From nobody Sat Apr 16 04:25:13 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 486F97CEAC5; Sat, 16 Apr 2022 04:25:15 +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 4KgKqZ3JzLz3PF1; Sat, 16 Apr 2022 04:25:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650083114; 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=cGde0/NQj8biLFvg68LUMdXTHiV6E+faHOQb5fJJ5wc=; b=SkQ3qUSZnUSfFDjLyCULS/OG6W2jxtDt9Au/jTeVMCJwvhyTjQWJUqDN6vPAZdsnRrt69G 1YPi6kaVD1L3u8SQ4qZKR/4zmGfiAnG6j5a3ex0PbkEetMkMXgjS+6TiWjzrWoRT5uu2sE L5ERCRTsILsTa2Y4Pb/N++aUVR/OY48ZwAC8ef6A8k4kQTPjKsTqmQF+Cke9fVksg2sktq 1L2qOGXvcnZbQB7TlUaHrWOqk7AvyPsHkGlQleExhvoT65XIcFr29hE8adnExApjcNV453 QOkD8wyKfFsSDPkOpcVJr6aQg48W+orSPEIL2s4aySY4hMWRpFrRhvr8RFBajg== 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 E0F9B22FA3; Sat, 16 Apr 2022 04:25:13 +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 23G4PDiR008490; Sat, 16 Apr 2022 04:25:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23G4PD3D008489; Sat, 16 Apr 2022 04:25:13 GMT (envelope-from git) Date: Sat, 16 Apr 2022 04:25:13 GMT Message-Id: <202204160425.23G4PD3D008489@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 7f9a658424ac - main - graphics/devil: Fix build with jasper 3.0.2 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: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7f9a658424acdd1918db1bff6e4cb236c7ac33c5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650083114; 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=cGde0/NQj8biLFvg68LUMdXTHiV6E+faHOQb5fJJ5wc=; b=pJXzizueQoVQXEVVfmYiwY9zQWSl829QugNyVAfk+43WC3rJAepdcz/+UIrpBaZrekaLTm A5fnWY4upKB9tpSZxuGWx9JRxjYkrewk8cqS8iTrs9n7bvOFgA4rzdmMDR9pNq6BcSBE0W 1C0FYa4dx8g6ZILlTxPoKiEMw8H8f1hk9l0EVi3hOpePSY4zjx5aSEfmtixonlxW1HguX0 o0CdWvgJZyf5WiV9CQwa5CcL59Ed//R4P7yzQK4gKL1MgQUxWiyC2tgKBo16aDPSNr87/Y YiLf4nCZ/0EzXlgbt5ZxrN34GsX7dJbkoHAwrBehn0FWOhlvxCZ38rIE5+ZqZw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650083114; a=rsa-sha256; cv=none; b=ixst/dYck2YbbRUJ8l0aPiSbsXyniZZnh98tJV89iB/hFfvGqyiulDL+3apwSzaRBBG0FN aKL1+g+SPRLSUVy6kBPDUqxQpNYgF1QKmm5wF+SoDW3Cv+UdxZgJtC9Y/GiX70Gvl67rPt gBM7qVBV6RSY7sm4H/qaLDUK3bFGHEfjrtfvXoLWYzMAVYwUkWS4vA8Palss4VmM7GHpFv TVkiOnIOjLphZPiOD7+58oMAUMyksZ5etN7tFtalJom5ZLpi9YIMCzcpXC9mAuw6gFCe+x 5csTb+KalDhLvsO43jvsqzskz+4dWt3IL3mW1aAc+yQJ5jb/CIQzimFlNYEw6Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=7f9a658424acdd1918db1bff6e4cb236c7ac33c5 commit 7f9a658424acdd1918db1bff6e4cb236c7ac33c5 Author: Po-Chuan Hsieh AuthorDate: 2022-04-16 04:14:59 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-04-16 04:19:51 +0000 graphics/devil: Fix build with jasper 3.0.2 Approved by: portmgr (blanket) --- graphics/devil/files/patch-DevIL_src-IL_src_il__jp2.cpp | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/graphics/devil/files/patch-DevIL_src-IL_src_il__jp2.cpp b/graphics/devil/files/patch-DevIL_src-IL_src_il__jp2.cpp index 664d07fdff1a..2a61a2897c30 100644 --- a/graphics/devil/files/patch-DevIL_src-IL_src_il__jp2.cpp +++ b/graphics/devil/files/patch-DevIL_src-IL_src_il__jp2.cpp @@ -1,18 +1,27 @@ --- DevIL/src-IL/src/il_jp2.cpp.orig 2017-01-01 23:37:37 UTC +++ DevIL/src-IL/src/il_jp2.cpp -@@ -314,13 +314,13 @@ ILboolean iLoadJp2Internal(jas_stream_t *Stream, ILima - +@@ -313,14 +313,21 @@ ILboolean iLoadJp2Internal(jas_stream_t *Stream, ILima + } +- -static int iJp2_file_read(jas_stream_obj_t *obj, char *buf, int cnt) -+static int iJp2_file_read(jas_stream_obj_t *obj, char *buf, unsigned int cnt) ++#if JAS_VERSION_MAJOR >= 3 ++static ssize_t iJp2_file_read(jas_stream_obj_t *obj, char *buf, size_t cnt) ++#else ++static int iJp2_file_read(jas_stream_obj_t *obj, char *buf, unsigned long cnt) ++#endif { obj; return iread(buf, 1, cnt); } -static int iJp2_file_write(jas_stream_obj_t *obj, char *buf, int cnt) -+static int iJp2_file_write(jas_stream_obj_t *obj, const char *buf, unsigned int cnt) ++#if JAS_VERSION_MAJOR >= 3 ++static ssize_t iJp2_file_write(jas_stream_obj_t *obj, const char *buf, size_t cnt) ++#else ++static int iJp2_file_write(jas_stream_obj_t *obj, const char *buf, unsigned long cnt) ++#endif { obj; return iwrite(buf, 1, cnt);