Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Arwed v. Merkatz (001d92b982a21f3f83d1a7b296c6fc52ec2b513d)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: "Arwed v. Merkatz" <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Arwed v. Merkatz (001d92b982a21f3f83d1a7b296c6fc52ec2b513d)
  • Date: Wed, 21 Jun 2006 11:47:53 -0500

GIT changes to master grimoire by Arwed v. Merkatz <v.merkatz AT gmx.net>:

dev/null |binary
video/motion/DETAILS | 2 +-
video/motion/FINAL | 3 +++
video/motion/HISTORY | 5 +++++
video/motion/PRE_BUILD | 3 +++
video/motion/motion-3.2.4.tar.gz.sig | 0
video/motion/motion-3.2.6.tar.gz.sig |binary
video/mplayer/DEPENDS | 9 ++++++---
video/mplayer/HISTORY | 3 +++
9 files changed, 21 insertions(+), 4 deletions(-)

New commits:
commit 001d92b982a21f3f83d1a7b296c6fc52ec2b513d
Author: Arwed <arwed@Otherland.(none)>
Commit: Arwed v. Merkatz <v.merkatz AT gmx.net>

motion: updated to 3.2.6

commit c862ef13442d6d47f09a9e343d38ccd91f99c745
Author: Arwed <arwed@Otherland.(none)>
Commit: Arwed v. Merkatz <v.merkatz AT gmx.net>

mplayer: some optional_depends changed option names in svn version

diff --git a/video/motion/DETAILS b/video/motion/DETAILS
index aac43e8..734f815 100755
--- a/video/motion/DETAILS
+++ b/video/motion/DETAILS
@@ -1,5 +1,5 @@
SPELL=motion
- VERSION=3.2.4
+ VERSION=3.2.6
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/video/motion/FINAL b/video/motion/FINAL
new file mode 100755
index 0000000..e92c7d9
--- /dev/null
+++ b/video/motion/FINAL
@@ -0,0 +1,3 @@
+message "${MESSAGE_COLOR}The configuration directive ffmpeg_filename has
changed name"
+message "to movie_filename in motion 3.2.6, if you used that directive,"
+message "you'll need to edit your config.${DEFAULT_COLOR}"
diff --git a/video/motion/HISTORY b/video/motion/HISTORY
index 08bb076..d2c7606 100644
--- a/video/motion/HISTORY
+++ b/video/motion/HISTORY
@@ -1,3 +1,8 @@
+2006-06-21 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DETAILS: updated to 3.2.6, bug #12727
+ * PRE_BUILD: added to fix compile with ffmpeg-svn
+ * FINAL: added a warning about config directive rename
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

diff --git a/video/motion/PRE_BUILD b/video/motion/PRE_BUILD
new file mode 100755
index 0000000..ad9362e
--- /dev/null
+++ b/video/motion/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+sedit 's/FFMPEG_VERSION_INT/LIBAVFORMAT_VERSION_INT/' ffmpeg.c
diff --git a/video/motion/motion-3.2.4.tar.gz.sig
b/video/motion/motion-3.2.4.tar.gz.sig
deleted file mode 100644
index 61fb70e..0000000
Binary files a/video/motion/motion-3.2.4.tar.gz.sig and /dev/null differ
diff --git a/video/motion/motion-3.2.6.tar.gz.sig
b/video/motion/motion-3.2.6.tar.gz.sig
new file mode 100644
index 0000000..3bcce65
Binary files /dev/null and b/video/motion/motion-3.2.6.tar.gz.sig differ
diff --git a/video/mplayer/DEPENDS b/video/mplayer/DEPENDS
index 8b0356d..0a85ca0 100755
--- a/video/mplayer/DEPENDS
+++ b/video/mplayer/DEPENDS
@@ -9,15 +9,18 @@ fi &&
if [[ $MPLAYER_SVN = y ]]; then
depends subversion &&
optional_depends ffmpeg-svn \
- "--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"
+ "--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 libvorbis "--disable-tremor-internal" "" "to use
external libvorbis to play ogg/vorbis audio"
+ optional_depends faad2 "--enable-faad-external" "" "to use shared faad
for AAC decoding"
+else
+ optional_depends libvorbis "--disable-internal-tremor" "" "to use
external libvorbis to play ogg/vorbis audio" &&
+ optional_depends faad2 "--enable-external-faad" "" "to use shared faad
for AAC decoding"
fi &&

# audio codecs
optional_depends libmpcdec "" "--disable-musepack" "for musepack (mpc)
support" &&
-optional_depends libvorbis "--disable-internal-tremor" "" "to use external
libvorbis to play ogg/vorbis audio" &&
optional_depends libmad "" "--disable-mad" "to play mp3 audio using libmad"
&&
optional_depends xmms "--enable-xmms" "" "for xmms input plugin support" &&
-optional_depends faad2 "--enable-external-faad" "" "to use shared faad for
AAC decoding" &&
optional_depends ladspa "" "--disable-ladspa" "for LADSPA audio filter"
&&
optional_depends libdts "" "--disable-libdts" "for DTS audio support" &&
optional_depends lame "" "" "to encode files with mp3 audio (mencoder)" &&
diff --git a/video/mplayer/HISTORY b/video/mplayer/HISTORY
index bf35881..109bfbb 100644
--- a/video/mplayer/HISTORY
+++ b/video/mplayer/HISTORY
@@ -1,3 +1,6 @@
+2006-06-21 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: options for vorbis and faad changed in svn
+
2006-06-12 Arwed v. Merkatz <v.merkatz AT gmx.net>
* DETAILS: updated to 1.0pre8, don't use gcc 3.4 for that anymore
* DEPENDS: removed gcc34, moved libmpcdec and twolame optional_depends



  • [SM-Commit] GIT changes to master grimoire by Arwed v. Merkatz (001d92b982a21f3f83d1a7b296c6fc52ec2b513d), Arwed v. Merkatz, 06/21/2006

Archive powered by MHonArc 2.6.24.

Top of Page