From nobody Sun Feb 20 14:09:48 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id B2C3219CC080; Sun, 20 Feb 2022 14:09:48 +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 4K1nPS4cZLz3HMD; Sun, 20 Feb 2022 14:09:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645366188; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qYh4y8QbI9Z+4IYICnM33Rwp0/iLa7/qp+YRGr//Xf8=; b=uuvalO8XiFBG0hWqGmVApAZgpWrt2VdC+KkZJ8x1KSay96fYjLa3MvPLcjM8y/QkZ0KZp+ JaPZqzvcn44EAQ2jgLtU2d3NBDnQC/VvwSXvyWN4Ie5Ih0AqiN5N4kkUthzMjYGHcLz/YU Y08HPKsb4tQAq3qtZsVdX76dMrpClr0CaQPebVIv2H2g1TeH+SD9aVju3o3DR05ZgNKJDf ep6uZj4luwDxL/CDfxzRGXIFN8H94EZmAroVdJrRJ5KXpHZhlpy1px93rzQs9jkZngy8Au aHHPliC+V9VYu83ULuonO87+Iex7O4ZJ7PeFILHjRMNl4OfczkN7bB+VYTlj8w== 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 7E4271D75E; Sun, 20 Feb 2022 14:09:48 +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 21KE9m1L080923; Sun, 20 Feb 2022 14:09:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21KE9mTf080922; Sun, 20 Feb 2022 14:09:48 GMT (envelope-from git) Date: Sun, 20 Feb 2022 14:09:48 GMT Message-Id: <202202201409.21KE9mTf080922@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Dima Panov Subject: git: 527db460bd28 - 2022Q1 - multimedia/m{player|encoder}: switch to graphics/openjpeg (+) List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q1 X-Git-Reftype: branch X-Git-Commit: 527db460bd28103a5d6a3d8e9ee6296e40aff4ef Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645366188; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qYh4y8QbI9Z+4IYICnM33Rwp0/iLa7/qp+YRGr//Xf8=; b=u73nmJObWImBDgfj9dKSXqPA3vk32BIyNRepuFfWNGBpRbDSsL+LXqwikLp5tGwlBqIx5c DrGFcVWRI3aRzWtVjf1qIyWHaQkJ4UOU7yiFkqgUVo+P4zv88UjjjlMzA28jnzq/ZQ9w4z rVVbLQCDS1bqUzOMvIPLv88NVKw10sDA+Z01eovbeizctB2TkLaR3gkaKt2ydVM5IXNTjz YfAfBgLnQmwkZlcyPajEOsnK/vApkn4C5OqIGEzSyEuKbRHavPdwUWY8gzU+P19CGmjePZ 0DLLUNDurP2PaFCYKjCOiliy08O6u9FfVBQxApkDY0V+qHKjRciYhnHmPbj6fw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645366188; a=rsa-sha256; cv=none; b=MFtr2n8zIChFF886bzS78b5hhdc8+HURtrMm1OjzLBYjTNPjoZRIYfDkY2jOWvByiveiZv ij0g/gOGbl47Su9WLw7jj/fT23PXYJ9JpOLW1K3HrSZ5DgyuGRpF8XZx6uj3lBFIKNRim8 lgALVIQKv/VkEnDD7AVOM16P6DSmEByMgMj7Zadrd+4VUGJwkNz4kaKq3Xjw84q+jvuuOq xLMUFim3pIUeKO1DwYMT0FyoWjZ5gpu3W0jG8chMUUtS2bH5ymBxmS8MQaaZnaHmOdUaEu +rEC3/sPoCNi0D4Zk7plXkPH9MqQZOLkz4eaGJInFTYkSHixeHAyKm1buWBRiA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q1 has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=527db460bd28103a5d6a3d8e9ee6296e40aff4ef commit 527db460bd28103a5d6a3d8e9ee6296e40aff4ef Author: Dima Panov AuthorDate: 2022-02-20 14:05:04 +0000 Commit: Dima Panov CommitDate: 2022-02-20 14:09:39 +0000 multimedia/m{player|encoder}: switch to graphics/openjpeg (+) Mplayer engine indeed require openjpeg >= 2.1.0. Depend on openjpeg15 is irrelevant, player even connot link with it. MFH: 2022Q1 Approved by: portmgr (fix build blanket) Sponsored by: Netzkommune GmbH (cherry picked from commit 7beae5bb0fa6b7a5c35418ada41b5016a52157ba) --- multimedia/mencoder/Makefile | 1 + multimedia/mplayer/Makefile | 2 +- multimedia/mplayer/Makefile.optvars | 5 ++--- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/multimedia/mencoder/Makefile b/multimedia/mencoder/Makefile index 2df6b5c12581..5cce54e130c2 100644 --- a/multimedia/mencoder/Makefile +++ b/multimedia/mencoder/Makefile @@ -2,6 +2,7 @@ PORTNAME= mencoder PORTVERSION= ${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g} +PORTREVISION= 2 CATEGORIES= multimedia audio MAINTAINER= riggs@FreeBSD.org diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile index d9cb87a4df7d..62c25b154dbd 100644 --- a/multimedia/mplayer/Makefile +++ b/multimedia/mplayer/Makefile @@ -2,7 +2,7 @@ PORTNAME= mplayer PORTVERSION= ${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia audio MAINTAINER= riggs@FreeBSD.org diff --git a/multimedia/mplayer/Makefile.optvars b/multimedia/mplayer/Makefile.optvars index da9155ed0ce9..6beab30a82e3 100644 --- a/multimedia/mplayer/Makefile.optvars +++ b/multimedia/mplayer/Makefile.optvars @@ -87,9 +87,8 @@ OPENGL_USES= gl OPENGL_CONFIGURE_OFF= --disable-gl OPENGL_IMPLIES= X11 -OPENJPEG_CFLAGS= -I${LOCALBASE}/include/openjpeg-1.5 -OPENJPEG_LIB_DEPENDS= libopenjpeg.so:graphics/openjpeg15 -OPENJPEG_CONFIGURE_OFF= --disable-libopenjpeg +OPENJPEG_LIB_DEPENDS= libopenjp2.so:graphics/openjpeg +OPENJPEG_CONFIGURE_ENABLE= libopenjpeg OPUS_LIB_DEPENDS= libopus.so:audio/opus OPUS_CONFIGURE_OFF= --disable-libopus