Revert "smpeg: convert to new staging and bump SRCREV a bit"

This reverts commit 13c2e6cede23f9af11c7bf1909ac9c52649b1098.

diff --git a/recipes/smpeg/smpeg/as-fix.patch b/recipes/smpeg/smpeg/as-fix.patch
new file mode 100644 (file)
index 0000000..1a74701
--- /dev/null
+++ b/recipes/smpeg/smpeg/as-fix.patch
@@ -0,0 +1,18 @@
+---
+ configure.in |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- trunk.orig/configure.in
++++ trunk/configure.in
+@@ -54,10 +54,11 @@ AC_PROG_MAKE_SET
+ AC_PROG_CC
+ AC_PROG_CXX
+ AC_LIBTOOL_WIN32_DLL
+ AM_PROG_LIBTOOL
+ AC_PROG_INSTALL
++AM_PROG_AS
+ 
+ dnl Ugh.
+ AS="$CC"
+ CCAS="$CC"
+ AC_SUBST(AS)

diff --git a/recipes/smpeg/smpeg_svn.bb b/recipes/smpeg/smpeg_svn.bb
index 7883463..343e0bd 100644 (file)
--- a/recipes/smpeg/smpeg_svn.bb
+++ b/recipes/smpeg/smpeg_svn.bb
@@ -6,31 +6,41 @@ DEPENDS = "virtual/libsdl"
 PROVIDES = "smpeg"
 PV = "0.4.5+svnr${SRCPV}"
 PE = "1"
-SRCREV = "387"
+SRCREV = "370"
 
-SRC_URI = "svn://svn.icculus.org/smpeg/;module=trunk"
+SRC_URI = "svn://svn.icculus.org/smpeg/;module=trunk  \
+          file://m4.patch;patch=1 \
+          file://as-fix.patch;patch=1"
 
 S = "${WORKDIR}/trunk"
 
-inherit autotools binconfig
+inherit autotools
 
+export SDL_CONFIG = "${STAGING_BINDIR_CROSS}/sdl-config"
+
+CFLAGS_append = " -I${STAGING_INCDIR}/SDL"
 EXTRA_OECONF = "--disable-gtktest --disable-opengl-player --without-x \
                --without-gtk --disable-gtk-player"
 
 do_configure_prepend () {
        touch NEWS AUTHORS ChangeLog
-       # drop all .m4 which are available in staging
-       rm -f acinclude/gtk-2.0.m4 \
-             acinclude/libtool.m4 \
-             acinclude/ltdl.m4 \
-             acinclude/ltoptions.m4 \
-             acinclude/ltsugar.m4 \
-             acinclude/ltversion.m4 \
-             acinclude/lt~obsolete.m4 \
-             acinclude/pkg.m4 \
-             acinclude/sdl.m4 \
-             aclocal.m4 \
-             acinclude.m4
+       rm -f acinclude.m4
+}
+
+do_stage() {
+       oe_libinstall -so -C .libs libsmpeg-0.4 ${STAGING_LIBDIR}
+       ln -sf libsmpeg-0.4.so ${STAGING_LIBDIR}/libsmpeg.so
+
+       for f in "*.h"
+       do
+               install -m 0644 ${f} ${STAGING_INCDIR}/SDL
+       done
+
+        cat smpeg-config | sed -e "s,-I/usr/include/SDL,-I${STAGING_INCDIR}/SDL," \
+                         | sed -e "s,-I/usr/include/smpeg, ," \
+                         | sed -e "s,libdirs ,mickey_is_cool ," \
+                         | sed -e "s,-lSDL ,-lSDL-1.2 , "> ${STAGING_BINDIR_CROSS}/smpeg-config
+        chmod a+rx ${STAGING_BINDIR_CROSS}/smpeg-config
 }
 
 PACKAGES =+ "plaympeg "