From nobody Mon May 01 15:57:31 2023 X-Original-To: dev-commits-ports-main@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 4Q97C011TTz48hQR; Mon, 1 May 2023 15:57:32 +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 4Q97C00Vrrz3tr5; Mon, 1 May 2023 15:57:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682956652; 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=YLf4zLz8+s/pj302f1hw2lIoNX0S3ik/zoHHRUansmQ=; b=WYNIerpPmF4vXWT7d0HVqz1PeWAHO/1Rrsuv6TFOcazhyHmmm5mBiHzRRpUe0owv6vcUv8 UkeWG1u/VgaC10ULjFwcwKxVBMiOtf/wfKTeNC6vXMS9E3XKwWZp5Lz4QtSnptu4kFJ3EY KOXuWyKzndJOkxVhBFS01SsgIoOlDilo8dSLlMcl6n2KWMX7rs1WRALD3qu6C354lMbTMy 1bfefL7SREy7R2hMDZIXtbYIHW0xagdtmaYaOGhIB/e7tTVsfb3fvXQcCNyiBFco+9h44u UuaJ8F0boVv+kFrEbsc6F+jtRiXx5BuRpgr/czjbZugyyfXwKm/DJhALuOTR4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682956652; 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=YLf4zLz8+s/pj302f1hw2lIoNX0S3ik/zoHHRUansmQ=; b=m0PWWO1HaD1MOBHs4Oujqtnst1uO1GwMPkfJwPtb0khSB4PmdRwr65C5dL1mxTw1h/N2tO W+a+1Tl1uuLYtm7CLEuTeZzw0mOPZCjmuFsVQSIbpytGLboCiKrblmVRKJtp0ldKUPqL7Y s8Vxyv0nZk+ul18BspPS0e2vmIaPKRP4jJwtmurowci5uyLRHz/0hVY8ctC+icxfJCHvzA cpn0ZPWBeAchSaX0F8FAmv7k7kxAania6B+Vgvh3zq3IQzbPVtaat63JsNV89pWlqOfsW+ WiszqTSnX775CF1f7snGdnARASOz/8sgMu16rttkQ58d6gdFXBmy/Hy+PX+blg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682956652; a=rsa-sha256; cv=none; b=AzVoskZSl6gJE6W1d/SsKPbtdee1ZCkSWfC19uAC4u3SwDZRAveXuQzUwoEavOIMSLHelP ZjnYhud/hR/wjl6OeUBapTmC0fGkzu2u0p7Oj+42p1D/wxNbZ27S19Pa/g8ee09d7713YO eJ0D92JyF2YB6Q8HPxUH1WpdJCcKLWWUgBGr9mb7usgCA23Z9dOU+5dDowLo6Hx/ADp01b NVrrt2HRNrpTIzmWfsQx48RCW0QIBPM6jWxgHxl/XqbKaVD48ujyl79jNrWLLWx9dM/1L6 3r4jAQwAC3flzPkfp4FQNJbr1VAebfqpG2OI589ptfoEGcav8jpvJqsT9xU4rA== 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 4Q97Bz6h22z1B9c; Mon, 1 May 2023 15:57:31 +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 341FvVRj039139; Mon, 1 May 2023 15:57:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 341FvVVx039138; Mon, 1 May 2023 15:57:31 GMT (envelope-from git) Date: Mon, 1 May 2023 15:57:31 GMT Message-Id: <202305011557.341FvVVx039138@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: 5348dafc8864 - main - multimedia/{mplayer|mencoder} Add missing CFLAGS for ffmpeg4 headers List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: 5348dafc8864fb387609b408a94568bb844a7ead Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by riggs: URL: https://cgit.FreeBSD.org/ports/commit/?id=5348dafc8864fb387609b408a94568bb844a7ead commit 5348dafc8864fb387609b408a94568bb844a7ead Author: Thomas Zander AuthorDate: 2023-05-01 15:52:33 +0000 Commit: Thomas Zander CommitDate: 2023-05-01 15:57:18 +0000 multimedia/{mplayer|mencoder} Add missing CFLAGS for ffmpeg4 headers Details: This was missed in the previous commit. Ensure the ffmpeg4 headers are included, not the ffmpeg 6 ones. PR: 270569 Reported by: diizzy Tested by: george@m5p.com, riggs --- multimedia/mencoder/Makefile | 2 +- multimedia/mplayer/Makefile | 2 +- multimedia/mplayer/Makefile.common | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/multimedia/mencoder/Makefile b/multimedia/mencoder/Makefile index 7f6b82aa9894..f355d289e2ef 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= 3 +PORTREVISION= 4 CATEGORIES= multimedia audio MAINTAINER= riggs@FreeBSD.org diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile index 35ae0eca59ca..f9fce65ff92c 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= 3 +PORTREVISION= 4 CATEGORIES= multimedia audio MAINTAINER= riggs@FreeBSD.org diff --git a/multimedia/mplayer/Makefile.common b/multimedia/mplayer/Makefile.common index 7638a799c473..25522f9fd955 100644 --- a/multimedia/mplayer/Makefile.common +++ b/multimedia/mplayer/Makefile.common @@ -53,6 +53,8 @@ CONFIGURE_ARGS= --cc="${CC}" \ MAKE_ENV+= PKG_CONFIG_PATH="${LOCALBASE}/ffmpeg4/libdata/pkgconfig" +CFLAGS+= -I${LOCALBASE}/ffmpeg4/include + common-post-patch: @${REINPLACE_CMD} \ -e 's|/dev/dvd|${DEFAULT_DVD_DEVICE}|; \