Commit c3da6657 authored by Sandrine Avakian's avatar Sandrine Avakian

Fixing mediastreamer2

parent 68d6f7b1
--- 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()
......@@ -9,20 +9,30 @@ DEPENDS = "intltool-native libortp speex alsa-lib spandsp libv4l"
PROVIDES += "libmediastreamer2"
S = "${WORKDIR}/git"
PACKAGECONFIG ??= "ffmpeg vpx opus srtp bzrtp ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
PACKAGECONFIG ??= "ffmpeg vpx opus srtp bzrtp gsm ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
PACKAGECONFIG[ffmpeg] = ", -DENABLE_FFMPEG=NO, libav"
PACKAGECONFIG[vpx] = ", -DENABLE_VPX=NO, libvpx"
PACKAGECONFIG[opus] = ", -DENABLE_OPUS=NO, opus-bc"
PACKAGECONFIG[srtp] = ", -DENABLE_SRTP=NO, libsrtp-bc"
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 += " -DENABLE_GLX_DEFAULT_VALUE=NO -DENABLE_PCAP=NO "
EXTRA_OECMAKE += " -DENABLE_GL=NO -DENABLE_GLX_DEFAULT_VALUE=NO -DENABLE_PCAP=NO -DENABLE_GSM=NO -DENABLE_BV16=NO -DENABLE_DOC=NO"
PACKAGES += "${PN}-bin"
#PACKAGES += "${PN}-bin"
FILES_${PN}-bin = "${bindir}/mediastream ${bindir}/msaudiocmp"
#FILES_${PN}-bin = "${bindir}/mediastream ${bindir}/msaudiocmp"
FILES_${PN} += " ${libdir}/mediastreamer/plugins ${datadir}/images/nowebcamCIF.jpg"
inherit cmake gettext pkgconfig
FILES_${PN}-dev += " \
${includedir} \
${libdir}/lib*.so \
${libdir}/*.la \
${libdir}/*.a \
${libdir}/*.o \
${libdir}/pkgconfig \
${prefix}/share/Mediastreamer2 "
inherit cmake lib_package pkgconfig pythonnative
FILESEXTRAPATHS_prepend := "${THISDIR}/files/:"
SRC_URI += " file://mediastreamer2_cmakefile.patch"
\ No newline at end of file
......@@ -4,8 +4,8 @@ inherit gitpkgv
PR = "${INC_PR}.0"
SRCREV = "4e5134f8578629cd55afc3d7b8b7bdb5ff41d264"
SRC_URI = "git://git.linphone.org/mediastreamer2.git"
SRCREV = "e715cc559f1c60710dae306426d1ade42420c517"
SRC_URI = "git://git.linphone.org/mediastreamer2.git;branch=2.15.x"
PV = "git_${SRCREV}"
PKGV = "${GITPKGVTAG}"
......
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