diff --git a/.gitignore b/.gitignore index 1c6fac4..a2b2a48 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ Blue-1.8.tar.bz2 -MPlayer-1.1.tar.xz +mplayer-export-2012-10-08.tar.bz2 diff --git a/mplayer-gmplayer-subtitles.patch b/mplayer-gmplayer-subtitles.patch deleted file mode 100644 index ee8a8e9..0000000 --- a/mplayer-gmplayer-subtitles.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: gui/ui/gtk/menu.c -=================================================================== ---- gui/ui/gtk/menu.c (wersja 34995) -+++ gui/ui/gtk/menu.c (wersja 34996) -@@ -625,6 +625,7 @@ - { - int i; - SubMenu=AddSubMenu( window1, (const char*)empty_xpm, Menu, MSGTR_MENU_Subtitles ); -+ AddMenuCheckItem( window1, (const char*)empty1px_xpm, SubMenu, MSGTR_MENU_None, guiInfo.mpcontext->global_sub_pos == -1, (-1 << 16) + ivSetSubtitle ); - for ( i=0;i < global_sub_size;i++ ) - { - char tmp[32]; diff --git a/mplayer-snapshot.sh b/mplayer-snapshot.sh index db86b5f..3841c10 100755 --- a/mplayer-snapshot.sh +++ b/mplayer-snapshot.sh @@ -13,7 +13,7 @@ cleanup() { unset CDPATH pwd=$(pwd) svn=$(date +%Y-%m-%d) -svn=2012-05-04 +svn=2012-10-08 dirname=mplayer-export-$svn mplayer_rev={$svn} #mplayer_rev=HEAD diff --git a/mplayer.spec b/mplayer.spec index 5a83d4f..bd66876 100644 --- a/mplayer.spec +++ b/mplayer.spec @@ -1,12 +1,12 @@ %define codecdir %{_libdir}/codecs -#define pre 20120205svn -#define svn 1 -#define svnbuild 2012-02-05 +%define pre 20121008svn +%define svn 1 +%define svnbuild 2012-10-08 %define faad2min 1:2.6.1 Name: mplayer Version: 1.1 -Release: 2%{?pre}%{?dist} +Release: 3.%{?pre}%{?dist} Summary: Movie player playing most video formats and DVDs %if 0%{!?_without_amr:1} @@ -23,7 +23,6 @@ Source0: http://www.mplayerhq.hu/MPlayer/releases/MPlayer-%{version}%{?pr %endif Source1: http://www.mplayerhq.hu/MPlayer/skins/Blue-1.8.tar.bz2 Source10: mplayer-snapshot.sh -Patch0: %{name}-gmplayer-subtitles.patch # set defaults for Fedora Patch2: %{name}-config.patch # use roff include statements instead of symlinks @@ -198,7 +197,6 @@ This package contains various scripts from MPlayer TOOLS directory. %{!?_with_libmad:--disable-mad} \\\ %{?_with_libmpcdec:--enable-musepack} \\\ --disable-libmpeg2-internal \\\ - --disable-tremor-internal \\\ %{?_with_xmms:--enable-xmms} \\\ %{?_with_xmms:--with-xmmslibdir=%{_libdir}} \\\ \\\ @@ -224,7 +222,6 @@ This package contains various scripts from MPlayer TOOLS directory. %setup -q -n MPlayer-%{version}%{?pre} rm -rf ffmpeg libdvdcss libdvdnav libdvdread4 %endif -%patch0 -p0 -b .gmplayer-subtitles %patch2 -p1 -b .config %patch8 -p1 -b .manlinks %patch14 -p1 -b .nodvdcss @@ -384,6 +381,11 @@ update-desktop-database &>/dev/null || : %{_datadir}/mplayer/*.fp %changelog +* Sat Oct 20 2012 Julian Sikorski - 1.1-3.20121008svn +- 20121008 snapshot +- Internal tremor copy is no more +- Dropped the included gmplayer subtitles patch + * Wed Sep 05 2012 Nicolas Chauvet - Rebuilt for x264 ABI 125 - Use --cpu-runtime-detection only on supported arches - rfbz#2467 diff --git a/sources b/sources index 59b74c9..8ad3cce 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ 340368f4e33f767d9df109990fb29c02 Blue-1.8.tar.bz2 -ac7bf1cfedc1c5c24bfc83107eefb1d9 MPlayer-1.1.tar.xz +1a073615341bae9ab99550ae7a31c509 mplayer-export-2012-10-08.tar.bz2