X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=ffmpeg.spec;h=69ddc98bc1196de10e09ac6b6ec00915ff2d9407;hb=1bab6688a1ce4ef223c96760580239571d5b756a;hp=986768dabc4168011be5cb294baaea031d0d3514;hpb=7003e3a3474506e7858c513ba3356e45adfa8109;p=packages%2Fffmpeg.git

diff --git a/ffmpeg.spec b/ffmpeg.spec
index 986768d..69ddc98 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -1,5 +1,3 @@
-# TODO:
-# --enable-libopenmpt [BR: libopenmpt >= 0.2.6557]
 #
 # How to deal with ffmpeg/opencv/chromaprint checken-egg problem:
 #	1. make-request -r --with bootstrap ffmpeg.spec
@@ -34,6 +32,7 @@
 %bcond_without	opencv		# OpenCV video filtering
 %bcond_without	opengl		# OpenGL rendering support
 %bcond_with	openh264	# OpenH264 H.264 encoder
+%bcond_without	openmpt		# OpenMPT module decoder
 %bcond_without	pulseaudio	# PulseAudio input support
 %bcond_without	rubberband	# rubberband filter
 %bcond_without	shine		# shine fixed-point MP3 encoder
@@ -70,7 +69,7 @@ Summary:	FFmpeg - a very fast video and audio converter
 Summary(pl.UTF-8):	FFmpeg - szybki konwerter audio/wideo
 Name:		ffmpeg
 Version:	3.3.2
-Release:	1
+Release:	2
 # LGPL or GPL, chosen at configure time (GPL version is more featured)
 # (postprocessing, some filters, x264, x265, xavs, xvid, xcbgrab)
 # using v3 allows Apache-licensed libs (opencore-amr, libvo-*enc)
@@ -122,6 +121,7 @@ BuildRequires:	libgsm-devel
 BuildRequires:	libiec61883-devel
 BuildRequires:	libmodplug-devel
 BuildRequires:	libnut-devel
+%{?with_openmpt:BuildRequires: libopenmpt-devel >= 0.2.6557}
 BuildRequires:	libraw1394-devel >= 2
 BuildRequires:	librtmp-devel
 %{?with_ssh:BuildRequires:	libssh-devel}
@@ -228,6 +228,7 @@ Requires:	SDL2 >= 2.0.1
 # uses gnutls_certificate_set_x509_system_trust if >= 3.0.20
 Requires:	gnutls-libs >= 3.0.20
 %endif
+%{?with_openmpt:Requires: libopenmpt >= 0.2.6557}
 %{?with_vpx:Requires:	libvpx >= 1.3.0}
 %{?with_rubberband:Requires:	rubberband-libs >= 1.8.1}
 %{?with_zimg:Requires:	zimg >= 2.3.0}
@@ -281,6 +282,7 @@ Requires:	libgsm-devel
 Requires:	libiec61883-devel
 Requires:	libmodplug-devel
 Requires:	libnut-devel
+%{?with_openmpt:Requires: libopenmpt-devel >= 0.2.6557}
 Requires:	libraw1394-devel >= 2
 Requires:	librtmp-devel
 %{?with_smb:Requires:	libsmbclient-devel}
@@ -506,6 +508,7 @@ EOF
 	%{?with_opencv:--enable-libopencv} \
 	%{?with_openh264:--enable-libopenh264} \
 	--enable-libopenjpeg \
+	%{?with_openmpt:--enable-libopenmpt} \
 	--enable-libopus \
 	%{?with_pulseaudio:--enable-libpulse} \
 	--enable-librtmp \