From d38bfce134585968a26d366a3ec9cebc4d5648d94312fabe6ba0741d10d1a1bd Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 22 Sep 2021 08:24:21 +0000 Subject: [PATCH 1/2] Accepting request 919672 from home:iznogood:branches:multimedia:libs - Stop building doc sub-package, we will in the future use upstreams own standalone doc package. Following this: Drop fdupes, gtk-doc and hotdoc BuildRequires, and fdupes call, no longer needed nor usefull. - Refresh patches with quilt. OBS-URL: https://build.opensuse.org/request/show/919672 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/gstreamer?expand=0&rev=172 --- gstreamer-pie.patch | 9 +++++---- gstreamer-rpm-prov.patch | 29 +++++++++++++++-------------- gstreamer.changes | 9 +++++++++ gstreamer.spec | 28 +++------------------------- 4 files changed, 32 insertions(+), 43 deletions(-) diff --git a/gstreamer-pie.patch b/gstreamer-pie.patch index eab086e..0abc9d4 100644 --- a/gstreamer-pie.patch +++ b/gstreamer-pie.patch @@ -1,6 +1,7 @@ -diff -urp gstreamer-1.16.0.orig/libs/gst/helpers/meson.build gstreamer-1.16.0/libs/gst/helpers/meson.build ---- gstreamer-1.16.0.orig/libs/gst/helpers/meson.build 2019-01-26 19:10:08.000000000 -0600 -+++ gstreamer-1.16.0/libs/gst/helpers/meson.build 2019-06-12 15:06:33.120486636 -0500 +Index: gstreamer-1.18.5/libs/gst/helpers/meson.build +=================================================================== +--- gstreamer-1.18.5.orig/libs/gst/helpers/meson.build ++++ gstreamer-1.18.5/libs/gst/helpers/meson.build @@ -5,6 +5,7 @@ executable('gst-plugin-scanner', dependencies : [gobject_dep, gmodule_dep, glib_dep, mathlib, gst_dep], install_dir : helpers_install_dir, @@ -17,7 +18,7 @@ diff -urp gstreamer-1.16.0.orig/libs/gst/helpers/meson.build gstreamer-1.16.0/li ) endif -@@ -118,7 +120,8 @@ if have_ptp +@@ -114,7 +116,8 @@ if have_ptp include_directories : [configinc, libsinc], dependencies : [gio_dep, gobject_dep, glib_dep, mathlib, gst_dep, cap_dep], install_dir : helpers_install_dir, diff --git a/gstreamer-rpm-prov.patch b/gstreamer-rpm-prov.patch index 4627acc..744ea17 100644 --- a/gstreamer-rpm-prov.patch +++ b/gstreamer-rpm-prov.patch @@ -1,7 +1,8 @@ -diff -urp gstreamer-1.16.0.orig/tools/gst-inspect.c gstreamer-1.16.0/tools/gst-inspect.c ---- gstreamer-1.16.0.orig/tools/gst-inspect.c 2019-04-11 17:58:09.000000000 -0500 -+++ gstreamer-1.16.0/tools/gst-inspect.c 2019-06-12 09:28:27.004257869 -0500 -@@ -1730,7 +1730,224 @@ print_tracer_info (GstPluginFeature * fe +Index: gstreamer-1.18.5/tools/gst-inspect.c +=================================================================== +--- gstreamer-1.18.5.orig/tools/gst-inspect.c ++++ gstreamer-1.18.5/tools/gst-inspect.c +@@ -1750,7 +1750,224 @@ print_tracer_info (GstPluginFeature * fe * is meant for machines, not humans. */ static void @@ -227,7 +228,7 @@ diff -urp gstreamer-1.16.0.orig/tools/gst-inspect.c gstreamer-1.16.0/tools/gst-i { GstPadDirection direction; const gchar *type_name; -@@ -1756,6 +1973,13 @@ print_plugin_automatic_install_info_code +@@ -1776,6 +1993,13 @@ print_plugin_automatic_install_info_code return; } @@ -241,7 +242,7 @@ diff -urp gstreamer-1.16.0.orig/tools/gst-inspect.c gstreamer-1.16.0/tools/gst-i /* decoder/demuxer sink pads should always be static and there should only * be one, the same applies to encoders/muxers and source pads */ static_templates = gst_element_factory_get_static_pad_templates (factory); -@@ -1792,15 +2016,20 @@ print_plugin_automatic_install_info_code +@@ -1812,15 +2036,20 @@ print_plugin_automatic_install_info_code gst_structure_remove_field (s, "rate"); gst_structure_remove_field (s, "depth"); gst_structure_remove_field (s, "clock-rate"); @@ -266,7 +267,7 @@ diff -urp gstreamer-1.16.0.orig/tools/gst-inspect.c gstreamer-1.16.0/tools/gst-i { const gchar *const *protocols; -@@ -1809,13 +2038,19 @@ print_plugin_automatic_install_info_prot +@@ -1829,13 +2058,19 @@ print_plugin_automatic_install_info_prot switch (gst_element_factory_get_uri_type (factory)) { case GST_URI_SINK: while (*protocols != NULL) { @@ -288,7 +289,7 @@ diff -urp gstreamer-1.16.0.orig/tools/gst-inspect.c gstreamer-1.16.0/tools/gst-i ++protocols; } break; -@@ -1826,7 +2061,7 @@ print_plugin_automatic_install_info_prot +@@ -1846,7 +2081,7 @@ print_plugin_automatic_install_info_prot } static void @@ -297,7 +298,7 @@ diff -urp gstreamer-1.16.0.orig/tools/gst-inspect.c gstreamer-1.16.0/tools/gst-i { GList *features, *l; -@@ -1845,11 +2080,15 @@ print_plugin_automatic_install_info (Gst +@@ -1865,11 +2100,15 @@ print_plugin_automatic_install_info (Gst if (feature_plugin == plugin) { GstElementFactory *factory; @@ -316,7 +317,7 @@ diff -urp gstreamer-1.16.0.orig/tools/gst-inspect.c gstreamer-1.16.0/tools/gst-i } if (feature_plugin) gst_object_unref (feature_plugin); -@@ -1871,7 +2110,7 @@ print_all_plugin_automatic_install_info +@@ -1891,7 +2130,7 @@ print_all_plugin_automatic_install_info plugin = (GstPlugin *) (plugins->data); plugins = g_list_next (plugins); @@ -325,7 +326,7 @@ diff -urp gstreamer-1.16.0.orig/tools/gst-inspect.c gstreamer-1.16.0/tools/gst-i } gst_plugin_list_free (orig_plugins); } -@@ -1938,6 +2177,7 @@ main (int argc, char *argv[]) +@@ -1958,6 +2197,7 @@ main (int argc, char *argv[]) gboolean do_print_blacklist = FALSE; gboolean plugin_name = FALSE; gboolean print_aii = FALSE; @@ -333,7 +334,7 @@ diff -urp gstreamer-1.16.0.orig/tools/gst-inspect.c gstreamer-1.16.0/tools/gst-i gboolean uri_handlers = FALSE; gboolean check_exists = FALSE; gboolean color_always = FALSE; -@@ -1958,6 +2198,9 @@ main (int argc, char *argv[]) +@@ -1979,6 +2219,9 @@ main (int argc, char *argv[]) "or all plugins provide.\n " "Useful in connection with external automatic plugin " "installation mechanisms"), NULL}, @@ -343,7 +344,7 @@ diff -urp gstreamer-1.16.0.orig/tools/gst-inspect.c gstreamer-1.16.0/tools/gst-i {"plugin", '\0', 0, G_OPTION_ARG_NONE, &plugin_name, N_("List the plugin contents"), NULL}, {"types", 't', 0, G_OPTION_ARG_STRING, &types, -@@ -2113,7 +2356,7 @@ main (int argc, char *argv[]) +@@ -2144,7 +2387,7 @@ main (int argc, char *argv[]) /* if there is such a plugin, print out info */ if (plugin) { if (print_aii) { @@ -352,7 +353,7 @@ diff -urp gstreamer-1.16.0.orig/tools/gst-inspect.c gstreamer-1.16.0/tools/gst-i } else { print_plugin_info (plugin); print_plugin_features (plugin); -@@ -2126,13 +2369,17 @@ main (int argc, char *argv[]) +@@ -2157,13 +2400,17 @@ main (int argc, char *argv[]) if (plugin) { if (print_aii) { diff --git a/gstreamer.changes b/gstreamer.changes index 061c324..3f873ad 100644 --- a/gstreamer.changes +++ b/gstreamer.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Thu Sep 16 08:53:14 UTC 2021 - Bjørn Lie + +- Stop building doc sub-package, we will in the future use + upstreams own standalone doc package. Following this: Drop + fdupes, gtk-doc and hotdoc BuildRequires, and fdupes call, no + longer needed nor usefull. +- Refresh patches with quilt. + ------------------------------------------------------------------- Thu Sep 16 01:44:54 UTC 2021 - Stanislav Brabec diff --git a/gstreamer.spec b/gstreamer.spec index a2fc391..c384ea3 100644 --- a/gstreamer.spec +++ b/gstreamer.spec @@ -37,11 +37,8 @@ Patch2: gstreamer-pie.patch BuildRequires: bison >= 2.4 BuildRequires: check-devel -BuildRequires: fdupes BuildRequires: flex >= 2.5.31 BuildRequires: gobject-introspection-devel >= 1.31.1 -BuildRequires: gtk-doc >= 1.12 -BuildRequires: hotdoc BuildRequires: libcap-devel BuildRequires: libcap-progs BuildRequires: meson >= 0.47.0 @@ -103,19 +100,6 @@ installing new plug-ins. This package provides the GObject Introspection bindings for GStreamer. -%package doc -Summary: GStreamer Streaming-Media Framework Plug-Ins -Group: Development/Libraries/C and C++ -Requires: %{name} = %{version} - -%description doc -GStreamer is a streaming media framework, based on graphs of filters -which operate on media data. Applications using this library can do -anything from real-time sound processing to playing videos, and just -about anything else media-related. Its plugin-based architecture means -that new data types or processing capabilities can be added simply by -installing new plug-ins. - %package utils Summary: Streaming-Media Framework Runtime # Generic name, never used in SuSE: @@ -148,9 +132,7 @@ to develop applications that require these. %lang_package %prep -%setup -q -n gstreamer-%{version} -%patch1 -p1 -%patch2 -p1 +%autosetup -p1 sed -i -e '1{s,^#!/usr/bin/env python3,#!%{_bindir}/python3,}' docs/gst-plugins-doc-cache-generator.py %build @@ -164,7 +146,7 @@ sed -i "s/gst-plugin-scanner/gst-plugin-scanner-%{_target_cpu}/" meson.build -Dpackage-origin='http://download.opensuse.org' \ -Dintrospection=enabled \ -Dbenchmarks=disabled \ - -Ddoc=enabled \ + -Ddoc=disabled \ -Dexamples=disabled \ -Ddbghelp=disabled \ %ifnarch %{libunwind_archs} @@ -181,7 +163,6 @@ mkdir -p %{buildroot}%{_datadir}/gstreamer-%{gst_branch}/presets # Install the rpm macros install -m644 -D %{SOURCE1} %{buildroot}%{_fileattrsdir}/gstreamer.attr install -m755 -D %{SOURCE2} %{buildroot}%{_rpmconfigdir}/gstreamer-provides -%fdupes %{buildroot}%{_datadir}/gtk-doc %verifyscript %verify_permissions -e %{_libexecdir}/gstreamer-%{gst_branch}/gst-ptp-helper @@ -222,6 +203,7 @@ install -m755 -D %{SOURCE2} %{buildroot}%{_rpmconfigdir}/gstreamer-provides %{_mandir}/man?/*-%{gst_branch}*%{ext_man} %files devel +%doc AUTHORS ChangeLog NEWS README RELEASE %{_datadir}/aclocal/*.m4 # Own these directories to avoid build requirement on gdb # only for directories ownership @@ -241,10 +223,6 @@ install -m755 -D %{SOURCE2} %{buildroot}%{_rpmconfigdir}/gstreamer-provides %{_fileattrsdir}/gstreamer.attr %{_datadir}/gir-1.0/*.gir -%files doc -%doc AUTHORS ChangeLog NEWS README RELEASE -#%%{_datadir}/gtk-doc/html/* - %files lang -f %{name}-%{gst_branch}.lang %changelog From 2b1e423afb5fde244f680fe9c6d6d136681fc4ca36ad68a3143fd6a9837bc207 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 22 Sep 2021 08:24:48 +0000 Subject: [PATCH 2/2] Accepting request 919952 from home:sbrabec:branches:tuu-goodbye Fix issue identification. OBS-URL: https://build.opensuse.org/request/show/919952 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/gstreamer?expand=0&rev=173 --- gstreamer.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gstreamer.changes b/gstreamer.changes index 3f873ad..e18886f 100644 --- a/gstreamer.changes +++ b/gstreamer.changes @@ -11,7 +11,7 @@ Thu Sep 16 08:53:14 UTC 2021 - Bjørn Lie Thu Sep 16 01:44:54 UTC 2021 - Stanislav Brabec - Remove obsolete translation-update-upstream and - gnome-patch-translation support (PM-2938). + gnome-patch-translation support (jsc#SLE-21105). ------------------------------------------------------------------- Wed Sep 15 08:39:21 UTC 2021 - Bjørn Lie