From nobody Thu Apr 27 12:03:57 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 4Q6ZCL2ZGzz474MV; Thu, 27 Apr 2023 12:03:58 +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 4Q6ZCL0cPWz3l6T; Thu, 27 Apr 2023 12:03:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682597038; 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=ZkbAAbSp+K/jeXfGY+uSCA4o1vemBcEG+KwzamzGfCQ=; b=nrEBA06bFeya+wei4LFgureL3PXKTPEiyZoFsaLNWPb6FYDEP3YGRbqgimZ9qSlcQglkwu VGPozDSsw7uXLDiZsc76GH4mABIzMh0qgvZakMgBrL8jy9scfqAjkdf6WEnC7fvG3CYfCI x4mW9dWztMtn1hirUq1tmihxz/5JZ4M5/v7i0N4xt6VeGIfMMIsZcv3/g+9Ucc7DSS9Ux2 ch0Uf6Zr2C+ayko2mxXMyRqdw2IY3XhywGHaV73YFZFlnspeOOeUcZZwVsTQpun6VXL4wa tmGYQFtsaaPGvB6LdtoWpO1/coivfeGvFJBj+jAGZtDqjWtt5BdIyuUvFQbOOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682597038; 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=ZkbAAbSp+K/jeXfGY+uSCA4o1vemBcEG+KwzamzGfCQ=; b=Un2D4S5uJNQaV2M7ec/m8qR/Bi1q6n1gmjO9SrCcZJC6e/2uzYJXhTKq6hxwB9ekSMsony rx0t0a53g0eZwVtH+oA1QV3uVPILDaWb2qAObjLQXN9c9HSX+JsAgj5g474DUGDOYl+e8d 4TLGIDs8/pw08eMay/z0prsOM56rkNepeQGfpAvG9TcvebLCN4kh1rrTN68LXEGNGgFKK6 AjQFd56raNqh70H7Pv6m6XcrbEYXz0A3JDTOAaBp8aVrBxQJqd50WubNJYmdB8VTfzoBYo /gD9YsqqKNmR9Ycw2+1rEy9Fd6DWPmhjwyt8rwtv9w8aDoVzcjV0EDX+knIhew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682597038; a=rsa-sha256; cv=none; b=uTTmFYDrNyImAYfFeumO+m5biuVj3brHrelyxOIf9HJYaGU8flOnh77UgJuitiDlJl6j+w n/mMIAOFMfVsbAXiRTnyH2mhF3eNJdAJKycjGMXXmWKy00u1sGVUm5/Xa4n+ryx9KBJMC7 Rsuh+1iXkD7/0nIgp8CjsvcmPg42WEgJVqgL6/MxIME0WyGmf16EOMKq6RSM60id6/sYt1 MNiuQmQvfDXiVHlPkv6xH42Cg9th1wobbtO1qIg4fk0ezZk7ky6Cc3wRG1VR8a8olosscM /HfbUuNQI+llbmFmicxM+QPyLyXg7/fLlp3Os/+vufDqv3g9DL11VtYxqphOOw== 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 4Q6ZCK6f4dzH11; Thu, 27 Apr 2023 12:03:57 +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 33RC3vwN046143; Thu, 27 Apr 2023 12:03:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33RC3v4M046142; Thu, 27 Apr 2023 12:03:57 GMT (envelope-from git) Date: Thu, 27 Apr 2023 12:03:57 GMT Message-Id: <202304271203.33RC3v4M046142@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: 8ae71fbb3355 - main - graphics/osg*: 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: 8ae71fbb335508c140898af9da2d50e8a19cfce0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=8ae71fbb335508c140898af9da2d50e8a19cfce0 commit 8ae71fbb335508c140898af9da2d50e8a19cfce0 Author: Daniel Engberg AuthorDate: 2023-04-27 09:40:57 +0000 Commit: Daniel Engberg CommitDate: 2023-04-27 12:01:42 +0000 graphics/osg*: Move to FFmpeg 4 Fails to build with FFmpeg 6 PR: 270207 Approved by: portmgr (blanket, build fix) Sponsored by: Blinkinblox --- graphics/osg/Makefile | 4 +++- graphics/osg/files/patch-CMakeModules_FindFFmpeg.cmake | 10 ++++++++++ graphics/osg34/Makefile | 6 ++++-- graphics/osg34/files/patch-CMakeModules_FindFFmpeg.cmake | 10 ++++++++++ 4 files changed, 27 insertions(+), 3 deletions(-) diff --git a/graphics/osg/Makefile b/graphics/osg/Makefile index e169534ec600..e9672246f0f3 100644 --- a/graphics/osg/Makefile +++ b/graphics/osg/Makefile @@ -54,7 +54,7 @@ COLLADA_DESC= COLLADA (dae) format support CURL_LIB_DEPENDS= libcurl.so:ftp/curl CURL_VARS= FORCE_REQUIRE+=CURL CURL_VARS_OFF= FORCE_IGNORE+=CURL -FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg +FFMPEG_LIB_DEPENDS= libavcodec.so.58:multimedia/ffmpeg4 FFMPEG_VARS= FORCE_REQUIRE+=FFmpeg FFMPEG_VARS_OFF= FORCE_IGNORE+=FFmpeg FREETYPE_LIB_DEPENDS= libfreetype.so:print/freetype2 @@ -148,6 +148,8 @@ post-patch: ${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' @${REINPLACE_CMD} -e '/FIND_LIBRARY.*DL_LIBRARY/ d; \ s|-pedantic||' ${WRKSRC}/CMakeLists.txt + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ + ${PATCH_WRKSRC}/CMakeModules/FindFFmpeg.cmake .for p in ${FORCE_REQUIRE} @${REINPLACE_CMD} -e '/FIND_PACKAGE.*${p}/ s|)$$| REQUIRED&|' \ ${WRKSRC}/CMakeLists.txt diff --git a/graphics/osg/files/patch-CMakeModules_FindFFmpeg.cmake b/graphics/osg/files/patch-CMakeModules_FindFFmpeg.cmake new file mode 100644 index 000000000000..21ea506f30a7 --- /dev/null +++ b/graphics/osg/files/patch-CMakeModules_FindFFmpeg.cmake @@ -0,0 +1,10 @@ +--- CMakeModules/FindFFmpeg.cmake.orig 2023-04-24 09:16:25 UTC ++++ CMakeModules/FindFFmpeg.cmake +@@ -21,6 +21,7 @@ + # (in new version case, use by ffmpeg header) + #and ${FFMPEG_libname_INCLUDE_DIRS/libname} (in new version case, use by osg plugin code) + ++set(CMAKE_PREFIX_PATH "%%LOCALBASE%%/ffmpeg4;%%LOCALBASE%%/ffmpeg4/libexec") + + # Macro to find header and lib directories + # example: FFMPEG_FIND(AVFORMAT avformat avformat.h) diff --git a/graphics/osg34/Makefile b/graphics/osg34/Makefile index 51ba61a83cbf..b6d2e29baacd 100644 --- a/graphics/osg34/Makefile +++ b/graphics/osg34/Makefile @@ -23,7 +23,7 @@ GH_PROJECT= OpenSceneGraph CONFLICTS_INSTALL=osg -USES= alias cmake compiler:c++11-lang gl jpeg pkgconfig xorg +USES= alias cmake compiler:c++11-lang gl jpeg localbase pkgconfig xorg USE_GL= gl glu USE_XORG= x11 USE_LDCONFIG= yes @@ -54,7 +54,7 @@ OPTIONS_SUB= yes CURL_LIB_DEPENDS= libcurl.so:ftp/curl CURL_VARS= FORCE_REQUIRE+=CURL CURL_VARS_OFF= FORCE_IGNORE+=CURL -FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg +FFMPEG_LIB_DEPENDS= libavcodec.so.58:multimedia/ffmpeg4 FFMPEG_VARS= FORCE_REQUIRE+=FFmpeg FFMPEG_VARS_OFF= FORCE_IGNORE+=FFmpeg FREETYPE_LIB_DEPENDS= libfreetype.so:print/freetype2 @@ -138,6 +138,8 @@ post-patch: ${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' @${REINPLACE_CMD} -e '/FIND_LIBRARY.*DL_LIBRARY/ d' \ ${WRKSRC}/CMakeLists.txt + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ + ${PATCH_WRKSRC}/CMakeModules/FindFFmpeg.cmake .for p in ${FORCE_REQUIRE} @${REINPLACE_CMD} -e '/FIND_PACKAGE.*${p}/ s|)$$| REQUIRED&|' \ ${WRKSRC}/CMakeLists.txt diff --git a/graphics/osg34/files/patch-CMakeModules_FindFFmpeg.cmake b/graphics/osg34/files/patch-CMakeModules_FindFFmpeg.cmake new file mode 100644 index 000000000000..8877dac1de45 --- /dev/null +++ b/graphics/osg34/files/patch-CMakeModules_FindFFmpeg.cmake @@ -0,0 +1,10 @@ +--- CMakeModules/FindFFmpeg.cmake.orig 2023-04-24 09:18:12 UTC ++++ CMakeModules/FindFFmpeg.cmake +@@ -21,6 +21,7 @@ + # (in new version case, use by ffmpeg header) + #and ${FFMPEG_libname_INCLUDE_DIRS/libname} (in new version case, use by osg plugin code) + ++set(CMAKE_PREFIX_PATH "%%LOCALBASE%%/ffmpeg4;%%LOCALBASE%%/ffmpeg4/libexec") + + # Macro to find header and lib directories + # example: FFMPEG_FIND(AVFORMAT avformat avformat.h)