[SM-Commit] GIT changes to master grimoire by Eric Sandall (bfb5ce06e6a8b75be89d4a6fea3ae94d4e97672c)

Eric Sandall scm at sourcemage.org
Fri Feb 6 20:20:25 EST 2009


GIT changes to master grimoire by Eric Sandall <esandall at esandall25808.local.webex.com>:

 video/mplayer/CONFIGURE |   12 ++++--------
 video/mplayer/HISTORY   |    1 +
 2 files changed, 5 insertions(+), 8 deletions(-)

New commits:
commit bfb5ce06e6a8b75be89d4a6fea3ae94d4e97672c
Author: Eric Sandall <esandall at esandall25808.local.webex.com>
Commit: Eric Sandall <esandall at esandall25808.local.webex.com>

    mplayer: Removed old variable change code from 2006

diff --git a/video/mplayer/CONFIGURE b/video/mplayer/CONFIGURE
index be57935..2c514b1 100755
--- a/video/mplayer/CONFIGURE
+++ b/video/mplayer/CONFIGURE
@@ -2,16 +2,12 @@ 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 support?" y              \
                     "--enable-joystick" "--disable-joystick"  &&
 config_query_option MPLAYER_OPTS  \
-                    "Enable OSD Menu?" ${MPLAYER_OSD_MENU:-n} \
+                    "Enable OSD Menu?" n              \
                     "--enable-menu" "--disable-menu"  &&
 config_query_option MPLAYER_OPTS  \
-                    "Build mencoder?" ${MPLAYER_MENCODER:-y} \
-                    "--enable-mencoder" "--disable-mencoder"  &&
-# remove this and the above MPLAYER_... defaults once this is in stable
-# 2006-03-06 Arwed v. Merkatz
-persistent_remove MPLAYER_JOYSTICK MPLAYER_OSD_MENU MPLAYER_MENCODER
+                    "Build mencoder?" y                       \
+                    "--enable-mencoder" "--disable-mencoder"
diff --git a/video/mplayer/HISTORY b/video/mplayer/HISTORY
index e0be846..c0197a8 100644
--- a/video/mplayer/HISTORY
+++ b/video/mplayer/HISTORY
@@ -1,6 +1,7 @@
 2009-02-06 Eric Sandall <sandalle at sourcemage.org>
 	* CONFIGURE: Add query (default n) for IVTV, fix from Vasil Yonkov
 	  Fixes Bug #14977
+	  Removed old variable change code from 2006
 	* BUILD: Pass MPLAYER_IVTV to OPTS
 
 2008-11-14 Arjan Bouter <abouter at sourcemage.org>



More information about the SM-Commit mailing list