[Lunar-commits] <moonbase-other> MPlayer: fix dependencies

[v4hn]

commit 8214da417eb7e8133515b924451614a96fb9d154
Author: v4hn <me at v4hn.de>
Date: Sun, 14 Oct 2012 16:43:35 -0700
URL: https://github.com/lunar-linux/moonbase-other/commit/8214da417eb7e8133515b924451614a96fb9d154

MPlayer: fix dependencies
---
  video/MPlayer/BUILD   | +5/-1     
  video/MPlayer/DEPENDS | +3/-3     
  2 files changed, 8 insertions(+), 4 deletions(-)

--- a/video/MPlayer/BUILD
+++ b/video/MPlayer/BUILD
@@ -1,8 +1,12 @@
 (
 
   sedit '1s@/usr/bin/awk@/bin/awk@' vidix/pci_db2c.awk &&
+
+  # --extra_* are expected only once, but we might need more
+  sedit "s:extra_\([^=]*\)=\(\\\$.*\)$:extra_\1=\"\$extra_\1 \2\":" configure &&
+
   # Remove subversion directories
-  find -name "\.svn" -type d -print0 | xargs -0 rm -rf
+  find -name "\.svn" -type d -print0 | xargs -0 rm -rf &&
 
   # using CFLAGS other than MPlayer's auto-detected will break
   bad_flags compiler  &&
--- a/video/MPlayer/DEPENDS
+++ b/video/MPlayer/DEPENDS
@@ -33,7 +33,7 @@ optional_depends alsa-utils \
                  "for ALSA sound support"
 
 optional_depends mpg123 \
-                 "--enable-mpg123" \
+                 "--enable-mpg123 --extra-libs=-lmpg123" \
                  "--disable-mpg123" \
                  "for mp3 audio format"
 
@@ -93,7 +93,7 @@ optional_depends mpeg2dec \
                  "use system library for mpeg-1 and mpeg-2 support"
 
 optional_depends live555 \
-                 "--enable-live" \
+                 "--enable-live --extra-cflags=-I/usr/include/liveMedia --extra-cflags=-I/usr/include/UsageEnvironment --extra-cflags=-I/usr/include/BasicUsageEnvironment --extra-cflags=-I/usr/include/groupsock --extra-libs=-lstdc++ --extra-libs=-lliveMedia --extra-libs=-lUsageEnvironment --extra-libs=-lBasicUsageEnvironment --extra-libs=-lgroupsock" \
                  "--disable-live" \
                  "for RTP/RTCP, RTSP, SIP support"
 
@@ -104,6 +104,6 @@ optional_depends ffmpeg \
                  "use ffmpeg (with e.g. x264-snapshot)"
 
 optional_depends libbs2b \
-                 "--enable-libbs2b" \
+                 "--enable-libbs2b --extra-cflags=-I/usr/include/bs2b/ --extra-libs=-lbs2b" \
                  "--disable-libbs2b" \
                  "for better sound via headphones"