aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--recipes/libmikmod/libmikmod_3.2.0-beta2.bb11
-rw-r--r--recipes/libsdl/libsdl-mixer_1.2.11.bb2
2 files changed, 3 insertions, 10 deletions
diff --git a/recipes/libmikmod/libmikmod_3.2.0-beta2.bb b/recipes/libmikmod/libmikmod_3.2.0-beta2.bb
index 61cbdbcf2c..d692f1aa12 100644
--- a/recipes/libmikmod/libmikmod_3.2.0-beta2.bb
+++ b/recipes/libmikmod/libmikmod_3.2.0-beta2.bb
@@ -3,7 +3,7 @@ SECTION = "libs"
PRIORITY = "optional"
LICENSE = "LGPL"
-PR="r1"
+PR="r2"
DEFAULT_PREFERENCE = "-1"
@@ -26,14 +26,7 @@ EXTRA_OECONF = "\
--disable-ultra \
--disable-esdtest \
--enable-threads \
+ LIBRARY_LIB=-lm \
"
-
-do_stage() {
- oe_libinstall -a -so -C libmikmod libmikmod ${STAGING_LIBDIR}
- install -m 0644 ${S}/include/mikmod.h ${STAGING_INCDIR}/
- install -d ${STAGING_DATADIR}/aclocal/
- install -m 0644 libmikmod.m4 ${STAGING_DATADIR}/aclocal/
-}
-
SRC_URI[md5sum] = "19fc0879aebd1610813a23bd84726362"
SRC_URI[sha256sum] = "857b66ef04d695f70414188b985e08b04f1f62cc250d72a43d0e0609dfbdba03"
diff --git a/recipes/libsdl/libsdl-mixer_1.2.11.bb b/recipes/libsdl/libsdl-mixer_1.2.11.bb
index 8f45939d59..1d5b1f9d08 100644
--- a/recipes/libsdl/libsdl-mixer_1.2.11.bb
+++ b/recipes/libsdl/libsdl-mixer_1.2.11.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
DEPENDS = "virtual/libsdl flac libmikmod libvorbis libmad"
LICENSE = "LGPL"
-PR = "r2"
+PR = "r3"
SRC_URI = "http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-${PV}.tar.gz \
file://fix-flac-madness.diff"