From nobody Thu Apr 27 12:03:52 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 4Q6ZCD64Qjz474dM; Thu, 27 Apr 2023 12:03:52 +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 4Q6ZCD4SRTz3kMN; Thu, 27 Apr 2023 12:03:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682597032; 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=ZpxisuVj2mxVlvXro2kAn4DoNl9IrmaVSiUFlBHeVig=; b=jDTuKeV7Ag4KzoZViTGuIo8KMcPCxXhzhB8if3ktQpuPLT3KUzCyYtKfTEQ/UCltFEmva4 mjrjmcu+aU2KFnFTiKt4OqSdpIm8MtIRM4xfGXe5iOM4Q0TOrRE/gf7RzWD/SgbGVQ3UBc QKhPFsJTYHmFf3SPXceiy15EUQUu3+RMVg4GxSWQ6e25qMnlDa2rFLhTjvr+XEVWteyHiK CkPhF70iwFbAz2e2YwdP8aMVlkXsKbYPJNWO3s0b7dUUSUtOr8Yci+ITXo669sheWXBx4W OFqGp1+0/UGnM3doYGy6gWRDljNk5GBdbqm+g75HCFf5hR/HKOtqCVWanMcwkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682597032; 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=ZpxisuVj2mxVlvXro2kAn4DoNl9IrmaVSiUFlBHeVig=; b=pLOlrCMSrBOxuWRqw3f1bMewZOrRO4Y6GzTTmZS5htDdXMJVLjIPF31E/r7BLTMzF6zyZ3 U4Gfz24xSjIai0wsmxgIm3oqPQqXy0ctVU6eKxrZhF/ngcyiFJwUfsqKKw4Q1/ysa8cWwN IscwPiBfcpxnJCxssHbZN+Zm2dSLzZ/SGuy65DiL+hO86NnZr+MZxEgTqPWv2fB140RAW7 j56j2i/Phr0Oyzz27k8iq05xWrvsjbjeSeZqkp79j7TnkfhL2KhyY5InpIchvW1kpVtbsr qurj50YzNX0Y7OXeeIK29XuvBcoeqNT8ndHqmuZ/V0cUAGxKxPYoWs7JLeuvJg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682597032; a=rsa-sha256; cv=none; b=dMIPGCgf6shJZDKR+ad3iBRCHc37lyCMpwb5Xo/Ooa90ApVUclsDXK4kgJjN9CmZBSEJQG u5duEIXD+aoREqVnqgU2FLp+62XO2cJ6CdVqsrkOCO8UOdC+LOXiH+uVvLiivHJfWeuWW+ 7P65R+QFfYYpY/xP6CUZTOTO6MaAmV7SxImlehSF4U44A8tUc8n0NfQ3+7Bx/SVm02xgLU r0lg9izPalPmUEA6W3ruPsw320t6WRZ7Q25AZpmNS62cuxzH9IWD6f73lWj4JNLuqChh2j EuVuLaqV7cgUvrnz0xCWfa9XxxhbbHDrY/NwZIrFoBZJ4fgSnxGgombGWybwUQ== 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 4Q6ZCD3HHCzH3p; Thu, 27 Apr 2023 12:03:52 +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 33RC3qus046024; Thu, 27 Apr 2023 12:03:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33RC3qvO046023; Thu, 27 Apr 2023 12:03:52 GMT (envelope-from git) Date: Thu, 27 Apr 2023 12:03:52 GMT Message-Id: <202304271203.33RC3qvO046023@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: a62d83a6772a - main - cad/opencascade*: 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: a62d83a6772af22ab2d4542ac4ecf6aaac6d1a58 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=a62d83a6772af22ab2d4542ac4ecf6aaac6d1a58 commit a62d83a6772af22ab2d4542ac4ecf6aaac6d1a58 Author: Daniel Engberg AuthorDate: 2023-04-27 09:24:43 +0000 Commit: Daniel Engberg CommitDate: 2023-04-27 12:01:41 +0000 cad/opencascade*: Move to FFmpeg 4 Fails to build with FFmpeg 6 PR: 270197 Approved by: portmgr (blanket, build fix) Sponsored by: Blinkinblox --- cad/opencascade/Makefile | 6 ++++-- cad/opencascade740/Makefile | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/cad/opencascade/Makefile b/cad/opencascade/Makefile index b2155bf56e84..1dea4e5fb78a 100644 --- a/cad/opencascade/Makefile +++ b/cad/opencascade/Makefile @@ -86,9 +86,11 @@ OCCROOT= ${PREFIX}/${LOCCROOT} PLIST_SUB= OCCROOT="${LOCCROOT}" BITS=${BITS} CC=${CHOSEN_COMPILER_TYPE} \ VE=${PORTVERSION:R} VER=${DISTVERSION:C/-beta//} -FFMPEG_CMAKE_ON= -DUSE_FFMPEG:BOOL=ON +FFMPEG_CMAKE_ON= -DUSE_FFMPEG:BOOL=ON \ + -D3RDPARTY_FFMPEG_INCLUDE_DIR=${LOCALBASE}/ffmpeg4/include \ + -D3RDPARTY_FFMPEG_DIR=${LOCALBASE}/ffmpeg4 FFMPEG_CMAKE_OFF= -DUSE_FFMPEG:BOOL=OFF -FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ +FFMPEG_LIB_DEPENDS= libavcodec.so.58:multimedia/ffmpeg4 \ libtheoraenc.so:multimedia/libtheora \ libunistring.so:devel/libunistring \ libvdpau.so:multimedia/libvdpau \ diff --git a/cad/opencascade740/Makefile b/cad/opencascade740/Makefile index 72e9bf9d58b7..1b3e554f92b1 100644 --- a/cad/opencascade740/Makefile +++ b/cad/opencascade740/Makefile @@ -63,9 +63,11 @@ OCCROOT= ${PREFIX}/${LOCCROOT} PLIST_SUB= OCCROOT="${LOCCROOT}" BITS=${BITS} CC=${CHOSEN_COMPILER_TYPE} \ VE=${PORTVERSION:R:R} VER=${PORTVERSION} -FFMPEG_CMAKE_ON= -DUSE_FFMPEG:BOOL=ON +FFMPEG_CMAKE_ON= -DUSE_FFMPEG:BOOL=ON \ + -D3RDPARTY_FFMPEG_INCLUDE_DIR=${LOCALBASE}/ffmpeg4/include \ + -D3RDPARTY_FFMPEG_DIR=${LOCALBASE}/ffmpeg4 FFMPEG_CMAKE_OFF= -DUSE_FFMPEG:BOOL=OFF -FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg +FFMPEG_LIB_DEPENDS= libavcodec.so.58:multimedia/ffmpeg4 VIS_CMAKE_ON= -DUSE_FREEIMAGE:BOOL=ON -DUSE_GL2PS:BOOL=ON \ -DUSE_FREETYPE:BOOL=ON -D3RDPARTY_FREETYPE_DIR=${LOCALBASE}