commit f26d4e98dc466e95e52ba6a1bc1c270b3dd7b576 Author: Sérgio M. Basto <sergio(a)serjux.com&gt; Date: Tue Nov 22 03:28:43 2016 +0000 Update to the 2.6.15 release, rfbz#4344 .gitignore | 1 + avidemux-2.6.10-bundled_libs.patch | 211 +++++++++++----------- avidemux-2.6.10-qt5_lrelease.patch | 39 ---- avidemux-2.6.12-gcc6.patch | 218 ----------------------- avidemux-2.6.12-narrowing.patch | 23 --- avidemux-2.6.12-qt.patch | 74 -------- avidemux-2.6.15-disable-vpx-decoder-plugin.patch | 7 + avidemux-2.6.15-hwaccel.patch | 19 ++ avidemux-qt.desktop | 2 +- avidemux.spec | 69 ++++--- sources | 2 +- 11 files changed, 167 insertions(+), 498 deletions(-) --- diff --git a/.gitignore b/.gitignore index e1804eb..8813633 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ avidemux_2.6.10.tar.gz /avidemux_2.6.12.tar.gz +/avidemux_2.6.15.tar.gz diff --git a/avidemux-2.6.10-bundled_libs.patch b/avidemux-2.6.10-bundled_libs.patch index 3223b2f..fda1d75 100644 --- a/avidemux-2.6.10-bundled_libs.patch +++ b/avidemux-2.6.10-bundled_libs.patch @@ -1,82 +1,20 @@ ---- a/avidemux_plugins/CMakeLists.txt -+++ b/avidemux_plugins/CMakeLists.txt -@@ -37,6 +37,40 @@ include(admCoreIncludes) - LINK_DIRECTORIES("${AVIDEMUX_SEARCH_LIB_DIR}") - INCLUDE_DIRECTORIES("${AVIDEMUX_SEARCH_INCLUDE_DIR}/avidemux/2.6") +diff --git a/avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_ad_a52.cpp b/avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_ad_a52.cpp +index 6eddc3a..539405a 100644 +--- a/avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_ad_a52.cpp ++++ b/avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_ad_a52.cpp +@@ -18,8 +18,8 @@ + #include "ADM_ad_plugin.h" -+######################################### -+# Unbundle some libraries here -+######################################### -+OPTION(USE_EXTERNAL_LIBASS "Use system installed libass library." OFF) -+OPTION(USE_EXTERNAL_LIBMAD "Use system installed libmad library." OFF) -+OPTION(USE_EXTERNAL_LIBA52 "Use system installed liba52 library." OFF) -+OPTION(USE_EXTERNAL_LIBTWOLAME "Use system installed libtwolame library." OFF) -+ -+INCLUDE(FindPkgConfig) -+ -+# libass -+IF(USE_EXTERNAL_LIBASS) -+ PKG_CHECK_MODULES(LIBASS REQUIRED libass) -+ INCLUDE_DIRECTORIES(SYSTEM ${LIBASS_INCLUDE_DIRS}) -+ENDIF() -+ -+# libmad -+IF(USE_EXTERNAL_LIBMAD) -+ PKG_CHECK_MODULES(LIBMAD REQUIRED mad) -+ INCLUDE_DIRECTORIES(SYSTEM ${LIBMAD_INCLUDE_DIRS}) -+ENDIF() -+ -+# liba52 -+IF(USE_EXTERNAL_LIBA52) -+ FIND_PATH(LIBA52_INCLUDE_DIR a52dec/a52.h) -+ FIND_LIBRARY(LIBA52_LIBRARIES a52) -+ INCLUDE_DIRECTORIES(SYSTEM ${LIBA52_INCLUDE_DIR}) -+ENDIF() -+ -+# twolame -+IF(USE_EXTERNAL_TWOLAME) -+ PKG_CHECK_MODULES(LIBTWOLAME REQUIRED twolame) -+ INCLUDE_DIRECTORIES(SYSTEM ${LIBTWOLAME_INCLUDE_DIRS}) -+ENDIF() + extern "C" { +-#include "ADM_liba52/a52.h" +-#include "ADM_liba52/mm_accel.h" ++#include "a52dec/a52.h" ++#include "a52dec/mm_accel.h" + }; - IF (FRESH_BUILD) - MESSAGE("") ---- a/avidemux_plugins/ADM_videoFilters6/ass/CMakeLists.txt -+++ b/avidemux_plugins/ADM_videoFilters6/ass/CMakeLists.txt -@@ -4,7 +4,6 @@ checkFreeType() - checkFridibi("0.19") - - IF (USE_FREETYPE AND USE_FRIDIBI) -- ADD_SUBDIRECTORY(ADM_libass) - - INCLUDE(vf_plugin) - SET(ADM_vf_ssa_SRCS ADM_vidASS.cpp) -@@ -12,7 +11,15 @@ IF (USE_FREETYPE AND USE_FRIDIBI) - ADD_VIDEO_FILTER(ADM_vf_ssa ${ADM_vf_ssa_SRCS}) - - IF(DO_COMMON) -- TARGET_LINK_LIBRARIES(ADM_vf_ssa ADM_libass ${FREETYPE2_LDFLAGS} ${FRIDIBI_LDFLAGS} ADM_coreSubtitle) -+# TARGET_LINK_LIBRARIES(ADM_vf_ssa ADM_libass ${FREETYPE2_LDFLAGS} ${FRIDIBI_LDFLAGS} ADM_coreSubtitle) -+ IF(USE_EXTERNAL_LIBASS) -+ TARGET_LINK_LIBRARIES(ADM_vf_ssa ${LIBASS_LIBRARIES} -+ ${FREETYPE2_LDFLAGS} ADM_coreSubtitle) -+ ELSE(USE_EXTERNAL_LIBASS) -+ ADD_SUBDIRECTORY(ADM_libass) -+ TARGET_LINK_LIBRARIES(ADM_vf_ssa ADM_libass -+ ${FREETYPE2_LDFLAGS} ADM_coreSubtitle) -+ ENDIF(USE_EXTERNAL_LIBASS) - # We force the use of fontconfig - ADD_DEFINITIONS("-DUSE_FONTCONFIG") - TARGET_LINK_LIBRARIES(ADM_vf_ssa ${FONTCONFIG_LDFLAGS}) ---- a/avidemux_plugins/ADM_videoFilters6/CMakeLists.txt -+++ b/avidemux_plugins/ADM_videoFilters6/CMakeLists.txt -@@ -1,6 +1,5 @@ - ADD_SUBDIRECTORY(addBorder) - ADD_SUBDIRECTORY(asharp) --ADD_SUBDIRECTORY(ass) - ADD_SUBDIRECTORY(avsfilter) - ADD_SUBDIRECTORY(black) - ADD_SUBDIRECTORY(blackenBorder) + #define AC3_HANDLE ((a52_state_t *)ac3_handle) +diff --git a/avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/CMakeLists.txt b/avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/CMakeLists.txt +index 04fbdc6..f769ded 100644 --- a/avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/CMakeLists.txt +++ b/avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/CMakeLists.txt @@ -1,11 +1,18 @@ @@ -100,10 +38,25 @@ INIT_AUDIO_PLUGIN(ADM_ad_a52) INSTALL_AUDIODECODER(ADM_ad_a52) +diff --git a/avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_ad_mad.cpp b/avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_ad_mad.cpp +index 171b413..5bddd56 100644 +--- a/avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_ad_mad.cpp ++++ b/avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_ad_mad.cpp +@@ -16,7 +16,7 @@ + ***************************************************************************/ + #include "ADM_default.h" + #include "ADM_ad_plugin.h" +-#include "ADM_libMad/mad.h" ++#include "mad.h" + + #define Stream ((mad_stream *)_stream) + #define Frame ((mad_frame *)_frame) +diff --git a/avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/CMakeLists.txt b/avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/CMakeLists.txt +index e7e91e8..fa9ec90 100644 --- a/avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/CMakeLists.txt +++ b/avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/CMakeLists.txt -@@ -8,13 +8,20 @@ ELSEIF (ADM_CPU_PPC) - ADD_DEFINITIONS("-DFPM_PPC") +@@ -10,13 +10,20 @@ ELSEIF (ADM_CPU_ARMEL) + ADD_DEFINITIONS("-DFPM_ARM") ENDIF (ADM_CPU_X86_32) -ADD_SUBDIRECTORY(ADM_libMad) @@ -125,30 +78,8 @@ INIT_AUDIO_PLUGIN(ADM_ad_Mad) INSTALL_AUDIODECODER(ADM_ad_Mad) ---- a/avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_ad_a52.cpp -+++ b/avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_ad_a52.cpp -@@ -18,8 +18,8 @@ - #include "ADM_ad_plugin.h" - - extern "C" { --#include "ADM_liba52/a52.h" --#include "ADM_liba52/mm_accel.h" -+#include "a52dec/a52.h" -+#include "a52dec/mm_accel.h" - }; - - #define AC3_HANDLE ((a52_state_t *)ac3_handle) ---- a/avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_ad_mad.cpp -+++ b/avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_ad_mad.cpp -@@ -16,7 +16,7 @@ - ***************************************************************************/ - #include "ADM_default.h" - #include "ADM_ad_plugin.h" --#include "ADM_libMad/mad.h" -+#include "mad.h" - - #define Stream ((mad_stream *)_stream) - #define Frame ((mad_frame *)_frame) +diff --git a/avidemux_plugins/ADM_videoFilters6/ass/ADM_vidASS.cpp b/avidemux_plugins/ADM_videoFilters6/ass/ADM_vidASS.cpp +index baadf0c..9ad93cd 100644 --- a/avidemux_plugins/ADM_videoFilters6/ass/ADM_vidASS.cpp +++ b/avidemux_plugins/ADM_videoFilters6/ass/ADM_vidASS.cpp @@ -24,7 +24,7 @@ @@ -160,3 +91,77 @@ } /** +diff --git a/avidemux_plugins/ADM_videoFilters6/ass/CMakeLists.txt b/avidemux_plugins/ADM_videoFilters6/ass/CMakeLists.txt +index f793fe0..d49efc4 100644 +--- a/avidemux_plugins/ADM_videoFilters6/ass/CMakeLists.txt ++++ b/avidemux_plugins/ADM_videoFilters6/ass/CMakeLists.txt +@@ -5,7 +5,6 @@ checkFreeType() + checkFridibi("0.19") + + IF (USE_FREETYPE AND USE_FRIDIBI) +- ADD_SUBDIRECTORY(ADM_libass) + + INCLUDE(vf_plugin) + SET(ADM_vf_ssa_SRCS ADM_vidASS.cpp) +@@ -13,7 +12,15 @@ IF (USE_FREETYPE AND USE_FRIDIBI) + ADD_VIDEO_FILTER(ADM_vf_ssa ${ADM_vf_ssa_SRCS}) + + IF(DO_COMMON) +- TARGET_LINK_LIBRARIES(ADM_vf_ssa ADM_libass ${FREETYPE2_LDFLAGS} ${FRIDIBI_LDFLAGS} ADM_coreSubtitle) ++# TARGET_LINK_LIBRARIES(ADM_vf_ssa ADM_libass ${FREETYPE2_LDFLAGS} ${FRIDIBI_LDFLAGS} ADM_coreSubtitle) ++ IF(USE_EXTERNAL_LIBASS) ++ TARGET_LINK_LIBRARIES(ADM_vf_ssa ${LIBASS_LIBRARIES} ++ ${FREETYPE2_LDFLAGS} ADM_coreSubtitle) ++ ELSE(USE_EXTERNAL_LIBASS) ++ ADD_SUBDIRECTORY(ADM_libass) ++ TARGET_LINK_LIBRARIES(ADM_vf_ssa ADM_libass ++ ${FREETYPE2_LDFLAGS} ADM_coreSubtitle) ++ ENDIF(USE_EXTERNAL_LIBASS) + # We force the use of fontconfig + ADD_DEFINITIONS("-DUSE_FONTCONFIG") + TARGET_LINK_LIBRARIES(ADM_vf_ssa ${FONTCONFIG_LDFLAGS}) +diff --git a/avidemux_plugins/CMakeLists.txt b/avidemux_plugins/CMakeLists.txt +index 0333abd..0a57523 100644 +--- a/avidemux_plugins/CMakeLists.txt ++++ b/avidemux_plugins/CMakeLists.txt +@@ -64,6 +64,40 @@ include(admCoreIncludes) + LINK_DIRECTORIES("${AVIDEMUX_SEARCH_LIB_DIR}") + INCLUDE_DIRECTORIES("${AVIDEMUX_SEARCH_INCLUDE_DIR}/avidemux/2.6") + ++######################################### ++# Unbundle some libraries here ++######################################### ++OPTION(USE_EXTERNAL_LIBASS "Use system installed libass library." OFF) ++OPTION(USE_EXTERNAL_LIBMAD "Use system installed libmad library." OFF) ++OPTION(USE_EXTERNAL_LIBA52 "Use system installed liba52 library." OFF) ++OPTION(USE_EXTERNAL_LIBTWOLAME "Use system installed libtwolame library." OFF) ++ ++INCLUDE(FindPkgConfig) ++ ++# libass ++IF(USE_EXTERNAL_LIBASS) ++ PKG_CHECK_MODULES(LIBASS REQUIRED libass) ++ INCLUDE_DIRECTORIES(SYSTEM ${LIBASS_INCLUDE_DIRS}) ++ENDIF() ++ ++# libmad ++IF(USE_EXTERNAL_LIBMAD) ++ PKG_CHECK_MODULES(LIBMAD REQUIRED mad) ++ INCLUDE_DIRECTORIES(SYSTEM ${LIBMAD_INCLUDE_DIRS}) ++ENDIF() ++ ++# liba52 ++IF(USE_EXTERNAL_LIBA52) ++ FIND_PATH(LIBA52_INCLUDE_DIR a52dec/a52.h) ++ FIND_LIBRARY(LIBA52_LIBRARIES a52) ++ INCLUDE_DIRECTORIES(SYSTEM ${LIBA52_INCLUDE_DIR}) ++ENDIF() ++ ++# twolame ++IF(USE_EXTERNAL_TWOLAME) ++ PKG_CHECK_MODULES(LIBTWOLAME REQUIRED twolame) ++ INCLUDE_DIRECTORIES(SYSTEM ${LIBTWOLAME_INCLUDE_DIRS}) ++ENDIF() + + IF (FRESH_BUILD) + MESSAGE("") diff --git a/avidemux-2.6.15-disable-vpx-decoder-plugin.patch b/avidemux-2.6.15-disable-vpx-decoder-plugin.patch new file mode 100644 index 0000000..4db936d --- /dev/null +++ b/avidemux-2.6.15-disable-vpx-decoder-plugin.patch @@ -0,0 +1,7 @@ +diff --git a/avidemux_plugins/ADM_videoDecoder/CMakeLists.txt b/avidemux_plugins/ADM_videoDecoder/CMakeLists.txt +index 9586aff..e953354 100644 +--- a/avidemux_plugins/ADM_videoDecoder/CMakeLists.txt ++++ b/avidemux_plugins/ADM_videoDecoder/CMakeLists.txt +@@ -1 +1 @@ +-ADD_SUBDIRECTORY(vpx) ++#ADD_SUBDIRECTORY(vpx) diff --git a/avidemux-2.6.15-hwaccel.patch b/avidemux-2.6.15-hwaccel.patch new file mode 100644 index 0000000..00ff7d5 --- /dev/null +++ b/avidemux-2.6.15-hwaccel.patch @@ -0,0 +1,19 @@ +diff --git a/avidemux/common/gui_main.cpp b/avidemux/common/gui_main.cpp +index c27f279..536178b 100644 +--- a/avidemux/common/gui_main.cpp ++++ b/avidemux/common/gui_main.cpp +@@ -1578,12 +1578,14 @@ ADM_RENDER_TYPE UI_getPreferredRender(void) + { + return RENDER_GTK; + } ++#if 0 + if(strcmp(displ,":0") && strcmp(displ,":0.0")) + { + printf("Looks like remote display, no Xv :%s\n",displ); + return RENDER_GTK; + } + #endif ++#endif + + if(prefs->get(VIDEODEVICE,&renderI)!=RC_OK) + { diff --git a/avidemux-qt.desktop b/avidemux-qt.desktop index 5aee1ed..24bd18c 100644 --- a/avidemux-qt.desktop +++ b/avidemux-qt.desktop @@ -2,7 +2,7 @@ Name=Avidemux Video Editor (Qt) Comment=Graphical video editing tool - Qt interface Icon=avidemux -Exec=avidemux3_qt4 +Exec=avidemux3_qt5 MimeType=video/mpeg;video/quicktime;video/x-msvideo;video/x-anim;audio/x-mp3;audio/x-mp2; Terminal=false Type=Application diff --git a/avidemux.spec b/avidemux.spec index d27c602..8c97c8f 100644 --- a/avidemux.spec +++ b/avidemux.spec @@ -1,8 +1,8 @@ %global _pkgbuilddir %{_builddir}/%{name}_%{version} Name: avidemux -Version: 2.6.12 -Release: 7%{?dist} +Version: 2.6.15 +Release: 1%{?dist} Summary: Graphical video editing and transcoding tool License: GPLv2+ @@ -11,10 +11,8 @@ Source0: http://downloads.sourceforge.net/%{name}/%{name}_%{version}.tar. Source1: avidemux-qt.desktop Patch0: avidemux-2.6.10-bundled_libs.patch -Patch1: avidemux-2.6.10-qt5_lrelease.patch -Patch2: avidemux-2.6.12-narrowing.patch -Patch3: avidemux-2.6.12-gcc6.patch -Patch4: avidemux-2.6.12-qt.patch +Patch1: avidemux-2.6.15-hwaccel.patch +Patch2: avidemux-2.6.15-disable-vpx-decoder-plugin.patch # Don't try to build on arm ExcludeArch: %{arm} @@ -26,6 +24,7 @@ BuildRequires: libxslt BuildRequires: desktop-file-utils BuildRequires: pkgconfig BuildRequires: sqlite-devel +BuildRequires: bzip2 # Libraries BuildRequires: yasm-devel @@ -44,9 +43,9 @@ BuildRequires: alsa-lib-devel >= 1.0.3 BuildRequires: pulseaudio-libs-devel # Video out -BuildRequires: SDL-devel >= 1.2.7 BuildRequires: mesa-libGL-devel mesa-libGLU-devel BuildRequires: libvdpau-devel +BuildRequires: libva-devel # Audio Codecs BuildRequires: a52dec-devel >= 0.7.4 @@ -69,7 +68,6 @@ BuildRequires: ffmpeg-devel # Main package is a metapackage, bring in something useful. Requires: %{name}-gui = %{version}-%{release} -Requires: %{name}-help = %{version}-%{release} %description @@ -96,25 +94,17 @@ This package contains the runtime libraries for %{name}. %package qt Summary: Qt interface for %{name} -BuildRequires: qt4-devel >= 4.5.0-9 +BuildRequires: qt5-qtbase-devel +BuildRequires: qt5-linguist BuildRequires: libxslt Provides: %{name}-gui = %{version}-%{release} Requires: %{name}-libs%{?_isa} = %{version}-%{release} Obsoletes: %{name}-gtk < 2.6.10 +Obsoletes: %{name}-help %description qt This package contains the Qt graphical interface for %{name}. -%package help -Summary: Help files for %{name} -Requires: %{name} = %{version}-%{release} -Requires: %{name}-gui = %{version}-%{release} -BuildArch: noarch - -%description help -This package contains the help files for %{name}. - - %package i18n Summary: Translations for %{name} Requires: %{name} = %{version}-%{release} @@ -128,10 +118,8 @@ This package contains translation files for %{name}. %prep %setup -q -n %{name}_%{version} %patch0 -p1 -%patch1 -p1 -b .bund_libs +%patch1 -p1 %patch2 -p1 -%patch3 -p1 -%patch4 -p1 # Remove sources of bundled libraries. rm -rf avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_liba52 \ @@ -139,7 +127,6 @@ rm -rf avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_liba52 \ avidemux_plugins/ADM_audioEncoders/twolame/ADM_libtwolame \ avidemux_plugins/ADM_videoFilters6/ass/ADM_libass - %build # Build avidemux_core export LDFLAGS="-lc -Wl,--as-needed" @@ -162,10 +149,11 @@ make %{?_smp_mflags} make install DESTDIR=%{_pkgbuilddir}/fakeRoot popd -# Build QT4 gui -rm -rf build_qt4 && mkdir build_qt4 && pushd build_qt4 +# Build QT5 gui +rm -rf build_qt5 && mkdir build_qt5 && pushd build_qt5 %cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DFAKEROOT=%{_pkgbuilddir}/fakeRoot \ + -DENABLE_QT5=TRUE \ ../avidemux/qt4 make %{?_smp_mflags} make install DESTDIR=%{_pkgbuilddir}/fakeRoot @@ -192,6 +180,7 @@ rm -rf build_plugins_cli && mkdir build_plugins_cli && pushd build_plugins_cli %cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DFAKEROOT=%{_pkgbuilddir}/fakeRoot \ -DAVIDEMUX_SOURCE_DIR=%{_builddir}/%{name}_%{version} \ + -DENABLE_QT5=TRUE \ -DPLUGIN_UI=CLI \ -DUSE_EXTERNAL_LIBASS=TRUE \ -DUSE_EXTERNAL_LIBMAD=TRUE \ @@ -202,11 +191,12 @@ make %{?_smp_mflags} make install DESTDIR=%{_pkgbuilddir}/fakeRoot popd -# Build avidemux_plugins_qt4 -rm -rf build_plugins_qt4 && mkdir build_plugins_qt4 && pushd build_plugins_qt4 +# Build avidemux_plugins_qt5 +rm -rf build_plugins_qt5 && mkdir build_plugins_qt5 && pushd build_plugins_qt5 %cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DFAKEROOT=%{_pkgbuilddir}/fakeRoot \ -DAVIDEMUX_SOURCE_DIR=%{_builddir}/%{name}_%{version} \ + -DENABLE_QT5=TRUE \ -DPLUGIN_UI=QT4 \ -DUSE_EXTERNAL_LIBASS=TRUE \ -DUSE_EXTERNAL_LIBMAD=TRUE \ @@ -221,10 +211,10 @@ popd %install make -C build_core install DESTDIR=%{buildroot} make -C build_cli install DESTDIR=%{buildroot} -make -C build_qt4 install DESTDIR=%{buildroot} +make -C build_qt5 install DESTDIR=%{buildroot} make -C build_plugins_common install DESTDIR=%{buildroot} make -C build_plugins_cli install DESTDIR=%{buildroot} -make -C build_plugins_qt4 install DESTDIR=%{buildroot} +make -C build_plugins_qt5 install DESTDIR=%{buildroot} # Remove useless devel files rm -rf %{buildroot}%{_includedir}/%{name} @@ -298,24 +288,25 @@ fi #%{_datadir}/applications/rpmfusion-avidemux-gtk.desktop %files qt -%{_bindir}/avidemux3_qt4 -%{_bindir}/avidemux3_jobs_qt4 +%{_bindir}/avidemux3_qt5 +%{_bindir}/avidemux3_jobs_qt5 +%{_libdir}/libADM_openGLQT*.so %{_libdir}/libADM_UIQT*.so -%{_libdir}/libADM_render6_QT4.so +%{_libdir}/libADM_render6_QT5.so %{_datadir}/applications/rpmfusion-avidemux-qt.desktop # QT plugins -%{_libdir}/ADM_plugins6/videoEncoders/qt4/ -%{_libdir}/ADM_plugins6/videoFilters/qt4/ -%{_libdir}/ADM_plugins6/scriptEngines/qt4/ - -%files help -%{_datadir}/avidemux6/help/ +%{_libdir}/ADM_plugins6/videoEncoders/qt5/ +%{_libdir}/ADM_plugins6/videoFilters/qt5/ +%{_libdir}/ADM_plugins6/shaderDemo/ %files i18n -%{_datadir}/avidemux6/qt4/i18n/ +%{_datadir}/avidemux6/qt5/i18n/ %changelog +* Tue Nov 22 2016 Sérgio Basto <sergio(a)serjux.com&gt; - 2.6.15-1 +- Update to the 2.6.15 release, rfbz#4344 + * Tue Nov 08 2016 Sérgio Basto <sergio(a)serjux.com&gt; - 2.6.12-7 - Rebuild for x265-2.1 diff --git a/sources b/sources index 1ff27ba..c2fdee0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -354d8ddf75d48d1f698786e8243ecc54 avidemux_2.6.12.tar.gz +2a822d96548d9dca19c805d46be424fc avidemux_2.6.15.tar.gz