Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (34e86df6bbdb065091682b96177bd98da4286993)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Arwed von Merkatz <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (34e86df6bbdb065091682b96177bd98da4286993)
  • Date: Thu, 18 Oct 2007 12:14:31 -0500

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

video/mplayer/DEPENDS | 16 ++++++----------
video/mplayer/HISTORY | 6 ++++++
2 files changed, 12 insertions(+), 10 deletions(-)

New commits:
commit 34e86df6bbdb065091682b96177bd98da4286993
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

mplayer: dependency fixes for live, polypaudio and pulseaudio

diff --git a/video/mplayer/DEPENDS b/video/mplayer/DEPENDS
index b6fc581..4499d59 100755
--- a/video/mplayer/DEPENDS
+++ b/video/mplayer/DEPENDS
@@ -10,17 +10,18 @@ if [ "$MPLAYER_SVN" == "y" ]; then
depends subversion &&
optional_depends ffmpeg-svn \
"--disable-libavcodec_a --disable-libavformat_a --disable-libpostproc_a
--disable-libavutil_a" "" "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"
+ optional_depends pulseaudio "" "--disable-pulse" "for pulseaudio audio
output"
else
optional_depends libdvdnav \
"" \
"--disable-dvdnav" \
"support for DVD navigation" &&
- 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"
+ optional_depends polypaudio "" "--disable-polyp" "for polypaudio audio
output"
fi &&

+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"
+
# audio codecs
optional_depends libmpcdec "" "--disable-musepack" "for musepack (mpc)
support" &&
optional_depends libmad "" "--disable-mad" "to play mp3 audio using libmad"
&&
@@ -49,7 +50,6 @@ optional_depends esound "" "--disable-esd" "for direct esd
audio output" &&
optional_depends arts "" "--disable-arts" "for arts audio output" &&
optional_depends alsa-lib "" "--disable-alsa" "for alsa audio output" &&
optional_depends nas "" "--disable-nas" "for NAS audio output" &&
-optional_depends polypaudio "" "--disable-polyp" "for polypaudio audio
output" &&

# video devices
optional_depends X11-LIBS "" "--disable-x11 --disable-xv --disable-xvmc
--disable-xmga" "for X11 output support" &&
@@ -66,11 +66,7 @@ optional_depends jpeg "" "--disable-jpeg" "to output to
.jpeg files" &&

# misc
optional_depends cdparanoia "" "--disable-cdparanoia" "to play audio cds"
&&
-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 live "" "--disable-live" "for live.com Streaming Media
(sdp/rtsp) support" &&
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 c5fd079..4dd6dfd 100644
--- a/video/mplayer/HISTORY
+++ b/video/mplayer/HISTORY
@@ -1,3 +1,9 @@
+2007-10-18 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: removed the MPLAYER_SVN check around the live dependency,
+ both versions use the new flags now, moved polypaudio
+ optional_depends to stable version, added pulseaudio
+ optional_depends to svn version
+
2007-10-15 Juuso Alasuutari <iuso AT sourcemage.org>
* DEPENDS: Removed redundant and broken libdts option,
libdca is the same library (libdts must be the old name



  • [SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (34e86df6bbdb065091682b96177bd98da4286993), Arwed von Merkatz, 10/18/2007

Archive powered by MHonArc 2.6.24.

Top of Page