rpms/avidemux/F-14 avidemux-2.5.4-audio_prefs.patch, NONE, 1.1 avidemux-2.5.4-ffmpeg_perms.patch, NONE, 1.1 avidemux.spec, 1.39, 1.40

Sun Apr 24 14:18:45 CEST 2011

Author: hobbes1069

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

Modified Files:
	avidemux.spec 
Added Files:
	avidemux-2.5.4-audio_prefs.patch 
	avidemux-2.5.4-ffmpeg_perms.patch 
Log Message:
* Sun Apr 24 2011 Richard Shaw <hobbes1069 at gmail.com> - 2.5.4-5
- AAC encoding now working. (Kevin Kolfer)
- Fedora 15 build dependecy fixed. (Kevin Kolfer)
- Audio device peferences now remembered.


avidemux-2.5.4-audio_prefs.patch:
 config.h.cmake |    2 --
 1 file changed, 2 deletions(-)

--- NEW FILE avidemux-2.5.4-audio_prefs.patch ---
diff -Naur avidemux_2.5.4.orig/cmake/config.h.cmake avidemux_2.5.4/cmake/config.h.cmake
--- avidemux_2.5.4.orig/cmake/config.h.cmake	2010-09-29 14:01:12.000000000 -0500
+++ avidemux_2.5.4/cmake/config.h.cmake	2011-04-22 10:52:22.664268351 -0500
@@ -76,9 +76,7 @@
 /* use Nvwa memory leak detector */
 #cmakedefine FIND_LEAKS
 
-#if defined(OSS_SUPPORT) || defined (USE_ARTS) || defined(USE_SDL) || defined(__APPLE__) || defined(__WIN32) || defined(ALSA_SUPPORT)
 #define HAVE_AUDIO
-#endif
 
 #define HAVE_ENCODER
 

avidemux-2.5.4-ffmpeg_perms.patch:
 admFFmpegBuild.cmake |   19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

--- NEW FILE avidemux-2.5.4-ffmpeg_perms.patch ---
diff -ur avidemux_2.5.4/cmake/admFFmpegBuild.cmake avidemux_2.5.4-ffmpeg-permissions/cmake/admFFmpegBuild.cmake
--- avidemux_2.5.4/cmake/admFFmpegBuild.cmake	2010-09-05 13:42:43.000000000 +0200
+++ avidemux_2.5.4-ffmpeg-permissions/cmake/admFFmpegBuild.cmake	2011-04-24 04:02:46.000000000 +0200
@@ -178,29 +178,36 @@
 	set(FFMPEG_INSTALL_DIR lib${LIB_SUFFIX})
 endif (WIN32)
 
+if (CMAKE_INSTALL_SO_NO_EXE)
+	set(FFMPEG_SHLIB_INSTALL_TYPE FILES)
+else (CMAKE_INSTALL_SO_NO_EXE)
+	set(FFMPEG_SHLIB_INSTALL_TYPE PROGRAMS)
+endif (CMAKE_INSTALL_SO_NO_EXE)
+
+
 add_library(ADM_libswscale UNKNOWN IMPORTED)
 set_property(TARGET ADM_libswscale PROPERTY IMPORTED_LOCATION "${FFMPEG_BINARY_DIR}/libswscale/${LIBSWSCALE_LIB}")
-install(FILES "${FFMPEG_BINARY_DIR}/libswscale/${LIBSWSCALE_LIB}" DESTINATION "${FFMPEG_INSTALL_DIR}")
+install(${FFMPEG_SHLIB_INSTALL_TYPE} "${FFMPEG_BINARY_DIR}/libswscale/${LIBSWSCALE_LIB}" DESTINATION "${FFMPEG_INSTALL_DIR}")
 
 add_library(ADM_libpostproc UNKNOWN IMPORTED)
 set_property(TARGET ADM_libpostproc PROPERTY IMPORTED_LOCATION "${FFMPEG_BINARY_DIR}/libpostproc/${LIBPOSTPROC_LIB}")
-install(FILES "${FFMPEG_BINARY_DIR}/libpostproc/${LIBPOSTPROC_LIB}" DESTINATION "${FFMPEG_INSTALL_DIR}")
+install(${FFMPEG_SHLIB_INSTALL_TYPE} "${FFMPEG_BINARY_DIR}/libpostproc/${LIBPOSTPROC_LIB}" DESTINATION "${FFMPEG_INSTALL_DIR}")
 
 add_library(ADM_libavutil UNKNOWN IMPORTED)
 set_property(TARGET ADM_libavutil PROPERTY IMPORTED_LOCATION "${FFMPEG_BINARY_DIR}/libavutil/${LIBAVUTIL_LIB}")
-install(FILES "${FFMPEG_BINARY_DIR}/libavutil/${LIBAVUTIL_LIB}" DESTINATION "${FFMPEG_INSTALL_DIR}")
+install(${FFMPEG_SHLIB_INSTALL_TYPE} "${FFMPEG_BINARY_DIR}/libavutil/${LIBAVUTIL_LIB}" DESTINATION "${FFMPEG_INSTALL_DIR}")
 
 add_library(ADM_libavcodec UNKNOWN IMPORTED)
 set_property(TARGET ADM_libavcodec PROPERTY IMPORTED_LOCATION "${FFMPEG_BINARY_DIR}/libavcodec/${LIBAVCODEC_LIB}")
-install(FILES "${FFMPEG_BINARY_DIR}/libavcodec/${LIBAVCODEC_LIB}" DESTINATION "${FFMPEG_INSTALL_DIR}")
+install(${FFMPEG_SHLIB_INSTALL_TYPE} "${FFMPEG_BINARY_DIR}/libavcodec/${LIBAVCODEC_LIB}" DESTINATION "${FFMPEG_INSTALL_DIR}")
 
 add_library(ADM_libavformat UNKNOWN IMPORTED)
 set_property(TARGET ADM_libavformat PROPERTY IMPORTED_LOCATION "${FFMPEG_BINARY_DIR}/libavformat/${LIBAVFORMAT_LIB}")
-install(FILES "${FFMPEG_BINARY_DIR}/libavformat/${LIBAVFORMAT_LIB}" DESTINATION "${FFMPEG_INSTALL_DIR}")
+install(${FFMPEG_SHLIB_INSTALL_TYPE} "${FFMPEG_BINARY_DIR}/libavformat/${LIBAVFORMAT_LIB}" DESTINATION "${FFMPEG_INSTALL_DIR}")
 
 add_library(ADM_libavcore UNKNOWN IMPORTED)
 set_property(TARGET ADM_libavcore PROPERTY IMPORTED_LOCATION "${FFMPEG_BINARY_DIR}/libavcore/${LIBAVCORE_LIB}")
-install(FILES "${FFMPEG_BINARY_DIR}/libavcore/${LIBAVCORE_LIB}" DESTINATION "${FFMPEG_INSTALL_DIR}")
+install(${FFMPEG_SHLIB_INSTALL_TYPE} "${FFMPEG_BINARY_DIR}/libavcore/${LIBAVCORE_LIB}" DESTINATION "${FFMPEG_INSTALL_DIR}")
 
 include_directories("${FFMPEG_SOURCE_DIR}")
 include_directories("${FFMPEG_SOURCE_DIR}/libavutil")


Index: avidemux.spec
===================================================================
RCS file: /cvs/free/rpms/avidemux/F-14/avidemux.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- avidemux.spec	21 Apr 2011 01:59:03 -0000	1.39
+++ avidemux.spec	24 Apr 2011 12:18:44 -0000	1.40
@@ -2,7 +2,7 @@
 
 Name:           avidemux
 Version:        2.5.4
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Graphical video editing and transcoding tool
 
 Group:          Applications/Multimedia
@@ -38,12 +38,14 @@
 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
+Patch10:        avidemux-2.5.4-ext_lib_cmake_fix.patch
+Patch11:        avidemux-2.5.4-audio_prefs.patch
+Patch12:        avidemux-2.5.4-ffmpeg_perms.patch
 
 # Upstream has been informed http://avidemux.org/admForum/viewtopic.php?id=6447
 ExcludeArch: ppc ppc64
@@ -184,13 +186,14 @@
 %patch3 -p1 -b .tmplinktarget
 %patch4 -p1 -b .mpeg2enc
 %patch5 -p1 -b .pluginlibs
-# Does not work as is. Disabled for now.
-#%patch6 -p1 -b .ffmpegaac
+%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
+%patch11 -p1 -b .audioprefs
+%patch12 -p1 -b .ffmpegperms
 
 %build
 # Out of source build
@@ -293,6 +296,11 @@
 %{_includedir}/ADM_coreConfig.h
 
 %changelog
+* Sun Apr 24 2011 Richard Shaw <hobbes1069 at gmail.com> - 2.5.4-5
+- AAC encoding now working. (Kevin Kolfer)
+- Fedora 15 build dependecy fixed. (Kevin Kolfer)
+- Audio device peferences now remembered.
+
 * 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.

