From nobody Thu Apr 27 12:04:05 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 4Q6ZCV26Nqz474RS; Thu, 27 Apr 2023 12:04:06 +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 4Q6ZCV0dh6z3lY9; Thu, 27 Apr 2023 12:04:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682597046; 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=PlZ1oupE+0Q2bL6UzVm5jFh9hZF8HZ3fms3o7oLzkw8=; b=PD/OeW6kUcIGztZI960Xg+28NBdDzPsYI7/WMZOIhHO0rc5FYk2PSKx7thJ7YFHBuk/oHQ S1sqWUgz/ZQp2OF0GHM1Hr9B3ineXEwNGTzPNFUn/x3pIa+0sO3CqRLhoqNqANEgSNZk8h kHoyi9xC7RC9WMzUSGNaJoBOnfNPjpysl7dElscO9o84A1S2rtr+PPQDHFP3oTkruDQ0eX 2DZEzCdEtQtT7ukqo1OkgerGq8SBjv62MC/t/7zLIryNmHfRZlFeyMmiacZaw3NooEUBFp FMA4vlM8PlU84ghk0S+OFIyyoc5ykh/Eb9ZRX3iIhBe+/Yl9Sn2ri494kT+kxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682597046; 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=PlZ1oupE+0Q2bL6UzVm5jFh9hZF8HZ3fms3o7oLzkw8=; b=cFnZvdlpl1PUqJoxh9ih5CK7+fnWgUz10R/PwBWO/mcuGHhwWC/jSu7p1jar7mFj9qmcqL 1TsQmpBxHRR6b2UdiA2Qi5jXCGjRKXS8NfoK6WMHifg6yEhcpme3xMfsP1nZTq+UYM8bHi kZSLZcDMBnafu4GmakQjxMaPpEG4YCA8Ua3mpq0njeXThZySIWyNIz2euTn8G4X7w+LR/m oBsP//jTzXbwwtt3VDhoM5yEdhsDw34/VNc25/qNYQZ0MkxgpRY3mI3q5maA8+TJRD8AsA XrT/QCTM2kK9ICGYTEkypoB/7fh/Ti79l9pEDttPHbnpK0VTwyUqo683wdONHw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682597046; a=rsa-sha256; cv=none; b=EGuIV6E5WsEo15FjJUUN5pf69vBGyA3xyAz6DrFhGXmoxuGxHaHO6ZTAil/Lh8VKrQlvgH kCCnd3eNdmZTy0PZZCiujDwwuxWQGBmXMyKRsuEiYb7YHmnGqUo4wubpy4gTKAcGj8zvdy B7p5ngClpLqBsu5yQs0EspevDRn/KRHqM9UHo315cql7X1h3G8s87eFb2qFHCln4Jb9lbh BpClugxsUb3YGTxM9/UyQESO+OHqLJ6RrQFnwj6b4b2Rg7P55sIwDIJbXMr02VBnQ/H/ve JWKQQz+3853gab3PzbFdnx/8mlCSV9mhZpbp6FbybMUPq4pqIYUHei9qjJ1lmw== 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 4Q6ZCT6XtczH6B; Thu, 27 Apr 2023 12:04:05 +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 33RC45t6046282; Thu, 27 Apr 2023 12:04:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33RC45Gk046281; Thu, 27 Apr 2023 12:04:05 GMT (envelope-from git) Date: Thu, 27 Apr 2023 12:04:05 GMT Message-Id: <202304271204.33RC45Gk046281@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: f1a196b59cb5 - main - multimedia/nordlicht: 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: f1a196b59cb5d07606ce3dd7da8d54aaef74b9aa Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=f1a196b59cb5d07606ce3dd7da8d54aaef74b9aa commit f1a196b59cb5d07606ce3dd7da8d54aaef74b9aa Author: Daniel Engberg AuthorDate: 2023-04-27 10:04:36 +0000 Commit: Daniel Engberg CommitDate: 2023-04-27 12:01:43 +0000 multimedia/nordlicht: Move to FFmpeg 4 Fails to build with FFmpeg 6 PR: 261302 Reported by: antoine (via exp-run) Approved by: portmgr (blanket, build fix) Sponsored by: Blinkinblox --- multimedia/nordlicht/Makefile | 11 ++++++----- multimedia/nordlicht/files/patch-cmake_FindFFmpeg.cmake | 11 +++++++++++ 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/multimedia/nordlicht/Makefile b/multimedia/nordlicht/Makefile index 3429d9c8f1ec..83bc12696932 100644 --- a/multimedia/nordlicht/Makefile +++ b/multimedia/nordlicht/Makefile @@ -12,13 +12,13 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE.md BUILD_DEPENDS= help2man:misc/help2man -LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ +LIB_DEPENDS= libavcodec.so.58:multimedia/ffmpeg4 \ libpopt.so:devel/popt \ libpng.so:graphics/png USE_GITHUB= yes -USES= cmake pkgconfig shebangfix +USES= cmake pathfix pkgconfig shebangfix USE_LDCONFIG= yes PLIST_SUB= PORTVERSION=${PORTVERSION} @@ -28,9 +28,10 @@ SHEBANG_FILES= utils/mpv-nordlicht OPTIONS_DEFINE= EXAMPLES post-patch: - @${REINPLACE_CMD} \ - -e 's|$${CMAKE_INSTALL_LIBDIR}/pkgconfig|libdata/pkgconfig|' \ - -e 's|share/man/man1|man/man1|' ${WRKSRC}/CMakeLists.txt + @${REINPLACE_CMD} -e 's|share/man/man1|man/man1|' \ + ${PATCH_WRKSRC}/CMakeLists.txt + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ + ${PATCH_WRKSRC}/cmake/FindFFmpeg.cmake post-install: @cd ${WRKSRC}/utils && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} diff --git a/multimedia/nordlicht/files/patch-cmake_FindFFmpeg.cmake b/multimedia/nordlicht/files/patch-cmake_FindFFmpeg.cmake new file mode 100644 index 000000000000..9972f1ada037 --- /dev/null +++ b/multimedia/nordlicht/files/patch-cmake_FindFFmpeg.cmake @@ -0,0 +1,11 @@ +--- cmake/FindFFmpeg.cmake.orig 2023-04-25 07:25:17 UTC ++++ cmake/FindFFmpeg.cmake +@@ -26,6 +26,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(FindPackageHandleStandardArgs) + + # The default components were taken from a survey over other FindFFMPEG.cmake files