diff --git a/.gitignore b/.gitignore index 53fe950..58f1b5e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ Blue-1.11.tar.bz2 MPlayer-1.3.0.tar.xz +/mplayer-export-2018-01-19.tar.bz2 diff --git a/mplayer-add-include_vdpau_x11.patch b/mplayer-add-include_vdpau_x11.patch deleted file mode 100644 index 3c2891b..0000000 --- a/mplayer-add-include_vdpau_x11.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 2fe876f5ed67edd72e6da4fd0ccaae03a1952d4c Mon Sep 17 00:00:00 2001 -From: al -Date: Wed, 19 Apr 2017 23:06:04 +0000 -Subject: [PATCH] vo_vdpau: Explicitly include header vdpau_x11.h - -The include from inside libavcodec/vdpau.h was removed in FFmpeg -commit d40e181bec22014a9ea312ab6837f7f0bc4f9e42 . ---- - libvo/vo_vdpau.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/libvo/vo_vdpau.c b/libvo/vo_vdpau.c -index 7b94cad1b9..99f08d6c7b 100644 ---- a/libvo/vo_vdpau.c -+++ b/libvo/vo_vdpau.c -@@ -34,6 +34,7 @@ - - #include - #include -+#include - - #include "config.h" - #include "sub/ass_mp.h" diff --git a/mplayer-fix-screenshot-crash.patch b/mplayer-fix-screenshot-crash.patch deleted file mode 100644 index 9f17461..0000000 --- a/mplayer-fix-screenshot-crash.patch +++ /dev/null @@ -1,26 +0,0 @@ -From bbaf524d691d6bfecfd65175259fd61abc6e5f69 Mon Sep 17 00:00:00 2001 -From: rtogni -Date: Sun, 3 Jul 2016 20:06:11 +0000 -Subject: [PATCH] Fix crash with screenshot filter. - -avcodec_open2() now requires timebase to be always set, even for png images. -The patch sets it to 1/1, since pictures do not have a framerate. - -Patch by Thomas Kirsten (Tho_Ki gmx de) ---- - libmpcodecs/vf_screenshot.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/libmpcodecs/vf_screenshot.c b/libmpcodecs/vf_screenshot.c -index 4692d20..992ea6d 100644 ---- a/libmpcodecs/vf_screenshot.c -+++ b/libmpcodecs/vf_screenshot.c -@@ -81,6 +81,8 @@ static int config(struct vf_instance *vf, - vf->priv->avctx->pix_fmt = AV_PIX_FMT_RGB24; - vf->priv->avctx->width = d_width; - vf->priv->avctx->height = d_height; -+ vf->priv->avctx->time_base.num = 1; -+ vf->priv->avctx->time_base.den = 1; - vf->priv->avctx->compression_level = 0; - if (avcodec_open2(vf->priv->avctx, avcodec_find_encoder(AV_CODEC_ID_PNG), NULL)) { - mp_msg(MSGT_VFILTER, MSGL_FATAL, "Could not open libavcodec PNG encoder\n"); diff --git a/mplayer-fix-vo_png.patch b/mplayer-fix-vo_png.patch deleted file mode 100644 index 62b100c..0000000 --- a/mplayer-fix-vo_png.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 3e7a0f39e5acf4e9da96cb075050e51e24e81403 Mon Sep 17 00:00:00 2001 -From: rtogni -Date: Sun, 7 Aug 2016 20:44:47 +0000 -Subject: [PATCH] Fix vo_png with recent ffmpeg - -avcodec_open2() now requires timebase to be always set, even for png images. -The patch sets it to 1/1, since pictures do not have a framerate. ---- - libvo/vo_png.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/libvo/vo_png.c b/libvo/vo_png.c -index 38a4097..5696a1f 100644 ---- a/libvo/vo_png.c -+++ b/libvo/vo_png.c -@@ -136,6 +136,8 @@ config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uin - avctx->pix_fmt = imgfmt2pixfmt(format); - avctx->width = width; - avctx->height = height; -+ avctx->time_base.num = 1; -+ avctx->time_base.den = 1; - if (avcodec_open2(avctx, avcodec_find_encoder(AV_CODEC_ID_PNG), NULL) < 0) { - uninit(); - return -1; diff --git a/mplayer-snapshot.sh b/mplayer-snapshot.sh index 7273dbb..f7fc3f8 100755 --- a/mplayer-snapshot.sh +++ b/mplayer-snapshot.sh @@ -13,7 +13,7 @@ cleanup() { unset CDPATH pwd=$(pwd) svn=$(date +%Y-%m-%d) -svn=2015-05-05 +svn=2018-01-19 dirname=mplayer-export-$svn mplayer_rev={$svn} #mplayer_rev=HEAD diff --git a/mplayer.spec b/mplayer.spec index 341e90e..c34dc27 100644 --- a/mplayer.spec +++ b/mplayer.spec @@ -1,15 +1,15 @@ %define codecdir %{_libdir}/codecs -#define pre 20150505svn -#define svn 1 -#define svnbuild 2015-05-05 +%define pre 20180119svn +%define svn 1 +%define svnbuild 2018-01-19 %define faad2min 1:2.6.1 Name: mplayer Version: 1.3.0 %if 0%{?svn} -Release: 45.%{?pre}%{?dist} +Release: 46.%{?pre}%{?dist} %else -Release: 15%{?dist} +Release: 16%{?dist} %endif Summary: Movie player playing most video formats and DVDs @@ -33,15 +33,6 @@ Patch0: %{name}-config.patch Patch1: %{name}-manlinks.patch # use system FFmpeg libraries Patch3: %{name}-ffmpeg.patch -# Fix screenshot crash -# https://bugzilla.rpmfusion.org/show_bug.cgi?id=4391 -# Patch is from an upstream svn commit -Patch4: %{name}-fix-screenshot-crash.patch -# Fix vo_png with recent ffmpeg -# https://bugzilla.rpmfusion.org/show_bug.cgi?id=4470 -# Patch is from an upstream svn commit -Patch5: %{name}-fix-vo_png.patch -Patch6: %{name}-add-include_vdpau_x11.patch ExcludeArch: %{ix86} @@ -237,9 +228,6 @@ rm -rf ffmpeg %patch0 -p1 -b .config %patch1 -p1 -b .manlinks %patch3 -p1 -b .ffmpeg -%patch4 -p1 -b .screenshot -%patch5 -p1 -b .vo_png -%patch6 -p1 -b .vdpau_x11 mkdir GUI cp -a `ls -1|grep -v GUI` GUI/ @@ -395,6 +383,9 @@ update-desktop-database &>/dev/null || : %{_datadir}/mplayer/*.fp %changelog +* Fri Jan 19 2018 Leigh Scott - 1.3.0-46.20180119svn +- Update to latest svn + * Thu Jan 18 2018 Leigh Scott - 1.3.0-15 - Rebuilt for ffmpeg-3.5 git diff --git a/sources b/sources index 2e566ea..535cb24 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ de7b4438b68729089d92912f041abe54 Blue-1.11.tar.bz2 -e8a4d77ad4f509e81dd5e13b51636c1d MPlayer-1.3.0.tar.xz +72d9ed506f0273a8943d5d02d5e79a82 mplayer-export-2018-01-19.tar.bz2