From a265fffbb39a21e6a08dd13e03a2af660ce78cd3 Mon Sep 17 00:00:00 2001 From: Guillaume BIENKOWSKI Date: Fri, 13 Dec 2013 15:26:00 +0100 Subject: [PATCH] Integrate patches from amphitech build machine to make the compilation in OpenEmbedded work. --- .../antlr3/antlr3c-linphone/library.patch | 12 ---------- build/openembedded/antlr3/antlr3c.inc | 18 ++++----------- build/openembedded/antlr3/antlr3c_linphone.oe | 4 ---- build/openembedded/belle-sip/belle-sip.inc | 16 ++++++------- .../belle-sip/belle-sip_master.bb | 7 +++++- .../openembedded/linphone/linphone-common.inc | 5 +++- .../linphone/linphone-common_git.inc | 23 ++++++++++--------- .../linphone_+git-nogtk-gsm-video-x11.bb | 2 +- build/openembedded/polarssl/polarssl.inc | 6 +---- .../polarssl/polarssl_linphone.bb | 15 ++++++++---- 10 files changed, 48 insertions(+), 60 deletions(-) delete mode 100644 build/openembedded/antlr3/antlr3c-linphone/library.patch delete mode 100644 build/openembedded/antlr3/antlr3c_linphone.oe diff --git a/build/openembedded/antlr3/antlr3c-linphone/library.patch b/build/openembedded/antlr3/antlr3c-linphone/library.patch deleted file mode 100644 index 7aeb29508..000000000 --- a/build/openembedded/antlr3/antlr3c-linphone/library.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN a/runtime/C/Makefile.am b/runtime/C/Makefile.am ---- a/runtime/C/Makefile.am 2013-07-30 09:46:20.000000000 +0200 -+++ b/runtime/C/Makefile.am 2013-07-30 09:52:08.000000000 +0200 -@@ -62,7 +62,7 @@ - include/antlr3treeparser.h \ - antlr3config.h - --libantlr3c_la_LDFLAGS = -no-undefined -avoid-version -+libantlr3c_la_LDFLAGS = -no-undefined - libantlr3c_la_LIBADD = $(ANTLR_LIBS) - - INCLUDES = -I$(top_srcdir)/include diff --git a/build/openembedded/antlr3/antlr3c.inc b/build/openembedded/antlr3/antlr3c.inc index 51418168c..99f0f0439 100644 --- a/build/openembedded/antlr3/antlr3c.inc +++ b/build/openembedded/antlr3/antlr3c.inc @@ -1,23 +1,15 @@ DESCRIPTION = "Linphone version of antlr3" LICENSE = "GPL" -RECIPE_TYPES = "machine native" DEPENDS = "" -S = "${SRCDIR}/antlr3" -B = "${SRCDIR}/antlr3/runtime/C" -CONFIGURE_SCRIPT = "${B}/configure" +S = "${WORKDIR}/git/runtime/C" -inherit autotools-autoreconf pkgconfig library c +inherit autotools pkgconfig lib_package -do_autoreconf () { - pushd runtime/C - ./autogen.sh - popd +do_fetch_append() { + import os + os.system("autogen.sh") } -EXTRA_OECONF:>TARGET_CPU_x86_64 = " --enable-64bit" - -DEPENDS_${PN} += "${DEPENDS}" -RDEPENDS_${PN} += "${DEPENDS}" diff --git a/build/openembedded/antlr3/antlr3c_linphone.oe b/build/openembedded/antlr3/antlr3c_linphone.oe deleted file mode 100644 index cbddb170b..000000000 --- a/build/openembedded/antlr3/antlr3c_linphone.oe +++ /dev/null @@ -1,4 +0,0 @@ -require antlr3c.inc - -SRC_URI = "git://git.linphone.org/antlr3.git;commit=f0dbcbbcd22a7fd9a479ff68d4daa9225fb2f3b1" -SRC_URI += "file://library.patch" diff --git a/build/openembedded/belle-sip/belle-sip.inc b/build/openembedded/belle-sip/belle-sip.inc index 90eab6f4f..ea2528356 100644 --- a/build/openembedded/belle-sip/belle-sip.inc +++ b/build/openembedded/belle-sip/belle-sip.inc @@ -1,18 +1,18 @@ DESCRIPTION = "SIP stack from Belledonne Communications" LICENSE = "GPL" -RECIPE_TYPES = "machine native" +DEPENDS = "polarssl antlr3c" +RDEPENDS = "antlr3c" -DEPENDS = "polarssl antlr3c libm" +EXTRA_OECONF += "--with-antlr=${STAGING_DIR_HOST}${layout_exec_prefix}/usr --with-polarssl=${STAGING_DIR_HOST}${layout_exec_prefix}/usr" +INSANE_SKIP_belle-sip += "dev-deps" -EXTRA_OECONF += "--with-antlr=${BUILD_SYSROOT}${target_prefix} --with-polarssl=${BUILD_SYSROOT}${target_prefix}" - -inherit autotools-autoreconf pkgconfig library c +inherit autotools pkgconfig do_autoreconf () { - ./autogen.sh + ./autogen.sh } DEPENDS_${PN} += "${DEPENDS}" -RDEPENDS_${PN} += "${DEPENDS}" -RDEPENDS_${PN}-dev += "polarssl-dev antlr3c-dev" +RDEPENDS_${PN} += "${RDEPENDS}" + diff --git a/build/openembedded/belle-sip/belle-sip_master.bb b/build/openembedded/belle-sip/belle-sip_master.bb index ce3702b9d..a1382a314 100644 --- a/build/openembedded/belle-sip/belle-sip_master.bb +++ b/build/openembedded/belle-sip/belle-sip_master.bb @@ -1,5 +1,10 @@ require belle-sip.inc -S = "${SRCDIR}/belle-sip/" +SRCREV="e5a2ddc4456fa15114fd986aadaf9e45a5b1072b" +S = "${WORKDIR}/git" + +PR="R1" + SRC_URI = "git://git.linphone.org/belle-sip.git;commit=e5a2ddc4456fa15114fd986aadaf9e45a5b1072b" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" diff --git a/build/openembedded/linphone/linphone-common.inc b/build/openembedded/linphone/linphone-common.inc index f9b9e0890..cce675f73 100644 --- a/build/openembedded/linphone/linphone-common.inc +++ b/build/openembedded/linphone/linphone-common.inc @@ -30,6 +30,8 @@ LINPHONE_OE_ENABLE_VIDEO = "--disable-video" LINPHONE_OE_ENABLE_VIDEO_video = "--with-ffmpeg=${STAGING_DIR_HOST}${layout_exec_prefix} --enable-video" LINPHONE_OE_ENABLE_X11 = "--disable-x11 --disable-xv" LINPHONE_OE_ENABLE_X11_x11 = "" +LINPHONE_OE_ENABLE_GL = "--disable-glx" +LINPHONE_OE_ENABLE_GL_gl = "" LINPHONE_OE_ENABLE_CONSOLE_UI = "no" LINPHONE_OE_ENABLE_CONSOLE_UI_console = "yes" @@ -38,13 +40,14 @@ LINPHONE_OE_ENABLE_GTK_UI = "no" LINPHONE_OE_ENABLE_GTK_UI_gtk = "yes" do_install_append(){ - install -d ${D}${bindir} + install -d ${D}${bindir} } EXTRA_OECONF = " \ ${LINPHONE_OE_ENABLE_TESTS} \ ${LINPHONE_OE_ENABLE_VIDEO} \ ${LINPHONE_OE_ENABLE_X11} \ + ${LINPHONE_OE_ENABLE_GL} \ --enable-alsa \ --with-osip=${STAGING_DIR_HOST}${layout_exec_prefix} \ --with-readline=${STAGING_DIR_HOST}${layout_exec_prefix} \ diff --git a/build/openembedded/linphone/linphone-common_git.inc b/build/openembedded/linphone/linphone-common_git.inc index c8d2a9602..bac153315 100644 --- a/build/openembedded/linphone/linphone-common_git.inc +++ b/build/openembedded/linphone/linphone-common_git.inc @@ -12,19 +12,20 @@ S = "${WORKDIR}/linphone" # There is also a problem with autogen and AC_SUBST # note: don't use a ssh key with password, it does not work. do_fetch_prepend () { - import os,bb - bb.note("Hack preparing clone in %s" %"${LINPHONE_TMP_DIR}") - os.system("rm -rf ${LINPHONE_TMP_DIR}") - os.system("mkdir -p ${LINPHONE_TMP_DIR}") + import os,bb + bb.note("Hack preparing clone in %s" %"${LINPHONE_TMP_DIR}") + os.system("rm -rf ${LINPHONE_TMP_DIR}") + os.system("mkdir -p ${LINPHONE_TMP_DIR}") - bb.note("Hack cloning linphone !recursively") - os.system("cd ${LINPHONE_TMP_DIR}; git clone --depth 1 --recursive ${L_GIT_SRC_URI} linphone") + bb.note("Hack cloning linphone !recursively") + os.system("cd ${LINPHONE_TMP_DIR}; git clone --depth 1 --recursive ${L_GIT_SRC_URI} linphone") - bb.note("Hack launching autogen.sh manually") - os.system("cd ${LINPHONE_TMP_DIR}/linphone; ./autogen.sh") + bb.note("Hack launching autogen.sh manually") + os.system("cd ${LINPHONE_TMP_DIR}/linphone; ./autogen.sh") - bb.note("Hack preparing linphone.tar.gz") - os.system("cd ${LINPHONE_TMP_DIR}; tar czf linphone.tar.gz --exclude .git linphone") + bb.note("Hack preparing linphone.tar.gz") +# we need to keep the .git since the versioning in linphone is done through `git describe` + os.system("cd ${LINPHONE_TMP_DIR}; tar czf linphone.tar.gz linphone") } require linphone-common.inc @@ -33,4 +34,4 @@ require linphone-common.inc #Required to avoid compile errors on May 2011. EXTRA_OECONF +=" --disable-strict" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" +LIC_FILES_CHKSUM = "file://COPYING;md5=9f9938e31db89d55a796e86808c96848" diff --git a/build/openembedded/linphone/linphone_+git-nogtk-gsm-video-x11.bb b/build/openembedded/linphone/linphone_+git-nogtk-gsm-video-x11.bb index 41f0cf1c5..0d55b7665 100644 --- a/build/openembedded/linphone/linphone_+git-nogtk-gsm-video-x11.bb +++ b/build/openembedded/linphone/linphone_+git-nogtk-gsm-video-x11.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Audio/video SIP-based IP phone (console edition)" HOMEPAGE = "http://www.linphone.org/?lang=us" LICENSE = "GPLv2" -PR="r14" +PR="r0" DEFAULT_PREFERENCE = "3" OVERRIDES_append = ":console" diff --git a/build/openembedded/polarssl/polarssl.inc b/build/openembedded/polarssl/polarssl.inc index ada34b27a..cbf856671 100644 --- a/build/openembedded/polarssl/polarssl.inc +++ b/build/openembedded/polarssl/polarssl.inc @@ -1,15 +1,12 @@ DESCRIPTION = "SSL/TLS library" LICENSE = "GPL" -RECIPE_TYPES = "machine native" DEPENDS = "" -inherit c make pkgconfig library +inherit pkgconfig EXTRA_OEMAKE += " SHARED=1" -EXTRA_OEMAKE:>TARGET_OS_darwin = " DARWIN=1" -EXTRA_OEMAKE:>TARGET_OS_mingw32 = " WINDOWS=1" PACKAGES += "${PN}-utils" @@ -20,4 +17,3 @@ FILES_${PN}-dev += "!${sharedlibdir}/*${SOLIBSDEV}" FILES_${PN}-utils += "${bindir}/polarssl_*" DEPENDS_${PN} += "${DEPENDS}" -RDEPENDS_${PN} += "${DEPENDS}" diff --git a/build/openembedded/polarssl/polarssl_linphone.bb b/build/openembedded/polarssl/polarssl_linphone.bb index 5d4d41d30..41ed5060e 100644 --- a/build/openembedded/polarssl/polarssl_linphone.bb +++ b/build/openembedded/polarssl/polarssl_linphone.bb @@ -1,7 +1,14 @@ require polarssl.inc -S = "${SRCDIR}/polarssl/" +SRCREV="cecb44e4f13f42f793dde34b42793e1ebcce91a5" + +S = "${WORKDIR}/git" + +do_fetch_prepend () { + import bb + bb.note("Will checkout in %s" % "${S}" ) +} + +SRC_URI = "git://git.linphone.org/polarssl.git" +LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe" -SRC_URI = "git://git.linphone.org/polarssl.git;commit=cecb44e4f13f42f793dde34b42793e1ebcce91a5" -SRC_URI += "file://darwin.patch" -SRC_URI += "file://soname.patch"