summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc2
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/ensure-valid-sentinels-for-gst_structure_get-etc.patch51
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.6.3.bb10
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_git.bb21
4 files changed, 63 insertions, 21 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc
index c4199bd739..cb6cbadf1d 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc
@@ -37,7 +37,6 @@ PACKAGECONFIG[hls] = "--enable-hls,--disable-hls,nettle"
37PACKAGECONFIG[libmms] = "--enable-libmms,--disable-libmms,libmms" 37PACKAGECONFIG[libmms] = "--enable-libmms,--disable-libmms,libmms"
38PACKAGECONFIG[libssh2] = "--enable-libssh2,--disable-libssh2,libssh2" 38PACKAGECONFIG[libssh2] = "--enable-libssh2,--disable-libssh2,libssh2"
39PACKAGECONFIG[modplug] = "--enable-modplug,--disable-modplug,libmodplug" 39PACKAGECONFIG[modplug] = "--enable-modplug,--disable-modplug,libmodplug"
40PACKAGECONFIG[mpg123] = "--enable-mpg123,--disable-mpg123,mpg123"
41PACKAGECONFIG[neon] = "--enable-neon,--disable-neon,neon" 40PACKAGECONFIG[neon] = "--enable-neon,--disable-neon,neon"
42PACKAGECONFIG[openal] = "--enable-openal,--disable-openal,openal-soft" 41PACKAGECONFIG[openal] = "--enable-openal,--disable-openal,openal-soft"
43PACKAGECONFIG[opencv] = "--enable-opencv,--disable-opencv,opencv" 42PACKAGECONFIG[opencv] = "--enable-opencv,--disable-opencv,opencv"
@@ -93,7 +92,6 @@ EXTRA_OECONF += " \
93 --disable-directsound \ 92 --disable-directsound \
94 --disable-dts \ 93 --disable-dts \
95 --disable-gme \ 94 --disable-gme \
96 --disable-gsettings \
97 --disable-gsm \ 95 --disable-gsm \
98 --disable-kate \ 96 --disable-kate \
99 --disable-ladspa \ 97 --disable-ladspa \
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 8ccaaa0598..369ff93ac1 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
@@ -1,4 +1,4 @@
1From 3164f23cd6ae338d0e423fccb4e11539cd220e2f Mon Sep 17 00:00:00 2001 1From 2262ba4b686d5cc0d3e894707fe1d31619a3a8f1 Mon Sep 17 00:00:00 2001
2From: Andre McCurdy <armccurdy@gmail.com> 2From: Andre McCurdy <armccurdy@gmail.com>
3Date: Tue, 9 Feb 2016 14:00:00 -0800 3Date: Tue, 9 Feb 2016 14:00:00 -0800
4Subject: [PATCH] ensure valid sentinals for gst_structure_get() etc 4Subject: [PATCH] ensure valid sentinals for gst_structure_get() etc
@@ -18,26 +18,45 @@ Upstream-Status: Pending
18 18
19Signed-off-by: Andre McCurdy <armccurdy@gmail.com> 19Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
20--- 20---
21 sys/decklink/gstdecklink.cpp | 2 +- 21 sys/decklink/gstdecklink.cpp | 10 +++++-----
22 sys/decklink/gstdecklinkaudiosrc.cpp | 2 +- 22 sys/decklink/gstdecklinkaudiosrc.cpp | 2 +-
23 sys/decklink/gstdecklinkvideosink.cpp | 2 +- 23 sys/decklink/gstdecklinkvideosink.cpp | 2 +-
24 3 files changed, 3 insertions(+), 3 deletions(-) 24 3 files changed, 7 insertions(+), 7 deletions(-)
25 25
26diff --git a/sys/decklink/gstdecklink.cpp b/sys/decklink/gstdecklink.cpp 26diff --git a/sys/decklink/gstdecklink.cpp b/sys/decklink/gstdecklink.cpp
27index c0d1128..6f2ef75 100644 27index 64637f1..bac956f 100644
28--- a/sys/decklink/gstdecklink.cpp 28--- a/sys/decklink/gstdecklink.cpp
29+++ b/sys/decklink/gstdecklink.cpp 29+++ b/sys/decklink/gstdecklink.cpp
30@@ -328,7 +328,7 @@ gst_decklink_mode_get_structure (GstDecklinkModeEnum e) 30@@ -324,22 +324,22 @@ gst_decklink_mode_get_structure (GstDecklinkModeEnum e, BMDPixelFormat f)
31 "interlace-mode", G_TYPE_STRING, 31 "height", G_TYPE_INT, mode->height,
32 mode->interlaced ? "interleaved" : "progressive", "pixel-aspect-ratio", 32 "pixel-aspect-ratio", GST_TYPE_FRACTION, mode->par_n, mode->par_d,
33 GST_TYPE_FRACTION, mode->par_n, mode->par_d, "colorimetry", G_TYPE_STRING, 33 "interlace-mode", G_TYPE_STRING, mode->interlaced ? "interleaved" : "progressive",
34- mode->colorimetry, "chroma-site", G_TYPE_STRING, "mpeg2", NULL); 34- "framerate", GST_TYPE_FRACTION, mode->fps_n, mode->fps_d, NULL);
35+ mode->colorimetry, "chroma-site", G_TYPE_STRING, "mpeg2", (void *) NULL); 35+ "framerate", GST_TYPE_FRACTION, mode->fps_n, mode->fps_d, (void *) NULL);
36 }
37 36
38 GstCaps * 37 switch (f) {
38 case bmdFormat8BitYUV: /* '2vuy' */
39 gst_structure_set (s, "format", G_TYPE_STRING, "UYVY",
40 "colorimetry", G_TYPE_STRING, mode->colorimetry,
41- "chroma-site", G_TYPE_STRING, "mpeg2", NULL);
42+ "chroma-site", G_TYPE_STRING, "mpeg2", (void *) NULL);
43 break;
44 case bmdFormat10BitYUV: /* 'v210' */
45- gst_structure_set (s, "format", G_TYPE_STRING, "v210", NULL);
46+ gst_structure_set (s, "format", G_TYPE_STRING, "v210", (void *) NULL);
47 break;
48 case bmdFormat8BitARGB: /* 'ARGB' */
49- gst_structure_set (s, "format", G_TYPE_STRING, "ARGB", NULL);
50+ gst_structure_set (s, "format", G_TYPE_STRING, "ARGB", (void *) NULL);
51 break;
52 case bmdFormat8BitBGRA: /* 'BGRA' */
53- gst_structure_set (s, "format", G_TYPE_STRING, "BGRA", NULL);
54+ gst_structure_set (s, "format", G_TYPE_STRING, "BGRA", (void *) NULL);
55 break;
56 case bmdFormat10BitRGB: /* 'r210' Big-endian RGB 10-bit per component with SMPTE video levels (64-960). Packed as 2:10:10:10 */
57 case bmdFormat12BitRGB: /* 'R12B' Big-endian RGB 12-bit per component with full range (0-4095). Packed as 12-bit per component */
39diff --git a/sys/decklink/gstdecklinkaudiosrc.cpp b/sys/decklink/gstdecklinkaudiosrc.cpp 58diff --git a/sys/decklink/gstdecklinkaudiosrc.cpp b/sys/decklink/gstdecklinkaudiosrc.cpp
40index e5ac8ae..a153851 100644 59index 9a701ee..26fb7ec 100644
41--- a/sys/decklink/gstdecklinkaudiosrc.cpp 60--- a/sys/decklink/gstdecklinkaudiosrc.cpp
42+++ b/sys/decklink/gstdecklinkaudiosrc.cpp 61+++ b/sys/decklink/gstdecklinkaudiosrc.cpp
43@@ -312,7 +312,7 @@ gst_decklink_audio_src_set_caps (GstBaseSrc * bsrc, GstCaps * caps) 62@@ -312,7 +312,7 @@ gst_decklink_audio_src_set_caps (GstBaseSrc * bsrc, GstCaps * caps)
@@ -50,7 +69,7 @@ index e5ac8ae..a153851 100644
50 69
51 switch (vconn) { 70 switch (vconn) {
52diff --git a/sys/decklink/gstdecklinkvideosink.cpp b/sys/decklink/gstdecklinkvideosink.cpp 71diff --git a/sys/decklink/gstdecklinkvideosink.cpp b/sys/decklink/gstdecklinkvideosink.cpp
53index 7111cb1..b958fda 100644 72index eebeff3..da6e486 100644
54--- a/sys/decklink/gstdecklinkvideosink.cpp 73--- a/sys/decklink/gstdecklinkvideosink.cpp
55+++ b/sys/decklink/gstdecklinkvideosink.cpp 74+++ b/sys/decklink/gstdecklinkvideosink.cpp
56@@ -158,7 +158,7 @@ reset_framerate (GstCapsFeatures * features, GstStructure * structure, 75@@ -158,7 +158,7 @@ reset_framerate (GstCapsFeatures * features, GstStructure * structure,
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.6.3.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.6.3.bb
index c51a637dce..8eb47c265f 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.6.3.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.6.3.bb
@@ -5,6 +5,16 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=73a5855a8119deb017f5f13cf327095d \
5 file://gst/tta/crc32.h;beginline=12;endline=29;md5=27db269c575d1e5317fffca2d33b3b50 \ 5 file://gst/tta/crc32.h;beginline=12;endline=29;md5=27db269c575d1e5317fffca2d33b3b50 \
6 file://gst/tta/filters.h;beginline=12;endline=29;md5=8a08270656f2f8ad7bb3655b83138e5a" 6 file://gst/tta/filters.h;beginline=12;endline=29;md5=8a08270656f2f8ad7bb3655b83138e5a"
7 7
8# Note: The mpg123 plugin was moved to gst-plugins-ugly prior to the 1.7.2
9# release, so this line should be removed during the update to 1.8.x
10# https://cgit.freedesktop.org/gstreamer/gst-plugins-bad/commit/?id=08d8aefcdaaf89ecb6dd53ec1e4f95cd42d01664
11PACKAGECONFIG[mpg123] = "--enable-mpg123,--disable-mpg123,mpg123"
12
13# Note: The gsettings plug-in was dropped prior to the 1.7.2 release,
14# so this line should be removed during the update to 1.8.x
15# https://cgit.freedesktop.org/gstreamer/gst-plugins-bad/commit/?id=914291808ad10621d6a74031f3d46d45eef5a3a3
16EXTRA_OECONF += "--disable-gsettings"
17
8SRC_URI = " \ 18SRC_URI = " \
9 http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-${PV}.tar.xz \ 19 http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-${PV}.tar.xz \
10 file://configure-allow-to-disable-libssh2.patch \ 20 file://configure-allow-to-disable-libssh2.patch \
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 f9b5f3e223..5be76db83c 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_git.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_git.bb
@@ -16,11 +16,12 @@ SRC_URI = " \
16 file://ensure-valid-sentinels-for-gst_structure_get-etc.patch \ 16 file://ensure-valid-sentinels-for-gst_structure_get-etc.patch \
17" 17"
18 18
19PV = "1.7.1+git${SRCPV}" 19PV = "1.7.2+git${SRCPV}"
20
20UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))" 21UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))"
21 22
22SRCREV_base = "3a088ecc9330d5cb8888ff43de0fe4f61c23a607" 23SRCREV_base = "50ae46cc0f8827bf966920d9c221e5cf86e811ba"
23SRCREV_common = "86e46630ed8af8d94796859db550a9c3d89c9f65" 24SRCREV_common = "a25397448942079002622be231e9ec49b985745a"
24SRCREV_FORMAT = "base" 25SRCREV_FORMAT = "base"
25 26
26S = "${WORKDIR}/git" 27S = "${WORKDIR}/git"
@@ -31,6 +32,20 @@ S = "${WORKDIR}/git"
31# This should move back to the common .inc once the main recipe updates to 1.8.x 32# This should move back to the common .inc once the main recipe updates to 1.8.x
32PACKAGECONFIG[hls] = "--enable-hls --with-hls-crypto=openssl,--disable-hls,openssl" 33PACKAGECONFIG[hls] = "--enable-hls --with-hls-crypto=openssl,--disable-hls,openssl"
33 34
35# The tinyalsa plugin was added prior to the 1.7.2 release
36# https://cgit.freedesktop.org/gstreamer/gst-plugins-bad/commit/?id=c8bd74fa9a81398f57d976c478d2043f30188684
37PACKAGECONFIG[tinyalsa] = "--enable-tinyalsa,--disable-tinyalsa,tinyalsa"
38
39# The vulkan based video sink plugin was added prior to the 1.7.2 release
40# https://cgit.freedesktop.org/gstreamer/gst-plugins-bad/commit/?id=5de6dd9f40629562acf90e35e1fa58464d66617d
41PACKAGECONFIG[vulkan] = "--enable-vulkan,--disable-vulkan,libxcb"
42
43# The dependency-less netsim plugin was added prior to the 1.7.2 release
44# https://cgit.freedesktop.org/gstreamer/gst-plugins-bad/commit/?id=e3f9e854f08e82bfab11182c5a2aa6f9a0c73cd5
45EXTRA_OECONF += " \
46 --enable-netsim \
47"
48
34do_configure_prepend() { 49do_configure_prepend() {
35 ${S}/autogen.sh --noconfigure 50 ${S}/autogen.sh --noconfigure
36} 51}