- BR: docbook-dtd412-xml

[packages/mplayer.git] / mplayer.spec

diff --git a/mplayer.spec b/mplayer.spec
index a6766a5c96bfe3ca5da6abc5b10bf6f67c3832b2..259f2b4c91e8fcac44a269d9e4626ff4311bfbfb 100644 (file)
--- a/mplayer.spec
+++ b/mplayer.spec
@@ -13,7 +13,7 @@
 %bcond_with    ggi             # with ggi video output
 %bcond_with    nas             # with NAS audio output
 %bcond_with    svga            # with svgalib video output
-%bcond_with    osd             # with osd menu support
+%bcond_without osd             # with osd menu support
 %bcond_without altivec         # without altivec support
 %bcond_without x264            # without x264 support
 %bcond_with    xmms            # with XMMS inputplugin support
@@ -23,7 +23,6 @@
 %bcond_without arts            # without arts audio output
 %bcond_without caca            # without libcaca video output
 %bcond_without cdparanoia      # without cdparanoia support
-%bcond_without dshow           # disable DirectShow support
 %bcond_without enca            # disable using ENCA charset oracle library
 %bcond_without esd             # disable EsounD sound support
 %bcond_without faad            # disable FAAD2 (AAC) support
@@ -75,7 +74,7 @@
 %endif
 
 %define                subver  rc2
-%define                rel             9
+%define                rel     15
 
 Summary:       MPlayer - THE Movie Player for UN*X
 Summary(de.UTF-8):     MPlayer ist ein unter der freien GPL-Lizenz stehender Media-Player
@@ -128,6 +127,8 @@ Patch24:    %{name}-fontconfig_sub.patch
 Patch25:       http://www.mplayerhq.hu/MPlayer/patches/stream_cddb_fix_20080120.diff
 Patch26:       %{name}-check-byteswap.patch
 Patch27:       http://www.mplayerhq.hu/MPlayer/patches/demux_mov_fix_20080129.diff
+Patch28:       http://www.ocert.org/patches/2008-013/mplayer_demux_real.patch
+Patch29:       %{name}-x264.patch
 URL:           http://www.mplayerhq.hu/
 %{?with_directfb:BuildRequires:        DirectFB-devel}
 BuildRequires: OpenAL-devel
@@ -143,6 +144,7 @@ BuildRequires:      amrwb-devel >= 5.3.0
 %{?with_ssse3:BuildRequires:   binutils >= 3:2.16.92}
 %{?with_cdparanoia:BuildRequires:      cdparanoia-III-devel}
 %{?with_doc:BuildRequires:     docbook-style-xsl}
+%{?with_doc:BuildRequires:     docbook-dtd412-xml}
 %{?with_dxr3:BuildRequires:    em8300-devel}
 %{?with_enca:BuildRequires:    enca-devel}
 %{?with_esd:BuildRequires:     esound-devel}
@@ -173,11 +175,10 @@ BuildRequires:    libjpeg-devel
 BuildRequires: libmpcdec-devel >= 1.2.1
 BuildRequires: libpng-devel
 %{?with_smb:BuildRequires:     libsmbclient-devel}
-%{?with_dshow:BuildRequires:   libstdc++-devel}
 %{?with_theora:BuildRequires:  libtheora-devel}
 # tremor is used by default, internal as we don't have system one
 #%{?with_vorbis:BuildRequires: libvorbis-devel}
-%{?with_x264:BuildRequires:    libx264-devel >= 0.1.2-1.20060828_2245.1}
+%{?with_x264:BuildRequires:    libx264-devel >= 0.1.2-1.20081023_2245.1}
 BuildRequires: libxslt-progs
 %{?with_lirc:BuildRequires:    lirc-devel}
 %{?with_live:BuildRequires:    live}
@@ -346,6 +347,8 @@ done
 %patch25 -p0
 %patch26 -p1
 %patch27 -p0
+%patch28 -p0
+%patch29 -p1
 
 # recent dvdnav-config doesn't support --minilibs.
 sed -i 's:--minilibs:--libs:g' configure
@@ -376,7 +379,6 @@ set -x
        --confdir=%{_sysconfdir}/mplayer \
        --with-extraincdir=%{_includedir}/xvid \
        --with-extralibdir=%{?_x_libraries}%{!?_x_libraries:%{_libdir}} \
-       --enable-menu \
 %if %{with system_ffmpeg}
        --disable-libavutil_a \
        --disable-libavcodec_a \
@@ -418,7 +420,6 @@ set -x
        %{!?with_arts:--disable-arts} \
        %{!?with_caca:--disable-caca} \
        %{!?with_cdparanoia:--disable-cdparanoia} \
-       %{!?with_dshow:--disable-dshow} \
        %{!?with_enca:--disable-enca} \
        %{!?with_esd:--disable-esd} \
        %{!?with_faad:--disable-faad-external --disable-faad-internal} \