- drop vidix bcond and BR, not used anymore

[packages/mplayer2.git] / mplayer2.spec

diff --git a/mplayer2.spec b/mplayer2.spec
index 8a09b8c78d8a76104f56f1e1614dc60797a478b7..ba8fcf1e411ae4d051bc5b03cf7c9901537b3c5e 100644 (file)
--- a/mplayer2.spec
+++ b/mplayer2.spec
@@ -24,7 +24,7 @@
 %bcond_without libdts          # disable libdts support
 %bcond_without libdv           # disable libdv en/decoding support
 %bcond_without lirc            # without lirc support
-%bcond_without live            # without LIVE555 libraries
+%bcond_with    live            # without LIVE555 libraries
 %bcond_without lzo             # with LZO support (requires lzo 2.x)
 %bcond_without mad             # without mad (audio MPEG) support
 %bcond_without pulseaudio      # without pulseaudio output
@@ -38,7 +38,6 @@
 %bcond_without theora          # without theora support
 %bcond_without win32           # without win32 codecs support
 %bcond_without vdpau           # disable vdpau
-%bcond_without vidix           # disable vidix
 %bcond_without vorbis          # without Ogg-Vorbis audio support
 %bcond_with    system_vorbis   # use system libvorbis instead of internal tremor
 %bcond_without xvid            # disable XviD codec
@@ -63,11 +62,13 @@ Summary(pl.UTF-8):  Odtwarzacz filmów dla systemów uniksowych
 Summary(pt_BR.UTF-8):  Reprodutor de filmes
 Name:          mplayer2
 Version:       2.0
-Release:       3
+Release:       17
 License:       GPL
 Group:         Applications/Multimedia
 Source0:       http://ftp.mplayer2.org/pub/release/%{name}-build-%{version}.tar.xz
 # Source0-md5: 05b93784de995235e2758f182de15f73
+Patch0:                format-security.patch
+Patch1:                libdvdnav5.patch
 URL:           http://www.mplayer2.org/
 BuildRequires: OpenAL-devel
 BuildRequires: OpenGL-devel
@@ -89,7 +90,6 @@ BuildRequires:        faac-devel
 BuildRequires: freetype-devel >= 2.0.9
 BuildRequires: fribidi-devel
 BuildRequires: tar >= 1:1.22
-%{?with_vidix:BuildRequires:   vidix-devel}
 %{?with_altivec:BuildRequires: gcc >= 5:4.1}
 %{?with_gnomess:BuildRequires: dbus-glib-devel}
 %{?with_gif:BuildRequires:     giflib-devel}
@@ -221,11 +221,13 @@ escolhidos, incluindo SDL, SVGALib, frame buffer, aalib, X11 e outros.
 
 %prep
 %setup -q -n %{name}-build-%{version}
+%patch0 -p1
+%patch1 -p1
 
 # set ffmpeg options:
 echo " --arch=%{_target_base_arch}" >>ffmpeg_options
 echo " --cc="%{__cc}"" >>ffmpeg_options
-echo " --extra-cflags="-D_GNU_SOURCE=1 %{rpmcppflags} %{rpmcflags}"" >>ffmpeg_options
+echo " --extra-cflags="-D_GNU_SOURCE=1 %{rpmcppflags} %{rpmcflags} -I/usr/include/openjpeg-1.5"" >>ffmpeg_options
 echo " --extra-ldflags="%{rpmcflags} %{rpmldflags}"" >>ffmpeg_options
 echo " --disable-debug" >>ffmpeg_options
 echo " --disable-optimizations" >>ffmpeg_options
@@ -266,7 +268,7 @@ echo "      --disable-mmx" >>ffmpeg_options
 echo " --enable-nonfree" >>ffmpeg_options
 echo " --enable-libfaac" >>ffmpeg_options
 %endif
-echo " --enable-runtime-cpudetect" >>ffmpeg_options
+echo " %{__enable_disable runtime runtime-cpudetect}" >>ffmpeg_options
 
 # set mplayer options:
 echo " --prefix=%{_prefix}" >>mplayer_options
@@ -332,7 +334,6 @@ echo "      %{__disable theora}" >>mplayer_options
 echo " %{__disable x264}" >>mplayer_options
 echo " %{?with_xmms:--enable-xmms --with-xmmsplugindir=%{_libdir}/xmms/Input --with-xmmslibdir=%{_libdir}}" >>mplayer_options
 echo " %{__disable xvid}" >>mplayer_options
-echo " %{__disable vidix}" >>mplayer_options
 echo " %{__disable vdpau}" >>mplayer_options
 echo " %{__disable mencoder}" >>mplayer_options
 echo " --enable-dga1" >>mplayer_options