rpms/avidemux/F-10 avidemux-2.4-cmake264.patch, NONE, 1.1 avidemux-2.4-pulseaudio-default.patch, 1.1, 1.2 avidemux.spec, 1.11, 1.12

[Stewart Adam]

Author: firewing

Update of /cvs/free/rpms/avidemux/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv7518/F-10

Modified Files:
	avidemux-2.4-pulseaudio-default.patch avidemux.spec 
Added Files:
	avidemux-2.4-cmake264.patch 
Log Message:
* Fri Jun 19 2009 Stewart Adam <s.adam at diffingo.com> - 2.4.4-9
- Add patch to fix build with CMake 2.6.4
- Update gcc44 patch to match Gentoo upstream
- Update PulseAudio patch to work as expected with avidemux 2.4.4


avidemux-2.4-cmake264.patch:

--- NEW FILE avidemux-2.4-cmake264.patch ---
diff -uNr avidemux_2.4.4.orig/avidemux/CMakeLists.txt avidemux_2.4.4/avidemux/CMakeLists.txt
--- avidemux_2.4.4.orig/avidemux/CMakeLists.txt	2009-05-06 13:00:10.000000000 +0200
+++ avidemux_2.4.4/avidemux/CMakeLists.txt	2009-05-06 13:00:49.000000000 +0200
@@ -84,7 +84,6 @@
 ADM_audio
 ADM_script 
 ADM_videoFilter
-ADM_filter
 ADM_video 
 ADM_audiodevice
 ADM_ocr  
@@ -93,6 +92,24 @@
 
 FOREACH(_current ${ADM_SUBDIR})
 	ADD_SUBDIRECTORY(${_current})
+ENDFOREACH(_current ${ADM_SUBDIR})
+
+SET(ADM_SUBDIR 
+ADM_filter
+ADM_audiofilter 
+ADM_editor
+ADM_audiocodec 
+ADM_audio
+ADM_script 
+ADM_videoFilter
+ADM_filter
+ADM_video 
+ADM_audiodevice
+ADM_ocr  
+ADM_colorspace 
+)
+
+FOREACH(_current ${ADM_SUBDIR})
 	add_libs_all_targets(${_current})
 ENDFOREACH(_current ${ADM_SUBDIR})
 

avidemux-2.4-pulseaudio-default.patch:

Index: avidemux-2.4-pulseaudio-default.patch
===================================================================
RCS file: /cvs/free/rpms/avidemux/F-10/avidemux-2.4-pulseaudio-default.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- avidemux-2.4-pulseaudio-default.patch	20 Feb 2009 04:56:42 -0000	1.1
+++ avidemux-2.4-pulseaudio-default.patch	19 Jun 2009 20:04:33 -0000	1.2
@@ -1,5 +1,16 @@
---- 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
+--- ./avidemux/ADM_libraries/ADM_utilities/prefs.cpp.orig	2009-06-19 15:41:02.618558127 -0400
++++ ./avidemux/ADM_libraries/ADM_utilities/prefs.cpp	2009-06-19 15:41:08.552557321 -0400
+@@ -105,7 +105,7 @@
+ #else
+ 	{"device.audiodevice",		STRING,"ALSA",	NULL, NULL, NULL },
+ #endif
+-	{"device.audio.alsa_device",		STRING,"dmix",	NULL, NULL, NULL },
++	{"device.audio.alsa_device",		STRING,"pulse",	NULL, NULL, NULL },
+ 	{"device.videodevice",		UINT,	"0",	NULL,	"0",	"10"	},
+ 	{"default.postproc_type",		UINT,	"3",	NULL,	"0",	"7"	},
+ 	{"default.postproc_value",		UINT,	"3",	NULL,	"0",	"5"	},
+--- avidemux/prefs.in.orig	2008-07-23 12:47:32.000000000 -0400
++++ avidemux/prefs.in	2009-06-19 15:23:43.656584530 -0400
 @@ -55,7 +55,7 @@
  #else
  device.audiodevice,			STRING,	ALSA


Index: avidemux.spec
===================================================================
RCS file: /cvs/free/rpms/avidemux/F-10/avidemux.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- avidemux.spec	20 Feb 2009 05:19:37 -0000	1.11
+++ avidemux.spec	19 Jun 2009 20:04:33 -0000	1.12
@@ -2,7 +2,7 @@
 
 Name:           avidemux
 Version:        2.4.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Graphical video editing and transcoding tool
 
 Group:          Applications/Multimedia
@@ -19,6 +19,10 @@
 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
+# Fix building with cmake 2.6.4+
+# Patch from: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/avidemux/files/avidemux-2.4-cmake264.patch?rev=1.1&view=markup
+Patch4:         avidemux-2.4-cmake264.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:       %{name}-cli  = %{version}
@@ -112,24 +116,27 @@
 
 %prep
 %setup -q -n avidemux_%{version}
-%patch0 -p1 -b .pulse
+%patch0 -b .pulse
 %patch1 -p1 -b .qt4
 %patch2 -p1 -b .i18n
 %patch3 -p1 -b .libdca
+%patch4 -p1 -b .cmake
 
 %build
 %cmake
+# po/ not smp safe - http://bugs.avidemux.org/index.php?do=details&task_id=605
+make -C po
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-desktop-file-install --vendor livna \
+desktop-file-install --vendor rpmfusion \
     --dir $RPM_BUILD_ROOT%{_datadir}/applications \
     %{SOURCE1}
 
-desktop-file-install --vendor livna \
+desktop-file-install --vendor rpmfusion \
     --dir $RPM_BUILD_ROOT%{_datadir}/applications \
     %{SOURCE2}
 
@@ -161,6 +168,11 @@
 %{_datadir}/applications/*qt*.desktop
 
 %changelog
+* Fri Jun 19 2009 Stewart Adam <s.adam at diffingo.com> - 2.4.4-3
+- Add patch to fix build with CMake 2.6.4
+- Update PulseAudio patch to work as expected with avidemux 2.4.4
+- skip %%_smp_mflags in po (Rex Dieter)
+
 * Fri Feb 20 2009 Stewart Adam <s.adam at diffingo.com> - 2.4.4-2
 - Sync libdca and i18n patches with devel