From nobody Thu Apr 27 12:04:06 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 4Q6ZCW1nwcz474jd; Thu, 27 Apr 2023 12:04:07 +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 4Q6ZCW0qV7z3lTB; Thu, 27 Apr 2023 12:04:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682597047; 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=knjZU9YH+on7Z4Zd7JteRxD3DF+wRnrDMZ2tvEEA0fk=; b=aB2zqdXodAMIOP8RkdMLFT+7WOAaRa6Dji3+ihww5He2OXGvCVFukyJWMXghig0kowz4ZL 08YQW/Zj9+IsU9jAnjK/i/8I6xSfKpNDUPUL1eUpHg99/SjM/4wYJNYC19GEXc2DCEWK2C vKB9SlKx1GDzco5xDRkNdqbp2xzD3/OHES8mnWFiNV9kLTwjk0t3TL59OGWHRTC7Am/bwq 8slSX6d6YH8U6iUziudeT8D/i45b/jXIpZiZBkwM3oQMH0xOzgqEK0DKgD9vi311Z5aEZS xkamCoghO5qlWrxpxlgEWc2aSERi4e5yugFcKR/OibFkovwslxnScnFdCOt9ZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682597047; 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=knjZU9YH+on7Z4Zd7JteRxD3DF+wRnrDMZ2tvEEA0fk=; b=x+lCY+mZLsUnSb+o2N6jBgpNbcyybl7MpD9Cu0whZ7SzHndq8SfRnv2guOW2rZ6xhUFuPF 8etBqbPKioCFy6kpiO3/Ah+alNhQnHcrEGIL93F5CcqEUwjoxqE2iMkkRH3HtQe7c9kd3o Hrp+F1tRNK+XYgpxNlJiAQTrxK4hEo27arxGFNmS6RCv3Rb5l20M+QQr0jYdP2rfi5yOFI EV5Nxy95IYHJ0CuT9X1DiJW0nnEBcLgLhhYdaTcqy76RBWAx7NrVtI0tjHuEj1hZ8V7hM8 9mPhCyEWUoRk6I28fl9ynwLv6R71AICOJfqq64ag06WTEIkWGY/sRsIKvPbRSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682597047; a=rsa-sha256; cv=none; b=rwf6sSeZ/2pGzNf8mchUe885B4SjAm2PaTIoexWMglCelE6XTyMh8Q/mq+wseTizq3yxyn iO0+6YFdBol8sgnL/BvrK0ix6dbT8pwatg/y4TCw5JyDH8LqpyJGysOXnADqZLdNQ8OLFp wThPQpXQBAs8qfcYJrC84n7o8A5M3HMvozEN6OLbdmWLCIQlBH5PvBtQkrNN8uTVmQXxZ1 o1m0Uug+OMmzUxfIWQTUiW3B0cc9jnTNEDm9MJd4L34Kt8Sg2zuFNJir6XmbPHXZM+VqoB W6rFgLRiB+k8J49hl4ucGaf4dmwk3jBkZe0VXoM8zkCRHPnguNQTo7WCSuYwNQ== 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 4Q6ZCV6rXKzH3s; Thu, 27 Apr 2023 12:04:06 +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 33RC46I3046301; Thu, 27 Apr 2023 12:04:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33RC46rr046300; Thu, 27 Apr 2023 12:04:06 GMT (envelope-from git) Date: Thu, 27 Apr 2023 12:04:06 GMT Message-Id: <202304271204.33RC46rr046300@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: 4ea6ffb836ed - main - games/hedgewars: Move to FFmpeg 4 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: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4ea6ffb836ed71110fff16f6569e6957fcdeaa91 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=4ea6ffb836ed71110fff16f6569e6957fcdeaa91 commit 4ea6ffb836ed71110fff16f6569e6957fcdeaa91 Author: Daniel Engberg AuthorDate: 2023-04-27 10:07:40 +0000 Commit: Daniel Engberg CommitDate: 2023-04-27 12:01:43 +0000 games/hedgewars: Move to FFmpeg 4 Fails to build with FFmpeg 6 PR: 270248 Approved by: portmgr (blanket, build fix) Sponsored by: Blinkinblox --- games/hedgewars/Makefile | 4 +++- games/hedgewars/files/patch-cmake__modules_FindLIBAV.cmake | 11 +++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/games/hedgewars/Makefile b/games/hedgewars/Makefile index 5a7087cd2265..3b2f1b95dfd9 100644 --- a/games/hedgewars/Makefile +++ b/games/hedgewars/Makefile @@ -41,7 +41,7 @@ OPTIONS_EXCLUDE_i386= VIDEOREC # some pascal issues preventing to use it VIDEOREC_DESC= Enable video recording (requires ffmpeg) -VIDEOREC_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg +VIDEOREC_LIB_DEPENDS= libavcodec.so.58:multimedia/ffmpeg4 VIDEOREC_PLIST_FILES= lib/libavwrapper.so \ lib/libavwrapper.so.1.0 VIDEOREC_CMAKE_OFF= -DNOVIDEOREC=1 @@ -60,6 +60,8 @@ post-patch: @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/cmake_modules/*.cmake @${REINPLACE_CMD} -e "s|'liblua'|'liblua-${LUA_VER}'|" ${WRKSRC}/hedgewars/LuaPas.pas @${REINPLACE_CMD} -e "/linklib/ s|lua|&-${LUA_VER}|" ${WRKSRC}/hedgewars/LuaPas.pas + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ + ${PATCH_WRKSRC}/cmake_modules/FindLIBAV.cmake post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* diff --git a/games/hedgewars/files/patch-cmake__modules_FindLIBAV.cmake b/games/hedgewars/files/patch-cmake__modules_FindLIBAV.cmake new file mode 100644 index 000000000000..19b2fd55e4dd --- /dev/null +++ b/games/hedgewars/files/patch-cmake__modules_FindLIBAV.cmake @@ -0,0 +1,11 @@ +--- cmake_modules/FindLIBAV.cmake.orig 2023-04-25 07:46:45 UTC ++++ cmake_modules/FindLIBAV.cmake +@@ -19,6 +19,8 @@ + # BSD license. + # + ++set(CMAKE_PREFIX_PATH "%%LOCALBASE%%/ffmpeg4;%%LOCALBASE%%/ffmpeg4/libexec") ++ + include(FindPackageHandleStandardArgs) + +