This commit was manufactured by cvs2git to create branch 'AVIDEMUX_2_5_2'.

[packages/avidemux.git] / avidemux.spec

diff --git a/avidemux.spec b/avidemux.spec
index 6f2a7652d237c67917fba6501966ee9f88a3fe20..1ace8b640c0aaddafe11953994084e19fe08135c 100644 (file)
--- a/avidemux.spec
+++ b/avidemux.spec
@@ -4,9 +4,10 @@
 # - use external spidermonkey (cmake fix needed): Checking for SpiderMonkey -- Skipping check and using bundled version.
 # - uses patched ffmpeg
 # - don't force -O3 optimization
+# - get rid of gcc-bug-mmx-x86 patch
 #
 # Conditional build:
-%bcond_without esd     # disable EsounD sound support
+%bcond_with    esd     # disable EsounD sound support
 %bcond_with    arts    # with arts audio output
 %bcond_without amr     # disable Adaptive Multi Rate (AMR) speech codec support
 %bcond_without qt4     # build qt4 interface
@@ -18,7 +19,7 @@ Summary:      A small audio/video editing software for Linux
 Summary(pl.UTF-8):     Mały edytor audio/wideo dla Linuksa
 Name:          avidemux
 Version:       2.5.2
-Release:       1
+Release:       8
 License:       GPL v2+
 Group:         X11/Applications/Multimedia
 Source0:       http://downloads.sourceforge.net/avidemux/%{name}_%{version}.tar.gz
@@ -28,6 +29,7 @@ Source2:      %{name}-qt4.desktop
 Patch0:                gcc44.patch
 Patch1:                types.patch
 Patch2:                qtlocale.patch
+Patch3:                mmx-asm.patch
 #Patch1:       %{name}-dts_internal.patch
 #Patch2:       %{name}-sparc64.patch
 URL:           http://fixounet.free.fr/avidemux/
@@ -103,6 +105,7 @@ find '(' -name '*.js' -o -name '*.cpp' -o -name '*.h' -o -name '*.cmake' -o -nam
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 echo 'pt_BR' >> po/LINGUAS
 
@@ -217,6 +220,7 @@ rm -rf $RPM_BUILD_ROOT
 %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/audioDecoder/libADM_ad_vorbis.so
 %if %{with amr}
 %attr(755,root,root) %{_libdir}/ADM_plugins/audioDecoder/libADM_ad_opencore_amrnb.so
 %attr(755,root,root) %{_libdir}/ADM_plugins/audioDecoder/libADM_ad_opencore_amrwb.so
@@ -239,6 +243,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/ADM_plugins/audioEncoders/libADM_ae_vorbis.so
 
 %attr(755,root,root) %{_libdir}/ADM_plugins/videoEncoder/libADM_vidEnc_avcodec.so
+%attr(755,root,root) %{_libdir}/ADM_plugins/videoEncoder/libADM_vidEnc_x264.so
 %attr(755,root,root) %{_libdir}/ADM_plugins/videoEncoder/libADM_vidEnc_xvid.so
 
 %attr(755,root,root) %{_libdir}/ADM_plugins/videoFilter/libADM_vf_addborders.so
@@ -346,8 +351,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_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/audioDecoder/libADM_ad_vorbis.so
-%attr(755,root,root) %{_libdir}/ADM_plugins/videoEncoder/libADM_vidEnc_x264.so
 %attr(755,root,root) %{_libdir}/ADM_plugins/videoEncoder/x264/libADM_vidEnc_x264_Qt.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