[pkg-nvidia-devel] r557 - in /packages/nvidia-graphics-drivers/trunk: ./ debian/
rdonald at users.alioth.debian.org
rdonald at users.alioth.debian.org
Wed Jun 10 22:56:47 UTC 2009
Author: rdonald
Date: Wed Jun 10 22:56:45 2009
New Revision: 557
URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=557
Log:
prepare 185.18.14 and libvdpau
Added:
packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau-dev.dirs
packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau-ia32.dirs
packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau-ia32.links.in
packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau.dirs
packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau.docs.in
packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau.links.in
packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau.shlibs
packages/nvidia-graphics-drivers/trunk/patches.h
Modified:
packages/nvidia-graphics-drivers/trunk/debian/changelog
packages/nvidia-graphics-drivers/trunk/debian/control.in
packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-dev.dirs
packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.links.in
packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.links.in
packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.shlibs
packages/nvidia-graphics-drivers/trunk/debian/rules
packages/nvidia-graphics-drivers/trunk/debian/upstream_info
Modified: packages/nvidia-graphics-drivers/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/changelog?rev=557&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/changelog Wed Jun 10 22:56:45 2009
@@ -1,3 +1,14 @@
+nvidia-graphics-drivers (185.18.14-1) unstable; urgency=low
+
+ [ Randall Donald ]
+ * New upstream: (closes: #532568)
+
+ [ Harald Dunkel ]
+ * create empty patches.h
+ * new nvidia-libvdpau, nvidia-libvdpau-ia32, nvidia-libvdpau-dev: (closes: #519792)
+
+ -- Randall Donald <rdonald at debian.org> Wed, 10 Jun 2009 15:35:55 -0700
+
nvidia-graphics-drivers (180.44-2) unstable; urgency=low
* Fix the dh_clean issue that just showed up now for some reason
Modified: packages/nvidia-graphics-drivers/trunk/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/control.in?rev=557&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/control.in (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/control.in Wed Jun 10 22:56:45 2009
@@ -61,6 +61,37 @@
For more information on this source package visit NVIDIA's homepage
at http://www.nvidia.com/ .
+Package: nvidia-libvdpau-ia32
+Architecture: amd64
+Depends: ia32-libs, ${shlibs:Depends}
+Suggests: nvidia-settings, nvidia-kernel-source (>= #VERSION#)
+Replaces: nvidia-glx-ia32 (< 180.51)
+Conflicts: nvidia-glx-ia32 (< 180.51)
+Description: NVIDIA vdpau 32bit libraries
+ These libraries provide the Video Decode and Presentation API for Unix
+ (32 bit). 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
+Architecture: i386 amd64
+Depends: x11-common (>= 1:7.0.0), ${shlibs:Depends}
+Replaces: nvidia-glx (< 180.51)
+Conflicts: nvidia-glx (< 180.51)
+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-libvdpau-dev
+Architecture: i386 amd64
+Depends: nvidia-libvdpau (>= #VERSION#)
+Replaces: nvidia-glx-dev (< 180.51)
+Conflicts: nvidia-glx-dev (< 180.51), nvidia-libvdpau (>= #NEXTVER#)
+Description: NVIDIA vdpau development files
+ This package contains the NVIDIA vdpau development files.
+
Package: nvidia-kernel-source
Architecture: i386 amd64
Depends: debhelper (>> 4.0.0), make, sed (>> 3.0), dpatch (>= 2.0.0)
Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-dev.dirs
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-dev.dirs?rev=557&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-dev.dirs (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-dev.dirs Wed Jun 10 22:56:45 2009
@@ -1,4 +1,3 @@
usr/include/GL
usr/include/cuda
-usr/include/vdpau
usr/lib/nvidia
Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.links.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.links.in?rev=557&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.links.in (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.links.in Wed Jun 10 22:56:45 2009
@@ -3,4 +3,3 @@
emul/ia32-linux/usr/lib/libGLcore.so.#VERSION# emul/ia32-linux/usr/lib/libGLcore.so
emul/ia32-linux/usr/lib/libnvidia-tls.so.#VERSION# emul/ia32-linux/usr/lib/libnvidia-tls.so.1
emul/ia32-linux/usr/lib/libcuda.so.#VERSION# emul/ia32-linux/usr/lib/libcuda.so
-emul/ia32-linux/usr/lib/libvdpau.so.#VERSION# emul/ia32-linux/usr/lib/libvdpau.so
Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.links.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.links.in?rev=557&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.links.in (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.links.in Wed Jun 10 22:56:45 2009
@@ -6,5 +6,3 @@
usr/lib/libXvMCNVIDIA.so.#VERSION# usr/lib/libXvMCNVIDIA_dynamic.so.1
usr/lib/libcuda.so.#VERSION# usr/lib/libcuda.so
usr/lib/libcuda.so.#VERSION# usr/lib/libcuda.so.1
-usr/lib/libvdpau.so.#VERSION# usr/lib/libvdpau.so.1
-usr/lib/libvdpau.so.#VERSION# usr/lib/libvdpau.so
Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.shlibs
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.shlibs?rev=557&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.shlibs (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.shlibs Wed Jun 10 22:56:45 2009
@@ -2,4 +2,3 @@
libGLcore 1 xlibmesa-gl | libgl1
libXvMCNVIDIA_dynamic 1 nvidia-glx
libnvidia-tls 1 nvidia-glx
-libvdpau 1 nvidia-glx
Added: packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau-dev.dirs
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau-dev.dirs?rev=557&op=file
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau-dev.dirs (added)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau-dev.dirs Wed Jun 10 22:56:45 2009
@@ -1,0 +1,1 @@
+usr/include/vdpau
Added: packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau-ia32.dirs
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau-ia32.dirs?rev=557&op=file
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau-ia32.dirs (added)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau-ia32.dirs Wed Jun 10 22:56:45 2009
@@ -1,0 +1,1 @@
+emul/ia32-linux/usr/lib
Added: packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau-ia32.links.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau-ia32.links.in?rev=557&op=file
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau-ia32.links.in (added)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau-ia32.links.in Wed Jun 10 22:56:45 2009
@@ -1,0 +1,1 @@
+emul/ia32-linux/usr/lib/libvdpau.so.#VERSION# emul/ia32-linux/usr/lib/libvdpau.so
Added: packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau.dirs
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau.dirs?rev=557&op=file
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau.dirs (added)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau.dirs Wed Jun 10 22:56:45 2009
@@ -1,0 +1,1 @@
+usr/lib
Added: packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau.docs.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau.docs.in?rev=557&op=file
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau.docs.in (added)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau.docs.in Wed Jun 10 22:56:45 2009
@@ -1,0 +1,2 @@
+#DIRNAME#/usr/share/doc/NVIDIA_Changelog
+#DIRNAME#/usr/share/doc/README.txt
Added: packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau.links.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau.links.in?rev=557&op=file
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau.links.in (added)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau.links.in Wed Jun 10 22:56:45 2009
@@ -1,0 +1,2 @@
+usr/lib/libvdpau.so.#VERSION# usr/lib/libvdpau.so.1
+usr/lib/libvdpau.so.#VERSION# usr/lib/libvdpau.so
Added: packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau.shlibs
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau.shlibs?rev=557&op=file
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau.shlibs (added)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau.shlibs Wed Jun 10 22:56:45 2009
@@ -1,0 +1,1 @@
+libvdpau 1 nvidia-libvdpau
Modified: packages/nvidia-graphics-drivers/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/rules?rev=557&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/rules (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/rules Wed Jun 10 22:56:45 2009
@@ -29,7 +29,9 @@
AUTOGEN=debian/nvidia-kernel-source.README.Debian debian/control \
debian/copyright debian/nvidia-glx.links debian/nvidia-glx-dev.links \
+debian/nvidia-libvdpau.links debian/nvidia-libvdpau-ia32.links \
debian/nvidia-glx.override debian/nvidia-glx.docs debian/nvidia-glx.examples \
+debian/nvidia-libvdpau.docs \
debian/nvidia-glx.postrm debian/nvidia-glx.init \
debian/nvidia-glx-ia32.override debian/nvidia-glx-ia32.links \
debian/nvidia-kernel-source.docs debian/nvidia-glx-dev.preinst
@@ -120,6 +122,7 @@
# We have new conftest files that work purely with kbuild and doesn't require root
cp $(CURDIR)/Makefile $(CURDIR)/conftest.* $(CURDIR)/debian/temp/modules/nvidia-kernel/
+ cp $(CURDIR)/patches.h $(CURDIR)/debian/temp/modules/nvidia-kernel/
# Fix permissions
chmod 755 $(CURDIR)/debian/temp/modules/nvidia-kernel/debian/rules
@@ -172,9 +175,9 @@
$(CURDIR)/debian/nvidia-glx-dev/usr/include/cuda
install -m 0644 $(dirname)/usr/include/vdpau/vdpau.h \
- $(CURDIR)/debian/nvidia-glx-dev/usr/include/vdpau
+ $(CURDIR)/debian/nvidia-libvdpau-dev/usr/include/vdpau
install -m 0644 $(dirname)/usr/include/vdpau/vdpau_x11.h \
- $(CURDIR)/debian/nvidia-glx-dev/usr/include/vdpau
+ $(CURDIR)/debian/nvidia-libvdpau-dev/usr/include/vdpau
install -m 0644 $(dirname)/usr/include/GL/glx.h \
$(CURDIR)/debian/nvidia-glx-dev/usr/include/GL
@@ -188,11 +191,11 @@
install -m 0644 $(dirname)/usr/lib/libcuda.so.${version} \
$(CURDIR)/debian/nvidia-glx/usr/lib
install -m 0644 $(dirname)/usr/lib/libvdpau_nvidia.so.${version} \
- $(CURDIR)/debian/nvidia-glx/usr/lib
+ $(CURDIR)/debian/nvidia-libvdpau/usr/lib
install -m 0644 $(dirname)/usr/lib/libvdpau.so.${version} \
- $(CURDIR)/debian/nvidia-glx/usr/lib
+ $(CURDIR)/debian/nvidia-libvdpau/usr/lib
install -m 0644 $(dirname)/usr/lib/libvdpau_trace.so.${version} \
- $(CURDIR)/debian/nvidia-glx/usr/lib
+ $(CURDIR)/debian/nvidia-libvdpau/usr/lib
@@ -231,11 +234,11 @@
install $(dirname)/usr/lib32/libcuda.so.${version} \
$(CURDIR)/debian/nvidia-glx-ia32/emul/ia32-linux/usr/lib ; \
install $(dirname)/usr/lib32/libvdpau.so.${version} \
- $(CURDIR)/debian/nvidia-glx-ia32/emul/ia32-linux/usr/lib ; \
+ $(CURDIR)/debian/nvidia-libvdpau-ia32/emul/ia32-linux/usr/lib ; \
install $(dirname)/usr/lib32/libvdpau_nvidia.so.${version} \
- $(CURDIR)/debian/nvidia-glx-ia32/emul/ia32-linux/usr/lib ; \
+ $(CURDIR)/debian/nvidia-libvdpau-ia32/emul/ia32-linux/usr/lib ; \
install $(dirname)/usr/lib32/libvdpau_trace.so.${version} \
- $(CURDIR)/debian/nvidia-glx-ia32/emul/ia32-linux/usr/lib ; \
+ $(CURDIR)/debian/nvidia-libvdpau-ia32/emul/ia32-linux/usr/lib ; \
install $(dirname)/usr/lib32/libnvidia-tls.so.${version} \
$(CURDIR)/debian/nvidia-glx-ia32/emul/ia32-linux/usr/lib ; \
install $(dirname)/usr/lib32/tls/libnvidia-tls.so.${version} \
@@ -284,7 +287,7 @@
# dh_python
dh_makeshlibs
dh_installdeb
- dh_shlibdeps -Xia32 -Xtls -l$(CURDIR)/debian/nvidia-glx/usr/lib
+ dh_shlibdeps -Xia32 -Xtls -l$(CURDIR)/debian/nvidia-glx/usr/lib:$(CURDIR)/debian/nvidia-libvdpau/usr/lib
# quickhack! remove me :-/
perl -pi.bak -e 's/,\s+nvidia-glx-ia32//;' $(CURDIR)/debian/nvidia-glx.substvars
dh_gencontrol -s
Modified: packages/nvidia-graphics-drivers/trunk/debian/upstream_info
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/upstream_info?rev=557&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/upstream_info (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/upstream_info Wed Jun 10 22:56:45 2009
@@ -1,8 +1,8 @@
eval `dpkg-architecture`
#BASE_VERSION=1.0
-RELEASE=180.44
-NEXTVER=180.45
+RELEASE=185.18.14
+NEXTVER=185.18.15
if [ "$DEB_BUILD_ARCH" = "amd64" ] ; then
BASE_URL=ftp://download.nvidia.com/XFree86/Linux-x86_64/${RELEASE}
Added: packages/nvidia-graphics-drivers/trunk/patches.h
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/patches.h?rev=557&op=file
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/patches.h (added)
+++ packages/nvidia-graphics-drivers/trunk/patches.h Wed Jun 10 22:56:45 2009
@@ -1,0 +1,5 @@
+static struct {
+ const char *short_description;
+ const char *description;
+} __nv_patches[] = {
+{ NULL, NULL } };
More information about the Pkg-nvidia-devel
mailing list