gstreamer1.0-plugins-base: upgrade to version 1.18.0

* 0001-meson-build-gir-even-when-cross-compiling-if-introsp.patch
    * 0002-meson-Add-variables-for-gir-files.patch
      Removed since these are included in 1.18.0

License-Update: remove file://common/coverage/coverage-report.pl
Upstream dont have it any more.

    API and plugin documentation are no longer built with gtk_doc.
    The gtk_doc documentation has been removed in favour of a new unified
    documentation module built with hotdoc.
    Distributors should use the documentation release tarball instead of trying
    to package hotdoc and building the documentation from scratch.

(From OE-Core rev: 5485ecd65987f5a2c0824cf6f691ccb3f529c86e)

Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Jose Quaresma
2020-10-29 14:27:47 +00:00
committed by Richard Purdie
parent 673ca00315
commit 4650ec0450
7 changed files with 32 additions and 306 deletions

View File

@@ -1,14 +1,13 @@
From 41de2ec64ab06bb58c82c1659adaa3811bc5bcf8 Mon Sep 17 00:00:00 2001
From f9d48cd85ee68207733b1b91a00453462c33524a Mon Sep 17 00:00:00 2001
From: zhouming <b42586@freescale.com>
Date: Wed, 14 May 2014 10:16:20 +0800
Subject: [PATCH] ENGR00312515: get caps from src pad when query caps
Subject: [PATCH 1/4] ENGR00312515: get caps from src pad when query caps
https://bugzilla.gnome.org/show_bug.cgi?id=728312
Upstream-Status: Pending
Signed-off-by: zhouming <b42586@freescale.com>
---
gst-libs/gst/tag/gsttagdemux.c | 13 +++++++++++++
1 file changed, 13 insertions(+)
@@ -17,10 +16,10 @@ Signed-off-by: zhouming <b42586@freescale.com>
diff --git a/gst-libs/gst/tag/gsttagdemux.c b/gst-libs/gst/tag/gsttagdemux.c
old mode 100644
new mode 100755
index 8a127c8..71c5d78
index f545857..62d10ef
--- a/gst-libs/gst/tag/gsttagdemux.c
+++ b/gst-libs/gst/tag/gsttagdemux.c
@@ -1759,6 +1759,19 @@ gst_tag_demux_pad_query (GstPad * pad, GstObject * parent, GstQuery * query)
@@ -1777,6 +1777,19 @@ gst_tag_demux_pad_query (GstPad * pad, GstObject * parent, GstQuery * query)
}
break;
}
@@ -40,3 +39,6 @@ index 8a127c8..71c5d78
default:
res = gst_pad_query_default (pad, parent, query);
break;
--
2.28.0

View File

@@ -1,36 +0,0 @@
From 30672ba7d134553e59935ddc875104adba26f25c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.com>
Date: Thu, 17 Oct 2019 20:06:24 +0100
Subject: [PATCH] meson: build gir even when cross-compiling if introspection
was enabled explicitly
This can be made to work in certain circumstances when
cross-compiling, so default to not building g-i stuff
when cross-compiling, but allow it if introspection was
enabled explicitly via -Dintrospection=enabled.
See gstreamer/gstreamer#454 and gstreamer/gstreamer#381.
Upstream-Status: Backport [30672ba7d134553e59935ddc875104adba26f25c]
Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
---
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index 264d84c9e..c8147c224 100644
--- a/meson.build
+++ b/meson.build
@@ -372,7 +372,7 @@ endif
gir = find_program('g-ir-scanner', required : get_option('introspection'))
gnome = import('gnome')
-build_gir = gir.found() and not meson.is_cross_build()
+build_gir = gir.found() and (not meson.is_cross_build() or get_option('introspection').enabled())
gir_init_section = [ '--add-init-section=extern void gst_init(gint*,gchar**);' + \
'g_setenv("GST_REGISTRY_DISABLE", "yes", TRUE);' + \
'g_setenv("GST_REGISTRY_1.0", "@0@", TRUE);'.format(meson.current_build_dir() + '/gir_empty_registry.reg') + \
--
2.17.1

View File

@@ -1,235 +0,0 @@
From 685731e989dc074a4b0d48b6c8062e2738f09719 Mon Sep 17 00:00:00 2001
From: Thibault Saunier <tsaunier@igalia.com>
Date: Mon, 22 Oct 2018 11:44:37 +0200
Subject: [PATCH] meson: Add variables for gir files
And flatten list of sources for dependencies
Upstream-Status: Backport [685731e989dc074a4b0d48b6c8062e2738f09719]
Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
---
gst-libs/gst/allocators/meson.build | 5 +++--
gst-libs/gst/app/meson.build | 6 ++++--
gst-libs/gst/audio/meson.build | 5 +++--
gst-libs/gst/pbutils/meson.build | 5 +++--
gst-libs/gst/rtp/meson.build | 6 ++++--
gst-libs/gst/rtsp/meson.build | 5 +++--
gst-libs/gst/sdp/meson.build | 6 ++++--
gst-libs/gst/tag/meson.build | 5 +++--
gst-libs/gst/video/meson.build | 5 +++--
9 files changed, 30 insertions(+), 18 deletions(-)
diff --git a/gst-libs/gst/allocators/meson.build b/gst-libs/gst/allocators/meson.build
index 364baeebf..56f156dc3 100644
--- a/gst-libs/gst/allocators/meson.build
+++ b/gst-libs/gst/allocators/meson.build
@@ -22,7 +22,7 @@ gstallocators = library('gstallocators-@0@'.format(api_version),
allocators_gen_sources = []
if build_gir
gst_gir_extra_args = gir_init_section + [ '--c-include=gst/allocators/allocators.h' ]
- allocators_gen_sources += [gnome.generate_gir(gstallocators,
+ allocators_gir = gnome.generate_gir(gstallocators,
sources : gst_allocators_sources + gst_allocators_headers,
namespace : 'GstAllocators',
nsversion : api_version,
@@ -33,7 +33,8 @@ if build_gir
install : true,
extra_args : gst_gir_extra_args,
dependencies : [gst_dep]
- )]
+ )
+ allocators_gen_sources += allocators_gir
endif
allocators_dep = declare_dependency(link_with: gstallocators,
diff --git a/gst-libs/gst/app/meson.build b/gst-libs/gst/app/meson.build
index 81dd0f42c..7a90f5e10 100644
--- a/gst-libs/gst/app/meson.build
+++ b/gst-libs/gst/app/meson.build
@@ -32,7 +32,7 @@ gstapp = library('gstapp-@0@'.format(api_version),
if build_gir
gst_gir_extra_args = gir_init_section + [ '--c-include=gst/app/app.h' ]
- app_gen_sources += [gnome.generate_gir(gstapp,
+ app_gir = gnome.generate_gir(gstapp,
sources : app_sources + app_headers + [gstapp_c] + [gstapp_h],
namespace : 'GstApp',
nsversion : api_version,
@@ -43,7 +43,9 @@ if build_gir
install : true,
extra_args : gst_gir_extra_args,
dependencies : [gst_dep, gst_base_dep]
- )]
+ )
+
+ app_gen_sources += app_gir
endif
app_dep = declare_dependency(link_with: gstapp,
diff --git a/gst-libs/gst/audio/meson.build b/gst-libs/gst/audio/meson.build
index 0e4efab2e..2a449d4bf 100644
--- a/gst-libs/gst/audio/meson.build
+++ b/gst-libs/gst/audio/meson.build
@@ -153,7 +153,7 @@ gstaudio = library('gstaudio-@0@'.format(api_version),
if build_gir
gst_gir_extra_args = gir_init_section + [ '--c-include=gst/audio/audio.h' ]
- audio_gen_sources += [gnome.generate_gir(gstaudio,
+ audio_gir = gnome.generate_gir(gstaudio,
sources : audio_src + audio_headers + [gstaudio_c] + [gstaudio_h],
namespace : 'GstAudio',
nsversion : api_version,
@@ -164,7 +164,8 @@ if build_gir
install : true,
extra_args : gst_gir_extra_args,
dependencies : gstaudio_deps
- )]
+ )
+ audio_gen_sources += [audio_gir]
endif
audio_dep = declare_dependency(link_with : gstaudio,
diff --git a/gst-libs/gst/pbutils/meson.build b/gst-libs/gst/pbutils/meson.build
index 2faf62622..0e96722fd 100644
--- a/gst-libs/gst/pbutils/meson.build
+++ b/gst-libs/gst/pbutils/meson.build
@@ -63,7 +63,7 @@ pbutils = library('gstpbutils-@0@'.format(api_version),
pbutils_gen_sources = [gstpbutils_h, gst_pbutils_version_h]
if build_gir
gst_gir_extra_args = gir_init_section + [ '--c-include=gst/pbutils/pbutils.h' ]
- pbutils_gen_sources += [gnome.generate_gir(pbutils,
+ pbutils_gir = gnome.generate_gir(pbutils,
sources : pbutils_sources + pbutils_headers + [gstpbutils_h, gst_pbutils_version_h],
namespace : 'GstPbutils',
nsversion : api_version,
@@ -74,7 +74,8 @@ if build_gir
install : true,
extra_args : gst_gir_extra_args,
dependencies : gstpbutils_deps
- )]
+ )
+ pbutils_gen_sources += [pbutils_gir]
endif
pbutils_dep = declare_dependency(link_with : pbutils,
diff --git a/gst-libs/gst/rtp/meson.build b/gst-libs/gst/rtp/meson.build
index f47ec6592..7ea6658d5 100644
--- a/gst-libs/gst/rtp/meson.build
+++ b/gst-libs/gst/rtp/meson.build
@@ -49,7 +49,7 @@ gst_rtp = library('gstrtp-@0@'.format(api_version),
rtp_gen_sources = [gstrtp_enum_h]
if build_gir
gst_gir_extra_args = gir_init_section + [ '--c-include=gst/rtp/rtp.h' ]
- rtp_gen_sources += [gnome.generate_gir(gst_rtp,
+ rtp_gir = gnome.generate_gir(gst_rtp,
sources : rtp_sources + rtp_headers + [gstrtp_enum_c] + [gstrtp_enum_h],
namespace : 'GstRtp',
nsversion : api_version,
@@ -60,7 +60,9 @@ if build_gir
install : true,
extra_args : gst_gir_extra_args,
dependencies : gstrtp_deps
- )]
+ )
+
+ rtp_gen_sources += [rtp_gir]
endif
diff --git a/gst-libs/gst/rtsp/meson.build b/gst-libs/gst/rtsp/meson.build
index 27e309d5a..3632adceb 100644
--- a/gst-libs/gst/rtsp/meson.build
+++ b/gst-libs/gst/rtsp/meson.build
@@ -54,7 +54,7 @@ gst_rtsp = library('gstrtsp-@0@'.format(api_version),
rtsp_gen_sources = [gstrtsp_h]
if build_gir
gst_gir_extra_args = gir_init_section + [ '--c-include=gst/rtsp/rtsp.h' ]
- rtsp_gen_sources += [gnome.generate_gir(gst_rtsp,
+ rtsp_gir = gnome.generate_gir(gst_rtsp,
sources : rtsp_sources + rtsp_headers + [gstrtsp_c] + [gstrtsp_h],
namespace : 'GstRtsp',
nsversion : api_version,
@@ -65,7 +65,8 @@ if build_gir
install : true,
extra_args : gst_gir_extra_args,
dependencies : gstrtsp_deps + [sdp_dep]
- )]
+ )
+ rtsp_gen_sources += [rtsp_gir]
endif
rtsp_dep = declare_dependency(link_with : gst_rtsp,
diff --git a/gst-libs/gst/sdp/meson.build b/gst-libs/gst/sdp/meson.build
index 62c18b732..24cdb5293 100644
--- a/gst-libs/gst/sdp/meson.build
+++ b/gst-libs/gst/sdp/meson.build
@@ -23,7 +23,7 @@ gstsdp = library('gstsdp-@0@'.format(api_version),
sdp_gen_sources = []
if build_gir
gst_gir_extra_args = gir_init_section + [ '--c-include=gst/sdp/sdp.h' ]
- sdp_gen_sources += [gnome.generate_gir(gstsdp,
+ sdp_gir = gnome.generate_gir(gstsdp,
sources : gst_sdp_sources + gst_sdp_headers,
namespace : 'GstSdp',
nsversion : api_version,
@@ -34,7 +34,9 @@ if build_gir
install : true,
extra_args : gst_gir_extra_args,
dependencies : rtsp_deps
- )]
+ )
+
+ sdp_gen_sources += [sdp_gir]
endif
sdp_dep = declare_dependency(link_with: gstsdp,
diff --git a/gst-libs/gst/tag/meson.build b/gst-libs/gst/tag/meson.build
index 27e66fd63..5ec37392a 100644
--- a/gst-libs/gst/tag/meson.build
+++ b/gst-libs/gst/tag/meson.build
@@ -93,7 +93,7 @@ gsttag = library('gsttag-@0@'.format(api_version),
if build_gir
gst_gir_extra_args = gir_init_section + [ '--c-include=gst/tag/tag.h' ]
- tag_gen_sources += [gnome.generate_gir(gsttag,
+ tag_gir = gnome.generate_gir(gsttag,
sources : tag_sources + tag_headers + [gsttag_h] + [gsttag_c],
namespace : 'GstTag',
nsversion : api_version,
@@ -104,7 +104,8 @@ if build_gir
install : true,
extra_args : gst_gir_extra_args,
dependencies : tag_deps
- )]
+ )
+ tag_gen_sources += [tag_gir]
endif
tag_dep = declare_dependency(link_with: gsttag,
diff --git a/gst-libs/gst/video/meson.build b/gst-libs/gst/video/meson.build
index 5b35e1943..bf77aa157 100644
--- a/gst-libs/gst/video/meson.build
+++ b/gst-libs/gst/video/meson.build
@@ -138,7 +138,7 @@ gstvideo = library('gstvideo-@0@'.format(api_version),
if build_gir
gst_gir_extra_args = gir_init_section + [ '--c-include=gst/video/video.h' ]
- video_gen_sources += [gnome.generate_gir(gstvideo,
+ video_gir = gnome.generate_gir(gstvideo,
sources : video_sources + video_headers + [gstvideo_c] + [gstvideo_h],
namespace : 'GstVideo',
nsversion : api_version,
@@ -149,7 +149,8 @@ if build_gir
install : true,
extra_args : gst_gir_extra_args,
dependencies : gstvideo_deps
- )]
+ )
+ video_gen_sources += [video_gir]
endif
video_dep = declare_dependency(link_with : gstvideo,
--
2.17.1

View File

@@ -1,7 +1,7 @@
From 918c96b24d10f61b7455b4cef3bab490849d0d77 Mon Sep 17 00:00:00 2001
From f587861bbe12ad0b10370f835592746aafedbf56 Mon Sep 17 00:00:00 2001
From: Mingke Wang <mingke.wang@freescale.com>
Date: Thu, 19 Mar 2015 14:17:10 +0800
Subject: [PATCH] ssaparse: enhance SSA text lines parsing.
Subject: [PATCH 2/4] ssaparse: enhance SSA text lines parsing.
some parser will pass in the original ssa text line which starts with "Dialog:"
and there's are maybe multiple Dialog lines in one input buffer.
@@ -9,9 +9,8 @@ and there's are maybe multiple Dialog lines in one input buffer.
Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=747496]
Signed-off-by: Mingke Wang <mingke.wang@freescale.com>
---
gst/subparse/gstssaparse.c | 150 ++++++++++++++++++++++++++++++++++++++++-----
gst/subparse/gstssaparse.c | 150 +++++++++++++++++++++++++++++++++----
1 file changed, 134 insertions(+), 16 deletions(-)
mode change 100644 => 100755 gst/subparse/gstssaparse.c
@@ -225,3 +224,6 @@ index c849c08..4b9636c
if (ret != GST_FLOW_OK && GST_CLOCK_TIME_IS_VALID (ts)) {
GstSegment segment;
--
2.28.0

View File

@@ -1,7 +1,7 @@
From bec38a0c2e2958927c42b2f9ae939969b7c4a326 Mon Sep 17 00:00:00 2001
From 153f3b83a3fed77785bd1420bed8bbafa2d791b3 Mon Sep 17 00:00:00 2001
From: Carlos Rafael Giani <crg7475@mailbox.org>
Date: Tue, 21 May 2019 14:01:11 +0200
Subject: [PATCH] viv-fb: Make sure config.h is included
Subject: [PATCH 3/4] viv-fb: Make sure config.h is included
This prevents build errors due to missing GST_API_* symbols
@@ -13,7 +13,7 @@ Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org>
1 file changed, 4 insertions(+)
diff --git a/gst-libs/gst/gl/gl-prelude.h b/gst-libs/gst/gl/gl-prelude.h
index 05e1f6229..96ce5e685 100644
index 05e1f62..96ce5e6 100644
--- a/gst-libs/gst/gl/gl-prelude.h
+++ b/gst-libs/gst/gl/gl-prelude.h
@@ -22,6 +22,10 @@
@@ -28,5 +28,5 @@ index 05e1f6229..96ce5e685 100644
#ifdef BUILDING_GST_GL
--
2.17.1
2.28.0

View File

@@ -1,7 +1,7 @@
From c6b37a80806f9128de47f1ccc3f2354f8d436bb6 Mon Sep 17 00:00:00 2001
From 79841a02ee754eba736cb32aaf2ed2b2fc0483d4 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Thu, 24 Sep 2015 19:47:32 +0300
Subject: [PATCH] glimagesink: Downrank to marginal
Subject: [PATCH 4/4] glimagesink: Downrank to marginal
On desktop, where there is good OpenGL, xvimagesink will come up first,
on other platforms, OpenGL can't be trusted because it's either software (like
@@ -15,7 +15,7 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ext/gl/gstopengl.c b/ext/gl/gstopengl.c
index a4b2540..0ccaacd 100644
index 302e845..463be9c 100644
--- a/ext/gl/gstopengl.c
+++ b/ext/gl/gstopengl.c
@@ -127,7 +127,7 @@ plugin_init (GstPlugin * plugin)
@@ -28,5 +28,5 @@ index a4b2540..0ccaacd 100644
}
--
2.1.4
2.28.0

View File

@@ -1,26 +1,22 @@
require gstreamer1.0-plugins-common.inc
LICENSE = "GPLv2+ & LGPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d \
file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=a4e1830fce078028c8f0974161272607"
LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d"
SRC_URI = " \
https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-${PV}.tar.xz \
file://get-caps-from-src-pad-when-query-caps.patch \
file://0001-meson-build-gir-even-when-cross-compiling-if-introsp.patch \
file://0002-meson-Add-variables-for-gir-files.patch \
file://0003-ssaparse-enhance-SSA-text-lines-parsing.patch \
file://0005-viv-fb-Make-sure-config.h-is-included.patch \
file://0009-glimagesink-Downrank-to-marginal.patch \
"
SRC_URI[md5sum] = "3fdb32823535799a748c1fc14f978e2c"
SRC_URI[sha256sum] = "b13e73e2fe74a4166552f9577c3dcb24bed077021b9c7fa600d910ec6987816a"
SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-${PV}.tar.xz \
file://0001-ENGR00312515-get-caps-from-src-pad-when-query-caps.patch \
file://0003-viv-fb-Make-sure-config.h-is-included.patch \
file://0002-ssaparse-enhance-SSA-text-lines-parsing.patch \
file://0004-glimagesink-Downrank-to-marginal.patch \
"
SRC_URI[md5sum] = "5ea9dc2692335e03170c3639901c2d83"
SRC_URI[sha256sum] = "762abdd1a950809a1cea62fff7f86b5f7d6bd5f6841e3e585c700b823cdb7897"
S = "${WORKDIR}/gst-plugins-base-${PV}"
DEPENDS += "iso-codes util-linux zlib"
inherit gobject-introspection gtk-doc
inherit gobject-introspection
PACKAGES_DYNAMIC =+ "^libgst.*"
@@ -74,16 +70,13 @@ OPENGL_WINSYS_append = "${@bb.utils.contains('PACKAGECONFIG', 'wayland', ' wayla
OPENGL_WINSYS_append = "${@bb.utils.contains('PACKAGECONFIG', 'dispmanx', ' dispmanx', '', d)}"
EXTRA_OEMESON += " \
-Ddoc=disabled \
-Dgl-graphene=disabled \
${@get_opengl_cmdline_list('gl_api', d.getVar('OPENGL_APIS'), d)} \
${@get_opengl_cmdline_list('gl_platform', d.getVar('OPENGL_PLATFORMS'), d)} \
${@get_opengl_cmdline_list('gl_winsys', d.getVar('OPENGL_WINSYS'), d)} \
"
GTKDOC_MESON_OPTION = "gtk_doc"
GTKDOC_MESON_ENABLE_FLAG = "enabled"
GTKDOC_MESON_DISABLE_FLAG = "disabled"
FILES_${PN}-dev += "${libdir}/gstreamer-1.0/include/gst/gl/gstglconfig.h"
FILES_${MLPREFIX}libgsttag-1.0 += "${datadir}/gst-plugins-base/1.0/license-translations.dict"