summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2016-01-18 19:47:08 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-24 09:40:24 +0000
commit97e07529671be823f052b1bc15da48dc7ba256c8 (patch)
tree1c4958dc38bdbca08a72ae7a4fb86cd5f925b15d /meta
parent78e936174996f07dc5b1db82ebfa7b156d77f189 (diff)
downloadpoky-97e07529671be823f052b1bc15da48dc7ba256c8.tar.gz
gstreamer1.0-plugins-bad.inc: don't set ${S} or apply version specific patch
gstreamer1.0-plugins-bad.inc is shared by both the 1.6.2 and git recipes, so must not set ${S} or apply any version specific patches. (From OE-Core rev: 4f8f5dd7a487de5344bb01769892231956d63cb9) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc4
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.6.2.bb5
2 files changed, 4 insertions, 5 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc
index 4aa2f564cd..689d3ad7a3 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc
@@ -4,10 +4,6 @@ LICENSE = "GPLv2+ & LGPLv2+ & LGPLv2.1+"
4 4
5DEPENDS += "gstreamer1.0-plugins-base libpng jpeg" 5DEPENDS += "gstreamer1.0-plugins-base libpng jpeg"
6 6
7SRC_URI += "file://configure-allow-to-disable-libssh2.patch"
8
9S = "${WORKDIR}/gst-plugins-bad-${PV}"
10
11inherit gettext bluetooth 7inherit gettext bluetooth
12 8
13# opengl packageconfig factored out to make it easy for distros 9# opengl packageconfig factored out to make it easy for distros
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.6.2.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.6.2.bb
index c1c322b136..004d0530d9 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.6.2.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.6.2.bb
@@ -5,7 +5,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=73a5855a8119deb017f5f13cf327095d \
5 file://gst/tta/crc32.h;beginline=12;endline=29;md5=27db269c575d1e5317fffca2d33b3b50 \ 5 file://gst/tta/crc32.h;beginline=12;endline=29;md5=27db269c575d1e5317fffca2d33b3b50 \
6 file://gst/tta/filters.h;beginline=12;endline=29;md5=8a08270656f2f8ad7bb3655b83138e5a" 6 file://gst/tta/filters.h;beginline=12;endline=29;md5=8a08270656f2f8ad7bb3655b83138e5a"
7 7
8SRC_URI += "file://0001-glimagesink-Downrank-to-marginal.patch" 8SRC_URI += " \
9 file://configure-allow-to-disable-libssh2.patch \
10 file://0001-glimagesink-Downrank-to-marginal.patch \
11"
9 12
10SRC_URI[md5sum] = "7c73bec1d389f0e184ebbbbb9e9f883d" 13SRC_URI[md5sum] = "7c73bec1d389f0e184ebbbbb9e9f883d"
11SRC_URI[sha256sum] = "650855e39ff56a8bb6cb0c192109c5926ce12f536d06e19ebf829de71ef396fe" 14SRC_URI[sha256sum] = "650855e39ff56a8bb6cb0c192109c5926ce12f536d06e19ebf829de71ef396fe"