rpms/mplayer/EL-6 mplayer-pngalpha.patch, 1.2, 1.3 mplayer-ffmpeg.patch, 1.7, 1.8 mplayer-manlinks.patch, 1.5, 1.6 mplayer.spec, 1.60, 1.61 sources, 1.29, 1.30
Richard Shaw
hobbes1069 at rpmfusion.org
Tue Jul 3 16:53:03 CEST 2012
Author: hobbes1069
Update of /cvs/free/rpms/mplayer/EL-6
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv10978
Modified Files:
mplayer-ffmpeg.patch mplayer-manlinks.patch mplayer.spec
sources
Added Files:
mplayer-pngalpha.patch
Log Message:
* Tue Jul 03 2012 Richard Shaw <hobbes1069 at gmail.com> - 1.0-0.140.20120205svn.1
- Update spec for initial build for EL-6.
- Conditionalize em8300-devel requirement for Fedora only.
- Fix typo in build requirement for pulseaudio-libs-devel.
mplayer-pngalpha.patch:
vo_png.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: mplayer-pngalpha.patch
===================================================================
RCS file: mplayer-pngalpha.patch
diff -N mplayer-pngalpha.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ mplayer-pngalpha.patch 3 Jul 2012 14:53:02 -0000 1.3
@@ -0,0 +1,13 @@
+Index: libvo/vo_png.c
+===================================================================
+--- libvo/vo_png.c (wersja 34891)
++++ libvo/vo_png.c (wersja 34892)
+@@ -205,7 +205,7 @@
+ switch(format){
+ case IMGFMT_RGB24:
+ return use_alpha ? 0 : supported_flags;
+- case IMGFMT_BGR32:
++ case IMGFMT_RGBA:
+ return use_alpha ? supported_flags : 0;
+ }
+ return 0;
mplayer-ffmpeg.patch:
Makefile | 2
configure | 4 -
ffmpeg/libavformat/internal.h | 32 +++++++++++++
ffmpeg/libavutil/x86_cpu.h | 98 ++++++++++++++++++++++++++++++++++++++++++
4 files changed, 133 insertions(+), 3 deletions(-)
Index: mplayer-ffmpeg.patch
===================================================================
RCS file: /cvs/free/rpms/mplayer/EL-6/mplayer-ffmpeg.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mplayer-ffmpeg.patch 14 Jun 2012 22:34:06 -0000 1.7
+++ mplayer-ffmpeg.patch 3 Jul 2012 14:53:02 -0000 1.8
@@ -1,16 +1,16 @@
-diff -up MPlayer-1.1/configure.ffmpeg MPlayer-1.1/configure
---- MPlayer-1.1/configure.ffmpeg 2012-06-12 19:54:45.573647100 +0200
-+++ MPlayer-1.1/configure 2012-06-12 19:55:00.444732663 +0200
-@@ -6755,7 +6755,7 @@ elif test "$ffmpeg_so" = auto ; then
- inc_ffmpeg=$($_pkg_config --cflags libswscale libavformat libavcodec libavutil)
- ld_tmp=$($_pkg_config --libs libswscale libavformat libavcodec libavutil)
+diff -up mplayer-export-2012-02-05/configure.ffmpeg mplayer-export-2012-02-05/configure
+--- mplayer-export-2012-02-05/configure.ffmpeg 2012-03-12 00:18:05.000000000 +0100
++++ mplayer-export-2012-02-05/configure 2012-03-12 00:18:05.000000000 +0100
+@@ -6718,7 +6718,7 @@ elif test "$ffmpeg_so" = auto ; then
+ inc_ffmpeg=$($_pkg_config --cflags libpostproc libswscale libavformat libavcodec libavutil)
+ ld_tmp=$($_pkg_config --libs libpostproc libswscale libavformat libavcodec libavutil)
header_check libavutil/avutil.h $inc_ffmpeg $ld_tmp &&
- extra_ldflags="$extra_ldflags $ld_tmp" && ffmpeg_so=yes && ffmpeg=yes
+ extra_ldflags="$extra_ldflags $ld_tmp" && ffmpeg_so=yes && ffmpeg=yes && extra_cflags="$extra_cflags $inc_ffmpeg"
- elif header_check libavutil/avutil.h -lswscale -lavformat -lavcodec -lavutil ; then
- extra_ldflags="$extra_ldflags -lswscale -lavformat -lavcodec -lavutil"
+ elif header_check libavutil/avutil.h -lpostproc -lswscale -lavformat -lavcodec -lavutil ; then
+ extra_ldflags="$extra_ldflags -lpostproc -lswscale -lavformat -lavcodec -lavutil"
ffmpeg_so=yes
-@@ -7464,7 +7464,7 @@ if test "$_gui" = yes ; then
+@@ -7407,7 +7407,7 @@ if test "$_gui" = yes ; then
# Required libraries
if test "$ffmpeg" != yes ||
@@ -19,9 +19,9 @@
die "The GUI requires libavcodec with PNG support (needs zlib)."
fi
test "$_freetype" = no && test "$_bitmap_font" = no &&
-diff -up MPlayer-1.1/ffmpeg/libavformat/internal.h.ffmpeg MPlayer-1.1/ffmpeg/libavformat/internal.h
---- MPlayer-1.1/ffmpeg/libavformat/internal.h.ffmpeg 2012-06-12 19:54:45.578647128 +0200
-+++ MPlayer-1.1/ffmpeg/libavformat/internal.h 2012-06-12 19:54:45.578647128 +0200
+diff -up mplayer-export-2012-02-05/ffmpeg/libavformat/internal.h.ffmpeg mplayer-export-2012-02-05/ffmpeg/libavformat/internal.h
+--- mplayer-export-2012-02-05/ffmpeg/libavformat/internal.h.ffmpeg 2012-03-12 00:20:43.000000000 +0100
++++ mplayer-export-2012-02-05/ffmpeg/libavformat/internal.h 2012-03-12 00:23:13.000000000 +0100
@@ -0,0 +1,32 @@
+/*
+ * copyright (c) 2001 Fabrice Bellard
@@ -55,9 +55,9 @@
+} AVCodecTag;
+
+#endif /* AVFORMAT_INTERNAL_H */
-diff -up MPlayer-1.1/ffmpeg/libavutil/x86_cpu.h.ffmpeg MPlayer-1.1/ffmpeg/libavutil/x86_cpu.h
---- MPlayer-1.1/ffmpeg/libavutil/x86_cpu.h.ffmpeg 2012-06-12 19:54:45.615647342 +0200
-+++ MPlayer-1.1/ffmpeg/libavutil/x86_cpu.h 2012-06-12 19:54:45.615647342 +0200
+diff -up mplayer-export-2012-02-05/ffmpeg/libavutil/x86_cpu.h.ffmpeg mplayer-export-2012-02-05/ffmpeg/libavutil/x86_cpu.h
+--- mplayer-export-2012-02-05/ffmpeg/libavutil/x86_cpu.h.ffmpeg 2012-03-12 00:18:05.000000000 +0100
++++ mplayer-export-2012-02-05/ffmpeg/libavutil/x86_cpu.h 2012-03-12 00:18:05.000000000 +0100
@@ -0,0 +1,98 @@
+/*
+ * copyright (c) 2006 Michael Niedermayer <michaelni at gmx.at>
@@ -157,10 +157,10 @@
+#endif
+
+#endif /* AVUTIL_X86_CPU_H */
-diff -up MPlayer-1.1/Makefile.ffmpeg MPlayer-1.1/Makefile
---- MPlayer-1.1/Makefile.ffmpeg 2012-06-12 19:54:45.573647100 +0200
-+++ MPlayer-1.1/Makefile 2012-06-12 19:54:45.616647347 +0200
-@@ -788,7 +788,7 @@ mencoder$(EXESUF) mplayer$(EXESUF):
+diff -up mplayer-export-2012-02-05/Makefile.ffmpeg mplayer-export-2012-02-05/Makefile
+--- mplayer-export-2012-02-05/Makefile.ffmpeg 2012-03-12 00:18:05.000000000 +0100
++++ mplayer-export-2012-02-05/Makefile 2012-03-12 00:18:05.000000000 +0100
+@@ -787,7 +787,7 @@ mencoder$(EXESUF) mplayer$(EXESUF):
$(CC) -o $@ $^ $(EXTRALIBS)
codec-cfg$(EXESUF): codec-cfg.c codec-cfg.h help_mp.h
mplayer-manlinks.patch:
Makefile | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
Index: mplayer-manlinks.patch
===================================================================
RCS file: /cvs/free/rpms/mplayer/EL-6/mplayer-manlinks.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mplayer-manlinks.patch 28 Feb 2012 18:35:17 -0000 1.5
+++ mplayer-manlinks.patch 3 Jul 2012 14:53:02 -0000 1.6
@@ -1,32 +1,31 @@
-diff -up mplayer-export-2009-10-29/Makefile.manlinks mplayer-export-2009-10-29/Makefile
---- mplayer-export-2009-10-29/Makefile.manlinks 2009-10-19 11:56:18.000000000 +0200
-+++ mplayer-export-2009-10-29/Makefile 2009-10-30 00:42:36.000000000 +0100
-@@ -922,10 +922,10 @@ install-mencoder-man: $(foreach lang,$(M
+diff -up mplayer-export-2012-02-04/Makefile.manlinks mplayer-export-2012-02-04/Makefile
+--- mplayer-export-2012-02-04/Makefile.manlinks 2012-02-27 13:46:39.000000000 +0100
++++ mplayer-export-2012-02-04/Makefile 2012-02-27 20:43:47.286424087 +0100
+@@ -919,10 +919,10 @@ install-mencoder-man: $(foreach lang,$(M
install-mplayer-man: $(foreach lang,$(MAN_LANGS),install-mplayer-man-$(lang))
install-gui-man-en: install-mplayer-man-en
- cd $(MANDIR)/man1/ && ln -sf mplayer.1 gmplayer.1
-+ echo ".so mplayer.1" > $(MANDIR)/man1/gmplayer.1
++ echo ".so man1/mplayer.1" > $(MANDIR)/man1/gmplayer.1
install-mencoder-man-en: install-mplayer-man-en
- cd $(MANDIR)/man1 && ln -sf mplayer.1 mencoder.1
-+ echo ".so mplayer.1" > $(MANDIR)/man1/mencoder.1
++ echo ".so man1/mplayer.1" > $(MANDIR)/man1/mencoder.1
install-mplayer-man-en:
$(INSTALL) -d $(MANDIR)/man1
-@@ -933,12 +933,12 @@ install-mplayer-man-en:
+@@ -936,12 +936,12 @@ endef
define GUI_MAN_RULE
install-gui-man-$(lang): install-mplayer-man-$(lang)
- cd $(MANDIR)/$(lang)/man1/ && ln -sf mplayer.1 gmplayer.1
-+ echo ".so mplayer.1" > $(MANDIR)/$(lang)/man1/gmplayer.1
++ echo ".so man1/mplayer.1" > $(MANDIR)/$(lang)/man1/gmplayer.1
endef
define MENCODER_MAN_RULE
install-mencoder-man-$(lang): install-mplayer-man-$(lang)
- cd $(MANDIR)/$(lang)/man1 && ln -sf mplayer.1 mencoder.1
-+ echo ".so mplayer.1" > $(MANDIR)/$(lang)/man1/mencoder.1
++ echo ".so man1/mplayer.1" > $(MANDIR)/$(lang)/man1/mencoder.1
endef
define MPLAYER_MAN_RULE
-E
Index: mplayer.spec
===================================================================
RCS file: /cvs/free/rpms/mplayer/EL-6/mplayer.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- mplayer.spec 2 Jul 2012 19:18:43 -0000 1.60
+++ mplayer.spec 3 Jul 2012 14:53:03 -0000 1.61
@@ -1,12 +1,12 @@
%define codecdir %{_libdir}/codecs
-#define pre 20120205svn
-#define svn 1
-#define svnbuild 2012-02-05
+%define pre 20120205svn
+%define svn 1
+%define svnbuild 2012-02-05
%define faad2min 1:2.6.1
Name: mplayer
-Version: 1.1
-Release: 1%{?pre}%{?dist}
+Version: 1.0
+Release: 0.140.%{pre}%{?dist}.1
Summary: Movie player playing most video formats and DVDs
%if 0%{!?_without_amr:1}
@@ -15,15 +15,16 @@
License: GPLv2+
%endif
URL: http://www.mplayerhq.hu/
-%if 0%{?svn}
+%if 0%{svn}
# run ./mplayer-snapshot.sh to get this
Source0: mplayer-export-%{svnbuild}.tar.bz2
%else
-Source0: http://www.mplayerhq.hu/MPlayer/releases/MPlayer-%{version}%{?pre}.tar.xz
+Source0: http://www.mplayerhq.hu/MPlayer/releases/MPlayer-%{version}%{pre}.tar.bz2
%endif
Source1: http://www.mplayerhq.hu/MPlayer/skins/Blue-1.8.tar.bz2
Source10: mplayer-snapshot.sh
Patch0: %{name}-gmplayer-subtitles.patch
+Patch1: %{name}-pngalpha.patch
# set defaults for Fedora
Patch2: %{name}-config.patch
# use roff include statements instead of symlinks
@@ -39,6 +40,9 @@
BuildRequires: bzip2-devel
BuildRequires: alsa-lib-devel
BuildRequires: desktop-file-utils
+%if 0%{?fedora}
+BuildRequires: em8300-devel
+%endif
BuildRequires: enca-devel
BuildRequires: faad2-devel >= %{faad2min}
BuildRequires: ffmpeg-devel >= 0.10
@@ -93,7 +97,7 @@
%{?_with_samba:BuildRequires: libsmbclient-devel}
%{?_with_svgalib:BuildRequires: svgalib-devel}
%{?_with_xmms:BuildRequires: xmms-devel}
-%if 0%{?svn}
+%if %{svn}
# for XML docs, SVN only
BuildRequires: docbook-dtds
BuildRequires: docbook-style-xsl
@@ -215,13 +219,13 @@
%prep
-%if 0%{?svn}
+%if 0%{svn}
%setup -q -n mplayer-export-%{svnbuild}
%else
-%setup -q -n MPlayer-%{version}%{?pre}
-rm -rf ffmpeg libdvdcss libdvdnav libdvdread4
+%setup -q -n MPlayer-%{version}%{pre}
%endif
%patch0 -p0 -b .gmplayer-subtitles
+%patch1 -p0 -b .pngalpha
%patch2 -p1 -b .config
%patch8 -p1 -b .manlinks
%patch14 -p1 -b .nodvdcss
@@ -241,7 +245,7 @@
%{__make} V=1 %{?_smp_mflags}
-%if 0%{?svn}
+%if 0%{svn}
# build HTML documentation from XML files
%{__make} html-chunked
%endif
@@ -381,16 +385,17 @@
%{_datadir}/mplayer/*.fp
%changelog
-* Sun Jun 24 2012 Julian Sikorski <belegdol at fedoraproject.org> - 1.1-1
-- Updated to 1.1
-- Made %%pre, %%svn and %%svnbuild defines optional
-- Switched to .xz sources
-- Updated the ffmpeg patch
+* Tue Jul 03 2012 Richard Shaw <hobbes1069 at gmail.com> - 1.0-0.140.20120205svn.1
+- Update spec for initial build for EL-6.
+- Conditionalize em8300-devel requirement for Fedora only.
+- Fix typo in build requirement for pulseaudio-libs-devel.
+
+* Sun Jun 24 2012 Julian Sikorski <belegdol at fedoraproject.org> - 1.0-0.140.20120205svn
+- Fixed -vo png:alpha using a patch from SVN (RPM Fusion bug #2362)
* Wed Jun 13 2012 Julian Sikorski <belegdol at fedoraproject.org> - 1.0-0.139.20120205svn
- Restored the ability to disable subtitles in gmplayer (RPM Fusion bug #2373)
- Rebuilt for ffmpeg-0.10.4
-- Fix BR to pulseaudio-libs-devel
* Mon May 07 2012 Julian Sikorski <belegdol at fedoraproject.org> - 1.0-0.138.20120205svn
- Rebuilt for ffmpeg-0.10.3
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mplayer/EL-6/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources 14 Jun 2012 22:34:06 -0000 1.29
+++ sources 3 Jul 2012 14:53:03 -0000 1.30
@@ -1,2 +1,2 @@
340368f4e33f767d9df109990fb29c02 Blue-1.8.tar.bz2
-ac7bf1cfedc1c5c24bfc83107eefb1d9 MPlayer-1.1.tar.xz
+3f7055dd51cc3f5e95a555dd655924ad mplayer-export-2012-02-05.tar.bz2
More information about the rpmfusion-commits
mailing list