From 8c1c046f7e136ece107df20ca4d93474886144b4 Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Thu, 19 Feb 2009 16:50:11 +0100 Subject: php: fixed build --- packages/php/php-native.inc | 2 +- packages/php/php-native_5.2.6.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/php/php-native.inc b/packages/php/php-native.inc index 84f9a1a0ee..1698a80379 100644 --- a/packages/php/php-native.inc +++ b/packages/php/php-native.inc @@ -7,7 +7,7 @@ export LIBS=" -lxml2 " export LD_LIBRARY_PATH = "${STAGING_LIBDIR_NATIVE}" EXTRA_OECONF = "--with-cgi --enable-sockets --enable-pcntl \ - --with-zlib --with-zlib-dir=${STAGING_LIBDIR_NATIVE} \ + --with-zlib --with-zlib-dir=${STAGING_LIBDIR_NATIVE}/.. \ --without-libpng --without-libjpeg \ --with-libxml-dir=${STAGING_BINDIR_NATIVE} \ " diff --git a/packages/php/php-native_5.2.6.bb b/packages/php/php-native_5.2.6.bb index 97064a6510..ac1c51fa3f 100644 --- a/packages/php/php-native_5.2.6.bb +++ b/packages/php/php-native_5.2.6.bb @@ -1,3 +1,3 @@ require php-native.inc -PR = "r2" +PR = "r3" -- cgit v1.2.3 From 31f5fe8e7fcc51474245d07483e2698f64a3b460 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 19 Feb 2009 16:53:57 +0100 Subject: Revert the portions of "libgles-omap3: add comments on how to get the gles binary files to help" that snuck in --- packages/mtd/mtd-utils-native_1.2.0+git.bb | 2 +- packages/powervr-drivers/libgles-omap3.inc | 1 + packages/qte/qte-mt-static_2.3.10.bb | 22 ++++++++++++++++++++++ packages/qte/qte-mt_2.3.10.bb | 6 ++++++ packages/qte/qte_2.3.10.bb | 3 +++ 5 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 packages/qte/qte-mt-static_2.3.10.bb create mode 100644 packages/qte/qte-mt_2.3.10.bb create mode 100644 packages/qte/qte_2.3.10.bb (limited to 'packages') diff --git a/packages/mtd/mtd-utils-native_1.2.0+git.bb b/packages/mtd/mtd-utils-native_1.2.0+git.bb index 5fa3bbbf01..6135d7f4d0 100644 --- a/packages/mtd/mtd-utils-native_1.2.0+git.bb +++ b/packages/mtd/mtd-utils-native_1.2.0+git.bb @@ -1,5 +1,5 @@ # Doesn't build for everyone, errors range from missing includes to linking errors -DEFAULT_PREFERENCE = "1" +DEFAULT_PREFERENCE = "-1" require mtd-utils_${PV}.bb require mtd-utils-native.inc diff --git a/packages/powervr-drivers/libgles-omap3.inc b/packages/powervr-drivers/libgles-omap3.inc index c960903f8d..7e47bbc8ae 100644 --- a/packages/powervr-drivers/libgles-omap3.inc +++ b/packages/powervr-drivers/libgles-omap3.inc @@ -17,6 +17,7 @@ PROVIDES += "virtual/egl" # chmod a+x ./libgles-omap3/OMAP35x_Graphics_SDK_setuplinux_3_00_00_06.bin # # voila! + SRC_URI = "file://OMAP35x_Graphics_SDK_setuplinux_${SGXPV}.bin \ file://rc.pvr \ " diff --git a/packages/qte/qte-mt-static_2.3.10.bb b/packages/qte/qte-mt-static_2.3.10.bb new file mode 100644 index 0000000000..68ab2aceab --- /dev/null +++ b/packages/qte/qte-mt-static_2.3.10.bb @@ -0,0 +1,22 @@ +require qte-common_${PV}.inc +PR = "r8" + +DEFAULT_PREFERENCE = "-1" + +EXTRA_OECONF += "-static -thread" + +do_stage() { + rm -rf ${STAGING_DIR_HOST}/qt2 + install -d ${STAGING_DIR_HOST}/qt2/lib + oe_libinstall -a -C lib libqte-mt ${STAGING_DIR_HOST}/qt2/lib + rm -f include/qxt.h + install -d ${STAGING_DIR_HOST}/qt2/include + cp -pfLR include/* ${STAGING_DIR_HOST}/qt2/include + cp -pPR lib/fonts ${STAGING_DIR_HOST}/qt2/lib/ +} + +do_install() { + : +} + +PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/packages/qte/qte-mt_2.3.10.bb b/packages/qte/qte-mt_2.3.10.bb new file mode 100644 index 0000000000..32afeda271 --- /dev/null +++ b/packages/qte/qte-mt_2.3.10.bb @@ -0,0 +1,6 @@ +require qte-common_${PV}.inc +PR = "r27" + +EXTRA_OECONF += "-thread" + +DEFAULT_PREFERENCE = "1" diff --git a/packages/qte/qte_2.3.10.bb b/packages/qte/qte_2.3.10.bb new file mode 100644 index 0000000000..68825b6ce8 --- /dev/null +++ b/packages/qte/qte_2.3.10.bb @@ -0,0 +1,3 @@ +require qte-common_${PV}.inc +PR = "r52" + -- cgit v1.2.3 From bf8f4198ab40c068efa23df954ca09e2461c6741 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 19 Feb 2009 17:08:09 +0100 Subject: mpd: add fix from mpd-alsa --- packages/musicpd/mpd_0.14.2.bb | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'packages') diff --git a/packages/musicpd/mpd_0.14.2.bb b/packages/musicpd/mpd_0.14.2.bb index 80a4857bcb..fee254e874 100644 --- a/packages/musicpd/mpd_0.14.2.bb +++ b/packages/musicpd/mpd_0.14.2.bb @@ -8,6 +8,8 @@ DEPENDS = "libvorbis libogg libao zlib libmikmod flac audiofile virtual/libiconv SRC_URI = "${SOURCEFORGE_MIRROR}/musicpd/mpd-${PV}.tar.bz2 \ file://mpd/mpd.init" +PR = "r1" + inherit autotools update-rc.d INITSCRIPT_NAME = "mpd" @@ -32,3 +34,9 @@ EXTRA_OECONF = "\ do_compile_prepend() { find -name Makefile | xargs sed -i 's~-I/usr/include~-I${STAGING_INCDIR}~g' } + +do_install_append() { + install -d ${D}${sysconfdir}/init.d + install -m 755 ${WORKDIR}/mpd/mpd.init ${D}${sysconfdir}/init.d/mpd +} + -- cgit v1.2.3