Skip to Content.
Sympa Menu

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

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 (67f6281a3710dd7d167d91213115ab53735b279d)
  • Date: Wed, 14 Feb 2007 14:33:00 -0600

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

video/ffmpeg-svn/DEPENDS | 8 ++++----
video/ffmpeg-svn/HISTORY | 7 +++++++
video/ffmpeg-svn/INSTALL | 4 +++-
video/mplayer/DEPENDS | 8 ++++++--
video/mplayer/HISTORY | 4 ++++
video/mplayer/PRE_BUILD | 2 ++
6 files changed, 26 insertions(+), 7 deletions(-)

New commits:
commit 67f6281a3710dd7d167d91213115ab53735b279d
Author: Arwed v. Merkatz <v.merkatz AT gmx.net>
Commit: Arwed v. Merkatz <v.merkatz AT gmx.net>

mplayer: only apply patch for stable version, fixed usage of live library

commit 46e24a3008e538fbfd36aec4c63f42721530f266
Author: Arwed v. Merkatz <v.merkatz AT gmx.net>
Commit: Arwed v. Merkatz <v.merkatz AT gmx.net>

ffmpeg-svn: fixed some options, install headers needed by mplayer svn

diff --git a/video/ffmpeg-svn/DEPENDS b/video/ffmpeg-svn/DEPENDS
index a54f50c..dd7ae77 100755
--- a/video/ffmpeg-svn/DEPENDS
+++ b/video/ffmpeg-svn/DEPENDS
@@ -4,15 +4,15 @@ optional_depends "nasm" \
"--disable-mmx" \
"for MMX support" &&
optional_depends "lame" \
- "--enable-mp3lame" \
+ "--enable-libmp3lame" \
"" \
"for mp3 encoding via libmp3lame" &&
optional_depends "libvorbis" \
- "--enable-libogg --enable-vorbis" \
+ "--enable-libogg --enable-libvorbis" \
"" \
"for ogg/vorbis support" &&
optional_depends "faad2" \
- "--enable-faad" \
+ "--enable-libfaad" \
"" \
"for AAC audio support" &&
optional_depends "imlib2" \
@@ -24,7 +24,7 @@ optional_depends "freetype2" \
"" \
"for a text render plugin" &&
optional_depends "libdts" \
- "--enable-dts" \
+ "--enable-libdts" \
"" \
"for DTS audio decoding" &&
optional_depends "xvid" \
diff --git a/video/ffmpeg-svn/HISTORY b/video/ffmpeg-svn/HISTORY
index 66798d3..7dc0746 100644
--- a/video/ffmpeg-svn/HISTORY
+++ b/video/ffmpeg-svn/HISTORY
@@ -1,3 +1,10 @@
+2007-02-14 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: several --enable options got renamed
+
+2007-02-13 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * INSTALL: install bswap.h, riff.h headers again,
+ as mplayer svn needs them
+
2007-02-03 Treeve Jelbert <treeve AT pi.be>
* DETAILS, PREPARE, PRE_BUILD, BUILD:
add amr_nb-fixed, amr_wb support
diff --git a/video/ffmpeg-svn/INSTALL b/video/ffmpeg-svn/INSTALL
index d3f6c19..ba4fac5 100755
--- a/video/ffmpeg-svn/INSTALL
+++ b/video/ffmpeg-svn/INSTALL
@@ -1,3 +1,5 @@
make_single &&
install_config_file doc/ffserver.conf ${INSTALL_ROOT}/etc/ffserver.conf &&
-make install
+make install &&
+cp libavutil/bswap.h $INSTALL_ROOT/usr/include/ffmpeg &&
+cp libavformat/riff.h $INSTALL_ROOT/usr/include/ffmpeg
diff --git a/video/mplayer/DEPENDS b/video/mplayer/DEPENDS
index 2acdd2c..f96720a 100755
--- a/video/mplayer/DEPENDS
+++ b/video/mplayer/DEPENDS
@@ -9,7 +9,7 @@ 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 --disable-libavformat --disable-libpostproc
--disable-libavutil" "" "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
@@ -62,7 +62,11 @@ optional_depends jpeg "" "--disable-jpe

# misc
optional_depends cdparanoia "" "--disable-cdparanoia" "to play audio cds"
&&
-optional_depends live "--enable-live --with-livelibdir=/usr/lib/live"
"--disable-live" "for live.com Streaming Media (sdp/rtsp) support" &&
+if [[ $MPLAYER_SVN = y ]]; then
+ optional_depends live "" "--disable-live" "for live.com Streaming Media
(sdp/rtsp) support"
+else
+ optional_depends live "--enable-live --with-livelibdir=/usr/lib/live"
"--disable-live" "for live.com Streaming Media (sdp/rtsp) support"
+fi &&
optional_depends lirc "" "--disable-lirc" "for remote-control" &&
optional_depends freetype2 "" "--disable-freetype" "for truetype subtitle
font support" &&
optional_depends fontconfig "" "--disable-fontconfig" "for fontconfig font
lookup support" &&
diff --git a/video/mplayer/HISTORY b/video/mplayer/HISTORY
index 30b97a8..9760aa6 100644
--- a/video/mplayer/HISTORY
+++ b/video/mplayer/HISTORY
@@ -1,3 +1,7 @@
+2007-02-13 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * PRE_BUILD: only apply patch for stable mplayer, not for svn version
+ * DEPENDS: don't pass --enable-live to svn version as that breaks it
+
2007-01-16 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* sorry, forgot to increase PATCHLEVEL yesterday
=> DETAILS: added PATCHLEVEL
diff --git a/video/mplayer/PRE_BUILD b/video/mplayer/PRE_BUILD
index e7a7a89..69cda24 100755
--- a/video/mplayer/PRE_BUILD
+++ b/video/mplayer/PRE_BUILD
@@ -1,3 +1,5 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
+if [[ $MPLAYER_SVN != y ]]; then
patch -p0 < $SCRIPT_DIRECTORY/Makefile.patch
+fi



  • [SM-Commit] GIT changes to master grimoire by Arwed v. Merkatz (67f6281a3710dd7d167d91213115ab53735b279d), Arwed v. Merkatz, 02/14/2007

Archive powered by MHonArc 2.6.24.

Top of Page