Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=85eaabea3295ded4816c31258fa74ebcd8a787ff

commit 85eaabea3295ded4816c31258fa74ebcd8a787ff
Author: Michel Hermier <herm...@frugalware.org>
Date:   Sat Jul 11 12:28:45 2009 +0200

mesa-7.4.4-1-i686

* Remove unused patches.

diff --git a/source/x11/mesa/change-default-dri-driver-dir-X7.1.patch 
b/source/x11/mesa/change-default-dri-driver-dir-X7.1.patch
deleted file mode 100644
index 66495bf..0000000
--- a/source/x11/mesa/change-default-dri-driver-dir-X7.1.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur Mesa-6.5.1.orig/src/glx/x11/dri_glx.c 
Mesa-6.5.1/src/glx/x11/dri_glx.c
---- Mesa-6.5.1.orig/src/glx/x11/dri_glx.c      2006-09-16 11:50:59.000000000 
+0200
-+++ Mesa-6.5.1/src/glx/x11/dri_glx.c   2006-09-16 11:51:29.000000000 +0200
-@@ -58,7 +58,7 @@
-
- #ifndef DEFAULT_DRIVER_DIR
- /* this is normally defined in Mesa/configs/default with 
DRI_DRIVER_SEARCH_PATH */
--#define DEFAULT_DRIVER_DIR "/usr/X11R6/lib/modules/dri"
-+#define DEFAULT_DRIVER_DIR "/usr/lib/dri"
- #endif
-
- static __DRIdriver *Drivers = NULL;
diff --git a/source/x11/mesa/mesa-build-config.patch 
b/source/x11/mesa/mesa-build-config.patch
deleted file mode 100644
index a8dd83a..0000000
--- a/source/x11/mesa/mesa-build-config.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff -Naur Mesa-6.5.1.orig/configs/default Mesa-6.5.1/configs/default
---- Mesa-6.5.1.orig/configs/default    2006-10-07 12:12:00.000000000 +0200
-+++ Mesa-6.5.1/configs/default 2006-10-07 12:13:12.000000000 +0200
-@@ -80,7 +80,7 @@
-
- # Installation directories (for make install)
- INSTALL_DIR = /usr/local
--DRI_DRIVER_INSTALL_DIR = /usr/X11R6/lib/modules/dri
-+DRI_DRIVER_INSTALL_DIR = /usr/lib/dri
-
- # Where libGL will look for DRI hardware drivers
- DRI_DRIVER_SEARCH_DIR = $(DRI_DRIVER_INSTALL_DIR)
-diff -Naur Mesa-6.5.1.orig/configs/linux-dri Mesa-6.5.1/configs/linux-dri
---- Mesa-6.5.1.orig/configs/linux-dri  2006-10-07 12:12:00.000000000 +0200
-+++ Mesa-6.5.1/configs/linux-dri       2006-10-07 12:18:37.000000000 +0200
-@@ -9,7 +9,7 @@
- CC = gcc
- CXX = g++
-
--#MKDEP = /usr/X11R6/bin/makedepend
-+MKDEP = /usr/bin/makedepend
- #MKDEP = gcc -M
- #MKDEP_OPTIONS = -MF depend
-
-@@ -24,7 +24,7 @@
-       -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER \
-       -DGLX_DIRECT_RENDERING -DHAVE_ALIAS -DHAVE_POSIX_MEMALIGN
-
--X11_INCLUDES = -I/usr/X11R6/include
-+X11_INCLUDES =
-
- CFLAGS = -Wall -Wmissing-prototypes -std=c99 -ffast-math \
-       $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) $(ASM_FLAGS)
-@@ -35,7 +35,7 @@
- ASM_SOURCES =
-
- # Library/program dependencies
--EXTRA_LIB_PATH=-L/usr/X11R6/lib
-+EXTRA_LIB_PATH=-L/usr/lib
-
- LIBDRM_CFLAGS = `pkg-config --cflags libdrm`
- LIBDRM_LIB = `pkg-config --libs libdrm`
-diff -Naur Mesa-6.5.1.orig/configs/linux-dri-x86-64 
Mesa-6.5.1/configs/linux-dri-x86-64
---- Mesa-6.5.1.orig/configs/linux-dri-x86-64   2006-10-07 12:12:00.000000000 
+0200
-+++ Mesa-6.5.1/configs/linux-dri-x86-64        2006-10-07 12:19:07.000000000 
+0200
-@@ -11,14 +11,14 @@
- ASM_SOURCES = $(X86-64_SOURCES)
- ASM_API = $(X86-64_API)
-
--LIB_DIR = lib64
-+LIB_DIR = lib
-
- # Library/program dependencies
--EXTRA_LIB_PATH=-L/usr/X11R6/lib64
-+EXTRA_LIB_PATH=-L/usr/lib
-
- # ffb, gamma, and sis are missing because they have not be converted to use
- # the new interface.  i810 are missing because there is no x86-64
- # system where they could *ever* be used.
- #
--DRI_DIRS = i915tex i915 i965 mach64 mga r128 r200 radeon tdfx unichrome 
savage r300
-+DRI_DIRS = i915tex i915 i965 mach64 mga r128 r200 radeon tdfx unichrome 
savage r300 nouveau
-
diff --git a/source/x11/mesa/missing-glw.pc.in.patch 
b/source/x11/mesa/missing-glw.pc.in.patch
deleted file mode 100644
index 01bb9a4..0000000
--- a/source/x11/mesa/missing-glw.pc.in.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Naur Mesa-7.0.2/src/glw/glw.pc.in Mesa-7.0.2-p/src/glw/glw.pc.in
---- Mesa-7.0.2/src/glw/glw.pc.in       1970-01-01 01:00:00.000000000 +0100
-+++ Mesa-7.0.2-p/src/glw/glw.pc.in     2007-11-11 00:17:08.000000000 +0100
-@@ -0,0 +1,11 @@
-+pref...@install_dir@
-+exec_prefix=${prefix}
-+libdir=${exec_prefix}/@LIB_DIR@
-+includedir=${prefix}/include
-+
-+Name: glw
-+Description: Mesa OpenGL widget library
-+Requires: gl
-+Version: @VERSION@
-+Libs: -L${libdir} -lGLU
-+Cflags: -I${includedir}
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to