- updated to 2.4.3

- added new bconds and SSE3 support
- BR: libsamplerate-devel, xorg-lib-libXt-devel, xorg-proto-xextproto-devel

Changed files:
    avidemux.spec -> 1.65

diff --git a/avidemux.spec b/avidemux.spec
index 8e5f8344f97e82a2ece0aa1730bdcf98a3e71a13..4a031de2a24ada6372119918ac42a21dab9171ec 100644 (file)
--- a/avidemux.spec
+++ b/avidemux.spec
@@ -2,18 +2,25 @@
 #      - create aften.spec (aften.sf.net) and use it
 #
 # 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_with    sse3    # use SSE3 instructions
 #
+%ifarch pentium4 %{x8664}
+%define                with_sse3       1
+%endif
+
 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.1
-Release:       2
+Version:       2.4.3
+Release:       1
 License:       GPL v2+
 Group:         X11/Applications/Multimedia
 Source0:       http://download2.berlios.de/avidemux/%{name}_%{version}.tar.gz
-# Source0-md5: 2d972f6b8795c891dd6e0ebe5035852a
+# Source0-md5: ff8e6ac186321e7e8bec9f8177df3724
 Source1:       %{name}.desktop
 Patch0:                %{name}-autoconf.patch
 Patch1:                %{name}-dts_internal.patch
@@ -24,10 +31,10 @@ BuildRequires:      SDL-devel
 BuildRequires: a52dec-libs-devel
 BuildRequires: alsa-lib-devel >= 1.0
 %{?with_amr:BuildRequires:     amrnb-devel}
-BuildRequires: artsc-devel
+%{?with_arts:BuildRequires:    artsc-devel}
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: esound-devel
+%{?with_esd:BuildRequires:     esound-devel}
 BuildRequires: faad2-devel
 BuildRequires: ffmpeg-devel
 BuildRequires: freetype-devel >= 2.0.0
@@ -38,6 +45,7 @@ BuildRequires:        lame-libs-devel
 BuildRequires: libdts-devel
 BuildRequires: libmad-devel
 BuildRequires: libmpeg3-devel
+BuildRequires: libsamplerate-devel
 BuildRequires: libstdc++-devel
 BuildRequires: libtool
 BuildRequires: libvorbis-devel
@@ -47,7 +55,9 @@ BuildRequires:        pkgconfig
 %{?with_qt:BuildRequires:      QtGui-devel}
 %{?with_qt:BuildRequires:      qt4-build}
 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
 Requires:      js(threads)
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -63,25 +73,25 @@ Mały edytor audio/wideo dla Linuksa.
 %patch0 -p1
 %patch1 -p0
 %patch2 -p1
-%patch3 -p1
+#%patch3 -p1
 
 echo 'pt_BR' >> po/LINGUAS
 
 %build
-export kde_htmldir=%{_kdedocdir}
-export kde_libs_htmldir=%{_kdedocdir}
 %{__make} -f admin/Makefile.common cvs
 %{__libtoolize}
 %{__aclocal} -I m4
-%{__automake}
 %{__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-jsapi-include=%{_includedir}/js \
+       %{?with_sse3:--enable-ssse3} \
 %if %{with qt}
        --with-qt-dir=%{_prefix} \
        --with-qt-include=%{_includedir}/qt4 \