rpms/avidemux/devel avidemux.spec,1.40,1.41

[Richard Shaw]

Author: hobbes1069

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

Modified Files:
	avidemux.spec 
Log Message:
* Wed Apr 20 2011 Richard Shaw <hobbes1069 at gmail.com> - 2.5.4-4
- Disabled non-working patch for experimental aac encoding with ffmpeg.
- Removed dependency on bundled javascript library. Now uses system library.
- Added optional opencore-amr decoding support.



Index: avidemux.spec
===================================================================
RCS file: /cvs/free/rpms/avidemux/devel/avidemux.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- avidemux.spec	19 Apr 2011 23:50:00 -0000	1.40
+++ avidemux.spec	21 Apr 2011 01:56:25 -0000	1.41
@@ -2,7 +2,7 @@
 
 Name:           avidemux
 Version:        2.5.4
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Graphical video editing and transcoding tool
 
 Group:          Applications/Multimedia
@@ -38,11 +38,12 @@
 Patch4:         avidemux-2.5.3-mpeg2enc.patch
 Patch5:         avidemux-2.5.3-pluginlibs.patch
 # Patch8 obtained from http://lists.rpmfusion.org/pipermail/rpmfusion-developers/2010-October/008645.html
-Patch6:         avidemux_2.5.4-ffmpeg-aac.patch
+#Patch6:         avidemux_2.5.4-ffmpeg-aac.patch
 Patch7:         avidemux-2.5.4-gcc46_tmp_fix.patch
 Patch8:         avidemux-2.5.4-gtk_menu_crash_fix.patch
 # Patch needed for version of x264 in F15/rawhide.
 Patch9:         avidemux-2.5.4-x264_fix.patch
+#Patch10:        avidemux-2.5.4-ext_lib_cmake_fix.patch
 
 # Upstream has been informed http://avidemux.org/admForum/viewtopic.php?id=6447
 ExcludeArch: ppc ppc64
@@ -83,6 +84,9 @@
 BuildRequires:  libogg-devel >= 1.1
 BuildRequires:  libvorbis-devel >= 1.0.1
 BuildRequires:  libdca-devel
+BuildRequires:  opencore-amr-devel
+# VP8 support, decoding only?
+BuildRequires:  libvpx-devel
 
 
 # Video Codecs
@@ -164,6 +168,10 @@
 %prep
 %setup -q -n avidemux_%{version}
 
+# Remove unneeded external libraries
+# Currently breaks building if it doesn't exist.
+#rm -rf avidemux/ADM_script
+
 # change hardcoded libdir paths
 %ifarch x86_64 ppc64
 sed -i.bak 's/startDir="lib";/startDir="lib64";/' avidemux/ADM_core/src/ADM_fileio.cpp
@@ -176,10 +184,13 @@
 %patch3 -p1 -b .tmplinktarget
 %patch4 -p1 -b .mpeg2enc
 %patch5 -p1 -b .pluginlibs
-%patch6 -p1 -b .ffmpegaac
+# Does not work as is. Disabled for now.
+#%patch6 -p1 -b .ffmpegaac
 %patch7 -p1 -b .gcc46tmpfix
 %patch8 -b .gtk_menu
 %patch9 -p1 -b .x264fix
+# Fixes cmake configuration but build fails.
+#%patch10 -p1 -b .extlibfix
 
 %build
 # Out of source build
@@ -187,6 +198,7 @@
 %cmake -DAVIDEMUX_INSTALL_PREFIX=%{_prefix} \
        -DAVIDEMUX_SOURCE_DIR="%{_pkgbuilddir}" \
        -DAVIDEMUX_CORECONFIG_DIR="%{_pkgbuilddir}/build/config" \
+       -DUSE_SYSTEM_SPIDERMONKEY:BOOL=ON \
        ..
 make %{?_smp_mflags}
 # Create the temp link directory manually since otherwise it happens too early
@@ -281,6 +293,11 @@
 %{_includedir}/ADM_coreConfig.h
 
 %changelog
+* Wed Apr 20 2011 Richard Shaw <hobbes1069 at gmail.com> - 2.5.4-4
+- Disabled non-working patch for experimental aac encoding with ffmpeg.
+- Removed dependency on bundled javascript library. Now uses system library.
+- Added optional opencore-amr decoding support.
+
 * Tue Apr 19 2011 Richard Shaw <hobbes1069 at gmail.com> - 2.5.4-3
 - Fixes gcc 4.6 errors that used to be warnings.
 - Fixes compile issues with x264 being too new.