commit 0dbc916580f499fca8970ef3e9e0ae6c67b3932d Author: Richard Shaw <hobbes1069(a)gmail.com&gt; Date: Wed Mar 27 14:48:57 2019 -0500 Update to 2.7.3 and apply upstream patches per user request. Fixes RFBZ#5208. .gitignore | 1 + avidemux-ffmpeg_gcc9.patch | 13 ---------- avidemux-qt.desktop | 9 ------- avidemux.spec | 51 ++++++++++----------------------------- rpmfusion-avidemux-qt.appdata.xml | 28 --------------------- sources | 2 +- 6 files changed, 15 insertions(+), 89 deletions(-) --- diff --git a/.gitignore b/.gitignore index a23558b..6eaa0b6 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ avidemux_2.6.10.tar.gz /avidemux_2.6.20.tar.gz /avidemux_2.7.0.tar.gz /avidemux_2.7.1.tar.gz +/avidemux_2.7.3.tar.gz diff --git a/avidemux.spec b/avidemux.spec index f90a2f0..2e85e70 100644 --- a/avidemux.spec +++ b/avidemux.spec @@ -4,16 +4,16 @@ %global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g') Name: avidemux -Version: 2.7.1 -Release: 12%{?dist} +Version: 2.7.3 +Release: 1%{?dist} Summary: Graphical video editing and transcoding tool License: GPLv2+ URL: http://www.avidemux.org Source0: http://downloads.sourceforge.net/%{name}/%{name}_%{version}.tar.gz -Source1: avidemux-qt.desktop -Source2: rpmfusion-avidemux-qt.appdata.xml -Source100: avidemux-ffmpeg_gcc9.patch + +Patch0: avidemux-2.7.3-ad_lav.patch +Patch1: avidemux-2.7.3-frame_matching.patch # Don't try to build on arm, aarch64 or ppc ExclusiveArch: i686 x86_64 @@ -59,7 +59,6 @@ BuildRequires: libogg-devel >= 1.1 BuildRequires: libvorbis-devel >= 1.0.1 BuildRequires: libdca-devel BuildRequires: opencore-amr-devel -BuildRequires: libvpx-devel BuildRequires: twolame-devel BuildRequires: opus-devel @@ -121,8 +120,6 @@ This package contains translation files for %{name}. %prep %autosetup -p1 -n %{name}_%{version} -# nvenc is retired in favor nv-codec-headers -sed -i -e 's@/usr/include/x86_64-linux-gnu@/usr/include/ffnvcodec@g' cmake/admCheckNvEnc.cmake # Remove sources of bundled libraries. rm -rf avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_liba52 \ @@ -130,11 +127,6 @@ rm -rf avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_liba52 \ avidemux_plugins/ADM_videoFilters6/ass/ADM_libass \ avidemux_plugins/ADM_muxers/muxerMp4v2/libmp4v2 -# Add patch to bundled ffmpeg for gcc 9 -# -install -pm 0644 %{SOURCE100} ./avidemux_core/ffmpeg_package/patches/libavutil_mem_h.patch - - %build # Build avidemux_core export LDFLAGS="-lc -Wl,--as-needed" @@ -230,31 +222,12 @@ rm -rf %{buildroot}%{_includedir}/%{name} # FFMpeg libraries are not being installed as executable. chmod +x %{buildroot}%{_libdir}/libADM6*.so.* -# INstall PNG file -mkdir -p %{buildroot}%{_datadir}/icons/%{name} -install -pm 0644 ./appImage/%{name}.png %{buildroot}%{_datadir}/icons/%{name}/ - -# Install desktop files -desktop-file-install --vendor rpmfusion \ - --set-icon=%{_datadir}/icons/%{name}/%{name}.png \ - --dir %{buildroot}%{_datadir}/applications \ - %{SOURCE1} - -# Install appdata file -mkdir -p %{buildroot}%{_datadir}/metainfo -install -pm 0644 %{SOURCE2} %{buildroot}%{_datadir}/metainfo/ - -# Install icons -install -pDm 0644 avidemux/gtk/ADM_userInterfaces/glade/main/avidemux_icon_small.png \ - %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/avidemux.png -install -pDm 0644 avidemux_icon.png \ - %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/avidemux.png - # Fix library permissions find %{buildroot}%{_libdir} -type f -name "*.so.*" -exec chmod 0755 {} \; %check +desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop appstream-util validate-relax --nonet \ %{buildroot}%{_datadir}/metainfo/*.appdata.xml @@ -267,7 +240,6 @@ appstream-util validate-relax --nonet \ %if 0%{?el7} %post /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : -/bin/touch --no-create %{_datadir}/icons/%{name} &>/dev/null || : /usr/bin/update-desktop-database &> /dev/null || : %postun @@ -309,10 +281,9 @@ fi %{_libdir}/libADM_openGLQT*.so %{_libdir}/libADM_UIQT*.so %{_libdir}/libADM_render6_QT5.so -%{_datadir}/applications/rpmfusion-avidemux-qt.desktop -%{_datadir}/metainfo/*.appdata.xml -%{_datadir}/icons/hicolor/*/apps/avidemux.png -%{_datadir}/icons/%{name}/ +%{_datadir}/applications/org.avidemux.Avidemux.desktop +%{_datadir}/metainfo/org.avidemux.Avidemux.appdata.xml +%{_datadir}/icons/hicolor/*/apps/org.avidemux.Avidemux.png # QT plugins %{_libdir}/ADM_plugins6/videoEncoders/qt5/ %{_libdir}/ADM_plugins6/videoFilters/qt5/ @@ -323,6 +294,10 @@ fi %changelog +* Wed Mar 27 2019 Richard Shaw <hobbes1069(a)gmail.com&gt; - 2.7.3-1 +- Update to 2.7.3 and apply upstream patches per user request. + Fixes RFBZ#5208. + * Wed Mar 13 2019 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 2.7.1-12 - Switch to nv-codec-headers diff --git a/sources b/sources index 9c39b52..1a2d61c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e3510c858c9371283551b1b4b67d288b avidemux_2.7.1.tar.gz +f01d2cfeda010b56ce0f1fb111201463 avidemux_2.7.3.tar.gz