Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package dvbcut for openSUSE:Factory checked in at 2024-02-18 20:23:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dvbcut (Old) and /work/SRC/openSUSE:Factory/.dvbcut.new.1815 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dvbcut" Sun Feb 18 20:23:28 2024 rev:5 rq:1147181 version:0.7.4 Changes: -------- --- /work/SRC/openSUSE:Factory/dvbcut/dvbcut.changes 2023-08-23 14:59:23.494180794 +0200 +++ /work/SRC/openSUSE:Factory/.dvbcut.new.1815/dvbcut.changes 2024-02-18 20:23:43.491213025 +0100 @@ -1,0 +2,13 @@ +Fri Feb 16 19:33:21 UTC 2024 - Luigi Baldoni <[email protected]> + +- Use cleaner package version detection method + +------------------------------------------------------------------- +Fri Feb 16 13:52:53 UTC 2024 - Luigi Baldoni <[email protected]> + +- Reintroduce modified dvbcut-a52.patch to build against liba52 + 0.7.x +- Add dvbcut-autoconf269.patch +- Have Leap also build against ffmpeg 5 + +------------------------------------------------------------------- New: ---- dvbcut-a52.patch dvbcut-autoconf269.patch BETA DEBUG BEGIN: New: - Reintroduce modified dvbcut-a52.patch to build against liba52 0.7.x New: 0.7.x - Add dvbcut-autoconf269.patch - Have Leap also build against ffmpeg 5 BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dvbcut.spec ++++++ --- /var/tmp/diff_new_pack.N8jdHO/_old 2024-02-18 20:23:43.927228760 +0100 +++ /var/tmp/diff_new_pack.N8jdHO/_new 2024-02-18 20:23:43.931228904 +0100 @@ -1,7 +1,7 @@ # # spec file for package dvbcut # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,11 +26,15 @@ Source0: https://github.com/bernhardu/dvbcut-deb/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz # PATCH-FIX-OPENSUSE dvbcut-use_pkgconfig.patch [email protected] -- use pkgconfig for ffmpeg libraries Patch1: dvbcut-use_pkgconfig.patch +# PATCH-FIX-OPENSUSE dvbcut-a52.patch [email protected] -- Support new version of liba52 +Patch2: dvbcut-a52.patch # PATCH-FIX-OPENSUSE dvbcut-appicon-patch [email protected] -- install icon in the proper path Patch3: dvbcut-appicon.patch # PATCH-FIX-OPENSUSE dvbcut-locale.patch [email protected] -- also install .qm locale files Patch4: dvbcut-locale.patch -BuildRequires: autoconf >= 2.71 +# PATCH-FIX-OPENSUSE dvbcut-autoconf269.patch [email protected] -- autoconf 2.71 is not really necessary +Patch5: dvbcut-autoconf269.patch +BuildRequires: autoconf >= 2.69 BuildRequires: fdupes BuildRequires: hicolor-icon-theme BuildRequires: libqt5-linguist @@ -42,17 +46,10 @@ BuildRequires: pkgconfig(Qt5Xml) BuildRequires: pkgconfig(ao) BuildRequires: pkgconfig(liba52) -%if 0%{?suse_version} > 1500 BuildRequires: pkgconfig(libavcodec) >= 58.7.100 BuildRequires: pkgconfig(libavformat) >= 58.0.102 BuildRequires: pkgconfig(libavutil) >= 56.6.100 BuildRequires: pkgconfig(libswscale) >= 5.0.101 -%else -BuildRequires: pkgconfig(libavcodec) = 57.107.100 -BuildRequires: pkgconfig(libavfilter) = 6.107.100 -BuildRequires: pkgconfig(libavformat) = 57.83.100 -BuildRequires: pkgconfig(libavutil) = 55.78.100 -%endif BuildRequires: pkgconfig(mad) %description @@ -67,7 +64,10 @@ %autosetup -p1 -n %{name}-deb-%{version} %build -export CXXFLAGS="-std=c++11 %{optflags}" +%if %{pkg_vcmp liba52 <= 0.7.9} +EXTRA_CXXFLAGS="-DLIBA52_07" +%endif +export CXXFLAGS="-std=c++11 %{optflags} $EXTRA_CXXFLAGS" export CPPFLAGS=-DDVBCUT_VERSION=\\\"%{version}\\\" autoreconf -fiv %configure ++++++ dvbcut-a52.patch ++++++ Index: dvbcut-deb-0.7.4/src/playaudio.cpp =================================================================== --- dvbcut-deb-0.7.4.orig/src/playaudio.cpp +++ dvbcut-deb-0.7.4/src/playaudio.cpp @@ -80,7 +80,9 @@ public: extern "C" { #include <a52dec/a52.h> +#ifndef LIBA52_07 #include <a52dec/mm_accel.h> +#endif } /// Simple class for AC3 decoding @@ -91,7 +93,11 @@ protected: public: a52dec() : m_state(0) { +#ifdef LIBA52_07 + m_state=a52_init(); +#else m_state=a52_init(MM_ACCEL_DJBFFT); +#endif if (not m_state) throw dvbcut_exception("Error setting up AC3 decoder"); ++++++ dvbcut-autoconf269.patch ++++++ Index: dvbcut-deb-0.7.4/configure.ac =================================================================== --- dvbcut-deb-0.7.4.orig/configure.ac +++ dvbcut-deb-0.7.4/configure.ac @@ -7,7 +7,7 @@ AC_INIT AC_CONFIG_SRCDIR([src/dvbcut.cpp]) -AC_PREREQ([2.71]) +AC_PREREQ([2.69]) AC_CANONICAL_BUILD
