fix libmikmod staging and fix mikmod linking

BKrev: 404a25b5KWdl5sWaFXBTH36L1fML3g

diff --git a/libmikmod/libmikmod_3.2.0-beta2.oe b/libmikmod/libmikmod_3.2.0-beta2.oe
index e69de29..8174318 100644 (file)
--- a/libmikmod/libmikmod_3.2.0-beta2.oe
+++ b/libmikmod/libmikmod_3.2.0-beta2.oe
@@ -0,0 +1,25 @@
+DESCRIPTION=libmikmod is a module player library supporting many formats, including mod, s3m, it, and xm.
+SECTION=libs
+PRIORITY=optional
+RDEPENDS=libc6
+DEPENDS=virtual/libc
+
+SRC_URI = http://mikmod.raphnet.net/files/${P}.tar.gz
+
+inherit autotools libtool
+
+EXTRA_OECONF = --disable-af --disable-alsa --disable-esd --enable-oss --disable-sam9407 --disable-ultra --disable-esdtest --enable-threads --enable-shared --disable-static
+
+do_configure() {
+       oe_runconf
+}
+
+do_stage() {
+       oe_soinstall libmikmod/.libs/libmikmod.so.3.0.0 ${STAGING_LIBDIR}/
+       install -m 0644 include/mikmod.h ${STAGING_INCDIR}/
+
+        cat libmikmod-config | sed 's,$libdir , ,' \
+                             | sed 's,$includes , ,' > ${STAGING_BINDIR}/libmikmod-config
+        chmod a+rx ${STAGING_BINDIR}/libmikmod-config
+}
+

diff --git a/mikmod/mikmod_3.2.2-beta1.oe b/mikmod/mikmod_3.2.2-beta1.oe
index e69de29..9170653 100644 (file)
--- a/mikmod/mikmod_3.2.2-beta1.oe
+++ b/mikmod/mikmod_3.2.2-beta1.oe
@@ -0,0 +1,12 @@
+DESCRIPTION=A module player based on libmikmod.
+SECTION=base
+PRIORITY=optional
+DEPENDS=virtual/libc libmikmod
+RDEPENDS=libc6 libmikmod
+
+SRC_URI = http://mikmod.raphnet.net/files/${P}.tar.bz2 \
+          file://${FILESDIR}/m4.patch;patch=1
+
+inherit autotools libtool
+
+LDFLAGS_append = " -lm"