diff options
64 files changed, 1260 insertions, 425 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass index d29ba4bfcf..89ee917d20 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -661,7 +661,7 @@ python base_do_fetch() { bb.note("No conf/checksums.ini found, not checking checksums") return except: - bb.note("Creating the CheckSum parser failed") + bb.note("Creating the CheckSum parser failed: %s:%s" % (sys.exc_info()[0], sys.exc_info()[1])) return pv = bb.data.getVar('PV', d, True) diff --git a/classes/cmake.bbclass b/classes/cmake.bbclass index b5b7b8655b..4978421b63 100644 --- a/classes/cmake.bbclass +++ b/classes/cmake.bbclass @@ -1,7 +1,7 @@ DEPENDS += " cmake-native " # We want the staging and installing functions from autotools -inherit autotools +inherit autotools_stage # Use in-tree builds by default but allow this to be changed # since some packages do not support them (e.g. llvm 2.5). diff --git a/classes/e.bbclass b/classes/e.bbclass index a6fa1d0d78..fca9aa0010 100644 --- a/classes/e.bbclass +++ b/classes/e.bbclass @@ -23,7 +23,7 @@ export FREETYPE_CONFIG = "${STAGING_BINDIR_CROSS}/freetype-config" # This construction is stupid, someone with more E knowledge should change it to =+ or something # And it's in efl.bbclass as well.... -PACKAGES = "${PN}-dbg ${PN}-themes ${PN} ${PN}-dev ${PN}-doc ${PN}-lib" +PACKAGES = "${PN}-dbg ${PN}-themes ${PN} ${PN}-dev ${PN}-doc ${PN}-lib ${PN}-static" FILES_${PN}-lib = "${libdir}/lib*.so.*" FILES_${PN}-themes = "${datadir}/${PN}/themes ${datadir}/${PN}/data ${datadir}/${PN}/fonts ${datadir}/${PN}/pointers ${datadir}/${PN}/images ${datadir}/${PN}/users ${datadir}/${PN}/images ${datadir}/${PN}/styles" FILES_${PN}-dev += "${includedir} ${libdir}/lib*.so" diff --git a/classes/efl.bbclass b/classes/efl.bbclass index 22e664ce01..d4c3baa9cf 100644 --- a/classes/efl.bbclass +++ b/classes/efl.bbclass @@ -24,7 +24,7 @@ do_stage() { } # This construction is stupid, someone with more E knowledge should change it to =+ or something -PACKAGES = "${PN}-dbg ${PN} ${PN}-themes ${PN}-dev ${PN}-doc ${PN}-tests" +PACKAGES = "${PN}-dbg ${PN} ${PN}-themes ${PN}-dev ${PN}-doc ${PN}-tests ${PN}-static" FILES_${PN} = "${libdir}/*.so.*" @@ -40,13 +40,14 @@ FILES_${PN}-themes = "${datadir}/${PN}/themes \ FILES_${PN}-dev += "${bindir}/${PN}-config \ ${libdir}/pkgconfig/* \ ${libdir}/lib*.la \ - ${libdir}/lib*.a \ ${libdir}/*.so \ - ${libdir}/${PN}/*.a \ ${libdir}/${PN}/*.la \ - ${libdir}/${PN}/*/*.a \ ${libdir}/${PN}/*/*.la" +FILES_${PN}-static += "${libdir}/${PN}/*.a \ + ${libdir}/${PN}/*/*.a \ +" + FILES_${PN}-dbg += "${libdir}/${PN}/.debug \ ${libdir}/${PN}/*/.debug" diff --git a/classes/qmake2.bbclass b/classes/qmake2.bbclass index 26e813a036..37721898d6 100644 --- a/classes/qmake2.bbclass +++ b/classes/qmake2.bbclass @@ -19,3 +19,5 @@ export OE_QMAKE_INCDIR_QT = "${STAGING_INCDIR}/qt4" export OE_QMAKE_LIBDIR_QT = "${STAGING_LIBDIR}" export OE_QMAKE_LIBS_QT = "qt" export OE_QMAKE_LIBS_X11 = "-lXext -lX11 -lm" +export OE_QMAKE_LRELEASE = "${STAGING_BINDIR_NATIVE}/lrelease4" +export OE_QMAKE_LUPDATE = "${STAGING_BINDIR_NATIVE}/lupdate4" diff --git a/conf/checksums.ini b/conf/checksums.ini index 171fe89917..177e3ad5f4 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -1330,6 +1330,10 @@ sha256=3b732ed179dd34c17d1ba17867b60a36f20d82a3f0eca7b084fcb5396aa2b30c md5=84d9e0001fe01c14867256c3fe115899 sha256=55386de7bf78f67ad2b9ef664a578db66ee53f512a28eb067cd2303f5e23d740 +[http://www.cpan.org/modules/by-module/XML/XML-Parser-2.36.tar.gz] +md5=1b868962b658bd87e1563ecd56498ded +sha256=9fd529867402456bd826fe0e5588d35b3a2e27e586a2fd838d1352b71c2ed73f + [http://www.cpan.org/modules/by-module/XML/XML-Simple-2.18.tar.gz] md5=593aa8001e5c301cdcdb4bb3b63abc33 sha256=a54967c188cda3e20f496c83be4de3f1740eeaa83c0380712ecd969ad8766826 @@ -3338,6 +3342,10 @@ sha256=9a4a0cfbbd227c20a13519a2c41f2e707dc0d89e518a3c7bfcd381f7b7fbcdef md5=328bfec66c312150e4c2a78dcecb504b sha256=9a4a0cfbbd227c20a13519a2c41f2e707dc0d89e518a3c7bfcd381f7b7fbcdef +[http://sodium.resophonic.com/boost-cmake/1.40.0.cmake2/boost-1.40.0.cmake2.tar.gz] +md5=1a0926fe4c8228f14a2622b4182b801e +sha256=ce6e6c3a6b9a3e7695cb7a0f83d4dbb58f1fb246eb706e3caf3fce3b77e186c0 + [http://downloads.sourceforge.net/asio/boost_asio_0_3_7.tar.bz2] md5=e006cde4b4a28cfce95e43710cd126a9 sha256=ade3663edc611d558f5a383abccd0a9ab87d6168f422ef4c2a38775e8b7ca575 @@ -4394,6 +4402,10 @@ sha256=eacc3c57cffb411b09d834d2225323cde5676165b5d2fc2a27b16cde98e3ba97 md5=f5b84040e99eeff3a18e11e83b1eb12a sha256=e3a35e2ee2cc729bd637a69c7f82d6672317738d29dacab067468bb0634eb0de +[http://www.kernel.org/pub/linux/network/connman/connman-0.46.tar.gz] +md5=9bcdc528f38bc17ecb92519a28b741f1 +sha256=1853ed3d6400e25ef61ba1c98a7ef0f3984a2bf59aaf3485721cbc1de036b75c + [ftp://ftp.moblin.org/connman/releases/connman-0.8.tar.gz] md5=3f1995bf91846b601a25a37832c88cb6 sha256=d40272cfb9a9990a32f6985056735df53d7368eacc28b31b8141de1fb2cb414d @@ -5870,6 +5882,10 @@ sha256=a0d03208e335610defc3049d8dd03f4ec7fcf477f44c4897b3f68adc478237ee md5=b96a6d4263122f1711db12701d79f738 sha256=ef9f7906484cfde4ba223b2682a37058f9a3c7d3bb1adda7a34a67402e2ffe55 +[http://sources.openembedded.org/eject-2.1.5.tar.gz] +md5=b96a6d4263122f1711db12701d79f738 +sha256=ef9f7906484cfde4ba223b2682a37058f9a3c7d3bb1adda7a34a67402e2ffe55 + [http://ekg.chmurka.net/ekg-1.6.tar.gz] md5=1094eee5062d9b9900c4b28bd68fb564 sha256=c6dc601e20bb43c94f5689f05bca8e8501af4cff9dd760afdb3d6998c6952c28 @@ -20014,6 +20030,10 @@ sha256=063f00d5b889beee910eb113c8cfbb4fc85cd404693494bcaaf79dd09a98335c md5=ba2ee667a8b7606b125b7d32f47ca578 sha256=d7f52e2217ed1cf367ca93257b27c8acb29fcae4fcaa31b4a94146a3c7a7de33 +[http://openvpn.net/release/openvpn-2.1_rc20.tar.gz] +md5=8187f8f21507faac5e320e32747203b8 +sha256=4d423b48cb3ccc66b5669b9404dcb028cb62af410361c09e6056db0c5d2a1267 + [http://downloads.sourceforge.net/gakusei/openwrt-imagetools-svn-rev7641.tar.bz2] md5=7f35543286911b827dcbf8d07a7d72be sha256=bad49b59646dbea380cc88be13a77d17c70488b8e11e85f7dd474930fa9cf36a @@ -26202,6 +26222,10 @@ sha256=2edc7cc98fd217f6980d8ba0b3792beed4695d4e8429a11c7237faab04ab47f4 md5=6e393cc7423b5d228fa3d34c21481ae4 sha256=9876b0e45a1bd3899222b916ab1d423e9efa3ad9374d55a6a301d5716f2d8a2f +[http://downloads.sourceforge.net/linux-usb/usbutils-0.86.tar.gz] +md5=34979f675d2bcb3e1b45012fa830a53f +sha256=b3b2bea6d2cd87660c8201a47071bf2a9889d8ed90c7203cc768b597799c12f4 + [http://www.kroah.com/linux-usb/usbview-1.0.tar.gz] md5=2ac1bdae03a858b965e895b211a75ad7 sha256=7a7add52242142f37a7d220c76dfe77090f6592eacdf796e3d07fa61415340fd diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index f7d78ec01f..b57ea4d673 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -42,9 +42,6 @@ SRCREV_pn-diversity-radar ?= "453" SRCREV_pn-eds-dbus ?= "736" SRCREV_pn-enlazar ?= "37" SRCREV_pn-essential-dialer ?= "194" -SRCREV_pn-exalt ?= "79" -SRCREV_pn-exalt-daemon ?= "78" -SRCREV_pn-exalt-module ?= "78" SRCREV_pn-ezx-boot-usb-native ?= "2371" SRCREV_pn-ezx-gen-blob ?= "2426" SRCREV_pn-ezxd ?= "2074" @@ -81,8 +78,6 @@ SRCREV_pn-kismet ?= "2285" SRCREV_pn-kismet-newcore ?= "2285" SRCREV_pn-libcalenabler2 ?= "1410" SRCREV_pn-libefso ?= "194" -SRCREV_pn-libexalt ?= "78" -SRCREV_pn-libexalt-dbus ?= "76" SRCREV_pn-libfakekey ?= "1455" SRCREV_pn-libgdbus ?= "aeab6e3c0185b271ca343b439470491b99cc587f" SRCREV_pn-libgee ?= "0bddeeefb3bd5b003d77301705dbad181cddcaf6" @@ -189,9 +184,9 @@ SRCREV_pn-openmoko-toolchain-scripts ?= "4913" SRCREV_pn-openmoko-worldclock2 ?= "3365" SRCREV_pn-openocd ?= "517" SRCREV_pn-openocd-native ?= "517" -SRCREV_pn-opkg ?= "219" -SRCREV_pn-opkg-native ?= "219" -SRCREV_pn-opkg-sdk ?= "219" +SRCREV_pn-opkg ?= "240" +SRCREV_pn-opkg-native ?= "240" +SRCREV_pn-opkg-sdk ?= "240" SRCREV_pn-opkg-utils ?= "4578" SRCREV_pn-opkg-utils-native ?= "4595" SRCREV_pn-oprofileui ?= "173" @@ -245,7 +240,7 @@ SRCREV_pn-xserver-kdrive-glamo ?= "9b28d998424c77fbc057dd3a022ccbb122793a52" # Enlightenment Foundation Libraries # Caution: This is not alphabetically, but (roughly) dependency-sorted. # Please leave it like that. -EFL_SRCREV ?= "43038" +EFL_SRCREV ?= "43437" SRCREV_pn-edb-native ?= "${EFL_SRCREV}" SRCREV_pn-edb ?= "${EFL_SRCREV}" SRCREV_pn-eina-native ?= "${EFL_SRCREV}" @@ -316,4 +311,8 @@ SRCREV_pn-illume ?= "${EFL_SRCREV}" SRCREV_pn-illume-theme-illume ?= "${EFL_SRCREV}" SRCREV_pn-waker ?= "${EFL_SRCREV}" +#exalt +SRCREV_pn-exalt ?= "${EFL_SRCREV}" +SRCREV_pn-exalt-client ?= "${EFL_SRCREV}" + require conf/distro/include/sane-srcrevs-fso.inc diff --git a/conf/machine/am3517-evm.conf b/conf/machine/am3517-evm.conf index f7a60b4be4..0ee57c407f 100644 --- a/conf/machine/am3517-evm.conf +++ b/conf/machine/am3517-evm.conf @@ -18,7 +18,6 @@ require conf/machine/include/omap3.inc PACKAGE_EXTRA_ARCHS += "omap3517-evm" # Ship all kernel modules -MACHINE_EXTRA_RRECOMMENDS = " omap3-sgx-modules kernel-modules" IMAGE_FSTYPES ?= "jffs2 tar.bz2" EXTRA_IMAGECMD_jffs2 = "-lnp -e 0x20000 -s 2048" diff --git a/conf/machine/beagleboard.conf b/conf/machine/beagleboard.conf index 69cdec6f1f..a5de68e0af 100644 --- a/conf/machine/beagleboard.conf +++ b/conf/machine/beagleboard.conf @@ -41,6 +41,5 @@ UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512" PREFERRED_VERSION_u-boot = "git" -MACHINE_EXTRA_RRECOMMENDS = " omap3-sgx-modules " # and sdio MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa" diff --git a/conf/machine/igep0020.conf b/conf/machine/igep0020.conf index deb17233cc..55c18507c3 100644 --- a/conf/machine/igep0020.conf +++ b/conf/machine/igep0020.conf @@ -41,5 +41,4 @@ MKUBIFS_ARGS = "-m 2048 -e 129024 -c 1996" # UBI: sub-page size: 512 UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512" -# MACHINE_EXTRA_RRECOMMENDS = " omap3-sgx-modules " MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa" diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc index bb750aad98..e87b56c282 100644 --- a/conf/machine/include/omap3.inc +++ b/conf/machine/include/omap3.inc @@ -11,8 +11,6 @@ UBOOT_LOADADDRESS = "0x80008000" # Only build u-boot, xload is optional EXTRA_IMAGEDEPENDS += "u-boot" -MACHINE_EXTRA_RRECOMMENDS = " omap3-sgx-modules " - # TI DVSDK stuff: CODEC_INSTALL_DIR ?= "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-codec-combo" CODEC ?= "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-codec-combo" diff --git a/conf/machine/omap3-pandora.conf b/conf/machine/omap3-pandora.conf index 8729715513..c896fa0b02 100644 --- a/conf/machine/omap3-pandora.conf +++ b/conf/machine/omap3-pandora.conf @@ -5,7 +5,6 @@ TARGET_ARCH = "arm" -MACHINE_EXTRA_RRECOMMENDS = "omap3-sgx-modules " PREFERRED_PROVIDER_u-boot = "u-boot-omap3pandora" diff --git a/conf/machine/omap3-touchbook.conf b/conf/machine/omap3-touchbook.conf index 3595383f03..2839b7ddf6 100644 --- a/conf/machine/omap3-touchbook.conf +++ b/conf/machine/omap3-touchbook.conf @@ -45,6 +45,5 @@ UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512" PREFERRED_VERSION_u-boot = "git" -MACHINE_EXTRA_RRECOMMENDS = " rt3070 omap3-sgx-modules " # and sdio MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa touchscreen" diff --git a/conf/machine/omap3evm.conf b/conf/machine/omap3evm.conf index ad410fae4c..097904d886 100644 --- a/conf/machine/omap3evm.conf +++ b/conf/machine/omap3evm.conf @@ -16,7 +16,6 @@ GUI_MACHINE_CLASS = "smallscreen" require conf/machine/include/omap3.inc # Ship all kernel modules -MACHINE_EXTRA_RRECOMMENDS = " omap3-sgx-modules kernel-modules" IMAGE_FSTYPES ?= "jffs2 tar.bz2" EXTRA_IMAGECMD_jffs2 = "-lnp " diff --git a/conf/machine/omapzoom.conf b/conf/machine/omapzoom.conf index 4ca164e633..4732f68c98 100644 --- a/conf/machine/omapzoom.conf +++ b/conf/machine/omapzoom.conf @@ -52,6 +52,5 @@ UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512" PREFERRED_VERSION_u-boot = "git" #EXTRA_IMAGEDEPENDS += "u-boot x-load" -#MACHINE_EXTRA_RRECOMMENDS = " omap3-sgx-modules " # and sdio MACHINE_FEATURES = "kernel26 touchscreen phone screen apm usbgadget usbhost vfat alsa" diff --git a/conf/machine/omapzoom2.conf b/conf/machine/omapzoom2.conf index 7d0a72b5d7..749339faea 100644 --- a/conf/machine/omapzoom2.conf +++ b/conf/machine/omapzoom2.conf @@ -50,7 +50,6 @@ UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512" PREFERRED_VERSION_u-boot = "git" #EXTRA_IMAGEDEPENDS += "u-boot x-load" -#MACHINE_EXTRA_RRECOMMENDS = " omap3-sgx-modules " MACHINE_EXTRA_RRECOMMENDS = "" # and sdio MACHINE_FEATURES = "kernel26 touchscreen phone screen apm usbgadget usbhost vfat alsa" diff --git a/conf/machine/palmpre.conf b/conf/machine/palmpre.conf index c7baaedd2d..dccc892472 100644 --- a/conf/machine/palmpre.conf +++ b/conf/machine/palmpre.conf @@ -26,6 +26,5 @@ IMAGE_FSTYPES += "tar.bz2" # Let's keep the following three from the beagleboard machine config UBOOT_MACHINE = "omap3_beagle_config" PREFERRED_VERSION_u-boot = "git" -#MACHINE_EXTRA_RRECOMMENDS = " omap3-sgx-modules " MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa phone bluetooth touchscreen keyboard wifi" diff --git a/contrib/angstrom/build-feeds.sh b/contrib/angstrom/build-feeds.sh index 6760a5dff6..7f3dff0dd3 100755 --- a/contrib/angstrom/build-feeds.sh +++ b/contrib/angstrom/build-feeds.sh @@ -70,7 +70,7 @@ fi for machine in ${ARCH_MACHINES} do BUILD_MACHINE=$machine - BUILD_CLEAN="qmake-native qmake2-native qt-x11-free iso-codes python python-native python-pygtk gnome-icon-theme" + BUILD_CLEAN="qmake-native qmake2-native qt-x11-free iso-codes perl perl-native python python-native python-pygtk gnome-icon-theme" BUILD_TARGETS=" \ abiword \ aircrack-ng \ diff --git a/recipes/autofs/autofs.inc b/recipes/autofs/autofs.inc new file mode 100644 index 0000000000..badadb524a --- /dev/null +++ b/recipes/autofs/autofs.inc @@ -0,0 +1,19 @@ +DESCRIPTION = "Kernel based automounter for linux." +SECTION = "base" +LICENSE = "GPL" +INC_PR = "r4" +EXTRA_OEMAKE += "'RANLIB=${RANLIB}'" + +inherit autotools + +do_configure_prepend () { + if [ ! -e acinclude.m4 ]; then + cp aclocal.m4 acinclude.m4 + fi +} + +do_install () { + install -d ${D}${mandir}/man5 ${D}${mandir}/man8 \ + ${D}${sbindir} + oe_runmake 'INSTALLROOT=${D}' install +} diff --git a/recipes/autofs/autofs_3.1.7.bb b/recipes/autofs/autofs_3.1.7.bb index 05481ed46c..10840d8d33 100644 --- a/recipes/autofs/autofs_3.1.7.bb +++ b/recipes/autofs/autofs_3.1.7.bb @@ -1,18 +1,4 @@ -DESCRIPTION = "Kernel based automounter for linux." -SECTION = "base" -LICENSE = "GPL" -SRC_URI = "${KERNELORG_MIRROR}/pub/linux/daemons/autofs/v3/autofs-${PV}.tar.bz2" - -inherit autotools +require autofs.inc -do_configure_prepend () { - if [ ! -e acinclude.m4 ]; then - cp aclocal.m4 acinclude.m4 - fi -} - -do_install () { - install -d ${D}${mandir}/man5 ${D}${mandir}/man8 \ - ${D}${sbindir} - oe_runmake 'INSTALLROOT=${D}' install -} +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/daemons/autofs/v3/autofs-${PV}.tar.bz2" +PR = "${INC_PR}" diff --git a/recipes/autofs/autofs_4.0.0.bb b/recipes/autofs/autofs_4.0.0.bb index 6033b8a09a..b08d6aa3bf 100644 --- a/recipes/autofs/autofs_4.0.0.bb +++ b/recipes/autofs/autofs_4.0.0.bb @@ -1,17 +1,4 @@ -DESCRIPTION = "Kernel based automounter for linux." -SECTION = "base" -LICENSE = "GPL" +require autofs.inc SRC_URI = "${KERNELORG_MIRROR}/pub/linux/daemons/autofs/v4/old/autofs-${PV}-1.tar.bz2" - -inherit autotools - -do_configure_prepend () { - if [ ! -e acinclude.m4 ]; then - cp aclocal.m4 acinclude.m4 - fi -} - -do_install () { - oe_runmake 'INSTALLROOT=${D}' install -} +PR = "${INC_PR}" diff --git a/recipes/autofs/autofs_4.1.4.bb b/recipes/autofs/autofs_4.1.4.bb index 2f998ab220..0ec818a046 100644 --- a/recipes/autofs/autofs_4.1.4.bb +++ b/recipes/autofs/autofs_4.1.4.bb @@ -1,8 +1,4 @@ -DESCRIPTION = "Kernel based automounter for linux." -SECTION = "base" -LICENSE = "GPL" - -PR = "r3" +require autofs.inc SRC_URI = "${KERNELORG_MIRROR}/pub/linux/daemons/autofs/v4/autofs-${PV}.tar.bz2 \ ${KERNELORG_MIRROR}/pub/linux/daemons/autofs/v4/autofs-4.1.4-misc-fixes.patch;patch=1 \ @@ -14,8 +10,9 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/daemons/autofs/v4/autofs-${PV}.tar.bz2 file://auto.net-sort-option-fix.patch;patch=1 \ file://autofs-additional-distros.patch;patch=1 \ file://no-bash.patch;patch=1" +PR = "${INC_PR}" -inherit autotools update-rc.d +inherit update-rc.d INITSCRIPT_NAME = "autofs" INITSCRIPT_PARAMS = "defaults" @@ -24,13 +21,3 @@ INITSCRIPT_PARAMS = "defaults" CFLAGS += "${LDFLAGS}" EXTRA_OEMAKE = "STRIP=/bin/true" PARALLEL_MAKE = "" - -do_configure_prepend () { - if [ ! -e acinclude.m4 ]; then - cp aclocal.m4 acinclude.m4 - fi -} - -do_install () { - oe_runmake 'INSTALLROOT=${D}' install -} diff --git a/recipes/boost/boost-14x.inc b/recipes/boost/boost-14x.inc new file mode 100644 index 0000000000..b1a5f6bb65 --- /dev/null +++ b/recipes/boost/boost-14x.inc @@ -0,0 +1,83 @@ +# The Boost web site provides free peer-reviewed portable +# C++ source libraries. The emphasis is on libraries which +# work well with the C++ Standard Library. The libraries are +# intended to be widely useful, and are in regular use by +# thousands of programmers across a broad spectrum of applications. +DESCRIPTION = "Free peer-reviewed portable C++ source libraries" +HOMEPAGE = "http://www.boost.org/" +SECTION = "libs" +DEPENDS = "zlib bzip2 python expat" +PRIORITY = "optional" +LICENSE = "Boost Software License" +PR = "r0" + +ARM_INSTRUCTION_SET = "arm" +BOOST_VER = "${@"_".join(bb.data.getVar("PV",d,1).split("."))}" +BOOST_MAJ = "${@"_".join(bb.data.getVar("PV",d,1).split(".")[0:2])}" +BOOST_P = "boost_${BOOST_VER}" + +inherit cmake + +EXTRA_OECMAKE = "-DBUILD_SHARED=ON \ + -DBUILD_MULTI_THREADED=ON \ + -DBUILD_RELEASE=ON \ + -DBUILD_DEBUG=OFF \ + " + +BOOST_LIBS = "\ + date_time \ + filesystem \ + graph \ + iostreams \ + program_options \ + python \ + regex \ + serialization \ + signals \ + system \ + test \ + thread \ + " + +# FIXME: for some reason this fails on powerpc +#BOOST_LIBS += "serialization" + +# To enable python, uncomment the following: +#BOOST_LIBS += "python" +#DEPENDS += "python" +#PYTHON_ROOT = "${STAGING_DIR_HOST}/${layout_prefix}" +#PYTHON_VERSION = "2.5" + +S = "${WORKDIR}/${BOOST_P}" + +# Make a package for each library, plus -dev +PACKAGES = "${PN}-dbg ${BOOST_PACKAGES}" +python __anonymous () { + import bb + + packages = [] + extras = [] + for lib in bb.data.getVar('BOOST_LIBS', d, 1).split( ): + pkg = "boost-%s" % lib.replace("_", "-") + extras.append("--with-%s" % lib) + packages.append(pkg) + if not bb.data.getVar("FILES_%s" % pkg, d, 1): + bb.data.setVar("FILES_%s" % pkg, "${libdir}/libboost_%s*.so*" % lib, d) + bb.data.setVar("BOOST_PACKAGES", " ".join(packages), d) + bb.data.setVar("BJAM_EXTRA", " ".join(extras), d) +} + +# Override the contents of specific packages +FILES_boost-serialization = "${libdir}/libboost_serialization*.so* \ + ${libdir}/libboost_wserialization*.so*" +FILES_boost-test = "${libdir}/libboost_prg_exec_monitor*.so \ + ${libdir}/libboost_unit_test_framework*.so*" + +# -dev last to pick up the remaining stuff +PACKAGES += "${PN}-dev" +FILES_${PN}-dev = "${includedir} ${libdir}/libboost_*.so ${libdir}/libboost_*.a" + +# "boost" is a metapackage which pulls in all boost librabries +PACKAGES += "${PN}" +RRECOMMENDS_${PN} += "${BOOST_PACKAGES}" + diff --git a/recipes/boost/boost_1.40.0.bb b/recipes/boost/boost_1.40.0.bb new file mode 100644 index 0000000000..5db3b4a301 --- /dev/null +++ b/recipes/boost/boost_1.40.0.bb @@ -0,0 +1,10 @@ +require boost-14x.inc + +PR = "r0" + +SRC_URI = "http://sodium.resophonic.com/boost-cmake/1.40.0.cmake2/boost-1.40.0.cmake2.tar.gz \ + file://uclibc.patch;patch=1 \ + " +S = "${WORKDIR}/boost-1.40.0.cmake2" + +DEFAULT_PREFERENCE = "-1" diff --git a/recipes/boost/files/uclibc.patch b/recipes/boost/files/uclibc.patch new file mode 100644 index 0000000000..738b8b947d --- /dev/null +++ b/recipes/boost/files/uclibc.patch @@ -0,0 +1,13 @@ +Index: boost-1.40.0.cmake2/libs/thread/src/pthread/thread.cpp +=================================================================== +--- boost-1.40.0.cmake2.orig/libs/thread/src/pthread/thread.cpp 2009-11-03 21:33:21.392444361 +0100 ++++ boost-1.40.0.cmake2/libs/thread/src/pthread/thread.cpp 2009-11-03 21:36:04.748684550 +0100 +@@ -390,7 +390,7 @@ + { + #if defined(PTW32_VERSION) || defined(__hpux) + return pthread_num_processors_np(); +-#elif defined(__linux__) ++#elif defined(__linux__) && !defined(__UCLIBC__) + return get_nprocs(); + #elif defined(__APPLE__) || defined(__FreeBSD__) + int count; diff --git a/recipes/connman/connman_0.46.bb b/recipes/connman/connman_0.46.bb new file mode 100644 index 0000000000..26b7b82798 --- /dev/null +++ b/recipes/connman/connman_0.46.bb @@ -0,0 +1,37 @@ +require connman.inc + +PR = "r1" + +EXTRA_OECONF += "\ + --disable-gtk-doc \ + --enable-debug \ + --enable-threads \ + --enable-loopback \ + --enable-ethernet \ + --enable-wifi \ + --disable-wimax \ + --enable-bluetooth \ + --enable-udhcp \ + --enable-dhclient \ + --enable-resolvconf \ + --enable-dnsproxy \ + --disable-novatel \ + --disable-huawei \ + --disable-hso \ + --enable-ppp \ +# needs udev >= 129 + --disable-udev \ + --disable-polkit \ + --enable-client \ + --enable-fake \ +# --with-udhcpc=PROGRAM \ +# --with-dhclient=PROGRAM \ +# --with-resolvconf=PROGRAM \ +# --with-pppd=PROGRAM \ +" + +SRC_URI = "\ + http://www.kernel.org/pub/linux/network/connman/connman-${PV}.tar.gz \ + file://connman \ +" + diff --git a/recipes/e17/exalt-client_svn.bb b/recipes/e17/exalt-client_svn.bb new file mode 100644 index 0000000000..469a95554a --- /dev/null +++ b/recipes/e17/exalt-client_svn.bb @@ -0,0 +1,23 @@ +LICENSE = "LGPLv2" +PV = "0.0.1+svnr${SRCREV}" + +require e-module.inc + +DEPENDS += "elementary exalt edje-native" + +CFLAGS += " -I${STAGING_INCDIR}/exalt -I${STAGING_INCDIR}/exalt_dbus" + +do_configure_prepend() { + sed -i -e /po/d configure.ac + sed -i -e s:\ po::g Makefile.am +} + +FILES_${PN} += "${libdir}/enlightenment/modules/*/*.desktop \ + ${libdir}/enlightenment/modules/*/*.edj \ + ${libdir}/enlightenment/modules/*/*/*.so" + +FILES_${PN}-static += "${libdir}/enlightenment/modules/*/*/*.a" +FILES_${PN}-dev += "${libdir}/enlightenment/modules/*/*/*.la" +FILES_${PN}-dbg += "${libdir}/enlightenment/modules/*/*/.debug" + + diff --git a/recipes/e17/exalt_svn.bb b/recipes/e17/exalt_svn.bb new file mode 100644 index 0000000000..8868296736 --- /dev/null +++ b/recipes/e17/exalt_svn.bb @@ -0,0 +1,33 @@ +DESCRIPTION = "Exalt is a network manager for the windows manager Enlightenment DR17." +HOMEPAGE = "http://watchwolf.fr/wiki/doku.php?id=exalt" + +LICENSE = "LGPLv2" +DEPENDS = "elementary vpnc wpa-supplicant ecore eet edbus" +RDEPENDS = "vpnc wpa-supplicant" + +PV = "0.9+svnr${SRCREV}" + +inherit e + +EXTRA_OECONF = " \ +--with-wpa_supplicant=${sbindir}/wpa_supplicant \ +--with-vpnc=${sbindir}/vpnc \ +--with-vpnc-disconnect=${sbindir}/vpnc-disconnect \ +" + +do_install_append() { + # install dbus config file + install -d ${D}${sysconfdir}/dbus-1/system.d/ + install -m 0644 data/daemon/dbus/exalt.conf ${D}${sysconfdir}/dbus-1/system.d/exalt.conf + + # install dbus service file + install -d ${D}${datadir}/dbus-1/system-services/ + install -m 0644 org.e.Exalt.service ${D}${datadir}/dbus-1/system-services/ +} + +do_stage() { + autotools_stage_all +} + +FILES_${PN} += "${datadir}/dbus-1" + diff --git a/recipes/e17/expedite_svn.bb b/recipes/e17/expedite_svn.bb index c4dfa5afed..2bcc6d9877 100644 --- a/recipes/e17/expedite_svn.bb +++ b/recipes/e17/expedite_svn.bb @@ -1,9 +1,9 @@ DESCRIPTION = "Expedite is a comprehensive benchmarking suite for Evas" DEPENDS = "eet evas" -RDEPENDS = "evas-engine-buffer evas-engine-fb evas-engine-software-generic evas-engine-software-x11 evas-loader-png" +RDEPENDS = "expedite-themes evas-engine-buffer evas-engine-fb evas-engine-software-generic evas-engine-software-x11 evas-loader-png" LICENSE = "MIT BSD" PV = "0.6.0+svnr${SRCREV}" -PR = "r1" +PR = "r3" inherit e @@ -13,7 +13,6 @@ EXTRA_OECONF = "\ --enable-simple-x11 \ \ --disable-opengl-glew \ - --disable-opengl-x11 \ --enable-software-x11 \ --enable-xrender-x11 \ --enable-software-16-x11 \ diff --git a/recipes/efl1/evas.inc b/recipes/efl1/evas.inc index 55774ee7ad..833d38f240 100644 --- a/recipes/efl1/evas.inc +++ b/recipes/efl1/evas.inc @@ -29,12 +29,12 @@ do_install_append() { find "${D}" -name .debug -type d -exec rm -rf {} \; } -FILES_${PN}-dev += "${libdir}/evas/modules/*/*/*/*.a ${libdir}/evas/modules/*/*/*/*.la" -FILES_${PN}-dbg += "${libdir}/evas/modules/*/*/*/.debug/" +FILES_${SRCNAME}-dev += "${libdir}/evas/modules/*/*/*/*.a ${libdir}/evas/modules/*/*/*/*.la" +FILES_${SRCNAME}-dbg += "${libdir}/evas/modules/*/*/*/.debug/" PACKAGES_DYNAMIC = "evas-engine-* evas-loader-* evas-saver-*" -RRECOMMENDS_${PN} = "\ +RRECOMMENDS_${SRCNAME} = "\ evas-engine-buffer \ evas-engine-fb \ evas-engine-software-generic \ @@ -51,9 +51,9 @@ RRECOMMENDS_${PN} = "\ # Some upgrade path tweaking AUTO_LIBNAME_PKGS = "" -RREPLACES_${PN} = "libevas-ver-pre-svn-00-0 libevas-ver-pre-svn-01-0" +RREPLACES_${SRCNAME} = "libevas-ver-pre-svn-00-0 libevas-ver-pre-svn-01-0" -RREPLACES_${PN}-tests = "libevas-ver-pre-svn-00-tests libevas-ver-pre-svn-01-tests" +RREPLACES_${SRCNAME}-tests = "libevas-ver-pre-svn-00-tests libevas-ver-pre-svn-01-tests" RREPLACES_evas-loader-pmaps = "liblibevas-ver-pre-svn-00-loader-pmaps libevas-ver-pre-svn-00-loader-pmaps " RREPLACES_evas-loader-eet = "liblibevas-ver-pre-svn-00-loader-eet libevas-ver-pre-svn-00-loader-eet " @@ -79,6 +79,6 @@ RREPLACES_evas-engine-software-x11 = "liblibevas-ver-pre-svn-00-engine-software- # disabling this, since (due to OE bugs) it drags in whole Gtk+ -#RRECOMMENDS_${PN} += "\ +#RRECOMMENDS_${SRCNAME} += "\ # libevas-loader-svg \ #" diff --git a/recipes/efl1/evas_svn.bb b/recipes/efl1/evas_svn.bb index f84bd48f7a..21779818ca 100644 --- a/recipes/efl1/evas_svn.bb +++ b/recipes/efl1/evas_svn.bb @@ -1,5 +1,8 @@ require evas.inc -PR = "r3" +PR = "r4" + +EVAS_CPU_TWEAKS = "" +EVAS_CPU_TWEAKS_armv7a = "--enable-cpu-neon" EXTRA_OECONF = "\ --x-includes=${STAGING_INCDIR}/X11 \ @@ -60,4 +63,19 @@ EXTRA_OECONF = "\ --enable-convert-32-rgb-rot-0 \ --enable-convert-32-rgb-rot-90 \ --disable-convert-32-rgb-rot-180 \ - --enable-convert-32-rgb-rot-270" + --enable-convert-32-rgb-rot-270 \ + ${EVAS_CPU_TWEAKS}" + + +# either sgx or 6410 atm +GLES ?= "sgx" + +# This is a hack to get openGL|ES 2.x support enabled for people that have the SDK headers in staging. +# We put this in the main recipe, since it will just not build the gl stuff when the headers are missing + +# If the above sentence confuse you: everything is built and configured as before if you don't have the SDK + +EXTRA_OECONF += "\ + --enable-gl-x11 --enable-gl-flavor-gles --enable-gles-variety-${GLES} \ +" + diff --git a/recipes/eject/eject_2.1.5.bb b/recipes/eject/eject_2.1.5.bb index 6d53aee9a7..f90f8e6993 100644 --- a/recipes/eject/eject_2.1.5.bb +++ b/recipes/eject/eject_2.1.5.bb @@ -1,9 +1,10 @@ DESCRIPTION = "Eject allows removable media (typically a CD-ROM, floppy disk, tape, or JAZ or ZIP disk) to be ejected under software control." +HOMEPAGE = "http://eject.sourceforge.net/" LICENSE = "GPLv2" inherit autotools gettext -SRC_URI = "http://ca.geocities.com/jefftranter@rogers.com/eject-${PV}.tar.gz" +SRC_URI = "http://sources.openembedded.org/eject-2.1.5.tar.gz" S = "${WORKDIR}/${PN}" diff --git a/recipes/exalt/exalt-daemon/init b/recipes/exalt/exalt-daemon/init deleted file mode 100644 index cbceed1793..0000000000 --- a/recipes/exalt/exalt-daemon/init +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/sh -set -e - -#need dbus and hald - -start() { - echo -n "Starting Exalt daemon..." - start-stop-daemon --start --exec /usr/sbin/exalt-daemon \ - --pidfile /var/run/exaltd.pid - echo "done." -} - -stop() { - echo -n "Stopping Exalt daemon..." - start-stop-daemon --stop --exec /usr/sbin/exalt-daemon \ - --pidfile /var/run/exaltd.pid - echo "done." -} - -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart) - stop - sleep 2 - start - ;; - *) - echo "Usage: $(basename $0) {start|stop|restart}" - exit 1 -esac - -exit 0 diff --git a/recipes/exalt/exalt-daemon_svn.bb b/recipes/exalt/exalt-daemon_svn.bb deleted file mode 100644 index 8f5e9afa29..0000000000 --- a/recipes/exalt/exalt-daemon_svn.bb +++ /dev/null @@ -1,13 +0,0 @@ -require exalt.inc - -DEPENDS = "evas edbus libexalt" - -SRC_URI += "file://init" - -do_install_append() { - install -D -m 0755 "${WORKDIR}/init" "${D}${sysconfdir}/dbus-1/event.d/40exaltd" -} - -FILES_${PN} += "${sysconfdir}/dbus-1/event.d/" - -EXALT_MODULE = "daemon" diff --git a/recipes/exalt/exalt-module/autotools-fix.patch b/recipes/exalt/exalt-module/autotools-fix.patch deleted file mode 100644 index 8f3b3deb51..0000000000 --- a/recipes/exalt/exalt-module/autotools-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: module/Makefile.am -=================================================================== ---- module.orig/Makefile.am 2008-04-16 17:39:03.000000000 +0800 -+++ module/Makefile.am 2008-04-16 17:39:05.000000000 +0800 -@@ -26,7 +26,6 @@ - # the module .so file - INCLUDES = -I. \ - -I$(top_srcdir) \ -- -I$(includedir) \ - @EXALT_CFLAGS@ \ - @e_cflags@ - diff --git a/recipes/exalt/exalt-module_svn.bb b/recipes/exalt/exalt-module_svn.bb deleted file mode 100644 index 0a28a1a206..0000000000 --- a/recipes/exalt/exalt-module_svn.bb +++ /dev/null @@ -1,19 +0,0 @@ -require exalt.inc - -DEPENDS = "edbus libexalt-dbus" -RDEPENDS_${PN} = "exalt" - -SRC_URI += "file://autotools-fix.patch;patch=1;minrev=78" - -EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc" - -FILES_${PN} += "${libdir}/enlightenment/modules/module_exalt/*.edj \ - ${libdir}/enlightenment/modules/module_exalt/*/*.so \ - ${libdir}/enlightenment/modules/module_exalt/*.desktop \ - ${libdir}/enlightenment/modules/module_exalt/module_exalt" -FILES_${PN}-dev += "${libdir}/enlightenment/modules/module_exalt/*/*.a \ - ${libdir}/enlightenment/modules/module_exalt/*/*.la" -FILES_${PN}-dbg += "${libdir}/enlightenment/modules/module_exalt/*/.debug" -FILES_${PN}-locale += "${libdir}/enlightenment/modules/module_exalt/locale" - -EXALT_MODULE = "module" diff --git a/recipes/exalt/exalt.inc b/recipes/exalt/exalt.inc deleted file mode 100644 index 2e82be2d82..0000000000 --- a/recipes/exalt/exalt.inc +++ /dev/null @@ -1,12 +0,0 @@ -DESCRIPTION = "Exalt is a network manager for the windows manager Enlightenment DR17." -AUTHOR = "John Lee <john_lee@openmoko.com>" -HOMEPAGE = "http://watchwolf.fr/wiki/doku.php?id=exalt" -PV = "0.0.0+svnr${SRCREV}" - -SRC_URI = "svn://svn.berlios.de/exalt/trunk;module=${EXALT_MODULE};proto=svn" - -S = "${WORKDIR}/${EXALT_MODULE}" - -inherit autotools pkgconfig - -EXALT_MODULE ?= "${PN}" diff --git a/recipes/exalt/exalt_svn.bb b/recipes/exalt/exalt_svn.bb deleted file mode 100644 index 0ed46a2e96..0000000000 --- a/recipes/exalt/exalt_svn.bb +++ /dev/null @@ -1,4 +0,0 @@ -require exalt.inc - -DEPENDS = "ecore etk edbus libexalt libexalt-dbus" -RDEPENDS_${PN} = "exalt-daemon" diff --git a/recipes/exalt/libexalt-dbus_svn.bb b/recipes/exalt/libexalt-dbus_svn.bb deleted file mode 100644 index e40766bfe5..0000000000 --- a/recipes/exalt/libexalt-dbus_svn.bb +++ /dev/null @@ -1,9 +0,0 @@ -require exalt.inc - -DEPENDS = "ecore edbus libexalt" - -do_stage() { - autotools_stage_all -} - -EXALT_MODULE = "libexalt_dbus" diff --git a/recipes/exalt/libexalt_svn.bb b/recipes/exalt/libexalt_svn.bb deleted file mode 100644 index cd70d52c77..0000000000 --- a/recipes/exalt/libexalt_svn.bb +++ /dev/null @@ -1,8 +0,0 @@ -require exalt.inc - -DEPENDS = "ecore eet ecore edbus evas wpa-supplicant dhcp" -RDEPENDS_${PN} = "wpa-supplicant dhclient" - -do_stage() { - autotools_stage_all -} diff --git a/recipes/gnome-mplayer/gecko-mediaplayer/gecko-mplayer-svn.diff b/recipes/gnome-mplayer/gecko-mediaplayer/gecko-mplayer-svn.diff new file mode 100644 index 0000000000..929d02540a --- /dev/null +++ b/recipes/gnome-mplayer/gecko-mediaplayer/gecko-mplayer-svn.diff @@ -0,0 +1,480 @@ +Index: configure +=================================================================== +--- configure (revision 328) ++++ configure (working copy) +@@ -639,6 +639,7 @@ + am__EXEEXT_TRUE + LTLIBOBJS + LIBOBJS ++plugindir + GIO_DEFINES + GIO_LIBS + GIO_CFLAGS +@@ -775,6 +776,7 @@ + enable_schemas_install + with_gconf + with_gio ++with_plugin_dir + enable_caching + ' + ac_precious_vars='build_alias +@@ -1444,6 +1446,7 @@ + Directory for installing schema files. + --with-gconf Use Gconf to store preferences + --with-gio Use GIO for file I/O ++ --with-plugin-dir=dir Directory where plugins are stored + + Some influential environment variables: + CC C compiler command +@@ -9640,6 +9643,16 @@ + fi + + ++ ++# Check whether --with-plugin_dir was given. ++if test "${with_plugin_dir+set}" = set; then ++ withval=$with_plugin_dir; plugindir=$withval ++else ++ plugindir='$(libdir)/mozilla/plugins' ++fi ++ ++ ++ + # Check whether --enable-caching was given. + if test "${enable_caching+set}" = set; then + enableval=$enable_caching; usecache=$enableval +Index: Makefile.in +=================================================================== +--- Makefile.in (revision 328) ++++ Makefile.in (working copy) +@@ -239,6 +239,7 @@ + mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ ++plugindir = @plugindir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ + psdir = @psdir@ +Index: configure.in +=================================================================== +--- configure.in (revision 328) ++++ configure.in (working copy) +@@ -114,6 +114,13 @@ + AC_SUBST(GIO_LIBS) + ]) + ++AC_ARG_WITH([plugin_dir], ++ [AS_HELP_STRING([--with-plugin-dir=dir], ++ [Directory where plugins are stored])], ++ [plugindir=$withval], ++ [plugindir='$(libdir)/mozilla/plugins']) ++AC_SUBST(plugindir) ++ + AC_ARG_ENABLE(caching, + AC_HELP_STRING([--disable-caching],[Disable caching of remote media to local storage]), + [usecache=$enableval],[usecache=yes]) +Index: src/plugin.cpp +=================================================================== +--- src/plugin.cpp (revision 328) ++++ src/plugin.cpp (working copy) +@@ -42,9 +42,9 @@ + #include "plugin_setup.h" + #include "plugin_types.h" + #include "plugin_dbus.h" +-#include "nsIPrefBranch.h" +-#include "nsIPrefService.h" +-#include "nsIServiceManager.h" ++#include <nsIPrefBranch.h> ++#include <nsIPrefService.h> ++#include <nsIServiceManager.h> + + nsIPrefBranch *prefBranch = NULL; + nsIPrefService *prefService = NULL; +@@ -170,9 +170,9 @@ + { + gchar *jscript; + +- jscript = g_strdup_printf("javascript:obj=document.getElementById('%s');" +- "e=document.createEvent('Events');" +- "e.initEvent('%s',true,true);" "obj.dispatchEvent(e);", id, event); ++ jscript = g_strdup_printf("javascript:obj_gmp=document.getElementById('%s');" ++ "e_gmp=document.createEvent('Events');" ++ "e_gmp.initEvent('%s',true,true);" "obj_gmp.dispatchEvent(e_gmp);", id, event); + NPN_GetURL(mInstance, jscript, NULL); + g_free(jscript); + } +@@ -259,6 +259,7 @@ + console(NULL), + controls(NULL), + user_agent(NULL), ++player_backend(NULL), + disable_context_menu(FALSE), + disable_fullscreen(FALSE), + post_dom_events(FALSE), +@@ -354,6 +355,8 @@ + store = gm_pref_store_new("gecko-mediaplayer"); + if (store != NULL) { + debug_level = gm_pref_store_get_int(store, DEBUG_LEVEL); ++ player_backend = gm_pref_store_get_string(store, PLAYER_BACKEND); ++ printf("Using player backend of '%s'\n",player_backend); + gm_pref_store_free(store); + } + +@@ -458,10 +461,16 @@ + } + + if (!player_launched && mWidth > 0 && mHeight > 0) { +- app_name = g_find_program_in_path("gnome-mplayer"); +- if (app_name == NULL) +- app_name = g_find_program_in_path("gnome-mplayer-minimal"); +- ++ app_name = NULL; ++ if (player_backend != NULL) { ++ app_name = g_find_program_in_path(player_backend); ++ } ++ if (app_name == NULL) { ++ app_name = g_find_program_in_path("gnome-mplayer"); ++ if (app_name == NULL) ++ app_name = g_find_program_in_path("gnome-mplayer-minimal"); ++ } ++ + argvn[arg++] = g_strdup_printf("%s", app_name); + g_free(app_name); + argvn[arg++] = g_strdup_printf("--window=%i", (gint) mWindow); +@@ -643,6 +652,14 @@ + g_free(path); + } + //printf("Leaving destroy stream src = %s\n", item->src); ++ ++ } else if (reason == NPRES_NETWORK_ERR) { ++ item = (ListItem *) stream->notifyData; ++ if (item) { ++ printf("Destroy Stream, network error, item is %s\n", item->src); ++ } else { ++ printf("Destory Stream, network error, item is NULL\n"); ++ } + } else { + item = (ListItem *) stream->notifyData; + // item = list_find(playlist, (gchar*)stream->url); +@@ -692,9 +709,19 @@ + */ + } + } else { +- if (item) ++ if (item) { + item->played = TRUE; +- if (!item->streaming) { ++ if (!item->streaming) { ++ item = list_find_next_playable(playlist); ++ if (item) { ++ if (item->retrieved) { ++ open_location(this, item, TRUE); ++ } else { ++ NPN_GetURLNotify(mInstance, item->src, NULL, item); ++ } ++ } ++ } ++ } else { + item = list_find_next_playable(playlist); + if (item) { + if (item->retrieved) { +@@ -703,7 +730,7 @@ + NPN_GetURLNotify(mInstance, item->src, NULL, item); + } + } +- } ++ } + } + } + +Index: src/Makefile.in +=================================================================== +--- src/Makefile.in (revision 328) ++++ src/Makefile.in (working copy) +@@ -57,34 +57,45 @@ + $(am__objects_1) + gecko_mediaplayer_dvx_so_OBJECTS = \ + $(am_gecko_mediaplayer_dvx_so_OBJECTS) +-gecko_mediaplayer_dvx_so_DEPENDENCIES = libgmlib/libgmlib.a ++am__DEPENDENCIES_1 = ++gecko_mediaplayer_dvx_so_DEPENDENCIES = libgmlib/libgmlib.a \ ++ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ ++ $(am__DEPENDENCIES_1) + gecko_mediaplayer_dvx_so_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ + $(gecko_mediaplayer_dvx_so_LDFLAGS) $(LDFLAGS) -o $@ + am_gecko_mediaplayer_qt_so_OBJECTS = plugin_types_qt.$(OBJEXT) \ + $(am__objects_1) + gecko_mediaplayer_qt_so_OBJECTS = \ + $(am_gecko_mediaplayer_qt_so_OBJECTS) +-gecko_mediaplayer_qt_so_DEPENDENCIES = libgmlib/libgmlib.a ++gecko_mediaplayer_qt_so_DEPENDENCIES = libgmlib/libgmlib.a \ ++ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ ++ $(am__DEPENDENCIES_1) + gecko_mediaplayer_qt_so_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ + $(gecko_mediaplayer_qt_so_LDFLAGS) $(LDFLAGS) -o $@ + am_gecko_mediaplayer_rm_so_OBJECTS = plugin_types_rm.$(OBJEXT) \ + $(am__objects_1) + gecko_mediaplayer_rm_so_OBJECTS = \ + $(am_gecko_mediaplayer_rm_so_OBJECTS) +-gecko_mediaplayer_rm_so_DEPENDENCIES = libgmlib/libgmlib.a ++gecko_mediaplayer_rm_so_DEPENDENCIES = libgmlib/libgmlib.a \ ++ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ ++ $(am__DEPENDENCIES_1) + gecko_mediaplayer_rm_so_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ + $(gecko_mediaplayer_rm_so_LDFLAGS) $(LDFLAGS) -o $@ + am_gecko_mediaplayer_wmp_so_OBJECTS = plugin_types_wmp.$(OBJEXT) \ + $(am__objects_1) + gecko_mediaplayer_wmp_so_OBJECTS = \ + $(am_gecko_mediaplayer_wmp_so_OBJECTS) +-gecko_mediaplayer_wmp_so_DEPENDENCIES = libgmlib/libgmlib.a ++gecko_mediaplayer_wmp_so_DEPENDENCIES = libgmlib/libgmlib.a \ ++ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ ++ $(am__DEPENDENCIES_1) + gecko_mediaplayer_wmp_so_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ + $(gecko_mediaplayer_wmp_so_LDFLAGS) $(LDFLAGS) -o $@ + am_gecko_mediaplayer_so_OBJECTS = plugin_types_std.$(OBJEXT) \ + $(am__objects_1) + gecko_mediaplayer_so_OBJECTS = $(am_gecko_mediaplayer_so_OBJECTS) +-gecko_mediaplayer_so_DEPENDENCIES = libgmlib/libgmlib.a ++gecko_mediaplayer_so_DEPENDENCIES = libgmlib/libgmlib.a \ ++ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ ++ $(am__DEPENDENCIES_1) + gecko_mediaplayer_so_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ + $(gecko_mediaplayer_so_LDFLAGS) $(LDFLAGS) -o $@ + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +@@ -265,6 +276,7 @@ + mkdir_p = @mkdir_p@ + oldincludedir = @oldincludedir@ + pdfdir = @pdfdir@ ++plugindir = @plugindir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ + psdir = @psdir@ +@@ -312,42 +324,42 @@ + npp_gate.cpp \ + npupp.h + +-install_libexecdir = $(libdir)/mozilla/plugins ++install_libexecdir = $(plugindir) + gecko_mediaplayer_so_SOURCES = \ + plugin_types_std.cpp \ + $(COMMONCODE) + + gecko_mediaplayer_so_CFLAGS = -fPIC +-gecko_mediaplayer_so_LDFLAGS = -shared $(GLIB_LIBS) $(DBUS_LIBS) $(GCONF_LIBS) -fPIC +-gecko_mediaplayer_so_LDADD = libgmlib/libgmlib.a ++gecko_mediaplayer_so_LDFLAGS = -shared -fPIC ++gecko_mediaplayer_so_LDADD = libgmlib/libgmlib.a $(GLIB_LIBS) $(DBUS_LIBS) $(GCONF_LIBS) + gecko_mediaplayer_qt_so_SOURCES = \ + plugin_types_qt.cpp \ + $(COMMONCODE) + + gecko_mediaplayer_qt_so_CFLAGS = -fPIC +-gecko_mediaplayer_qt_so_LDFLAGS = -shared $(GLIB_LIBS) $(DBUS_LIBS) $(GCONF_LIBS) -fPIC +-gecko_mediaplayer_qt_so_LDADD = libgmlib/libgmlib.a ++gecko_mediaplayer_qt_so_LDFLAGS = -shared -fPIC ++gecko_mediaplayer_qt_so_LDADD = libgmlib/libgmlib.a $(GLIB_LIBS) $(DBUS_LIBS) $(GCONF_LIBS) + gecko_mediaplayer_wmp_so_SOURCES = \ + plugin_types_wmp.cpp \ + $(COMMONCODE) + + gecko_mediaplayer_wmp_so_CFLAGS = -fPIC +-gecko_mediaplayer_wmp_so_LDFLAGS = -shared $(GLIB_LIBS) $(DBUS_LIBS) $(GCONF_LIBS) -fPIC +-gecko_mediaplayer_wmp_so_LDADD = libgmlib/libgmlib.a ++gecko_mediaplayer_wmp_so_LDFLAGS = -shared -fPIC ++gecko_mediaplayer_wmp_so_LDADD = libgmlib/libgmlib.a $(GLIB_LIBS) $(DBUS_LIBS) $(GCONF_LIBS) + gecko_mediaplayer_dvx_so_SOURCES = \ + plugin_types_dvx.cpp \ + $(COMMONCODE) + + gecko_mediaplayer_dvx_so_CFLAGS = -fPIC +-gecko_mediaplayer_dvx_so_LDFLAGS = -shared $(GLIB_LIBS) $(DBUS_LIBS) $(GCONF_LIBS) -fPIC +-gecko_mediaplayer_dvx_so_LDADD = libgmlib/libgmlib.a ++gecko_mediaplayer_dvx_so_LDFLAGS = -shared -fPIC ++gecko_mediaplayer_dvx_so_LDADD = libgmlib/libgmlib.a $(GLIB_LIBS) $(DBUS_LIBS) $(GCONF_LIBS) + gecko_mediaplayer_rm_so_SOURCES = \ + plugin_types_rm.cpp \ + $(COMMONCODE) + + gecko_mediaplayer_rm_so_CFLAGS = -fPIC +-gecko_mediaplayer_rm_so_LDFLAGS = -shared $(GLIB_LIBS) $(DBUS_LIBS) $(GCONF_LIBS) -fPIC +-gecko_mediaplayer_rm_so_LDADD = libgmlib/libgmlib.a ++gecko_mediaplayer_rm_so_LDFLAGS = -shared -fPIC ++gecko_mediaplayer_rm_so_LDADD = libgmlib/libgmlib.a $(GLIB_LIBS) $(DBUS_LIBS) $(GCONF_LIBS) + all: all-recursive + + .SUFFIXES: +Index: src/plugin.h +=================================================================== +--- src/plugin.h (revision 328) ++++ src/plugin.h (working copy) +@@ -84,6 +84,7 @@ + #define DISABLE_DVX "disable_dvx" + #define DEBUG_LEVEL "debug_level" + #define DISABLE_MIDI "disable_midi" ++#define PLAYER_BACKEND "player_backend" + + typedef enum { + PLAYING, +@@ -189,6 +190,7 @@ + gchar *console; + gchar *controls; + gchar *user_agent; ++ gchar *player_backend; + + // events + gboolean post_dom_events; +Index: src/plugin_dbus.cpp +=================================================================== +--- src/plugin_dbus.cpp (revision 328) ++++ src/plugin_dbus.cpp (working copy) +@@ -109,6 +109,14 @@ + return DBUS_HANDLER_RESULT_HANDLED; + } + ++ if (g_ascii_strcasecmp(dbus_message_get_member(message), "ListDump") == 0) { ++ ++ printf("playlist:\n"); ++ list_dump(instance->playlist); ++ ++ return DBUS_HANDLER_RESULT_HANDLED; ++ } ++ + if (g_ascii_strcasecmp(dbus_message_get_member(message), "RequestById") == 0) { + dbus_error_init(&error); + if (dbus_message_get_args(message, &error, DBUS_TYPE_STRING, &s, DBUS_TYPE_INVALID)) { +@@ -773,6 +781,10 @@ + + result = TRUE; + ++ } else if (g_ascii_strcasecmp(message, "/DEBUG") == 0) { ++ ++ result = TRUE; ++ + } else { + + if (instance->playlist != NULL) { +Index: src/Makefile.am +=================================================================== +--- src/Makefile.am (revision 328) ++++ src/Makefile.am (working copy) +@@ -39,7 +39,7 @@ + npp_gate.cpp \ + npupp.h + +-install_libexecdir = $(libdir)/mozilla/plugins ++install_libexecdir = $(plugindir) + install_libexec_PROGRAMS = \ + gecko-mediaplayer.so \ + gecko-mediaplayer-qt.so \ +@@ -52,40 +52,40 @@ + $(COMMONCODE) + + gecko_mediaplayer_so_CFLAGS = -fPIC +-gecko_mediaplayer_so_LDFLAGS = -shared $(GLIB_LIBS) $(DBUS_LIBS) $(GCONF_LIBS) -fPIC +-gecko_mediaplayer_so_LDADD = libgmlib/libgmlib.a ++gecko_mediaplayer_so_LDFLAGS = -shared -fPIC ++gecko_mediaplayer_so_LDADD = libgmlib/libgmlib.a $(GLIB_LIBS) $(DBUS_LIBS) $(GCONF_LIBS) + + gecko_mediaplayer_qt_so_SOURCES = \ + plugin_types_qt.cpp \ + $(COMMONCODE) + + gecko_mediaplayer_qt_so_CFLAGS = -fPIC +-gecko_mediaplayer_qt_so_LDFLAGS = -shared $(GLIB_LIBS) $(DBUS_LIBS) $(GCONF_LIBS) -fPIC +-gecko_mediaplayer_qt_so_LDADD = libgmlib/libgmlib.a ++gecko_mediaplayer_qt_so_LDFLAGS = -shared -fPIC ++gecko_mediaplayer_qt_so_LDADD = libgmlib/libgmlib.a $(GLIB_LIBS) $(DBUS_LIBS) $(GCONF_LIBS) + + gecko_mediaplayer_wmp_so_SOURCES = \ + plugin_types_wmp.cpp \ + $(COMMONCODE) + + gecko_mediaplayer_wmp_so_CFLAGS = -fPIC +-gecko_mediaplayer_wmp_so_LDFLAGS = -shared $(GLIB_LIBS) $(DBUS_LIBS) $(GCONF_LIBS) -fPIC +-gecko_mediaplayer_wmp_so_LDADD = libgmlib/libgmlib.a ++gecko_mediaplayer_wmp_so_LDFLAGS = -shared -fPIC ++gecko_mediaplayer_wmp_so_LDADD = libgmlib/libgmlib.a $(GLIB_LIBS) $(DBUS_LIBS) $(GCONF_LIBS) + + gecko_mediaplayer_dvx_so_SOURCES = \ + plugin_types_dvx.cpp \ + $(COMMONCODE) + + gecko_mediaplayer_dvx_so_CFLAGS = -fPIC +-gecko_mediaplayer_dvx_so_LDFLAGS = -shared $(GLIB_LIBS) $(DBUS_LIBS) $(GCONF_LIBS) -fPIC +-gecko_mediaplayer_dvx_so_LDADD = libgmlib/libgmlib.a ++gecko_mediaplayer_dvx_so_LDFLAGS = -shared -fPIC ++gecko_mediaplayer_dvx_so_LDADD = libgmlib/libgmlib.a $(GLIB_LIBS) $(DBUS_LIBS) $(GCONF_LIBS) + + gecko_mediaplayer_rm_so_SOURCES = \ + plugin_types_rm.cpp \ + $(COMMONCODE) + + gecko_mediaplayer_rm_so_CFLAGS = -fPIC +-gecko_mediaplayer_rm_so_LDFLAGS = -shared $(GLIB_LIBS) $(DBUS_LIBS) $(GCONF_LIBS) -fPIC +-gecko_mediaplayer_rm_so_LDADD = libgmlib/libgmlib.a ++gecko_mediaplayer_rm_so_LDFLAGS = -shared -fPIC ++gecko_mediaplayer_rm_so_LDADD = libgmlib/libgmlib.a $(GLIB_LIBS) $(DBUS_LIBS) $(GCONF_LIBS) + + indent: + indent -kr -l100 -i4 -nut *.cpp +Index: src/plugin_list.cpp +=================================================================== +--- src/plugin_list.cpp (revision 328) ++++ src/plugin_list.cpp (working copy) +@@ -356,7 +356,7 @@ + return list; + } else { + while (p != NULL) { +- urlptr = (gchar *) memmem(p,datalen - (p - data), "url ", 4); ++ urlptr = (gchar *) memmem_compat(p,datalen - (p - data), "url ", 4); + + + if (urlptr == NULL) { +@@ -385,7 +385,7 @@ + item->id = -1; + list = g_list_append(list, newitem); + } +- p = (gchar *) memmem(urlptr,datalen - (urlptr - data),"mmdr",4); ++ p = (gchar *) memmem_compat(urlptr,datalen - (urlptr - data),"mmdr",4); + } + + } +Index: ChangeLog +=================================================================== +--- ChangeLog (revision 328) ++++ ChangeLog (working copy) +@@ -1,3 +1,11 @@ ++Developement ++ Allow for configurable backend (fosfor or gnome-mplayer or something else) ++ Make dom event javascript a little more unique ++ React to Network Errors in DestroyStream differently ++ Added /DEBUG path for debugging purposes ++ Added ListDump dbus method ++ konqueror patch from Christian.Morales.Vega ++ plugin-dir patch from Christian.Morales.Vega + 0.9.8 + When cancelling a stream (USER_BREAK) and the cancelled one is streaming + don't automatically load the next item on the playlist +Index: gecko-mediaplayer.schemas +=================================================================== +--- gecko-mediaplayer.schemas (revision 328) ++++ gecko-mediaplayer.schemas (working copy) +@@ -62,5 +62,17 @@ + </locale> + </schema> + ++ <schema> ++ <key>/schemas/apps/gecko-mediaplayer/preferences/player_backend</key> ++ <applyto>/apps/gecko-mediaplayer/preferences/player_backend</applyto> ++ <owner>gecko-mediaplayer</owner> ++ <type>string</type> ++ <default></default> ++ <locale name="C"> ++ <short>Backend to use</short> ++ <long>Backend to use</long> ++ </locale> ++ </schema> ++ + </schemalist> + </gconfschemafile> diff --git a/recipes/gthumb/gthumb_2.10.11.bb b/recipes/gthumb/gthumb_2.10.11.bb index dc75a0bfb9..94f37a04d5 100644 --- a/recipes/gthumb/gthumb_2.10.11.bb +++ b/recipes/gthumb/gthumb_2.10.11.bb @@ -5,7 +5,9 @@ DEPENDS = "gtk+ libexif libgnome libgnomeui libgnomeprintui" inherit gnome -FILES_${PN} += "${datadir}/gnome* ${datadir}/application-registry/*" +PR = "r1" + +FILES_${PN} += "${libdir}/*.so ${datadir}/gnome* ${datadir}/application-registry/*" FILES_${PN}-dbg += "${libdir}/gthumb/modules/.debug" diff --git a/recipes/linux/linux-2.6.31/boc01/005-091008-isl12024.patch b/recipes/linux/linux-2.6.31/boc01/005-091103-isl12024.patch index 401ce4d9c8..9daab5acaa 100644 --- a/recipes/linux/linux-2.6.31/boc01/005-091008-isl12024.patch +++ b/recipes/linux/linux-2.6.31/boc01/005-091103-isl12024.patch @@ -1,37 +1,44 @@ +Support for the ISL12024 RTC, EEPROM and unique ID. + +Signed-off-by: Jeremy Laine <jeremy.laine@m4x.org> + Index: linux-2.6.31/drivers/misc/eeprom/at24.c =================================================================== ---- linux-2.6.31.orig/drivers/misc/eeprom/at24.c 2009-10-19 16:55:01.000000000 +0200 -+++ linux-2.6.31/drivers/misc/eeprom/at24.c 2009-10-19 16:55:05.000000000 +0200 +--- linux-2.6.31.orig/drivers/misc/eeprom/at24.c 2009-09-10 00:13:59.000000000 +0200 ++++ linux-2.6.31/drivers/misc/eeprom/at24.c 2009-11-03 11:17:22.000000000 +0100 @@ -115,6 +115,8 @@ { "spd", AT24_DEVICE_MAGIC(2048 / 8, AT24_FLAG_READONLY | AT24_FLAG_IRUGO) }, { "24c04", AT24_DEVICE_MAGIC(4096 / 8, 0) }, -+ /* Intersil RTC/Unique-ID isl12024 eeprom handled here */ ++ /* Intersil isl12024 eeprom */ + { "isl12024-eeprom", AT24_DEVICE_MAGIC(4096 / 8, AT24_FLAG_ADDR16) }, /* 24rf08 quirk is handled at i2c-core */ { "24c08", AT24_DEVICE_MAGIC(8192 / 8, 0) }, { "24c16", AT24_DEVICE_MAGIC(16384 / 8, 0) }, Index: linux-2.6.31/drivers/rtc/Kconfig =================================================================== ---- linux-2.6.31.orig/drivers/rtc/Kconfig 2009-10-19 16:55:01.000000000 +0200 -+++ linux-2.6.31/drivers/rtc/Kconfig 2009-10-19 16:55:05.000000000 +0200 -@@ -128,6 +128,12 @@ - - if I2C +--- linux-2.6.31.orig/drivers/rtc/Kconfig 2009-09-10 00:13:59.000000000 +0200 ++++ linux-2.6.31/drivers/rtc/Kconfig 2009-11-03 11:13:42.000000000 +0100 +@@ -193,6 +193,15 @@ + This driver can also be built as a module. If so, the module + will be called rtc-isl1208. +config RTC_DRV_ISL12024 -+ tristate "Intersil 12024 RTC/Unique-ID" ++ tristate "Intersil 12024" + help -+ If you say yes .... -+ This driver can also be built as a module. ++ If you say yes here you get support for the Intersil ISL12024 ++ RTC chip. This driver also exposes the chip's unique ID. ++ ++ This driver can also be built as a module. If so, the module ++ will be called rtc-isl12024. + - config RTC_DRV_DS1307 - tristate "Dallas/Maxim DS1307/37/38/39/40, ST M41T00, EPSON RX-8025" + config RTC_DRV_X1205 + tristate "Xicor/Intersil X1205" help Index: linux-2.6.31/drivers/rtc/Makefile =================================================================== ---- linux-2.6.31.orig/drivers/rtc/Makefile 2009-10-19 16:55:01.000000000 +0200 -+++ linux-2.6.31/drivers/rtc/Makefile 2009-10-19 16:55:05.000000000 +0200 +--- linux-2.6.31.orig/drivers/rtc/Makefile 2009-09-10 00:13:59.000000000 +0200 ++++ linux-2.6.31/drivers/rtc/Makefile 2009-11-03 11:13:42.000000000 +0100 @@ -40,6 +40,7 @@ obj-$(CONFIG_RTC_DRV_EP93XX) += rtc-ep93xx.o obj-$(CONFIG_RTC_DRV_FM3130) += rtc-fm3130.o @@ -43,20 +50,23 @@ Index: linux-2.6.31/drivers/rtc/Makefile Index: linux-2.6.31/drivers/rtc/rtc-isl12024.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.31/drivers/rtc/rtc-isl12024.c 2009-10-19 16:57:37.000000000 +0200 -@@ -0,0 +1,465 @@ ++++ linux-2.6.31/drivers/rtc/rtc-isl12024.c 2009-11-03 11:14:33.000000000 +0100 +@@ -0,0 +1,457 @@ +/* -+ * Intersil ISL12024 class driver -+ * ++ * Intersil ISL12024 rtc class driver + * + * Copyright (C) 2007, CenoSYS (www.cenosys.com). -+ * ++ * Copyright (C) 2009, Bollore telecom (www.bolloretelecom.eu). ++ * + * Guillaume Ligneul <guillaume.ligneul@gmail.com> + * Sylvain Giroudon <sylvain.giroudon@goobie.fr> + * Jeremy Laine <jeremy.laine@bolloretelecom.eu> + * -+ * This software program is licensed subject to the GNU General Public License -+ * (GPL).Version 2,June 1991, available at http://www.fsf.org/copyleft/gpl.html ++ * Based on rtc-x1205. ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 as ++ * published by the Free Software Foundation. + */ + +#include <linux/module.h> @@ -67,36 +77,7 @@ Index: linux-2.6.31/drivers/rtc/rtc-isl12024.c + +#define DRV_VERSION "0.3" + -+#define ISL12024_CCR_BASE 0x30 /* Base address of CCR */ -+#define ISL12024_ALM0_BASE 0x00 /* Base address of ALARM0 */ -+#define ISL12024_INT_AL0E 0x20 /* Alarm 0 enable */ -+ -+/* Register map */ -+ -+/* device id section */ -+#define ISL12024_REG_ID 0x20 -+ -+/* rtc section */ -+#define ISL12024_REG_HR_MIL (1<<7) /* 24h/12h mode */ -+#define ISL12024_REG_HR_PM (1<<5) /* PM/AM bit in 12h mode */ -+#define ISL12024_REG_SC 0x30 -+#define ISL12024_REG_DT 0x33 /* Date */ -+#define ISL12024_REG_MO 0x34 /* Month */ -+#define ISL12024_REG_YR 0x35 /* Year */ -+#define ISL12024_REG_DW 0x36 -+#define ISL12024_REG_Y2K 0x37 -+#define ISL12024_RTC_SECTION_LEN 8 -+ -+/* control/status section */ -+#define ISL12024_REG_SR 0x3F -+#define ISL12024_REG_SR_BAT (1<<7) /* battery */ -+#define ISL12024_REG_SR_AL1 (1<<6) /* alarm 0 */ -+#define ISL12024_REG_SR_AL0 (1<<5) /* alarm 1 */ -+#define ISL12024_REG_SR_OSCF (1<<4) /* oscillator fail */ -+#define ISL12024_REG_SR_RWEL (1<<2) /* register write enable latch */ -+#define ISL12024_REG_SR_WEL (1<<1) /* write enable latch */ -+#define ISL12024_REG_SR_RTCF (1<<0) /* rtc fail */ -+#define ISL12024_REG_INT 0x11 ++/* offsets into CCR area */ + +#define CCR_SEC 0 +#define CCR_MIN 1 @@ -107,8 +88,31 @@ Index: linux-2.6.31/drivers/rtc/rtc-isl12024.c +#define CCR_WDAY 6 +#define CCR_Y2K 7 + -+static int isl12024_get_status(struct i2c_client *client, unsigned char *sr); -+static int isl12024_fix_osc(struct i2c_client *client); ++/* alarm0 section */ ++#define ISL12024_REG_ALARM0 0x08 /* Base address of ALARM0 */ ++ ++/* device id section */ ++#define ISL12024_REG_ID 0x20 ++#define ISL12024_ID_SECTION_LEN 8 ++ ++/* rtc section */ ++#define ISL12024_REG_RTC 0x30 /* Base address of RTC */ ++#define ISL12024_REG_HR_MIL (1<<7) /* 24h/12h mode */ ++#define ISL12024_REG_HR_PM (1<<5) /* AM/PM bit in 12h mode */ ++#define ISL12024_RTC_SECTION_LEN 8 ++ ++/* control/status section */ ++#define ISL12024_REG_SR 0x3F ++#define ISL12024_REG_SR_BAT (1<<7) /* battery */ ++#define ISL12024_REG_SR_AL1 (1<<6) /* alarm 0 */ ++#define ISL12024_REG_SR_AL0 (1<<5) /* alarm 1 */ ++#define ISL12024_REG_SR_OSCF (1<<4) /* oscillator fail */ ++#define ISL12024_REG_SR_RWEL (1<<2) /* register write enable latch */ ++#define ISL12024_REG_SR_WEL (1<<1) /* write enable latch */ ++#define ISL12024_REG_SR_RTCF (1<<0) /* rtc fail */ ++#define ISL12024_REG_INT 0x11 ++ ++#define ISL12024_INT_AL0E 0x20 /* Alarm 0 enable */ + +static struct i2c_driver isl12024_driver; + @@ -117,70 +121,68 @@ Index: linux-2.6.31/drivers/rtc/rtc-isl12024.c + unsigned len) +{ + int ret; -+ u8 dt_addr[2]; ++ u8 dt_addr[2]; + + struct i2c_msg msgs[2] = { -+ { -+ .addr = client->addr, -+ .flags = 0, -+ .len = 2, -+ .buf = dt_addr, -+ }, -+ { -+ .addr = client->addr, -+ .flags = I2C_M_RD, -+ .len = len , -+ .buf = buf, -+ }, ++ { ++ .addr = client->addr, ++ .flags = 0, ++ .len = 2, ++ .buf = dt_addr, ++ }, ++ { ++ .addr = client->addr, ++ .flags = I2C_M_RD, ++ .len = len, ++ .buf = buf, ++ }, + }; + + dt_addr[0] = 0; + dt_addr[1] = reg; + + ret = i2c_transfer(client->adapter, msgs, 2); -+ if ( ret < 0) { -+ dev_err(&client->dev, "read error\n"); -+ return -EIO; ++ if (ret < 0) { ++ dev_err(&client->dev, "read error (%i)\n", ret); ++ return ret; + } -+ return ret; ++ return 0; +} + -+static int isl12024_i2c_validate_client(struct i2c_client *client) ++static int ++isl12024_i2c_set_regs(struct i2c_client *client, u8 reg, u8 const buf[], ++ unsigned len) +{ -+ u8 regs[ISL12024_RTC_SECTION_LEN] = { 0, }; -+ u8 zero_mask[ISL12024_RTC_SECTION_LEN] = { -+ 0x80, 0x80, 0x40, 0xc0, 0xe0, 0x00, 0xf8, 0xc6 -+ }; -+ -+ int i; + int ret; ++ u8 i2c_buf[10]; + -+ ret = isl12024_i2c_read_regs(client, ISL12024_REG_SC, regs, ISL12024_RTC_SECTION_LEN); -+ -+ if (ret < 0) -+ return ret; ++ i2c_buf[0] = 0; ++ i2c_buf[1] = reg; ++ memcpy(&i2c_buf[2], &buf[0], len); + -+ for (i = 0; i < ISL12024_RTC_SECTION_LEN; ++i) { -+ if (regs[i] & zero_mask[i]) /* check if bits are cleared */ -+ return -ENODEV; ++ ret = i2c_master_send(client, i2c_buf, len + 2); ++ if (ret != len + 2) { ++ dev_err(&client->dev, "write error (%d)\n", ret); ++ return -EIO; + } -+ + return 0; +} + +static int isl12024_read_time(struct i2c_client *client, -+ struct rtc_time *tm) ++ struct rtc_time *tm, u8 reg_base) +{ + unsigned char sr; + int err; + u8 regs[ISL12024_RTC_SECTION_LEN] = { 0, }; + -+ if (isl12024_get_status(client, &sr) < 0) { ++ if (isl12024_i2c_read_regs(client, ISL12024_REG_SR, &sr, ++ sizeof(sr)) < 0) { + dev_err(&client->dev, "reading SR failed\n"); + return -EIO; + } + -+ err = isl12024_i2c_read_regs(client, ISL12024_REG_SC, regs, ISL12024_RTC_SECTION_LEN); ++ err = isl12024_i2c_read_regs(client, reg_base, regs, ++ ISL12024_RTC_SECTION_LEN); + + if (err < 0) { + dev_err(&client->dev, "reading RTC section failed\n"); @@ -190,15 +192,15 @@ Index: linux-2.6.31/drivers/rtc/rtc-isl12024.c + tm->tm_sec = bcd2bin(regs[0]); + tm->tm_min = bcd2bin(regs[1]); + -+ { /* HR field has a more complex interpretation */ -+ const u8 _hr = regs[2]; -+ if (_hr & ISL12024_REG_HR_MIL) /* 24h format */ -+ tm->tm_hour = bcd2bin(_hr & 0x3f); -+ else { // 12h format -+ tm->tm_hour = bcd2bin(_hr & 0x1f); -+ if (_hr & ISL12024_REG_HR_PM) /* PM flag set */ -+ tm->tm_hour += 12; -+ } ++ /* HR field has a more complex interpretation */ ++ if (regs[2] & ISL12024_REG_HR_MIL) { ++ /* 24h format */ ++ tm->tm_hour = bcd2bin(regs[2] & 0x3f); ++ } else { ++ /* 12h format */ ++ tm->tm_hour = bcd2bin(regs[2] & 0x1f); ++ if (regs[2] & ISL12024_REG_HR_PM) /* PM flag set */ ++ tm->tm_hour += 12; + } + + tm->tm_mday = bcd2bin(regs[3]); @@ -209,36 +211,18 @@ Index: linux-2.6.31/drivers/rtc/rtc-isl12024.c + return rtc_valid_tm(tm); +} + -+static int isl12024_get_status(struct i2c_client *client, unsigned char *sr) -+{ -+ static unsigned char sr_addr[2] = { 0, ISL12024_REG_SR }; -+ -+ struct i2c_msg msgs[] = { -+ { client->addr, 0, 2, sr_addr }, /* setup read ptr */ -+ { client->addr, I2C_M_RD, 1, sr }, /* read status */ -+ }; -+ -+ /* read status register */ -+ if (i2c_transfer(client->adapter, &msgs[0], 2) != 2) { -+ dev_err(&client->dev, "%s: read error\n", __func__); -+ return -EIO; -+ } -+ -+ return 0; -+} -+ +static int isl12024_set_datetime(struct i2c_client *client, struct rtc_time *tm, -+ int datetoo, u8 reg_base, unsigned char alm_enable) ++ int datetoo, u8 reg_base, ++ unsigned char alm_enable) +{ + int i, xfer, nbytes; + unsigned char buf[8]; -+ unsigned char rdata[10] = { 0, reg_base }; + + static const unsigned char wel[3] = { 0, ISL12024_REG_SR, -+ ISL12024_REG_SR_WEL }; ++ ISL12024_REG_SR_WEL }; + + static const unsigned char rwel[3] = { 0, ISL12024_REG_SR, -+ ISL12024_REG_SR_WEL | ISL12024_REG_SR_RWEL }; ++ ISL12024_REG_SR_WEL | ISL12024_REG_SR_RWEL }; + + static const unsigned char diswe[3] = { 0, ISL12024_REG_SR, 0 }; + @@ -272,17 +256,19 @@ Index: linux-2.6.31/drivers/rtc/rtc-isl12024.c + } + + /* If writing alarm registers, set compare bits on registers 0-4 */ -+ if (reg_base < ISL12024_CCR_BASE) ++ if (reg_base == ISL12024_REG_ALARM0) + for (i = 0; i <= 4; i++) + buf[i] |= 0x80; + + /* this sequence is required to unlock the chip */ -+ if ((xfer = i2c_master_send(client, wel, 3)) != 3) { ++ xfer = i2c_master_send(client, wel, 3); ++ if (xfer != 3) { + dev_err(&client->dev, "%s: wel - %d\n", __func__, xfer); + return -EIO; + } + -+ if ((xfer = i2c_master_send(client, rwel, 3)) != 3) { ++ xfer = i2c_master_send(client, rwel, 3); ++ if (xfer != 3) { + dev_err(&client->dev, "%s: rwel - %d\n", __func__, xfer); + return -EIO; + } @@ -292,20 +278,12 @@ Index: linux-2.6.31/drivers/rtc/rtc-isl12024.c + nbytes = 8; + else + nbytes = 3; -+ for (i = 0; i < nbytes; i++) -+ rdata[2+i] = buf[i]; -+ -+ xfer = i2c_master_send(client, rdata, nbytes+2); -+ if (xfer != nbytes+2) { -+ dev_err(&client->dev, -+ "%s: result=%d addr=%02x, data=%02x\n", -+ __func__, -+ xfer, rdata[1], rdata[2]); -+ return -EIO; -+ } ++ xfer = isl12024_i2c_set_regs(client, reg_base, buf, nbytes); ++ if (xfer < 0) ++ return xfer; + + /* If we wrote to the nonvolatile region, wait 10msec for write cycle*/ -+ if (reg_base < ISL12024_CCR_BASE) { ++ if (reg_base == ISL12024_REG_ALARM0) { + unsigned char al0e[3] = { 0, ISL12024_REG_INT, 0 }; + + msleep(10); @@ -316,7 +294,7 @@ Index: linux-2.6.31/drivers/rtc/rtc-isl12024.c + xfer = i2c_master_send(client, rwel, 3); + if (xfer != 3) { + dev_err(&client->dev, -+ "%s: aloe rwel - %d\n", ++ "%s: al0e rwel - %d\n", + __func__, + xfer); + return -EIO; @@ -339,7 +317,8 @@ Index: linux-2.6.31/drivers/rtc/rtc-isl12024.c + } + + /* disable further writes */ -+ if ((xfer = i2c_master_send(client, diswe, 3)) != 3) { ++ xfer = i2c_master_send(client, diswe, 3); ++ if (xfer != 3) { + dev_err(&client->dev, "%s: diswe - %d\n", __func__, xfer); + return -EIO; + } @@ -354,31 +333,51 @@ Index: linux-2.6.31/drivers/rtc/rtc-isl12024.c + + tm.tm_hour = tm.tm_min = tm.tm_sec = 0; + -+ err = isl12024_set_datetime(client, &tm, 0, ISL12024_CCR_BASE, 0); -+ if ( err < 0 ) -+ dev_err(&client->dev, "unable to restart the oscillator (%d)\n", err); ++ err = isl12024_set_datetime(client, &tm, 0, ISL12024_REG_RTC, 0); ++ if (err < 0) ++ dev_err(&client->dev, ++ "unable to restart the oscillator (%d)\n", err); + + return err; +} + +static int isl12024_rtc_read_time(struct device *dev, struct rtc_time *tm) +{ -+ return isl12024_read_time(to_i2c_client(dev), tm); -+ ++ return isl12024_read_time(to_i2c_client(dev), tm, ++ ISL12024_REG_RTC); +} + +static int isl12024_rtc_set_time(struct device *dev, struct rtc_time *tm) +{ -+ return isl12024_set_datetime(to_i2c_client(dev), -+ tm, 1, ISL12024_CCR_BASE, 0); ++ return isl12024_set_datetime(to_i2c_client(dev), tm, 1, ++ ISL12024_REG_RTC, 0); ++} ++ ++static int isl12024_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm) ++{ ++ unsigned char intr; ++ int err; ++ struct i2c_client *client = to_i2c_client(dev); ++ ++ err = isl12024_i2c_read_regs(client, ISL12024_REG_INT, &intr, ++ sizeof(intr)); ++ if (err < 0) ++ return err; ++ alrm->enabled = (intr & ISL12024_INT_AL0E) ? 1 : 0; ++ ++ return isl12024_read_time(client, &alrm->time, ISL12024_REG_ALARM0); ++} ++ ++static int isl12024_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm) ++{ ++ return isl12024_set_datetime(to_i2c_client(dev), &alrm->time, 1, ++ ISL12024_REG_ALARM0, alrm->enabled); +} + +static int +isl12024_rtc_proc(struct device *dev, struct seq_file *seq) +{ -+ + /* Nothing to do */ -+ + return 0; +} + @@ -386,19 +385,23 @@ Index: linux-2.6.31/drivers/rtc/rtc-isl12024.c + .proc = isl12024_rtc_proc, + .read_time = isl12024_rtc_read_time, + .set_time = isl12024_rtc_set_time, ++ .read_alarm = isl12024_rtc_read_alarm, ++ .set_alarm = isl12024_rtc_set_alarm, +}; + -+static ssize_t isl12024_show_id(struct device *dev, struct device_attribute *attr, -+ char *buf) ++static ssize_t isl12024_show_id(struct device *dev, ++ struct device_attribute *attr, ++ char *buf) +{ + struct i2c_client *client = to_i2c_client(dev); + int err; -+ int len = 0; ++ ssize_t len = 0; + int i; -+ u8 id_buffer[ISL12024_RTC_SECTION_LEN]; ++ u8 id_buffer[ISL12024_ID_SECTION_LEN]; + + /* Read unique id from eeprom */ -+ err = isl12024_i2c_read_regs(client, ISL12024_REG_ID, id_buffer, sizeof(id_buffer)); ++ err = isl12024_i2c_read_regs(client, ISL12024_REG_ID, id_buffer, ++ sizeof(id_buffer)); + if (err < 0) { + dev_err(&client->dev, "reading RTC section failed\n"); + return err; @@ -423,26 +426,22 @@ Index: linux-2.6.31/drivers/rtc/rtc-isl12024.c + if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) + return -ENODEV; + -+ if (isl12024_i2c_validate_client(client) < 0) -+ return -ENODEV; -+ -+ dev_info(&client->dev, -+ "chip found, driver version " DRV_VERSION "\n"); ++ dev_info(&client->dev, ++ "chip found, driver version " DRV_VERSION "\n"); + + rtc = rtc_device_register(isl12024_driver.driver.name, + &client->dev, &isl12024_rtc_ops, + THIS_MODULE); -+ + if (IS_ERR(rtc)) + return PTR_ERR(rtc); + + i2c_set_clientdata(client, rtc); + -+ rc = isl12024_get_status(client, &sr); -+ if (rc < 0) { -+ dev_err(&client->dev, "reading status failed\n"); -+ goto exit_unregister; -+ } ++ rc = isl12024_i2c_read_regs(client, ISL12024_REG_SR, &sr, sizeof(sr)); ++ if (rc < 0) { ++ dev_err(&client->dev, "reading status failed\n"); ++ goto exit_unregister; ++ } + + /* Check for power failures and enable the osc */ + if (sr & ISL12024_REG_SR_RTCF) { @@ -477,18 +476,18 @@ Index: linux-2.6.31/drivers/rtc/rtc-isl12024.c +} + +static const struct i2c_device_id isl12024_id[] = { -+ { "isl12024", 0 }, -+ { } ++ { "isl12024", 0 }, ++ { } +}; +MODULE_DEVICE_TABLE(i2c, isl12024_id); + +static struct i2c_driver isl12024_driver = { -+ .driver = { -+ .name = "rtc-isl12024", -+ }, -+ .probe = isl12024_probe, -+ .remove = isl12024_remove, -+ .id_table = isl12024_id, ++ .driver = { ++ .name = "rtc-isl12024", ++ }, ++ .probe = isl12024_probe, ++ .remove = isl12024_remove, ++ .id_table = isl12024_id, +}; + +/* module init/exit */ diff --git a/recipes/linux/linux-omap-2.6.29/2.6.29_relocation_1.patch b/recipes/linux/linux-omap-2.6.29/2.6.29_relocation_1.patch new file mode 100644 index 0000000000..627f03c785 --- /dev/null +++ b/recipes/linux/linux-omap-2.6.29/2.6.29_relocation_1.patch @@ -0,0 +1,11 @@ +--- /tmp/elf.h 2009-11-03 20:29:16.000000000 +0100 ++++ git/arch/arm/include/asm/elf.h 2009-11-03 20:29:40.000000000 +0100 +@@ -50,6 +50,8 @@ + #define R_ARM_ABS32 2 + #define R_ARM_CALL 28 + #define R_ARM_JUMP24 29 ++#define R_ARM_MOVW_ABS_NC 43 ++#define R_ARM_MOVT_ABS 44 + + /* + * These are used to set parameters in the core dumps. diff --git a/recipes/linux/linux-omap-2.6.29/2.6.29_relocation_2.patch b/recipes/linux/linux-omap-2.6.29/2.6.29_relocation_2.patch new file mode 100644 index 0000000000..caa8dd533d --- /dev/null +++ b/recipes/linux/linux-omap-2.6.29/2.6.29_relocation_2.patch @@ -0,0 +1,33 @@ +--- /tmp/module.c 2009-11-03 20:30:56.000000000 +0100 ++++ git/arch/arm/kernel/module.c 2009-11-03 20:34:33.000000000 +0100 +@@ -83,6 +83,7 @@ + unsigned long loc; + Elf32_Sym *sym; + s32 offset; ++ s32 addend; + + offset = ELF32_R_SYM(rel->r_info); + if (offset < 0 || offset > (symsec->sh_size / sizeof(Elf32_Sym))) { +@@ -132,6 +133,22 @@ + *(u32 *)loc |= offset & 0x00ffffff; + break; + ++ case R_ARM_MOVW_ABS_NC: ++ case R_ARM_MOVT_ABS: ++ offset = sym->st_value; ++ ++ addend = ((*(u32 *)loc >> 4) & 0xf000) | (*(u32 *)loc &0xfff); ++ addend = (addend ^ 0x8000) - 0x8000; ++ offset += addend; ++ ++ if (ELF32_R_TYPE(rel->r_info) == R_ARM_MOVT_ABS) ++ offset >>= 16; ++ ++ *(u32 *)loc &= 0xfff0f000; ++ *(u32 *)loc |= offset & 0xfff; ++ *(u32 *)loc |= (offset & 0xf000) << 4; ++ break; ++ + default: + printk(KERN_ERR "%s: unknown relocation: %u\n", + module->name, ELF32_R_TYPE(rel->r_info)); diff --git a/recipes/linux/linux-omap_2.6.29.bb b/recipes/linux/linux-omap_2.6.29.bb index 465d5adc00..130f9a8f69 100644 --- a/recipes/linux/linux-omap_2.6.29.bb +++ b/recipes/linux/linux-omap_2.6.29.bb @@ -166,6 +166,8 @@ SRC_URI_append = " \ file://arch-has-holes.diff;patch=1 \ file://cache/l1cache-shift.patch;patch=1 \ file://cache/copy-page-tweak.patch;patch=1 \ + file://2.6.29_relocation_1.patch;patch=1 \ + file://2.6.29_relocation_2.patch;patch=1 \ " diff --git a/recipes/linux/linux_2.6.31.bb b/recipes/linux/linux_2.6.31.bb index d908326016..15597104b6 100644 --- a/recipes/linux/linux_2.6.31.bb +++ b/recipes/linux/linux_2.6.31.bb @@ -25,7 +25,7 @@ SRC_URI_append_boc01 = "\ file://boc01.dts \ file://boc01.dts.v1 \ file://004-081205-usb.patch;patch=1 \ - file://005-091008-isl12024.patch;patch=1 \ + file://005-091103-isl12024.patch;patch=1 \ file://007-091005-lm73.patch;patch=1 \ file://011-091028-gpio.patch;patch=1 \ file://012-091019-capsense.patch;patch=1 \ diff --git a/recipes/mysql/mysql_4.1.22.bb b/recipes/mysql/mysql_4.1.22.bb index 09c52ecbc2..b6718cb0cb 100644 --- a/recipes/mysql/mysql_4.1.22.bb +++ b/recipes/mysql/mysql_4.1.22.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.mysql.com/" SECTION = "libs" LICENSE = "GPL" DEPENDS = "ncurses" -PR = "r3" +PR = "r4" SRC_URI = "http://downloads.mysql.com/archives/mysql-4.1/mysql-${PV}.tar.gz \ file://autofoo.patch;patch=1 \ @@ -39,8 +39,8 @@ do_stage() { } do_stage_append() { - sed -i -es,^pkgincludedir=\'/usr/include/mysql\',pkgincludedir=\'\', ${STAGING_BINDIR_CROSS}/mysql_config - sed -i -es,^pkglibdir=\'/usr/lib/mysql\',pkglibdir=\'\', ${STAGING_BINDIR_CROSS}/mysql_config + sed -i -es,^pkgincludedir=\'/usr/include/mysql\',pkgincludedir=\'${STAGING_INCDIR}\', ${STAGING_BINDIR_CROSS}/mysql_config + sed -i -es,^pkglibdir=\'/usr/lib/mysql\',pkglibdir=\'${STAGING_LIBDIR}\', ${STAGING_BINDIR_CROSS}/mysql_config } do_install() { diff --git a/recipes/mythtv/mythplugins/mytharchive.pro.patch b/recipes/mythtv/mythplugins/mytharchive.pro.patch new file mode 100644 index 0000000000..e5ea1808a9 --- /dev/null +++ b/recipes/mythtv/mythplugins/mytharchive.pro.patch @@ -0,0 +1,41 @@ +Index: mythplugins-0.22rc2/mytharchive/mytharchive/mytharchive.pro +=================================================================== +--- mythplugins-0.22rc2.orig/mytharchive/mytharchive/mytharchive.pro ++++ mythplugins-0.22rc2/mytharchive/mytharchive/mytharchive.pro +@@ -32,28 +32,28 @@ SOURCES += dbcheck.cpp archiveutil.cpp s + SOURCES += mythburn.cpp themeselector.cpp editmetadata.cpp thumbfinder.cpp + SOURCES += exportnative.cpp importnative.cpp + +-burnuifiles.path = $${SYSROOT}$${PREFIX}/share/mythtv/themes/default ++burnuifiles.path = $${PREFIX}/share/mythtv/themes/default + burnuifiles.files = mythburn-ui.xml + +-scriptfiles.path = $${SYSROOT}$${PREFIX}/share/mythtv/mytharchive/scripts ++scriptfiles.path = $${PREFIX}/share/mythtv/mytharchive/scripts + scriptfiles.files = ../mythburn/scripts/* + +-introfiles.path = $${SYSROOT}$${PREFIX}/share/mythtv/mytharchive/intro ++introfiles.path = $${PREFIX}/share/mythtv/mytharchive/intro + introfiles.files = ../mythburn/intro/*.mpg + +-musicfiles.path = $${SYSROOT}$${PREFIX}/share/mythtv/mytharchive/music ++musicfiles.path = $${PREFIX}/share/mythtv/mytharchive/music + musicfiles.files = ../mythburn/music/*.ac3 + +-imagefiles.path = $${SYSROOT}$${PREFIX}/share/mythtv/mytharchive/images ++imagefiles.path = $${PREFIX}/share/mythtv/mytharchive/images + imagefiles.files = ../mythburn/images/*.png + +-themefiles.path = $${SYSROOT}$${PREFIX}/share/mythtv/mytharchive/themes ++themefiles.path = $${PREFIX}/share/mythtv/mytharchive/themes + themefiles.files = ../mythburn/themes/* + +-profilefiles.path = $${SYSROOT}$${PREFIX}/share/mythtv/mytharchive/encoder_profiles ++profilefiles.path = $${PREFIX}/share/mythtv/mytharchive/encoder_profiles + profilefiles.files = ../mythburn/encoder_profiles/*.xml + +-nativeuifiles.path = $${SYSROOT}$${PREFIX}/share/mythtv/themes/default ++nativeuifiles.path = $${PREFIX}/share/mythtv/themes/default + nativeuifiles.files = mythnative-ui.xml + + INSTALLS += scriptfiles introfiles themefiles imagefiles musicfiles diff --git a/recipes/mythtv/mythplugins_0.21+0.22rc2.bb b/recipes/mythtv/mythplugins_0.21+0.22rc2.bb index 63ef18ffec..31025329a3 100644 --- a/recipes/mythtv/mythplugins_0.21+0.22rc2.bb +++ b/recipes/mythtv/mythplugins_0.21+0.22rc2.bb @@ -1,12 +1,9 @@ # todo: add mythweb -# todo: fix and add zoneminder DEPENDS = "flac taglib mythtv libvorbis libexif libvisual libsdl-x11 libcdaudio cdparanoia" RDEPENDS_${PN} = "mytharchive mythbrowser mythflix mythgallery \ mythgame mythmusic mythmovies mythnews mythvideo mythweather" PV = "0.21+0.22rc2" -PR = "r1" - -#DEFAULT_PREFERENCE = "-1" +PR = "r3" QMAKE_PROFILES = "mythplugins.pro" @@ -14,20 +11,19 @@ SRC_URI = "ftp://ftp.osuosl.org/pub/mythtv/mythplugins-0.22rc2.tar.bz2 \ file://sysroot.patch;patch=1 \ file://mythplugins_wo_qtopengl.diff;patch=1 \ file://configure.patch;patch=1 \ + file://mytharchive.pro.patch;patch=1 \ " S = "${WORKDIR}/mythplugins-0.22rc2" inherit qmake2 qt4x11 -# zoneminder needs sql files EXTRA_OECONF = " \ --cross-prefix=${TARGET_PREFIX} \ --sysroot=${STAGING_DIR_HOST} \ --prefix=${prefix} \ --with-libdir-name=${STAGING_LIBDIR} \ --disable-opengl \ - --disable-mythzoneminder \ \ --extra-cflags="${TARGET_CFLAGS} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \ --extra-cxxflags="${TARGET_CXXFLAGS} ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" \ @@ -64,6 +60,8 @@ FILES_mytharchive = "${libdir}/mythtv/plugins/libmytharchive.so \ ${datadir}/mythtv/themes/default/mythburn-ui.xml \ ${datadir}/mythtv/themes/default/mythnative-ui.xml \ ${datadir}/mythtv/themes/default/ma_*.png \ + ${datadir}/mythtv/themes/default/mb_progressbar_background.png \ + ${datadir}/mythtv/themes/default/mb_progressbar_fill.png \ ${datadir}/mythtv/themes/default-wide/mytharchive-ui.xml \ ${datadir}/mythtv/themes/default-wide/mythburn-ui.xml \ ${datadir}/mythtv/themes/default-wide/mythnative-ui.xml \ @@ -73,7 +71,6 @@ FILES_mytharchive-dbg = "${bindir}/.debug/mytharchivehelper \ FILES_mythbrowser = "${libdir}/mythtv/plugins/libmythbrowser.so \ ${bindir}/mythbrowser \ ${datadir}/mythtv/i18n/mythbrowser* \ - ${datadir}/mythtv/themes/default/webpage.png \ ${datadir}/mythtv/themes/default/browser-ui.xml \ ${datadir}/mythtv/themes/default-wide/browser-ui.xml \ " @@ -86,7 +83,6 @@ FILES_mythflix = "${libdir}/mythtv/plugins/libmythflix.so \ ${datadir}/mythtv/themes/default/netflix-ui.xml \ ${datadir}/mythtv/themes/default-wide/netflix-ui.xml \ ${datadir}/mythtv/themes/default/title_netflix.png \ - ${datadir}/mythtv/themes/default-wide/title_netflix-bg.png \ ${datadir}/mythtv/themes/default-wide/netflix-bg.png \ " FILES_mythflix-dbg = "${libdir}/mythtv/plugins/.debug/libmythflix.so" @@ -194,29 +190,29 @@ FILES_mythvideo = "${libdir}/mythtv/plugins/libmythvideo.so \ ${bindir}/mtd \ ${datadir}/mythtv/mythvideo/* \ ${datadir}/mythtv/i18n/mythvideo* \ - $(datadir)/mythtv/themes/default/mv_level_none.png \ - $(datadir)/mythtv/themes/default/mv_level_high.png \ - $(datadir)/mythtv/themes/default/mv_results_popup.png \ - $(datadir)/mythtv/themes/default-wide/mv_results_popup.png \ - $(datadir)/mythtv/themes/default/mv_level_low.png \ - $(datadir)/mythtv/themes/default/mv_level_medium.png \ - $(datadir)/mythtv/themes/default/mv_browse_selector.png \ - $(datadir)/mythtv/themes/default-wide/mv_browse_selector.png \ - $(datadir)/mythtv/themes/default-wide/mv_browse_background.png \ - $(datadir)/mythtv/themes/default-wide/mv_browse_nocover_large.png \ - $(datadir)/mythtv/themes/default-wide/mv_itemdetail_popup.png \ + ${datadir}/mythtv/themes/default/md_progress_background.png \ + ${datadir}/mythtv/themes/default/md_rip_banner.png \ + ${datadir}/mythtv/themes/default/mv_level_none.png \ + ${datadir}/mythtv/themes/default/mv_browse_background.png \ + ${datadir}/mythtv/themes/default/mv_itemdetail_popup.png \ + ${datadir}/mythtv/themes/default/mv_filerequest.png \ + ${datadir}/mythtv/themes/default/mv_level_high.png \ + ${datadir}/mythtv/themes/default/mv_results_popup.png \ + ${datadir}/mythtv/themes/default-wide/mv_results_popup.png \ + ${datadir}/mythtv/themes/default/mv_level_low.png \ + ${datadir}/mythtv/themes/default/mv_level_lowest.png \ + ${datadir}/mythtv/themes/default/mv_level_medium.png \ + ${datadir}/mythtv/themes/default/mv_browse_selector.png \ + ${datadir}/mythtv/themes/default-wide/mv_results_popup.png \ + ${datadir}/mythtv/themes/default-wide/mv_browse_selector.png \ + ${datadir}/mythtv/themes/default-wide/mv_browse_background.png \ + ${datadir}/mythtv/themes/default-wide/mv_browse_nocover_large.png \ + ${datadir}/mythtv/themes/default-wide/mv_itemdetail_popup.png \ ${datadir}/mythtv/themes/default-wide/movies-ui.xml \ ${datadir}/mythtv/themes/default/dvd-ui.xml \ ${datadir}/mythtv/themes/default-wide/dvd-ui.xml \ ${datadir}/mythtv/themes/default/video-ui.xml \ ${datadir}/mythtv/themes/default-wide/video-ui.xml \ - ${datadir}/mythtv/themes/default-wide/mv-background.png \ - ${datadir}/mythtv/themes/default-wide/mv-mselect.png \ - ${datadir}/mythtv/themes/default-wide/mv-sel.png \ - ${datadir}/mythtv/themes/default-wide/mv-wait-background.png \ - ${datadir}/mythtv/themes/default-wide/mv-filerequest.png \ - ${datadir}/mythtv/themes/default-wide/mv-other_background.png \ - ${datadir}/mythtv/themes/default-wide/mv-selected.png \ ${datadir}/mythtv/video_settings.xml \ ${datadir}/mythtv/videomenu.xml \ " diff --git a/recipes/neon/neon_0.25.5.bb b/recipes/neon/neon_0.25.5.bb index 9151a74665..0f99c0ba9b 100644 --- a/recipes/neon/neon_0.25.5.bb +++ b/recipes/neon/neon_0.25.5.bb @@ -13,6 +13,7 @@ SRC_URI = "http://www.webdav.org/${PN}/${P}.tar.gz \ inherit autotools binconfig lib_package pkgconfig EXTRA_OECONF = "--with-ssl=gnutls --with-libxml2 --with-expat --enable-shared" +EXTRA_AUTORECONF=" -I ${S}/macros " do_stage() { autotools_stage_all diff --git a/recipes/neon/neon_0.26.0.bb b/recipes/neon/neon_0.26.0.bb index 3a234851aa..4df99f7b2c 100644 --- a/recipes/neon/neon_0.26.0.bb +++ b/recipes/neon/neon_0.26.0.bb @@ -11,6 +11,7 @@ SRC_URI = "http://www.webdav.org/${PN}/${P}.tar.gz" inherit autotools binconfig lib_package pkgconfig EXTRA_OECONF = "--with-ssl=gnutls --with-libxml2 --with-expat --enable-shared" +EXTRA_AUTORECONF=" -I ${S}/macros " do_stage () { autotools_stage_all diff --git a/recipes/ntp/ntp-4.2.4p7/ntpdate b/recipes/ntp/ntp-4.2.4p7/ntpdate new file mode 100755 index 0000000000..784b029ad5 --- /dev/null +++ b/recipes/ntp/ntp-4.2.4p7/ntpdate @@ -0,0 +1,49 @@ +#!/bin/sh + +PATH=/sbin:/bin:/usr/bin + +test -x /usr/bin/ntpdate || exit 0 + +if test -f /etc/default/ntpdate ; then +. /etc/default/ntpdate +else +NTPSERVERS="pool.ntp.org" +fi + +test -n "$NTPSERVERS" || exit 0 + +# This is a heuristic: The idea is that if a static interface is brought +# up, that is a major event, and we can put in some extra effort to fix +# the system time. Feel free to change this, especially if you regularly +# bring up new network interfaces. +if [ "$METHOD" = static ]; then + OPTS="-b" +fi + +if [ "$METHOD" = loopback ]; then + exit 0 +fi + +( + +LOCKFILE=/var/lock/ntpdate + +# Avoid running more than one at a time +if [ -x /usr/bin/lockfile-create ]; then + lockfile-create $LOCKFILE + lockfile-touch $LOCKFILE & + LOCKTOUCHPID="$!" +fi + +if /usr/bin/ntpdate -s $OPTS $NTPSERVERS 2>/dev/null; then + if [ "$UPDATE_HWCLOCK" = "yes" ]; then + hwclock --systohc || : + fi +fi + +if [ -x /usr/bin/lockfile-create ] ; then + kill $LOCKTOUCHPID + lockfile-remove $LOCKFILE +fi + +) & diff --git a/recipes/ntp/ntp_4.2.4p7.bb b/recipes/ntp/ntp_4.2.4p7.bb index 5e24e8adb1..4109c40c29 100644 --- a/recipes/ntp/ntp_4.2.4p7.bb +++ b/recipes/ntp/ntp_4.2.4p7.bb @@ -1,6 +1,6 @@ require ntp.inc -PR = "r0" +PR = "r1" SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/${P}.tar.gz \ file://tickadj.c.patch;patch=1 \ @@ -17,24 +17,24 @@ FILES_${PN}-bin = "${bindir}/ntp-wait ${bindir}/ntpdc ${bindir}/ntpq ${bindir}/n FILES_${PN} = "${bindir}/ntpd ${sysconfdir}/ntp.conf ${sysconfdir}/init.d/ntpd" FILES_${PN}-tickadj = "${bindir}/tickadj" FILES_ntp-utils = "${bindir}/*" +FILES_ntpdate = "${bindir}/ntpdate ${sysconfdir}/network/if-up.d/ntpdate" do_install_append() { install -d ${D}/${sysconfdir}/init.d install -m 644 ${WORKDIR}/ntp.conf ${D}/${sysconfdir} - install -m 755 ${WORKDIR}/ntpdate ${D}/${sysconfdir}/init.d install -m 755 ${WORKDIR}/ntpd ${D}/${sysconfdir}/init.d + install -d ${D}/${sysconfdir}/network/if-up.d + install -m 755 ${WORKDIR}/ntpdate ${D}/${sysconfdir}/network/if-up.d } pkg_postinst_ntpdate() { if test "x$D" != "x"; then exit 1 else - if ! grep -q ntpdate /etc/cron/crontabs/root; then + if ! grep -q -s ntpdate /etc/cron/crontabs/root; then echo "adding crontab" test -d /etc/cron/crontabs || mkdir -p /etc/cron/crontabs echo "30 * * * * /usr/bin/ntpdate -s -u pool.ntp.org" >> /etc/cron/crontabs/root fi - update-rc.d -s busybox-cron defaults - update-rc.d -s ntpdate defaults 30 fi } diff --git a/recipes/openvpn/openvpn_2.0.9+2.1rc20.bb b/recipes/openvpn/openvpn_2.0.9+2.1rc20.bb new file mode 100644 index 0000000000..f671e15165 --- /dev/null +++ b/recipes/openvpn/openvpn_2.0.9+2.1rc20.bb @@ -0,0 +1,9 @@ +require openvpn.inc + +SRC_URI = "http://openvpn.net/release/openvpn-2.1_rc20.tar.gz \ + file://openvpn" + +S = "${WORKDIR}/openvpn-2.1_rc20" + +# I want openvpn to be able to read password from file (hrw) +EXTRA_OECONF += "--enable-password-save" diff --git a/recipes/opkg/opkg.inc b/recipes/opkg/opkg.inc index c146c75b79..aa91955c3a 100644 --- a/recipes/opkg/opkg.inc +++ b/recipes/opkg/opkg.inc @@ -4,13 +4,14 @@ SECTION = "base" LICENSE = "GPL" DEPENDS = "curl gpgme" PV = "0.1.6+svnr${SRCREV}" -INC_PR = "r15" +INC_PR = "r16" FILESPATHPKG =. "opkg:" SRC_URI = "svn://opkg.googlecode.com/svn;module=trunk;proto=http \ file://opkg_unarchive.patch;patch=1;maxrev=201 \ - file://opkg-intercept-cleanup.patch;patch=1" + file://opkg-intercept-cleanup.patch;patch=1 \ + file://isatty.patch;patch=1" SRC_URI += "file://configure" diff --git a/recipes/opkg/opkg/isatty.patch b/recipes/opkg/opkg/isatty.patch new file mode 100644 index 0000000000..c935f153d1 --- /dev/null +++ b/recipes/opkg/opkg/isatty.patch @@ -0,0 +1,64 @@ +Copyright (c) 2009 MontaVista Software, Inc. All rights reserved. + +Don't prompt for user input from stdin if it's not a tty. Fixes a minor +memory leak while we're at it, as the code was strdup'ing the malloc'd string +read from stdin without ever freeing the original. +--- + libopkg/libopkg.c | 13 ++++++++----- + libopkg/opkg_install.c | 3 +++ + libopkg/user.c | 10 +++++++--- + 3 files changed, 18 insertions(+), 8 deletions(-) + +--- trunk.orig/libopkg/libopkg.c ++++ trunk/libopkg/libopkg.c +@@ -71,11 +71,14 @@ int default_opkg_status_callback(char *n + char* default_opkg_response_callback(char *question) + { + char *response = NULL; +- printf("%s",question); +- fflush(stdout); +- do { +- response = (char *)file_read_line_alloc(stdin); +- } while (response == NULL); ++ if (isatty(fileno(stdin))) ++ { ++ printf("%s",question); ++ fflush(stdout); ++ do { ++ response = (char *)file_read_line_alloc(stdin); ++ } while (response == NULL); ++ } + return response; + } + +--- trunk.orig/libopkg/user.c ++++ trunk/libopkg/user.c +@@ -44,9 +44,13 @@ char *get_user_response(const char *form + len = vsnprintf(question,question_len,format,ap); + va_end(ap); + } while (len > question_len); +- response = strdup(opkg_cb_response(question)); +- str_chomp(response); +- str_tolower(response); ++ ++ response = opkg_cb_response(question); ++ if (response) ++ { ++ str_chomp(response); ++ str_tolower(response); ++ } + + return response; + } +--- trunk.orig/libopkg/opkg_install.c ++++ trunk/libopkg/opkg_install.c +@@ -1613,6 +1613,9 @@ static int user_prefers_old_conffile(con + " D : show the differences between the versions (if diff is installed)\n" + " The default action is to keep your current version.\n" + " *** %s (Y/I/N/O/D) [default=N] ? ", file_name, short_file_name); ++ if (!response) ++ return 1; ++ + if (strcmp(response, "y") == 0 + || strcmp(response, "i") == 0 + || strcmp(response, "yes") == 0) { diff --git a/recipes/perl/libxml-parser-perl_2.36.bb b/recipes/perl/libxml-parser-perl_2.36.bb new file mode 100644 index 0000000000..c96489b2de --- /dev/null +++ b/recipes/perl/libxml-parser-perl_2.36.bb @@ -0,0 +1,21 @@ +SECTION = "libs" +LICENSE = "Artistic" +DEPENDS += "expat expat-native" + +SRC_URI = "http://www.cpan.org/modules/by-module/XML/XML-Parser-${PV}.tar.gz" + +S = "${WORKDIR}/XML-Parser-${PV}" + +EXTRA_CPANFLAGS = "EXPATLIBPATH=${STAGING_LIBDIR} EXPATINCPATH=${STAGING_INCDIR}" + +inherit cpan + +do_compile() { + export LIBC="$(find ${STAGING_DIR}/lib -name 'libc-*.so')" + cpan_do_compile +} + + + +FILES_${PN} = "${PERLLIBDIRS}/auto/XML/Parser/Expat/* \ + ${PERLLIBDIRS}/XML" diff --git a/recipes/powervr-drivers/libgles-omap3.inc b/recipes/powervr-drivers/libgles-omap3.inc index 1f098da1fe..79dcf59dd0 100644 --- a/recipes/powervr-drivers/libgles-omap3.inc +++ b/recipes/powervr-drivers/libgles-omap3.inc @@ -52,7 +52,7 @@ BINLOCATION ?= "${S}/gfx_rel" PACKAGES += " xserver-kdrive-powervrsgx ${PN}-tests ${PN}-demos" -FILES_${PN} = "${sysconfdir} ${libdir}/lib*.so.* ${libdir}/ES*/* ${bindir}/pvrsrvinit ${bindir}/*/*" +FILES_${PN} = "${sysconfdir} ${libdir}/lib*.so.* ${libdir}/ES*/* ${bindir}/pvrsrvinit ${bindir}/cputype ${bindir}/*/*" FILES_xserver-kdrive-powervrsgx = "${bindir}/Xsgx" FILES_${PN}-tests = "${bindir}" FILES_${PN}-demos = "${prefix}/demos ${prefix}/share/applications " @@ -101,9 +101,10 @@ do_install () { install -d ${D}${includedir} cp -pPR ${S}/GFX_Linux_SDK/OGLES2/SDKPackage/Builds/OGLES2/Include/* ${D}${includedir}/ cp -pPR ${S}/GFX_Linux_SDK/OGLES/SDKPackage/Builds/OGLES/Include/* ${D}${includedir}/ - cp -pPR ${S}/GFX_Linux_SDK/OGLES/SDKPackage/Builds/OGLES/LinuxOMAP3/Include/GLES/* ${D}${includedir}/GLES/ - cp -pPr ${S}/GFX_Linux_SDK/OGLES2/SDKPackage/Builds/OGLES2/LinuxOMAP3/Include/GLES/* ${D}${includedir}/GLES2/ - cp -pPr ${S}/GFX_Linux_SDK/OVG/SDKPackage/Builds/OVG/Include/v* ${D}${includedir}/ + cp -pPR ${S}/GFX_Linux_SDK/OGLES/SDKPackage/Builds/OGLES/LinuxOMAP3/Include/GLES/* ${D}${includedir}/GLES/ || true + cp -pPr ${S}/GFX_Linux_SDK/OGLES2/SDKPackage/Builds/OGLES2/LinuxOMAP3/Include/GLES/* ${D}${includedir}/GLES2/ || true + cp -pPr ${S}/GFX_Linux_SDK/OVG/SDKPackage/Builds/OVG/Include/v* ${D}${includedir}/ || true + cp -pPr ${S}/GFX_Linux_SDK/OVG/SDKPackage/Builds/OVG/Include/V* ${D}${includedir}/ || true cp -pPr ${S}/include/*.h ${D}${includedir} || true install -d ${D}${sysconfdir}/init.d/ @@ -134,10 +135,11 @@ do_stage () { cp -pPR ${S}/GFX_Linux_SDK/OGLES2/SDKPackage/Builds/OGLES2/Include/* ${STAGING_INCDIR}/ cp -pPR ${S}/GFX_Linux_SDK/OGLES/SDKPackage/Builds/OGLES/Include/* ${STAGING_INCDIR}/ - cp -pPR ${S}/GFX_Linux_SDK/OGLES/SDKPackage/Builds/OGLES/LinuxOMAP3/Include/GLES/* ${STAGING_INCDIR}/GLES/ - cp -pPr ${S}/GFX_Linux_SDK/OGLES2/SDKPackage/Builds/OGLES2/LinuxOMAP3/Include/GLES/* ${STAGING_INCDIR}/GLES2/ + cp -pPR ${S}/GFX_Linux_SDK/OGLES/SDKPackage/Builds/OGLES/LinuxOMAP3/Include/GLES/* ${STAGING_INCDIR}/GLES/ || true + cp -pPr ${S}/GFX_Linux_SDK/OGLES2/SDKPackage/Builds/OGLES2/LinuxOMAP3/Include/GLES/* ${STAGING_INCDIR}/GLES2/ || true cp -pPr ${S}/include/*.h ${STAGING_INCDIR} || true - cp -pPr ${S}/GFX_Linux_SDK/OVG/SDKPackage/Builds/OVG/Include/v* ${STAGING_INCDIR}/ + cp -pPr ${S}/GFX_Linux_SDK/OVG/SDKPackage/Builds/OVG/Include/v* ${STAGING_INCDIR}/ || true + cp -pPr ${S}/GFX_Linux_SDK/OVG/SDKPackage/Builds/OVG/Include/V* ${STAGING_INCDIR}/ || true } pkg_postinst() { diff --git a/recipes/prelink/prelink_20061027.bb b/recipes/prelink/prelink_20061027.bb index b650c2c2f1..83f33f382c 100644 --- a/recipes/prelink/prelink_20061027.bb +++ b/recipes/prelink/prelink_20061027.bb @@ -4,7 +4,7 @@ DESCRIPTION = " The prelink package contains a utility which modifies ELF shared and executables, so that far fewer relocations need to be resolved at \ runtime and thus programs come up faster." LICENSE = "GPL" -PR = "r5" +PR = "r6" SRC_URI = "${DEBIAN_MIRROR}/main/p/prelink/prelink_0.0.${PV}.orig.tar.gz \ file://prelink.conf \ @@ -35,12 +35,15 @@ if [ "x$D" != "x" ]; then exit 1 fi -prelink -a +. ${sysconfdir}/cron.daily/prelink } pkg_prerm_prelink() { #!/bin/sh -prelink -au +if [ -f ${sysconfdir}/prelink.cache ]; then + prelink -au + rm -f ${sysconfdir}/prelink.cache +fi } diff --git a/recipes/prelink/prelink_20071009.bb b/recipes/prelink/prelink_20071009.bb index b650c2c2f1..83f33f382c 100644 --- a/recipes/prelink/prelink_20071009.bb +++ b/recipes/prelink/prelink_20071009.bb @@ -4,7 +4,7 @@ DESCRIPTION = " The prelink package contains a utility which modifies ELF shared and executables, so that far fewer relocations need to be resolved at \ runtime and thus programs come up faster." LICENSE = "GPL" -PR = "r5" +PR = "r6" SRC_URI = "${DEBIAN_MIRROR}/main/p/prelink/prelink_0.0.${PV}.orig.tar.gz \ file://prelink.conf \ @@ -35,12 +35,15 @@ if [ "x$D" != "x" ]; then exit 1 fi -prelink -a +. ${sysconfdir}/cron.daily/prelink } pkg_prerm_prelink() { #!/bin/sh -prelink -au +if [ -f ${sysconfdir}/prelink.cache ]; then + prelink -au + rm -f ${sysconfdir}/prelink.cache +fi } diff --git a/recipes/proxy-libintl/proxy-libintl_20080418.bb b/recipes/proxy-libintl/proxy-libintl_20080418.bb index 6b91f530f3..dccd3eabe2 100644 --- a/recipes/proxy-libintl/proxy-libintl_20080418.bb +++ b/recipes/proxy-libintl/proxy-libintl_20080418.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/" SECTION = "libs" LICENSE = "LGPL" -PR = "r2" +PR = "r3" PROVIDES = "virtual/libintl" SRC_URI = " \ @@ -18,6 +18,7 @@ FILES_${PN}-dev = "${includedir}/libintl.h ${libdir}/libintl.a" FILES_${PN} = "${libdir}/libintl.so" CFLAGS_append = " -Wall -I ../../include ${@['-DSTUB_ONLY', ''][bb.data.getVar('USE_NLS', d, 1) != 'no']}" +TARGET_CC_ARCH += "${LDFLAGS}" do_compile() { cd ${WORKDIR}/src/proxy-libintl diff --git a/recipes/qt4/qt4-x11-free.inc b/recipes/qt4/qt4-x11-free.inc index 59c973f208..adf3bbc6c0 100644 --- a/recipes/qt4/qt4-x11-free.inc +++ b/recipes/qt4/qt4-x11-free.inc @@ -6,7 +6,7 @@ LICENSE = "GPL QPL" DEPENDS += "virtual/libx11 fontconfig xft libxext libxrender libxrandr libxcursor" PROVIDES = "qt4x11" -INC_PR = "r12" +INC_PR = "r13" SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz \ file://0001-cross-compile.patch;patch=1 \ diff --git a/recipes/usbutils/usbutils_0.86.bb b/recipes/usbutils/usbutils_0.86.bb new file mode 100644 index 0000000000..436331dd5a --- /dev/null +++ b/recipes/usbutils/usbutils_0.86.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "Host side USB console utilities." +SECTION = "base" +DEPENDS += "virtual/libusb0" +LICENSE = "GPL" +PRIORITY = "optional" + +SRC_URI = "${SOURCEFORGE_MIRROR}/linux-usb/usbutils-${PV}.tar.gz \ + " +inherit autotools + +EXTRA_OECONF = "--program-prefix=" +sbindir = "/sbin" +bindir = "/bin" + +FILES_${PN} += "${datadir}/usb*" + +do_configure_prepend() { + rm -rf ${S}/libusb +} |