Log:
r9209@Otherland: arwed | 1970-01-01 01:00:00 +0200
mplayer: use new svn repository
Modified: test/video/mplayer/BUILD
==============================================================================
--- test/video/mplayer/BUILD (original)
+++ test/video/mplayer/BUILD Mon Jun 5 08:39:55 2006
@@ -1,15 +1,14 @@
-invoke_gcc
# needed so it actually uses gcc 3.4
OPTS="$OPTS --cc=gcc" &&
-if [ "$MPLAYER_CVS" != "y" ]; then
+if [[ $MPLAYER_SVN = n ]]; then
OPTS="$OPTS --enable-libavcodec"
else
OPTS="$OPTS --with-extraincdir=/usr/include/ffmpeg"
fi &&
# remove --enable-old-gtk for 1.0pre7try2 as it doesn't know that option
-if [ "$MPLAYER_GUI" = "gtk+" -a "$MPLAYER_CVS" = "n" ]; then
+if [[ $MPLAYER_GUI = gtk+ && $MPLAYER_SVN = n ]]; then
OPTS="${OPTS/--enable-old-gtk/}"
fi &&
Modified: test/video/mplayer/CONFIGURE
==============================================================================
--- test/video/mplayer/CONFIGURE (original)
+++ test/video/mplayer/CONFIGURE Mon Jun 5 08:39:55 2006
@@ -1,4 +1,4 @@
-if [ "$MPLAYER_CVS" == "y" ]; then
+if [[ $MPLAYER_SVN = y ]]; then
config_query_list MPLAYER_GUI "What GUI do you want?" none gtk+ gtk+2
else
config_query_list MPLAYER_GUI "What GUI do you want?" none gtk+
Modified: test/video/mplayer/DEPENDS
==============================================================================
--- test/video/mplayer/DEPENDS (original)
+++ test/video/mplayer/DEPENDS Mon Jun 5 08:39:55 2006
@@ -1,4 +1,4 @@
-if [ "$MPLAYER_CVS" == "n" ]; then
+if [[ $MPLAYER_SVN = n ]]; then
depends gcc34
fi &&
if [ "$MPLAYER_GUI" == "gtk+" ]
@@ -9,12 +9,10 @@
depends mplayer-gui
fi &&
Modified: test/video/mplayer/HISTORY
==============================================================================
--- test/video/mplayer/HISTORY (original)
+++ test/video/mplayer/HISTORY Mon Jun 5 08:39:55 2006
@@ -1,3 +1,14 @@
+2006-06-05 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: switched from snapshot to new svn checkout for the scm
+ version
+ * DOWNLOAD: added for svn download
+ * BUILD, CONFIGURE, DEPENDS, PREPARE, PRE_BUILD: changed variables
+ from MPLAYER_CVS* to MPLAYER_SVN*
+ * BUILD, PRE_BUILD: moved invoke_gcc call to PRE_BUILD
+ * DEPENDS: changed switches for ffmpeg-svn optional_depends, this is
+ required because the svn checkout includes a full copy of ffmpeg
+ svn
+
2006-06-02 Arwed v. Merkatz <v.merkatz AT gmx.net>
* PRE_BUILD: sedit getline to vs_getline in vobsub.c for stable
release, seems to be incompatible with current glibc otherwise
Modified: test/video/mplayer/PREPARE
==============================================================================
--- test/video/mplayer/PREPARE (original)
+++ test/video/mplayer/PREPARE Mon Jun 5 08:39:55 2006
@@ -1,6 +1,9 @@
-config_query MPLAYER_CVS "Build CVS version?" n
-if [ "$MPLAYER_CVS" == "y" ]; then
- config_query MPLAYER_CVS_AUTOUPDATE \
- "Update to the latest CVS on every cast?" \
- n
+# changed CVS -> SVN, remove from test when it's in stable
+# 2006-06-05 Arwed v. Merkatz
+config_query MPLAYER_SVN "Build SVN version?" ${MPLAYER_CVS:-n}
+if [[ $MPLAYER_SVN = y ]]; then
+ config_query MPLAYER_SVN_AUTOUPDATE \
+ "Update to the latest SVN on every system-update?" \
+ ${MPLAYER_CVS_AUTOUPDATE:-n}
fi
+persistent_remove MPLAYER_CVS MPLAYER_CVS_AUTOUPDATE
Modified: test/video/mplayer/PRE_BUILD
==============================================================================
--- test/video/mplayer/PRE_BUILD (original)
+++ test/video/mplayer/PRE_BUILD Mon Jun 5 08:39:55 2006
@@ -1,6 +1,7 @@
default_pre_build &&
+invoke_gcc &&
cd $SOURCE_DIRECTORY &&
-if [ "$MPLAYER_CVS" = "y" ]; then
+if [[ $MPLAYER_SVN = y ]]; then
patch Makefile $SCRIPT_DIRECTORY/cvs.Makefile.patch &&
if [ "$MPLAYER_GUI" == "gtk+" ]; then
sedit "s|_gui=no|_gui=yes|" configure &&
[SM-Commit] SVK change 9177 to grimoire.svk,
Arwed von Merkatz, 06/05/2006