[oe-commits] Eric Benard : mplayer_svn : fix compilation problem

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: ff57f14c99a6ff61ffb7f1c533523e3e934f96e5
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=ff57f14c99a6ff61ffb7f1c533523e3e934f96e5

Author: Eric Benard <eric at eukrea.com>
Date:   Fri Apr 30 09:33:43 2010 +0200

mplayer_svn : fix compilation problem

- this patch fix the following error (met for a x86 target) :

| loader/module.o: In function `MODULE_GetProcAddress':
| module.c:(.text+0x125): undefined reference to `report_entry'
| module.c:(.text+0x12f): undefined reference to `report_ret'
| module.c:(.text+0x139): undefined reference to `wrapper_target'
| module.c:(.text+0x13e): undefined reference to `wrapper'
| loader/module.o: In function `LoadLibraryExA':
| module.c:(.text+0x10d4): undefined reference to `report_entry'
| module.c:(.text+0x10de): undefined reference to `report_ret'
| module.c:(.text+0x10ea): undefined reference to `wrapper_target'
| module.c:(.text+0x10f0): undefined reference to `wrapper'
| collect2: ld returned 1 exit status
| make: *** [mplayer] Error 1

- also add --disable-xss --disable-dga1 --disable-dga2 in order to
prevent configure to autodetect these options which leads to a
dependency problem.

Signed-off-by: Eric Benard <eric at eukrea.com>
Acked-by: Denis Carikli <GNUtoo at no-log.org>

---

 recipes/mplayer/files/fix-emu_qtx_api.diff |   33 ++++++++++++++++++++++++++++
 recipes/mplayer/mplayer_svn.bb             |    6 ++++-
 2 files changed, 38 insertions(+), 1 deletions(-)

diff --git a/recipes/mplayer/files/fix-emu_qtx_api.diff b/recipes/mplayer/files/fix-emu_qtx_api.diff
new file mode 100644
index 0000000..e657475
--- /dev/null
+++ b/recipes/mplayer/files/fix-emu_qtx_api.diff
@@ -0,0 +1,33 @@
+http://bugs.gentoo.org/213836
+
+Fix the following error :
+
+| loader/module.o: In function `MODULE_GetProcAddress':
+| module.c:(.text+0x125): undefined reference to `report_entry'
+| module.c:(.text+0x12f): undefined reference to `report_ret'
+| module.c:(.text+0x139): undefined reference to `wrapper_target'
+| module.c:(.text+0x13e): undefined reference to `wrapper'
+| loader/module.o: In function `LoadLibraryExA':
+| module.c:(.text+0x10d4): undefined reference to `report_entry'
+| module.c:(.text+0x10de): undefined reference to `report_ret'
+| module.c:(.text+0x10ea): undefined reference to `wrapper_target'
+| module.c:(.text+0x10f0): undefined reference to `wrapper'
+| collect2: ld returned 1 exit status
+| make: *** [mplayer] Error 1
+
+---
+diff --git a/loader/module.c b/loader/module.c
+index e316cf0..2023acb 100644
+--- a/loader/module.c
++++ b/loader/module.c
+@@ -9,8 +9,8 @@
+  */
+ 
+ // define for quicktime calls debugging and/or MacOS-level emulation:
+-#ifndef __APPLE__
+-#define EMU_QTX_API
++#ifdef __APPLE__
++#undef EMU_QTX_API
+ #endif /* __APPLE__ */
+ 
+ // define for quicktime debugging (verbose logging):
diff --git a/recipes/mplayer/mplayer_svn.bb b/recipes/mplayer/mplayer_svn.bb
index dd94767..f26318c 100644
--- a/recipes/mplayer/mplayer_svn.bb
+++ b/recipes/mplayer/mplayer_svn.bb
@@ -14,6 +14,7 @@ SRC_URI = "svn://svn.mplayerhq.hu/mplayer;module=trunk \
        file://fix-exp.diff;patch=1;maxrev=30291 \
 	   file://fix-addrinfo.patch;patch=1;maxrev=30302 \
        file://fix-avconfig.diff;patch=1;maxrev=30376 \
+	   file://fix-emu_qtx_api.diff;patch=1;maxrev=30165 \
 "
 
 SRCREV = "30165"
@@ -39,7 +40,7 @@ RCONFLICTS_${PN} = "mplayer-atty"
 RREPLACES_${PN} = "mplayer-atty"
 
 PV = "0.0+1.0rc3+svnr${SRCPV}"
-PR = "r19"
+PR = "r20"
 DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_angstrom = "1"
 DEFAULT_PREFERENCE_shr = "1"
@@ -156,6 +157,9 @@ EXTRA_OECONF = " \
 	--disable-tga \
 	--disable-pnm \
 	--disable-md5sum \
+	--disable-xss \
+	--disable-dga1 \
+	--disable-dga2 \
 	\
 	--enable-alsa \
 	--enable-ossaudio \