diff options
Diffstat (limited to 'packages')
22 files changed, 294 insertions, 26 deletions
diff --git a/packages/cacao/cacaoh-cldc-native_0.98.bb b/packages/cacao/cacaoh-cldc-native_0.98.bb index e2c92cc328..eac95b8ace 100644 --- a/packages/cacao/cacaoh-cldc-native_0.98.bb +++ b/packages/cacao/cacaoh-cldc-native_0.98.bb @@ -1,19 +1,9 @@ require cacaoh-native.inc -DEPENDS += "midpath-cldc-native" - SRC_URI = "\ http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-${PV}/cacao-${PV}.tar.bz2;md5sum=8b8907c8b925761c9410bcadb9705346 \ " -EXTRA_OECONF += "\ - --with-classpath-includedir=${STAGING_INCDIR}/classpath \ - --enable-jni \ - --enable-java=cldc1.1 \ - --with-classpath=cldc1.1 \ - --with-classpath-classes=${STAGING_DATADIR}/midpath-cldc/midpath-cldc1.1.jar \ -" - do_stage() { install -m 0755 src/cacaoh/.libs/cacaoh ${STAGING_BINDIR}/cacaoh-cldc-${PV} } diff --git a/packages/dbus-java/dbus-java_2.3.bb b/packages/dbus-java/dbus-java_2.3.bb index 756dd9ffe9..8ed5c44d94 100644 --- a/packages/dbus-java/dbus-java_2.3.bb +++ b/packages/dbus-java/dbus-java_2.3.bb @@ -20,10 +20,15 @@ RSUGGESTS_libdbus-java = "libunixsocket-java dbus" RDEPENDS_dbus-java-viewer = "java2-runtime libunixsocket-java ${JPN}" RDEPENDS_dbus-java-bin = "java2-runtime libunixsocket-java ${JPN}" +# jamvm-native unfortunately contains non-generificed java/lang/reflect classes +# which are accessed in this package. Work around this by setting the bootclasspath +# explicitly. +JCFLAGS = "-bootclasspath ${STAGING_DATADIR}/classpath/glibj.zip" + do_compile () { # run target .binclasses first to fix a brokenness in the Makefile oe_runmake \ - JCFLAGS="-source 1.5" \ + JCFLAGS="-source 1.5 ${JCFLAGS}" \ JAVAC="javac" \ JARPREFIX="${STAGING_DATADIR_JAVA}" \ JAVAUNIXJARDIR="${STAGING_DATADIR_JAVA}" \ @@ -32,7 +37,7 @@ do_compile () { .binclasses oe_runmake \ - JCFLAGS="-source 1.5" \ + JCFLAGS="-source 1.5 ${JCFLAGS}" \ JAVAC="javac" \ JARPREFIX="${STAGING_DATADIR_JAVA}" \ JAVAUNIXJARDIR="${STAGING_DATADIR_JAVA}" \ diff --git a/packages/dbus-java/dbus-java_2.4.bb b/packages/dbus-java/dbus-java_2.4.bb index 17b7ccec68..37c539b20e 100644 --- a/packages/dbus-java/dbus-java_2.4.bb +++ b/packages/dbus-java/dbus-java_2.4.bb @@ -17,10 +17,15 @@ S = "${WORKDIR}/dbus-java-${PV}" inherit java-library +# jamvm-native unfortunately contains non-generificed java/lang/reflect classes +# which are accessed in this package. Work around this by setting the bootclasspath +# explicitly. +JCFLAGS = "-bootclasspath ${STAGING_DATADIR}/classpath/glibj.zip" + do_compile () { # run target .binclasses first to fix a brokenness in the Makefile oe_runmake \ - JCFLAGS="-source 1.5" \ + JCFLAGS="-source 1.5 ${JCFLAGS}" \ JAVAC="javac" \ JARPREFIX="${STAGING_DATADIR_JAVA}" \ JAVAUNIXJARDIR="${STAGING_DATADIR_JAVA}" \ @@ -28,7 +33,7 @@ do_compile () { JAR="fastjar" \ .binclasses oe_runmake \ - JCFLAGS="-source 1.5" \ + JCFLAGS="-source 1.5 ${JCFLAGS}" \ JAVAC="javac" \ JARPREFIX="${STAGING_DATADIR_JAVA}" \ JAVAUNIXJARDIR="${STAGING_DATADIR_JAVA}" \ diff --git a/packages/dbus-java/dbus-java_2.5.bb b/packages/dbus-java/dbus-java_2.5.bb new file mode 100644 index 0000000000..ef783c905d --- /dev/null +++ b/packages/dbus-java/dbus-java_2.5.bb @@ -0,0 +1,87 @@ +DESCRIPTION = "A pure Java D-Bus Implementation" +DESCRIPTION_dbus-java-viewer = "${DESCRIPTION} (DBusViewer Binary)" +DESCRIPTION_dbus-java-bin = "${DESCRIPTION} (Binaries)" +AUTHOR = "Matthew Johnson <dbus@matthew.ath.cx>" +HOMEPAGE = "http://dbus.freedesktop.org/doc/dbus-java" +SECTION = "libs" +LICENSE = "LGPLv2 AFL" +DEPENDS = "libmatthew docbook-utils-native docbook-sgml-dtd-4.1-native fastjar-native" +RDEPENDS_dbus-java-viewer = "java2-runtime libunixsocket-java ${JPN}" +RDEPENDS_dbus-java-bin = "java2-runtime libunixsocket-java ${JPN}" +RSUGGESTS_libdbus-java = "libunixsocket-java dbus" +PR = "r0" + +SRC_URI = "http://dbus.freedesktop.org/releases/dbus-java/dbus-java-${PV}.tar.gz" + +S = "${WORKDIR}/dbus-java-${PV}" + +inherit java-library + +# jamvm-native unfortunately contains non-generificed java/lang/reflect classes +# which are accessed in this package. Work around this by setting the bootclasspath +# explicitly. +JCFLAGS = "-bootclasspath ${STAGING_DATADIR}/classpath/glibj.zip" + +do_compile () { + oe_runmake \ + JCFLAGS="-source 1.5 ${JCFLAGS}" \ + JAVAC="javac" \ + JARPREFIX="${STAGING_DATADIR_JAVA}" \ + JAVAUNIXJARDIR="${STAGING_DATADIR_JAVA}" \ + CLASSPATH="${S}/classes" \ + JAR="fastjar" \ + bin + + # Generated shell scripts will have staging paths inside them. + rm bin/* + + # Generate them again with target paths. + oe_runmake \ + JAVAC="oefatal \"No Java compilation expected here.\"" \ + JAR="oefatal \"No jar invocation expected here.\"" \ + JARPREFIX=${datadir_java} \ + JAVAUNIXPATH=${datadir_java} \ + bin + + # Generate man pages. + oe_runmake \ + JAVAC="oefatal \"No Java compilation expected here.\"" \ + JAR="oefatal \"No jar invocation expected here.\"" \ + JARPREFIX=${datadir_java} \ + JAVAUNIXPATH=${datadir_java} \ + man +} + +do_install () { + oe_jarinstall ${JPN}-${PV}.jar ${JPN}.jar + oe_jarinstall dbus-java-viewer-${PV}.jar dbus-java-viewer.jar + oe_jarinstall dbus-java-bin-${PV}.jar dbus-java-bin.jar + + install -d ${D}${bindir} + install bin/DBusViewer ${D}${bindir} + install bin/DBusCall ${D}${bindir} + install bin/CreateInterface ${D}${bindir} + install bin/ListDBus ${D}${bindir} + install bin/DBusDaemon ${D}${bindir} + + oe_runmake \ + JAVAC="oefatal \"No Java compilation expected here.\"" \ + JAR="oefatal \"No jar invocation expected here.\"" \ + MANPREFIX=${D}${mandir} \ + DOCPREFIX=${D}${docdir}/${JPN} \ + install-man +} + +do_stage () { + oe_jarinstall -s ${JPN}-${PV}.jar ${JPN}.jar +} + +PACKAGE_ARCH = "all" +# ${JPN} must be last otherwise it would pick up dbus-viewer*.jar +# and dbus-bin*.jar +PACKAGES = "dbus-java-viewer dbus-java-viewer-doc dbus-java-bin dbus-java-bin-doc ${JPN}" + +FILES_dbus-java-viewer = "${datadir}/java/dbus-java-viewer*.jar ${bindir}/DBusViewer" +FILES_dbus-java-viewer-doc = "${mandir}/DBusViewer*" +FILES_dbus-java-bin = "${datadir}/java/dbus-java-bin*.jar ${bindir}" +FILES_dbus-java-bin-doc = "${mandir} ${docdir}/${JPN}" diff --git a/packages/flumotion/flumotion_0.4.1.bb b/packages/flumotion/flumotion_0.4.1.bb index 976c8c4142..c746da6c8f 100644 --- a/packages/flumotion/flumotion_0.4.1.bb +++ b/packages/flumotion/flumotion_0.4.1.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Fluendo Streaming Server" LICENSE = "GPL" -DEPENDS = "gstreamer python-imaging python-gst twisted python-pygtk" +DEPENDS = "gstreamer python-imaging python-gst python-twisted python-pygtk" RDEPENDS = "python-resource python-pprint python-threading \ python-imaging python-xml python-curses \ python-compression python-fcntl python-pygobject \ diff --git a/packages/gnash/gnash-minimal.inc b/packages/gnash/gnash-minimal.inc index f77ef6ae02..a4a44ae058 100644 --- a/packages/gnash/gnash-minimal.inc +++ b/packages/gnash/gnash-minimal.inc @@ -1,7 +1,7 @@ DESCRIPTION = "Gnash is a GNU Flash movie player that supports many SWF v7 features" HOMEPAGE = "http://www.gnu.org/software/gnash" LICENSE = "GPL-2" -DEPENDS = "virtual/libiconv virtual/libintl libtool agg libxml2 libmad zlib boost jpeg pango curl freetype" +DEPENDS = "virtual/libiconv virtual/libintl libltdl libtool agg libxml2 libmad zlib boost jpeg pango curl freetype" SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gnash/${PV}/gnash-${PV}.tar.bz2" S = ${WORKDIR}/gnash-${PV} diff --git a/packages/gstreamer/gst-ffmpeg/autotools.patch b/packages/gstreamer/gst-ffmpeg/autotools.patch new file mode 100644 index 0000000000..76e7ac6486 --- /dev/null +++ b/packages/gstreamer/gst-ffmpeg/autotools.patch @@ -0,0 +1,21 @@ +Index: gst-ffmpeg-0.10.2/gst-libs/ext/ffmpeg/configure.ac +=================================================================== +--- gst-ffmpeg-0.10.2.orig/gst-libs/ext/ffmpeg/configure.ac 2008-08-20 00:20:19.177850039 +0200 ++++ gst-ffmpeg-0.10.2/gst-libs/ext/ffmpeg/configure.ac 2008-08-20 00:26:24.567809464 +0200 +@@ -27,13 +27,15 @@ + + AM_MAINTAINER_MODE + AC_GNU_SOURCE ++ ++AC_PROG_LIBTOOL + AM_PROG_AS + AC_PROG_CC ++AC_PROG_CXX + AC_PROG_INSTALL + AC_SYS_LARGEFILE + AC_STDC_HEADERS + AM_DISABLE_STATIC +-AC_PROG_LIBTOOL + + dnl Warning for anyone using these custom macros. + dnl before asking me questions on why it doesn't work and why you diff --git a/packages/gstreamer/gst-ffmpeg_0.10.2.bb b/packages/gstreamer/gst-ffmpeg_0.10.2.bb index e4dfb0b701..2cad978a16 100644 --- a/packages/gstreamer/gst-ffmpeg_0.10.2.bb +++ b/packages/gstreamer/gst-ffmpeg_0.10.2.bb @@ -4,12 +4,14 @@ PRIORITY = "optional" LICENSE = "LGPL" HOMEPAGE = "http://www.gstreamer.net/" DEPENDS = "gstreamer zlib" -PR = "r1" +PR = "r2" inherit autotools pkgconfig SRC_URI = "http://gstreamer.freedesktop.org/src/${PN}/${PN}-${PV}.tar.bz2 \ - file://armv5.patch;patch=1" + file://armv5.patch;patch=1 \ + file://autotools.patch;patch=1 \ + " FILES_${PN} += "${libdir}/gstreamer-0.10/*.so" FILES_${PN}-dbg += "${libdir}/gstreamer-0.10/.debug" diff --git a/packages/midpath/midpath-backend-qt3x11_0.2+0.3rc1.bb b/packages/midpath/midpath-backend-qt3x11_0.2+0.3rc1.bb index 3f1c0e594f..1d79379863 100644 --- a/packages/midpath/midpath-backend-qt3x11_0.2+0.3rc1.bb +++ b/packages/midpath/midpath-backend-qt3x11_0.2+0.3rc1.bb @@ -6,7 +6,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz" S = "${WORKDIR}/midpath-0.3rc1" -DEPENDS = "classpath qt-mt" +DEPENDS = "classpath qte-mt" RCONFLICTS = "midpath-backend-qte" inherit qt3x11 diff --git a/packages/midpath/midpath-backend-qt4x11_0.2+0.3rc1.bb b/packages/midpath/midpath-backend-qt4x11_0.2+0.3rc1.bb index ba12796d28..f26ea4eac5 100644 --- a/packages/midpath/midpath-backend-qt4x11_0.2+0.3rc1.bb +++ b/packages/midpath/midpath-backend-qt4x11_0.2+0.3rc1.bb @@ -6,7 +6,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz" S = "${WORKDIR}/midpath-0.3rc1" -DEPENDS = "classpath qt-mt" +DEPENDS = "classpath qte-mt" inherit qt4x11 diff --git a/packages/midpath/midpath-backend-qte_0.2+0.3rc1.bb b/packages/midpath/midpath-backend-qte_0.2+0.3rc1.bb index c812b34234..6d7cb9dba7 100644 --- a/packages/midpath/midpath-backend-qte_0.2+0.3rc1.bb +++ b/packages/midpath/midpath-backend-qte_0.2+0.3rc1.bb @@ -6,7 +6,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz" S = "${WORKDIR}/midpath-0.3rc1" -DEPENDS = "classpath qt-mt" +DEPENDS = "classpath qte-mt" RCONFLICTS = "midpath-backend-qt3" inherit qt3e diff --git a/packages/openjade/openjade-native_1.3.2.bb b/packages/openjade/openjade-native_1.3.2.bb index 11a3ca8525..822c47dd3b 100644 --- a/packages/openjade/openjade-native_1.3.2.bb +++ b/packages/openjade/openjade-native_1.3.2.bb @@ -15,8 +15,12 @@ EXTRA_OECONF = "--enable-spincludedir=${STAGING_INCDIR}/OpenSP \ --enable-splibdir=${STAGING_LIBDIR} \ --enable-default-catalog=${sysconfdir}/sgml/catalog \ --enable-default-search-path=${datadir}/sgml" + acpaths = "-I ${S}/config" -CFLAGS_prepend = "-I${S}/include" + +# Trailing whitespace is important. Otherwise compiler arguments will be messed +# up, resulting in a fail in do_configure. +CFLAGS_prepend = "-I${S}/include " do_configure () { mv config/configure.in . diff --git a/packages/openjade/openjade_1.3.2.bb b/packages/openjade/openjade_1.3.2.bb index 7b1272ba4f..dcbfd886a0 100644 --- a/packages/openjade/openjade_1.3.2.bb +++ b/packages/openjade/openjade_1.3.2.bb @@ -12,8 +12,12 @@ inherit autotools EXTRA_OECONF = "--enable-spincludedir=${STAGING_INCDIR}/OpenSP \ --enable-splibdir=${STAGING_LIBDIR}" + acpaths = "-I ${S}/config" -CFLAGS_prepend = "-I${S}/include" + +# Trailing whitespace is important. Otherwise compiler arguments will be messed +# up, resulting in a fail in do_configure. +CFLAGS_prepend = "-I${S}/include " do_configure_prepend () { mv config/configure.in . diff --git a/packages/openmoko2/openmoko-icon-theme-standard2-qvga_svn.bb b/packages/openmoko2/openmoko-icon-theme-standard2-qvga_svn.bb index acbf3da7b9..e394547fd5 100644 --- a/packages/openmoko2/openmoko-icon-theme-standard2-qvga_svn.bb +++ b/packages/openmoko2/openmoko-icon-theme-standard2-qvga_svn.bb @@ -4,6 +4,8 @@ DEPENDS = "imagemagick-native librsvg-native" PV = "0.1.0+svnr${SRCREV}" PR = "r2" +EXCLUDE_FROM_WORLD = "1" + inherit openmoko2 SRC_URI = "svn://svn.openmoko.org/trunk/src/target/OM-2007.2/artwork/;module=icons;proto=http" diff --git a/packages/php/php-5.2.6/acinclude-xml2-config.patch b/packages/php/php-5.2.6/acinclude-xml2-config.patch new file mode 100644 index 0000000000..bf519d2934 --- /dev/null +++ b/packages/php/php-5.2.6/acinclude-xml2-config.patch @@ -0,0 +1,18 @@ +--- /orig-acinclude.m4 2007-02-20 15:03:25.000000000 +0200 ++++ /acinclude.m4 2007-02-20 15:03:24.000000000 +0200 +@@ -2359,12 +2359,9 @@ + AC_DEFUN([PHP_SETUP_LIBXML], [ + AC_CACHE_CHECK([for xml2-config path], ac_cv_php_xml2_config_path, + [ +- for i in $PHP_LIBXML_DIR /usr/local /usr; do +- if test -x "$i/bin/xml2-config"; then +- ac_cv_php_xml2_config_path="$i/bin/xml2-config" +- break +- fi +- done ++ ++ ac_cv_php_xml2_config_path="$PHP_LIBXML_DIR/xml2-config" ++ + ]) + + if test -x "$ac_cv_php_xml2_config_path"; then diff --git a/packages/php/php-5.2.6/pear-makefile.patch b/packages/php/php-5.2.6/pear-makefile.patch new file mode 100644 index 0000000000..26de98a48f --- /dev/null +++ b/packages/php/php-5.2.6/pear-makefile.patch @@ -0,0 +1,11 @@ +--- /pear/orig-Makefile.frag 2007-03-16 12:18:33.000000000 +0200 ++++ /pear/Makefile.frag 2007-03-16 12:35:48.000000000 +0200 +@@ -6,7 +6,7 @@ + PEAR_INSTALL_FLAGS = -n -dshort_open_tag=0 -dsafe_mode=0 -dopen_basedir= -derror_reporting=E_ALL -dmemory_limit=-1 -ddetect_unicode=0 + + install-pear-installer: $(SAPI_CLI_PATH) +- @$(top_builddir)/sapi/cli/php $(PEAR_INSTALL_FLAGS) $(builddir)/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)" ++ @$(PHP_NATIVE_DIR)/php $(PEAR_INSTALL_FLAGS) $(builddir)/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)" + + install-pear: + @echo "Installing PEAR environment: $(INSTALL_ROOT)$(peardir)/" diff --git a/packages/proxy-libintl/.mtn2git_empty b/packages/proxy-libintl/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/proxy-libintl/.mtn2git_empty diff --git a/packages/proxy-libintl/proxy-libintl-20080418/.mtn2git_empty b/packages/proxy-libintl/proxy-libintl-20080418/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/proxy-libintl/proxy-libintl-20080418/.mtn2git_empty diff --git a/packages/proxy-libintl/proxy-libintl-20080418/stub-only.patch b/packages/proxy-libintl/proxy-libintl-20080418/stub-only.patch new file mode 100644 index 0000000000..7186b13c06 --- /dev/null +++ b/packages/proxy-libintl/proxy-libintl-20080418/stub-only.patch @@ -0,0 +1,72 @@ +Index: proxy-libintl/src/proxy-libintl/libintl.c +=================================================================== +--- proxy-libintl.orig/src/proxy-libintl/libintl.c ++++ proxy-libintl/src/proxy-libintl/libintl.c +@@ -18,9 +18,12 @@ + */ + + #ifdef _WIN32 +-#include <windows.h> ++# include <windows.h> + #else +-#include <dlfcn.h> ++# include <stddef.h> ++# if !STUB_ONLY ++# include <dlfcn.h> ++# endif + typedef void* HMODULE; + #endif + +@@ -65,11 +68,13 @@ static char * (*p_bind_textdomain_codese + static int + use_intl_dll (HMODULE dll) + { +-#ifdef _WIN32 +-#define LOOKUP(fn) p_##fn = (void *) GetProcAddress (dll, #fn); if (p_##fn == NULL) return 0 +-#else +-#define LOOKUP(fn) p_##fn = (void *) dlsym (dll, #fn); if (p_##fn == NULL) return 0 +-#endif ++#if !STUB_ONLY ++# ifdef _WIN32 ++# define LOOKUP(fn) p_##fn = (void *) GetProcAddress (dll, #fn); if (p_##fn == NULL) return 0 ++# else ++# define LOOKUP(fn) p_##fn = (void *) dlsym (dll, #fn); if (p_##fn == NULL) return 0 ++# endif /* _WIN32 */ ++ + + LOOKUP (gettext); + LOOKUP (dgettext); +@@ -82,7 +87,7 @@ use_intl_dll (HMODULE dll) + LOOKUP (bind_textdomain_codeset); + + #undef LOOKUP +- ++#endif /* !STUB_ONLY */ + return 1; + } + +@@ -171,13 +176,17 @@ setup (void) + + if (!beenhere) + { +-#ifdef _WIN32 +- HMODULE intl_dll = LoadLibrary ("intl.dll"); +-#elif defined(__APPLE__) && defined(__MACH__) +- HMODULE intl_dll = dlopen ("libintl.dylib", RTLD_LAZY); +-#else +- HMODULE intl_dll = dlopen ("libintl.so", RTLD_LAZY); +-#endif ++#if !STUB_ONLY ++# ifdef _WIN32 ++ HMODULE intl_dll = LoadLibrary ("intl.dll"); ++# elif defined(__APPLE__) && defined(__MACH__) ++ HMODULE intl_dll = dlopen ("libintl.dylib", RTLD_LAZY); ++# else ++ HMODULE intl_dll = dlopen ("libintl.so", RTLD_LAZY); ++# endif ++#else /* !STUB_ONLY */ ++ HMODULE intl_dll = NULL; ++#endif /* STUB_ONLY */ + + if (intl_dll != NULL && + use_intl_dll (intl_dll)) diff --git a/packages/proxy-libintl/proxy-libintl_20080418.bb b/packages/proxy-libintl/proxy-libintl_20080418.bb new file mode 100644 index 0000000000..dbe7b92c7e --- /dev/null +++ b/packages/proxy-libintl/proxy-libintl_20080418.bb @@ -0,0 +1,46 @@ +DESCRIPTION = "Proxy libintl" +HOMEPAGE = "http://ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/" +SECTION = "libs" +LICENSE = "LGPL" + +PR = "r1" +PROVIDES = "virtual/libintl" + + +SRC_URI = " \ + http://ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/${PN}-${PV}.zip \ + file://stub-only.patch;patch=1 \ +" + + +S = "${WORKDIR}" +FILES_${PN}-dev = "${includedir} ${libdir}" + + +CFLAGS_append = " -Wall -I ../../include ${@['-DSTUB_ONLY', ''][bb.data.getVar('USE_NLS', d, 1) != 'no']}" + +do_compile() { + cd ${WORKDIR}/src/proxy-libintl + oe_runmake +} + + + + +do_install() { + install -d ${D}/usr/include + install -d ${D}/usr/lib + + install -m 0644 ${WORKDIR}/include/libintl.h ${D}/${includedir} + install -m 0644 ${WORKDIR}/lib/libintl.a ${D}/${libdir} +} + + + +do_stage() { + install -m 0644 ${WORKDIR}/include/libintl.h ${STAGING_INCDIR}/ + oe_libinstall -a -C lib libintl ${STAGING_LIBDIR}/ +} + + + diff --git a/packages/python/python-pygame_1.8.1.bb b/packages/python/python-pygame_1.8.1.bb index 2debc950ea..dc3f431964 100644 --- a/packages/python/python-pygame_1.8.1.bb +++ b/packages/python/python-pygame_1.8.1.bb @@ -8,7 +8,7 @@ SRCNAME = "pygame" PR = "ml0" SRC_URI = "\ - ftp://ftp.pyganem.org/pygame/${SRCNAME}-${PV}release.tar.gz \ + ftp://ftp.pygame.org/pub/pygame/${SRCNAME}-${PV}release.tar.gz \ file://Setup" S = "${WORKDIR}/${SRCNAME}-${PV}release" diff --git a/packages/tasks/task-openmoko-feed.bb b/packages/tasks/task-openmoko-feed.bb index b68bb7ee6c..207d48d904 100644 --- a/packages/tasks/task-openmoko-feed.bb +++ b/packages/tasks/task-openmoko-feed.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Openmoko: Misc. Feed Items" SECTION = "openmoko/base" LICENSE = "MIT" -PR = "r33" +PR = "r34" inherit task @@ -84,9 +84,10 @@ RDEPENDS_task-openmoko-feed = "\ navit \ libnotify \ notification-daemon \ - u-boot-openmoko \ libxine \ # subversion \ task-openmoko-games \ xournal \ + openvpn \ + python-pygame \ " |