packages: mplayer/mplayer-shared_live.patch - up to 34805

blekot blekot at pld-linux.org
Sat Mar 10 14:17:17 CET 2012


Author: blekot                       Date: Sat Mar 10 13:17:17 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 34805

---- Files affected:
packages/mplayer:
   mplayer-shared_live.patch (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: packages/mplayer/mplayer-shared_live.patch
diff -u packages/mplayer/mplayer-shared_live.patch:1.4 packages/mplayer/mplayer-shared_live.patch:1.5
--- packages/mplayer/mplayer-shared_live.patch:1.4	Mon Jul 25 11:45:15 2011
+++ packages/mplayer/mplayer-shared_live.patch	Sat Mar 10 14:17:11 2012
@@ -1,16 +1,15 @@
---- ./configure.org	2011-02-17 12:15:19.000000000 +0100
-+++ ./configure	2011-02-18 00:49:43.984157326 +0100
-@@ -6778,11 +6778,7 @@
+--- mplayer-r34805/configure.orig	2012-03-10 12:22:12.000000000 +0000
++++ mplayer-r34805/configure	2012-03-10 12:24:33.000000000 +0000
+@@ -6671,11 +6671,7 @@
      _livelibdir=$(echo $I| sed s/-I//)
      test -e "$_livelibdir/BasicUsageEnvironment/libBasicUsageEnvironment.a" &&
-         cxx_check $I/liveMedia/include $I/UsageEnvironment/include $I/BasicUsageEnvironment/include $I/groupsock/include $_livelibdir/BasicUsageEnvironment/libBasicUsageEnvironment.a $_livelibdir/UsageEnvironment/libUsageEnvironment.a $_livelibdir/groupsock/libgroupsock.a $_ld_sock &&
+         cxx_check $I/liveMedia/include $I/UsageEnvironment/include $I/BasicUsageEnvironment/include $I/groupsock/include $_livelibdir/BasicUsageEnvironment/libBasicUsageEnvironment.a $_livelibdir/UsageEnvironment/libUsageEnvironment.a $_livelibdir/groupsock/libgroupsock.a $ld_sock &&
 -      extra_ldflags="$_livelibdir/liveMedia/libliveMedia.a \
 -                 $_livelibdir/UsageEnvironment/libUsageEnvironment.a \
 -                 $_livelibdir/BasicUsageEnvironment/libBasicUsageEnvironment.a \
 -                 $_livelibdir/groupsock/libgroupsock.a \
--                 $extra_ldflags  -lstdc++ $_ld_sock" \
+-                 $extra_ldflags  -lstdc++ $ld_sock" \
 +      extra_ldflags="-lliveMedia -lgroupsock -lUsageEnvironment -lBasicUsageEnvironment $extra_ldflags -lstdc++" && \
        extra_cxxflags="-I$_livelibdir/liveMedia/include \
                    -I$_livelibdir/UsageEnvironment/include \
                    -I$_livelibdir/BasicUsageEnvironment/include \
-
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mplayer/mplayer-shared_live.patch?r1=1.4&r2=1.5&f=u



More information about the pld-cvs-commit mailing list