sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] PERFORCE change 79752 by Arwed von Merkatz for review

From: Perforce Review Daemon <p4review AT smee.org>
To: "Andrew Stitt" <a AT t.armory.com>, "Arjan Bouter" <abouter AT sourcemage.org>, "SM-Commit Daemon" <sm-commit AT lists.ibiblio.org>, "duane_malcolm" <d.malcolm AT auckland.ac.nz>, "Ethan Grammatikidis" <eekee AT eekee.is-a-geek.org>, "Gareth Clay" <gareth AT caffeinefuelled.co.uk>, "Maurizio Boriani" <baux AT member.fsf.org>, "Pieter Lenaerts" <e-type AT sourcemage.org>, "Robin Cook" <rcook AT wyrms.net>, "Seth Woolley" <seth AT swoolley.homeip.net>, "Unet" <unet AT sourcemage.org>, "vladimir_marek" <vlmarek AT volny.cz>
Subject: [SM-Commit] PERFORCE change 79752 by Arwed von Merkatz for review
Date: Wed, 24 May 2006 17:05:01 +0100 (BST)

Change 79752 by arwed_von_merkatz@arwed-Otherland on 2006/05/24 17:03:36

ffmpeg-cvs and mplayer cvs temporarily switched to snapshot, bug
#12010

Affected files ...

... //sgl/grimoires/devel/video/ffmpeg-cvs/DEPENDS#6 edit
... //sgl/grimoires/devel/video/ffmpeg-cvs/DETAILS#7 edit
... //sgl/grimoires/devel/video/ffmpeg-cvs/HISTORY#20 edit
... //sgl/grimoires/devel/video/ffmpeg-cvs/ffmpeg_20060519.tar.bz2.sig#1 add
... //sgl/grimoires/devel/video/mplayer/DEPENDS#8 edit
... //sgl/grimoires/devel/video/mplayer/DETAILS#8 edit
... //sgl/grimoires/devel/video/mplayer/HISTORY#29 edit
... //sgl/grimoires/devel/video/mplayer/mplayer_20060519.tar.bz2.sig#1 add

Differences ...

==== //sgl/grimoires/devel/video/ffmpeg-cvs/DEPENDS#6 (xtext) ====

@@ -1,4 +1,4 @@
-depends CVS &&
+#depends CVS &&
optional_depends "nasm" \
"" \
"--disable-mmx" \

==== //sgl/grimoires/devel/video/ffmpeg-cvs/DETAILS#7 (xtext) ====

@@ -1,18 +1,24 @@
SPELL=ffmpeg-cvs
if test "$FFMPEG_CVS_AUTOUPDATE" = "y"; then
- VERSION=$(date +%Y%m%d)
+# VERSION=$(date +%Y%m%d)
+ VERSION=snapshot
else
- VERSION=cvs
+# VERSION=cvs
+ VERSION=snapshot
fi
- SOURCE=$SPELL.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
- SOURCE_URL[0]=cvs://:pserver:anonymous AT mplayerhq.hu:/cvsroot/ffmpeg:ffmpeg
+# SOURCE=$SPELL.tar.bz2
+ SOURCE=ffmpeg_20060519.tar.bz2
+#SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/ffmpeg_20060519
+#
SOURCE_URL[0]=cvs://:pserver:anonymous AT mplayerhq.hu:/cvsroot/ffmpeg:ffmpeg
+ SOURCE_URL[0]=http://www.mplayerhq.hu/~rtogni/snapshots/$SOURCE
WEB_SITE=http://ffmpeg.sourceforge.net
ENTERED=20030514
UPDATED=20041205
- SOURCE_IGNORE=volatile
+ SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
+# SOURCE_IGNORE=volatile
LICENSE[0]=GPL
- FORCE_DOWNLOAD=on
+# FORCE_DOWNLOAD=on
KEYWORDS="video"
SHORT="ffmpeg is complete video and audio broadcasting solution"
cat << EOF

==== //sgl/grimoires/devel/video/ffmpeg-cvs/HISTORY#20 (text) ====

@@ -1,3 +1,9 @@
+2006-05-24 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: commented all cvs stuff, switch to a snapshot from
+ http://www.mplayerhq.hu/~rtogni/snapshots/ as the cvs server is
+ dead
+ * DEPENDS: commented dependency on CVS
+
2006-05-19 Arwed v. Merkatz <v.merkatz AT gmx.net>
* DEPENDS: added optional_depends on sdl
* BUILD: fix SDL_LIBS after running configure so it works with

==== //sgl/grimoires/devel/video/mplayer/DEPENDS#8 (xtext) ====

@@ -10,7 +10,7 @@
fi &&

if [ "$MPLAYER_CVS" == "y" ]; then
- depends CVS &&
+# depends CVS &&
optional_depends ffmpeg-cvs \
"--enable-libavcodec_so --enable-libavformat_so --enable-libpostproc_so"
\
"--disable-libavcodec_so --disable-libavformat_so
--disable-libpostproc_so" \

==== //sgl/grimoires/devel/video/mplayer/DETAILS#8 (xtext) ====

@@ -1,15 +1,21 @@
SPELL=mplayer
if [ "$MPLAYER_CVS" == "y" ]; then
if [ "$MPLAYER_CVS_AUTOUPDATE" == "y" ]; then
- VERSION=$(date +%Y%m%d)
+# VERSION=$(date +%Y%m%d)
+ VERSION=snapshot
else
- VERSION=cvs
+# VERSION=cvs
+ VERSION=snapshot
fi
- SOURCE=$SPELL-cvs.tar.bz2
- SOURCE_URL[0]=cvs://:pserver:anonymous AT mplayerhq.hu:/cvsroot/mplayer:main
- SOURCE_IGNORE=volatile
- FORCE_DOWNLOAD=on
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-cvs
+# 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
else
VERSION=1.0pre7try2
SOURCE=MPlayer-$VERSION.tar.bz2

==== //sgl/grimoires/devel/video/mplayer/HISTORY#29 (text) ====

@@ -1,3 +1,9 @@
+2006-05-24 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: commented all cvs stuff, switch to a snapshot from
+ http://www.mplayerhq.hu/~rtogni/snapshots/ as the cvs server is
+ dead
+ * DEPENDS: commented dependency on CVS
+
2006-03-30 Arwed v. Merkatz <v.merkatz AT gmx.net>
* cvs.Makefile.patch: updated

[SM-Commit] PERFORCE change 79752 by Arwed von Merkatz for review, Perforce Review Daemon, 05/24/2006