From fbe9f3dae3a57556e20d76b4fb76cd14e2f83b61 Mon Sep 17 00:00:00 2001 From: Denis 'GNUtoo' Carikli Date: Thu, 22 Jan 2009 15:55:12 +0100 Subject: scummvm: fix the fact that none of the engines were builtin(so scummvm was useless) while keeping ENTERPRISE_DISTRO and minor fixes: *took the lacking scummvm/files/openmoko/openmoko-scummvm from the openmoko wiki *no-strip.patch for the 0.12.0 version : if you let the Makefile strip,openembedded skip stripping and so it can't copy the unstripped binaries before stripping...and so it creates an empty -dbg package *must check the stripping for the others versions *explanation of the main fix: most of the recipes added something like this: DEFINES="-DUNIX -DSCUMM_NEED_ALIGNMENT -DUSE_VORBIS -DUSE_ZLIB -DUSE_MPEG2 ${@base_conditional('ENTERPRISE_DISTRO', '1', '', '-DUSE_MAD -DUSE_MPEG2', d)}" this did override the DEFINES...and so defines such as -DENABLE_ENGINENAME=STATIC_PLUGIN were no longer defined...and so none of the engines were built... I removed it and remplaced it by ${@base_conditional('ENTERPRISE_DISTRO', '1', '--disable-mpeg2', '--with-mpeg2-prefix=${STAGING_LIBDIR}/..', d)} \ ${@base_conditional('ENTERPRISE_DISTRO', '1', '--disable-mad', '--with-mad-prefix=${STAGING_LIBDIR}/..', d)} \ I've also tested it with ENTREPRISE_DISTRO = "1" in my local.conf here are what I checked: **the configure log: Checking for MAD... no Checking for libmpeg2 >= 0.3.2... no **the run.do_configure.21902 shell script: --disable-mpeg2 twice in oe_runconf and in do_configure ..no other matches for mpeg same thing for --disable-mad **the about menu inside scummvm says vorbis zlib in the "features compiled in" section and there were no mention of mad,mp3 or mpeg2 *bump all PR --- packages/scummvm/files/no-strip.patch | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 packages/scummvm/files/no-strip.patch (limited to 'packages/scummvm/files/no-strip.patch') diff --git a/packages/scummvm/files/no-strip.patch b/packages/scummvm/files/no-strip.patch new file mode 100644 index 0000000000..4df1283263 --- /dev/null +++ b/packages/scummvm/files/no-strip.patch @@ -0,0 +1,22 @@ +Index: scummvm-0.12.0/ports.mk +=================================================================== +--- scummvm-0.12.0.orig/ports.mk ++++ scummvm-0.12.0/ports.mk +@@ -10,7 +10,7 @@ + # + install: all + $(INSTALL) -d "$(DESTDIR)$(BINDIR)" +- $(INSTALL) -c -s -m 755 "$(srcdir)/scummvm$(EXEEXT)" "$(DESTDIR)$(BINDIR)/scummvm$(EXEEXT)" ++ $(INSTALL) -c -m 755 "$(srcdir)/scummvm$(EXEEXT)" "$(DESTDIR)$(BINDIR)/scummvm$(EXEEXT)" + $(INSTALL) -d "$(DESTDIR)$(MANDIR)/man6/" + $(INSTALL) -c -m 644 "$(srcdir)/dists/scummvm.6" "$(DESTDIR)$(MANDIR)/man6/scummvm.6" + $(INSTALL) -d "$(DESTDIR)$(PREFIX)/share/pixmaps/" +@@ -21,7 +21,7 @@ install: all + $(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(DIST_FILES_ENGINEDATA) "$(DESTDIR)$(DATADIR)/scummvm/" + ifdef DYNAMIC_MODULES + $(INSTALL) -d "$(DESTDIR)$(LIBDIR)/scummvm/" +- $(INSTALL) -c -s -m 644 $(DIST_FILES_PLUGINS) "$(DESTDIR)$(LIBDIR)/scummvm/" ++ $(INSTALL) -c -m 644 $(DIST_FILES_PLUGINS) "$(DESTDIR)$(LIBDIR)/scummvm/" + endif + + uninstall: -- cgit v1.2.3