]> git.pld-linux.org Git - packages/mplayer.git/blobdiff - mplayer.spec
- updated dependencies
[packages/mplayer.git] / mplayer.spec
index 2b3da378b60ce4be80cc16502e680017daf02caa..e9e7e98e83f8fa9d418c518d974998e637e62ca0 100644 (file)
@@ -23,7 +23,6 @@
 %bcond_without live            # LIVE555 Streaming Media support
 %bcond_without mencoder        # mencoder (a/v encoder) compilation
 %bcond_without nemesi          # NeMeSi Streaming Media support
-%bcond_with    on2             # patches from On2 Flix Engine for Linux
 %bcond_without osd             # osd menu support
 %bcond_without rtmp            # RTMPDump Streaming Media support
 %bcond_with    shared          # experimental libmplayer.so support
 %endif
 
 # date from directory inside of tarball (like mplayer-export-2014-04-29)
-%define        snap    2017-07-09
+%define        snap    2018-05-22
 %define        ssnap   %(echo %{snap} | tr -d -)
-%define        rel     1
+%define        rel     2
 Summary:       MPlayer - THE Movie Player for UN*X
 Summary(de.UTF-8):     MPlayer ist ein unter der freien GPL-Lizenz stehender Media-Player
 Summary(es.UTF-8):     Otro reproductor de películas
@@ -133,9 +132,9 @@ License:    GPL
 Group:         Applications/Multimedia
 # Source0:        http://mplayerhq.hu/MPlayer/releases/MPlayer-%{version}.tar.xz
 Source0:       ftp://ftp.mplayerhq.hu/MPlayer/releases/mplayer-export-snapshot.tar.bz2
-# Source0-md5: d5d7bb7176682afccd64ef855ae65e8d
+# Source0-md5: d7447a6838ff3055d5ccb93534b88609
 Source1:       http://ffmpeg.org/releases/ffmpeg-snapshot.tar.bz2
-# Source1-md5: 20eb6a5caa8fd874e90033b54fc39ac0
+# Source1-md5: b1b71cc56b15da49cee1ede9a7b8134e
 Source3:       ftp://ftp1.mplayerhq.hu/MPlayer/releases/fonts/font-arial-iso-8859-2.tar.bz2
 # Source3-md5: 7b47904a925cf58ea546ca15f3df160c
 Source5:       g%{name}.desktop
@@ -143,20 +142,17 @@ Source6:  ftp://ftp2.mplayerhq.hu/MPlayer/releases/fonts/font-arial-iso-8859-1.ta
 # Source6-md5: 1ecd31d17b51f16332b1fcc7da36b312
 Source7:       %{name}.png
 Source8:       %{name}.desktop
-# http://www.on2.com/gpl/mplayer/
-Source9:       http://support.on2.com/gpl/mplayer/2009-10-08-mencoder-on2flixenglinux.tar.bz2
-# Source9-md5: 07774a2663a8fda07c308df0c6569b56
 
 # build (configure / Makefile) related:
 Patch10:       %{name}-ldflags.patch
 Patch11:       %{name}-altivec.patch
 Patch12:       %{name}-check-byteswap.patch
 Patch13:       %{name}-visibility-hidden-fix.patch
-
+Patch14:       cflags.patch
 Patch15:       %{name}-live555-async.patch
 
 Patch17:       %{name}-gsm.patch
-Patch18:       %{name}-openjpeg.patch
+
 Patch19:       %{name}-shared.patch
 Patch20:       %{name}-vstream.patch
 
@@ -171,7 +167,6 @@ Patch31:    %{name}-350.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=579430
 #Patch32:      %{name}-gnome-screensaver.patch
 
-Patch100:      %{name}-on2flix.patch
 Patch101:      %{name}-link.patch
 
 URL:           http://www.mplayerhq.hu/
@@ -191,8 +186,7 @@ BuildRequires:      binutils >= 2.10.1
 BuildRequires: bzip2-devel
 #%{?with_cdparanoia:BuildRequires:     cdparanoia-III-devel}
 %{?with_gnomess:BuildRequires: dbus-glib-devel}
-BuildRequires: dirac-devel
-%{?with_doc:BuildRequires:     docbook-dtd412-xml}
+%{?with_doc:BuildRequires:     docbook-dtd45-xml}
 %{?with_doc:BuildRequires:     docbook-style-xsl}
 %{?with_dxr2:BuildRequires:    dxr2-driver-devel}
 %{?with_dxr3:BuildRequires:    em8300-devel}
@@ -254,13 +248,12 @@ BuildRequires:    linux-libc-headers >= 7:2.6.22
 %{?with_nas:BuildRequires:     nas-devel}
 BuildRequires: ncurses-devel
 %{?with_amr:BuildRequires:     opencore-amr-devel}
-%{?with_openjpeg:BuildRequires:        openjpeg-devel}
+%{?with_openjpeg:BuildRequires:        openjpeg2-devel >= 2.1.0}
 BuildRequires: opus-devel
 BuildRequires: pkgconfig
 %{?with_pulseaudio:BuildRequires:      pulseaudio-devel >= 0.9}
 BuildRequires: rpm >= 4.4.9-56
 BuildRequires: rpmbuild(macros) >= 1.527
-BuildRequires: schroedinger-devel
 BuildRequires: speex-devel >= 1.1
 %{?with_svga:BuildRequires:    svgalib-devel}
 BuildRequires: tar >= 1:1.22
@@ -285,10 +278,9 @@ BuildRequires:     yasm
 %endif
 BuildRequires: zlib-devel
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
-Requires:      OpenGL
+%{?with_openjpeg:Requires:     openjpeg2 >= 2.1.0}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _noautoreqdep   libGL.so.1 libGLU.so.1
 %define                specflags_ia32  -fomit-frame-pointer
 %if %{with altivec}
 %define                specflags_ppc   -maltivec
@@ -410,7 +402,7 @@ package.
 MEncoder to koder filmów dla Linuksa będący częścią pakietu MPlayer.
 
 %prep
-%setup -q -n %{name}-export-%{snap} -a1 -a3 -a6 -a9
+%setup -q -n %{name}-export-%{snap} -a1 -a3 -a6
 cp -f etc/codecs.conf etc/codecs.win32.conf
 
 # build (configure / Makefile) related:
@@ -418,11 +410,11 @@ cp -f etc/codecs.conf etc/codecs.win32.conf
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
-
+%patch14 -p1
 %patch15 -p1
 
 %patch17 -p1
-%patch18 -p1
+
 %{?with_shared:%patch19 -p1}
 %patch20 -p1
 
@@ -435,28 +427,6 @@ cp -f etc/codecs.conf etc/codecs.win32.conf
 %patch31 -p1
 #%{with_gnomess:%patch32 -p1}
 
-# on2flix
-mv mencoder-on2flixenglinux{-*-*-*,}
-%if %{with on2}
-#%%patch100 -p1
-cp -a mencoder-on2flixenglinux/patch/new_files/libmpdemux/* libmpdemux
-# remove broken patches:
-# - first set does not apply
-# - second set beakes build
-for PATCH in   asf-correct_movielength avi_check_idxflags \
-               demux_lavf-add_dv_mts_preferred demux_lavf-probe_small_files \
-               mencoder_07_demux_update_pts mencoder_10_correct_pts \
-               mpegvideo-revert_r18381 \
-               \
-               reduce_spurious_logging
-do
-       rm mencoder-on2flixenglinux/patch/$PATCH.diff
-done
-for a in mencoder-on2flixenglinux/patch/*.diff; do
-       patch -p0 < $a
-done
-%endif
-
 %patch101 -p1
 
 cat etc/example.conf > etc/mplayer.conf
@@ -612,7 +582,7 @@ build() {
 %if %{with gui}
 # build GUI version
 build --enable-gui --disable-mencoder
-mv -f mplayer gmplayer
+%{__mv} mplayer gmplayer
 %{__make} distclean
 %endif
 
@@ -713,9 +683,10 @@ umask 022
 %lang(es) %doc DOCS/HTML/es
 %lang(fr) %doc DOCS/HTML/fr
 %lang(hu) %doc DOCS/HTML/hu
+%lang(it) %doc DOCS/HTML/it
 %lang(pl) %doc DOCS/HTML/pl
 %lang(ru) %doc DOCS/HTML/ru
-#%lang(zh_CN) %doc DOCS/zh
+%lang(zh_CN) %doc DOCS/HTML/zh_CN
 %endif
 
 %files common
This page took 0.199603 seconds and 4 git commands to generate.