summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorCarlos Rafael Giani <dv@pseudoterminal.org>2015-11-05 09:32:09 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-11-16 11:39:35 +0000
commit0ec3c62b4291631c0a5856cbbb141381ad872091 (patch)
tree8b0f866d25d0f93df6bbaa2390645b018a6dde87 /meta
parentba1bc6335bd3a28b49e293687e06799f4bd949c6 (diff)
downloadpoky-0ec3c62b4291631c0a5856cbbb141381ad872091.tar.gz
gstreamer1.0-plugins-bad: upgrade to version 1.6.1
0001-gl-do-not-check-for-GL-GLU-EGL-GLES2-libs-if-disable.patch is now in upstream, and therefore not needed as a separate patch anymore. 0001-glimagesink-Downrank-to-marginal.patch didn't apply anymore, and was adapted to the updated code. (From OE-Core rev: b771bf7a684e227e8402cef104ff3efe7637059a) 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')
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc61
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-gl-do-not-check-for-GL-GLU-EGL-GLES2-libs-if-disable.patch41
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-glimagesink-Downrank-to-marginal.patch4
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.6.1.bb (renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.4.5.bb)8
4 files changed, 44 insertions, 70 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc
index cdedb60b2b..f94b12fbd1 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc
@@ -20,10 +20,12 @@ PACKAGECONFIG ??= " \
20 ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)} \ 20 ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)} \
21 ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \ 21 ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \
22 ${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \ 22 ${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \
23 orc curl uvch264 neon sndfile \ 23 orc curl uvch264 neon sndfile hls sbc dash bz2 smoothstreaming rsvg dtls \
24 hls sbc dash bz2 smoothstreaming \
25 " 24 "
26 25
26# gtk is not in the PACKAGECONFIG variable by default until
27# the transition to gtk+3 is finished
28#
27# dash = Dynamic Adaptive Streaming over HTTP 29# dash = Dynamic Adaptive Streaming over HTTP
28PACKAGECONFIG[assrender] = "--enable-assrender,--disable-assrender,libass" 30PACKAGECONFIG[assrender] = "--enable-assrender,--disable-assrender,libass"
29PACKAGECONFIG[curl] = "--enable-curl,--disable-curl,curl" 31PACKAGECONFIG[curl] = "--enable-curl,--disable-curl,curl"
@@ -55,36 +57,46 @@ PACKAGECONFIG[sndfile] = "--enable-sndfile,--disable-sndfile,libsndfile1
55PACKAGECONFIG[webp] = "--enable-webp,--disable-webp,libwebp" 57PACKAGECONFIG[webp] = "--enable-webp,--disable-webp,libwebp"
56PACKAGECONFIG[rtmp] = "--enable-rtmp,--disable-rtmp,rtmpdump" 58PACKAGECONFIG[rtmp] = "--enable-rtmp,--disable-rtmp,rtmpdump"
57PACKAGECONFIG[libssh2] = "--enable-libssh2,--disable-libssh2,libssh2" 59PACKAGECONFIG[libssh2] = "--enable-libssh2,--disable-libssh2,libssh2"
60PACKAGECONFIG[dtls] = "--enable-dtls,--disable-dtls,openssl"
61PACKAGECONFIG[gtk] = "--enable-gtk3,--disable-gtk3,gtk+3"
62PACKAGECONFIG[srtp] = "--enable-srtp,--disable-srtp,libsrtp"
63PACKAGECONFIG[voaacenc] = "--enable-voaacenc,--disable-voaacenc,vo-aacenc"
64PACKAGECONFIG[voamrwbenc] = "--enable-voamrwbenc,--disable-voamrwbenc,vo-amrwbenc"
65PACKAGECONFIG[resindvd] = "--enable-resindvd,--disable-resindvd,libdvdread libdvdnav"
58 66
59# these plugins have not been ported to 1.0 (yet): 67# these plugins have not been ported to 1.0 (yet):
60# directdraw vcd apexsink dc1394 lv2 linsys musepack mythtv 68# apexsink dc1394 lv2 linsys musepack nas timidity teletextdec sdl xvid wininet
61# nas timidity teletextdec sdl xvid wininet acm gsettings 69# acm gsettings sndio cdxaparse dccp faceoverlay hdvparse tta mve nuvdemux
62# sndio qtwrapper cdxaparse dccp faceoverlay hdvparse tta 70# patchdetect real sdi videomeasure gsettings
63# mve nuvdemux osx_video patchdetect quicktime real sdi
64# videomeasure gsettings
65 71
66# these plugins have no corresponding library in OE-core or meta-openembedded: 72# these plugins have no corresponding library in OE-core or meta-openembedded:
67# openni2 winks direct3d directdraw directsound winscreencap osx_video 73# openni2 winks direct3d directsound winscreencap
68# apple_media android_media avc chromaprint daala dts gme gsm kate ladspa mimic 74# apple_media android_media avc bs2b chromaprint daala dts gme gsm kate ladspa
69# mpeg2enc mplex ofa openjpeg opensles pvr resindvd rtmp soundtouch spandsp spc 75# libde265 mimic mpeg2enc mplex ofa openh264 opensles pvr soundtouch spandsp
70# srtp vdpau voaacenc voamrwbenc wasapi zbar 76# spc vdpau wasapi x265 zbar
77
78# qt5 support is disabled, because it is not present in OE core, and requires more work than
79# just adding a packageconfig (it requires access to moc, uic, rcc, and qmake paths).
80# This is better done in a separate qt5 layer (which then should add a "qt5" packageconfig
81# in a gstreamer1.0-plugins-bad bbappend).
71 82
72EXTRA_OECONF += " \ 83EXTRA_OECONF += " \
73 --enable-dvb \ 84 --enable-dvb \
74 --enable-shm \ 85 --enable-shm \
75 --enable-fbdev \ 86 --enable-fbdev \
76 --enable-decklink \ 87 --enable-decklink \
88 --enable-vcd \
77 --disable-acm \ 89 --disable-acm \
78 --disable-android_media \ 90 --disable-android_media \
79 --disable-apexsink \ 91 --disable-apexsink \
80 --disable-apple_media \ 92 --disable-apple_media \
81 --disable-avc \ 93 --disable-avc \
94 --disable-bs2b \
82 --disable-chromaprint \ 95 --disable-chromaprint \
83 --disable-cocoa \ 96 --disable-cocoa \
84 --disable-daala \ 97 --disable-daala \
85 --disable-dc1394 \ 98 --disable-dc1394 \
86 --disable-direct3d \ 99 --disable-direct3d \
87 --disable-directdraw \
88 --disable-directsound \ 100 --disable-directsound \
89 --disable-dts \ 101 --disable-dts \
90 --disable-gme \ 102 --disable-gme \
@@ -92,44 +104,49 @@ EXTRA_OECONF += " \
92 --disable-gsm \ 104 --disable-gsm \
93 --disable-kate \ 105 --disable-kate \
94 --disable-ladspa \ 106 --disable-ladspa \
107 --disable-libvisual \
108 --disable-libde265 \
95 --disable-linsys \ 109 --disable-linsys \
96 --disable-lv2 \ 110 --disable-lv2 \
97 --disable-mimic \ 111 --disable-mimic \
98 --disable-mpeg2enc \ 112 --disable-mpeg2enc \
99 --disable-mplex \ 113 --disable-mplex \
100 --disable-musepack \ 114 --disable-musepack \
101 --disable-mythtv \
102 --disable-nas \ 115 --disable-nas \
103 --disable-ofa \ 116 --disable-ofa \
117 --disable-openexr \
118 --disable-openh264 \
104 --disable-openjpeg \ 119 --disable-openjpeg \
120 --disable-openni2 \
105 --disable-opensles \ 121 --disable-opensles \
106 --disable-osx_video \
107 --disable-pvr \ 122 --disable-pvr \
108 --disable-quicktime \ 123 --disable-qt \
109 --disable-resindvd \
110 --disable-sdl \ 124 --disable-sdl \
111 --disable-sdltest \ 125 --disable-sdltest \
112 --disable-sndio \ 126 --disable-sndio \
113 --disable-soundtouch \ 127 --disable-soundtouch \
114 --disable-spandsp \ 128 --disable-spandsp \
115 --disable-spc \ 129 --disable-spc \
116 --disable-srtp \
117 --disable-teletextdec \ 130 --disable-teletextdec \
118 --disable-timidity \ 131 --disable-timidity \
119 --disable-vcd \
120 --disable-vdpau \ 132 --disable-vdpau \
121 --disable-voaacenc \
122 --disable-voamrwbenc \
123 --disable-wasapi \ 133 --disable-wasapi \
124 --disable-wildmidi \ 134 --disable-wildmidi \
125 --disable-wininet \ 135 --disable-wininet \
136 --disable-winks \
126 --disable-winscreencap \ 137 --disable-winscreencap \
138 --disable-x265 \
127 --disable-xvid \ 139 --disable-xvid \
128 --disable-zbar \ 140 --disable-zbar \
129 ${@bb.utils.contains("TUNE_FEATURES", "mx32", "--disable-yadif", "", d)} \ 141 ${@bb.utils.contains("TUNE_FEATURES", "mx32", "--disable-yadif", "", d)} \
130 " 142 "
131 143
132ARM_INSTRUCTION_SET = "arm" 144OPENCV_PREFIX="${STAGING_DIR_TARGET}${prefix}"
145export OPENCV_PREFIX
133 146
134FILES_gstreamer1.0-plugins-bad-opencv += "${datadir}/gst-plugins-bad/1.0/opencv*" 147ARM_INSTRUCTION_SET = "arm"
135 148
149FILES_${PN}-opencv += "${datadir}/gst-plugins-bad/1.0/opencv*"
150FILES_${PN}-freeverb += "${datadir}/gstreamer-1.0/presets/GstFreeverb.prs"
151FILES_${PN}-voamrwbenc += "${datadir}/gstreamer-1.0/presets/GstVoAmrwbEnc.prs"
152FILES_${PN}-dev += "${libdir}/gstreamer-1.0/include/gst/gl/gstglconfig.h"
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-gl-do-not-check-for-GL-GLU-EGL-GLES2-libs-if-disable.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-gl-do-not-check-for-GL-GLU-EGL-GLES2-libs-if-disable.patch
deleted file mode 100644
index 042a32c04d..0000000000
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-gl-do-not-check-for-GL-GLU-EGL-GLES2-libs-if-disable.patch
+++ /dev/null
@@ -1,41 +0,0 @@
1From deba0da45ec821209a7ed148a4521d562e6512cd Mon Sep 17 00:00:00 2001
2From: Carlos Rafael Giani <dv@pseudoterminal.org>
3Date: Wed, 27 Aug 2014 14:47:25 +0200
4Subject: [PATCH] gl: do not check for GL/GLU/EGL/GLES2 libs if disabled in
5 configuration
6
7Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=735522]
8
9Signed-off-by: Carlos Rafael Giani <dv@pseudoterminal.org>
10---
11 configure.ac | 14 ++++++++++----
12 1 file changed, 10 insertions(+), 4 deletions(-)
13
14diff --git a/configure.ac b/configure.ac
15index 1a46afb..e85d4ba 100644
16--- a/configure.ac
17+++ b/configure.ac
18@@ -661,10 +661,16 @@ case $host in
19 fi
20 ;;
21 *)
22- AG_GST_CHECK_LIBHEADER(GL, GL, glTexImage2D,, GL/gl.h)
23- AG_GST_CHECK_LIBHEADER(GLU, GLU, gluSphere,, GL/glu.h)
24- AG_GST_CHECK_LIBHEADER(GLES2, GLESv2, glTexImage2D,, GLES2/gl2.h)
25- AG_GST_CHECK_LIBHEADER(EGL, EGL, eglGetError,, EGL/egl.h)
26+ if test "x$NEED_GL" != "xno"; then
27+ AG_GST_CHECK_LIBHEADER(GL, GL, glTexImage2D,, GL/gl.h)
28+ AG_GST_CHECK_LIBHEADER(GLU, GLU, gluSphere,, GL/glu.h)
29+ fi
30+ if test "x$NEED_GLES2" != "xno"; then
31+ AG_GST_CHECK_LIBHEADER(GLES2, GLESv2, glTexImage2D,, GLES2/gl2.h)
32+ fi
33+ if test "x$NEED_EGL" != "xno"; then
34+ AG_GST_CHECK_LIBHEADER(EGL, EGL, eglGetError,, EGL/egl.h)
35+ fi
36
37 old_LIBS=$LIBS
38 old_CFLAGS=$CFLAGS
39--
401.8.3.2
41
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-glimagesink-Downrank-to-marginal.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-glimagesink-Downrank-to-marginal.patch
index f677603ebc..1085e95e8a 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-glimagesink-Downrank-to-marginal.patch
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-glimagesink-Downrank-to-marginal.patch
@@ -22,8 +22,8 @@ index a4b2540..0ccaacd 100644
22 #endif 22 #endif
23 23
24 if (!gst_element_register (plugin, "glimagesink", 24 if (!gst_element_register (plugin, "glimagesink",
25- GST_RANK_SECONDARY, GST_TYPE_GLIMAGE_SINK)) { 25- GST_RANK_SECONDARY, gst_gl_image_sink_bin_get_type ())) {
26+ GST_RANK_MARGINAL, GST_TYPE_GLIMAGE_SINK)) { 26+ GST_RANK_MARGINAL, gst_gl_image_sink_bin_get_type ())) {
27 return FALSE; 27 return FALSE;
28 } 28 }
29 29
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.4.5.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.6.1.bb
index 687366924e..eeb477165c 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.4.5.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.6.1.bb
@@ -5,12 +5,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=73a5855a8119deb017f5f13cf327095d \
5 file://COPYING.LIB;md5=21682e4e8fea52413fd26c60acb907e5 \ 5 file://COPYING.LIB;md5=21682e4e8fea52413fd26c60acb907e5 \
6 file://gst/tta/crc32.h;beginline=12;endline=29;md5=27db269c575d1e5317fffca2d33b3b50" 6 file://gst/tta/crc32.h;beginline=12;endline=29;md5=27db269c575d1e5317fffca2d33b3b50"
7 7
8SRC_URI += "file://0001-gl-do-not-check-for-GL-GLU-EGL-GLES2-libs-if-disable.patch \ 8SRC_URI += "file://0001-glimagesink-Downrank-to-marginal.patch"
9 file://0001-glimagesink-Downrank-to-marginal.patch \
10 "
11 9
12SRC_URI[md5sum] = "e0bb39412cf4a48fe0397bcf3a7cd451" 10SRC_URI[md5sum] = "c92d7d32de68e7293712bf9b6c99dc77"
13SRC_URI[sha256sum] = "152fad7250683d72f9deb36c5685428338365fe4a4c87ffe15e38783b14f983c" 11SRC_URI[sha256sum] = "e176a9af125f6874b3d6724aa7566a198fa225d3ece0a7ac2f2b51c57e525466"
14 12
15S = "${WORKDIR}/gst-plugins-bad-${PV}" 13S = "${WORKDIR}/gst-plugins-bad-${PV}"
16 14