From 3e4bd1a86275e1e9198367cc11d1d1b59f37ec07 Mon Sep 17 00:00:00 2001
From: blekot <blekot@pld-linux.org>
Date: Sat, 10 Mar 2012 13:17:11 +0000
Subject: [PATCH] - up to 34805

Changed files:
    mplayer-ldflags.patch -> 1.5
    mplayer-shared_live.patch -> 1.5
---
 mplayer-ldflags.patch     | 15 ++++++++-------
 mplayer-shared_live.patch | 11 +++++------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/mplayer-ldflags.patch b/mplayer-ldflags.patch
index 7977708..1eee5d3 100644
--- a/mplayer-ldflags.patch
+++ b/mplayer-ldflags.patch
@@ -1,6 +1,6 @@
---- mplayer-r32669/configure.orig	2010-11-03 09:12:22.000000000 +0100
-+++ mplayer-r32669/configure	2010-11-30 09:21:10.000406064 +0100
-@@ -523,7 +523,8 @@
+--- mplayer-r32669/configure.orig	2012-03-03 23:31:28.000000000 +0000
++++ mplayer-r32669/configure	2012-03-10 12:19:51.000000000 +0000
+@@ -593,7 +593,8 @@
  
  Use these options if autodetection fails:
    --extra-cflags=FLAGS        extra CFLAGS
@@ -10,7 +10,7 @@
    --extra-libs=FLAGS          extra linker flags
    --extra-libs-mplayer=FLAGS  extra linker flags for MPlayer
    --extra-libs-mencoder=FLAGS extra linker flags for MEncoder
-@@ -853,6 +854,9 @@
+@@ -929,6 +930,9 @@
    --extra-cflags=*)
      extra_cflags=$(echo $ac_option | cut -d '=' -f 2-)
      ;;
@@ -20,7 +20,7 @@
    --extra-ldflags=*)
      extra_ldflags=$(echo $ac_option | cut -d '=' -f 2-)
      ;;
-@@ -7802,7 +7806,7 @@
+@@ -7590,7 +7594,7 @@
  
  echocheck "compiler support for noexecstack"
  if cflag_check -Wl,-z,noexecstack ; then
@@ -29,12 +29,13 @@
    echores "yes"
  else
    echores "no"
-@@ -8023,6 +8027,7 @@
+@@ -7988,6 +7992,8 @@
  CFLAGS_SVGALIB_HELPER    = $cflags_svgalib_helper
  CFLAGS_TREMOR_LOW        = $cflags_tremor_low
  
 +LDFLAGS            = $real_ldflags
- EXTRALIBS          = $extra_ldflags $_ld_static $extra_libs
++
+ EXTRALIBS          = $extra_ldflags $ld_static $extra_libs
  EXTRALIBS_MPLAYER  = $libs_mplayer
  EXTRALIBS_MENCODER = $libs_mencoder
 --- mplayer-r32669/Makefile.orig	2010-10-27 19:55:45.000000000 +0200
diff --git a/mplayer-shared_live.patch b/mplayer-shared_live.patch
index c1e3740..bb9c18d 100644
--- a/mplayer-shared_live.patch
+++ b/mplayer-shared_live.patch
@@ -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 \
-
-- 
2.44.0