12:33 p.m.
commit c46fdc48726811732bf8553f801516a541f111ea
Author: Richard Shaw <hobbes1069(a)gmail.com>
Date: Tue Jul 7 07:33:05 2020 -0500
Update to 2.7.6.
.gitignore | 1 +
avidemux-2.7.6-external-libass.patch | 18 ++++++++++++++++++
avidemux.spec | 18 ++++++++++++------
sources | 2 +-
4 files changed, 32 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 96bab0f..4e1f5b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ avidemux_2.6.10.tar.gz
/avidemux_2.7.1.tar.gz
/avidemux_2.7.3.tar.gz
/avidemux_2.7.4.tar.gz
+/avidemux_2.7.6.tar.gz
diff --git a/avidemux-2.7.6-external-libass.patch b/avidemux-2.7.6-external-libass.patch
new file mode 100644
index 0000000..c080393
--- /dev/null
+++ b/avidemux-2.7.6-external-libass.patch
@@ -0,0 +1,18 @@
+commit a1d969d47a5d2e49a7c3a0a0b6c7e6ed9fd46622
+Author: eumagga0x2a <eumagga0x2a(a)users.noreply.github.com>
+Date: Sun Jul 5 23:21:25 2020 +0200
+
+ [ass] Use the right header when building with system libass
+
+diff --git a/avidemux_plugins/ADM_videoFilters6/ass/CMakeLists.txt
b/avidemux_plugins/ADM_videoFilters6/ass/CMakeLists.txt
+index af432d455..c2f31ef2b 100644
+--- a/avidemux_plugins/ADM_videoFilters6/ass/CMakeLists.txt
++++ b/avidemux_plugins/ADM_videoFilters6/ass/CMakeLists.txt
+@@ -16,6 +16,7 @@ IF ((USE_FREETYPE AND USE_FRIBIDI) OR MSVC)
+ MESSAGE(STATUS "Checking libass external lib ...")
+ PKG_CHECK_MODULES(LIBASS libass)
+ IF (LIBASS_FOUND)
++ ADD_DEFINITIONS("-DUSE_EXTERNAL_LIBASS")
+ ADD_DEFINITIONS(${LIBASS_CFLAGS})
+ SET(LIBASS_LIBRARIES ${LIBASS_LDFLAGS})
+ MESSAGE(STATUS " found, lib is ${LIBASS_LIBRARIES}")
diff --git a/avidemux.spec b/avidemux.spec
index 2c7da64..8e04c81 100644
--- a/avidemux.spec
+++ b/avidemux.spec
@@ -4,14 +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.4
-Release: 7%{?dist}
+Version: 2.7.6
+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
+Patch0: avidemux-2.7.6-external-libass.patch
+
# Don't try to build on arm, aarch64 or ppc
ExclusiveArch: i686 x86_64
@@ -34,8 +36,10 @@ BuildRequires: fribidi-devel
BuildRequires: libXv-devel
BuildRequires: libXmu-devel
BuildRequires: jack-audio-connection-kit-devel
+BuildRequires: libaom-devel
BuildRequires: libass-devel
BuildRequires: libmp4v2-devel
+BuildRequires: vapoursynth-devel
# Sound out
BuildRequires: alsa-lib-devel >= 1.0.3
@@ -49,7 +53,7 @@ BuildRequires: libva-devel
# Audio Codecs
BuildRequires: a52dec-devel >= 0.7.4
%{?_with_faac:BuildRequires: faac-devel >= 1.24}
-BuildRequires: faad2-devel >= 2.0
+%{?_with_fdk_aac:BuildRequires: fdk-aac-devel >= 0.1.6}
BuildRequires: lame-devel >= 3.96.1
BuildRequires: libmad-devel >= 0.15.1
BuildRequires: libogg-devel >= 1.1
@@ -169,7 +173,6 @@ rm -rf build_plugins_common && mkdir build_plugins_common
&& pushd build_plugins
-DUSE_EXTERNAL_MP4V2=TRUE \
../avidemux_plugins
%make_build V=1
-make install DESTDIR=%{_pkgbuilddir}/fakeRoot
popd
# Build avidemux_plugins_cli
@@ -185,7 +188,6 @@ rm -rf build_plugins_cli && mkdir build_plugins_cli &&
pushd build_plugins_cli
-DUSE_EXTERNAL_MP4V2=TRUE \
../avidemux_plugins
%make_build V=1
-make install DESTDIR=%{_pkgbuilddir}/fakeRoot
popd
# Build avidemux_plugins_qt5
@@ -201,7 +203,6 @@ rm -rf build_plugins_qt5 && mkdir build_plugins_qt5 &&
pushd build_plugins_qt5
-DUSE_EXTERNAL_MP4V2=TRUE \
../avidemux_plugins
%make_build V=1
-make install DESTDIR=%{_pkgbuilddir}/fakeRoot
popd
@@ -269,12 +270,14 @@ fi
%files cli -f build_plugins_cli/install_manifest.txt
%{_bindir}/avidemux3_cli
+%{_bindir}/vsProxy
%{_libdir}/libADM_UI_Cli*.so
%{_libdir}/libADM_render6_cli.so
%files qt
%{_bindir}/avidemux3_qt5
%{_bindir}/avidemux3_jobs_qt5
+%{_bindir}/vsProxy_gui_qt5
%{_libdir}/libADM_openGLQT*.so
%{_libdir}/libADM_UIQT*.so
%{_libdir}/libADM_render6_QT5.so
@@ -291,6 +294,9 @@ fi
%changelog
+* Tue Jul 7 2020 Richard Shaw <hobbes1069(a)gmail.com> - 2.7.6-1
+- Update to 2.7.6.
+
* Tue Jul 07 2020 Sérgio Basto <sergio(a)serjux.com> - 2.7.4-7
- Mass rebuild for x264
diff --git a/sources b/sources
index b0a8988..b243a08 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-87b4dd1ef3a1f695b3d0f9971da8abde avidemux_2.7.4.tar.gz
+SHA512 (avidemux_2.7.6.tar.gz) =
7f40b48a6c688a5a847e46118aef822a0f5f1dfb50b6223ce8a825d9e3817a9114bc3400aa7b7286a495051912b4b54cf1b86ea7064e6164f7ca7455e5a714ee