rpms/avidemux/devel avidemux-2.4-pulseaudio-default.patch, NONE, 1.1 avidemux-2.4-qt4.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 avidemux-2.4-i18n.patch, 1.2, 1.3 avidemux-2.4-libdca.patch, 1.2, 1.3 avidemux.spec, 1.12, 1.13 sources, 1.3, 1.4 avidemux-2.4.2-pulseaudio-default.patch, 1.2, NONE avidemux-2.4.3-ppc.patch, 1.1, NONE avidemux-2.4.3-qt4.patch, 1.1, NONE avidemux-x264.patch, 1.1, NONE

Stewart Adam firewing at rpmfusion.org
Fri Feb 20 05:41:57 CET 2009 

Author: firewing

Update of /cvs/free/rpms/avidemux/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv4519

Modified Files:
	.cvsignore avidemux-2.4-i18n.patch avidemux-2.4-libdca.patch 
	avidemux.spec sources 
Added Files:
	avidemux-2.4-pulseaudio-default.patch avidemux-2.4-qt4.patch 
Removed Files:
	avidemux-2.4.2-pulseaudio-default.patch 
	avidemux-2.4.3-ppc.patch avidemux-2.4.3-qt4.patch 
	avidemux-x264.patch 
Log Message:
* Wed Feb 18 2009 Stewart Adam <s.adam at diffingo.com> - 2.4.4-1
- Update to 2.4.4 final, update patches accordingly
- Move Qt translation files to qt subpackage


avidemux-2.4-pulseaudio-default.patch:

--- NEW FILE avidemux-2.4-pulseaudio-default.patch ---
--- avidemux_2.4.4.orig/avidemux/prefs.in	2008-07-23 12:47:32.000000000 -0400
+++ avidemux_2.4.4/avidemux/prefs.in	2009-02-19 00:02:46.000000000 -0500
@@ -55,7 +55,7 @@
 #else
 device.audiodevice,			STRING,	ALSA
 #endif
-device.audio.alsa_device,               STRING, "dmix"
+device.audio.alsa_device,               STRING, "pulse"
 device.videodevice,			UINT,	0,	0,	10
 # Posproc
 default.postproc_type,			UINT,	3,	0,	7

avidemux-2.4-qt4.patch:

--- NEW FILE avidemux-2.4-qt4.patch ---
--- avidemux_2.4.4.orig/cmake/Ts.cmake	2007-10-14 07:58:28.000000000 -0400
+++ avidemux_2.4.4/cmake/Ts.cmake	2009-02-19 00:07:13.000000000 -0500
@@ -14,7 +14,7 @@
 
 MACRO(FIND_LRELEASE)
     IF(NOT LRELEASE_EXECUTABLE AND NOT LRELEASE_NOT_FOUND)
-		FIND_PROGRAM(LRELEASE_EXECUTABLE lrelease PATHS
+		FIND_PROGRAM(LRELEASE_EXECUTABLE lrelease-qt4 PATHS
 			"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin"
 			"[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin"
 			$ENV{QTDIR}/bin)


Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/avidemux/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	16 Aug 2008 20:07:42 -0000	1.3
+++ .cvsignore	20 Feb 2009 04:41:56 -0000	1.4
@@ -1 +1 @@
-avidemux_2.4.3.tar.gz
+avidemux_2.4.4.tar.gz

avidemux-2.4-i18n.patch:

Index: avidemux-2.4-i18n.patch
===================================================================
RCS file: /cvs/free/rpms/avidemux/devel/avidemux-2.4-i18n.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- avidemux-2.4-i18n.patch	27 Sep 2008 00:42:06 -0000	1.2
+++ avidemux-2.4-i18n.patch	20 Feb 2009 04:41:56 -0000	1.3
@@ -1,7 +1,6 @@
-diff -ur avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp
---- avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp	2007-10-16 21:23:21.000000000 +0300
-+++ avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp	2007-12-28 20:35:30.000000000 +0200
-@@ -53,7 +53,7 @@
+--- avidemux_2.4.4.orig/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp	2008-09-23 21:09:49.000000000 -0400
++++ avidemux_2.4.4/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp	2009-02-19 23:05:30.000000000 -0500
+@@ -60,7 +60,7 @@
  {
  	printf("\n[Locale] Locale: %s\n", QLocale::system().name().toUtf8().constData());
  
@@ -10,9 +9,8 @@
  
  	loadTranslation(&qtTranslator, appdir + "qt_" + QLocale::system().name());
  	loadTranslation(&avidemuxTranslator, appdir + "avidemux_" + QLocale::system().name());
-diff -ur cmake/Ts.cmake cmake/Ts.cmake
---- cmake/Ts.cmake	2007-10-14 14:58:28.000000000 +0300
-+++ cmake/Ts.cmake	2007-12-28 20:36:05.000000000 +0200
+--- avidemux_2.4.4.orig/cmake/Ts.cmake	2007-10-14 07:58:28.000000000 -0400
++++ avidemux_2.4.4/cmake/Ts.cmake	2009-02-19 23:04:55.000000000 -0500
 @@ -63,7 +63,7 @@
                  
              SET(qm_files ${qm_files} ${_outXml} ${_out})

avidemux-2.4-libdca.patch:

Index: avidemux-2.4-libdca.patch
===================================================================
RCS file: /cvs/free/rpms/avidemux/devel/avidemux-2.4-libdca.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- avidemux-2.4-libdca.patch	27 Sep 2008 00:42:06 -0000	1.2
+++ avidemux-2.4-libdca.patch	20 Feb 2009 04:41:56 -0000	1.3
@@ -1,39 +1,13 @@
-diff -p -up avidemux/CMakeLists.txt.libdca avidemux/CMakeLists.txt
---- avidemux/CMakeLists.txt.libdca	2008-06-28 15:03:51.000000000 +0200
-+++ avidemux/CMakeLists.txt	2008-07-24 15:43:18.000000000 +0200
-@@ -331,7 +331,7 @@ endif(USE_AMR_NB AND NOT USE_LATE_BINDIN
- 
- #libdts
- if(USE_LIBDCA AND NOT USE_LATE_BINDING)
--	add_libs_all_targets(dts)
-+	add_libs_all_targets(dca)
- endif(USE_LIBDCA AND NOT USE_LATE_BINDING)
- 
- # Lame
-diff -p -up ConfigureChecks.cmake.libdca ConfigureChecks.cmake
---- ConfigureChecks.cmake.libdca	2008-07-05 20:24:01.000000000 +0200
-+++ ConfigureChecks.cmake	2008-07-24 15:43:18.000000000 +0200
-@@ -475,7 +475,7 @@ SET(CMAKE_REQUIRED_LIBRARIES "-lm")
- IF (USE_LATE_BINDING)
- 	CHECK_INCLUDE_FILES(dts.h USE_LIBDCA)
- ELSE (USE_LATE_BINDING)
--	ADM_CHECK_HL(libdca dts.h dts dts_init USE_LIBDCA)
-+	ADM_CHECK_HL(libdca dts.h dca dca_init USE_LIBDCA)
- ENDIF (USE_LATE_BINDING)
- 
- SET(CMAKE_REQUIRED_LIBRARIES)
-diff -p -up configure.in.in.libdca configure.in.in
---- configure.in.in.libdca	2008-07-24 15:43:18.000000000 +0200
-+++ configure.in.in	2008-07-24 15:51:57.000000000 +0200
-@@ -891,18 +891,14 @@ have_libdca=no
+--- avidemux_2.4.4.orig/configure.in.in	2009-02-06 14:07:37.000000000 -0500
++++ avidemux_2.4.4/configure.in.in	2009-02-18 23:48:22.000000000 -0500
+@@ -874,18 +874,14 @@
  if test "x$with_libdca" != "xno"; then
      have_libdca=yes
      AC_CHECK_HEADERS([dts.h], , have_libdca=no)
 -    
 -    if test "x$have_libdca" = "xyes"; then
 -    	AC_CHECK_HEADERS([dts_internal.h], , have_libdca=no)
--    	
-+ 	
+     	
      	if test "x$have_libdca" = "xyes"; then
      		if test "x$use_late_binding" = "xno"; then
 -				AC_CHECK_LIB(dts, dts_init, , have_libdca=no)
@@ -46,3 +20,14 @@
      
      if test "x$have_libdca" = "xyes"; then
  		AC_DEFINE(USE_LIBDCA, 1, "[libdca detected]")
+--- avidemux_2.4.4.orig/avidemux/CMakeLists.txt	2008-10-03 07:05:09.000000000 -0400
++++ avidemux_2.4.4/avidemux/CMakeLists.txt	2009-02-18 23:45:12.000000000 -0500
+@@ -315,7 +315,7 @@
+ 
+ #libdts
+ if(USE_LIBDCA AND NOT USE_LATE_BINDING)
+-	add_libs_all_targets(dts)
++	add_libs_all_targets(dca)
+ endif(USE_LIBDCA AND NOT USE_LATE_BINDING)
+ 
+ # Lame


Index: avidemux.spec
===================================================================
RCS file: /cvs/free/rpms/avidemux/devel/avidemux.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- avidemux.spec	20 Dec 2008 21:39:46 -0000	1.12
+++ avidemux.spec	20 Feb 2009 04:41:56 -0000	1.13
@@ -1,8 +1,8 @@
 #define svndate 20080521
 
 Name:           avidemux
-Version:        2.4.3
-Release:        8%{?dist}
+Version:        2.4.4
+Release:        1%{?dist}
 Summary:        Graphical video editing and transcoding tool
 
 Group:          Applications/Multimedia
@@ -11,16 +11,14 @@
 Source0:        http://download.berlios.de/avidemux/avidemux_%{version}.tar.gz
 Source1:        %{name}-gtk.desktop
 Source2:        %{name}-qt.desktop
-Patch0:         avidemux-2.4.2-pulseaudio-default.patch
-Patch1:         avidemux-2.4.3-qt4.patch
+# Make PulseAudio the default audio out device
+Patch0:         avidemux-2.4-pulseaudio-default.patch
+# Search for lrelease-qt4 instead of lrelease
+Patch1:         avidemux-2.4-qt4.patch
+# Why are i18n files stored in bindir? Move to datadir...
 Patch2:         avidemux-2.4-i18n.patch
 # http://ftp.ncnu.edu.tw/Linux/Gentoo/gentoo-portage/media-video/avidemux/files/avidemux-2.4-libdca.patch
 Patch3:         avidemux-2.4-libdca.patch
-# http://avidemux.org/admForum/viewtopic.php?pid=29582#p29582
-# http://avidemux.org/admForum/viewtopic.php?id=3991
-Patch4:         avidemux-2.4.3-ppc.patch
-#http://bugs.gentoo.org/attachment.cgi?id=160132&action=view
-Patch5:         avidemux-x264.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:       %{name}-cli  = %{version}
@@ -114,12 +112,10 @@
 
 %prep
 %setup -q -n avidemux_%{version}
-%patch0 -b .pulse
-%patch1 -b .qt4
-%patch2 -b .i18n
-%patch3 -b .libdca
-%patch4 -b .ppc
-%patch5 -p1 -b .x264
+%patch0 -p1 -b .pulse
+%patch1 -p1 -b .qt4
+%patch2 -p1 -b .i18n
+%patch3 -p1 -b .libdca
 
 %build
 %cmake
@@ -146,7 +142,7 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog History README TODO
-%{_datadir}/%{name}/
+%dir %{_datadir}/%{name}
 
 %files cli
 %defattr(-,root,root,-)
@@ -159,10 +155,16 @@
 
 %files qt
 %defattr(-,root,root,-)
+%dir %{_datadir}/%{name}/i18n/
+%{_datadir}/%{name}/i18n/*.qm
 %{_bindir}/avidemux2_qt4
 %{_datadir}/applications/*qt*.desktop
 
 %changelog
+* Wed Feb 18 2009 Stewart Adam <s.adam at diffingo.com> - 2.4.4-1
+- Update to 2.4.4 final, update patches accordingly
+- Move Qt translation files to qt subpackage
+
 * Sun Dec 14 2008 Dominik Mierzejewski <rpm at greysector.net> - 2.4.3-8
 - Fix build with current x264
 


Index: sources
===================================================================
RCS file: /cvs/free/rpms/avidemux/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	16 Aug 2008 16:50:48 -0000	1.3
+++ sources	20 Feb 2009 04:41:56 -0000	1.4
@@ -1 +1 @@
-ff8e6ac186321e7e8bec9f8177df3724  avidemux_2.4.3.tar.gz
+503dfd25842ef81be7c769811e7bc54e  avidemux_2.4.4.tar.gz


--- avidemux-2.4.2-pulseaudio-default.patch DELETED ---


--- avidemux-2.4.3-ppc.patch DELETED ---


--- avidemux-2.4.3-qt4.patch DELETED ---


--- avidemux-x264.patch DELETED ---

More information about the rpmfusion-commits mailing list