From nobody Thu Apr 27 12:03:53 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 4Q6ZCF5kKgz474fv; Thu, 27 Apr 2023 12:03:53 +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 4Q6ZCF4r3Cz3kc4; Thu, 27 Apr 2023 12:03:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682597033; 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=u5D8H2BlRGhuf/KJxYVwTJC5xtX0Glm1kP6HE9wcHCk=; b=GeGCzGiMn9ApenrCkhZgnK9eIUj+06VMS2NCu1KbGMDQS9QOTSD+T/XhqRhK9e1DqyOCrv k8aliKoIBHMnCPXXATnO+BlkjCsrs3673NRxEtuRqLlU0fFnTH0RJKE1kBDv6LC52GcYDB LcC9yFr/g5/CiMjX3fXs1XDNgAhGEk2IEAkDG/Miklg6MbuiMl9zVwI41v8EeVdYQUiTV9 SqwIc0GjnVLDx393FNSLEnLhZzVxR7JPdssh0kjAxYzDwbwOlxKfDTsFH7zJE239nED38J NX2TEGbOnY8RlSXvO+SkJifYDK5T74E5QMRfNltOWR7SWefgmvo9dMcb+NIy+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682597033; 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=u5D8H2BlRGhuf/KJxYVwTJC5xtX0Glm1kP6HE9wcHCk=; b=Sd7Ti0MhWo2/jGslEUPi+SsV4/yk/WTZZI665dAbEGV08v2s5sbxo2AP8SaPJ1eLVpnutN Rbdea80eCa2tnMrwv/kATSem0tdcl3cmRE6pUfLNzk5wR65/ihfcZm3yXHmTELLkv/9yjm 5U8dNZBHyQAyuVqguYKNmyy0mOSz7VXJ4/6AUYQY2rRcbok/aFUJZ2kB7qymeWHbtOxNjf Kt9zcq61j0EKPOW1UMRjHBBzkaA8AfhSOLTgNC1805V8k03LvqV9gQk/IIBQLdep6Rbp6z gYzHBl0jsCuWZDga3Wr2vl5r4qFwrU4AItrBG1FVDuHFb+3aVtJlMw+VDebjfQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682597033; a=rsa-sha256; cv=none; b=gmtDLA8aigRNPmqc9JAt2u5MoFlnEZrLHiAhUdEUFd1ZkwEllJoZpnSGETxMZJClZtRuKG qLK9uWp6rZ4G7C8R+u85p3GM7Csyrs2I4IV2dcNZd6ZP20Ry1uh7cCo7dVqReRqE7lMVHZ /oTU+yVc67oq76ZmH2nMjyPO+TCI8STQeP64o/kbZzrChQdMrUrPlZDc1Aef5dv2ENEyx4 5XOOwLUYlN/pB1lTXPieiNoK+wwPjvse8wJjw/tsxQ4hX5whnh4szftwlzWjVHDLi4nLP+ /7ZdMzVlV7AtKZL3ZrmE/336h9JslmN5U1T5jcgu5F7xBaTF15hthiFRBGn/Vw== 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 4Q6ZCF3cYLzGVC; Thu, 27 Apr 2023 12:03:53 +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 33RC3rVl046043; Thu, 27 Apr 2023 12:03:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33RC3rtl046042; Thu, 27 Apr 2023 12:03:53 GMT (envelope-from git) Date: Thu, 27 Apr 2023 12:03:53 GMT Message-Id: <202304271203.33RC3rtl046042@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: 4f1ddd2085b3 - main - devel/ignition-cmake: Force usage of 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: 4f1ddd2085b3ca2e8bfa20059c0bcdc24747af22 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=4f1ddd2085b3ca2e8bfa20059c0bcdc24747af22 commit 4f1ddd2085b3ca2e8bfa20059c0bcdc24747af22 Author: Daniel Engberg AuthorDate: 2023-04-27 09:29:02 +0000 Commit: Daniel Engberg CommitDate: 2023-04-27 12:01:41 +0000 devel/ignition-cmake: Force usage of FFmpeg 4 Consumers (devel/ignition-common) fails to build with FFmpeg 6 PR: 270198 Approved by: portmgr (blanket, build fix) Sponsored by: Blinkinblox --- devel/ignition-cmake/Makefile | 12 ++++++++++++ devel/ignition-cmake/files/patch-cmake_FindAVCODEC.cmake | 8 ++++++++ devel/ignition-cmake/files/patch-cmake_FindAVDEVICE.cmake | 8 ++++++++ devel/ignition-cmake/files/patch-cmake_FindAVFORMAT.cmake | 8 ++++++++ devel/ignition-cmake/files/patch-cmake_FindAVUTIL.cmake | 8 ++++++++ devel/ignition-cmake/files/patch-cmake_FindSWSCALE.cmake | 8 ++++++++ 6 files changed, 52 insertions(+) diff --git a/devel/ignition-cmake/Makefile b/devel/ignition-cmake/Makefile index 4bafcd4b27ec..1262b4115505 100644 --- a/devel/ignition-cmake/Makefile +++ b/devel/ignition-cmake/Makefile @@ -22,4 +22,16 @@ NO_ARCH= yes PLIST_SUB+= CMAKE_IGN_VER=cmake${DISTVERSION:R:R} +post-patch: + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ + ${PATCH_WRKSRC}/cmake/FindAVCODEC.cmake + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ + ${PATCH_WRKSRC}/cmake/FindAVDEVICE.cmake + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ + ${PATCH_WRKSRC}/cmake/FindAVFORMAT.cmake + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ + ${PATCH_WRKSRC}/cmake/FindAVUTIL.cmake + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ + ${PATCH_WRKSRC}/cmake/FindSWSCALE.cmake + .include diff --git a/devel/ignition-cmake/files/patch-cmake_FindAVCODEC.cmake b/devel/ignition-cmake/files/patch-cmake_FindAVCODEC.cmake new file mode 100644 index 000000000000..4b9304f922f7 --- /dev/null +++ b/devel/ignition-cmake/files/patch-cmake_FindAVCODEC.cmake @@ -0,0 +1,8 @@ +--- cmake/FindAVCODEC.cmake.orig 2023-04-24 07:29:13 UTC ++++ cmake/FindAVCODEC.cmake +@@ -16,4 +16,5 @@ + ######################################## + # Find avcodec + include(IgnPkgConfig) ++set(CMAKE_PREFIX_PATH "%%LOCALBASE%%/ffmpeg4;%%LOCALBASE%%/ffmpeg4/libexec") + ign_pkg_check_modules(AVCODEC libavcodec) diff --git a/devel/ignition-cmake/files/patch-cmake_FindAVDEVICE.cmake b/devel/ignition-cmake/files/patch-cmake_FindAVDEVICE.cmake new file mode 100644 index 000000000000..640a2079d5dc --- /dev/null +++ b/devel/ignition-cmake/files/patch-cmake_FindAVDEVICE.cmake @@ -0,0 +1,8 @@ +--- cmake/FindAVDEVICE.cmake.orig 2023-04-24 07:29:47 UTC ++++ cmake/FindAVDEVICE.cmake +@@ -20,4 +20,5 @@ set(av_minor ${AVDEVICE_FIND_VERSION_MINOR}) + set(av_patch ${AVDEVICE_FIND_VERSION_PATCH}) + + include(IgnPkgConfig) ++set(CMAKE_PREFIX_PATH "%%LOCALBASE%%/ffmpeg4;%%LOCALBASE%%/ffmpeg4/libexec") + ign_pkg_check_modules(AVDEVICE "libavdevice >= ${av_major}.${av_minor}.${av_patch}") diff --git a/devel/ignition-cmake/files/patch-cmake_FindAVFORMAT.cmake b/devel/ignition-cmake/files/patch-cmake_FindAVFORMAT.cmake new file mode 100644 index 000000000000..60567157f9e8 --- /dev/null +++ b/devel/ignition-cmake/files/patch-cmake_FindAVFORMAT.cmake @@ -0,0 +1,8 @@ +--- cmake/FindAVFORMAT.cmake.orig 2023-04-24 07:30:02 UTC ++++ cmake/FindAVFORMAT.cmake +@@ -16,4 +16,5 @@ + ######################################## + # Find AV format + include(IgnPkgConfig) ++set(CMAKE_PREFIX_PATH "%%LOCALBASE%%/ffmpeg4;%%LOCALBASE%%/ffmpeg4/libexec") + ign_pkg_check_modules(AVFORMAT libavformat) diff --git a/devel/ignition-cmake/files/patch-cmake_FindAVUTIL.cmake b/devel/ignition-cmake/files/patch-cmake_FindAVUTIL.cmake new file mode 100644 index 000000000000..eaacfdf00a22 --- /dev/null +++ b/devel/ignition-cmake/files/patch-cmake_FindAVUTIL.cmake @@ -0,0 +1,8 @@ +--- cmake/FindAVUTIL.cmake.orig 2023-04-24 07:30:38 UTC ++++ cmake/FindAVUTIL.cmake +@@ -16,4 +16,5 @@ + ######################################## + # Find avutil + include(IgnPkgConfig) ++set(CMAKE_PREFIX_PATH "%%LOCALBASE%%/ffmpeg4;%%LOCALBASE%%/ffmpeg4/libexec") + ign_pkg_check_modules(AVUTIL libavutil) diff --git a/devel/ignition-cmake/files/patch-cmake_FindSWSCALE.cmake b/devel/ignition-cmake/files/patch-cmake_FindSWSCALE.cmake new file mode 100644 index 000000000000..79c83b834b34 --- /dev/null +++ b/devel/ignition-cmake/files/patch-cmake_FindSWSCALE.cmake @@ -0,0 +1,8 @@ +--- cmake/FindSWSCALE.cmake.orig 2023-04-25 18:35:25 UTC ++++ cmake/FindSWSCALE.cmake +@@ -16,4 +16,5 @@ + ######################################## + # Find libswscale format + include(IgnPkgConfig) ++set(CMAKE_PREFIX_PATH "%%LOCALBASE%%/ffmpeg4;%%LOCALBASE%%/ffmpeg4/libexec") + ign_pkg_check_modules(SWSCALE libswscale)