From nobody Sun May 7 05:18:57 2023 X-Original-To: dev-commits-ports-branches@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 4QDXlP3swnz49h24; Sun, 7 May 2023 05:18:57 +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 4QDXlP3Nl6z3vKX; Sun, 7 May 2023 05:18:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683436737; 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=xEbIwLGyNzX+QH/QsmaF6XqdsBRkGyV04tvWvKpRQOk=; b=ErxM75O893j06cGudDzwFyXGxVl71abhFHUHXui6o62UEb26+i8tJP8+G7IP3poJ2RIR/C I3shdRuOj6uqNSNMrVTeMoiSXAyM8M1ld7Yj/bPCSiMpOI9R2+gPpEJNEnGcJQVX+Z2l92 Wl7KkgDvVDn/eJ/FWZg7igcsWR6aJGiq3SEP+D8W7Pmy/XvtJ2lAvwmDjSe/ArRVjc6URU A0QBGO2fxgGxWazqoqZGXNDQsZjUN8aYZv36+wHR2H9TfH66ScLS5Dj0At2Jt1FmnmV9So MAcKgPI1ZDGOIaKymwdASL4R0WmlZd5/O1nmA3yvZn2qvih0Nr/zkLqBO8ye8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683436737; 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=xEbIwLGyNzX+QH/QsmaF6XqdsBRkGyV04tvWvKpRQOk=; b=ua0zU+X4i51hC7sm+kgnqc3qyRyuwwdDtUlYdgSnkUtirDUmViE1pVmb/KeqNXy5bQCi/u opmmGSAawp3aCsLHwGXcF8M1latxNN1a2UcIma5h9XRKm9Qgj8r0iUGNTXHs4pVDYjUo9Y dmYoIauYXpKCPEcYLbcHagSZCZavXN4QPDnTaDWpuFQYqsYArfEXB7fkjqDIsCEvsTNbOJ 55J50iOo2q0eunDGjVXXnT64P+SSUiXGqkzn/ZGUcRxrcAfd8lvcumm1RedAqnWtEyAmjH MdF4L7CSuWeoA6TL/pMX4GHiAGRKT+y9yUSmAVR9+slx/sP/R+VS6y89OW6F5g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683436737; a=rsa-sha256; cv=none; b=w/EqrODn2cfh4ezP4UZ2+0C2tUxXInP8cB05MUK3nPKs9cDrdO1l9R5XMi48u2lr4NxAOS qAVa8z9veCeUOFTFJpQf+dvaGJyvTk9mqogsUkQke5HCXaw22EGDeSTHoLJsaIgx6ILAa3 pwY9thc8qoLG/ZxXOpurxxqvNHD/AEY83wbCKp0wpVNtDs9y2r8kBL6CDFXQyx4cvL5Ywx QFByJlGg7WpnGjEHEtEbEYkZdxdAwcndV94Y0GVsNuUzd6XBRt8vnNAoU0028eBrYLGEXG yRUIZrmdcC9lom7tpbl8vQ5L8JR1p23qh0uRHce4q4qrKmLl7oA+V4WLInQHsA== 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 4QDXlP28Stz15bW; Sun, 7 May 2023 05:18: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 3475IvVU054942; Sun, 7 May 2023 05:18:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3475Ivl2054941; Sun, 7 May 2023 05:18:57 GMT (envelope-from git) Date: Sun, 7 May 2023 05:18:57 GMT Message-Id: <202305070518.3475Ivl2054941@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: c5c27487bb1b - 2023Q2 - graphics/libyuv: track libjpeg dependency List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q2 X-Git-Reftype: branch X-Git-Commit: c5c27487bb1bf1e4df343a7a2f976c3cf73b5d78 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q2 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=c5c27487bb1bf1e4df343a7a2f976c3cf73b5d78 commit c5c27487bb1bf1e4df343a7a2f976c3cf73b5d78 Author: Jan Beich AuthorDate: 2023-05-07 05:10:21 +0000 Commit: Jan Beich CommitDate: 2023-05-07 05:18:53 +0000 graphics/libyuv: track libjpeg dependency -- Found JPEG: /usr/local/lib/libjpeg.so (found version "80") [...] Error: /usr/local/bin/yuvconvert is linked to /usr/local/lib/libjpeg.so.8 from graphics/jpeg-turbo but it is not declared as a dependency Warning: you need USES+=jpeg PR: 267163 (cherry picked from commit 78d127100976a6e431088b58b887c297ccf87573) --- graphics/libyuv/Makefile | 7 +++++++ graphics/libyuv/files/patch-CMakeLists.txt | 18 ++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/graphics/libyuv/Makefile b/graphics/libyuv/Makefile index b9cd848610cb..50c7be667514 100644 --- a/graphics/libyuv/Makefile +++ b/graphics/libyuv/Makefile @@ -10,6 +10,7 @@ PORTNAME= libyuv DISTVERSION= 0.0.1789 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= LOCAL/mikael/libyuv/:libyuv \ LOCAL/tcberner/libyuv/:libyuv @@ -28,6 +29,12 @@ SUB_LIST= DISTVERSION=${DISTVERSION} LIBYUV_HASH= 0896c34873e83ca3d1690286a94e278a81d0a760 +OPTIONS_DEFINE= JPEG +OPTIONS_DEFAULT=JPEG + +JPEG_USES= jpeg +JPEG_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_JPEG + # sha256 changes everytime you download the archive, need to host it on freefall # To download the distfile: as mikael: make MAINTAINER_MODE=yes fetch .if defined(MAINTAINER_MODE) diff --git a/graphics/libyuv/files/patch-CMakeLists.txt b/graphics/libyuv/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..f8bfd4ded342 --- /dev/null +++ b/graphics/libyuv/files/patch-CMakeLists.txt @@ -0,0 +1,18 @@ +https://chromium.googlesource.com/libyuv/libyuv.git/+/c365da9c6c3a%5E!/ +https://chromium.googlesource.com/libyuv/libyuv.git/+/f428a642e3d8%5E!/ + +--- CMakeLists.txt.orig 2021-10-26 08:34:37 UTC ++++ CMakeLists.txt +@@ -35,10 +35,10 @@ TARGET_LINK_LIBRARIES ( yuvconvert ${ly_lib_static} ) + TARGET_LINK_LIBRARIES ( yuvconvert ${ly_lib_static} ) + + +-INCLUDE ( FindJPEG ) ++find_package ( JPEG ) + if (JPEG_FOUND) + include_directories( ${JPEG_INCLUDE_DIR} ) +- target_link_libraries( yuvconvert ${JPEG_LIBRARY} ) ++ target_link_libraries( ${ly_lib_shared} ${JPEG_LIBRARY} ) + add_definitions( -DHAVE_JPEG ) + endif() +