rpms
/
mplayer
21
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Sat Mar 01 2014 Julian Sikorski <belegdol@fedoraproject.org> - 1.1-20.20140301svn

Browse Source 
- 20140301 snapshot
el8
Julian Sikorski 11 years ago
parent 5d4b9b6a3d
commit d6fc5898c4
5 changed files with 23 additions and 29 deletions
Show Stats Download Patch File Download Diff File

2
.gitignore vendored
Unescape View File

@ -1,2 +1,2 @@
Blue-1.8.tar.bz2
mplayer-export-2014-02-11.tar.bz2
mplayer-export-2014-03-01.tar.bz2

37
mplayer-ffmpeg.patch
Unescape View File

@ -1,7 +1,7 @@
diff -up mplayer-export-2013-08-01/configure.ffmpeg mplayer-export-2013-08-01/configure
--- mplayer-export-2013-08-01/configure.ffmpeg 2013-08-01 12:37:20.815714081 +0200
+++ mplayer-export-2013-08-01/configure 2013-08-01 12:37:20.817714096 +0200
@@ -6987,7 +6987,7 @@ elif test "$ffmpeg_so" = auto ; then
diff -up mplayer-export-2014-03-01/configure.ffmpeg mplayer-export-2014-03-01/configure
--- mplayer-export-2014-03-01/configure.ffmpeg 2014-03-01 11:25:45.356757774 +0100
+++ mplayer-export-2014-03-01/configure 2014-03-01 11:25:45.359757607 +0100
@@ -7082,7 +7082,7 @@ if test "$ffmpeg_so" = auto ; then
inc_ffmpeg=$($_pkg_config --cflags libswscale libavformat libavcodec libavutil)
ld_tmp=$($_pkg_config --libs libswscale libavformat libavcodec libavutil)
header_check libavutil/avutil.h $inc_ffmpeg $ld_tmp &&
@ -10,18 +10,9 @@ diff -up mplayer-export-2013-08-01/configure.ffmpeg mplayer-export-2013-08-01/co
elif header_check libavutil/avutil.h -lswscale -lavformat -lavcodec -lavutil ; then
extra_ldflags="$extra_ldflags -lswscale -lavformat -lavcodec -lavutil"
ffmpeg_so=yes
@@ -7696,7 +7696,7 @@ if test "$_gui" = yes ; then
# Required libraries
if test "$ffmpeg" != yes ||
- ! echo $libavdecoders | grep -q PNG_DECODER ; then
+ ! cat $_libdir/pkgconfig/libavcodec.pc | grep -q lz ; then
die "The GUI requires libavcodec with PNG support (needs zlib)."
fi
test "$_freetype" = no && test "$_bitmap_font" = no &&
diff -up mplayer-export-2013-08-01/ffmpeg/libavformat/internal.h.ffmpeg mplayer-export-2013-08-01/ffmpeg/libavformat/internal.h
--- mplayer-export-2013-08-01/ffmpeg/libavformat/internal.h.ffmpeg 2013-08-01 12:37:20.818714103 +0200
+++ mplayer-export-2013-08-01/ffmpeg/libavformat/internal.h 2013-08-01 12:37:20.818714103 +0200
diff -up mplayer-export-2014-03-01/ffmpeg/libavformat/internal.h.ffmpeg mplayer-export-2014-03-01/ffmpeg/libavformat/internal.h
--- mplayer-export-2014-03-01/ffmpeg/libavformat/internal.h.ffmpeg 2014-03-01 11:25:45.359757607 +0100
+++ mplayer-export-2014-03-01/ffmpeg/libavformat/internal.h 2014-03-01 11:25:45.359757607 +0100
@@ -0,0 +1,32 @@
+/*
+ * copyright (c) 2001 Fabrice Bellard
@ -55,9 +46,9 @@ diff -up mplayer-export-2013-08-01/ffmpeg/libavformat/internal.h.ffmpeg mplayer-
+} AVCodecTag;
+
+#endif /* AVFORMAT_INTERNAL_H */
diff -up mplayer-export-2013-08-01/ffmpeg/libavutil/x86/asm.h.ffmpeg mplayer-export-2013-08-01/ffmpeg/libavutil/x86/asm.h
--- mplayer-export-2013-08-01/ffmpeg/libavutil/x86/asm.h.ffmpeg 2013-08-01 12:37:20.818714103 +0200
+++ mplayer-export-2013-08-01/ffmpeg/libavutil/x86/asm.h 2013-08-01 12:39:29.232657100 +0200
diff -up mplayer-export-2014-03-01/ffmpeg/libavutil/x86/asm.h.ffmpeg mplayer-export-2014-03-01/ffmpeg/libavutil/x86/asm.h
--- mplayer-export-2014-03-01/ffmpeg/libavutil/x86/asm.h.ffmpeg 2014-03-01 11:25:45.359757607 +0100
+++ mplayer-export-2014-03-01/ffmpeg/libavutil/x86/asm.h 2014-03-01 11:25:45.359757607 +0100
@@ -0,0 +1,112 @@
+/*
+ * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
@ -171,10 +162,10 @@ diff -up mplayer-export-2013-08-01/ffmpeg/libavutil/x86/asm.h.ffmpeg mplayer-exp
+#define MANGLE(a) EXTERN_PREFIX LOCAL_MANGLE(a)
+
+#endif /* AVUTIL_X86_ASM_H */
diff -up mplayer-export-2013-08-01/Makefile.ffmpeg mplayer-export-2013-08-01/Makefile
--- mplayer-export-2013-08-01/Makefile.ffmpeg 2013-08-01 12:37:20.815714081 +0200
+++ mplayer-export-2013-08-01/Makefile 2013-08-01 12:37:20.818714103 +0200
@@ -775,7 +775,7 @@ mencoder$(EXESUF) mplayer$(EXESUF):
diff -up mplayer-export-2014-03-01/Makefile.ffmpeg mplayer-export-2014-03-01/Makefile
--- mplayer-export-2014-03-01/Makefile.ffmpeg 2014-03-01 11:25:45.357757718 +0100
+++ mplayer-export-2014-03-01/Makefile 2014-03-01 11:25:45.360757551 +0100
@@ -776,7 +776,7 @@ mencoder$(EXESUF) mplayer$(EXESUF):
codec-cfg-test$(EXESUF): HOSTCFLAGS := $(HOSTCFLAGS) -DTESTING
codec-cfg$(EXESUF) codecs2html$(EXESUF): HOSTCFLAGS := $(HOSTCFLAGS) -DCODECS2HTML
codec-cfg$(EXESUF) codec-cfg-test$(EXESUF) codecs2html$(EXESUF): codec-cfg.c codec-cfg.h help_mp.h

2
mplayer-snapshot.sh
Unescape View File

@ -13,7 +13,7 @@ cleanup() {
unset CDPATH
pwd=$(pwd)
svn=$(date +%Y-%m-%d)
svn=2014-02-11
svn=2014-03-01
dirname=mplayer-export-$svn
mplayer_rev={$svn}
#mplayer_rev=HEAD

9
mplayer.spec
Unescape View File

@ -1,12 +1,12 @@
%define codecdir %{_libdir}/codecs
%define pre 20140211svn
%define pre 20140301svn
%define svn 1
%define svnbuild 2014-02-11
%define svnbuild 2014-03-01
%define faad2min 1:2.6.1
Name: mplayer
Version: 1.1
Release: 19.%{?pre}%{?dist}
Release: 20.%{?pre}%{?dist}
Summary: Movie player playing most video formats and DVDs
%if 0%{!?_without_amr:1}
@ -380,6 +380,9 @@ update-desktop-database &>/dev/null || :
%{_datadir}/mplayer/*.fp
%changelog
* Sat Mar 01 2014 Julian Sikorski <belegdol@fedoraproject.org> - 1.1-20.20140301svn
- 20140301 snapshot
* Tue Feb 11 2014 Julian Sikorski <belegdol@fedoraproject.org> - 1.1-19.20140211svn
- 20140211 snapshot

2
sources
Unescape View File

@ -1,2 +1,2 @@
340368f4e33f767d9df109990fb29c02 Blue-1.8.tar.bz2
6888d412884a24084118e82d78814420 mplayer-export-2014-02-11.tar.bz2
5048b11765630664508888bdce26244f mplayer-export-2014-03-01.tar.bz2

Write Preview
Loading…
Cancel
Save