4:22 p.m.
Author: hobbes1069
Update of /cvs/free/rpms/avidemux/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv7375
Modified Files:
avidemux.spec avidemux3-libass.patch sources
Log Message:
* Sun May 11 2014 Richard Shaw <hobbes1069(a)gmail.com> - 2.6.8-1
- Update to latest upstream release.
Index: avidemux.spec
===================================================================
RCS file: /cvs/free/rpms/avidemux/F-19/avidemux.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- avidemux.spec 13 Mar 2014 17:34:39 -0000 1.83
+++ avidemux.spec 11 May 2014 16:22:17 -0000 1.84
@@ -1,7 +1,7 @@
%global _pkgbuilddir %{_builddir}/%{name}_%{version}
Name: avidemux
-Version: 2.6.7
+Version: 2.6.8
Release: 1%{?dist}
Summary: Graphical video editing and transcoding tool
@@ -11,9 +11,10 @@
Source1: avidemux-qt.desktop
Source2: avidemux-gtk.desktop
-Patch0: avidemux-2.6-bundled_libs.patch
-Patch1: avidemux3-libass.patch
-Patch2: avidemux3-bundled_libs.patch
+#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
# Don't try to build on arm
ExcludeArch: %{arm}
@@ -141,9 +142,10 @@
%prep
%setup -q -n %{name}_%{version}
-%patch0 -p1 -b .bund_libs
-%patch1 -p1 -b .libass
-%patch2 -p1 -b .bund_libs2
+#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 \
@@ -361,6 +363,18 @@
%changelog
+* Sun May 11 2014 Richard Shaw <hobbes1069(a)gmail.com> - 2.6.8-1
+- Update to latest upstream release.
+
+* Sat Mar 22 2014 Sérgio Basto <sergio(a)serjux.com> - 2.6.7-4
+- Rebuilt for x264
+
+* Thu Mar 06 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 2.6.7-3
+- Rebuilt for x264
+
+* Thu Mar 06 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 2.6.7-2
+- Rebuilt
+
* Mon Jan 27 2014 Richard Shaw <hobbes1069(a)gmail.com> - 2.6.7-1
- Update to latest upstream release.
- Obsolete unneeded devel subpackage.
avidemux3-libass.patch:
CMakeLists.txt | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
Index: avidemux3-libass.patch
===================================================================
RCS file: /cvs/free/rpms/avidemux/F-19/avidemux3-libass.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- avidemux3-libass.patch 27 May 2013 13:43:38 -0000 1.2
+++ avidemux3-libass.patch 11 May 2014 16:22:17 -0000 1.3
@@ -1,5 +1,6 @@
---- avidemux3/avidemux_plugins/ADM_videoFilters6/ass/CMakeLists.txt.bund_libs 2012-06-17
21:01:09.000000000 -0500
-+++ avidemux3/avidemux_plugins/ADM_videoFilters6/ass/CMakeLists.txt 2012-06-18
14:52:06.836495759 -0500
+diff -Naur avidemux_2.6.8.orig/avidemux_plugins/ADM_videoFilters6/ass/CMakeLists.txt
avidemux_2.6.8/avidemux_plugins/ADM_videoFilters6/ass/CMakeLists.txt
+--- avidemux_2.6.8.orig/avidemux_plugins/ADM_videoFilters6/ass/CMakeLists.txt 2014-03-12
01:15:23.000000000 -0500
++++ avidemux_2.6.8/avidemux_plugins/ADM_videoFilters6/ass/CMakeLists.txt 2014-03-14
08:07:05.851887562 -0500
@@ -4,7 +4,6 @@
checkFridibi("0.19")
@@ -8,18 +9,19 @@
INCLUDE(vf_plugin)
SET(ADM_vf_ssa_SRCS ADM_vidASS.cpp)
-@@ -12,7 +11,14 @@
+@@ -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})
+- 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})
++ ${FREETYPE2_LDFLAGS} ADM_coreSubtitle)
+ ELSE(USE_EXTERNAL_LIBASS)
+ ADD_SUBDIRECTORY(ADM_libass)
+ TARGET_LINK_LIBRARIES(ADM_vf_ssa ADM_libass
-+ ${FREETYPE2_LDFLAGS})
++ ${FREETYPE2_LDFLAGS} ADM_coreSubtitle)
+ ENDIF(USE_EXTERNAL_LIBASS)
# We force the use of fontconfig
ADD_DEFINITIONS("-DUSE_FONTCONFIG")
Index: sources
===================================================================
RCS file: /cvs/free/rpms/avidemux/F-19/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources 13 Mar 2014 17:34:40 -0000 1.15
+++ sources 11 May 2014 16:22:17 -0000 1.16
@@ -1 +1 @@
-830a5115b7007e754cb0afe77469bfa0 avidemux_2.6.7.tar.gz
+33d0cd47cb84a4e9f4e1b3160405c85c avidemux_2.6.8.tar.gz