PR#1: Use upstream source tarball, cleanup spec, add gst-debug-viewer - rpms/gst-devtools

rpms / gst-devtools

#1 Use upstream source tarball, cleanup spec, add gst-debug-viewer

Merged 6 months ago by limb. Opened 6 months ago by yselkowitz.

rpms/ yselkowitz/gst-devtools rawhide into rawhide

Add gst-debug-viewer

Yaakov Selkowitz • 6 months ago

e1c9d20

Cleanup spec

Yaakov Selkowitz • 6 months ago

5445d70

Use upstream source tarball

Yaakov Selkowitz • 6 months ago

2ac0085

.gitignore

file modified

		`@@ -1,3 +1,4 @@`
		`/gst-devtools-1.12.3.tar.gz`
		`/gst-devtools-1.19.2.tar.gz`
		`/gst-devtools.tar.gz`
		`+ /gst-devtools-1.22.7.tar.xz`

5027.patch

file added

+28

		`@@ -0,0 +1,28 @@`
		`+ From 98217f1892ea2472e1c0456bf4c407daf7e28ca2 Mon Sep 17 00:00:00 2001`
		`+ From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete@collabora.com>`
		`+ Date: Wed, 12 Jul 2023 14:57:28 -0600`
		`+ Subject: [PATCH] debug-viewer: Remove unnecessary call to`
		`+ gettext.bind_textdomain_codeset()`
		`+`
		`+ It has been deprecated in Python 3.8 and removed in 3.10`
		`+`
		`+ Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5027>`
		`+ ---`
		`+ .../gst-devtools/debug-viewer/GstDebugViewer/Common/Main.py \| 1 -`
		`+ 1 file changed, 1 deletion(-)`
		`+`
		`+ diff --git a/subprojects/gst-devtools/debug-viewer/GstDebugViewer/Common/Main.py b/subprojects/gst-devtools/debug-viewer/GstDebugViewer/Common/Main.py`
		`+ index e7f8552ce84..c57f5fa6fed 100644`
		`+ --- a/subprojects/gst-devtools/debug-viewer/GstDebugViewer/Common/Main.py`
		`+ +++ b/subprojects/gst-devtools/debug-viewer/GstDebugViewer/Common/Main.py`
		`+ @@ -314,7 +314,6 @@ def _init_locale(gettext_domain=None):`
		`+ else:`
		`+ gettext.bindtextdomain(gettext_domain, Paths.locale_dir)`
		`+ gettext.textdomain(gettext_domain)`
		`+ - gettext.bind_textdomain_codeset(gettext_domain, "UTF-8")`
		`+`
		`+`
		`+ def _init_logging(level):`
		`+ --`
		`+ GitLab`
		`+`

gst-devtools.spec

file modified

+29 -16

		`@@ -2,14 +2,15 @@`

		`Name: gst-devtools`
		`Version: 1.22.7`
		`- Release: 1%{?dist}`
		`+ Release: 2%{?dist}`
		`Summary: Development and debugging tools for GStreamer`

		`License: LGPL-2.0-or-later`
		`URL: https://gstreamer.freedesktop.org/src/gst-devtools`
		`- # git clone --depth 1 --branch %%{version} https://gitlab.freedesktop.org/gstreamer/gstreamer.git`
		`- # cd gstreamer/subprojects ; tar -czf gst-devtools.tar.gz gst-devtools`
		`- Source0: %{name}.tar.gz`
		`+ Source: https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-%{version}.tar.xz`
		`+`
		`+ # Remove deprecated call to gettext.bind_textdomain_codeset(), fixed in 1.24`
		`+ Patch: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5027.patch`

		`BuildRequires: meson`
		`BuildRequires: pkgconfig(gobject-2.0)`
		`@@ -33,26 +34,26 @@`
		`%description devel`
		`%{summary}.`

		`+ %package -n gst-debug-viewer`
		`+ Summary: GStreamer Debug Viewer`
		`+ Requires: gtk3`
		`+ Requires: hicolor-icon-theme`
		`+ Requires: python3-gobject`
		`+ BuildArch: noarch`
		`+`
		`+ %description -n gst-debug-viewer`
		`+ A simple graphical utility to view and analyze GStreamer debug files.`
		`+`
		`%prep`
		`- %autosetup -n %{name}`
		`+ %autosetup -p3`

		`%build`
		`- %meson -D doc=disabled`
		`+ %meson -D doc=disabled -D debug_viewer=enabled`
		`%meson_build`

		`%install`
		`%meson_install`

		- for lib in `find %{buildroot} -type f -name '*.py'`; do
		`- sed '1{\@^#!/usr/bin/env python@d}' $lib > $lib.new &&`
		`- touch -r $lib $lib.new &&`
		`- mv $lib.new $lib`
		`- done`
		`-`
		`- sed -i "s/env\ //g" %{buildroot}%{_bindir}/gst-validate-launcher`
		`-`
		`- %ldconfig_scriptlets`
		`-`
		`%files`
		`%doc validate/README`
		`%license validate/COPYING`
		`@@ -74,7 +75,19 @@`
		`%{_datadir}/gir-1.0/GstValidate-%{apiver}.gir`
		`%{_libdir}/libgstvalidate-default-overrides-1.0.so`

		`+ %files -n gst-debug-viewer`
		`+ %{_bindir}/gst-debug-viewer`
		`+ %{python3_sitelib}/GstDebugViewer/`
		`+ %{_datadir}/applications/org.freedesktop.GstDebugViewer.desktop`
		`+ %{_datadir}/gst-debug-viewer/`
		`+ %{_datadir}/icons/hicolor//apps/gst-debug-viewer.`
		`+ %{_metainfodir}/org.freedesktop.GstDebugViewer.appdata.xml`
		`+`
		`%changelog`
		`+ * Tue Nov 21 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 1.22.7-2`
		`+ - Use upstream source tarball`
		`+ - Add gst-debug-viewer`
		`+`
		`* Mon Nov 13 2023 Gwyn Ciesla <gwync@protonmail.com> - 1.22.7-1`
		`- 1.22.7`

sources

file modified

+1 -1

		`@@ -1,1 +1,1 @@`
		`- SHA512 (gst-devtools.tar.gz) = 7720b75bed837d6a4be0004a1f14a772ded5e20944aed08e604be4d4901238564b3fb37305ac720a0ceeeba3a7e058ac14c2ad007011b1cd58d925ccf6e05716`
		`+ SHA512 (gst-devtools-1.22.7.tar.xz) = 84c96242a87ad234313d349a62c02f9f551aa9c79bc3a9cd917625fea54cb9a608a34a6c691eeae9ff574a5be2b7e866e17ed20d580bf28ec3d76925c347de2f`

yselkowitz commented 6 months ago

The snapshot tarball was not updated from 1.22.5 to 1.22.7; using the upstream sources avoids such mistakes. Also, clean up unnecessary (post-)install scriplets. Finally, enable gst-debug-viewer as a separate subpackage.