From: Bernd Kuhls <bernd.kuhls@t-online.de>
Date: Sat, 2 Jul 2016 17:35:13 +0000 (+0200)
Subject: package/mplayer: Fix static linking with tremor & libogg
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e63e6dc87d327f65c0bcf7c68878d4f83ee973e8;p=buildroot.git

package/mplayer: Fix static linking with tremor & libogg

Fixes
http://autobuild.buildroot.net/results/bc9/bc98fa585399b53ea181dbaf392b93424145911d/

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---

diff --git a/package/mplayer/0005-tremor-ogg.patch b/package/mplayer/0005-tremor-ogg.patch
new file mode 100644
index 0000000000..b4d65052a3
--- /dev/null
+++ b/package/mplayer/0005-tremor-ogg.patch
@@ -0,0 +1,29 @@
+Fix static linking with tremor & libogg
+
+The order of the libraries needs to be changed to fix a bug during
+static linking caught by buildroot autobuilders:
+
+http://autobuild.buildroot.net/results/bc9/bc98fa585399b53ea181dbaf392b93424145911d/
+
+/home/test/autobuild/instance-3/output/host/usr/powerpc-buildroot-linux-uclibc/sysroot/usr/lib/libvorbisidec.a(synthesis.o): In function `_vorbis_synthesis1':
+synthesis.c:(.text+0x90): undefined reference to `oggpack_readinit'
+synthesis.c:(.text+0x9c): undefined reference to `oggpack_read'
+[...]
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+(patch sent upstream:
+ http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/2016-July/073501.html)
+
+Index: configure
+===================================================================
+--- a/configure	(revision 37873)
++++ b/configure	(working copy)
+@@ -6629,7 +6629,7 @@
+   def_tremor='#define CONFIG_TREMOR 1'
+   codecmodules="tremor $codecmodules"
+   res_comment="integer libvorbis"
+-  extra_ldflags="$extra_ldflags -logg -lvorbisidec"
++  extra_ldflags="$extra_ldflags -lvorbisidec -logg"
+ elif test "$_libvorbis" = yes ; then
+   _vorbis=yes
+   def_vorbis='#define CONFIG_OGGVORBIS 1'