From 2ac0085990950a738c6dc8588e14f5e347b94640 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Nov 21 2023 21:42:11 +0000 Subject: [PATCH 1/3] Use upstream source tarball --- diff --git a/.gitignore b/.gitignore index 75eff55..ecc7901 100644 --- a/.gitignore +++ b/.gitignore @@ -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 diff --git a/gst-devtools.spec b/gst-devtools.spec index 8d1c68b..1317b2e 100644 --- a/gst-devtools.spec +++ b/gst-devtools.spec @@ -2,14 +2,12 @@ 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 BuildRequires: meson BuildRequires: pkgconfig(gobject-2.0) @@ -34,7 +32,7 @@ Requires: gstreamer1-devel%{?_isa} %{summary}. %prep -%autosetup -n %{name} +%autosetup %build %meson -D doc=disabled @@ -75,6 +73,9 @@ sed -i "s/env\ //g" %{buildroot}%{_bindir}/gst-validate-launcher %{_libdir}/libgstvalidate-default-overrides-1.0.so %changelog +* Tue Nov 21 2023 Yaakov Selkowitz - 1.22.7-2 +- Use upstream source tarball + * Mon Nov 13 2023 Gwyn Ciesla - 1.22.7-1 - 1.22.7 diff --git a/sources b/sources index b2eb784..566f98f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gst-devtools.tar.gz) = 7720b75bed837d6a4be0004a1f14a772ded5e20944aed08e604be4d4901238564b3fb37305ac720a0ceeeba3a7e058ac14c2ad007011b1cd58d925ccf6e05716 +SHA512 (gst-devtools-1.22.7.tar.xz) = 84c96242a87ad234313d349a62c02f9f551aa9c79bc3a9cd917625fea54cb9a608a34a6c691eeae9ff574a5be2b7e866e17ed20d580bf28ec3d76925c347de2f From 5445d70a78331ec9963a9fffbf6c2630d6f1707e Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Nov 21 2023 21:47:02 +0000 Subject: [PATCH 2/3] Cleanup spec Script and module shebangs are automatically handled by BRP scripts. %ldconfig_scriplets is only needed for RHEL 7 and earlier. --- diff --git a/gst-devtools.spec b/gst-devtools.spec index 1317b2e..562e696 100644 --- a/gst-devtools.spec +++ b/gst-devtools.spec @@ -41,16 +41,6 @@ Requires: gstreamer1-devel%{?_isa} %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 From e1c9d20f89d0906f7a30e10c33de3f3aeb44c53b Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Nov 21 2023 21:50:52 +0000 Subject: [PATCH 3/3] Add gst-debug-viewer --- diff --git a/5027.patch b/5027.patch new file mode 100644 index 0000000..a4da460 --- /dev/null +++ b/5027.patch @@ -0,0 +1,28 @@ +From 98217f1892ea2472e1c0456bf4c407daf7e28ca2 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= +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: +--- + .../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 + diff --git a/gst-devtools.spec b/gst-devtools.spec index 562e696..96d99b9 100644 --- a/gst-devtools.spec +++ b/gst-devtools.spec @@ -9,6 +9,9 @@ License: LGPL-2.0-or-later URL: https://gstreamer.freedesktop.org/src/gst-devtools 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) BuildRequires: pkgconfig(glib-2.0) @@ -31,11 +34,21 @@ Requires: gstreamer1-devel%{?_isa} %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 +%autosetup -p3 %build -%meson -D doc=disabled +%meson -D doc=disabled -D debug_viewer=enabled %meson_build %install @@ -62,9 +75,18 @@ Requires: gstreamer1-devel%{?_isa} %{_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 - 1.22.7-2 - Use upstream source tarball +- Add gst-debug-viewer * Mon Nov 13 2023 Gwyn Ciesla - 1.22.7-1 - 1.22.7