commit f0dce24b73d092e0c678306238c4d93536255c04
Author: Arkadiusz Miśkiewicz <[email protected]>
Date: Wed Dec 3 22:49:57 2014 +0100
- up to 20141203 snap
mplayer-giflib.patch | 26 --------------------------
mplayer.spec | 8 +++-----
2 files changed, 3 insertions(+), 31 deletions(-)
---
diff --git a/mplayer.spec b/mplayer.spec
index 616f0af..086584d 100644
--- a/mplayer.spec
+++ b/mplayer.spec
@@ -108,7 +108,7 @@
%endif
# date from directory inside of tarball (like mplayer-export-2014-04-29)
-%define snap 2014-09-12
+%define snap 2014-12-03
%define ssnap %(echo %{snap} | tr -d -)
%define rel 3
Summary: MPlayer - THE Movie Player for UN*X
@@ -129,9 +129,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: 28b3754f5a1f8d783e422e1bff239a92
+# Source0-md5: 2f37d5e386a7ce98fec54636602e7a58
Source1: http://ffmpeg.org/releases/ffmpeg-snapshot.tar.bz2
-# Source1-md5: 05728909d83ea25c77e2d7912492ba93
+# Source1-md5: 25e00ca99eda7bb54546ce7c10b78464
Source3:
ftp://ftp1.mplayerhq.hu/MPlayer/releases/fonts/font-arial-iso-8859-2.tar.bz2
# Source3-md5: 7b47904a925cf58ea546ca15f3df160c
Source5: g%{name}.desktop
@@ -142,7 +142,6 @@ 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
-Patch0: %{name}-giflib.patch
# build (configure / Makefile) related:
Patch10: %{name}-ldflags.patch
@@ -396,7 +395,6 @@ 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
cp -f etc/codecs.conf etc/codecs.win32.conf
-%patch0 -p1
# build (configure / Makefile) related:
%patch10 -p1
diff --git a/mplayer-giflib.patch b/mplayer-giflib.patch
deleted file mode 100644
index 2812969..0000000
--- a/mplayer-giflib.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- mplayer-export-2014-09-12/libvo/vo_gif89a.c.orig 2014-01-18
22:39:07.000000000 +0100
-+++ mplayer-export-2014-09-12/libvo/vo_gif89a.c 2014-09-16
17:01:13.843265608 +0200
-@@ -367,7 +367,11 @@
- MPLAYER_VERSION, VO_GIF_REVISION,
- "[email protected]");
- EGifPutComment(new_gif, temp);
-+#if (GIFLIB_MAJOR > 5) || ((GIFLIB_MAJOR == 5) && (GIFLIB_MINOR >= 1))
-+ EGifCloseFile(new_gif, NULL); // also frees gif storage space.
-+#else
- EGifCloseFile(new_gif); // also frees gif storage space.
-+#endif
- }
-
- // free our allocated ram
---- mplayer-export-2014-09-12/libmpdemux/demux_gif.c.orig 2014-02-23
19:14:44.000000000 +0100
-+++ mplayer-export-2014-09-12/libmpdemux/demux_gif.c 2014-09-16
18:00:40.546449439 +0200
-@@ -51,6 +51,9 @@
- #define GifError() (gif ? gif->Error : 0)
- #define GifErrorString() GifErrorString(gif->Error)
- #endif
-+#if defined GIFLIB_MAJOR && ((GIFLIB_MAJOR > 5) || ((GIFLIB_MAJOR == 5) &&
(GIFLIB_MINOR >= 1)))
-+#define DGifCloseFile(a) DGifCloseFile(a, NULL)
-+#endif
-
- /* >= 4.2 prior GIFLIB did not have MAJOR/MINOR defines */
- #if defined GIFLIB_MAJOR && GIFLIB_MAJOR >= 4
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mplayer.git/commitdiff/f0dce24b73d092e0c678306238c4d93536255c04
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
