[Lunar-commits] <moonbase> Revert "xine-lib-vdpau: replaced very old release with current one" Reason: this is the only version of xine 1.1 with vdpau support. Development of this project stopped on 2009-11-08 13:33:39 GMT but we keep it till all players will start using xine 1.2. xine 1.2 which development continues with improved vdpau is now present in xine-lib-2 module.

[Zbigniew Luszpinski]

commit 38b418aab950dc79ce7b6bee37813e12ef9b9713
Author: Zbigniew Luszpinski <zbiggy at lunar-linux.org>
Date:   Mon Jan 24 23:19:52 2011 +0100

    Revert "xine-lib-vdpau: replaced very old release with current one"
    Reason: this is the only version of xine 1.1 with vdpau support.
    Development of this project stopped on 2009-11-08 13:33:39 GMT
    but we keep it till all players will start using xine 1.2.
    xine 1.2 which development continues with improved vdpau is now
    present in xine-lib-2 module.
    
    This reverts commit 3b87489938bc2e55e289305b98d1386429f0dc3f.
---
 video/xine-lib-vdpau/BUILD        |    7 +++++++
 video/xine-lib-vdpau/DEPENDS      |    9 +++++----
 video/xine-lib-vdpau/DETAILS      |   16 +++++++++-------
 video/xine-lib-vdpau/POST_INSTALL |    1 -
 4 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/video/xine-lib-vdpau/BUILD b/video/xine-lib-vdpau/BUILD
index 4602929..4e9f5a1 100644
--- a/video/xine-lib-vdpau/BUILD
+++ b/video/xine-lib-vdpau/BUILD
@@ -1,5 +1,12 @@
 (
 
+  patch_it $SOURCE_CACHE/$SOURCE2 0 &&
+
+  sedit 's/\$sarchopt=\$archopt_val//' m4/optimizations.m4 &&
+
+# Fixes the make failing with the lastest ffmpeg bump.
+  sedit "s:RGBA32:RGB32:g" src/combined/ffmpeg/ff_video_decoder.c &&
+
   OPTS+=" --enable-static --with-xv-path=/usr/X11/lib --enable-mmap --enable-antialiasing" &&
 
   ./autogen.sh &&
diff --git a/video/xine-lib-vdpau/DEPENDS b/video/xine-lib-vdpau/DEPENDS
index b5b9410..5cb8dfb 100644
--- a/video/xine-lib-vdpau/DEPENDS
+++ b/video/xine-lib-vdpau/DEPENDS
@@ -1,8 +1,4 @@
 depends  %X
-depends  libcdio
-depends  vcdimager
-depends  ffmpeg
-depends  libmpcdec
 depends  %VDPAUDEVICE
 
 optional_depends  "alsa-utils" \
@@ -24,3 +20,8 @@ optional_depends  "libcaca" \
                   "" \
                   "--disable-caca" \
                   "for text support"
+
+optional_depends  "ffmpeg"                    \
+                  "--with-external-ffmpeg"    \
+                  "--without-external-ffmpeg" \
+                  "for ffmpeg support"
diff --git a/video/xine-lib-vdpau/DETAILS b/video/xine-lib-vdpau/DETAILS
index b69535e..a4b608e 100644
--- a/video/xine-lib-vdpau/DETAILS
+++ b/video/xine-lib-vdpau/DETAILS
@@ -1,12 +1,14 @@
           MODULE=xine-lib-vdpau
-         VERSION=1-2-e82fdba2e88d
-          SOURCE=e82fdba2e88d.tar.bz2
-      SOURCE_URL=http://hg.debian.org/hg/xine-lib/xine-lib-1.2/archive
-      SOURCE_VFY=sha1:c91ef21e0a15ef2208205cdf5563c7f78fbbeab9
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/xine-lib-$VERSION
-        WEB_SITE=http://hg.debian.org/hg/xine-lib/xine-lib-1.2
+         VERSION=286
+          SOURCE=$MODULE-$VERSION.tar.bz2
+         SOURCE2=xine-lib-1.1.19-xvmc.patch.bz2
+      SOURCE_URL=$MIRROR_URL
+     SOURCE2_URL=$PATCH_URL
+      SOURCE_VFY=sha1:82f76ed9ebff27160d2d219e837d1a0b7c988c5b
+     SOURCE2_VFY=sha1:5cfd0d50c2dfbd234ab9495ad7f5f6cd39b0dfec
+        WEB_SITE=http://www.jusst.de/vdpau/
          ENTERED=20090927
-         UPDATED=20101223
+         UPDATED=20100906
            SHORT="Free video player with VDPAU"
 
 cat << EOF
diff --git a/video/xine-lib-vdpau/POST_INSTALL b/video/xine-lib-vdpau/POST_INSTALL
deleted file mode 100644
index be18bce..0000000
--- a/video/xine-lib-vdpau/POST_INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-if module_installed xine-ui; then lin -c xine-ui; fi