3 files changed, 68 insertions, 11 deletions
diff --git a/packages/smpeg/smpeg/as-fix.patch b/packages/smpeg/smpeg/as-fix.patch
new file mode 100644
index 0000000000..1a747018e5
--- /dev/null
+++ b/packages/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/packages/smpeg/smpeg/compile.patch b/packages/smpeg/smpeg/compile.patch
index 86ec4fca45..563334c972 100644
--- a/packages/smpeg/smpeg/compile.patch
+++ b/packages/smpeg/smpeg/compile.patch
@@ -3,17 +3,6 @@
 # Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
 #
 
---- smpeg/Makefile.am~compile	2002-09-26 01:24:04.000000000 -0400
-+++ smpeg/Makefile.am	2004-03-05 09:31:19.000000000 -0500
-@@ -4,7 +4,7 @@
- # These are the subdirectories that are always built
- SUBDIRS = audio video
- 
--CXXLD = cc
-+CXXLD = $(CC)
- 
- bin_SCRIPTS = smpeg-config
- 
 --- smpeg/MPEGaudio.h~compile	2006-06-10 22:41:41.000000000 +0200
 +++ smpeg/MPEGaudio.h	2006-06-10 22:41:51.000000000 +0200
 @@ -34,6 +34,9 @@
diff --git a/packages/smpeg/smpeg_svn.bb b/packages/smpeg/smpeg_svn.bb
new file mode 100644
index 0000000000..e6c0f6444a
--- /dev/null
+++ b/packages/smpeg/smpeg_svn.bb
@@ -0,0 +1,50 @@
+DESCRIPTION = "SMPEG is a general purpose MPEG video/audio \
+player for Linux based on the mpeg_play and SPLAY MPEG decoders."
+LICENSE = "LGPL"
+SECTION = "libs/multimedia"
+DEPENDS = "virtual/libsdl"
+PROVIDES = "smpeg"
+PV = "0.4.5+rsvn${SRCREV}"
+SRCREV = "370"
+
+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
+
+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
+	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 "
+SECTION_plaympeg = "console/multimedia"
+FILES_${PN} = "${libdir}"
+FILES_plaympeg = "${bindir}/plaympeg"
+FILES_${PN}-dev += "${bindir}"
+