diff options
| author | Andre McCurdy <armccurdy@gmail.com> | 2016-01-18 19:47:08 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-22 23:42:42 +0000 |
| commit | 4f8f5dd7a487de5344bb01769892231956d63cb9 (patch) | |
| tree | b1cccd63f85098c42bfbd647881134baeaa6ed47 | |
| parent | 085a95b21c508ca67218e6e0ee0e3bfa85639af5 (diff) | |
| download | openembedded-core-4f8f5dd7a487de5344bb01769892231956d63cb9.tar.gz openembedded-core-4f8f5dd7a487de5344bb01769892231956d63cb9.tar.bz2 openembedded-core-4f8f5dd7a487de5344bb01769892231956d63cb9.zip | |
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.
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
| -rw-r--r-- | meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc | 4 | ||||
| -rw-r--r-- | meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.6.2.bb | 5 |
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+" DEPENDS += "gstreamer1.0-plugins-base libpng jpeg" -SRC_URI += "file://configure-allow-to-disable-libssh2.patch" - -S = "${WORKDIR}/gst-plugins-bad-${PV}" - inherit gettext bluetooth # 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 \ file://gst/tta/crc32.h;beginline=12;endline=29;md5=27db269c575d1e5317fffca2d33b3b50 \ file://gst/tta/filters.h;beginline=12;endline=29;md5=8a08270656f2f8ad7bb3655b83138e5a" -SRC_URI += "file://0001-glimagesink-Downrank-to-marginal.patch" +SRC_URI += " \ + file://configure-allow-to-disable-libssh2.patch \ + file://0001-glimagesink-Downrank-to-marginal.patch \ +" SRC_URI[md5sum] = "7c73bec1d389f0e184ebbbbb9e9f883d" SRC_URI[sha256sum] = "650855e39ff56a8bb6cb0c192109c5926ce12f536d06e19ebf829de71ef396fe" |