diff options
author | Carlos Rafael Giani <dv@pseudoterminal.org> | 2016-08-26 20:53:20 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-09-14 22:22:07 +0100 |
commit | 564a0d782d2989a056c58f944dfbaa6adbb8e027 (patch) | |
tree | a0d8c70248a5a32dc1dc69582da294d3403d567a /meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc | |
parent | 473a47974c4a5e97b72cced102d18b2374bffb9c (diff) | |
download | poky-564a0d782d2989a056c58f944dfbaa6adbb8e027.tar.gz |
gstreamer1.0-plugins-bad: Fix packageconfigs and patches
This reintroduces fixes and changes which were introduced in the original
gstreamer1.0-plugins-bad 1.8.1 upgrade commit.
* packageconfigs changed since GStreamer 1.6.3
(they often do between minor version increases like 1.6 -> 1.8)
* hls,tinyalsa packageconfigs moved into the .inc file
* vulkan packageconfig dropped since there are no vulkan libraries in OE
(libxcb alone is not enough)
* reintroduced glimagesink downrank patch (it was removed because it was
dangling before)
* fixed patch line numbers
(From OE-Core rev: ca3f9fbe21407685ed09c60bc4b991b5c6b448f4)
Signed-off-by: Carlos Rafael Giani <dv@pseudoterminal.org>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc')
-rw-r--r-- | meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc index a815c5061b..0fe5564b53 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc | |||
@@ -39,7 +39,9 @@ PACKAGECONFIG[flite] = "--enable-flite,--disable-flite,flite-alsa" | |||
39 | PACKAGECONFIG[fluidsynth] = "--enable-fluidsynth,--disable-fluidsynth,fluidsynth" | 39 | PACKAGECONFIG[fluidsynth] = "--enable-fluidsynth,--disable-fluidsynth,fluidsynth" |
40 | PACKAGECONFIG[gles2] = "--enable-gles2,--disable-gles2,virtual/libgles2" | 40 | PACKAGECONFIG[gles2] = "--enable-gles2,--disable-gles2,virtual/libgles2" |
41 | PACKAGECONFIG[gtk] = "--enable-gtk3,--disable-gtk3,gtk+3" | 41 | PACKAGECONFIG[gtk] = "--enable-gtk3,--disable-gtk3,gtk+3" |
42 | PACKAGECONFIG[hls] = "--enable-hls,--disable-hls,nettle" | 42 | # ensure OpenSSL is used for HLS AES description instead of nettle |
43 | # (OpenSSL is a shared dependency with dtls) | ||
44 | PACKAGECONFIG[hls] = "--enable-hls --with-hls-crypto=openssl,--disable-hls,openssl" | ||
43 | PACKAGECONFIG[libmms] = "--enable-libmms,--disable-libmms,libmms" | 45 | PACKAGECONFIG[libmms] = "--enable-libmms,--disable-libmms,libmms" |
44 | PACKAGECONFIG[libssh2] = "--enable-libssh2,--disable-libssh2,libssh2" | 46 | PACKAGECONFIG[libssh2] = "--enable-libssh2,--disable-libssh2,libssh2" |
45 | PACKAGECONFIG[modplug] = "--enable-modplug,--disable-modplug,libmodplug" | 47 | PACKAGECONFIG[modplug] = "--enable-modplug,--disable-modplug,libmodplug" |
@@ -47,7 +49,9 @@ PACKAGECONFIG[neon] = "--enable-neon,--disable-neon,neon" | |||
47 | PACKAGECONFIG[openal] = "--enable-openal,--disable-openal,openal-soft" | 49 | PACKAGECONFIG[openal] = "--enable-openal,--disable-openal,openal-soft" |
48 | PACKAGECONFIG[opencv] = "--enable-opencv,--disable-opencv,opencv" | 50 | PACKAGECONFIG[opencv] = "--enable-opencv,--disable-opencv,opencv" |
49 | PACKAGECONFIG[opengl] = "--enable-opengl,--disable-opengl,virtual/libgl libglu" | 51 | PACKAGECONFIG[opengl] = "--enable-opengl,--disable-opengl,virtual/libgl libglu" |
50 | PACKAGECONFIG[opus] = "--enable-opus,--disable-opus,libopus" | 52 | # the opus encoder/decoder elements are now in the -base package, |
53 | # but the opus parser remains in -bad | ||
54 | PACKAGECONFIG[opusparse] = "--enable-opus,--disable-opus,libopus" | ||
51 | PACKAGECONFIG[resindvd] = "--enable-resindvd,--disable-resindvd,libdvdread libdvdnav" | 55 | PACKAGECONFIG[resindvd] = "--enable-resindvd,--disable-resindvd,libdvdread libdvdnav" |
52 | PACKAGECONFIG[rsvg] = "--enable-rsvg,--disable-rsvg,librsvg" | 56 | PACKAGECONFIG[rsvg] = "--enable-rsvg,--disable-rsvg,librsvg" |
53 | PACKAGECONFIG[rtmp] = "--enable-rtmp,--disable-rtmp,rtmpdump" | 57 | PACKAGECONFIG[rtmp] = "--enable-rtmp,--disable-rtmp,rtmpdump" |
@@ -63,15 +67,15 @@ PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,wayland-nat | |||
63 | PACKAGECONFIG[webp] = "--enable-webp,--disable-webp,libwebp" | 67 | PACKAGECONFIG[webp] = "--enable-webp,--disable-webp,libwebp" |
64 | 68 | ||
65 | # these plugins have not been ported to 1.0 (yet): | 69 | # these plugins have not been ported to 1.0 (yet): |
66 | # apexsink dc1394 lv2 linsys musepack nas timidity teletextdec sdl xvid wininet | 70 | # apexsink dc1394 lv2 linsys musepack nas timidity sdl xvid wininet |
67 | # acm gsettings sndio cdxaparse dccp faceoverlay hdvparse tta mve nuvdemux | 71 | # sndio cdxaparse dccp faceoverlay hdvparse tta mve nuvdemux |
68 | # patchdetect real sdi videomeasure gsettings | 72 | # patchdetect sdi videomeasure |
69 | 73 | ||
70 | # these plugins have no corresponding library in OE-core or meta-openembedded: | 74 | # these plugins have no corresponding library in OE-core or meta-openembedded: |
71 | # openni2 winks direct3d directsound winscreencap | 75 | # openni2 winks direct3d directsound winscreencap acm |
72 | # apple_media android_media avc bs2b chromaprint daala dts gme gsm kate ladspa | 76 | # apple_media android_media avc bs2b chromaprint daala dts gme gsm kate ladspa |
73 | # libde265 mimic mpeg2enc mplex ofa openh264 opensles pvr soundtouch spandsp | 77 | # libde265 mimic mpeg2enc mplex nvenc ofa openh264 opensles pvr soundtouch spandsp |
74 | # spc vdpau wasapi x265 zbar | 78 | # spc teletextdec tinyalsa vdpau vulkan wasapi x265 zbar |
75 | 79 | ||
76 | # qt5 support is disabled, because it is not present in OE core, and requires more work than | 80 | # qt5 support is disabled, because it is not present in OE core, and requires more work than |
77 | # just adding a packageconfig (it requires access to moc, uic, rcc, and qmake paths). | 81 | # just adding a packageconfig (it requires access to moc, uic, rcc, and qmake paths). |
@@ -82,6 +86,7 @@ EXTRA_OECONF += " \ | |||
82 | --enable-decklink \ | 86 | --enable-decklink \ |
83 | --enable-dvb \ | 87 | --enable-dvb \ |
84 | --enable-fbdev \ | 88 | --enable-fbdev \ |
89 | --enable-netsim \ | ||
85 | --enable-shm \ | 90 | --enable-shm \ |
86 | --enable-vcd \ | 91 | --enable-vcd \ |
87 | --disable-acm \ | 92 | --disable-acm \ |
@@ -110,6 +115,7 @@ EXTRA_OECONF += " \ | |||
110 | --disable-mplex \ | 115 | --disable-mplex \ |
111 | --disable-musepack \ | 116 | --disable-musepack \ |
112 | --disable-nas \ | 117 | --disable-nas \ |
118 | --disable-nvenc \ | ||
113 | --disable-ofa \ | 119 | --disable-ofa \ |
114 | --disable-openexr \ | 120 | --disable-openexr \ |
115 | --disable-openh264 \ | 121 | --disable-openh264 \ |
@@ -126,7 +132,9 @@ EXTRA_OECONF += " \ | |||
126 | --disable-spc \ | 132 | --disable-spc \ |
127 | --disable-teletextdec \ | 133 | --disable-teletextdec \ |
128 | --disable-timidity \ | 134 | --disable-timidity \ |
135 | --disable-tinyalsa \ | ||
129 | --disable-vdpau \ | 136 | --disable-vdpau \ |
137 | --disable-vulkan \ | ||
130 | --disable-wasapi \ | 138 | --disable-wasapi \ |
131 | --disable-wildmidi \ | 139 | --disable-wildmidi \ |
132 | --disable-wininet \ | 140 | --disable-wininet \ |