commit 8b8a09ed27b163d5ac1b54611ab1a12f72119dd6 Author: Richard Shaw <hobbes1069(a)gmail.com&gt; Date: Sat Dec 31 15:57:47 2016 -0600 Update to the 2.6.15 release, rfbz#4344 avidemux-2.6.10-bundled_libs.patch | 167 ------------------------------------- avidemux-2.6.15-hwaccel.patch | 19 ----- avidemux.spec | 14 ++-- sources | 2 +- 4 files changed, 6 insertions(+), 196 deletions(-) --- diff --git a/avidemux.spec b/avidemux.spec index 8c97c8f..7b42a74 100644 --- a/avidemux.spec +++ b/avidemux.spec @@ -1,7 +1,7 @@ %global _pkgbuilddir %{_builddir}/%{name}_%{version} Name: avidemux -Version: 2.6.15 +Version: 2.6.16 Release: 1%{?dist} Summary: Graphical video editing and transcoding tool @@ -10,9 +10,7 @@ URL: http://www.avidemux.org Source0: http://downloads.sourceforge.net/%{name}/%{name}_%{version}.tar.gz Source1: avidemux-qt.desktop -Patch0: avidemux-2.6.10-bundled_libs.patch -Patch1: avidemux-2.6.15-hwaccel.patch -Patch2: avidemux-2.6.15-disable-vpx-decoder-plugin.patch +Patch0: avidemux-2.6.15-disable-vpx-decoder-plugin.patch # Don't try to build on arm ExcludeArch: %{arm} @@ -31,10 +29,9 @@ BuildRequires: yasm-devel BuildRequires: libxml2-devel >= 2.6.8 BuildRequires: fontconfig-devel BuildRequires: freetype-devel -BuildRequires: js-devel +BuildRequires: fribidi-devel BuildRequires: libXv-devel BuildRequires: libXmu-devel -BuildRequires: libsamplerate-devel BuildRequires: jack-audio-connection-kit-devel BuildRequires: libass-devel @@ -59,12 +56,13 @@ BuildRequires: libdca-devel BuildRequires: opencore-amr-devel BuildRequires: libvpx-devel BuildRequires: twolame-devel +BuildRequires: opus-devel # Video Codecs BuildRequires: xvidcore-devel >= 1.0.2 BuildRequires: x264-devel BuildRequires: x265-devel -BuildRequires: ffmpeg-devel +BuildRequires: nvenc-devel # Main package is a metapackage, bring in something useful. Requires: %{name}-gui = %{version}-%{release} @@ -118,8 +116,6 @@ This package contains translation files for %{name}. %prep %setup -q -n %{name}_%{version} %patch0 -p1 -%patch1 -p1 -%patch2 -p1 # Remove sources of bundled libraries. rm -rf avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_liba52 \ diff --git a/sources b/sources index c2fdee0..dd75077 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2a822d96548d9dca19c805d46be424fc avidemux_2.6.15.tar.gz +0d0df96cc9f165b4ebcd7bc7fe1d09ba avidemux_2.6.16.tar.gz