Author: firewing Update of /cvs/free/rpms/avidemux/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv5896 Modified Files: .cvsignore avidemux-gtk.desktop avidemux-qt.desktop avidemux.spec sources Added Files: 2.5.3_mjpeg_fix.diff avidemux-2.5.3-mpeg2enc.patch avidemux-2.5.3-pluginlibs.patch avidemux-2.5.3-tmplinktarget.patch Removed Files: avidemux-2.5-checkfunction-includes.patch avidemux-2.5-i18n.patch avidemux-2.5.1-tmplinktarget.patch Log Message: * Wed May 26 2010 Stewart Adam <s.adam at diffingo.com> - 2.5.3-2 - Bump for F-13 --> devel EVR 2.5.3_mjpeg_fix.diff: CMakeLists.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) --- NEW FILE 2.5.3_mjpeg_fix.diff --- diff --git a/plugins/ADM_videoEncoder/ADM_vidEnc_mpeg2enc/mpeg2enc/CMakeLists.txt b/plugins/ADM_videoEncoder/ADM_vidEnc_mpeg2enc/mpeg2enc/CMakeLists.txt index 43baf2a..e36e5f5 100644 --- a/plugins/ADM_videoEncoder/ADM_vidEnc_mpeg2enc/mpeg2enc/CMakeLists.txt +++ b/plugins/ADM_videoEncoder/ADM_vidEnc_mpeg2enc/mpeg2enc/CMakeLists.txt @@ -6,7 +6,8 @@ build_sub22_mests.cc feedframe.cc mblock_bsumsq_mmx.cc motionse build_sub44_mests.cc find_best_one_pel.cc mblock_sad_mmx.cc mpeg2enc.cc predict_mmx.cc putvlc.cc synchrolib.cc conform.cc idct.cc mblock_sad_mmxe.cc mpeg2enc_if.cc predict_ref.cc quantize.cc transfrm.cc cpu_accel.cc idctdata.cc mblock_sub44_sads_x86.cc mpeg2param.cc predict_x86.cc quantize_ref.cc transfrm_ref.cc -fdctdata.cc idct_mmx.cc mjpeg_logging.c mpeg2setup.cc putbits.cc quantize_x86.cc transfrm_x86.cc +fdctdata.cc idct_mmx.cc +mpeg2setup.cc putbits.cc quantize_x86.cc transfrm_x86.cc fdct_mmx.cc ioio.c mblock_sumsq_mmx.cc mpegconsts.cc puthdr.cc quant_mmx2.cc writepic.cc fdctref.cc macroblock.cc motion.cc predcomp_mmx.cc putmpg.cc ratectl.cc) @@ -45,4 +46,5 @@ add_library(${ADM_LIB} ${${ADM_LIB}_SRCS}) if (UNIX) add_target_cflags(mpeg2enc -fPIC) -endif (UNIX) \ No newline at end of file +endif (UNIX) + avidemux-2.5.3-mpeg2enc.patch: CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- NEW FILE avidemux-2.5.3-mpeg2enc.patch --- --- avidemux_2.5.3/plugins/ADM_videoEncoder/ADM_vidEnc_mpeg2enc/mpeg2enc/CMakeLists.txt.orig 2010-05-19 18:04:45.640566565 -0400 +++ avidemux_2.5.3/plugins/ADM_videoEncoder/ADM_vidEnc_mpeg2enc/mpeg2enc/CMakeLists.txt 2010-05-19 18:05:01.255568336 -0400 @@ -42,7 +42,7 @@ ENDIF (NOT APPLE) ENDIF (ADM_CPU_X86) -add_library(${ADM_LIB} ${${ADM_LIB}_SRCS}) +add_library(${ADM_LIB} STATIC ${${ADM_LIB}_SRCS}) if (UNIX) add_target_cflags(mpeg2enc -fPIC) avidemux-2.5.3-pluginlibs.patch: pluginOptions/CMakeLists.txt | 5 ++++- xvidRateCtl/CMakeLists.txt | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) --- NEW FILE avidemux-2.5.3-pluginlibs.patch --- --- avidemux_2.5.3/plugins/ADM_videoEncoder/common/pluginOptions/CMakeLists.txt.orig 2010-05-19 17:59:29.921690913 -0400 +++ avidemux_2.5.3/plugins/ADM_videoEncoder/common/pluginOptions/CMakeLists.txt 2010-05-19 18:00:08.825566160 -0400 @@ -13,4 +13,7 @@ if (UNIX) add_target_cflags(ADM_vidEnc_pluginOptions -fPIC) -endif (UNIX) \ No newline at end of file +endif (UNIX) + +INSTALL(TARGETS ADM_vidEnc_pluginOptions RUNTIME DESTINATION ${BIN_DIR} LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX}) + --- avidemux_2.5.3/plugins/ADM_videoEncoder/common/xvidRateCtl/CMakeLists.txt.orig 2010-05-19 17:57:00.680690875 -0400 +++ avidemux_2.5.3/plugins/ADM_videoEncoder/common/xvidRateCtl/CMakeLists.txt 2010-05-19 17:59:56.794691281 -0400 @@ -2,4 +2,7 @@ if (UNIX) add_target_cflags(ADM_xvidRateCtl -fPIC) -endif (UNIX) \ No newline at end of file +endif (UNIX) + +INSTALL(TARGETS ADM_xvidRateCtl RUNTIME DESTINATION ${BIN_DIR} LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX}) + avidemux-2.5.3-tmplinktarget.patch: CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- NEW FILE avidemux-2.5.3-tmplinktarget.patch --- --- avidemux_2.5.3/avidemux/CMakeLists.txt.orig 2010-04-30 12:30:20.000000000 -0400 +++ avidemux_2.5.3/avidemux/CMakeLists.txt 2010-05-19 14:25:31.456566543 -0400 @@ -490,5 +490,5 @@ ENDMACRO (ADM_SYMLINK_LIBS) IF (UNIX AND NOT APPLE) # Some plugins link to ADM_coreImage (e.g., ADM_vf_addborders) and thus need the symlink in ${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX} - ADM_SYMLINK_LIBS(ffmpeg ADM_coreImage) + #ADM_SYMLINK_LIBS(ffmpeg ADM_coreImage) ENDIF(UNIX AND NOT APPLE) Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/avidemux/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 18 Jan 2010 21:13:36 -0000 1.6 +++ .cvsignore 27 May 2010 02:05:51 -0000 1.7 @@ -1 +1 @@ -avidemux_2.5.2.tar.gz +avidemux_2.5.3.tar.gz Index: avidemux-gtk.desktop =================================================================== RCS file: /cvs/free/rpms/avidemux/devel/avidemux-gtk.desktop,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- avidemux-gtk.desktop 23 Oct 2009 06:23:00 -0000 1.3 +++ avidemux-gtk.desktop 27 May 2010 02:05:51 -0000 1.4 @@ -1,7 +1,7 @@ [Desktop Entry] Name=Avidemux Video Editor (GTK) Comment=Graphical video editing tool - GTK interface -Icon=gnome-multimedia +Icon=avidemux Exec=avidemux2_gtk Terminal=false Type=Application Index: avidemux-qt.desktop =================================================================== RCS file: /cvs/free/rpms/avidemux/devel/avidemux-qt.desktop,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- avidemux-qt.desktop 23 Oct 2009 06:23:00 -0000 1.3 +++ avidemux-qt.desktop 27 May 2010 02:05:51 -0000 1.4 @@ -1,7 +1,7 @@ [Desktop Entry] Name=Avidemux Video Editor (Qt) Comment=Graphical video editing tool - Qt interface -Icon=gnome-multimedia +Icon=avidemux Exec=avidemux2_qt4 Terminal=false Type=Application Index: avidemux.spec =================================================================== RCS file: /cvs/free/rpms/avidemux/devel/avidemux.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- avidemux.spec 31 Jan 2010 00:31:44 -0000 1.32 +++ avidemux.spec 27 May 2010 02:05:51 -0000 1.33 @@ -1,8 +1,8 @@ %define _pkgbuilddir %{_builddir}/%{name}_%{version} Name: avidemux -Version: 2.5.2 -Release: 4%{?dist} +Version: 2.5.3 +Release: 2%{?dist} Summary: Graphical video editing and transcoding tool Group: Applications/Multimedia @@ -31,11 +31,15 @@ Patch0: 2.5.0-coreImage-parallel-build.patch Patch1: avidemux-2.5-pulseaudio-default.patch Patch2: avidemux-2.4-qt4.patch -Patch3: avidemux-2.5-i18n.patch -Patch4: avidemux-2.5-libmpeg2enc-altivec.patch -Patch5: avidemux-2.5-checkfunction-includes.patch -Patch6: avidemux-2.5.1-tmplinktarget.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 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # Upstream has been informed http://avidemux.org/admForum/viewtopic.php?id=6447 @@ -50,21 +54,18 @@ BuildRequires: gettext-devel # Libraries -BuildRequires: nasm >= 0.98.38 +BuildRequires: yasm-devel BuildRequires: libxml2-devel >= 2.6.8 BuildRequires: fontconfig-devel BuildRequires: freetype-devel BuildRequires: js-devel BuildRequires: libXv-devel BuildRequires: libXmu-devel -# Required by gtk: libXi-devel, libXext-devel, libX11-devel -# Required by qt: libXt-devel, libXext-devel, libX11-devel BuildRequires: libsamplerate-devel BuildRequires: jack-audio-connection-kit-devel # Sound out BuildRequires: alsa-lib-devel >= 1.0.3 -BuildRequires: esound-devel >= 0.2.0 BuildRequires: pulseaudio-libs-devel # Video out @@ -97,7 +98,7 @@ MPEG files, MP4 and ASF, using a variety of codecs. Tasks can be automated using projects, job queue and powerful scripting capabilities. -For compatability reasons, avidemux is a meta-package which installs the +For compatibility reasons, avidemux is a meta-package which installs the graphical, command line and plugin packages. If you want a smaller setup, you may selectively install one or more of the avidemux-* subpackages. @@ -169,10 +170,10 @@ %patch0 -p1 -b .parallel %patch1 -p1 -b .pulse %patch2 -p1 -b .qt4 -%patch3 -p1 -b .i18n -%patch4 -p1 -b .altivec -%patch5 -p1 -b .cfincludes -%patch6 -p0 -b .tmplinktarget +%patch3 -p1 -b .tmplinktarget +%patch4 -p1 -b .mjpeg_log +%patch5 -p1 -b .mpeg2enc +%patch6 -p1 -b .pluginlibs %build @@ -183,8 +184,8 @@ -DAVIDEMUX_CORECONFIG_DIR="%{_pkgbuilddir}/build/config" \ .. make %{?_smp_mflags} -# Create the temp link directory manuall since otherwise it happens too early -mkdir %{_pkgbuilddir}/build/%{_lib} +# Create the temp link directory manually since otherwise it happens too early +mkdir -p %{_pkgbuilddir}/build/%{_lib} find %{_pkgbuilddir}/build/avidemux -name '*.so*' | \ xargs ln -sft %{_pkgbuilddir}/build/%{_lib} @@ -198,14 +199,14 @@ %install rm -rf $RPM_BUILD_ROOT -# Temporary workaround since the i18n files aren't being built -mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name} make -C build install DESTDIR=$RPM_BUILD_ROOT make -C build_plugins install DESTDIR=$RPM_BUILD_ROOT # Install the build configuration for devel package install -d -m755 $RPM_BUILD_ROOT%{_includedir} install -m644 build/config/ADM_coreConfig.h $RPM_BUILD_ROOT%{_includedir}/ADM_coreConfig.h +install -d -m755 $RPM_BUILD_ROOT%{_datadir}/pixmaps +install -m644 avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/pics/avidemux_icon.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/avidemux.png # Find and remove all la files find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' @@ -224,8 +225,8 @@ %clean rm -rf $RPM_BUILD_ROOT -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%post libs -p /sbin/ldconfig +%postun libs -p /sbin/ldconfig %files %defattr(-,root,root,-) @@ -235,6 +236,7 @@ %doc AUTHORS COPYING README TODO %dir %{_datadir}/%{name} %{_datadir}/ADM_scripts/ +%{_datadir}/pixmaps/avidemux.png %{_libdir}/libADM* %files cli @@ -248,7 +250,7 @@ %files qt %defattr(-,root,root,-) -#{_datadir}/%{name}/i18n/ +%{_datadir}/%{name}/i18n/ %{_bindir}/avidemux2_qt4 %{_datadir}/applications/*qt*.desktop @@ -261,6 +263,15 @@ %{_includedir}/ADM_coreConfig.h %changelog +* Wed May 26 2010 Stewart Adam <s.adam at diffingo.com> - 2.5.3-2 +- Bump for F-13 --> devel EVR + +* Wed May 26 2010 Stewart Adam <s.adam at diffingo.com> - 2.5.3-1 +- Update to 2.5.3 release +- Use avidemux.png as icon in the desktop shorcuts to fix problem on KDE +- Make ldconfig run in post/postun of libs package +- Fix typo in %%description + * Wed Jan 27 2010 Stewart Adam <s.adam at diffingo.com> - 2.5.2-4 - Remove the i18n folder from %%files, as it seems it does not get created nor populated with any files on rawhide. Index: sources =================================================================== RCS file: /cvs/free/rpms/avidemux/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 18 Jan 2010 21:13:36 -0000 1.6 +++ sources 27 May 2010 02:05:52 -0000 1.7 @@ -1 +1 @@ -9027e1324c06e833e6c3c22298503cc7 avidemux_2.5.2.tar.gz +5a688029895b66b65ca86b7c85a03ee3 avidemux_2.5.3.tar.gz --- avidemux-2.5-checkfunction-includes.patch DELETED --- --- avidemux-2.5-i18n.patch DELETED --- --- avidemux-2.5.1-tmplinktarget.patch DELETED ---