[Pkg-fglrx-devel] r875 - fglrx-driver/trunk/debian

[Andreas Beckmann]

Author: anbe-guest
Date: 2012-03-09 23:32:33 +0000 (Fri, 09 Mar 2012)
New Revision: 875

Modified:
   fglrx-driver/trunk/debian/changelog
   fglrx-driver/trunk/debian/libxvbaw1.install.in
   fglrx-driver/trunk/debian/rules
Log:
work around mismatching libAMDXvBA.cap

Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog	2012-03-09 22:45:10 UTC (rev 874)
+++ fglrx-driver/trunk/debian/changelog	2012-03-09 23:32:33 UTC (rev 875)
@@ -1,9 +1,14 @@
 fglrx-driver (1:12-2-2) UNRELEASED; urgency=low
 
+  [ Patrick Matthäi ]
   * Add patch 04-x86-ftbfs to fix a FTBFS with Linux >= 3.2.8 on 32bit systems.
     Closes: #663107
   * Remove redundant spelling-error-in-binary lintian overrides.
 
+  [ Andreas Beckmann ]
+  * Edit libAMDXvBA.so.1.0 and rename libAMDXvBA.cap to allow two different
+    versions for i386 and amd64.  (Closes: #663097)
+
  -- Patrick Matthäi <pmatthaei at debian.org>  Fri, 09 Mar 2012 23:44:45 +0100
 
 fglrx-driver (1:12-2-1) unstable; urgency=low

Modified: fglrx-driver/trunk/debian/libxvbaw1.install.in
===================================================================
--- fglrx-driver/trunk/debian/libxvbaw1.install.in	2012-03-09 22:45:10 UTC (rev 874)
+++ fglrx-driver/trunk/debian/libxvbaw1.install.in	2012-03-09 23:32:33 UTC (rev 875)
@@ -1,3 +1,3 @@
 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	usr/lib/
+arch/_ARCH_/usr/X11R6/_LIB_/AMDXvBA*.cap	usr/lib/

Modified: fglrx-driver/trunk/debian/rules
===================================================================
--- fglrx-driver/trunk/debian/rules	2012-03-09 22:45:10 UTC (rev 874)
+++ fglrx-driver/trunk/debian/rules	2012-03-09 23:32:33 UTC (rev 875)
@@ -10,10 +10,12 @@
 arch=x86_64
 xpic=xpic_64a
 lib=lib64
+cap=AMDXvBAx64.cap
 else
 arch=x86
 xpic=xpic
 lib=lib
+cap=AMDXvBAx86.cap
 endif
 
 MULTIARCH	?= yes
@@ -38,6 +40,8 @@
 	test ! -f debian/man/Makefile || $(MAKE) -C debian/man maintainer-clean
 	rm -f LICENSE.txt
 	rm -f $(generated)
+	rm -f arch/x86/usr/X11R6/lib/AMDXvBAx86.cap
+	rm -f arch/x86_64/usr/X11R6/lib64/AMDXvBAx64.cap
 
 # Reformat the LICENSE to the format needed for debian/copyright.
 LICENSE.txt: LICENSE.TXT
@@ -64,6 +68,8 @@
 	    --with-xserver=Xorg
 
 override_dh_auto_build:
+	ln arch/x86/usr/X11R6/lib/libAMDXvBA.cap arch/x86/usr/X11R6/lib/AMDXvBAx86.cap
+	ln arch/x86_64/usr/X11R6/lib64/libAMDXvBA.cap arch/x86_64/usr/X11R6/lib64/AMDXvBAx64.cap
 	$(MAKE) -C debian/man
 
 # On amd64, AMD hardcoded some paths to /usr/lib64/fglrx/switchlibgl*, and
@@ -88,6 +94,7 @@
 	rpl -e	'/usr/lib64/fglrx' \
 		'/usr/lib///fglrx' \
 		$(badlib64files)
+	rpl -e 'libAMDXvBA.cap' '$(cap)' debian/libxvbaw1/$(libdir)/libAMDXvBA.so.1.0
 	chmod a+x debian/fglrx-source/usr/src/modules/fglrx/debian/rules
 	tar cfj debian/fglrx-source/usr/src/fglrx.tar.bz2 \
 		--owner=root --group=src --remove-files \