diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2015-11-11 16:32:16 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-12-08 10:20:51 +0000 |
commit | 642e92f2cd67980a731ba21b570d8d1c6f4798e0 (patch) | |
tree | ccae9a0f45db187759a1fcc536ddfc20a51c2dcb /meta/recipes-multimedia | |
parent | 96eac69636d2c345cdd50b19262f157335d53380 (diff) | |
download | poky-642e92f2cd67980a731ba21b570d8d1c6f4798e0.tar.gz |
package_regex.inc: split entries with odd-even versioning into their own recipes
(From OE-Core rev: 5ddaba1fb833d0408cef5f58f786513b9293c30a)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia')
4 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav.inc index 5d86205cf8..664c5d6f99 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav.inc +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav.inc | |||
@@ -5,7 +5,7 @@ LICENSE_FLAGS = "commercial" | |||
5 | HOMEPAGE = "http://www.gstreamer.net/" | 5 | HOMEPAGE = "http://www.gstreamer.net/" |
6 | DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base zlib bzip2 xz" | 6 | DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base zlib bzip2 xz" |
7 | 7 | ||
8 | inherit autotools pkgconfig | 8 | inherit autotools pkgconfig upstream-version-is-even |
9 | 9 | ||
10 | # CAUTION: Using the system libav is not recommended. Since the libav API is changing all the time, | 10 | # CAUTION: Using the system libav is not recommended. Since the libav API is changing all the time, |
11 | # compilation errors (and other, more subtle bugs) can happen. It is usually better to rely on the | 11 | # compilation errors (and other, more subtle bugs) can happen. It is usually better to rely on the |
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc index f1783b768b..58c0bbb3e2 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc | |||
@@ -4,7 +4,7 @@ BUGTRACKER = "https://bugzilla.gnome.org/enter_bug.cgi?product=Gstreamer" | |||
4 | SECTION = "multimedia" | 4 | SECTION = "multimedia" |
5 | DEPENDS = "gstreamer1.0" | 5 | DEPENDS = "gstreamer1.0" |
6 | 6 | ||
7 | inherit autotools pkgconfig | 7 | inherit autotools pkgconfig upstream-version-is-even |
8 | 8 | ||
9 | GSTREAMER_1_0_DEBUG ?= "--disable-debug" | 9 | GSTREAMER_1_0_DEBUG ?= "--disable-debug" |
10 | GSTREAMER_1_0_GIT_BRANCH ?= "master" | 10 | GSTREAMER_1_0_GIT_BRANCH ?= "master" |
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server.inc index 28a9420f85..65b4876696 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server.inc +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server.inc | |||
@@ -10,5 +10,5 @@ SRC_URI = "http://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${PV}.tar.xz | |||
10 | 10 | ||
11 | S = "${WORKDIR}/${PNREAL}-${PV}" | 11 | S = "${WORKDIR}/${PNREAL}-${PV}" |
12 | 12 | ||
13 | inherit autotools pkgconfig | 13 | inherit autotools pkgconfig upstream-version-is-even |
14 | 14 | ||
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0.inc index 7f36865660..77e160fd64 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0.inc +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0.inc | |||
@@ -7,7 +7,7 @@ SECTION = "multimedia" | |||
7 | LICENSE = "LGPLv2+" | 7 | LICENSE = "LGPLv2+" |
8 | DEPENDS = "glib-2.0 libxml2 bison-native flex-native libcap" | 8 | DEPENDS = "glib-2.0 libxml2 bison-native flex-native libcap" |
9 | 9 | ||
10 | inherit autotools pkgconfig gettext | 10 | inherit autotools pkgconfig gettext upstream-version-is-even |
11 | 11 | ||
12 | PACKAGECONFIG[debug] = "--enable-debug,--disable-debug" | 12 | PACKAGECONFIG[debug] = "--enable-debug,--disable-debug" |
13 | PACKAGECONFIG[check] = "--enable-check,--disable-check" | 13 | PACKAGECONFIG[check] = "--enable-check,--disable-check" |