diff --git a/.gitignore b/.gitignore index 7ac86a5..5919298 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ Blue-1.10.tar.bz2 -mplayer-export-2014-10-20.tar.bz2 +mplayer-export-2015-01-23.tar.bz2 diff --git a/mplayer-nodvdcss.patch b/mplayer-nodvdcss.patch deleted file mode 100644 index 099afbf..0000000 --- a/mplayer-nodvdcss.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff -up mplayer-export-2013-03-29/configure.nodvdcss mplayer-export-2013-03-29/configure ---- mplayer-export-2013-03-29/configure.nodvdcss 2013-03-28 08:45:33.000000000 +0100 -+++ mplayer-export-2013-03-29/configure 2013-03-28 08:46:54.302523303 +0100 -@@ -741,7 +741,7 @@ _dvdnavconfig=dvdnav-config - _dvdreadconfig=dvdread-config - _dvdread=auto - _dvdread_internal=auto --_libdvdcss_internal=auto -+_libdvdcss_internal=no - _xanim=auto - _real=auto - _live=auto -diff -up mplayer-export-2013-03-29/Makefile.nodvdcss mplayer-export-2013-03-29/Makefile ---- mplayer-export-2013-03-29/Makefile.nodvdcss 2013-03-28 08:46:54.300523311 +0100 -+++ mplayer-export-2013-03-29/Makefile 2013-03-28 08:48:09.386242474 +0100 -@@ -124,11 +124,6 @@ SRCS_COMMON-$(LIBDCA) += - SRCS_COMMON-$(LIBDV) += libmpcodecs/ad_libdv.c \ - libmpcodecs/vd_libdv.c \ - libmpdemux/demux_rawdv.c --SRCS_COMMON-$(LIBDVDCSS_INTERNAL) += libdvdcss/css.c \ -- libdvdcss/device.c \ -- libdvdcss/error.c \ -- libdvdcss/ioctl.c \ -- libdvdcss/libdvdcss.c \ - - SRCS_COMMON-$(LIBMAD) += libmpcodecs/ad_libmad.c - -@@ -730,7 +725,6 @@ DIRS = . \ - - ALL_DIRS = $(DIRS) \ - libass \ -- libdvdcss \ - libdvdnav \ - libdvdnav/vm \ - libdvdread4 \ -@@ -859,7 +853,6 @@ osdep/mplayer-rc.o: osdep/mplayer.exe.ma - - gui/%: CFLAGS += -Wno-strict-prototypes - --libdvdcss/%: CFLAGS := $(CFLAGS_LIBDVDCSS) $(CFLAGS) - libdvdnav/%: CFLAGS := -Ilibdvdnav -DHAVE_CONFIG_H -DVERSION=\"MPlayer-custom\" $(CFLAGS) - libdvdread4/%: CFLAGS := -Ilibdvdread4 $(CFLAGS_LIBDVDCSS_DVDREAD) $(CFLAGS) - diff --git a/mplayer-snapshot.sh b/mplayer-snapshot.sh index 4eccd1a..f4fd113 100755 --- a/mplayer-snapshot.sh +++ b/mplayer-snapshot.sh @@ -13,17 +13,15 @@ cleanup() { unset CDPATH pwd=$(pwd) svn=$(date +%Y-%m-%d) -svn=2014-10-20 +svn=2015-01-23 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 +svn checkout -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 diff --git a/mplayer.spec b/mplayer.spec index 30934ad..7fe4f8b 100644 --- a/mplayer.spec +++ b/mplayer.spec @@ -1,12 +1,12 @@ %define codecdir %{_libdir}/codecs -%define pre 20141020svn +%define pre 20150123svn %define svn 1 -%define svnbuild 2014-10-20 +%define svnbuild 2015-01-23 %define faad2min 1:2.6.1 Name: mplayer Version: 1.1 -Release: 31.%{?pre}%{?dist} +Release: 32.%{?pre}%{?dist} Summary: Movie player playing most video formats and DVDs %if 0%{!?_without_amr:1} @@ -27,8 +27,6 @@ Source10: mplayer-snapshot.sh Patch0: %{name}-config.patch # use roff include statements instead of symlinks Patch1: %{name}-manlinks.patch -# erase any trace of libdvdcss -Patch2: %{name}-nodvdcss.patch # use system FFmpeg libraries Patch3: %{name}-ffmpeg.patch @@ -184,8 +182,6 @@ This package contains various scripts from MPlayer TOOLS directory. %endif \ --enable-unrarexec \\\ \\\ - --disable-dvdread-internal \\\ - --disable-libdvdcss-internal \\\ %{!?_with_nemesi:--disable-nemesi} \\\ %{!?_with_samba:--disable-smb} \\\ \\\ @@ -219,11 +215,9 @@ This package contains various scripts from MPlayer TOOLS directory. %setup -q -n mplayer-export-%{svnbuild} %else %setup -q -n MPlayer-%{version}%{?pre} -rm -rf ffmpeg libdvdcss libdvdnav libdvdread4 %endif %patch0 -p1 -b .config %patch1 -p1 -b .manlinks -%patch2 -p1 -b .nodvdcss %patch3 -p1 -b .ffmpeg mkdir GUI @@ -380,6 +374,10 @@ update-desktop-database &>/dev/null || : %{_datadir}/mplayer/*.fp %changelog +* Sat Jan 31 2015 Julian Sikorski - 1.1-32.20150123svn +- 20150123 snapshot +- Internal libdvd* are no more, cleaned up the spec accordingly + * Tue Oct 21 2014 Julian Sikorski - 1.1-31.20141020svn - 20141020 snapshot diff --git a/sources b/sources index f1bf220..c1ab4d8 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ d0d7baf1e84ba95f4456c51b50d99b14 Blue-1.10.tar.bz2 -9a21e3a2119aedfc893638d977a7abfc mplayer-export-2014-10-20.tar.bz2 +c0f5e1b9847812b76fb107563fda93c5 mplayer-export-2015-01-23.tar.bz2