Here's a patch to have a package solely dedicated to containing the NVIDIA
VDPAU driver. I'm ready to commit this via svn if you like.
This would allow for libvdpau to be uploaded as well.
--
Regards,
Andres
Index: debian/control
===================================================================
--- debian/control (revision 649)
+++ debian/control (working copy)
@@ -55,7 +55,7 @@
Architecture: i386 amd64
Depends: nvidia-glx (>= 190.42), ${misc:Depends}
Provides: libgl-dev
-Conflicts: nvidia-glx (>= 190.42), libgl-dev, mesa-common-dev
+Conflicts: nvidia-glx (>= 190.43), libgl-dev, mesa-common-dev
Replaces: libgl-dev
Description: NVIDIA binary Xorg driver development files
This package contains the NVIDIA binary Xorg driver
@@ -68,7 +68,8 @@
Section: non-free/libs
Architecture: amd64
Pre-Depends: libc6-i386 (>= 2.9-18)
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: nvidia-libvdpau1-driver-ia32 (>= 190.42),
+ ${shlibs:Depends}, ${misc:Depends}
Recommends: nvidia-kernel-190.42
Suggests: nvidia-kernel-source (>= 190.42)
Replaces: nvidia-glx-ia32 (< 180.51), nvidia-libvdpau-ia32
@@ -82,22 +83,52 @@
Package: nvidia-libvdpau1
Section: non-free/libs
Architecture: i386 amd64
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: nvidia-libvdpau1-driver (>= 190.42),
+ ${shlibs:Depends}, ${misc:Depends}
Recommends: nvidia-kernel-190.42
Suggests: nvidia-kernel-source (>= 190.42)
Replaces: nvidia-glx (< 180.51), nvidia-libvdpau
-Conflicts: nvidia-glx (< 180.51), nvidia-libvdpau
+Conflicts: nvidia-glx (< 180.51), nvidia-libvdpau, libvdpau1,
Description: NVIDIA vdpau libraries
These libraries provide the Video Decode and Presentation API for Unix.
They provide accelerated video playback (incl. H.264) for the supported
graphics cards. See /usr/share/doc/nvidia-libvdpau/README.txt.gz for
more information.
+Package: nvidia-libvdpau1-driver
+Section: non-free/libs
+Architecture: i386 amd64
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: nvidia-kernel-190.42
+Suggests: nvidia-kernel-source (>= 190.42)
+Replaces: nvidia-glx (< 180.51), nvidia-libvdpau
+Conflicts: nvidia-glx (< 180.51), nvidia-libvdpau
+Description: NVIDIA vdpau driver
+ These libraries provide the Video Decode and Presentation API for Unix.
+ They provide accelerated video playback (incl. H.264) for the supported
+ graphics cards. See /usr/share/doc/nvidia-libvdpau/README.txt.gz for
+ more information.
+
+Package: nvidia-libvdpau1-driver-ia32
+Section: non-free/libs
+Architecture: amd64
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: nvidia-kernel-190.42
+Suggests: nvidia-kernel-source (>= 190.42)
+Replaces: nvidia-glx (< 180.51), nvidia-libvdpau
+Conflicts: nvidia-glx (< 180.51), nvidia-libvdpau
+Description: NVIDIA vdpau 32-bit driver
+ These libraries provide the Video Decode and Presentation API for Unix.
+ They provide accelerated video playback (incl. H.264) for the supported
+ graphics cards. See /usr/share/doc/nvidia-libvdpau/README.txt.gz for
+ more information.
+
Package: nvidia-libvdpau-dev
Section: non-free/libdevel
Architecture: i386 amd64
Depends: nvidia-libvdpau1 (>= 190.42), ${misc:Depends}
-Conflicts: nvidia-glx-dev (< 180.51), nvidia-libvdpau1 (>= 190.42)
+Conflicts: nvidia-glx-dev (< 180.51), nvidia-libvdpau1 (>= 190.43),
+ libvdpau-dev,
Provides: nvidia-libvdpau1-dev
Replaces: nvidia-libvdpau, nvidia-glx-dev (< 180.51)
Description: NVIDIA vdpau development files
@@ -108,6 +139,7 @@
This package contains the VDPAU development files.
Package: nvidia-kernel-source
+Section: non-free/kernel
Architecture: i386 amd64
Depends: debhelper (>> 4.0.0), make, sed (>> 3.0), dpatch (>= 2.0.0), ${misc:Depends}
Recommends: nvidia-glx (>= 190.42), kernel-package (>= 8.082), module-assistant, devscripts
Index: debian/nvidia-libvdpau1-driver.lintian-overrides.i386.in
===================================================================
--- debian/nvidia-libvdpau1-driver.lintian-overrides.i386.in (revision 0)
+++ debian/nvidia-libvdpau1-driver.lintian-overrides.i386.in (revision 0)
@@ -0,0 +1,7 @@
+nvidia-libvdpau1-driver: shlib-without-PT_GNU_STACK-section usr/lib/libvdpau_nvidia.so.#VERSION#
+nvidia-libvdpau1-driver: shlib-with-non-pic-code usr/lib/libvdpau_nvidia.so.#VERSION#
+nvidia-libvdpau1-driver: binary-has-unneeded-section ./usr/lib/libvdpau_nvidia.so.#VERSION# .comment
+nvidia-libvdpau1-driver: binary-has-unneeded-section ./usr/lib/libvdpau_nvidia.so.#VERSION# .note
+
+# libvdpau.so.1 does dlopen("libvdpau_*.so")
+nvidia-libvdpau1-driver: non-dev-pkg-with-shlib-symlink usr/lib/libvdpau_nvidia.so.#VERSION# usr/lib/libvdpau_nvidia.so
Index: debian/nvidia-libvdpau1-driver.docs.in
===================================================================
--- debian/nvidia-libvdpau1-driver.docs.in (revision 0)
+++ debian/nvidia-libvdpau1-driver.docs.in (revision 0)
@@ -0,0 +1,2 @@
+#DIRNAME#/usr/share/doc/NVIDIA_Changelog
+#DIRNAME#/usr/share/doc/README.txt
Index: debian/control.in
===================================================================
--- debian/control.in (revision 649)
+++ debian/control.in (working copy)
@@ -68,7 +68,8 @@
Section: non-free/libs
Architecture: amd64
Pre-Depends: libc6-i386 (>= 2.9-18)
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: nvidia-libvdpau1-driver-ia32 (>= #VERSION#),
+ ${shlibs:Depends}, ${misc:Depends}
Recommends: nvidia-kernel-#VERSION#
Suggests: nvidia-kernel-source (>= #VERSION#)
Replaces: nvidia-glx-ia32 (< 180.51), nvidia-libvdpau-ia32
@@ -82,7 +83,8 @@
Package: nvidia-libvdpau1
Section: non-free/libs
Architecture: i386 amd64
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: nvidia-libvdpau1-driver (>= #VERSION#),
+ ${shlibs:Depends}, ${misc:Depends}
Recommends: nvidia-kernel-#VERSION#
Suggests: nvidia-kernel-source (>= #VERSION#)
Replaces: nvidia-glx (< 180.51), nvidia-libvdpau
@@ -93,6 +95,34 @@
graphics cards. See /usr/share/doc/nvidia-libvdpau/README.txt.gz for
more information.
+Package: nvidia-libvdpau1-driver
+Section: non-free/libs
+Architecture: i386 amd64
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: nvidia-kernel-#VERSION#
+Suggests: nvidia-kernel-source (>= #VERSION#)
+Replaces: nvidia-glx (< 180.51), nvidia-libvdpau
+Conflicts: nvidia-glx (< 180.51), nvidia-libvdpau
+Description: NVIDIA vdpau driver
+ These libraries provide the Video Decode and Presentation API for Unix.
+ They provide accelerated video playback (incl. H.264) for the supported
+ graphics cards. See /usr/share/doc/nvidia-libvdpau/README.txt.gz for
+ more information.
+
+Package: nvidia-libvdpau1-driver-ia32
+Section: non-free/libs
+Architecture: amd64
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: nvidia-kernel-#VERSION#
+Suggests: nvidia-kernel-source (>= #VERSION#)
+Replaces: nvidia-glx (< 180.51), nvidia-libvdpau
+Conflicts: nvidia-glx (< 180.51), nvidia-libvdpau
+Description: NVIDIA vdpau 32-bit driver
+ These libraries provide the Video Decode and Presentation API for Unix.
+ They provide accelerated video playback (incl. H.264) for the supported
+ graphics cards. See /usr/share/doc/nvidia-libvdpau/README.txt.gz for
+ more information.
+
Package: nvidia-libvdpau-dev
Section: non-free/libdevel
Architecture: i386 amd64
Index: debian/nvidia-libvdpau1.symbols.amd64
===================================================================
--- debian/nvidia-libvdpau1.symbols.amd64 (revision 649)
+++ debian/nvidia-libvdpau1.symbols.amd64 (working copy)
@@ -2,8 +2,6 @@
nv_vdpau_wrapper...@base 180.06
pnv_vdpau_wrapper...@base 180.06
vdp_device_create_...@base 180.06
-libvdpau_nvidia.so nvidia-libvdpau1 #MINVER#
- vdp_imp_device_create_...@base 180.06
libvdpau_trace.so nvidia-libvdpau1 #MINVER#
nv_vdpau_trace...@base 180.06
_z40_vdp_cap_init_planes_adapt_surface_videojpjs...@base 180.06
Index: debian/rules
===================================================================
--- debian/rules (revision 649)
+++ debian/rules (working copy)
@@ -43,8 +43,14 @@
debian/libcuda1-ia32.symbols \
debian/nvidia-libvdpau1.lintian-overrides.amd64 debian/nvidia-libvdpau1.lintian-overrides.i386 \
debian/nvidia-libvdpau1-ia32.lintian-overrides \
-debian/nvidia-libvdpau1-ia32.symbols
+debian/nvidia-libvdpau1-ia32.symbols \
+debian/nvidia-libvdpau1-driver.docs \
+debian/nvidia-libvdpau1-driver-ia32.links \
+debian/nvidia-libvdpau1-driver.links \
+debian/nvidia-libvdpau1-driver.lintian-overrides.amd64 \
+debian/nvidia-libvdpau1-driver.lintian-overrides.i386 \
+
AUTOGEN=$(AUTOCLEAN) debian/copyright
@@ -196,7 +202,7 @@
install -m 0644 $(dirname)/usr/lib/libGLcore.so.${version} \
$(CURDIR)/debian/nvidia-glx/usr/lib
install -m 0644 $(dirname)/usr/lib/libvdpau_nvidia.so.${version} \
- $(CURDIR)/debian/nvidia-libvdpau1/usr/lib
+ $(CURDIR)/debian/nvidia-libvdpau1-driver/usr/lib
install -m 0644 $(dirname)/usr/lib/libvdpau.so.${version} \
$(CURDIR)/debian/nvidia-libvdpau1/usr/lib
install -m 0644 $(dirname)/usr/lib/libvdpau_trace.so.${version} \
@@ -233,7 +239,7 @@
install $(dirname)/usr/lib32/libGL.so.${version} \
$(CURDIR)/debian/nvidia-glx-ia32/usr/lib32 ; \
install $(dirname)/usr/lib32/libvdpau.so.${version} \
- $(CURDIR)/debian/nvidia-libvdpau1-ia32/usr/lib32 ; \
+ $(CURDIR)/debian/nvidia-libvdpau1-driver-ia32/usr/lib32 ; \
install $(dirname)/usr/lib32/libvdpau_nvidia.so.${version} \
$(CURDIR)/debian/nvidia-libvdpau1-ia32/usr/lib32 ; \
install $(dirname)/usr/lib32/libvdpau_trace.so.${version} \
Index: debian/nvidia-libvdpau1-ia32.links.in
===================================================================
--- debian/nvidia-libvdpau1-ia32.links.in (revision 649)
+++ debian/nvidia-libvdpau1-ia32.links.in (working copy)
@@ -1,4 +1,3 @@
usr/lib32/libvdpau.so.#VERSION# usr/lib32/libvdpau.so.1
usr/lib32/libvdpau.so.1 usr/lib32/libvdpau.so
-usr/lib32/libvdpau_nvidia.so.#VERSION# usr/lib32/libvdpau_nvidia.so
usr/lib32/libvdpau_trace.so.#VERSION# usr/lib32/libvdpau_trace.so
Index: debian/nvidia-libvdpau1-driver-ia32.dirs
===================================================================
--- debian/nvidia-libvdpau1-driver-ia32.dirs (revision 0)
+++ debian/nvidia-libvdpau1-driver-ia32.dirs (revision 0)
@@ -0,0 +1 @@
+usr/lib32
Index: debian/nvidia-libvdpau1-driver.dirs
===================================================================
--- debian/nvidia-libvdpau1-driver.dirs (revision 0)
+++ debian/nvidia-libvdpau1-driver.dirs (revision 0)
@@ -0,0 +1 @@
+usr/lib
Index: debian/nvidia-libvdpau1.lintian-overrides.i386.in
===================================================================
--- debian/nvidia-libvdpau1.lintian-overrides.i386.in (revision 649)
+++ debian/nvidia-libvdpau1.lintian-overrides.i386.in (working copy)
@@ -1,12 +1,7 @@
nvidia-libvdpau1: shlib-without-PT_GNU_STACK-section usr/lib/libvdpau.so.#VERSION#
-nvidia-libvdpau1: shlib-without-PT_GNU_STACK-section usr/lib/libvdpau_nvidia.so.#VERSION#
nvidia-libvdpau1: shlib-without-PT_GNU_STACK-section usr/lib/libvdpau_trace.so.#VERSION#
-nvidia-libvdpau1: shlib-with-non-pic-code usr/lib/libvdpau_nvidia.so.#VERSION#
nvidia-libvdpau1: binary-has-unneeded-section ./usr/lib/libvdpau.so.#VERSION# .comment
-nvidia-libvdpau1: binary-has-unneeded-section ./usr/lib/libvdpau_nvidia.so.#VERSION# .comment
-nvidia-libvdpau1: binary-has-unneeded-section ./usr/lib/libvdpau_nvidia.so.#VERSION# .note
nvidia-libvdpau1: binary-has-unneeded-section ./usr/lib/libvdpau_trace.so.#VERSION# .comment
# libvdpau.so.1 does dlopen("libvdpau_*.so")
-nvidia-libvdpau1: non-dev-pkg-with-shlib-symlink usr/lib/libvdpau_nvidia.so.#VERSION# usr/lib/libvdpau_nvidia.so
nvidia-libvdpau1: non-dev-pkg-with-shlib-symlink usr/lib/libvdpau_trace.so.#VERSION# usr/lib/libvdpau_trace.so
Index: debian/nvidia-libvdpau1-driver.symbols.amd64
===================================================================
--- debian/nvidia-libvdpau1-driver.symbols.amd64 (revision 0)
+++ debian/nvidia-libvdpau1-driver.symbols.amd64 (revision 0)
@@ -0,0 +1,2 @@
+libvdpau_nvidia.so nvidia-libvdpau1-driver #MINVER#
+ vdp_imp_device_create_...@base 180.06
Index: debian/nvidia-libvdpau1-driver.lintian-overrides.amd64.in
===================================================================
--- debian/nvidia-libvdpau1-driver.lintian-overrides.amd64.in (revision 0)
+++ debian/nvidia-libvdpau1-driver.lintian-overrides.amd64.in (revision 0)
@@ -0,0 +1,4 @@
+nvidia-libvdpau1-driver: binary-has-unneeded-section ./usr/lib/libvdpau_nvidia.so.#VERSION# .comment
+
+# libvdpau.so.1 does dlopen("libvdpau_*.so")
+nvidia-libvdpau1-driver: non-dev-pkg-with-shlib-symlink usr/lib/libvdpau_nvidia.so.#VERSION# usr/lib/libvdpau_nvidia.so
Index: debian/nvidia-libvdpau1-driver.postrm
===================================================================
--- debian/nvidia-libvdpau1-driver.postrm (revision 0)
+++ debian/nvidia-libvdpau1-driver.postrm (revision 0)
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -e
+
+if [ "$1" = "remove" ]; then
+ ldconfig
+fi
+
+#DEBHELPER#
Index: debian/nvidia-libvdpau1.symbols.i386
===================================================================
--- debian/nvidia-libvdpau1.symbols.i386 (revision 649)
+++ debian/nvidia-libvdpau1.symbols.i386 (working copy)
@@ -2,10 +2,6 @@
nv_vdpau_wrapper...@base 180.06
pnv_vdpau_wrapper...@base 180.06
vdp_device_create_...@base 180.06
-libvdpau_nvidia.so nvidia-libvdpau1 #MINVER#
- mk...@base 180.06
- s...@base 180.06
- vdp_imp_device_create_...@base 180.06
libvdpau_trace.so nvidia-libvdpau1 #MINVER#
nv_vdpau_trace...@base 180.06
_z40_vdp_cap_init_planes_adapt_surface_videojpjs...@base 180.06
Index: debian/nvidia-libvdpau1.links.in
===================================================================
--- debian/nvidia-libvdpau1.links.in (revision 649)
+++ debian/nvidia-libvdpau1.links.in (working copy)
@@ -1,3 +1,2 @@
usr/lib/libvdpau.so.#VERSION# usr/lib/libvdpau.so.1
-usr/lib/libvdpau_nvidia.so.#VERSION# usr/lib/libvdpau_nvidia.so
usr/lib/libvdpau_trace.so.#VERSION# usr/lib/libvdpau_trace.so
Index: debian/changelog
===================================================================
--- debian/changelog (revision 649)
+++ debian/changelog (working copy)
@@ -1,3 +1,9 @@
+nvidia-graphics-drivers (190.42-3) unstable; urgency=low
+
+ * Provide a package for just the NVIDIA VDPAU driver.
+
+ -- Andres Mejia <mcita...@gmail.com> Fri, 20 Nov 2009 18:46:02 -0500
+
nvidia-graphics-drivers (190.42-2) unstable; urgency=low
* Fix nextver (closes: #556594, #556571)
Index: debian/nvidia-libvdpau1-driver.symbols.i386
===================================================================
--- debian/nvidia-libvdpau1-driver.symbols.i386 (revision 0)
+++ debian/nvidia-libvdpau1-driver.symbols.i386 (revision 0)
@@ -0,0 +1,4 @@
+libvdpau_nvidia.so nvidia-libvdpau1-driver #MINVER#
+ mk...@base 180.06
+ s...@base 180.06
+ vdp_imp_device_create_...@base 180.06
Index: debian/nvidia-libvdpau1-driver-ia32.links.in
===================================================================
--- debian/nvidia-libvdpau1-driver-ia32.links.in (revision 0)
+++ debian/nvidia-libvdpau1-driver-ia32.links.in (revision 0)
@@ -0,0 +1 @@
+usr/lib32/libvdpau_nvidia.so.#VERSION# usr/lib32/libvdpau_nvidia.so
Index: debian/nvidia-libvdpau1-driver.postinst
===================================================================
--- debian/nvidia-libvdpau1-driver.postinst (revision 0)
+++ debian/nvidia-libvdpau1-driver.postinst (revision 0)
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -e
+
+if [ "$1" = "configure" ]; then
+ ldconfig
+fi
+
+#DEBHELPER#
Index: debian/nvidia-libvdpau1.lintian-overrides.amd64.in
===================================================================
--- debian/nvidia-libvdpau1.lintian-overrides.amd64.in (revision 649)
+++ debian/nvidia-libvdpau1.lintian-overrides.amd64.in (working copy)
@@ -1,7 +1,5 @@
nvidia-libvdpau1: binary-has-unneeded-section ./usr/lib/libvdpau.so.#VERSION# .comment
-nvidia-libvdpau1: binary-has-unneeded-section ./usr/lib/libvdpau_nvidia.so.#VERSION# .comment
nvidia-libvdpau1: binary-has-unneeded-section ./usr/lib/libvdpau_trace.so.#VERSION# .comment
# libvdpau.so.1 does dlopen("libvdpau_*.so")
-nvidia-libvdpau1: non-dev-pkg-with-shlib-symlink usr/lib/libvdpau_nvidia.so.#VERSION# usr/lib/libvdpau_nvidia.so
nvidia-libvdpau1: non-dev-pkg-with-shlib-symlink usr/lib/libvdpau_trace.so.#VERSION# usr/lib/libvdpau_trace.so
Index: debian/nvidia-libvdpau1-driver.links.in
===================================================================
--- debian/nvidia-libvdpau1-driver.links.in (revision 0)
+++ debian/nvidia-libvdpau1-driver.links.in (revision 0)
@@ -0,0 +1 @@
+usr/lib/libvdpau_nvidia.so.#VERSION# usr/lib/libvdpau_nvidia.so
