On Sat, Aug 23, 2014 at 07:47:48PM +0200, Thomas Zander wrote:
> On 21 August 2014 09:52, Brad Smith <b...@comstyle.com> wrote:
> > On 14/08/14 4:42 AM, Brad Smith wrote:
> >>
> >> Here is an update to a snapshot of MPlayer from 20140814.
> >>
> >> OK?
> >
> >
> > Any MPlayer users?
>
> You might want to use an mplayer snapshot after r37257, this should
> fix an issue where PGS subtitles are not displayed due to a behavioral
> change in ffmpeg's pgs decoder.
That's all that has been commited since the previous snap so I might
as well. I take it you have some content using PGS subtitles?
Index: Makefile
===================================================================
RCS file: /home/cvs/ports/x11/mplayer/Makefile,v
retrieving revision 1.239
diff -u -p -u -p -r1.239 Makefile
--- Makefile 14 Aug 2014 08:20:27 -0000 1.239
+++ Makefile 25 Aug 2014 00:52:10 -0000
@@ -7,7 +7,7 @@ ONLY_FOR_ARCHS = ${GCC4_ARCHS}
COMMENT = movie player supporting many formats
-V = 20140412
+V = 20140824
FFMPEG_V = 20140810
SUBST_VARS += PREFIX CONFDIR
@@ -15,7 +15,6 @@ SUBST_VARS += PREFIX CONFDIR
# Distfiles must be hand-rolled, see README
N = mplayer
DISTNAME = mplayer-${V}
-REVISION = 1
EXTRACT_SUFX = .tar.xz
CATEGORIES = x11 multimedia
@@ -26,7 +25,7 @@ HOMEPAGE = http://www.mplayerhq.hu/
PERMIT_PACKAGE_CDROM = patents
PERMIT_PACKAGE_FTP = Yes
-WANTLIB = EGL GL X11 Xext Xinerama Xss Xv Xxf86dga Xxf86vm ass avcodec \
+WANTLIB = GL X11 Xext Xinerama Xss Xv Xxf86dga Xxf86vm ass avcodec \
avformat avutil bluray bz2 c cdda_interface cdda_paranoia \
crypto dv dvdnavmini dvdread enca fontconfig freetype \
fribidi jpeg m mng mp3lame ncurses png postproc pthread \
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/x11/mplayer/distinfo,v
retrieving revision 1.40
diff -u -p -u -p -r1.40 distinfo
--- distinfo 16 May 2014 01:34:50 -0000 1.40
+++ distinfo 25 Aug 2014 00:52:22 -0000
@@ -1,2 +1,2 @@
-SHA256 (mplayer-20140412.tar.xz) = 4KUrtyu7WIw+f1Ud14cAR+GaCNpS5FcgKDehHJxHn/c=
-SIZE (mplayer-20140412.tar.xz) = 5262184
+SHA256 (mplayer-20140824.tar.xz) = 45dPJ+Yy2FFI2ORJNFDt733EsdztgYUK2CIO7DaJFGg=
+SIZE (mplayer-20140824.tar.xz) = 5268352
Index: patches/patch-DOCS_man_en_mplayer_1
===================================================================
RCS file: /home/cvs/ports/x11/mplayer/patches/patch-DOCS_man_en_mplayer_1,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 patch-DOCS_man_en_mplayer_1
--- patches/patch-DOCS_man_en_mplayer_1 16 May 2014 01:34:50 -0000 1.10
+++ patches/patch-DOCS_man_en_mplayer_1 14 Aug 2014 08:32:22 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-DOCS_man_en_mplayer_1,v 1.10 2014/05/16 01:34:50 brad Exp $
---- DOCS/man/en/mplayer.1.orig Wed Feb 26 23:29:38 2014
-+++ DOCS/man/en/mplayer.1 Wed Feb 26 23:31:29 2014
+--- DOCS/man/en/mplayer.1.orig Thu Aug 14 04:26:57 2014
++++ DOCS/man/en/mplayer.1 Thu Aug 14 04:32:10 2014
@@ -1546,7 +1546,7 @@ May be negative.
.
.TP
@@ -10,7 +10,7 @@ $OpenBSD: patch-DOCS_man_en_mplayer_1,v
.
.TP
.B \-channels <number> (also see \-af channels)
-@@ -12313,11 +12313,11 @@ mplayer \-vo zr2 \-vf scale=352:288,zrmjpeg file.avi
+@@ -12315,11 +12315,11 @@ mplayer \-vo zr2 \-vf scale=352:288,zrmjpeg file.avi
.PP
.B Play DTS-CD with passthrough:
.nf
Index: patches/patch-configure
===================================================================
RCS file: /home/cvs/ports/x11/mplayer/patches/patch-configure,v
retrieving revision 1.74
diff -u -p -u -p -r1.74 patch-configure
--- patches/patch-configure 16 May 2014 01:34:50 -0000 1.74
+++ patches/patch-configure 25 Aug 2014 00:53:15 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.74 2014/05/16 01:34:50 brad Exp $
---- configure.orig Sat Apr 12 17:12:35 2014
-+++ configure Sat Apr 12 17:15:59 2014
-@@ -1505,39 +1505,39 @@ echo configuration: $configuration > "$TMPLOG"
+--- configure.orig Sun Aug 24 20:39:15 2014
++++ configure Sun Aug 24 20:52:56 2014
+@@ -1513,39 +1513,39 @@ echo configuration: $configuration > "$TMPLOG"
echo >> "$TMPLOG"
@@ -73,7 +73,7 @@ $OpenBSD: patch-configure,v 1.74 2014/05
list_subparts() {
test ! -e ffmpeg/libav${3} && return 1
pattern="s/^[^#]*${1}.*([^ ,]*, *\([^ ,)]*\).*/\1_${2}/p"
-@@ -2390,7 +2390,7 @@ case "$host_arch" in
+@@ -2400,7 +2400,7 @@ case "$host_arch" in
arch='sparc'
iproc='sparc'
if test "$host_arch" = "sparc64" ; then
@@ -82,7 +82,7 @@ $OpenBSD: patch-configure,v 1.74 2014/05
proc='ultrasparc'
def_fast_64bit='#define HAVE_FAST_64BIT 1'
elif sunos ; then
-@@ -2724,7 +2724,7 @@ cat > $TMPC << EOF
+@@ -2736,7 +2736,7 @@ cat > $TMPC << EOF
int ff_extern;
EOF
cc_check -c || die "Symbol mangling check failed."
@@ -91,7 +91,7 @@ $OpenBSD: patch-configure,v 1.74 2014/05
extern_prefix=${sym%%ff_extern*}
def_extern_asm="#define EXTERN_ASM $extern_prefix"
def_extern_prefix="#define EXTERN_PREFIX \"$extern_prefix\""
-@@ -2852,7 +2852,7 @@ elif test $relocatable = "yes" ; then
+@@ -2864,7 +2864,7 @@ elif test $relocatable = "yes" ; then
fi
echores $relocatable
@@ -100,7 +100,7 @@ $OpenBSD: patch-configure,v 1.74 2014/05
# Checking assembler (_as) compatibility...
# Added workaround for older as that reads from stdin by default - atmos
as_version=$(echo '' | $_as -version 2>&1 | sed -n 's/^.*assembler
\(version \)*\([0-9.]*\).*$/\2/p')
-@@ -6191,7 +6191,7 @@ echocheck "cdparanoia"
+@@ -6213,7 +6213,7 @@ echocheck "cdparanoia"
if test "$_cdparanoia" = auto ; then
_cdparanoia=no
for inc_tmp in "" "-I/usr/include/cdda" "-I/usr/local/include/cdda" ; do
@@ -109,7 +109,7 @@ $OpenBSD: patch-configure,v 1.74 2014/05
_cdparanoia=yes && extra_cflags="$extra_cflags $inc_tmp" && break
done
fi
-@@ -8146,6 +8146,7 @@ extra_ldflags="$extra_ldflags $libm"
+@@ -8169,6 +8169,7 @@ extra_ldflags="$extra_ldflags $libm"
# XML documentation tests
echocheck "XML catalogs"
for try_catalog in \
@@ -117,7 +117,7 @@ $OpenBSD: patch-configure,v 1.74 2014/05
/etc/sgml/catalog \
/usr/share/xml/docbook/*/catalog.xml \
/opt/local/share/xml/docbook-xml/*/catalog.xml \
-@@ -8173,6 +8174,7 @@ fi
+@@ -8196,6 +8197,7 @@ fi
echocheck "XML chunked stylesheet"
for try_chunk_xsl in \
@@ -125,7 +125,7 @@ $OpenBSD: patch-configure,v 1.74 2014/05
/usr/share/xml/docbook/*/html/chunk.xsl \
/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/html/chunk.xsl \
/usr/share/sgml/docbook/yelp/docbook/html/chunk.xsl \
-@@ -8198,6 +8200,7 @@ fi
+@@ -8221,6 +8223,7 @@ fi
echocheck "XML monolithic stylesheet"
for try_docbook_xsl in \
@@ -133,7 +133,7 @@ $OpenBSD: patch-configure,v 1.74 2014/05
/usr/share/xml/docbook/*/html/docbook.xsl \
/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/html/docbook.xsl \
/usr/share/sgml/docbook/yelp/docbook/html/docbook.xsl \
-@@ -8251,6 +8254,7 @@ EOF
+@@ -8274,6 +8277,7 @@ EOF
echocheck "XML DTD"
#FIXME: This should prefer higher version numbers, not the other way around ..
for try_dtd in \
Index: patches/patch-libmpdemux_demux_real_c
===================================================================
RCS file: patches/patch-libmpdemux_demux_real_c
diff -N patches/patch-libmpdemux_demux_real_c
--- patches/patch-libmpdemux_demux_real_c 16 May 2014 01:34:50 -0000
1.6
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,50 +0,0 @@
-$OpenBSD: patch-libmpdemux_demux_real_c,v 1.6 2014/05/16 01:34:50 brad Exp $
-
-r37202
-always select a stream to play if available.
-
---- libmpdemux/demux_real.c.orig Tue May 13 22:08:45 2014
-+++ libmpdemux/demux_real.c Tue May 13 22:10:54 2014
-@@ -1842,15 +1842,39 @@ header_end:
- // detect streams:
- if(demuxer->video->id==-1 && v_streams>0){
- // find the valid video stream:
-- if(!ds_fill_buffer(demuxer->video)){
-- mp_msg(MSGT_DEMUXER,MSGL_INFO,"RM: " MSGTR_MissingVideoStream);
-- }
-+ ds_fill_buffer(demuxer->video);
- }
- if(demuxer->audio->id==-1 && a_streams>0){
- // find the valid audio stream:
- if(!ds_fill_buffer(demuxer->audio)){
- mp_msg(MSGT_DEMUXER,MSGL_INFO,"RM: " MSGTR_MissingAudioStream);
- }
-+ }
-+ if(demuxer->video->id==-1 && v_streams>0){
-+ // try video once more in case there were too many audio packets first.
-+ demuxer->video->eof = 0;
-+ demuxer->video->fill_count = 0;
-+ if(!ds_fill_buffer(demuxer->video)){
-+ mp_msg(MSGT_DEMUXER,MSGL_INFO,"RM: " MSGTR_MissingVideoStream);
-+ }
-+ }
-+ if(demuxer->video->id==-1 && v_streams>0){
-+ // worst case just select the first
-+ int i;
-+ for (i = 0; i < MAX_V_STREAMS; i++)
-+ if (demuxer->v_streams[i]) {
-+ demuxer->video->id = i;
-+ demuxer->video->sh = demuxer->v_streams[i];
-+ }
-+ }
-+ if(demuxer->audio->id==-1 && a_streams>0){
-+ // worst case just select the first
-+ int i;
-+ for (i = 0; i < MAX_A_STREAMS; i++)
-+ if (demuxer->a_streams[i]) {
-+ demuxer->audio->id = i;
-+ demuxer->audio->sh = demuxer->a_streams[i];
-+ }
- }
-
- if(demuxer->video->sh){
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
