git: 77024574f418 - main - graphics/xv: update to 6.0.1

The branch main has been updated by dinoex:

URL: https://cgit.FreeBSD.org/ports/commit/?id=77024574f4180b7ce291f36eb00fc3c2912f78cb

commit 77024574f4180b7ce291f36eb00fc3c2912f78cb
Author:     Dirk Meyer <dinoex@FreeBSD.org>
AuthorDate: 2024-09-05 15:20:02 +0000
Commit:     Dirk Meyer <dinoex@FreeBSD.org>
CommitDate: 2024-09-05 15:20:56 +0000

    graphics/xv: update to 6.0.1
    
    add xrandr support
    
    force libpng for PNG images
    https://github.com/jasper-software/xv/issues/24
---
 graphics/xv/Makefile             | 11 +++++++----
 graphics/xv/distinfo             |  6 +++---
 graphics/xv/files/patch-xvjpeg.c |  9 ---------
 graphics/xv/pkg-plist            |  2 ++
 4 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/graphics/xv/Makefile b/graphics/xv/Makefile
index d3fa034d2ad1..672df3b45422 100644
--- a/graphics/xv/Makefile
+++ b/graphics/xv/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	xv
-PORTVERSION=	6.0.0
+PORTVERSION=	6.0.1
 DISTVERSIONPREFIX=	v
 PORTREVISION=	0
 CATEGORIES+=	graphics
@@ -10,12 +10,12 @@ COMMENT?=	X11 program that displays images of various formats
 WWW=		http://www.trilon.com/xv/
 
 LIB_DEPENDS=	libtiff.so:graphics/tiff \
-		libpng.so:graphics/png \
+		libpng16.so:graphics/png \
 		libjasper.so:graphics/jasper \
 		libwebp.so:graphics/webp
 
-USES=		cpe localbase cmake jpeg xorg
-USE_XORG=	xext x11 xt ice sm
+USES=		cpe localbase cmake jpeg xorg desktop-file-utils
+USE_XORG=	xext x11 xt ice sm xrandr
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	jasper-software
@@ -37,6 +37,9 @@ CONFLICTS_INSTALL=	xv-m17n
 
 XV_DOCS=	README.md src/docs/help
 
+post-patch:
+	${REINPLACE_CMD} -e 's|^PNG|#PNG|' ${WRKSRC}/src/xv_mgcsfx.sample
+
 do-install-DOCS-on:
 .for i in ${XV_DOCS}
 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}/
diff --git a/graphics/xv/distinfo b/graphics/xv/distinfo
index b805771c131d..02fd4929ec86 100644
--- a/graphics/xv/distinfo
+++ b/graphics/xv/distinfo
@@ -1,3 +1,3 @@
-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
+TIMESTAMP = 1725546094
+SHA256 (xv/jasper-software-xv-v6.0.1_GH0.tar.gz) = ff063de041e0f4a895577fde14802e4f018a0eca21a4331318e419924e698d71
+SIZE (xv/jasper-software-xv-v6.0.1_GH0.tar.gz) = 5051856
diff --git a/graphics/xv/files/patch-xvjpeg.c b/graphics/xv/files/patch-xvjpeg.c
index 9def7d7f9cdb..e49b47db884c 100644
--- a/graphics/xv/files/patch-xvjpeg.c
+++ b/graphics/xv/files/patch-xvjpeg.c
@@ -1,14 +1,5 @@
 --- 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 */
--      } 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 */
diff --git a/graphics/xv/pkg-plist b/graphics/xv/pkg-plist
index 36cb487ba513..6224f367e796 100644
--- a/graphics/xv/pkg-plist
+++ b/graphics/xv/pkg-plist
@@ -275,6 +275,7 @@ etc/xv_mgcsfx
 %%PORTDOCS%%%%DOCSDIR%%/manuals/xvdocs.pdf
 %%PORTDOCS%%%%DOCSDIR%%/manuals/xvdocs.ps
 %%PORTDOCS%%%%DOCSDIR%%/manuals/xvtitle.ps
+share/applications/xv.desktop
 share/man/fi/man1/xv.1.gz
 share/man/man1/bggen.1.gz
 share/man/man1/vdcomp.1.gz
@@ -282,3 +283,4 @@ share/man/man1/xcmap.1.gz
 share/man/man1/xv.1.gz
 share/man/man1/xvpictoppm.1.gz
 share/man/pl/man1/xvpictoppm.1.gz
+share/pixmaps/xv.xpm