diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2018-09-01 15:43:34 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2018-09-01 15:48:41 +0530 |
| commit | badc9f9a2a3b85124a88c40ce9fc30f9eddcbe92 (patch) | |
| tree | 9aa645b25e1c10e9957be91e48ac9ae35810cfa8 | |
| parent | 6adb5a7f4963ab2950367633339d1fb6e7f729e7 (diff) | |
gst-plugins-good-1.0.recipe: Fix jpeg plugin on iOS
Now that we require the use of the pkg-config file in the meson build
files, we need to ensure that the libjpeg pkg-config file is correctly
merged when building ios flat universal.
| -rw-r--r-- | recipes/gst-plugins-good-1.0.recipe | 2 | ||||
| -rw-r--r-- | recipes/libjpeg-turbo.recipe | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/recipes/gst-plugins-good-1.0.recipe b/recipes/gst-plugins-good-1.0.recipe index ad5bc19b..6b7b95d9 100644 --- a/recipes/gst-plugins-good-1.0.recipe +++ b/recipes/gst-plugins-good-1.0.recipe @@ -8,7 +8,7 @@ class Recipe(custom.GStreamer): meson_options = {'examples': 'disabled', 'oss': 'disabled', 'oss4': 'disabled', 'dv1394': 'disabled', 'aalib': 'disabled', 'libcaca': 'disabled', 'jack': 'disabled', 'shout2': 'disabled', 'twolame': 'disabled', - 'qt5': 'disabled', 'gtk3': 'disabled'} + 'qt5': 'disabled', 'gtk3': 'disabled', 'jpeg': 'enabled'} remotes = {'origin': 'https://anongit.freedesktop.org/git/gstreamer/gst-plugins-good'} deps = ['gstreamer-1.0', 'gst-plugins-base-1.0', 'libjpeg-turbo', 'libpng', 'speex', 'gdk-pixbuf', 'libsoup', 'mpg123', 'lame', diff --git a/recipes/libjpeg-turbo.recipe b/recipes/libjpeg-turbo.recipe index bcb123cb..cc14edf6 100644 --- a/recipes/libjpeg-turbo.recipe +++ b/recipes/libjpeg-turbo.recipe @@ -15,7 +15,7 @@ class Recipe(recipe.Recipe): files_libs = ['libjpeg','libturbojpeg'] files_devel = ['include/jpeglib.h', 'include/jerror.h', 'include/jconfig.h', - 'include/jmorecfg.h','include/turbojpeg.h'] + 'include/jmorecfg.h','include/turbojpeg.h', 'lib/pkgconfig/libjpeg.pc'] def prepare(self): if self.config.target_platform in [Platform.DARWIN, Platform.IOS]: |