Author: hobbes1069 Update of /cvs/free/rpms/avidemux/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv4579 Modified Files: avidemux.spec Removed Files: avidemux-2.6-use_external_libass.patch avidemux3-glu_fix.patch Log Message: * Sun Dec 16 2012 Richard Shaw <hobbes1069(a)gmail.com&gt; - 2.6.0-3 - Make sure we're building all availabel plugins. (#2575) - Don't install the gtk interface when all you want is the qt one. (#2574) - Exclude arm as a build target. (#2466) Index: avidemux.spec =================================================================== RCS file: /cvs/free/rpms/avidemux/devel/avidemux.spec,v retrieving revision 1.70 retrieving revision 1.71 diff -u -r1.70 -r1.71 --- avidemux.spec 23 Nov 2012 08:49:36 -0000 1.70 +++ avidemux.spec 16 Dec 2012 14:38:20 -0000 1.71 @@ -1,14 +1,13 @@ -%global realname avidemux %global _pkgbuilddir %{_builddir}/%{name}_%{version} Name: avidemux Version: 2.6.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Graphical video editing and transcoding tool License: GPLv2+ URL: http://www.avidemux.org -Source0: http://downloads.sourceforge.net/%{realname}/%{realname}_%{version}.tar.gz +Source0: http://downloads.sourceforge.net/%{name}/%{name}_%{version}.tar.gz Source1: avidemux-qt.desktop Source2: avidemux-gtk.desktop @@ -17,6 +16,9 @@ Patch2: avidemux3-libass.patch Patch3: avidemux3-bundled_libs.patch +# Don't try to build on arm +ExcludeArch: %{arm} + # Utilities BuildRequires: cmake BuildRequires: gettext intltool @@ -64,9 +66,6 @@ BuildRequires: x264-devel BuildRequires: ffmpeg-devel -Conflicts: avidemux < 2.6.0 -Provides: avidemux = %{version}-%{release} - # Main package is a metapackage, bring in something useful. Requires: avidemux-gui = %{version}-%{release} @@ -77,6 +76,8 @@ MPEG files, MP4 and ASF, using a variety of codecs. Tasks can be automated using projects, job queue and powerful scripting capabilities. +This is a meta package that brings in all interfaces: GTK, QT, and CLI. + %package cli Summary: CLI for %{name} @@ -99,9 +100,7 @@ Group: Applications/Multimedia BuildRequires: gtk3-devel BuildRequires: cairo-devel -# Slightly higher so it is default, but it can be avoided by installing -# avidemux-qt directly or it can be removed later once avidemux-qt is installed -Provides: %{name}-gui = %{version}-%{release}.1 +Provides: %{name}-gui = %{version}-%{release} Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires: %{name}-help = %{version}-%{release} @@ -139,7 +138,7 @@ %prep -%setup -q -n %{realname}_%{version} +%setup -q -n %{name}_%{version} #patch0 -p1 -b .ffmpeg_build %patch1 -p1 -b .bund_libs %patch2 -p1 -b .libass @@ -172,6 +171,7 @@ -DFAKEROOT=%{_pkgbuilddir}/fakeRoot \ ../avidemux/cli make %{?_smp_mflags} +make install DESTDIR=%{_pkgbuilddir}/fakeRoot popd # Build QT4 gui @@ -180,6 +180,7 @@ -DFAKEROOT=%{_pkgbuilddir}/fakeRoot \ ../avidemux/qt4 make %{?_smp_mflags} +make install DESTDIR=%{_pkgbuilddir}/fakeRoot popd # Build GTK gui @@ -188,13 +189,14 @@ -DFAKEROOT=%{_pkgbuilddir}/fakeRoot \ ../avidemux/gtk make %{?_smp_mflags} +make install DESTDIR=%{_pkgbuilddir}/fakeRoot popd -# Build avidemux_plugins -rm -rf build_plugins && mkdir build_plugins && pushd build_plugins +# Build avidemux_plugins_common +rm -rf build_plugins_common && mkdir build_plugins_common && pushd build_plugins_common %cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DFAKEROOT=%{_pkgbuilddir}/fakeRoot \ - -DAVIDEMUX_SOURCE_DIR=%{_builddir}/%{realname}_%{version} \ + -DAVIDEMUX_SOURCE_DIR=%{_builddir}/%{name}_%{version} \ -DPLUGIN_UI=COMMON \ -DUSE_EXTERNAL_LIBASS=TRUE \ -DUSE_EXTERNAL_LIBMAD=TRUE \ @@ -202,6 +204,52 @@ -DUSE_EXTERNAL_TWOLAME=TRUE \ ../avidemux_plugins make %{?_smp_mflags} +make install DESTDIR=%{_pkgbuilddir}/fakeRoot +popd + +# Build avidemux_plugins_cli +rm -rf build_plugins_cli && mkdir build_plugins_cli && pushd build_plugins_cli +%cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DFAKEROOT=%{_pkgbuilddir}/fakeRoot \ + -DAVIDEMUX_SOURCE_DIR=%{_builddir}/%{name}_%{version} \ + -DPLUGIN_UI=CLI \ + -DUSE_EXTERNAL_LIBASS=TRUE \ + -DUSE_EXTERNAL_LIBMAD=TRUE \ + -DUSE_EXTERNAL_LIBA52=TRUE \ + -DUSE_EXTERNAL_TWOLAME=TRUE \ + ../avidemux_plugins +make %{?_smp_mflags} +make install DESTDIR=%{_pkgbuilddir}/fakeRoot +popd + +# Build avidemux_plugins_qt4 +rm -rf build_plugins_qt4 && mkdir build_plugins_qt4 && pushd build_plugins_qt4 +%cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DFAKEROOT=%{_pkgbuilddir}/fakeRoot \ + -DAVIDEMUX_SOURCE_DIR=%{_builddir}/%{name}_%{version} \ + -DPLUGIN_UI=QT4 \ + -DUSE_EXTERNAL_LIBASS=TRUE \ + -DUSE_EXTERNAL_LIBMAD=TRUE \ + -DUSE_EXTERNAL_LIBA52=TRUE \ + -DUSE_EXTERNAL_TWOLAME=TRUE \ + ../avidemux_plugins +make %{?_smp_mflags} +make install DESTDIR=%{_pkgbuilddir}/fakeRoot +popd + +# Build avidemux_plugins_gtk +rm -rf build_plugins_gtk && mkdir build_plugins_gtk && pushd build_plugins_gtk +%cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DFAKEROOT=%{_pkgbuilddir}/fakeRoot \ + -DAVIDEMUX_SOURCE_DIR=%{_builddir}/%{name}_%{version} \ + -DPLUGIN_UI=GTK \ + -DUSE_EXTERNAL_LIBASS=TRUE \ + -DUSE_EXTERNAL_LIBMAD=TRUE \ + -DUSE_EXTERNAL_LIBA52=TRUE \ + -DUSE_EXTERNAL_TWOLAME=TRUE \ + ../avidemux_plugins +make %{?_smp_mflags} +make install DESTDIR=%{_pkgbuilddir}/fakeRoot popd @@ -210,7 +258,10 @@ make -C build_cli install DESTDIR=%{buildroot} make -C build_qt4 install DESTDIR=%{buildroot} make -C build_gtk install DESTDIR=%{buildroot} -make -C build_plugins install DESTDIR=%{buildroot} +make -C build_plugins_common install DESTDIR=%{buildroot} +make -C build_plugins_cli install DESTDIR=%{buildroot} +make -C build_plugins_qt4 install DESTDIR=%{buildroot} +make -C build_plugins_gtk install DESTDIR=%{buildroot} # FFMpeg libraries are not being installed as executable. chmod +x %{buildroot}%{_libdir}/libADM6*.so.* @@ -268,26 +319,26 @@ %files %doc AUTHORS COPYING README -%files libs +%files libs -f build_plugins_common/install_manifest.txt %{_datadir}/icons/hicolor/*/apps/avidemux.png %{_libdir}/libADM* %exclude %{_libdir}/libADM_UI* %exclude %{_libdir}/libADM_render* %{_libdir}/ADM_plugins6/ -%files cli +%files cli -f build_plugins_cli/install_manifest.txt %{_bindir}/avidemux3_cli %{_libdir}/libADM_UI_Cli6.so %{_libdir}/libADM_render6_cli.so -%files gtk +%files gtk -f build_plugins_gtk/install_manifest.txt %{_bindir}/avidemux3_gtk %{_libdir}/libADM_UIGtk6.so %{_libdir}/libADM_render6_gtk.so %{_libdir}/ADM_glade/ %{_datadir}/applications/rpmfusion-avidemux-gtk.desktop -%files qt +%files qt -f build_plugins_qt4/install_manifest.txt %{_bindir}/avidemux3_qt4 %{_bindir}/avidemux3_jobs %{_libdir}/libADM_UIQT46.so @@ -301,6 +352,11 @@ %{_includedir}/avidemux/ %changelog +* Sun Dec 16 2012 Richard Shaw <hobbes1069(a)gmail.com&gt; - 2.6.0-3 +- Make sure we're building all availabel plugins. (#2575) +- Don't install the gtk interface when all you want is the qt one. (#2574) +- Exclude arm as a build target. (#2466) + * Fri Nov 23 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 2.6.0-2 - Rebuilt for x264 --- avidemux-2.6-use_external_libass.patch DELETED --- --- avidemux3-glu_fix.patch DELETED ---