diff --git a/.gitignore b/.gitignore index c9a4043..cc9853c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ Blue-1.7.tar.bz2 -mplayer-export-2010-01-16.tar.bz2 +mplayer-export-2010-03-27.tar.bz2 diff --git a/mplayer-libgif.patch b/mplayer-libgif.patch new file mode 100644 index 0000000..c1e556a --- /dev/null +++ b/mplayer-libgif.patch @@ -0,0 +1,12 @@ +diff -up mplayer-export-2010-03-27/configure.libgif mplayer-export-2010-03-27/configure +--- mplayer-export-2010-03-27/configure.libgif 2010-03-27 22:56:17.000000000 +0100 ++++ mplayer-export-2010-03-27/configure 2010-03-28 00:37:40.000000000 +0100 +@@ -5246,7 +5246,7 @@ cat > $TMPC << EOF + #include + int main(void) { return 0; } + EOF +- for _ld_gif in "-lungif" "-lgif" ; do ++ for _ld_gif in "-lgif" "-lungif" ; do + cc_check $_ld_gif && _gif=yes && break + done + fi diff --git a/mplayer.spec b/mplayer.spec index 2a5e3af..230b963 100644 --- a/mplayer.spec +++ b/mplayer.spec @@ -1,12 +1,12 @@ %define codecdir %{_libdir}/codecs -%define pre 20100116svn +%define pre 20100327svn %define svn 1 -%define svnbuild 2010-01-16 +%define svnbuild 2010-03-27 %define faad2min 1:2.6.1 Name: mplayer Version: 1.0 -Release: 0.113.%{pre}%{?dist} +Release: 0.114.%{pre}%{?dist} Summary: Movie player playing most video formats and DVDs Group: Applications/Multimedia @@ -26,8 +26,8 @@ Source1: http://www.mplayerhq.hu/MPlayer/skins/Blue-1.7.tar.bz2 Source10: mplayer-snapshot.sh Patch2: %{name}-config.patch Patch8: %{name}-manlinks.patch -Patch10: %{name}-qcelp.patch Patch14: %{name}-nodvdcss.patch +Patch15: %{name}-libgif.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel @@ -219,8 +219,8 @@ This package contains various scripts from MPlayer TOOLS directory. %endif %patch2 -p1 -b .config %patch8 -p1 -b .manlinks -%patch10 -p1 -b .qcelp %patch14 -p1 -b .nodvdcss +%patch15 -p1 -b .libgif doconv() { iconv -f $1 -t $2 -o DOCS/man/$3/mplayer.1.utf8 DOCS/man/$3/mplayer.1 && \ @@ -393,6 +393,11 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/mplayer/*.fp %changelog +* Sat Mar 27 2010 Dominik Mierzejewski - 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 - 1.0-0.113.20100116svn - Rebuild for live555 diff --git a/sources b/sources index e642e40..a7327d5 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ e4e2020d11b681aac898103b3ba723c4 Blue-1.7.tar.bz2 -a945a0c0248ebcbfbd72af0975bd46a8 mplayer-export-2010-01-16.tar.bz2 +2046c98215915a4cc5cf47335a3e23e9 mplayer-export-2010-03-27.tar.bz2