[Lunar-commits] <moonbase-other> xine-lib: merged xine-lib and xine-lib-2 into one module
Stefan Wold
ratler at lunar-linux.org
Sat Oct 4 11:33:31 CEST 2014
commit c02ab97a6623d6e82f1a83d276f275af1397dcb8
Author: Stefan Wold <ratler at lunar-linux.org>
Date: Sun, 21 Sep 2014 21:17:51 +0200
URL: https://github.com/lunar-linux/moonbase-other/commit/c02ab97a6623d6e82f1a83d276f275af1397dcb8
xine-lib: merged xine-lib and xine-lib-2 into one module
---
video/xine-lib/BUILD | +4/-4
video/xine-lib/CONFLICTS | +0/-1
video/xine-lib/DEPENDS | +31/-52
video/xine-lib/DETAILS | +10/-7
4 files changed, 45 insertions(+), 64 deletions(-)
--- a/video/xine-lib/BUILD
+++ b/video/xine-lib/BUILD
@@ -1,6 +1,6 @@
-(
+OPTS+=" --enable-static --with-xv-path=/usr/X11/lib --enable-mmap --enable-antialiasing" &&
- OPTS+=" --enable-static --with-xv-path=/usr/X11/lib" &&
- default_build
+cp $SOURCE_CACHE/$SOURCE2 src/xine-engine/ &&
+default_build &&
+cp $SOURCE_CACHE/$SOURCE2 /usr/include/xine/
-) > $C_FIFO 2>&1
--- a/video/xine-lib/CONFLICTS
+++ b/video/xine-lib/CONFLICTS
@@ -1,2 +1 @@
conflicts xine-lib-vdpau
-conflicts xine-lib-2
--- a/video/xine-lib/DEPENDS
+++ b/video/xine-lib/DEPENDS
@@ -1,53 +1,32 @@
depends %X
-
-optional_depends "alsa-utils" \
- "" \
- "--without-alsa" \
- "for ALSA sound support"
-
-optional_depends "speex" \
- "" \
- "--without-speex" \
- "for Speex audio decoder"
-
-optional_depends "aalib" \
- "" \
- "--disable-aalib" \
- "for ascii art library support"
-
-optional_depends "libmng" \
- "" \
- "--disable-mng" \
- "for mng library support"
-
-optional_depends "libXvMC" \
- "" \
- "" \
- "for hw accelerated playback on supported cards"
-
-optional_depends "libcaca" \
- "" \
- "--without-caca" \
- "for text support"
-
-optional_depends "ImageMagick" \
- "" \
- "--without-imagemagick" \
- "for ImageMagick image decoder"
-
-
-optional_depends "libtheora" \
- "" \
- "--without-theora" \
- "for Theora video decoder"
-
-optional_depends "SDL" \
- "" \
- "--without-sdl" \
- "for SDL video output"
-
-optional_depends "ffmpeg" \
- "--with-external-ffmpeg" \
- "" \
- "for external ffmpeg library support"
-
+depends libcdio
+depends vcdimager
+depends ffmpeg
+depends libmpcdec
+
+optional_depends "alsa-utils" "--with-alsa" "--without-alsa" "for ALSA sound support"
+optional_depends "speex" "--with-speex" "--without-speex" "for Speex audio decoder"
+optional_depends "aalib" "--enable-aalib" "--disable-aalib" "for ascii art library support"
+optional_depends "libmng" "--enable-mng" "--disable-mng" "for mng library support"
+optional_depends "libXvMC" "--enable-xvmc" "--disable-xvmc" "for hw accelerated playback on supported cards"
+optional_depends "libcaca" "--with-caca" "--without-caca" "for text support"
+optional_depends "ImageMagick" "--with-imagemagick" "--without-imagemagick" "for ImageMagick image decoder"
+optional_depends "libtheora" "--with-theora" "--without-theora" "for Theora video decoder"
+optional_depends "SDL" "--with-sdl" "--without-sdl" "for SDL video output"
+optional_depends "jack" "--with-jack" "--without-jack" "for jack audio plugin"
+optional_depends "mesa-lib" "" "" "for opengl plugin"
+optional_depends "faad" "--enable-faad" "--disable-faad" "for faad2 plugin"
+optional_depends "libmodplug" "--enable-modplug" "--disable-modplug" "for modplug plugin"
+optional_depends "libdca" "--enable-dts" "--disable-dts" "for DTS (dca) audio plugin"
+optional_depends "a52dec" "--enable-a52dec" "--disable-a52dec" "for a52 video plugin"
+optional_depends "libmad" "--enable-mad" "--disable-mad" "for mad and mp3 plugin"
+optional_depends "libmpcdec" "--enable-musepack" "--disable-musepack" "for musepack plugin"
+optional_depends "libblueray" "--enable-bluray" "--disable-bluray" "for bluray plugin"
+optional_depends "gnome-vfs" "--enable-gnomevfs" "--disable-gnomevfs" "for gnome vfs plugin"
+optional_depends "libvdpau" "--enable-vdpau" "--disable-vdpau" "for VDPAU output plugin"
+optional_depends "libva" "--enable-vaapi" "--disable-vaapi" "for VAAPI output plugin"
+optional_depends "gdk-pixbuf" "--enable-gdkpixbuf" "--disable-gdkpixbuf" "for gdk-pixbuf plugin"
+optional_depends "wavpack" "--with-wavpack" "--without-wavpack" "for wavpack decoder support"
+optional_depends "pulseaudio" "--with-pulseaudio" "--without-pulseaudio" "for pulseaudio support"
+optional_depends "libvorbis" "--with-vorbis" "--without-vorbis" "for vorbis/ogg support"
+optional_depends "freetype2" "--with-freetype" "--without-freetype" "for truetype font support"
--- a/video/xine-lib/DETAILS
+++ b/video/xine-lib/DETAILS
@@ -1,17 +1,20 @@
MODULE=xine-lib
- VERSION=1.1.21
+ VERSION=1.2.6
SOURCE=$MODULE-$VERSION.tar.xz
+ SOURCE2=accel_vaapi.h
SOURCE_URL=$SFORGE_URL/xine
- SOURCE_VFY=sha1:0adf20ef55d24f2a1b4a8974e57ad1be5133b236
- WEB_SITE=http://www.xine-project.org
+ SOURCE2_URL=$PATCH_URL
+ SOURCE_VFY=sha1:ac929eef2b7bf5c27699bbed612b953a01fccba5
+ SOURCE2_VFY=sha1:08ed9947ef919c71c87151baa8fc0ce7d8f72050
+ WEB_SITE=http://www.xine-project.org/
ENTERED=20010927
- UPDATED=20120612
- PSAFE=no
- SHORT="Free video player"
+ UPDATED=20140921
+ SHORT="Free video player with VDPAU"
cat << EOF
xine is a free video player which plays mpeg-2 and mpeg-1 video, DVDs
(unlocked/unencrypted only), video CDs, SVCDs, and AVI files (using
Win32 codecs) with synchronized audio and video, and optionally
-fullscreen using the Xv extensions in Xfree86 4.x.
+fullscreen using the Xv extensions. This xine-lib offers VDPAU
+hardware decoding and postprocessing.
EOF
More information about the Lunar-commits
mailing list