From: cvs2git Date: Mon, 4 Jun 2007 08:09:08 +0000 (+0000) Subject: This commit was manufactured by cvs2git to create branch X-Git-Tag: deadbranch-1.141.2.7.2~12 X-Git-Url: http://git.pld-linux.org/?p=packages%2FX11-driver-firegl.git;a=commitdiff_plain;h=ac071ba92e12b39e6b22d22ccb17496b0b857707 This commit was manufactured by cvs2git to create branch 'unlabeled-1.141.2.7.2'. Sprout from AC-branch 2007-06-04 08:09:08 UTC Elan Ruusamäe '- rel 52 (2.6.16.52)' Delete: X11-driver-firegl-force-define-AGP.patch X11-driver-firegl-intermodule.patch X11-driver-firegl-kh.patch X11-driver-firegl-noiommu.patch X11-driver-firegl-viak8t.patch firegl-panel-ugliness.patch firegl-panel.patch --- diff --git a/X11-driver-firegl-force-define-AGP.patch b/X11-driver-firegl-force-define-AGP.patch deleted file mode 100644 index 3dd2538..0000000 --- a/X11-driver-firegl-force-define-AGP.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- X11-driver-firegl-8.23.7/common/lib/modules/fglrx/build_mod/firegl_public.c.orig 2006-04-15 02:25:12.183912250 +0200 -+++ X11-driver-firegl-8.23.7/common/lib/modules/fglrx/build_mod/firegl_public.c 2006-04-15 02:25:28.484931000 +0200 -@@ -21,6 +21,8 @@ - !!! since it requires changes to linux/init/main.c. - #endif /* !MODULE */ - -+#define __AGP__ 1 -+ - // ============================================================ - #include - #ifdef MODVERSIONS diff --git a/X11-driver-firegl-intermodule.patch b/X11-driver-firegl-intermodule.patch deleted file mode 100644 index 8fabc58..0000000 --- a/X11-driver-firegl-intermodule.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- X11-driver-firegl-8.23.7/common/lib/modules/fglrx/build_mod/firegl_public.c-orig 2006-02-23 14:54:16.386740016 -0600 -+++ X11-driver-firegl-8.23.7/common/lib/modules/fglrx/build_mod/firegl_public.c 2006-02-23 14:56:38.054203288 -0600 -@@ -361,13 +361,15 @@ - } firegl_drm_stub_info_t; - static firegl_drm_stub_info_t firegl_stub_info; - --#if LINUX_VERSION_CODE < 0x020400 -+#if LINUX_VERSION_CODE > 0x02060F - struct firegl_drm_stub_info_t *firegl_stub_pointer = NULL; - #define inter_module_put(x) - #define inter_module_unregister(x) - #define inter_module_get_request(x,y) firegl_stub_pointer - #define inter_module_register(x,y,z) do { firegl_stub_pointer = z; } while (0) -+#endif - /* This is a kludge for backward compatibility that is only useful in DRM(stub_open) */ -+#if LINUX_VERSION_CODE < 0x020400 - #define fops_put(fops) MOD_DEC_USE_COUNT - #define fops_get(fops) (fops); MOD_INC_USE_COUNT - #endif // LINUX_VERSION_CODE < 0x020400 diff --git a/X11-driver-firegl-kh.patch b/X11-driver-firegl-kh.patch deleted file mode 100644 index 223c138..0000000 --- a/X11-driver-firegl-kh.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- XFree86-driver-firegl-3.2.5/lib/modules/fglrx/build_mod/make.sh.org 2003-09-21 13:27:52.000000000 +0200 -+++ XFree86-driver-firegl-3.2.5/lib/modules/fglrx/build_mod/make.sh 2003-09-21 13:29:03.000000000 +0200 -@@ -47,7 +47,7 @@ - - # ============================================================== - # system/kernel identification --uname_r=`uname -r` -+uname_r=`rpm -q kernel-headers |awk -F- '{print $3}'` - uname_v=`uname -v` - uname_s=`uname -s` - uname_m=`uname -m` diff --git a/X11-driver-firegl-noiommu.patch b/X11-driver-firegl-noiommu.patch deleted file mode 100644 index 6623bd5..0000000 --- a/X11-driver-firegl-noiommu.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- X11-driver-firegl-8.23.7/common/lib/modules/fglrx/build_mod/firegl_public.c.orig 2006-03-21 15:32:05.000000000 +0100 -+++ X11-driver-firegl-8.23.7/common/lib/modules/fglrx/build_mod/firegl_public.c 2006-03-21 15:38:06.000000000 +0100 -@@ -2353,7 +2353,7 @@ - - int ATI_API_CALL __ke_no_iommu(void) - { --#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,1) -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,1) && LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16) - #ifdef CONFIG_GART_IOMMU - return no_iommu; - #else /* !CONFIG_GART_IOMMU */ diff --git a/X11-driver-firegl-viak8t.patch b/X11-driver-firegl-viak8t.patch deleted file mode 100644 index 2070a56..0000000 --- a/X11-driver-firegl-viak8t.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- a/lib/modules/fglrx/build_mod/agpgart_be.c 2005-05-06 19:38:20.097954488 +0200 -+++ b/lib/modules/fglrx/build_mod/agpgart_be.c 2005-05-06 18:33:55.722009576 +0200 -@@ -6185,6 +6185,18 @@ - "Via", - "Apollo P4M266", - via_generic_setup }, -+ { PCI_DEVICE_ID_VIA_8380_0, -+ PCI_VENDOR_ID_VIA, -+ AMD_8151, -+ "AMD", -+ "On-CPU GART", -+ amd_8151_setup }, -+ { PCI_DEVICE_ID_VIA_8385_0, -+ PCI_VENDOR_ID_VIA, -+ AMD_8151, -+ "AMD", -+ "On-CPU GART", -+ amd_8151_setup }, - { 0, - PCI_VENDOR_ID_VIA, - VIA_GENERIC, ---- a/lib/modules/fglrx/build_mod/agp.h 2005-05-06 19:38:19.671019392 +0200 -+++ b/lib/modules/fglrx/build_mod/agp.h 2005-05-06 18:37:10.403413504 +0200 -@@ -202,6 +202,8 @@ - #define SIS_GENERIC _X(SIS_GENERIC) - #define AMD_GENERIC _X(AMD_GENERIC) - #define AMD_IRONGATE _X(AMD_IRONGATE) -+ #define PCI_DEVICE_ID_VIA_8380_0 0x0204 -+ #define PCI_DEVICE_ID_VIA_8385_0 0x3188 - // #define AMD_IGD4 _X(AMD_IGD4) - // #define AMD_IGD4_2P _X(AMD_IGD4_2P) - #define AMD_761 _X(AMD_761) diff --git a/firegl-panel-ugliness.patch b/firegl-panel-ugliness.patch deleted file mode 100644 index c766d63..0000000 --- a/firegl-panel-ugliness.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruN X11-driver-firegl-3.12.0./panel_src/main.cpp X11-driver-firegl-3.12.0/panel_src/main.cpp ---- X11-driver-firegl-3.12.0./panel_src/main.cpp 2004-09-23 16:25:46.000000000 +0200 -+++ X11-driver-firegl-3.12.0/panel_src/main.cpp 2004-09-23 16:26:12.689848008 +0200 -@@ -28,8 +28,6 @@ - // printf ( "%s\n", lpath.data() ) ; - // printf ( "%s\n", lfile.data() ) ; - -- QApplication::setStyle ( "Windows" ) ; -- - QApplication a( argc, argv ); - - if ( fi.exists() ) diff --git a/firegl-panel.patch b/firegl-panel.patch deleted file mode 100644 index 6c18a72..0000000 --- a/firegl-panel.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- XFree86-driver-firegl-2.9.8/panel_src/Makefile.fix Wed May 7 00:12:45 2003 -+++ XFree86-driver-firegl-2.9.8/panel_src/Makefile Wed May 7 00:17:42 2003 -@@ -87,12 +87,12 @@ - $(error environment missing: MK_QTDIR=$(MK_QTDIR)) - endif - --ifeq ($(shell test -e $(MK_QTDIR)/include/qglobal.h$(colon) echo $$?),1) -+ifeq ($(shell test -e $(MK_QTDIR)/include/qt/qglobal.h$(colon) echo $$?),1) - $(error environment incomplete: MK_QTDIR=$(MK_QTDIR)) - endif - - ifeq ($(QT_VER),0) --QT_VER=$(shell grep QT_VERSION_STR $(MK_QTDIR)/include/qglobal.h | cut -d'"' -f2 | cut -d'.' -f1) -+QT_VER=$(shell grep QT_VERSION_STR $(MK_QTDIR)/include/qt/qglobal.h | cut -d'"' -f2 | cut -d'.' -f1) - endif - - ifeq ($(QT_VER),0) -@@ -138,7 +138,7 @@ - # for *.c - CINCDIR = -I/usr/X11R6/include -I. -I./include_dummy - CDEFINES = $(DEFINES) --ifeq ($(DEBUG),0) -+ifneq ($(DEBUG),0) - CDEBFLAGS = -g - endif - CFLAGS = $(CDEBFLAGS) -O2 -fno-strength-reduce -funsigned-char $(CDEFINES) -@@ -145,7 +145,7 @@ - LFLAGS = $(CDEBFLAGS) -L/usr/X11R6/$(LIB_DIR) -lXaw -lXmu -lXt -lXext -lX11 - - # for *.cpp --CCINCDIR = -I$(MK_QTDIR)/include -I. -I./include_dummy -+CCINCDIR = -I$(MK_QTDIR)/include -I. -I./include_dummy -I/usr/include/qt - CCDEFINES = $(DEFINES) - ifneq ($(DEBUG),0) - CCDEBFLAGS = -ggdb ---- XFree86-driver-firegl-2.9.8/panel_src/main.cpp.fix Wed May 7 00:19:12 2003 -+++ XFree86-driver-firegl-2.9.8/panel_src/main.cpp Wed May 7 00:20:06 2003 -@@ -28,7 +28,7 @@ - // printf ( "%s\n", lpath.data() ) ; - // printf ( "%s\n", lfile.data() ) ; - -- QApplication::setStyle ( new QWindowsStyle ) ; -+ QApplication::setStyle ( "Windows" ) ; - - QApplication a( argc, argv ); -