5:29 p.m.
Author: hobbes1069
Update of /cvs/free/rpms/avidemux/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv25141
Modified Files:
avidemux.spec avidemux3-libass.patch sources
Added Files:
avidemux-2.5.6-ffmpeg_parallel_build.patch
avidemux-2.6.4-gtk_fix.patch
Log Message:
* Wed May 15 2013 Richard Shaw <hobbes1069(a)gmail.com> - 2.6.4-1
- Update to latest upstream release.
avidemux-2.5.6-ffmpeg_parallel_build.patch:
admFFmpegBuild.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: avidemux-2.5.6-ffmpeg_parallel_build.patch
===================================================================
RCS file: avidemux-2.5.6-ffmpeg_parallel_build.patch
diff -N avidemux-2.5.6-ffmpeg_parallel_build.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ avidemux-2.5.6-ffmpeg_parallel_build.patch 27 May 2013 17:29:20 -0000 1.3
@@ -0,0 +1,12 @@
+diff -Naur avidemux_2.5.6.orig/cmake/admFFmpegBuild.cmake
avidemux_2.5.6/cmake/admFFmpegBuild.cmake
+--- avidemux_2.5.6.orig/cmake/admFFmpegBuild.cmake 2011-12-28 08:51:49.000000000 -0600
++++ avidemux_2.5.6/cmake/admFFmpegBuild.cmake 2012-01-26 14:07:41.928167845 -0600
+@@ -167,7 +167,7 @@
+
+ # Build FFmpeg
+ add_custom_command(OUTPUT
"${FFMPEG_BINARY_DIR}/ffmpeg${CMAKE_EXECUTABLE_SUFFIX}"
+- COMMAND ${CMAKE_COMMAND} -DCMAKE_BUILD_TOOL=${CMAKE_BUILD_TOOL} -P
"${CMAKE_SOURCE_DIR}/cmake/admFFmpegMake.cmake"
++ COMMAND ${CMAKE_COMMAND} -DCMAKE_BUILD_TOOL=$(MAKE) -P
"${CMAKE_SOURCE_DIR}/cmake/admFFmpegMake.cmake"
+ WORKING_DIRECTORY "${FFMPEG_BINARY_DIR}")
+
+ add_custom_target(ffmpeg ALL
avidemux-2.6.4-gtk_fix.patch:
ui_support.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- NEW FILE avidemux-2.6.4-gtk_fix.patch ---
diff --git a/avidemux/gtk/ADM_userInterfaces/ui_support.cpp
b/avidemux/gtk/ADM_userInterfaces/ui_support.cpp
index f6e6ac9..076c6d6 100644
--- a/avidemux/gtk/ADM_userInterfaces/ui_support.cpp
+++ b/avidemux/gtk/ADM_userInterfaces/ui_support.cpp
@@ -13,6 +13,7 @@ extern "C" int getMainNSWindow(void);
#include "ADM_inttype.h"
#include "ADM_files.h"
#include "DIA_uiTypes.h"
+#include "ADM_default.h"
extern GtkWidget *guiRootWindow;
@@ -68,4 +69,4 @@ void getMainWindowHandles(long int *handle,long int *nativeHandle)
}
void GUI_OpenApplicationLog() { }
-void GUI_OpenApplicationDataFolder() { }
\ No newline at end of file
+void GUI_OpenApplicationDataFolder() { }
Index: avidemux.spec
===================================================================
RCS file: /cvs/free/rpms/avidemux/F-17/avidemux.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- avidemux.spec 1 Apr 2013 02:50:22 -0000 1.71
+++ avidemux.spec 27 May 2013 17:29:20 -0000 1.72
@@ -1,7 +1,7 @@
%global _pkgbuilddir %{_builddir}/%{name}_%{version}
Name: avidemux
-Version: 2.6.3
+Version: 2.6.4
Release: 1%{?dist}
Summary: Graphical video editing and transcoding tool
@@ -15,6 +15,7 @@
Patch1: avidemux-2.6-bundled_libs.patch
Patch2: avidemux3-libass.patch
Patch3: avidemux3-bundled_libs.patch
+Patch4: avidemux-2.6.4-gtk_fix.patch
# Don't try to build on arm
ExcludeArch: %{arm}
@@ -143,6 +144,7 @@
%patch1 -p1 -b .bund_libs
%patch2 -p1 -b .libass
%patch3 -p1 -b .bund_libs2
+%patch4 -p1 -b .gtk_fix
# Remove sources of bundled libraries.
rm -rf avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_liba52 \
@@ -353,6 +355,12 @@
%{_includedir}/avidemux/
%changelog
+* Wed May 15 2013 Richard Shaw <hobbes1069(a)gmail.com> - 2.6.4-1
+- Update to latest upstream release.
+
+* Sun May 05 2013 Richard Shaw <hobbes1069(a)gmail.com> - 2.6.3-2
+- Rebuild for updated x264.
+
* Wed Mar 20 2013 Richard Shaw <hobbes1069(a)gmail.com> - 2.6.3-1
- Update to latest bugfix release.
avidemux3-libass.patch:
CMakeLists.txt | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
Index: avidemux3-libass.patch
===================================================================
RCS file: /cvs/free/rpms/avidemux/F-17/avidemux3-libass.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- avidemux3-libass.patch 30 Oct 2012 14:04:39 -0000 1.1
+++ avidemux3-libass.patch 27 May 2013 17:29:20 -0000 1.2
@@ -1,26 +1,26 @@
--- 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
-@@ -4,15 +4,20 @@
+@@ -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,14 @@
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})
-+ IF(USE_EXTERNAL_LIBASS)
-+ TARGET_LINK_LIBRARIES(ADM_vf_ssa ${LIBASS_LIBRARIES}
-+ ${FREETYPE2_LDFLAGS})
-+ ELSE(USE_EXTERNAL_LIBASS)
-+ ADD_SUBDIRECTORY(ADM_libass)
-+ TARGET_LINK_LIBRARIES(ADM_vf_ssa ADM_libass
-+ ${FREETYPE2_LDFLAGS})
-+ ENDIF(USE_EXTERNAL_LIBASS)
-
- IF (FONTCONFIG_FOUND)
- ADD_DEFINITIONS("-DUSE_FONTCONFIG")
++ IF(USE_EXTERNAL_LIBASS)
++ TARGET_LINK_LIBRARIES(ADM_vf_ssa ${LIBASS_LIBRARIES}
++ ${FREETYPE2_LDFLAGS})
++ ELSE(USE_EXTERNAL_LIBASS)
++ ADD_SUBDIRECTORY(ADM_libass)
++ TARGET_LINK_LIBRARIES(ADM_vf_ssa ADM_libass
++ ${FREETYPE2_LDFLAGS})
++ ENDIF(USE_EXTERNAL_LIBASS)
+ # We force the use of fontconfig
+ ADD_DEFINITIONS("-DUSE_FONTCONFIG")
+ TARGET_LINK_LIBRARIES(ADM_vf_ssa ${FONTCONFIG_LDFLAGS})
Index: sources
===================================================================
RCS file: /cvs/free/rpms/avidemux/F-17/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources 1 Apr 2013 02:50:22 -0000 1.13
+++ sources 27 May 2013 17:29:20 -0000 1.14
@@ -1 +1 @@
-3a9840a027a8a2dddf967e16248aad8b avidemux_2.6.3.tar.gz
+adb9110ab230fe13a8e9799f547f2f57 avidemux_2.6.4.tar.gz