Merge branches 'master' and 'obi' into obi

[vuplus_openvuplus_3.0] / meta-openvuplus / recipes-multimedia / gstreamer / gst-plugin-dvbmediasink_0.10.bb

diff --git a/meta-openvuplus/recipes-multimedia/gstreamer/gst-plugin-dvbmediasink_0.10.bb b/meta-openvuplus/recipes-multimedia/gstreamer/gst-plugin-dvbmediasink_0.10.bb
index 11febfc..e1070bd 100644 (file)
--- a/meta-openvuplus/recipes-multimedia/gstreamer/gst-plugin-dvbmediasink_0.10.bb
+++ b/meta-openvuplus/recipes-multimedia/gstreamer/gst-plugin-dvbmediasink_0.10.bb
@@ -1,15 +1,28 @@
 SUMMARY = "Plugin for gstreamer: dvbmediasink"
 SECTION = "multimedia"
+MAINTAINER = "Felix Domke <tmbinc@openembedded.org>"
 LICENSE = "MIT | LGPLv2.1"
-LIC_FILES_CHKSUM = "file://src/gstdvbaudiosink.c;beginline=1;endline=45;md5=023ebb8eaef9b8cce8591a9d96638392 \
-                    file://src/gstdvbvideosink.c;beginline=1;endline=44;md5=b597d3f0a4e3b49db42d2b5140bd7004"
+LIC_FILES_CHKSUM = "file://src/gstdvbaudiosink.c;md5=1b3d0c8e4a67b80e29e1a8bf0e7d568c \
+                    file://src/gstdvbvideosink.c;md5=01003daf0d4030982ef58f3f8540bd33"
+
 DEPENDS = "gstreamer gst-plugins-base"
-SRCREV = "1bc9f47255396df4b3119a02790c4e864566560a"
-PR = "r5"
 
-SCHWERKRAFT_PROJECT = "dvbmediasink"
+#SRCREV="15a323fd769d4546bc454bfd81848aa43d655f3d"
+SRCREV="1bc9f47255396df4b3119a02790c4e864566560a"
+SRCDATE="20110210"
+BRANCH="master"
+PV = "0.10+git${SRCDATE}"
+PR = "r6"
+
+inherit autotools pkgconfig
+SRC_URI = "git://schwerkraft.elitedvb.net/dvbmediasink/dvbmediasink.git;protocol=git;branch=${BRANCH};tag=${SRCREV}"
+
+SRC_URI_append_vuplus = " \
+                file://fix_dvbaudiosink_async_opt.patch;patch=1;pnum=1 \
+                file://fix_dvbvideosink_dm8000_padtemplate.patch;patch=1;pnum=1 \
+                "
 
-inherit autotools schwerkraft-git
+S = "${WORKDIR}/git"
 
 FILES_${PN} = "${libdir}/gstreamer-0.10/*.so"
 FILES_${PN}-dev += "${libdir}/gstreamer-0.10/*.la"