Author: hobbes1069 Update of /cvs/free/rpms/avidemux/F-16 In directory se02.es.rpmfusion.net:/tmp/cvs-serv13817 Modified Files: avidemux.spec sources Added Files: avidemux-2.5.6-ffmpeg_aac.patch avidemux-2.5.6-ffmpeg_parallel_build.patch Log Message: * Fri Jan 27 2012 Richard Shaw <hobbes1069(a)gmail.com&gt; - 2.5.6-2 - Reenable FFmpeg based AAC encoding. avidemux-2.5.6-ffmpeg_aac.patch: cmake/admFFmpegBuild.cmake | 2 - plugins/ADM_audioEncoders/lavcodec/CMakeLists.txt | 9 ++++ plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp | 21 ++++++++--- 3 files changed, 26 insertions(+), 6 deletions(-) --- NEW FILE avidemux-2.5.6-ffmpeg_aac.patch --- diff -Naur avidemux_2.5.6.orig/cmake/admFFmpegBuild.cmake avidemux_2.5.6/cmake/admFFmpegBuild.cmake --- avidemux_2.5.6.orig/cmake/admFFmpegBuild.cmake 2012-01-27 15:05:15.029793577 -0600 +++ avidemux_2.5.6/cmake/admFFmpegBuild.cmake 2012-01-27 15:06:00.663291081 -0600 @@ -14,7 +14,7 @@ set(FFMPEG_DECODERS adpcm_ima_amv amv bmp cinepak cyuv dca dvbsub dvvideo ffv1 ffvhuff flac flv fraps h263 h264 huffyuv mjpeg mjpegb mpeg2video mpeg4 msmpeg4v2 msmpeg4v3 msvideo1 nellymoser png qdm2 rawvideo snow svq3 theora tscc vc1 vp3 vp6 vp6a vp6f wmav2 wmv1 wmv2 wmv3) -set(FFMPEG_ENCODERS ac3_fixed dvvideo ffv1 ffvhuff flv h263 huffyuv mjpeg mp2 mpeg1video mpeg2video mpeg4 snow) +set(FFMPEG_ENCODERS aac ac3_fixed dvvideo ffv1 ffvhuff flv h263 huffyuv mjpeg mp2 mpeg1video mpeg2video mpeg4 snow) set(FFMPEG_MUXERS flv matroska mpeg1vcd mpeg2dvd mpeg2svcd mpegts mov mp4 psp) set(FFMPEG_PARSERS ac3 h263 h264 mpeg4video) set(FFMPEG_PROTOCOLS file) diff -Naur avidemux_2.5.6.orig/plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp avidemux_2.5.6/plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp --- avidemux_2.5.6.orig/plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp 2011-12-28 08:51:49.000000000 -0600 +++ avidemux_2.5.6/plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp 2012-01-27 15:05:39.672982290 -0600 @@ -25,13 +25,16 @@ #include "ADM_lavcodec.h" #define Join(x,y) x##_##y -#if defined(ADM_LAV_MP2) && !defined(ADM_LAV_AC3) +#if defined(ADM_LAV_MP2) && !defined(ADM_LAV_AC3) && !defined(ADM_LAV_AAC) #define makeName(x) Join(x,MP2) #define AUDMEncoder_Lavcodec AUDMEncoder_Lavcodec_MP2 #else - #if !defined(ADM_LAV_MP2) && defined(ADM_LAV_AC3) + #if !defined(ADM_LAV_MP2) && defined(ADM_LAV_AC3) && !defined(ADM_LAV_AAC) #define makeName(x) Join(x,AC3) #define AUDMEncoder_Lavcodec AUDMEncoder_Lavcodec_AC3 + #elif !defined(ADM_LAV_MP2) && !defined(ADM_LAV_AC3) && defined(ADM_LAV_AAC) + #define makeName(x) Join(x,AAC) + #define AUDMEncoder_Lavcodec AUDMEncoder_Lavcodec_AAC #else #error #endif @@ -60,13 +63,19 @@ 2, // Max channels 1,0,0, // Version #else - - +#ifdef ADM_LAV_AC3 "LavAC3", "AC3 (lav)", "AC3 LavEncoder encoder plugin Mean 2008", 6, // Max channels 1,0,0, // Version +#else + "LavAAC", + "AAC (lav)", + "AAC LavEncoder encoder plugin Mean 2008", + 6, // Max channels + 1,0,0, // Version +#endif #endif makeName(WAV), @@ -132,7 +141,9 @@ #endif _wavheader->byterate=(lavConfig.bitrate*1000)>>3; -#ifdef ADM_LAV_MP2 +#if defined(ADM_LAV_AAC) + _chunk = 1024*_wavheader->channels; +#elif defined(ADM_LAV_MP2) _chunk = 1152*_wavheader->channels; #else _chunk = 1536*_wavheader->channels; // AC3 diff -Naur avidemux_2.5.6.orig/plugins/ADM_audioEncoders/lavcodec/CMakeLists.txt avidemux_2.5.6/plugins/ADM_audioEncoders/lavcodec/CMakeLists.txt --- avidemux_2.5.6.orig/plugins/ADM_audioEncoders/lavcodec/CMakeLists.txt 2010-05-25 15:48:57.000000000 -0500 +++ avidemux_2.5.6/plugins/ADM_audioEncoders/lavcodec/CMakeLists.txt 2012-01-27 15:05:39.673982248 -0600 @@ -27,3 +27,12 @@ INIT_AUDIO_ENCODER(ADM_ae_lav_ac3) INSTALL_AUDIOENCODER(ADM_ae_lav_ac3) + + SET(ADM_ae_lav_aac_SRCS audioencoder_lavcodec.cpp) + + ADD_LIBRARY(ADM_ae_lav_aac SHARED ${ADM_ae_lav_aac_SRCS}) + ADD_TARGET_CFLAGS(ADM_ae_lav_aac "-DADM_LAV_AAC") + TARGET_LINK_LIBRARIES(ADM_ae_lav_aac ADM_core ADM_coreAudio ADM_coreUI ADM_libavcodec ADM_libavutil) + + INIT_AUDIO_ENCODER(ADM_ae_lav_aac) + INSTALL_AUDIOENCODER(ADM_ae_lav_aac) avidemux-2.5.6-ffmpeg_parallel_build.patch: admFFmpegBuild.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- NEW FILE avidemux-2.5.6-ffmpeg_parallel_build.patch --- diff -Naur avidemux_2.5.6.orig/cmake/admFFmpegBuild.cmake avidemux_2.5.6/cmake/admFFmpegBuild.cmake --- avidemux_2.5.6.orig/cmake/admFFmpegBuild.cmake 2011-12-28 08:51:49.000000000 -0600 +++ avidemux_2.5.6/cmake/admFFmpegBuild.cmake 2012-01-26 14:07:41.928167845 -0600 @@ -167,7 +167,7 @@ # Build FFmpeg add_custom_command(OUTPUT "${FFMPEG_BINARY_DIR}/ffmpeg${CMAKE_EXECUTABLE_SUFFIX}" - COMMAND ${CMAKE_COMMAND} -DCMAKE_BUILD_TOOL=${CMAKE_BUILD_TOOL} -P "${CMAKE_SOURCE_DIR}/cmake/admFFmpegMake.cmake" + COMMAND ${CMAKE_COMMAND} -DCMAKE_BUILD_TOOL=$(MAKE) -P "${CMAKE_SOURCE_DIR}/cmake/admFFmpegMake.cmake" WORKING_DIRECTORY "${FFMPEG_BINARY_DIR}") add_custom_target(ffmpeg ALL Index: avidemux.spec =================================================================== RCS file: /cvs/free/rpms/avidemux/F-16/avidemux.spec,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- avidemux.spec 23 Sep 2011 16:00:16 -0000 1.55 +++ avidemux.spec 28 Jan 2012 16:10:02 -0000 1.56 @@ -1,8 +1,8 @@ %define _pkgbuilddir %{_builddir}/%{name}_%{version} Name: avidemux -Version: 2.5.5 -Release: 6%{?dist} +Version: 2.5.6 +Release: 2%{?dist} Summary: Graphical video editing and transcoding tool Group: Applications/Multimedia @@ -14,18 +14,18 @@ Source2: %{name}-qt.desktop # Patch0 obtained from avidemux-2.5.0-patches-1.tar.bz2: # http://mirror.csclub.uwaterloo.ca/gentoo-distfiles/distfiles/avidemux-2.5... -Patch0: 2.5.0-coreImage-parallel-build.patch +#Patch0: avidemux-2.5.6-parallel_build.patch Patch1: avidemux-2.5-pulseaudio-default.patch Patch2: avidemux-2.4-qt4.patch # Prevents avidemux from creating the symlinks for .so files, which we do below Patch3: avidemux-2.5.3-tmplinktarget.patch # libADM_xvidRateCtl.so and libADM_vidEnc_pluginOptions.so are supposed to be -# build statically according to upstream... Let's get them installed instead +# built statically according to upstream... Let's get them installed instead 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/00... #Patch6: avidemux_2.5.4-ffmpeg-aac.patch -Patch6: avidemux_2.5.5-ffmpeg_aac.patch +Patch6: avidemux-2.5.6-ffmpeg_aac.patch Patch7: avidemux-2.5.5-gcc46_tmp_fix.patch # Patch needed for version of x264 in F15/rawhide. # Use system libraries @@ -38,6 +38,7 @@ Patch13: avidemux-2.5.5-x264_i_to_b_open_gop.patch # Uses a header file not found in the standard package #Patch16: avidemux-2.5.4-mpeg2enc.patch +Patch14: avidemux-2.5.6-ffmpeg_parallel_build.patch # Upstream has been informed http://avidemux.org/admForum/viewtopic.php?id=6447 ExcludeArch: ppc ppc64 @@ -45,7 +46,6 @@ Requires: %{name}-cli = %{version}-%{release} Requires: %{name}-gui = %{version} Requires: %{name}-plugins = %{version} -Obsoletes: %{name}-devel # Compiling BuildRequires: cmake @@ -81,7 +81,6 @@ BuildRequires: libvorbis-devel >= 1.0.1 BuildRequires: libdca-devel BuildRequires: opencore-amr-devel -# VP8 support, decoding only? BuildRequires: libvpx-devel BuildRequires: twolame-devel @@ -150,6 +149,14 @@ %description qt This package contains the Qt graphical interface for %{name}. +%package devel +Summary: Development files for %{name} +Group: Development/Libraries +Requires: %{name}-libs = %{version}-%{release} + +%description devel +This package contains files required to develop with or extend %{name}. + %prep %setup -q -n %{name}_%{version} @@ -170,28 +177,21 @@ sed -i.bak 's/startDir="lib";/startDir="lib64";/' avidemux/main.cpp %endif -# Fix build with js 1.8.5 introduced in F15. -#find avidemux/ADM_script -name '*.h' -exec \ -#sed -i -e '/#include "jsapi.h"/ i\ -##undef malloc \ -##undef calloc \ -##undef realloc \ -##undef free' {} \; - -%patch0 -p1 -b .parallel +#patch0 -p1 -b .parallel %patch1 -p1 -b .pulse %patch2 -p1 -b .qt4 %patch3 -p1 -b .tmplinktarget %patch4 -p1 -b .mpeg2enc %patch5 -p1 -b .pluginlibs -#%patch6 -p1 -b .ffmpegaac +%patch6 -p1 -b .ffmpegaac %patch7 -p1 -b .gcc46tmpfix %patch8 -p1 -b .libass %patch9 -p1 -b .liba52 %patch10 -p1 -b .libmad %patch11 -p1 -b .libtwolame -%patch12 -p1 -b .lavencode -%patch13 -p1 -b .x264 +#patch12 -p1 -b .lavencode +#patch13 -p1 -b .x264 +%patch14 -p1 -b .ffmpegbuild %build @@ -220,11 +220,16 @@ %install +rm -rf %{buildroot} + make -C build install DESTDIR=%{buildroot} make -C build_plugins install DESTDIR=%{buildroot} +# Install the build configuration for devel package +install -d -m755 %{buildroot}%{_includedir} +install -m644 build/config/ADM_coreConfig.h %{buildroot}%{_includedir}/ADM_coreConfig.h install -d -m755 %{buildroot}%{_datadir}/pixmaps -install -pm0644 avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/pics/avidemux_icon.png %{buildroot}%{_datadir}/pixmaps/avidemux.png +install -m644 avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/pics/avidemux_icon.png %{buildroot}%{_datadir}/pixmaps/avidemux.png # Find and remove all la files find %{buildroot} -type f -name "*.la" -exec rm -f {} ';' @@ -254,6 +259,9 @@ # Gettext-style translations %find_lang %{name} +%clean +rm -rf %{buildroot} + %post libs -p /sbin/ldconfig @@ -282,6 +290,7 @@ %{_libdir}/libADM_render_cli.so %{_libdir}/ADM_plugins/videoFilter/*cli.so + %files gtk -f %{name}.lang %{_bindir}/avidemux2_gtk %{_libdir}/libADM_UIGtk.so @@ -301,14 +310,23 @@ %{_datadir}/applications/*qt*.desktop %dir %{_datadir}/%{name}/i18n +%files devel +%{_includedir}/ADM_coreConfig.h + %changelog +* Fri Jan 27 2012 Richard Shaw <hobbes1069(a)gmail.com&gt; - 2.5.6-2 +- Reenable FFmpeg based AAC encoding. + +* Wed Jan 25 2012 Richard Shaw <hobbes1069(a)gmail.com&gt; - 2.5.6-1 +- Update to latest release. + * Fri Sep 23 2011 Richard Shaw <hobbes1069(a)gmail.com&gt; - 2.5.5-6 - Obsolete useless devel subpackage which has multilib issues. * Mon Aug 07 2011 Richard Shaw <hobbes1069(a)gmail.com&gt; - 2.5.5-4 -- Moved UI specific libraries and plugins to their respective sub-package to - prevent unneeded dependencies from being installed. +- Moved UI specific libraries and plugins to their respective sub-package to prevent + unneeded dependencies from being installed. - Obsoleted plugins sub-package and combined with libs sub-package. * Fri Jul 15 2011 Richard Shaw <hobbes1069(a)gmail.com&gt; - 2.5.5-2 Index: sources =================================================================== RCS file: /cvs/free/rpms/avidemux/F-16/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 27 Jun 2011 14:09:10 -0000 1.9 +++ sources 28 Jan 2012 16:10:02 -0000 1.10 @@ -1 +1 @@ -33bbe210c6826cea1987ed18a41d57a7 avidemux_2.5.5.tar.gz +00e479dd806b94a98d3f0f40639e88a9 avidemux_2.5.6.tar.gz