From nobody Mon Jul 18 15:26:15 2022 X-Original-To: dev-commits-ports-all@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 4Lmm5N2PL1z4TS2c; Mon, 18 Jul 2022 15:26:16 +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 4Lmm5M6pMjz3FxQ; Mon, 18 Jul 2022 15:26:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658157976; 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=MAW29Jk2Otu+pKwFlZJkieA1X9HLoXmz+0OgEefSp/E=; b=yg1CQKlV47wqNQrP2KCrDCNya1znwWhe6CCjYCc3VsJGdZSU1IDmFPhLhXXgUaXCfK8ygW VIArWHBm1NagnOfhKc9mhUMRCSjsAwnT4ndH8Pm9LeMOIpGfZDwBZq0YEo3RKhN5r1npDQ N6SNL4P/vm2sBH2paRRvY+8EEwSDoZ53k6gGFsMbFPqwddcyJYdlXlY0NrgM3kXAxkZRLi NRGl67n/j5AFaXwhwTHc7VOLQYFB5HxrGN3Ks6oFPIjdljyikRgkg8HhOtoskZj53Jv4rm 9uR/MCEvY8txame8299VspSc8SyTJpeNJawG2BAu7Jbs1UaV18PFiFBseKxpRQ== 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 4Lmm5M5s4jzkLf; Mon, 18 Jul 2022 15:26:15 +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 26IFQFAO001467; Mon, 18 Jul 2022 15:26:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26IFQF1j001466; Mon, 18 Jul 2022 15:26:15 GMT (envelope-from git) Date: Mon, 18 Jul 2022 15:26:15 GMT Message-Id: <202207181526.26IFQF1j001466@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Fernando=20Apestegu=C3=ADa?= Subject: git: cd714f2f4e30 - main - graphics/leptonica: fix build with openjpeg 2.5.0 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cd714f2f4e30a136df40f77eafd79448ca11c90a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658157976; 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=MAW29Jk2Otu+pKwFlZJkieA1X9HLoXmz+0OgEefSp/E=; b=dIMGFepYz7pRB3RwiavqDPpsdI7ZQ7v7kHn2dPxeHY++j0x5RtyVpES8AX0IVZETABkVSf GGxUESbrZ/HlZHNItKNYUWTw9WW2dUF9DLah4zAFTDq6W17syUvKj8FgiYGuXu6zNriwv2 o5aHy6PGOayG0C0GuucbeItOK+FX96c3yJZKde48mRjWLp7tiO96nWNkFEFytavMiGDaHU bIxJ5JiHxZDXJOd+30vC7M8VgkzCM5fCLu6Ne7vsj54qE1g0CESmSwXoMtn7Q4991jE1VW /vr/c8n/QjSsCeZbWVUlIWvtMkVorat/JSzNcEHuhS0wt+ExYovh2RZnRZS9hA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658157976; a=rsa-sha256; cv=none; b=CS8ovBLX7XBw8x6hVVkaWcZ4jawfjmzDZjiMHBfOrD2Mx3hizlphG9UwKEB1y/dDcSid/Q jP88OVTv5W9XHRziVDHGw6ueE8Kmgl54M8gHrJVIQEhnmF4BWFZEPEbvRb8wZOlYJuVwl/ lhvBwLY50aPpJWYP7a4EDH6SQFdFkzWKtreuEdCLRRmYdy2lorXxqVwf/LUEmHZY2K4q8z aHSfJkKRaBLjYhrJ/6vzdLAQh+S3O90BNsEEhMYe/4SGRoz0kdvZBUeGk4IUqH0fDyp8WE K0F67p8DQSE8WgAmxkGYxLPExm40SpkUlov3nd0w8/3YHfZInQjYSW+rg/Ut8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=cd714f2f4e30a136df40f77eafd79448ca11c90a commit cd714f2f4e30a136df40f77eafd79448ca11c90a Author: VVD AuthorDate: 2022-07-18 08:54:30 +0000 Commit: Fernando Apesteguía CommitDate: 2022-07-18 15:23:17 +0000 graphics/leptonica: fix build with openjpeg 2.5.0 ChangeLog: https://github.com/DanBloomberg/leptonica/issues/623 Fix detection of openjpeg 2.5.0 PR: 264684 Reported by: vvd@unislabs.com Approved by: hiroto.kagotani@gmail.com (maintainer, timeout > 1 month) --- graphics/leptonica/files/patch-openjpeg-2.5 | 59 +++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/graphics/leptonica/files/patch-openjpeg-2.5 b/graphics/leptonica/files/patch-openjpeg-2.5 new file mode 100644 index 000000000000..4b4e95a9457e --- /dev/null +++ b/graphics/leptonica/files/patch-openjpeg-2.5 @@ -0,0 +1,59 @@ +diff -u CMakeLists.txt.orig CMakeLists.txt +--- CMakeLists.txt.orig ++++ CMakeLists.txt +@@ -141,6 +141,17 @@ + set(HAVE_LIBJP2K 1) + endif() + endif() ++ if(NOT JP2K) ++ find_path(JP2K_INCLUDE_DIR /openjpeg-2.5/openjpeg.h) ++ find_library(JP2K_LIBRARY NAMES openjp2) ++ if (JP2K_INCLUDE_DIR AND JP2K_LIBRARY) ++ set(JP2K 1) ++ set(JP2K_FOUND TRUE) ++ set(JP2K_LIBRARIES ${JP2K_LIBRARY}) ++ set(JP2K_INCLUDE_DIRS ${JP2K_INCLUDE_DIR}) ++ set(HAVE_LIBJP2K 1) ++ endif() ++ endif() + set(libs_private "${libs_private} -lopenjp2") + endif() + endif() +diff -u cmake/Configure.cmake.orig cmake/Configure.cmake +--- cmake/Configure.cmake.orig ++++ cmake/Configure.cmake +@@ -69,6 +69,7 @@ + openjpeg-2.2/openjpeg.h + openjpeg-2.3/openjpeg.h + openjpeg-2.4/openjpeg.h ++ openjpeg-2.5/openjpeg.h + ) + check_includes(include_files_list) + +@@ -146,7 +147,9 @@ + /* Define to 1 if you have zlib. */ + #cmakedefine HAVE_LIBZ 1 + +-#if defined(HAVE_OPENJPEG_2_4_OPENJPEG_H) ++#if defined(HAVE_OPENJPEG_2_5_OPENJPEG_H) ++#define LIBJP2K_HEADER ++#elif defined(HAVE_OPENJPEG_2_4_OPENJPEG_H) + #define LIBJP2K_HEADER + #elif defined(HAVE_OPENJPEG_2_3_OPENJPEG_H) + #define LIBJP2K_HEADER +diff -u config/config.h.in.orig config/config.h.in +--- config/config.h.in.orig ++++ config/config.h.in +@@ -51,6 +51,12 @@ + /* Define to 1 if you have the header file. */ + #undef HAVE_OPENJPEG_2_3_OPENJPEG_H + ++/* Define to 1 if you have the header file. */ ++#undef HAVE_OPENJPEG_2_4_OPENJPEG_H ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_OPENJPEG_2_5_OPENJPEG_H ++ + /* Define to 1 if you have the header file. */ + #undef HAVE_STDINT_H +