diff options
author | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2008-06-14 09:43:50 +0000 |
---|---|---|
committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2008-06-14 09:43:50 +0000 |
commit | 3a5ff886a30a1c4a046bede899071713380c8e47 (patch) | |
tree | 141b5eda6838d68d5844e2e2ae774a593a3141d4 /packages | |
parent | d3e22b5a43ebbd20f15aadef4d2d294ad1f874b4 (diff) | |
parent | 261421b2c150e2758ec6b4812c251512f4bb5895 (diff) |
merge of '10ff7a617b3c5cbe78b0c05c1d0b09006a1c44c0'
and 'e4d84a69982a5a0ca8aec781cee663743ca6d6fc'
Diffstat (limited to 'packages')
-rw-r--r-- | packages/gcc/gcc-cross-kernel.inc | 4 | ||||
-rw-r--r-- | packages/images/beagleboard-demo-image.bb | 2 | ||||
-rw-r--r-- | packages/images/neuros-osd-base-image.bb | 18 | ||||
-rw-r--r-- | packages/libmodplug/libmodplug_0.8.bb (renamed from packages/libmodplug/libmodplug_0.7.bb) | 1 | ||||
-rw-r--r-- | packages/modplugplay/modplugplay_1.0.bb | 12 | ||||
-rw-r--r-- | packages/pulseaudio/pulseaudio-0.9.10/2113.diff | 19 | ||||
-rw-r--r-- | packages/pulseaudio/pulseaudio-0.9.10/2114.diff | 15 | ||||
-rw-r--r-- | packages/pulseaudio/pulseaudio-0.9.10/libtool2.patch | 48 | ||||
-rw-r--r-- | packages/pulseaudio/pulseaudio_0.9.10.bb | 7 | ||||
-rw-r--r-- | packages/python/python-pyyaml_3.05.bb | 10 | ||||
-rw-r--r-- | packages/tasks/task-python-everything.bb | 7 |
11 files changed, 129 insertions, 14 deletions
diff --git a/packages/gcc/gcc-cross-kernel.inc b/packages/gcc/gcc-cross-kernel.inc index 59938f5500..7bca7d2bf5 100644 --- a/packages/gcc/gcc-cross-kernel.inc +++ b/packages/gcc/gcc-cross-kernel.inc @@ -1,6 +1,8 @@ # Cut-down gcc for kernel builds # Only installs ${TARGET_PREFIX}gcc-${PV}, not ${TARGET_PREFIX}gcc. +DEPENDS += "gcc-cross" + PROVIDES = "virtual/${TARGET_PREFIX}gcc-${PV}" do_install () { @@ -9,8 +11,6 @@ do_install () { do_stage () { cd gcc - install -d ${CROSS_DIR}/bin/ - install -d ${CROSS_DIR}/lib/ oe_runmake install-common install-headers install-libgcc install -m 0755 xgcc ${CROSS_DIR}/bin/${TARGET_PREFIX}gcc-${PV} } diff --git a/packages/images/beagleboard-demo-image.bb b/packages/images/beagleboard-demo-image.bb index 4dde217cef..d4ac529b9d 100644 --- a/packages/images/beagleboard-demo-image.bb +++ b/packages/images/beagleboard-demo-image.bb @@ -21,7 +21,7 @@ IMAGE_INSTALL = "\ xterm xmms epiphany-firefox-replacement \ hicolor-icon-theme gnome-icon-theme \ jaaa nmap iperf gnuplot \ - abiword gnumeric gimp minimo \ + abiword gnumeric gimp \ powertop \ " diff --git a/packages/images/neuros-osd-base-image.bb b/packages/images/neuros-osd-base-image.bb new file mode 100644 index 0000000000..ddf524574a --- /dev/null +++ b/packages/images/neuros-osd-base-image.bb @@ -0,0 +1,18 @@ +# This image is intended to be the base for further neuros images + +# Select which Secure Shell Daemon gets included into the rootfs +DISTRO_SSH_DAEMON ?= "dropbear" + +# Include a timestamp that initscripts can use to set the time to a +# more sane value after a reboot +IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp" + +IMAGE_INSTALL = "task-boot \ + util-linux-mount util-linux-umount \ + ${DISTRO_SSH_DAEMON} \ + " + +IMAGE_LINGUAS = "" + +inherit image + diff --git a/packages/libmodplug/libmodplug_0.7.bb b/packages/libmodplug/libmodplug_0.8.bb index 369120e685..ead04a7cdb 100644 --- a/packages/libmodplug/libmodplug_0.7.bb +++ b/packages/libmodplug/libmodplug_0.8.bb @@ -7,6 +7,7 @@ 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} diff --git a/packages/modplugplay/modplugplay_1.0.bb b/packages/modplugplay/modplugplay_1.0.bb index 45caf8d083..d91e2b3a97 100644 --- a/packages/modplugplay/modplugplay_1.0.bb +++ b/packages/modplugplay/modplugplay_1.0.bb @@ -1,20 +1,20 @@ -LICENSE = "GPL" DESCRIPTION = "modplugplay is a commandline mod-like audio file player." +HOMEPAGE = "http://gnu.ethz.ch/linuks.mine.nu/modplugplay/" +LICENSE = "GPL" SECTION = "console/multimedia" DEPENDS = "libmodplug" PR = "r1" -SRC_URI = "http://www.linuks.mine.nu/modplugplay/modplugplay-${PV}.tar.gz" +SRC_URI = "http://gnu.ethz.ch/linuks.mine.nu/modplugplay/modplugplay-${PV}.tar.gz" do_compile() { ${CC} -c ${CFLAGS} modplugplay.c -o modplugplay.o - ${CC} -o modplugplay modplugplay.o ${LDFLAGS} -lmodplug + ${CC} -o modplugplay modplugplay.o ${LDFLAGS} -lmodplug -lstdc++ } do_install() { install -d ${D}${bindir} install -d ${D}${mandir}/man1 - install -m 0755 modplugplay ${D}${bindir}/ - install -m 0644 modplugplay.1 ${D}${mandir}/man1/ + install -m 0755 modplugplay ${D}${bindir}/ + install -m 0644 modplugplay.1 ${D}${mandir}/man1/ } - diff --git a/packages/pulseaudio/pulseaudio-0.9.10/2113.diff b/packages/pulseaudio/pulseaudio-0.9.10/2113.diff new file mode 100644 index 0000000000..666ed34ad3 --- /dev/null +++ b/packages/pulseaudio/pulseaudio-0.9.10/2113.diff @@ -0,0 +1,19 @@ +from upstream svn r2113 + +Index: configure.ac +=================================================================== +--- configure.ac (wersja 2112) ++++ configure.ac (wersja 2113) +@@ -172,6 +172,12 @@ + AC_SUBST(LIBLTDL) + AC_CONFIG_SUBDIRS(libltdl) + ++old_LIBS=$LIBS ++LIBS="$LIBS $LIBLTDL" ++AC_CHECK_FUNCS([lt_dlmutex_register]) ++LIBS=$old_LIBS ++AC_CHECK_TYPES([lt_user_dlloader, lt_dladvise], , , [#include <ltdl.h>]) ++ + if test "x$enable_ltdl_install" = "xno" && test "x$ac_cv_lib_ltdl_lt_dlinit" = "xno" ; then + AC_MSG_ERROR([[ + diff --git a/packages/pulseaudio/pulseaudio-0.9.10/2114.diff b/packages/pulseaudio/pulseaudio-0.9.10/2114.diff new file mode 100644 index 0000000000..cbd82eeb84 --- /dev/null +++ b/packages/pulseaudio/pulseaudio-0.9.10/2114.diff @@ -0,0 +1,15 @@ +from upstream svn r2114 + +Index: configure.ac +=================================================================== +--- configure.ac (wersja 2113) ++++ configure.ac (wersja 2114) +@@ -176,7 +176,7 @@ + LIBS="$LIBS $LIBLTDL" + AC_CHECK_FUNCS([lt_dlmutex_register]) + LIBS=$old_LIBS +-AC_CHECK_TYPES([lt_user_dlloader, lt_dladvise], , , [#include <ltdl.h>]) ++AC_CHECK_TYPES([struct lt_user_dlloader, lt_dladvise], , , [#include <ltdl.h>]) + + if test "x$enable_ltdl_install" = "xno" && test "x$ac_cv_lib_ltdl_lt_dlinit" = "xno" ; then + AC_MSG_ERROR([[ diff --git a/packages/pulseaudio/pulseaudio-0.9.10/libtool2.patch b/packages/pulseaudio/pulseaudio-0.9.10/libtool2.patch new file mode 100644 index 0000000000..9e9e5f55d3 --- /dev/null +++ b/packages/pulseaudio/pulseaudio-0.9.10/libtool2.patch @@ -0,0 +1,48 @@ +Tell where is libltdl from libtool - was needed to get it built with libtool 2.2.4 + +--- + configure.ac | 26 +++++++++++++++++++------- + 1 file changed, 19 insertions(+), 7 deletions(-) + +--- pulseaudio-0.9.10.orig/configure.ac ++++ pulseaudio-0.9.10/configure.ac +@@ -242,20 +242,32 @@ if test $ret -eq 0 ; then + else + AC_MSG_RESULT([no]) + fi + + #### libtool stuff #### +- +-AC_LTDL_ENABLE_INSTALL +-AC_LIBLTDL_INSTALLABLE +-AC_LIBTOOL_DLOPEN +-AC_LIBTOOL_WIN32_DLL ++LT_PREREQ([2.2]) ++LT_INIT([dlopen win32-dll]) + AC_PROG_LIBTOOL +-AC_SUBST(LTDLINCL) +-AC_SUBST(LIBLTDL) ++#AC_SUBST(LTDLINCL) ++#AC_SUBST(LIBLTDL) + AC_CONFIG_SUBDIRS(libltdl) + ++AC_ARG_WITH(libltdl-libs, ++ [ --with-libltdl-libs=DIR path to libltdl libs], libltdl_libs_prefix=$withval) ++if test x$libltdl_libs_prefix != x; then ++ LIBLTDL="-L${libltdl_libs_prefix}/libltdl.so -lltdl" ++fi ++AC_SUBST(LIBLTDL) ++ ++AC_ARG_WITH(libltdl-includes, ++ [ --with-libltdl-includes=DIR path to libltdl includes], libltdl_prefix=$withval) ++if test x$libltdl_prefix != x; then ++ LTDLINCL="-I${libltdl_prefix} ${libltdl_libs_prefix}/libltdl.so" ++fi ++AC_SUBST(LTDLINCL) ++ ++ + old_LIBS=$LIBS + LIBS="$LIBS $LIBLTDL" + AC_CHECK_FUNCS([lt_dlmutex_register]) + LIBS=$old_LIBS + AC_CHECK_TYPES([struct lt_user_dlloader, lt_dladvise], , , [#include <ltdl.h>]) diff --git a/packages/pulseaudio/pulseaudio_0.9.10.bb b/packages/pulseaudio/pulseaudio_0.9.10.bb index ef5ec03498..fe43a57cb0 100644 --- a/packages/pulseaudio/pulseaudio_0.9.10.bb +++ b/packages/pulseaudio/pulseaudio_0.9.10.bb @@ -1,16 +1,19 @@ require pulseaudio.inc DEPENDS += "dbus" -PR = "r2" +PR = "r3" -# this is not correct (see below) SRC_URI += "\ file://disable-using-glibc-tls.patch;patch=1 \ file://libpulsedsp-references-libpulsecore.patch;patch=1 \ file://pa-drop-caps-returns-void.patch;patch=1 \ +# file://libtool2.patch;patch=1 \ + file://2113.diff;patch=1;pnum=0 \ + file://2114.diff;patch=1;pnum=0 \ " # problems w/ pulseaudio 0.9.10 atm: # 1.) needs libltdl >= 1.5.24 (yes, any older version will NOT work at runtime) # 2.) doesn't build w/ glibc TLS support (hence patched out) # 3.) fails with hierarchical pthread stuff w/ gst-pulse (hence patched out) + diff --git a/packages/python/python-pyyaml_3.05.bb b/packages/python/python-pyyaml_3.05.bb new file mode 100644 index 0000000000..7f86bbadf7 --- /dev/null +++ b/packages/python/python-pyyaml_3.05.bb @@ -0,0 +1,10 @@ +DESCRIPTION = "Python support for YAML" +HOMEPAGE = "http://www.pyyaml.org" +SECTION = "devel/python" +LICENSE = "MIT" +PR = "ml0" + +SRC_URI = "http://pyyaml.org/download/pyyaml/PyYAML-3.05.tar.gz" +S = "${WORKDIR}/PyYAML-${PV}" + +inherit distutils diff --git a/packages/tasks/task-python-everything.bb b/packages/tasks/task-python-everything.bb index aebfed320f..669c94159b 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 = "ml29" +PR = "ml30" RDEPENDS = "\ python-ao \ @@ -9,10 +9,8 @@ RDEPENDS = "\ python-constraint \ python-dbus \ python-dialog \ - python-pydirectfb \ task-python-efl \ task-python-efl-examples \ - python-pycurl \ python-fam \ python-fnorb \ python-formencode \ @@ -45,6 +43,8 @@ RDEPENDS = "\ python-pycairo \ python-pychecker \ python-pycodes \ + python-pycurl \ + python-pydirectfb \ python-pyephem \ python-pyfits \ python-pyflakes \ @@ -69,6 +69,7 @@ RDEPENDS = "\ python-pyweather \ python-pyxml \ python-pyxmlrpc \ + python-pyyaml \ python-scapy \ python-scons \ python-setuptools \ |