diff options
| author |   Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2010-06-30 16:19:42 +0400 |
|---|---|---|
| committer | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2010-06-30 16:19:42 +0400 |
| commit | f2c65a6c54c402e013a7264aa433844be864455a (patch) | |
| tree | 8d8e63352abf1f9996ce40a4455444ad1d26220c /recipes | |
| parent | e90cf71fe69917d5716fbf25846ba0e91f0b5bd7 (diff) | |
| parent | 81adc0e1ce121a1cb04ea484761920e6e79c6f25 (diff) | |
| download | openembedded-f2c65a6c54c402e013a7264aa433844be864455a.tar.gz | |
Merge branch 'org.openembedded.dev' of git://git.openembedded.org/openembedded into org.openembedded.dev
Diffstat (limited to 'recipes')
119 files changed, 1493 insertions, 430 deletions
diff --git a/recipes/devicekit/devicekit-power_009.bb b/recipes/devicekit/devicekit-power_009.bb index 01f0aedf8d..099ce0b2e3 100644 --- a/recipes/devicekit/devicekit-power_009.bb +++ b/recipes/devicekit/devicekit-power_009.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Devicekit power" LICENSE = "GPLv2" DEPENDS = "devicekit glib-2.0 dbus-glib policykit" -SRC_URI = "http://hal.freedesktop.org/releases/DeviceKit-power-${PV}.tar.gz" +SRC_URI = "http://cgit.freedesktop.org/DeviceKit/DeviceKit-power/snapshot/DeviceKit-power-${PV}.tar.gz" S = "${WORKDIR}/DeviceKit-power-${PV}" inherit autotools pkgconfig @@ -18,7 +18,5 @@ FILES_${PN} += "${datadir}/dbus-1/ \ FILES_${PN}-dbg += "${base_libdir}/udev/.debug" - - -SRC_URI[md5sum] = "535703fa7b9c323d6388b5aff28cfeeb" -SRC_URI[sha256sum] = "438ac7f22533e04f5b44e0cf23d8b51a5cb69906ea2bbdef0581dc3c7cf19e55" +SRC_URI[md5sum] = "2ec93fbd14926101a12c9e4dbbe5937f" +SRC_URI[sha256sum] = "6dfa2623cb5c0b2df9aff00ad6d3213815d7de498855cc6f72c2cd18d50a4cd1" diff --git a/recipes/devicekit/devicekit-power_014.bb b/recipes/devicekit/devicekit-power_014.bb index acdcd9a9ce..f018a64aab 100644 --- a/recipes/devicekit/devicekit-power_014.bb +++ b/recipes/devicekit/devicekit-power_014.bb @@ -2,9 +2,11 @@ DESCRIPTION = "Devicekit power" LICENSE = "GPLv2" DEPENDS = "libusb1 udev glib-2.0 dbus-glib policykit" -SRC_URI = "http://hal.freedesktop.org/releases/DeviceKit-power-${PV}.tar.gz;name=archive" -SRC_URI[archive.md5sum] = "935d37f1e14b3c8a1d6dabcd9a38d3ca" -SRC_URI[archive.sha256sum] = "ad3e9a8bd9525d66fadc7fa53ef99e0632aa8cca8fd5bc27483956261153b373" + +SRC_URI = "http://cgit.freedesktop.org/DeviceKit/DeviceKit-power/snapshot/DeviceKit-power-${PV}.tar.gz;name=archive" + +SRC_URI[archive.md5sum] = "570846c933df16b768082879b5ee0605" +SRC_URI[archive.sha256sum] = "ae450e86443df825b31a664562f12117983ebd7d106f5c5cd82ca2f38791166d" S = "${WORKDIR}/DeviceKit-power-${PV}" diff --git a/recipes/e17/e-tasks_svn.bb b/recipes/e17/e-tasks_svn.bb index 76c8de9353..fccf951633 100644 --- a/recipes/e17/e-tasks_svn.bb +++ b/recipes/e17/e-tasks_svn.bb @@ -9,7 +9,7 @@ inherit autotools SRCREV = "25" PV = "0.0.1+svnr${SRCPV}" -PR = "r3" +PR = "r4" SRC_URI = "svn://e-tasks.googlecode.com/svn;module=trunk;proto=http" S = "${WORKDIR}/trunk" diff --git a/recipes/e17/intuition_svn.bb b/recipes/e17/intuition_svn.bb index 5087144454..bb01e894d2 100644 --- a/recipes/e17/intuition_svn.bb +++ b/recipes/e17/intuition_svn.bb @@ -3,7 +3,7 @@ SECTION = "x11" LICENSE = "GPLv2" DEPENDS = "elementary sqlite" PV = "0.2.0+svnr${SRCPV}" -PR = "r2" +PR = "r3" SRCREV = "194" SRC_URI = "svn://svn.om.vptt.ch/trunk/;proto=http;module=intuition" diff --git a/recipes/ebrainy/ebrainy_svn.bb b/recipes/ebrainy/ebrainy_svn.bb index d873a29435..cedbd9f4dc 100644 --- a/recipes/ebrainy/ebrainy_svn.bb +++ b/recipes/ebrainy/ebrainy_svn.bb @@ -6,7 +6,7 @@ SECTION = "e/apps" RDEPENDS_${PN} = "elementary sqlite3 python-sqlalchemy python-mysqldb python-netserver" PV = "0.0.1+svnr${SRCPV}" -PR = "r4" +PR = "r5" SRCREV = "21" SRC_URI = "svn://ebrainy.googlecode.com/svn/trunk;module=.;proto=http" S = "${WORKDIR}" diff --git a/recipes/ecj/libecj-bootstrap_3.4.bb b/recipes/ecj/libecj-bootstrap_3.4.bb index 27dc120782..db66eaeb92 100644 --- a/recipes/ecj/libecj-bootstrap_3.4.bb +++ b/recipes/ecj/libecj-bootstrap_3.4.bb @@ -3,7 +3,7 @@ require libecj-bootstrap.inc PR = "r2" SRC_URI = "\ - http://mirrors.ibiblio.org/pub/mirrors/eclipse/eclipse/downloads/drops/R-3.4-200806172000/ecjsrc-3.4.zip \ + http://archive.eclipse.org/eclipse/downloads/drops/R-3.4-200806172000/ecjsrc-3.4.zip \ " diff --git a/recipes/eds/eds-dbus/disable_orbit.patch b/recipes/eds/eds-dbus/disable_orbit.patch deleted file mode 100644 index 8757666e9d..0000000000 --- a/recipes/eds/eds-dbus/disable_orbit.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: trunk/configure.in -=================================================================== ---- trunk.orig/configure.in 2006-01-20 02:08:42.555073776 +0000 -+++ trunk/configure.in 2006-01-20 10:19:13.631870024 +0000 -@@ -1114,7 +1114,7 @@ - AC_MSG_RESULT($with_bug_buddy) - - if test "x${with_dbus}" = "xno"; then -- AM_PATH_ORBIT2(2.9.8) -+dnl AM_PATH_ORBIT2(2.9.8) - - AC_MSG_CHECKING(for CORBA include paths) - IDL_INCLUDES="-I "`pkg-config --variable=idldir libbonobo-2.0`" -I "`pkg-config --variable=idldir bonobo-activation-2.0` diff --git a/recipes/eds/eds-dbus/fix-bindig-tool.patch b/recipes/eds/eds-dbus/fix-bindig-tool.patch deleted file mode 100644 index 704df84f69..0000000000 --- a/recipes/eds/eds-dbus/fix-bindig-tool.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- /tmp/Makefile.am 2007-01-16 13:56:57.000000000 +0100 -+++ trunk/calendar/libecal-dbus/Makefile.am 2007-01-16 13:57:40.045251000 +0100 -@@ -64,7 +64,7 @@ - dbus-binding-tool --mode=glib-server --output=$@ --prefix=$(subst -,_,$*) $^ - - %-bindings.h: ../libedata-cal-dbus/%.xml -- dbus-binding-tool --mode=glib-client --output=$@ $^ -+ dbus-binding-tool --mode=glib-client --prefix= --output=$@ $^ - - BUILT_SOURCES = $(DBUS_GENERATED_H) $(MARSHAL_GENERATED) - CLEANFILES = $(BUILT_SOURCES) ---- /tmp/Makefile.am 2007-01-16 14:05:49.000000000 +0100 -+++ trunk/calendar/libedata-cal-dbus/Makefile.am 2007-01-16 14:06:15.865251000 +0100 -@@ -90,7 +90,7 @@ - dbus-binding-tool --mode=glib-server --output=$@ --prefix=$(subst -,_,$*) $^ - - %-bindings.h: %.xml -- dbus-binding-tool --mode=glib-client --output=$@ $^ -+ dbus-binding-tool --mode=glib-client --prefix= --output=$@ $^ - - - DBUS_BINDINGS = e-data-cal-factory-bindings.h e-data-cal-bindings.h e-data-cal-view-bindings.h diff --git a/recipes/eds/eds-dbus/gtk-doc.make b/recipes/eds/eds-dbus/gtk-doc.make new file mode 100644 index 0000000000..4c8ef12d61 --- /dev/null +++ b/recipes/eds/eds-dbus/gtk-doc.make @@ -0,0 +1,2 @@ + +EXTRA_DIST = diff --git a/recipes/eds/eds-dbus/libxml2-for-libedataserverui.patch b/recipes/eds/eds-dbus/libxml2-for-libedataserverui.patch new file mode 100644 index 0000000000..42da462b40 --- /dev/null +++ b/recipes/eds/eds-dbus/libxml2-for-libedataserverui.patch @@ -0,0 +1,25 @@ +diff --git a/.gitignore b/.gitignore +index 96787d6..622d967 100644 +--- a/.gitignore ++++ b/.gitignore +@@ -24,7 +24,6 @@ missing + mkinstalldirs + stamp-it + stamp-h1 +-gtk-doc.make + po/POTFILES + *.la + *.lo +diff --git a/configure.ac b/configure.ac +index ae9addb..83239d3 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1472,7 +1472,7 @@ EVO_SET_COMPILE_FLAGS(E_DATA_SERVER, $E_DATA_SERVER_DEPS, $THREADS_CFLAGS $MANUA + AC_SUBST(E_DATA_SERVER_CFLAGS) + AC_SUBST(E_DATA_SERVER_LIBS) + +-E_DATA_SERVER_UI_DEPS="gtk+-2.0 libglade-2.0 gobject-2.0 gthread-2.0 gconf-2.0 $GNOME_KEYRING_REQUIREMENT" ++E_DATA_SERVER_UI_DEPS="libxml-2.0 gtk+-2.0 libglade-2.0 gobject-2.0 gthread-2.0 gconf-2.0 $GNOME_KEYRING_REQUIREMENT" + + EVO_SET_COMPILE_FLAGS(E_DATA_SERVER_UI, $E_DATA_SERVER_UI_DEPS, $THREADS_CFLAGS, $THREADS_LIBS) + AC_SUBST(E_DATA_SERVER_UI_CFLAGS) diff --git a/recipes/eds/eds-dbus/no_iconv_test.patch b/recipes/eds/eds-dbus/no_iconv_test.patch deleted file mode 100644 index 6e33c7889e..0000000000 --- a/recipes/eds/eds-dbus/no_iconv_test.patch +++ /dev/null @@ -1,70 +0,0 @@ -Index: trunk/configure.in -=================================================================== ---- trunk.orig/configure.in 2005-09-28 17:34:08.000000000 +0000 -+++ trunk/configure.in 2005-09-28 19:13:22.000000000 +0000 -@@ -213,39 +213,6 @@ - if test $ac_cv_libiconv = no; then - AC_CHECK_FUNCS(gnu_get_libc_version) - fi -- AC_CACHE_CHECK([if iconv() handles UTF-8], ac_cv_libiconv_utf8, AC_TRY_RUN([ --#include <iconv.h> --#include <stdlib.h> --#include <string.h> --#ifdef HAVE_GNU_GET_LIBC_VERSION --#include <gnu/libc-version.h> --#endif -- --int main (int argc, char **argv) --{ -- const char *from = "Some Text \xA4"; -- const char *utf8 = "Some Text \xC2\xA4"; -- char *transbuf = malloc (20), *trans = transbuf; -- iconv_t cd; -- size_t from_len = strlen (from), utf8_len = 20; -- size_t utf8_real_len = strlen (utf8); -- --#ifdef HAVE_GNU_GET_LIBC_VERSION -- /* glibc 2.1.2's iconv is broken in hard to test ways. */ -- if (!strcmp (gnu_get_libc_version (), "2.1.2")) -- exit (1); --#endif -- -- cd = iconv_open ("UTF-8", "ISO_8859-1"); -- if (cd == (iconv_t) -1) -- exit (1); -- if (iconv (cd, &from, &from_len, &trans, &utf8_len) == -1 || from_len != 0) -- exit (1); -- if (memcmp (utf8, transbuf, utf8_real_len) != 0) -- exit (1); -- -- exit (0); --}], ac_cv_libiconv_utf8=yes, [ac_cv_libiconv_utf8=no; have_iconv=no], [ac_cv_libiconv_utf8=no; have_iconv=no])) - fi - - if test "$have_iconv" = no; then -@@ -254,25 +221,6 @@ - AC_SUBST(ICONV_CFLAGS) - AC_SUBST(ICONV_LIBS) - --CFLAGS="$CFLAGS -I$srcdir" -- --AC_MSG_CHECKING(preferred charset formats for system iconv) --AC_TRY_RUN([ --#define CONFIGURE_IN --#include "iconv-detect.c" --],[ -- AC_MSG_RESULT(found) --],[ -- AC_MSG_RESULT(not found) -- AC_WARN([ -- *** The iconv-detect program was unable to determine the -- *** preferred charset formats recognized by your system -- *** iconv library. It is suggested that you install a -- *** working iconv library such as the one found at -- *** ftp://ftp.gnu.org/pub/gnu/libiconv -- ]) --]) -- - CFLAGS="$save_CFLAGS" - LIBS="$save_LIBS" - diff --git a/recipes/eds/eds-dbus/no_libdb.patch b/recipes/eds/eds-dbus/no_libdb.patch deleted file mode 100644 index ae9a66deac..0000000000 --- a/recipes/eds/eds-dbus/no_libdb.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: configure.in -=================================================================== ---- trunk/configure.in (revision 306) -+++ trunk/configure.in (working copy) -@@ -1353,9 +1353,6 @@ - if test $enable_calendar = yes; then - AC_CONFIG_SUBDIRS(calendar/libical) - fi --if test $dynamic_libdb = no; then -- AC_CONFIG_SUBDIRS(libdb/dist) --fi - - AC_OUTPUT([ - Makefile diff --git a/recipes/eds/eds-dbus/no_libedataserverui-20060126.patch b/recipes/eds/eds-dbus/no_libedataserverui-20060126.patch deleted file mode 100644 index bb6f78d9f7..0000000000 --- a/recipes/eds/eds-dbus/no_libedataserverui-20060126.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: Makefile.am -=================================================================== ---- trunk/Makefile.am (revision 306) -+++ trunk/Makefile.am (working copy) -@@ -16,7 +16,7 @@ - endif - - if ENABLE_DBUS --SUBDIRS = $(LIBDB) libedataserver $(CAMEL_DIR) addressbook $(CALENDAR_DIR) libedataserverui docs art po -+SUBDIRS = $(LIBDB) libedataserver $(CAMEL_DIR) addressbook $(CALENDAR_DIR) docs art po - else - SUBDIRS = $(LIBDB) libedataserver servers $(CAMEL_DIR) addressbook $(CALENDAR_DIR) libedataserverui src docs art po - endif diff --git a/recipes/eds/eds-dbus/no_libedataserverui.patch b/recipes/eds/eds-dbus/no_libedataserverui.patch deleted file mode 100644 index 766c547a56..0000000000 --- a/recipes/eds/eds-dbus/no_libedataserverui.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: Makefile.am -=================================================================== ---- trunk/Makefile.am (revision 306) -+++ trunk/Makefile.am (working copy) -@@ -16,7 +16,7 @@ - endif - - if ENABLE_DBUS --SUBDIRS = $(LIBDB) libedataserver camel addressbook $(CALENDAR_DIR) libedataserverui docs art po -+SUBDIRS = $(LIBDB) libedataserver camel addressbook $(CALENDAR_DIR) docs art po - else - SUBDIRS = $(LIBDB) libedataserver servers $(CAMEL_DIR) addressbook $(CALENDAR_DIR) libedataserverui src docs art po - endif diff --git a/recipes/eds/eds-dbus/no_libgnome.patch b/recipes/eds/eds-dbus/no_libgnome.patch deleted file mode 100644 index a8bae50d03..0000000000 --- a/recipes/eds/eds-dbus/no_libgnome.patch +++ /dev/null @@ -1,45 +0,0 @@ -Index: trunk/configure.in -=================================================================== ---- trunk.orig/configure.in 2005-09-28 20:01:02.000000000 +0000 -+++ trunk/configure.in 2005-09-28 21:02:35.000000000 +0000 -@@ -1120,7 +1120,12 @@ - AC_SUBST(E_DATA_SERVER_CFLAGS) - AC_SUBST(E_DATA_SERVER_LIBS) - --E_DATA_SERVER_UI_DEPS="gtk+-2.0 libglade-2.0 gconf-2.0 libgnome-2.0" -+if test "x${with_libgnome}" != "xno"; then -+ E_DATA_SERVER_UI_DEPS="gtk+-2.0 libglade-2.0 gconf-2.0 libgnome-2.0" -+else -+ E_DATA_SERVER_UI_DEPS="gtk+-2.0 libglade-2.0 gconf-2.0" -+fi -+ - - EVO_SET_COMPILE_FLAGS(E_DATA_SERVER_UI, $E_DATA_SERVER_UI_DEPS, $THREADS_CFLAGS, $THREADS_LIBS) - AC_SUBST(E_DATA_SERVER_UI_CFLAGS) -@@ -1128,7 +1133,7 @@ - - dnl --- evolution-addressbook flags - --EVOLUTION_ADDRESSBOOK_DEPS="libxml-2.0 gobject-2.0 gconf-2.0 $IPC_DEPS gnome-vfs-2.0 " -+EVOLUTION_ADDRESSBOOK_DEPS="libxml-2.0 gobject-2.0 gconf-2.0 $IPC_DEPS " - - EVO_SET_COMPILE_FLAGS(EVOLUTION_ADDRESSBOOK, $EVOLUTION_ADDRESSBOOK_DEPS) - AC_SUBST(EVOLUTION_ADDRESSBOOK_CFLAGS) -@@ -1136,7 +1141,7 @@ - - dnl --- evolution-calendar flags - --EVOLUTION_CALENDAR_DEPS="libxml-2.0 gobject-2.0 gconf-2.0 gnome-vfs-2.0 dbus-glib-1" -+EVOLUTION_CALENDAR_DEPS="libxml-2.0 gobject-2.0 gconf-2.0 dbus-glib-1" - - EVO_SET_COMPILE_FLAGS(EVOLUTION_CALENDAR, $EVOLUTION_CALENDAR_DEPS) - AC_SUBST(EVOLUTION_CALENDAR_CFLAGS) -@@ -1145,7 +1150,7 @@ - if test "x${with_dbus}" = "xno"; then - dnl --- factory flags - -- E_FACTORY_DEPS="gobject-2.0 >= $GLIB_REQUIRED $IPC_DEPS gconf-2.0 gnome-vfs-2.0 libgnome-2.0 $mozilla_nspr" -+ E_FACTORY_DEPS="gobject-2.0 >= $GLIB_REQUIRED $IPC_DEPS gconf-2.0 $mozilla_nspr" - - EVO_SET_COMPILE_FLAGS(E_FACTORY, $E_FACTORY_DEPS, $THREADS_CFLAGS $MANUAL_NSPR_CFLAGS, $THREADS_LIBS $MANUAL_NSPR_LIBS) - AC_SUBST(E_FACTORY_CFLAGS) diff --git a/recipes/eds/eds-dbus_svn.bb b/recipes/eds/eds-dbus_git.bb index 20d7f79ae2..88a4da5bae 100644 --- a/recipes/eds/eds-dbus_svn.bb +++ b/recipes/eds/eds-dbus_git.bb @@ -1,27 +1,32 @@ DESCRIPTION = "Evolution database backend server" -HOMEPAGE = "http://projects.o-hand.com/eds" +HOMEPAGE = "http://labs.o-hand.com/embedded-eds/" LICENSE = "LGPL" -DEPENDS = "intltool-native libglade glib-2.0 gtk+ gconf dbus db gnome-common virtual/libiconv zlib intltool" +DEPENDS = "intltool-native libglade glib-2.0 gtk+ gconf dbus db gnome-common virtual/libiconv zlib intltool libxml2" -PV = "1.4.0+svnr${SRCPV}" -PR = "r7" -SRCREV = "736" +SRCREV = "91812cd2f797fb8ec8befbb2685037584ce144ee" +PV = "1.4.0" +PR = "r2" +PE = "1" +PR_append = "+gitr${SRCREV}" -SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http \ - file://no_libdb.patch;maxrev=659 \ - file://no_iconv_test.patch \ - file://no_libedataserverui.patch;maxrev=659 \ - file://iconv-detect.h" +SRC_URI = "git://git.o-hand.com/eds-dbus;branch=master;protocol=git \ + file://iconv-detect.h \ + file://libxml2-for-libedataserverui.patch;patch=1 \ + file://gtk-doc.make" -S = "${WORKDIR}/trunk" +S = "${WORKDIR}/git" inherit autotools pkgconfig # -ldb needs this on some platforms LDFLAGS += "-lpthread" -do_configure_append = " cp ${WORKDIR}/iconv-detect.h ${S} " -EXTRA_OECONF = "--without-openldap --with-dbus --without-bug-buddy --without-soup --with-libdb=${STAGING_DIR_HOST}${layout_prefix} --disable-smime --disable-nss --disable-nntp --disable-gtk-doc" +do_configure_prepend () { + cp ${WORKDIR}/iconv-detect.h ${S} + cp ${WORKDIR}/gtk-doc.make ${S} +} + +EXTRA_OECONF = "--without-openldap --with-dbus --without-weather --without-bug-buddy --without-soup --without-libdb --with-libdb=${STAGING_DIR_HOST}${layout_prefix} --disable-smime --disable-nss --disable-nntp --disable-gtk-doc --disable-calendar --disable-hula --disable-dot-locking --disable-gnome-keyring" PACKAGES =+ "libcamel-collateral libcamel libcamel-dev libebook libebook-dev libecal libecal-dev libedata-book libedata-book-dev libedata-cal libedata-cal-dev libedataserver libedataserver-dev" @@ -51,10 +56,6 @@ FILES_libedata-cal-dev = "${libdir}/libedata-cal-*.so ${libdir}/pkgconfig/libeda FILES_libedataserver = "${libdir}/libedataserver-*.so.*" FILES_libedataserver-dev = "${libdir}/libedataserver-*.so ${libdir}/pkgconfig/libedataserver-*.pc ${includedir}/evolution-data-server-*/libedataserver/*.h" -do_stage () { - autotools_stage_all -} - do_install_append () { rm ${D}${libdir}/evolution-data-server-*/*/*.la } diff --git a/recipes/efl1/eet_svn.bb b/recipes/efl1/eet_svn.bb index 65181b7080..73417fcbc3 100644 --- a/recipes/efl1/eet_svn.bb +++ b/recipes/efl1/eet_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "EET is the Enlightenment data storage library" DEPENDS = "pkgconfig zlib jpeg openssl eina" LICENSE = "MIT BSD" SRCREV = "${EFL_SRCREV}" -PV = "1.3.0+svnr${SRCPV}" +PV = "1.3.2+svnr${SRCPV}" inherit efl diff --git a/recipes/efl1/elementary_svn.bb b/recipes/efl1/elementary_svn.bb index 6b9867cae4..82302b9706 100644 --- a/recipes/efl1/elementary_svn.bb +++ b/recipes/efl1/elementary_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "EFL based widget set for mobile devices" LICENSE = "LGPL" DEPENDS = "eet-native efreet evas ecore edje eet edbus" -PV = "0.0.0+svnr${SRCPV}" +PV = "0.7.0+svnr${SRCPV}" PR = "r10" SRCREV = "${EFL_SRCREV}" @@ -50,5 +50,8 @@ FILES_${PN}-tests = "\ ${libdir}/elementary/modules/test_entry/* \ " -RREPLACES_${PN}-themes = "libelementary-ver-pre-svn-05-themes libelementary-ver-svn-06-themes" -RREPLACES_${PN}-configs = "libelementary-ver-pre-svn-05-configs libelementary-ver-svn-06-configs" +# Some upgrade path tweaking, as in evas +AUTO_LIBNAME_PKGS = "" + +RREPLACES_${PN}-themes = "libelementary-ver-pre-svn-05-themes libelementary-ver-svn-06-themes libelementary-ver-pre-svn-06-themes" +RREPLACES_${PN}-configs = "libelementary-ver-pre-svn-05-configs libelementary-ver-svn-06-configs libelementary-ver-pre-svn-06-configs" diff --git a/recipes/eglibc/eglibc_2.12.bb b/recipes/eglibc/eglibc_2.12.bb index a22b2b2fc3..730a88e290 100644 --- a/recipes/eglibc/eglibc_2.12.bb +++ b/recipes/eglibc/eglibc_2.12.bb @@ -6,7 +6,7 @@ FILESPATHPKG =. "eglibc-svn:" PV = "2.12" PR = "${INC_PR}.2" PR_append = "+svnr${SRCPV}" -SRCREV="10689" +SRCREV="10809" EGLIBC_BRANCH="eglibc-2_12" SRC_URI = "svn://svn.eglibc.org/branches;module=${EGLIBC_BRANCH};proto=svn \ file://eglibc-svn-arm-lowlevellock-include-tls.patch \ diff --git a/recipes/eglibc/eglibc_svn.bb b/recipes/eglibc/eglibc_svn.bb index 36592c9aba..c72e64cefd 100644 --- a/recipes/eglibc/eglibc_svn.bb +++ b/recipes/eglibc/eglibc_svn.bb @@ -1,7 +1,7 @@ require eglibc.inc DEPENDS += "gperf-native" -SRCREV = "10688" +SRCREV = "10825" DEFAULT_PREFERENCE = "-1" FILESPATHPKG =. "eglibc-svn:" PV = "2.12+svnr${SRCPV}" diff --git a/recipes/estardict/estardict_0.2.bb b/recipes/estardict/estardict_0.2.bb index 256a4cd8c7..7c03761468 100644 --- a/recipes/estardict/estardict_0.2.bb +++ b/recipes/estardict/estardict_0.2.bb @@ -4,7 +4,7 @@ AUTHOR = "Luca Vaudano" LICENSE = "GPLv3" SECTION = "e/apps" DEPENDS = "elementary" -PR = "r2" +PR = "r3" SRC_URI = "http://www.vaudano.eu/projects/${PN}/${PN}-${PV}.tar.gz;name=archive" SRC_URI[archive.md5sum] = "2aaad7efc6658539f68f8cf093dd4361" diff --git a/recipes/ffalarms/ffalarms_git.bb b/recipes/ffalarms/ffalarms_git.bb index e831154113..02c85b0735 100644 --- a/recipes/ffalarms/ffalarms_git.bb +++ b/recipes/ffalarms/ffalarms_git.bb @@ -8,7 +8,7 @@ DEPENDS = "elementary libeflvala libical" RDEPENDS_${PN} = "atd alsa-utils-amixer ttf-dejavu-sans libical" RSUGGESTS_${PN} = "mplayer alsa-utils-aplay frameworkd" PV = "0.4+gitr${SRCPV}" -PR = "r4" +PR = "r5" SRC_URI = "git://git.shr-project.org/repo/ffalarms.git;protocol=http;branch=master" diff --git a/recipes/file/file_5.04.bb b/recipes/file/file_5.04.bb index 187ee19efc..3d027380cb 100644 --- a/recipes/file/file_5.04.bb +++ b/recipes/file/file_5.04.bb @@ -1,6 +1,6 @@ require file.inc - -PR = "${INCPR}.0" +DEPENDS_virtclass-native += "zlib-native" +PR = "${INCPR}.1" SRC_URI[md5sum] = "accade81ff1cc774904b47c72c8aeea0" SRC_URI[sha256sum] = "4c9e6e7994e74cb3386374ae91b055d26ac96b9d3e82fd157ae2d62e87a4260c" diff --git a/recipes/gcc/gcc-4.5.inc b/recipes/gcc/gcc-4.5.inc index 181db33574..0c3d46ffd4 100644 --- a/recipes/gcc/gcc-4.5.inc +++ b/recipes/gcc/gcc-4.5.inc @@ -10,7 +10,7 @@ NATIVEDEPS = "mpfr-native gmp-native libmpc-native" INC_PR = "r4" -SRCREV = "160764" +SRCREV = "161450" PV = "4.5" # BINV should be incremented after updating to a revision # after a minor gcc release (e.g. 4.5.1 or 4.5.2) has been made diff --git a/recipes/gdb/gdb-common.inc b/recipes/gdb/gdb-common.inc index 0c236925dc..d6e0725189 100644 --- a/recipes/gdb/gdb-common.inc +++ b/recipes/gdb/gdb-common.inc @@ -8,7 +8,7 @@ inherit autotools SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.gz" -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gdb-${PV}" +FILESPATHPKG =. "gdb-${PV}:" export CC_FOR_BUILD = "${BUILD_CC}" export CXX_FOR_BUILD = "${BUILD_CXX}" diff --git a/recipes/gnome/cheese_2.30.1.bb b/recipes/gnome/cheese_2.30.1.bb index 39f67e5dc2..d230409748 100644 --- a/recipes/gnome/cheese_2.30.1.bb +++ b/recipes/gnome/cheese_2.30.1.bb @@ -1,6 +1,8 @@ DESCRIPTION = "Take photos and videos with your webcam, with fun graphical effects" LICENSE = "GPLv2" +PR = "r1" + DEPENDS = "gtk+ gstreamer gst-plugins-base libcanberra udev librsvg gnome-desktop eds-dbus" RRECOMMENDS_${PN} = "gst-plugin-gconfelements gst-plugins-good-meta gst-plugins-base-meta" diff --git a/recipes/gnome/gnome-python-desktop_2.30.0.bb b/recipes/gnome/gnome-python-desktop_2.30.0.bb index 8dd73fa3ba..f7488f674c 100644 --- a/recipes/gnome/gnome-python-desktop_2.30.0.bb +++ b/recipes/gnome/gnome-python-desktop_2.30.0.bb @@ -1,5 +1,7 @@ LICENSE = "GPL/LGPL" -DEPENDS = "librsvg libwnck totem-pl-parser libgtop gnome-panel gnome-desktop eds-dbus python-pygtk gnome-python libgnomeprint libgnomeprintui" +DEPENDS = "python-pycairo evince librsvg libwnck totem-pl-parser libgtop gnome-panel gnome-desktop eds-dbus python-pygtk gnome-python libgnomeprint libgnomeprintui" + +PR = "r2" inherit gnome distutils-base diff --git a/recipes/gypsy/gypsy_0.7.bb b/recipes/gypsy/gypsy_0.7.bb index 9b112dd8e9..8cd8760a07 100644 --- a/recipes/gypsy/gypsy_0.7.bb +++ b/recipes/gypsy/gypsy_0.7.bb @@ -1,6 +1,6 @@ require gypsy.inc -SRC_URI = "http://gypsy.freedesktop.org/gypsy-releases/gypsy-0.7.tar.gz;name=gypsy \ +SRC_URI = "http://gypsy.freedesktop.org/releases/gypsy-0.7.tar.gz;name=gypsy \ file://docs-reference-am.patch \ file://remove-werror.patch \ " diff --git a/recipes/intone-video/intone-video_svn.bb b/recipes/intone-video/intone-video_svn.bb index ee4d253efd..c73329b3e6 100644 --- a/recipes/intone-video/intone-video_svn.bb +++ b/recipes/intone-video/intone-video_svn.bb @@ -8,7 +8,7 @@ RDEPENDS_${PN} = "mplayer lame libxv libsdl-x11" SRCREV = "12" PV = "0.13+svnr${SRCPV}" -PR = "r4" +PR = "r5" SRC_URI = "svn://intone-video.googlecode.com/svn;module=trunk;proto=http" S = "${WORKDIR}/trunk" diff --git a/recipes/intone/intone_svn.bb b/recipes/intone/intone_svn.bb index 184e02d300..e824f9dea6 100644 --- a/recipes/intone/intone_svn.bb +++ b/recipes/intone/intone_svn.bb @@ -8,7 +8,7 @@ RDEPENDS_${PN} = "mplayer lame libxv libsdl-x11" SRCREV = "76" PV = "0.66+svnr${SRCPV}" -PR = "r6" +PR = "r7" SRC_URI = "svn://intone.googlecode.com/svn;module=trunk;proto=http \ file://vorbis-include-id3tag.patch;maxrev=18" diff --git a/recipes/jamvm/jamvm-initial_1.4.5.bb b/recipes/jamvm/jamvm-initial_1.4.5.bb index fb2f4bf330..e3ace6dbdb 100644 --- a/recipes/jamvm/jamvm-initial_1.4.5.bb +++ b/recipes/jamvm/jamvm-initial_1.4.5.bb @@ -2,7 +2,7 @@ SUMMARY = "A compact Java Virtual Machine which conforms to the JVM specificatio HOMEPAGE = "http://jamvm.sourceforge.net/" LICENSE = "GPL" -DEPENDS = "zlib-native classpath-initial jikes-initial" +DEPENDS = "zlib-native classpath-initial jikes-initial libffi-native" PR = "r1" diff --git a/recipes/kexecboot/kexecboot_git.bb b/recipes/kexecboot/kexecboot_git.bb index 9878c82918..526959f8a2 100644 --- a/recipes/kexecboot/kexecboot_git.bb +++ b/recipes/kexecboot/kexecboot_git.bb @@ -1,8 +1,8 @@ PV = "0.5" -PR = "r12+gitr${SRCREV}" +PR = "r13+gitr${SRCREV}" SRC_URI = "git://git.linuxtogo.org/home/groups/kexecboot/kexecboot.git;protocol=git " -SRCREV = "ac70f55e2b49f23963a8f057330eb47836a01c2f" +SRCREV = "485ff04f432115f41b09b39d06ce524b960bfa29" S = "${WORKDIR}/git" diff --git a/recipes/kexecboot/linux-kexecboot_git.bb b/recipes/kexecboot/linux-kexecboot_git.bb index 6e29777617..e2259bf543 100644 --- a/recipes/kexecboot/linux-kexecboot_git.bb +++ b/recipes/kexecboot/linux-kexecboot_git.bb @@ -1,7 +1,7 @@ require linux-kexecboot.inc KERNEL_RELEASE = "2.6.35-rc3" -SRCREV = "7e27d6e778cd87b6f2415515d7127eba53fe5d02" +SRCREV = "5904b3b81d25166e5e39b9727645bb47937618e3" PV = "${KERNEL_RELEASE}+gitr${SRCPV}" SRC_URI += "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;branch=master \ @@ -11,4 +11,4 @@ SRC_URI += "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git S = "${WORKDIR}/git" # Mark archs/machines that this kernel supports -DEFAULT_PREFERENCE = "-1" +DEFAULT_PREFERENCE = "-2" diff --git a/recipes/libmodplug/libmodplug_0.8.7.bb b/recipes/libmodplug/libmodplug_0.8.7.bb index f1af28a2cd..7d198a9094 100644 --- a/recipes/libmodplug/libmodplug_0.8.7.bb +++ b/recipes/libmodplug/libmodplug_0.8.7.bb @@ -3,14 +3,17 @@ HOMEPAGE = "http://modplug-xmms.sf.net" SECTION = "libs" LICENSE = "GPL" +PR = "r1" + SRC_URI = "${SOURCEFORGE_MIRROR}/modplug-xmms/libmodplug-${PV}.tar.gz" inherit autotools pkgconfig # NOTE: autotools_stage_all does nothing here, we need to do it manually -do_stage() { - install -m 0644 ${S}/src/modplug.h ${STAGING_INCDIR} - oe_libinstall -C src -so libmodplug ${STAGING_LIBDIR} +do_install_append() { + install -d ${D}${includedir}/libmodplug + install -m 0644 ${S}/src/modplug.h ${D}${includedir}/libmodplug + install -m 0644 ${S}/src/modplug.h ${D}${includedir}/ } SRC_URI[md5sum] = "d2d9ccd8da22412999caed076140f786" diff --git a/recipes/linux/linux-2.6.24/hipox/defconfig b/recipes/linux/linux-2.6.24/hipox/defconfig index 9dbe866109..be42d03f05 100644 --- a/recipes/linux/linux-2.6.24/hipox/defconfig +++ b/recipes/linux/linux-2.6.24/hipox/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.24.7 -# Wed May 26 09:12:55 2010 +# Fri Jun 25 12:36:50 2010 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -1028,7 +1028,7 @@ CONFIG_USB_STORAGE=m # # CONFIG_USB_MDC800 is not set # CONFIG_USB_MICROTEK is not set -# CONFIG_USB_MON is not set +CONFIG_USB_MON=y # # USB port drivers @@ -1178,7 +1178,9 @@ CONFIG_EXT4DEV_FS_XATTR=y CONFIG_EXT4DEV_FS_POSIX_ACL=y CONFIG_EXT4DEV_FS_SECURITY=y CONFIG_JBD=y +# CONFIG_JBD_DEBUG is not set CONFIG_JBD2=m +# CONFIG_JBD2_DEBUG is not set CONFIG_FS_MBCACHE=y CONFIG_REISERFS_FS=m # CONFIG_REISERFS_CHECK is not set @@ -1367,7 +1369,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y CONFIG_ENABLE_MUST_CHECK=y CONFIG_MAGIC_SYSRQ=y # CONFIG_UNUSED_SYMBOLS is not set -# CONFIG_DEBUG_FS is not set +CONFIG_DEBUG_FS=y # CONFIG_HEADERS_CHECK is not set CONFIG_DEBUG_KERNEL=y # CONFIG_DEBUG_SHIRQ is not set diff --git a/recipes/linux/linux-openmoko-2.6.34/0001-glamo-mci-add-MMC_CAP_NONREMOVABLE.patch b/recipes/linux/linux-openmoko-2.6.34/0001-glamo-mci-add-MMC_CAP_NONREMOVABLE.patch new file mode 100644 index 0000000000..1f996fafaf --- /dev/null +++ b/recipes/linux/linux-openmoko-2.6.34/0001-glamo-mci-add-MMC_CAP_NONREMOVABLE.patch @@ -0,0 +1,37 @@ +From 10e7f7b2132aaac8e3ebc549d3837cc2df888df7 Mon Sep 17 00:00:00 2001 +From: Thibaut Girka <thib@sitedethib.com> +Date: Tue, 29 Jun 2010 12:54:03 +0200 +Subject: [PATCH] glamo-mci: add MMC_CAP_NONREMOVABLE and move enable_irq to right place + +--- + drivers/mmc/host/glamo-mci.c | 5 +++-- + 1 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/drivers/mmc/host/glamo-mci.c b/drivers/mmc/host/glamo-mci.c +index b2442c2..11deb7d 100644 +--- a/drivers/mmc/host/glamo-mci.c ++++ b/drivers/mmc/host/glamo-mci.c +@@ -811,6 +811,7 @@ static int glamo_mci_probe(struct platform_device *pdev) + mmc->ocr_avail = mmc_regulator_get_ocrmask(host->regulator); + mmc->caps = MMC_CAP_4_BIT_DATA | + MMC_CAP_MMC_HIGHSPEED | ++ MMC_CAP_NONREMOVABLE | + MMC_CAP_SD_HIGHSPEED; + mmc->f_min = host->clk_rate / 256; + mmc->f_max = sd_max_clk; +@@ -930,10 +931,10 @@ static int glamo_mci_resume(struct device *dev) + glamo_mci_reset(host); + mdelay(10); + +- ret = mmc_resume_host(host->mmc); +- + enable_irq(host->irq); + ++ ret = mmc_resume_host(host->mmc); ++ + mmc_host_lazy_disable(host->mmc); + + return ret; +-- +1.7.1 + diff --git a/recipes/linux/linux-openmoko-2.6.34_git.bb b/recipes/linux/linux-openmoko-2.6.34_git.bb index 73d8be4341..5ba2196ce8 100644 --- a/recipes/linux/linux-openmoko-2.6.34_git.bb +++ b/recipes/linux/linux-openmoko-2.6.34_git.bb @@ -4,7 +4,7 @@ require linux-openmoko.inc KERNEL_RELEASE="2.6.34" SRCREV = "4ce5f33cd4bcde2e25d50ae0880eb39213e2b6d2" -OEV = "oe4" +OEV = "oe4.2" PV = "${KERNEL_RELEASE}-${OEV}+gitr${SRCPV}" SRC_URI = "\ @@ -29,6 +29,8 @@ SRC_URI = "\ file://0002-usbhost.patch.patch \ file://0003-ar6000_delay.patch.patch \ file://0004-save_regs.patch.patch \ +# possible resume fix + file://0001-glamo-mci-add-MMC_CAP_NONREMOVABLE.patch \ file://defconfig \ " diff --git a/recipes/linux/linux_git.bb b/recipes/linux/linux_git.bb index 35f827e565..c242ef1b2b 100644 --- a/recipes/linux/linux_git.bb +++ b/recipes/linux/linux_git.bb @@ -1,7 +1,7 @@ require linux.inc KERNEL_RELEASE = "2.6.35-rc3" -SRCREV = "7e27d6e778cd87b6f2415515d7127eba53fe5d02" +SRCREV = "5904b3b81d25166e5e39b9727645bb47937618e3" PV = "${KERNEL_RELEASE}+gitr${SRCPV}" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;branch=master \ @@ -11,4 +11,4 @@ SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git; S = "${WORKDIR}/git" # Mark archs/machines that this kernel supports -DEFAULT_PREFERENCE = "-1" +DEFAULT_PREFERENCE = "-2" diff --git a/recipes/llvm/llvm-native.inc b/recipes/llvm/llvm-native.inc index 15ce0b731c..b3cb7a64ec 100644 --- a/recipes/llvm/llvm-native.inc +++ b/recipes/llvm/llvm-native.inc @@ -17,6 +17,10 @@ EXTRA_OECMAKE = "\ -DNM_PATH:FILEPATH=${NM} \ " +PACKAGES = "" + +PACKAGES_DYNAMIC = "" + do_stage() { cd ${OECMAKE_BUILDPATH} diff --git a/recipes/llvm/llvm.inc b/recipes/llvm/llvm.inc index 3e11318743..baebe308af 100644 --- a/recipes/llvm/llvm.inc +++ b/recipes/llvm/llvm.inc @@ -55,45 +55,57 @@ EXTRA_OECMAKE = "\ -DCMAKE_STRIP:FILEPATH=${STRIP} \ -DNM_PATH:FILEPATH=${NM} \ -DLLVM_ENABLE_PIC:BOOL=ON \ + -DLLVM_TARGET_ARCH:STRING=${LLVM_ARCH} \ + -DLLVM_ENABLE_ASSERTIONS:BOOL=ON \ + -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \ + -DBUILD_SHARED_LIBS:BOOL=ON \ " +PACKAGES = " ${PN}-dev ${PN}-dbg ${PN}-doc " + +PACKAGES_DYNAMIC = "llvm-*" + +python populate_packages_prepend () { + libllvm_libdir = bb.data.expand('${libdir}/', d) + + do_split_packages(d, libllvm_libdir, '^lib(.*)\.so$', 'libllvm-%s', 'Split package for %s', allow_dirs=True) +} + +FILES_${PN}-dev = "${includedir} ${bindir}/* ${libdir}/LLVMHello.so" + llvm_stage() { # Install into a private directory to be able to reorganize the files. - oe_runmake DESTDIR=${WORKDIR}/llvm-install install + oe_runmake DESTDIR=${WORKDIR}/llvm-install install # Create our custom target directories install -d ${STAGING_BINDIR}/llvm${LLVM_RELEASE} - install -d ${STAGING_INCDIR}/llvm${LLVM_RELEASE} + install -d ${STAGING_INCDIR}/llvm${LLVM_RELEASE} install -d ${STAGING_LIBDIR}/llvm${LLVM_RELEASE} # Move headers into their own directory cp -r ${WORKDIR}/llvm-install/${prefix}/include/llvm \ - ${STAGING_INCDIR}/llvm${LLVM_RELEASE}/ + ${STAGING_INCDIR}/llvm${LLVM_RELEASE}/ cp -r ${WORKDIR}/llvm-install/${prefix}/include/llvm-c \ - ${STAGING_INCDIR}/llvm${LLVM_RELEASE}/ - - # llvm somehow forgets these -# find include/llvm -name "*.h" -maxdepth 1 -exec \ -# install {} ${STAGING_INCDIR}/llvm${LLVM_RELEASE}/llvm \; + ${STAGING_INCDIR}/llvm${LLVM_RELEASE}/ find ${WORKDIR}/llvm-install/${prefix}/lib -name "*" -maxdepth 1 -exec \ - install {} ${STAGING_LIBDIR}/llvm${LLVM_RELEASE} \; + install {} ${STAGING_LIBDIR}/llvm${LLVM_RELEASE} \; # I dont know another way out. Binaries are installed into a special subdir find ${WORKDIR}/llvm-install/${prefix}/bin -name "*" -maxdepth 1 -exec \ - install {} ${STAGING_BINDIR}/llvm${LLVM_RELEASE} \; + install {} ${STAGING_BINDIR}/llvm${LLVM_RELEASE} \; # LLVM does not install this by default. - install bin/tblgen ${STAGING_BINDIR}/llvm${LLVM_RELEASE} - - # Fix the paths in the config script to make it find the binaries and - # library files. Doing so allows 3rd party configure scripts working - # unmodified. - sed -e's!my.*ABS_RUN_DIR =.*!my $ABS_RUN_DIR = "${STAGING_DIR_TARGET}";!' \ - -e's!my.*INCLUDEDIR =.*!my $INCLUDEDIR = "${STAGING_INCDIR}/llvm${LLVM_RELEASE}";!' \ - -e's!my.*LIBDIR.*!my $LIBDIR = "${STAGING_LIBDIR}/llvm${LLVM_RELEASE}";!' \ - -e's!my.*BINDIR.*!my $BINDIR = "${STAGING_BINDIR}/llvm${LLVM_RELEASE}";!' \ - bin/llvm-config > bin/llvm-config${LLVM_RELEASE} + install bin/tblgen ${STAGING_BINDIR}/llvm${LLVM_RELEASE} + + # Fix the paths in the config script to make it find the binaries and + # library files. Doing so allows 3rd party configure scripts working + # unmodified. + sed -e's!my.*ABS_RUN_DIR =.*!my $ABS_RUN_DIR = "${STAGING_DIR_TARGET}";!' \ + -e's!my.*INCLUDEDIR =.*!my $INCLUDEDIR = "${STAGING_INCDIR}/llvm${LLVM_RELEASE}";!' \ + -e's!my.*LIBDIR.*!my $LIBDIR = "${STAGING_LIBDIR}/llvm${LLVM_RELEASE}";!' \ + -e's!my.*BINDIR.*!my $BINDIR = "${STAGING_BINDIR}/llvm${LLVM_RELEASE}";!' \ + bin/llvm-config > bin/llvm-config${LLVM_RELEASE} } do_stage() { diff --git a/recipes/llvm/llvm2.5-native_2.5.bb b/recipes/llvm/llvm2.5-native_2.5.bb deleted file mode 100644 index 416e0683b7..0000000000 --- a/recipes/llvm/llvm2.5-native_2.5.bb +++ /dev/null @@ -1,7 +0,0 @@ -require llvm-native.inc - -SRC_URI += "file://fix-build.patch" - - -SRC_URI[md5sum] = "55df2ea8665c8094ad2ef85187b9fc74" -SRC_URI[sha256sum] = "8f3d69e63bc5d1ee2c2ee49ff07ccb7e070070a0e937813d2a6179b9e2e173ed" diff --git a/recipes/llvm/llvm2.5/fix-build.patch b/recipes/llvm/llvm2.5/fix-build.patch deleted file mode 100644 index 527823c18c..0000000000 --- a/recipes/llvm/llvm2.5/fix-build.patch +++ /dev/null @@ -1,24 +0,0 @@ -Index: llvm-2.5/tools/llvm-config/CMakeLists.txt -=================================================================== ---- llvm-2.5.orig/tools/llvm-config/CMakeLists.txt 2009-01-07 20:24:44.000000000 +0100 -+++ llvm-2.5/tools/llvm-config/CMakeLists.txt 2009-03-23 13:45:24.000000000 +0100 -@@ -83,13 +83,13 @@ - COMMENT "Checking for cyclic dependencies between LLVM libraries.") - - add_custom_command(OUTPUT ${LLVM_CONFIG} -- COMMAND echo 's,@LLVM_CPPFLAGS@,${CMAKE_CPP_FLAGS},' > temp.sed -- COMMAND echo 's,@LLVM_CFLAGS@,${CMAKE_C_FLAGS},' >> temp.sed -- COMMAND echo 's,@LLVM_CXXFLAGS@,${CMAKE_CXX_FLAGS},' >> temp.sed -+ COMMAND echo 's!@LLVM_CPPFLAGS@!${CMAKE_CPP_FLAGS}!' > temp.sed -+ COMMAND echo 's!@LLVM_CFLAGS@!${CMAKE_C_FLAGS} -D_GNU_SOURCE -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS!' >> temp.sed -+ COMMAND echo 's!@LLVM_CXXFLAGS@!${CMAKE_CXX_FLAGS} -D_GNU_SOURCE -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS -fpermissive -fvisibility-inlines-hidden -Woverloaded-virtual!' >> temp.sed - # TODO: Use general flags for linking, not just for shared libs: -- COMMAND echo 's,@LLVM_LDFLAGS@,${CMAKE_SHARED_LINKER_FLAGS},' >> temp.sed -- COMMAND echo 's,@LIBS@,,' >> temp.sed # TODO: System libs -- COMMAND echo 's,@LLVM_BUILDMODE@,${CMAKE_BUILD_TYPE},' >> temp.sed -+ COMMAND echo 's!@LLVM_LDFLAGS@!${CMAKE_SHARED_LINKER_FLAGS}!' >> temp.sed -+ COMMAND echo 's!@LIBS@!!' >> temp.sed # TODO: System libs -+ COMMAND echo 's!@LLVM_BUILDMODE@!${CMAKE_BUILD_TYPE}!' >> temp.sed - COMMAND sed -f temp.sed < ${LLVM_CONFIG_IN} > ${LLVM_CONFIG} - COMMAND ${CMAKE_COMMAND} -E remove -f temp.sed - COMMAND cat ${FINAL_LIBDEPS} >> ${LLVM_CONFIG} diff --git a/recipes/llvm/llvm2.5_2.5.bb b/recipes/llvm/llvm2.5_2.5.bb deleted file mode 100644 index 301aa47365..0000000000 --- a/recipes/llvm/llvm2.5_2.5.bb +++ /dev/null @@ -1,7 +0,0 @@ -require llvm.inc - -SRC_URI += "file://fix-build.patch" - - -SRC_URI[md5sum] = "55df2ea8665c8094ad2ef85187b9fc74" -SRC_URI[sha256sum] = "8f3d69e63bc5d1ee2c2ee49ff07ccb7e070070a0e937813d2a6179b9e2e173ed" diff --git a/recipes/llvm/llvm2.6-native_2.6.bb b/recipes/llvm/llvm2.6-native_2.6.bb deleted file mode 100644 index dec132a8c1..0000000000 --- a/recipes/llvm/llvm2.6-native_2.6.bb +++ /dev/null @@ -1,13 +0,0 @@ -require llvm-native.inc - -PR = "r0" - -SRC_URI += "\ - file://fix-build.patch \ - file://llvm-debugonly-zeroormore.patch;striplevel=0 \ -" - -LLVM_RELEASE = "2.6" - -SRC_URI[md5sum] = "34a11e807add0f4555f691944e1a404a" -SRC_URI[sha256sum] = "4cd9257350c5ff8b9b139d19497e2396c0604eef0e5d6504f5c1463b09bf2d84" diff --git a/recipes/llvm/llvm2.6/BX_to_BLX.patch b/recipes/llvm/llvm2.6/BX_to_BLX.patch deleted file mode 100644 index 7cf36766af..0000000000 --- a/recipes/llvm/llvm2.6/BX_to_BLX.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: llvm/lib/Target/ARM/ARMInstrInfo.td -=================================================================== ---- llvm.orig/lib/Target/ARM/ARMInstrInfo.td 2009-10-06 12:35:26.000000000 +0000 -+++ llvm/lib/Target/ARM/ARMInstrInfo.td 2009-10-06 12:36:03.000000000 +0000 -@@ -645,7 +645,7 @@ - IIC_Br, "mov lr, pc\n\tbx $func", - [(ARMcall_nolink GPR:$func)]>, - Requires<[IsARM, IsNotDarwin]> { -- let Inst{7-4} = 0b0001; -+ let Inst{7-4} = 0b0011; - let Inst{19-8} = 0b111111111111; - let Inst{27-20} = 0b00010010; - } diff --git a/recipes/llvm/llvm2.6/fix-build.patch b/recipes/llvm/llvm2.6/fix-build.patch deleted file mode 100644 index 39b8d1dc30..0000000000 --- a/recipes/llvm/llvm2.6/fix-build.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: trunk/tools/llvm-config/CMakeLists.txt -=================================================================== ---- trunk.orig/tools/llvm-config/CMakeLists.txt 2009-04-10 11:56:56.000000000 +0200 -+++ trunk/tools/llvm-config/CMakeLists.txt 2009-04-10 12:21:19.000000000 +0200 -@@ -90,7 +90,7 @@ - add_custom_command(OUTPUT ${LLVM_CONFIG} - COMMAND echo 's!@LLVM_CPPFLAGS@!${CPP_FLGS}!' > temp.sed - COMMAND echo 's!@LLVM_CFLAGS@!${C_FLGS}!' >> temp.sed -- COMMAND echo 's!@LLVM_CXXFLAGS@!${CXX_FLGS}!' >> temp.sed -+ COMMAND echo 's!@LLVM_CXXFLAGS@!${CXX_FLGS} -fpermissive -fvisibility-inlines-hidden -Woverloaded-virtual!' >> temp.sed - # TODO: Use general flags for linking! not just for shared libs: - COMMAND echo 's!@LLVM_LDFLAGS@!${CMAKE_SHARED_LINKER_FLAGS}!' >> temp.sed - COMMAND echo 's!@LIBS@!!' >> temp.sed # TODO: System libs diff --git a/recipes/llvm/llvm2.6/llvm-debugonly-zeroormore.patch b/recipes/llvm/llvm2.6/llvm-debugonly-zeroormore.patch deleted file mode 100644 index 8888884ea5..0000000000 --- a/recipes/llvm/llvm2.6/llvm-debugonly-zeroormore.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: lib/Support/Debug.cpp -=================================================================== ---- lib/Support/Debug.cpp (Revision 71077) -+++ lib/Support/Debug.cpp (Arbeitskopie) -@@ -48,7 +48,7 @@ - static cl::opt<DebugOnlyOpt, true, cl::parser<std::string> > - DebugOnly("debug-only", cl::desc("Enable a specific type of debug output"), - cl::Hidden, cl::value_desc("debug string"), -- cl::location(DebugOnlyOptLoc), cl::ValueRequired); -+ cl::location(DebugOnlyOptLoc), cl::ValueRequired, cl::ZeroOrMore); - #endif - } - diff --git a/recipes/llvm/llvm2.6_2.6.bb b/recipes/llvm/llvm2.6_2.6.bb deleted file mode 100644 index 35aa38fe76..0000000000 --- a/recipes/llvm/llvm2.6_2.6.bb +++ /dev/null @@ -1,16 +0,0 @@ -require llvm.inc - -PR = "r1" - -DEPENDS = "llvm-common llvm2.6-native" - -SRC_URI += "\ - file://fix-build.patch \ - file://llvm-debugonly-zeroormore.patch;striplevel=0 \ - file://BX_to_BLX.patch \ -" - -LLVM_RELEASE = "2.6" - -SRC_URI[md5sum] = "34a11e807add0f4555f691944e1a404a" -SRC_URI[sha256sum] = "4cd9257350c5ff8b9b139d19497e2396c0604eef0e5d6504f5c1463b09bf2d84" diff --git a/recipes/llvm/llvm2.7_2.7.bb b/recipes/llvm/llvm2.7_2.7.bb index 67633e22b4..187a41d24a 100644 --- a/recipes/llvm/llvm2.7_2.7.bb +++ b/recipes/llvm/llvm2.7_2.7.bb @@ -1,6 +1,6 @@ require llvm.inc -PR = "r2" +PR = "r3" DEPENDS = "llvm-common llvm2.7-native" @@ -9,13 +9,6 @@ SRC_URI = "\ file://BX_to_BLX.patch \ " -EXTRA_OECMAKE += "\ - -DLLVM_TARGET_ARCH:STRING=${LLVM_ARCH} \ - -DLLVM_ENABLE_ASSERTIONS:BOOL=ON \ - -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \ - -DBUILD_SHARED_LIBS:BOOL=ON \ - " - LLVM_RELEASE = "2.7" SRC_URI[md5sum] = "ac322661f20e7d6c810b1869f886ad9b" diff --git a/recipes/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb b/recipes/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb index bbe887476d..f8822e7e03 100644 --- a/recipes/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb +++ b/recipes/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb @@ -2,11 +2,10 @@ DESCRIPTION = "Matchbox virtual keyboard for X11" LICENSE = "GPL" DEPENDS = "libfakekey expat libxft gtk+ matchbox-panel-2" RCONFLICTS_${PN} = "matchbox-keyboard" -RPROVIDES_${PN} = "matchbox-keyboard" SECTION = "x11" SRCREV = "1910" PV = "0.0+svnr${SRCPV}" -PR = "r11" +PR = "r12" SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=matchbox-keyboard;proto=http \ file://smallscreen-fontsize.patch \ diff --git a/recipes/matchbox-keyboard/matchbox-keyboard_svn.bb b/recipes/matchbox-keyboard/matchbox-keyboard_svn.bb index 28e3ac7e3b..28d8035ca6 100644 --- a/recipes/matchbox-keyboard/matchbox-keyboard_svn.bb +++ b/recipes/matchbox-keyboard/matchbox-keyboard_svn.bb @@ -2,11 +2,10 @@ DESCRIPTION = "Matchbox virtual keyboard for X11" LICENSE = "GPL" DEPENDS = "libfakekey expat libxft" RCONFLICTS_${PN} = matchbox-keyboard-inputmethod -RPROVIDES_${PN} = matchbox-keyboard-inputmethod SECTION = "x11" SRCREV = "1910" PV = "0.0+svnr${SRCPV}" -PR = "r8" +PR = "r9" SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \ file://smallscreen-fontsize.patch \ diff --git a/recipes/opencv/opencv-dsp-acceleration_svn.bb b/recipes/opencv/opencv-dsp-acceleration_svn.bb new file mode 100644 index 0000000000..c225c5102a --- /dev/null +++ b/recipes/opencv/opencv-dsp-acceleration_svn.bb @@ -0,0 +1,53 @@ +LICENSE = "BSD" +DEPENDS = "ti-codec-engine ti-dsplib" + +PV = "0+svnr${SRCPV}" +SRCREV = "105" + +SRC_URI = "svn://opencv-dsp-acceleration.googlecode.com/svn/;proto=http;module=trunk \ + http://focus.ti.com/lit/sw/sprc264/sprc264.zip;name=imglib \ +" + +SRC_URI[imglib.md5sum] = "97dca3f1612d7c35b3d3fe9f32ab3e0c" +SRC_URI[imglib.sha256sum] = "bf22c58cf81362ec3e7ed2d8debc39f00d1bfd0343094401cce2f928830858c1" + +S = "${WORKDIR}/trunk/dsp_opencv" + +require recipes/ti/ti-paths.inc +require recipes/ti/ti-staging.inc + +export CROSS_COMPILE = "${TOOLCHAIN_PATH}/bin/${TARGET_PREFIX}" +export LINUXKERNEL_INSTALL_DIR = "${STAGING_KERNEL_DIR}" +export OPENCV_PATH = "${STAGING_INCDIR}" +export DSPLIB_PATH = "${DSPLIB_INSTALL_DIR}" + +# You need to extract the imglib from the .exe manually and place it in /OE/tmp (or somewhere else and change the patch below) +export IMGLIB_PATH = "/OE/tmp/imglib" + +do_configure() { + echo "-l ${DSPLIB_INSTALL_DIR}/dsplib64plus.lib" >> ${S}/beagle/server/opencv_unitserver_evm3530/link.cmd + echo "-l ${IMGLIB_PATH}/lib/target/imglib2.l64P" >> ${S}/beagle/server/opencv_unitserver_evm3530/link.cmd + sed -e /DIR/d -e /PATH/d -i Rules.make + for i in $(find ${S} -name "*.mak" ; find ${S} -name "*.cmd") ; do + sed -i s:/media/disk/OE/work/ti/dsplib_v210:${DSPLIB_PATH}:g $i + sed -i s:/media/disk/OE/work/ti/imglib_v201:${IMGLIB_PATH}:g $i + done + + # Add in build *FLAGS as well + for i in $(find ${S} -name "Makefile") ; do + sed -i -e 's:LD_FLAGS):LD_FLAGS) $(LDFLAGS):g' -e 's:C_FLAGS):C_FLAGS) $(CFLAGS):g' $i + done +} + +do_compile() { + oe_runmake -e codec + oe_runmake -e server + oe_runmake -e library + oe_runmake -e app +} + +do_install() { + oe_runmake -e install EXEC_DIR=${D}${datadir}/ti/opencv-dsp +} + +FILES_${PN} += "${datadir}" diff --git a/recipes/openmoko-3rdparty/emtooth_svn.bb b/recipes/openmoko-3rdparty/emtooth_svn.bb index 1be1001aaf..12204d5edd 100644 --- a/recipes/openmoko-3rdparty/emtooth_svn.bb +++ b/recipes/openmoko-3rdparty/emtooth_svn.bb @@ -8,7 +8,7 @@ RDEPENDS_${PN} = "bluez4 obexd" SRCREV = "77" PV = "0.1+svnr${SRCPV}" -PR = "r4" +PR = "r5" SRC_URI = "svn://emtooth.googlecode.com/svn/trunk;module=app;proto=http" diff --git a/recipes/openmoko-3rdparty/iliwi_git.bb b/recipes/openmoko-3rdparty/iliwi_git.bb index 3d7f96e39c..665f69b5bb 100644 --- a/recipes/openmoko-3rdparty/iliwi_git.bb +++ b/recipes/openmoko-3rdparty/iliwi_git.bb @@ -8,7 +8,7 @@ RDEPENDS_${PN} = "wireless-tools wpa-supplicant" SRCREV = "5be2b301033418fb9a33759047274b676034f096" PV = "0.0.1+gitr${SRCPV}" -PR = "r4" +PR = "r5" SRC_URI = "git://github.com/Ebbe/Iliwi.git;protocol=http;branch=master" S = "${WORKDIR}/git" diff --git a/recipes/openmoko-3rdparty/jefliks_git.bb b/recipes/openmoko-3rdparty/jefliks_git.bb index fbd24cfa30..2b1588a5ea 100644 --- a/recipes/openmoko-3rdparty/jefliks_git.bb +++ b/recipes/openmoko-3rdparty/jefliks_git.bb @@ -6,7 +6,7 @@ DEPENDS = "edje-native elementary iksemel gnutls eet evas ecore eina" HOMEPAGE = "http://jefliks.sourceforge.net/" AUTHOR = "Phoenix Kayo <kayo.k11.4@gmail.com>" PV = "0.0.2b+gitr${SRCPV}" -PR = "r2" +PR = "r3" inherit autotools pkgconfig diff --git a/recipes/openmoko-3rdparty/mcnavi_0.2.10.bb b/recipes/openmoko-3rdparty/mcnavi_0.2.10.bb new file mode 100644 index 0000000000..e72b1d1611 --- /dev/null +++ b/recipes/openmoko-3rdparty/mcnavi_0.2.10.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "Free GPS navigation for car and outdoor with OpenStreetMap maps" +HOMEPAGE = "http://www.gps-routes.info/index.php?name=Content&pa=showpage&pid=1" +LICENSE = "GPL" +DEPENDS = "ecore evas imlib2 gpsd edje-native" + +SRC_URI = "http://www.gps-routes.info/debian/pool/main/m/mcnavi/mcnavi_${PV}.tar.gz;name=archive" + +SRC_URI[archive.md5sum] = "627d36d735b866ecb0dc3ad350fe815d" +SRC_URI[archive.sha256sum] = "70abe699d93adfa544fb1243356b71ccc0178e23af743726ac5e707825b11e06" + +S = "${WORKDIR}/${PN}" + +do_configure_prepend() { + # replace link to (sometimes) non-existent file with empty file + rm -f ${S}/INSTALL; touch ${S}/INSTALL +} + +inherit autotools diff --git a/recipes/openmoko-3rdparty/mcnavi_0.2.5.bb b/recipes/openmoko-3rdparty/mcnavi_0.2.5.bb index 5a4f3e6510..5079553891 100644 --- a/recipes/openmoko-3rdparty/mcnavi_0.2.5.bb +++ b/recipes/openmoko-3rdparty/mcnavi_0.2.5.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Free GPS navigation for car and outdoor with OpenStreetMap maps" HOMEPAGE = "http://www.gps-routes.info/index.php?name=Content&pa=showpage&pid=1" LICENSE = "GPL" DEPENDS = "ecore evas imlib2 gpsd edje-native" -PR = "r4" +PR = "r5" SRC_URI = "http://www.gps-routes.info/debian/pool/main/m/mcnavi/mcnavi_${PV}.tar.gz;name=archive \ file://gpsd-2.90.patch" diff --git a/recipes/openmoko-3rdparty/ventura_svn.bb b/recipes/openmoko-3rdparty/ventura_svn.bb index 1d9ac65a04..b419e37351 100644 --- a/recipes/openmoko-3rdparty/ventura_svn.bb +++ b/recipes/openmoko-3rdparty/ventura_svn.bb @@ -6,7 +6,7 @@ LICENSE = "GPLv2" DEPENDS = "elementary webkit-efl sqlite3" RRECOMMENDS_${PN} = "ca-certificates" PV = "0.2+svnr${SRCPV}" -PR = "r4" +PR = "r5" SRC_URI = "svn://elm-browser.googlecode.com/svn;module=trunk;proto=http" diff --git a/recipes/openmoko-projects/paroli_git.bb b/recipes/openmoko-projects/paroli_git.bb index a006c046b2..2b074dd392 100644 --- a/recipes/openmoko-projects/paroli_git.bb +++ b/recipes/openmoko-projects/paroli_git.bb @@ -4,7 +4,7 @@ LICENSE = "GPL" SRCREV = "bb9fb1969acdfbaa48b55902675a6d8949014c6d" PV = "0.2.1+gitr${SRCPV}" PE = "1" -PR = "r3" +PR = "r4" SRC_URI = "git://git.paroli-project.org/paroli.git;protocol=http;branch=shr" S = "${WORKDIR}/git" diff --git a/recipes/opie-taskbar/opie-taskbar-images.inc b/recipes/opie-taskbar/opie-taskbar-images.inc index b35dd8d593..3e1a8c8f39 100644 --- a/recipes/opie-taskbar/opie-taskbar-images.inc +++ b/recipes/opie-taskbar/opie-taskbar-images.inc @@ -2,7 +2,6 @@ DESCRIPTION = "Opie Launcher and Taskbar" SECTION = "opie/base" PRIORITY = "optional" LICENSE = "GPL" -RPROVIDES = "${PN}" APPNAME = "qpe" S = "${WORKDIR}/pics" @@ -61,3 +60,12 @@ python do_package_prepend () { PACKAGE_ARCH = "all" PACKAGES = "${PN}-dbg ${PN}-320x480 ${PN}-480x320 ${PN}-480x640 ${PN}-640x480 ${PN}-800x600 ${PN}-600x800 ${PN}-320x240 ${PN}-240x320 ${PN}-320x320" +RPROVIDES_${PN}-320x480 = "opie-taskbar-images" +RPROVIDES_${PN}-480x320 = "opie-taskbar-images" +RPROVIDES_${PN}-480x640 = "opie-taskbar-images" +RPROVIDES_${PN}-640x480 = "opie-taskbar-images" +RPROVIDES_${PN}-800x600 = "opie-taskbar-images" +RPROVIDES_${PN}-600x800 = "opie-taskbar-images" +RPROVIDES_${PN}-320x240 = "opie-taskbar-images" +RPROVIDES_${PN}-240x320 = "opie-taskbar-images" +RPROVIDES_${PN}-320x320 = "opie-taskbar-images" diff --git a/recipes/orinoco/spectrum-fw.bb b/recipes/orinoco/spectrum-fw.bb index 66ec16ed83..3e0f384ae9 100644 --- a/recipes/orinoco/spectrum-fw.bb +++ b/recipes/orinoco/spectrum-fw.bb @@ -3,7 +3,7 @@ DEPENDS += " unzip-native " LICENSE = "unknown" PR = "r2" -SRC_URI = "ftp://symstore.longisland.com/Symstore/services_download/wirless_prod/MC&DriverOnlyInstallers.zip;name=zip \ +SRC_URI = "http://ftp.osuosl.org/pub/nslu2/sources/MC&DriverOnlyInstallers.zip;name=zip \ file://get_symbol_fw \ file://parse_symbol_fw" S = "${WORKDIR}" diff --git a/recipes/python/python-pycairo_1.8.0.bb b/recipes/python/python-pycairo_1.8.0.bb index 6437c373d1..0b44acbad3 100644 --- a/recipes/python/python-pycairo_1.8.0.bb +++ b/recipes/python/python-pycairo_1.8.0.bb @@ -4,7 +4,7 @@ HOMEPAGE = "http://cairographics.org/pycairo" LICENSE = "LGPL MPL" # cairo >= 1.8.0 DEPENDS = "cairo" -PR = "ml0" +PR = "ml4" DEFAULT_PREFERENCE = "-1" @@ -18,9 +18,11 @@ do_configure_append() { sed -e 's:@prefix@:${prefix}:' -e 's:@includedir@:\$\{prefix\}/include:' -e 's:@VERSION@:${PV}:' pycairo.pc.in > pycairo.pc } -do_stage() { - install -d ${STAGING_INCDIR} - install -m 0644 cairo/pycairo.h ${STAGING_INCDIR} +do_install_append() { + mv ${D}${datadir}/include/* ${D}${includedir} + mv ${D}${datadir}/lib/* ${D}${libdir} + install -d ${D}${includedir}/pycairo + ln -sf ..//pycairo.h ${D}${includedir}/pycairo/ } SRC_URI[md5sum] = "847f5377c32228a656819f5bd18eb6b4" diff --git a/recipes/realpath/files/makefile.patch b/recipes/realpath/realpath-1.10/makefile.patch index d97ba59778..d97ba59778 100644 --- a/recipes/realpath/files/makefile.patch +++ b/recipes/realpath/realpath-1.10/makefile.patch diff --git a/recipes/realpath/realpath-1.15/fix-common-mk.patch b/recipes/realpath/realpath-1.15/fix-common-mk.patch new file mode 100644 index 0000000000..3556d04b2e --- /dev/null +++ b/recipes/realpath/realpath-1.15/fix-common-mk.patch @@ -0,0 +1,38 @@ +Index: realpath-1.15/common.mk +=================================================================== +--- realpath-1.15.orig/common.mk 2010-06-28 17:26:17.611275002 -0700 ++++ realpath-1.15/common.mk 2010-06-28 17:31:40.151275002 -0700 +@@ -8,17 +8,15 @@ + + override PACKAGE := realpath + +-PATH := /usr/bin:/usr/sbin:/bin:/sbin:$(PATH) +- + # build abstraction +-install_file := install -p -o root -g root -m 644 +-install_script := install -p -o root -g root -m 755 +-install_dir := install -d -o root -g root -m 755 ++install_file := install -p -m 644 ++install_script := install -p -m 755 ++install_dir := install -d -m 755 + install_link := ln -sf + compress := gzip -9f + +-prefix := /usr +-etcdir := /etc/$(PACKAGE) ++prefix := $(prefix) ++etcdir := $(sysconfdir)/$(PACKAGE) + bindir := $(prefix)/bin + sbindir := $(prefix)/sbin + mandir := $(prefix)/share/man +@@ -33,8 +31,8 @@ + webcgidir := $(prefix)/lib/cgi-bin + applicationsdir := $(prefix)/share/applications + +-PERL := /usr/bin/perl +-CC := gcc ++PERL := perl ++CC := $(CC) + CFLAGS = -Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes -Werror -g -DVERSION='"$(VERSION)"' -DPACKAGE='"$(PACKAGE)"' -DLOCALEDIR='"$(nlsdir)"' + LDFLAGS := + LIBS := diff --git a/recipes/realpath/realpath-1.15/no-po4a.patch b/recipes/realpath/realpath-1.15/no-po4a.patch new file mode 100644 index 0000000000..26c9a06145 --- /dev/null +++ b/recipes/realpath/realpath-1.15/no-po4a.patch @@ -0,0 +1,11 @@ +Index: realpath-1.15/po/Makefile +=================================================================== +--- realpath-1.15.orig/po/Makefile 2010-06-28 17:22:08.561275001 -0700 ++++ realpath-1.15/po/Makefile 2010-06-28 17:22:17.421275001 -0700 +@@ -4,5 +4,5 @@ + # + + ALL_TARGET= +-SUBDIRS=bin man ++SUBDIRS=bin + include ../common.mk diff --git a/recipes/realpath/realpath-1.15/remove-nls.patch b/recipes/realpath/realpath-1.15/remove-nls.patch new file mode 100644 index 0000000000..e2910e1a2b --- /dev/null +++ b/recipes/realpath/realpath-1.15/remove-nls.patch @@ -0,0 +1,27 @@ +Index: realpath-1.15/src/realpath.c +=================================================================== +--- realpath-1.15.orig/src/realpath.c 2010-06-28 17:24:05.591275001 -0700 ++++ realpath-1.15/src/realpath.c 2010-06-28 17:24:52.731275001 -0700 +@@ -23,9 +23,8 @@ + #include <errno.h> + #include <getopt.h> + #include <stdarg.h> +-#include <libintl.h> + +-#define _(String) gettext (String) ++#define _(String) (String) + + static char *stripdir(char * dir, char *buf, int maxlen); + +@@ -115,11 +114,6 @@ + + myname = ( p = strchr(argv[0], '/') ) ? p+1 : argv[0]; + +- setlocale(LC_ALL, ""); +- bindtextdomain(PACKAGE, LOCALEDIR); +- textdomain(PACKAGE); +- +- + parse_options(argc, argv); + + while (optind < argc) { diff --git a/recipes/realpath/realpath_1.15.bb b/recipes/realpath/realpath_1.15.bb new file mode 100644 index 0000000000..d4001d3c6c --- /dev/null +++ b/recipes/realpath/realpath_1.15.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "Return the canonicalized absolute pathname" +SECTION = "utility" +PRIORITY = "optional" +LICENSE = "GPLv2" + +PR = "r1" +SRC_URI = "${DEBIAN_MIRROR}/main/r/realpath/realpath_${PV}.tar.gz;name=realpath \ + file://fix-common-mk.patch \ + file://no-po4a.patch \ + file://remove-nls.patch \ + " + +CFLAGS += "-DVERSION=${PV}" +TARGET_CC_ARCH += "${LDFLAGS}" + +do_install () { + install -d ${D}${bindir} + install -p -m 0755 ${S}/src/_build/realpath ${D}${bindir} +} + +SRC_URI[realpath.md5sum] = "3351ce6e3d0ce255641c8ca9216a8638" +SRC_URI[realpath.sha256sum] = "b3d11cec375145ea60663e6fe54727c70a0e86c18f40bddac2a89b635cc1531f" diff --git a/recipes/shadow/shadow.inc b/recipes/shadow/shadow.inc index 460930b22a..d2ac65da71 100644 --- a/recipes/shadow/shadow.inc +++ b/recipes/shadow/shadow.inc @@ -13,7 +13,7 @@ DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" PACKAGE_ARCH_${PN} = "${MACHINE_ARCH}" -INC_PR = "r14" +INC_PR = "r15" # Additional Policy files for PAM PAM_SRC_URI = " \ @@ -81,6 +81,9 @@ do_install_append() { sed -i 's/MAIL_DIR/#MAIL_DIR/g' ${D}${sysconfdir}/login.defs sed -i 's/#MAIL_FILE/MAIL_FILE/g' ${D}${sysconfdir}/login.defs + # disable checking emails at all + sed -i 's/MAIL_CHECK_ENAB/#MAIL_CHECK_ENAB/g' ${D}${sysconfdir}/login.defs + install -d ${D}${sbindir} ${D}${base_sbindir} ${D}${base_bindir} for i in passwd chfn newgrp chsh ; do mv ${D}${bindir}/$i ${D}${bindir}/$i.${PN} diff --git a/recipes/shr/e-wm-config-illume-shr_git.bb b/recipes/shr/e-wm-config-illume-shr_git.bb index 74379901da..b816b400a7 100644 --- a/recipes/shr/e-wm-config-illume-shr_git.bb +++ b/recipes/shr/e-wm-config-illume-shr_git.bb @@ -4,7 +4,7 @@ DEPENDS = "eet" LICENSE = "MIT BSD" SRCREV = "285e2f0a92fc47d9a739c5a1a936124b6e6fa819" PV = "1.2+gitr${SRCPV}" -PR = "r2" +PR = "r3" inherit e diff --git a/recipes/shr/e-wm-config-illume2-shr_git.bb b/recipes/shr/e-wm-config-illume2-shr_git.bb index f1d1fb2bb7..081bb063d0 100644 --- a/recipes/shr/e-wm-config-illume2-shr_git.bb +++ b/recipes/shr/e-wm-config-illume2-shr_git.bb @@ -5,7 +5,7 @@ LICENSE = "MIT BSD" RDEPENDS_${PN} = "shr-e-gadgets" SRCREV = "1247d22a007435a58f0967189fc92db2931b31cb" PV = "1.2+gitr${SRCPV}" -PR = "r3" +PR = "r4" inherit e diff --git a/recipes/shr/libphone-ui-shr_git.bb b/recipes/shr/libphone-ui-shr_git.bb index eb12e9e709..e3e6a9f78f 100644 --- a/recipes/shr/libphone-ui-shr_git.bb +++ b/recipes/shr/libphone-ui-shr_git.bb @@ -3,7 +3,7 @@ SECTION = "e/apps" DEPENDS += " dbus-glib libframeworkd-glib libfsoframework libphone-ui evas ecore edje edje-native elementary" SRCREV = "29f50f4482feec132e30c075e7c2a36ce09d3638" PV = "0.0.0+gitr${SRCPV}" -PR = "r7" +PR = "r8" SRC_URI = "git://shr.bearstech.com/repo/libphone-ui-shr.git;protocol=http;branch=master" S = "${WORKDIR}/git" @@ -18,4 +18,6 @@ do_configure_prepend() { } FILES_${PN} += "${libdir}/phoneui/modules/shr.so" +FILES_${PN}-dev += "${libdir}/phoneui/modules/*.la" FILES_${PN}-dbg += "${libdir}/phoneui/modules/.debug" +FILES_${PN}-static += "${libdir}/phoneui/modules/*.a" diff --git a/recipes/shr/shr-e-gadgets_git.bb b/recipes/shr/shr-e-gadgets_git.bb index 30b9d8b133..a301426fb4 100644 --- a/recipes/shr/shr-e-gadgets_git.bb +++ b/recipes/shr/shr-e-gadgets_git.bb @@ -7,7 +7,7 @@ SECTION = "x11/application" SRCREV = "4f94c139bd50935dbfb6524e8525d0c35200380b" PV = "0.0.0+gitr${SRCPV}" -PR = "r3" +PR = "r4" inherit autotools diff --git a/recipes/shr/shr-launcher_svn.bb b/recipes/shr/shr-launcher_svn.bb index 20ce6794df..2e040564e8 100644 --- a/recipes/shr/shr-launcher_svn.bb +++ b/recipes/shr/shr-launcher_svn.bb @@ -6,7 +6,7 @@ SECTION = "e/apps" DEPENDS = "elementary eina edbus" SRCREV = "105" PV = "0.0.1+svnr${SRCPV}" -PR = "r7" +PR = "r8" SRC_URI = "svn://shr-launcher.googlecode.com/svn;module=trunk;proto=http" diff --git a/recipes/shr/shr-wizard_git.bb b/recipes/shr/shr-wizard_git.bb index 0f085047f9..a1cfca14bd 100644 --- a/recipes/shr/shr-wizard_git.bb +++ b/recipes/shr/shr-wizard_git.bb @@ -6,7 +6,7 @@ RDEPENDS_${PN} = "python-elementary shr-settings python-phoneutils e-wm python-d SECTION = "x11/application" SRCREV = "24450cba257e7057045ad576530f158a03bd0f8b" PV = "0.0.0+gitr${SRCPV}" -PR = "r4" +PR = "r5" inherit autotools diff --git a/recipes/telepathy/empathy_2.28.2.bb b/recipes/telepathy/empathy_2.28.2.bb index ee563b2620..2ab1c1c8ce 100644 --- a/recipes/telepathy/empathy_2.28.2.bb +++ b/recipes/telepathy/empathy_2.28.2.bb @@ -7,7 +7,7 @@ libtelepathy telepathy-glib gtk+ gconf libglade eds-dbus \ libunique" RDEPENDS_${PN} = "telepathy-mission-control" RRECOMMENDS_${PN} = "telepathy-gabble" -PR = "r1" +PR = "r2" inherit gnome diff --git a/recipes/ti/ti-audio-soc-example.inc b/recipes/ti/ti-audio-soc-example.inc new file mode 100644 index 0000000000..65566adbc5 --- /dev/null +++ b/recipes/ti/ti-audio-soc-example.inc @@ -0,0 +1,74 @@ +DESCRIPTION = "TI Audio Soc devices example" +HOMEPAGE = "http://software-dl.ti.com/dsps/dsps_public_sw/apps_processors/Audio_soc_example/1_00/index_FDS.html" +SECTION = "devel" +LICENSE = "TI BSD" + +require ti-paths.inc +require ti-staging.inc + +COMPATIBLE_MACHINE = "(da830-omapl137-evm|da850-omapl138-evm)" + +PR = "r5" + +S = "${WORKDIR}/audio_soc_example_${PV}" + +SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/apps_processors/Audio_soc_example/1_00/exports/audio_soc_example_${PV}.tar.gz;name=audiosoctarball" + +DEPENDS = "ti-cgt6x ti-xdctools ti-dspbios ti-biospsp ti-edma3lld ti-dsplink" +DEPENDS += "virtual/kernel" + +PLATFORM_da830-omapl137-evm = "omapl137" +PLATFORM_da850-omapl138-evm = "omapl138" + +BOARD_da830-omapl137-evm = "evmOMAPL137" +BOARD_da850-omapl138-evm = "evmOMAPL138" + +do_compile() { + # Build gpp sample application + cd ${S} + make \ + PLATFORM="${PLATFORM}" \ + CSTOOL_DIR="${TOOLCHAIN_PATH}" \ + CSTOOLS_PREFIX="${TOOLCHAIN_PATH}/bin/${TARGET_PREFIX}" \ + LINUXKERNEL_INSTALL_DIR="{STAGING_KERNEL_DIR}" \ + BIOS_INSTALL_DIR="${BIOS_INSTALL_DIR}" \ + XDC_INSTALL_DIR="${XDC_INSTALL_DIR}" \ + CODEGEN_INSTALL_DIR="${CODEGEN_INSTALL_DIR}" \ + LINK_INSTALL_DIR="${LINK_INSTALL_DIR}" \ + BIOSPSP_INSTALL_DIR="${BIOSPSP_INSTALL_DIR}" \ + EDMA3LLD_INSTALL_DIR="${EDMA3_LLD_INSTALL_DIR}" \ + gpp + + # Build dsp sample application + make \ + PLATFORM="${PLATFORM}" \ + CSTOOL_DIR="${TOOLCHAIN_PATH}" \ + CSTOOLS_PREFIX="${TOOLCHAIN_PATH}/bin/${TARGET_PREFIX}" \ + LINUXKERNEL_INSTALL_DIR="{STAGING_KERNEL_DIR}" \ + BIOS_INSTALL_DIR="${BIOS_INSTALL_DIR}" \ + XDC_INSTALL_DIR="${XDC_INSTALL_DIR}" \ + CODEGEN_INSTALL_DIR="${CODEGEN_INSTALL_DIR}" \ + LINK_INSTALL_DIR="${LINK_INSTALL_DIR}" \ + BIOSPSP_INSTALL_DIR="${BIOSPSP_INSTALL_DIR}" \ + EDMA3LLD_INSTALL_DIR="${EDMA3_LLD_INSTALL_DIR}" \ + dsp +} + + +do_install() { + install -d ${D}${AUDIO_SOC_INSTALL_DIR_RECIPE} + cp -pPrf ${S}/* ${D}${AUDIO_SOC_INSTALL_DIR_RECIPE} + + install -d ${D}/${installdir}/ti-audio-soc-example + cp -rf ${S}/gpp/${BOARD} ${D}/${installdir}/ti-audio-soc-example + cp -rf ${S}/data/* ${D}/${installdir}/ti-audio-soc-example + + cp -rf ${S}/dsp/${BOARD}/Debug/audioSoc_dsp.out ${D}/${installdir}/ti-audio-soc-example/${BOARD}/Debug + cp -rf ${S}/dsp/${BOARD}/Debug/audioSoc_dsp.out ${D}/${installdir}/ti-audio-soc-example/${BOARD}/Release + +} + +FILES_${PN} = "${installdir}/ti-audio-soc-example/*" +INSANE_SKIP_${PN} = "True" + +RRECOMMENDS_ti_audio-soc-example += "ti-dsplink-module" diff --git a/recipes/ti/ti-audio-soc-example_1.00.00.02.bb b/recipes/ti/ti-audio-soc-example_1.00.00.02.bb new file mode 100644 index 0000000000..e3c1ace231 --- /dev/null +++ b/recipes/ti/ti-audio-soc-example_1.00.00.02.bb @@ -0,0 +1,6 @@ +require ti-audio-soc-example.inc + +PV = "1_00_00_02" + +SRC_URI[audiosoctarball.md5sum] = "980fead72fbd5999c97d9ae2ffe5017a" +SRC_URI[audiosoctarball.sha256sum] = "70dff0c4fa3a7d450d6939eacdc2b8a7fbae867778693d14dcccbbcfd039b0f5" diff --git a/recipes/ti/ti-biospsp.inc b/recipes/ti/ti-biospsp.inc new file mode 100644 index 0000000000..6aac89de62 --- /dev/null +++ b/recipes/ti/ti-biospsp.inc @@ -0,0 +1,32 @@ +DESCRIPTION = "TI (DSP/) BIOS Platform Support Package (PSP)" +HOMEPAGE = "http://software-dl.ti.com/dsps/dsps_public_sw/psp/BIOSPSP/01_30_01/index_FDS.html" +SECTION = "devel" +LICENSE = "TI BSD" + +require ti-paths.inc +require ti-staging.inc + +COMPATIBLE_MACHINE = "(da830-omapl137-evm|da850-omapl138-evm)" + +PR = "r2" + +S = "${WORKDIR}/pspdrivers_${PV}" + +SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/psp/BIOSPSP/${PV}/content/BIOSPSP_${PV}_Setup.exe;name=biospsptarball" + +# No real depends right now since we're not building anything - placeholder for now +DEPENDS = "ti-cgt6x ti-dspbios ti-edma3lld" + +do_configure() { + echo "Do Nothing for now" +} + +do_compile() { + echo "Do Nothing for now" +} + +do_install() { + install -d ${D}${BIOSPSP_INSTALL_DIR_RECIPE} + cp -pPrf ${S}/* ${D}${BIOSPSP_INSTALL_DIR_RECIPE} +} + diff --git a/recipes/ti/ti-biospsp_01.30.01.bb b/recipes/ti/ti-biospsp_01.30.01.bb new file mode 100644 index 0000000000..118e90d93b --- /dev/null +++ b/recipes/ti/ti-biospsp_01.30.01.bb @@ -0,0 +1,11 @@ +require ti-biospsp.inc + +PV = "01_30_01" + +SRC_URI[biospsptarball.md5sum] = "92096326d0b6d82bac758b622b5f2b50" +SRC_URI[biospsptarball.sha256sum] = "87acc688c06152569b8faa1480ff5f0c040e2fbdd6c2a4a0b30b8d8b0aa72314" + +# Internal Release Only - SRC_URI is not public yet - override link +HTTP_PROXY_IGNORE="ftp.india.ti.com" +SRC_URI = "ftp://ftp.india.ti.com/PSP/Releases/ODC/Freon_BIOS_PSP/REL.BIOSPSP.01.30.01.GA/BIOSPSP_${PV}.tar.gz;name=biospsptarball" + diff --git a/recipes/ti/ti-codec-engine.inc b/recipes/ti/ti-codec-engine.inc index 57802961f1..1b89ea71b2 100644 --- a/recipes/ti/ti-codec-engine.inc +++ b/recipes/ti/ti-codec-engine.inc @@ -85,7 +85,7 @@ do_prepsources() { CGTOOLS_V5T="${TOOLCHAIN_PATH}" \ CGTOOLS_C64P="${CODEGEN_INSTALL_DIR}" \ CGTOOLS_C674="${CODEGEN_INSTALL_DIR}" \ - clean + .make clean done } diff --git a/recipes/ti/ti-codec-engine_2.25.04.15.bb b/recipes/ti/ti-codec-engine_2.25.04.15.bb new file mode 100644 index 0000000000..2906859dec --- /dev/null +++ b/recipes/ti/ti-codec-engine_2.25.04.15.bb @@ -0,0 +1,7 @@ +require ti-codec-engine.inc + +PV = "2_25_04_15" + +SRC_URI[cetarball.md5sum] = "add6f1fa1b49ef8198a8ad3bf572b610" +SRC_URI[cetarball.sha256sum] = "6b297c7267f792ba1f9fb6b69d3c9c1df82af3f23e5a600b251cb2a042b6e429" + diff --git a/recipes/ti/ti-codec-engine_2.25.05.16.bb b/recipes/ti/ti-codec-engine_2.25.05.16.bb new file mode 100644 index 0000000000..5a171dc037 --- /dev/null +++ b/recipes/ti/ti-codec-engine_2.25.05.16.bb @@ -0,0 +1,7 @@ +require ti-codec-engine.inc + +PV = "2_25_05_16" + +SRC_URI[cetarball.md5sum] = "fbc1346b5f0ed8d6667b8509d57faa80" +SRC_URI[cetarball.sha256sum] = "72062186b07fe903e11788e3432df604f93e75f6ed68ab4b1af4b24512d449fa" + diff --git a/recipes/ti/ti-codecs-omap3530_1.01.00.bb b/recipes/ti/ti-codecs-omap3530_1.01.00.bb new file mode 100644 index 0000000000..57bc7c4ef9 --- /dev/null +++ b/recipes/ti/ti-codecs-omap3530_1.01.00.bb @@ -0,0 +1,89 @@ +DESCRIPTION = "TI Codecs (and Server Combo) for OMAP3530" +HOMEPAGE = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_tii/dvsdk/dvsdk_3_01/3_01_00_10/index_FDS.html" +SECTION = "multimedia" +LICENSE = "TI" + +# TODO :: Move to common .inc (omap3 and omapl ready) + +PV = "1_01_00" + +SRC_URI[omap3codecsbin.md5sum] = "b9483c218fddb2eaca000cf68382862a" +SRC_URI[omap3codecsbin.sha256sum] = "ae4e786d9c343b0953dd5d411b597a5d0bf5894bc1f69be3be6e0fc7980152b2" + +PE = "1" +PR = "r2" + +require ti-paths.inc +require ti-staging.inc +require ti-eula-unpack.inc + +PROVIDES += "ti-codecs-omap3530-server" +RREPLACES_${PN} = "ti-cs1-omap3530" + +S = "${WORKDIR}/dvsdk/dvsdk_3_01_00_10/cs1omap3530_1_01_00" + +SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_tii/dvsdk/dvsdk_3_01/3_01_00_10/exports/cs1omap3530_setupLinux_1_01_00-prebuilt-dvsdk3.01.00.10.bin;name=omap3codecsbin" + +BINFILE = "cs1omap3530_setupLinux_1_01_00-prebuilt-dvsdk3.01.00.10.bin" +TI_BIN_UNPK_CMDS = "Y:Y: qY:workdir" + +DEPENDS = "ti-cgt6x ti-xdctools ti-dspbios ti-codec-engine ti-linuxutils" + +#generic codec +DSPSUFFIX_omap3 = "x64P" + +do_prepsources() { + + make \ + CE_INSTALL_DIR=${CE_INSTALL_DIR} \ + FC_INSTALL_DIR=${FC_INSTALL_DIR} \ + LINK_INSTALL_DIR=${LINK_INSTALL_DIR} \ + CMEM_INSTALL_DIR=${CMEM_INSTALL_DIR} \ + LPM_INSTALL_DIR=${LPM_INSTALL_DIR} \ + BIOS_INSTALL_DIR=${BIOS_INSTALL_DIR} \ + CODEGEN_INSTALL_DIR=${CODEGEN_INSTALL_DIR} \ + XDC_INSTALL_DIR=${XDC_INSTALL_DIR} \ + CODEC_INSTALL_DIR="${S}" \ + XDCARGS="prod" \ + clean +} + +addtask prepsources after do_configure before do_compile + +do_compile() { + + make \ + CE_INSTALL_DIR=${CE_INSTALL_DIR} \ + FC_INSTALL_DIR=${FC_INSTALL_DIR} \ + LINK_INSTALL_DIR=${LINK_INSTALL_DIR} \ + CMEM_INSTALL_DIR=${CMEM_INSTALL_DIR} \ + LPM_INSTALL_DIR=${LPM_INSTALL_DIR} \ + BIOS_INSTALL_DIR=${BIOS_INSTALL_DIR} \ + CODEGEN_INSTALL_DIR=${CODEGEN_INSTALL_DIR} \ + XDC_INSTALL_DIR=${XDC_INSTALL_DIR} \ + CODEC_INSTALL_DIR="${S}" \ + XDCARGS="prod" \ + all +} + +do_install() { + + install -d ${D}/${installdir}/ti-codecs-server + cd ${S} + + # Install the DSP Server Binary + for file in `find . -name *.${DSPSUFFIX}`; do + cp ${file} ${D}/${installdir}/ti-codecs-server + done + + # Install docs (codec qualiTI test reports, server config datasheet, etc) + for file in `find . -name *.html`; do + cp ${file} ${D}/${installdir}/ti-codecs-server + done + + install -d ${D}${CODEC_INSTALL_DIR_RECIPE} + cp -pPrf ${S}/* ${D}${CODEC_INSTALL_DIR_RECIPE} +} + +PACKAGES += "ti-codecs-omap3530-server" +FILES_ti-codecs-omap3530-server = "${installdir}/ti-codecs-server/*" diff --git a/recipes/ti/ti-dmai_2.05.00.14.bb b/recipes/ti/ti-dmai_2.05.00.14.bb new file mode 100644 index 0000000000..1d49ba7c31 --- /dev/null +++ b/recipes/ti/ti-dmai_2.05.00.14.bb @@ -0,0 +1,24 @@ +require ti-dmai.inc + +PV = "2_05_00_14" +PR = "r0" + +COMPATIBLE_MACHINE = "(omap3evm|dm3730-am3715-evm)" + +SRC_URI_append = " \ + file://doxygen_templates.tar.gz \ + file://arago-tdox \ +" + +SRCREV = "488" +DMAIBRANCH = "tags/TAG_2_05_00_14" + +do_install_prepend () { + find ${S} -name .svn -type d | xargs rm -rf + cp -pPrf ${WORKDIR}/doxygen_templates ${S} + cp -pPrf ${WORKDIR}/arago-tdox ${S}/tdox + chmod a+x ${S}/release.sh + chmod a+x ${S}/tdox + ${S}/release.sh ${PV} +} + diff --git a/recipes/ti/ti-dspbios_5.41.04.18.bb b/recipes/ti/ti-dspbios_5.41.04.18.bb new file mode 100644 index 0000000000..b9ffd585a3 --- /dev/null +++ b/recipes/ti/ti-dspbios_5.41.04.18.bb @@ -0,0 +1,7 @@ +require ti-dspbios.inc + +PV = "5_41_04_18" + +SRC_URI[biosbin.md5sum] = "dd9c6a595b982e6af313f788040c8b3e" +SRC_URI[biosbin.sha256sum] = "21575ddd96165c9650083554b400e6274e816c8ca9e5f51853da3463c045d136" + diff --git a/recipes/ti/ti-dsplib_2.10.bb b/recipes/ti/ti-dsplib_2.10.bb index 8e26092d97..f47b4a9f62 100644 --- a/recipes/ti/ti-dsplib_2.10.bb +++ b/recipes/ti/ti-dsplib_2.10.bb @@ -10,7 +10,7 @@ PV = "1_20" SRC_URI[dsplibgz.md5sum] = "0e9f0fc05b17d8eefc6117f36ecd576e" SRC_URI[dsplibgz.sha256sum] = "96e320a3dcb8b238e5245a36b26c2f7f1d00a8467ab65d6c5c93f5f57c891252" -PR = "r1" +PR = "r2" require ti-paths.inc require ti-staging.inc @@ -70,6 +70,7 @@ do_compile() { do_install() { install -d ${D}${DSPLIB_INSTALL_DIR_RECIPE} + sed -i 's,\\,/,g' ${S}/dsplib64plus.h cp -pPrf ${S}/* ${D}${DSPLIB_INSTALL_DIR_RECIPE} } diff --git a/recipes/ti/ti-dsplink.inc b/recipes/ti/ti-dsplink.inc index 119211e906..388d057372 100644 --- a/recipes/ti/ti-dsplink.inc +++ b/recipes/ti/ti-dsplink.inc @@ -16,7 +16,7 @@ PROVIDES += "ti-dsplink-examples" # This package builds a kernel module, use kernel PR as base and append a local version PR = "${MACHINE_KERNEL_PR}" -PR_append = "f" +PR_append = "h" S = "${WORKDIR}/dsplink_linux_${PV}" @@ -166,6 +166,17 @@ do_install () { install -d ${D}${LINK_INSTALL_DIR_RECIPE} cp -pPrf ${S}/* ${D}${LINK_INSTALL_DIR_RECIPE} chmod -R +w ${D}${LINK_INSTALL_DIR_RECIPE} + + # Changes path of include txt file to use LINK_INSTALL_DIR variable for GPP + for i in $(find ${D}${LINK_INSTALL_DIR_RECIPE}/dsplink/gpp/export/BIN/Linux/${DSPLINKPLATFORM}/*/ -name "*.txt"); do + sed -i ${i} -e s=${S}=\$\{LINK_INSTALL_DIR\}=g + done + + # Changes path of include txt file to use LINK_INSTALL_DIR variable for DSP + for i in $(find ${D}${LINK_INSTALL_DIR_RECIPE}/dsplink/dsp/export/BIN/DspBios/${DSPLINKPLATFORM}/${DSPLINKDSP}/*/ -name "*.txt"); do + sed -i ${i} -e s=${S}=\$\{LINK_INSTALL_DIR\}=g + done + } PACKAGES += "ti-dsplink-module" diff --git a/recipes/ti/ti-eula-unpack.inc b/recipes/ti/ti-eula-unpack.inc index 947ca143ea..a812a85ec5 100644 --- a/recipes/ti/ti-eula-unpack.inc +++ b/recipes/ti/ti-eula-unpack.inc @@ -41,10 +41,11 @@ python ti_bin_do_unpack() { # Run the InstallJammer binary and accept the EULA filename = "HOME=%s ./%s --mode console" % (workdir, binfile) - # Test executable by printing installer version - if os.system(filename + " --version") != 0: - print "ERROR: ti-eula-unpack: failed to execute binary installer" - raise bb.build.FuncFailed() + # Test executable by printing installer version or help screen (--version currently broken for some installers) + # - this is currently broken in some IJ installers - comment out for now + #if os.system(filename + " --version") != 0: + # print "ERROR: ti-eula-unpack: failed to execute binary installer" + # raise bb.build.FuncFailed() f = os.popen(filename,'w') for cmd in cmd_list: diff --git a/recipes/ti/ti-framework-components_2.25.02.06.bb b/recipes/ti/ti-framework-components_2.25.02.06.bb new file mode 100644 index 0000000000..6e2387bf3a --- /dev/null +++ b/recipes/ti/ti-framework-components_2.25.02.06.bb @@ -0,0 +1,7 @@ +require ti-framework-components.inc + +PV = "2_25_02_06" + +SRC_URI[fctarball.md5sum] = "0ff9fc152633f6bfbe7ae98902833477" +SRC_URI[fctarball.sha256sum] = "1dc2994b867c76a474fd0c7c82c544d9163f661434ce994542bba9dd2997da6a" + diff --git a/recipes/ti/ti-linuxutils.inc b/recipes/ti/ti-linuxutils.inc index 209299deea..073416ae5e 100644 --- a/recipes/ti/ti-linuxutils.inc +++ b/recipes/ti/ti-linuxutils.inc @@ -11,7 +11,7 @@ require ti-paths.inc require ti-staging.inc #This is a kernel module, don't set PR directly -MACHINE_KERNEL_PR_append = "c" +MACHINE_KERNEL_PR_append = "d" inherit module @@ -23,6 +23,8 @@ do_compile() { modules="cmem edma irq";; omap3) modules="cmem sdma";; + dm355) + modules="cmem edma irq";; *) modules="cmem" esac diff --git a/recipes/ti/ti-linuxutils_2.25.03.09.bb b/recipes/ti/ti-linuxutils_2.25.03.09.bb new file mode 100644 index 0000000000..273af61214 --- /dev/null +++ b/recipes/ti/ti-linuxutils_2.25.03.09.bb @@ -0,0 +1,8 @@ +require ti-linuxutils.inc + +PE = "1" +PV = "2_25_03_09" + +SRC_URI[md5sum] = "4ce632504e9624d33265577c25240ec3" +SRC_URI[sha256sum] = "addd15709235c79e7d3892f313bd7bbb7560d14da98e311de617ad897f6ce387" + diff --git a/recipes/ti/ti-linuxutils_2.25.04.10.bb b/recipes/ti/ti-linuxutils_2.25.04.10.bb new file mode 100644 index 0000000000..492f9467bc --- /dev/null +++ b/recipes/ti/ti-linuxutils_2.25.04.10.bb @@ -0,0 +1,8 @@ +require ti-linuxutils.inc + +PE = "1" +PV = "2_25_04_10" + +SRC_URI[md5sum] = "3f7640f3c0eaee5a4aac6cdf453a77ff" +SRC_URI[sha256sum] = "173170c8ce130c3011c8a124d4307999d7b12958cedf51dbf5ce5bfff2d38256" + diff --git a/recipes/ti/ti-paths.inc b/recipes/ti/ti-paths.inc index 15cd51966f..27400a1abc 100644 --- a/recipes/ti/ti-paths.inc +++ b/recipes/ti/ti-paths.inc @@ -18,6 +18,8 @@ export DMAI_INSTALL_DIR_RECIPE = "${installdir}/ti-dmai-tree" export CODEC_INSTALL_DIR_RECIPE = "${installdir}/ti-codecs-tree" export DSPLIB_INSTALL_DIR_RECIPE = "${installdir}/ti-dsplib-tree" export DVSDK_DEMOS_INSTALL_DIR_RECIPE = "${installdir}/ti-dvsdk-demos-tree" +export BIOSPSP_INSTALL_DIR_RECIPE = "${installdir}/ti-biospsp-tree" +export AUDIO_SOC_INSTALL_DIR_RECIPE = "${installdir}/ti-audio-soc-example-tree" # This is where the tools will end up in staging provided PACKAGE_ARCH = ${MACHINE_ARCH} is set export CODEGEN_INSTALL_DIR = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}${CODEGEN_INSTALL_DIR_RECIPE}" @@ -36,6 +38,7 @@ export LPM_INSTALL_DIR = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}${LPM_INS export DMAI_INSTALL_DIR = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}${DMAI_INSTALL_DIR_RECIPE}" export CODEC_INSTALL_DIR = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}${CODEC_INSTALL_DIR_RECIPE}" export DSPLIB_INSTALL_DIR = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}${DSPLIB_INSTALL_DIR_RECIPE}" +export BIOSPSP_INSTALL_DIR = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}${BIOSPSP_INSTALL_DIR_RECIPE}" DSPSUFFIX_omapl137 = "x674" DSPSUFFIX_omapl138 = "x674" diff --git a/recipes/ti/ti-xdctools_3.16.04.39.bb b/recipes/ti/ti-xdctools_3.16.04.39.bb new file mode 100644 index 0000000000..0777ef3c31 --- /dev/null +++ b/recipes/ti/ti-xdctools_3.16.04.39.bb @@ -0,0 +1,7 @@ +require ti-xdctools.inc + +PV = "3_16_04_39" + +SRC_URI[xdcbin.md5sum] = "ed9f6e8a6404521207b1b17f6ee0bc78" +SRC_URI[xdcbin.sha256sum] = "d1de82b2795c5cc86a14c314d25ce1d0346304d485cafad2ed848ec97b427b0a" + diff --git a/recipes/ti/ti-xdctools_3.16.05.41.bb b/recipes/ti/ti-xdctools_3.16.05.41.bb new file mode 100644 index 0000000000..3004cf0d7c --- /dev/null +++ b/recipes/ti/ti-xdctools_3.16.05.41.bb @@ -0,0 +1,7 @@ +require ti-xdctools.inc + +PV = "3_16_05_41" + +SRC_URI[xdcbin.md5sum] = "4a460d7974f271c2e686ada8ddf2a117" +SRC_URI[xdcbin.sha256sum] = "81af530d252b1d9f45f01542059fd55fa756dcc219bb22190f995f3d4b1daa46" + diff --git a/recipes/ti/ti-xdctools_3.20.01.51.bb b/recipes/ti/ti-xdctools_3.20.01.51.bb new file mode 100644 index 0000000000..4edec79984 --- /dev/null +++ b/recipes/ti/ti-xdctools_3.20.01.51.bb @@ -0,0 +1,7 @@ +require ti-xdctools.inc + +PV = "3_20_01_51" + +SRC_URI[xdcbin.md5sum] = "1527c946d7a99320175295c2699a9686" +SRC_URI[xdcbin.sha256sum] = "e289a19d9f4e1b91e0f157527935e4c2ac4c7e02481a718de16f56b569d5450f" + diff --git a/recipes/totem/totem-pl-parser_2.30.0.bb b/recipes/totem/totem-pl-parser_2.30.0.bb index 1a45ce9e1e..f39114c3d4 100644 --- a/recipes/totem/totem-pl-parser_2.30.0.bb +++ b/recipes/totem/totem-pl-parser_2.30.0.bb @@ -2,6 +2,8 @@ DESCRIPTION = "Playlist parser for Totem, a GTK2 based media player" HOMEPAGE = "http://www.gnome.org/projects/totem/" LICENSE = "LGPLv2" +PR = "r1" + DEPENDS = "gmime eds-dbus" inherit gnome diff --git a/recipes/uclibc/uclibc_git.bb b/recipes/uclibc/uclibc_git.bb index 29e692dbf5..9eb3ab646c 100644 --- a/recipes/uclibc/uclibc_git.bb +++ b/recipes/uclibc/uclibc_git.bb @@ -7,7 +7,7 @@ # on whether the base patches apply to the selected (SRCDATE) svn release. # UCLIBC_BASE ?= "0.9.31" -SRCREV="83b76076b82adbac62df5e093ad3a552347b5416" +SRCREV="957157deebd5eea63eaa8993f47740c2b2cd2592" PR_append = "+gitr${SRCPV}" DEFAULT_PREFERENCE = "-1" #DEFAULT_PREFERENCE is 0 (empty), releases have a preference of 1 so take diff --git a/recipes/webkit/webkit-efl_git.bb b/recipes/webkit/webkit-efl_git.bb index 36cf325dfb..f750061ca2 100644 --- a/recipes/webkit/webkit-efl_git.bb +++ b/recipes/webkit/webkit-efl_git.bb @@ -6,7 +6,7 @@ DEPENDS = "icu flex gst-plugins-base gstreamer jpeg libpng libxml2 pango \ SRCREV = "3a5ee77664c898ed51a2b2d5759822f8c0a06472" PV = "1.1.11+gitr${SRCPV}" -PR = "r7" +PR = "r8" SRC_URI = "git://gitorious.org/webkit-efl/webkit-efl.git;protocol=git;branch=master \ file://fix-build-with-newer-evas.patch \ diff --git a/recipes/xbmc/xbmc/0001-Only-check-for-nasm-on-i686-it-is-bogus-on-ARM-which.patch b/recipes/xbmc/xbmc/0001-Only-check-for-nasm-on-i686-it-is-bogus-on-ARM-which.patch new file mode 100644 index 0000000000..995e767764 --- /dev/null +++ b/recipes/xbmc/xbmc/0001-Only-check-for-nasm-on-i686-it-is-bogus-on-ARM-which.patch @@ -0,0 +1,26 @@ +From cbe1089a3455c306d58e175dced0227b5d22ffa5 Mon Sep 17 00:00:00 2001 +From: topfs2 <topfs2@568bbfeb-2a22-0410-94d2-cc84cf5bfa90> +Date: Mon, 7 Jun 2010 21:03:47 +0000 +Subject: [PATCH 01/11] Only check for nasm on i686, it is bogus on ARM, which is also !x86_64 - Thanks koen + +git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/gsoc-2010-beagleboard@30917 568bbfeb-2a22-0410-94d2-cc84cf5bfa90 +--- + configure.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/configure.in b/configure.in +index 8d714b5..806e9c2 100644 +--- a/configure.in ++++ b/configure.in +@@ -986,7 +986,7 @@ if test "$HAVE_ZIP" = "no" ; then + AC_MSG_ERROR($missing_program) + fi + +-if test "$ARCH" != "x86_64-linux"; then ++if test "$ARCH" = "i686-linux"; then + AC_CHECK_PROG(HAVE_NASM,nasm,"yes","no",) + if test "$HAVE_NASM" = "no" ; then + AC_MSG_ERROR($missing_program) +-- +1.6.6.1 + diff --git a/recipes/xbmc/xbmc/0002-Exclude-gnu-configize-for-ngstr-m-Thanks-koen.patch b/recipes/xbmc/xbmc/0002-Exclude-gnu-configize-for-ngstr-m-Thanks-koen.patch new file mode 100644 index 0000000000..663b216d0a --- /dev/null +++ b/recipes/xbmc/xbmc/0002-Exclude-gnu-configize-for-ngstr-m-Thanks-koen.patch @@ -0,0 +1,45 @@ +From 517276ac7ef1d01b2edfc1f66323a685bfc25229 Mon Sep 17 00:00:00 2001 +From: topfs2 <topfs2@568bbfeb-2a22-0410-94d2-cc84cf5bfa90> +Date: Mon, 7 Jun 2010 21:04:05 +0000 +Subject: [PATCH 02/11] =?UTF-8?q?Exclude=20gnu-configize=20for=20=C3=85ngstr=C3=B6m=20-=20Thanks=20koen!?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/gsoc-2010-beagleboard@30918 568bbfeb-2a22-0410-94d2-cc84cf5bfa90 +--- + bootstrap | 16 ++++++++-------- + 1 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/bootstrap b/bootstrap +index 8485ea7..09ceefc 100755 +--- a/bootstrap ++++ b/bootstrap +@@ -2,16 +2,16 @@ + + set -e + +-autoreconf -vif +-autoreconf -vif lib/cpluff +-# we must autoreconf libass as we don't know till later if it's used. +-autoreconf -vif lib/libass +-autoreconf -vif xbmc/cores/dvdplayer/Codecs/libbdnav ++autoreconf -vif --exclude gnu-configize ++autoreconf -vif --exclude gnu-configize lib/cpluff ++# w must autoreconf libass as we don't know till later if it's used. ++autoreconf -vif --exclude gnu-configize lib/libass ++autoreconf -vif --exclude gnu-configize xbmc/cores/dvdplayer/Codecs/libbdnav + # order matters with libbdnav and friends + [ -d xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss ] && \ +- autoreconf -vif xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss +-autoreconf -vif xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread +-autoreconf -vif xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav ++ autoreconf -vif --exclude gnu-configize xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss ++autoreconf -vif --exclude gnu-configize xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread ++autoreconf -vif --exclude gnu-configize xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav + + # Clean the generated files + find . -depth -type d -name "autom4te.cache" -exec rm -rf {} \; +-- +1.6.6.1 + diff --git a/recipes/xbmc/xbmc/0003-Workaround-to-compile-python-on-ngstr-m-with-Python-.patch b/recipes/xbmc/xbmc/0003-Workaround-to-compile-python-on-ngstr-m-with-Python-.patch new file mode 100644 index 0000000000..e984f6bdd3 --- /dev/null +++ b/recipes/xbmc/xbmc/0003-Workaround-to-compile-python-on-ngstr-m-with-Python-.patch @@ -0,0 +1,45 @@ +From 50193c0722ff25e4fcb762884fc24fb69181ebda Mon Sep 17 00:00:00 2001 +From: topfs2 <topfs2@568bbfeb-2a22-0410-94d2-cc84cf5bfa90> +Date: Mon, 7 Jun 2010 21:04:34 +0000 +Subject: [PATCH 03/11] =?UTF-8?q?Workaround=20to=20compile=20python=20on=20=C3=85ngstr=C3=B6m=20with=20Python=202.6?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/gsoc-2010-beagleboard@30919 568bbfeb-2a22-0410-94d2-cc84cf5bfa90 +--- + xbmc/lib/libPython/Python/Include/unicodeobject.h | 2 +- + xbmc/lib/libPython/xbmcmodule/pyutil.cpp | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/xbmc/lib/libPython/Python/Include/unicodeobject.h b/xbmc/lib/libPython/Python/Include/unicodeobject.h +index b534187..8a66ab7 100644 +--- a/xbmc/lib/libPython/Python/Include/unicodeobject.h ++++ b/xbmc/lib/libPython/Python/Include/unicodeobject.h +@@ -147,7 +147,7 @@ typedef PY_UNICODE_TYPE Py_UNICODE; + # define PyUnicode_AsRawUnicodeEscapeString PyUnicodeUCS2_AsRawUnicodeEscapeString + # define PyUnicode_AsUTF16String PyUnicodeUCS2_AsUTF16String + # define PyUnicode_AsUTF8String PyUnicodeUCS2_AsUTF8String +-# define PyUnicode_AsUnicode PyUnicodeUCS2_AsUnicode ++//# define PyUnicode_AsUnicode PyUnicodeUCS2_AsUnicode + # define PyUnicode_AsUnicodeEscapeString PyUnicodeUCS2_AsUnicodeEscapeString + # define PyUnicode_AsWideChar PyUnicodeUCS2_AsWideChar + # define PyUnicode_Compare PyUnicodeUCS2_Compare +diff --git a/xbmc/lib/libPython/xbmcmodule/pyutil.cpp b/xbmc/lib/libPython/xbmcmodule/pyutil.cpp +index 673b2e3..0322b10 100644 +--- a/xbmc/lib/libPython/xbmcmodule/pyutil.cpp ++++ b/xbmc/lib/libPython/xbmcmodule/pyutil.cpp +@@ -55,8 +55,8 @@ namespace PYXBMC + // + CStdString utf8String; + +- CStdStringW utf16String = (wchar_t*) PyUnicode_AsUnicode(pObject); +- g_charsetConverter.wToUTF8(utf16String, utf8String); ++// CStdStringW utf16String = (wchar_t*) PyUnicode_AsUnicode(pObject); ++// g_charsetConverter.wToUTF8(utf16String, utf8String); + + buf = utf8String; + return 1; +-- +1.6.6.1 + diff --git a/recipes/xbmc/xbmc/0004-Don-t-use-sudo-in-install-of-xbmc.bin-not-all-distri.patch b/recipes/xbmc/xbmc/0004-Don-t-use-sudo-in-install-of-xbmc.bin-not-all-distri.patch new file mode 100644 index 0000000000..c3d066ba21 --- /dev/null +++ b/recipes/xbmc/xbmc/0004-Don-t-use-sudo-in-install-of-xbmc.bin-not-all-distri.patch @@ -0,0 +1,26 @@ +From cbac0c8500a67e06ca136591a574c0cf1ae1b0e9 Mon Sep 17 00:00:00 2001 +From: topfs2 <topfs2@568bbfeb-2a22-0410-94d2-cc84cf5bfa90> +Date: Mon, 7 Jun 2010 21:04:52 +0000 +Subject: [PATCH 04/11] Don't use sudo in install of xbmc.bin - not all distributions have sudo + +git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/gsoc-2010-beagleboard@30920 568bbfeb-2a22-0410-94d2-cc84cf5bfa90 +--- + Makefile.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index f6a8b8d..01bbf54 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -503,7 +503,7 @@ tools/TexturePacker/TexturePacker: guilib/guilib.a xbmc/lib/libsquish/libsquish- + $(MAKE) -C tools/TexturePacker/ + + install-bin: xbmc.bin # developement convenience target +- sudo install -D xbmc.bin $(DESTDIR)$(libdir)/xbmc ++ install -D xbmc.bin $(DESTDIR)$(libdir)/xbmc + + ifeq ($(findstring osx,$(ARCH)), osx) + # TODO: add osx install +-- +1.6.6.1 + diff --git a/recipes/xbmc/xbmc/0005-Hardcode-arm7-for-now.patch b/recipes/xbmc/xbmc/0005-Hardcode-arm7-for-now.patch new file mode 100644 index 0000000000..fe64763314 --- /dev/null +++ b/recipes/xbmc/xbmc/0005-Hardcode-arm7-for-now.patch @@ -0,0 +1,26 @@ +From ea6d35da9dd3c0ce3e22b3390574e2362348c3ec Mon Sep 17 00:00:00 2001 +From: topfs2 <topfs2@568bbfeb-2a22-0410-94d2-cc84cf5bfa90> +Date: Mon, 7 Jun 2010 21:05:16 +0000 +Subject: [PATCH 05/11] Hardcode arm7 for now + +git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/gsoc-2010-beagleboard@30921 568bbfeb-2a22-0410-94d2-cc84cf5bfa90 +--- + xbmc/lib/libPython/linux/Makefile.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/xbmc/lib/libPython/linux/Makefile.in b/xbmc/lib/libPython/linux/Makefile.in +index 9df6b02..e4caecb 100644 +--- a/xbmc/lib/libPython/linux/Makefile.in ++++ b/xbmc/lib/libPython/linux/Makefile.in +@@ -32,7 +32,7 @@ ifeq ($(ARCH), x86_64-linux) + PYLIBDIR=lib.linux-x86_64-2.4 + else + ifeq ($(ARCH), arm) +- PYLIBDIR=lib.linux-armv6tel-2.4 ++ PYLIBDIR=lib.linux-armv7l-2.4 + else + PYLIBDIR=lib.linux-i686-2.4 + endif +-- +1.6.6.1 + diff --git a/recipes/xbmc/xbmc/0006-Hardcode-python2.6-for-now.patch b/recipes/xbmc/xbmc/0006-Hardcode-python2.6-for-now.patch new file mode 100644 index 0000000000..b48d1a28af --- /dev/null +++ b/recipes/xbmc/xbmc/0006-Hardcode-python2.6-for-now.patch @@ -0,0 +1,26 @@ +From 9a9456d3355a1b1c341cbf27d193af0f25a2f01d Mon Sep 17 00:00:00 2001 +From: topfs2 <topfs2@568bbfeb-2a22-0410-94d2-cc84cf5bfa90> +Date: Mon, 7 Jun 2010 21:05:33 +0000 +Subject: [PATCH 06/11] Hardcode python2.6 for now + +git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/gsoc-2010-beagleboard@30922 568bbfeb-2a22-0410-94d2-cc84cf5bfa90 +--- + Makefile.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index 01bbf54..e700604 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -472,7 +472,7 @@ DYNOBJSXBMC= \ + + ifeq (arm, $(ARCH)) + # Force external python2.5 for now! +-LIBS +=-lpython2.5 ++LIBS +=-lpython2.6 + endif + + xbmc.bin: $(OBJSXBMC) $(DYNOBJSXBMC) +-- +1.6.6.1 + diff --git a/recipes/xbmc/xbmc/0007-No-need-for-FEH-on-embedded-need-a-better-way-to-not.patch b/recipes/xbmc/xbmc/0007-No-need-for-FEH-on-embedded-need-a-better-way-to-not.patch new file mode 100644 index 0000000000..02894c4ed0 --- /dev/null +++ b/recipes/xbmc/xbmc/0007-No-need-for-FEH-on-embedded-need-a-better-way-to-not.patch @@ -0,0 +1,38 @@ +From d119bc01f9f15950ef40dfeef9925789f7414b45 Mon Sep 17 00:00:00 2001 +From: Koen Kooi <koen@dominion.thruhere.net> +Date: Tue, 29 Jun 2010 19:06:37 +0200 +Subject: [PATCH 07/11] No need for FEH on embedded (need a better way to not be hardcoded for armv7l) + +git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/gsoc-2010-beagleboard@30923 568bbfeb-2a22-0410-94d2-cc84cf5bfa90 + +Conflicts: + + tools/Linux/xbmc.sh.in +--- + tools/Linux/xbmc.sh.in | 10 ++++++---- + 1 files changed, 6 insertions(+), 4 deletions(-) + +diff --git a/tools/Linux/xbmc.sh.in b/tools/Linux/xbmc.sh.in +index 9612659..5b5f967 100644 +--- a/tools/Linux/xbmc.sh.in ++++ b/tools/Linux/xbmc.sh.in +@@ -100,10 +100,12 @@ print_crash_report() + echo "Crash report available at $FILE" + } + +-python @datadir@/xbmc/FEH.py "$SAVED_ARGS" +-RET=$? +-if [ $RET -ne 0 ]; then +- exit $RET ++if [ ! `uname -m` = "armv7l" ]; then ++ python @prefix@/share/xbmc/FEH.py "$SAVED_ARGS" ++ RET=$? ++ if [ $RET -ne 0 ]; then ++ exit $RET ++ fi + fi + + # Output warning in case ulimit is unsupported by shell +-- +1.6.6.1 + diff --git a/recipes/xbmc/xbmc/0008-configure.in-also-pass-down-target-when-using-host-a.patch b/recipes/xbmc/xbmc/0008-configure.in-also-pass-down-target-when-using-host-a.patch new file mode 100644 index 0000000000..da54acfeb6 --- /dev/null +++ b/recipes/xbmc/xbmc/0008-configure.in-also-pass-down-target-when-using-host-a.patch @@ -0,0 +1,129 @@ +From 8cd72c7fdfb625c9be7a367ec92c763924bd7bf1 Mon Sep 17 00:00:00 2001 +From: topfs2 <topfs2@568bbfeb-2a22-0410-94d2-cc84cf5bfa90> +Date: Fri, 18 Jun 2010 14:03:47 +0000 +Subject: [PATCH 08/11] configure.in: also pass down --target when using --host and --build. Thanks Koen Kooi! + +git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/gsoc-2010-beagleboard@31176 568bbfeb-2a22-0410-94d2-cc84cf5bfa90 +--- + configure.in | 21 +++++++++++++++++---- + 1 files changed, 17 insertions(+), 4 deletions(-) + +diff --git a/configure.in b/configure.in +index 806e9c2..b69261f 100644 +--- a/configure.in ++++ b/configure.in +@@ -1510,6 +1510,7 @@ XB_CONFIG_MODULE([xbmc/lib/libPython/Python], [ + ./configure \ + --host=$host_alias \ + --build=$build_alias \ ++ --target=$target_alias \ + --disable-ipv6 \ + --enable-unicode=ucs4 \ + --without-cxx \ +@@ -1622,6 +1623,7 @@ XB_CONFIG_MODULE([xbmc/cores/dvdplayer/Codecs/libdts], [ + ./configure \ + --host=$host_alias \ + --build=$build_alias \ ++ --target=$target_alias \ + --disable-oss \ + --disable-solaris-audio \ + --disable-al-audio \ +@@ -1642,6 +1644,7 @@ XB_CONFIG_MODULE([xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss], [ + CFLAGS="$CFLAGS" \ + --host=$host_alias \ + --build=$build_alias \ ++ --target=$target_alias \ + --disable-doc \ + --enable-static \ + --with-pic +@@ -1664,6 +1667,7 @@ XB_CONFIG_MODULE([xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread], [ + --prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}" --datadir="${datadir}" \ + --host=$host_alias \ + --build=$build_alias \ ++ --target=$target_alias \ + --enable-static \ + --disable-shared \ + --disable-strip \ +@@ -1692,6 +1696,7 @@ XB_CONFIG_MODULE([xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav], [ + --with-dvdread-config="`pwd`/../libdvdread/obj/dvdread-config" \ + --host=$host_alias \ + --build=$build_alias \ ++ --target=$target_alias \ + --enable-static \ + --disable-shared \ + --cc="$CC" +@@ -1723,6 +1728,7 @@ XB_CONFIG_MODULE([xbmc/cores/dvdplayer/Codecs/liba52], [ + ./configure \ + --host=$host_alias \ + --build=$build_alias \ ++ --target=$target_alias \ + --with-pic \ + --disable-static \ + --enable-shared \ +@@ -1760,7 +1766,8 @@ XB_CONFIG_MODULE([lib/libass], [ + CFLAGS="$CFLAGS" \ + ./configure \ + --host=$host_alias \ +- --build=$build_alias ++ --build=$build_alias \ ++ --target=$target_alias + fi + ], [$USE_EXTERNAL_LIBASS]) + +@@ -1778,6 +1785,7 @@ XB_CONFIG_MODULE([xbmc/lib/libid3tag/libid3tag],[ + --prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}" --datadir="${datadir}" \ + --host=$host_alias \ + --build=$build_alias \ ++ --target=$target_alias \ + --disable-static \ + --with-pic + fi +@@ -1805,6 +1813,7 @@ XB_CONFIG_MODULE([xbmc/visualizations/Goom/goom2k4-0],[ + --prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}" --datadir="${datadir}" \ + --host=$host_alias \ + --build=$build_alias \ ++ --target=$target_alias \ + --disable-shared \ + --enable-static \ + --with-pic +@@ -1837,6 +1846,7 @@ if expr "X$host_cpu" : 'Xarm.*' > /dev/null; then :; else + --prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}" --datadir="${datadir}" \ + --host=$host_alias \ + --build=$build_alias \ ++ --target=$target_alias \ + --without-xscreensaver \ + --disable-sound \ + --disable-cyclone \ +@@ -1857,7 +1867,8 @@ XB_CONFIG_MODULE([xbmc/cores/dvdplayer/Codecs/libbdnav/], [ + else + ./configure --without-openssl \ + --host=$host_alias \ +- --build=$build_alias CFLAGS="$CFLAGS" ++ --build=$build_alias \ ++ --target=$target_alias CFLAGS="$CFLAGS" + fi + ], [0]) + +@@ -1868,7 +1879,8 @@ XB_CONFIG_MODULE([xbmc/lib/libapetag], [ + else + ./configure \ + --host=$host_alias \ +- --build=$build_alias CFLAGS="$CFLAGS" ++ --build=$build_alias \ ++ --target=$target_alias CFLAGS="$CFLAGS" + fi + ], [0]) + +@@ -1898,7 +1910,8 @@ XB_CONFIG_MODULE([lib/cpluff], [ + else + ./configure --disable-nls \ + --host=$host_alias \ +- --build=$build_alias CFLAGS="$CFLAGS" ++ --build=$build_alias \ ++ --target=$target_alias CFLAGS="$CFLAGS" + fi + ], [0]) + +-- +1.6.6.1 + diff --git a/recipes/xbmc/xbmc/0009-Added-a-configure-option-disable-optical-drive.patch b/recipes/xbmc/xbmc/0009-Added-a-configure-option-disable-optical-drive.patch new file mode 100644 index 0000000000..4a1487e9a9 --- /dev/null +++ b/recipes/xbmc/xbmc/0009-Added-a-configure-option-disable-optical-drive.patch @@ -0,0 +1,76 @@ +From f5ba37fc083be1acd412cf2643dab9aaa81f20d8 Mon Sep 17 00:00:00 2001 +From: topfs2 <topfs2@568bbfeb-2a22-0410-94d2-cc84cf5bfa90> +Date: Fri, 25 Jun 2010 08:58:43 +0000 +Subject: [PATCH 09/11] Added a configure option --disable-optical-drive + +git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/gsoc-2010-beagleboard@31373 568bbfeb-2a22-0410-94d2-cc84cf5bfa90 +--- + configure.in | 17 +++++++++++++++++ + guilib/system.h | 2 +- + 2 files changed, 18 insertions(+), 1 deletions(-) + +diff --git a/configure.in b/configure.in +index b69261f..d861b28 100644 +--- a/configure.in ++++ b/configure.in +@@ -228,6 +228,12 @@ AC_ARG_ENABLE([webserver], + [use_webserver=$enableval], + [use_webserver=yes]) + ++AC_ARG_ENABLE([optical-drive], ++ [AS_HELP_STRING([--disable-optical-drive], ++ [disable optical drive])], ++ [use_optical_drive=$enableval], ++ [use_optical_drive=yes]) ++ + AC_ARG_ENABLE([libdts], + [AS_HELP_STRING([--enable-libdts], + [enable deprecated libdts support])], +@@ -616,6 +622,11 @@ else + fi + fi + ++# Optical ++if test "$use_optical_drive" = "yes"; then ++ AC_DEFINE([HAS_DVD_DRIVE], [1], [Define to 1 to have optical drive support]) ++fi ++ + # PulseAudio + if test "x$use_pulse" != "xno"; then + if test "$host_vendor" = "apple" ; then +@@ -1258,6 +1269,12 @@ else + final_message="$final_message\n WebM support:\tNo" + fi + ++if test "$use_optical_drive" = "yes"; then ++ final_message="$final_message\n Optical drive:\tYes" ++else ++ final_message="$final_message\n Optical drive:\tNo" ++fi ++ + if test "$use_librtmp" = "yes"; then + final_message="$final_message\n libRTMP support:\tYes" + else +diff --git a/guilib/system.h b/guilib/system.h +index 560778d..6e21cdb 100644 +--- a/guilib/system.h ++++ b/guilib/system.h +@@ -32,7 +32,6 @@ + #define HAS_SDL + #endif + +-#define HAS_DVD_DRIVE + #define HAS_DVD_SWSCALE + #define HAS_DVDPLAYER + #define HAS_EVENT_SERVER +@@ -87,6 +86,7 @@ + *****************/ + + #ifdef _WIN32 ++#define HAS_DVD_DRIVE + #define HAS_SDL_JOYSTICK + #define HAS_WIN32_NETWORK + #define HAS_IRSERVERSUITE +-- +1.6.6.1 + diff --git a/recipes/xbmc/xbmc/0010-Fixed-so-compile-worked-when-disabling-optical.patch b/recipes/xbmc/xbmc/0010-Fixed-so-compile-worked-when-disabling-optical.patch new file mode 100644 index 0000000000..39b611f5d3 --- /dev/null +++ b/recipes/xbmc/xbmc/0010-Fixed-so-compile-worked-when-disabling-optical.patch @@ -0,0 +1,136 @@ +From 2a5804ffc7c27496605c033bcbb9fc6569ec134f Mon Sep 17 00:00:00 2001 +From: topfs2 <topfs2@568bbfeb-2a22-0410-94d2-cc84cf5bfa90> +Date: Fri, 25 Jun 2010 09:00:12 +0000 +Subject: [PATCH 10/11] Fixed so compile worked when disabling optical + +git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/gsoc-2010-beagleboard@31374 568bbfeb-2a22-0410-94d2-cc84cf5bfa90 +--- + guilib/system.h | 5 ++++- + xbmc/MediaManager.h | 3 ++- + xbmc/MusicDatabase.cpp | 1 + + xbmc/MusicInfoTagLoaderCDDA.cpp | 4 +++- + xbmc/Util.cpp | 2 +- + xbmc/utils/Builtins.cpp | 7 ++++++- + 6 files changed, 17 insertions(+), 5 deletions(-) + +diff --git a/guilib/system.h b/guilib/system.h +index 6e21cdb..f24665a 100644 +--- a/guilib/system.h ++++ b/guilib/system.h +@@ -52,7 +52,6 @@ + #define HAS_JSONRPC + #define HAS_HTTPAPI + +-#define HAS_CDDA_RIPPER + #ifdef HAVE_ASAP_CODEC + #define HAS_ASAP_CODEC + #endif +@@ -250,6 +249,10 @@ + #endif + #endif + ++#ifdef HAS_DVD_DRIVE ++#define HAS_CDDA_RIPPER ++#endif ++ + #define SAFE_DELETE(p) { delete (p); (p)=NULL; } + #define SAFE_DELETE_ARRAY(p) { delete[] (p); (p)=NULL; } + #define SAFE_RELEASE(p) { if(p) { (p)->Release(); (p)=NULL; } } +diff --git a/xbmc/MediaManager.h b/xbmc/MediaManager.h +index 11338b1..4cba1df 100644 +--- a/xbmc/MediaManager.h ++++ b/xbmc/MediaManager.h +@@ -22,6 +22,7 @@ + + #include "MediaSource.h" // for VECSOURCES + #include <map> ++#include "utils/SingleLock.h" + #ifdef HAS_DVD_DRIVE + #include "FileSystem/cdioSupport.h" + #endif +@@ -70,8 +71,8 @@ public: + #ifdef HAS_DVD_DRIVE + CCdInfo* GetCdInfo(const CStdString& devicePath=""); + bool RemoveCdInfo(const CStdString& devicePath=""); +-#endif + CStdString GetDiskLabel(const CStdString& devicePath=""); ++#endif + void SetHasOpticalDrive(bool bstatus); + + bool Eject(CStdString mountpath); +diff --git a/xbmc/MusicDatabase.cpp b/xbmc/MusicDatabase.cpp +index f53271e..5d608a5 100644 +--- a/xbmc/MusicDatabase.cpp ++++ b/xbmc/MusicDatabase.cpp +@@ -58,6 +58,7 @@ + #include "utils/TimeUtils.h" + #include "TextureCache.h" + #include "GUIWindowAddonBrowser.h" ++#include "AutoPtrHandle.h" + + using namespace std; + using namespace AUTOPTR; +diff --git a/xbmc/MusicInfoTagLoaderCDDA.cpp b/xbmc/MusicInfoTagLoaderCDDA.cpp +index 8b4dcbe..aad19c3 100644 +--- a/xbmc/MusicInfoTagLoaderCDDA.cpp ++++ b/xbmc/MusicInfoTagLoaderCDDA.cpp +@@ -27,9 +27,11 @@ + #include "MediaManager.h" + #include "utils/log.h" + +-using namespace MEDIA_DETECT; + using namespace MUSIC_INFO; ++#ifdef HAS_DVD_DRIVE ++using namespace MEDIA_DETECT; + using namespace CDDB; ++#endif + + CMusicInfoTagLoaderCDDA::CMusicInfoTagLoaderCDDA(void) + { +diff --git a/xbmc/Util.cpp b/xbmc/Util.cpp +index 276bf5f..dab73a4 100644 +--- a/xbmc/Util.cpp ++++ b/xbmc/Util.cpp +@@ -1829,7 +1829,7 @@ bool CUtil::ThumbCached(const CStdString& strFileName) + + void CUtil::PlayDVD(const CStdString& strProtocol) + { +-#ifdef HAS_DVDPLAYER ++#if defined(HAS_DVDPLAYER) && defined(HAS_DVD_DRIVE) + CIoSupport::Dismount("Cdrom0"); + CIoSupport::RemapDriveLetter('D', "Cdrom0"); + CStdString strPath; +diff --git a/xbmc/utils/Builtins.cpp b/xbmc/utils/Builtins.cpp +index 64e44a9..a7e8b31 100644 +--- a/xbmc/utils/Builtins.cpp ++++ b/xbmc/utils/Builtins.cpp +@@ -87,9 +87,12 @@ + + using namespace std; + using namespace XFILE; +-using namespace MEDIA_DETECT; + using namespace ADDON; + ++#ifdef HAS_DVD_DRIVE ++using namespace MEDIA_DETECT; ++#endif ++ + typedef struct + { + const char* command; +@@ -759,10 +762,12 @@ int CBuiltins::Execute(const CStdString& execString) + { + g_playlistPlayer.Clear(); + } ++#ifdef HAS_DVD_DRIVE + else if (execute.Equals("ejecttray")) + { + CIoSupport::ToggleTray(); + } ++#endif + else if( execute.Equals("alarmclock") && params.size() > 1 ) + { + // format is alarmclock(name,command[,seconds,true]); +-- +1.6.6.1 + diff --git a/recipes/xbmc/xbmc/0011-reverted-so-normal-bootstrap-doesn-t-exclude-gnu-con.patch b/recipes/xbmc/xbmc/0011-reverted-so-normal-bootstrap-doesn-t-exclude-gnu-con.patch new file mode 100644 index 0000000000..6cc41725b3 --- /dev/null +++ b/recipes/xbmc/xbmc/0011-reverted-so-normal-bootstrap-doesn-t-exclude-gnu-con.patch @@ -0,0 +1,66 @@ +From f217484b4c0d036697dacb3a93a450b90dd44f82 Mon Sep 17 00:00:00 2001 +From: topfs2 <topfs2@568bbfeb-2a22-0410-94d2-cc84cf5bfa90> +Date: Fri, 25 Jun 2010 09:00:55 +0000 +Subject: [PATCH 11/11] reverted so normal bootstrap doesn't exclude gnu-configize but added a bootstrap.angstrom who does + +git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/gsoc-2010-beagleboard@31375 568bbfeb-2a22-0410-94d2-cc84cf5bfa90 +--- + bootstrap | 14 +++++++------- + bootstrap.angstrom | 17 +++++++++++++++++ + 2 files changed, 24 insertions(+), 7 deletions(-) + create mode 100755 bootstrap.angstrom + +diff --git a/bootstrap b/bootstrap +index 09ceefc..c77ae98 100755 +--- a/bootstrap ++++ b/bootstrap +@@ -2,16 +2,16 @@ + + set -e + +-autoreconf -vif --exclude gnu-configize +-autoreconf -vif --exclude gnu-configize lib/cpluff ++autoreconf -vif ++autoreconf -vif lib/cpluff + # w must autoreconf libass as we don't know till later if it's used. +-autoreconf -vif --exclude gnu-configize lib/libass +-autoreconf -vif --exclude gnu-configize xbmc/cores/dvdplayer/Codecs/libbdnav ++autoreconf -vif lib/libass ++autoreconf -vif xbmc/cores/dvdplayer/Codecs/libbdnav + # order matters with libbdnav and friends + [ -d xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss ] && \ +- autoreconf -vif --exclude gnu-configize xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss +-autoreconf -vif --exclude gnu-configize xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread +-autoreconf -vif --exclude gnu-configize xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav ++ autoreconf -vif xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss ++autoreconf -vif xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread ++autoreconf -vif xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav + + # Clean the generated files + find . -depth -type d -name "autom4te.cache" -exec rm -rf {} \; +diff --git a/bootstrap.angstrom b/bootstrap.angstrom +new file mode 100755 +index 0000000..8549f89 +--- /dev/null ++++ b/bootstrap.angstrom +@@ -0,0 +1,17 @@ ++#!/bin/sh ++ ++set -e ++ ++autoreconf -vif --exclude gnu-configize ++autoreconf -vif --exclude gnu-configize lib/cpluff ++# w must autoreconf libass as we don't know till later if it's used. ++autoreconf -vif --exclude gnu-configize lib/libass ++autoreconf -vif --exclude gnu-configize xbmc/cores/dvdplayer/Codecs/libbdnav ++# order matters with libbdnav and friends ++[ -d xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss ] && \ ++ autoreconf -vif --exclude gnu-configize xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss ++autoreconf -vif --exclude gnu-configize xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread ++autoreconf -vif --exclude gnu-configize xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav ++ ++echo "Please (re)run configure..." ++ +-- +1.6.6.1 + diff --git a/recipes/xbmc/xbmc_svn.bb b/recipes/xbmc/xbmc_svn.bb new file mode 100644 index 0000000000..2d1d476e87 --- /dev/null +++ b/recipes/xbmc/xbmc_svn.bb @@ -0,0 +1,62 @@ +DESCRIPTION = "XBMC Media Center" +LICENSE = "xbmc" + +DEPENDS = "libmodplug libmicrohttpd wavpack libmms cmake-native libsdl-image libsdl-mixer virtual/egl mysql5 sqlite3 libmms faad2 libcdio libpcre boost lzo2 enca avahi libsamplerate0 libxrandr bzip2 virtual/libsdl" + +SRCREV = "21029056aa4c26c6ce3aa7d09703ca8b458df201" + +PV = "10.05" +PR = "r2" +PR_append = "+gitr${SRCPV}" + +SRC_URI = "git://xbmc.git.sourceforge.net/gitroot/xbmc/xbmc;protocol=git;branch=master \ +file://0001-Only-check-for-nasm-on-i686-it-is-bogus-on-ARM-which.patch \ +file://0002-Exclude-gnu-configize-for-ngstr-m-Thanks-koen.patch \ +file://0003-Workaround-to-compile-python-on-ngstr-m-with-Python-.patch \ +file://0004-Don-t-use-sudo-in-install-of-xbmc.bin-not-all-distri.patch \ +file://0005-Hardcode-arm7-for-now.patch \ +file://0006-Hardcode-python2.6-for-now.patch \ +file://0007-No-need-for-FEH-on-embedded-need-a-better-way-to-not.patch \ +file://0008-configure.in-also-pass-down-target-when-using-host-a.patch \ +file://0009-Added-a-configure-option-disable-optical-drive.patch \ +file://0010-Fixed-so-compile-worked-when-disabling-optical.patch \ +file://0011-reverted-so-normal-bootstrap-doesn-t-exclude-gnu-con.patch \ +" + +inherit autotools gettext + +S = "${WORKDIR}/git" + +EXTRA_OECONF = " \ + --enable-gles \ + --disable-optical-drive \ + --enable-external-libraries \ +" + +do_configure() { + sh bootstrap.angstrom + oe_runconf +} + +do_compile_prepend() { + for i in $(find . -name "Makefil*") ; do + sed -i 's:I/usr/include:I${STAGING_INCDIR}:g' $i + done + for i in $(find . -name "*.mak*") ; do + sed -i 's:I/usr/include:I${STAGING_INCDIR}:g' $i + done + sed -i 's:I/usr/include:I${STAGING_INCDIR}:g' ${S}/Makefile +} + +do_install_append() { + ln -sf ${libdir}/xbmc/system/python/python24-arm.so ${D}${datadir}/xbmc/system/python/ || true + ln -sf ${libdir}/xbmc/system/python/python26-arm.so ${D}${datadir}/xbmc/system/python/ || true +} + +FILES_${PN} += "${datadir}/xsessions" +FILES_${PN}-dbg += "${libdir}/xbmc/.debug ${libdir}/xbmc/*/.debug ${libdir}/xbmc/*/*/.debug ${libdir}/xbmc/*/*/*/.debug" + +# GNU_HASH QA errors... +INSANE_SKIP_${PN} = "True" + + diff --git a/recipes/xcb/libpthread-stubs_0.1.bb b/recipes/xcb/libpthread-stubs_0.1.bb index 1fbb4fccdf..0f2dd10afd 100644 --- a/recipes/xcb/libpthread-stubs_0.1.bb +++ b/recipes/xcb/libpthread-stubs_0.1.bb @@ -3,6 +3,7 @@ not provided in libc or otherwise available by default." SECTION = "x11/libs" LICENSE = "MIT-X" HOMEPAGE = "http://xcb.freedesktop.org" +PR = "r1" PARALLEL_MAKE = "" #DEPENDS = "xcb-proto xproto libxau libxslt-native" @@ -12,9 +13,5 @@ SRC_URI = "http://xcb.freedesktop.org/dist/libpthread-stubs-${PV}.tar.bz2" inherit autotools pkgconfig -do_stage() { - autotools_stage_all -} - SRC_URI[md5sum] = "774eabaf33440d534efe108ef9130a7d" SRC_URI[sha256sum] = "004dae11e11598584939d66d26a5ab9b48d08a00ca2d00ae8d38ee3ac7a15d65" diff --git a/recipes/xcb/libpthread-stubs_0.2.bb b/recipes/xcb/libpthread-stubs_0.2.bb index bca163100f..068c6673d9 100644 --- a/recipes/xcb/libpthread-stubs_0.2.bb +++ b/recipes/xcb/libpthread-stubs_0.2.bb @@ -3,6 +3,7 @@ not provided in libc or otherwise available by default." SECTION = "x11/libs" LICENSE = "MIT-X" HOMEPAGE = "http://xcb.freedesktop.org" +PR = "r1" PARALLEL_MAKE = "" #DEPENDS = "xcb-proto xproto libxau libxslt-native" @@ -12,9 +13,5 @@ SRC_URI = "http://xcb.freedesktop.org/dist/libpthread-stubs-${PV}.tar.bz2" inherit autotools pkgconfig -do_stage() { - autotools_stage_all -} - SRC_URI[md5sum] = "2ba9ce2d46da0a2a1090384ece3387ff" SRC_URI[sha256sum] = "d4c47c24e5ec07e974a7ef8f55b2907dd7fa8de82e291a02b15f8c4a7028bf48" diff --git a/recipes/xcb/libpthread-stubs_0.3.bb b/recipes/xcb/libpthread-stubs_0.3.bb new file mode 100644 index 0000000000..bad516e9a2 --- /dev/null +++ b/recipes/xcb/libpthread-stubs_0.3.bb @@ -0,0 +1,20 @@ +DESCRIPTION = "This library provides weak aliases for pthread functions \ +not provided in libc or otherwise available by default." +SECTION = "x11/libs" +LICENSE = "MIT-X" +HOMEPAGE = "http://xcb.freedesktop.org" +PR = "r1" + +# For unknown reason doesn't create libpthread-stubs.la +DEFAULT_PREFERENCE = "-1" + +PARALLEL_MAKE = "" +#DEPENDS = "xcb-proto xproto libxau libxslt-native" +# DEPENDS += "xsltproc-native gperf-native" + +SRC_URI = "http://xcb.freedesktop.org/dist/libpthread-stubs-${PV}.tar.bz2" + +inherit autotools pkgconfig + +SRC_URI[md5sum] = "e8fa31b42e13f87e8f5a7a2b731db7ee" +SRC_URI[sha256sum] = "35b6d54e3cc6f3ba28061da81af64b9a92b7b757319098172488a660e3d87299" diff --git a/recipes/xcb/libxcb_1.6.bb b/recipes/xcb/libxcb_1.6.bb index f24f40a08f..ccf475b2d4 100644 --- a/recipes/xcb/libxcb_1.6.bb +++ b/recipes/xcb/libxcb_1.6.bb @@ -1,5 +1,5 @@ include libxcb.inc -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" SRC_URI = "http://xcb.freedesktop.org/dist/libxcb-${PV}.tar.bz2 \ file://configure_git.patch" diff --git a/recipes/xorg-driver/xf86-video-glamo/0001-glamo-output-initialize-mode-name-to-NULL.patch b/recipes/xorg-driver/xf86-video-glamo/0001-glamo-output-initialize-mode-name-to-NULL.patch new file mode 100644 index 0000000000..89123443b5 --- /dev/null +++ b/recipes/xorg-driver/xf86-video-glamo/0001-glamo-output-initialize-mode-name-to-NULL.patch @@ -0,0 +1,25 @@ +From 993affdb7cdcc4d2bd9c5df784c2d61c75d34701 Mon Sep 17 00:00:00 2001 +From: Martin Jansa <Martin.Jansa@gmail.com> +Date: Wed, 30 Jun 2010 10:05:23 +0200 +Subject: [PATCH] glamo-output: initialize mode name to NULL with calloc + +--- + src/glamo-output.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/glamo-output.c b/src/glamo-output.c +index 10a0f8e..eea3cb2 100644 +--- a/src/glamo-output.c ++++ b/src/glamo-output.c +@@ -165,7 +165,7 @@ GlamoOutputInit(ScrnInfoPtr pScrn) { + output->driver_private = pGlamoOutput; + pGlamoOutput->modes = NULL; + +- mode = xnfalloc(sizeof(DisplayModeRec)); ++ mode = xnfcalloc(1, sizeof(DisplayModeRec)); + if (!mode) + return; + +-- +1.7.1 + diff --git a/recipes/xorg-driver/xf86-video-glamo_git.bb b/recipes/xorg-driver/xf86-video-glamo_git.bb index 44d2e3dd40..71fa207ffa 100644 --- a/recipes/xorg-driver/xf86-video-glamo_git.bb +++ b/recipes/xorg-driver/xf86-video-glamo_git.bb @@ -4,9 +4,11 @@ DEPENDS += "libdrm" RDEPENDS_${PN} = "xserver-xorg-extension-dri xserver-xorg-extension-dri2 xserver-xorg-extension-glx mesa-dri" PE = "2" PV = "1.0.0+gitr${SRCPV}" -PR = "${INC_PR}.2" +PR = "${INC_PR}.4" -SRC_URI = "git://git.openmoko.org/git/xf86-video-glamo.git;protocol=git;branch=master" +SRC_URI = "git://git.openmoko.org/git/xf86-video-glamo.git;protocol=git;branch=master \ + file://0001-glamo-output-initialize-mode-name-to-NULL.patch \ + " S = "${WORKDIR}/git" SRCREV = "e43cf499d0df41eb6ca2a1a7c21af71e31207635" diff --git a/recipes/xorg-xserver/xserver-xorg-1.8.99.903/0001-xf86Modes-make-sure-that-DisplayModeRec-name-is-init.patch b/recipes/xorg-xserver/xserver-xorg-1.8.99.903/0001-xf86Modes-make-sure-that-DisplayModeRec-name-is-init.patch new file mode 100644 index 0000000000..adbc274fd7 --- /dev/null +++ b/recipes/xorg-xserver/xserver-xorg-1.8.99.903/0001-xf86Modes-make-sure-that-DisplayModeRec-name-is-init.patch @@ -0,0 +1,25 @@ +From 7deb3068ff65ecadf035e8e493d418aca89c9212 Mon Sep 17 00:00:00 2001 +From: Martin Jansa <Martin.Jansa@gmail.com> +Date: Wed, 30 Jun 2010 10:42:36 +0200 +Subject: [PATCH] xf86Modes: make sure that DisplayModeRec name is initialized to NULL and then don't call free() on it in xf86SetModeDefaultName + +--- + hw/xfree86/modes/xf86Modes.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/hw/xfree86/modes/xf86Modes.c b/hw/xfree86/modes/xf86Modes.c +index 05f4319..09a9679 100644 +--- a/hw/xfree86/modes/xf86Modes.c ++++ b/hw/xfree86/modes/xf86Modes.c +@@ -206,7 +206,7 @@ xf86DuplicateMode(const DisplayModeRec *pMode) + { + DisplayModePtr pNew; + +- pNew = xnfalloc(sizeof(DisplayModeRec)); ++ pNew = xnfcalloc(1, sizeof(DisplayModeRec)); + *pNew = *pMode; + pNew->next = NULL; + pNew->prev = NULL; +-- +1.7.1 + diff --git a/recipes/xorg-xserver/xserver-xorg_1.8.99.903.bb b/recipes/xorg-xserver/xserver-xorg_1.8.99.903.bb index b8b27ad91a..709c57c42b 100644 --- a/recipes/xorg-xserver/xserver-xorg_1.8.99.903.bb +++ b/recipes/xorg-xserver/xserver-xorg_1.8.99.903.bb @@ -6,7 +6,7 @@ require xorg-xserver-common.inc DESCRIPTION = "the X.Org X server" DEPENDS += "pixman libpciaccess openssl dri2proto glproto xorg-minimal-fonts font-util-native" PE = "2" -PR = "${INC_PR}.2" +PR = "${INC_PR}.3" # Needs newer mesa-dri, where is D_P = "-1" DEFAULT_PREFERENCE = "-1" @@ -15,7 +15,8 @@ DEFAULT_PREFERENCE_shr = "1" SRC_URI += " \ file://dolt-fix-1.7.0.patch \ file://randr-support-1.7.0.patch \ - file://hack-fbdev-ignore-return-mode.patch \ + file://hack-fbdev-ignore-return-mode.patch \ + file://0001-xf86Modes-make-sure-that-DisplayModeRec-name-is-init.patch \ " SRC_URI[archive.md5sum] = "d49305baa79772ca965407b0fd2dcb84" SRC_URI[archive.sha256sum] = "2e7e999da9e23e2daee35715c4432447408ae1edc4bdac0b13e667af58cd5775" |