Updates and World Build Fixes
Richard,
This is version contains additional comments and fixes based on Khem's notes, I also fixes the Upstream-Status to have correct capitolization.
Sau!
The following changes since commit d1b12b92439805ec9ca5d031d34d264acd0cab3b:
mesa-dri: Enable swrast only by default and intel drivers only on IA platform (2011-10-15 00:41:12 +0100)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib sgw/stage
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/stage
Dmitry Cherukhin (1):
qt4: Added support for QtMobility 1.2
Dmitry Eremin-Solenikov (1):
default-provider: also define a default provider for gconf-native
Paul Eggleton (2):
pulseaudio: make bluetooth support conditional upon DISTRO_FEATURES
bluez4: disable hidd, pand & dund
Philip Balister (1):
cmake : Disable building ccmake.
Saul Wold (9):
bind: update to 9.8.1
resolvconf: Update to 1.61
glib-2.0: Add nativesdk depends for libffi
qmmp: Fix QA Packaging Errors
libomxil: Fix QA Package Errors
Distro Tracking: Fix dates
sysprof: remove duplicated patch
mktemp: Add patch to fix parallel make install
screen: Add patch to fix parallel make install
meta/conf/distro/include/default-providers.inc | 1 +
.../conf/distro/include/distro_tracking_fields.inc | 16 +++---
.../bind/{bind-9.7.2-P3 => bind-9.8.1}/conf.patch | 0
.../cross-build-fix.patch | 0
.../bind/{bind_9.7.2-P3.bb => bind_9.8.1.bb} | 10 ++--
meta/recipes-connectivity/bluez/bluez4.inc | 6 +-
meta/recipes-connectivity/bluez/bluez4_4.96.bb | 2 +-
.../{resolvconf_1.59.bb => resolvconf_1.61.bb} | 6 +-
meta/recipes-core/glib-2.0/glib-2.0_2.30.0.bb | 3 +-
meta/recipes-devtools/cmake/cmake_2.8.5.bb | 3 +-
.../mktemp/files/fix-parallel-make.patch | 23 +++++++
meta/recipes-extended/mktemp/mktemp_1.7.bb | 3 +-
.../screen/screen-4.0.3/fix-parallel-make.patch | 19 ++++++
meta/recipes-extended/screen/screen_4.0.3.bb | 3 +-
meta/recipes-gnome/libffi/libffi_3.0.9.bb | 4 +-
.../sysprof/files/ppc-macro-fix.patch | 13 ----
meta/recipes-kernel/sysprof/sysprof_git.bb | 1 -
meta/recipes-multimedia/libomxil/libomxil_0.3.3.bb | 9 ++-
meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 5 +-
.../pulseaudio/pulseaudio_0.9.22.bb | 2 +-
.../pulseaudio/pulseaudio_0.9.23.bb | 2 +-
meta/recipes-qt/qt-apps/qmmp_0.5.1.bb | 36 ++++++++++--
meta/recipes-qt/qt4/qt-mobility-embedded_1.2.0.bb | 11 ++++
meta/recipes-qt/qt4/qt-mobility-x11_1.2.0.bb | 10 +++
meta/recipes-qt/qt4/qt-mobility_1.2.0.inc | 62 ++++++++++++++++++++
25 files changed, 198 insertions(+), 52 deletions(-)
rename meta/recipes-connectivity/bind/{bind-9.7.2-P3 => bind-9.8.1}/conf.patch (100%)
rename meta/recipes-connectivity/bind/{bind-9.7.2-P3 => bind-9.8.1}/cross-build-fix.patch (100%)
rename meta/recipes-connectivity/bind/{bind_9.7.2-P3.bb => bind_9.8.1.bb} (82%)
rename meta/recipes-connectivity/resolvconf/{resolvconf_1.59.bb => resolvconf_1.61.bb} (87%)
create mode 100644 meta/recipes-extended/mktemp/files/fix-parallel-make.patch
create mode 100644 meta/recipes-extended/screen/screen-4.0.3/fix-parallel-make.patch
delete mode 100644 meta/recipes-kernel/sysprof/files/ppc-macro-fix.patch
create mode 100644 meta/recipes-qt/qt4/qt-mobility-embedded_1.2.0.bb
create mode 100644 meta/recipes-qt/qt4/qt-mobility-x11_1.2.0.bb
create mode 100644 meta/recipes-qt/qt4/qt-mobility_1.2.0.incSignature · 1 line
1.7.6.2
[v2 -CONSOLIDATED PULL 01/14] bind: update to 9.8.1
The COPYRIGHT File was updates for both Year and showing the complete list of contributors, this change effectively adds BSD equivlant to the licensing terms.
---
.../bind/{bind-9.7.2-P3 => bind-9.8.1}/conf.patch | 0
.../cross-build-fix.patch | 0
.../bind/{bind_9.7.2-P3.bb => bind_9.8.1.bb} | 10 +++++-----
3 files changed, 5 insertions(+), 5 deletions(-)
rename meta/recipes-connectivity/bind/{bind-9.7.2-P3 => bind-9.8.1}/conf.patch (100%)
rename meta/recipes-connectivity/bind/{bind-9.7.2-P3 => bind-9.8.1}/cross-build-fix.patch (100%)
rename meta/recipes-connectivity/bind/{bind_9.7.2-P3.bb => bind_9.8.1.bb} (82%)meta/recipes-connectivity/bind/bind-9.8.1/conf.patch renamed from meta/recipes-connectivity/bind/bind-9.7.2-P3/conf.patch +0 -0
meta/recipes-connectivity/bind/bind-9.8.1/cross-build-fix.patch renamed from meta/recipes-connectivity/bind/bind-9.7.2-P3/cross-build-fix.patch +0 -0
meta/recipes-connectivity/bind/bind_9.8.1.bb renamed from meta/recipes-connectivity/bind/bind_9.7.2-P3.bb +5 -5
@@ -2,8 +2,8 @@ DESCRIPTION = "ISC Internet Domain Name Server" HOMEPAGE = "http://www.isc.org/sw/bind/" SECTION = "console/network" -LICENSE = "ISC" -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=fe11ac92dcbd84134d91b6e2c2eccab5" +LICENSE = "ISC & BSD" +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=0fbe2a3ab3c68ac3fea3cad13093877c" DEPENDS = "openssl" PR = "r0"
@@ -13,12 +13,12 @@ SRC_URI = "ftp://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.gz \ file://cross-build-fix.patch \ " -SRC_URI[md5sum] = "b4537cbae38b2daef36775bf49f33db9" -SRC_URI[sha256sum] = "cd945f4766be664f4528ec065df626ad3624481695316ec8e13ad272f4abfb7e" +SRC_URI[md5sum] = "cf31117c5d35af34d4c0702970ad9fb7" +SRC_URI[sha256sum] = "02285dc429cb2a6687a1b2446e9ee22c1df27f2577225b05be5092395ee7c92c" # --enable-exportlib is necessary for building dhcp EXTRA_OECONF = " --enable-ipv6=no --with-randomdev=/dev/random --disable-threads \ - --disable-devpoll --disable-epoll \ + --disable-devpoll --disable-epoll --with-gost=no \ --sysconfdir=${sysconfdir}/bind \ --with-openssl=${STAGING_LIBDIR}/.. --with-libxml2=${STAGING_LIBDIR}/.. \ --enable-exportlib --with-export-includedir=${includedir} --with-export-libdir=${libdir} \
Signature · 1 line
1.7.6.2
[v2 -CONSOLIDATED PULL 04/14] qt4: Added support for QtMobility 1.2
In reply to Saul WoldFrom: Dmitry Cherukhin <[email protected]>
The QtMobility is a Qt add-on which allows to include standard mobile functionality to Qt applications. For details, see
http://qt.nokia.com/products/qt-addons/mobility/
The patch is intended to add support for the QtMobility 1.2 package to OE.
Added two recipes:
1) qt-mobility-x11 builds the QtMobility 1.2 package on the basis of Qt/X11 using the qt4-x11-free package;
2) qt-mobility-embedded builds the QtMobility 1.2 package on the basis of Qt/Embedded using the qt4-embedded package.
--- meta/recipes-qt/qt4/qt-mobility-embedded_1.2.0.bb | 11 ++++ meta/recipes-qt/qt4/qt-mobility-x11_1.2.0.bb | 10 +++ meta/recipes-qt/qt4/qt-mobility_1.2.0.inc | 62 +++++++++++++++++++++ 3 files changed, 83 insertions(+), 0 deletions(-) create mode 100644 meta/recipes-qt/qt4/qt-mobility-embedded_1.2.0.bb create mode 100644 meta/recipes-qt/qt4/qt-mobility-x11_1.2.0.bb create mode 100644 meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
meta/recipes-qt/qt4/qt-mobility-embedded_1.2.0.bb new file +11 -0
@@ -0,0 +1,11 @@ +DESCRIPTION = "Qt Mobility 1.2.0 - version for Qt/Embedded" +DEPENDS = "qt4-embedded" +SECTION = "libs" +qtm_embedded := "embedded" +qtm_dir = "qtopia" +qtm_glflags := "-=opengl" +qtm_extra_config := "gstreamer-photography_enabled = no" + +inherit qt4e +require qt-mobility_${PV}.inc +
meta/recipes-qt/qt4/qt-mobility-x11_1.2.0.bb new file +10 -0
@@ -0,0 +1,10 @@ +DESCRIPTION = "Qt Mobility 1.2.0 - version for Qt/X11" +DEPENDS = "qt4-x11-free" +SECTION = "x11/libs" +qtm_embedded := "" +qtm_dir = "qt4" +qtm_glflags := "${@base_contains('DISTRO_FEATURES', 'opengl', '+=opengl', '-=opengl', d)} " +qtm_extra_config := "" + +inherit qt4x11 +require qt-mobility_${PV}.inc
meta/recipes-qt/qt4/qt-mobility_1.2.0.inc new file +62 -0
62 lines not on this page · raw message
Signature · 1 line
1.7.6.2
[v2 -CONSOLIDATED PULL 05/14] cmake : Disable building ccmake.
In reply to Saul WoldFrom: Philip Balister <[email protected]>
ccmake fails to build due to an as-needed type error with -ltinfo. Disable it for now since the build fails and cmake is what we need for target sdk.
--- meta/recipes-devtools/cmake/cmake_2.8.5.bb | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
meta/recipes-devtools/cmake/cmake_2.8.5.bb +2 -1
@@ -4,7 +4,7 @@ inherit cmake DEPENDS += "curl expat zlib libarchive ncurses" -PR = "${INC_PR}.2" +PR = "${INC_PR}.3" SRC_URI += "file://dont-run-cross-binaries.patch"
@@ -30,6 +30,7 @@ EXTRA_OECMAKE=" \ -DCMAKE_DOC_DIR=${docdir_stripped}/cmake-${CMAKE_MAJOR_VERSION} \ -DCMAKE_USE_SYSTEM_LIBRARIES=1 \ -DKWSYS_CHAR_IS_SIGNED=1 \ + -DBUILD_CursesDialog=0 \ ${@base_contains('DISTRO_FEATURES', 'largefile', '-DKWSYS_LFS_WORKS=1', '-DKWSYS_LFS_DISABLE=1', d)} \ "
Signature · 1 line
1.7.6.2
[v2 -CONSOLIDATED PULL 03/14] default-provider: also define a default provider for gconf-native
In reply to Saul WoldFrom: Dmitry Eremin-Solenikov <[email protected]>
--- meta/conf/distro/include/default-providers.inc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
meta/conf/distro/include/default-providers.inc +1 -0
@@ -22,6 +22,7 @@ VIRTUAL-RUNTIME_update-alternatives ?= "update-alternatives-cworth" PREFERRED_PROVIDER_dbus-glib ?= "dbus-glib" PREFERRED_PROVIDER_dbus-glib-native ?= "dbus-glib-native" PREFERRED_PROVIDER_gconf ?= "gconf-dbus" +PREFERRED_PROVIDER_gconf-native ?= "gconf-dbus-native" PREFERRED_PROVIDER_gdk-pixbuf ?= "gdk-pixbuf" PREFERRED_PROVIDER_libgcc ?= "libgcc" PREFERRED_PROVIDER_libgcc-nativesdk ?= "libgcc-nativesdk"
Signature · 1 line
1.7.6.2
[v2 -CONSOLIDATED PULL 02/14] resolvconf: Update to 1.61
In reply to Saul Wold---
.../{resolvconf_1.59.bb => resolvconf_1.61.bb} | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
rename meta/recipes-connectivity/resolvconf/{resolvconf_1.59.bb => resolvconf_1.61.bb} (87%)meta/recipes-connectivity/resolvconf/resolvconf_1.61.bb renamed from meta/recipes-connectivity/resolvconf/resolvconf_1.59.bb +3 -3
@@ -10,12 +10,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b" AUTHOR = "Thomas Hood" HOMEPAGE = "http://packages.debian.org/resolvconf" RDEPENDS_${PN} = "bash" -PR = "r1" +PR = "r0" SRC_URI = "${DEBIAN_MIRROR}/main/r/resolvconf/resolvconf_${PV}.tar.gz" -SRC_URI[md5sum] = "59b20258bb8a3c25b8c4083fc0279547" -SRC_URI[sha256sum] = "37691677cea24da66d6664c98668b5f16667c0133f17feb166f246ee923ad756" +SRC_URI[md5sum] = "ac1cfa1abc7c690f1d8917f746ad80a5" +SRC_URI[sha256sum] = "0eaa97fa29f8e30a541d549abe76766e5e4edfa841721529c85616d7c0089908" inherit allarch
Signature · 1 line
1.7.6.2
[v2 -CONSOLIDATED PULL 08/14] glib-2.0: Add nativesdk depends for libffi
In reply to Saul Wold--- meta/recipes-core/glib-2.0/glib-2.0_2.30.0.bb | 3 ++- meta/recipes-gnome/libffi/libffi_3.0.9.bb | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-)
meta/recipes-core/glib-2.0/glib-2.0_2.30.0.bb +2 -1
@@ -1,10 +1,11 @@ require glib.inc -PR = "r1" +PR = "r2" PE = "1" DEPENDS += "libffi python-argparse-native" DEPENDS_virtclass-native += "libffi-native python-argparse-native" +DEPENDS_virtclass-nativesdk += "libffi-nativesdk python-argparse-native zlib-nativesdk" SHRT_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
meta/recipes-gnome/libffi/libffi_3.0.9.bb +2 -2
@@ -7,7 +7,7 @@ library really only provides the lowest, machine dependent layer of a fully feat A layer must exist above `libffi' that handles type conversions for values passed between the two languages." SRC_URI = "ftp://sourceware.org/pub/libffi/${BPN}-${PV}.tar.gz" -PR = "r1" +PR = "r2" SRC_URI[md5sum] = "1f300a7a7f975d4046f51c3022fa5ff1" SRC_URI[sha256sum] = "589d25152318bc780cd8919b14670793f4971d9838dab46ed38c32b3ee92c452"
@@ -16,4 +16,4 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=fa09cb778aaba64dc9eac37ab7e4e5d8" inherit autotools FILES_${PN}-dev += "${libdir}/libffi-${PV}" -BBCLASSEXTEND = "native" +BBCLASSEXTEND = "native nativesdk"
Signature · 1 line
1.7.6.2
[v2 -CONSOLIDATED PULL 07/14] bluez4: disable hidd, pand & dund
In reply to Saul WoldFrom: Paul Eggleton <[email protected]>
These daemons have been deprecated for some time, as their functionality is now provided within the main bluetoothd daemon.
--- meta/recipes-connectivity/bluez/bluez4.inc | 6 +++--- meta/recipes-connectivity/bluez/bluez4_4.96.bb | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)
meta/recipes-connectivity/bluez/bluez4.inc +3 -3
@@ -27,9 +27,9 @@ EXTRA_OECONF = "\ --enable-bccmd \ --enable-hid2hci \ --enable-dfutool \ - --enable-hidd \ - --enable-pand \ - --enable-dund \ + --disable-hidd \ + --disable-pand \ + --disable-dund \ --disable-cups \ --enable-test \ --enable-datafiles \
meta/recipes-connectivity/bluez/bluez4_4.96.bb +1 -1
@@ -1,6 +1,6 @@ require bluez4.inc -PR = "r2" +PR = "r3" SRC_URI += "file://bluetooth.conf"
Signature · 1 line
1.7.6.2
[v2 -CONSOLIDATED PULL 06/14] pulseaudio: make bluetooth support conditional upon DISTRO_FEATURES
In reply to Saul WoldFrom: Paul Eggleton <[email protected]>
If "bluetooth" is in DISTRO_FEATURES then enable bluetooth and depend on bluez4, otherwise disable it.
--- meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 5 +++-- .../pulseaudio/pulseaudio_0.9.22.bb | 2 +- .../pulseaudio/pulseaudio_0.9.23.bb | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-)
meta/recipes-multimedia/pulseaudio/pulseaudio.inc +3 -2
@@ -9,7 +9,8 @@ LIC_FILES_CHKSUM = "file://GPL;md5=4325afd396febcb659c36b49533135d4 \ file://src/pulsecore/vector.h;beginline=1;endline=21;md5=1b561f0a2ca47b1fa49862a6ccaacff1" DEPENDS = "libatomics-ops liboil avahi libsamplerate0 libsndfile1 libtool virtual/libx11" # optional -DEPENDS += "bluez4 udev alsa-lib glib-2.0 dbus consolekit" +DEPENDS += "udev alsa-lib glib-2.0 dbus consolekit \ + ${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluez4', '', d)}" SRC_URI = "http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-${PV}.tar.gz \ file://gcc4-compile-fix.patch \
@@ -19,7 +20,7 @@ inherit autotools pkgconfig EXTRA_OECONF = "\ --disable-lynx \ - --enable-bluez \ + ${@base_contains('DISTRO_FEATURES', 'bluetooth', '--enable-bluez', '--disable-bluez', d)} \ --disable-polkit \ --with-x \ --without-jack \
meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.22.bb +1 -1
@@ -1,6 +1,6 @@ require pulseaudio.inc -PR = "r6" +PR = "r7" DEPENDS += "gdbm speex"
meta/recipes-multimedia/pulseaudio/pulseaudio_0.9.23.bb +1 -1
@@ -1,6 +1,6 @@ require pulseaudio.inc -PR = "r4" +PR = "r5" DEPENDS += "gdbm speex"
Signature · 1 line
1.7.6.2
[v2 -CONSOLIDATED PULL 12/14] sysprof: remove duplicated patch
In reply to Saul WoldApparently this pactch was duplicated by backported patch, and needed to be applied more broaded than to just ppc.
--- .../sysprof/files/ppc-macro-fix.patch | 13 ------------- meta/recipes-kernel/sysprof/sysprof_git.bb | 1 - 2 files changed, 0 insertions(+), 14 deletions(-) delete mode 100644 meta/recipes-kernel/sysprof/files/ppc-macro-fix.patch
meta/recipes-kernel/sysprof/files/ppc-macro-fix.patch deleted +0 -13
@@ -1,13 +0,0 @@ -Index: git/collector.c -=================================================================== ---- git.orig/collector.c 2010-12-09 19:42:12.292040001 -0600 -+++ git/collector.c 2010-12-09 19:42:23.352039997 -0600 -@@ -175,7 +175,7 @@ - #define __NR_perf_counter_open 337 - #elif defined(__hppa__) - #define __NR_perf_counter_open 318 --#elif defined(__ppc__) || defined(__ppc64__) -+#elif defined(__powerpc__) || defined(__powerpc64__) - #define __NR_perf_counter_open 319 - #elif defined(__s390__) - #define __NR_perf_counter_open 331
meta/recipes-kernel/sysprof/sysprof_git.bb +0 -1
@@ -15,7 +15,6 @@ SRC_URI = "git://git.gnome.org/sysprof;protocol=git \ SRC_URI_append_arm = " file://rmb-arm.patch" SRC_URI_append_mips = " file://rmb-mips.patch" -SRC_URI_append_powerpc = " file://ppc-macro-fix.patch" S = "${WORKDIR}/git"
Signature · 1 line
1.7.6.2
[v2 -CONSOLIDATED PULL 09/14] qmmp: Fix QA Packaging Errors
In reply to Saul Wold--- meta/recipes-qt/qt-apps/qmmp_0.5.1.bb | 36 +++++++++++++++++++++++++++----- 1 files changed, 30 insertions(+), 6 deletions(-)
meta/recipes-qt/qt-apps/qmmp_0.5.1.bb +30 -6
@@ -4,7 +4,7 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" SECTION = "multimedia" -PR = "r0" +PR = "r1" DEPENDS = "qt4-x11-free taglib libmad libvorbis libogg alsa-lib" RDEPENDS_${PN} += "taglib alsa-lib curl"
@@ -29,16 +29,40 @@ export EXTRA_OECMAKE = "-DQT_QMAKE_EXECUTABLE=${OE_QMAKE_QMAKE} \ -DQT_QTCORE_INCLUDE_DIR=${OE_QMAKE_INCDIR_QT}/QtCore \ " -FILES_${PN} = "${bindir}/qmmp ${libdir}/*.so* \ - ${libdir}/qmmp/PlaylistFormats/*.so \ - ${libdir}/qmmp/Output/libalsa.so \ - ${libdir}/qmmp/Transports/libhttp.so \ - ${libdir}/qmmp/Visual/libanalyzer.so \ +FILES_${PN} = "${bindir}/qmmp ${libdir}/*${SOLIBS} \ + ${libdir}/qmmp/PlaylistFormats/*${SOLIBS} \ + ${libdir}/qmmp/Output/libalsa${SOLIBS} \ + ${libdir}/qmmp/Transports/libhttp${SOLIBS} \ + ${libdir}/qmmp/Visual/libanalyzer${SOLIBS} \ ${datadir}/icons/* \ ${datadir}/qmmp/images/* \ ${datadir}/applications/qmmp.desktop \ " +FILES_${PN}-dev += "${libdir}/qmmp/PlaylistFormats/*${SOLIBSDEV} \ + ${libdir}/qmmp/Output/libalsa${SOLIBSDEV} \ + ${libdir}/qmmp/Transports/libhttp${SOLIBSDEV} \ + ${libdir}/qmmp/Visual/libanalyzer${SOLIBSDEV} \ + " + +FILES_${PN}-dbg += "${libdir}/qmmp/PlaylistFormats/.debug \ + ${libdir}/qmmp/Output/.debug/libalsa* \ + ${libdir}/qmmp/Transports/.debug/libhttp* \ + ${libdir}/qmmp/Visual/.debug/libanalyzer* \ + " + +FILES_${PN}-others-dbg = "${libdir}/qmmp/PlaylistFormats/.debug \ + ${libdir}/qmmp/General/.debug \ + ${libdir}/qmmp/Input/.debug \ + ${libdir}/qmmp/Output/.debug \ + ${libdir}/qmmp/Effect/.debug \ + ${libdir}/qmmp/Engines/.debug \ + ${libdir}/qmmp/FileDialogs/.debug \ + ${libdir}/qmmp/Transports/.debug \ + ${libdir}/qmmp/Visual/.debug \ + ${libdir}/qmmp/CommandLineOptions/.debug \ + " + PACKAGES += "${PN}-plugin-input-mad ${PN}-plugin-input-vorbis" FILES_${PN}-plugin-input-mad = "${libdir}/qmmp/Input/libmad.so"
Signature · 1 line
1.7.6.2
[v2 -CONSOLIDATED PULL 10/14] libomxil: Fix QA Package Errors
In reply to Saul Wold--- meta/recipes-multimedia/libomxil/libomxil_0.3.3.bb | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-)
meta/recipes-multimedia/libomxil/libomxil_0.3.3.bb +7 -2
@@ -5,6 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=ae6f0f4dbc7ac193b50f323a6ae191cb \ file://src/omxcore.h;beginline=1;endline=27;md5=c2e37f68ba9652ca9b2431f466944174" DEPENDS = "libvorbis libogg alsa-lib libmad" +PR = "r1" + SRC_URI = "${SOURCEFORGE_MIRROR}/omxil/libomxil-B-${PV}.tar.gz" S = "${WORKDIR}/${BPN}-B-${PV}"
@@ -13,6 +15,9 @@ inherit autotools EXTRA_OECONF += "--disable-ffmpegcomponents" -FILES_${PN} += "${libdir}/omxilcomponents/*.so*" -FILES_${PN}-dev += "${libdir}/omxilcomponents/*.*a" +FILES_${PN} += "${libdir}/omxilcomponents/*${SOLIBS} \ + ${datadir}/libomxil-B" +FILES_${PN}-staticdev += "${libdir}/omxilcomponents/*.a" +FILES_${PN}-dev += "${libdir}/omxilcomponents/*.la \ + ${libdir}/omxilcomponents/*${SOLIBSDEV}" FILES_${PN}-dbg += "${libdir}/omxilcomponents/.debug/"
Signature · 1 line
1.7.6.2
[v2 -CONSOLIDATED PULL 14/14] screen: Add patch to fix parallel make install
In reply to Saul Wold--- .../screen/screen-4.0.3/fix-parallel-make.patch | 19 +++++++++++++++++++ meta/recipes-extended/screen/screen_4.0.3.bb | 3 ++- 2 files changed, 21 insertions(+), 1 deletions(-) create mode 100644 meta/recipes-extended/screen/screen-4.0.3/fix-parallel-make.patch
meta/recipes-extended/screen/screen-4.0.3/fix-parallel-make.patch new file +19 -0
@@ -0,0 +1,19 @@ +This fixes the parallel make install failure + +Upstream-Status: Pending + +Signed-off-by: Saul Wold <[email protected]> + +Index: screen-4.0.3/Makefile.in +=================================================================== +--- screen-4.0.3.orig/Makefile.in ++++ screen-4.0.3/Makefile.in +@@ -70,7 +70,7 @@ screen: $(OFILES) + .c.o: + $(CC) -c -I. -I$(srcdir) $(M_CFLAGS) $(DEFS) $(OPTIONS) $(CFLAGS) $< + +-install_bin: .version screen ++install_bin: .version screen installdirs + -if [ -f $(DESTDIR)$(bindir)/$(SCREEN) ] && [ ! -f $(DESTDIR)$(bindir)/$(SCREEN).old ]; \ + then mv $(DESTDIR)$(bindir)/$(SCREEN) $(DESTDIR)$(bindir)/$(SCREEN).old; fi + $(INSTALL_PROGRAM) screen $(DESTDIR)$(bindir)/$(SCREEN)
meta/recipes-extended/screen/screen_4.0.3.bb +2 -1
@@ -12,11 +12,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0774d66808b0f602e94448108f59448b \ SECTION = "console/utils" DEPENDS = "ncurses \ ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" -PR = "r1" +PR = "r2" SRC_URI = "${GNU_MIRROR}/screen/screen-${PV}.tar.gz;name=tarball \ ${DEBIAN_MIRROR}/main/s/screen/screen_4.0.3-11+lenny1.diff.gz;name=patch \ file://configure.patch \ + file://fix-parallel-make.patch \ ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}" PAM_SRC_URI = "file://screen.pam"
Signature · 1 line
1.7.6.2
[v2 -CONSOLIDATED PULL 13/14] mktemp: Add patch to fix parallel make install
In reply to Saul Wold--- .../mktemp/files/fix-parallel-make.patch | 23 ++++++++++++++++++++ meta/recipes-extended/mktemp/mktemp_1.7.bb | 3 +- 2 files changed, 25 insertions(+), 1 deletions(-) create mode 100644 meta/recipes-extended/mktemp/files/fix-parallel-make.patch
meta/recipes-extended/mktemp/files/fix-parallel-make.patch new file +23 -0
@@ -0,0 +1,23 @@ +This fixes the parallel make install failure + +Upstream-Status: Pending + +Signed-off-by: Saul Wold <[email protected]> + +Index: mktemp-1.7/Makefile.in +=================================================================== +--- mktemp-1.7.orig/Makefile.in ++++ mktemp-1.7/Makefile.in +@@ -94,10 +94,10 @@ install-dirs: + $(SHELL) $(srcdir)/mkinstalldirs $(DESTDIR)$(bindir) \ + $(DESTDIR)$(mandir)/man1 + +-install-binaries: $(PROG) ++install-binaries: install-dirs $(PROG) + $(INSTALL) -m 0555 $(PROG) $(DESTDIR)$(bindir)/$(PROG) + +-install-man: ++install-man: install-dirs + $(INSTALL) -m 0444 $(srcdir)/mktemp.$(mantype) \ + $(DESTDIR)$(mandir)/man1/mktemp.1 +
meta/recipes-extended/mktemp/mktemp_1.7.bb +2 -1
@@ -5,10 +5,11 @@ SECTION = "console/utils" LICENSE = "ISC" LIC_FILES_CHKSUM = "file://LICENSE;md5=430680f6322a1eb87199b5e01a82c0d4" -PR = "r0" +PR = "r1" SRC_URI = "ftp://ftp.mktemp.org/pub/mktemp/${BPN}-${PV}.tar.gz \ file://disable-strip.patch \ + file://fix-parallel-make.patch \ " SRC_URI[md5sum] = "787bbed9fa2ee8e7645733c0e8e65172"
Signature · 1 line
1.7.6.2
[v2 -CONSOLIDATED PULL 11/14] Distro Tracking: Fix dates
In reply to Saul Wold--- .../conf/distro/include/distro_tracking_fields.inc | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-)
meta/conf/distro/include/distro_tracking_fields.inc +8 -8
@@ -3447,32 +3447,32 @@ DISTRO_PN_ALIAS_pn-imake = "Mandriva=xutils Ubuntu=xutils" RECIPE_STATUS_pn-qt4-tools-native = "green" # no update needed RECIPE_LATEST_VERSION_pn-qt4-tools-native = "4.7.4" RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-qt4-tools-native = "4 months" -RECIPE_LATEST_RELEASE_DATE_pn-qt4-tools-native = "2011/09/01" -RECIPE_LAST_UPDATE_pn-qt4-tools-native = "September 10, 2011" +RECIPE_LATEST_RELEASE_DATE_pn-qt4-tools-native = "Sep 01, 2011" +RECIPE_LAST_UPDATE_pn-qt4-tools-native = "Sep 10, 2011" RECIPE_MAINTAINER_pn-qt4-tools-native = "Paul Eggleton <[email protected]>" DISTRO_PN_ALIAS_pn-qt4-tools-native = "Mandriva=libqt4-devel Ubuntu=libqt4-dev" RECIPE_STATUS_pn-qt4-tools-nativesdk = "green" RECIPE_LATEST_VERSION_pn-qt4-tools-nativesdk = "4.7.4" RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-qt4-tools-nativesdk = "4 months" -RECIPE_LATEST_RELEASE_DATE_pn-qt4-tools-nativesdk = "2011/09/01" -RECIPE_LAST_UPDATE_pn-qt4-tools-nativesdk = "September 10, 2011" +RECIPE_LATEST_RELEASE_DATE_pn-qt4-tools-nativesdk = "Sep 01, 2011" +RECIPE_LAST_UPDATE_pn-qt4-tools-nativesdk = "Sep 10, 2011" RECIPE_MAINTAINER_pn-qt4-tools-nativesdk = "Paul Eggleton <[email protected]>" DISTRO_PN_ALIAS_pn-qt4-tools-nativesdk = "Mandriva=libqt4-devel Ubuntu=libqt4-dev" RECIPE_STATUS_pn-qt4-embedded = "green" RECIPE_LATEST_VERSION_pn-qt4-embedded = "4.7.4" RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-qt4-embedded = "4 months" -RECIPE_LATEST_RELEASE_DATE_pn-qt4-embedded = "2011/09/01" -RECIPE_LAST_UPDATE_pn-qt4-embedded = "September 10, 2011" +RECIPE_LATEST_RELEASE_DATE_pn-qt4-embedded = "Sep 01, 2011" +RECIPE_LAST_UPDATE_pn-qt4-embedded = "Sep 10, 2011" RECIPE_MAINTAINER_pn-qt4-embedded = "Paul Eggleton <[email protected]>" DISTRO_PN_ALIAS_pn-qt4-embedded = "OSPDT" RECIPE_STATUS_pn-qt4-x11-free = "green" RECIPE_LATEST_VERSION_pn-qt4-x11-free = "4.7.4" RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-qt4-x11-free = "4 months" -RECIPE_LATEST_RELEASE_DATE_pn-qt4-x11-free = "2011/09/01" -RECIPE_LAST_UPDATE_pn-qt4-x11-free = "September 10, 2011" +RECIPE_LATEST_RELEASE_DATE_pn-qt4-x11-free = "Sep 01, 2011" +RECIPE_LAST_UPDATE_pn-qt4-x11-free = "Sep 10, 2011" RECIPE_MAINTAINER_pn-qt4-x11-free = "Paul Eggleton <[email protected]" DISTRO_PN_ALIAS_pn-qt4-x11-free = "Ubuntu=qt-x11-free Debian=qt-x11-free"
Signature · 1 line
1.7.6.2
Re: [v2 -CONSOLIDATED PULL 09/14] qmmp: Fix QA Packaging Errors
In reply to Saul WoldQuoted 50 lines · Saul Wold
Signed-off-by Saul Wold <[email protected]>--- meta/recipes-qt/qt-apps/qmmp_0.5.1.bb | 36 +++++++++++++++++++++++++++----- 1 files changed, 30 insertions(+), 6 deletions(-)meta/recipes-qt/qt-apps/qmmp_0.5.1.bb +19
-6@@ -4,7 +4,7 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" SECTION = "multimedia" -PR = "r0" +PR = "r1" DEPENDS = "qt4-x11-free taglib libmad libvorbis libogg alsa-lib" RDEPENDS_${PN} += "taglib alsa-lib curl"@@ -29,16 +29,40 @@ export EXTRA_OECMAKE = "-DQT_QMAKE_EXECUTABLE=${OE_QMAKE_QMAKE} \ -DQT_QTCORE_INCLUDE_DIR=${OE_QMAKE_INCDIR_QT}/QtCore \ " -FILES_${PN} = "${bindir}/qmmp ${libdir}/*.so* \ - ${libdir}/qmmp/PlaylistFormats/*.so \ - ${libdir}/qmmp/Output/libalsa.so \ - ${libdir}/qmmp/Transports/libhttp.so \ - ${libdir}/qmmp/Visual/libanalyzer.so \ +FILES_${PN} = "${bindir}/qmmp ${libdir}/*${SOLIBS} \ + ${libdir}/qmmp/PlaylistFormats/*${SOLIBS} \ + ${libdir}/qmmp/Output/libalsa${SOLIBS} \ + ${libdir}/qmmp/Transports/libhttp${SOLIBS} \ + ${libdir}/qmmp/Visual/libanalyzer${SOLIBS} \ ${datadir}/icons/* \ ${datadir}/qmmp/images/* \ ${datadir}/applications/qmmp.desktop \ " +FILES_${PN}-dev += "${libdir}/qmmp/PlaylistFormats/*${SOLIBSDEV} \ + ${libdir}/qmmp/Output/libalsa${SOLIBSDEV} \ + ${libdir}/qmmp/Transports/libhttp${SOLIBSDEV} \ + ${libdir}/qmmp/Visual/libanalyzer${SOLIBSDEV} \ + " + +FILES_${PN}-dbg += "${libdir}/qmmp/PlaylistFormats/.debug \ + ${libdir}/qmmp/Output/.debug/libalsa* \ + ${libdir}/qmmp/Transports/.debug/libhttp* \ + ${libdir}/qmmp/Visual/.debug/libanalyzer* \ + " + +FILES_${PN}-others-dbg = "${libdir}/qmmp/PlaylistFormats/.debug \
meta/recipes-qt/qt-apps/qmmp_0.5.1.bb export EXTRA_OECMAKE = "-DQT_QMAKE_EXECUTABLE=${OE_QMAKE_QMAKE} \ · line 64
Quoted 10 lines
meta/recipes-qt/qt-apps/qmmp_0.5.1.bb +10
-0+ ${libdir}/qmmp/General/.debug \ + ${libdir}/qmmp/Input/.debug \ + ${libdir}/qmmp/Output/.debug \ + ${libdir}/qmmp/Effect/.debug \ + ${libdir}/qmmp/Engines/.debug \ + ${libdir}/qmmp/FileDialogs/.debug \ + ${libdir}/qmmp/Transports/.debug \ + ${libdir}/qmmp/Visual/.debug \ + ${libdir}/qmmp/CommandLineOptions/.debug \ + "
What is FILES_${PN}-others-dbg? Shouldn't these be in the -dbg package? Is this package listed in PACKAGES?
Cheers,
Richard
Richard Purdie
AppliedQuoted 28 lines · Saul Wold
Richard,
This is version contains additional comments and fixes based on Khem's notes, I also fixes the Upstream-Status to have correct capitolization.
Sau!
The following changes since commit
d1b12b92439805ec9ca5d031d34d264acd0cab3b:mesa-dri: Enable swrast only by default and intel drivers only on IA platform (2011-10-15 00:41:12 +0100)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contribsgw/stage
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/stageDmitry Cherukhin (1):
qt4: Added support for QtMobility 1.2Dmitry Eremin-Solenikov (1):
default-provider: also define a default provider for gconf-nativePaul Eggleton (2):
pulseaudio: make bluetooth support conditional uponDISTRO_FEATURES
bluez4: disable hidd, pand & dundPhilip Balister (1):
cmake : Disable building ccmake.
Quoted 10 lines
Saul Wold (9):
bind: update to 9.8.1
resolvconf: Update to 1.61
glib-2.0: Add nativesdk depends for libffi
qmmp: Fix QA Packaging Errors
libomxil: Fix QA Package Errors
Distro Tracking: Fix dates
sysprof: remove duplicated patch
mktemp: Add patch to fix parallel make install
screen: Add patch to fix parallel make install
Merged to master apart from the qmmp change, thanks.
Richard
Re: [v2 -CONSOLIDATED PULL 06/14] pulseaudio: make bluetooth support conditional upon DISTRO_FEATURES
In reply to Saul WoldQuoted 11 lines · Saul Wold
From: Paul Eggleton <[email protected]>
If "bluetooth" is in
DISTRO_FEATURESthen enable bluetooth and depend on bluez4, otherwise disable it.Signed-off-by Paul Eggleton <[email protected]>---
meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 5 +++-- .../pulseaudio/pulseaudio_0.9.22.bb | 2 +- .../pulseaudio/pulseaudio_0.9.23.bb | 2 +-3 files changed, 5 insertions(+), 4 deletions(-)
It's not caused by this patch.. but if you're looking into pulseaudio, can you also fix this:
Building man pages is using host perl and fails if there isn't XML/Parser.pm on host:
| perl ./xmltoman default.pa.5.xml > default.pa.5 || rm -f default.pa.5 | Can't locate XML/Parser.pm in @INC (@INC contains: /etc/perl
/usr/lib64/perl5/site_perl/5.12.4/x86_64-linux/usr/lib64/perl5/site_perl/5.12.4/usr/lib64/perl5/vendor_perl/5.12.4/x86_64-linux/usr/lib64/perl5/vendor_perl/5.12.4 /usr/lib
64/perl5/site_perl /usr/lib64/perl5/vendor_perl/usr/lib64/perl5/5.12.4/x86_64-linux /usr/lib64/perl5/5.12.4/usr/local/lib/site_perl .) at ./xmltoman line 21.
| BEGIN failed--compilation aborted at ./xmltoman line 21.
| test -z "/usr/share/man/man1" || /bin/mkdir -p "/OE/shr-core/tmp/work/armv7a-vfp-neon-oe-linux-gnueabi/pulseaudio-0.9.23-r5/image/usr/share/man/man1" | /usr/bin/install -c -m 644 ./pulseaudio.1 ./esdcompat.1
./pax11publish.1 ./paplay.1 ./pacat.1 ./pacmd.1 ./pactl.1
./pasuspender.1 ./padsp.1 ./pabrowse.1 '/OE/shr-core/tmp/work/armv7a-vfp-neon-oe-linux-gnueabi/pulseaudio-0.9.23-r5/image/usr/share/man/man1'
| /usr/bin/install: cannot stat `./pulseaudio.1': No such file or directory | /usr/bin/install: cannot stat `./esdcompat.1': No such file or directory | /usr/bin/install: cannot stat `./pax11publish.1': No such file or directory | /usr/bin/install: cannot stat `./paplay.1': No such file or directory | /usr/bin/install: cannot stat `./pacat.1': No such file or directory | /usr/bin/install: cannot stat `./pacmd.1': No such file or directory | /usr/bin/install: cannot stat `./pactl.1': No such file or directory | /usr/bin/install: cannot stat `./pasuspender.1': No such file or directory | /usr/bin/install: cannot stat `./padsp.1': No such file or directory | /usr/bin/install: cannot stat `./pabrowse.1': No such file or directory | make[3]: *** [install-man1] Error 1 | make[3]: Leaving directory
`/OE/shr-core/tmp/work/armv7a-vfp-neon-oe-linux-gnueabi/pulseaudio-0.9.23-r5/pulseaudio-0.9.23/man'
inherit perlnative works for me as work around as it puts perl perl-native in PATH before host perl and XML/Parser.pm is installed in native sysroot, but maybe you'll find cleaner solution (maybe patching Makefile to use env perl will be enough).
Regards,
Re: [v2 -CONSOLIDATED PULL 06/14] pulseaudio: make bluetooth support conditional upon DISTRO_FEATURES
Quoted 47 lines · Martin Jansa
Quoted 11 lines · Saul Wold
From: Paul Eggleton<[email protected]>
If "bluetooth" is in
DISTRO_FEATURESthen enable bluetooth and depend on bluez4, otherwise disable it.Signed-off-by Paul Eggleton<[email protected]>--- meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 5 +++-- .../pulseaudio/pulseaudio_0.9.22.bb | 2 +- .../pulseaudio/pulseaudio_0.9.23.bb | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-)It's not caused by this patch.. but if you're looking into pulseaudio, can you also fix this:
Building man pages is using host perl and fails if there isn't XML/Parser.pm on host:
| perl ./xmltoman default.pa.5.xml> default.pa.5 || rm -f default.pa.5 | Can't locate XML/Parser.pm in @INC (@INC contains: /etc/perl
/usr/lib64/perl5/site_perl/5.12.4/x86_64-linux/usr/lib64/perl5/site_perl/5.12.4/usr/lib64/perl5/vendor_perl/5.12.4/x86_64-linux/usr/lib64/perl5/vendor_perl/5.12.4/usr/lib
64/perl5/site_perl/usr/lib64/perl5/vendor_perl/usr/lib64/perl5/5.12.4/x86_64-linux/usr/lib64/perl5/5.12.4/usr/local/lib/site_perl.) at ./xmltoman line 21.
| BEGIN failed--compilation aborted at ./xmltoman line 21.
| test -z "/usr/share/man/man1" ||/bin/mkdir-p "/OE/shr-core/tmp/work/armv7a-vfp-neon-oe-linux-gnueabi/pulseaudio-0.9.23-r5/image/usr/share/man/man1" |/usr/bin/install-c -m 644 ./pulseaudio.1 ./esdcompat.1
./pax11publish.1 ./paplay.1 ./pacat.1 ./pacmd.1 ./pactl.1
./pasuspender.1 ./padsp.1 ./pabrowse.1 '/OE/shr-core/tmp/work/armv7a-vfp-neon-oe-linux-gnueabi/pulseaudio-0.9.23-r5/image/usr/share/man/man1'| /usr/bin/install: cannot stat `./pulseaudio.1': No such file or directory | /usr/bin/install: cannot stat `./esdcompat.1': No such file or directory | /usr/bin/install: cannot stat `./pax11publish.1': No such file or directory | /usr/bin/install: cannot stat `./paplay.1': No such file or directory | /usr/bin/install: cannot stat `./pacat.1': No such file or directory | /usr/bin/install: cannot stat `./pacmd.1': No such file or directory | /usr/bin/install: cannot stat `./pactl.1': No such file or directory | /usr/bin/install: cannot stat `./pasuspender.1': No such file or directory | /usr/bin/install: cannot stat `./padsp.1': No such file or directory | /usr/bin/install: cannot stat `./pabrowse.1': No such file or directory | make[3]: *** [install-man1] Error 1 | make[3]: Leaving directory
Quoted 7 lines
`/OE/shr-core/tmp/work/armv7a-vfp-neon-oe-linux-gnueabi/pulseaudio-0.9.23-r5/pulseaudio-0.9.23/man'
inherit perlnative works for me as work around as it puts perl perl-native in PATH before host perl and XML/Parser.pm is installed in native sysroot, but maybe you'll find cleaner solution (maybe patching
Makefileto use env perl will be enough).
Martin,
Could you please file this as a bug in bugzilla.yoctoproject.org.
Thanks
Sau!
Quoted 6 lines
Regards,
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core