Fix differences to OE-core

OSSystems · Sep 29, 2015 · a86ebea · a86ebea
1 parent b0e192e
commit a86ebea
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 10 deletions.
diff --git a/...streamer/gstreamer1.0-plugins-package.inc → ...timedia/gstreamer/gst-plugins-package.inc b/...streamer/gstreamer1.0-plugins-package.inc → ...timedia/gstreamer/gst-plugins-package.inc
@@ -1,5 +1,3 @@
-LIBV = "1.0"
-
 PACKAGESPLITFUNCS_prepend = " split_gstreamer10_packages "
 PACKAGESPLITFUNCS_append = " set_metapkg_rdepends "
 

diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-libav.inc b/recipes-multimedia/gstreamer/gstreamer1.0-libav.inc
@@ -14,6 +14,7 @@ PACKAGECONFIG ??= " orc yasm "
 PACKAGECONFIG[libav] = "--with-system-libav,,libav"
 PACKAGECONFIG[lgpl]  = "--enable-lgpl,,"
 PACKAGECONFIG[yasm]  = "--enable-yasm,--disable-yasm,yasm-native"
+PACKAGECONFIG[orc]  = "--enable-orc,--disable-orc,orc"
 
 
 GSTREAMER_1_0_DEBUG ?= "--disable-debug"

diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-libav_git.bb b/recipes-multimedia/gstreamer/gstreamer1.0-libav_git.bb
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
                     file://gst-libs/ext/libav/COPYING.LGPLv2.1;md5=bd7a443320af8c812e4c18d1b79df004 \
                     file://gst-libs/ext/libav/COPYING.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02"
 
-SRC_URI = "git://anongit.freedesktop.org/gstreamer/gst-libav;branch=master;protocol=git"
+SRC_URI = "git://anongit.freedesktop.org/gstreamer/gst-libav;branch=master"
 S = "${WORKDIR}/git"
 
 SRCREV = "127202d6f65584891dabf92be031f0d170b0e7f1"

diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-omx_git.bb b/recipes-multimedia/gstreamer/gstreamer1.0-omx_git.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \
                     file://omx/gstomx.h;beginline=1;endline=21;md5=5c8e1fca32704488e76d2ba9ddfa935f"
 
 SRC_URI = " \
-    git://anongit.freedesktop.org/gstreamer/gst-omx;branch=master;protocol=git \
+    git://anongit.freedesktop.org/gstreamer/gst-omx;branch=master \
     file://0001-omx-fixed-type-error-in-printf-call.patch \    
     "
 S = "${WORKDIR}/git"

diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc b/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc
@@ -12,7 +12,8 @@ EXTRA_OECONF = "--disable-valgrind ${GSTREAMER_1_0_DEBUG} --disable-examples "
 
 acpaths = "-I ${S}/common/m4 -I ${S}/m4"
 
-require gstreamer1.0-plugins-package.inc
+LIBV = "1.0"
+require gst-plugins-package.inc
 
 PACKAGECONFIG[orc] = "--enable-orc,--disable-orc,orc"
 
@@ -27,7 +28,9 @@ oe_runconf_prepend() {
 	fi
 }
 
-python __anonymous () {
+SRC_URI = "${@get_gst_srcuri(d)}"
+
+def get_gst_srcuri(d):
     # check if expected prefix is present
     prefix = "gstreamer1.0-"
     bpn = d.getVar("BPN", True)
@@ -40,10 +43,10 @@ python __anonymous () {
     branch = d.getVar("GSTREAMER_1_0_GIT_BRANCH", True)
 
     if pv == "git":
-        d.setVar("SRC_URI", d.getVar("SRC_URI") + " git://anongit.freedesktop.org/gstreamer/%s;branch=%s;protocol=git" % (gstpkg_basename, branch))
+        s = "git://anongit.freedesktop.org/gstreamer/%s;branch=%s" % (gstpkg_basename, branch)
     else:
-        d.setVar("SRC_URI", d.getVar("SRC_URI") + " http://gstreamer.freedesktop.org/src/%s/%s-%s.tar.xz" % (gstpkg_basename, gstpkg_basename, pv))
-}
+        s = "http://gstreamer.freedesktop.org/src/%s/%s-%s.tar.xz" % (gstpkg_basename, gstpkg_basename, pv)
+    return s
 
 delete_liblink_m4_file() {
 	# This m4 file contains nastiness which conflicts with libtool 2.2.2

diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server.inc b/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server.inc
@@ -0,0 +1,14 @@
+SUMMARY = "A library on top of GStreamer for building an RTSP server"
+SECTION = "multimedia"
+LICENSE = "LGPLv2"
+HOMEPAGE = "http://cgit.freedesktop.org/gstreamer/gst-rtsp-server/"
+DEPENDS = "gstreamer1.0 libcgroup gstreamer1.0-plugins-base"
+
+PNREAL = "gst-rtsp-server"
+
+SRC_URI = "http://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${PV}.tar.xz"
+
+S = "${WORKDIR}/${PNREAL}-${PV}"
+
+inherit autotools pkgconfig 
+
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.2.3.bb b/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.2.3.bb
@@ -0,0 +1,9 @@
+include gstreamer1.0-rtsp-server.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d"
+
+SRC_URI[md5sum] = "239f805e755deb388162e957fcffff1d"
+SRC_URI[sha256sum] = "c12befa5ec63818842c150725d3e9e38bf9948366317b67dc2536dfd00765da1"
+
+
+
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0_git.bb b/recipes-multimedia/gstreamer/gstreamer1.0_git.bb
@@ -5,7 +5,7 @@ include gstreamer1.0.inc
 LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d \
                     file://gst/gst.h;beginline=1;endline=21;md5=e059138481205ee2c6fc1c079c016d0d"
 
-SRC_URI = "git://anongit.freedesktop.org/gstreamer/gstreamer;branch=master;protocol=git"
+SRC_URI = "git://anongit.freedesktop.org/gstreamer/gstreamer;branch=master"
 S = "${WORKDIR}/git"
 
 SRCREV = "3b8181a8c550e74acaba4e8c55bdc649fa551dc9"