From nobody Thu Apr 27 12:03:59 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 4Q6ZCM2VzKz474dg; Thu, 27 Apr 2023 12:03:59 +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 4Q6ZCM1RMhz3l6q; Thu, 27 Apr 2023 12:03:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682597039; 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=YXfsODArPMTa2OHpPp2+Nb8Jre560LekyF69uOqs7JM=; b=MsDnI7B9clTTT758NgOjvAoqKnSXuKTR2/hSP91qkhDMvGii9XUk1qERfbn6H1uKtWer+z ao6+7+xR1comXOVx8UABCu80pL7pJ9S2Dwv4Ud/9DLrFJa4HoEQm8PPdeHoKg3jlkO1cOE paXv9SEMRMorK57U+eCA7ZmHIjy/gfnelEszoj5uBLq10jrE5/Sw1DIQ2FzozsyBFsjNDF DGztDirCLcHsLwyfnosljgXHUUVgLopU5iyFQBaRqOGXgostaKyyxPmazcbvpvOACJ3mob elaHAkorbNlKhMbT9xfSELZr905Al5OwEM6rPRFVXYy63OnDFx8Vn3+o87NWrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682597039; 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=YXfsODArPMTa2OHpPp2+Nb8Jre560LekyF69uOqs7JM=; b=YN//PslaVYG4K1c5az9g9xnWLl8vmRiIUqCXYMI1mdXNbCuhA/fHGfJGY9Ic/dVm7gq0bj PxYM6x7DfukV8L3uBisMw+OVKBiz/Z1Kqj56xMSskxLXqO8UO00bICBY3o7jwt03v+F8tH 6MIu28A6G7a/KuRDgac3FWx/np+fglHrPo6Oa2V7xl6JV6iVopamAznFlDAXkfoNMOSk0f eHpFiIxTSlMtMGQkNz+u+8QNRoZv1bxQUgMMuWQi92UurPF+z0wzh1bJKPFtoO+OeW3+mF xpk7+tGXpLlBqViXyjo6JDauiKhdcV/zY828gk95qCbXVHeQgSwf4bkRf/f6oQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682597039; a=rsa-sha256; cv=none; b=pDS3bAAtNS7ukUI2Oe8A/BEwYFFpuzzrUVGf7xWH8/vlQeGL9cc8EAXwgfR0YL1TnRtFj2 wNZxMqm7cWlMhjlJ3bOORHn+QcgZpyb7NjdfM4T62/BxRNmnL+nlrLdU4HWqQj8LdoF1UX JT0mGCfDNUrBO1p9v6bdkJaYBXW8/pVREV+Qyn/POpiBQffwfRrZHSikf/zYbr4iVCSXUB VkUYvuoR/yUR47bzruneG16rVVMBoKNUUrF8pAhD2M0gMcVxF+2jvpl4RlRbmxvDaOY0ve MhDuXVceeO7Xbw3xct5up9xfKn0GTQxmglknqhG9Iv2mDPvapFZYQ9pFRLz7xw== 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 4Q6ZCM0T7mzH3q; Thu, 27 Apr 2023 12:03:59 +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 33RC3xil046162; Thu, 27 Apr 2023 12:03:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33RC3x08046161; Thu, 27 Apr 2023 12:03:59 GMT (envelope-from git) Date: Thu, 27 Apr 2023 12:03:59 GMT Message-Id: <202304271203.33RC3x08046161@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: 3e0515560556 - main - games/openmw: 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: 3e0515560556dc48ce03e315b2de73143a95ca22 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=3e0515560556dc48ce03e315b2de73143a95ca22 commit 3e0515560556dc48ce03e315b2de73143a95ca22 Author: Daniel Engberg AuthorDate: 2023-04-27 09:43:33 +0000 Commit: Daniel Engberg CommitDate: 2023-04-27 12:01:42 +0000 games/openmw: Move to FFmpeg 4 Move to FFmpeg 4 due to dependency of graphics/osg Approved by: portmgr (blanket, build fix) Sponsored by: Blinkinblox --- games/openmw/Makefile | 5 ++++- games/openmw/files/patch-cmake_FindFFmpeg.cmake | 11 +++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/games/openmw/Makefile b/games/openmw/Makefile index dd012ba94cf2..973a4a0ce0dc 100644 --- a/games/openmw/Makefile +++ b/games/openmw/Makefile @@ -11,7 +11,7 @@ WWW= https://openmw.org/ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE -LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ +LIB_DEPENDS= libavcodec.so.58:multimedia/ffmpeg4 \ libboost_thread.so:devel/boost-libs \ libMyGUIEngine.so:x11-toolkits/mygui \ libBulletCollision.so:devel/bullet@double \ @@ -44,6 +44,9 @@ DOCS_USES= python:build PORTDOCS= * +post-patch: + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ + ${PATCH_WRKSRC}/cmake/FindFFmpeg.cmake post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* diff --git a/games/openmw/files/patch-cmake_FindFFmpeg.cmake b/games/openmw/files/patch-cmake_FindFFmpeg.cmake new file mode 100644 index 000000000000..cbedcb816345 --- /dev/null +++ b/games/openmw/files/patch-cmake_FindFFmpeg.cmake @@ -0,0 +1,11 @@ +--- cmake/FindFFmpeg.cmake.orig 2023-04-24 10:57:53 UTC ++++ cmake/FindFFmpeg.cmake +@@ -33,6 +33,8 @@ + # Redistribution and use is allowed according to the terms of the BSD license. + # For details see the accompanying COPYING-CMAKE-SCRIPTS file. + ++set(CMAKE_PREFIX_PATH "%%LOCALBASE%%/ffmpeg4;%%LOCALBASE%%/ffmpeg4/libexec") ++ + include(LibFindMacros) + include(FindPackageHandleStandardArgs) +