diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2007-08-30 22:36:16 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2007-08-30 22:36:16 +0000 |
| commit | 295f0eb481ce73f976bc46031fa33551375d77cf (patch) | |
| tree | 05128354e9e08c744377763a48f95398c5dfa8fd /packages/openmoko2 | |
| parent | 328141d34f35516a988d7525f704064c6c55737d (diff) | |
| parent | d7d57f3e05feab6e49a2264f6e81902c28682049 (diff) | |
merge of '16ddc63cc58ab4f6ac83a2e1d653c740ffdd6f87'
and '76b3eaaf78af7bef8ae185d70ad72a4c8f9a3af7'
Diffstat (limited to 'packages/openmoko2')
5 files changed, 11 insertions, 55 deletions
diff --git a/packages/openmoko2/openmoko-firststart2_svn.bb b/packages/openmoko2/openmoko-firststart2_svn.bb new file mode 100644 index 0000000000..5b24d17d5e --- /dev/null +++ b/packages/openmoko2/openmoko-firststart2_svn.bb @@ -0,0 +1,9 @@ +DESCRIPTION = "The OpenMoko First Start Wizard" +SECTION = "openmoko/apps" +DEPENDS += "libmokoui2 libglade" +PV = "0.1.0+svn${SVNREV}" +PR = "r0" + +inherit openmoko2 + +FILES_${PN} += "${datadir}" diff --git a/packages/openmoko2/openmoko-mediaplayer2/.mtn2git_empty b/packages/openmoko2/openmoko-mediaplayer2/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/openmoko2/openmoko-mediaplayer2/.mtn2git_empty +++ /dev/null diff --git a/packages/openmoko2/openmoko-mediaplayer2/autofoo.patch b/packages/openmoko2/openmoko-mediaplayer2/autofoo.patch deleted file mode 100644 index 5db5707798..0000000000 --- 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 index d968e474eb..0000000000 --- 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 a7e6711d23..871416c066 100644 --- 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" + |