summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch43
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/avoid-including-sys-poll.h-directly.patch2
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/configure-allow-to-disable-libssh2.patch4
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/ensure-valid-sentinels-for-gst_structure_get-etc.patch8
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/fix-maybe-uninitialized-warnings-when-compiling-with-Os.patch2
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.0.bb (renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.14.4.bb)17
6 files changed, 15 insertions, 61 deletions
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
deleted file mode 100644
index 05b991a8f0..0000000000
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch
+++ /dev/null
@@ -1,43 +0,0 @@
1From 7d8e8b8bcce34d01fc7ad7285b4eb17ad8949399 Mon Sep 17 00:00:00 2001
2From: Anuj Mittal <anuj.mittal@intel.com>
3Date: Wed, 11 Apr 2018 11:06:39 +0800
4Subject: [PATCH] Makefile.am: don't hardcode libtool name when running
5 introspection tools
6
7Upstream-Status: Pending [review on oe-core list]
8Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
9Signed-off-by: Maxin B. John <maxin.john@intel.com>
10---
11 gst-libs/gst/insertbin/Makefile.am | 2 +-
12 gst-libs/gst/mpegts/Makefile.am | 2 +-
13 2 files changed, 2 insertions(+), 2 deletions(-)
14
15diff --git a/gst-libs/gst/insertbin/Makefile.am b/gst-libs/gst/insertbin/Makefile.am
16index 1f8ea30..4b98ef6 100644
17--- a/gst-libs/gst/insertbin/Makefile.am
18+++ b/gst-libs/gst/insertbin/Makefile.am
19@@ -45,7 +45,7 @@ GstInsertBin-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstinsertbin-@GS
20 --library=libgstinsertbin-@GST_API_VERSION@.la \
21 --include=Gst-@GST_API_VERSION@ \
22 --include=GstBase-@GST_API_VERSION@ \
23- --libtool="$(top_builddir)/libtool" \
24+ --libtool="$(LIBTOOL)" \
25 --pkg gstreamer-@GST_API_VERSION@ \
26 --pkg gstreamer-base-@GST_API_VERSION@ \
27 --pkg-export gstreamer-insertbin-@GST_API_VERSION@ \
28diff --git a/gst-libs/gst/mpegts/Makefile.am b/gst-libs/gst/mpegts/Makefile.am
29index f264e33..9934a4d 100644
30--- a/gst-libs/gst/mpegts/Makefile.am
31+++ b/gst-libs/gst/mpegts/Makefile.am
32@@ -82,7 +82,7 @@ GstMpegts-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstmpegts-@GST_API_
33 --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-video-@GST_API_VERSION@` \
34 --library=libgstmpegts-@GST_API_VERSION@.la \
35 --include=Gst-@GST_API_VERSION@ \
36- --libtool="$(top_builddir)/libtool" \
37+ --libtool="$(LIBTOOL)" \
38 --pkg gstreamer-@GST_API_VERSION@ \
39 --pkg gstreamer-video-@GST_API_VERSION@ \
40 --pkg-export gstreamer-mpegts-@GST_API_VERSION@ \
41--
422.7.4
43
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/avoid-including-sys-poll.h-directly.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/avoid-including-sys-poll.h-directly.patch
index 357fd78002..32261279a5 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/avoid-including-sys-poll.h-directly.patch
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/avoid-including-sys-poll.h-directly.patch
@@ -16,7 +16,7 @@ diff --git a/sys/dvb/gstdvbsrc.c b/sys/dvb/gstdvbsrc.c
16index b93255f..49f145a 100644 16index b93255f..49f145a 100644
17--- a/sys/dvb/gstdvbsrc.c 17--- a/sys/dvb/gstdvbsrc.c
18+++ b/sys/dvb/gstdvbsrc.c 18+++ b/sys/dvb/gstdvbsrc.c
19@@ -93,7 +93,7 @@ 19@@ -97,7 +97,7 @@
20 #include <gst/gst.h> 20 #include <gst/gst.h>
21 #include <gst/glib-compat-private.h> 21 #include <gst/glib-compat-private.h>
22 #include <sys/ioctl.h> 22 #include <sys/ioctl.h>
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/configure-allow-to-disable-libssh2.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/configure-allow-to-disable-libssh2.patch
index ad86329893..25861b6b9d 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/configure-allow-to-disable-libssh2.patch
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/configure-allow-to-disable-libssh2.patch
@@ -22,7 +22,7 @@ Index: gst-plugins-bad-1.12.3/configure.ac
22=================================================================== 22===================================================================
23--- gst-plugins-bad-1.12.3.orig/configure.ac 23--- gst-plugins-bad-1.12.3.orig/configure.ac
24+++ gst-plugins-bad-1.12.3/configure.ac 24+++ gst-plugins-bad-1.12.3/configure.ac
25@@ -2139,6 +2139,15 @@ AG_GST_CHECK_FEATURE(CHROMAPRINT, [chrom 25@@ -1202,6 +1202,15 @@ AG_GST_CHECK_FEATURE(CHROMAPRINT, [chrom
26 ]) 26 ])
27 27
28 dnl *** Curl *** 28 dnl *** Curl ***
@@ -38,7 +38,7 @@ Index: gst-plugins-bad-1.12.3/configure.ac
38 translit(dnm, m, l) AM_CONDITIONAL(USE_CURL, true) 38 translit(dnm, m, l) AM_CONDITIONAL(USE_CURL, true)
39 AG_GST_CHECK_FEATURE(CURL, [Curl plugin], curl, [ 39 AG_GST_CHECK_FEATURE(CURL, [Curl plugin], curl, [
40 PKG_CHECK_MODULES(CURL, libcurl >= 7.35.0, [ 40 PKG_CHECK_MODULES(CURL, libcurl >= 7.35.0, [
41@@ -2161,12 +2170,14 @@ AG_GST_CHECK_FEATURE(CURL, [Curl plugin] 41@@ -1224,12 +1233,14 @@ AG_GST_CHECK_FEATURE(CURL, [Curl plugin]
42 ]) 42 ])
43 AC_SUBST(CURL_CFLAGS) 43 AC_SUBST(CURL_CFLAGS)
44 AC_SUBST(CURL_LIBS) 44 AC_SUBST(CURL_LIBS)
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/ensure-valid-sentinels-for-gst_structure_get-etc.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/ensure-valid-sentinels-for-gst_structure_get-etc.patch
index 20c9ffcd84..2d5389d953 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/ensure-valid-sentinels-for-gst_structure_get-etc.patch
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/ensure-valid-sentinels-for-gst_structure_get-etc.patch
@@ -27,7 +27,7 @@ Index: gst-plugins-bad-1.10.2/sys/decklink/gstdecklink.cpp
27=================================================================== 27===================================================================
28--- gst-plugins-bad-1.10.2.orig/sys/decklink/gstdecklink.cpp 28--- gst-plugins-bad-1.10.2.orig/sys/decklink/gstdecklink.cpp
29+++ gst-plugins-bad-1.10.2/sys/decklink/gstdecklink.cpp 29+++ gst-plugins-bad-1.10.2/sys/decklink/gstdecklink.cpp
30@@ -476,7 +476,7 @@ gst_decklink_mode_get_structure (GstDeck 30@@ -617,7 +617,7 @@ gst_decklink_mode_get_structure (GstDeck
31 "pixel-aspect-ratio", GST_TYPE_FRACTION, mode->par_n, mode->par_d, 31 "pixel-aspect-ratio", GST_TYPE_FRACTION, mode->par_n, mode->par_d,
32 "interlace-mode", G_TYPE_STRING, 32 "interlace-mode", G_TYPE_STRING,
33 mode->interlaced ? "interleaved" : "progressive", 33 mode->interlaced ? "interleaved" : "progressive",
@@ -36,7 +36,7 @@ Index: gst-plugins-bad-1.10.2/sys/decklink/gstdecklink.cpp
36 36
37 if (input && mode->interlaced) { 37 if (input && mode->interlaced) {
38 if (mode->tff) 38 if (mode->tff)
39@@ -489,16 +489,16 @@ gst_decklink_mode_get_structure (GstDeck 39@@ -632,16 +632,16 @@ gst_decklink_mode_get_structure (GstDeck
40 case bmdFormat8BitYUV: /* '2vuy' */ 40 case bmdFormat8BitYUV: /* '2vuy' */
41 gst_structure_set (s, "format", G_TYPE_STRING, "UYVY", 41 gst_structure_set (s, "format", G_TYPE_STRING, "UYVY",
42 "colorimetry", G_TYPE_STRING, mode->colorimetry, 42 "colorimetry", G_TYPE_STRING, mode->colorimetry,
@@ -61,7 +61,7 @@ Index: gst-plugins-bad-1.10.2/sys/decklink/gstdecklinkaudiosrc.cpp
61=================================================================== 61===================================================================
62--- gst-plugins-bad-1.10.2.orig/sys/decklink/gstdecklinkaudiosrc.cpp 62--- gst-plugins-bad-1.10.2.orig/sys/decklink/gstdecklinkaudiosrc.cpp
63+++ gst-plugins-bad-1.10.2/sys/decklink/gstdecklinkaudiosrc.cpp 63+++ gst-plugins-bad-1.10.2/sys/decklink/gstdecklinkaudiosrc.cpp
64@@ -322,7 +322,7 @@ gst_decklink_audio_src_set_caps (GstBase 64@@ -387,7 +387,7 @@ gst_decklink_audio_src_set_caps (GstBase
65 g_mutex_unlock (&self->input->lock); 65 g_mutex_unlock (&self->input->lock);
66 66
67 if (videosrc) { 67 if (videosrc) {
@@ -74,7 +74,7 @@ Index: gst-plugins-bad-1.10.2/sys/decklink/gstdecklinkvideosink.cpp
74=================================================================== 74===================================================================
75--- gst-plugins-bad-1.10.2.orig/sys/decklink/gstdecklinkvideosink.cpp 75--- gst-plugins-bad-1.10.2.orig/sys/decklink/gstdecklinkvideosink.cpp
76+++ gst-plugins-bad-1.10.2/sys/decklink/gstdecklinkvideosink.cpp 76+++ gst-plugins-bad-1.10.2/sys/decklink/gstdecklinkvideosink.cpp
77@@ -163,7 +163,7 @@ reset_framerate (GstCapsFeatures * featu 77@@ -285,7 +285,7 @@ reset_framerate (GstCapsFeatures * featu
78 gpointer user_data) 78 gpointer user_data)
79 { 79 {
80 gst_structure_set (structure, "framerate", GST_TYPE_FRACTION_RANGE, 0, 1, 80 gst_structure_set (structure, "framerate", GST_TYPE_FRACTION_RANGE, 0, 1,
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/fix-maybe-uninitialized-warnings-when-compiling-with-Os.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/fix-maybe-uninitialized-warnings-when-compiling-with-Os.patch
index 5ce57714e7..73681f1002 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/fix-maybe-uninitialized-warnings-when-compiling-with-Os.patch
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/fix-maybe-uninitialized-warnings-when-compiling-with-Os.patch
@@ -14,7 +14,7 @@ diff --git a/gst-libs/gst/codecparsers/gstvc1parser.c b/gst-libs/gst/codecparser
14index fd16ee0..ddb890c 100644 14index fd16ee0..ddb890c 100644
15--- a/gst-libs/gst/codecparsers/gstvc1parser.c 15--- a/gst-libs/gst/codecparsers/gstvc1parser.c
16+++ b/gst-libs/gst/codecparsers/gstvc1parser.c 16+++ b/gst-libs/gst/codecparsers/gstvc1parser.c
17@@ -1729,7 +1729,7 @@ gst_vc1_parse_sequence_layer (const guint8 * data, gsize size, 17@@ -1730,7 +1730,7 @@ gst_vc1_parse_sequence_layer (const guint8 * data, gsize size,
18 GstVC1SeqLayer * seqlayer) 18 GstVC1SeqLayer * seqlayer)
19 { 19 {
20 guint32 tmp; 20 guint32 tmp;
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.14.4.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.0.bb
index 23d093d47c..f676b1f6de 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.14.4.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.0.bb
@@ -7,10 +7,9 @@ SRC_URI = " \
7 file://avoid-including-sys-poll.h-directly.patch \ 7 file://avoid-including-sys-poll.h-directly.patch \
8 file://ensure-valid-sentinels-for-gst_structure_get-etc.patch \ 8 file://ensure-valid-sentinels-for-gst_structure_get-etc.patch \
9 file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \ 9 file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \
10 file://0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch \
11" 10"
12SRC_URI[md5sum] = "5d20a91d027708abcf924f6c1279dd25" 11SRC_URI[md5sum] = "e9e562d86c1527c44d904500dd35e326"
13SRC_URI[sha256sum] = "910b4e0e2e897e8b6d06767af1779d70057c309f67292f485ff988d087aa0de5" 12SRC_URI[sha256sum] = "22139de35626ada6090bdfa3423b27b7fc15a0198331d25c95e6b12cb1072b05"
14 13
15S = "${WORKDIR}/gst-plugins-bad-${PV}" 14S = "${WORKDIR}/gst-plugins-bad-${PV}"
16 15
@@ -69,6 +68,7 @@ PACKAGECONFIG[resindvd] = "--enable-resindvd,--disable-resindvd,libdvdrea
69PACKAGECONFIG[rsvg] = "--enable-rsvg,--disable-rsvg,librsvg" 68PACKAGECONFIG[rsvg] = "--enable-rsvg,--disable-rsvg,librsvg"
70PACKAGECONFIG[rtmp] = "--enable-rtmp,--disable-rtmp,rtmpdump" 69PACKAGECONFIG[rtmp] = "--enable-rtmp,--disable-rtmp,rtmpdump"
71PACKAGECONFIG[sbc] = "--enable-sbc,--disable-sbc,sbc" 70PACKAGECONFIG[sbc] = "--enable-sbc,--disable-sbc,sbc"
71PACKAGECONFIG[sctp] = "--enable-sctp,--disable-sctp,usrsctp"
72PACKAGECONFIG[smoothstreaming] = "--enable-smoothstreaming,--disable-smoothstreaming,libxml2" 72PACKAGECONFIG[smoothstreaming] = "--enable-smoothstreaming,--disable-smoothstreaming,libxml2"
73PACKAGECONFIG[sndfile] = "--enable-sndfile,--disable-sndfile,libsndfile1" 73PACKAGECONFIG[sndfile] = "--enable-sndfile,--disable-sndfile,libsndfile1"
74PACKAGECONFIG[srtp] = "--enable-srtp,--disable-srtp,libsrtp" 74PACKAGECONFIG[srtp] = "--enable-srtp,--disable-srtp,libsrtp"
@@ -84,10 +84,10 @@ PACKAGECONFIG[webrtc] = "--enable-webrtc,--disable-webrtc,libnice"
84PACKAGECONFIG[webrtcdsp] = "--enable-webrtcdsp,--disable-webrtcdsp,webrtc-audio-processing" 84PACKAGECONFIG[webrtcdsp] = "--enable-webrtcdsp,--disable-webrtcdsp,webrtc-audio-processing"
85 85
86# these plugins have no corresponding library in OE-core or meta-openembedded: 86# these plugins have no corresponding library in OE-core or meta-openembedded:
87# openni2 winks direct3d directsound winscreencap acm apple_media iqa 87# openni2 winks direct3d directsound winscreencap apple_media iqa
88# android_media avc bs2b chromaprint daala dts fdkaac gme gsm kate ladspa 88# android_media avc bs2b chromaprint dts fdkaac gme gsm kate ladspa
89# lv2 mpeg2enc mplex musepack nvenc ofa opensles soundtouch 89# lv2 mpeg2enc mplex musepack nvenc ofa opensles soundtouch
90# spandsp spc teletextdec vdpau wasapi x265 zbar 90# spandsp teletextdec vdpau wasapi wpe x265 zbar
91 91
92EXTRA_OECONF += " \ 92EXTRA_OECONF += " \
93 --enable-decklink \ 93 --enable-decklink \
@@ -96,15 +96,12 @@ EXTRA_OECONF += " \
96 --enable-ipcpipeline \ 96 --enable-ipcpipeline \
97 --enable-netsim \ 97 --enable-netsim \
98 --enable-shm \ 98 --enable-shm \
99 --enable-vcd \
100 --disable-acm \
101 --disable-android_media \ 99 --disable-android_media \
102 --disable-aom \ 100 --disable-aom \
103 --disable-apple_media \ 101 --disable-apple_media \
104 --disable-avc \ 102 --disable-avc \
105 --disable-bs2b \ 103 --disable-bs2b \
106 --disable-chromaprint \ 104 --disable-chromaprint \
107 --disable-daala \
108 --disable-direct3d \ 105 --disable-direct3d \
109 --disable-directsound \ 106 --disable-directsound \
110 --disable-dts \ 107 --disable-dts \
@@ -125,7 +122,6 @@ EXTRA_OECONF += " \
125 --disable-opensles \ 122 --disable-opensles \
126 --disable-soundtouch \ 123 --disable-soundtouch \
127 --disable-spandsp \ 124 --disable-spandsp \
128 --disable-spc \
129 --disable-srt \ 125 --disable-srt \
130 --disable-teletextdec \ 126 --disable-teletextdec \
131 --disable-vdpau \ 127 --disable-vdpau \
@@ -133,6 +129,7 @@ EXTRA_OECONF += " \
133 --disable-wildmidi \ 129 --disable-wildmidi \
134 --disable-winks \ 130 --disable-winks \
135 --disable-winscreencap \ 131 --disable-winscreencap \
132 --disable-wpe \
136 --disable-x265 \ 133 --disable-x265 \
137 --disable-zbar \ 134 --disable-zbar \
138 ${@bb.utils.contains("TUNE_FEATURES", "mx32", "--disable-yadif", "", d)} \ 135 ${@bb.utils.contains("TUNE_FEATURES", "mx32", "--disable-yadif", "", d)} \