kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

mplayer: Update to 1.4

Browse source 
pkgsrc changes:

* Set autosync = 30 by default to fix choppy video with NetBSD's new
  audio system.
* Remove PulseAudio and legacy sound servers (nas, esd) as defaults.
  Consistent with mpv.
* Add an alsa option and enable it by default on Linux.
* Disable all codecs by default and just use ffmpeg instead.
  Allows distribution restrictions based on patents to be removed.
  Tested with a variety of common file formats.
  Consistent with other packages (e.g. FreeBSD Ports).
  While here, upgrade to ffmpeg4.

Upstream changes:

  1.4: "SubCounter" April 18, 2019

    Decoders, demuxers, streams:
    * More pixel formats are supported for VP9, RSCC, Screenpresso
    * pvr:// support for the Hauppauge HD PVR model 1212
    * Speed up detection of mpg format while streaming (limit probe to 4 MB)
    * demuxer: fall back to audio pts if all others are unavailable (#1928)
    * raw video: add support for < 8bpp RGB, support for paletted raw video,
      fix fliped raw video in non-avi containers
    * increase -lavdopts threads limit to 32
    * warn for badly interleaved files, and make -ni more aggressive
    * support GBR pixel formats for HEVC
    * FFmpeg audio decoders: g721, g732
    * FFmpeg video decoders: more Matrox mpeg2 formats (M702-3-4-5), Truemotion
      RT, Matrox Uncompressed SD/HD, BitJazz SheerVideo, YUY2 Lossless Codec
      Apple Pixlet, ScreenPressor, FM Screen Capture Codec
    * FFmpeg IFF video/image decoders: ANIM, ILBM, PBM, RGB8, RGBN

    Fixes:
    * fix more issues reported by Coverity
    * expand error checking, and fix many memleaks
    * fix -subcp enca: with external ASS subtitles (#2281)
    * fix reading of bitmap fonts
    * fix -subdelay applied inverted
    * some fixes for video filter bmovl (#2304, #2308)
    * fix timing of first and last frame (#2315)

    Other:
    * MPlayer can link against OpenSSL instead of GnuTLS for https support
      (Warning: the resulting binary can not be redistributed)
    * OSD: NV12/NV21 support
    * video output xv: NV12/NV21 support
    * video outputs for OSX: fix a few issues with newer OSX versions

    GUI:
    * No limitation on the number of entries in a font description file
    * Dramatic speedup of scanning font description files
    * Playback improvements for cue sheet playlists
    * Implementation of audio playback utilizing ReplayGain data
    * New symbol character 'g' and new dynamic label variable $g
    * Skins can leave current volume unchanged at startup
    * New configuration file: gui.gain
    * Modern new icons for the (default) menu, the file selector,
      the playlist and the message boxes
    * Rearrangement of some items of the (default) menu
    * Fix of broken evLoadAudioFile, evLoadSubtitle and evDropSubtitle
    * Skin support for 8-bit PNGs with palette
This commit is contained in:
nia 2019-06-04 13:39:38 +00:00
parent eef61a27b6
commit 98f9a30446
14 changed files with 104 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
multimedia/gmplayer/Makefile
View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.145 2019/06/02 09:48:10 tsutsui Exp $
# $NetBSD: Makefile,v 1.146 2019/06/04 13:39:38 nia Exp $
#
# NOTE: if you are updating both mplayer and gmplayer, you must ensure
# that *both* distinfo files contain the correct, up-to-date files and
@ -8,7 +8,6 @@
#
PKGNAME= gmplayer-${MPLAYER_VERSION}
PKGREVISION= 13
SKIN_SITES= http://www1.mplayerhq.hu/MPlayer/skins/ \
http://www2.mplayerhq.hu/MPlayer/skins/ \

10
multimedia/gmplayer/distinfo
View file

@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.104 2019/06/02 09:48:10 tsutsui Exp $
$NetBSD: distinfo,v 1.105 2019/06/04 13:39:38 nia Exp $
SHA1 (mplayer/Abyss-1.7.tar.bz2) = 46d122cb60496eecbc96f26a0cfe0bda883fd725
RMD160 (mplayer/Abyss-1.7.tar.bz2) = ca1e1c77177dc23300d011c1e00711c6bb81756a
@ -88,10 +88,10 @@ SHA1 (mplayer/Linea-1.0.tar.bz2) = e6cbd705e285e117fc97c231b7fe0f9abf1db656
RMD160 (mplayer/Linea-1.0.tar.bz2) = 558647aede2d009519f08191d45bbd1d50ed3ee9
SHA512 (mplayer/Linea-1.0.tar.bz2) = a55e11b6ac40e17acf54b290e2763448085e5962da992ec24bc8c3ecd9df40d5ad2965079c930ce30338d64b8a2544dc5ba7f5fcdd84c0ffd14a7e6d1a9ac3d8
Size (mplayer/Linea-1.0.tar.bz2) = 46965 bytes
SHA1 (mplayer/MPlayer-1.3.0.tar.xz) = 11db20434a4e1aabb9c52f7712241dae1b3730e3
RMD160 (mplayer/MPlayer-1.3.0.tar.xz) = b6688b186f41267ca3cec59c67afe34396c51ade
SHA512 (mplayer/MPlayer-1.3.0.tar.xz) = 10007e471a941f8a3dabf6149e6e44fc1a364a9ccb5cd08c670fc22560e5053a15f3249e9d3e18cdda06b6b7e77e537026b5d33dc356e928c63747d6ed73dbae
Size (mplayer/MPlayer-1.3.0.tar.xz) = 13278984 bytes
SHA1 (mplayer/MPlayer-1.4.tar.xz) = 0954a7141de7c945d90db234e39a78c27cf73f78
RMD160 (mplayer/MPlayer-1.4.tar.xz) = 7f94e3e3f127491f70a93a8699a1192c0771e20b
SHA512 (mplayer/MPlayer-1.4.tar.xz) = 8ef71cad187d8c8f81c837279bd3a421b440c892d3347a667670b21c954007e35cf0d15828f0901f347b9c1b053e8da4bc7f0fb6de34382d1e463074923d7b34
Size (mplayer/MPlayer-1.4.tar.xz) = 15054920 bytes
SHA1 (mplayer/MidnightLove-1.7.tar.bz2) = 8df9f2b504e6f5af5e3d23b8c9c4131b74f253e9
RMD160 (mplayer/MidnightLove-1.7.tar.bz2) = eb9371bb5019c938d3429dabb901afdde143c8a6
SHA512 (mplayer/MidnightLove-1.7.tar.bz2) = 1ff7a7dbcc920c2f65d3a2ad0c555e5742e1deb86d1cc1a65fd55390161fc06e6e074105c797c896b808993ddf32fea5e01769cae831a597c1f5fe4e5539cc9e

3
multimedia/mencoder/Makefile
View file

@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.71 2019/06/02 09:48:10 tsutsui Exp $
# $NetBSD: Makefile,v 1.72 2019/06/04 13:39:38 nia Exp $
PKGNAME= mencoder-${MPLAYER_VERSION}
PKGREVISION= 4
COMMENT= Simple movie encoder for MPlayer-playable movies

3
multimedia/mplayer-share/Makefile
View file

@ -1,6 +1,5 @@
# $NetBSD: Makefile,v 1.63 2019/06/02 09:48:11 tsutsui Exp $
# $NetBSD: Makefile,v 1.64 2019/06/04 13:39:38 nia Exp $
PKGREVISION= 15
.include "Makefile.common"
PKGNAME= mplayer-share-${MPLAYER_VERSION}

12
multimedia/mplayer-share/Makefile.common
View file

@ -1,9 +1,9 @@
# $NetBSD: Makefile.common,v 1.61 2018/05/27 15:27:13 tsutsui Exp $
# $NetBSD: Makefile.common,v 1.62 2019/06/04 13:39:38 nia Exp $
# used by multimedia/gmplayer/Makefile
# used by multimedia/mencoder/Makefile
# used by multimedia/mplayer/Makefile
MPLAYER_VERSION= 1.3.0
MPLAYER_VERSION= 1.4
DISTNAME= MPlayer-${MPLAYER_VERSION}
@ -16,6 +16,7 @@ DIST_SUBDIR= mplayer
MAINTAINER?= pkgsrc-users@NetBSD.org
HOMEPAGE?= http://www.mplayerhq.hu/
LICENSE?= gnu-gpl-v2
#
# NOTE: gmplayer has its own distinfo file. if you are also updating
@ -28,11 +29,6 @@ HOMEPAGE?= http://www.mplayerhq.hu/
PATCHDIR= ${.CURDIR}/../../multimedia/mplayer-share/patches
DISTINFO_FILE= ${.CURDIR}/../../multimedia/mplayer-share/distinfo
RESTRICTED= Prohibited by USAs DMCA and patent law
NO_BIN_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_FTP= ${RESTRICTED}
NO_SRC_ON_FTP= ${RESTRICTED}
USE_TOOLS+= gmake
HAS_CONFIGURE= YES
@ -68,4 +64,6 @@ CONFIGURE_ARGS+= --enable-big-endian
CONFIGURE_ARGS+= --disable-armv5te --disable-armv6 --disable-armv6t2
.endif
CHECK_PORTABILITY_SKIP+= ffmpeg/configure
.include "../../multimedia/mplayer-share/options.mk"

4
multimedia/mplayer-share/Makefile.depends
View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile.depends,v 1.22 2018/05/27 15:27:13 tsutsui Exp $
# $NetBSD: Makefile.depends,v 1.23 2019/06/04 13:39:38 nia Exp $
#
DEPENDS+= mplayer-share>=${MPLAYER_VERSION}:../../multimedia/mplayer-share
@ -6,6 +6,6 @@ DEPENDS+= mplayer-share>=${MPLAYER_VERSION}:../../multimedia/mplayer-share
.include "../../converters/libiconv/buildlink3.mk"
.include "../../fonts/fontconfig/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../multimedia/ffmpeg3/buildlink3.mk"
.include "../../multimedia/ffmpeg4/buildlink3.mk"
.include "../../multimedia/libass/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"

3
multimedia/mplayer-share/PLIST
View file

@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.13 2012/06/11 13:41:12 wiz Exp $
@comment $NetBSD: PLIST,v 1.14 2019/06/04 13:39:38 nia Exp $
man/man1/mplayer.1
share/mplayer/DOCS/HTML/cs/aalib.html
share/mplayer/DOCS/HTML/cs/advaudio.html
@ -880,6 +880,7 @@ share/mplayer/DOCS/tech/realcodecs/audio-codecs.txt
share/mplayer/DOCS/tech/realcodecs/streaming.txt
share/mplayer/DOCS/tech/realcodecs/video-codecs.txt
share/mplayer/DOCS/tech/release-howto.txt
share/mplayer/DOCS/tech/release-svn.txt
share/mplayer/DOCS/tech/release.sh
share/mplayer/DOCS/tech/slave.txt
share/mplayer/DOCS/tech/snow.txt

14
multimedia/mplayer-share/distinfo
View file

@ -1,19 +1,21 @@
$NetBSD: distinfo,v 1.97 2019/06/02 09:48:11 tsutsui Exp $
$NetBSD: distinfo,v 1.98 2019/06/04 13:39:38 nia Exp $
SHA1 (mplayer/MPlayer-1.3.0.tar.xz) = 11db20434a4e1aabb9c52f7712241dae1b3730e3
RMD160 (mplayer/MPlayer-1.3.0.tar.xz) = b6688b186f41267ca3cec59c67afe34396c51ade
SHA512 (mplayer/MPlayer-1.3.0.tar.xz) = 10007e471a941f8a3dabf6149e6e44fc1a364a9ccb5cd08c670fc22560e5053a15f3249e9d3e18cdda06b6b7e77e537026b5d33dc356e928c63747d6ed73dbae
Size (mplayer/MPlayer-1.3.0.tar.xz) = 13278984 bytes
SHA1 (mplayer/MPlayer-1.4.tar.xz) = 0954a7141de7c945d90db234e39a78c27cf73f78
RMD160 (mplayer/MPlayer-1.4.tar.xz) = 7f94e3e3f127491f70a93a8699a1192c0771e20b
SHA512 (mplayer/MPlayer-1.4.tar.xz) = 8ef71cad187d8c8f81c837279bd3a421b440c892d3347a667670b21c954007e35cf0d15828f0901f347b9c1b053e8da4bc7f0fb6de34382d1e463074923d7b34
Size (mplayer/MPlayer-1.4.tar.xz) = 15054920 bytes
SHA1 (patch-Makefile) = be30a8e90383d6af5902380587b5075fd9c73b83
SHA1 (patch-ae) = 286f5ac075ea4123a1a6276f97e02a4dda9b3e67
SHA1 (patch-an) = 330c427e30b686165fda15a85b730a3f53e0d217
SHA1 (patch-configure) = 1bba1d39be27c31f2345c8303f252404538c192f
SHA1 (patch-gui_interface.c) = 04c347b6cb0a54132e6b089142c8ed282f583a1c
SHA1 (patch-libao2_ao__alsa.c) = da568da8b9290f1ed49ecedec7dc9141408698b1
SHA1 (patch-libao2_ao_sun.c) = ce7042b394b9b8c051597c734b70290c8bf0a8d5
SHA1 (patch-libmpcodecs_vf__screenshot.c) = a99f81ae7fb3da72e623b0169124e4aa2e20ce37
SHA1 (patch-libvo_vo__corevideo.h) = c29a24266edb6727dda68a378fac413b5b0ab7ec
SHA1 (patch-libvo_vo__gif89a.c) = f7ee649bebef4b7f3fd4659613f61667109ee825
SHA1 (patch-libvo_vo__vdpau.c) = df3de0e079f7047228065bf36390aa3ad01b7f97
SHA1 (patch-mplayer.c) = 8cfdca9d062d4a10320a0471c91dd7c264aa963c
SHA1 (patch-stream_ai__alsa.c) = 1ed116931f4fde910c9bbe23680463a71631185c
SHA1 (patch-stream_dvb_tune.c) = 46cb5fb4700d7da5ed997dd468033c1edbe9be03
SHA1 (patch-stream_dvbin.h) = ee4f74eb786100e7cc62be228d73ce29d88638d1
SHA1 (patch-stream_stream__dvdnav.c) = 6f7e54629b32c83de8e4b31fe414b78f6043e0e8

21
multimedia/mplayer-share/options.mk
View file

@ -1,4 +1,4 @@
# $NetBSD: options.mk,v 1.62 2019/03/25 22:55:14 rhialto Exp $
# $NetBSD: options.mk,v 1.63 2019/06/04 13:39:38 nia Exp $
.if defined(PKGNAME) && empty(PKGNAME:Mmplayer-share*)
@ -30,11 +30,10 @@ PKG_SUPPORTED_OPTIONS+= oss
.endif
PKG_SUPPORTED_OPTIONS+= faad
PKG_SUGGESTED_OPTIONS+= faad
# Set options based on the specific package being built.
.if !empty(PKGNAME:M*mplayer*)
PKG_SUPPORTED_OPTIONS+= aalib caca esound ggi mplayer-menu nas pulseaudio sdl
PKG_SUPPORTED_OPTIONS+= aalib alsa caca esound ggi mplayer-menu nas pulseaudio sdl
.if ${VDPAU_AVAILABLE} == "yes"
PKG_SUPPORTED_OPTIONS+= vdpau
@ -81,16 +80,15 @@ PKG_SUPPORTED_OPTIONS+= xvid
# Define PKG_SUGGESTED_OPTIONS.
# -------------------------------------------------------------------------
.for o in cdparanoia dv esound gif jpeg \
dvdread dvdnav \
lame libmpg123 mad mplayer-menu \
.for o in dvdread dvdnav gif jpeg \
mplayer-menu \
mplayer-default-cflags mplayer-runtime-cpudetection \
nas oss pulseaudio png sdl theora vorbis x264 xvid vdpau lirc
oss png sdl vdpau lirc
. if !empty(PKG_SUPPORTED_OPTIONS:M${o})
PKG_SUGGESTED_OPTIONS+= ${o}
. endif
.endfor
PKG_SUGGESTED_OPTIONS.Linux+= vidix
PKG_SUGGESTED_OPTIONS.Linux+= alsa vidix
# -------------------------------------------------------------------------
# Handle extra libraries (part 1)
@ -110,6 +108,13 @@ CONFIGURE_ARGS+= --enable-aa
CONFIGURE_ARGS+= --disable-aa
.endif
.if !empty(PKG_OPTIONS:Malsa)
CONFIGURE_ARGS+= --enable-alsa
. include "../../audio/alsa-lib/buildlink3.mk"
.else
CONFIGURE_ARGS+= --disable-alsa
.endif
.if !empty(PKG_OPTIONS:Mcaca)
CONFIGURE_ARGS+= --enable-caca
. include "../../graphics/libcaca/buildlink3.mk"

27
multimedia/mplayer-share/patches/patch-libao2_ao__alsa.c Normal file
View file

@ -0,0 +1,27 @@
$NetBSD: patch-libao2_ao__alsa.c,v 1.1 2019/06/04 13:39:38 nia Exp $
Make this build on NetBSD.
--- libao2/ao_alsa.c.orig 2014-05-06 19:02:03.000000000 +0000
+++ libao2/ao_alsa.c
@@ -33,7 +33,9 @@
#include <ctype.h>
#include <math.h>
#include <string.h>
+#if defined(__linux__) || defined (__sun)
#include <alloca.h>
+#endif
#define ALSA_PCM_NEW_HW_PARAMS_API
#define ALSA_PCM_NEW_SW_PARAMS_API
#include <alsa/asoundlib.h>
@@ -47,6 +49,10 @@
#include "audio_out_internal.h"
#include "libaf/af_format.h"
+#ifndef ESTRPIPE
+#define ESTRPIPE EPIPE
+#endif
+
static const ao_info_t info =
{
"ALSA-0.9.x-1.x audio output",

16
multimedia/mplayer-share/patches/patch-libmpcodecs_vf__screenshot.c
View file

@ -1,16 +0,0 @@
$NetBSD: patch-libmpcodecs_vf__screenshot.c,v 1.1 2018/04/04 11:02:07 triaxx Exp $
Fix crash with screenshot filter.
From upstream r37875.
--- libmpcodecs/vf_screenshot.c.orig 2016-02-14 20:36:28.000000000 +0000
+++ 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");

22
multimedia/mplayer-share/patches/patch-mplayer.c Normal file
View file

@ -0,0 +1,22 @@
$NetBSD: patch-mplayer.c,v 1.1 2019/06/04 13:39:38 nia Exp $
NetBSD implements no "perfect audio delay measurement"
(suggested to be required by mplayer's man page).
This allows video to be played at full speed without perfect
audio delay measurement.
--- mplayer.c.orig 2018-06-10 15:53:58.000000000 +0000
+++ mplayer.c
@@ -213,7 +213,11 @@ static int loop_seek;
static m_time_size_t end_at = { .type = END_AT_NONE, .pos = 0 };
// A/V sync:
+#ifdef __NetBSD__
+int autosync = 30;
+#else
int autosync; // 30 might be a good default value.
+#endif
// may be changed by GUI: (FIXME!)
float rel_seek_secs;

16
multimedia/mplayer-share/patches/patch-stream_ai__alsa.c Normal file
View file

@ -0,0 +1,16 @@
$NetBSD: patch-stream_ai__alsa.c,v 1.1 2019/06/04 13:39:38 nia Exp $
Make this build on NetBSD.
--- stream/ai_alsa.c.orig 2011-11-14 09:58:24.000000000 +0000
+++ stream/ai_alsa.c
@@ -19,7 +19,9 @@
#include <stdio.h>
#include <stdlib.h>
#include <sys/time.h>
+#if defined(__linux__) || defined(__sun)
#include <alloca.h>
+#endif
#define ALSA_PCM_NEW_HW_PARAMS_API
#define ALSA_PCM_NEW_SW_PARAMS_API
#include <alsa/asoundlib.h>

3
multimedia/mplayer/Makefile
View file

@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.104 2019/06/02 09:48:10 tsutsui Exp $
# $NetBSD: Makefile,v 1.105 2019/06/04 13:39:38 nia Exp $
PKGNAME= mplayer-${MPLAYER_VERSION}
PKGREVISION= 4
COMMENT= Fast, cross-platform movie player