summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarlos Rafael Giani <dv@pseudoterminal.org>2016-08-26 20:53:20 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-14 22:22:07 +0100
commit564a0d782d2989a056c58f944dfbaa6adbb8e027 (patch)
treea0d8c70248a5a32dc1dc69582da294d3403d567a
parent473a47974c4a5e97b72cced102d18b2374bffb9c (diff)
downloadpoky-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>
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc24
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch4
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0009-glimagesink-Downrank-to-marginal.patch32
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.8.3.bb34
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_git.bb20
5 files changed, 51 insertions, 63 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"
39PACKAGECONFIG[fluidsynth] = "--enable-fluidsynth,--disable-fluidsynth,fluidsynth" 39PACKAGECONFIG[fluidsynth] = "--enable-fluidsynth,--disable-fluidsynth,fluidsynth"
40PACKAGECONFIG[gles2] = "--enable-gles2,--disable-gles2,virtual/libgles2" 40PACKAGECONFIG[gles2] = "--enable-gles2,--disable-gles2,virtual/libgles2"
41PACKAGECONFIG[gtk] = "--enable-gtk3,--disable-gtk3,gtk+3" 41PACKAGECONFIG[gtk] = "--enable-gtk3,--disable-gtk3,gtk+3"
42PACKAGECONFIG[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)
44PACKAGECONFIG[hls] = "--enable-hls --with-hls-crypto=openssl,--disable-hls,openssl"
43PACKAGECONFIG[libmms] = "--enable-libmms,--disable-libmms,libmms" 45PACKAGECONFIG[libmms] = "--enable-libmms,--disable-libmms,libmms"
44PACKAGECONFIG[libssh2] = "--enable-libssh2,--disable-libssh2,libssh2" 46PACKAGECONFIG[libssh2] = "--enable-libssh2,--disable-libssh2,libssh2"
45PACKAGECONFIG[modplug] = "--enable-modplug,--disable-modplug,libmodplug" 47PACKAGECONFIG[modplug] = "--enable-modplug,--disable-modplug,libmodplug"
@@ -47,7 +49,9 @@ PACKAGECONFIG[neon] = "--enable-neon,--disable-neon,neon"
47PACKAGECONFIG[openal] = "--enable-openal,--disable-openal,openal-soft" 49PACKAGECONFIG[openal] = "--enable-openal,--disable-openal,openal-soft"
48PACKAGECONFIG[opencv] = "--enable-opencv,--disable-opencv,opencv" 50PACKAGECONFIG[opencv] = "--enable-opencv,--disable-opencv,opencv"
49PACKAGECONFIG[opengl] = "--enable-opengl,--disable-opengl,virtual/libgl libglu" 51PACKAGECONFIG[opengl] = "--enable-opengl,--disable-opengl,virtual/libgl libglu"
50PACKAGECONFIG[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
54PACKAGECONFIG[opusparse] = "--enable-opus,--disable-opus,libopus"
51PACKAGECONFIG[resindvd] = "--enable-resindvd,--disable-resindvd,libdvdread libdvdnav" 55PACKAGECONFIG[resindvd] = "--enable-resindvd,--disable-resindvd,libdvdread libdvdnav"
52PACKAGECONFIG[rsvg] = "--enable-rsvg,--disable-rsvg,librsvg" 56PACKAGECONFIG[rsvg] = "--enable-rsvg,--disable-rsvg,librsvg"
53PACKAGECONFIG[rtmp] = "--enable-rtmp,--disable-rtmp,rtmpdump" 57PACKAGECONFIG[rtmp] = "--enable-rtmp,--disable-rtmp,rtmpdump"
@@ -63,15 +67,15 @@ PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,wayland-nat
63PACKAGECONFIG[webp] = "--enable-webp,--disable-webp,libwebp" 67PACKAGECONFIG[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 \
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch
index 154d340e4e..33efc503eb 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch
@@ -17,7 +17,7 @@ diff --git a/gst-libs/gst/gl/Makefile.am b/gst-libs/gst/gl/Makefile.am
17index f968357..7cc2c7a 100644 17index f968357..7cc2c7a 100644
18--- a/gst-libs/gst/gl/Makefile.am 18--- a/gst-libs/gst/gl/Makefile.am
19+++ b/gst-libs/gst/gl/Makefile.am 19+++ b/gst-libs/gst/gl/Makefile.am
20@@ -149,7 +149,7 @@ GstGL-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstgl-@GST_API_VERSION@ 20@@ -167,7 +167,7 @@ GstGL-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstgl-@GST_API_VERSION@
21 --library=libgstgl-@GST_API_VERSION@.la \ 21 --library=libgstgl-@GST_API_VERSION@.la \
22 --include=Gst-@GST_API_VERSION@ \ 22 --include=Gst-@GST_API_VERSION@ \
23 --include=GstBase-@GST_API_VERSION@ \ 23 --include=GstBase-@GST_API_VERSION@ \
@@ -30,7 +30,7 @@ diff --git a/gst-libs/gst/insertbin/Makefile.am b/gst-libs/gst/insertbin/Makefil
30index 09eb97c..b746885 100644 30index 09eb97c..b746885 100644
31--- a/gst-libs/gst/insertbin/Makefile.am 31--- a/gst-libs/gst/insertbin/Makefile.am
32+++ b/gst-libs/gst/insertbin/Makefile.am 32+++ b/gst-libs/gst/insertbin/Makefile.am
33@@ -43,7 +43,7 @@ GstInsertBin-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstinsertbin-@GS 33@@ -44,7 +44,7 @@ GstInsertBin-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstinsertbin-@GS
34 --library=libgstinsertbin-@GST_API_VERSION@.la \ 34 --library=libgstinsertbin-@GST_API_VERSION@.la \
35 --include=Gst-@GST_API_VERSION@ \ 35 --include=Gst-@GST_API_VERSION@ \
36 --include=GstBase-@GST_API_VERSION@ \ 36 --include=GstBase-@GST_API_VERSION@ \
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0009-glimagesink-Downrank-to-marginal.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0009-glimagesink-Downrank-to-marginal.patch
new file mode 100644
index 0000000000..c81fb0f6aa
--- /dev/null
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0009-glimagesink-Downrank-to-marginal.patch
@@ -0,0 +1,32 @@
1From c6b37a80806f9128de47f1ccc3f2354f8d436bb6 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Thu, 24 Sep 2015 19:47:32 +0300
4Subject: [PATCH] glimagesink: Downrank to marginal
5
6On desktop, where there is good OpenGL, xvimagesink will come up first,
7on other platforms, OpenGL can't be trusted because it's either software (like
8in a VM) or broken (like on embedded)., so let ximagesink come above.
9
10Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=751684]
11
12Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
13---
14 ext/gl/gstopengl.c | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17diff --git a/ext/gl/gstopengl.c b/ext/gl/gstopengl.c
18index a4b2540..0ccaacd 100644
19--- a/ext/gl/gstopengl.c
20+++ b/ext/gl/gstopengl.c
21@@ -118,7 +118,7 @@ plugin_init (GstPlugin * plugin)
22 #endif
23
24 if (!gst_element_register (plugin, "glimagesink",
25- GST_RANK_SECONDARY, gst_gl_image_sink_bin_get_type ())) {
26+ GST_RANK_MARGINAL, gst_gl_image_sink_bin_get_type ())) {
27 return FALSE;
28 }
29
30--
312.1.4
32
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.8.3.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.8.3.bb
index 928d2d4313..108f4db10e 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.8.3.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.8.3.bb
@@ -18,41 +18,9 @@ SRC_URI = " \
18 file://0005-glshader-add-glBindFragDataLocation.patch \ 18 file://0005-glshader-add-glBindFragDataLocation.patch \
19 file://0006-glcolorconvert-GLES3-deprecates-texture2D-and-it-doe.patch \ 19 file://0006-glcolorconvert-GLES3-deprecates-texture2D-and-it-doe.patch \
20 file://0008-gl-implement-GstGLMemoryEGL.patch \ 20 file://0008-gl-implement-GstGLMemoryEGL.patch \
21 file://0009-glimagesink-Downrank-to-marginal.patch \
21" 22"
22SRC_URI[md5sum] = "955281a43e98c5464563fa049e0a0911" 23SRC_URI[md5sum] = "955281a43e98c5464563fa049e0a0911"
23SRC_URI[sha256sum] = "7899fcb18e6a1af2888b19c90213af018a57d741c6e72ec56b133bc73ec8509b" 24SRC_URI[sha256sum] = "7899fcb18e6a1af2888b19c90213af018a57d741c6e72ec56b133bc73ec8509b"
24 25
25S = "${WORKDIR}/gst-plugins-bad-${PV}" 26S = "${WORKDIR}/gst-plugins-bad-${PV}"
26
27# over-ride the default hls PACKAGECONFIG in gstreamer1.0-plugins-bad.inc to
28# pass an additional --with-hls-crypto=XXX option (new in 1.7.x) and switch HLS
29# AES decryption from nettle to openssl (ie a shared dependency with dtls).
30# This should move back to the common .inc once the main recipe updates to 1.8.x
31PACKAGECONFIG[hls] = "--enable-hls --with-hls-crypto=openssl,--disable-hls,openssl"
32
33# The tinyalsa plugin was added prior to the 1.7.2 release
34# https://cgit.freedesktop.org/gstreamer/gst-plugins-bad/commit/?id=c8bd74fa9a81398f57d976c478d2043f30188684
35PACKAGECONFIG[tinyalsa] = "--enable-tinyalsa,--disable-tinyalsa,tinyalsa"
36
37# The vulkan based video sink plugin was added prior to the 1.7.2 release
38# https://cgit.freedesktop.org/gstreamer/gst-plugins-bad/commit/?id=5de6dd9f40629562acf90e35e1fa58464d66617d
39PACKAGECONFIG[vulkan] = "--enable-vulkan,--disable-vulkan,libxcb"
40
41# The dependency-less netsim plugin was added prior to the 1.7.2 release
42# https://cgit.freedesktop.org/gstreamer/gst-plugins-bad/commit/?id=e3f9e854f08e82bfab11182c5a2aa6f9a0c73cd5
43EXTRA_OECONF += " \
44 --enable-netsim \
45"
46
47# In 1.6.2, the "--enable-hls" configure option generated an installable package
48# called "gstreamer1.0-plugins-bad-fragmented". In 1.7.1 that HLS plugin package
49# has become "gstreamer1.0-plugins-bad-hls". See:
50# http://cgit.freedesktop.org/gstreamer/gst-plugins-bad/commit/?id=efe62292a3d045126654d93239fdf4cc8e48ae08
51
52PACKAGESPLITFUNCS_append = " handle_hls_rename "
53
54python handle_hls_rename () {
55 d.setVar('RPROVIDES_gstreamer1.0-plugins-bad-hls', 'gstreamer1.0-plugins-bad-fragmented')
56 d.setVar('RREPLACES_gstreamer1.0-plugins-bad-hls', 'gstreamer1.0-plugins-bad-fragmented')
57 d.setVar('RCONFLICTS_gstreamer1.0-plugins-bad-hls', 'gstreamer1.0-plugins-bad-fragmented')
58}
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_git.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_git.bb
index d3fbd12a6f..1370380b94 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_git.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_git.bb
@@ -27,26 +27,6 @@ SRCREV_FORMAT = "base"
27 27
28S = "${WORKDIR}/git" 28S = "${WORKDIR}/git"
29 29
30# over-ride the default hls PACKAGECONFIG in gstreamer1.0-plugins-bad.inc to
31# pass an additional --with-hls-crypto=XXX option (new in 1.7.x) and switch HLS
32# AES decryption from nettle to openssl (ie a shared dependency with dtls).
33# This should move back to the common .inc once the main recipe updates to 1.8.x
34PACKAGECONFIG[hls] = "--enable-hls --with-hls-crypto=openssl,--disable-hls,openssl"
35
36# The tinyalsa plugin was added prior to the 1.7.2 release
37# https://cgit.freedesktop.org/gstreamer/gst-plugins-bad/commit/?id=c8bd74fa9a81398f57d976c478d2043f30188684
38PACKAGECONFIG[tinyalsa] = "--enable-tinyalsa,--disable-tinyalsa,tinyalsa"
39
40# The vulkan based video sink plugin was added prior to the 1.7.2 release
41# https://cgit.freedesktop.org/gstreamer/gst-plugins-bad/commit/?id=5de6dd9f40629562acf90e35e1fa58464d66617d
42PACKAGECONFIG[vulkan] = "--enable-vulkan,--disable-vulkan,libxcb"
43
44# The dependency-less netsim plugin was added prior to the 1.7.2 release
45# https://cgit.freedesktop.org/gstreamer/gst-plugins-bad/commit/?id=e3f9e854f08e82bfab11182c5a2aa6f9a0c73cd5
46EXTRA_OECONF += " \
47 --enable-netsim \
48"
49
50do_configure_prepend() { 30do_configure_prepend() {
51 ${S}/autogen.sh --noconfigure 31 ${S}/autogen.sh --noconfigure
52} 32}