Author: firewing Update of /cvs/free/rpms/avidemux/F-14 In directory se02.es.rpmfusion.net:/tmp/cvs-serv8359 Modified Files: .cvsignore avidemux.spec sources Added Files: avidemux_2.5.4-ffmpeg-aac.patch Removed Files: 2.5.3_mjpeg_fix.diff avidemux-2.5.3-field-asm-fix.diff avidemux_2.5.3-ffmpeg-aac.patch Log Message: * Sat Nov 20 2010 Stewart Adam <s.adam at diffingo.com> - 2.5.4-1 - Update to 2.5.4 - Fix Qt translations (Kevin Kofler) avidemux_2.5.4-ffmpeg-aac.patch: CMakeLists.txt | 9 +++++++++ audioencoder_lavcodec.cpp | 21 ++++++++++++++++----- 2 files changed, 25 insertions(+), 5 deletions(-) --- NEW FILE avidemux_2.5.4-ffmpeg-aac.patch --- diff -ur avidemux_2.5.4/plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp avidemux_2.5.4-ffmpeg-aac/plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp --- avidemux_2.5.4/plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp.ffmpegaac 2010-05-25 16:48:57.000000000 -0400 +++ avidemux_2.5.4/plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp 2010-11-20 16:26:36.756237795 -0500 @@ -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 -ur avidemux_2.5.4/plugins/ADM_audioEncoders/lavcodec/CMakeLists.txt avidemux_2.5.4-ffmpeg-aac/plugins/ADM_audioEncoders/lavcodec/CMakeLists.txt --- avidemux_2.5.4/plugins/ADM_audioEncoders/lavcodec/CMakeLists.txt.ffmpegaac 2010-05-25 16:48:57.000000000 -0400 +++ avidemux_2.5.4/plugins/ADM_audioEncoders/lavcodec/CMakeLists.txt 2010-11-20 16:24:10.171164293 -0500 @@ -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) Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/avidemux/F-14/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 27 May 2010 02:05:51 -0000 1.7 +++ .cvsignore 20 Nov 2010 23:55:16 -0000 1.8 @@ -1 +1 @@ -avidemux_2.5.3.tar.gz +avidemux_2.5.4.tar.gz Index: avidemux.spec =================================================================== RCS file: /cvs/free/rpms/avidemux/F-14/avidemux.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- avidemux.spec 5 Nov 2010 16:35:59 -0000 1.37 +++ avidemux.spec 20 Nov 2010 23:55:16 -0000 1.38 @@ -1,8 +1,8 @@ %define _pkgbuilddir %{_builddir}/%{name}_%{version} Name: avidemux -Version: 2.5.3 -Release: 6%{?dist} +Version: 2.5.4 +Release: 1%{?dist} Summary: Graphical video editing and transcoding tool Group: Applications/Multimedia @@ -33,17 +33,12 @@ 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 -# Fixes multiple definitions of mjpeg_log -# http://fixounet.free.fr/2.6/2.5.3_mjpeg_fix.diff -Patch4: 2.5.3_mjpeg_fix.diff # libADM_xvidRateCtl.so and libADM_vidEnc_pluginOptions.so are supposed to be # build statically according to upstream... Let's get them installed instead -Patch5: avidemux-2.5.3-mpeg2enc.patch -Patch6: avidemux-2.5.3-pluginlibs.patch -# Patch7 obtained from http://fixounet.free.fr/2.6/2.5.3_field_asm_fix.diff -Patch7: avidemux-2.5.3-field-asm-fix.diff +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... -Patch8: avidemux_2.5.3-ffmpeg-aac.patch +Patch6: avidemux_2.5.4-ffmpeg-aac.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # Upstream has been informed http://avidemux.org/admForum/viewtopic.php?id=6447 @@ -56,6 +51,7 @@ # Compiling BuildRequires: cmake BuildRequires: gettext-devel +BuildRequires: libxslt # Libraries BuildRequires: yasm-devel @@ -175,11 +171,9 @@ %patch1 -p1 -b .pulse %patch2 -p1 -b .qt4 %patch3 -p1 -b .tmplinktarget -%patch4 -p1 -b .mjpeg_log -%patch5 -p1 -b .mpeg2enc -%patch6 -p1 -b .pluginlibs -%patch7 -p1 -b .x264asm -%patch8 -p1 -b .ffmpegaac +%patch4 -p1 -b .mpeg2enc +%patch5 -p1 -b .pluginlibs +%patch6 -p1 -b .ffmpegaac %build # Out of source build @@ -216,6 +210,11 @@ # Find and remove all la files find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' +# Remove Windows-only executables +# Must check this for new Linux-relevant files upon new avidemux releases +rm -rf $RPM_BUILD_ROOT%{_datadir}/ADM_addons/avsfilter +rmdir $RPM_BUILD_ROOT%{_datadir}/ADM_addons/ + # Install .desktop shortcuts desktop-file-install --vendor rpmfusion \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ @@ -225,6 +224,15 @@ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ %{SOURCE2} +# Remove duplicated Qt translations +rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/i18n/qt_*.qm +# find_lang.sh doesn't recognize this one, and there already is avidemux_sr.qm +rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/i18n/avidemux_sr(a)latin.qm + +# Qt-style translations +%find_lang %{name} --with-qt --without-mo +mv -f %{name}.lang %{name}-qt.lang +# Gettext-style translations %find_lang %{name} %clean @@ -237,7 +245,7 @@ %defattr(-,root,root,-) # metapackage, no files -%files libs -f %{name}.lang +%files libs %doc AUTHORS COPYING README TODO %{_datadir}/ADM_scripts/ %{_datadir}/pixmaps/avidemux.png @@ -247,16 +255,16 @@ %defattr(-,root,root,-) %{_bindir}/avidemux2_cli -%files gtk +%files gtk -f %{name}.lang %defattr(-,root,root,-) %{_bindir}/avidemux2_gtk %{_datadir}/applications/*gtk*.desktop -%files qt +%files qt -f %{name}-qt.lang %defattr(-,root,root,-) -%{_datadir}/%{name}/i18n/ %{_bindir}/avidemux2_qt4 %{_datadir}/applications/*qt*.desktop +%dir %{_datadir}/%{name}/i18n %files plugins %defattr(-,root,root,-) @@ -267,6 +275,10 @@ %{_includedir}/ADM_coreConfig.h %changelog +* Sat Nov 20 2010 Stewart Adam <s.adam at diffingo.com> - 2.5.4-1 +- Update to 2.5.4 +- Fix Qt translations (Kevin Kofler) + * Fri Nov 5 2010 Stewart Adam <s.adam at diffingo.com> - 2.5.3-6 - Remove dir /usr/share/avidemux as nothing installs there anymore Index: sources =================================================================== RCS file: /cvs/free/rpms/avidemux/F-14/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 27 May 2010 02:05:52 -0000 1.7 +++ sources 20 Nov 2010 23:55:16 -0000 1.8 @@ -1 +1 @@ -5a688029895b66b65ca86b7c85a03ee3 avidemux_2.5.3.tar.gz +b849460f6480df92bfd72d1a3dc288d4 avidemux_2.5.4.tar.gz --- 2.5.3_mjpeg_fix.diff DELETED --- --- avidemux-2.5.3-field-asm-fix.diff DELETED --- --- avidemux_2.5.3-ffmpeg-aac.patch DELETED ---