diff options
Diffstat (limited to 'packages')
-rw-r--r-- | packages/gnome/libsoup_2.2.100.bb (renamed from packages/gnome/libsoup_2.2.98.bb) | 9 | ||||
-rw-r--r-- | packages/images/helloworld-image.bb | 15 | ||||
-rw-r--r-- | packages/libspiff/.mtn2git_empty | 0 | ||||
-rw-r--r-- | packages/libspiff/files/.mtn2git_empty | 0 | ||||
-rw-r--r-- | packages/libspiff/files/autofoo.patch | 31 | ||||
-rw-r--r-- | packages/libspiff/libspiff_0.7.2.bb | 23 | ||||
-rw-r--r-- | packages/liburiparser/.mtn2git_empty | 0 | ||||
-rw-r--r-- | packages/liburiparser/files/.mtn2git_empty | 0 | ||||
-rw-r--r-- | packages/liburiparser/files/autofoo.patch | 21 | ||||
-rw-r--r-- | packages/liburiparser/liburiparser_0.5.1.bb | 15 | ||||
-rw-r--r-- | packages/linux/linux.inc | 2 | ||||
-rw-r--r-- | packages/openmoko2/openmoko-mediaplayer2/.mtn2git_empty | 0 | ||||
-rw-r--r-- | packages/openmoko2/openmoko-mediaplayer2/autofoo.patch | 38 | ||||
-rw-r--r-- | packages/openmoko2/openmoko-mediaplayer2/missing-images.patch | 13 | ||||
-rw-r--r-- | packages/openmoko2/openmoko-mediaplayer2_svn.bb | 12 |
15 files changed, 158 insertions, 21 deletions
diff --git a/packages/gnome/libsoup_2.2.98.bb b/packages/gnome/libsoup_2.2.100.bb index c466a3a9c9..701ab1556d 100644 --- a/packages/gnome/libsoup_2.2.98.bb +++ b/packages/gnome/libsoup_2.2.100.bb @@ -1,19 +1,18 @@ DESCRIPTION = "An HTTP library implementation in C" LICENSE = "GPL" SECTION = "x11/gnome/libs" - DEPENDS = "glib-2.0 gnutls libxml2" SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/${PN}/2.2/${PN}-${PV}.tar.bz2" inherit autotools pkgconfig -FILES_${PN} = "${libdir}/lib*.so.*" -FILES_${PN}-dev = "${includedir}/ ${libdir}/" -FILES_${PN}-doc = "${datadir}/" - do_stage() { rm -f ${PKG_CONFIG_PATH}/libsoup* autotools_stage_all ln -sf ${PKG_CONFIG_PATH}/libsoup.pc ${PKG_CONFIG_PATH}/libsoup-2.2.pc } + +FILES_${PN} = "${libdir}/lib*.so.*" +FILES_${PN}-dev = "${includedir}/ ${libdir}/" +FILES_${PN}-doc = "${datadir}/" diff --git a/packages/images/helloworld-image.bb b/packages/images/helloworld-image.bb index 058bb7f12a..a1caf54cc5 100644 --- a/packages/images/helloworld-image.bb +++ b/packages/images/helloworld-image.bb @@ -11,18 +11,3 @@ export IMAGE_LINGUAS = "" PACKAGE_INSTALL = ${RDEPENDS} inherit image - -# Hello world image -# Contains *only* a statically linked hello world init program -LICENSE = "MIT" -PR = "r0" - -RDEPENDS = "helloworld" - -export IMAGE_BASENAME = "helloworld-image" -export IMAGE_LINGUAS = "" - -PACKAGE_INSTALL = ${RDEPENDS} - -inherit image - diff --git a/packages/libspiff/.mtn2git_empty b/packages/libspiff/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/libspiff/.mtn2git_empty diff --git a/packages/libspiff/files/.mtn2git_empty b/packages/libspiff/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/libspiff/files/.mtn2git_empty diff --git a/packages/libspiff/files/autofoo.patch b/packages/libspiff/files/autofoo.patch new file mode 100644 index 0000000000..2fcd7ebb47 --- /dev/null +++ b/packages/libspiff/files/autofoo.patch @@ -0,0 +1,31 @@ +Index: libspiff-0.7.2/configure.in +=================================================================== +--- libspiff-0.7.2.orig/configure.in 2007-08-25 15:47:29.000000000 +0000 ++++ libspiff-0.7.2/configure.in 2007-08-25 15:47:48.000000000 +0000 +@@ -78,26 +78,6 @@ + LDFLAGS="-L${withval} ${LDFLAGS}" + ], []) + +- +- +-# Local headers must come very first. Otherwise we +-# risk including headers of an already installed +-# libSpiff version if its path is in CPPFLAGS +-CPPFLAGS="-Iinclude ${CPPFLAGS}" +- +- +- +-# Append $prefix as a fallback at the very end +-if test "x${prefix}" != "xNONE"; then +- WORKING_PREFIX=${prefix} +-else +- WORKING_PREFIX=${ac_default_prefix} +-fi +-LDFLAGS="${LDFLAGS} -L${WORKING_PREFIX}/lib" +-CPPFLAGS="${CPPFLAGS} -I${WORKING_PREFIX}/include" +- +- +- + # Check presence + EXPAT_MISSING="Please install libexpat 1.95.8 or later. + On Ubuntu enter 'sudo apt-get install libexpat-dev'." diff --git a/packages/libspiff/libspiff_0.7.2.bb b/packages/libspiff/libspiff_0.7.2.bb new file mode 100644 index 0000000000..06be4b3aa4 --- /dev/null +++ b/packages/libspiff/libspiff_0.7.2.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "libSpiff brings XSPF playlist reading and writing support to your C++ application." +HOMEPAGE = "http://libspiff.sf.net" +SECTION = "libs" +LICENSE = "BSD" +DEPENDS = "expat liburiparser" + +SRC_URI = "${SOURCEFORGE_MIRROR}/libspiff/libspiff-${PV}.tar.bz2 \ + file://autofoo.patch;patch=1" +S = "${WORKDIR}/libspiff-${PV}" + +inherit autotools pkgconfig lib_package + +EXTRA_OECONF = "\ + --with-expat=${STAGING_LIBDIR}/.. \ + --with-uriparser=${STAGING_LIBDIR}/.. \ +" + +CPPFLAGS += "-I${S}/include" + +do_stage() { + autotools_stage_all +} + diff --git a/packages/liburiparser/.mtn2git_empty b/packages/liburiparser/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/liburiparser/.mtn2git_empty diff --git a/packages/liburiparser/files/.mtn2git_empty b/packages/liburiparser/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/liburiparser/files/.mtn2git_empty diff --git a/packages/liburiparser/files/autofoo.patch b/packages/liburiparser/files/autofoo.patch new file mode 100644 index 0000000000..548867c7e7 --- /dev/null +++ b/packages/liburiparser/files/autofoo.patch @@ -0,0 +1,21 @@ +Index: uriparser-0.5.1/configure.in +=================================================================== +--- uriparser-0.5.1.orig/configure.in 2007-08-25 15:32:52.000000000 +0000 ++++ uriparser-0.5.1/configure.in 2007-08-25 15:34:56.000000000 +0000 +@@ -2,7 +2,7 @@ + AC_INIT([uriparser], [0.5.1]) + AM_INIT_AUTOMAKE([1.9 foreign]) + AM_CONFIG_HEADER(test/CppTest/config.h) +- ++AM_PROG_CC_C_O + + AC_PROG_CC + AC_PROG_CXX +@@ -10,7 +10,6 @@ + AC_HEADER_STDC + + +- + # URI_SIZEDOWN + AC_ARG_ENABLE(sizedown, [ + Extra options: diff --git a/packages/liburiparser/liburiparser_0.5.1.bb b/packages/liburiparser/liburiparser_0.5.1.bb new file mode 100644 index 0000000000..60c88cba23 --- /dev/null +++ b/packages/liburiparser/liburiparser_0.5.1.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "uriparser is a strictly RFC 3986 compliant URI parsing library." +HOMEPAGE = "http://uriparser.sf.net" +SECTION = "libs" +LICENSE = "BSD" + +SRC_URI = "${SOURCEFORGE_MIRROR}/uriparser/uriparser-${PV}.tar.bz2 \ + file://autofoo.patch;patch=1" +S = "${WORKDIR}/uriparser-${PV}" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} + diff --git a/packages/linux/linux.inc b/packages/linux/linux.inc index ae7308bb81..4a09c92975 100644 --- a/packages/linux/linux.inc +++ b/packages/linux/linux.inc @@ -64,7 +64,7 @@ do_deploy() { ${OBJCOPY} -O binary -R .note -R .comment -S vmlinux linux.bin rm -f linux.bin.gz gzip -9 linux.bin - uboot-mkimage -A ${ARCH} -O linux -T kernel -C gzip -a ${UBOOT_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME} Kernel for ${MACHINE}" -d linux.bin.gz ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}-${DATETIME}.bin + uboot-mkimage -A ${ARCH} -O linux -T kernel -C gzip -a ${UBOOT_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin.gz ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}-${DATETIME}.bin rm -f linux.bin.gz fi } diff --git a/packages/openmoko2/openmoko-mediaplayer2/.mtn2git_empty b/packages/openmoko2/openmoko-mediaplayer2/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/openmoko2/openmoko-mediaplayer2/.mtn2git_empty diff --git a/packages/openmoko2/openmoko-mediaplayer2/autofoo.patch b/packages/openmoko2/openmoko-mediaplayer2/autofoo.patch new file mode 100644 index 0000000000..5db5707798 --- /dev/null +++ b/packages/openmoko2/openmoko-mediaplayer2/autofoo.patch @@ -0,0 +1,38 @@ +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 new file mode 100644 index 0000000000..d968e474eb --- /dev/null +++ b/packages/openmoko2/openmoko-mediaplayer2/missing-images.patch @@ -0,0 +1,13 @@ +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 new file mode 100644 index 0000000000..a7e6711d23 --- /dev/null +++ b/packages/openmoko2/openmoko-mediaplayer2_svn.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "A media player for OpenMoko" +SECTION = "openmoko/tools" +DEPENDS = "libmokoui2 expat gstreamer libspiff" +PV = "0.1.0+svn${SVNREV}" +PR = "r0" + +inherit openmoko2 + +SRC_URI += "\ + file://autofoo.patch;patch=1 \ + file://missing-images.patch;patch=1 \ +" |