7:27 p.m.
Author: hobbes1069
Update of /cvs/free/rpms/avidemux/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv24345
Modified Files:
.cvsignore avidemux.spec avidemux3-libass.patch sources
Added Files:
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.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: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/avidemux/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore 31 Mar 2013 15:42:40 -0000 1.13
+++ .cvsignore 26 May 2013 19:27:03 -0000 1.14
@@ -1 +1 @@
-avidemux_2.6.3.tar.gz
+avidemux_2.6.4.tar.gz
Index: avidemux.spec
===================================================================
RCS file: /cvs/free/rpms/avidemux/devel/avidemux.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- avidemux.spec 5 May 2013 12:28:32 -0000 1.76
+++ avidemux.spec 26 May 2013 19:27:03 -0000 1.77
@@ -1,8 +1,8 @@
%global _pkgbuilddir %{_builddir}/%{name}_%{version}
Name: avidemux
-Version: 2.6.3
-Release: 2%{?dist}
+Version: 2.6.4
+Release: 1%{?dist}
Summary: Graphical video editing and transcoding tool
License: GPLv2+
@@ -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,9 @@
%{_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.
avidemux3-libass.patch:
CMakeLists.txt | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
Index: avidemux3-libass.patch
===================================================================
RCS file: /cvs/free/rpms/avidemux/devel/avidemux3-libass.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- avidemux3-libass.patch 29 Oct 2012 21:16:11 -0000 1.1
+++ avidemux3-libass.patch 26 May 2013 19:27:03 -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/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources 31 Mar 2013 15:42:40 -0000 1.13
+++ sources 26 May 2013 19:27:03 -0000 1.14
@@ -1 +1 @@
-3a9840a027a8a2dddf967e16248aad8b avidemux_2.6.3.tar.gz
+adb9110ab230fe13a8e9799f547f2f57 avidemux_2.6.4.tar.gz