- merge 2.5.1 from DEVEL

Changed files:
    avidemux.spec -> 1.73
    qtlocale.patch -> 1.2

diff --git a/avidemux.spec b/avidemux.spec
index 00f1b2f99f3473e5d69d0ccb805346266e229298..9a12e0431cc5ff12c12c8091fbf7d89a6d7bbc69 100644 (file)
--- a/avidemux.spec
+++ b/avidemux.spec
@@ -1,13 +1,19 @@
 # TODO:
-#      - create aften.spec (aften.sf.net) and use it
+# - create aften.spec (aften.sf.net) and use it
+# - the bconds don't work with cmake, all gets enabled if BR found -- needs some cmake magican to fixup the bconds
+# - use external seamonkey (cmake fix needed): Checking for SpiderMonkey -- Skipping check and using bundled version.
+# - uses patched ffmpeg
+# - Could not find Gettext -- libintl not required for gettext support
 #
 # Conditional build:
 %bcond_without esd     # disable EsounD sound support
 %bcond_without arts    # without arts audio output
 %bcond_with    amr     # enable 3GPP Adaptive Multi Rate (AMR) speech codec support
-%bcond_with    qt      # build qt4-base interface
+%bcond_without qt4     # build qt4-base interface
 %bcond_with    ssse3   # use SSSE3 instructions
-#
+
+%define                qt4_version     4.2
+
 %ifarch pentium4 %{x8664}
 %define                with_sse3       1
 %endif
@@ -15,49 +21,60 @@
 Summary:       A small audio/video editing software for Linux
 Summary(pl.UTF-8):     Mały edytor audio/wideo dla Linuksa
 Name:          avidemux
-Version:       2.4.4
-Release:       2
+Version:       2.5.1
+Release:       1
 License:       GPL v2+
 Group:         X11/Applications/Multimedia
 Source0:       http://dl.sourceforge.net/avidemux/%{name}_%{version}.tar.gz
-# Source0-md5: 503dfd25842ef81be7c769811e7bc54e
+# Source0-md5: 081db3af87f1f93c7b4e5d5975e07e40
 Source1:       %{name}.desktop
-Patch0:                %{name}-autoconf.patch
-Patch1:                %{name}-dts_internal.patch
-Patch2:                %{name}-sparc64.patch
+Source2:       %{name}-qt4.desktop
+Patch0:                gcc44.patch
+Patch1:                types.patch
+Patch2:                qtlocale.patch
+Patch3:                link-libs.patch
+Patch4:                libdir.patch
+#Patch1:       %{name}-dts_internal.patch
+#Patch2:       %{name}-sparc64.patch
 URL:           http://fixounet.free.fr/avidemux/
+%{?with_qt4:BuildRequires:     QtGui-devel >= %{qt4_version}}
 BuildRequires: SDL-devel
 BuildRequires: a52dec-libs-devel
 BuildRequires: alsa-lib-devel >= 1.0
 %{?with_amr:BuildRequires:     amrnb-devel}
 %{?with_arts:BuildRequires:    artsc-devel}
-BuildRequires: autoconf
-BuildRequires: automake
+BuildRequires: cmake >= 2.6.2
 %{?with_esd:BuildRequires:     esound-devel}
+BuildRequires: faac-devel
 BuildRequires: faad2-devel
 BuildRequires: ffmpeg-devel
 BuildRequires: freetype-devel >= 2.0.0
 BuildRequires: gettext-devel
 BuildRequires: gtk+2-devel >= 1:2.6.0
+BuildRequires: jack-audio-connection-kit-devel
 BuildRequires: js-devel(threads)
 BuildRequires: lame-libs-devel
+#BuildRequires:        libdca-devel
 BuildRequires: libdts-devel
 BuildRequires: libmad-devel
 BuildRequires: libmpeg3-devel
+BuildRequires: libpng-devel
 BuildRequires: libsamplerate-devel
 BuildRequires: libstdc++-devel
 BuildRequires: libtool
 BuildRequires: libvorbis-devel
 BuildRequires: libx264-devel
 BuildRequires: libxml2-devel
+BuildRequires: nasm >= 0.98.32
 BuildRequires: pkgconfig
-%{?with_qt:BuildRequires:      QtGui-devel}
-%{?with_qt:BuildRequires:      qt4-build}
+%{?with_qt4:BuildRequires:     qt4-build >= %{qt4_version}}
 BuildRequires: sed >= 4.0
 BuildRequires: xorg-lib-libXt-devel
 BuildRequires: xorg-lib-libXv-devel
 BuildRequires: xorg-proto-xextproto-devel
 BuildRequires: xvid-devel >= 1:1.0
+BuildRequires: xvidcore-devel
+BuildRequires: zlib-devel
 Requires:      js(threads)
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -67,48 +84,83 @@ A small audio/video editing software for Linux.
 %description -l pl.UTF-8
 Mały edytor audio/wideo dla Linuksa.
 
+%package ui-gtk
+Summary:       GTK+2 UI for Avidemux
+Group:         X11/Applications/Multimedia
+Requires:      %{name} = %{version}-%{release}
+
+%description ui-gtk
+GTK+2 UI for Avidemux
+
+%package ui-qt4
+Summary:       Qt4 UI for Avidemux
+Group:         X11/Applications/Multimedia
+Requires:      %{name} = %{version}-%{release}
+
+%description ui-qt4
+Qt4 UI for Avidemux
+
 %prep
 %setup -q -n %{name}_%{version}
+find '(' -name '*.js' -o -name '*.cpp' -o -name '*.h' -o -name '*.cmake' -o -name '*.txt' ')' -print0 | xargs -0 %{__sed} -i -e 's,\r$,,'
 %patch0 -p1
-%patch1 -p0
+%patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 echo 'pt_BR' >> po/LINGUAS
 
+# libdir fix
+grep -rl 'DESTINATION lib' . | xargs sed -i -e's,DESTINATION lib,DESTINATION lib${LIB_SUFFIX},g'
+sed -i -e's,FFMPEG_INSTALL_DIR lib,FFMPEG_INSTALL_DIR lib${LIB_SUFFIX},' cmake/admFFmpegBuild.cmake
+sed -i -e's,"lib","%{_lib}",' avidemux/main.cpp avidemux/ADM_core/src/ADM_fileio.cpp
+
 %build
-%{__cp} /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-%{__make} -f admin/Makefile.common cvs
-%{__libtoolize}
-%{__aclocal} -I m4
-%{__autoconf}
-%{__automake}
-%configure \
-       %{!?with_amr:ac_cv_header_amrnb_interf_dec_h=no} \
-       %{!?with_arts:--without-arts} \
-       %{!?with_esd:--without-esd} \
-       --disable-static \
-%ifarch ppc
-       --enable-altivec \
-%endif
-       %{?with_ssse3:--enable-ssse3} \
-%if %{with qt}
-       --with-qt-dir=%{_prefix} \
-       --with-qt-include=%{_includedir}/qt4 \
-       --with-qt-lib=%{_libdir}
+TOP=$PWD
+# main
+install -d build plugin-build
+cd build
+%cmake \
+       -DCMAKE_BUILD_TYPE=%{?debug:Debug}%{!?debug:Release} \
+       -DCMAKE_INSTALL_PREFIX=%{_prefix} \
+       -DAVIDEMUX_INSTALL_PREFIX=%{_prefix} \
+%if "%{_lib}" == "lib64"
+       -DLIB_SUFFIX=64 \
 %endif
-
-%{__make} -j1 -C po
+       ..
 %{__make}
+cd ..
+
+# plugins
+cd plugin-build
+%cmake \
+       -DCMAKE_INSTALL_PREFIX=%{_prefix} \
+       -DAVIDEMUX_INSTALL_PREFIX=%{_prefix} \
+       -DAVIDEMUX_SOURCE_DIR=$TOP/  \
+       -DAVIDEMUX_CORECONFIG_DIR=$TOP/build/config \
+%if "%{_lib}" == "lib64"
+       -DLIB_SUFFIX=64 \
+%endif
+       ../plugins
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}}
+install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir},%{_bindir},%{_mandir}/man1}
+
+%{__make} -C build install \
+       DESTDIR=$RPM_BUILD_ROOT
 
-%{__make} install \
+%{__make} -C plugin-build install \
        DESTDIR=$RPM_BUILD_ROOT
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
-install avidemux_icon.png $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png
+chmod +x $RPM_BUILD_ROOT%{_libdir}/lib*.so*
+
+mv $RPM_BUILD_ROOT%{_bindir}/avidemux2{_cli,}
+cp -a man/avidemux.1 $RPM_BUILD_ROOT%{_mandir}/man1
+cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}/%{name}-gtk.desktop
+cp -a %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir}/%{name}-qt4.desktop
+cp -a avidemux_icon.png $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png
 
 %find_lang %{name}
 
@@ -117,9 +169,172 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS History
-%attr(755,root,root) %{_bindir}/avidemux2_cli
-%attr(755,root,root) %{_bindir}/avidemux2_gtk
-%{?with_qt:%attr(755,root,root) %{_bindir}/avidemux2_qt4}
-%{_desktopdir}/*.desktop
+%doc AUTHORS
+%attr(755,root,root) %{_bindir}/avidemux2
+%attr(755,root,root) %{_libdir}/libADM5avcodec.so.52
+%attr(755,root,root) %{_libdir}/libADM5avformat.so.52
+%attr(755,root,root) %{_libdir}/libADM5avutil.so.50
+%attr(755,root,root) %{_libdir}/libADM5postproc.so.51
+%attr(755,root,root) %{_libdir}/libADM5swscale.so.0
+%attr(755,root,root) %{_libdir}/libADM_UICli.so
+%attr(755,root,root) %{_libdir}/libADM_core.so
+%attr(755,root,root) %{_libdir}/libADM_coreAudio.so
+%attr(755,root,root) %{_libdir}/libADM_coreImage.so
+%attr(755,root,root) %{_libdir}/libADM_coreUI.so
+%attr(755,root,root) %{_libdir}/libADM_render_cli.so
+%attr(755,root,root) %{_libdir}/libADM_smjs.so
+
+%dir %{_libdir}/ADM_plugins
+%dir %{_libdir}/ADM_plugins/audioDecoder
+%dir %{_libdir}/ADM_plugins/audioDevices
+%dir %{_libdir}/ADM_plugins/audioEncoders
+%dir %{_libdir}/ADM_plugins/videoEncoder
+%dir %{_libdir}/ADM_plugins/videoFilter
+
+%attr(755,root,root) %{_libdir}/ADM_plugins/audioDecoder/libADM_ad_Mad.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/audioDecoder/libADM_ad_a52.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/audioDecoder/libADM_ad_faad.so
+
+%attr(755,root,root) %{_libdir}/ADM_plugins/audioDevices/libADM_av_alsa.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/audioDevices/libADM_av_arts.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/audioDevices/libADM_av_esd.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/audioDevices/libADM_av_jack.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/audioDevices/libADM_av_oss.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/audioDevices/libADM_av_pulseAudioSimple.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/audioDevices/libADM_av_sdl.so
+
+%attr(755,root,root) %{_libdir}/ADM_plugins/audioEncoders/libADM_ae_faac.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/audioEncoders/libADM_ae_lame.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/audioEncoders/libADM_ae_lav_ac3.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/audioEncoders/libADM_ae_lav_mp2.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/audioEncoders/libADM_ae_pcm.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/audioEncoders/libADM_ae_twolame.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/audioEncoders/libADM_ae_vorbis.so
+
+%dir %{_libdir}/ADM_plugins/videoEncoder/avcodec
+%{_libdir}/ADM_plugins/videoEncoder/avcodec/Mpeg1Param.xsd
+%attr(755,root,root) %{_libdir}/ADM_plugins/videoEncoder/libADM_vidEnc_avcodec.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/videoEncoder/libADM_vidEnc_xvid.so
+%dir %{_libdir}/ADM_plugins/videoEncoder/xvid
+%{_libdir}/ADM_plugins/videoEncoder/xvid/XvidParam.xsd
+
+%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_Deinterlace.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_Delta.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_Denoise.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_FluxSmooth.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_Mosaic.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_Pulldown.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_Stabilize.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_Tisophote.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_Whirl.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_addborders.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_blackenBorders.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_blendDgBob.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_blendRemoval.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_decimate.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_denoise3d.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_denoise3dhq.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_dropOut.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_fade.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_fastconvolutiongauss.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_fastconvolutionmean.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_fastconvolutionmedian.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_fastconvolutionsharpen.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_forcedPP.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_hzStackField.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_keepEvenField.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_keepOddField.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_kernelDeint.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_largemedian.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_lavDeinterlace.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_lumaonly.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_mSharpen.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_mSmooth.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_mcdeint.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_mergeField.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_palShift.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_resampleFps.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_reverse.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_rotate.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_separateField.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_smartPalShift.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_smartSwapField.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_soften.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_ssa.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_stackField.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_swapField.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_swapuv.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_tdeint.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_telecide.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_unstackField.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_vflip.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_vlad.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_yadif.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vidChromaU.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vidChromaV.so
+%{_mandir}/man1/avidemux.1*
+
+%{_datadir}/ADM_scripts
+
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/i18n
+%lang(ca) %{_datadir}/%{name}/i18n/*_ca.qm
+%lang(cs) %{_datadir}/%{name}/i18n/*_cs.qm
+%lang(de) %{_datadir}/%{name}/i18n/*_de.qm
+%lang(el) %{_datadir}/%{name}/i18n/*_el.qm
+%lang(es) %{_datadir}/%{name}/i18n/*_es.qm
+%lang(fr) %{_datadir}/%{name}/i18n/*_fr.qm
+%lang(it) %{_datadir}/%{name}/i18n/*_it.qm
+%lang(ja) %{_datadir}/%{name}/i18n/*_ja.qm
+%lang(pt_BR) %{_datadir}/%{name}/i18n/*_pt_BR.qm
+%lang(ru) %{_datadir}/%{name}/i18n/*_ru.qm
+%lang(sr) %{_datadir}/%{name}/i18n/*_sr.qm
+%lang(sr@latin) %{_datadir}/%{name}/i18n/*_sr@latin.qm
+%lang(tr) %{_datadir}/%{name}/i18n/*_tr.qm
+%lang(zh_TW) %{_datadir}/%{name}/i18n/*_zh_TW.qm
+
 %{_pixmapsdir}/*.png
+
+%files ui-gtk
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/avidemux2_gtk
+%{_desktopdir}/%{name}-gtk.desktop
+%attr(755,root,root) %{_libdir}/libADM_UIGtk.so
+%attr(755,root,root) %{_libdir}/libADM_render_gtk.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/videoEncoder/xvid/libADM_vidEnc_Xvid_Gtk.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_asharp_gtk.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_avisynthResize_gtk.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_chromaShift_gtk.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_cnr2_gtk.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_colorYUV_gtk.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_contrast_gtk.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_Crop_gtk.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_eq2_gtk.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_equalizer_gtk.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_hue_gtk.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_mpdelogo_gtk.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_mplayerResize_gtk.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_sub_gtk.so
+
+%if %{with qt4}
+%files ui-qt4
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/avidemux2_qt4
+%{_desktopdir}/%{name}-qt4.desktop
+%attr(755,root,root) %{_libdir}/libADM_UIQT4.so
+%attr(755,root,root) %{_libdir}/libADM_render_qt4.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/videoEncoder/xvid/libADM_vidEnc_Xvid_Qt.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_asharp_qt4.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_avisynthResize_qt4.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_chromaShift_qt4.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_cnr2_qt4.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_colorYUV_qt4.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_contrast_qt4.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_crop_qt4.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_eq2_qt4.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_equalizer_qt4.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_hue_qt4.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_mpdelogo_qt4.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_mplayerResize_qt4.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_sub_qt4.so
+%endif

diff --git a/qtlocale.patch b/qtlocale.patch
new file mode 100644 (file)
index 0000000..4f6da21
--- /dev/null
+++ b/qtlocale.patch
@@ -0,0 +1,47 @@
+--- avidemux_2.5.0/cmake/Ts.cmake.qtlocale     2008-03-11 19:21:46.000000000 +0100
++++ avidemux_2.5.0/cmake/Ts.cmake      2009-07-18 19:44:50.000000000 +0200
+@@ -64,7 +64,7 @@
+                 
+             SET(qm_files ${qm_files} ${_outXml} ${_out})
+ 
+-                      INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/${BIN_DIR}/i18n")
++                      INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/share/avidemux/i18n")
+         ENDFOREACH(ts_input ${ts_files})
+ 
+         SET(${_sources} ${${_sources}} ${qm_files})
+@@ -95,7 +95,7 @@
+                 
+             SET(qm_files ${qm_files} ${_out})
+ 
+-                      INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/${BIN_DIR}/i18n")
++                      INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/share/avidemux/i18n")
+         ENDFOREACH(ts_input ${ts_files})
+ 
+         SET(${_sources} ${${_sources}} ${qm_files})
+--- avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp.qtlocale 2008-10-01 15:49:39.000000000 +0200
++++ avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp  2009-07-18 19:51:36.000000000 +0200
+@@ -9,6 +9,7 @@
+ #include <Carbon/Carbon.h>
+ #endif
+ #include <QtGui/QPaintEngine>
++//#include "../../config.h"  // for ADMLOCALE with CMake
+ 
+ #include "ADM_inttype.h"
+ #include "ADM_files.h"
+@@ -73,7 +74,8 @@
+ #ifdef __APPLE__
+       QString appdir = QCoreApplication::applicationDirPath() + "/../Resources/locale/";
+ #else
+-      QString appdir = QCoreApplication::applicationDirPath() + "/i18n/";
++//    QString appdir = ADMLOCALE;
++      QString appdir = "/usr/share/avidemux/i18n/";
+ #endif
+ 
+       loadTranslation(&qtTranslator, appdir + "qt_" + QLocale::system().name());
+@@ -164,4 +165,4 @@
+       }
+ 
+       return "Qt";
+-}
+\ No newline at end of file
++}