commit 623cb87258b5d3f2bdace3db9cbb1c392b6f9a16 Author: Sérgio M. Basto <sergio(a)serjux.com&gt; Date: Sun Dec 19 01:24:51 2021 +0000 Update to 0.7.3 .gitignore | 1 + dvbcut-appicon.patch | 13 +++++ dvbcut-locale.patch | 14 +++++ dvbcut-use_pkgconfig.patch | 43 +++++++++++++++ dvbcut.spec | 127 +++++++++++++++++---------------------------- sources | 2 +- 6 files changed, 119 insertions(+), 81 deletions(-) --- diff --git a/.gitignore b/.gitignore index 112f430..96608ff 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ dvbcut-svn179.tar.bz2 +/dvbcut-0.7.3.tar.gz diff --git a/dvbcut-appicon.patch b/dvbcut-appicon.patch new file mode 100644 index 0000000..c99ead6 --- /dev/null +++ b/dvbcut-appicon.patch @@ -0,0 +1,13 @@ +Index: dvbcut-deb-0.7.3/dvbcut.desktop.in +=================================================================== +--- dvbcut-deb-0.7.3.orig/dvbcut.desktop.in ++++ dvbcut-deb-0.7.3/dvbcut.desktop.in +@@ -7,7 +7,7 @@ GenericName[de]=DVB-Schnittprogramm für + NoDisplay=false + Comment=Trim and cut video MPEG2 transport streams into multiple export formats + Comment[de]=Kürze und schneide MPEG Tranport Ströme in verschiedene Exportformate +-Icon=@prefix(a)/share/dvbcut/icons/dvbcut.svg ++Icon=dvbcut + TryExec=@prefix@/bin/dvbcut + Exec=@prefix@/bin/dvbcut %F + Terminal=false diff --git a/dvbcut-locale.patch b/dvbcut-locale.patch new file mode 100644 index 0000000..c26be70 --- /dev/null +++ b/dvbcut-locale.patch @@ -0,0 +1,14 @@ +Index: dvbcut-deb-0.7.2/src/Makefile.in +=================================================================== +--- dvbcut-deb-0.7.2.orig/src/Makefile.in ++++ dvbcut-deb-0.7.2/src/Makefile.in +@@ -104,6 +104,9 @@ check: + + install: all installdirs + $(INSTALL_PROGRAM) dvbcut$(EXEEXT) $(DESTDIR)$(bindir) ++ $(INSTALL_DATA) dvbcut.qm $(DESTDIR)$(helpdir) ++ $(INSTALL_DATA) dvbcut_cs.qm $(DESTDIR)$(helpdir) ++ $(INSTALL_DATA) dvbcut_de.qm $(DESTDIR)$(helpdir) + $(INSTALL_DATA) dvbcut_cs.html $(DESTDIR)$(helpdir) + $(INSTALL_DATA) dvbcut_en.html $(DESTDIR)$(helpdir) + $(INSTALL_DATA) dvbcut_de.html $(DESTDIR)$(helpdir) diff --git a/dvbcut-use_pkgconfig.patch b/dvbcut-use_pkgconfig.patch new file mode 100644 index 0000000..6bd50f3 --- /dev/null +++ b/dvbcut-use_pkgconfig.patch @@ -0,0 +1,43 @@ +Index: dvbcut-deb-0.7.2/configure.ac +=================================================================== +--- dvbcut-deb-0.7.2.orig/configure.ac ++++ dvbcut-deb-0.7.2/configure.ac +@@ -43,12 +43,35 @@ done + + dnl Checks for libraries. + +-FFMPEG_LIBS='-lavformat -lavcodec -lavutil' + AC_SUBST(FFMPEG_LIBS) + ++AC_CHECK_LIB(avformat, main, ++ [HAVE_FFMPEG="yes"], ++ [AC_MSG_ERROR([libavformat library not found])]) ++ ++AC_CHECK_LIB(avcodec, main, ++ [HAVE_FFMPEG="yes"], ++ [AC_MSG_ERROR([libavcodec library not found])]) ++ ++AC_CHECK_LIB(avutil, main, ++ [HAVE_FFMPEG="yes"], ++ [AC_MSG_ERROR([libavutil library not found])]) ++ + AC_CHECK_LIB(swscale, main, +- [AC_DEFINE(HAVE_LIB_SWSCALE, 1, [Define this if you have libswscale.]) +- FFMPEG_LIBS="$FFMPEG_LIBS -lswscale"]) ++ [HAVE_SWSCALE="yes"], ++ [AC_MSG_ERROR([libswscale library not found])]) ++ ++if test "x$HAVE_FFMPEG" = "xyes"; then ++ FFMPEG_LIBS="`$PKG_CONFIG --libs libavformat libavcodec libavutil`" ++ CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags libavformat libavcodec libavutil`" ++ if test "x$HAVE_SWSCALE" = "xyes"; then ++ AC_DEFINE(HAVE_LIB_SWSCALE, 1, [Define this if you have libswscale.]) ++ FFMPEG_LIBS="$FFMPEG_LIBS `$PKG_CONFIG --libs libswscale`" ++ CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags libswscale`" ++ fi ++else ++ AC_MSG_ERROR([cannot find ffmpeg libraries]) ++fi + + AC_CHECK_LIB(mad, mad_decoder_init, + [AC_DEFINE(HAVE_LIB_MAD, 1, [Define this if you have libmad.]) diff --git a/dvbcut.spec b/dvbcut.spec index 2f1adfe..a06b4ed 100644 --- a/dvbcut.spec +++ b/dvbcut.spec @@ -1,124 +1,89 @@ %define svnrev 179 Name: dvbcut -Version: 0.6.1 -Release: 37.svn%{svnrev}%{?dist} +Version: 0.7.3 +Release: 1%{?dist} Summary: Clip and convert DVB transport streams to MPEG2 program streams Group: Applications/Multimedia License: GPLv2+ and LGPLv2 -URL: http://dvbcut.sourceforge.net/ -# fixes were committed to svn since release, so using svn checkout for latest fixes: -# original upstream archive location: -#Source0: http://downloads.sourceforge.net/dvbcut/dvbcut_% {version}.tar.bz2 # current upstream release location: -#Source0: http://www.mr511.de/dvbcut/dvbcut-0.6.1.tar.gz +URL: https://github.com/bernhardu/dvbcut-deb # use sh dvbcut-snapshot.sh to create the archive -Source0: %{name}-svn%{svnrev}.tar.bz2 -# This desktop file was created by hand. -Source5: %{name}-snapshot.sh -Source6: %{name}-servicemenu.desktop -# helpfile is placed in /usr/share/help. Look for it under /usr/share/dvbcut instead -Patch0: %{name}-fix-help-path.patch -Patch1: %{name}-svn176-fix-make-install.patch -Patch2: %{name}-svn176-fix-help-install-path.patch -Patch3: %{name}-svn176-desktop-additions.patch -Patch6: %{name}-179-vs-ubuntu-12.04.diff -Patch7: %{name}-svn179-ffmpeg-0.11.1.patch -Patch8: %{name}-svn179-ffmpeg-2.0-compatibility.patch -Patch9: %{name}-svn179-ffmpeg-2.4.3-compatibility.patch -Patch10: %{name}-svn179-ffmpeg-3.0.3-compatibility.patch -Patch11: ffmpeg35_buildfix.patch +Source0: https://github.com/bernhardu/dvbcut-deb/archive/v%{version}/%{name}-%{ver... +# PATCH-FIX-OPENSUSE dvbcut-use_pkgconfig.patch aloisio(a)gmx.com -- use pkgconfig for ffmpeg libraries +Patch1: dvbcut-use_pkgconfig.patch +# PATCH-FIX-OPENSUSE dvbcut-appicon-patch aloisio(a)gmx.com -- install icon in the proper path +Patch3: dvbcut-appicon.patch +# PATCH-FIX-OPENSUSE dvbcut-locale.patch aloisio(a)gmx.com -- also install .qm locale files +Patch4: dvbcut-locale.patch BuildRequires: autoconf +BuildRequires: libtool BuildRequires: gcc-c++ -BuildRequires: qt3-devel -BuildRequires: libao-devel -BuildRequires: a52dec-devel +BuildRequires: libao-devel +BuildRequires: a52dec-devel +BuildRequires: hicolor-icon-theme +BuildRequires: qt5-linguist +BuildRequires: pkgconfig +BuildRequires: pkgconfig(Qt5Core) +BuildRequires: pkgconfig(Qt5Gui) +BuildRequires: pkgconfig(Qt5Widgets) +BuildRequires: pkgconfig(Qt5Xml) +BuildRequires: pkgconfig(ao) BuildRequires: libmad-devel BuildRequires: ffmpeg-devel BuildRequires: desktop-file-utils -BuildRequires: kde-filesystem Requires: hicolor-icon-theme # mplayer not actually required, but much better with it. Requires: mplayer -Requires: kde-filesystem + %description -dvbcut is a Qt application that allows you to select certain parts of an MPEG +DVBcut is a Qt application that allows you to select certain parts of an MPEG transport stream (as received via Digital Video Broadcasting, DVB) and save these parts into a single MPEG output file. It follows a "keyhole surgery" approach where the input video and audio data is mostly kept unchanged, and -only very few frames at the beginning and/or end of the selected range are +only very few frames at the beginning and/or end of the selected range are re-encoded in order to obtain a valid MPEG file. For MPEG video playback dvbcut can use Mplayer if available. %prep -# for release archive -#%#setup -q -# for svn tag -%setup -q -n %{name}-svn%{svnrev} -%patch0 -b .fix-help-path -%patch1 -b .fix-make-install -%patch2 -b .fix-help-install -%patch3 -b .desktop-improvements -%patch6 -b .ubuntu -%patch7 -p1 -b .ffmpeg-0.11.1 -%patch8 -b .ffmpeg-2.0 -%patch9 -p1 -b .ffmpeg-2.4.3 -%patch10 -p1 -b .ffmpeg-3.0.3 -%patch11 -p1 -b .ffmpeg35 - -# Fix QTDIR libs in configure -sed -i 's,$QTDIR/$mr_libdirname,$QTDIR/lib,' configure.in - -# Avoid stripping binaries -sed -i 's,$(STRIP) $(topdir)/bin/dvbcut$(EXEEXT),,' src/Makefile.in - -# don't try to make Debian and ffmpeg files that have been stripped -sed -i '/debian/d' DISTFILES -sed -i '/ffmpeg.src/d' DISTFILES - -# fix desktop file -sed -i -e &#39;s|@prefix(a)/share/dvbcut/icons/dvbcut.svg|dvbcut|g&#39; dvbcut.desktop.in +%setup -q -n %{name}-deb-%{version} +%patch1 -p1 +%patch3 -p1 +%patch4 -p1 %build -unset QTDIR || : ; . /etc/profile.d/qt.sh -autoconf -%configure --with-ffmpeg=%{_prefix} \ - --with-ffmpeg-include=%{_includedir}/ffmpeg - helpdir=%{_datadir}/%{name} - -# It does not compile with smp_mflags -make +autoreconf -i +%configure + +%make_build %install %make_install -mkdir -p %{buildroot}%{_datadir}/applications -desktop-file-install --vendor="" \ - --dir %{buildroot}%{_datadir}/applications dvbcut.desktop -mkdir -p %{buildroot}%{_kde4_datadir}/kde4/services/ -cp %{SOURCE6} %{buildroot}%{_kde4_datadir}/kde4/services/ +%post +touch --no-create %{_datadir}/icons/hicolor || : +if [ -x %{_bindir}/gtk-update-icon-cache ]; then + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +fi +update-desktop-database &> /dev/null || : -%post -/usr/bin/update-desktop-database &> /dev/null || : -/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : %postun -/usr/bin/update-desktop-database &> /dev/null || : -if [ $1 -eq 0 ] ; then - /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null - /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : +touch --no-create %{_datadir}/icons/hicolor || : +if [ -x %{_bindir}/gtk-update-icon-cache ]; then + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi -%posttrans -/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : +update-desktop-database &> /dev/null || : + %files %doc ChangeLog CREDITS README README.icons @@ -127,12 +92,14 @@ fi %{_mandir}/man1/%{name}.1.gz %{_datadir}/applications/*.desktop %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg -%{_datadir}/%{name}/dvbcut_*.html -%{_kde4_datadir}/kde4/services/*.desktop +%{_datadir}/%{name} %{_datadir}/mime/packages/dvbcut.xml %changelog +* Sun Dec 19 2021 Sérgio Basto <sergio(a)serjux.com&gt; - 0.7.3-1 +- Update to 0.7.3 + * Thu Nov 11 2021 Leigh Scott <leigh123linux(a)gmail.com&gt; - 0.6.1-37.svn179 - Rebuilt for new ffmpeg snapshot diff --git a/sources b/sources index 947f4bb..6a70af9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -467975975bc7bf6abcb559449e776654 dvbcut-svn179.tar.bz2 +SHA512 (dvbcut-0.7.3.tar.gz) = 9473bc4d8dcd16f44ed25e586aacff6467a7b0530c3613a6f856d21cb2767991187a405b63a0ac4f4a130eaf0e7cd4697b440a57f29142186ff08fe923cd4580