Commit b794602d authored by Sandrine Avakian's avatar Sandrine Avakian

Modifying libgsm source repo now from linphone.

Patch for mediastreamer2 compilation chain.
Typo fix for bctoolbox.
parent 4c1eefeb
......@@ -39,4 +39,4 @@ FILES_${PN}-dev += " \
${libdir}/*.a \
${libdir}/*.o \
${libdir}/pkgconfig \
${prefix}/share/bctoolbox/
${prefix}/share/bctoolbox/ "
\ No newline at end of file
......@@ -5,30 +5,13 @@ LICENSE = "libgsm"
INC_PR = "r2"
SRC_URI = "http://www.quut.com/gsm/gsm-${PV}.tar.gz \
file://01_makefile.patch \
file://02_cplusplus.patch \
file://03_config.patch \
file://04_includes.patch \
file://05_compiler_warnings.patch \
"
inherit cmake pkgconfig
CFLAGS += "-c -g -fPIC -Wall -D_GNU_SOURCE -D_REENTRANT -DNeedFunctionPrototypes=1 -DWAV49 -I./inc"
PROVIDES = "libgsm"
PACKAGES = " ${PN}-dbg ${PN} ${PN}-doc ${PN}-dev "
PARALLEL_MAKE = ""
FILES_${PN} += " \
${libdir}/lib*.so "
do_compile() {
unset LD
oe_runmake CCFLAGS="${CFLAGS}"
}
do_install() {
oe_libinstall -a -C lib libgsm ${D}${libdir}
oe_libinstall -so -C lib libgsm ${D}${libdir}
install -d ${D}${includedir}/gsm
install -m 0644 ${S}/inc/gsm.h ${D}${includedir}/gsm/
cd ${D}${includedir}
ln -s gsm/gsm.h gsm.h
}
LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=fc1372895b173aaf543a122db37e04f5"
\ No newline at end of file
FILES_${PN}-dbg += "\
${libdir}/.debug/ \"
\ No newline at end of file
require libgsm.inc
inherit gitpkgv
PR = "${INC_PR}.0"
S = "${WORKDIR}/gsm-1.0-pl13/"
S = "${WORKDIR}/git"
SRC_URI[md5sum] = "c1ba392ce61dc4aff1c29ea4e92f6df4"
SRC_URI[sha256sum] = "52c518244d428c2e56c543b98c9135f4a76ff780c32455580b793f60a0a092ad"
SRCREV = "0f8822b5326c76bb9dc4c6b552631f51792c3982"
SRC_URI = "git://git.linphone.org/gsm.git;branch=linphone"
PV = "git_${SRCREV}"
PKGV = "${GITPKGVTAG}"
LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=fc1372895b173aaf543a122db37e04f5"
\ No newline at end of file
--- a/src/CMakeLists.txt 2017-05-02 15:02:55.000000000 +0200
+++ b/src/CMakeLists.txt 2017-05-02 15:04:01.000000000 +0200
@@ -31,7 +31,7 @@
find_library(LIBMINGWEX NAMES mingwex)
endif()
-find_program(AWK_PROGRAM awk)
+find_program(AWK_PROGRAM awk NO_CMAKE_FIND_ROOT_PATH)
if(NOT AWK_PROGRAM)
message(FATAL_ERROR "You need the awk program to build mediastreamer2.")
endif()
--- a/src/CMakeLists.txt 2017-05-02 15:02:55.000000000 +0200
+++ b/src/CMakeLists.txt 2017-05-02 15:04:01.000000000 +0200
@@ -461,7 +464,7 @@
if(APPLE OR ANDROID OR OPENGL_FOUND OR GLX_FOUND OR QTANGLE_FOUND)
find_package(PythonInterp REQUIRED)
- find_program(SED_PROGRAM sed)
+ find_program(SED_PROGRAM sed NO_CMAKE_FIND_ROOT_PATH)
if(NOT SED_PROGRAM)
message(FATAL_ERROR "You need the sed program to build mediastreamer2.")
endif()
......@@ -18,8 +18,8 @@ PACKAGECONFIG[bzrtp] = " -DENABLE_BZRTP=YES, -DENABLE_BZRTP=NO, libbzrtp"
PACKAGECONFIG[gsm] = " -DENABLE_GSM=YES, -DENABLE_GSM=NO, libgsm"
PACKAGECONFIG[x11] = " -DENABLE_X11=YES -DENABLE_XV=YES, -DENABLE_X11=NO -DENABLE_XV=NO, libxv"
EXTRA_OECMAKE += " -DCMAKE_SKIP_INSTALL_RPATH=ON -DENABLE_GLX=NO -DENABLE_GL=NO -DENABLE_GLX_DEFAULT_VALUE=NO -DENABLE_PCAP=NO -DENABLE_BV16=NO -DENABLE_DOC=NO"
EXTRA_OECMAKE += " -DENABLE_GL=NO -DENABLE_GLX_DEFAULT_VALUE=NO -DENABLE_PCAP=NO -DENABLE_GSM=NO -DENABLE_BV16=NO -DENABLE_DOC=NO -DCMAKE_SKIP_INSTALL_RPATH=ON"
#PACKAGES += "${PN}-bin"
......@@ -35,4 +35,6 @@ FILES_${PN}-dev += " \
${libdir}/pkgconfig \
${prefix}/share/Mediastreamer2 "
inherit cmake lib_package pkgconfig pythonnative
inherit cmake lib_package pkgconfig pythonnative
#inherit autotools pkgconfig gettext
FILESEXTRAPATHS_prepend := "${THISDIR}/files/:"
SRC_URI += " file://mediastreamer2_cmakefile.patch"
\ No newline at end of file
SRC_URI += " file://mediastreamer2_cmakefile.patch"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment