<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/148b86477fdf8d76aabce1427c9dfd66e3c268d3">https://github.com/macports/macports-ports/commit/148b86477fdf8d76aabce1427c9dfd66e3c268d3</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 148b864 mplayer-devel: update to latest upstream commit
</span>148b864 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 148b86477fdf8d76aabce1427c9dfd66e3c268d3
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Wed Feb 13 06:11:03 2019 -0700
<span style='display:block; white-space:pre;color:#404040;'> mplayer-devel: update to latest upstream commit
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Latest upstream commit fixes a problem with FFmpeg and x264.
</span><span style='display:block; white-space:pre;color:#404040;'> See https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/2a111c99a60fdf4fe5eea2b073901630190c6c93
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The issue has arisen with MPlayer (see https://trac.macports.org/ticket/58055).
</span>---
multimedia/mplayer-devel/Portfile | 6 +++---
multimedia/mplayer-devel/files/configure.vorbis.patch | 2 +-
multimedia/mplayer-devel/files/configure.x11.patch | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/mplayer-devel/Portfile b/multimedia/mplayer-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5c601bf..3dba1d7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/mplayer-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/mplayer-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,8 +4,8 @@ PortSystem 1.0
</span> PortGroup compiler_blacklist_versions 1.0
name mplayer-devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 37869
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 38122
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories multimedia
license GPL-2+
maintainers {jeremyhu @jeremyhu} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,7 +13,7 @@ platforms darwin
</span>
set dvdnav_ver 1294
set ffmpeg_branch master
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set ffmpeg_ver 81c3ce0855f144c89800b824db3e4e0dcdad9016
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set ffmpeg_ver 19565c6026016ee95a957ec95af0669103224ab5
</span>
description The MPlayer movie player built from SVN.
long_description ${description} It plays most MPEG/VOB, AVI, Ogg/OGM, \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/mplayer-devel/files/configure.vorbis.patch b/multimedia/mplayer-devel/files/configure.vorbis.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 49b72ce..7a2d6d2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/mplayer-devel/files/configure.vorbis.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/mplayer-devel/files/configure.vorbis.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- configure.orig 2013-04-01 00:55:08.000000000 -0700
+++ configure 2013-04-01 01:08:51.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6415,6 +6415,9 @@ if test "$_tremor" = auto; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6694,6 +6694,9 @@ if test "$_tremor" = auto; then
</span> _tremor=no
statement_check tremor/ivorbiscodec.h 'vorbis_synthesis(0, 0)' -logg -lvorbisidec && _tremor=yes && _libvorbis=no
fi
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/mplayer-devel/files/configure.x11.patch b/multimedia/mplayer-devel/files/configure.x11.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index b8adf9f..cbed51e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/mplayer-devel/files/configure.x11.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/mplayer-devel/files/configure.x11.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- configure.orig 2011-06-23 11:42:26.000000000 -0700
+++ configure 2011-06-23 13:34:17.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4297,6 +4297,9 @@ echores "$_x11_headers"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4715,6 +4715,9 @@ echores "$_x11_headers"
</span>
echocheck "X11"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,7 +10,7 @@
</span> if test "$_x11" = auto && test "$_x11_headers" = yes ; then
for I in "" -L/usr/X11R7/lib -L/usr/local/lib -L/usr/X11R6/lib -L/usr/lib/X11R6 \
-L/usr/X11/lib -L/usr/lib32 -L/usr/openwin/lib -L/usr/local/lib64 -L/usr/X11R6/lib64 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6777,6 +6780,7 @@ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7116,6 +7119,7 @@ fi
</span> if test "$_qtx" = yes ; then
def_qtx='#define CONFIG_QTX_CODECS 1'
win32 && _qtx_codecs_win32=yes && def_qtx_win32='#define CONFIG_QTX_CODECS_WIN32 1'
</pre><pre style='margin:0'>
</pre>