packages (DEVEL): avidemux/avidemux.spec - gcc and types fixes

[glen]

Author: glen                         Date: Tue Jul  7 23:08:02 2009 GMT
Module: packages                      Tag: DEVEL
---- Log message:
- gcc and types fixes

---- Files affected:
packages/avidemux:
   avidemux.spec (1.71.2.1 -> 1.71.2.2) 

---- Diffs:

================================================================
Index: packages/avidemux/avidemux.spec
diff -u packages/avidemux/avidemux.spec:1.71.2.1 packages/avidemux/avidemux.spec:1.71.2.2
--- packages/avidemux/avidemux.spec:1.71.2.1	Tue Jul  7 23:50:59 2009
+++ packages/avidemux/avidemux.spec	Wed Jul  8 01:07:57 2009
@@ -2,8 +2,10 @@
 # TODO:
 # - create aften.spec (aften.sf.net) and use it
 # - needs some cmake magican to fixup the bconds
-# - use external ffmpeg, seamonkey
+# - use external seamonkey (cmake fix needed)
 # - sync or use .desktop from sources
+# - subpackages per ui engine
+# - uses patched ffmpeg
 #
 # Conditional build:
 %bcond_without	esd	# disable EsounD sound support
@@ -26,6 +28,8 @@
 Source0:	http://dl.sourceforge.net/avidemux/%{name}_%{version}.tar.gz
 # Source0-md5:	69624352ac4e4cbb507e02b2bace5f56
 Source1:	%{name}.desktop
+Patch0:		gcc44.patch
+Patch1:		types.patch
 #Patch0:		%{name}-autoconf.patch
 #Patch1:		%{name}-dts_internal.patch
 #Patch2:		%{name}-sparc64.patch
@@ -77,16 +81,19 @@
 #%patch1 -p0
 #%patch2 -p1
 
+find '(' -name '*.js' -o -name '*.cpp' -o -name '*.h' ')' -print0 | xargs -0 %{__sed} -i -e 's,\r$,,'
+%patch0 -p1
+%patch1 -p1
+
 echo 'pt_BR' >> po/LINGUAS
-find -name '*.js' -print0 | xargs -0 %{__sed} -i -e 's,\r$,,'
 
 %build
 install -d build
 cd build
 %cmake \
-	%{?debug:-DCMAKE_BUILD_TYPE=Debug -DVERBOSE=1} \
+	-DCMAKE_INSTALL_DIR=/usr \
+	-DCMAKE_BUILD_TYPE=%{?debug:Debug}%{!?debug:Release} \
 	..
-#-DAVIDEMUX_INSTALL_PREFIX=path_to_avidemux_install
 %{__make}
 
 %install
@@ -97,7 +104,8 @@
 	DESTDIR=$RPM_BUILD_ROOT
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
-install avidemux_icon.png $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png
+cp -a avidemux_icon.png $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png
+install -p avidemux/avidemux2_gtk $RPM_BUILD_ROOT%{_bindir}/avidemux2_gtk
 
 %find_lang %{name}
 
@@ -119,6 +127,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.71.2.2  2009/07/07 23:07:57  glen
+- gcc and types fixes
+
 Revision 1.71.2.1  2009/07/07 21:50:59  glen
 - prepare for 2.5.0
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/avidemux/avidemux.spec?r1=1.71.2.1&r2=1.71.2.2&f=u