summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2016-02-05 13:34:56 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-07 17:30:01 +0000
commita43b9ef53d880dd76d4965ddcd999b5757a152d1 (patch)
treee8d799f9568f2067c65ffe7ab368032e429122a3
parentfb4f05bef4ddd06ed32c3e3e6afd9ce771299af9 (diff)
downloadpoky-a43b9ef53d880dd76d4965ddcd999b5757a152d1.tar.gz
gstreamer1.0-plugins-base: move freetype dependency into 1.6.3 recipe
The dependency on freetype was dropped shortly after the 1.7.1 release so is no longer required for the git recipe. http://cgit.freedesktop.org/gstreamer/gst-plugins-base/commit/?id=183610c035dd6955c9b3540b940aec50474af031 (From OE-Core rev: cf2877828c9cecbbde298af9bc53c42394ada2a4) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc3
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.6.3.bb6
2 files changed, 7 insertions, 2 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc
index 5d18752f8a..e04096c0e8 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc
@@ -2,7 +2,7 @@ require gstreamer1.0-plugins.inc
2 2
3LICENSE = "GPLv2+ & LGPLv2+" 3LICENSE = "GPLv2+ & LGPLv2+"
4 4
5DEPENDS += "freetype iso-codes util-linux zlib" 5DEPENDS += "iso-codes util-linux zlib"
6 6
7inherit gettext 7inherit gettext
8 8
@@ -31,7 +31,6 @@ PACKAGECONFIG[x11] = "${X11ENABLEOPTS},${X11DISABLEOPTS},${X11DEPENDS}"
31 31
32EXTRA_OECONF += " \ 32EXTRA_OECONF += " \
33 --enable-zlib \ 33 --enable-zlib \
34 --disable-freetypetest \
35" 34"
36 35
37CACHED_CONFIGUREVARS_append_x86 = " ac_cv_header_emmintrin_h=no ac_cv_header_xmmintrin_h=no" 36CACHED_CONFIGUREVARS_append_x86 = " ac_cv_header_emmintrin_h=no ac_cv_header_xmmintrin_h=no"
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.6.3.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.6.3.bb
index b9ed3f41be..429dc9338f 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.6.3.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.6.3.bb
@@ -4,6 +4,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c54ce9345727175ff66d17b67ff51f58 \
4 file://COPYING.LIB;md5=6762ed442b3822387a51c92d928ead0d \ 4 file://COPYING.LIB;md5=6762ed442b3822387a51c92d928ead0d \
5 file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=a4e1830fce078028c8f0974161272607" 5 file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=a4e1830fce078028c8f0974161272607"
6 6
7# Note: The dependency on freetype was dropped shortly after the 1.7.1 release
8# so these lines should be removed during the update to 1.8.x
9# http://cgit.freedesktop.org/gstreamer/gst-plugins-base/commit/?id=183610c035dd6955c9b3540b940aec50474af031
10DEPENDS += "freetype"
11EXTRA_OECONF += "--disable-freetypetest"
12
7SRC_URI = " \ 13SRC_URI = " \
8 http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-${PV}.tar.xz \ 14 http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-${PV}.tar.xz \
9 file://get-caps-from-src-pad-when-query-caps.patch \ 15 file://get-caps-from-src-pad-when-query-caps.patch \