diff options
| author |   Andre McCurdy <armccurdy@gmail.com> | 2016-02-05 13:34:56 -0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-02-07 17:29:46 +0000 |
| commit | cf2877828c9cecbbde298af9bc53c42394ada2a4 (patch) | |
| tree | 5b2552996cbb8291cc19215aff7b0245c2dbbfa6 /meta/recipes-multimedia/gstreamer | |
| parent | 4641dfe33263aefcaf0a69c62344764ddb58ff89 (diff) | |
| download | openembedded-core-contrib-cf2877828c9cecbbde298af9bc53c42394ada2a4.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
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-multimedia/gstreamer')
| -rw-r--r-- | meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc | 3 | ||||
| -rw-r--r-- | meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.6.3.bb | 6 |
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 LICENSE = "GPLv2+ & LGPLv2+" -DEPENDS += "freetype iso-codes util-linux zlib" +DEPENDS += "iso-codes util-linux zlib" inherit gettext @@ -31,7 +31,6 @@ PACKAGECONFIG[x11] = "${X11ENABLEOPTS},${X11DISABLEOPTS},${X11DEPENDS}" EXTRA_OECONF += " \ --enable-zlib \ - --disable-freetypetest \ " CACHED_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 \ file://COPYING.LIB;md5=6762ed442b3822387a51c92d928ead0d \ file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=a4e1830fce078028c8f0974161272607" +# Note: The dependency on freetype was dropped shortly after the 1.7.1 release +# so these lines should be removed during the update to 1.8.x +# http://cgit.freedesktop.org/gstreamer/gst-plugins-base/commit/?id=183610c035dd6955c9b3540b940aec50474af031 +DEPENDS += "freetype" +EXTRA_OECONF += "--disable-freetypetest" + SRC_URI = " \ http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-${PV}.tar.xz \ file://get-caps-from-src-pad-when-query-caps.patch \ |