sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (51e084a5c8714c1e7b9636d474faf7da6c9a3f07)

From: Vlad Glagolev <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (51e084a5c8714c1e7b9636d474faf7da6c9a3f07)
Date: Sun, 2 Dec 2012 04:51:13 -0600

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

video-libs/xine-lib/CONFIGURE | 27 ++++++++++++++++
video-libs/xine-lib/DEPENDS | 68
++++++++++++++++++++++++++----------------
video-libs/xine-lib/HISTORY | 7 ++++
3 files changed, 76 insertions(+), 26 deletions(-)

New commits:
commit 51e084a5c8714c1e7b9636d474faf7da6c9a3f07
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

xine-lib: added optipng suggest dependency

commit 84e8c7cca759368a3f5fe6c6b58cbbe4b0ed3253
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

xine-lib: added internal and optional dependencies

diff --git a/video-libs/xine-lib/CONFIGURE b/video-libs/xine-lib/CONFIGURE
index dd357be..cb6527b 100755
--- a/video-libs/xine-lib/CONFIGURE
+++ b/video-libs/xine-lib/CONFIGURE
@@ -11,4 +11,29 @@ config_query_option XINE_LIB_OPTS \
# V4L 1 is deprecated
if list_find "$XINE_LIB_OPTS" "--enable-v4l"; then
list_remove "XINE_LIB_OPTS" "--enable-v4l"
-fi
+fi &&
+
+config_query_option XINE_LIB_OPTS \
+ "Enable support for a52dec decoding library?" y \
+ "" \
+ "--disable-a52dec" &&
+
+config_query_option XINE_LIB_OPTS \
+ "Enable FAAD decoder support?" y \
+ "" \
+ "--disable-faad" &&
+
+config_query_option XINE_LIB_OPTS \
+ "Enable DTS decoding library support?" y \
+ "" \
+ "--disable-dts" &&
+
+config_query_option XINE_LIB_OPTS \
+ "Enable MAD decoding library support?" y \
+ "" \
+ "--disable-mad" &&
+
+config_query_option XINE_LIB_OPTS \
+ "Enable Musepack decoding support?" y \
+ "" \
+ "--disable-musepack"
diff --git a/video-libs/xine-lib/DEPENDS b/video-libs/xine-lib/DEPENDS
index 0308c0b..790c7ca 100755
--- a/video-libs/xine-lib/DEPENDS
+++ b/video-libs/xine-lib/DEPENDS
@@ -3,6 +3,11 @@ depends LIBAVCODEC &&
depends libcdio &&
depends vcdimager-unstable &&

+optional_depends libxdg-basedir \
+ "--with-external-libxdg-basedir" \
+ "--without-external-libxdg-basedir" \
+ "to use system version of libxdg-basedir" &&
+
optional_depends gettext \
"--enable-nls" \
"--disable-nls" \
@@ -107,34 +112,40 @@ if is_depends_enabled $SPELL speex; then
depends libogg
fi &&

-# not recommended as system libraries
-#
-# libdvdnav: --with-external-dvdnav
-
-optional_depends libmpcdec \
- "--enable-musepack" \
- "--disable-musepack" \
- "for Musepack decoding support" &&
+if ! list_find "$XINE_LIB_OPTS" "--disable-musepack"; then
+ optional_depends libmpcdec \
+ "--enable-musepack" \
+ "--enable-musepack=internal" \
+ "to use system version of Musepack decoding library"
+fi &&

-optional_depends faad2 \
- "--enable-faad" \
- "--disable-faad" \
- "for FAAD decoder support" &&
+if ! list_find "$XINE_LIB_OPTS" "--disable-faad"; then
+ optional_depends faad2 \
+ "--enable-faad" \
+ "--enable-faad=internal" \
+ "to use system version of FAAD decoder"
+fi &&

-optional_depends libdca \
- "--enable-dts" \
- "--disable-dts" \
- "for DTS decoding library support" &&
+if ! list_find "$XINE_LIB_OPTS" "--disable-dts"; then
+ optional_depends libdca \
+ "--enable-dts" \
+ "--enable-dts=internal" \
+ "to use system version of DTS decoding library"
+fi &&

-optional_depends a52dec \
- "--enable-a52dec" \
- "--disable-a52dec" \
- "for a52dec decoding library support" &&
+if ! list_find "$XINE_LIB_OPTS" "--disable-a52dec"; then
+ optional_depends a52dec \
+ "--enable-a52dec" \
+ "--enable-a52dec=internal" \
+ "to use system version of a52dec decoding library"
+fi &&

-optional_depends libmad \
- "--enable-mad" \
- "--disable-mad" \
- "for MAD decoding library support" &&
+if ! list_find "$XINE_LIB_OPTS" "--disable-mad"; then
+ optional_depends libmad \
+ "--enable-mad" \
+ "--enable-mad=internal" \
+ "to use system version of MAD decoding library"
+fi &&

optional_depends libmodplug \
"--enable-modplug" \
@@ -167,6 +178,11 @@ if is_depends_enabled $SPELL freetype2; then
"--disable-antialiasing"
fi &&

+optional_depends libdvdnav \
+ "--with-external-dvdnav" \
+ "--without-external-dvdnav" \
+ "to use system version of dvdnav library
(${PROBLEM_COLOR}not recommended${DEFAULT_COLOR})" &&
+
optional_depends libdvdcss "" "" "to play encrypted DVDs" &&

optional_depends real-codecs \
@@ -207,4 +223,6 @@ optional_depends samba \
optional_depends libfame \
"--enable-dxr3" \
"--disable-dxr3" \
- "build DXR3/HW+ plugins"
+ "build DXR3/HW+ plugins" &&
+
+suggest_depends optipng "" "" "for PNG optimisation"
diff --git a/video-libs/xine-lib/HISTORY b/video-libs/xine-lib/HISTORY
index ad69eb7..75743c4 100644
--- a/video-libs/xine-lib/HISTORY
+++ b/video-libs/xine-lib/HISTORY
@@ -1,8 +1,15 @@
+2012-12-02 Vlad Glagolev <stealth AT sourcemage.org>
+ * CONFIGURE: added default selection for internal libraries
+ * DEPENDS: added switches between internal and external versions;
+ added dependencies: libxdg-basedir, libdvdnav (with a warning);
+ added optipng suggest dependency
+
2012-10-12 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: libv4l -> v4l-utils

2012-07-15 Sukneet Basuta <sukneet AT sourcemage.org>
* DEPENDS: replaced libdts with libdca
+
2012-06-10 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.2.2; switched source to .xz

[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (51e084a5c8714c1e7b9636d474faf7da6c9a3f07), Vlad Glagolev, 12/02/2012