[Pkg-fglrx-devel] r755 - in fglrx-driver/branches/multiarch/debian: . patches

Andreas Beckmann anbe-guest at alioth.debian.org
Wed Aug 31 21:15:50 UTC 2011 

Author: anbe-guest
Date: 2011-08-31 21:15:50 +0000 (Wed, 31 Aug 2011)
New Revision: 755

Removed:
   fglrx-driver/branches/multiarch/debian/fglrx-driver.links.in
   fglrx-driver/branches/multiarch/debian/patches/04-build-x86_64-on-x86.diff
Modified:
   fglrx-driver/branches/multiarch/debian/changelog
   fglrx-driver/branches/multiarch/debian/control
   fglrx-driver/branches/multiarch/debian/fglrx-driver.install.in
   fglrx-driver/branches/multiarch/debian/fglrx-modules-dkms.install.in
   fglrx-driver/branches/multiarch/debian/fglrx-modules-dkms.lintian-overrides.in
   fglrx-driver/branches/multiarch/debian/libfglrx.install.in
   fglrx-driver/branches/multiarch/debian/patches/series
   fglrx-driver/branches/multiarch/debian/rules
Log:
merge changes from trunk up to r754, keep libAMDXvBA.cap in fglrx-driver

Modified: fglrx-driver/branches/multiarch/debian/changelog
===================================================================
--- fglrx-driver/branches/multiarch/debian/changelog	2011-08-31 20:51:16 UTC (rev 754)
+++ fglrx-driver/branches/multiarch/debian/changelog	2011-08-31 21:15:50 UTC (rev 755)
@@ -1,10 +1,10 @@
 fglrx-driver (1:11-8-2) UNRELEASED; urgency=low
 
   [ Andreas Beckmann ]
-  * Include libfglrx_ip.a for both architectures in the module source.
-  * Add patch 04-build-x86_64-on-x86.diff: add support for building the 64-bit
-    kernel module in 32-bit userspace, i.e. for linux-image-*-amd64 on i386.
-    (Closes: #636055)
+  * Bump glx-alternative-fglrx dependency to >= 0.1.92 and drop the libglx.so
+    compatibility symlink.
+  * Install a list of supported PCI IDs as /usr/share/fglrx/fglrx.ids.
+  * Cleanup maintainer scripts.
   * Enable multiarch build.
     - Add and use _LIBDIR_ substitution variable.
     - Add Pre-Depends: ${misc:Pre-Depends}.
@@ -24,7 +24,6 @@
   * Ensure no mismatching versions of fglrx-driver and libgl1-fglrx-glx can be
     installed.
   * Override the experimental lintian tag shlib-calls-exit.
-  * Cleanup maintainer scripts.
   * Prepare support for squeeze-backports:
     - Add instructions for squeeze-backports to README.source and a
       prepare-squeeze-backport target to debian/rules that performs the

Modified: fglrx-driver/branches/multiarch/debian/control
===================================================================
--- fglrx-driver/branches/multiarch/debian/control	2011-08-31 20:51:16 UTC (rev 754)
+++ fglrx-driver/branches/multiarch/debian/control	2011-08-31 21:15:50 UTC (rev 755)
@@ -33,7 +33,7 @@
  ${shlibs:Depends},
  libfglrx (= ${binary:Version}),
  xorg-video-abi-10 | xorg-video-abi-8 | xorg-video-abi-6.0,
- glx-alternative-fglrx (>= 0.1.2)
+ glx-alternative-fglrx (>= 0.1.92)
 Recommends:
  fglrx-modules-dkms (= ${binary:Version}),
  libgl1-fglrx-glx (= ${binary:Version}),
@@ -117,7 +117,7 @@
 Depends:
  ${misc:Depends},
  ${shlibs:Depends},
- glx-alternative-fglrx (>= 0.1.2)
+ glx-alternative-fglrx (>= 0.1.92)
 Conflicts:
  fglrx-glx-ia32 [i386],
 Breaks:

Modified: fglrx-driver/branches/multiarch/debian/fglrx-driver.install.in
===================================================================
--- fglrx-driver/branches/multiarch/debian/fglrx-driver.install.in	2011-08-31 20:51:16 UTC (rev 754)
+++ fglrx-driver/branches/multiarch/debian/fglrx-driver.install.in	2011-08-31 21:15:50 UTC (rev 755)
@@ -9,7 +9,9 @@
 arch/_ARCH_/usr/X11R6/bin/atiode usr/bin
 arch/_ARCH_/usr/X11R6/bin/fgl_glxgears usr/bin
 arch/_ARCH_/usr/X11R6/bin/fglrxinfo usr/bin
+arch/_ARCH_/usr/X11R6/_LIB_/libAMDXvBA.cap usr/lib
 _XPIC_/usr/X11R6/_LIB_/modules/*.so				usr/lib/xorg/modules/
 _XPIC_/usr/X11R6/_LIB_/modules/drivers/fglrx_drv.so usr/lib/fglrx
 _XPIC_/usr/X11R6/_LIB_/modules/extensions/fglrx/fglrx-libglx.so	usr/lib/fglrx/
 _XPIC_/usr/X11R6/_LIB_/modules/linux/*.so			usr/lib/xorg/modules/linux/
+fglrx.ids							usr/share/fglrx/

Deleted: fglrx-driver/branches/multiarch/debian/fglrx-driver.links.in
===================================================================
--- fglrx-driver/branches/multiarch/debian/fglrx-driver.links.in	2011-08-31 20:51:16 UTC (rev 754)
+++ fglrx-driver/branches/multiarch/debian/fglrx-driver.links.in	2011-08-31 21:15:50 UTC (rev 755)
@@ -1 +0,0 @@
-/usr/lib/fglrx/fglrx-libglx.so /usr/lib/fglrx/libglx.so

Modified: fglrx-driver/branches/multiarch/debian/fglrx-modules-dkms.install.in
===================================================================
--- fglrx-driver/branches/multiarch/debian/fglrx-modules-dkms.install.in	2011-08-31 20:51:16 UTC (rev 754)
+++ fglrx-driver/branches/multiarch/debian/fglrx-modules-dkms.install.in	2011-08-31 21:15:50 UTC (rev 755)
@@ -2,5 +2,4 @@
 common/lib/modules/fglrx/build_mod/*.h usr/src/fglrx-_VERSION_/
 common/lib/modules/fglrx/build_mod/2.6.x/Makefile usr/src/fglrx-_VERSION_/
 debian/dkms.conf usr/src/fglrx-_VERSION_/
-arch/x86/lib/modules/fglrx/build_mod/libfglrx_ip.a usr/src/fglrx-_VERSION_/x86/
-arch/x86_64/lib/modules/fglrx/build_mod/libfglrx_ip.a usr/src/fglrx-_VERSION_/x86_64/
+arch/_ARCH_/lib/modules/fglrx/build_mod/libfglrx_ip.a usr/src/fglrx-_VERSION_/

Modified: fglrx-driver/branches/multiarch/debian/fglrx-modules-dkms.lintian-overrides.in
===================================================================
--- fglrx-driver/branches/multiarch/debian/fglrx-modules-dkms.lintian-overrides.in	2011-08-31 20:51:16 UTC (rev 754)
+++ fglrx-driver/branches/multiarch/debian/fglrx-modules-dkms.lintian-overrides.in	2011-08-31 21:15:50 UTC (rev 755)
@@ -1,10 +1,5 @@
 no-upstream-changelog
-[i386]: binary-from-other-architecture usr/src/fglrx-_VERSION_/x86_64/libfglrx_ip.a
-spelling-error-in-binary usr/src/fglrx-_VERSION_/x86/libfglrx_ip.a aquired acquired
-spelling-error-in-binary usr/src/fglrx-_VERSION_/x86/libfglrx_ip.a neccessary necessary
-spelling-error-in-binary usr/src/fglrx-_VERSION_/x86/libfglrx_ip.a neccessary necessary
-spelling-error-in-binary usr/src/fglrx-_VERSION_/x86_64/libfglrx_ip.a aquired acquired
-spelling-error-in-binary usr/src/fglrx-_VERSION_/x86_64/libfglrx_ip.a neccessary necessary
-spelling-error-in-binary usr/src/fglrx-_VERSION_/x86_64/libfglrx_ip.a neccessary necessary
-unstripped-binary-or-object usr/src/fglrx-_VERSION_/x86/libfglrx_ip.a
-unstripped-binary-or-object usr/src/fglrx-_VERSION_/x86_64/libfglrx_ip.a
+spelling-error-in-binary usr/src/fglrx-_VERSION_/libfglrx_ip.a aquired acquired
+spelling-error-in-binary usr/src/fglrx-_VERSION_/libfglrx_ip.a neccessary necessary
+spelling-error-in-binary usr/src/fglrx-_VERSION_/libfglrx_ip.a neccessary necessary
+unstripped-binary-or-object usr/src/fglrx-_VERSION_/libfglrx_ip.a

Modified: fglrx-driver/branches/multiarch/debian/libfglrx.install.in
===================================================================
--- fglrx-driver/branches/multiarch/debian/libfglrx.install.in	2011-08-31 20:51:16 UTC (rev 754)
+++ fglrx-driver/branches/multiarch/debian/libfglrx.install.in	2011-08-31 21:15:50 UTC (rev 755)
@@ -5,6 +5,5 @@
 arch/_ARCH_/usr/X11R6/_LIB_/libatiadlxx.so	_LIBDIR_/
 arch/_ARCH_/usr/X11R6/_LIB_/libXvBAW.so.1.0	_LIBDIR_/
 arch/_ARCH_/usr/X11R6/_LIB_/libAMDXvBA.so.1.0	_LIBDIR_/
-arch/_ARCH_/usr/X11R6/_LIB_/libAMDXvBA.cap	_LIBDIR_/
 arch/_ARCH_/usr/X11R6/_LIB_/libfglrx_dm.so.1.0	_LIBDIR_/
 arch/_ARCH_/usr/X11R6/_LIB_/modules/dri		_LIBDIR_/

Deleted: fglrx-driver/branches/multiarch/debian/patches/04-build-x86_64-on-x86.diff
===================================================================
--- fglrx-driver/branches/multiarch/debian/patches/04-build-x86_64-on-x86.diff	2011-08-31 20:51:16 UTC (rev 754)
+++ fglrx-driver/branches/multiarch/debian/patches/04-build-x86_64-on-x86.diff	2011-08-31 21:15:50 UTC (rev 755)
@@ -1,19 +0,0 @@
-Author: Andreas Beckmann <debian at abeckmann.de>
-Description: select the libfglrx_ip.a based on the target kernel architecture
- Together with shipping libfglrx_ip.a for both architectures, this allows to
- build the kernel module for linux-image-*-amd64 on i386.
- No guarantees that the 32-bit userspace driver works on a 64-bit kernel.
-
-Index: b/common/lib/modules/fglrx/build_mod/2.6.x/Makefile
-===================================================================
---- a/common/lib/modules/fglrx/build_mod/2.6.x/Makefile	2011-08-10 02:24:53.439417802 +0200
-+++ b/common/lib/modules/fglrx/build_mod/2.6.x/Makefile	2011-08-10 02:28:11.395916634 +0200
-@@ -27,7 +27,7 @@
- LIBIP_PREFIX	?= ..
- 
- obj-m           += fglrx.o
--fglrx-libs      += libfglrx_ip.a
-+fglrx-libs      += $(if $(filter y,$(CONFIG_X86_64)),x86_64/,x86/)libfglrx_ip.a
- 
- fglrx-c-objs    += firegl_public.o      \
-                    kcl_acpi.o           \

Modified: fglrx-driver/branches/multiarch/debian/patches/series
===================================================================
--- fglrx-driver/branches/multiarch/debian/patches/series	2011-08-31 20:51:16 UTC (rev 754)
+++ fglrx-driver/branches/multiarch/debian/patches/series	2011-08-31 21:15:50 UTC (rev 755)
@@ -1,4 +1,3 @@
 01-CONFIG_X86_XEN.diff
 02-dkms-arch_compat.diff
 03-authatieventsd.sh.diff
-04-build-x86_64-on-x86.diff

Modified: fglrx-driver/branches/multiarch/debian/rules
===================================================================
--- fglrx-driver/branches/multiarch/debian/rules	2011-08-31 20:51:16 UTC (rev 754)
+++ fglrx-driver/branches/multiarch/debian/rules	2011-08-31 21:15:50 UTC (rev 755)
@@ -20,6 +20,7 @@
 libdir		 = usr/lib$(if $(MULTIARCH),/$(DEB_HOST_MULTIARCH))
 
 generated=$(shell ls debian/*.in | sed s/\.in$$//g)
+generated	+= fglrx.ids
 
 %: %.in
 	sed -r -e 's%_VERSION_%$(upstream_version)%g' \
@@ -49,6 +50,10 @@
 	diff -w copyright.tmp LICENSE.tmp
 	rm -f copyright.tmp LICENSE.tmp
 
+fglrx.ids: common/lib/modules/fglrx/build_mod/fglrxko_pci_ids.h
+	cat $< | sed -n -r -e '/FGL_ASIC_ID/ s/.*\(0x(.{4})\).*/1002\1/p' \
+		| tr a-z A-Z | sort -u > $@
+
 override_dh_auto_configure: $(generated) compare-copyright-license
 	cd debian/man && ./autogen.sh --copy
 	cd debian/man && ./configure --prefix=/usr --mandir=/usr/share/man \
@@ -84,7 +89,7 @@
 prepare-squeeze-backport:
 	echo 8 > debian/compat
 	sed -i -e '/^MULTIARCH/ s/^/#/' debian/rules
-	sed -i -e 's/debhelper (>= .*)/debhelper (>= 8.1)/' \
+	sed -i -e 's/debhelper (>= .*)/debhelper (>= 8.1.0~)/' \
 	       -e '/^Multi-Arch:/ d' debian/control
 	debchange --bpo "Disable multiarch build."
 	debchange "Reduce Build-Depends: debhelper and compat level to 8."

More information about the Pkg-fglrx-devel mailing list