From 107400a5855196c993a92e55367b59348f471c0d Mon Sep 17 00:00:00 2001 From: Guillaume BIENKOWSKI Date: Wed, 11 Dec 2013 11:06:01 +0100 Subject: [PATCH] tentative commit with Guillaume's fixes for bitbake --- .../images/console-linphone-image.bb | 18 ------- build/openembedded/linphone-common_local.inc | 2 +- .../linphone_+git-nogtk-gsm-video-x11.bb | 16 ------- .../linphone_+git-nogtk-gsm-video.bb | 15 ------ build/openembedded/linphone_+git-nogtk-gsm.bb | 14 ------ build/openembedded/linphone_+git-nogtk.bb | 13 ----- build/openembedded/msamr_local+wb.bb | 1 - build/openembedded/msamr_local.bb | 1 - build/openembedded/msilbc_local.bb | 1 - build/openembedded/speex_git.bb | 47 ------------------- 10 files changed, 1 insertion(+), 127 deletions(-) delete mode 100644 build/openembedded/images/console-linphone-image.bb delete mode 100644 build/openembedded/linphone_+git-nogtk-gsm-video-x11.bb delete mode 100644 build/openembedded/linphone_+git-nogtk-gsm-video.bb delete mode 100644 build/openembedded/linphone_+git-nogtk-gsm.bb delete mode 100644 build/openembedded/linphone_+git-nogtk.bb delete mode 100644 build/openembedded/speex_git.bb diff --git a/build/openembedded/images/console-linphone-image.bb b/build/openembedded/images/console-linphone-image.bb deleted file mode 100644 index 4b34e60bc..000000000 --- a/build/openembedded/images/console-linphone-image.bb +++ /dev/null @@ -1,18 +0,0 @@ -require recipes-images/angstrom/console-image.bb - -IMAGE_INSTALL += " \ - kbd \ - kbd-keymaps \ - keymaps \ - linphonec \ - linphone-plugins \ - linphone-rings \ -" - -rootfs_postprocess() { - gunzip -c ${IMAGE_ROOTFS}/usr/share/keymaps/i386/dvorak/dvorak.map.gz > ${IMAGE_ROOTFS}/etc/keymap-2.6.map -} - -ROOTFS_POSTPROCESS_COMMAND += "rootfs_postprocess; " - -export IMAGE_BASENAME = "console-linphone-image" diff --git a/build/openembedded/linphone-common_local.inc b/build/openembedded/linphone-common_local.inc index aaa5b9a15..a77b212e3 100644 --- a/build/openembedded/linphone-common_local.inc +++ b/build/openembedded/linphone-common_local.inc @@ -10,6 +10,6 @@ do_configure_prepend () { } #Required to avoid compile errors on May 2011. -EXTRA_OECONF +=" --disable-strict" +EXTRA_OECONF +=" --disable-strict --disable-glx" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" diff --git a/build/openembedded/linphone_+git-nogtk-gsm-video-x11.bb b/build/openembedded/linphone_+git-nogtk-gsm-video-x11.bb deleted file mode 100644 index 41f0cf1c5..000000000 --- a/build/openembedded/linphone_+git-nogtk-gsm-video-x11.bb +++ /dev/null @@ -1,16 +0,0 @@ -## THIS unusable work in progress ## - -DESCRIPTION = "Audio/video SIP-based IP phone (console edition)" -HOMEPAGE = "http://www.linphone.org/?lang=us" -LICENSE = "GPLv2" -PR="r14" - -DEFAULT_PREFERENCE = "3" -OVERRIDES_append = ":console" -OVERRIDES_append = ":gsm" -OVERRIDES_append = ":video" -OVERRIDES_append = ":x11" - -#PARALLEL_MAKE="V=1" - -require linphone-common_git.inc diff --git a/build/openembedded/linphone_+git-nogtk-gsm-video.bb b/build/openembedded/linphone_+git-nogtk-gsm-video.bb deleted file mode 100644 index ae1120632..000000000 --- a/build/openembedded/linphone_+git-nogtk-gsm-video.bb +++ /dev/null @@ -1,15 +0,0 @@ -## THIS unusable work in progress ## - -DESCRIPTION = "Audio/video SIP-based IP phone (console edition)" -HOMEPAGE = "http://www.linphone.org/?lang=us" -LICENSE = "GPLv2" -PR="r14" - -DEFAULT_PREFERENCE = "3" -OVERRIDES_append = ":console" -OVERRIDES_append = ":gsm" -OVERRIDES_append = ":video" - -#PARALLEL_MAKE="V=1" - -require linphone-common_git.inc diff --git a/build/openembedded/linphone_+git-nogtk-gsm.bb b/build/openembedded/linphone_+git-nogtk-gsm.bb deleted file mode 100644 index a9496c1ef..000000000 --- a/build/openembedded/linphone_+git-nogtk-gsm.bb +++ /dev/null @@ -1,14 +0,0 @@ - - -DESCRIPTION = "Audio/video SIP-based IP phone (console edition)" -HOMEPAGE = "http://www.linphone.org/?lang=us" -LICENSE = "GPLv2" -PR="r15" - -DEFAULT_PREFERENCE = "3" -OVERRIDES_append = ":console" -OVERRIDES_append = ":gsm" - -#PARALLEL_MAKE="V=1" - -require linphone-common_git.inc diff --git a/build/openembedded/linphone_+git-nogtk.bb b/build/openembedded/linphone_+git-nogtk.bb deleted file mode 100644 index a9228042a..000000000 --- a/build/openembedded/linphone_+git-nogtk.bb +++ /dev/null @@ -1,13 +0,0 @@ -## THIS unusable work in progress ## - -DESCRIPTION = "Audio/video SIP-based IP phone (console edition)" -HOMEPAGE = "http://www.linphone.org/?lang=us" -LICENSE = "GPLv2" -PR="r14" - -DEFAULT_PREFERENCE = "3" -OVERRIDES_append = ":console" - -#PARALLEL_MAKE="V=1" - -require linphone-common_git.inc diff --git a/build/openembedded/msamr_local+wb.bb b/build/openembedded/msamr_local+wb.bb index e63ef3367..cb89a1bde 100644 --- a/build/openembedded/msamr_local+wb.bb +++ b/build/openembedded/msamr_local+wb.bb @@ -4,7 +4,6 @@ S = "${WORKDIR}/msamr-0.0.2" do_configure_prepend () { ./autogen.sh - libtoolize --copy --force } OVERRIDES_append = ":wideband" diff --git a/build/openembedded/msamr_local.bb b/build/openembedded/msamr_local.bb index 43c434ffb..f6349af74 100644 --- a/build/openembedded/msamr_local.bb +++ b/build/openembedded/msamr_local.bb @@ -4,7 +4,6 @@ S = "${WORKDIR}/msamr-0.0.2" do_configure_prepend () { ./autogen.sh - libtoolize --copy --force } DEFAULT_PREFERENCE="-1" diff --git a/build/openembedded/msilbc_local.bb b/build/openembedded/msilbc_local.bb index 95fcd6466..72b08b239 100644 --- a/build/openembedded/msilbc_local.bb +++ b/build/openembedded/msilbc_local.bb @@ -4,7 +4,6 @@ S = "${WORKDIR}/msilbc-2.0.3" do_configure_prepend () { ./autogen.sh - libtoolize --copy --force } DEFAULT_PREFERENCE="-1" diff --git a/build/openembedded/speex_git.bb b/build/openembedded/speex_git.bb deleted file mode 100644 index af76d8840..000000000 --- a/build/openembedded/speex_git.bb +++ /dev/null @@ -1,47 +0,0 @@ -DESCRIPTION = "Speex is an Open Source/Free Software patent-free audio compression format designed for speech." -SECTION = "libs/multimedia" -LICENSE = "BSD" -HOMEPAGE = "http://www.speex.org" -DEPENDS = "libogg" -PV = "1.1+git" -PR = "r4" -SPEEX_TMP_DIR="/tmp/SPEEX_TMP" -SRC_URI = "file://${SPEEX_TMP_DIR}/speex.tar.gz" -S = "${WORKDIR}/speex" -LIC_FILES_CHKSUM = "file://COPYING;md5=314649d8ba9dd7045dfb6683f298d0a8" - -PARALLEL_MAKE = "" - -inherit autotools pkgconfig - -LEAD_SONAME = "libspeex.so" - -#check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points -EXTRA_OECONF += "--enable-fixed-point" -EXTRA_OECONF_append_armv5te = " --enable-arm5e-asm" -EXTRA_OECONF_append_armv7a = " --enable-armv7neon-asm" - -do_fetch_prepend () { - import os,bb - bb.note("Hack preparing clone in %s" %"${SPEEX_TMP_DIR}") - os.system("rm -rf ${SPEEX_TMP_DIR}") - os.system("mkdir -p ${SPEEX_TMP_DIR}") - - os.system("cd ${SPEEX_TMP_DIR}; git clone --depth 1 git://git.linphone.org/speex") - - os.system("cd ${SPEEX_TMP_DIR}/speex; ./autogen.sh") - - os.system("cd ${SPEEX_TMP_DIR}; tar czf speex.tar.gz --exclude .git speex") -} - -do_configure_append() { - sed -i s/"^OGG_CFLAGS.*$"/"OGG_CFLAGS = "/g Makefile */Makefile */*/Makefile - sed -i s/"^OGG_LIBS.*$"/"OGG_LIBS = -logg"/g Makefile */Makefile */*/Makefile - find . -name "Makefile" -exec sed -i s,-I/usr/include,, {} \; -} - -PACKAGES =+ "${PN}-utils ${PN}-dsp" -FILES_${PN}-utils = "${bindir}/speex*" -FILES_${PN}-dsp = "${libdir}/libspeexdsp.so.*" -FILES_${PN} = "${libdir}/libspeex.so.*" -