[packages/mplayer] drop On2 Flix Engine patch

[glen]

commit 3fbc4305262f9faf67f4f021c7d7802d508a7d0d
Author: Elan Ruusamäe <glen at pld-linux.org>
Date:   Wed Aug 2 09:21:50 2017 +0300

    drop On2 Flix Engine patch
    
    discontinued in favour of webm/vpx, acquired by google in 2010, etc
    
    https://en.wikipedia.org/wiki/On2_Flix
    https://en.wikipedia.org/wiki/On2_Technologies

 mplayer-on2flix.patch | 35 -----------------------------------
 mplayer.spec          | 29 +----------------------------
 2 files changed, 1 insertion(+), 63 deletions(-)
---
diff --git a/mplayer.spec b/mplayer.spec
index 3f6f411..64fccbd 100644
--- a/mplayer.spec
+++ b/mplayer.spec
@@ -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
@@ -143,9 +142,6 @@ 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
@@ -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/
@@ -410,7 +405,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:
@@ -435,28 +430,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
diff --git a/mplayer-on2flix.patch b/mplayer-on2flix.patch
deleted file mode 100644
index a91bcbf..0000000
--- a/mplayer-on2flix.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- mplayer-1.0_rc2_p27725/version.sh~	2008-11-23 20:34:23.000000000 +0200
-+++ mplayer-1.0_rc2_p27725/version.sh	2008-11-23 20:34:25.547985245 +0200
-@@ -9,7 +9,7 @@
- 
- NEW_REVISION="#define VERSION \"dev-SVN-r${svn_revision}${extra}\""
- OLD_REVISION=`cat version.h 2> /dev/null`
--TITLE="#define MP_TITLE \"MPlayer dev-SVN-r${svn_revision}${extra} (C) 2000-2008 MPlayer Team\""
-+TITLE="#define MP_TITLE \"MPlayer dev-SVN-on2-r${svn_revision}${extra} (C) 2000-2008 MPlayer Team\""
- 
- # Update version.h only on revision changes to avoid spurious rebuilds
- if test "$NEW_REVISION" != "$OLD_REVISION"; then
---- mplayer-1.0_rc2_p27725/mencoder-on2flixenglinux/patch/mencoder_05_mov_lavf_pts_var_fps.diff~	2008-09-30 17:48:23.000000000 +0300
-+++ mplayer-1.0_rc2_p27725/mencoder-on2flixenglinux/patch/mencoder_05_mov_lavf_pts_var_fps.diff	2008-11-23 20:42:01.869189287 +0200
-@@ -1,15 +1,12 @@
--Index: libmpdemux/video.c
--===================================================================
----- libmpdemux/video.c	(revision 27474)
--+++ libmpdemux/video.c	(working copy)
--@@ -587,7 +587,9 @@
--       }
-+--- libmpdemux/video.c~	2008-11-23 20:35:08.000000000 +0200
-++++ libmpdemux/video.c	2008-11-23 20:39:05.232123918 +0200
-+@@ -588,7 +588,8 @@
-        break;
-        case DEMUXER_TYPE_LAVF:
-+       case DEMUXER_TYPE_LAVF_PREFERRED:
- -        if((int)sh_video->fps==1000 || (int)sh_video->fps<=1){
--+      case DEMUXER_TYPE_LAVF_PREFERRED:
--+        if((int)sh_video->fps==1000 || (int)sh_video->fps<=1 
--+            || sh_video->video.dwRate==1000) {          
-++        if((int)sh_video->fps==1000 || (int)sh_video->fps<=1
-++            || sh_video->video.dwRate==1000) {
-            double next_pts = ds_get_next_pts(d_video);
-            double d= (next_pts != MP_NOPTS_VALUE) ? next_pts - d_video->pts : d_video->pts-pts1;
-            if(d>=0){
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mplayer.git/commitdiff/3fbc4305262f9faf67f4f021c7d7802d508a7d0d