Author: hobbes1069 Update of /cvs/free/rpms/avidemux/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv10655 Modified Files: .cvsignore avidemux.spec sources Log Message: * Wed Jan 25 2012 Richard Shaw <hobbes1069(a)gmail.com&gt; - 2.5.6-1 - Update to latest release. Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/avidemux/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 27 Jun 2011 14:09:09 -0000 1.9 +++ .cvsignore 27 Jan 2012 16:57:03 -0000 1.10 @@ -1 +1 @@ -avidemux_2.5.5.tar.gz +avidemux_2.5.6.tar.gz Index: avidemux.spec =================================================================== RCS file: /cvs/free/rpms/avidemux/devel/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 27 Jan 2012 16:57:03 -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: 1%{?dist} Summary: Graphical video editing and transcoding tool Group: Applications/Multimedia @@ -14,13 +14,13 @@ 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... @@ -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,17 @@ %{_datadir}/applications/*qt*.desktop %dir %{_datadir}/%{name}/i18n +%files devel +%{_includedir}/ADM_coreConfig.h + %changelog -* Fri Sep 23 2011 Richard Shaw <hobbes1069(a)gmail.com&gt; - 2.5.5-6 -- Obsolete useless devel subpackage which has multilib issues. +* Wed Jan 25 2012 Richard Shaw <hobbes1069(a)gmail.com&gt; - 2.5.6-1 +- Update to latest release. -* 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. +* Mon Aug 07 2011 Richard Shaw <hobbes1069(a)gmail.com&gt; - 2.5.5-3 +- 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/devel/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 27 Jan 2012 16:57:03 -0000 1.10 @@ -1 +1 @@ -33bbe210c6826cea1987ed18a41d57a7 avidemux_2.5.5.tar.gz +00e479dd806b94a98d3f0f40639e88a9 avidemux_2.5.6.tar.gz