From 185b2225315c1d87bd98b5edfd48a4bea8b73c03 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Wed, 11 Jun 2008 13:02:33 +0000 Subject: libmikmod: update 3.1.11 and set DEFAULT_PREFERENCE for 3.2.0-beta2 to -1 --- packages/libmikmod/libmikmod/m4.patch | 213 ---------------------------- packages/libmikmod/libmikmod_3.1.11.bb | 25 ---- packages/libmikmod/libmikmod_3.1.12.bb | 35 +++++ packages/libmikmod/libmikmod_3.2.0-beta2.bb | 29 ++-- 4 files changed, 53 insertions(+), 249 deletions(-) delete mode 100644 packages/libmikmod/libmikmod/m4.patch delete mode 100644 packages/libmikmod/libmikmod_3.1.11.bb create mode 100644 packages/libmikmod/libmikmod_3.1.12.bb diff --git a/packages/libmikmod/libmikmod/m4.patch b/packages/libmikmod/libmikmod/m4.patch deleted file mode 100644 index 854fc22b90..0000000000 --- a/packages/libmikmod/libmikmod/m4.patch +++ /dev/null @@ -1,213 +0,0 @@ ---- libmikmod-3.2.0-beta2/libmikmod.m4.orig 2004-01-21 02:36:34 +0100 -+++ libmikmod-3.2.0-beta2/libmikmod.m4 2004-08-12 11:28:30 +0200 -@@ -8,7 +8,7 @@ - dnl Test for libmikmod, and define LIBMIKMOD_CFLAGS, LIBMIKMOD_LIBS and - dnl LIBMIKMOD_LDADD - dnl --AC_DEFUN(AM_PATH_LIBMIKMOD, -+AC_DEFUN([AM_PATH_LIBMIKMOD], - [dnl - dnl Get the cflags and libraries from the libmikmod-config script - dnl - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- /dev/null -+++ libmikmod-3.2.0-beta2/m4/esd.m4 -@@ -0,0 +1,194 @@ -+# Configure paths for ESD -+# Manish Singh 98-9-30 -+# stolen back from Frank Belew -+# stolen from Manish Singh -+# Shamelessly stolen from Owen Taylor -+ -+dnl AM_PATH_ESD([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) -+dnl Test for ESD, and define ESD_CFLAGS and ESD_LIBS -+dnl -+AC_DEFUN(AM_PATH_ESD, -+[dnl -+dnl Get the cflags and libraries from the esd-config script -+dnl -+AC_ARG_WITH(esd-prefix,[ --with-esd-prefix=PFX Prefix where ESD is installed (optional)], -+ esd_prefix="$withval", esd_prefix="") -+AC_ARG_WITH(esd-exec-prefix,[ --with-esd-exec-prefix=PFX Exec prefix where ESD is installed (optional)], -+ esd_exec_prefix="$withval", esd_exec_prefix="") -+AC_ARG_ENABLE(esdtest, [ --disable-esdtest Do not try to compile and run a test ESD program], -+ , enable_esdtest=yes) -+ -+ if test x$esd_exec_prefix != x ; then -+ esd_args="$esd_args --exec-prefix=$esd_exec_prefix" -+ if test x${ESD_CONFIG+set} != xset ; then -+ ESD_CONFIG=$esd_exec_prefix/bin/esd-config -+ fi -+ fi -+ if test x$esd_prefix != x ; then -+ esd_args="$esd_args --prefix=$esd_prefix" -+ if test x${ESD_CONFIG+set} != xset ; then -+ ESD_CONFIG=$esd_prefix/bin/esd-config -+ fi -+ fi -+ -+ AC_PATH_PROG(ESD_CONFIG, esd-config, no) -+ min_esd_version=ifelse([$1], ,0.2.7,$1) -+ AC_MSG_CHECKING(for ESD - version >= $min_esd_version) -+ no_esd="" -+ if test "$ESD_CONFIG" = "no" ; then -+ no_esd=yes -+ else -+ AC_LANG_SAVE -+ AC_LANG_C -+ ESD_CFLAGS=`$ESD_CONFIG $esdconf_args --cflags` -+ ESD_LIBS=`$ESD_CONFIG $esdconf_args --libs` -+ -+ esd_major_version=`$ESD_CONFIG $esd_args --version | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` -+ esd_minor_version=`$ESD_CONFIG $esd_args --version | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` -+ esd_micro_version=`$ESD_CONFIG $esd_config_args --version | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` -+ if test "x$enable_esdtest" = "xyes" ; then -+ ac_save_CFLAGS="$CFLAGS" -+ ac_save_LIBS="$LIBS" -+ CFLAGS="$CFLAGS $ESD_CFLAGS" -+ LIBS="$LIBS $ESD_LIBS" -+dnl -+dnl Now check if the installed ESD is sufficiently new. (Also sanity -+dnl checks the results of esd-config to some extent -+dnl -+ rm -f conf.esdtest -+ AC_TRY_RUN([ -+#include -+#include -+#include -+#include -+ -+char* -+my_strdup (char *str) -+{ -+ char *new_str; -+ -+ if (str) -+ { -+ new_str = malloc ((strlen (str) + 1) * sizeof(char)); -+ strcpy (new_str, str); -+ } -+ else -+ new_str = NULL; -+ -+ return new_str; -+} -+ -+int main () -+{ -+ int major, minor, micro; -+ char *tmp_version; -+ -+ system ("touch conf.esdtest"); -+ -+ /* HP/UX 9 (%@#!) writes to sscanf strings */ -+ tmp_version = my_strdup("$min_esd_version"); -+ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { -+ printf("%s, bad version string\n", "$min_esd_version"); -+ exit(1); -+ } -+ -+ if (($esd_major_version > major) || -+ (($esd_major_version == major) && ($esd_minor_version > minor)) || -+ (($esd_major_version == major) && ($esd_minor_version == minor) && ($esd_micro_version >= micro))) -+ { -+ return 0; -+ } -+ else -+ { -+ printf("\n*** 'esd-config --version' returned %d.%d.%d, but the minimum version\n", $esd_major_version, $esd_minor_version, $esd_micro_version); -+ printf("*** of ESD required is %d.%d.%d. If esd-config is correct, then it is\n", major, minor, micro); -+ printf("*** best to upgrade to the required version.\n"); -+ printf("*** If esd-config was wrong, set the environment variable ESD_CONFIG\n"); -+ printf("*** to point to the correct copy of esd-config, and remove the file\n"); -+ printf("*** config.cache before re-running configure\n"); -+ return 1; -+ } -+} -+ -+],, no_esd=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) -+ CFLAGS="$ac_save_CFLAGS" -+ LIBS="$ac_save_LIBS" -+ AC_LANG_RESTORE -+ fi -+ fi -+ if test "x$no_esd" = x ; then -+ AC_MSG_RESULT(yes) -+ ifelse([$2], , :, [$2]) -+ else -+ AC_MSG_RESULT(no) -+ if test "$ESD_CONFIG" = "no" ; then -+ echo "*** The esd-config script installed by ESD could not be found" -+ echo "*** If ESD was installed in PREFIX, make sure PREFIX/bin is in" -+ echo "*** your path, or set the ESD_CONFIG environment variable to the" -+ echo "*** full path to esd-config." -+ else -+ if test -f conf.esdtest ; then -+ : -+ else -+ echo "*** Could not run ESD test program, checking why..." -+ CFLAGS="$CFLAGS $ESD_CFLAGS" -+ LIBS="$LIBS $ESD_LIBS" -+ AC_LANG_SAVE -+ AC_LANG_C -+ AC_TRY_LINK([ -+#include -+#include -+], [ return 0; ], -+ [ echo "*** The test program compiled, but did not run. This usually means" -+ echo "*** that the run-time linker is not finding ESD or finding the wrong" -+ echo "*** version of ESD. If it is not finding ESD, you'll need to set your" -+ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" -+ echo "*** to the installed location Also, make sure you have run ldconfig if that" -+ echo "*** is required on your system" -+ echo "***" -+ echo "*** If you have an old version installed, it is best to remove it, although" -+ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"], -+ [ echo "*** The test program failed to compile or link. See the file config.log for the" -+ echo "*** exact error that occured. This usually means ESD was incorrectly installed" -+ echo "*** or that you have moved ESD since it was installed. In the latter case, you" -+ echo "*** may want to edit the esd-config script: $ESD_CONFIG" ]) -+ CFLAGS="$ac_save_CFLAGS" -+ LIBS="$ac_save_LIBS" -+ AC_LANG_RESTORE -+ fi -+ fi -+ ESD_CFLAGS="" -+ ESD_LIBS="" -+ ifelse([$3], , :, [$3]) -+ fi -+ AC_SUBST(ESD_CFLAGS) -+ AC_SUBST(ESD_LIBS) -+ rm -f conf.esdtest -+]) -+ -+dnl AM_ESD_SUPPORTS_MULTIPLE_RECORD([ACTION-IF-SUPPORTS [, ACTION-IF-NOT-SUPPORTS]]) -+dnl Test, whether esd supports multiple recording clients (version >=0.2.21) -+dnl -+AC_DEFUN(AM_ESD_SUPPORTS_MULTIPLE_RECORD, -+[dnl -+ AC_MSG_NOTICE([whether installed esd version supports multiple recording clients]) -+ ac_save_ESD_CFLAGS="$ESD_CFLAGS" -+ ac_save_ESD_LIBS="$ESD_LIBS" -+ AM_PATH_ESD(0.2.21, -+ ifelse([$1], , [ -+ AM_CONDITIONAL(ESD_SUPPORTS_MULTIPLE_RECORD, true) -+ AC_DEFINE(ESD_SUPPORTS_MULTIPLE_RECORD, 1, -+ [Define if you have esound with support of multiple recording clients.])], -+ [$1]), -+ ifelse([$2], , [AM_CONDITIONAL(ESD_SUPPORTS_MULTIPLE_RECORD, false)], [$2]) -+ if test "x$ac_save_ESD_CFLAGS" != x ; then -+ ESD_CFLAGS="$ac_save_ESD_CFLAGS" -+ fi -+ if test "x$ac_save_ESD_LIBS" != x ; then -+ ESD_LIBS="$ac_save_ESD_LIBS" -+ fi -+ ) -+]) diff --git a/packages/libmikmod/libmikmod_3.1.11.bb b/packages/libmikmod/libmikmod_3.1.11.bb deleted file mode 100644 index 6c8dc8e064..0000000000 --- a/packages/libmikmod/libmikmod_3.1.11.bb +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION = "libmikmod is a module player library supporting many formats, including mod, s3m, it, and xm." -SECTION = "libs" -PRIORITY = "optional" -LICENSE = "LGPL" -SRC_URI = "http://mikmod.raphnet.net/files/libmikmod-${PV}.tar.gz \ - file://m4.patch;patch=1 \ - file://autofoo.patch;patch=1" - -inherit autotools - -EXTRA_OECONF = "--disable-af --disable-alsa --disable-esd \ ---enable-oss --disable-sam9407 --disable-ultra \ ---disable-esdtest --enable-threads" - -do_stage() { - oe_libinstall -a -so -C libmikmod libmikmod ${STAGING_LIBDIR} - install -m 0644 ${S}/include/mikmod.h ${STAGING_INCDIR}/ - - install -d ${STAGING_BINDIR_CROSS} - cat libmikmod-config | sed 's,$libdir , ,' \ - | sed 's,$includes , ,' > ${STAGING_BINDIR_CROSS}/libmikmod-config - chmod a+rx ${STAGING_BINDIR_CROSS}/libmikmod-config - install -d ${STAGING_DATADIR}/aclocal/ - install -m 0644 libmikmod.m4 ${STAGING_DATADIR}/aclocal/ -} diff --git a/packages/libmikmod/libmikmod_3.1.12.bb b/packages/libmikmod/libmikmod_3.1.12.bb new file mode 100644 index 0000000000..6c095d6065 --- /dev/null +++ b/packages/libmikmod/libmikmod_3.1.12.bb @@ -0,0 +1,35 @@ +DESCRIPTION = "libmikmod is a module player library supporting many formats, including mod, s3m, it, and xm." +SECTION = "libs" +PRIORITY = "optional" +LICENSE = "LGPL" +PR = "r0" + +SRC_URI = "\ + ${SOURCEFORGE_MIRROR}/mikmod/libmikmod-${PV}.tar.gz \ + file://autofoo.patch;patch=1 \ +" + +inherit autotools binconfig + +EXTRA_OECONF = "\ + --disable-af \ + --enable-alsa \ + --disable-esd \ + --enable-oss \ + --disable-sam9407 \ + --disable-ultra \ + --disable-esdtest \ + --enable-threads \ +" + +do_stage() { + oe_libinstall -a -so -C libmikmod libmikmod ${STAGING_LIBDIR} + install -m 0644 ${S}/include/mikmod.h ${STAGING_INCDIR}/ + + install -d ${STAGING_BINDIR_CROSS} + cat libmikmod-config | sed 's,$libdir , ,' \ + | sed 's,$includes , ,' > ${STAGING_BINDIR_CROSS}/libmikmod-config + chmod a+rx ${STAGING_BINDIR_CROSS}/libmikmod-config + install -d ${STAGING_DATADIR}/aclocal/ + install -m 0644 libmikmod.m4 ${STAGING_DATADIR}/aclocal/ +} diff --git a/packages/libmikmod/libmikmod_3.2.0-beta2.bb b/packages/libmikmod/libmikmod_3.2.0-beta2.bb index d866710f66..07e3af9a40 100644 --- a/packages/libmikmod/libmikmod_3.2.0-beta2.bb +++ b/packages/libmikmod/libmikmod_3.2.0-beta2.bb @@ -2,20 +2,27 @@ DESCRIPTION = "libmikmod is a module player library supporting many formats, inc SECTION = "libs" PRIORITY = "optional" LICENSE = "LGPL" -SRC_URI = "http://mikmod.raphnet.net/files/libmikmod-${PV}.tar.gz \ -file://m4.patch;patch=1 \ -file://autofoo.patch;patch=1" + +DEFAULT_PREFERENCE = "-1" + +SRC_URI = "\ + http://mikmod.raphnet.net/files/libmikmod-${PV}.tar.gz \ + file://m4.patch;patch=1 \ + file://autofoo.patch;patch=1 \ +" inherit autotools binconfig -EXTRA_OECONF = "--disable-af \ - --disable-alsa \ - --disable-esd \ - --enable-oss \ - --disable-sam9407 \ - --disable-ultra \ - --disable-esdtest \ - --enable-threads" +EXTRA_OECONF = "\ + --disable-af \ + --enable-alsa \ + --disable-esd \ + --enable-oss \ + --disable-sam9407 \ + --disable-ultra \ + --disable-esdtest \ + --enable-threads \ +" do_stage() { oe_libinstall -a -so -C libmikmod libmikmod ${STAGING_LIBDIR} -- cgit v1.2.3 From a08d438956aa4aea02544035828e3e03b501f3f1 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Wed, 11 Jun 2008 15:30:32 +0000 Subject: alsa-plugins 1.0.14 update to 1.0.15 --- packages/alsa/alsa-plugins_1.0.14.bb | 20 -------------------- packages/alsa/alsa-plugins_1.0.15.bb | 20 ++++++++++++++++++++ 2 files changed, 20 insertions(+), 20 deletions(-) delete mode 100644 packages/alsa/alsa-plugins_1.0.14.bb create mode 100644 packages/alsa/alsa-plugins_1.0.15.bb diff --git a/packages/alsa/alsa-plugins_1.0.14.bb b/packages/alsa/alsa-plugins_1.0.14.bb deleted file mode 100644 index b17a3265e8..0000000000 --- a/packages/alsa/alsa-plugins_1.0.14.bb +++ /dev/null @@ -1,20 +0,0 @@ -DESCRIPTION = "ALSA Plugins" -HOMEPAGE = "http://www.alsa-project.org" -SECTION = "multimedia/alsa/plugins" -LICENSE = "GPL" -DEPENDS = "alsa-lib pulseaudio" -PR = "r0" - -SRC_URI = "ftp://ftp.alsa-project.org/pub/plugins/alsa-plugins-${PV}.tar.bz2" - -inherit autotools - -PACKAGES_DYNAMIC = "libasound-module*" - -python populate_packages_prepend() { - plugindir = bb.data.expand('${libdir}/alsa-lib/', d) - do_split_packages(d, plugindir, '^libasound_module_(.*)\.so$', 'libasound-module-%s', 'Alsa plugin for %s', extra_depends='' ) -} - -FILES_${PN}-dev += "${libdir}/alsa-lib/libasound*.a ${libdir}/alsa-lib/libasound*.la" -FILES_${PN}-dbg += "${libdir}/alsa-lib/.debug" diff --git a/packages/alsa/alsa-plugins_1.0.15.bb b/packages/alsa/alsa-plugins_1.0.15.bb new file mode 100644 index 0000000000..b17a3265e8 --- /dev/null +++ b/packages/alsa/alsa-plugins_1.0.15.bb @@ -0,0 +1,20 @@ +DESCRIPTION = "ALSA Plugins" +HOMEPAGE = "http://www.alsa-project.org" +SECTION = "multimedia/alsa/plugins" +LICENSE = "GPL" +DEPENDS = "alsa-lib pulseaudio" +PR = "r0" + +SRC_URI = "ftp://ftp.alsa-project.org/pub/plugins/alsa-plugins-${PV}.tar.bz2" + +inherit autotools + +PACKAGES_DYNAMIC = "libasound-module*" + +python populate_packages_prepend() { + plugindir = bb.data.expand('${libdir}/alsa-lib/', d) + do_split_packages(d, plugindir, '^libasound_module_(.*)\.so$', 'libasound-module-%s', 'Alsa plugin for %s', extra_depends='' ) +} + +FILES_${PN}-dev += "${libdir}/alsa-lib/libasound*.a ${libdir}/alsa-lib/libasound*.la" +FILES_${PN}-dbg += "${libdir}/alsa-lib/.debug" -- cgit v1.2.3 From 4ef1e4c6f9fd31ca96541afb09ae4f6d63f3957c Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Wed, 11 Jun 2008 15:31:56 +0000 Subject: alsa-state: fix standard alsa dmix configuration, it now works out-of-the-box --- packages/alsa/alsa-state.bb | 17 ++++++++++------- packages/alsa/alsa-state/asound.conf | 12 ++++++++++++ packages/alsa/alsa-state/asoundrc | 12 ------------ 3 files changed, 22 insertions(+), 19 deletions(-) create mode 100644 packages/alsa/alsa-state/asound.conf delete mode 100644 packages/alsa/alsa-state/asoundrc diff --git a/packages/alsa/alsa-state.bb b/packages/alsa/alsa-state.bb index b9eb1431b4..83a9ca6ccd 100644 --- a/packages/alsa/alsa-state.bb +++ b/packages/alsa/alsa-state.bb @@ -10,13 +10,13 @@ RRECOMMENDS_alsa-state = "alsa-states" RRECOMMENDS_${PN}_om-gta01 = "openmoko-alsa-scenarios" RRECOMMENDS_${PN}_om-gta02 = "openmoko-alsa-scenarios" PV = "0.1.0" -PR = "r17" +PR = "r18" -SRC_URI = " \ - file://asoundrc \ +SRC_URI = "\ + file://asound.conf \ file://asound.state \ - file://alsa-state " - + file://alsa-state \ +" inherit update-rc.d @@ -32,8 +32,12 @@ do_install() { } PACKAGES += "alsa-states" -FILES_${PN} = "${sysconfdir}/init.d ${sysconfdir}/asoundrc" + +FILES_${PN} = "${sysconfdir}/init.d ${sysconfdir}/asound.conf" +CONFFILES_${PN} = "${sysconfdir}/asound.conf" + FILES_alsa-states = "${sysconfdir}/*.state" + PACKAGE_ARCH_${PN} = "all" PACKAGE_ARCH_alsa-states = "${MACHINE_ARCH}" @@ -46,4 +50,3 @@ pkg_postinst_${PN}() { fi fi } - diff --git a/packages/alsa/alsa-state/asound.conf b/packages/alsa/alsa-state/asound.conf new file mode 100644 index 0000000000..6be024201c --- /dev/null +++ b/packages/alsa/alsa-state/asound.conf @@ -0,0 +1,12 @@ +# default dmix configuration + +pcm.!default { + type plug + slave.pcm "dmix" +} + +ctl.mixer0 { + type hw + card 0 +} + diff --git a/packages/alsa/alsa-state/asoundrc b/packages/alsa/alsa-state/asoundrc deleted file mode 100644 index bc038e3e73..0000000000 --- a/packages/alsa/alsa-state/asoundrc +++ /dev/null @@ -1,12 +0,0 @@ -# -# simple dmix configuration -# -pcm.dsp0 { - type plug - slave.pcm "dmix" -} - -ctl.mixer0 { - type hw - card 0 -} -- cgit v1.2.3 From 530971b6de0c825c418cfb194dc5b8cd9b2c5d87 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Wed, 11 Jun 2008 15:43:57 +0000 Subject: alsa-state: install correct file --- packages/alsa/alsa-state.bb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/alsa/alsa-state.bb b/packages/alsa/alsa-state.bb index 83a9ca6ccd..58c724f79c 100644 --- a/packages/alsa/alsa-state.bb +++ b/packages/alsa/alsa-state.bb @@ -6,9 +6,6 @@ DESCRIPTION = "Default ALSA configuration" LICENSE = "GPL" -RRECOMMENDS_alsa-state = "alsa-states" -RRECOMMENDS_${PN}_om-gta01 = "openmoko-alsa-scenarios" -RRECOMMENDS_${PN}_om-gta02 = "openmoko-alsa-scenarios" PV = "0.1.0" PR = "r18" @@ -27,12 +24,16 @@ do_install() { install -d ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/alsa-state ${D}${sysconfdir}/init.d - install -m 0644 ${WORKDIR}/asoundrc ${D}${sysconfdir} + install -m 0644 ${WORKDIR}/asound.conf ${D}${sysconfdir} install -m 0644 ${WORKDIR}/*.state ${D}${sysconfdir} } PACKAGES += "alsa-states" +RRECOMMENDS_alsa-state = "alsa-states" +RRECOMMENDS_${PN}_om-gta01 = "openmoko-alsa-scenarios" +RRECOMMENDS_${PN}_om-gta02 = "openmoko-alsa-scenarios" + FILES_${PN} = "${sysconfdir}/init.d ${sysconfdir}/asound.conf" CONFFILES_${PN} = "${sysconfdir}/asound.conf" -- cgit v1.2.3 From 0e7b7ae49a4cbc5980b08c89461584b795f59c94 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Wed, 11 Jun 2008 15:45:54 +0000 Subject: rootfs_ipk.bbclass: opkg nowadays needs its lib directory created before it can operate --- classes/rootfs_ipk.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/rootfs_ipk.bbclass b/classes/rootfs_ipk.bbclass index 02c5e691fc..889ace2e99 100644 --- a/classes/rootfs_ipk.bbclass +++ b/classes/rootfs_ipk.bbclass @@ -20,7 +20,7 @@ fakeroot rootfs_ipk_do_rootfs () { package_generate_ipkg_conf mkdir -p ${T} - + mkdir -p ${IMAGE_ROOTFS}${libdir}/opkg/ opkg-cl ${IPKG_ARGS} update # Uclibc builds don't provide this stuff... -- cgit v1.2.3 From 76a92660f68f46dd4e91811ede1de9db6e609da2 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Wed, 11 Jun 2008 15:46:15 +0000 Subject: fso-image: yank pulseaudio and use alsa dmix for now --- packages/images/fso-image.bb | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/packages/images/fso-image.bb b/packages/images/fso-image.bb index 72e6bb0df6..b898560ab6 100644 --- a/packages/images/fso-image.bb +++ b/packages/images/fso-image.bb @@ -37,7 +37,6 @@ X_INSTALL = "\ # useful command line tools TOOLS_INSTALL = "\ - alsa-utils-aplay \ # bash \ htop \ mickeyterm \ @@ -49,9 +48,14 @@ TOOLS_INSTALL = "\ # audio AUDIO_INSTALL = "\ - pulseaudio-meta \ - openmoko-sound-theme-standard2 \ + alsa-oss \ + alsa-state \ + alsa-utils-aplay \ gst-meta-audio \ + gst-plugin-mad \ + gst-plugin-modplug \ + gst-plugin-sid \ + openmoko-sound-theme-standard2 \ " AUDIO_INSTALL_append_om-gta01 = "\ -- cgit v1.2.3 From ce83493ea8d3feab3cc01e5343586f8f69439eba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20L=C3=BCbbe?= Date: Wed, 11 Jun 2008 15:47:53 +0000 Subject: freesmartphone: start services after dbus --- packages/freesmartphone/python-odeviced_git.bb | 4 ++-- packages/freesmartphone/python-oeventd_git.bb | 4 ++-- packages/freesmartphone/python-ophoned_git.bb | 4 ++-- packages/freesmartphone/python-ousaged_git.bb | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/freesmartphone/python-odeviced_git.bb b/packages/freesmartphone/python-odeviced_git.bb index d380473878..d8fc2a1948 100644 --- a/packages/freesmartphone/python-odeviced_git.bb +++ b/packages/freesmartphone/python-odeviced_git.bb @@ -5,12 +5,12 @@ SECTION = "console/network" DEPENDS = "python-cython-native python-pyrex-native" LICENSE = "GPLv2" PV = "0.7.9+gitr${SRCREV}" -PR = "r0" +PR = "r1" inherit distutils update-rc.d INITSCRIPT_NAME = "odeviced" -INITSCRIPT_PARAMS = "defaults 20" +INITSCRIPT_PARAMS = "defaults 21" SRC_URI = "${FREESMARTPHONE_GIT}/python-odeviced.git;protocol=git;branch=master \ file://odeviced \ diff --git a/packages/freesmartphone/python-oeventd_git.bb b/packages/freesmartphone/python-oeventd_git.bb index 2f779058fd..c08e1af3b7 100644 --- a/packages/freesmartphone/python-oeventd_git.bb +++ b/packages/freesmartphone/python-oeventd_git.bb @@ -5,12 +5,12 @@ SECTION = "console/network" DEPENDS = "python-cython-native python-pyrex-native" LICENSE = "GPLv2" PV = "0.0.0+gitr${SRCREV}" -PR = "r0" +PR = "r1" inherit distutils update-rc.d INITSCRIPT_NAME = "oeventd" -INITSCRIPT_PARAMS = "defaults 20" +INITSCRIPT_PARAMS = "defaults 21" SRC_URI = "\ ${FREESMARTPHONE_GIT}/eventd.git;protocol=git;branch=master \ diff --git a/packages/freesmartphone/python-ophoned_git.bb b/packages/freesmartphone/python-ophoned_git.bb index 0a1c802041..7f30f4c24a 100644 --- a/packages/freesmartphone/python-ophoned_git.bb +++ b/packages/freesmartphone/python-ophoned_git.bb @@ -5,12 +5,12 @@ SECTION = "console/network" DEPENDS = "python-cython-native python-pyrex-native" LICENSE = "GPLv2" PV = "0.0.0+gitr${SRCREV}" -PR = "r0" +PR = "r1" inherit distutils update-rc.d INITSCRIPT_NAME = "ophoned" -INITSCRIPT_PARAMS = "defaults 20" +INITSCRIPT_PARAMS = "defaults 21" SRC_URI = "${FREESMARTPHONE_GIT}/python-ophoned.git;protocol=git;branch=master \ file://ophoned" diff --git a/packages/freesmartphone/python-ousaged_git.bb b/packages/freesmartphone/python-ousaged_git.bb index f9ba2856eb..1188da34a3 100644 --- a/packages/freesmartphone/python-ousaged_git.bb +++ b/packages/freesmartphone/python-ousaged_git.bb @@ -5,12 +5,12 @@ SECTION = "console/network" DEPENDS = "python-cython-native python-pyrex-native" LICENSE = "GPLv2" PV = "0.7.9+gitr${SRCREV}" -PR = "r0" +PR = "r1" inherit distutils update-rc.d INITSCRIPT_NAME = "ousaged" -INITSCRIPT_PARAMS = "defaults 20" +INITSCRIPT_PARAMS = "defaults 21" SRC_URI = "\ ${FREESMARTPHONE_GIT}/usaged.git;protocol=git;branch=master \ -- cgit v1.2.3 From f4c000b83ea9942d30cdfa7c54c14d74e489e422 Mon Sep 17 00:00:00 2001 From: Jeremy Laine Date: Wed, 11 Jun 2008 16:04:02 +0000 Subject: lighttpd: backport support for url.redirect-code from 1.5 branch --- packages/lighttpd/lighttpd/mod_redirect.c.patch | 56 +++++++++++++++++++++++++ packages/lighttpd/lighttpd_1.4.18.bb | 3 +- 2 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 packages/lighttpd/lighttpd/mod_redirect.c.patch diff --git a/packages/lighttpd/lighttpd/mod_redirect.c.patch b/packages/lighttpd/lighttpd/mod_redirect.c.patch new file mode 100644 index 0000000000..7bbdf32082 --- /dev/null +++ b/packages/lighttpd/lighttpd/mod_redirect.c.patch @@ -0,0 +1,56 @@ +Backport support for url.redirect-code directive from 1.5 branch. + +diff -urN lighttpd-1.4.18.orig/src/mod_redirect.c lighttpd-1.4.18/src/mod_redirect.c +--- lighttpd-1.4.18.orig/src/mod_redirect.c 2007-04-10 09:52:58.000000000 +0200 ++++ lighttpd-1.4.18/src/mod_redirect.c 2008-06-11 17:38:50.000000000 +0200 +@@ -16,6 +16,8 @@ + typedef struct { + pcre_keyvalue_buffer *redirect; + data_config *context; /* to which apply me */ ++ ++ unsigned short redirect_code; + } plugin_config; + + typedef struct { +@@ -72,6 +74,7 @@ + + config_values_t cv[] = { + { "url.redirect", NULL, T_CONFIG_LOCAL, T_CONFIG_SCOPE_CONNECTION }, /* 0 */ ++ { "url.redirect-code", NULL, T_CONFIG_SHORT, T_CONFIG_SCOPE_CONNECTION }, /* 1 */ + { NULL, NULL, T_CONFIG_UNSET, T_CONFIG_SCOPE_UNSET } + }; + +@@ -90,6 +93,7 @@ + s->redirect = pcre_keyvalue_buffer_init(); + + cv[0].destination = s->redirect; ++ cv[1].destination = &(s->redirect_code); + + p->config_storage[i] = s; + ca = ((data_config *)srv->config_context->data[i])->value; +@@ -140,6 +144,7 @@ + plugin_config *s = p->config_storage[0]; + + p->conf.redirect = s->redirect; ++ p->conf.redirect_code = s->redirect_code; + p->conf.context = NULL; + + /* skip the first, the global context */ +@@ -157,6 +162,8 @@ + if (0 == strcmp(du->key->ptr, "url.redirect")) { + p->conf.redirect = s->redirect; + p->conf.context = dc; ++ } else if (0 == strcmp(du->key->ptr, "url.redirect-code")) { ++ p->conf.redirect_code = s->redirect_code; + } + } + } +@@ -250,7 +257,7 @@ + + response_header_insert(srv, con, CONST_STR_LEN("Location"), CONST_BUF_LEN(p->location)); + +- con->http_status = 301; ++ con->http_status = p->conf.redirect_code > 99 && p->conf.redirect_code < 1000 ? p->conf.redirect_code : 301; + con->file_finished = 1; + + return HANDLER_FINISHED; diff --git a/packages/lighttpd/lighttpd_1.4.18.bb b/packages/lighttpd/lighttpd_1.4.18.bb index 4a27c626e4..d5870ba5af 100644 --- a/packages/lighttpd/lighttpd_1.4.18.bb +++ b/packages/lighttpd/lighttpd_1.4.18.bb @@ -2,10 +2,11 @@ DESCRIPTION = "Web server" SECTION = "net" LICENSE = "BSD" DEPENDS = "libpcre" -PR = "r2" +PR = "r3" SRC_URI = "http://www.lighttpd.net/download/lighttpd-${PV}.tar.gz \ file://configure.in.patch;patch=1 \ + file://mod_redirect.c.patch;patch=1 \ file://src-server.c.patch;patch=1 \ file://index.html \ file://lighttpd.conf \ -- cgit v1.2.3 From 15719bd72b40b6f98827702934830cdac2c57131 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Wed, 11 Jun 2008 16:04:44 +0000 Subject: add gsmd2, a dbus-enabled gsm phone server --- conf/distro/include/fso-autorev.inc | 1 + conf/distro/include/sane-srcrevs.inc | 1 + packages/freesmartphone/gsmd2_git.bb | 14 ++++++++++++++ 3 files changed, 16 insertions(+) create mode 100644 packages/freesmartphone/gsmd2_git.bb diff --git a/conf/distro/include/fso-autorev.inc b/conf/distro/include/fso-autorev.inc index 65a4543437..7035a05b23 100644 --- a/conf/distro/include/fso-autorev.inc +++ b/conf/distro/include/fso-autorev.inc @@ -1,4 +1,5 @@ SRCREV_pn-gsm0710muxd = "${AUTOREV}" +SRCREV_pn-gsmd2 = "${AUTOREV}" SRCREV_pn-pygsm = "${AUTOREV}" SRCREV_pn-mickeyterm = "${AUTOREV}" SRCREV_pn-pyneod = "${AUTOREV}" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index f2c9c195ed..3e461156f7 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -42,6 +42,7 @@ SRCREV_pn-gconf-dbus ?= "641" SRCREV_pn-gnuradio ?= "6377" SRCREV_pn-gpe-contacts ?= "9312" SRCREV_pn-gsm0710muxd ?= "6fecc78198dd821bbe29efd096bd8fecd855179d" +SRCREV_pn-gsmd2 ?= "963f34df8fa3ff4b301079dcf86e9acea6b6fe0f" SRCREV_pn-gtkhtml2 ?= "1158" SRCREV_pn-gypsy ?= "134" SRCREV_pn-hildon-1 ?= "14429" diff --git a/packages/freesmartphone/gsmd2_git.bb b/packages/freesmartphone/gsmd2_git.bb new file mode 100644 index 0000000000..6c2f1a4d21 --- /dev/null +++ b/packages/freesmartphone/gsmd2_git.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "GSM 07.07 phone server" +HOMEPAGE = "http://www.freesmartphone.org/mediawiki/index.php/Implementations/gsm0710muxd" +AUTHOR = "Ixonos" +SECTION = "console/network" +DEPENDS = "dbus dbus-glib" +RDEPENDS = "gsm0710muxd" +LICENSE = "GPL" +PV = "0.0.0+gitr${SRCREV}" +PR = "r0" + +SRC_URI = "${FREESMARTPHONE_GIT}/gsmd2.git;protocol=git;branch=master" +S = "${WORKDIR}/git" + +inherit autotools -- cgit v1.2.3 From d35e9496da0999525f5d206e57bb659a77d3660f Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 11 Jun 2008 16:21:42 +0000 Subject: neuros osd2: correct kernel provider --- conf/machine/neuros-osd2.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/machine/neuros-osd2.conf b/conf/machine/neuros-osd2.conf index b327d8f8b6..4a540270f4 100644 --- a/conf/machine/neuros-osd2.conf +++ b/conf/machine/neuros-osd2.conf @@ -7,7 +7,7 @@ TARGET_ARCH = "arm" PACKAGE_EXTRA_ARCHS = "armv4t armv5te" PREFERRED_PROVIDER_xserver = "xserver-kdrive" -PREFERRED_PROVIDER_virtual/kernel = "linux-davinci" +PREFERRED_PROVIDER_virtual/kernel = "linux-neuros" KERNEL_IMAGETYPE = "uImage" -- cgit v1.2.3 From 277e2569092ded631f33f97e15abe90d0899ffb9 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Wed, 11 Jun 2008 16:30:51 +0000 Subject: add python-pyalsaaudio, support for the Linux 2.6.x ALSA Sound System --- packages/python/python-pyalsaaudio_0.3.bb | 12 ++++++++++++ packages/tasks/task-python-everything.bb | 3 ++- 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 packages/python/python-pyalsaaudio_0.3.bb diff --git a/packages/python/python-pyalsaaudio_0.3.bb b/packages/python/python-pyalsaaudio_0.3.bb new file mode 100644 index 0000000000..42b15ce5be --- /dev/null +++ b/packages/python/python-pyalsaaudio_0.3.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "Support for the Linux 2.6.x ALSA Sound System" +SECTION = "devel/python" +DEPENDS = "alsa-lib" +PRIORITY = "optional" +LICENSE = "GPL" +SRCNAME = "pyalsaaudio" +PR = "ml0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/pyalsaaudio/${SRCNAME}-${PV}.tar.gz" +S = "${WORKDIR}/${SRCNAME}-${PV}" + +inherit distutils diff --git a/packages/tasks/task-python-everything.bb b/packages/tasks/task-python-everything.bb index de6e5dfaf2..3cd23c2779 100644 --- a/packages/tasks/task-python-everything.bb +++ b/packages/tasks/task-python-everything.bb @@ -1,7 +1,7 @@ DESCRIPTION= "Everything Python" HOMEPAGE = "http://www.vanille.de/projects/python.spy" LICENSE = "MIT" -PR = "ml27" +PR = "ml28" RDEPENDS = "\ python-ao \ @@ -39,6 +39,7 @@ RDEPENDS = "\ python-numeric \ python-ogg \ python-pexpect \ + python-pyalsaaudio \ python-pybluez \ python-pycairo \ python-pychecker \ -- cgit v1.2.3 From db256aa27627acb3921e356f8b6f03ba32aaf047 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20L=C3=BCbbe?= Date: Wed, 11 Jun 2008 18:58:09 +0000 Subject: fso-image: include python-oeventd --- packages/images/fso-image.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/images/fso-image.bb b/packages/images/fso-image.bb index b898560ab6..dc738d3756 100644 --- a/packages/images/fso-image.bb +++ b/packages/images/fso-image.bb @@ -76,6 +76,7 @@ PYTHON_INSTALL = "\ ZHONE_INSTALL = "\ gsm0710muxd \ python-odeviced \ + python-oeventd \ python-ophoned \ python-ousaged \ zhone \ -- cgit v1.2.3 From d12308215bbd52f4f59228fb1fd1b51ff3f76206 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 11 Jun 2008 21:09:01 +0000 Subject: gcc 4.3.1: fix NEON ice: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=36500 --- packages/gcc/gcc-4.3.1.inc | 1 + .../gcc-4.3.1/gcc-release-branch/.mtn2git_empty | 0 .../gcc-release-branch/PR-36500-fix-neon.patch | 265 +++++++++++++++++++++ packages/gcc/gcc-cross_4.3.1.bb | 2 +- 4 files changed, 267 insertions(+), 1 deletion(-) create mode 100644 packages/gcc/gcc-4.3.1/gcc-release-branch/.mtn2git_empty create mode 100644 packages/gcc/gcc-4.3.1/gcc-release-branch/PR-36500-fix-neon.patch diff --git a/packages/gcc/gcc-4.3.1.inc b/packages/gcc/gcc-4.3.1.inc index a08fd93f1f..3784727d9b 100644 --- a/packages/gcc/gcc-4.3.1.inc +++ b/packages/gcc/gcc-4.3.1.inc @@ -58,6 +58,7 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ # file://fortran-static-linking.patch;patch=1 \ # file://intermask-bigendian.patch;patch=1 \ file://gcc-arm-frename-registers.patch;patch=1 \ + file://gcc-release-branch/PR-36500-fix-neon.patch;patch=1 \ " SRC_URI_append_sh3 = " file://sh3-installfix-fixheaders.patch;patch=1 " diff --git a/packages/gcc/gcc-4.3.1/gcc-release-branch/.mtn2git_empty b/packages/gcc/gcc-4.3.1/gcc-release-branch/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gcc/gcc-4.3.1/gcc-release-branch/PR-36500-fix-neon.patch b/packages/gcc/gcc-4.3.1/gcc-release-branch/PR-36500-fix-neon.patch new file mode 100644 index 0000000000..971dfe7e29 --- /dev/null +++ b/packages/gcc/gcc-4.3.1/gcc-release-branch/PR-36500-fix-neon.patch @@ -0,0 +1,265 @@ +--- foo/gcc/config/arm/arm.c 2008/06/11 10:51:34 136660 ++++ foo/gcc/config/arm/arm.c 2008/06/11 10:52:55 136661 +@@ -14830,124 +14830,190 @@ + { + unsigned int i, fcode = ARM_BUILTIN_NEON_BASE; + ++ tree neon_intQI_type_node; ++ tree neon_intHI_type_node; ++ tree neon_polyQI_type_node; ++ tree neon_polyHI_type_node; ++ tree neon_intSI_type_node; ++ tree neon_intDI_type_node; ++ tree neon_float_type_node; ++ ++ tree intQI_pointer_node; ++ tree intHI_pointer_node; ++ tree intSI_pointer_node; ++ tree intDI_pointer_node; ++ tree float_pointer_node; ++ ++ tree const_intQI_node; ++ tree const_intHI_node; ++ tree const_intSI_node; ++ tree const_intDI_node; ++ tree const_float_node; ++ ++ tree const_intQI_pointer_node; ++ tree const_intHI_pointer_node; ++ tree const_intSI_pointer_node; ++ tree const_intDI_pointer_node; ++ tree const_float_pointer_node; ++ ++ tree V8QI_type_node; ++ tree V4HI_type_node; ++ tree V2SI_type_node; ++ tree V2SF_type_node; ++ tree V16QI_type_node; ++ tree V8HI_type_node; ++ tree V4SI_type_node; ++ tree V4SF_type_node; ++ tree V2DI_type_node; ++ ++ tree intUQI_type_node; ++ tree intUHI_type_node; ++ tree intUSI_type_node; ++ tree intUDI_type_node; ++ ++ tree intEI_type_node; ++ tree intOI_type_node; ++ tree intCI_type_node; ++ tree intXI_type_node; ++ ++ tree V8QI_pointer_node; ++ tree V4HI_pointer_node; ++ tree V2SI_pointer_node; ++ tree V2SF_pointer_node; ++ tree V16QI_pointer_node; ++ tree V8HI_pointer_node; ++ tree V4SI_pointer_node; ++ tree V4SF_pointer_node; ++ tree V2DI_pointer_node; ++ ++ tree void_ftype_pv8qi_v8qi_v8qi; ++ tree void_ftype_pv4hi_v4hi_v4hi; ++ tree void_ftype_pv2si_v2si_v2si; ++ tree void_ftype_pv2sf_v2sf_v2sf; ++ tree void_ftype_pdi_di_di; ++ tree void_ftype_pv16qi_v16qi_v16qi; ++ tree void_ftype_pv8hi_v8hi_v8hi; ++ tree void_ftype_pv4si_v4si_v4si; ++ tree void_ftype_pv4sf_v4sf_v4sf; ++ tree void_ftype_pv2di_v2di_v2di; ++ ++ tree reinterp_ftype_dreg[5][5]; ++ tree reinterp_ftype_qreg[5][5]; ++ tree dreg_types[5], qreg_types[5]; ++ + /* Create distinguished type nodes for NEON vector element types, + and pointers to values of such types, so we can detect them later. */ +- tree neon_intQI_type_node = make_signed_type (GET_MODE_PRECISION (QImode)); +- tree neon_intHI_type_node = make_signed_type (GET_MODE_PRECISION (HImode)); +- tree neon_polyQI_type_node = make_signed_type (GET_MODE_PRECISION (QImode)); +- tree neon_polyHI_type_node = make_signed_type (GET_MODE_PRECISION (HImode)); +- tree neon_intSI_type_node = make_signed_type (GET_MODE_PRECISION (SImode)); +- tree neon_intDI_type_node = make_signed_type (GET_MODE_PRECISION (DImode)); +- tree neon_float_type_node = make_node (REAL_TYPE); +- +- tree intQI_pointer_node = build_pointer_type (neon_intQI_type_node); +- tree intHI_pointer_node = build_pointer_type (neon_intHI_type_node); +- tree intSI_pointer_node = build_pointer_type (neon_intSI_type_node); +- tree intDI_pointer_node = build_pointer_type (neon_intDI_type_node); +- tree float_pointer_node = build_pointer_type (neon_float_type_node); ++ neon_intQI_type_node = make_signed_type (GET_MODE_PRECISION (QImode)); ++ neon_intHI_type_node = make_signed_type (GET_MODE_PRECISION (HImode)); ++ neon_polyQI_type_node = make_signed_type (GET_MODE_PRECISION (QImode)); ++ neon_polyHI_type_node = make_signed_type (GET_MODE_PRECISION (HImode)); ++ neon_intSI_type_node = make_signed_type (GET_MODE_PRECISION (SImode)); ++ neon_intDI_type_node = make_signed_type (GET_MODE_PRECISION (DImode)); ++ neon_float_type_node = make_node (REAL_TYPE); ++ TYPE_PRECISION (neon_float_type_node) = FLOAT_TYPE_SIZE; ++ layout_type (neon_float_type_node); ++ ++ intQI_pointer_node = build_pointer_type (neon_intQI_type_node); ++ intHI_pointer_node = build_pointer_type (neon_intHI_type_node); ++ intSI_pointer_node = build_pointer_type (neon_intSI_type_node); ++ intDI_pointer_node = build_pointer_type (neon_intDI_type_node); ++ float_pointer_node = build_pointer_type (neon_float_type_node); + + /* Next create constant-qualified versions of the above types. */ +- tree const_intQI_node = build_qualified_type (neon_intQI_type_node, +- TYPE_QUAL_CONST); +- tree const_intHI_node = build_qualified_type (neon_intHI_type_node, +- TYPE_QUAL_CONST); +- tree const_intSI_node = build_qualified_type (neon_intSI_type_node, +- TYPE_QUAL_CONST); +- tree const_intDI_node = build_qualified_type (neon_intDI_type_node, +- TYPE_QUAL_CONST); +- tree const_float_node = build_qualified_type (neon_float_type_node, +- TYPE_QUAL_CONST); +- +- tree const_intQI_pointer_node = build_pointer_type (const_intQI_node); +- tree const_intHI_pointer_node = build_pointer_type (const_intHI_node); +- tree const_intSI_pointer_node = build_pointer_type (const_intSI_node); +- tree const_intDI_pointer_node = build_pointer_type (const_intDI_node); +- tree const_float_pointer_node = build_pointer_type (const_float_node); ++ const_intQI_node = build_qualified_type (neon_intQI_type_node, ++ TYPE_QUAL_CONST); ++ const_intHI_node = build_qualified_type (neon_intHI_type_node, ++ TYPE_QUAL_CONST); ++ const_intSI_node = build_qualified_type (neon_intSI_type_node, ++ TYPE_QUAL_CONST); ++ const_intDI_node = build_qualified_type (neon_intDI_type_node, ++ TYPE_QUAL_CONST); ++ const_float_node = build_qualified_type (neon_float_type_node, ++ TYPE_QUAL_CONST); ++ ++ const_intQI_pointer_node = build_pointer_type (const_intQI_node); ++ const_intHI_pointer_node = build_pointer_type (const_intHI_node); ++ const_intSI_pointer_node = build_pointer_type (const_intSI_node); ++ const_intDI_pointer_node = build_pointer_type (const_intDI_node); ++ const_float_pointer_node = build_pointer_type (const_float_node); + + /* Now create vector types based on our NEON element types. */ + /* 64-bit vectors. */ +- tree V8QI_type_node = ++ V8QI_type_node = + build_vector_type_for_mode (neon_intQI_type_node, V8QImode); +- tree V4HI_type_node = ++ V4HI_type_node = + build_vector_type_for_mode (neon_intHI_type_node, V4HImode); +- tree V2SI_type_node = ++ V2SI_type_node = + build_vector_type_for_mode (neon_intSI_type_node, V2SImode); +- tree V2SF_type_node = ++ V2SF_type_node = + build_vector_type_for_mode (neon_float_type_node, V2SFmode); + /* 128-bit vectors. */ +- tree V16QI_type_node = ++ V16QI_type_node = + build_vector_type_for_mode (neon_intQI_type_node, V16QImode); +- tree V8HI_type_node = ++ V8HI_type_node = + build_vector_type_for_mode (neon_intHI_type_node, V8HImode); +- tree V4SI_type_node = ++ V4SI_type_node = + build_vector_type_for_mode (neon_intSI_type_node, V4SImode); +- tree V4SF_type_node = ++ V4SF_type_node = + build_vector_type_for_mode (neon_float_type_node, V4SFmode); +- tree V2DI_type_node = ++ V2DI_type_node = + build_vector_type_for_mode (neon_intDI_type_node, V2DImode); + + /* Unsigned integer types for various mode sizes. */ +- tree intUQI_type_node = make_unsigned_type (GET_MODE_PRECISION (QImode)); +- tree intUHI_type_node = make_unsigned_type (GET_MODE_PRECISION (HImode)); +- tree intUSI_type_node = make_unsigned_type (GET_MODE_PRECISION (SImode)); +- tree intUDI_type_node = make_unsigned_type (GET_MODE_PRECISION (DImode)); ++ intUQI_type_node = make_unsigned_type (GET_MODE_PRECISION (QImode)); ++ intUHI_type_node = make_unsigned_type (GET_MODE_PRECISION (HImode)); ++ intUSI_type_node = make_unsigned_type (GET_MODE_PRECISION (SImode)); ++ intUDI_type_node = make_unsigned_type (GET_MODE_PRECISION (DImode)); + + /* Opaque integer types for structures of vectors. */ +- tree intEI_type_node = make_signed_type (GET_MODE_PRECISION (EImode)); +- tree intOI_type_node = make_signed_type (GET_MODE_PRECISION (OImode)); +- tree intCI_type_node = make_signed_type (GET_MODE_PRECISION (CImode)); +- tree intXI_type_node = make_signed_type (GET_MODE_PRECISION (XImode)); ++ intEI_type_node = make_signed_type (GET_MODE_PRECISION (EImode)); ++ intOI_type_node = make_signed_type (GET_MODE_PRECISION (OImode)); ++ intCI_type_node = make_signed_type (GET_MODE_PRECISION (CImode)); ++ intXI_type_node = make_signed_type (GET_MODE_PRECISION (XImode)); + + /* Pointers to vector types. */ +- tree V8QI_pointer_node = build_pointer_type (V8QI_type_node); +- tree V4HI_pointer_node = build_pointer_type (V4HI_type_node); +- tree V2SI_pointer_node = build_pointer_type (V2SI_type_node); +- tree V2SF_pointer_node = build_pointer_type (V2SF_type_node); +- tree V16QI_pointer_node = build_pointer_type (V16QI_type_node); +- tree V8HI_pointer_node = build_pointer_type (V8HI_type_node); +- tree V4SI_pointer_node = build_pointer_type (V4SI_type_node); +- tree V4SF_pointer_node = build_pointer_type (V4SF_type_node); +- tree V2DI_pointer_node = build_pointer_type (V2DI_type_node); ++ V8QI_pointer_node = build_pointer_type (V8QI_type_node); ++ V4HI_pointer_node = build_pointer_type (V4HI_type_node); ++ V2SI_pointer_node = build_pointer_type (V2SI_type_node); ++ V2SF_pointer_node = build_pointer_type (V2SF_type_node); ++ V16QI_pointer_node = build_pointer_type (V16QI_type_node); ++ V8HI_pointer_node = build_pointer_type (V8HI_type_node); ++ V4SI_pointer_node = build_pointer_type (V4SI_type_node); ++ V4SF_pointer_node = build_pointer_type (V4SF_type_node); ++ V2DI_pointer_node = build_pointer_type (V2DI_type_node); + + /* Operations which return results as pairs. */ +- tree void_ftype_pv8qi_v8qi_v8qi = ++ void_ftype_pv8qi_v8qi_v8qi = + build_function_type_list (void_type_node, V8QI_pointer_node, V8QI_type_node, + V8QI_type_node, NULL); +- tree void_ftype_pv4hi_v4hi_v4hi = ++ void_ftype_pv4hi_v4hi_v4hi = + build_function_type_list (void_type_node, V4HI_pointer_node, V4HI_type_node, + V4HI_type_node, NULL); +- tree void_ftype_pv2si_v2si_v2si = ++ void_ftype_pv2si_v2si_v2si = + build_function_type_list (void_type_node, V2SI_pointer_node, V2SI_type_node, + V2SI_type_node, NULL); +- tree void_ftype_pv2sf_v2sf_v2sf = ++ void_ftype_pv2sf_v2sf_v2sf = + build_function_type_list (void_type_node, V2SF_pointer_node, V2SF_type_node, + V2SF_type_node, NULL); +- tree void_ftype_pdi_di_di = ++ void_ftype_pdi_di_di = + build_function_type_list (void_type_node, intDI_pointer_node, + neon_intDI_type_node, neon_intDI_type_node, NULL); +- tree void_ftype_pv16qi_v16qi_v16qi = ++ void_ftype_pv16qi_v16qi_v16qi = + build_function_type_list (void_type_node, V16QI_pointer_node, + V16QI_type_node, V16QI_type_node, NULL); +- tree void_ftype_pv8hi_v8hi_v8hi = ++ void_ftype_pv8hi_v8hi_v8hi = + build_function_type_list (void_type_node, V8HI_pointer_node, V8HI_type_node, + V8HI_type_node, NULL); +- tree void_ftype_pv4si_v4si_v4si = ++ void_ftype_pv4si_v4si_v4si = + build_function_type_list (void_type_node, V4SI_pointer_node, V4SI_type_node, + V4SI_type_node, NULL); +- tree void_ftype_pv4sf_v4sf_v4sf = ++ void_ftype_pv4sf_v4sf_v4sf = + build_function_type_list (void_type_node, V4SF_pointer_node, V4SF_type_node, + V4SF_type_node, NULL); +- tree void_ftype_pv2di_v2di_v2di = ++ void_ftype_pv2di_v2di_v2di = + build_function_type_list (void_type_node, V2DI_pointer_node, V2DI_type_node, + V2DI_type_node, NULL); + +- tree reinterp_ftype_dreg[5][5]; +- tree reinterp_ftype_qreg[5][5]; +- tree dreg_types[5], qreg_types[5]; +- +- TYPE_PRECISION (neon_float_type_node) = FLOAT_TYPE_SIZE; +- layout_type (neon_float_type_node); +- + /* Define typedefs which exactly correspond to the modes we are basing vector + types on. If you change these names you'll need to change + the table used by arm_mangle_type too. */ diff --git a/packages/gcc/gcc-cross_4.3.1.bb b/packages/gcc/gcc-cross_4.3.1.bb index 382a234816..066fa32b86 100644 --- a/packages/gcc/gcc-cross_4.3.1.bb +++ b/packages/gcc/gcc-cross_4.3.1.bb @@ -1,4 +1,4 @@ -PR = "r7" +PR = "r8" require gcc-${PV}.inc require gcc-cross4.inc -- cgit v1.2.3 From 026cc7619f092f92adbcfc5dbbb0894a72ac3a32 Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Wed, 11 Jun 2008 21:28:33 +0000 Subject: freetype: update to version 2.3.6 * fixing security issuses with 2.3.5 and before * patch fix-x86_64-build.patch seems to be applied upstream --- packages/freetype/freetype-native_2.3.6.bb | 21 ++++++++++++++++ packages/freetype/freetype_2.3.6.bb | 39 ++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+) create mode 100644 packages/freetype/freetype-native_2.3.6.bb create mode 100644 packages/freetype/freetype_2.3.6.bb diff --git a/packages/freetype/freetype-native_2.3.6.bb b/packages/freetype/freetype-native_2.3.6.bb new file mode 100644 index 0000000000..b5e8b307cd --- /dev/null +++ b/packages/freetype/freetype-native_2.3.6.bb @@ -0,0 +1,21 @@ +require freetype_${PV}.bb +inherit native +DEPENDS = "" +FILESPATH = "${FILE_DIRNAME}/freetype-${PV}:${FILE_DIRNAME}/freetype:${FILE_DIRNAME}/files" + +EXTRA_OEMAKE= + +do_configure() { + (cd builds/unix && gnu-configize) || die "failure running gnu-configize" + oe_runconf +} + +do_stage() { + autotools_stage_includes + oe_libinstall -so -a -C objs libfreetype ${STAGING_LIBDIR} +} + +do_install() { + : +} + diff --git a/packages/freetype/freetype_2.3.6.bb b/packages/freetype/freetype_2.3.6.bb new file mode 100644 index 0000000000..1333997775 --- /dev/null +++ b/packages/freetype/freetype_2.3.6.bb @@ -0,0 +1,39 @@ +DESCRIPTION = "Freetype font rendering library" +SECTION = "libs" +LICENSE = "freetype" +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \ + file://no-hardcode.patch;patch=1 \ + " + +S = "${WORKDIR}/freetype-${PV}" + +inherit autotools pkgconfig binconfig + +LIBTOOL = "${S}/builds/unix/${HOST_SYS}-libtool" +EXTRA_OEMAKE = "'LIBTOOL=${LIBTOOL}'" +EXTRA_OECONF = "--without-zlib" + +do_configure() { + cd builds/unix + libtoolize --force --copy + gnu-configize --force + aclocal -I . + autoconf + cd ${S} + oe_runconf +} + +do_compile_prepend() { + ${BUILD_CC} -o objs/apinames src/tools/apinames.c +} + +do_stage() { + export LIBTOOL='${LIBTOOL}' + autotools_stage_all + oe_libinstall -so -a -C objs libfreetype ${STAGING_LIBDIR} +} + +FILES_${PN} = "${libdir}/lib*.so.*" +FILES_${PN}-dev += "${bindir}" -- cgit v1.2.3 From eb3d6b98088530a7fc177e00cbbdb09d9a270775 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Wed, 11 Jun 2008 21:37:39 +0000 Subject: libmikmod 3.1.12 bring back m4 patch to improve compatibility with more systems (thanks Jeremy) --- packages/libmikmod/libmikmod/m4.patch | 197 +++++++++++++++++++++++++++++++++ packages/libmikmod/libmikmod_3.1.12.bb | 3 +- 2 files changed, 199 insertions(+), 1 deletion(-) create mode 100644 packages/libmikmod/libmikmod/m4.patch diff --git a/packages/libmikmod/libmikmod/m4.patch b/packages/libmikmod/libmikmod/m4.patch new file mode 100644 index 0000000000..ac7f2d7d04 --- /dev/null +++ b/packages/libmikmod/libmikmod/m4.patch @@ -0,0 +1,197 @@ +--- /dev/null ++++ libmikmod-3.2.0-beta2/m4/esd.m4 +@@ -0,0 +1,194 @@ ++# Configure paths for ESD ++# Manish Singh 98-9-30 ++# stolen back from Frank Belew ++# stolen from Manish Singh ++# Shamelessly stolen from Owen Taylor ++ ++dnl AM_PATH_ESD([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) ++dnl Test for ESD, and define ESD_CFLAGS and ESD_LIBS ++dnl ++AC_DEFUN(AM_PATH_ESD, ++[dnl ++dnl Get the cflags and libraries from the esd-config script ++dnl ++AC_ARG_WITH(esd-prefix,[ --with-esd-prefix=PFX Prefix where ESD is installed (optional)], ++ esd_prefix="$withval", esd_prefix="") ++AC_ARG_WITH(esd-exec-prefix,[ --with-esd-exec-prefix=PFX Exec prefix where ESD is installed (optional)], ++ esd_exec_prefix="$withval", esd_exec_prefix="") ++AC_ARG_ENABLE(esdtest, [ --disable-esdtest Do not try to compile and run a test ESD program], ++ , enable_esdtest=yes) ++ ++ if test x$esd_exec_prefix != x ; then ++ esd_args="$esd_args --exec-prefix=$esd_exec_prefix" ++ if test x${ESD_CONFIG+set} != xset ; then ++ ESD_CONFIG=$esd_exec_prefix/bin/esd-config ++ fi ++ fi ++ if test x$esd_prefix != x ; then ++ esd_args="$esd_args --prefix=$esd_prefix" ++ if test x${ESD_CONFIG+set} != xset ; then ++ ESD_CONFIG=$esd_prefix/bin/esd-config ++ fi ++ fi ++ ++ AC_PATH_PROG(ESD_CONFIG, esd-config, no) ++ min_esd_version=ifelse([$1], ,0.2.7,$1) ++ AC_MSG_CHECKING(for ESD - version >= $min_esd_version) ++ no_esd="" ++ if test "$ESD_CONFIG" = "no" ; then ++ no_esd=yes ++ else ++ AC_LANG_SAVE ++ AC_LANG_C ++ ESD_CFLAGS=`$ESD_CONFIG $esdconf_args --cflags` ++ ESD_LIBS=`$ESD_CONFIG $esdconf_args --libs` ++ ++ esd_major_version=`$ESD_CONFIG $esd_args --version | \ ++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` ++ esd_minor_version=`$ESD_CONFIG $esd_args --version | \ ++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` ++ esd_micro_version=`$ESD_CONFIG $esd_config_args --version | \ ++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` ++ if test "x$enable_esdtest" = "xyes" ; then ++ ac_save_CFLAGS="$CFLAGS" ++ ac_save_LIBS="$LIBS" ++ CFLAGS="$CFLAGS $ESD_CFLAGS" ++ LIBS="$LIBS $ESD_LIBS" ++dnl ++dnl Now check if the installed ESD is sufficiently new. (Also sanity ++dnl checks the results of esd-config to some extent ++dnl ++ rm -f conf.esdtest ++ AC_TRY_RUN([ ++#include ++#include ++#include ++#include ++ ++char* ++my_strdup (char *str) ++{ ++ char *new_str; ++ ++ if (str) ++ { ++ new_str = malloc ((strlen (str) + 1) * sizeof(char)); ++ strcpy (new_str, str); ++ } ++ else ++ new_str = NULL; ++ ++ return new_str; ++} ++ ++int main () ++{ ++ int major, minor, micro; ++ char *tmp_version; ++ ++ system ("touch conf.esdtest"); ++ ++ /* HP/UX 9 (%@#!) writes to sscanf strings */ ++ tmp_version = my_strdup("$min_esd_version"); ++ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { ++ printf("%s, bad version string\n", "$min_esd_version"); ++ exit(1); ++ } ++ ++ if (($esd_major_version > major) || ++ (($esd_major_version == major) && ($esd_minor_version > minor)) || ++ (($esd_major_version == major) && ($esd_minor_version == minor) && ($esd_micro_version >= micro))) ++ { ++ return 0; ++ } ++ else ++ { ++ printf("\n*** 'esd-config --version' returned %d.%d.%d, but the minimum version\n", $esd_major_version, $esd_minor_version, $esd_micro_version); ++ printf("*** of ESD required is %d.%d.%d. If esd-config is correct, then it is\n", major, minor, micro); ++ printf("*** best to upgrade to the required version.\n"); ++ printf("*** If esd-config was wrong, set the environment variable ESD_CONFIG\n"); ++ printf("*** to point to the correct copy of esd-config, and remove the file\n"); ++ printf("*** config.cache before re-running configure\n"); ++ return 1; ++ } ++} ++ ++],, no_esd=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) ++ CFLAGS="$ac_save_CFLAGS" ++ LIBS="$ac_save_LIBS" ++ AC_LANG_RESTORE ++ fi ++ fi ++ if test "x$no_esd" = x ; then ++ AC_MSG_RESULT(yes) ++ ifelse([$2], , :, [$2]) ++ else ++ AC_MSG_RESULT(no) ++ if test "$ESD_CONFIG" = "no" ; then ++ echo "*** The esd-config script installed by ESD could not be found" ++ echo "*** If ESD was installed in PREFIX, make sure PREFIX/bin is in" ++ echo "*** your path, or set the ESD_CONFIG environment variable to the" ++ echo "*** full path to esd-config." ++ else ++ if test -f conf.esdtest ; then ++ : ++ else ++ echo "*** Could not run ESD test program, checking why..." ++ CFLAGS="$CFLAGS $ESD_CFLAGS" ++ LIBS="$LIBS $ESD_LIBS" ++ AC_LANG_SAVE ++ AC_LANG_C ++ AC_TRY_LINK([ ++#include ++#include ++], [ return 0; ], ++ [ echo "*** The test program compiled, but did not run. This usually means" ++ echo "*** that the run-time linker is not finding ESD or finding the wrong" ++ echo "*** version of ESD. If it is not finding ESD, you'll need to set your" ++ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" ++ echo "*** to the installed location Also, make sure you have run ldconfig if that" ++ echo "*** is required on your system" ++ echo "***" ++ echo "*** If you have an old version installed, it is best to remove it, although" ++ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"], ++ [ echo "*** The test program failed to compile or link. See the file config.log for the" ++ echo "*** exact error that occured. This usually means ESD was incorrectly installed" ++ echo "*** or that you have moved ESD since it was installed. In the latter case, you" ++ echo "*** may want to edit the esd-config script: $ESD_CONFIG" ]) ++ CFLAGS="$ac_save_CFLAGS" ++ LIBS="$ac_save_LIBS" ++ AC_LANG_RESTORE ++ fi ++ fi ++ ESD_CFLAGS="" ++ ESD_LIBS="" ++ ifelse([$3], , :, [$3]) ++ fi ++ AC_SUBST(ESD_CFLAGS) ++ AC_SUBST(ESD_LIBS) ++ rm -f conf.esdtest ++]) ++ ++dnl AM_ESD_SUPPORTS_MULTIPLE_RECORD([ACTION-IF-SUPPORTS [, ACTION-IF-NOT-SUPPORTS]]) ++dnl Test, whether esd supports multiple recording clients (version >=0.2.21) ++dnl ++AC_DEFUN(AM_ESD_SUPPORTS_MULTIPLE_RECORD, ++[dnl ++ AC_MSG_NOTICE([whether installed esd version supports multiple recording clients]) ++ ac_save_ESD_CFLAGS="$ESD_CFLAGS" ++ ac_save_ESD_LIBS="$ESD_LIBS" ++ AM_PATH_ESD(0.2.21, ++ ifelse([$1], , [ ++ AM_CONDITIONAL(ESD_SUPPORTS_MULTIPLE_RECORD, true) ++ AC_DEFINE(ESD_SUPPORTS_MULTIPLE_RECORD, 1, ++ [Define if you have esound with support of multiple recording clients.])], ++ [$1]), ++ ifelse([$2], , [AM_CONDITIONAL(ESD_SUPPORTS_MULTIPLE_RECORD, false)], [$2]) ++ if test "x$ac_save_ESD_CFLAGS" != x ; then ++ ESD_CFLAGS="$ac_save_ESD_CFLAGS" ++ fi ++ if test "x$ac_save_ESD_LIBS" != x ; then ++ ESD_LIBS="$ac_save_ESD_LIBS" ++ fi ++ ) ++]) diff --git a/packages/libmikmod/libmikmod_3.1.12.bb b/packages/libmikmod/libmikmod_3.1.12.bb index 6c095d6065..f1ed9d672c 100644 --- a/packages/libmikmod/libmikmod_3.1.12.bb +++ b/packages/libmikmod/libmikmod_3.1.12.bb @@ -2,10 +2,11 @@ DESCRIPTION = "libmikmod is a module player library supporting many formats, inc SECTION = "libs" PRIORITY = "optional" LICENSE = "LGPL" -PR = "r0" +PR = "r1" SRC_URI = "\ ${SOURCEFORGE_MIRROR}/mikmod/libmikmod-${PV}.tar.gz \ + file://m4.patch;patch=1 \ file://autofoo.patch;patch=1 \ " -- cgit v1.2.3 From 01c11b010bc81950b4178b7ff58eae214531fff9 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Wed, 11 Jun 2008 21:58:42 +0000 Subject: add python-pyalsa, (another) alsa support package for python --- packages/python/python-pyalsa_1.0.16.bb | 12 ++++++++++++ packages/tasks/task-python-everything.bb | 3 ++- 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 packages/python/python-pyalsa_1.0.16.bb diff --git a/packages/python/python-pyalsa_1.0.16.bb b/packages/python/python-pyalsa_1.0.16.bb new file mode 100644 index 0000000000..f98e144c75 --- /dev/null +++ b/packages/python/python-pyalsa_1.0.16.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "Support for the Linux 2.6.x ALSA Sound System" +SECTION = "devel/python" +DEPENDS = "alsa-lib" +PRIORITY = "optional" +LICENSE = "GPL" +SRCNAME = "pyalsa" +PR = "ml0" + +SRC_URI = "ftp://ftp.alsa-project.org/pub/${SRCNAME}/${SRCNAME}-${PV}.tar.bz2" +S = "${WORKDIR}/${SRCNAME}-${PV}" + +inherit distutils diff --git a/packages/tasks/task-python-everything.bb b/packages/tasks/task-python-everything.bb index 3cd23c2779..aebfed320f 100644 --- a/packages/tasks/task-python-everything.bb +++ b/packages/tasks/task-python-everything.bb @@ -1,7 +1,7 @@ DESCRIPTION= "Everything Python" HOMEPAGE = "http://www.vanille.de/projects/python.spy" LICENSE = "MIT" -PR = "ml28" +PR = "ml29" RDEPENDS = "\ python-ao \ @@ -39,6 +39,7 @@ RDEPENDS = "\ python-numeric \ python-ogg \ python-pexpect \ + python-pyalsa \ python-pyalsaaudio \ python-pybluez \ python-pycairo \ -- cgit v1.2.3 From 077441a48b6313cbf3b2a81a7a263fa67c41150b Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Wed, 11 Jun 2008 22:15:29 +0000 Subject: python-etk git sanitize recipe and add to task-python-efl[-examples] --- packages/python/python-etk_git.bb | 11 +++++------ packages/tasks/task-python-efl-examples.bb | 3 ++- packages/tasks/task-python-efl.bb | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/python/python-etk_git.bb b/packages/python/python-etk_git.bb index 3c2cb71d7e..8f266449d9 100644 --- a/packages/python/python-etk_git.bb +++ b/packages/python/python-etk_git.bb @@ -1,11 +1,10 @@ -DESCRIPTION = "Python etk binding" -require python-efl.inc -DEPENDS += "etk python-setuptools python-ecore python-cython python-edje" -RDEPENDS += "etk python-cython python-evas python-ecore python-edje python-numeric python-math etk-themes" -PR = "r0.01" +require python-efl.inc +DEPENDS += "etk" +RDEPENDS += "python-evas python-ecore python-edje python-numeric python-math etk-themes" +PV = "0.0.0+git${SRCREV}" +PR = "r1" SRC_URI = "git://staff.get-e.org/users/cmarcelo/python-etk.git;protocol=git" - S = "${WORKDIR}/git" do_stage() { diff --git a/packages/tasks/task-python-efl-examples.bb b/packages/tasks/task-python-efl-examples.bb index e78a4cabae..34efbeab6b 100644 --- a/packages/tasks/task-python-efl-examples.bb +++ b/packages/tasks/task-python-efl-examples.bb @@ -6,9 +6,10 @@ RDEPENDS = "\ python-ecore-examples \ python-emotion-examples \ python-edje-examples \ + python-etk-examples \ python-epsilon-examples \ python-math python-textutils \ " -PR = "ml3" +PR = "ml4" ALLOW_EMPTY = "1" diff --git a/packages/tasks/task-python-efl.bb b/packages/tasks/task-python-efl.bb index 1c7f23a1eb..d7b2d694dd 100644 --- a/packages/tasks/task-python-efl.bb +++ b/packages/tasks/task-python-efl.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Python Bindings to the Enlightenment Foundation Libraries" LICENSE = "MIT" SECTION = "devel/python" -RDEPENDS = "python-evas python-ecore python-emotion python-edje python-epsilon python-edbus" -PR = "ml2" +RDEPENDS = "python-evas python-ecore python-emotion python-edje python-etk python-epsilon python-edbus" +PR = "ml3" ALLOW_EMPTY = "1" -- cgit v1.2.3