Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] SVK change 9177 to grimoire.svk

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Arwed von Merkatz <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] SVK change 9177 to grimoire.svk
  • Date: Mon, 5 Jun 2006 08:39:55 -0500

Group: defaults
Subject: r9177 - in test: . video/mplayer

Author: arwed
Date: Mon Jun 5 08:39:55 2006
New Revision: 9177

Added:
test/video/mplayer/DOWNLOAD (contents, props changed)
Modified:
test/ (props changed)
test/video/mplayer/BUILD
test/video/mplayer/CONFIGURE
test/video/mplayer/DEPENDS
test/video/mplayer/DETAILS
test/video/mplayer/HISTORY
test/video/mplayer/PREPARE
test/video/mplayer/PRE_BUILD

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 &&

-if [ "$MPLAYER_CVS" == "y" ]; then
-# depends CVS &&
+if [[ $MPLAYER_SVN = y ]]; then
+ depends subversion &&
optional_depends ffmpeg-svn \
- "--enable-libavcodec_so --enable-libavformat_so --enable-libpostproc_so"
\
- "--disable-libavcodec_so --disable-libavformat_so
--disable-libpostproc_so" \
- "for libavcodec audio/video decoders (you really want this)" &&
+ "--disable-libavcodec --enable-libavcodec_so --disable-libavformat
--enable-libavformat_so --disable-libpostproc --enable-libpostproc_so
--disable-libavutil --enable-libavutil_so" "" "to use system ffmpeg instead
of internal one" &&
optional_depends libmpcdec "" "--disable-musepack" "for musepack (mpc)
support"
fi &&

@@ -36,7 +34,7 @@
optional_depends real-codecs "" "--disable-real" "to decode RealMedia
files" "z-rejected" &&
optional_depends xanim-codecs "" "--disable-xanim" "for additional codecs
(intel indeo, ...)" "z-rejected" &&
optional_depends xvid "" "--disable-xvid" "for encoding with the xvid codec
(distribution in USA and Japan is forbidden)" &&
-if [ "$MPLAYER_CVS" == "y" ]; then
+if [[ $MPLAYER_SVN = y ]]; then
optional_depends twolame "" "--disable-twolame" "Twolame (MPEG layer 2
audio) support in mencoder"
fi &&


Modified: test/video/mplayer/DETAILS
==============================================================================
--- test/video/mplayer/DETAILS (original)
+++ test/video/mplayer/DETAILS Mon Jun 5 08:39:55 2006
@@ -1,21 +1,15 @@
SPELL=mplayer
-if [ "$MPLAYER_CVS" == "y" ]; then
- if [ "$MPLAYER_CVS_AUTOUPDATE" == "y" ]; then
-# VERSION=$(date +%Y%m%d)
- VERSION=snapshot
+if [[ $MPLAYER_SVN = y ]]; then
+ if [[ $MPLAYER_SVN_AUTOUPDATE = y ]]; then
+ VERSION=$(date +%Y%m%d)
else
-# VERSION=cvs
- VERSION=snapshot
+ VERSION=svn
fi
-# SOURCE=$SPELL-cvs.tar.bz2
- SOURCE=${SPELL}_20060519.tar.bz2
-# SOURCE_URL[0]=cvs://:pserver:anonymous AT mplayerhq.hu:/cvsroot/mplayer:main
- SOURCE_URL[0]=http://www.mplayerhq.hu/~rtogni/snapshots/$SOURCE
-# SOURCE_IGNORE=volatile
- SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
-# FORCE_DOWNLOAD=on
-#SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-cvs
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}_20060519
+ SOURCE=$SPELL-svn.tar.bz2
+ SOURCE_URL[0]=svn://svn.mplayerhq.hu/mplayer/trunk/:$SPELL-svn
+ SOURCE_IGNORE=volatile
+ FORCE_DOWNLOAD=on
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn
else
VERSION=1.0pre7try2
SOURCE=MPlayer-$VERSION.tar.bz2

Added: test/video/mplayer/DOWNLOAD
==============================================================================
--- (empty file)
+++ test/video/mplayer/DOWNLOAD Mon Jun 5 08:39:55 2006
@@ -0,0 +1,43 @@
+function url_r_svn_crack() {
+
+ URL=`url_strip_prefix "$1" svn`
+ R_SVN_ROOT=`echo $URL | sed "s#\(^[^/]*[^:]*\):.*#\1#"`
+ local R_SVN_MODULE_TAG=`echo $URL | sed "s#^[^/]*[^:]*\(.*\)#\1#"`
+ R_SVN_MODULE=`echo $R_SVN_MODULE_TAG | cut -d : -f2`
+ local R_SVN_TAGNAME=`echo $R_SVN_MODULE_TAG | cut -d : -f3`
+ R_SVN_TAG=${R_SVN_TAGNAME:-HEAD}
+
+}
+
+url_r_svn_crack ${SOURCE_URL}
&&
+message "${MESSAGE_COLOR}Starting SVN checkout of"
\
+ "${FILE_COLOR}${SOURCE}${MESSAGE_COLOR}...${DEFAULT_COLOR}"
&&
+if [[ -f $SOURCE_CACHE/${SOURCE} ]]
+then
+ message "${MESSAGE_COLOR}Previous source found
unpacking...${DEFAULT_COLOR}" &&
+ tar -jxf $SOURCE_CACHE/${SOURCE}
&&
+ cd $R_SVN_MODULE
&&
+ message "${MESSAGE_COLOR}Running SVN update...${DEFAULT_COLOR}"
&&
+ svn
\
+ --non-interactive
\
+ update
\
+ -r${R_SVN_TAG}
&&
+ cd ..
&&
+ message "${MESSAGE_COLOR}Done...${DEFAULT_COLOR}"
+else
+ message "${MESSAGE_COLOR}Running initial SVN checkout...${DEFAULT_COLOR}"
&&
+ svn
\
+ --non-interactive
\
+ checkout
\
+ -r${R_SVN_TAG}
\
+ svn://${R_SVN_ROOT}
\
+ ${R_SVN_MODULE}
&&
+ message "${MESSAGE_COLOR}Done...${DEFAULT_COLOR}"
+fi
&&
+message "${MESSAGE_COLOR}Generating tarball...${DEFAULT_COLOR}"
&&
+tar -jcf
\
+ ${SOURCE}
\
+ ${R_SVN_MODULE}
&&
+cp ${SOURCE} ${SOURCE_CACHE}/${SOURCE}
&&
+rm ${SOURCE}
&&
+message "${MESSAGE_COLOR}SVN Checkout complete...${DEFAULT_COLOR}"

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

Archive powered by MHonArc 2.6.24.

Top of Page