summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Sandall2009-02-06 10:44:21 -0800
committerArwed von Merkatz2009-02-10 17:49:10 +0100
commitde8bcd0c0c221dd3b994c6fa0dbb841431723a47 (patch)
tree581878858af303cccc51e87f14aeb27961832aad
parent1c31dca78c4c9d6c2cfab6faa0d88d639615b243 (diff)
mplayer: Add query (default n) for IVTV, fix from Vasil Yonkov
Pass MPLAYER_IVTV to OPTS Fixes Bug #14977 (cherry picked from commit 99eaa03dc50a56fe8db719741538f23b8f7c1011)
-rwxr-xr-xvideo/mplayer/BUILD2
-rwxr-xr-xvideo/mplayer/CONFIGURE4
-rw-r--r--video/mplayer/HISTORY5
3 files changed, 10 insertions, 1 deletions
diff --git a/video/mplayer/BUILD b/video/mplayer/BUILD
index 0117f392c4..273fb6c927 100755
--- a/video/mplayer/BUILD
+++ b/video/mplayer/BUILD
@@ -4,7 +4,7 @@ fi &&
disable_pic &&
-OPTS="$MPLAYER_OPTS $OPTS" &&
+OPTS="$MPLAYER_OPTS $MPLAYER_IVTV $OPTS" &&
CFLAGS= ./configure --prefix=${INSTALL_ROOT}/usr \
--confdir=${TRACK_ROOT}/etc/mplayer \
diff --git a/video/mplayer/CONFIGURE b/video/mplayer/CONFIGURE
index 92a18d50eb..be57935872 100755
--- a/video/mplayer/CONFIGURE
+++ b/video/mplayer/CONFIGURE
@@ -1,4 +1,8 @@
config_query_list MPLAYER_GUI "What GUI do you want?" none gtk+ gtk+2 &&
+config_query_option MPLAYER_IVTV \
+ "Build against IVTV?" n \
+ "--enable-ivtv" "--disable-ivtv" &&
+
config_query_option MPLAYER_OPTS \
"Enable Joystick support?" ${MPLAYER_JOYSTICK:-y} \
"--enable-joystick" "--disable-joystick" &&
diff --git a/video/mplayer/HISTORY b/video/mplayer/HISTORY
index 5305b54d10..e0be846052 100644
--- a/video/mplayer/HISTORY
+++ b/video/mplayer/HISTORY
@@ -1,3 +1,8 @@
+2009-02-06 Eric Sandall <sandalle@sourcemage.org>
+ * CONFIGURE: Add query (default n) for IVTV, fix from Vasil Yonkov
+ Fixes Bug #14977
+ * BUILD: Pass MPLAYER_IVTV to OPTS
+
2008-11-14 Arjan Bouter <abouter@sourcemage.org>
* DEPENDS: added optional dep on libnemesi