cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to mplayer-20190330.

Browse Source 
from Brad (maintainer)
This commit is contained in:
ajacoutot 2019-03-30 17:17:54 +00:00
parent 2b960f1856
commit c5be287d35
12 changed files with 58 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
x11/mplayer/Makefile
View File

@ -1,11 +1,10 @@
# $OpenBSD: Makefile,v 1.296 2019/03/24 09:03:35 ajacoutot Exp $ # $OpenBSD: Makefile,v 1.297 2019/03/30 17:17:54 ajacoutot Exp $
COMMENT= movie player supporting many formats COMMENT= movie player supporting many formats
V= 20180916 V= 20190330
FFMPEG_V= 4.1.2 FFMPEG_V= 4.1.2
DISTNAME= mplayer-${V} DISTNAME= mplayer-${V}
REVISION= 3
CATEGORIES= x11 multimedia CATEGORIES= x11 multimedia
MASTER_SITES= https://comstyle.com/source/ MASTER_SITES= https://comstyle.com/source/
EXTRACT_SUFX= .tar.xz EXTRACT_SUFX= .tar.xz

4
x11/mplayer/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (mplayer-20180916.tar.xz) = 3TwfU0oWYoGK0QllpTNZR1GQmnCy8vgzxV5OZiRS9wE= SHA256 (mplayer-20190330.tar.xz) = GLiXDzUVOT08jkEyjS8Su4TMtbMQAzAHDv1mxHHoUOU=
SIZE (mplayer-20180916.tar.xz) = 5175908 SIZE (mplayer-20190330.tar.xz) = 5162516

3
x11/mplayer/patches/patch-DOCS_man_en_mplayer_1
View File

@ -1,4 +1,5 @@
$OpenBSD: patch-DOCS_man_en_mplayer_1,v 1.17 2018/09/22 07:06:05 ajacoutot Exp $ $OpenBSD: patch-DOCS_man_en_mplayer_1,v 1.18 2019/03/30 17:17:54 ajacoutot Exp $
Index: DOCS/man/en/mplayer.1 Index: DOCS/man/en/mplayer.1
--- DOCS/man/en/mplayer.1.orig --- DOCS/man/en/mplayer.1.orig
+++ DOCS/man/en/mplayer.1 +++ DOCS/man/en/mplayer.1

8
x11/mplayer/patches/patch-DOCS_xml_en_usage_xml
View File

@ -1,6 +1,8 @@
$OpenBSD: patch-DOCS_xml_en_usage_xml,v 1.1 2010/11/08 21:25:44 edd Exp $ $OpenBSD: patch-DOCS_xml_en_usage_xml,v 1.2 2019/03/30 17:17:54 ajacoutot Exp $
--- DOCS/xml/en/usage.xml.orig Tue Oct 26 12:49:00 2010
+++ DOCS/xml/en/usage.xml Tue Oct 26 12:50:35 2010 Index: DOCS/xml/en/usage.xml
--- DOCS/xml/en/usage.xml.orig
+++ DOCS/xml/en/usage.xml
@@ -452,7 +452,7 @@ syntax is the same, except that you need to use dvdnav @@ -452,7 +452,7 @@ syntax is the same, except that you need to use dvdnav
</para> </para>

3
x11/mplayer/patches/patch-Makefile
View File

@ -1,4 +1,5 @@
$OpenBSD: patch-Makefile,v 1.31 2018/09/22 07:06:05 ajacoutot Exp $ $OpenBSD: patch-Makefile,v 1.32 2019/03/30 17:17:54 ajacoutot Exp $
Index: Makefile Index: Makefile
--- Makefile.orig --- Makefile.orig
+++ Makefile +++ Makefile

29
x11/mplayer/patches/patch-configure
View File

@ -1,8 +1,9 @@
$OpenBSD: patch-configure,v 1.84 2019/02/25 22:42:19 sthen Exp $ $OpenBSD: patch-configure,v 1.85 2019/03/30 17:17:54 ajacoutot Exp $
Index: configure Index: configure
--- configure.orig --- configure.orig
+++ configure +++ configure
@@ -1497,39 +1497,39 @@ echo configuration: $configuration > "$TMPLOG" @@ -1498,39 +1498,39 @@ echo configuration: $configuration > "$TMPLOG"
echo >> "$TMPLOG" echo >> "$TMPLOG"
@ -74,7 +75,7 @@ Index: configure
list_subparts() { list_subparts() {
test ! -e ffmpeg/libav${3} && return 1 test ! -e ffmpeg/libav${3} && return 1
pattern="s/^[^#]*${1}.*([^ ,]*, *\([^ ,)]*\).*/\1_${2}/p" pattern="s/^[^#]*${1}.*([^ ,]*, *\([^ ,)]*\).*/\1_${2}/p"
@@ -2431,7 +2431,7 @@ case "$host_arch" in @@ -2432,7 +2432,7 @@ case "$host_arch" in
arch='sparc' arch='sparc'
iproc='sparc' iproc='sparc'
if test "$host_arch" = "sparc64" ; then if test "$host_arch" = "sparc64" ; then
@ -83,7 +84,7 @@ Index: configure
proc='ultrasparc' proc='ultrasparc'
def_fast_64bit='#define HAVE_FAST_64BIT 1' def_fast_64bit='#define HAVE_FAST_64BIT 1'
elif sunos ; then elif sunos ; then
@@ -2800,7 +2800,7 @@ cat > $TMPC << EOF @@ -2801,7 +2801,7 @@ cat > $TMPC << EOF
int ff_extern; int ff_extern;
EOF EOF
cc_check -c || die "Symbol mangling check failed." cc_check -c || die "Symbol mangling check failed."
@ -92,7 +93,7 @@ Index: configure
extern_prefix=${sym%%ff_extern*} extern_prefix=${sym%%ff_extern*}
def_extern_asm="#define EXTERN_ASM $extern_prefix" def_extern_asm="#define EXTERN_ASM $extern_prefix"
def_extern_prefix="#define EXTERN_PREFIX \"$extern_prefix\"" def_extern_prefix="#define EXTERN_PREFIX \"$extern_prefix\""
@@ -2860,7 +2860,7 @@ else @@ -2861,7 +2861,7 @@ else
fi fi
CFLAGS="-D_ISOC99_SOURCE -I. -Iffmpeg $CFLAGS" CFLAGS="-D_ISOC99_SOURCE -I. -Iffmpeg $CFLAGS"
@ -101,7 +102,7 @@ Index: configure
# On glibc, add some more CPPFLAGS for enabling required functionality. # On glibc, add some more CPPFLAGS for enabling required functionality.
cpp_condition_check features.h "defined __GLIBC__" && cpp_condition_check features.h "defined __GLIBC__" &&
@@ -2941,7 +2941,7 @@ elif test $relocatable = "yes" ; then @@ -2942,7 +2942,7 @@ elif test $relocatable = "yes" ; then
fi fi
echores $relocatable echores $relocatable
@ -110,7 +111,7 @@ Index: configure
# Checking assembler (_as) compatibility... # Checking assembler (_as) compatibility...
# Added workaround for older as that reads from stdin by default - atmos # 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') as_version=$(echo '' | $_as -version 2>&1 | sed -n 's/^.*assembler \(version \)*\([0-9.]*\).*$/\2/p')
@@ -4310,8 +4310,8 @@ echores "$gettimeofday" @@ -4331,8 +4331,8 @@ echores "$gettimeofday"
echocheck "clock_gettime()" echocheck "clock_gettime()"
clock_gettime=no clock_gettime=no
def_clock_gettime='#undef HAVE_CLOCK_GETTIME' def_clock_gettime='#undef HAVE_CLOCK_GETTIME'
@ -121,7 +122,7 @@ Index: configure
echores "$clock_gettime" echores "$clock_gettime"
@@ -6322,7 +6322,7 @@ echocheck "cdparanoia" @@ -6343,7 +6343,7 @@ echocheck "cdparanoia"
if test "$_cdparanoia" = auto ; then if test "$_cdparanoia" = auto ; then
_cdparanoia=no _cdparanoia=no
for inc_tmp in "" "-I/usr/include/cdda" "-I/usr/local/include/cdda" ; do for inc_tmp in "" "-I/usr/include/cdda" "-I/usr/local/include/cdda" ; do
@ -130,7 +131,7 @@ Index: configure
_cdparanoia=yes && extra_cflags="$extra_cflags $inc_tmp" && break _cdparanoia=yes && extra_cflags="$extra_cflags $inc_tmp" && break
done done
fi fi
@@ -8162,6 +8162,7 @@ extra_ldflags="$extra_ldflags $libm" @@ -8183,6 +8183,7 @@ extra_ldflags="$extra_ldflags $libm"
# XML documentation tests # XML documentation tests
echocheck "XML catalogs" echocheck "XML catalogs"
for try_catalog in \ for try_catalog in \
@ -138,7 +139,7 @@ Index: configure
/etc/sgml/catalog \ /etc/sgml/catalog \
/usr/share/xml/docbook/*/catalog.xml \ /usr/share/xml/docbook/*/catalog.xml \
/opt/local/share/xml/docbook-xml/*/catalog.xml \ /opt/local/share/xml/docbook-xml/*/catalog.xml \
@@ -8189,6 +8190,7 @@ fi @@ -8210,6 +8211,7 @@ fi
echocheck "XML chunked stylesheet" echocheck "XML chunked stylesheet"
for try_chunk_xsl in \ for try_chunk_xsl in \
@ -146,7 +147,7 @@ Index: configure
/usr/share/xml/docbook/*/html/chunk.xsl \ /usr/share/xml/docbook/*/html/chunk.xsl \
/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/html/chunk.xsl \ /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/html/chunk.xsl \
/usr/share/sgml/docbook/yelp/docbook/html/chunk.xsl \ /usr/share/sgml/docbook/yelp/docbook/html/chunk.xsl \
@@ -8214,6 +8216,7 @@ fi @@ -8235,6 +8237,7 @@ fi
echocheck "XML monolithic stylesheet" echocheck "XML monolithic stylesheet"
for try_docbook_xsl in \ for try_docbook_xsl in \
@ -154,7 +155,7 @@ Index: configure
/usr/share/xml/docbook/*/html/docbook.xsl \ /usr/share/xml/docbook/*/html/docbook.xsl \
/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/html/docbook.xsl \ /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/html/docbook.xsl \
/usr/share/sgml/docbook/yelp/docbook/html/docbook.xsl \ /usr/share/sgml/docbook/yelp/docbook/html/docbook.xsl \
@@ -8267,6 +8270,7 @@ EOF @@ -8288,6 +8291,7 @@ EOF
echocheck "XML DTD" echocheck "XML DTD"
#FIXME: This should prefer higher version numbers, not the other way around .. #FIXME: This should prefer higher version numbers, not the other way around ..
for try_dtd in \ for try_dtd in \
@ -162,7 +163,7 @@ Index: configure
/usr/share/xml/docbook/*/dtd/4*/docbookx.dtd \ /usr/share/xml/docbook/*/dtd/4*/docbookx.dtd \
/usr/share/xml/docbook/*/docbookx.dtd \ /usr/share/xml/docbook/*/docbookx.dtd \
/usr/share/sgml/docbook/*/docbookx.dtd \ /usr/share/sgml/docbook/*/docbookx.dtd \
@@ -9414,9 +9418,6 @@ cmp -s "$TMPH" config.h || mv -f "$TMPH" config.h @@ -9442,9 +9446,6 @@ cmp -s "$TMPH" config.h || mv -f "$TMPH" config.h
############################################################################ ############################################################################
@ -172,7 +173,7 @@ Index: configure
# Create avconfig.h for FFmpeg. # Create avconfig.h for FFmpeg.
cat > "$TMPH" << EOF cat > "$TMPH" << EOF
/* Generated by mpconfigure */ /* Generated by mpconfigure */
@@ -9508,8 +9509,6 @@ print_enabled_components libavformat/demuxer_list.c AV @@ -9536,8 +9537,6 @@ print_enabled_components libavformat/demuxer_list.c AV
print_enabled_components libavformat/muxer_list.c AVOutputFormat muxer_list $libavmuxers print_enabled_components libavformat/muxer_list.c AVOutputFormat muxer_list $libavmuxers
print_enabled_components libavformat/protocol_list.c URLProtocol url_protocols $libavprotocols print_enabled_components libavformat/protocol_list.c URLProtocol url_protocols $libavprotocols
print_enabled_filters libavfilter/filter_list.c AVFilter filter_list $libavfilters print_enabled_filters libavfilter/filter_list.c AVFilter filter_list $libavfilters

8
x11/mplayer/patches/patch-libao2_audio_out_c
View File

@ -1,6 +1,8 @@
$OpenBSD: patch-libao2_audio_out_c,v 1.6 2014/01/10 21:52:29 brad Exp $ $OpenBSD: patch-libao2_audio_out_c,v 1.7 2019/03/30 17:17:54 ajacoutot Exp $
--- libao2/audio_out.c.orig Mon Jan 6 17:02:58 2014
+++ libao2/audio_out.c Mon Jan 6 17:27:38 2014 Index: libao2/audio_out.c
--- libao2/audio_out.c.orig
+++ libao2/audio_out.c
@@ -55,6 +55,7 @@ extern const ao_functions_t audio_out_v4l2; @@ -55,6 +55,7 @@ extern const ao_functions_t audio_out_v4l2;
extern const ao_functions_t audio_out_mpegpes; extern const ao_functions_t audio_out_mpegpes;
extern const ao_functions_t audio_out_pcm; extern const ao_functions_t audio_out_pcm;

8
x11/mplayer/patches/patch-libmpcodecs_vf_noise_c
View File

@ -1,6 +1,8 @@
$OpenBSD: patch-libmpcodecs_vf_noise_c,v 1.1 2015/12/21 01:08:17 sthen Exp $ $OpenBSD: patch-libmpcodecs_vf_noise_c,v 1.2 2019/03/30 17:17:54 ajacoutot Exp $
--- libmpcodecs/vf_noise.c.orig Mon Dec 21 00:38:47 2015
+++ libmpcodecs/vf_noise.c Mon Dec 21 00:39:11 2015 Index: libmpcodecs/vf_noise.c
--- libmpcodecs/vf_noise.c.orig
+++ libmpcodecs/vf_noise.c
@@ -85,7 +85,7 @@ static int8_t *initNoise(FilterParam *fp){ @@ -85,7 +85,7 @@ static int8_t *initNoise(FilterParam *fp){
int8_t *noise= av_malloc(MAX_NOISE*sizeof(int8_t)); int8_t *noise= av_malloc(MAX_NOISE*sizeof(int8_t));
int i, j; int i, j;

8
x11/mplayer/patches/patch-stream_audio_in_c
View File

@ -1,6 +1,8 @@
$OpenBSD: patch-stream_audio_in_c,v 1.2 2010/05/26 21:29:56 jakemsr Exp $ $OpenBSD: patch-stream_audio_in_c,v 1.3 2019/03/30 17:17:54 ajacoutot Exp $
--- stream/audio_in.c.orig Sat Jan 30 22:26:47 2010
+++ stream/audio_in.c Mon Mar 8 14:28:42 2010 Index: stream/audio_in.c
--- stream/audio_in.c.orig
+++ stream/audio_in.c
@@ -54,6 +54,12 @@ int audio_in_init(audio_in_t *ai, int type) @@ -54,6 +54,12 @@ int audio_in_init(audio_in_t *ai, int type)
ai->oss.device = strdup("/dev/dsp"); ai->oss.device = strdup("/dev/dsp");
return 0; return 0;

8
x11/mplayer/patches/patch-stream_audio_in_h
View File

@ -1,6 +1,8 @@
$OpenBSD: patch-stream_audio_in_h,v 1.2 2010/05/26 21:29:56 jakemsr Exp $ $OpenBSD: patch-stream_audio_in_h,v 1.3 2019/03/30 17:17:54 ajacoutot Exp $
--- stream/audio_in.h.orig Sat Jan 30 22:26:47 2010
+++ stream/audio_in.h Mon Mar 8 14:28:42 2010 Index: stream/audio_in.h
--- stream/audio_in.h.orig
+++ stream/audio_in.h
@@ -21,6 +21,7 @@ @@ -21,6 +21,7 @@
#define AUDIO_IN_ALSA 1 #define AUDIO_IN_ALSA 1

8
x11/mplayer/patches/patch-stream_stream_cdda_c
View File

@ -1,6 +1,8 @@
$OpenBSD: patch-stream_stream_cdda_c,v 1.3 2015/09/10 08:31:36 ajacoutot Exp $ $OpenBSD: patch-stream_stream_cdda_c,v 1.4 2019/03/30 17:17:54 ajacoutot Exp $
--- stream/stream_cdda.c.orig Thu Sep 10 03:13:55 2015
+++ stream/stream_cdda.c Thu Sep 10 03:18:41 2015 Index: stream/stream_cdda.c
--- stream/stream_cdda.c.orig
+++ stream/stream_cdda.c
@@ -451,9 +451,11 @@ static int open_cdda(stream_t *st,int m, void* opts, i @@ -451,9 +451,11 @@ static int open_cdda(stream_t *st,int m, void* opts, i
else if(p->search_overlap == 0) else if(p->search_overlap == 0)
mode &= ~PARANOIA_MODE_OVERLAP; mode &= ~PARANOIA_MODE_OVERLAP;

8
x11/mplayer/patches/patch-stream_tvi_bsdbt848_c
View File

@ -1,6 +1,8 @@
$OpenBSD: patch-stream_tvi_bsdbt848_c,v 1.6 2016/03/14 19:50:13 ajacoutot Exp $ $OpenBSD: patch-stream_tvi_bsdbt848_c,v 1.7 2019/03/30 17:17:54 ajacoutot Exp $
--- stream/tvi_bsdbt848.c.orig Sun Mar 6 20:23:31 2016
+++ stream/tvi_bsdbt848.c Sun Mar 6 20:29:00 2016 Index: stream/tvi_bsdbt848.c
--- stream/tvi_bsdbt848.c.orig
+++ stream/tvi_bsdbt848.c
@@ -53,9 +53,10 @@ @@ -53,9 +53,10 @@
#include <signal.h> #include <signal.h>
#include <string.h> #include <string.h>