From 7353df1996f0a43ec5dc6ea9d0ae4d75fd0a118f Mon Sep 17 00:00:00 2001 From: zador-blood-stained Date: Tue, 6 Sep 2016 18:33:37 +0300 Subject: [PATCH] Remove unneeded package libvdpau --- extras-buildpkgs/04-libvdpau.conf | 19 - extras-buildpkgs/90-libvdpau-sunxi.conf | 2 +- extras-buildpkgs/90-mpv.conf | 2 +- extras-buildpkgs/SOURCES | 1 - .../libvdpau/debian/README.source | 25 -- extras-buildpkgs/libvdpau/debian/bug-script | 28 -- extras-buildpkgs/libvdpau/debian/changelog | 338 ------------------ extras-buildpkgs/libvdpau/debian/clean | 1 - extras-buildpkgs/libvdpau/debian/compat | 1 - extras-buildpkgs/libvdpau/debian/control | 64 ---- extras-buildpkgs/libvdpau/debian/copyright | 65 ---- .../debian/libvdpau-dev.README.Debian | 9 - .../libvdpau/debian/libvdpau-dev.install | 3 - .../libvdpau/debian/libvdpau1.install | 3 - .../debian/patches/default-driver-sunxi.patch | 13 - .../patches/doxygen-no-timestamps.patch | 14 - .../debian/patches/link-with-libx11.patch | 28 -- .../libvdpau/debian/patches/series | 5 - ...fy-dlopen-path-length-error-handling.patch | 47 --- .../patches/vdpau-module-searchpath.patch | 43 --- extras-buildpkgs/libvdpau/debian/rules | 30 -- .../libvdpau/debian/source/format | 1 - 22 files changed, 2 insertions(+), 740 deletions(-) delete mode 100644 extras-buildpkgs/04-libvdpau.conf delete mode 100644 extras-buildpkgs/libvdpau/debian/README.source delete mode 100644 extras-buildpkgs/libvdpau/debian/bug-script delete mode 100644 extras-buildpkgs/libvdpau/debian/changelog delete mode 100644 extras-buildpkgs/libvdpau/debian/clean delete mode 100644 extras-buildpkgs/libvdpau/debian/compat delete mode 100644 extras-buildpkgs/libvdpau/debian/control delete mode 100644 extras-buildpkgs/libvdpau/debian/copyright delete mode 100644 extras-buildpkgs/libvdpau/debian/libvdpau-dev.README.Debian delete mode 100644 extras-buildpkgs/libvdpau/debian/libvdpau-dev.install delete mode 100644 extras-buildpkgs/libvdpau/debian/libvdpau1.install delete mode 100644 extras-buildpkgs/libvdpau/debian/patches/default-driver-sunxi.patch delete mode 100644 extras-buildpkgs/libvdpau/debian/patches/doxygen-no-timestamps.patch delete mode 100644 extras-buildpkgs/libvdpau/debian/patches/link-with-libx11.patch delete mode 100644 extras-buildpkgs/libvdpau/debian/patches/series delete mode 100644 extras-buildpkgs/libvdpau/debian/patches/simplify-dlopen-path-length-error-handling.patch delete mode 100644 extras-buildpkgs/libvdpau/debian/patches/vdpau-module-searchpath.patch delete mode 100644 extras-buildpkgs/libvdpau/debian/rules delete mode 100644 extras-buildpkgs/libvdpau/debian/source/format diff --git a/extras-buildpkgs/04-libvdpau.conf b/extras-buildpkgs/04-libvdpau.conf deleted file mode 100644 index 6308465d1c..0000000000 --- a/extras-buildpkgs/04-libvdpau.conf +++ /dev/null @@ -1,19 +0,0 @@ -# libvdpau -# needed for libvdpau-sunxi, FFmpeg and mpv -local package_name="libvdpau" -local package_repo="https://anongit.freedesktop.org/git/vdpau/libvdpau.git" -local package_ref="branch:master" -local package_builddeps="graphviz ghostscript doxygen-latex x11proto-dri2-dev pkg-config libxext-dev libx11-dev dh-autoreconf" -local package_install_chroot="libvdpau1 libvdpau-dev" -local package_install_target="libvdpau1" -local package_component="${release}-desktop" - -package_checkbuild() -{ - [[ $arch == armhf ]] -} - -package_checkinstall() -{ - [[ $LINUXFAMILY == sun*i && $BRANCH == default && $BUILD_DESKTOP == yes ]] -} diff --git a/extras-buildpkgs/90-libvdpau-sunxi.conf b/extras-buildpkgs/90-libvdpau-sunxi.conf index 653c33118f..86727c57a8 100644 --- a/extras-buildpkgs/90-libvdpau-sunxi.conf +++ b/extras-buildpkgs/90-libvdpau-sunxi.conf @@ -6,7 +6,7 @@ local package_name="libvdpau-sunxi" local package_repo="https://github.com/linux-sunxi/libvdpau-sunxi.git" local package_ref="branch:master" local package_upstream_version="0.5.1" -local package_builddeps="libpixman-1-dev pkg-config" +local package_builddeps="libpixman-1-dev pkg-config libvdpau-dev" local package_install_target="libvdpau-sunxi1" local package_component="${release}-desktop" diff --git a/extras-buildpkgs/90-mpv.conf b/extras-buildpkgs/90-mpv.conf index 8d48152d2a..c96cb4f408 100644 --- a/extras-buildpkgs/90-mpv.conf +++ b/extras-buildpkgs/90-mpv.conf @@ -5,7 +5,7 @@ local package_name="mpv" local package_repo="https://github.com/mpv-player/mpv.git" local package_ref="tag:v0.20.0" local package_upstream_version="0.20.0" -local package_builddeps="libasound2-dev libbluray-dev libcdio-paranoia-dev libdvdnav-dev libdvdread-dev libenca-dev libegl1-mesa-dev libgl1-mesa-dev libguess-dev libjpeg-dev liblcms2-dev liblua5.2-dev libpulse-dev librubberband-dev libsdl2-dev libsndio-dev libva-dev libx11-dev libxinerama-dev libxkbcommon-dev libxrandr-dev libxss-dev pkg-config python python-docutils" +local package_builddeps="libasound2-dev libbluray-dev libcdio-paranoia-dev libdvdnav-dev libdvdread-dev libenca-dev libegl1-mesa-dev libgl1-mesa-dev libguess-dev libjpeg-dev liblcms2-dev liblua5.2-dev libpulse-dev librubberband-dev libsdl2-dev libsndio-dev libva-dev libvdpau-dev libx11-dev libxinerama-dev libxkbcommon-dev libxrandr-dev libxss-dev pkg-config python python-docutils" local package_install_target="libmpv1 mpv" local package_component="${release}-desktop" diff --git a/extras-buildpkgs/SOURCES b/extras-buildpkgs/SOURCES index 22c7e10722..d85065a7b2 100644 --- a/extras-buildpkgs/SOURCES +++ b/extras-buildpkgs/SOURCES @@ -6,7 +6,6 @@ libcedrus: http://ppa.launchpad.net/longsleep/ubuntu-pine64-flavour-makers/ubunt libcsptr-dev: http://ppa.launchpad.net/snaipewastaken/ppa/ubuntu/pool/main/libc/libcsptr-dev/ libdri2-1: http://packages.ubuntu.com/xenial/libdri2-1 / http://archive.ubuntu.com/ubuntu/pool/universe/libd/libdri2/ libump: https://github.com/rellla/libump (http://ppa.launchpad.net/longsleep/ubuntu-pine64-flavour-makers/ubuntu/pool/main/libu/libump/ can be used too) -libvdpau: http://packages.ubuntu.com/xenial/libvdpau1 / http://archive.ubuntu.com/ubuntu/pool/main/libv/libvdpau/ libvdpau-sunxi: http://ppa.launchpad.net/longsleep/ubuntu-pine64-flavour-makers/ubuntu/pool/main/libv/libvdpau-sunxi/ mpv: http://packages.ubuntu.com/xenial/mpv / http://archive.ubuntu.com/ubuntu/pool/universe/m/mpv/ sunxi-tools: http://packages.ubuntu.com/ru/xenial/sunxi-tools / http://archive.ubuntu.com/ubuntu/pool/universe/s/sunxi-tools/ diff --git a/extras-buildpkgs/libvdpau/debian/README.source b/extras-buildpkgs/libvdpau/debian/README.source deleted file mode 100644 index 4887acee3d..0000000000 --- a/extras-buildpkgs/libvdpau/debian/README.source +++ /dev/null @@ -1,25 +0,0 @@ -The upstream repository: - - git remote add libvdpau git://people.freedesktop.org/~aplattner/libvdpau - git fetch --all --prune - -Importing a new upstream tarball: - -The tarball contains all the autotools generated files that we don't need -in the master branch thanks to dh_autoreconf. - - VER=0.7 - git-import-orig --upstream-vcs-tag libvdpau-$VER libvdpau-$VER.tar.bz2 - -Merge the new upstream release: - - git checkout upstream - git merge --ff-only libvdpau-$VER^{commit} - git tag -m "Upstream version $VER" upstream/$VER libvdpau-$VER^{commit} - - git checkout master - git merge upstream/$VER - -Pushing to origin: - - git push origin libvdpau-$VER tarball pristine-tar tarball/$VER upstream upstream/$VER master diff --git a/extras-buildpkgs/libvdpau/debian/bug-script b/extras-buildpkgs/libvdpau/debian/bug-script deleted file mode 100644 index b002ffcb1c..0000000000 --- a/extras-buildpkgs/libvdpau/debian/bug-script +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh - -exec >&3 - -if [ -z "$VDPAU_DRIVER" ]; then - echo "VDPAU_DRIVER is not set" -else - echo "VDPAU_DRIVER is set to '$VDPAU_DRIVER'" -fi -if [ -z "$VDPAU_DRIVER_PATH" ]; then - echo "VDPAU_DRIVER_PATH is not set" -else - echo "VDPAU_DRIVER_PATH is set to '$VDPAU_DRIVER_PATH'" -fi -echo - -if [ -x /usr/bin/vdpauinfo ]; then - echo "vdpauinfo:" - /usr/bin/vdpauinfo 2>&1 -else - echo "vdpauinfo is not installed" -fi -echo - -echo "available drivers:" -ls -la /usr/lib*/vdpau/libvdpau_* /usr/lib/*/vdpau/libvdpau_* "$VDPAU_DRIVER_PATH"/libvdpau_* 2>/dev/null - -exit 0 diff --git a/extras-buildpkgs/libvdpau/debian/changelog b/extras-buildpkgs/libvdpau/debian/changelog deleted file mode 100644 index a9f16e1213..0000000000 --- a/extras-buildpkgs/libvdpau/debian/changelog +++ /dev/null @@ -1,338 +0,0 @@ -libvdpau (1.1.1-3ubuntu1) xenial; urgency=medium - - * control: Demote libvdpau-va-gl1 from vdpau-driver-all Depends to - Suggests. - - -- Timo Aaltonen Fri, 19 Feb 2016 14:39:25 +0200 - -libvdpau (1.1.1-3) unstable; urgency=medium - - [ Luca Boccassi ] - * Cherry-pick patch for DRI_PRIME crash. (Closes: #802625) - * Upload to unstable. - - -- Andreas Beckmann Thu, 29 Oct 2015 00:47:28 +0100 - -libvdpau (1.1.1-2) experimental; urgency=medium - - * Add vdpau-driver-all driver metapackage. (Closes: #800657) - * libvdpau1: Recommends: vdpau-driver-all | vdpau-driver. - * Upload to experimental. - - -- Andreas Beckmann Thu, 08 Oct 2015 10:15:00 +0200 - -libvdpau (1.1.1-1) unstable; urgency=medium - - [ Andreas Beckmann ] - * simplify d/rules - - [ Luca Boccassi ] - * New upstream release. - - Use secure_getenv(3) to improve security - (CVE-2015-5198, CVE-2015-5199, CVE-2015-5200). Closes: #797895. - * Do not check for pdftex, removed upstream - * Add myself to Uploaders - * Refresh dlopen-path patch, upstream changes - * Refresh patch module-searchpath, upstream changes - - -- Luca Boccassi Thu, 03 Sep 2015 23:31:59 +0100 - -libvdpau (1.1-1) unstable; urgency=medium - - * New upstream release. - * Remove Jean-Yves Avenard from Uploaders. Inactive. - * Update Vcs-Browser URL. - * Import upstream signing key - pub 1024D/09BA9635 2005-09-28 Aaron Plattner - sub 2048R/8B1DA2D0 2007-08-23 [expires: 2011-08-22] - sub 2048R/ED9D97C2 2007-08-23 [expires: 2011-08-22] - sub 2048R/DDF35B94 2011-08-16 [expires: 2015-08-15] - sub 2048R/7FE346B2 2011-08-16 [expires: 2015-08-15] - sub 2048g/76DE8572 2005-09-28 [expires: 2006-09-28] - sub 4096R/01A68861 2012-08-24 [expires: 2016-08-23] - sub 4096R/E5083582 2012-08-24 [expires: 2016-08-23] - * Update watch file, verify signature. - * Cleanup doc/doxygen_sqlite3.db to build twice in a row. - * doxygen-no-timestamps.patch: New, disable doxygen timestamping for - reproducible builds. - * Upload to unstable. - - -- Andreas Beckmann Mon, 27 Apr 2015 16:52:14 +0200 - -libvdpau (0.9-1) experimental; urgency=medium - - * New upstream release. - * Drop patches cherry-picked from upstream git. - * hardening.patch: Remove, fixed upstream. - * link-with-libx11.patch: Refresh. - * Upload to experimental. - - -- Andreas Beckmann Sat, 24 Jan 2015 18:07:15 +0100 - -libvdpau (0.8-3) unstable; urgency=medium - - * Add a bug-script to collect some driver information. - * libvdpau-dev.README.Debian: Document required Depends/Enhances/Provides - for packages containing VDPAU drivers. - - -- Andreas Beckmann Sun, 19 Oct 2014 22:15:30 +0200 - -libvdpau (0.8-2) unstable; urgency=medium - - * Bump Standards-Version to 3.9.6. No changes needed. - * hardening.patch: Build the tests with hardening enabled, too. - - -- Andreas Beckmann Fri, 17 Oct 2014 22:13:27 +0200 - -libvdpau (0.8-1) unstable; urgency=medium - - [ Vincent Cheng ] - * New upstream release. - - Remove 0001-Fix-incorrect-VdpPictureInfo-typedef.patch, applied upstream. - * Add myself to Uploaders. - - [ Andreas Beckmann ] - * Refresh vdpau driver searchpath patches. - * Cherry-pick upstream commits: - - [9d27eb0] 0001-trace-properly-annotate-private-functions-as-static.patch - - [6cb973e] 0002-vdpau-do-not-export-_vdp_DRI2-functions.patch - * libvdpau1.symbols: Remove private symbols. - * libvdpau-doc: Do not ship useless autogenerated doxygen files: *.map. - * libvdpau1-dbg: New package for debug symbols. (Closes: #763142) - - -- Andreas Beckmann Mon, 29 Sep 2014 13:41:39 +0200 - -libvdpau (0.7-2) unstable; urgency=medium - - * Remove Andres Mejia from Uploaders. Thanks for your work on libvdpau! - (Closes: #743563) - * Bump Standards-Version to 3.9.5. No changes needed. - * Cherry-pick upstream commit: - - [186195b] 0001-Fix-incorrect-VdpPictureInfo-typedef.patch - - -- Andreas Beckmann Mon, 21 Apr 2014 23:08:42 +0200 - -libvdpau (0.7-1) unstable; urgency=low - - * New upstream release. (LP: #1313614) - * Add README.source describing the import of a new upstream release. - - -- Andreas Beckmann Thu, 15 Aug 2013 00:59:45 +0200 - -libvdpau (0.6-2) unstable; urgency=low - - * Drop Conflicts/Replaces against obsolete squeeze packages. - * libvdpau1: Drop postinst, ancient cleanup code already in squeeze. - * Bump Standards-Version to 3.9.4. No changes needed. - * Use canonical Vcs-* URLs. - * Upload to unstable. - - -- Andreas Beckmann Mon, 06 May 2013 00:42:22 +0200 - -libvdpau (0.6-1) experimental; urgency=low - - * New upstream release. - * Drop patches cherry-picked from upstream git: 0001, 0002, 0003. - - -- Andreas Beckmann Tue, 12 Feb 2013 20:27:10 +0100 - -libvdpau (0.5-1) experimental; urgency=low - - * New upstream release. (Closes: #689586) - * Drop patches that are now applied upstream: libvdpau_flashplayer.patch, - track_dynamic_library_handles_and_free_them_on_exit.patch. - * Update my email address and remove DMUA. - * Cherry-pick upstream commits: - - 0001-Make-use-of-dri2proto_CFLAGS-when-building.patch - - 0002-Change-mailing-list-to-vdpau-lists.freedesktop.org.patch - - 0003-Fix-leaked-extension-info-on-library-unload.patch (Closes: #592204) - * libvdpau1.symbols: Add _vdp_DRI2RemoveExtension, added in above patches. - * Change Upstream-Contact to vdpau@lists.freedesktop.org. - * Upload to experimental. - - -- Andreas Beckmann Fri, 25 Jan 2013 21:59:57 +0100 - -libvdpau (0.4.1-8) unstable; urgency=low - - * Update my email address and remove DMUA. - * Cherry-pick upstream commit 3b43955 from 0.5+git: - 0003-Fix-leaked-extension-info-on-library-unload.patch (Closes: #592204) - * libvdpau1.symbols: Add _vdp_DRI2RemoveExtension, added in above patch. - * Change Upstream-Contact to vdpau@lists.freedesktop.org. - - -- Andreas Beckmann Sun, 27 Jan 2013 01:49:23 +0100 - -libvdpau (0.4.1-7) unstable; urgency=low - - * The last (and only) reverse dependency of lib32vdpau1 was the non-free - nvidia-vdpau-driver-ia32 which is now an empty transitional package. - * d/{control,lib32vdpau1.*}: Drop lib32vdpau1 package. (Closes: #679524) - * d/{control,rules}: Remove support for building the extra 32-bit biarch - library on amd64. - * libvdpau1: Add Replaces/Conflicts: lib32vdpau1 to ensure the old biarch - package gets removed properly. - * Update lintian overrides for duplicate files generated by doxygen. - - -- Andreas Beckmann Thu, 16 Aug 2012 02:05:59 +0200 - -libvdpau (0.4.1-6) unstable; urgency=low - - [ Maurizio Avogadro ] - * Apply the wise patch supplied by Stephen Warren to fix Adobe Flash - insanities. (Closes: #668512) - - [ Andreas Beckmann ] - * debian/copyright: Switch to copyright-format 1.0 and update years. - - -- Andreas Beckmann Tue, 22 May 2012 23:13:00 +0200 - -libvdpau (0.4.1-5) unstable; urgency=low - - * Use debhelper 9 to use hardened compiler flags. - - -- Andres Mejia Mon, 19 Mar 2012 10:21:23 -0400 - -libvdpau (0.4.1-4) unstable; urgency=low - - * Allow dev package to be multiarch installable. - * Bump to Standards-Version 3.9.3. - - -- Andres Mejia Fri, 16 Mar 2012 19:01:46 -0400 - -libvdpau (0.4.1-3) unstable; urgency=low - - [ Andres Mejia ] - * Update to my @debian.org email. - - [ Andreas Beckmann ] - * Build for multiarch. Patch from Daniel Schaal. (Closes: #631174) - * Search the vdpau module in multiple directories, starting with - ${ORIGIN}/vdpau and fall back to /usr/lib/vdpau in the end. - * Add Conflicts to prevent mixing biarch and multiarch packages (i.e. - lib32vdpau1:amd64 and libvdpau1:i386). - * Use unversioned Conflicts/Replaces on nvidia-libvdpau* to remove the old - transitional packages. - * Use binary:Version for relationship between libvdpau1 and libvdpau-dev. - * Switch Build-Depends-Indep to doxygen-latex, graphviz, ghostscript. - (Closes: #616264) - * track_dynamic_library_handles_and_free_them_on_exit.patch: Pick upstream - commit 4262513e: "vdpau_wrapper.c: Track dynamic library handles and free - them on exit using __attribute__((destructor))". - * Switch to debhelper 8. - * Switch to dh-autoreconf: add to B-D, use dh --with autoreconf and drop - autoreconf_-fi.patch. - * Remove debian/libvdpau-get-orig-source, repackaging is no longer necessary - with dh-autoreconf. - * Build with LDFLAGS="-Wl,--as-needed". - * Add myself to Uploaders. - - -- Andreas Beckmann Thu, 08 Sep 2011 10:32:24 +0200 - -libvdpau (0.4.1-2) unstable; urgency=high - - * Provide an upload to unstable to fix build failure. (Closes: #603220) - * Set urgency to high so it enters testing ASAP. - - -- Andres Mejia Fri, 12 Nov 2010 17:14:33 -0500 - -libvdpau (0.4.1-1) experimental; urgency=low - - * New upstream release. - * Use script to generate latest source. - * Add get-orig-source rule that runs libvdpau-get-orig-source script. - * Update Vcs-* entries for new location for packaging. - * Refresh patches. - * Change Build-Depends of ia32-libs to ia32-libs-dev. - * Bump Standards-Version to 3.9.1. No other changes needed. - * Use proper Depends versioning for a binary-all package depending on - a binary-any package. - - -- Andres Mejia Mon, 20 Sep 2010 13:52:11 -0400 - -libvdpau (0.4-5) unstable; urgency=low - - [ Russ Allbery ] - * Also version the Conflicts and Replaces for libvdpau-dev so that the - nvidia-libvdpau-dev transitional package will work properly. - * Add an explicit license for the Debian packaging files. - - [ Andreas Beckmann ] - * Add Depends: libx11-dev to libvdpau-dev because vdpau_x11.h includes - X11/Xlib.h. - * Tighten the dependency of libvdpau-dev on libvdpau1 to only allow the - matching binary:Version or binary NMUs thereof. - * Remove dh_make boilerplate code and comments from maintainer scripts. - * Unify symbols control files. - - -- Russ Allbery Sat, 12 Jun 2010 18:33:51 -0700 - -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) - * lib32vdpau1: take over postinst script from nvidia-libvdpau-ia32. - * Add lib{,32}vdpau1.symbols. - * libvdpau-dev: do not ship /usr/lib/vdpau/libvdpau_trace.so, won't be used. - * libvdpau1: cleanup /usr/lib/libvdpau_trace.so left over by some old - versions of the nvidia-libvdpau* packages. - - [ Russ Allbery ] - * Link libvdpau with libX11 since it uses symbols from that library. - * Add myself to Uploaders. - * Convert debian/copyright to the DEP-5 format and add the slightly - different license used for two of the source files. - * Version the Conflicts and Replaces against nvidia-libvdpau1*. - * Also remove /usr/lib/libvdpau_nvidia.so, left by some old versions of - the nvidia-libvdpau* packages. - - -- Russ Allbery Sat, 22 May 2010 19:11:37 -0700 - -libvdpau (0.4-3) unstable; urgency=low - - * Enable dri2 feature. Requires x11proto-dri2-dev (>= 2.2) and libxext-dev. - - -- Andres Mejia Thu, 25 Feb 2010 20:08:17 -0500 - -libvdpau (0.4-2) unstable; urgency=low - - * Add dependencies for documentation to Build-Depends-Indep. - * Define a function in debian/rules that can be used to enable or disable - building of the documentation depending on if the necessary dependencies - are installed. - - -- Andres Mejia Wed, 10 Feb 2010 19:53:29 -0500 - -libvdpau (0.4-1) unstable; urgency=low - - * New upstream release. - * Bump Standards-Version to 3.8.4. - * Fix libvdpau-dev dependency on libvdpau1. - * Perform autoreconf -fi. - * Explicitly enable documentation. - * Use texlive-binaries instead of texlive-base-bin for pdftex build - dependency. - * Fix build error install texlive-binaries, which depends on tex-common. Just - Build-Depend on texlive-base for now, until bug #567714 is resolved. - - -- Andres Mejia Wed, 10 Feb 2010 19:20:49 -0500 - -libvdpau (0.3-2) unstable; urgency=low - - [ Andres Mejia ] - * Have libvdpau1 suggest a vdpau driver package to install, rather than - depend on one. - (Closes: #558434) - (Closes: #558464) - * Remove libvdpau-driver package. - * Move libvdpau to main. - - -- Randall Donald Wed, 02 Dec 2009 14:22:14 -0800 - -libvdpau (0.3-1) unstable; urgency=low - - [ Andres Mejia ] - * Initial release. - (Closes: #549626) - - -- Randall Donald Wed, 25 Nov 2009 10:30:10 -0800 diff --git a/extras-buildpkgs/libvdpau/debian/clean b/extras-buildpkgs/libvdpau/debian/clean deleted file mode 100644 index 683c12fe04..0000000000 --- a/extras-buildpkgs/libvdpau/debian/clean +++ /dev/null @@ -1 +0,0 @@ -doc/doxygen_sqlite3.db diff --git a/extras-buildpkgs/libvdpau/debian/compat b/extras-buildpkgs/libvdpau/debian/compat deleted file mode 100644 index ec635144f6..0000000000 --- a/extras-buildpkgs/libvdpau/debian/compat +++ /dev/null @@ -1 +0,0 @@ -9 diff --git a/extras-buildpkgs/libvdpau/debian/control b/extras-buildpkgs/libvdpau/debian/control deleted file mode 100644 index f86073f803..0000000000 --- a/extras-buildpkgs/libvdpau/debian/control +++ /dev/null @@ -1,64 +0,0 @@ -Source: libvdpau -Section: libs -Priority: optional -Maintainer: Debian NVIDIA Maintainers -Uploaders: - Russ Allbery , - Andreas Beckmann , - Vincent Cheng , - Luca Boccassi -Build-Depends: - debhelper (>= 9), - dh-autoreconf, - pkg-config, - libx11-dev, - x11proto-dri2-dev (>= 2.2), - libxext-dev, -Build-Depends-Indep: - doxygen-latex, - graphviz, - ghostscript, -Standards-Version: 3.9.6 -Homepage: http://cgit.freedesktop.org/~aplattner/libvdpau -Vcs-Git: git://anonscm.debian.org/pkg-nvidia/libvdpau.git -Vcs-Browser: https://anonscm.debian.org/cgit/pkg-nvidia/libvdpau.git - -Package: libvdpau-dev -Multi-Arch: same -Architecture: any -Section: libdevel -Depends: - libvdpau1 (= ${binary:Version}), - libx11-dev, - ${misc:Depends} -Suggests: libvdpau-doc -Description: Video Decode and Presentation API for Unix (development files) - 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 files necessary for development with VDPAU. - -Package: libvdpau1 -Architecture: any -Multi-Arch: same -Pre-Depends: ${misc:Pre-Depends} -Depends: ${shlibs:Depends}, ${misc:Depends} -Replaces: - lib32vdpau1, -Conflicts: - lib32vdpau1, -Recommends: - vdpau-driver, -Description: Video Decode and Presentation API for Unix (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 libraries. diff --git a/extras-buildpkgs/libvdpau/debian/copyright b/extras-buildpkgs/libvdpau/debian/copyright deleted file mode 100644 index 96e267f773..0000000000 --- a/extras-buildpkgs/libvdpau/debian/copyright +++ /dev/null @@ -1,65 +0,0 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: VDPAU wrapper and trace libraries -Upstream-Contact: -Source: http://people.freedesktop.org/~aplattner/vdpau/ - -Files: * -Copyright: © 2008-2010 NVIDIA Corporation - © 2008 Red Hat, Inc. -License: Expat - -Files: debian/* -Copyright: 2009-2012 Andres Mejia - © 2010-2015 Andreas Beckmann - 2010 Russ Allbery -License: Expat - -Files: src/mesa_dri2.c src/mesa_dri2.h -Copyright: © 2007,2008 Red Hat, Inc. - © 2010 NVIDIA Corporation -License: other - Permission is hereby granted, free of charge, to any person obtaining a - copy of this software and associated documentation files (the "Soft- - ware"), to deal in the Software without restriction, including without - limitation the rights to use, copy, modify, merge, publish, distribute, - and/or sell copies of the Software, and to permit persons to whom the - Software is furnished to do so, provided that the above copyright - notice(s) and this permission notice appear in all copies of the Soft- - ware and that both the above copyright notice(s) and this permission - notice appear in supporting documentation. - . - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL- - ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY - RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN - THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSE- - QUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, - DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFOR- - MANCE OF THIS SOFTWARE. - . - Except as contained in this notice, the name of a copyright holder shall - not be used in advertising or otherwise to promote the sale, use or - other dealings in this Software without prior written authorization of - the copyright holder. - -License: Expat - Permission is hereby granted, free of charge, to any person obtaining a - copy of this software and associated documentation files (the - "Software"), to deal in the Software without restriction, including - without limitation the rights to use, copy, modify, merge, publish, - distribute, sublicense, and/or sell copies of the Software, and to permit - persons to whom the Software is furnished to do so, subject to the - following conditions: - . - The above copyright notice and this permission notice (including the next - paragraph) shall be included in all copies or substantial portions of the - Software. - . - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT - OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR - THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/extras-buildpkgs/libvdpau/debian/libvdpau-dev.README.Debian b/extras-buildpkgs/libvdpau/debian/libvdpau-dev.README.Debian deleted file mode 100644 index 3a0452780c..0000000000 --- a/extras-buildpkgs/libvdpau/debian/libvdpau-dev.README.Debian +++ /dev/null @@ -1,9 +0,0 @@ -Packaging a VDPAU driver -======================== - -If you package a VDPAU driver, i.e. some library that is to be loaded by -libvdpau.so.1, your package must include the following three relationships: - - Depends: libvdpau1 (may be versioned) - Enhances: libvdpau1 - Provides: vdpau-driver diff --git a/extras-buildpkgs/libvdpau/debian/libvdpau-dev.install b/extras-buildpkgs/libvdpau/debian/libvdpau-dev.install deleted file mode 100644 index f02a5bae68..0000000000 --- a/extras-buildpkgs/libvdpau/debian/libvdpau-dev.install +++ /dev/null @@ -1,3 +0,0 @@ -usr/lib/*/libvdpau.so -usr/lib/*/pkgconfig -usr/include diff --git a/extras-buildpkgs/libvdpau/debian/libvdpau1.install b/extras-buildpkgs/libvdpau/debian/libvdpau1.install deleted file mode 100644 index a9352c3a81..0000000000 --- a/extras-buildpkgs/libvdpau/debian/libvdpau1.install +++ /dev/null @@ -1,3 +0,0 @@ -etc/vdpau_wrapper.cfg -usr/lib/*/libvdpau.so.* -usr/lib/*/vdpau/libvdpau_trace.so.* diff --git a/extras-buildpkgs/libvdpau/debian/patches/default-driver-sunxi.patch b/extras-buildpkgs/libvdpau/debian/patches/default-driver-sunxi.patch deleted file mode 100644 index aaa0a8e066..0000000000 --- a/extras-buildpkgs/libvdpau/debian/patches/default-driver-sunxi.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/vdpau_wrapper.c b/src/vdpau_wrapper.c -index 722576e..66969f8 100644 ---- a/src/vdpau_wrapper.c -+++ b/src/vdpau_wrapper.c -@@ -137,7 +137,7 @@ static VdpStatus _vdp_open_driver( - _vdp_get_driver_name_from_dri2(display, screen); - } - if (!vdpau_driver) { -- vdpau_driver = "nvidia"; -+ vdpau_driver = "sunxi"; - } - - _vdp_driver_dll = NULL; diff --git a/extras-buildpkgs/libvdpau/debian/patches/doxygen-no-timestamps.patch b/extras-buildpkgs/libvdpau/debian/patches/doxygen-no-timestamps.patch deleted file mode 100644 index a5cc904c73..0000000000 --- a/extras-buildpkgs/libvdpau/debian/patches/doxygen-no-timestamps.patch +++ /dev/null @@ -1,14 +0,0 @@ -Author: Andreas Beckmann -Description: disable timestamps in documentation for reproducible builds - ---- a/doc/Doxyfile -+++ b/doc/Doxyfile -@@ -10,6 +10,8 @@ - # TAG += value [value, ...] - # Values that contain spaces should be placed between quotes (" ") - -+HTML_TIMESTAMP = NO -+ - #--------------------------------------------------------------------------- - # Project related configuration options - #--------------------------------------------------------------------------- diff --git a/extras-buildpkgs/libvdpau/debian/patches/link-with-libx11.patch b/extras-buildpkgs/libvdpau/debian/patches/link-with-libx11.patch deleted file mode 100644 index 2ecd10f89a..0000000000 --- a/extras-buildpkgs/libvdpau/debian/patches/link-with-libx11.patch +++ /dev/null @@ -1,28 +0,0 @@ -Subject: Link libvdpao with libX11 since it uses symbols from it -Author: Russ Allbery -Forwarded: no - -libvdpau uses the symbols: - - _XEatData - _XReply - _XFlush - _XReadPad - XFree - -which are provided by libX11, but wasn't linking with it directly, resulting -in warnings during the package build (and possibly errors later with better -linkers). - ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -22,7 +22,8 @@ endif - libvdpau_la_LIBADD = \ - $(DLOPEN_LIBS) \ - $(PTHREAD_LIBS) \ -- $(XEXT_LIBS) -+ $(XEXT_LIBS) \ -+ $(X11_LIBS) - - libvdpau_la_LDFLAGS = -version-info 1:0:0 -no-undefined - diff --git a/extras-buildpkgs/libvdpau/debian/patches/series b/extras-buildpkgs/libvdpau/debian/patches/series deleted file mode 100644 index 884a10bbbb..0000000000 --- a/extras-buildpkgs/libvdpau/debian/patches/series +++ /dev/null @@ -1,5 +0,0 @@ -link-with-libx11.patch -simplify-dlopen-path-length-error-handling.patch -vdpau-module-searchpath.patch -doxygen-no-timestamps.patch -default-driver-sunxi.patch diff --git a/extras-buildpkgs/libvdpau/debian/patches/simplify-dlopen-path-length-error-handling.patch b/extras-buildpkgs/libvdpau/debian/patches/simplify-dlopen-path-length-error-handling.patch deleted file mode 100644 index 964ccaddda..0000000000 --- a/extras-buildpkgs/libvdpau/debian/patches/simplify-dlopen-path-length-error-handling.patch +++ /dev/null @@ -1,47 +0,0 @@ -From: Andreas Beckmann -Subject: simplify path overflow error handling - "path too long" is not a fatal error, there may be other search paths - that don't overflow, so try them as well - ---- a/src/vdpau_wrapper.c -+++ b/src/vdpau_wrapper.c -@@ -132,6 +132,8 @@ static VdpStatus _vdp_open_driver( - vdpau_driver = "nvidia"; - } - -+ _vdp_driver_dll = NULL; -+ - /* Don't allow setuid apps to use VDPAU_DRIVER_PATH */ - vdpau_driver_path = secure_getenv("VDPAU_DRIVER_PATH"); - if (vdpau_driver_path && -@@ -141,12 +143,6 @@ static VdpStatus _vdp_open_driver( - DRIVER_LIB_FORMAT, VDPAU_MODULEDIR, vdpau_driver) >= - sizeof(vdpau_driver_lib)) { - fprintf(stderr, "Failed to construct driver path: path too long\n"); -- if (vdpau_driver_dri2) { -- XFree(vdpau_driver_dri2); -- vdpau_driver_dri2 = NULL; -- } -- _VDP_ERROR_BREAKPOINT(); -- return VDP_STATUS_NO_IMPLEMENTATION; - } - else { - _vdp_driver_dll = dlopen(vdpau_driver_lib, RTLD_NOW | RTLD_GLOBAL); -@@ -154,11 +150,12 @@ static VdpStatus _vdp_open_driver( - } - - if (!_vdp_driver_dll) { -- /* Try again using the old path, which is guaranteed to fit in PATH_MAX -- * if the complete path fit above. */ -- snprintf(vdpau_driver_lib, sizeof(vdpau_driver_lib), -- DRIVER_FALLBACK_LIB_FORMAT, vdpau_driver); -- _vdp_driver_dll = dlopen(vdpau_driver_lib, RTLD_NOW | RTLD_GLOBAL); -+ /* Try again using the old path. */ -+ if (snprintf(vdpau_driver_lib, sizeof(vdpau_driver_lib), -+ DRIVER_FALLBACK_LIB_FORMAT, vdpau_driver) < -+ sizeof(vdpau_driver_lib)) { -+ _vdp_driver_dll = dlopen(vdpau_driver_lib, RTLD_NOW | RTLD_GLOBAL); -+ } - } - - if (vdpau_driver_dri2) { diff --git a/extras-buildpkgs/libvdpau/debian/patches/vdpau-module-searchpath.patch b/extras-buildpkgs/libvdpau/debian/patches/vdpau-module-searchpath.patch deleted file mode 100644 index 9750871d1c..0000000000 --- a/extras-buildpkgs/libvdpau/debian/patches/vdpau-module-searchpath.patch +++ /dev/null @@ -1,43 +0,0 @@ -From: Andreas Beckmann -Subject: search the vdpau module in multiple directories - start searching the vdpau module in ${ORIGIN}/vdpau, then the MODULEDIR and - finally fall back to /usr/lib/vdpau - ---- a/src/vdpau_wrapper.c -+++ b/src/vdpau_wrapper.c -@@ -103,6 +103,13 @@ static char * _vdp_get_driver_name_from_ - return driver_name; - } - -+static char const * _vdpau_module_search_paths[] = { -+ "${ORIGIN}/vdpau", -+ VDPAU_MODULEDIR, -+ "/usr/lib/vdpau", -+ NULL -+}; -+ - static VdpStatus _vdp_open_driver( - Display * display, - int screen) -@@ -117,6 +127,7 @@ static VdpStatus _vdp_open_driver( - char vdpau_driver_lib[PATH_MAX]; - char const * vdpau_trace; - char const * func_name; -+ char const ** module_path; - - vdpau_driver = secure_getenv("VDPAU_DRIVER"); - if (vdpau_driver) { -@@ -138,9 +146,11 @@ static VdpStatus _vdp_open_driver( - - /* Fallback to VDPAU_MODULEDIR when VDPAU_DRIVER_PATH is not set, - * or if we fail to create the driver path/dlopen the library. */ -- if (!_vdp_driver_dll) { -+ for (module_path = _vdpau_module_search_paths; -+ !_vdp_driver_dll && *module_path; -+ ++module_path) { - if (snprintf(vdpau_driver_lib, sizeof(vdpau_driver_lib), -- DRIVER_LIB_FORMAT, VDPAU_MODULEDIR, vdpau_driver) >= -+ DRIVER_LIB_FORMAT, *module_path, vdpau_driver) >= - sizeof(vdpau_driver_lib)) { - fprintf(stderr, "Failed to construct driver path: path too long\n"); - } diff --git a/extras-buildpkgs/libvdpau/debian/rules b/extras-buildpkgs/libvdpau/debian/rules deleted file mode 100644 index 72daf9a1c5..0000000000 --- a/extras-buildpkgs/libvdpau/debian/rules +++ /dev/null @@ -1,30 +0,0 @@ -#!/usr/bin/make -f - -#export DH_VERBOSE=1 - -DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) -DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) - -CONFIGURE_OPTIONS ?= --disable-documentation \ - --enable-dri2 - -%: - dh $@ --with autoreconf - -binary: binary-indep binary-arch ; - -override_dh_autoreconf: - dh_autoreconf --as-needed - -override_dh_auto_configure: - dh_testdir - LDFLAGS="-Wl,--as-needed $$(dpkg-buildflags --get LDFLAGS)" ./configure \ - --prefix=/usr --sysconfdir=/etc --libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \ - $(CONFIGURE_OPTIONS) - -override_dh_bugfiles: - dh_bugfiles -A - -# ignore the plugin -override_dh_makeshlibs: - dh_makeshlibs -Xvdpau/libvdpau_trace.so.1 diff --git a/extras-buildpkgs/libvdpau/debian/source/format b/extras-buildpkgs/libvdpau/debian/source/format deleted file mode 100644 index 163aaf8d82..0000000000 --- a/extras-buildpkgs/libvdpau/debian/source/format +++ /dev/null @@ -1 +0,0 @@ -3.0 (quilt)