Skip to contentSkip to conversation

update gstreamer1.0 git recipes 1.7.1 -> 1.7.2

PATCH New Andre McCurdy 1 participant 7 messages Feb 20, 2016

lore
Share & tools
lore
#0 lore raw

cover update gstreamer1.0 git recipes 1.7.1 -> 1.7.2

Minimal testing only (ie it builds OK in my distro and the Qt 5.4 browser demo can still play youtube videos using the libav plugin).

Andre McCurdy (6):
gstreamer1.0_git: update 1.7.1 -> 1.7.2 gstreamer1.0-plugins-base_git: update 1.7.1 -> 1.7.2 gstreamer1.0-plugins-good_git: update 1.7.1 -> 1.7.2 gstreamer1.0-plugins-bad_git: update 1.7.1 -> 1.7.2 gstreamer1.0-plugins-ugly_git: update 1.7.1 -> 1.7.2 gstreamer1.0-libav_git: update 1.7.1 -> 1.7.2

 .../gstreamer/gstreamer1.0-libav_git.bb            | 13 +++---
 .../gstreamer/gstreamer1.0-plugins-bad.inc         |  2 -
 ...valid-sentinels-for-gst_structure_get-etc.patch | 51 +++++++++++++++-------
 .../gstreamer/gstreamer1.0-plugins-bad_1.6.3.bb    | 10 +++++
 .../gstreamer/gstreamer1.0-plugins-bad_git.bb      | 21 +++++++--
 .../gstreamer/gstreamer1.0-plugins-base_git.bb     | 11 ++---
 ...itialized-warnings-when-compiling-with-Os.patch | 41 -----------------
 .../gstreamer/gstreamer1.0-plugins-good_git.bb     |  8 ++--
 .../gstreamer/gstreamer1.0-plugins-ugly_git.bb     | 23 ++++++++--
 .../gstreamer/gstreamer1.0_git.bb                  | 12 +++--
 10 files changed, 107 insertions(+), 85 deletions(-)
 delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/fix-maybe-uninitialized-warnings-when-compiling-with-Os.patch
Signature · 1 line
1.9.1
#1 lore raw

PATCH 1/6 gstreamer1.0_git: update 1.7.1 -> 1.7.2

---
 meta/recipes-multimedia/gstreamer/gstreamer1.0_git.bb | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)
meta/recipes-multimedia/gstreamer/gstreamer1.0_git.bb +9 -3
index cb55c9a..7715bb2 100644
@@ -10,15 +10,21 @@ SRC_URI = " \
     git://anongit.freedesktop.org/gstreamer/common;destsuffix=git/common;name=common \
 "
 
-PV = "1.7.1+git${SRCPV}"
+PV = "1.7.2+git${SRCPV}"
+
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))"
 
-SRCREV_base = "2a188848eb2af3c3b357978ff7786a78aad9dd55"
-SRCREV_common = "86e46630ed8af8d94796859db550a9c3d89c9f65"
+SRCREV_base = "9e33bfa2c7a5f43da2c49b0a8235fd43cba9feaf"
+SRCREV_common = "b64f03f6090245624608beb5d2fff335e23a01c0"
 SRCREV_FORMAT = "base"
 
 S = "${WORKDIR}/git"
 
+# The option to configure tracer hooks was added prior to the 1.7.2 release
+# https://cgit.freedesktop.org/gstreamer/gstreamer/commit/?id=e5ca47236e4df4683707f0bcf99181a937d358d5
+PACKAGECONFIG[gst-tracer-hooks] = "--enable-gst-tracer-hooks,--disable-gst-tracer-hooks,"
+PACKAGECONFIG[trace-historic] = "--enable-trace,--disable-trace,"
+
 do_configure_prepend() {
 	${S}/autogen.sh --noconfigure
 }
Signature · 1 line
1.9.1
#2 lore raw

PATCH 2/6 gstreamer1.0-plugins-base_git: update 1.7.1 -> 1.7.2

In reply to Andre McCurdy
---
 .../gstreamer/gstreamer1.0-plugins-base_git.bb                | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_git.bb +4 -7
index a07c35b..38a9fcc 100644
@@ -12,19 +12,16 @@ SRC_URI = " \
     file://make-gio_unix_2_0-dependency-configurable.patch \
 "
 
-PV = "1.7.1+git${SRCPV}"
+PV = "1.7.2+git${SRCPV}"
+
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))"
 
-SRCREV_base = "641428966e09d16b0a46540040f2faf3791eb7c9"
-SRCREV_common = "86e46630ed8af8d94796859db550a9c3d89c9f65"
+SRCREV_base = "97e108bebaa58821f4566a74cbf0135e93407c01"
+SRCREV_common = "b64f03f6090245624608beb5d2fff335e23a01c0"
 SRCREV_FORMAT = "base"
 
 S = "${WORKDIR}/git"
 
 do_configure_prepend() {
-
-	# Temp solution for git snapshot: relax version checks so we can build against GStreamer 1.7.1
-	sed 's/^GST_REQ=1\.7\.1\.1/GST_REQ=1.7.1/' -i ${S}/configure.ac
-
 	${S}/autogen.sh --noconfigure
 }
Signature · 1 line
1.9.1
#3 lore raw

PATCH 3/6 gstreamer1.0-plugins-good_git: update 1.7.1 -> 1.7.2

In reply to Andre McCurdy
---
 ...itialized-warnings-when-compiling-with-Os.patch | 41 ----------------------
 .../gstreamer/gstreamer1.0-plugins-good_git.bb     |  8 ++---
 2 files changed, 4 insertions(+), 45 deletions(-)
 delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/fix-maybe-uninitialized-warnings-when-compiling-with-Os.patch
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/fix-maybe-uninitialized-warnings-when-compiling-with-Os.patch deleted +0 -41
deleted file mode 100644
index 59addae..0000000
@@ -1,41 +0,0 @@
-From 63a838d9ae2be480be8d28d6f51762d288b2a54a Mon Sep 17 00:00:00 2001
-From: Andre McCurdy <[email protected]>
-Date: Tue, 26 Jan 2016 14:47:36 -0800
-Subject: [PATCH] fix maybe-uninitialized warnings when compiling with -Os
-
-Upstream-Status: Pending
-
-Signed-off-by: Andre McCurdy <[email protected]>
----
- gst/isomp4/qtdemux.c    | 1 +
- gst/rtp/gstrtph261pay.c | 2 +-
- 2 files changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/gst/isomp4/qtdemux.c b/gst/isomp4/qtdemux.c
-index 77bb73e..1fc60ac 100644
---- a/gst/isomp4/qtdemux.c
-+++ b/gst/isomp4/qtdemux.c
-@@ -3269,6 +3269,7 @@ qtdemux_parse_cenc_aux_info (GstQTDemux * qtdemux, QtDemuxStream * stream,
-     gst_structure_set (properties, "iv", GST_TYPE_BUFFER, buf, NULL);
-     size = info_sizes[i];
-     if (size > iv_size) {
-+      n_subsamples = 0;
-       if (!gst_byte_reader_get_uint16_be (br, &n_subsamples)
-           || !(n_subsamples > 0)) {
-         gst_structure_free (properties);
-diff --git a/gst/rtp/gstrtph261pay.c b/gst/rtp/gstrtph261pay.c
-index 7cdd323..ebcf80e 100644
---- a/gst/rtp/gstrtph261pay.c
-+++ b/gst/rtp/gstrtph261pay.c
-@@ -867,7 +867,7 @@ gst_rtp_h261_packetize_and_push (GstRtpH261Pay * pay, GstBuffer * buffer,
-       gst_rtp_buffer_calc_payload_len (GST_RTP_BASE_PAYLOAD_MTU (pay) -
-       GST_RTP_H261_PAYLOAD_HEADER_LEN, 0, 0);
-   guint startpos;
--  gint num_gobs;
-+  gint num_gobs = 0;
-   Gob gobs[MAX_NUM_GOB];
-   Gob *gob;
-   Macroblock last_mb_in_previous_packet = { 0 };
--- 
-1.9.1
-
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_git.bb +4 -4
index e3a2019..9cadc9a 100644
@@ -9,16 +9,16 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
 SRC_URI = " \
     git://anongit.freedesktop.org/gstreamer/gst-plugins-good;name=base \
     git://anongit.freedesktop.org/gstreamer/common;destsuffix=git/common;name=common \
-    file://fix-maybe-uninitialized-warnings-when-compiling-with-Os.patch \
     file://avoid-including-sys-poll.h-directly.patch \
     file://ensure-valid-sentinel-for-gst_structure_get.patch \
 "
 
-PV = "1.7.1+git${SRCPV}"
+PV = "1.7.2+git${SRCPV}"
+
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))"
 
-SRCREV_base = "e016a70a7c97fc61c6cb5cd3821d38bc5ae5c9a4"
-SRCREV_common = "86e46630ed8af8d94796859db550a9c3d89c9f65"
+SRCREV_base = "1b6fdce67c15d59957e395b1957aa625322092d4"
+SRCREV_common = "b64f03f6090245624608beb5d2fff335e23a01c0"
 SRCREV_FORMAT = "base"
 
 S = "${WORKDIR}/git"
Signature · 1 line
1.9.1
#4 lore raw

PATCH 4/6 gstreamer1.0-plugins-bad_git: update 1.7.1 -> 1.7.2

In reply to Andre McCurdy
---
 .../gstreamer/gstreamer1.0-plugins-bad.inc         |  2 -
 ...valid-sentinels-for-gst_structure_get-etc.patch | 51 +++++++++++++++-------
 .../gstreamer/gstreamer1.0-plugins-bad_1.6.3.bb    | 10 +++++
 .../gstreamer/gstreamer1.0-plugins-bad_git.bb      | 21 +++++++--
 4 files changed, 63 insertions(+), 21 deletions(-)
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc +0 -2
index c4199bd..cb6cbad 100644
@@ -37,7 +37,6 @@ PACKAGECONFIG[hls]             = "--enable-hls,--disable-hls,nettle"
 PACKAGECONFIG[libmms]          = "--enable-libmms,--disable-libmms,libmms"
 PACKAGECONFIG[libssh2]         = "--enable-libssh2,--disable-libssh2,libssh2"
 PACKAGECONFIG[modplug]         = "--enable-modplug,--disable-modplug,libmodplug"
-PACKAGECONFIG[mpg123]          = "--enable-mpg123,--disable-mpg123,mpg123"
 PACKAGECONFIG[neon]            = "--enable-neon,--disable-neon,neon"
 PACKAGECONFIG[openal]          = "--enable-openal,--disable-openal,openal-soft"
 PACKAGECONFIG[opencv]          = "--enable-opencv,--disable-opencv,opencv"
@@ -93,7 +92,6 @@ EXTRA_OECONF += " \
     --disable-directsound \
     --disable-dts \
     --disable-gme \
-    --disable-gsettings \
     --disable-gsm \
     --disable-kate \
     --disable-ladspa \
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/ensure-valid-sentinels-for-gst_structure_get-etc.patch +35 -16

72 lines not on this page · raw message

meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.6.3.bb +10 -0
index c51a637..8eb47c2 100644
@@ -5,6 +5,16 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=73a5855a8119deb017f5f13cf327095d \
                     file://gst/tta/crc32.h;beginline=12;endline=29;md5=27db269c575d1e5317fffca2d33b3b50 \
                     file://gst/tta/filters.h;beginline=12;endline=29;md5=8a08270656f2f8ad7bb3655b83138e5a"
 
+# Note: The mpg123 plugin was moved to gst-plugins-ugly prior to the 1.7.2
+# release, so this line should be removed during the update to 1.8.x
+# https://cgit.freedesktop.org/gstreamer/gst-plugins-bad/commit/?id=08d8aefcdaaf89ecb6dd53ec1e4f95cd42d01664
+PACKAGECONFIG[mpg123] = "--enable-mpg123,--disable-mpg123,mpg123"
+
+# Note: The gsettings plug-in was dropped prior to the 1.7.2 release,
+# so this line should be removed during the update to 1.8.x
+# https://cgit.freedesktop.org/gstreamer/gst-plugins-bad/commit/?id=914291808ad10621d6a74031f3d46d45eef5a3a3
+EXTRA_OECONF += "--disable-gsettings"
+
 SRC_URI = " \
     http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-${PV}.tar.xz \
     file://configure-allow-to-disable-libssh2.patch \
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_git.bb +18 -3
index f9b5f3e..5be76db 100644
@@ -16,11 +16,12 @@ SRC_URI = " \
     file://ensure-valid-sentinels-for-gst_structure_get-etc.patch \
 "
 
-PV = "1.7.1+git${SRCPV}"
+PV = "1.7.2+git${SRCPV}"
+
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))"
 
-SRCREV_base = "3a088ecc9330d5cb8888ff43de0fe4f61c23a607"
-SRCREV_common = "86e46630ed8af8d94796859db550a9c3d89c9f65"
+SRCREV_base = "50ae46cc0f8827bf966920d9c221e5cf86e811ba"
+SRCREV_common = "a25397448942079002622be231e9ec49b985745a"
 SRCREV_FORMAT = "base"
 
 S = "${WORKDIR}/git"
@@ -31,6 +32,20 @@ S = "${WORKDIR}/git"
 # This should move back to the common .inc once the main recipe updates to 1.8.x
 PACKAGECONFIG[hls] = "--enable-hls --with-hls-crypto=openssl,--disable-hls,openssl"
 
+# The tinyalsa plugin was added prior to the 1.7.2 release
+# https://cgit.freedesktop.org/gstreamer/gst-plugins-bad/commit/?id=c8bd74fa9a81398f57d976c478d2043f30188684
+PACKAGECONFIG[tinyalsa] = "--enable-tinyalsa,--disable-tinyalsa,tinyalsa"
+
+# The vulkan based video sink plugin was added prior to the 1.7.2 release
+# https://cgit.freedesktop.org/gstreamer/gst-plugins-bad/commit/?id=5de6dd9f40629562acf90e35e1fa58464d66617d
+PACKAGECONFIG[vulkan] = "--enable-vulkan,--disable-vulkan,libxcb"
+
+# The dependency-less netsim plugin was added prior to the 1.7.2 release
+# https://cgit.freedesktop.org/gstreamer/gst-plugins-bad/commit/?id=e3f9e854f08e82bfab11182c5a2aa6f9a0c73cd5
+EXTRA_OECONF += " \
+    --enable-netsim \
+"
+
 do_configure_prepend() {
 	${S}/autogen.sh --noconfigure
 }
Signature · 1 line
1.9.1
#5 lore raw

PATCH 5/6 gstreamer1.0-plugins-ugly_git: update 1.7.1 -> 1.7.2

In reply to Andre McCurdy
---
 .../gstreamer/gstreamer1.0-plugins-ugly_git.bb     | 23 +++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_git.bb +20 -3
index ccf6ece..69afe4c 100644
@@ -10,15 +10,32 @@ SRC_URI = " \
     git://anongit.freedesktop.org/gstreamer/common;destsuffix=git/common;name=common \
 "
 
-PV = "1.7.1+git${SRCPV}"
+PV = "1.7.2+git${SRCPV}"
+
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))"
 
-SRCREV_base = "c9c37983babad909d01c1c4c417d42a0cf252c1d"
-SRCREV_common = "86e46630ed8af8d94796859db550a9c3d89c9f65"
+SRCREV_base = "8bdb68edbc605e21314b608e7a39bdbaab7302b8"
+SRCREV_common = "b64f03f6090245624608beb5d2fff335e23a01c0"
 SRCREV_FORMAT = "base"
 
 S = "${WORKDIR}/git"
 
+# The mpg123 plugin was added prior to the 1.7.2 release
+# https://cgit.freedesktop.org/gstreamer/gst-plugins-ugly/commit/?id=43bd45ba991ef3247957ca37cdcb52f4b8c0acb1
+PACKAGECONFIG[mpg123] = "--enable-mpg123,--disable-mpg123,mpg123"
+
 do_configure_prepend() {
 	${S}/autogen.sh --noconfigure
 }
+
+# In 1.7.2, the mpg123 plugin was moved from -bad to -ugly
+# https://cgit.freedesktop.org/gstreamer/gst-plugins-bad/commit/?id=08d8aefcdaaf89ecb6dd53ec1e4f95cd42d01664
+# https://cgit.freedesktop.org/gstreamer/gst-plugins-ugly/commit/?id=43bd45ba991ef3247957ca37cdcb52f4b8c0acb1
+
+PACKAGESPLITFUNCS_append = " handle_mpg123_rename "
+
+python handle_mpg123_rename () {
+    d.setVar('RPROVIDES_gstreamer1.0-plugins-ugly-mpg123', 'gstreamer1.0-plugins-bad-mpg123')
+    d.setVar('RREPLACES_gstreamer1.0-plugins-ugly-mpg123', 'gstreamer1.0-plugins-bad-mpg123')
+    d.setVar('RCONFLICTS_gstreamer1.0-plugins-ugly-mpg123', 'gstreamer1.0-plugins-bad-mpg123')
+}
Signature · 1 line
1.9.1
#6 lore raw

PATCH 6/6 gstreamer1.0-libav_git: update 1.7.1 -> 1.7.2

In reply to Andre McCurdy

Hash for libav LICENSE.md updated due to dropping libaacplus:

https://github.com/FFmpeg/FFmpeg/commit/9ba54c1b82a81581e5283da75c153a76f04324c0

---
 meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_git.bb | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)
meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_git.bb +7 -6
index 4cd51cd..1957a5a 100644
@@ -5,7 +5,7 @@ include gstreamer1.0-libav.inc
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
                     file://COPYING.LIB;md5=6762ed442b3822387a51c92d928ead0d \
                     file://ext/libav/gstav.h;beginline=1;endline=18;md5=a752c35267d8276fd9ca3db6994fca9c \
-                    file://gst-libs/ext/libav/LICENSE.md;md5=5c6d1ed56d15ca87ddec48d0c3a2051d \
+                    file://gst-libs/ext/libav/LICENSE.md;md5=acda96fe91ccaabc9cd9d541806a0d37 \
                     file://gst-libs/ext/libav/COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
                     file://gst-libs/ext/libav/COPYING.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \
                     file://gst-libs/ext/libav/COPYING.LGPLv2.1;md5=bd7a443320af8c812e4c18d1b79df004 \
@@ -17,17 +17,18 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
 SRC_URI = " \
     git://anongit.freedesktop.org/gstreamer/gst-libav;name=base \
     git://anongit.freedesktop.org/gstreamer/common;destsuffix=git/common;name=common \
-    git://source.ffmpeg.org/ffmpeg;destsuffix=git/gst-libs/ext/libav;name=ffmpeg;branch=release/2.8 \
+    git://source.ffmpeg.org/ffmpeg;destsuffix=git/gst-libs/ext/libav;name=ffmpeg;branch=release/3.0 \
     file://0001-Disable-yasm-for-libav-when-disable-yasm.patch \
     file://workaround-to-build-gst-libav-for-i586-with-gcc.patch \
 "
 
-PV = "1.7.1+git${SRCPV}"
+PV = "1.7.2+git${SRCPV}"
+
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))"
 
-SRCREV_base = "0993ec8fa5cf6b09e33741f268c938719a1534d5"
-SRCREV_common = "86e46630ed8af8d94796859db550a9c3d89c9f65"
-SRCREV_ffmpeg = "644179e0d4155ae8f5ddd5c3f6bd003e2e13cf94"
+SRCREV_base = "6c4878b6abc916b7f6f25b8926c4859119acf1ec"
+SRCREV_common = "b64f03f6090245624608beb5d2fff335e23a01c0"
+SRCREV_ffmpeg = "c40983a6f631d22fede713d535bb9c31d5c9740c"
 SRCREV_FORMAT = "base"
 
 S = "${WORKDIR}/git"
Signature · 1 line
1.9.1