rpmfusion-commits
February 2012
rpmfusion-commits@lists.rpmfusion.org
- 21 participants
- 1094 discussions
rpms/openafs/devel .cvsignore, 1.5, 1.6 openafs.spec, 1.17, 1.18 sources, 1.8, 1.9
by Ken Dreyer
Author: ktdreyer
Update of /cvs/free/rpms/openafs/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv12264
Modified Files:
.cvsignore openafs.spec sources
Log Message:
* Wed Feb 28 2012 Ken Dreyer <ktdreyer(a)ktdreyer.com> 0:1.6.1-0.pre3
- Update to OpenAFS 1.6.1 pre-release 3
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/openafs/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 8 Feb 2012 14:42:24 -0000 1.5
+++ .cvsignore 28 Feb 2012 22:59:28 -0000 1.6
@@ -1,2 +1,2 @@
-openafs-1.6.1pre2-src.tar.bz2
-openafs-1.6.1pre2-doc.tar.bz2
+openafs-1.6.1pre3-src.tar.bz2
+openafs-1.6.1pre3-doc.tar.bz2
Index: openafs.spec
===================================================================
RCS file: /cvs/free/rpms/openafs/devel/openafs.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- openafs.spec 13 Feb 2012 22:32:28 -0000 1.17
+++ openafs.spec 28 Feb 2012 22:59:28 -0000 1.18
@@ -10,7 +10,7 @@
%define sysname amd64_linux26
%endif
-%define pre pre2
+%define pre pre3
Summary: Enterprise Network File System
Name: openafs
@@ -321,6 +321,9 @@
%{_datadir}/openafs/C/afszcm.cat
%changelog
+* Wed Feb 28 2012 Ken Dreyer <ktdreyer(a)ktdreyer.com> 0:1.6.1-0.pre3
+- Update to OpenAFS 1.6.1 pre-release 3
+
* Wed Feb 08 2012 Ken Dreyer <ktdreyer(a)ktdreyer.com> 0:1.6.1-0.pre2
- Update to OpenAFS 1.6.1 pre-release 2
- Drop setserverprefs patch (merged in http://gerrit.openafs.org/5566)
Index: sources
===================================================================
RCS file: /cvs/free/rpms/openafs/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources 8 Feb 2012 14:42:24 -0000 1.8
+++ sources 28 Feb 2012 22:59:28 -0000 1.9
@@ -1,2 +1,2 @@
-9715d40c4226d2bc119f139392b2f57b openafs-1.6.1pre2-src.tar.bz2
-ecea0ca0c1669c2885f34cd7b2a1c4e2 openafs-1.6.1pre2-doc.tar.bz2
+430a69f6bfd2498af91d3aaeb81e4692 openafs-1.6.1pre3-src.tar.bz2
+c740926bb33187444bc6615bb2c34c05 openafs-1.6.1pre3-doc.tar.bz2
12 years, 1 month
- 1
- 0
rpms/openafs-kmod/devel .cvsignore, 1.6, 1.7 openafs-kmod.spec, 1.16, 1.17 sources, 1.8, 1.9
by Ken Dreyer
Author: ktdreyer
Update of /cvs/free/rpms/openafs-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv12090
Modified Files:
.cvsignore openafs-kmod.spec sources
Log Message:
* Wed Feb 28 2012 Ken Dreyer <ktdreyer(a)ktdreyer.com> - 1.6.1-0.pre3
- Update to OpenAFS 1.6.1 pre-release 3
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/openafs-kmod/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 8 Feb 2012 15:24:32 -0000 1.6
+++ .cvsignore 28 Feb 2012 22:58:30 -0000 1.7
@@ -1 +1 @@
-openafs-1.6.1pre2-src.tar.bz2
+openafs-1.6.1pre3-src.tar.bz2
Index: openafs-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/openafs-kmod/devel/openafs-kmod.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- openafs-kmod.spec 8 Feb 2012 15:24:32 -0000 1.16
+++ openafs-kmod.spec 28 Feb 2012 22:58:30 -0000 1.17
@@ -17,7 +17,7 @@
%define kmod_name openafs
-%define pre pre2
+%define pre pre3
# name should have a -kmod suffix
Name: %{kmod_name}-kmod
@@ -96,6 +96,9 @@
%changelog
+* Wed Feb 28 2012 Ken Dreyer <ktdreyer(a)ktdreyer.com> - 1.6.1-0.pre3
+- Update to OpenAFS 1.6.1 pre-release 3
+
* Wed Feb 08 2012 Ken Dreyer <ktdreyer(a)ktdreyer.com> - 1.6.1-0.pre2
- Update to OpenAFS 1.6.1 pre-release 2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/openafs-kmod/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources 8 Feb 2012 15:24:32 -0000 1.8
+++ sources 28 Feb 2012 22:58:30 -0000 1.9
@@ -1 +1 @@
-9715d40c4226d2bc119f139392b2f57b openafs-1.6.1pre2-src.tar.bz2
+430a69f6bfd2498af91d3aaeb81e4692 openafs-1.6.1pre3-src.tar.bz2
12 years, 1 month
- 1
- 0
rpms/mplayer/F-15 mplayer-manlinks.patch, 1.4, 1.5 mplayer.spec, 1.41, 1.42
by Julian Sikorski
Author: belegdol
Update of /cvs/free/rpms/mplayer/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv18224
Modified Files:
mplayer-manlinks.patch mplayer.spec
Log Message:
* Tue Feb 28 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.0-0.128.20110816svn
- Added libbs2b-devel to BuildRequires (RPM Fusion bug #2157)
- Fixed --with directfb (RPM Fusion bug #2141)
- Don't mangle the manpages (RPM Fusion bug #1994)
- Fixed man links (RPM Fusion bug #1625)
- Dropped obsolete Group, Buildroot, %clean and %defattr
mplayer-manlinks.patch:
Makefile | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
Index: mplayer-manlinks.patch
===================================================================
RCS file: /cvs/free/rpms/mplayer/F-15/mplayer-manlinks.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mplayer-manlinks.patch 30 Oct 2009 01:10:22 -0000 1.4
+++ mplayer-manlinks.patch 28 Feb 2012 19:14:41 -0000 1.5
@@ -1,31 +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
Index: mplayer.spec
===================================================================
RCS file: /cvs/free/rpms/mplayer/F-15/mplayer.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- mplayer.spec 10 Jan 2012 06:41:43 -0000 1.41
+++ mplayer.spec 28 Feb 2012 19:14:41 -0000 1.42
@@ -6,10 +6,9 @@
Name: mplayer
Version: 1.0
-Release: 0.127.%{pre}%{?dist}
+Release: 0.128.%{pre}%{?dist}
Summary: Movie player playing most video formats and DVDs
-Group: Applications/Multimedia
%if 0%{!?_without_amr:1}
License: GPLv3+
%else
@@ -32,7 +31,6 @@
Patch14: %{name}-nodvdcss.patch
# use system FFmpeg libraries
Patch18: %{name}-ffmpeg.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: SDL-devel
BuildRequires: a52dec-devel
@@ -61,6 +59,7 @@
BuildRequires: libXxf86vm-devel
BuildRequires: libass-devel >= 0.9.10
BuildRequires: libbluray-devel
+BuildRequires: libbs2b-devel
BuildRequires: libcaca-devel
BuildRequires: libdca-devel
BuildRequires: libdv-devel
@@ -130,14 +129,12 @@
%package common
Summary: MPlayer common files
-Group: Applications/Multimedia
%description common
This package contains common files for MPlayer packages.
%package gui
Summary: GUI for MPlayer
-Group: Applications/Multimedia
Requires: mplayer-common = %{version}-%{release}
Requires: hicolor-icon-theme
@@ -146,7 +143,6 @@
%package -n mencoder
Summary: MPlayer movie encoder
-Group: Applications/Multimedia
Requires: mplayer-common = %{version}-%{release}
%description -n mencoder
@@ -154,14 +150,12 @@
%package doc
Summary: MPlayer documentation in various languages
-Group: Documentation
%description doc
MPlayer documentation in various languages.
%package tools
Summary: Useful scripts for MPlayer
-Group: Applications/Multimedia
Requires: mencoder = %{version}-%{release}
Requires: mplayer = %{version}-%{release}
@@ -206,7 +200,7 @@
\\\
--disable-bitmap-font \\\
%{!?_with_dga:--disable-dga1 --disable-dga2} \\\
- --%{?_with_directfb:enable}%{!?_with_directfb:disable}-directfb \\\
+ %{!?_with_directfb:--disable-directfb} \\\
%{!?_with_svgalib:--disable-svga} \\\
--disable-termcap \\\
--enable-xvmc \\\
@@ -229,14 +223,6 @@
%patch14 -p1 -b .nodvdcss
%patch18 -p1 -b .ffmpeg
-doconv() {
- iconv -f $1 -t $2 -o DOCS/man/$3/mplayer.1.utf8 DOCS/man/$3/mplayer.1 && \
- mv DOCS/man/$3/mplayer.1.utf8 DOCS/man/$3/mplayer.1
-}
-for lang in de es fr it ; do doconv iso-8859-1 utf-8 $lang ; done
-for lang in hu pl ; do doconv iso-8859-2 utf-8 $lang ; done
-for lang in ru ; do doconv koi8-r utf-8 $lang ; done
-
mkdir GUI
cp -a `ls -1|grep -v GUI` GUI/
@@ -323,16 +309,10 @@
update-desktop-database &>/dev/null || :
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
%files
-%defattr(-, root, root, -)
%{_bindir}/mplayer
%files common
-%defattr(-, root, root, -)
%doc AUTHORS Changelog Copyright LICENSE README
%dir %{_sysconfdir}/mplayer
%config(noreplace) %{_sysconfdir}/mplayer/mplayer.conf
@@ -352,14 +332,12 @@
%lang(zh_CN) %{_mandir}/zh_CN/man1/mplayer.1*
%files gui
-%defattr(-, root, root, -)
%{_bindir}/gmplayer
%{_datadir}/applications/*mplayer.desktop
%{_datadir}/icons/hicolor/48x48/apps/mplayer.png
%{_datadir}/mplayer/skins/
%files -n mencoder
-%defattr(-, root, root, -)
%{_bindir}/mencoder
%{_mandir}/man1/mencoder.1*
%lang(cs) %{_mandir}/cs/man1/mencoder.1*
@@ -373,7 +351,6 @@
%lang(zh_CN) %{_mandir}/zh_CN/man1/mencoder.1*
%files doc
-%defattr(-, root, root, -)
%doc doc/en/ doc/tech/
%lang(cs) %doc doc/cs/
%lang(de) %doc doc/de/
@@ -385,7 +362,6 @@
%lang(zh_CN) %doc doc/zh_CN/
%files tools
-%defattr(-, root, root, -)
%{_bindir}/aconvert
%{_bindir}/calcbpp
%{_bindir}/countquant
@@ -400,6 +376,13 @@
%{_datadir}/mplayer/*.fp
%changelog
+* Tue Feb 28 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.0-0.128.20110816svn
+- Added libbs2b-devel to BuildRequires (RPM Fusion bug #2157)
+- Fixed --with directfb (RPM Fusion bug #2141)
+- Don't mangle the manpages (RPM Fusion bug #1994)
+- Fixed man links (RPM Fusion bug #1625)
+- Dropped obsolete Group, Buildroot, %%clean and %%defattr
+
* Tue Jan 10 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.0-0.127.20110816svn
- Rebuild for FFmpeg
12 years, 1 month
- 1
- 0
rpms/mplayer/F-16 mplayer-manlinks.patch, 1.4, 1.5 mplayer.spec, 1.42, 1.43
by Julian Sikorski
Author: belegdol
Update of /cvs/free/rpms/mplayer/F-16
In directory se02.es.rpmfusion.net:/tmp/cvs-serv17442
Modified Files:
mplayer-manlinks.patch mplayer.spec
Log Message:
* Tue Feb 28 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.0-0.129.20110816svn
- Added libbs2b-devel to BuildRequires (RPM Fusion bug #2157)
- Fixed --with directfb (RPM Fusion bug #2141)
- Don't mangle the manpages (RPM Fusion bug #1994)
- Fixed man links (RPM Fusion bug #1625)
- Dropped obsolete Group, Buildroot, %clean and %defattr
mplayer-manlinks.patch:
Makefile | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
Index: mplayer-manlinks.patch
===================================================================
RCS file: /cvs/free/rpms/mplayer/F-16/mplayer-manlinks.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mplayer-manlinks.patch 30 Oct 2009 01:10:22 -0000 1.4
+++ mplayer-manlinks.patch 28 Feb 2012 19:09:27 -0000 1.5
@@ -1,31 +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
Index: mplayer.spec
===================================================================
RCS file: /cvs/free/rpms/mplayer/F-16/mplayer.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- mplayer.spec 10 Jan 2012 06:41:43 -0000 1.42
+++ mplayer.spec 28 Feb 2012 19:09:27 -0000 1.43
@@ -6,10 +6,9 @@
Name: mplayer
Version: 1.0
-Release: 0.128.%{pre}%{?dist}
+Release: 0.129.%{pre}%{?dist}
Summary: Movie player playing most video formats and DVDs
-Group: Applications/Multimedia
%if 0%{!?_without_amr:1}
License: GPLv3+
%else
@@ -32,7 +31,6 @@
Patch14: %{name}-nodvdcss.patch
# use system FFmpeg libraries
Patch18: %{name}-ffmpeg.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: SDL-devel
BuildRequires: a52dec-devel
@@ -61,6 +59,7 @@
BuildRequires: libXxf86vm-devel
BuildRequires: libass-devel >= 0.9.10
BuildRequires: libbluray-devel
+BuildRequires: libbs2b-devel
BuildRequires: libcaca-devel
BuildRequires: libdca-devel
BuildRequires: libdv-devel
@@ -131,14 +130,12 @@
%package common
Summary: MPlayer common files
-Group: Applications/Multimedia
%description common
This package contains common files for MPlayer packages.
%package gui
Summary: GUI for MPlayer
-Group: Applications/Multimedia
Requires: mplayer-common = %{version}-%{release}
Requires: hicolor-icon-theme
@@ -147,7 +144,6 @@
%package -n mencoder
Summary: MPlayer movie encoder
-Group: Applications/Multimedia
Requires: mplayer-common = %{version}-%{release}
%description -n mencoder
@@ -155,14 +151,12 @@
%package doc
Summary: MPlayer documentation in various languages
-Group: Documentation
%description doc
MPlayer documentation in various languages.
%package tools
Summary: Useful scripts for MPlayer
-Group: Applications/Multimedia
Requires: mencoder = %{version}-%{release}
Requires: mplayer = %{version}-%{release}
@@ -207,7 +201,7 @@
\\\
--disable-bitmap-font \\\
%{!?_with_dga:--disable-dga1 --disable-dga2} \\\
- --%{?_with_directfb:enable}%{!?_with_directfb:disable}-directfb \\\
+ %{!?_with_directfb:--disable-directfb} \\\
%{!?_with_svgalib:--disable-svga} \\\
--disable-termcap \\\
--enable-xvmc \\\
@@ -230,14 +224,6 @@
%patch14 -p1 -b .nodvdcss
%patch18 -p1 -b .ffmpeg
-doconv() {
- iconv -f $1 -t $2 -o DOCS/man/$3/mplayer.1.utf8 DOCS/man/$3/mplayer.1 && \
- mv DOCS/man/$3/mplayer.1.utf8 DOCS/man/$3/mplayer.1
-}
-for lang in de es fr it ; do doconv iso-8859-1 utf-8 $lang ; done
-for lang in hu pl ; do doconv iso-8859-2 utf-8 $lang ; done
-for lang in ru ; do doconv koi8-r utf-8 $lang ; done
-
mkdir GUI
cp -a `ls -1|grep -v GUI` GUI/
@@ -324,16 +310,10 @@
update-desktop-database &>/dev/null || :
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
%files
-%defattr(-, root, root, -)
%{_bindir}/mplayer
%files common
-%defattr(-, root, root, -)
%doc AUTHORS Changelog Copyright LICENSE README
%dir %{_sysconfdir}/mplayer
%config(noreplace) %{_sysconfdir}/mplayer/mplayer.conf
@@ -353,14 +333,12 @@
%lang(zh_CN) %{_mandir}/zh_CN/man1/mplayer.1*
%files gui
-%defattr(-, root, root, -)
%{_bindir}/gmplayer
%{_datadir}/applications/*mplayer.desktop
%{_datadir}/icons/hicolor/48x48/apps/mplayer.png
%{_datadir}/mplayer/skins/
%files -n mencoder
-%defattr(-, root, root, -)
%{_bindir}/mencoder
%{_mandir}/man1/mencoder.1*
%lang(cs) %{_mandir}/cs/man1/mencoder.1*
@@ -374,7 +352,6 @@
%lang(zh_CN) %{_mandir}/zh_CN/man1/mencoder.1*
%files doc
-%defattr(-, root, root, -)
%doc doc/en/ doc/tech/
%lang(cs) %doc doc/cs/
%lang(de) %doc doc/de/
@@ -386,7 +363,6 @@
%lang(zh_CN) %doc doc/zh_CN/
%files tools
-%defattr(-, root, root, -)
%{_bindir}/aconvert
%{_bindir}/calcbpp
%{_bindir}/countquant
@@ -401,6 +377,13 @@
%{_datadir}/mplayer/*.fp
%changelog
+* Tue Feb 28 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.0-0.129.20110816svn
+- Added libbs2b-devel to BuildRequires (RPM Fusion bug #2157)
+- Fixed --with directfb (RPM Fusion bug #2141)
+- Don't mangle the manpages (RPM Fusion bug #1994)
+- Fixed man links (RPM Fusion bug #1625)
+- Dropped obsolete Group, Buildroot, %%clean and %%defattr
+
* Tue Jan 10 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.0-0.128.20110816svn
- Rebuild for FFmpeg
12 years, 1 month
- 1
- 0
rpms/mplayer/F-17 .cvsignore, 1.24, 1.25 mplayer-ffmpeg.patch, 1.4, 1.5 mplayer-manlinks.patch, 1.4, 1.5 mplayer-snapshot.sh, 1.7, 1.8 mplayer.spec, 1.43, 1.44 sources, 1.25, 1.26
by Julian Sikorski
Author: belegdol
Update of /cvs/free/rpms/mplayer/F-17
In directory se02.es.rpmfusion.net:/tmp/cvs-serv13822
Modified Files:
.cvsignore mplayer-ffmpeg.patch mplayer-manlinks.patch
mplayer-snapshot.sh mplayer.spec sources
Log Message:
* Mon Feb 27 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.0-0.131.20120204svn
- Added libbs2b-devel to BuildRequires (RPM Fusion bug #2157)
- Fixed --with directfb (RPM Fusion bug #2141)
- Don't mangle the manpages (RPM Fusion bug #1994)
- Fixed man links (RPM Fusion bug #1625)
* Mon Feb 27 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.0-0.130.20120204svn
- 20120204 snapshot
- Dropped obsolete Group, Buildroot, %%clean and %%defattr
- Updated the ffmpeg patch
- Updated Blue skin to 1.8
- Building documentation is now done from the top-level Makefile
- Icons now come in different sizes
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/mplayer/F-17/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore 23 Sep 2011 20:54:44 -0000 1.24
+++ .cvsignore 28 Feb 2012 18:40:40 -0000 1.25
@@ -1,6 +1,2 @@
-Blue-1.7.tar.bz2
-mplayer-export-2011-01-10.tar.bz2
-mplayer-export-2011-02-27.tar.bz2
-mplayer-export-2011-04-04.tar.bz2
-mplayer-export-2011-04-12.tar.bz2
-mplayer-export-2011-08-16.tar.bz2
+Blue-1.8.tar.bz2
+mplayer-export-2012-02-04.tar.bz2
mplayer-ffmpeg.patch:
Makefile | 2
configure | 4
ffmpeg/libavformat/internal.h | 309 ++++++++++++++++++++++++++++++++++++++++++
ffmpeg/libavutil/x86_cpu.h | 98 +++++++++++++
4 files changed, 410 insertions(+), 3 deletions(-)
Index: mplayer-ffmpeg.patch
===================================================================
RCS file: /cvs/free/rpms/mplayer/F-17/mplayer-ffmpeg.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mplayer-ffmpeg.patch 23 Sep 2011 20:54:45 -0000 1.4
+++ mplayer-ffmpeg.patch 28 Feb 2012 18:40:40 -0000 1.5
@@ -1,7 +1,7 @@
-diff -up mplayer-export-2011-08-16/configure.ffmpeg mplayer-export-2011-08-16/configure
---- mplayer-export-2011-08-16/configure.ffmpeg 2011-08-16 21:55:01.000000000 +0200
-+++ mplayer-export-2011-08-16/configure 2011-08-16 21:56:38.000000000 +0200
-@@ -6792,7 +6792,7 @@ elif test "$ffmpeg_so" = auto ; then
+diff -up mplayer-export-2012-02-04/configure.ffmpeg mplayer-export-2012-02-04/configure
+--- mplayer-export-2012-02-04/configure.ffmpeg 2012-02-27 15:32:56.721715932 +0100
++++ mplayer-export-2012-02-04/configure 2012-02-27 15:32:56.760716194 +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 &&
@@ -10,22 +10,21 @@
elif header_check libavutil/avutil.h -lpostproc -lswscale -lavformat -lavcodec -lavutil ; then
extra_ldflags="$extra_ldflags -lpostproc -lswscale -lavformat -lavcodec -lavutil"
ffmpeg_so=yes
-@@ -7481,7 +7481,7 @@ if test "$_gui" = yes ; then
+@@ -7407,7 +7407,7 @@ if test "$_gui" = yes ; then
# Required libraries
if test "$ffmpeg" != yes ||
- ! echo $libavdecoders | grep -q PNG_DECODER ; then
-+ ! objdump -T $_libdir/libavcodec.so | grep -q ff_png ; 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-2011-08-16/ffmpeg/libavformat/riff.h.ffmpeg mplayer-export-2011-08-16/ffmpeg/libavformat/riff.h
---- mplayer-export-2011-08-16/ffmpeg/libavformat/riff.h.ffmpeg 2011-08-16 21:55:01.000000000 +0200
-+++ mplayer-export-2011-08-16/ffmpeg/libavformat/riff.h 2011-08-16 21:55:01.000000000 +0200
-@@ -0,0 +1,41 @@
+diff -up mplayer-export-2012-02-04/ffmpeg/libavformat/internal.h.ffmpeg mplayer-export-2012-02-04/ffmpeg/libavformat/internal.h
+--- mplayer-export-2012-02-04/ffmpeg/libavformat/internal.h.ffmpeg 2012-02-27 15:32:56.762716209 +0100
++++ mplayer-export-2012-02-04/ffmpeg/libavformat/internal.h 2012-02-27 15:32:56.762716209 +0100
+@@ -0,0 +1,309 @@
+/*
-+ * RIFF codec tags
-+ * copyright (c) 2000 Fabrice Bellard
++ * copyright (c) 2001 Fabrice Bellard
+ *
+ * This file is part of FFmpeg.
+ *
@@ -44,29 +43,298 @@
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
-+/**
-+ * @file
-+ * internal header for RIFF based (de)muxers
-+ * do NOT include this in end user applications
-+ */
++#ifndef AVFORMAT_INTERNAL_H
++#define AVFORMAT_INTERNAL_H
+
-+#ifndef AVFORMAT_RIFF_H
-+#define AVFORMAT_RIFF_H
++#include <stdint.h>
++#include "libavformat/avformat.h"
+
-+#include "libavcodec/avcodec.h"
++#define MAX_URL_SIZE 4096
++
++#ifdef DEBUG
++# define hex_dump_debug(class, buf, size) av_hex_dump_log(class, AV_LOG_DEBUG, buf, size)
++#else
++# define hex_dump_debug(class, buf, size)
++#endif
+
+typedef struct AVCodecTag {
+ enum CodecID id;
+ unsigned int tag;
+} AVCodecTag;
+
-+extern const AVCodecTag ff_codec_bmp_tags[];
-+extern const AVCodecTag ff_codec_wav_tags[];
++#ifdef __GNUC__
++#define dynarray_add(tab, nb_ptr, elem)\
++do {\
++ __typeof__(tab) _tab = (tab);\
++ __typeof__(elem) _elem = (elem);\
++ (void)sizeof(**_tab == _elem); /* check that types are compatible */\
++ av_dynarray_add(_tab, nb_ptr, _elem);\
++} while(0)
++#else
++#define dynarray_add(tab, nb_ptr, elem)\
++do {\
++ av_dynarray_add((tab), nb_ptr, (elem));\
++} while(0)
++#endif
++
++struct tm *brktimegm(time_t secs, struct tm *tm);
++
++char *ff_data_to_hex(char *buf, const uint8_t *src, int size, int lowercase);
+
-+#endif /* AVFORMAT_RIFF_H */
-diff -up mplayer-export-2011-08-16/ffmpeg/libavutil/x86_cpu.h.ffmpeg mplayer-export-2011-08-16/ffmpeg/libavutil/x86_cpu.h
---- mplayer-export-2011-08-16/ffmpeg/libavutil/x86_cpu.h.ffmpeg 2011-08-16 21:55:01.000000000 +0200
-+++ mplayer-export-2011-08-16/ffmpeg/libavutil/x86_cpu.h 2011-08-16 21:55:01.000000000 +0200
++/**
++ * Parse a string of hexadecimal strings. Any space between the hexadecimal
++ * digits is ignored.
++ *
++ * @param data if non-null, the parsed data is written to this pointer
++ * @param p the string to parse
++ * @return the number of bytes written (or to be written, if data is null)
++ */
++int ff_hex_to_data(uint8_t *data, const char *p);
++
++void ff_program_add_stream_index(AVFormatContext *ac, int progid, unsigned int idx);
++
++/**
++ * Add packet to AVFormatContext->packet_buffer list, determining its
++ * interleaved position using compare() function argument.
++ * @return 0, or < 0 on error
++ */
++int ff_interleave_add_packet(AVFormatContext *s, AVPacket *pkt,
++ int (*compare)(AVFormatContext *, AVPacket *, AVPacket *));
++
++void ff_read_frame_flush(AVFormatContext *s);
++
++#define NTP_OFFSET 2208988800ULL
++#define NTP_OFFSET_US (NTP_OFFSET * 1000000ULL)
++
++/** Get the current time since NTP epoch in microseconds. */
++uint64_t ff_ntp_time(void);
++
++/**
++ * Assemble a URL string from components. This is the reverse operation
++ * of av_url_split.
++ *
++ * Note, this requires networking to be initialized, so the caller must
++ * ensure ff_network_init has been called.
++ *
++ * @see av_url_split
++ *
++ * @param str the buffer to fill with the url
++ * @param size the size of the str buffer
++ * @param proto the protocol identifier, if null, the separator
++ * after the identifier is left out, too
++ * @param authorization an optional authorization string, may be null.
++ * An empty string is treated the same as a null string.
++ * @param hostname the host name string
++ * @param port the port number, left out from the string if negative
++ * @param fmt a generic format string for everything to add after the
++ * host/port, may be null
++ * @return the number of characters written to the destination buffer
++ */
++int ff_url_join(char *str, int size, const char *proto,
++ const char *authorization, const char *hostname,
++ int port, const char *fmt, ...) av_printf_format(7, 8);
++
++/**
++ * Append the media-specific SDP fragment for the media stream c
++ * to the buffer buff.
++ *
++ * Note, the buffer needs to be initialized, since it is appended to
++ * existing content.
++ *
++ * @param buff the buffer to append the SDP fragment to
++ * @param size the size of the buff buffer
++ * @param c the AVCodecContext of the media to describe
++ * @param dest_addr the destination address of the media stream, may be NULL
++ * @param dest_type the destination address type, may be NULL
++ * @param port the destination port of the media stream, 0 if unknown
++ * @param ttl the time to live of the stream, 0 if not multicast
++ * @param fmt the AVFormatContext, which might contain options modifying
++ * the generated SDP
++ */
++void ff_sdp_write_media(char *buff, int size, AVCodecContext *c,
++ const char *dest_addr, const char *dest_type,
++ int port, int ttl, AVFormatContext *fmt);
++
++/**
++ * Write a packet to another muxer than the one the user originally
++ * intended. Useful when chaining muxers, where one muxer internally
++ * writes a received packet to another muxer.
++ *
++ * @param dst the muxer to write the packet to
++ * @param dst_stream the stream index within dst to write the packet to
++ * @param pkt the packet to be written
++ * @param src the muxer the packet originally was intended for
++ * @return the value av_write_frame returned
++ */
++int ff_write_chained(AVFormatContext *dst, int dst_stream, AVPacket *pkt,
++ AVFormatContext *src);
++
++/**
++ * Get the length in bytes which is needed to store val as v.
++ */
++int ff_get_v_length(uint64_t val);
++
++/**
++ * Put val using a variable number of bytes.
++ */
++void ff_put_v(AVIOContext *bc, uint64_t val);
++
++/**
++ * Read a whole line of text from AVIOContext. Stop reading after reaching
++ * either a \\n, a \\0 or EOF. The returned string is always \\0-terminated,
++ * and may be truncated if the buffer is too small.
++ *
++ * @param s the read-only AVIOContext
++ * @param buf buffer to store the read line
++ * @param maxlen size of the buffer
++ * @return the length of the string written in the buffer, not including the
++ * final \\0
++ */
++int ff_get_line(AVIOContext *s, char *buf, int maxlen);
++
++#define SPACE_CHARS " \t\r\n"
++
++/**
++ * Callback function type for ff_parse_key_value.
++ *
++ * @param key a pointer to the key
++ * @param key_len the number of bytes that belong to the key, including the '='
++ * char
++ * @param dest return the destination pointer for the value in *dest, may
++ * be null to ignore the value
++ * @param dest_len the length of the *dest buffer
++ */
++typedef void (*ff_parse_key_val_cb)(void *context, const char *key,
++ int key_len, char **dest, int *dest_len);
++/**
++ * Parse a string with comma-separated key=value pairs. The value strings
++ * may be quoted and may contain escaped characters within quoted strings.
++ *
++ * @param str the string to parse
++ * @param callback_get_buf function that returns where to store the
++ * unescaped value string.
++ * @param context the opaque context pointer to pass to callback_get_buf
++ */
++void ff_parse_key_value(const char *str, ff_parse_key_val_cb callback_get_buf,
++ void *context);
++
++/**
++ * Find stream index based on format-specific stream ID
++ * @return stream index, or < 0 on error
++ */
++int ff_find_stream_index(AVFormatContext *s, int id);
++
++/**
++ * Internal version of av_index_search_timestamp
++ */
++int ff_index_search_timestamp(const AVIndexEntry *entries, int nb_entries,
++ int64_t wanted_timestamp, int flags);
++
++/**
++ * Internal version of av_add_index_entry
++ */
++int ff_add_index_entry(AVIndexEntry **index_entries,
++ int *nb_index_entries,
++ unsigned int *index_entries_allocated_size,
++ int64_t pos, int64_t timestamp, int size, int distance, int flags);
++
++/**
++ * Add a new chapter.
++ *
++ * @param s media file handle
++ * @param id unique ID for this chapter
++ * @param start chapter start time in time_base units
++ * @param end chapter end time in time_base units
++ * @param title chapter title
++ *
++ * @return AVChapter or NULL on error
++ */
++AVChapter *avpriv_new_chapter(AVFormatContext *s, int id, AVRational time_base,
++ int64_t start, int64_t end, const char *title);
++
++/**
++ * Ensure the index uses less memory than the maximum specified in
++ * AVFormatContext.max_index_size by discarding entries if it grows
++ * too large.
++ */
++void ff_reduce_index(AVFormatContext *s, int stream_index);
++
++/*
++ * Convert a relative url into an absolute url, given a base url.
++ *
++ * @param buf the buffer where output absolute url is written
++ * @param size the size of buf
++ * @param base the base url, may be equal to buf.
++ * @param rel the new url, which is interpreted relative to base
++ */
++void ff_make_absolute_url(char *buf, int size, const char *base,
++ const char *rel);
++
++enum CodecID ff_guess_image2_codec(const char *filename);
++
++/**
++ * Convert a date string in ISO8601 format to Unix timestamp.
++ */
++int64_t ff_iso8601_to_unix_time(const char *datestr);
++
++/**
++ * Perform a binary search using av_index_search_timestamp() and
++ * AVInputFormat.read_timestamp().
++ *
++ * @param target_ts target timestamp in the time base of the given stream
++ * @param stream_index stream number
++ */
++int ff_seek_frame_binary(AVFormatContext *s, int stream_index,
++ int64_t target_ts, int flags);
++
++/**
++ * Update cur_dts of all streams based on the given timestamp and AVStream.
++ *
++ * Stream ref_st unchanged, others set cur_dts in their native time base.
++ * Only needed for timestamp wrapping or if (dts not set and pts!=dts).
++ * @param timestamp new dts expressed in time_base of param ref_st
++ * @param ref_st reference stream giving time_base of param timestamp
++ */
++void ff_update_cur_dts(AVFormatContext *s, AVStream *ref_st, int64_t timestamp);
++
++/**
++ * Perform a binary search using read_timestamp().
++ *
++ * @param target_ts target timestamp in the time base of the given stream
++ * @param stream_index stream number
++ */
++int64_t ff_gen_search(AVFormatContext *s, int stream_index,
++ int64_t target_ts, int64_t pos_min,
++ int64_t pos_max, int64_t pos_limit,
++ int64_t ts_min, int64_t ts_max,
++ int flags, int64_t *ts_ret,
++ int64_t (*read_timestamp)(struct AVFormatContext *, int , int64_t *, int64_t ));
++
++/**
++ * Set the pts for a given stream. If the new values would be invalid
++ * (<= 0), it leaves the AVStream unchanged.
++ *
++ * @param s stream
++ * @param pts_wrap_bits number of bits effectively used by the pts
++ * (used for wrap control, 33 is the value for MPEG)
++ * @param pts_num numerator to convert to seconds (MPEG: 1)
++ * @param pts_den denominator to convert to seconds (MPEG: 90000)
++ */
++void avpriv_set_pts_info(AVStream *s, int pts_wrap_bits,
++ unsigned int pts_num, unsigned int pts_den);
++
++/**
++ * Add side data to a packet for changing parameters to the given values.
++ * Parameters set to 0 aren't included in the change.
++ */
++int ff_add_param_change(AVPacket *pkt, int32_t channels,
++ uint64_t channel_layout, int32_t sample_rate,
++ int32_t width, int32_t height);
++
++#endif /* AVFORMAT_INTERNAL_H */
+diff -up mplayer-export-2012-02-04/ffmpeg/libavutil/x86_cpu.h.ffmpeg mplayer-export-2012-02-04/ffmpeg/libavutil/x86_cpu.h
+--- mplayer-export-2012-02-04/ffmpeg/libavutil/x86_cpu.h.ffmpeg 2012-02-27 15:32:56.780716332 +0100
++++ mplayer-export-2012-02-04/ffmpeg/libavutil/x86_cpu.h 2012-02-27 15:32:56.780716332 +0100
@@ -0,0 +1,98 @@
+/*
+ * copyright (c) 2006 Michael Niedermayer <michaelni(a)gmx.at>
@@ -166,10 +434,10 @@
+#endif
+
+#endif /* AVUTIL_X86_CPU_H */
-diff -up mplayer-export-2011-08-16/Makefile.ffmpeg mplayer-export-2011-08-16/Makefile
---- mplayer-export-2011-08-16/Makefile.ffmpeg 2011-08-16 21:55:01.000000000 +0200
-+++ mplayer-export-2011-08-16/Makefile 2011-08-16 21:55:01.000000000 +0200
-@@ -779,7 +779,7 @@ mencoder$(EXESUF) mplayer$(EXESUF):
+diff -up mplayer-export-2012-02-04/Makefile.ffmpeg mplayer-export-2012-02-04/Makefile
+--- mplayer-export-2012-02-04/Makefile.ffmpeg 2012-02-27 15:32:56.722715938 +0100
++++ mplayer-export-2012-02-04/Makefile 2012-02-27 15:32:56.793716420 +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/F-17/mplayer-manlinks.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mplayer-manlinks.patch 30 Oct 2009 01:10:22 -0000 1.4
+++ mplayer-manlinks.patch 28 Feb 2012 18:40:40 -0000 1.5
@@ -1,31 +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
Index: mplayer-snapshot.sh
===================================================================
RCS file: /cvs/free/rpms/mplayer/F-17/mplayer-snapshot.sh,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mplayer-snapshot.sh 10 Jan 2011 18:48:43 -0000 1.7
+++ mplayer-snapshot.sh 28 Feb 2012 18:40:40 -0000 1.8
@@ -13,7 +13,7 @@
unset CDPATH
pwd=$(pwd)
svn=$(date +%Y-%m-%d)
-#svn=2010-12-05
+svn=2012-02-04
dirname=mplayer-export-$svn
mplayer_rev={$svn}
#mplayer_rev=HEAD
Index: mplayer.spec
===================================================================
RCS file: /cvs/free/rpms/mplayer/F-17/mplayer.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- mplayer.spec 27 Jan 2012 15:27:12 -0000 1.43
+++ mplayer.spec 28 Feb 2012 18:40:40 -0000 1.44
@@ -1,15 +1,14 @@
%define codecdir %{_libdir}/codecs
-%define pre 20110816svn
+%define pre 20120204svn
%define svn 1
-%define svnbuild 2011-08-16
+%define svnbuild 2012-02-04
%define faad2min 1:2.6.1
Name: mplayer
Version: 1.0
-Release: 0.129.%{pre}%{?dist}
+Release: 0.131.%{pre}%{?dist}
Summary: Movie player playing most video formats and DVDs
-Group: Applications/Multimedia
%if 0%{!?_without_amr:1}
License: GPLv3+
%else
@@ -22,7 +21,7 @@
%else
Source0: http://www.mplayerhq.hu/MPlayer/releases/MPlayer-%{version}%{pre}.tar.bz2
%endif
-Source1: http://www.mplayerhq.hu/MPlayer/skins/Blue-1.7.tar.bz2
+Source1: http://www.mplayerhq.hu/MPlayer/skins/Blue-1.8.tar.bz2
Source10: mplayer-snapshot.sh
# set defaults for Fedora
Patch2: %{name}-config.patch
@@ -32,7 +31,6 @@
Patch14: %{name}-nodvdcss.patch
# use system FFmpeg libraries
Patch18: %{name}-ffmpeg.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: SDL-devel
BuildRequires: a52dec-devel
@@ -44,7 +42,7 @@
BuildRequires: em8300-devel
BuildRequires: enca-devel
BuildRequires: faad2-devel >= %{faad2min}
-BuildRequires: ffmpeg-devel >= 0.7.3
+BuildRequires: ffmpeg-devel >= 0.10
BuildRequires: fontconfig-devel
BuildRequires: freetype-devel >= 2.0.9
BuildRequires: fribidi-devel
@@ -61,6 +59,7 @@
BuildRequires: libXxf86vm-devel
BuildRequires: libass-devel >= 0.9.10
BuildRequires: libbluray-devel
+BuildRequires: libbs2b-devel
BuildRequires: libcaca-devel
BuildRequires: libdca-devel
BuildRequires: libdv-devel
@@ -131,14 +130,12 @@
%package common
Summary: MPlayer common files
-Group: Applications/Multimedia
%description common
This package contains common files for MPlayer packages.
%package gui
Summary: GUI for MPlayer
-Group: Applications/Multimedia
Requires: mplayer-common = %{version}-%{release}
Requires: hicolor-icon-theme
@@ -147,7 +144,6 @@
%package -n mencoder
Summary: MPlayer movie encoder
-Group: Applications/Multimedia
Requires: mplayer-common = %{version}-%{release}
%description -n mencoder
@@ -155,14 +151,12 @@
%package doc
Summary: MPlayer documentation in various languages
-Group: Documentation
%description doc
MPlayer documentation in various languages.
%package tools
Summary: Useful scripts for MPlayer
-Group: Applications/Multimedia
Requires: mencoder = %{version}-%{release}
Requires: mplayer = %{version}-%{release}
@@ -207,7 +201,7 @@
\\\
--disable-bitmap-font \\\
%{!?_with_dga:--disable-dga1 --disable-dga2} \\\
- --%{?_with_directfb:enable}%{!?_with_directfb:disable}-directfb \\\
+ %{!?_with_directfb:--disable-directfb} \\\
%{!?_with_svgalib:--disable-svga} \\\
--disable-termcap \\\
--enable-xvmc \\\
@@ -230,14 +224,6 @@
%patch14 -p1 -b .nodvdcss
%patch18 -p1 -b .ffmpeg
-doconv() {
- iconv -f $1 -t $2 -o DOCS/man/$3/mplayer.1.utf8 DOCS/man/$3/mplayer.1 && \
- mv DOCS/man/$3/mplayer.1.utf8 DOCS/man/$3/mplayer.1
-}
-for lang in de es fr it ; do doconv iso-8859-1 utf-8 $lang ; done
-for lang in hu pl ; do doconv iso-8859-2 utf-8 $lang ; done
-for lang in ru ; do doconv koi8-r utf-8 $lang ; done
-
mkdir GUI
cp -a `ls -1|grep -v GUI` GUI/
@@ -254,9 +240,7 @@
%if %{svn}
# build HTML documentation from XML files
-pushd DOCS/xml
%{__make} html-chunked
-popd
%endif
%install
@@ -300,9 +284,12 @@
ln -s Blue $RPM_BUILD_ROOT%{_datadir}/mplayer/skins/default
# Icons
-install -dm 755 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
-install -pm 644 etc/mplayer.png \
- $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
+for iconsize in 16x16 22x22 24x24 32x32 48x48 256x256
+do
+install -dm 755 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$iconsize/apps
+install -pm 644 etc/mplayer$iconsize.png \
+ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$iconsize/apps/mplayer.png
+done
# Desktop file
desktop-file-install \
@@ -324,16 +311,10 @@
update-desktop-database &>/dev/null || :
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
%files
-%defattr(-, root, root, -)
%{_bindir}/mplayer
%files common
-%defattr(-, root, root, -)
%doc AUTHORS Changelog Copyright LICENSE README
%dir %{_sysconfdir}/mplayer
%config(noreplace) %{_sysconfdir}/mplayer/mplayer.conf
@@ -353,14 +334,12 @@
%lang(zh_CN) %{_mandir}/zh_CN/man1/mplayer.1*
%files gui
-%defattr(-, root, root, -)
%{_bindir}/gmplayer
%{_datadir}/applications/*mplayer.desktop
-%{_datadir}/icons/hicolor/48x48/apps/mplayer.png
+%{_datadir}/icons/hicolor/*/apps/mplayer.png
%{_datadir}/mplayer/skins/
%files -n mencoder
-%defattr(-, root, root, -)
%{_bindir}/mencoder
%{_mandir}/man1/mencoder.1*
%lang(cs) %{_mandir}/cs/man1/mencoder.1*
@@ -374,7 +353,6 @@
%lang(zh_CN) %{_mandir}/zh_CN/man1/mencoder.1*
%files doc
-%defattr(-, root, root, -)
%doc doc/en/ doc/tech/
%lang(cs) %doc doc/cs/
%lang(de) %doc doc/de/
@@ -386,7 +364,6 @@
%lang(zh_CN) %doc doc/zh_CN/
%files tools
-%defattr(-, root, root, -)
%{_bindir}/aconvert
%{_bindir}/calcbpp
%{_bindir}/countquant
@@ -401,6 +378,20 @@
%{_datadir}/mplayer/*.fp
%changelog
+* Mon Feb 27 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.0-0.131.20120204svn
+- Added libbs2b-devel to BuildRequires (RPM Fusion bug #2157)
+- Fixed --with directfb (RPM Fusion bug #2141)
+- Don't mangle the manpages (RPM Fusion bug #1994)
+- Fixed man links (RPM Fusion bug #1625)
+
+* Mon Feb 27 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.0-0.130.20120204svn
+- 20120204 snapshot
+- Dropped obsolete Group, Buildroot, %%clean and %%defattr
+- Updated the ffmpeg patch
+- Updated Blue skin to 1.8
+- Building documentation is now done from the top-level Makefile
+- Icons now come in different sizes
+
* Fri Jan 27 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.0-0.129.20110816svn
- Rebuilt for live555
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mplayer/F-17/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources 23 Sep 2011 20:54:46 -0000 1.25
+++ sources 28 Feb 2012 18:40:40 -0000 1.26
@@ -1,2 +1,2 @@
-e4e2020d11b681aac898103b3ba723c4 Blue-1.7.tar.bz2
-a63483caa8a603ccefbb8e29bf94b4c7 mplayer-export-2011-08-16.tar.bz2
+340368f4e33f767d9df109990fb29c02 Blue-1.8.tar.bz2
+b0f8f714b60e9a413cac32331b2e9d40 mplayer-export-2012-02-04.tar.bz2
12 years, 1 month
- 1
- 0
rpms/mplayer/devel .cvsignore, 1.25, 1.26 mplayer-snapshot.sh, 1.8, 1.9 mplayer.spec, 1.44, 1.45 sources, 1.26, 1.27
by Julian Sikorski
Author: belegdol
Update of /cvs/free/rpms/mplayer/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv13431
Added Files:
.cvsignore mplayer-snapshot.sh mplayer.spec sources
Log Message:
Re-added files deleted during retiring process
Index: .cvsignore
===================================================================
RCS file: .cvsignore
diff -N .cvsignore
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ .cvsignore 28 Feb 2012 18:36:31 -0000 1.26
@@ -0,0 +1,2 @@
+Blue-1.8.tar.bz2
+mplayer-export-2012-02-04.tar.bz2
Index: mplayer-snapshot.sh
===================================================================
RCS file: mplayer-snapshot.sh
diff -N mplayer-snapshot.sh
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ mplayer-snapshot.sh 28 Feb 2012 18:36:31 -0000 1.9
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+set -e
+
+tmp=$(mktemp -d)
+
+trap cleanup EXIT
+cleanup() {
+ set +e
+ [ -z "$tmp" -o ! -d "$tmp" ] || rm -rf "$tmp"
+}
+
+unset CDPATH
+pwd=$(pwd)
+svn=$(date +%Y-%m-%d)
+svn=2012-02-04
+dirname=mplayer-export-$svn
+mplayer_rev={$svn}
+#mplayer_rev=HEAD
+
+cd "$tmp"
+svn checkout --ignore-externals -r ${mplayer_rev} svn://svn.mplayerhq.hu/mplayer/trunk $dirname
+cd $dirname
+
+rm -rf libdvdcss libswscale
+
+svn_revision=`LC_ALL=C svn info 2> /dev/null | grep Revision | cut -d' ' -f2`
+sed -i -e 's/\(SVN-r[0-9]* \)/\1rpmfusion /' -e "s/UNKNOWN/SVN-r$svn_revision/" version.sh
+find . -type d -name .svn -print0 | xargs -0r rm -rf
+cd ..
+tar jcf "$pwd"/$dirname.tar.bz2 $dirname
+cd - >/dev/null
Index: mplayer.spec
===================================================================
RCS file: mplayer.spec
diff -N mplayer.spec
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ mplayer.spec 28 Feb 2012 18:36:31 -0000 1.45
@@ -0,0 +1,866 @@
+%define codecdir %{_libdir}/codecs
+%define pre 20120204svn
+%define svn 1
+%define svnbuild 2012-02-04
+%define faad2min 1:2.6.1
+
+Name: mplayer
+Version: 1.0
+Release: 0.131.%{pre}%{?dist}
+Summary: Movie player playing most video formats and DVDs
+
+%if 0%{!?_without_amr:1}
+License: GPLv3+
+%else
+License: GPLv2+
+%endif
+URL: http://www.mplayerhq.hu/
+%if %{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.bz2
+%endif
+Source1: http://www.mplayerhq.hu/MPlayer/skins/Blue-1.8.tar.bz2
+Source10: mplayer-snapshot.sh
+# set defaults for Fedora
+Patch2: %{name}-config.patch
+# use roff include statements instead of symlinks
+Patch8: %{name}-manlinks.patch
+# erase any trace of libdvdcss
+Patch14: %{name}-nodvdcss.patch
+# use system FFmpeg libraries
+Patch18: %{name}-ffmpeg.patch
+
+BuildRequires: SDL-devel
+BuildRequires: a52dec-devel
+BuildRequires: aalib-devel
+BuildRequires: bzip2-devel
+BuildRequires: alsa-lib-devel
+BuildRequires: cdparanoia-devel
+BuildRequires: desktop-file-utils
+BuildRequires: em8300-devel
+BuildRequires: enca-devel
+BuildRequires: faad2-devel >= %{faad2min}
+BuildRequires: ffmpeg-devel >= 0.10
+BuildRequires: fontconfig-devel
+BuildRequires: freetype-devel >= 2.0.9
+BuildRequires: fribidi-devel
+BuildRequires: giflib-devel
+BuildRequires: gsm-devel
+BuildRequires: gtk2-devel
+BuildRequires: ladspa-devel
+BuildRequires: lame-devel
+BuildRequires: libGL-devel
+BuildRequires: libXinerama-devel
+BuildRequires: libXScrnSaver-devel
+BuildRequires: libXv-devel
+BuildRequires: libXvMC-devel
+BuildRequires: libXxf86vm-devel
+BuildRequires: libass-devel >= 0.9.10
+BuildRequires: libbluray-devel
+BuildRequires: libbs2b-devel
+BuildRequires: libcaca-devel
+BuildRequires: libdca-devel
+BuildRequires: libdv-devel
+BuildRequires: libdvdnav-devel >= 4.1.3-1
+BuildRequires: libjpeg-devel
+BuildRequires: libmpcdec-devel
+BuildRequires: libmpeg2-devel
+BuildRequires: libmpg123-devel
+BuildRequires: librtmp-devel
+BuildRequires: libtheora-devel
+BuildRequires: libvdpau-devel
+BuildRequires: libvorbis-devel
+BuildRequires: libvpx-devel >= 0.9.1
+BuildRequires: lirc-devel
+BuildRequires: live555-devel
+BuildRequires: lzo-devel >= 2
+BuildRequires: pulseaudio-lib-devel
+BuildRequires: speex-devel >= 1.1
+BuildRequires: twolame-devel
+BuildRequires: x264-devel >= 0.0.0-0.28
+BuildRequires: xvidcore-devel >= 0.9.2
+BuildRequires: yasm
+%{?_with_arts:BuildRequires: arts-devel}
+%{?_with_dga:BuildRequires: libXxf86dga-devel}
+%{?_with_directfb:BuildRequires: directfb-devel}
+%{?_with_esound:BuildRequires: esound-devel}
+%{?_with_faac:BuildRequires: faac-devel}
+%{?_with_jack:BuildRequires: jack-audio-connection-kit-devel}
+%{?_with_libmad:BuildRequires: libmad-devel}
+%{?_with_nemesi:BuildRequires: libnemesi-devel >= 0.6.3}
+%{?_with_openal:BuildRequires: openal-soft-devel}
+%{?_with_samba:BuildRequires: libsmbclient-devel}
+%{?_with_svgalib:BuildRequires: svgalib-devel}
+%{?_with_xmms:BuildRequires: xmms-devel}
+%if %{svn}
+# for XML docs, SVN only
+BuildRequires: docbook-dtds
+BuildRequires: docbook-style-xsl
+BuildRequires: libxml2
+BuildRequires: libxslt
+%endif
+Obsoletes: mplayer-fonts
+Requires: faad2-libs >= %{faad2min}
+Requires: mplayer-common = %{version}-%{release}
+
+%description
+MPlayer is a movie player that plays most MPEG, VOB, AVI, OGG/OGM,
+VIVO, ASF/WMA/WMV, QT/MOV/MP4, FLI, RM, NuppelVideo, yuv4mpeg, FILM,
+RoQ, and PVA files. You can also use it to watch VCDs, SVCDs, DVDs,
+3ivx, RealMedia, and DivX movies.
+It supports a wide range of output drivers including X11, XVideo, DGA,
+OpenGL, SVGAlib, fbdev, AAlib, DirectFB etc. There are also nice
+antialiased shaded subtitles and OSD.
+Non-default rpmbuild options:
+--with samba: Enable Samba (smb://) support
+--with xmms: Enable XMMS input plugin support
+--without amr: Disable AMR support
+--with faac: Enable FAAC support
+--with libmad: Enable libmad support
+--with openal: Enable OpenAL support
+--with jack: Enable JACK support
+--with arts: Enable aRts support
+--with esound: Enable EsounD support
+--with dga: Enable DGA support
+--with directfb:Enable DirectFB support
+--with svgalib: Enable SVGAlib support
+--with nemesi: Enable libnemesi RTSP support
+
+%package common
+Summary: MPlayer common files
+
+%description common
+This package contains common files for MPlayer packages.
+
+%package gui
+Summary: GUI for MPlayer
+Requires: mplayer-common = %{version}-%{release}
+Requires: hicolor-icon-theme
+
+%description gui
+This package contains a GUI for MPlayer and a default skin for it.
+
+%package -n mencoder
+Summary: MPlayer movie encoder
+Requires: mplayer-common = %{version}-%{release}
+
+%description -n mencoder
+This package contains the MPlayer movie encoder.
+
+%package doc
+Summary: MPlayer documentation in various languages
+
+%description doc
+MPlayer documentation in various languages.
+
+%package tools
+Summary: Useful scripts for MPlayer
+Requires: mencoder = %{version}-%{release}
+Requires: mplayer = %{version}-%{release}
+
+%description tools
+This package contains various scripts from MPlayer TOOLS directory.
+
+%define mp_configure \
+./configure \\\
+ --prefix=%{_prefix} \\\
+ --bindir=%{_bindir} \\\
+ --datadir=%{_datadir}/mplayer \\\
+ --mandir=%{_mandir} \\\
+ --confdir=%{_sysconfdir}/mplayer \\\
+ --libdir=%{_libdir} \\\
+ --codecsdir=%{codecdir} \\\
+ \\\
+ --extra-cflags="$RPM_OPT_FLAGS" \\\
+ --language=all \\\
+ \\\
+ --enable-joystick \\\
+ --enable-lirc \\\
+ --enable-menu \\\
+ --enable-radio \\\
+ --enable-radio-capture \\\
+ --enable-runtime-cpudetection \\\
+ --enable-unrarexec \\\
+ \\\
+ --disable-dvdread-internal \\\
+ --disable-libdvdcss-internal \\\
+ %{!?_with_nemesi:--disable-nemesi} \\\
+ %{!?_with_samba:--disable-smb} \\\
+ \\\
+ --disable-ffmpeg_a \\\
+ \\\
+ %{?_without_amr:--disable-libopencore_amrnb --disable-libopencore_amrwb} \\\
+ %{!?_with_faac:--disable-faac} \\\
+ %{!?_with_libmad:--disable-mad} \\\
+ --disable-libmpeg2-internal \\\
+ --disable-tremor-internal \\\
+ %{?_with_xmms:--enable-xmms} \\\
+ %{?_with_xmms:--with-xmmslibdir=%{_libdir}} \\\
+ \\\
+ --disable-bitmap-font \\\
+ %{!?_with_dga:--disable-dga1 --disable-dga2} \\\
+ %{!?_with_directfb:--disable-directfb} \\\
+ %{!?_with_svgalib:--disable-svga} \\\
+ --disable-termcap \\\
+ --enable-xvmc \\\
+ --with-xvmclib=XvMCW \\\
+ \\\
+ %{!?_with_arts:--disable-arts} \\\
+ %{!?_with_esound:--disable-esd} \\\
+ %{!?_with_jack:--disable-jack} \\\
+ %{!?_with_openal:--disable-openal} \\\
+
+
+%prep
+%if %{svn}
+%setup -q -n mplayer-export-%{svnbuild}
+%else
+%setup -q -n MPlayer-%{version}%{pre}
+%endif
+%patch2 -p1 -b .config
+%patch8 -p1 -b .manlinks
+%patch14 -p1 -b .nodvdcss
+%patch18 -p1 -b .ffmpeg
+
+mkdir GUI
+cp -a `ls -1|grep -v GUI` GUI/
+
+%build
+pushd GUI
+%{mp_configure}--enable-gui --disable-mencoder
+
+%{__make} V=1 %{?_smp_mflags}
+popd
+
+%{mp_configure}
+
+%{__make} V=1 %{?_smp_mflags}
+
+%if %{svn}
+# build HTML documentation from XML files
+%{__make} html-chunked
+%endif
+
+%install
+rm -rf $RPM_BUILD_ROOT doc
+
+make install DESTDIR=$RPM_BUILD_ROOT INSTALLSTRIP=
+for file in aconvert.sh divx2svcd.sh mencvcd.sh midentify.sh mpconsole.sh qepdvcd.sh subsearch.sh ; do
+install -pm 755 TOOLS/$file $RPM_BUILD_ROOT%{_bindir}/`basename $file .sh`
+done
+
+for file in calcbpp.pl countquant.pl dvd2divxscript.pl ; do
+install -pm 755 TOOLS/$file $RPM_BUILD_ROOT%{_bindir}/`basename $file .pl`
+done
+
+for file in vobshift.py ; do
+install -pm 755 TOOLS/$file $RPM_BUILD_ROOT%{_bindir}/`basename $file .py`
+done
+
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/mplayer
+install -pm 644 TOOLS/*.fp $RPM_BUILD_ROOT%{_datadir}/mplayer/
+
+# Clean up documentation
+mkdir doc
+cp -pR DOCS/* doc/
+rm -r doc/man doc/xml doc/README
+mv doc/HTML/* doc/
+rm -rf doc/HTML
+
+# Default config files
+install -Dpm 644 etc/example.conf \
+ $RPM_BUILD_ROOT%{_sysconfdir}/mplayer/mplayer.conf
+
+install -pm 644 etc/{input,menu}.conf $RPM_BUILD_ROOT%{_sysconfdir}/mplayer/
+
+# GUI mplayer
+install -pm 755 GUI/%{name} $RPM_BUILD_ROOT%{_bindir}/gmplayer
+
+# Default skin
+install -dm 755 $RPM_BUILD_ROOT%{_datadir}/mplayer/skins
+tar xjC $RPM_BUILD_ROOT%{_datadir}/mplayer/skins --exclude=.svn -f %{SOURCE1}
+ln -s Blue $RPM_BUILD_ROOT%{_datadir}/mplayer/skins/default
+
+# Icons
+for iconsize in 16x16 22x22 24x24 32x32 48x48 256x256
+do
+install -dm 755 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$iconsize/apps
+install -pm 644 etc/mplayer$iconsize.png \
+ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$iconsize/apps/mplayer.png
+done
+
+# Desktop file
+desktop-file-install \
+ --vendor livna \
+ --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+ etc/%{name}.desktop
+
+# Codec dir
+install -dm 755 $RPM_BUILD_ROOT%{codecdir}
+
+
+%post gui
+gtk-update-icon-cache -qf %{_datadir}/icons/hicolor &>/dev/null || :
+update-desktop-database &>/dev/null || :
+
+
+%postun gui
+gtk-update-icon-cache -qf %{_datadir}/icons/hicolor &>/dev/null || :
+update-desktop-database &>/dev/null || :
+
+
+%files
+%{_bindir}/mplayer
+
+%files common
+%doc AUTHORS Changelog Copyright LICENSE README
+%dir %{_sysconfdir}/mplayer
+%config(noreplace) %{_sysconfdir}/mplayer/mplayer.conf
+%config(noreplace) %{_sysconfdir}/mplayer/input.conf
+%config(noreplace) %{_sysconfdir}/mplayer/menu.conf
+%dir %{codecdir}/
+%dir %{_datadir}/mplayer/
+%{_mandir}/man1/mplayer.1*
+%lang(cs) %{_mandir}/cs/man1/mplayer.1*
+%lang(de) %{_mandir}/de/man1/mplayer.1*
+%lang(es) %{_mandir}/es/man1/mplayer.1*
+%lang(fr) %{_mandir}/fr/man1/mplayer.1*
+%lang(hu) %{_mandir}/hu/man1/mplayer.1*
+%lang(it) %{_mandir}/it/man1/mplayer.1*
+%lang(pl) %{_mandir}/pl/man1/mplayer.1*
+%lang(ru) %{_mandir}/ru/man1/mplayer.1*
+%lang(zh_CN) %{_mandir}/zh_CN/man1/mplayer.1*
+
+%files gui
+%{_bindir}/gmplayer
+%{_datadir}/applications/*mplayer.desktop
+%{_datadir}/icons/hicolor/*/apps/mplayer.png
+%{_datadir}/mplayer/skins/
+
+%files -n mencoder
+%{_bindir}/mencoder
+%{_mandir}/man1/mencoder.1*
+%lang(cs) %{_mandir}/cs/man1/mencoder.1*
+%lang(de) %{_mandir}/de/man1/mencoder.1*
+%lang(es) %{_mandir}/es/man1/mencoder.1*
+%lang(fr) %{_mandir}/fr/man1/mencoder.1*
+%lang(hu) %{_mandir}/hu/man1/mencoder.1*
+%lang(it) %{_mandir}/it/man1/mencoder.1*
+%lang(pl) %{_mandir}/pl/man1/mencoder.1*
+%lang(ru) %{_mandir}/ru/man1/mencoder.1*
+%lang(zh_CN) %{_mandir}/zh_CN/man1/mencoder.1*
+
+%files doc
+%doc doc/en/ doc/tech/
+%lang(cs) %doc doc/cs/
+%lang(de) %doc doc/de/
+%lang(es) %doc doc/es/
+%lang(fr) %doc doc/fr/
+%lang(hu) %doc doc/hu/
+%lang(pl) %doc doc/pl/
+%lang(ru) %doc doc/ru/
+%lang(zh_CN) %doc doc/zh_CN/
+
+%files tools
+%{_bindir}/aconvert
+%{_bindir}/calcbpp
+%{_bindir}/countquant
+%{_bindir}/divx2svcd
+%{_bindir}/dvd2divxscript
+%{_bindir}/mencvcd
+%{_bindir}/midentify
+%{_bindir}/mpconsole
+%{_bindir}/qepdvcd
+%{_bindir}/subsearch
+%{_bindir}/vobshift
+%{_datadir}/mplayer/*.fp
+
+%changelog
+* Mon Feb 27 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.0-0.131.20120204svn
+- Added libbs2b-devel to BuildRequires (RPM Fusion bug #2157)
+- Fixed --with directfb (RPM Fusion bug #2141)
+- Don't mangle the manpages (RPM Fusion bug #1994)
+- Fixed man links (RPM Fusion bug #1625)
+
+* Mon Feb 27 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.0-0.130.20120204svn
+- 20120204 snapshot
+- Dropped obsolete Group, Buildroot, %%clean and %%defattr
+- Updated the ffmpeg patch
+- Updated Blue skin to 1.8
+- Building documentation is now done from the top-level Makefile
+- Icons now come in different sizes
+
+* Fri Jan 27 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.0-0.129.20110816svn
+- Rebuilt for live555
+
+* Tue Jan 10 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.0-0.128.20110816svn
+- Rebuild for FFmpeg
+
+* Mon Jan 02 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.0-0.127.20110816svn
+- Rebuild for new ffmpeg
+
+* Fri Sep 23 2011 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.126.20110816svn
+- 20110816 snapshot
+- drop obsolete pause crash patch
+- re-enable mp3lib decoder
+- enable libmpg123 decoder
+
+* Fri Jul 15 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 1.0-0.125.20110412svn
+- Rebuilt for x264 ABI 115
+
+* Thu Jun 16 2011 Ricky Zhou <ricky(a)rzhou.org> - 1.0-0.124.20110412svn
+- Add upstream patch for pause crash.
+
+* Tue Apr 12 2011 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.123.20110412svn
+- 20110412 snapshot
+- drop obsolete libvorbis patch
+- add explanatory comments to all patches
+- temporarily disable mp3lib decoder (workaround for bug #1680)
+
+* Sun Mar 27 2011 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.122.20110227svn
+- 20110227 snapshot
+- rebuilt for new ffmpeg and x264
+
+* Sun Mar 27 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 1.0-0.121.20110110svn
+- Rebuild for x264
+
+* Mon Jan 10 2011 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.120.20110110svn
+- 20110110 snapshot
+- enabled BluRay, bzip2, libgsm, rtmp support
+- DGA support is now a build-time option
+- build against system FFmpeg (experimental!)
+ (drop direct opencore-amr and schroedinger linking)
+
+* Sat Jul 03 2010 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.119.20100703svn
+- rebuild against latest x264
+
+* Sat Jul 03 2010 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.118.20100703svn
+- 20100703 snapshot
+- dropped obsolete libgif patch
+- enabled libvpx support
+- enabled external libmpeg2 (internal copy is scheduled to be dropped by upstream)
+
+* Thu May 06 2010 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 1.0-0.117.20100429svn
+- Rebuilt for live555
+
+* Thu Apr 29 2010 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.116.20100429svn
+- 20100429 snapshot
+- drop unnecessary patches
+
+* Sat Apr 24 2010 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.115.20100424svn
+- 20100424 snapshot
+- patch to build against older x264
+
+* Sat Mar 27 2010 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.114.20100327svn
+- 20100327 snapshot
+- drop unused patch
+- fix build on F-13+ by linking against libgif instead of libungif
+
+* Thu Jan 28 2010 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 1.0-0.113.20100116svn
+- Rebuild for live555
+
+* Sat Jan 16 2010 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.112.20100116svn
+- 20100116 snapshot
+- rebuild against current x264
+- fix licence tag when compiled with OpenCore AMR
+- fix build --with faac (bug #997)
+- enable radio support (bug #634)
+- openal-devel is now openal-soft-devel (bug #935)
+- move some files to -common subpackage, adjust dependencies (bug #1037)
+- introduce -tools subpackage, move scripts there (bugs #544, #1037)
+
+* Thu Oct 29 2009 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.111.20091029svn
+- 20091029 snapshot
+- rebuild against current x264
+- fix debuginfo generation (bug #101)
+- move aconvert to mencoder package (bug #544)
+- fix snapshot script not to mangle version string (bug #577)
+- disable screensaver by default (bug #672)
+- restore and rebase some of the dropped patches
+- build against external liba52
+- enable dirac decoding via libschroedinger
+
+* Wed Oct 21 2009 kwizart < kwizart at gmail.com > - 1.0-0.110.20091021svn
+- Update to snapshot 20091021
+ mplayer svn rev: 29776
+ ffmpeg : HEAD
+ dvdnav : HEAD
+- Move from amrnb amrwb to opencore-amr
+- Conditionalize faac (moved to nonfree).
+
+* Sun Mar 29 2009 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.109.20090329svn
+- 20090329 snapshot from 1.0rc3 branch
+- fix RPM_OPT_FLAGS usage
+- drop obsolete patch
+
+* Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.0-0.108.20090319svn
+- rebuild for new F11 features
+
+* Thu Mar 19 2009 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.107.20091319svn
+- 20090319 snapshot
+- fix HTML docs generation
+
+* Wed Feb 04 2009 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.106.20090204svn
+- 20090204 snapshot
+- dropped obsolete patch
+- dropped obsolete BR
+- dropped redundant altivec CFLAGS on ppc
+- fixed build on ppc
+
+* Wed Jan 07 2009 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.105.20090107svn
+- 20090107 snapshot
+- dropped .sh extension from shell scripts in %%{_bindir}
+- BR: yasm for more asm-optimized routines
+- rebased patches
+
+* Thu Dec 18 2008 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.104.20081218svn
+- 20081218 snapshot
+- dropped obsolete/upstreamed patches
+
+* Sun Nov 23 2008 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.103.20080903svn
+- fix broken terminal after using dvb input (bug #117)
+- disable backing store (fixes tearing on Xorg Xserver 1.5.x)
+- disable samba support by default, too much dependency bloat (bug #147)
+- add missing Requires for hicolor icon dirs to -gui
+- drop provides and obsoletes for mplayer-mencoder (last seen for FC4)
+
+* Tue Oct 28 2008 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.102.20080903svn
+- rework the build system
+- rebuild for new libcaca
+
+* Thu Oct 16 2008 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.101.20080903svn
+- remove libdvdcss copy from the source tarball
+
+* Sun Oct 12 2008 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.100.20080903svn
+- backport the fix for CVE-2008-3827
+
+* Tue Sep 09 2008 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.99.20080903svn
+- updated to 20080903 SVN snapshot
+- added snapshot creation script
+- dropped version sed-patching (happens in the snapshot script now)
+- enabled samba support by default
+
+* Tue Aug 19 2008 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.98.20080818svn
+- moved config settings to config patch
+- rebased patches against current snapshot
+
+* Mon Aug 18 2008 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.97.20080818svn
+- updated to latest SVN snapshot
+- dropped obsolete patches
+- installed aconvert.sh to bindir
+- fixed zh_CN manpage installation
+
+* Sun Aug 17 2008 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.96.20080613svn
+- live-devel is now live555-devel
+- added missing libXScrnSaver-devel BR
+- fixed audio in some rtsp streams (backport from SVN)
+
+* Sat Aug 09 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 1.0-0.95.20080613svn
+- rebuild
+
+* Sat Jun 14 2008 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.94.20080613svn
+- updated to latest SVN snapshot (bugs #1812, #1910, #1895)
+- fixed building with svgalib support
+- use pulseaudio output by default
+- BR latest libdvdnav
+- bring back live (bug #1950), make libnemesi optional
+- drop obsolete patches
+- fix building against fribidi (bug #1887)
+- BR latest x264
+- re-enable parallel make
+
+* Sat Mar 15 2008 Thorsten Leemhuis <fedora at leemhuis.info> - 1.0-0.93.20080211svn
+- rebuild for new x264
+
+* Mon Feb 11 2008 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.92.20080211svn
+- updated to latest SVN snapshot
+- fixed opening files with spaces in their names (bug #1674)
+- libnemesi doesn't conflict with live anymore
+- fixed samba BR (bug #1809)
+- enabled libnemesi by default
+- made live optional
+- security fixes: CVE-2008-0485, CVE-2008-0486, CVE-2008-0629, CVE-2008-0630
+ (bug #1852)
+
+* Mon Dec 03 2007 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.91.20071201svn
+- use correct chanmap patch
+- obsolete mplayer-fonts
+- require our faad2 2.6.1
+
+* Sat Dec 01 2007 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.90.20071201svn
+- updated to latest SVN snapshot
+- reverted a change which requires newer libdvdnav snapshot
+- fixed license tag
+- use man-links instead of real filesystem symlinks for mencoder.1
+- fixed desktop file
+
+* Sun Nov 11 2007 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.89.rc2
+- rebuild against faad2-2.6.1
+- drop obsolete patch
+
+* Tue Nov 06 2007 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.88.rc2
+- fixed crash in vorbis decoder (bug #1516)
+- added pulseaudio support
+- better libnemesi support
+- fixed libdca support
+
+* Tue Nov 06 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 1.0-87
+- rebuild
+
+* Sat Oct 13 2007 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.86.rc2
+- work around Fedora bug 330031
+
+* Thu Oct 11 2007 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.85.rc2
+- 1.0rc2
+- drop obsolete/useless patches
+- add experimental audio channel reordering patch
+- optional libnemesi support (mutually exclusive with LIVE555)
+- revert to internal faad2 (linking with 2.5 makes MPlayer non-distributable)
+ but leave a build-time option
+- don't rebuild HTML docs for releases
+- include Copyright file
+
+* Thu Sep 27 2007 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.84.20070923svn
+- really fix it this time
+
+* Wed Sep 26 2007 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.83.20070923svn
+- fix build on x86_32
+
+* Wed Sep 26 2007 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.82.20070923svn
+- disable parallel make (fails on vidix)
+- re-enable external faad2 (fixed in 2.5-4)
+
+* Sun Sep 23 2007 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.81.20070923svn
+- latest snapshot
+- update Blue skin
+- fix seeking with -demux lavf
+- dropped obsolete patches
+- Czech manpage is already utf8 (bug #1626)
+- fixes CVE-2007-4938 (bug #1645)
+- disable external faad, seems broken
+
+* Sat Jul 21 2007 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.80.20070715svn
+- fix build on i386
+- another libdca patch update
+- fix parallel builds
+
+* Fri Jul 20 2007 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.79.20070715svn
+- fix a crash in subtitle selection code
+- updated libdca patch
+
+* Sun Jul 15 2007 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.78.20070715svn
+- latest snapshot
+- use external libfaad again
+- restore libdca support
+- make ad_faad detect the correct sample rate on 64-bit systems
+ (based on a patch by Rasmus Rohde)
+
+* Tue Jun 12 2007 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.77.20070612svn
+- latest snapshot
+- dropped one obsolete patch
+- fixed CVE-2007-2948 (#1525)
+- backported compilation fix from r23546
+- dropped redundant BR: libpng-devel (brought in by gtk2-devel)
+
+* Tue May 15 2007 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.75.20070513svn
+- BuildRequire the new libdvdnav
+
+* Sun May 13 2007 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.74.20070513svn
+- 20070513 snapshot
+- libdha is now static
+
+* Sun Mar 25 2007 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.72.20070325svn
+- 20070325 snapshot
+- built with internal libav{codec,format,util}
+- dropped obsolete patches
+
+* Sun Mar 18 2007 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.71.rc1
+- fix buffer overflow in DS_VideoDecoder.c (bug #1443)
+
+* Sat Mar 10 2007 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.70.rc1
+- fix buffer overflow in DMO_VideoDecoder.c
+
+* Wed Jan 03 2007 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.69.rc1
+- fix buffer overflow in asmrp.c
+
+* Thu Dec 28 2006 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.68.rc1
+- don't depend on urw-fonts, use generic Sans font instead
+
+* Tue Dec 26 2006 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.67.rc1
+- disable bitmap fonts
+- add libdca support
+- add twolame support
+- prevent linking mplayer with GUI libs
+- make libmad support optional
+
+* Sun Nov 5 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.0-0.66.rc1
+- Apply upstream mp3lib workaround instead of disabling 3DNow altogether in it,
+ thanks to Dominik 'Rathann' Mierzejewski.
+
+* Tue Oct 31 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.0-0.65.rc1
+- 1.0rc1, ffmpeg WMV3 patch applied upstream.
+- Include libdvdnav and x264 support.
+
+* Fri Oct 06 2006 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 1.0-64
+- rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
+* Tue Sep 26 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.0-0.63.pre8
+- Rebuild.
+
+* Fri Aug 18 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.0-0.62.pre8
+- Enable ffmpeg WMV3 decoder.
+- Work around hang when dumping to wav on ix86 (#1127).
+- Disable internal tremor due to above workaround making it crashy.
+- Disable FriBidi (#612) and joystick (#983) in default config file.
+- Specfile/build dependency cleanups.
+- Update default Blue skin to 1.6.
+
+* Thu Jul 27 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.0-0.61.pre8
+- Move codecs dir to %%{_libdir}/codecs to follow upstream, old location
+ in %%{_libdir}/win32 still appears to work as a fallback.
+- Ship codecs dir on all architectures again.
+
+* Thu Jul 27 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.0-0.60.pre8
+- Make DirectFB support optional, disabled by default (#1102).
+- Adapt to lzo2, require it.
+- Include midentify (#1105).
+
+* Mon Jun 26 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.0-0.44.pre8
+- System wide skins dir has changed to /usr/share/mplayer/skins (#1070).
+
+* Thu Jun 22 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.0-0.42.pre8
+- Make arts and esound support optional, disabled by default (#1067).
+- Specfile and legacy dependency cleanups.
+
+* Fri Jun 16 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.0-0.40.pre8
+- 1.0pre8.
+- Drop runtime CPU detection message removal patch.
+- Disable XMMS and OpenAL support by default.
+- Add support for building with JACK support, disabled by default.
+- Don't include the %%{_libdir}/win32 dir on non-x86.
+- Fix %%lang tags in -doc.
+
+* Sat May 13 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.0-0.39.20060513
+- 2006-05-13 CVS snapshot.
+- Make audio output default to ALSA in default config (#970).
+- Trim pre-2005 %%changelog entries.
+
+* Sat May 06 2006 Noa Resare <noa(a)resare.com>
+- Move doc to a separate package (#960).
+
+* Sun Apr 16 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.0-0.39.20060412
+- Enable Musepack support.
+
+* Thu Apr 13 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.0-0.38.20060412
+- 2006-04-12 CVS snapshot.
+- Fix 3dnow disabling patch, some parts were erroneously omitted in the
+ previous revision (Thomas Jansen).
+
+* Sat Apr 8 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.0-0.38.20060407
+- 2006-04-07 CVS snapshot using shared ffmpeg, GTK2, FAAC, OpenAL, and XvMC.
+- XMMS input plugin support can be disabled by rebuilding with "--without xmms"
+- GUI changes: use upstream desktop entry file, update GTK icon cache and
+ desktop database at post(un)install time, install icon to %%{_datadir}/icons.
+- Drop lots of obsolete patches.
+
+* Fri Mar 24 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.0-0.37.pre7try2
+- fix #836
+- fix #835,#834 by disabling detection of 3dnowext for now (Thomas Jansen)
+ this should work around the garbage sound output
+
+* Sat Mar 18 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.0-0.36.pre7try2
+- Add RLO identifier to version string per upstream recommendation.
+- Use configure flags instead of patch for enabling v4l*.
+- Make DVB and DirectFB support unconditional.
+- Drop libXvMC-devel build dependency until xvmc is actually built (#731).
+- Backport get_time_pos slave mode command from CVS to fix progress bar
+ with mplayerplug-in >= 3.15.
+- Drop vdr-mplayer slave mode patch.
+- Rename mplayer-mencoder to mencoder.
+
+* Fri Mar 17 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.0-0.35.pre7try2
+- fix x86_64 asm issues (maybe?!)
+- fix file section for ppc
+
+* Thu Mar 09 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- switch to new release field
+
+* Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- add dist
+
+* Thu Feb 23 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.0-0.lvn.0.34.pre7try2
+- Apply upstream demuxer.h heap overflow fix (CVE-2006-0579).
+- Fix build time X11 detection on lib64 archs.
+- Update Blue skin to 1.5.
+
+* Mon Jan 16 2006 Adrian Reber <adrian(a)lisas.de> - 1.0-0.lvn.0.32.pre7try2
+- re-enabled the aalib-devel BR
+
+* Thu Dec 22 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.0-0.lvn.0.31.pre7try2
+- Apply fix for CVE-2005-4048 from ffmpeg CVS.
+
+* Sun Dec 11 2005 Adrian Reber <adrian(a)lisas.de> - 1.0-0.lvn.0.30.pre7try2
+- changed BR for modular X
+- temporary removal of aalib-devel BR
+
+* Fri Nov 25 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.0-0.lvn.0.29.pre7try2
+- More pre-FC3 cleanups.
+- Make "Blue" the default skin by symlinking, fixes fallback (#571).
+- Build against new DirectFB.
+
+* Thu Sep 29 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.0-0.lvn.0.28.pre7try2
+- Clean up obsolete pre-FC3 stuff (LIRC, CACA, DXR3, and Enca support now
+ unconditional).
+- Drop zero Epochs.
+
+* Thu Sep 15 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:1.0-0.lvn.0.27.pre7try2
+- Enable Enca by default, build with it for FC3+.
+
+* Tue Sep 6 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:1.0-0.lvn.0.26.pre7try2
+- 1.0pre7try2.
+- Enable v4l2 interface (#576).
+- Enable DVB support only with recent enough glibc-kernheaders.
+
+* Mon Jul 4 2005 Thorsten Leemhuis <fedora at leemhuis.info> - 0:1.0-0.lvn.0.26.pre7
+- Add a patch to allow compiling for x86_64-FC4; thx to Ryo Dairiki:
+ https://www.redhat.com/archives/fedora-extras-list/2005-July/msg00997.html
+
+* Mon Jul 4 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:1.0-0.lvn.0.25.pre7
+- Enable DirectFB by default, rebuild with "--without directfb" to disable.
+- Clean up obsolete pre-FC2 support.
+
+* Thu Jun 30 2005 Dams <anvil[AT]livna.org> - 0:1.0-0.lvn.0.24.pre7
+- Added patch to fix ppc/altivec builds (#494)
+
+* Mon Jun 20 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:1.0-0.lvn.0.23.pre7
+- Completely disable parallel make for now.
+
+* Mon Jun 6 2005 Thorsten Leemhuis <fedora at leemhuis.info> - 0:1.0-0.lvn.0.22.pre7
+- add gcc4 patch from thias/gentoo/myself
+
+* Mon May 9 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:1.0-0.lvn.0.21.pre7
+- Use em8300-devel for DXR3 support, and make it optional, default enabled.
+
+* Tue May 03 2005 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 0:1.0-0.lvn.0.20.pre7
+- fix build issues on x86_64:
+ - move target= to a ix86 section -- on x86_64 it passes the option x86-64
+ and not x86_64
+ - use explicit --with-xmmslibdir
+ - {_libdir}/libdha.so.* and {_libdir}/mplayer are missing on x86_64
+
+* Tue Apr 19 2005 Dams <anvil[AT]livna.org> - 0:1.0-0.lvn.0.19.pre7
+- Updated installstrip patch
+- Updated ldconfig patch
+- Updated to 1.0pre7
+
+* Sun Feb 27 2005 Ville Skyttä <ville.skytta at iki.fi> 0:1.0-0.lvn.0.18.pre6a
+- Fix PPC build (David Woodhouse, bug 376).
+- Add libcaca support (rebuild "--without caca" to disable).
+- Rebuild with LIRC support.
+
+* Thu Jan 6 2005 Ville Skyttä <ville.skytta at iki.fi> 0:1.0-0.lvn.0.17.pre6a
+- Update to 1.0pre6a (== 1.0pre6 + included HTML docs).
Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ sources 28 Feb 2012 18:36:31 -0000 1.27
@@ -0,0 +1,2 @@
+340368f4e33f767d9df109990fb29c02 Blue-1.8.tar.bz2
+b0f8f714b60e9a413cac32331b2e9d40 mplayer-export-2012-02-04.tar.bz2
12 years, 1 month
- 1
- 0
rpms/mplayer/devel mplayer-ffmpeg.patch, 1.4, 1.5 mplayer-manlinks.patch, 1.4, 1.5 dead.package, 1.1, NONE
by Julian Sikorski
Author: belegdol
Update of /cvs/free/rpms/mplayer/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv13039
Modified Files:
mplayer-ffmpeg.patch mplayer-manlinks.patch
Removed Files:
dead.package
Log Message:
* Mon Feb 27 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.0-0.131.20120204svn
- Added libbs2b-devel to BuildRequires (RPM Fusion bug #2157)
- Fixed --with directfb (RPM Fusion bug #2141)
- Don't mangle the manpages (RPM Fusion bug #1994)
- Fixed man links (RPM Fusion bug #1625)
* Mon Feb 27 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.0-0.130.20120204svn
- 20120204 snapshot
- Dropped obsolete Group, Buildroot, %%clean and %%defattr
- Updated the ffmpeg patch
- Updated Blue skin to 1.8
- Building documentation is now done from the top-level Makefile
- Icons now come in different sizes
mplayer-ffmpeg.patch:
Makefile | 2
configure | 4
ffmpeg/libavformat/internal.h | 309 ++++++++++++++++++++++++++++++++++++++++++
ffmpeg/libavutil/x86_cpu.h | 98 +++++++++++++
4 files changed, 410 insertions(+), 3 deletions(-)
Index: mplayer-ffmpeg.patch
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/mplayer-ffmpeg.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mplayer-ffmpeg.patch 23 Sep 2011 20:54:45 -0000 1.4
+++ mplayer-ffmpeg.patch 28 Feb 2012 18:35:17 -0000 1.5
@@ -1,7 +1,7 @@
-diff -up mplayer-export-2011-08-16/configure.ffmpeg mplayer-export-2011-08-16/configure
---- mplayer-export-2011-08-16/configure.ffmpeg 2011-08-16 21:55:01.000000000 +0200
-+++ mplayer-export-2011-08-16/configure 2011-08-16 21:56:38.000000000 +0200
-@@ -6792,7 +6792,7 @@ elif test "$ffmpeg_so" = auto ; then
+diff -up mplayer-export-2012-02-04/configure.ffmpeg mplayer-export-2012-02-04/configure
+--- mplayer-export-2012-02-04/configure.ffmpeg 2012-02-27 15:32:56.721715932 +0100
++++ mplayer-export-2012-02-04/configure 2012-02-27 15:32:56.760716194 +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 &&
@@ -10,22 +10,21 @@
elif header_check libavutil/avutil.h -lpostproc -lswscale -lavformat -lavcodec -lavutil ; then
extra_ldflags="$extra_ldflags -lpostproc -lswscale -lavformat -lavcodec -lavutil"
ffmpeg_so=yes
-@@ -7481,7 +7481,7 @@ if test "$_gui" = yes ; then
+@@ -7407,7 +7407,7 @@ if test "$_gui" = yes ; then
# Required libraries
if test "$ffmpeg" != yes ||
- ! echo $libavdecoders | grep -q PNG_DECODER ; then
-+ ! objdump -T $_libdir/libavcodec.so | grep -q ff_png ; 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-2011-08-16/ffmpeg/libavformat/riff.h.ffmpeg mplayer-export-2011-08-16/ffmpeg/libavformat/riff.h
---- mplayer-export-2011-08-16/ffmpeg/libavformat/riff.h.ffmpeg 2011-08-16 21:55:01.000000000 +0200
-+++ mplayer-export-2011-08-16/ffmpeg/libavformat/riff.h 2011-08-16 21:55:01.000000000 +0200
-@@ -0,0 +1,41 @@
+diff -up mplayer-export-2012-02-04/ffmpeg/libavformat/internal.h.ffmpeg mplayer-export-2012-02-04/ffmpeg/libavformat/internal.h
+--- mplayer-export-2012-02-04/ffmpeg/libavformat/internal.h.ffmpeg 2012-02-27 15:32:56.762716209 +0100
++++ mplayer-export-2012-02-04/ffmpeg/libavformat/internal.h 2012-02-27 15:32:56.762716209 +0100
+@@ -0,0 +1,309 @@
+/*
-+ * RIFF codec tags
-+ * copyright (c) 2000 Fabrice Bellard
++ * copyright (c) 2001 Fabrice Bellard
+ *
+ * This file is part of FFmpeg.
+ *
@@ -44,29 +43,298 @@
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
-+/**
-+ * @file
-+ * internal header for RIFF based (de)muxers
-+ * do NOT include this in end user applications
-+ */
++#ifndef AVFORMAT_INTERNAL_H
++#define AVFORMAT_INTERNAL_H
+
-+#ifndef AVFORMAT_RIFF_H
-+#define AVFORMAT_RIFF_H
++#include <stdint.h>
++#include "libavformat/avformat.h"
+
-+#include "libavcodec/avcodec.h"
++#define MAX_URL_SIZE 4096
++
++#ifdef DEBUG
++# define hex_dump_debug(class, buf, size) av_hex_dump_log(class, AV_LOG_DEBUG, buf, size)
++#else
++# define hex_dump_debug(class, buf, size)
++#endif
+
+typedef struct AVCodecTag {
+ enum CodecID id;
+ unsigned int tag;
+} AVCodecTag;
+
-+extern const AVCodecTag ff_codec_bmp_tags[];
-+extern const AVCodecTag ff_codec_wav_tags[];
++#ifdef __GNUC__
++#define dynarray_add(tab, nb_ptr, elem)\
++do {\
++ __typeof__(tab) _tab = (tab);\
++ __typeof__(elem) _elem = (elem);\
++ (void)sizeof(**_tab == _elem); /* check that types are compatible */\
++ av_dynarray_add(_tab, nb_ptr, _elem);\
++} while(0)
++#else
++#define dynarray_add(tab, nb_ptr, elem)\
++do {\
++ av_dynarray_add((tab), nb_ptr, (elem));\
++} while(0)
++#endif
++
++struct tm *brktimegm(time_t secs, struct tm *tm);
++
++char *ff_data_to_hex(char *buf, const uint8_t *src, int size, int lowercase);
+
-+#endif /* AVFORMAT_RIFF_H */
-diff -up mplayer-export-2011-08-16/ffmpeg/libavutil/x86_cpu.h.ffmpeg mplayer-export-2011-08-16/ffmpeg/libavutil/x86_cpu.h
---- mplayer-export-2011-08-16/ffmpeg/libavutil/x86_cpu.h.ffmpeg 2011-08-16 21:55:01.000000000 +0200
-+++ mplayer-export-2011-08-16/ffmpeg/libavutil/x86_cpu.h 2011-08-16 21:55:01.000000000 +0200
++/**
++ * Parse a string of hexadecimal strings. Any space between the hexadecimal
++ * digits is ignored.
++ *
++ * @param data if non-null, the parsed data is written to this pointer
++ * @param p the string to parse
++ * @return the number of bytes written (or to be written, if data is null)
++ */
++int ff_hex_to_data(uint8_t *data, const char *p);
++
++void ff_program_add_stream_index(AVFormatContext *ac, int progid, unsigned int idx);
++
++/**
++ * Add packet to AVFormatContext->packet_buffer list, determining its
++ * interleaved position using compare() function argument.
++ * @return 0, or < 0 on error
++ */
++int ff_interleave_add_packet(AVFormatContext *s, AVPacket *pkt,
++ int (*compare)(AVFormatContext *, AVPacket *, AVPacket *));
++
++void ff_read_frame_flush(AVFormatContext *s);
++
++#define NTP_OFFSET 2208988800ULL
++#define NTP_OFFSET_US (NTP_OFFSET * 1000000ULL)
++
++/** Get the current time since NTP epoch in microseconds. */
++uint64_t ff_ntp_time(void);
++
++/**
++ * Assemble a URL string from components. This is the reverse operation
++ * of av_url_split.
++ *
++ * Note, this requires networking to be initialized, so the caller must
++ * ensure ff_network_init has been called.
++ *
++ * @see av_url_split
++ *
++ * @param str the buffer to fill with the url
++ * @param size the size of the str buffer
++ * @param proto the protocol identifier, if null, the separator
++ * after the identifier is left out, too
++ * @param authorization an optional authorization string, may be null.
++ * An empty string is treated the same as a null string.
++ * @param hostname the host name string
++ * @param port the port number, left out from the string if negative
++ * @param fmt a generic format string for everything to add after the
++ * host/port, may be null
++ * @return the number of characters written to the destination buffer
++ */
++int ff_url_join(char *str, int size, const char *proto,
++ const char *authorization, const char *hostname,
++ int port, const char *fmt, ...) av_printf_format(7, 8);
++
++/**
++ * Append the media-specific SDP fragment for the media stream c
++ * to the buffer buff.
++ *
++ * Note, the buffer needs to be initialized, since it is appended to
++ * existing content.
++ *
++ * @param buff the buffer to append the SDP fragment to
++ * @param size the size of the buff buffer
++ * @param c the AVCodecContext of the media to describe
++ * @param dest_addr the destination address of the media stream, may be NULL
++ * @param dest_type the destination address type, may be NULL
++ * @param port the destination port of the media stream, 0 if unknown
++ * @param ttl the time to live of the stream, 0 if not multicast
++ * @param fmt the AVFormatContext, which might contain options modifying
++ * the generated SDP
++ */
++void ff_sdp_write_media(char *buff, int size, AVCodecContext *c,
++ const char *dest_addr, const char *dest_type,
++ int port, int ttl, AVFormatContext *fmt);
++
++/**
++ * Write a packet to another muxer than the one the user originally
++ * intended. Useful when chaining muxers, where one muxer internally
++ * writes a received packet to another muxer.
++ *
++ * @param dst the muxer to write the packet to
++ * @param dst_stream the stream index within dst to write the packet to
++ * @param pkt the packet to be written
++ * @param src the muxer the packet originally was intended for
++ * @return the value av_write_frame returned
++ */
++int ff_write_chained(AVFormatContext *dst, int dst_stream, AVPacket *pkt,
++ AVFormatContext *src);
++
++/**
++ * Get the length in bytes which is needed to store val as v.
++ */
++int ff_get_v_length(uint64_t val);
++
++/**
++ * Put val using a variable number of bytes.
++ */
++void ff_put_v(AVIOContext *bc, uint64_t val);
++
++/**
++ * Read a whole line of text from AVIOContext. Stop reading after reaching
++ * either a \\n, a \\0 or EOF. The returned string is always \\0-terminated,
++ * and may be truncated if the buffer is too small.
++ *
++ * @param s the read-only AVIOContext
++ * @param buf buffer to store the read line
++ * @param maxlen size of the buffer
++ * @return the length of the string written in the buffer, not including the
++ * final \\0
++ */
++int ff_get_line(AVIOContext *s, char *buf, int maxlen);
++
++#define SPACE_CHARS " \t\r\n"
++
++/**
++ * Callback function type for ff_parse_key_value.
++ *
++ * @param key a pointer to the key
++ * @param key_len the number of bytes that belong to the key, including the '='
++ * char
++ * @param dest return the destination pointer for the value in *dest, may
++ * be null to ignore the value
++ * @param dest_len the length of the *dest buffer
++ */
++typedef void (*ff_parse_key_val_cb)(void *context, const char *key,
++ int key_len, char **dest, int *dest_len);
++/**
++ * Parse a string with comma-separated key=value pairs. The value strings
++ * may be quoted and may contain escaped characters within quoted strings.
++ *
++ * @param str the string to parse
++ * @param callback_get_buf function that returns where to store the
++ * unescaped value string.
++ * @param context the opaque context pointer to pass to callback_get_buf
++ */
++void ff_parse_key_value(const char *str, ff_parse_key_val_cb callback_get_buf,
++ void *context);
++
++/**
++ * Find stream index based on format-specific stream ID
++ * @return stream index, or < 0 on error
++ */
++int ff_find_stream_index(AVFormatContext *s, int id);
++
++/**
++ * Internal version of av_index_search_timestamp
++ */
++int ff_index_search_timestamp(const AVIndexEntry *entries, int nb_entries,
++ int64_t wanted_timestamp, int flags);
++
++/**
++ * Internal version of av_add_index_entry
++ */
++int ff_add_index_entry(AVIndexEntry **index_entries,
++ int *nb_index_entries,
++ unsigned int *index_entries_allocated_size,
++ int64_t pos, int64_t timestamp, int size, int distance, int flags);
++
++/**
++ * Add a new chapter.
++ *
++ * @param s media file handle
++ * @param id unique ID for this chapter
++ * @param start chapter start time in time_base units
++ * @param end chapter end time in time_base units
++ * @param title chapter title
++ *
++ * @return AVChapter or NULL on error
++ */
++AVChapter *avpriv_new_chapter(AVFormatContext *s, int id, AVRational time_base,
++ int64_t start, int64_t end, const char *title);
++
++/**
++ * Ensure the index uses less memory than the maximum specified in
++ * AVFormatContext.max_index_size by discarding entries if it grows
++ * too large.
++ */
++void ff_reduce_index(AVFormatContext *s, int stream_index);
++
++/*
++ * Convert a relative url into an absolute url, given a base url.
++ *
++ * @param buf the buffer where output absolute url is written
++ * @param size the size of buf
++ * @param base the base url, may be equal to buf.
++ * @param rel the new url, which is interpreted relative to base
++ */
++void ff_make_absolute_url(char *buf, int size, const char *base,
++ const char *rel);
++
++enum CodecID ff_guess_image2_codec(const char *filename);
++
++/**
++ * Convert a date string in ISO8601 format to Unix timestamp.
++ */
++int64_t ff_iso8601_to_unix_time(const char *datestr);
++
++/**
++ * Perform a binary search using av_index_search_timestamp() and
++ * AVInputFormat.read_timestamp().
++ *
++ * @param target_ts target timestamp in the time base of the given stream
++ * @param stream_index stream number
++ */
++int ff_seek_frame_binary(AVFormatContext *s, int stream_index,
++ int64_t target_ts, int flags);
++
++/**
++ * Update cur_dts of all streams based on the given timestamp and AVStream.
++ *
++ * Stream ref_st unchanged, others set cur_dts in their native time base.
++ * Only needed for timestamp wrapping or if (dts not set and pts!=dts).
++ * @param timestamp new dts expressed in time_base of param ref_st
++ * @param ref_st reference stream giving time_base of param timestamp
++ */
++void ff_update_cur_dts(AVFormatContext *s, AVStream *ref_st, int64_t timestamp);
++
++/**
++ * Perform a binary search using read_timestamp().
++ *
++ * @param target_ts target timestamp in the time base of the given stream
++ * @param stream_index stream number
++ */
++int64_t ff_gen_search(AVFormatContext *s, int stream_index,
++ int64_t target_ts, int64_t pos_min,
++ int64_t pos_max, int64_t pos_limit,
++ int64_t ts_min, int64_t ts_max,
++ int flags, int64_t *ts_ret,
++ int64_t (*read_timestamp)(struct AVFormatContext *, int , int64_t *, int64_t ));
++
++/**
++ * Set the pts for a given stream. If the new values would be invalid
++ * (<= 0), it leaves the AVStream unchanged.
++ *
++ * @param s stream
++ * @param pts_wrap_bits number of bits effectively used by the pts
++ * (used for wrap control, 33 is the value for MPEG)
++ * @param pts_num numerator to convert to seconds (MPEG: 1)
++ * @param pts_den denominator to convert to seconds (MPEG: 90000)
++ */
++void avpriv_set_pts_info(AVStream *s, int pts_wrap_bits,
++ unsigned int pts_num, unsigned int pts_den);
++
++/**
++ * Add side data to a packet for changing parameters to the given values.
++ * Parameters set to 0 aren't included in the change.
++ */
++int ff_add_param_change(AVPacket *pkt, int32_t channels,
++ uint64_t channel_layout, int32_t sample_rate,
++ int32_t width, int32_t height);
++
++#endif /* AVFORMAT_INTERNAL_H */
+diff -up mplayer-export-2012-02-04/ffmpeg/libavutil/x86_cpu.h.ffmpeg mplayer-export-2012-02-04/ffmpeg/libavutil/x86_cpu.h
+--- mplayer-export-2012-02-04/ffmpeg/libavutil/x86_cpu.h.ffmpeg 2012-02-27 15:32:56.780716332 +0100
++++ mplayer-export-2012-02-04/ffmpeg/libavutil/x86_cpu.h 2012-02-27 15:32:56.780716332 +0100
@@ -0,0 +1,98 @@
+/*
+ * copyright (c) 2006 Michael Niedermayer <michaelni(a)gmx.at>
@@ -166,10 +434,10 @@
+#endif
+
+#endif /* AVUTIL_X86_CPU_H */
-diff -up mplayer-export-2011-08-16/Makefile.ffmpeg mplayer-export-2011-08-16/Makefile
---- mplayer-export-2011-08-16/Makefile.ffmpeg 2011-08-16 21:55:01.000000000 +0200
-+++ mplayer-export-2011-08-16/Makefile 2011-08-16 21:55:01.000000000 +0200
-@@ -779,7 +779,7 @@ mencoder$(EXESUF) mplayer$(EXESUF):
+diff -up mplayer-export-2012-02-04/Makefile.ffmpeg mplayer-export-2012-02-04/Makefile
+--- mplayer-export-2012-02-04/Makefile.ffmpeg 2012-02-27 15:32:56.722715938 +0100
++++ mplayer-export-2012-02-04/Makefile 2012-02-27 15:32:56.793716420 +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/devel/mplayer-manlinks.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mplayer-manlinks.patch 30 Oct 2009 01:10:22 -0000 1.4
+++ mplayer-manlinks.patch 28 Feb 2012 18:35:17 -0000 1.5
@@ -29,3 +29,4 @@
endef
define MPLAYER_MAN_RULE
+E
--- dead.package DELETED ---
12 years, 1 month
- 1
- 0
rpms/wxsvg/F-17 wxsvg.spec,1.8,1.9
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/wxsvg/F-17
In directory se02.es.rpmfusion.net:/tmp/cvs-serv27825
Modified Files:
wxsvg.spec
Log Message:
* Tue Feb 28 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.1.2-3
- Rebuilt for x264/FFmpeg
Index: wxsvg.spec
===================================================================
RCS file: /cvs/free/rpms/wxsvg/F-17/wxsvg.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- wxsvg.spec 8 Feb 2012 22:11:37 -0000 1.8
+++ wxsvg.spec 28 Feb 2012 11:47:21 -0000 1.9
@@ -1,6 +1,6 @@
Name: wxsvg
Version: 1.1.2
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: C++ library to create, manipulate and render SVG files
Group: System Environment/Libraries
@@ -71,6 +71,9 @@
%{_libdir}/pkgconfig/lib%{name}.pc
%changelog
+* Tue Feb 28 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.1.2-3
+- Rebuilt for x264/FFmpeg
+
* Wed Feb 08 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.1.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
12 years, 1 month
- 1
- 0
rpms/qmmp-plugins-freeworld/F-17 qmmp-plugins-freeworld.spec, 1.20, 1.21
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/qmmp-plugins-freeworld/F-17
In directory se02.es.rpmfusion.net:/tmp/cvs-serv27532
Modified Files:
qmmp-plugins-freeworld.spec
Log Message:
* Tue Feb 28 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.5.3-2
- Rebuilt for x264/FFmpeg
Index: qmmp-plugins-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/qmmp-plugins-freeworld/F-17/qmmp-plugins-freeworld.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- qmmp-plugins-freeworld.spec 23 Jan 2012 18:52:13 -0000 1.20
+++ qmmp-plugins-freeworld.spec 28 Feb 2012 11:46:34 -0000 1.21
@@ -1,6 +1,6 @@
Name: qmmp-plugins-freeworld
Version: 0.5.3
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Plugins for qmmp (Qt-based multimedia player)
Group: Applications/Multimedia
@@ -134,6 +134,9 @@
%changelog
+* Tue Feb 28 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.5.3-2
+- Rebuilt for x264/FFmpeg
+
* Mon Jan 23 2012 Karel Volný <kvolny(a)redhat.com> 0.5.3-1
- version bump
- patch to include usleep from QThread (qmmp-0.5.3-mms-include-usleep.patch)
12 years, 1 month
- 1
- 0
rpms/picard-freeworld/F-17 picard-freeworld.spec,1.15,1.16
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/picard-freeworld/F-17
In directory se02.es.rpmfusion.net:/tmp/cvs-serv27083
Modified Files:
picard-freeworld.spec
Log Message:
* Tue Feb 28 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.16-4
- Rebuilt for x264/FFmpeg
Index: picard-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/picard-freeworld/F-17/picard-freeworld.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- picard-freeworld.spec 25 Jan 2012 14:53:39 -0000 1.15
+++ picard-freeworld.spec 28 Feb 2012 11:45:44 -0000 1.16
@@ -3,7 +3,7 @@
Name: picard-freeworld
Version: 0.16
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: MusicBrainz-based audio tagger
Group: Applications/Multimedia
@@ -56,6 +56,9 @@
%{python_sitearch}/picard/musicdns/avcodec.so
%changelog
+* Tue Feb 28 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.16-4
+- Rebuilt for x264/FFmpeg
+
* Wed Jan 25 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.16-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
12 years, 1 month
- 1
- 0