From nobody Fri Aug 16 15:17:00 2024
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 4Wllvw23Jxz5T5X7;
Fri, 16 Aug 2024 15:17:00 +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 "R11" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4Wllvw1HBSz4Yy9;
Fri, 16 Aug 2024 15:17:00 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1723821420;
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=bG6miub6urS/Sgzz5whLPhveue7Do+zxfZnLF9w0LGE=;
b=ZGvt9QIWd6XZEfikdJiB/ND25r0x9vXvHiTh67B57RrB0YToIW9HW9os3jgtDfSDK3geTp
tMheP7a70LBp8z/wzP1xXIlShEIYh2jBySzLnEc6Nr3MHyLKQ4wfNdMFypZvr01U3tlaom
BMRM8hcdk5q3HbRppgr8GNSVtx097IUDDL9L0gbaUvRpHW/IZdhN0ZkqTAdYDNESw8UFPw
iU8yEpwCpCH4p+yWsHb1o52u7keFwwFHApzS4ERo5OJFdyzHKhOVWCwvjwKnkmg4o2rHl6
VNeaSMv8DaKCw47vrIQZx0nwveWeTyLkrWDoFRzrrJ5/pYA9E2Sjc/t8IXvOmQ==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723821420; a=rsa-sha256; cv=none;
b=A8xI7LPCQ37uOLzrdLrb1OQMCgLKgt0DQTrLLjEckQ+BVdEZ38yutPKOztMh/03ORSFTby
DDJYB2VZbmIHDuqxMfGQybk/7sngr2+MTG/OAtoqdYDPss9+UzVjjAwTLPNNN4dktOp1Y1
Aml1GflrAYI7py0OPWOm+sULNY6hJRZwuqoHZG3gA8jGDN+kBDc0Ws1OwD15t5C40mA6GB
Kc5ndSRwTotzfUwqSfMrW+MEvRmKLt4g91s0URu4yiaoxPmCbmAyMZ5t3CAJZBNw1UK4FW
72dGodz43n4zsEQUImhJqnEomvSG2tRzcoqRCbZgeQvzFDEk9eglVs08mFZnsg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1723821420;
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=bG6miub6urS/Sgzz5whLPhveue7Do+zxfZnLF9w0LGE=;
b=yhsWQ0pzy2nab4qLcvsxosunja9ddw4R2KCZmuG3wVcYm7EMJiEFq4z1BaBySCxE6++4QJ
sQAHT7DsARYbAITuzzfwwLAi2PH8c15jlAWHT3tkkqUYekck8e0NEphU9N5yaFEYrqo+Fx
t2NuzHMUoGoy+728CMX3xgxU9E7hdubwqsn60QypJGyalaEvwWGTRXFWB9wPYZbh93dqL2
T6HYFKqAOEDtsLKpTLeju6UyhimIIepxJxBS09hTLqg46ZDqJrt8oqEYX5kEBPgdV6JeGQ
zMyuVxXuQqJqzohNnQhodPuqWFpv6VevGZ/AIO+X0g/rwqEhDYrLtgBv5qzdCg==
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 4Wllvw0t2Dz1B4S;
Fri, 16 Aug 2024 15:17:00 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47GFH0sP045128;
Fri, 16 Aug 2024 15:17:00 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47GFH0sq045123;
Fri, 16 Aug 2024 15:17:00 GMT
(envelope-from git)
Date: Fri, 16 Aug 2024 15:17:00 GMT
Message-Id: <202408161517.47GFH0sq045123@gitrepo.freebsd.org>
To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org,
dev-commits-ports-main@FreeBSD.org
From: Dirk Meyer <dinoex@FreeBSD.org>
Subject: git: f6f3393e5107 - main - graphics/xv: update to 6.0.0
List-Id: Commit messages for all branches of the ports repository <dev-commits-ports-all.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all
List-Help: <mailto:dev-commits-ports-all+help@freebsd.org>
List-Post: <mailto:dev-commits-ports-all@freebsd.org>
List-Subscribe: <mailto:dev-commits-ports-all+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-ports-all+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-ports-all@freebsd.org
Sender: owner-dev-commits-ports-all@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: dinoex
X-Git-Repository: ports
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: f6f3393e5107446d424fe3bc905eb411fed92ae4
Auto-Submitted: auto-generated
The branch main has been updated by dinoex:
URL: https://cgit.FreeBSD.org/ports/commit/?id=f6f3393e5107446d424fe3bc905eb411fed92ae4
commit f6f3393e5107446d424fe3bc905eb411fed92ae4
Author: Dirk Meyer <dinoex@FreeBSD.org>
AuthorDate: 2024-08-16 15:16:52 +0000
Commit: Dirk Meyer <dinoex@FreeBSD.org>
CommitDate: 2024-08-16 15:16:52 +0000
graphics/xv: update to 6.0.0
---
graphics/xv/Makefile | 2 +-
graphics/xv/distinfo | 6 +++---
graphics/xv/files/patch-xvjpeg.c | 14 +++++++-------
graphics/xv/files/patch-xvtext.c | 11 -----------
graphics/xv/files/patch-xvvd.c | 15 +++++++--------
5 files changed, 18 insertions(+), 30 deletions(-)
diff --git a/graphics/xv/Makefile b/graphics/xv/Makefile
index b4bf646d0a9c..d3fa034d2ad1 100644
--- a/graphics/xv/Makefile
+++ b/graphics/xv/Makefile
@@ -1,5 +1,5 @@
PORTNAME= xv
-PORTVERSION= 5.2.0
+PORTVERSION= 6.0.0
DISTVERSIONPREFIX= v
PORTREVISION= 0
CATEGORIES+= graphics
diff --git a/graphics/xv/distinfo b/graphics/xv/distinfo
index b78b158e3fdf..b805771c131d 100644
--- a/graphics/xv/distinfo
+++ b/graphics/xv/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1719760817
-SHA256 (xv/jasper-software-xv-v5.2.0_GH0.tar.gz) = 6eaaf726e89d519fcfa49a4195d09f542efaec38d6659d6887e3ba6f1ff0cbae
-SIZE (xv/jasper-software-xv-v5.2.0_GH0.tar.gz) = 4785784
+TIMESTAMP = 1723749811
+SHA256 (xv/jasper-software-xv-v6.0.0_GH0.tar.gz) = 4adcc73d7472daab434b596b4c14588df89ad216a8857bca2d5f22722cb7df1b
+SIZE (xv/jasper-software-xv-v6.0.0_GH0.tar.gz) = 5051786
diff --git a/graphics/xv/files/patch-xvjpeg.c b/graphics/xv/files/patch-xvjpeg.c
index 44fcd6566080..9def7d7f9cdb 100644
--- a/graphics/xv/files/patch-xvjpeg.c
+++ b/graphics/xv/files/patch-xvjpeg.c
@@ -1,18 +1,18 @@
---- src/xvjpeg.c.orig 2023-07-17 01:25:42 UTC
+--- src/xvjpeg.c.orig 2024-08-12 21:10:49 UTC
+++ src/xvjpeg.c
@@ -699,7 +699,7 @@ L2:
- if ((cmy = *q++ - k) < 0) cmy = 0; *p++ = cmy; /* R */
- if ((cmy = *q++ - k) < 0) cmy = 0; *p++ = cmy; /* G */
- if ((cmy = *q++ - k) < 0) cmy = 0; *p++ = cmy; /* B */
+ if ((cmy = *q++ - k) < 0) { cmy = 0; } *p++ = cmy; /* R */
+ if ((cmy = *q++ - k) < 0) { cmy = 0; } *p++ = cmy; /* G */
+ if ((cmy = *q++ - k) < 0) { cmy = 0; } *p++ = cmy; /* B */
- } while (++q <= pic_end);
+ } while (++q < pic_end);
}
else { /* assume normal data */
register byte *q = pic;
@@ -710,7 +710,7 @@ L2:
- if ((cmy = k - *q++) < 0) cmy = 0; *p++ = cmy; /* R */
- if ((cmy = k - *q++) < 0) cmy = 0; *p++ = cmy; /* G */
- if ((cmy = k - *q++) < 0) cmy = 0; *p++ = cmy; /* B */
+ if ((cmy = k - *q++) < 0) { cmy = 0; } *p++ = cmy; /* R */
+ if ((cmy = k - *q++) < 0) { cmy = 0; } *p++ = cmy; /* G */
+ if ((cmy = k - *q++) < 0) { cmy = 0; } *p++ = cmy; /* B */
- } while (++q <= pic_end);
+ } while (++q < pic_end);
}
diff --git a/graphics/xv/files/patch-xvtext.c b/graphics/xv/files/patch-xvtext.c
deleted file mode 100644
index ce8254f3aa29..000000000000
--- a/graphics/xv/files/patch-xvtext.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/xvtext.c.orig 2023-07-17 01:25:42 UTC
-+++ src/xvtext.c
-@@ -181,7 +181,7 @@ static int selectCodeset PARM((TVINFO *));
- #endif
- #ifdef TV_MULTILINGUAL
- static void setCodingSpec PARM((TVINFO *, struct coding_spec *));
--static void createCsWins PARM((char *));
-+static void createCsWins PARM((const char *));
- static void openCsWin PARM((TVINFO *));
- static void closeCsWin PARM((TVINFO *));
- #endif
diff --git a/graphics/xv/files/patch-xvvd.c b/graphics/xv/files/patch-xvvd.c
index d0343720adf8..0afa536d2674 100644
--- a/graphics/xv/files/patch-xvvd.c
+++ b/graphics/xv/files/patch-xvvd.c
@@ -1,7 +1,7 @@
---- src/xvvd.c.orig 2023-07-17 01:25:42 UTC
+--- src/xvvd.c.orig 2024-08-12 21:10:49 UTC
+++ src/xvvd.c
-@@ -1072,6 +1072,8 @@ static void HUPhandler(XtPointer dummy, XtSignalId* Id
- #endif
+@@ -1157,6 +1157,8 @@ static void HUPhandler(XtPointer dummy, XtSignalId* Id
+ unblock_signal(SIGHUP, mask);
}
+int InSignal = 0;
@@ -9,11 +9,10 @@
static void vd_handler(int sig)
{
UsedSignal = sig;
-@@ -1085,7 +1087,7 @@ static void INThandler(XtPointer dummy, XtSignalId* Id
- #else
- sigblock(sigmask(UsedSignal));
- #endif
--
+@@ -1170,6 +1172,7 @@ static void INThandler(XtPointer dummy, XtSignalId* Id
+
+ block_signal(UsedSignal);
+
+ InSignal = 1;
Quit(1); /*exit(1);*/
}