From nobody Sun Apr 30 17:42:40 2023 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 4Q8YZm5dX9z485Rj; Sun, 30 Apr 2023 17:42:40 +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 4Q8YZm4j9jz3kY5; Sun, 30 Apr 2023 17:42:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682876560; 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=EciQsX2TH5/P2kwkLNI7ujR0hJjKhDULkSuTblfCr0c=; b=eIa+adg08Fg5KxaZXXA087Esdof1Y3K5CsiDk8SRxhhO1V8zEO0gA0ylL9cXQDhxpDq34E SvJk1/thf7U5CwIA17XmqwjURPU4UgolQ83+Ys7XMwYSfDvtx6HjXyWDvJ2iPw1/MW2ORT cD9NtmrTN8g3AO+aV6Oj+uUJQnhF7iLT22CosLboFYC7bSnxkRJlfWVgqAxwBnC+UAPhTq 8nnGmbXsdnUcl1gZmklLKN+unUP3u5tD+m5NYNmXZ6D6WAhZoN44zB0BTP747/w99mHzM1 cJ/G2SxGkALOAXoH61gkzN8oQcq2sPeMV/E/W2ZSbDIdV7r+sp+SZw6C+VlsNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682876560; 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=EciQsX2TH5/P2kwkLNI7ujR0hJjKhDULkSuTblfCr0c=; b=h7S1XaaNC3xLXuJoV1rbjiDXlfquk8KQol8uZroBfQw0zQyJpOeS0g3UUCAaMGywqKByuC cMqOfh86kbb90LohnFKZtLxja+jXCv6WAClBvWnJiCdznubgeMCpydTch3XTROp/234jRB y9MBkJdSpR9LYQTzLXaTpjY9odBemeUhi4WiVd14d8Ds9XdRDCORhGJYrBqfsBDYlpptbh VdD0ud2o0W1+7CztgNMVNxf4u3VdKHwDNsP9fmpTaokY5PK5FGz4ymTdclHXhpXXp3Q8Ib 5GazJGjRONZE/Q9FiApAzfXc0qPZS1xiUCX4LWAdy6Pg/7I9jm/rA2oeGtaWgQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682876560; a=rsa-sha256; cv=none; b=tGhdTi9/rlRbhLP+ZiZtAjV+udmBpi1dXADFxOEvDaaO1zU/HeGxHU1aO1nEOZ/2oIdxD+ ceOjfQ3JYj5P9TelCtsaXyKSFBM5Gi43GnIW02UAl90mo6dWXctpHFkNdKoTUw3jwzvBBw qJsqb8bXdhI7hKjLjAvFWmA2jqTv3ZnSBbWBj2ImEkyeHiFEKgr0avJOuOey1oPbGI1xCW DpENwNgOzcmKK8VJYZ0aeKmc4WdPskcywWXRVQ+JnxWRNtZg0ETPiL/ycCkOO4+QtPUWJf ixlIZs16mUgYCpLqZDQZetRhe5kj3OeVwftRYHQ7AA+5ywGBEGUG49plMsk5/g== 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 4Q8YZm3lnNzXVq; Sun, 30 Apr 2023 17:42:40 +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 33UHgeOc042974; Sun, 30 Apr 2023 17:42:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33UHgek3042973; Sun, 30 Apr 2023 17:42:40 GMT (envelope-from git) Date: Sun, 30 Apr 2023 17:42:40 GMT Message-Id: <202304301742.33UHgek3042973@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: 2df216b41d14 - main - multimedia/{mplayer|mencoder} Use ffmpeg4 instead of ffmpeg6 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: riggs X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2df216b41d143e27e251b8d4447586a82e7554a5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by riggs: URL: https://cgit.FreeBSD.org/ports/commit/?id=2df216b41d143e27e251b8d4447586a82e7554a5 commit 2df216b41d143e27e251b8d4447586a82e7554a5 Author: Thomas Zander AuthorDate: 2023-04-30 14:15:20 +0000 Commit: Thomas Zander CommitDate: 2023-04-30 17:42:38 +0000 multimedia/{mplayer|mencoder} Use ffmpeg4 instead of ffmpeg6 Details: Hopefully temporary workaround to fix a whole bunch of decoding problems with various ffmpeg codecs. PR: 270569 --- multimedia/mencoder/Makefile | 2 +- multimedia/mplayer/Makefile | 2 +- multimedia/mplayer/Makefile.common | 7 +++++-- multimedia/mplayer/files/patch-Makefile | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/multimedia/mencoder/Makefile b/multimedia/mencoder/Makefile index 44826e691f02..7f6b82aa9894 100644 --- a/multimedia/mencoder/Makefile +++ b/multimedia/mencoder/Makefile @@ -1,6 +1,6 @@ PORTNAME= mencoder PORTVERSION= ${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia audio MAINTAINER= riggs@FreeBSD.org diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile index 3e57d404d1f6..35ae0eca59ca 100644 --- a/multimedia/mplayer/Makefile +++ b/multimedia/mplayer/Makefile @@ -1,6 +1,6 @@ PORTNAME= mplayer PORTVERSION= ${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia audio MAINTAINER= riggs@FreeBSD.org diff --git a/multimedia/mplayer/Makefile.common b/multimedia/mplayer/Makefile.common index ec9ce778dea5..7638a799c473 100644 --- a/multimedia/mplayer/Makefile.common +++ b/multimedia/mplayer/Makefile.common @@ -12,7 +12,7 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libpng.so:graphics/png \ - libavcodec.so:multimedia/ffmpeg \ + libavcodec.so.58:multimedia/ffmpeg4 \ libfreetype.so:print/freetype2 BUILD_DEPENDS= ${BUILD_DEPENDS_${ARCH}} @@ -21,7 +21,8 @@ BUILD_DEPENDS_i386= as:devel/binutils USES= compiler:c11 gmake iconv ncurses tar:xz NOPRECIOUSMAKEVARS= yes # ARCH HAS_CONFIGURE= yes -CONFIGURE_ENV= TMPDIR="${WRKSRC}" +CONFIGURE_ENV+= TMPDIR="${WRKSRC}" \ + PKG_CONFIG_PATH="${LOCALBASE}/ffmpeg4/libdata/pkgconfig" CONFIGURE_ARGS= --cc="${CC}" \ --host-cc="${CC}" \ --as="${AS}" \ @@ -50,6 +51,8 @@ CONFIGURE_ARGS= --cc="${CC}" \ --disable-real \ --yasm='' +MAKE_ENV+= PKG_CONFIG_PATH="${LOCALBASE}/ffmpeg4/libdata/pkgconfig" + common-post-patch: @${REINPLACE_CMD} \ -e 's|/dev/dvd|${DEFAULT_DVD_DEVICE}|; \ diff --git a/multimedia/mplayer/files/patch-Makefile b/multimedia/mplayer/files/patch-Makefile index fe4d63a722ef..0321c42a4b80 100644 --- a/multimedia/mplayer/files/patch-Makefile +++ b/multimedia/mplayer/files/patch-Makefile @@ -5,7 +5,7 @@ codec-cfg$(EXESUF) codecs2html$(EXESUF): HOSTCFLAGS := $(HOSTCFLAGS) -DCODECS2HTML codec-cfg$(EXESUF) codec-cfg-test$(EXESUF) codecs2html$(EXESUF): codec-cfg.c codec-cfg.h help_mp.h - $(HOST_CC) $(HOSTCFLAGS) -o $@ $< -+ $(HOST_CC) $(HOSTCFLAGS) -I%%LOCALBASE%%/include -o $@ $< ++ $(HOST_CC) $(HOSTCFLAGS) -I%%LOCALBASE%%/ffmpeg4/include -o $@ $< codecs.conf.h: codec-cfg$(EXESUF) etc/codecs.conf ./$^ > $@