Author: hobbes1069 Update of /cvs/free/rpms/avidemux/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv14862 Modified Files: .cvsignore avidemux.spec sources Added Files: avidemux-2.6.10-bundled_libs.patch Removed Files: avidemux-2.5.6-ffmpeg_parallel_build.patch avidemux-2.6-bundled_libs.patch avidemux3-bundled_libs.patch avidemux3-libass.patch Log Message: * Tue Jun 16 2015 Richard Shaw <hobbes1069(a)gmail.com&gt; - 2.6.10-1 - Update to latest upstream release. - Disable GTK interface as it is unmaintained and does not build. avidemux-2.6.10-bundled_libs.patch: avidemux_2.6.0/avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_ad_a52.cpp | 4 - avidemux_2.6.0/avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/CMakeLists.txt | 11 ++- avidemux_2.6.0/avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_ad_mad.cpp | 2 avidemux_2.6.0/avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/CMakeLists.txt | 11 ++- avidemux_2.6.0/avidemux_plugins/ADM_videoFilters6/ass/ADM_vidASS.cpp | 2 avidemux_2.6.0/avidemux_plugins/CMakeLists.txt | 34 ++++++++++ avidemux_2.6.10/avidemux_plugins/ADM_videoFilters6/CMakeLists.txt | 1 avidemux_2.6.10/avidemux_plugins/ADM_videoFilters6/ass/CMakeLists.txt | 11 ++- 8 files changed, 65 insertions(+), 11 deletions(-) --- NEW FILE avidemux-2.6.10-bundled_libs.patch --- diff -Naur avidemux_2.6.0.orig/avidemux_plugins/CMakeLists.txt avidemux_2.6.0/avidemux_plugins/CMakeLists.txt --- avidemux_2.6.0.orig/avidemux_plugins/CMakeLists.txt 2012-07-13 02:50:08.000000000 -0500 +++ avidemux_2.6.0/avidemux_plugins/CMakeLists.txt 2012-09-14 14:57:05.767002527 -0500 @@ -37,6 +37,40 @@ 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 -Naur avidemux_2.6.10.orig/avidemux_plugins/ADM_videoFilters6/ass/CMakeLists.txt avidemux_2.6.10/avidemux_plugins/ADM_videoFilters6/ass/CMakeLists.txt --- avidemux_2.6.10.orig/avidemux_plugins/ADM_videoFilters6/ass/CMakeLists.txt 2015-06-10 00:42:47.000000000 -0500 +++ avidemux_2.6.10/avidemux_plugins/ADM_videoFilters6/ass/CMakeLists.txt 2015-07-21 17:24:11.939838828 -0500 @@ -4,7 +4,6 @@ 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 @@ 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 -Naur avidemux_2.6.10.orig/avidemux_plugins/ADM_videoFilters6/CMakeLists.txt avidemux_2.6.10/avidemux_plugins/ADM_videoFilters6/CMakeLists.txt --- avidemux_2.6.10.orig/avidemux_plugins/ADM_videoFilters6/CMakeLists.txt 2015-06-10 00:42:47.000000000 -0500 +++ avidemux_2.6.10/avidemux_plugins/ADM_videoFilters6/CMakeLists.txt 2015-07-21 17:25:05.380500847 -0500 @@ -1,6 +1,5 @@ ADD_SUBDIRECTORY(addBorder) ADD_SUBDIRECTORY(asharp) -ADD_SUBDIRECTORY(ass) ADD_SUBDIRECTORY(avsfilter) ADD_SUBDIRECTORY(blackenBorder) ADD_SUBDIRECTORY(changeFps) diff -Naur avidemux_2.6.0.orig/avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/CMakeLists.txt avidemux_2.6.0/avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/CMakeLists.txt --- avidemux_2.6.0.orig/avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/CMakeLists.txt 2011-02-17 13:04:55.000000000 -0600 +++ avidemux_2.6.0/avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/CMakeLists.txt 2012-09-15 15:03:06.009414605 -0500 @@ -1,11 +1,18 @@ INCLUDE(ad_plugin) -ADD_SUBDIRECTORY(ADM_liba52) +IF(NOT USE_EXTERNAL_LIBA52) + ADD_SUBDIRECTORY(ADM_liba52) +ENDIF() SET(ADM_ad_a52_SRCS ADM_ad_a52.cpp) ADD_AUDIO_DECODER( ADM_ad_a52 ${ADM_ad_a52_SRCS}) -TARGET_LINK_LIBRARIES(ADM_ad_a52 ADM_liba52) + +IF(USE_EXTERNAL_LIBA52) + TARGET_LINK_LIBRARIES(ADM_ad_a52 ${LIBA52_LIBRARIES}) +ELSE() + TARGET_LINK_LIBRARIES(ADM_ad_a52 ADM_liba52) +ENDIF() INIT_AUDIO_PLUGIN(ADM_ad_a52) INSTALL_AUDIODECODER(ADM_ad_a52) diff -Naur avidemux_2.6.0.orig/avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/CMakeLists.txt avidemux_2.6.0/avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/CMakeLists.txt --- avidemux_2.6.0.orig/avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/CMakeLists.txt 2011-02-17 13:04:55.000000000 -0600 +++ avidemux_2.6.0/avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/CMakeLists.txt 2012-09-15 15:04:31.914550564 -0500 @@ -8,13 +8,20 @@ ADD_DEFINITIONS("-DFPM_PPC") ENDIF (ADM_CPU_X86_32) -ADD_SUBDIRECTORY(ADM_libMad) +IF(NOT USE_EXTERNAL_LIBMAD) + ADD_SUBDIRECTORY(ADM_libMad) +ENDIF() ADD_DEFINITIONS("-DHAVE_ASSERT_H") SET(ADM_ad_Mad_SRCS ADM_ad_mad.cpp) ADD_AUDIO_DECODER( ADM_ad_Mad ${ADM_ad_Mad_SRCS}) -TARGET_LINK_LIBRARIES(ADM_ad_Mad ADM_libMad) + +IF(USE_EXTERNAL_LIBMAD) + TARGET_LINK_LIBRARIES(ADM_ad_Mad ${LIBMAD_LIBRARIES}) +ELSE() + TARGET_LINK_LIBRARIES(ADM_ad_Mad ADM_libMad) +ENDIF() INIT_AUDIO_PLUGIN(ADM_ad_Mad) INSTALL_AUDIODECODER(ADM_ad_Mad) diff -Naur avidemux_2.6.0.orig/avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_ad_a52.cpp avidemux_2.6.0/avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_ad_a52.cpp --- avidemux_2.6.0.orig/avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_ad_a52.cpp 2012-08-05 00:50:48.000000000 -0500 +++ avidemux_2.6.0/avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_ad_a52.cpp 2012-09-15 15:15:44.275205965 -0500 @@ -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) diff -Naur avidemux_2.6.0.orig/avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_ad_mad.cpp avidemux_2.6.0/avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_ad_mad.cpp --- avidemux_2.6.0.orig/avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_ad_mad.cpp 2012-06-06 00:51:28.000000000 -0500 +++ avidemux_2.6.0/avidemux_plugins/ADM_audioDecoders/ADM_ad_mad/ADM_ad_mad.cpp 2012-09-15 15:16:02.560599956 -0500 @@ -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 -Naur avidemux_2.6.0.orig/avidemux_plugins/ADM_videoFilters6/ass/ADM_vidASS.cpp avidemux_2.6.0/avidemux_plugins/ADM_videoFilters6/ass/ADM_vidASS.cpp --- avidemux_2.6.0.orig/avidemux_plugins/ADM_videoFilters6/ass/ADM_vidASS.cpp 2012-08-24 06:52:00.000000000 -0500 +++ avidemux_2.6.0/avidemux_plugins/ADM_videoFilters6/ass/ADM_vidASS.cpp 2012-09-15 16:16:33.076596468 -0500 @@ -23,7 +23,7 @@ extern "C" { -#include "ADM_libass/ass.h" +#include "ass/ass.h" } /** Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/avidemux/devel/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 11 May 2014 14:52:31 -0000 1.16 +++ .cvsignore 4 Nov 2015 20:13:23 -0000 1.17 @@ -1 +1 @@ -avidemux_2.6.8.tar.gz +avidemux_2.6.10.tar.gz Index: avidemux.spec =================================================================== RCS file: /cvs/free/rpms/avidemux/devel/avidemux.spec,v retrieving revision 1.95 retrieving revision 1.96 diff -u -r1.95 -r1.96 --- avidemux.spec 22 Jan 2015 01:33:00 -0000 1.95 +++ avidemux.spec 4 Nov 2015 20:13:23 -0000 1.96 @@ -1,8 +1,8 @@ %global _pkgbuilddir %{_builddir}/%{name}_%{version} Name: avidemux -Version: 2.6.8 -Release: 3%{?dist} +Version: 2.6.10 +Release: 1%{?dist} Summary: Graphical video editing and transcoding tool License: GPLv2+ @@ -11,10 +11,7 @@ Source1: avidemux-qt.desktop Source2: avidemux-gtk.desktop -#Patch0: avidemux-2.5.6-ffmpeg_parallel_build.patch -Patch1: avidemux-2.6-bundled_libs.patch -Patch2: avidemux3-libass.patch -Patch3: avidemux3-bundled_libs.patch +Patch1: avidemux-2.6.10-bundled_libs.patch # Don't try to build on arm ExcludeArch: %{arm} @@ -64,6 +61,7 @@ # Video Codecs BuildRequires: xvidcore-devel >= 1.0.2 BuildRequires: x264-devel +BuildRequires: x265-devel BuildRequires: ffmpeg-devel # Main package is a metapackage, bring in something useful. @@ -77,12 +75,12 @@ MPEG files, MP4 and ASF, using a variety of codecs. Tasks can be automated using projects, job queue and powerful scripting capabilities. -This is a meta package that brings in all interfaces: GTK, QT, and CLI. +This is a meta package that brings in all interfaces: QT and CLI. +#This is a meta package that brings in all interfaces: GTK, QT, and CLI. %package cli Summary: CLI for %{name} -Group: Applications/Multimedia Requires: %{name}-libs%{?_isa} = %{version}-%{release} %description cli @@ -90,32 +88,27 @@ %package libs Summary: Libraries for %{name} -Group: System Environment/Libraries -#Requires: %{name}%{?_isa} = %{version}-%{release} -Obsoletes: avidemux-devel < 2.6.4-9 %description libs This package contains the runtime libraries for %{name}. -%package gtk -Summary: GTK interface for %{name} -Group: Applications/Multimedia -BuildRequires: gtk3-devel -BuildRequires: cairo-devel -Provides: %{name}-gui = %{version}-%{release} -Requires: %{name}-libs%{?_isa} = %{version}-%{release} +#%package gtk +#Summary: GTK interface for %{name} +#BuildRequires: gtk3-devel +#BuildRequires: cairo-devel +#Provides: %{name}-gui = %{version}-%{release} +#Requires: %{name}-libs%{?_isa} = %{version}-%{release} -%description gtk -This package provides the GTK graphical interface for %{name}. +#%description gtk +#This package provides the GTK graphical interface for %{name}. %package qt Summary: Qt interface for %{name} -Group: Applications/Multimedia -# 4.5.0-9 fixes a failure when there are duplicate translated strings -# https://bugzilla.redhat.com/show_bug.cgi?id=491514 -BuildRequires: qt4-devel >= 4.5.0-9 +#BuildRequires: qt4-devel >= 4.5.0-9 +BuildRequires: qt5-qtbase-devel qt5-qttools-devel libxslt Provides: %{name}-gui = %{version}-%{release} Requires: %{name}-libs%{?_isa} = %{version}-%{release} +Obsoletes: %{name}-gtk < 2.6.10 %description qt This package contains the Qt graphical interface for %{name}. @@ -142,10 +135,7 @@ %prep %setup -q -n %{name}_%{version} -#patch0 -p1 -b .ffmpeg_build %patch1 -p1 -b .bund_libs -%patch2 -p1 -b .libass -%patch3 -p1 -b .bund_libs2 # Remove sources of bundled libraries. rm -rf avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_liba52 \ @@ -156,12 +146,11 @@ %build # Build avidemux_core -LDFLAGS="-lc -Wl,--as-needed";export LDFLAGS +export LDFLAGS="-lc -Wl,--as-needed" rm -rf build_core && mkdir build_core && pushd build_core %cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \ ../avidemux_core make -#%{?_smp_mflags} # We have to do a fake install so header files are avaialble for the other # packages. @@ -181,25 +170,27 @@ rm -rf build_qt4 && mkdir build_qt4 && pushd build_qt4 %cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DFAKEROOT=%{_pkgbuilddir}/fakeRoot \ + -DENABLE_QT5=TRUE \ ../avidemux/qt4 make %{?_smp_mflags} make install DESTDIR=%{_pkgbuilddir}/fakeRoot popd # Build GTK gui -rm -rf build_gtk && mkdir build_gtk && pushd build_gtk -%cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DFAKEROOT=%{_pkgbuilddir}/fakeRoot \ - ../avidemux/gtk -make %{?_smp_mflags} -make install DESTDIR=%{_pkgbuilddir}/fakeRoot -popd +#rm -rf build_gtk && mkdir build_gtk && pushd build_gtk +#cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \ +# -DFAKEROOT=%{_pkgbuilddir}/fakeRoot \ +# ../avidemux/gtk +#make %{?_smp_mflags} +#make install DESTDIR=%{_pkgbuilddir}/fakeRoot +#popd # Build avidemux_plugins_common rm -rf build_plugins_common && mkdir build_plugins_common && pushd build_plugins_common %cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DFAKEROOT=%{_pkgbuilddir}/fakeRoot \ -DAVIDEMUX_SOURCE_DIR=%{_builddir}/%{name}_%{version} \ + -DENABLE_QT5=TRUE \ -DPLUGIN_UI=COMMON \ -DUSE_EXTERNAL_LIBASS=TRUE \ -DUSE_EXTERNAL_LIBMAD=TRUE \ @@ -215,6 +206,7 @@ %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 \ @@ -230,6 +222,7 @@ %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 \ @@ -241,30 +234,30 @@ popd # Build avidemux_plugins_gtk -rm -rf build_plugins_gtk && mkdir build_plugins_gtk && pushd build_plugins_gtk -%cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DFAKEROOT=%{_pkgbuilddir}/fakeRoot \ - -DAVIDEMUX_SOURCE_DIR=%{_builddir}/%{name}_%{version} \ - -DPLUGIN_UI=GTK \ - -DUSE_EXTERNAL_LIBASS=TRUE \ - -DUSE_EXTERNAL_LIBMAD=TRUE \ - -DUSE_EXTERNAL_LIBA52=TRUE \ - -DUSE_EXTERNAL_TWOLAME=TRUE \ - ../avidemux_plugins -make %{?_smp_mflags} -make install DESTDIR=%{_pkgbuilddir}/fakeRoot -popd +#rm -rf build_plugins_gtk && mkdir build_plugins_gtk && pushd build_plugins_gtk +#cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \ +# -DFAKEROOT=%{_pkgbuilddir}/fakeRoot \ +# -DAVIDEMUX_SOURCE_DIR=%{_builddir}/%{name}_%{version} \ +# -DPLUGIN_UI=GTK \ +# -DUSE_EXTERNAL_LIBASS=TRUE \ +# -DUSE_EXTERNAL_LIBMAD=TRUE \ +# -DUSE_EXTERNAL_LIBA52=TRUE \ +# -DUSE_EXTERNAL_TWOLAME=TRUE \ +# ../avidemux_plugins +#make %{?_smp_mflags} +#make install DESTDIR=%{_pkgbuilddir}/fakeRoot +#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_gtk install DESTDIR=%{buildroot} +#make -C build_gtk 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_gtk install DESTDIR=%{buildroot} +#make -C build_plugins_gtk install DESTDIR=%{buildroot} # Remove useless devel files rm -rf %{buildroot}%{_includedir}/%{name} @@ -277,9 +270,9 @@ --dir %{buildroot}%{_datadir}/applications \ %{SOURCE1} -desktop-file-install --vendor rpmfusion \ - --dir %{buildroot}%{_datadir}/applications \ - %{SOURCE2} +#desktop-file-install --vendor rpmfusion \ +# --dir %{buildroot}%{_datadir}/applications \ +# %{SOURCE2} # Install icons install -pDm 0644 avidemux/gtk/ADM_userInterfaces/glade/main/avidemux_icon_small.png \ @@ -292,20 +285,20 @@ %postun libs -p /sbin/ldconfig -%post gtk -/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : -/usr/bin/update-desktop-database &> /dev/null || : +#%post gtk +#/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : +#/usr/bin/update-desktop-database &> /dev/null || : %post qt /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : /usr/bin/update-desktop-database &> /dev/null || : -%postun gtk -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 || : -fi -/usr/bin/update-desktop-database &> /dev/null || : +#%postun gtk +#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 || : +#fi +#/usr/bin/update-desktop-database &> /dev/null || : %postun qt if [ $1 -eq 0 ] ; then @@ -314,8 +307,8 @@ fi /usr/bin/update-desktop-database &> /dev/null || : -%posttrans gtk -/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : +#%posttrans gtk +#/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %posttrans qt /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : @@ -342,28 +335,32 @@ %{_libdir}/libADM_UI_Cli*.so %{_libdir}/libADM_render6_cli.so -%files gtk -f build_plugins_gtk/install_manifest.txt -%{_bindir}/avidemux3_gtk -%{_libdir}/libADM_UIGtk*.so -%{_libdir}/libADM_render6_gtk.so -%{_libdir}/ADM_glade/ -%{_datadir}/applications/rpmfusion-avidemux-gtk.desktop +#%files gtk -f build_plugins_gtk/install_manifest.txt +#%{_bindir}/avidemux3_gtk +#%{_libdir}/libADM_UIGtk*.so +#%{_libdir}/libADM_render6_gtk.so +#%{_libdir}/ADM_glade/ +#%{_datadir}/applications/rpmfusion-avidemux-gtk.desktop %files qt -f build_plugins_qt4/install_manifest.txt -%{_bindir}/avidemux3_qt4 -%{_bindir}/avidemux3_jobs +%{_bindir}/avidemux3_qt5 +%{_bindir}/avidemux3_jobs_qt5 %{_libdir}/libADM_UIQT*.so -%{_libdir}/libADM_render6_qt4.so +#%{_libdir}/libADM_render6_qt4.so %{_datadir}/applications/rpmfusion-avidemux-qt.desktop %files help %{_datadir}/avidemux6/help/ %files i18n -%{_datadir}/avidemux6/i18n/ +%{_datadir}/avidemux6/qt5/i18n/ %changelog +* Tue Jun 16 2015 Richard Shaw <hobbes1069(a)gmail.com&gt; - 2.6.10-1 +- Update to latest upstream release. +- Disable GTK interface as it is unmaintained and does not build. + * Wed Jan 21 2015 Richard Shaw <hobbes1069(a)gmail.com&gt; - 2.6.8-3 - Fix directory ownership. Index: sources =================================================================== RCS file: /cvs/free/rpms/avidemux/devel/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 11 May 2014 14:52:31 -0000 1.16 +++ sources 4 Nov 2015 20:13:24 -0000 1.17 @@ -1 +1 @@ -33d0cd47cb84a4e9f4e1b3160405c85c avidemux_2.6.8.tar.gz +61addac2a03720c070aa0b6932cfc2db avidemux_2.6.10.tar.gz --- avidemux-2.5.6-ffmpeg_parallel_build.patch DELETED --- --- avidemux-2.6-bundled_libs.patch DELETED --- --- avidemux3-bundled_libs.patch DELETED --- --- avidemux3-libass.patch DELETED ---