[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (06009ee3960baa1797bb5a5bdb20b65535218491)

Vlad Glagolev scm at sourcemage.org
Mon Jul 19 10:56:44 EDT 2010


GIT changes to master grimoire by Vlad Glagolev <stealth at sourcemage.org>:

 video-libs/xine-lib/BUILD     |    4 
 video-libs/xine-lib/CONFIGURE |    9 +
 video-libs/xine-lib/DEPENDS   |  251 ++++++++++++++++++++++++++++++++----------
 video-libs/xine-lib/DETAILS   |    8 -
 video-libs/xine-lib/HISTORY   |    6 +
 5 files changed, 214 insertions(+), 64 deletions(-)

New commits:
commit 06009ee3960baa1797bb5a5bdb20b65535218491
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    xine-lib: refactored dependencies

diff --git a/video-libs/xine-lib/BUILD b/video-libs/xine-lib/BUILD
index 88c7c6b..8b3c4f7 100755
--- a/video-libs/xine-lib/BUILD
+++ b/video-libs/xine-lib/BUILD
@@ -1,3 +1,3 @@
-# breaks with lots of stuff, let it use its own CFLAGS
-export  CFLAGS=""  &&
+OPTS="$XINE_LIB_OPTS $OPTS" &&
+
 default_build
diff --git a/video-libs/xine-lib/CONFIGURE b/video-libs/xine-lib/CONFIGURE
new file mode 100755
index 0000000..3a3c337
--- /dev/null
+++ b/video-libs/xine-lib/CONFIGURE
@@ -0,0 +1,9 @@
+config_query_option XINE_LIB_OPTS \
+                    "Enable IPv6?" y \
+                    "--enable-ipv6" \
+                    "--disable-ipv6" &&
+
+config_query_option XINE_LIB_OPTS \
+                    "Build Video4Linux input plugins?" y \
+                    "--enable-v4l" \
+                    "--disable-v4l"
diff --git a/video-libs/xine-lib/DEPENDS b/video-libs/xine-lib/DEPENDS
index cd73147..b11d06a 100755
--- a/video-libs/xine-lib/DEPENDS
+++ b/video-libs/xine-lib/DEPENDS
@@ -1,66 +1,203 @@
-depends  zlib    &&
+depends zlib &&
+depends LIBAVCODEC '--with-external-ffmpeg' &&
 
-optional_depends  libx11                   \
-                  "--with-x"               \
-                  ""                       \
-                  "To support X display"   &&
+optional_depends gettext \
+                 "--enable-nls" \
+                 "--disable-nls" \
+                 "for alternate language support" &&
 
-# output devices
-optional_depends  "alsa-lib"               \
-                  "--with-alsa"            \
-                  "--without-alsa"         \
-                  "for ALSA audio output"  &&
+# X support
+optional_depends libx11 \
+                 "--with-x" \
+                 "--without-x" \
+                 "to support X display" &&
 
-optional_depends  "esound"  ""  ""  "for esd audio output"  &&
-optional_depends  "arts"                   \
-                  "--with-arts"            \
-                  "--without-arts"         \
-                  "for arts audio output"  &&
+if is_depends_enabled $SPELL libx11; then
+  depends libxv &&
+  depends libxext &&
 
-optional_depends  "pulseaudio"  "--with-pulseaudio"  "--without-pulseaudio"  "for pulseaudio output"  &&
-optional_depends  "aalib"  ""  ""  "for ascii art video output"  &&
-optional_depends  "sdl"  "--with-sdl"  "--without-sdl"  "for SDL video output"  &&
-optional_depends  "libcaca" "--with-caca" "--without-caca" "for colored ascii art video output"  &&
-# unused in the source
-#optional_depends  "GLUT"  ""  ""  "for (experimental) OpenGL video output"  &&
+  optional_depends libxcb \
+                   "--with-xcb" \
+                   "--without-xcb" \
+                   "build XCB video out plugins" &&
 
+  optional_depends libxinerama \
+                   "--enable-xinerama" \
+                   "--disable-xinerama" \
+                   "build Xinerama support" &&
+
+  optional_depends libxvmc \
+                   "--with-xvmc-lib=${INSTALL_ROOT}/usr/lib \
+                    --with-xxmc-lib=${INSTALL_ROOT}/usr/lib" \
+                   "--disable-xvmc" \
+                   "for XvMC plugin"
+fi &&
+
+# output devices (audio)
+optional_depends alsa-lib \
+                 "--with-alsa" \
+                 "--without-alsa" \
+                 "for ALSA audio output" &&
+
+optional_depends esound \
+                 "--with-esound" \
+                 "--without-esound" \
+                 "for esd audio output" &&
+
+optional_depends arts \
+                 "--with-arts" \
+                 "--without-arts" \
+                 "for arts audio output" &&
+
+optional_depends pulseaudio \
+                 "--with-pulseaudio" \
+                 "--without-pulseaudio" \
+                 "for PulseAudio output" &&
+
+optional_depends JACK-DRIVER \
+                 "--with-jack" \
+                 "--without-jack" \
+                 "for Jack audio output" &&
+
+optional_depends oss \
+                 "--enable-oss" \
+                 "--disable-oss" \
+                 "for OSS audio output" &&
+
+# output devices (video)
+optional_depends sdl \
+                 "--with-sdl" \
+                 "--without-sdl" \
+                 "for SDL video output" &&
+
+optional_depends aalib \
+                 "--enable-aalib" \
+                 "--disable-aalib" \
+                 "for ascii art video output" &&
+
+optional_depends libcaca \
+                 "--with-caca" \
+                 "--without-caca" \
+                 "for colored ascii art video output" &&
 
 # input codecs
-optional_depends  "jpeg"  '' ''   'JPEG support' && 
-optional_depends  "flac"  ""  ""  "for FLAC audio decoding"  &&
-optional_depends  "libogg"  ""  ""  "for OGG/OGM file support"  &&
-optional_depends  "libvorbis"  ""  ""  "for OGG/Vorbis audio support"  &&
-optional_depends  "libmng"  ""  ""  "for MNG file support"  &&
-optional_depends  "win32codecs"  ""  ""  "to use win32 dlls for video/audio decoding" "z-rejected" &&
-optional_depends  "quicktime-codecs" "" "" "for addtional video/audio codecs used in quicktime files" "z-rejected"  &&
-optional_depends  "real-codecs" "" "" "for RealMedia decoding" "z-rejected" &&
-depends  LIBAVCODEC &&
-optional_depends  "libtheora" "" "" "for OGG/Theora video support"  &&
-optional_depends  "libdvdcss"  ""  ""  "to play encrypted DVDs"  &&
-optional_depends  "speex"  ""  ""  "for speech compression"  &&
-optional_depends  "libmodplug"  ""  ""  "for mod playback support"  &&
-optional_depends  "imagemagick"            \
-                  "--with-imagemagick" \
-                  "--without-imagemagick" \
-                  "for image loader"       &&
+optional_depends libmng \
+                 "--enable-mng" \
+                 "--disable-mng" \
+                 "for MNG file support" &&
+
+optional_depends flac \
+                 "--with-libflac" \
+                 "--without-libflac" \
+                 "for FLAC audio decoding" &&
+
+optional_depends libvorbis \
+                 "--with-vorbis" \
+                 "--without-vorbis" \
+                 "for OGG/Vorbis audio support" &&
+
+optional_depends libtheora \
+                 "--with-theora" \
+                 "--without-theora" \
+                 "for OGG/Theora video support" &&
+
+optional_depends speex \
+                 "--with-speex" \
+                 "--without-speex" \
+                 "for speech compression support"  &&
+
+if is_depends_enabled $SPELL speex; then
+  depends libogg
+fi &&
+
+optional_depends libmpcdec \
+                 "--with-external-libmpcdec" "" \
+                 "use system library for MusePack decoding" &&
+
+optional_depends faad2 \
+                 "--with-external-libfaad" "" \
+                 "use system libfaad (recommended)" &&
+
+# not recommended as system libraries
+#
+# a52dec: --with-external-a52dec
+# libmad: --with-external-libmad
+# libdvdnav: --with-external-dvdnav
+# libdts: --with-external-libdts
+
+optional_depends libmodplug \
+                 "--enable-modplug" \
+                 "--disable-modplug" \
+                 "for mod playback support" &&
+
+optional_depends wavpack \
+                 "--with-wavpack" \
+                 "--without-wavpack" \
+                 "for Wavpack decoder" &&
+
+optional_depends imagemagick \
+                 "--with-imagemagick" \
+                 "--without-imagemagick" \
+                 "for ImageMagick image decoder" &&
+
+optional_depends freetype2 \
+                 "--with-freetype" \
+                 "--without-freetype" \
+                 "for FreeType2 support" &&
+
+if is_depends_enabled $SPELL freetype2; then
+  optional_depends fontconfig \
+                   "--with-fontconfig" \
+                   "--without-fontconfig" \
+                   "for fontconfig support" &&
+
+  config_query_option XINE_LIB_OPTS "Enable font antialiasing?" y \
+                                    "--enable-antialiasing" \
+                                    "--disable-antialiasing"
+fi &&
+
+optional_depends libdvdcss "" "" "to play encrypted DVDs" &&
+
+optional_depends real-codecs \
+                 "--enable-real-codecs" \
+                 "--disable-real-codecs" \
+                 "for RealMedia decoding" \
+                 "z-rejected" &&
+
+optional_depends win32codecs \
+                 "--enable-w32dll" \
+                 "--disable-w32dll" \
+                 "to use win32 dlls for video/audio decoding" \
+                 "z-rejected" &&
+
+optional_depends quicktime-codecs \
+                 "" "" \
+                 "for addtional video/audio codecs used in quicktime files" \
+                 "z-rejected" &&
 
 # input plugins
-optional_depends  "gnome-vfs2"  ""  ""  "for gnome-vfs input support"  &&
-optional_depends  "samba"  ""  ""  "for samba input support"  &&
-optional_depends  "vcdimager-unstable"      \
-                  "--with-external-vcdnav"  \
-                  ""                        \
-                  "for dynamically linked vcd plugin"         &&
-# all xorg stuff
-if is_depends_enabled $SPELL libx11;then
-optional_depends  libxcb  "--with-xcb"  "--without-xcb"  "Build XCB video out plugins" &&
-optional_depends  libxinerama "" "" "" &&
-optional_depends  libxext "" "" "" &&
-optional_depends  libice "" "" "" &&
-optional_depends  libxv "" "" "" &&
-optional_depends  libxvmc                                    \
-                  "--with-xvmc-lib=${INSTALL_ROOT}/usr/lib   \
-                   --with-xxmc-lib=${INSTALL_ROOT}/usr/lib"  \
-                  ""                                         \
-                  "For XvMC plugin"
-fi
+if list_find "$XINE_LIB_OPTS" "--enable-v4l"; then
+  optional_depends libv4l \
+                   "--enable-libv4l" \
+                   "--disable-libv4l" \
+                   "for libv4l support"
+fi &&
+
+optional_depends gnome-vfs2 \
+                 "--enable-gnomevfs" \
+                 "--disable-gnomevfs" \
+                 "for gnome-vfs input support" &&
+
+optional_depends samba \
+                 "--enable-samba" \
+                 "--disable-samba" \
+                 "for Samba input support" &&
+
+optional_depends vcdimager-unstable \
+                 "--with-external-vcdnav" "" \
+                 "for dynamically linked vcd plugin (not recommended)" &&
+
+optional_depends libfame \
+                 "--enable-dxr3" \
+                 "--disable-dxr3" \
+                 "build DXR3/HW+ plugins"
diff --git a/video-libs/xine-lib/DETAILS b/video-libs/xine-lib/DETAILS
index 488f468..600da4b 100755
--- a/video-libs/xine-lib/DETAILS
+++ b/video-libs/xine-lib/DETAILS
@@ -2,14 +2,14 @@
          VERSION=1.1.18.1
      SOURCE_HASH=sha512:c3a6556edd234b95e9a3276ac53574078b806d4901a4b64ce83a22a9d52f37e81c943dce1b5277221fa5cef5c1b87d217cc6e12257aa1f170a1dc8d60272a91f
           SOURCE=$SPELL-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=$SOURCEFORGE_URL/xine/$SOURCE
-        WEB_SITE=http://xine.sourceforge.net
+        WEB_SITE=http://www.xine-project.org/
          ENTERED=20010927
       LICENSE[0]=GPL
   SECURITY_PATCH=12
         KEYWORDS="player video libs"
-           SHORT="xine is a free video player."
+           SHORT="free video player"
 cat << EOF
 xine is a free multimedia player. It plays back CDs, DVDs, and VCDs. It also
 decodes multimedia files like AVI, MOV, WMV, and MP3 from local disk drives,
@@ -17,5 +17,3 @@ and displays multimedia streamed over the Internet. It interprets many of the
 most common multimedia formats available - and some of the most uncommon
 formats, too.
 EOF
-
-
diff --git a/video-libs/xine-lib/HISTORY b/video-libs/xine-lib/HISTORY
index 05f233d..35a3e47 100644
--- a/video-libs/xine-lib/HISTORY
+++ b/video-libs/xine-lib/HISTORY
@@ -1,3 +1,9 @@
+2010-07-19 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: quoting paths; cleaned up; updated website
+	* BUILD: flags' removal comes from 2004 -- removed that hack; use XINE_LIB_OPTS
+	* DEPENDS: rewritten to fix some bugs, missing dependencies and flags
+	* CONFIGURE: added, for some flags
+
 2010-03-08 Ladislav Hagara <hgr at vabo.cz>
 	* DETAILS: 1.1.18.1
 	* PRE_BUILD, compat.c: removed



More information about the SM-Commit mailing list