From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pg1-f177.google.com (mail-pg1-f177.google.com [209.85.215.177]) by mail.openembedded.org (Postfix) with ESMTP id 4BD427FCDB for ; Sat, 23 Nov 2019 16:11:27 +0000 (UTC) Received: by mail-pg1-f177.google.com with SMTP id b1so4940140pgq.10 for ; Sat, 23 Nov 2019 08:11:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=0Lc9SUzGdOcFXswgV2kMKYPPAD+5Uo4tXswuvW5dJsU=; b=MJihuAH/2AwwkaSpCgV9XUdJa0HkcIFtLCGv4FvU6HR1EcAtQXWivejMdSevErJ6Gj OwtLCfd/wjcsnXNFAl9L0KKL22f9gbmZQ0xkkW4cPu+1sGLfbL43A2RLe25sQIadwl0P Fo612G8UkPfNflXO9J2qguSfrq5bZ182OWVIEHcsEgtQ12wFjpekia79j+vmOMkyrPzF GgwaRcW385jDF9OSipeDONayAbiyJ4cMOKrz0f1MuWAnGx+YQdSqwIvkxva89q3ix3aU cVCPnOFfEqxE66hYWUqNUWIPPzzUETMMBqmbWl72lf8t5EzAFIXuFsCMLLgvs7KtPEoy 4X6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=0Lc9SUzGdOcFXswgV2kMKYPPAD+5Uo4tXswuvW5dJsU=; b=sWtqwkLuI1f/KssKmvYJujpTaDkMpyTQY7A2NV4A+MtAYnKwvhRyBlRcerOY8rPlxM 0Teja48RtPDH91rhpY/okPR0AAWj6aYf0XEbdcZV1MCCcOKoqJh4HRHGXS7jU16WjXWr 9Ow/bhamolN8iI80NWeTCBlx9TxEQtVCjgIkg56QROQ4kc7JYITYazsi6HNNDyoYRcq9 wluR0I/Y6XnykWM5vKSEdLyeBUlCUx7K0BKKhTK1yD48lnOfcNRShHevtKbFKphnfvWv yMTOGK+0nzS3fhUSOXBijxHZdmY1F/S5X557nJ+Rk3DmEVZxMqVsb8z6nck0lnY/Kqct QyKA== X-Gm-Message-State: APjAAAVMCJd99iNz9EQpu0rPEyO7h6UZJucFKnFQ+iD6CJKO5i+xidLQ iUOyW7QZvRgDuTjiTNKuOEqyI47e X-Google-Smtp-Source: APXvYqz7Q6IlwSJY+TIb0LITWMh0xDKxhPiraaXdukoOW/kPJjz3LUmuXIhA7KGtMDxoJK9TU8oRtA== X-Received: by 2002:a63:5611:: with SMTP id k17mr22832165pgb.210.1574525488004; Sat, 23 Nov 2019 08:11:28 -0800 (PST) Received: from akuster-ThinkPad-T460s.mvista.com ([2601:202:4180:a5c0:d5a1:4623:137e:d439]) by smtp.gmail.com with ESMTPSA id 199sm2091943pfz.186.2019.11.23.08.11.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 23 Nov 2019 08:11:27 -0800 (PST) From: Armin Kuster To: openembedded-core@lists.openembedded.org Date: Sat, 23 Nov 2019 08:11:16 -0800 Message-Id: <1574525485-20450-2-git-send-email-akuster808@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1574525485-20450-1-git-send-email-akuster808@gmail.com> References: <1574525485-20450-1-git-send-email-akuster808@gmail.com> Subject: [zeus][PATCH 02/11] gstreamer1.0-plugins-good: upgrade to version 1.16.1 X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Nov 2019 16:11:27 -0000 From: Carlos Rafael Giani * 0001-scaletempo-Advertise-interleaved-layout-in-caps-temp.patch * headerfix.patch Removed since these changes are already included in 1.16.1 Signed-off-by: Carlos Rafael Giani Signed-off-by: Ross Burton Signed-off-by: Armin Kuster --- ...Advertise-interleaved-layout-in-caps-temp.patch | 37 ------------------- .../gstreamer1.0-plugins-good/headerfix.patch | 43 ---------------------- ...16.0.bb => gstreamer1.0-plugins-good_1.16.1.bb} | 6 +-- 3 files changed, 2 insertions(+), 84 deletions(-) delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-scaletempo-Advertise-interleaved-layout-in-caps-temp.patch delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/headerfix.patch rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-good_1.16.0.bb => gstreamer1.0-plugins-good_1.16.1.bb} (92%) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-scaletempo-Advertise-interleaved-layout-in-caps-temp.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-scaletempo-Advertise-interleaved-layout-in-caps-temp.patch deleted file mode 100644 index caa080c..0000000 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-scaletempo-Advertise-interleaved-layout-in-caps-temp.patch +++ /dev/null @@ -1,37 +0,0 @@ -From aadfa5f20f53601785e417fe3fcbe6d574880988 Mon Sep 17 00:00:00 2001 -From: Philippe Normand -Date: Tue, 23 Apr 2019 10:10:01 +0100 -Subject: [PATCH] scaletempo: Advertise interleaved layout in caps templates - -Scaletempo doesn't support non-interleaved layout. Not explicitely stating this -would trigger critical warnings and a caps negotiation failure when scaletempo -is used as playbin audio-filter. - -Patch suggested by George Kiagiadakis . - -Fixes #591 -Upstream-Status: Backport [merged, on track for 1.16.1.] ---- - gst/audiofx/gstscaletempo.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/gst/audiofx/gstscaletempo.c b/gst/audiofx/gstscaletempo.c -index 3a719719a..83ee8fe24 100644 ---- a/gst/audiofx/gstscaletempo.c -+++ b/gst/audiofx/gstscaletempo.c -@@ -93,9 +93,9 @@ enum - - #define SUPPORTED_CAPS \ - GST_STATIC_CAPS ( \ -- GST_AUDIO_CAPS_MAKE (GST_AUDIO_NE (F32)) "; " \ -- GST_AUDIO_CAPS_MAKE (GST_AUDIO_NE (F64)) "; " \ -- GST_AUDIO_CAPS_MAKE (GST_AUDIO_NE (S16)) \ -+ GST_AUDIO_CAPS_MAKE (GST_AUDIO_NE (F32)) ", layout=(string)interleaved; " \ -+ GST_AUDIO_CAPS_MAKE (GST_AUDIO_NE (F64)) ", layout=(string)interleaved; " \ -+ GST_AUDIO_CAPS_MAKE (GST_AUDIO_NE (S16)) ", layout=(string)interleaved" \ - ) - - static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink", --- -2.20.1 - diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/headerfix.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/headerfix.patch deleted file mode 100644 index 34d25a0..0000000 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/headerfix.patch +++ /dev/null @@ -1,43 +0,0 @@ -Things break with overlapping defines between glib and gstreamer with glibc 2.30. - -Discussion in the link below, basically internal __ prefixed variables -shouldn't be redefined. - -Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/issues/635] -RP 2019/8/6 - -Index: gst-plugins-good-1.16.0/sys/v4l2/ext/types-compat.h -=================================================================== ---- gst-plugins-good-1.16.0.orig/sys/v4l2/ext/types-compat.h -+++ gst-plugins-good-1.16.0/sys/v4l2/ext/types-compat.h -@@ -24,29 +24,6 @@ - #ifndef __TYPES_COMPAT_H__ - #define __TYPES_COMPAT_H__ - --/* From linux/types.h */ --#ifndef __bitwise__ --# ifdef __CHECKER__ --# define __bitwise__ __attribute__((bitwise)) --# else --# define __bitwise__ --# endif --#endif -- --#ifndef __bitwise --# ifdef __CHECK_ENDIAN__ --# define __bitwise __bitwise__ --# else --# define __bitwise --# endif --#endif -- --#define __u64 guint64 --#define __u32 guint32 --#define __u16 guint16 --#define __u8 guint8 --#define __s64 gint64 --#define __s32 gint32 --#define __le32 guint32 __bitwise -+#include - - #endif /* __TYPES_COMPAT_H__ */ diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.0.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.1.bb similarity index 92% rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.0.bb rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.1.bb index 5751467..21d2b2b 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.0.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.1.bb @@ -2,13 +2,11 @@ require gstreamer1.0-plugins.inc SRC_URI = " \ http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-${PV}.tar.xz \ - file://0001-scaletempo-Advertise-interleaved-layout-in-caps-temp.patch \ file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \ - file://headerfix.patch \ " -SRC_URI[md5sum] = "d1a7b442994d9522418de4af4330e034" -SRC_URI[sha256sum] = "654adef33380d604112f702c2927574cfc285e31307b79e584113858838bb0fd" +SRC_URI[md5sum] = "515987ee763256840a11bd8ea098f2bf" +SRC_URI[sha256sum] = "9fbabe69018fcec707df0b71150168776040cde6c1a26bb5a82a136755fa8f1f" S = "${WORKDIR}/gst-plugins-good-${PV}" -- 2.7.4