Author: hobbes1069 Update of /cvs/free/rpms/avidemux/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv21057 Modified Files: avidemux-qt.desktop avidemux.spec Added Files: avidemux-2.6.10-libass.patch Removed Files: avidemux-gtk.desktop Log Message: Add patch to find qt5 version of lrelease. Fix desktop files. avidemux-2.6.10-libass.patch: CMakeLists.txt | 1 - ass/CMakeLists.txt | 11 +++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) --- NEW FILE avidemux-2.6.10-libass.patch --- 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) Index: avidemux-qt.desktop =================================================================== RCS file: /cvs/free/rpms/avidemux/devel/avidemux-qt.desktop,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- avidemux-qt.desktop 29 Oct 2012 21:16:11 -0000 1.5 +++ avidemux-qt.desktop 4 Nov 2015 21:43:43 -0000 1.6 @@ -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 Index: avidemux.spec =================================================================== RCS file: /cvs/free/rpms/avidemux/devel/avidemux.spec,v retrieving revision 1.96 retrieving revision 1.97 diff -u -r1.96 -r1.97 --- avidemux.spec 4 Nov 2015 20:13:23 -0000 1.96 +++ avidemux.spec 4 Nov 2015 21:43:43 -0000 1.97 @@ -9,9 +9,10 @@ URL: http://www.avidemux.org Source0: http://downloads.sourceforge.net/%{name}/%{name}_%{version}.tar.gz Source1: avidemux-qt.desktop -Source2: avidemux-gtk.desktop +#Source2: avidemux-gtk.desktop -Patch1: avidemux-2.6.10-bundled_libs.patch +Patch0: avidemux-2.6.10-bundled_libs.patch +Patch1: avidemux-2.6.10-qt5_lrelease.patch # Don't try to build on arm ExcludeArch: %{arm} @@ -105,7 +106,8 @@ %package qt Summary: Qt interface for %{name} #BuildRequires: qt4-devel >= 4.5.0-9 -BuildRequires: qt5-qtbase-devel qt5-qttools-devel libxslt +BuildRequires: qt5-qtbase-devel qt5-qttools-devel qt5-qtscript-devel +BuildRequires: libxslt Provides: %{name}-gui = %{version}-%{release} Requires: %{name}-libs%{?_isa} = %{version}-%{release} Obsoletes: %{name}-gtk < 2.6.10 @@ -135,6 +137,7 @@ %prep %setup -q -n %{name}_%{version} +%patch0 -p1 %patch1 -p1 -b .bund_libs # Remove sources of bundled libraries. --- avidemux-gtk.desktop DELETED ---