From 8acb3973d417aa18770e6e3bb9345e652939ccba Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 22 Oct 2009 08:03:47 +0200 Subject: [PATCH] move package Mesa: - no more need, move to pkg-archive branch --- packages/graphics/Mesa/build | 52 ------------------- packages/graphics/Mesa/install | 20 ------- .../Mesa/patches/102_dont-vblank.diff | 14 ----- .../Mesa/patches/10_cross-compile.diff | 35 ------------- packages/graphics/Mesa/url | 2 - 5 files changed, 123 deletions(-) delete mode 100755 packages/graphics/Mesa/build delete mode 100755 packages/graphics/Mesa/install delete mode 100644 packages/graphics/Mesa/patches/102_dont-vblank.diff delete mode 100644 packages/graphics/Mesa/patches/10_cross-compile.diff delete mode 100644 packages/graphics/Mesa/url diff --git a/packages/graphics/Mesa/build b/packages/graphics/Mesa/build deleted file mode 100755 index 4662b7c4ac..0000000000 --- a/packages/graphics/Mesa/build +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/sh - -. config/options - -$SCRIPTS/build expat -$SCRIPTS/build glproto -$SCRIPTS/build dri2proto -$SCRIPTS/build $LIBDRM -$SCRIPTS/build libXext -$SCRIPTS/build libXdamage -$SCRIPTS/build libXfixes -$SCRIPTS/build libXxf86vm -$SCRIPTS/build libX11 - -cd $PKG_BUILD -HOST_CC=$HOST_CC \ -OPT_FLAGS="$CFLAGS -D_GNU_SOURCE" \ -HOST_OPT_FLAGS="$HOST_CFLAGS" \ -X11_INCLUDES= \ -DRI_DRIVER_INSTALL_DIR="$XORG_PATH_DRI" \ -DRI_DRIVER_SEARCH_DIR="$XORG_PATH_DRI" \ -./configure --host=$TARGET_NAME \ - --build=$HOST_NAME \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --disable-static \ - --enable-shared \ - --disable-debug \ - --disable-selinux \ - --disable-xcb \ - --disable-glx-tls \ - --enable-driglx-direct \ - --disable-egl \ - --disable-gl-osmesa \ - --disable-glu \ - --disable-glut \ - --disable-glw \ - --disable-gallium \ - --disable-motif \ - --with-driver=dri \ - --with-dri-drivers=$DRIDRIVERS \ - --with-dri-driverdir="$XORG_PATH_DRI" \ - --with-xorg-driver-dir="$XORG_PATH_DRIVERS" \ - --with-x \ - --without-demos \ - -make - -make -C progs/xdemos - -$MAKEINSTALL -C src/mesa diff --git a/packages/graphics/Mesa/install b/packages/graphics/Mesa/install deleted file mode 100755 index a63f82a794..0000000000 --- a/packages/graphics/Mesa/install +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -. config/options - -$SCRIPTS/install libXdamage -$SCRIPTS/install libdrm -$SCRIPTS/install expat -$SCRIPTS/install libXext -$SCRIPTS/install libXfixes -$SCRIPTS/install libXxf86vm -$SCRIPTS/install libX11 - -mkdir -p $INSTALL/usr/lib -cp -PR $PKG_BUILD/lib/libGL.so* $INSTALL/usr/lib - -mkdir -p $INSTALL/usr/lib/dri -cp -PR $PKG_BUILD/lib*/*_dri.so $INSTALL/usr/lib/dri - -mkdir -p $INSTALL/usr/bin -cp -PR $PKG_BUILD/progs/xdemos/{glxdemo,glxgears,glxinfo,glxpbdemo} $INSTALL/usr/bin diff --git a/packages/graphics/Mesa/patches/102_dont-vblank.diff b/packages/graphics/Mesa/patches/102_dont-vblank.diff deleted file mode 100644 index 3f1c3ae615..0000000000 --- a/packages/graphics/Mesa/patches/102_dont-vblank.diff +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/mesa/drivers/dri/intel/intel_screen.c b/src/mesa/drivers/dri/intel/intel_screen.c -index 5233e58..5dded4b 100644 ---- a/src/mesa/drivers/dri/intel/intel_screen.c -+++ b/src/mesa/drivers/dri/intel/intel_screen.c -@@ -55,7 +55,7 @@ PUBLIC const char __driConfigOptions[] = - DRI_CONF_BEGIN - DRI_CONF_SECTION_PERFORMANCE - DRI_CONF_FTHROTTLE_MODE(DRI_CONF_FTHROTTLE_IRQS) -- DRI_CONF_VBLANK_MODE(DRI_CONF_VBLANK_ALWAYS_SYNC) -+ DRI_CONF_VBLANK_MODE(DRI_CONF_VBLANK_DEF_INTERVAL_0) - /* Options correspond to DRI_CONF_BO_REUSE_DISABLED, - * DRI_CONF_BO_REUSE_ALL - */ - diff --git a/packages/graphics/Mesa/patches/10_cross-compile.diff b/packages/graphics/Mesa/patches/10_cross-compile.diff deleted file mode 100644 index 0e46d69f3a..0000000000 --- a/packages/graphics/Mesa/patches/10_cross-compile.diff +++ /dev/null @@ -1,35 +0,0 @@ -diff -Naur mesa-7.1rc1-20080706.orig/bin/mklib mesa-7.1rc1-20080706/bin/mklib ---- mesa-7.1rc1-20080706.orig/bin/mklib 2008-07-06 14:09:54.000000000 +0200 -+++ mesa-7.1rc1-20080706/bin/mklib 2008-07-06 14:11:03.000000000 +0200 -@@ -211,9 +211,9 @@ - if [ "x$LINK" = "x" ] ; then - # -linker was not specified so set default link command now - if [ $CPLUSPLUS = 1 ] ; then -- LINK=g++ -+ LINK=$CXX - else -- LINK=gcc -+ LINK=$CC - fi - fi - -diff -Naur mesa-7.1rc1-20080706.orig/configs/linux-dri mesa-7.1rc1-20080706/configs/linux-dri ---- mesa-7.1rc1-20080706.orig/configs/linux-dri 2008-07-06 14:09:54.000000000 +0200 -+++ mesa-7.1rc1-20080706/configs/linux-dri 2008-07-06 14:16:00.000000000 +0200 -@@ -14,6 +14,7 @@ - #MKDEP_OPTIONS = -MF depend - - OPT_FLAGS = -O2 -g -+HOST_OPT_FLAGS = $(OPT_FLAGS) - PIC_FLAGS = -fPIC - - # Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support. -@@ -29,6 +30,8 @@ - - CFLAGS = -Wall -Wmissing-prototypes -std=c99 -ffast-math \ - $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) $(ASM_FLAGS) -+HOST_CFLAGS = -Wall -Wmissing-prototypes -std=c99 -ffast-math \ -+ $(HOST_OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) $(ASM_FLAGS) - - CXXFLAGS = -Wall $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) - diff --git a/packages/graphics/Mesa/url b/packages/graphics/Mesa/url deleted file mode 100644 index de7e64411e..0000000000 --- a/packages/graphics/Mesa/url +++ /dev/null @@ -1,2 +0,0 @@ -http://puzzle.dl.sourceforge.net/project/mesa3d/MesaLib/7.5/MesaLib-7.5.tar.bz2 -http://puzzle.dl.sourceforge.net/project/mesa3d/MesaDemos/7.5/MesaDemos-7.5.tar.bz2 \ No newline at end of file