openmoko-mediaplayer2: ship images, remove patches that have been applied upstream

diff --git a/packages/openmoko2/openmoko-mediaplayer2/.mtn2git_empty b/packages/openmoko2/openmoko-mediaplayer2/.mtn2git_empty
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/packages/openmoko2/openmoko-mediaplayer2/autofoo.patch b/packages/openmoko2/openmoko-mediaplayer2/autofoo.patch
deleted file mode 100644 (file)
index 5db5707..0000000
--- a/packages/openmoko2/openmoko-mediaplayer2/autofoo.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Index: openmoko-mediaplayer2/configure.ac
-===================================================================
---- openmoko-mediaplayer2.orig/configure.ac    2007-08-25 16:05:09.000000000 +0000
-+++ openmoko-mediaplayer2/configure.ac 2007-08-25 16:05:28.000000000 +0000
-@@ -14,12 +14,6 @@
- AM_GNU_GETTEXT
- AM_GNU_GETTEXT_VERSION([0.12.1])
- 
--
--CFLAGS="-I${prefix}/include $CFLAGS"
--AC_SUBST(CFLAGS)
--CPPFLAGS="-I${prefix}/include $CPPFLAGS"
--AC_SUBST(CPPFLAGS)
--
- # Check for GTK/GLib/GThread/Pango, dbus, OpenMoko libs, gstreamer, expat, uriparser and XSPF
- 
- PKG_CHECK_MODULES(GTK, [glib-2.0 >= 2.4.0 gtk+-2.0 >= 2.4.0 gthread-2.0 pango],,
-@@ -61,7 +55,5 @@
-     Makefile
-     src/Makefile
-     images/Makefile
--    po/Makefile.in
--    intl/Makefile
- ])
- AC_OUTPUT
-Index: openmoko-mediaplayer2/Makefile.am
-===================================================================
---- openmoko-mediaplayer2.orig/Makefile.am     2007-08-25 16:07:46.000000000 +0000
-+++ openmoko-mediaplayer2/Makefile.am  2007-08-25 16:07:53.000000000 +0000
-@@ -1,6 +1,6 @@
- AUTOMAKE_OPTIONS = foreign
--SUBDIRS = src images intl
--# po
-+SUBDIRS = src images
-+# po intl
- 
- 
- EXTRA_DIST = openmoko-mediaplayer.desktop openmoko-mediaplayer.png

diff --git a/packages/openmoko2/openmoko-mediaplayer2/missing-images.patch b/packages/openmoko2/openmoko-mediaplayer2/missing-images.patch
deleted file mode 100644 (file)
index d968e47..0000000
--- a/packages/openmoko2/openmoko-mediaplayer2/missing-images.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: openmoko-mediaplayer2/images/Makefile.am
-===================================================================
---- openmoko-mediaplayer2.orig/images/Makefile.am      2007-08-25 16:15:27.000000000 +0000
-+++ openmoko-mediaplayer2/images/Makefile.am   2007-08-25 16:15:35.000000000 +0000
-@@ -12,8 +12,6 @@
-       ico-repeat-all.png \
-       ico-shuffle-on.png \
-       ico-shuffle-off.png \
--      ico-balance-left.png \
--      ico-balance-right.png \
-       ico-tracktype-general.png \
-       ind-music-eq-00.png \
-       ind-music-eq-01.png \

diff --git a/packages/openmoko2/openmoko-mediaplayer2_svn.bb b/packages/openmoko2/openmoko-mediaplayer2_svn.bb
index a7e6711..871416c 100644 (file)
--- a/packages/openmoko2/openmoko-mediaplayer2_svn.bb
+++ b/packages/openmoko2/openmoko-mediaplayer2_svn.bb
@@ -6,7 +6,5 @@ PR = "r0"
 
 inherit openmoko2
 
-SRC_URI += "\
-  file://autofoo.patch;patch=1 \
-  file://missing-images.patch;patch=1 \
-"
+FILES_${PN} += "${datadir}/openmoko-mediaplayer"
+