From owner-dev-commits-ports-main@freebsd.org Sun Jul 4 21:42:49 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 87D4C64CB6E; Sun, 4 Jul 2021 21:42:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GJ2Nn3FKHz4fyW; Sun, 4 Jul 2021 21:42:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 57A8E1A1D8; Sun, 4 Jul 2021 21:42:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 164LgnRU010372; Sun, 4 Jul 2021 21:42:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 164LgnXs010371; Sun, 4 Jul 2021 21:42:49 GMT (envelope-from git) Date: Sun, 4 Jul 2021 21:42:49 GMT Message-Id: <202107042142.164LgnXs010371@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Thomas Zander Subject: git: 56f8f0ac2a21 - main - multimedia/(mplayer|mencoder): Update to upstream snapshot 2021-07-03. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: riggs X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 56f8f0ac2a21e1672029d3c59aeec07a5532029f Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 04 Jul 2021 21:42:49 -0000 The branch main has been updated by riggs: URL: https://cgit.FreeBSD.org/ports/commit/?id=56f8f0ac2a21e1672029d3c59aeec07a5532029f commit 56f8f0ac2a21e1672029d3c59aeec07a5532029f Author: Thomas Zander AuthorDate: 2021-07-04 10:53:23 +0000 Commit: Thomas Zander CommitDate: 2021-07-04 21:42:46 +0000 multimedia/(mplayer|mencoder): Update to upstream snapshot 2021-07-03. MFH: 2021Q3 --- multimedia/mencoder/Makefile | 1 - multimedia/mencoder/distinfo | 6 +++--- multimedia/mplayer/Makefile | 1 - multimedia/mplayer/Makefile.common | 2 +- multimedia/mplayer/distinfo | 6 +++--- multimedia/mplayer/files/patch-libao2_ao__oss.c | 11 ++++------- 6 files changed, 11 insertions(+), 16 deletions(-) diff --git a/multimedia/mencoder/Makefile b/multimedia/mencoder/Makefile index 28b5c8eaadcd..2df6b5c12581 100644 --- a/multimedia/mencoder/Makefile +++ b/multimedia/mencoder/Makefile @@ -2,7 +2,6 @@ PORTNAME= mencoder PORTVERSION= ${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g} -PORTREVISION= 1 CATEGORIES= multimedia audio MAINTAINER= riggs@FreeBSD.org diff --git a/multimedia/mencoder/distinfo b/multimedia/mencoder/distinfo index d1f256eeef77..1e75807866db 100644 --- a/multimedia/mencoder/distinfo +++ b/multimedia/mencoder/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1615850499 -SHA256 (mplayer-1.4.0.20210314.tar.xz) = 7709f988fadcd24c00cc27b8c2d775dbb2e75e6b8bdc682b13ae6b66cc0a5174 -SIZE (mplayer-1.4.0.20210314.tar.xz) = 5194236 +TIMESTAMP = 1625393918 +SHA256 (mplayer-1.4.0.20210703.tar.xz) = 7c81c590215436d2365b98324e3903e92958722e06eb7ebc9f20192e8a99a6ab +SIZE (mplayer-1.4.0.20210703.tar.xz) = 5195192 diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile index d9cb87a4df7d..09ddd828f6a4 100644 --- a/multimedia/mplayer/Makefile +++ b/multimedia/mplayer/Makefile @@ -2,7 +2,6 @@ PORTNAME= mplayer PORTVERSION= ${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g} -PORTREVISION= 1 CATEGORIES= multimedia audio MAINTAINER= riggs@FreeBSD.org diff --git a/multimedia/mplayer/Makefile.common b/multimedia/mplayer/Makefile.common index f7701abd85f0..dd35b9a35e45 100644 --- a/multimedia/mplayer/Makefile.common +++ b/multimedia/mplayer/Makefile.common @@ -3,7 +3,7 @@ # before we include bsd.port.pre.mk MPLAYER_PORT_VERSION= 1.4.0 -MPLAYER_SNAPSHOT_DATE= 2021-03-14 +MPLAYER_SNAPSHOT_DATE= 2021-07-03 MASTER_SITES= LOCAL/riggs/mplayer DISTNAME= mplayer-${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g} WRKSRC= ${WRKDIR}/mplayer-export-${MPLAYER_SNAPSHOT_DATE} diff --git a/multimedia/mplayer/distinfo b/multimedia/mplayer/distinfo index b91ba38d8b1a..3933f63c3152 100644 --- a/multimedia/mplayer/distinfo +++ b/multimedia/mplayer/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1615840634 -SHA256 (mplayer-1.4.0.20210314.tar.xz) = 7709f988fadcd24c00cc27b8c2d775dbb2e75e6b8bdc682b13ae6b66cc0a5174 -SIZE (mplayer-1.4.0.20210314.tar.xz) = 5194236 +TIMESTAMP = 1625328221 +SHA256 (mplayer-1.4.0.20210703.tar.xz) = 7c81c590215436d2365b98324e3903e92958722e06eb7ebc9f20192e8a99a6ab +SIZE (mplayer-1.4.0.20210703.tar.xz) = 5195192 diff --git a/multimedia/mplayer/files/patch-libao2_ao__oss.c b/multimedia/mplayer/files/patch-libao2_ao__oss.c index fd7fb8d6fa64..431cfe198dc3 100644 --- a/multimedia/mplayer/files/patch-libao2_ao__oss.c +++ b/multimedia/mplayer/files/patch-libao2_ao__oss.c @@ -1,4 +1,4 @@ ---- libao2/ao_oss.c.orig 2016-02-26 20:47:16 UTC +--- libao2/ao_oss.c.orig 2021-04-15 19:26:53 UTC +++ libao2/ao_oss.c @@ -57,6 +57,8 @@ static const ao_info_t info = "" @@ -129,13 +129,10 @@ oss_format = format2oss(ao_data.format); if(AF_FORMAT_IS_AC3(ao_data.format)) fail |= ioctl (audio_fd, SNDCTL_DSP_SPEED, &ao_data.samplerate) == -1; -@@ -467,14 +543,15 @@ static void reset(void){ - int c = ao_data.channels-1; - fail |= ioctl (audio_fd, SNDCTL_DSP_STEREO, &c) == -1; - } -- fail |= ioctl (audio_fd, SNDCTL_DSP_SPEED, &ao_data.samplerate) == -1; +@@ -471,11 +547,14 @@ static void reset(void){ } -- mp_msg(MSGT_AO,MSGL_WARN, "OSS: Reset failed\n"); + if (fail) + mp_msg(MSGT_AO,MSGL_WARN, "OSS: Reset failed\n"); + setfragment(audio_fd); + restorevol(); }