From nobody Thu Sep 05 15:21:14 2024 X-Original-To: dev-commits-ports-main@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 4X033b14wlz5WDSN; Thu, 05 Sep 2024 15:21: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4X033b0dvxz4hYp; Thu, 5 Sep 2024 15:21:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725549675; 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=s2iLt+TUEB+XGa/jBp9lhmwhspJ2DlkcZvv4TU/8y5o=; b=AwI2iK2QmqefhDrL1wcRTXqrLYq03tAVI65gyPNdmhDUtWiMpmcbty7ikMTl/zAZUYxCqB qV6La0el3aNJEHw8nc5jrxGXohUm/JsXH2ZzSMc0Mg0cUf9grCxC84ZgJ7/wPzugWUIU+Q ypOXMPDlnndo3wFl2st2pP9Hsr+3wsPO2/JkoYx6CUDruHt48u+VpvMfxQBIeYg+GNlS2C hZtcLLarib/QpGfsyEP5tYqbsNmZ8MtM1sRwt+IbM2ebivmEiE8K/t7fTgWDBRsyvKoCsu 2OXtzQ09nckeNIJGj617B+aMBEUVtLdQBs3X5tjE7hiAsWE2lN+86zfpJcC5uA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725549675; a=rsa-sha256; cv=none; b=W2CAWqmtJQNlhKbw+ZB3AuBP7W4AoS9At4B0RnlcC8v9mvM7Tc5/AtprDC7G1fSCKVr9SP 0YAU59AmmqrlhzzwX3uQFF4KS32SpKQEd3YvC3qsc9ycnqNZwagAM1Xe3bh6QtTAH3F1KY I4AYrYU2TViTMfnqXAVr1hemQz/aoN6UYiG1gGdmXMdIxlSCRrR+BdhTDif+HSXnSC15Ct qonfaIsqe8ha93ijQ7CUqfW3KSDpC4g+KpGG4MeXn0nSezO98fmqgROaH4GRJoajtJ9Jez jFuchbcikXnWBtpBs2H9G14j2HG8r+ddw9Fa76Hz7eYuG5ksXLcbunB5nTUekQ== 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=1725549675; 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=s2iLt+TUEB+XGa/jBp9lhmwhspJ2DlkcZvv4TU/8y5o=; b=ryDsQkINBt10EKptCY+tiiNyXTZ8OMqU4L6nvrZ50wmQcIrHFjVgUK+qK/wWqTJsEXLA3l oOYJ/x3XLRZLWvttY9NdRaQQdQ0v/Nq9qOhqqu+B6ApV1bvYTWjDzxi5ZBspghklPdMIwG iIQ0t7oOaRnJVH6LRDD90Tk2dSeqliur7K5gmIYMW/EKJEYSqR9/TWrxm8tVTouMvuzhgs juMSh0bR3vBlAnVd3/I1rDYln1fR6AK2SWqmFYBiJBRoDRD6j2yrXApOmimgU0DslgsbLA 4geJA0MPpzTZhvDmgxIT1nQ/2L/MQGoOTxtAlcVDPDZqlMbUS9SKZawpyeTm7Q== 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 4X033b0Dmnz1C9G; Thu, 5 Sep 2024 15:21:15 +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 485FLEiC028901; Thu, 5 Sep 2024 15:21:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 485FLEpK028898; Thu, 5 Sep 2024 15:21:14 GMT (envelope-from git) Date: Thu, 5 Sep 2024 15:21:14 GMT Message-Id: <202409051521.485FLEpK028898@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dirk Meyer Subject: git: 77024574f418 - main - graphics/xv: update to 6.0.1 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@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: 77024574f4180b7ce291f36eb00fc3c2912f78cb Auto-Submitted: auto-generated The branch main has been updated by dinoex: URL: https://cgit.FreeBSD.org/ports/commit/?id=77024574f4180b7ce291f36eb00fc3c2912f78cb commit 77024574f4180b7ce291f36eb00fc3c2912f78cb Author: Dirk Meyer AuthorDate: 2024-09-05 15:20:02 +0000 Commit: Dirk Meyer 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