[pkg-nvidia-devel] r897 - in /packages/libvdpau/trunk/debian: changelog control lib32vdpau1.install lib32vdpau1.lintian-overrides rules

[anbe-guest at users.alioth.debian.org]

Author: anbe-guest
Date: Thu May 20 09:27:45 2010
New Revision: 897

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=897
Log:
  * Build lib32vdpau1 [amd64], so we can replace nvidia-libvdpau-ia32.
    Build rules inspired by lib32z1. (Closes: #572206)

Added:
    packages/libvdpau/trunk/debian/lib32vdpau1.install
    packages/libvdpau/trunk/debian/lib32vdpau1.lintian-overrides
Modified:
    packages/libvdpau/trunk/debian/changelog
    packages/libvdpau/trunk/debian/control
    packages/libvdpau/trunk/debian/rules

Modified: packages/libvdpau/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/libvdpau/trunk/debian/changelog?rev=897&op=diff
==============================================================================
--- packages/libvdpau/trunk/debian/changelog (original)
+++ packages/libvdpau/trunk/debian/changelog Thu May 20 09:27:45 2010
@@ -1,3 +1,11 @@
+libvdpau (0.4-4) unstable; urgency=low
+
+  [ Andreas Beckmann ]
+  * Build lib32vdpau1 [amd64], so we can replace nvidia-libvdpau-ia32.
+    Build rules inspired by lib32z1. (Closes: #572206)
+
+ -- Andreas Beckmann <debian at abeckmann.de>  Thu, 20 May 2010 10:43:18 +0200
+
 libvdpau (0.4-3) unstable; urgency=low
 
   * Enable dri2 feature. Requires x11proto-dri2-dev (>= 2.2) and libxext-dev.

Modified: packages/libvdpau/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/libvdpau/trunk/debian/control?rev=897&op=diff
==============================================================================
--- packages/libvdpau/trunk/debian/control (original)
+++ packages/libvdpau/trunk/debian/control Thu May 20 09:27:45 2010
@@ -7,6 +7,7 @@
 DM-Upload-Allowed: yes
 Build-Depends: debhelper (>= 7.0.50), pkg-config, libx11-dev,
  x11proto-dri2-dev (>= 2.2), libxext-dev,
+ g++-multilib [amd64], ia32-libs [amd64],
 Build-Depends-Indep: doxygen, graphviz, texlive-binaries, texlive-base,
 Standards-Version: 3.8.4
 Homepage: http://cgit.freedesktop.org/~aplattner/libvdpau
@@ -51,6 +52,22 @@
  .
  This package contains the VDPAU wrapper and trace libraries.
 
+Package: lib32vdpau1
+Architecture: amd64
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: nvidia-libvdpau1-ia32
+Conflicts: nvidia-libvdpau1-ia32
+Suggests: nvidia-vdpau-driver-ia32 [amd64] | vdpau-driver-ia32
+Description: Video Decode and Presentation API for Unix (32-bit libraries)
+ VDPAU (Video Decode and Presentation API for Unix) is an open source library
+ (libvdpau) and API designed by NVIDIA originally for its GeForce 8 series and
+ later GPU hardware, targeted at the X Window System on Unix operating-systems
+ (including Linux, FreeBSD, and Solaris). This VDPAU API
+ allows video programs to offload portions of the video decoding process and
+ video post-processing to the GPU video-hardware.
+ .
+ This package contains the VDPAU wrapper and trace 32-bit libraries.
+
 Package: libvdpau-doc
 Architecture: all
 Section: doc

Added: packages/libvdpau/trunk/debian/lib32vdpau1.install
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/libvdpau/trunk/debian/lib32vdpau1.install?rev=897&op=file
==============================================================================
--- packages/libvdpau/trunk/debian/lib32vdpau1.install (added)
+++ packages/libvdpau/trunk/debian/lib32vdpau1.install Thu May 20 09:27:45 2010
@@ -1,0 +1,3 @@
+usr/lib32/libvdpau.so
+usr/lib32/libvdpau.so.*
+usr/lib32/vdpau/libvdpau_trace.so.*

Added: packages/libvdpau/trunk/debian/lib32vdpau1.lintian-overrides
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/libvdpau/trunk/debian/lib32vdpau1.lintian-overrides?rev=897&op=file
==============================================================================
--- packages/libvdpau/trunk/debian/lib32vdpau1.lintian-overrides (added)
+++ packages/libvdpau/trunk/debian/lib32vdpau1.lintian-overrides Thu May 20 09:27:45 2010
@@ -1,0 +1,1 @@
+lib32vdpau1: non-dev-pkg-with-shlib-symlink usr/lib32/libvdpau.so.1.0.0 usr/lib32/libvdpau.so

Modified: packages/libvdpau/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/libvdpau/trunk/debian/rules?rev=897&op=diff
==============================================================================
--- packages/libvdpau/trunk/debian/rules (original)
+++ packages/libvdpau/trunk/debian/rules Thu May 20 09:27:45 2010
@@ -1,4 +1,8 @@
 #!/usr/bin/make -f
+
+#export DH_VERBOSE=1
+
+DEB_HOST_ARCH       ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
 # Used to enable documentation if dependencies are available
 define cond_enable
@@ -10,9 +14,41 @@
 CONFIGURE_OPTIONS ?= $(call cond_enable) \
 		     --enable-dri2
 
+32-ARCHS=amd64
+ifneq (,$(findstring $(DEB_HOST_ARCH), $(32-ARCHS)))
+EXTRA_CONFIGURE	+= configure32
+EXTRA_BUILD	+= build32
+EXTRA_INSTALL	+= install32
+endif
+
 %:
 	dh $@
 
-override_dh_auto_configure:
+binary: binary-indep binary-arch ;
+
+override_dh_auto_configure: $(EXTRA_CONFIGURE)
 	dh_testdir
 	./configure --prefix=/usr $(CONFIGURE_OPTIONS)
+
+configure32:
+	dh_testdir
+	mkdir debian/32
+	cd debian/32 && CC="$(CC) -m32" CXX="$(CXX) -m32" \
+		../../configure --prefix=/usr --libdir=/usr/lib32 \
+		$(CONFIGURE_OPTIONS)
+
+override_dh_auto_build: $(EXTRA_BUILD)
+	dh_auto_build
+
+build32:
+	dh_auto_build --sourcedirectory=debian/32
+
+override_dh_auto_install: $(EXTRA_INSTALL)
+	dh_auto_install
+
+install32:
+	dh_auto_install --sourcedirectory=debian/32
+
+clean:
+	dh clean
+	rm -rf debian/32