[packages/mplayer] - enhanced visibility-hidden-fix patch to cover vstream code - added vstream patch to fix build with

[qboosh]

commit 990687b2a2203946ae0a022d055f5ef0edab8cfd
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Feb 24 21:41:56 2013 +0100

    - enhanced visibility-hidden-fix patch to cover vstream code
    - added vstream patch to fix build with vstream client (cannot leave -lvstream-client for other checks
      because libvstream-client requires external symbol)

 mplayer-visibility-hidden-fix.patch | 28 ++++++++++++++++++++++++++++
 mplayer-vstream.patch               | 20 ++++++++++++++++++++
 mplayer.spec                        |  8 +++++---
 3 files changed, 53 insertions(+), 3 deletions(-)
---
diff --git a/mplayer.spec b/mplayer.spec
index 20d48fe..f9f0039 100644
--- a/mplayer.spec
+++ b/mplayer.spec
@@ -152,10 +152,11 @@ Patch16:	%{name}-libcdio.patch
 Patch17:	%{name}-gsm.patch
 Patch18:	%{name}-openjpeg.patch
 Patch19:	%{name}-shared.patch
+Patch20:	%{name}-vstream.patch
 
 # codecs, outputs, demuxers:
-Patch20:	%{name}-auto-expand.patch
-Patch21:	%{name}-release_directfb.patch
+Patch21:	%{name}-auto-expand.patch
+Patch22:	%{name}-release_directfb.patch
 
 # goodies:
 Patch30:	%{name}-cp1250-fontdesc.patch
@@ -413,10 +414,11 @@ cp -f etc/codecs.conf etc/codecs.win32.conf
 %patch17 -p1
 %patch18 -p1
 %{?with_shared:%patch19 -p1}
+%patch20 -p1
 
 # codecs, outputs, demuxers:
-%patch20 -p1
 %patch21 -p1
+%patch22 -p1
 
 # goodies:
 %patch30 -p0
diff --git a/mplayer-visibility-hidden-fix.patch b/mplayer-visibility-hidden-fix.patch
index 5eed1e0..93593ec 100644
--- a/mplayer-visibility-hidden-fix.patch
+++ b/mplayer-visibility-hidden-fix.patch
@@ -55,3 +55,31 @@
  
  #ifdef __cplusplus
  };
+--- MPlayer-1.1/configure.orig	2013-02-24 17:53:33.092693098 +0100
++++ MPlayer-1.1/configure	2013-02-24 19:29:59.079116950 +0100
+@@ -7426,6 +7426,7 @@
+   _vstream=no
+   cat > $TMPC <<EOF
+ #include <vstream-client.h>
++#pragma GCC visibility push(default)
+ void vstream_error(const char *format, ... ) {}
+ int main(void) { vstream_start(); return 0; }
+ EOF
+--- MPlayer-1.1/stream/stream_vstream.c.orig	2011-10-21 17:44:58.000000000 +0200
++++ MPlayer-1.1/stream/stream_vstream.c	2013-02-24 21:03:09.752215665 +0100
+@@ -51,6 +51,7 @@
+ 
+ #include <vstream-client.h>
+ 
++#pragma GCC visibility push(default)
+ void vstream_error(const char *format, ...) {
+     char buf[1024];
+     va_list va;
+@@ -59,6 +60,7 @@
+     va_end(va);
+     mp_msg(MSGT_STREAM, MSGL_ERR, buf);
+ }
++#pragma GCC visibility pop
+ 
+ static struct stream_priv_s {
+   char* host;
diff --git a/mplayer-vstream.patch b/mplayer-vstream.patch
new file mode 100644
index 0000000..bc13050
--- /dev/null
+++ b/mplayer-vstream.patch
@@ -0,0 +1,20 @@
+--- MPlayer-1.1/configure.orig	2013-02-24 19:30:58.149114471 +0100
++++ MPlayer-1.1/configure	2013-02-24 19:44:59.449079165 +0100
+@@ -7435,7 +7435,7 @@
+ if test "$_vstream" = yes ; then
+   def_vstream='#define CONFIG_VSTREAM 1'
+   inputmodules="vstream $inputmodules"
+-  extra_ldflags="$extra_ldflags -lvstream-client"
++  ndextra_ldflags="$ndextra_ldflags -lvstream-client"
+ else
+   noinputmodules="vstream $noinputmodules"
+   def_vstream='#undef CONFIG_VSTREAM'
+@@ -8048,7 +8048,7 @@
+ 
+ LDFLAGS            = $real_ldflags
+ 
+-EXTRALIBS          = $extra_ldflags $ld_static $extra_libs
++EXTRALIBS          = $extra_ldflags $ndextra_ldflags $ld_static $extra_libs
+ EXTRALIBS_MPLAYER  = $libs_mplayer
+ EXTRALIBS_MENCODER = $libs_mencoder
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mplayer.git/commitdiff/990687b2a2203946ae0a022d055f5ef0edab8cfd