Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 13 Sep 2020 05:56:35 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r548453 - in head/graphics: . dssim libdssim
Message-ID:  <202009130556.08D5uZ8F072779@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Sun Sep 13 05:56:34 2020
New Revision: 548453
URL: https://svnweb.freebsd.org/changeset/ports/548453

Log:
  graphics/dssim: update to 2.11.3 (rust)
  
  Changes:	https://github.com/kornelski/dssim/compare/cb6b383...c66fb04

Added:
  head/graphics/libdssim/
  head/graphics/libdssim/Makefile   (contents, props changed)
  head/graphics/libdssim/pkg-plist   (contents, props changed)
Deleted:
  head/graphics/dssim/pkg-plist
Modified:
  head/graphics/Makefile   (contents, props changed)
  head/graphics/dssim/Makefile   (contents, props changed)
  head/graphics/dssim/distinfo   (contents, props changed)
  head/graphics/dssim/pkg-descr   (contents, props changed)

Modified: head/graphics/Makefile
==============================================================================
--- head/graphics/Makefile	Sun Sep 13 05:56:27 2020	(r548452)
+++ head/graphics/Makefile	Sun Sep 13 05:56:34 2020	(r548453)
@@ -435,6 +435,7 @@
     SUBDIR += libchamplain
     SUBDIR += libdmtx
     SUBDIR += libdrm
+    SUBDIR += libdssim
     SUBDIR += libecwj2
     SUBDIR += libemf
     SUBDIR += libepoxy

Modified: head/graphics/dssim/Makefile
==============================================================================
--- head/graphics/dssim/Makefile	Sun Sep 13 05:56:27 2020	(r548452)
+++ head/graphics/dssim/Makefile	Sun Sep 13 05:56:34 2020	(r548453)
@@ -1,9 +1,12 @@
 # $FreeBSD$
 
 PORTNAME=	dssim
-DISTVERSION=	1.3.3-15
-DISTVERSIONSUFFIX=	-gcb6b383
+DISTVERSION=	2.11.3
+PORTREVISION?=	0
 CATEGORIES=	graphics
+MASTER_SITES=	CRATESIO
+# XXX Teach USES=cargo to have proper default
+DISTFILES=	${CARGO_DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Image similarity comparison simulating human perception
@@ -11,21 +14,62 @@ COMMENT=	Image similarity comparison simulating human 
 LICENSE=	AGPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libpng.so:graphics/png
+USES=		cargo
+PLIST_FILES?=	bin/${PORTNAME}
 
-USES=		meson pkgconfig
-USE_GITHUB=	yes
-GH_ACCOUNT=	kornelski
-
-OPTIONS_DEFINE=	JPEG
-OPTIONS_DEFAULT=JPEG
-
-JPEG_USES=		jpeg
-JPEG_MESON_ENABLED=	jpeg
-
-post-patch:
-# Extract (snapshot) version from the port instead of meson.build
-	@${REINPLACE_CMD} "/^[[:space:]]*version : /s/'.*'/'${PORTVERSION}'/" \
-		${WRKSRC}/meson.build
+CARGO_CRATES=	adler-0.2.3 \
+		arrayvec-0.5.1 \
+		autocfg-1.0.0 \
+		bytemuck-1.2.0 \
+		cc-1.0.58 \
+		cfg-if-0.1.10 \
+		crc32fast-1.2.0 \
+		crossbeam-deque-0.7.3 \
+		crossbeam-epoch-0.8.2 \
+		crossbeam-queue-0.2.3 \
+		crossbeam-utils-0.7.2 \
+		dssim-core-2.11.3 \
+		dunce-1.0.1 \
+		either-1.5.3 \
+		flate2-1.0.17 \
+		foreign-types-0.5.0 \
+		foreign-types-macros-0.2.1 \
+		foreign-types-shared-0.3.0 \
+		getopts-0.2.21 \
+		hermit-abi-0.1.15 \
+		imgref-1.7.0 \
+		itertools-0.9.0 \
+		jobserver-0.1.21 \
+		lazy_static-1.4.0 \
+		lcms2-5.3.1 \
+		lcms2-sys-3.1.4 \
+		libc-0.2.72 \
+		load_image-2.12.1 \
+		lodepng-3.2.1 \
+		maybe-uninit-2.0.0 \
+		memoffset-0.5.5 \
+		miniz_oxide-0.4.1 \
+		mozjpeg-0.8.19 \
+		mozjpeg-sys-0.10.8 \
+		nasm-rs-0.1.7 \
+		num-0.2.1 \
+		num-bigint-0.2.6 \
+		num-complex-0.2.4 \
+		num-integer-0.1.43 \
+		num-iter-0.1.41 \
+		num-rational-0.2.4 \
+		num-traits-0.2.12 \
+		num_cpus-1.13.0 \
+		pkg-config-0.3.18 \
+		proc-macro2-1.0.18 \
+		quote-1.0.7 \
+		rayon-1.3.1 \
+		rayon-core-1.7.1 \
+		rexif-0.5.0 \
+		rgb-0.8.20 \
+		scopeguard-1.1.0 \
+		syn-1.0.34 \
+		unicode-width-0.1.8 \
+		unicode-xid-0.2.1
 
 .include <bsd.port.mk>

Modified: head/graphics/dssim/distinfo
==============================================================================
--- head/graphics/dssim/distinfo	Sun Sep 13 05:56:27 2020	(r548452)
+++ head/graphics/dssim/distinfo	Sun Sep 13 05:56:34 2020	(r548453)
@@ -1,3 +1,111 @@
-TIMESTAMP = 1599972446
-SHA256 (kornelski-dssim-1.3.3-15-gcb6b383_GH0.tar.gz) = e4e7a89bd0b154e3ca8c54659047b73a696b521a5b127a36f662847d3da4a2be
-SIZE (kornelski-dssim-1.3.3-15-gcb6b383_GH0.tar.gz) = 36273
+TIMESTAMP = 1598277341
+SHA256 (rust/crates/dssim-2.11.3.tar.gz) = ccf63d56cce067886bfb0431c8a50ae54ea978fe835e582ccb286b678c57da3e
+SIZE (rust/crates/dssim-2.11.3.tar.gz) = 20655
+SHA256 (rust/crates/adler-0.2.3.tar.gz) = ee2a4ec343196209d6594e19543ae87a39f96d5534d7174822a3ad825dd6ed7e
+SIZE (rust/crates/adler-0.2.3.tar.gz) = 12168
+SHA256 (rust/crates/arrayvec-0.5.1.tar.gz) = cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8
+SIZE (rust/crates/arrayvec-0.5.1.tar.gz) = 26816
+SHA256 (rust/crates/autocfg-1.0.0.tar.gz) = f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d
+SIZE (rust/crates/autocfg-1.0.0.tar.gz) = 12870
+SHA256 (rust/crates/bytemuck-1.2.0.tar.gz) = 37fa13df2292ecb479ec23aa06f4507928bef07839be9ef15281411076629431
+SIZE (rust/crates/bytemuck-1.2.0.tar.gz) = 17957
+SHA256 (rust/crates/cc-1.0.58.tar.gz) = f9a06fb2e53271d7c279ec1efea6ab691c35a2ae67ec0d91d7acec0caf13b518
+SIZE (rust/crates/cc-1.0.58.tar.gz) = 52896
+SHA256 (rust/crates/cfg-if-0.1.10.tar.gz) = 4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822
+SIZE (rust/crates/cfg-if-0.1.10.tar.gz) = 7933
+SHA256 (rust/crates/crc32fast-1.2.0.tar.gz) = ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1
+SIZE (rust/crates/crc32fast-1.2.0.tar.gz) = 39161
+SHA256 (rust/crates/crossbeam-deque-0.7.3.tar.gz) = 9f02af974daeee82218205558e51ec8768b48cf524bd01d550abe5573a608285
+SIZE (rust/crates/crossbeam-deque-0.7.3.tar.gz) = 19888
+SHA256 (rust/crates/crossbeam-epoch-0.8.2.tar.gz) = 058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace
+SIZE (rust/crates/crossbeam-epoch-0.8.2.tar.gz) = 39283
+SHA256 (rust/crates/crossbeam-queue-0.2.3.tar.gz) = 774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570
+SIZE (rust/crates/crossbeam-queue-0.2.3.tar.gz) = 14753
+SHA256 (rust/crates/crossbeam-utils-0.7.2.tar.gz) = c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8
+SIZE (rust/crates/crossbeam-utils-0.7.2.tar.gz) = 34338
+SHA256 (rust/crates/dssim-core-2.11.3.tar.gz) = 462c6cf1cb98d8f7dc5f7a5878e9f05e6be51086370f7f162e446a62ebfab0cb
+SIZE (rust/crates/dssim-core-2.11.3.tar.gz) = 26211
+SHA256 (rust/crates/dunce-1.0.1.tar.gz) = b2641c4a7c0c4101df53ea572bffdc561c146f6c2eb09e4df02bc4811e3feeb4
+SIZE (rust/crates/dunce-1.0.1.tar.gz) = 7988
+SHA256 (rust/crates/either-1.5.3.tar.gz) = bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3
+SIZE (rust/crates/either-1.5.3.tar.gz) = 12278
+SHA256 (rust/crates/flate2-1.0.17.tar.gz) = 766d0e77a2c1502169d4a93ff3b8c15a71fd946cd0126309752104e5f3c46d94
+SIZE (rust/crates/flate2-1.0.17.tar.gz) = 74154
+SHA256 (rust/crates/foreign-types-0.5.0.tar.gz) = d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965
+SIZE (rust/crates/foreign-types-0.5.0.tar.gz) = 7824
+SHA256 (rust/crates/foreign-types-macros-0.2.1.tar.gz) = 63f713f8b2aa9e24fec85b0e290c56caee12e3b6ae0aeeda238a75b28251afd6
+SIZE (rust/crates/foreign-types-macros-0.2.1.tar.gz) = 7673
+SHA256 (rust/crates/foreign-types-shared-0.3.0.tar.gz) = 7684cf33bb7f28497939e8c7cf17e3e4e3b8d9a0080ffa4f8ae2f515442ee855
+SIZE (rust/crates/foreign-types-shared-0.3.0.tar.gz) = 5894
+SHA256 (rust/crates/getopts-0.2.21.tar.gz) = 14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5
+SIZE (rust/crates/getopts-0.2.21.tar.gz) = 18457
+SHA256 (rust/crates/hermit-abi-0.1.15.tar.gz) = 3deed196b6e7f9e44a2ae8d94225d80302d81208b1bb673fd21fe634645c85a9
+SIZE (rust/crates/hermit-abi-0.1.15.tar.gz) = 9597
+SHA256 (rust/crates/imgref-1.7.0.tar.gz) = d8767843be7909b5b3ffd9b52cdc042882b94e2cfe0c00abc4ce1c301cb1fcae
+SIZE (rust/crates/imgref-1.7.0.tar.gz) = 60376
+SHA256 (rust/crates/itertools-0.9.0.tar.gz) = 284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b
+SIZE (rust/crates/itertools-0.9.0.tar.gz) = 96429
+SHA256 (rust/crates/jobserver-0.1.21.tar.gz) = 5c71313ebb9439f74b00d9d2dcec36440beaf57a6aa0623068441dd7cd81a7f2
+SIZE (rust/crates/jobserver-0.1.21.tar.gz) = 21228
+SHA256 (rust/crates/lazy_static-1.4.0.tar.gz) = e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646
+SIZE (rust/crates/lazy_static-1.4.0.tar.gz) = 10443
+SHA256 (rust/crates/lcms2-5.3.1.tar.gz) = d58ec166f11ed510d5f602c45bac0a9441bf4f3c8ea3046a35311303ea2fc4f0
+SIZE (rust/crates/lcms2-5.3.1.tar.gz) = 27496
+SHA256 (rust/crates/lcms2-sys-3.1.4.tar.gz) = bb7d2f71158c0c27e642fa8a60e6dac6cb31216cab818c6454f8ec39717771a4
+SIZE (rust/crates/lcms2-sys-3.1.4.tar.gz) = 268184
+SHA256 (rust/crates/libc-0.2.72.tar.gz) = a9f8082297d534141b30c8d39e9b1773713ab50fdbe4ff30f750d063b3bfd701
+SIZE (rust/crates/libc-0.2.72.tar.gz) = 478292
+SHA256 (rust/crates/load_image-2.12.1.tar.gz) = d326645af741a5a6f07d792c8acde0352106ce995c4215ad321e5181ad1e1250
+SIZE (rust/crates/load_image-2.12.1.tar.gz) = 418366
+SHA256 (rust/crates/lodepng-3.2.1.tar.gz) = 1d6face0280146377ad4959c588399014554f2875e953fdec135655ca769e1da
+SIZE (rust/crates/lodepng-3.2.1.tar.gz) = 45007
+SHA256 (rust/crates/maybe-uninit-2.0.0.tar.gz) = 60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00
+SIZE (rust/crates/maybe-uninit-2.0.0.tar.gz) = 11809
+SHA256 (rust/crates/memoffset-0.5.5.tar.gz) = c198b026e1bbf08a937e94c6c60f9ec4a2267f5b0d2eec9c1b21b061ce2be55f
+SIZE (rust/crates/memoffset-0.5.5.tar.gz) = 7318
+SHA256 (rust/crates/miniz_oxide-0.4.1.tar.gz) = 4d7559a8a40d0f97e1edea3220f698f78b1c5ab67532e49f68fde3910323b722
+SIZE (rust/crates/miniz_oxide-0.4.1.tar.gz) = 46117
+SHA256 (rust/crates/mozjpeg-0.8.19.tar.gz) = e48f720b666d5a659335383a7e4ed0f5a20e50eddf58e53bb91185bb197cc8b4
+SIZE (rust/crates/mozjpeg-0.8.19.tar.gz) = 13953
+SHA256 (rust/crates/mozjpeg-sys-0.10.8.tar.gz) = 36788b7750db9e75b4af447b3ee644a8489e860813f88542aa0c383b08d50415
+SIZE (rust/crates/mozjpeg-sys-0.10.8.tar.gz) = 2221012
+SHA256 (rust/crates/nasm-rs-0.1.7.tar.gz) = fea4fa2ba8f650120445ddcf137d8a6370ff01d55f00e6b29e0ab01b7c846464
+SIZE (rust/crates/nasm-rs-0.1.7.tar.gz) = 9008
+SHA256 (rust/crates/num-0.2.1.tar.gz) = b8536030f9fea7127f841b45bb6243b27255787fb4eb83958aa1ef9d2fdc0c36
+SIZE (rust/crates/num-0.2.1.tar.gz) = 9082
+SHA256 (rust/crates/num-bigint-0.2.6.tar.gz) = 090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304
+SIZE (rust/crates/num-bigint-0.2.6.tar.gz) = 87275
+SHA256 (rust/crates/num-complex-0.2.4.tar.gz) = b6b19411a9719e753aff12e5187b74d60d3dc449ec3f4dc21e3989c3f554bc95
+SIZE (rust/crates/num-complex-0.2.4.tar.gz) = 24679
+SHA256 (rust/crates/num-integer-0.1.43.tar.gz) = 8d59457e662d541ba17869cf51cf177c0b5f0cbf476c66bdc90bf1edac4f875b
+SIZE (rust/crates/num-integer-0.1.43.tar.gz) = 21966
+SHA256 (rust/crates/num-iter-0.1.41.tar.gz) = 7a6e6b7c748f995c4c29c5f5ae0248536e04a5739927c74ec0fa564805094b9f
+SIZE (rust/crates/num-iter-0.1.41.tar.gz) = 10198
+SHA256 (rust/crates/num-rational-0.2.4.tar.gz) = 5c000134b5dbf44adc5cb772486d335293351644b801551abe8f75c84cfa4aef
+SIZE (rust/crates/num-rational-0.2.4.tar.gz) = 21694
+SHA256 (rust/crates/num-traits-0.2.12.tar.gz) = ac267bcc07f48ee5f8935ab0d24f316fb722d7a1292e2913f0cc196b29ffd611
+SIZE (rust/crates/num-traits-0.2.12.tar.gz) = 43807
+SHA256 (rust/crates/num_cpus-1.13.0.tar.gz) = 05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3
+SIZE (rust/crates/num_cpus-1.13.0.tar.gz) = 14704
+SHA256 (rust/crates/pkg-config-0.3.18.tar.gz) = d36492546b6af1463394d46f0c834346f31548646f6ba10849802c9c9a27ac33
+SIZE (rust/crates/pkg-config-0.3.18.tar.gz) = 14674
+SHA256 (rust/crates/proc-macro2-1.0.18.tar.gz) = beae6331a816b1f65d04c45b078fd8e6c93e8071771f41b8163255bbd8d7c8fa
+SIZE (rust/crates/proc-macro2-1.0.18.tar.gz) = 36252
+SHA256 (rust/crates/quote-1.0.7.tar.gz) = aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37
+SIZE (rust/crates/quote-1.0.7.tar.gz) = 25170
+SHA256 (rust/crates/rayon-1.3.1.tar.gz) = 62f02856753d04e03e26929f820d0a0a337ebe71f849801eea335d464b349080
+SIZE (rust/crates/rayon-1.3.1.tar.gz) = 151292
+SHA256 (rust/crates/rayon-core-1.7.1.tar.gz) = e92e15d89083484e11353891f1af602cc661426deb9564c298b270c726973280
+SIZE (rust/crates/rayon-core-1.7.1.tar.gz) = 58437
+SHA256 (rust/crates/rexif-0.5.0.tar.gz) = b18541ee0a90d5ba60c094fd70b8d31cb903d6bc75cdba0f795507077bf6c1dd
+SIZE (rust/crates/rexif-0.5.0.tar.gz) = 23732
+SHA256 (rust/crates/rgb-0.8.20.tar.gz) = 90ef54b45ae131327a88597e2463fee4098ad6c88ba7b6af4b3987db8aad4098
+SIZE (rust/crates/rgb-0.8.20.tar.gz) = 14960
+SHA256 (rust/crates/scopeguard-1.1.0.tar.gz) = d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd
+SIZE (rust/crates/scopeguard-1.1.0.tar.gz) = 11470
+SHA256 (rust/crates/syn-1.0.34.tar.gz) = 936cae2873c940d92e697597c5eee105fb570cd5689c695806f672883653349b
+SIZE (rust/crates/syn-1.0.34.tar.gz) = 205051
+SHA256 (rust/crates/unicode-width-0.1.8.tar.gz) = 9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3
+SIZE (rust/crates/unicode-width-0.1.8.tar.gz) = 16732
+SHA256 (rust/crates/unicode-xid-0.2.1.tar.gz) = f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564
+SIZE (rust/crates/unicode-xid-0.2.1.tar.gz) = 14392

Modified: head/graphics/dssim/pkg-descr
==============================================================================
--- head/graphics/dssim/pkg-descr	Sun Sep 13 05:56:27 2020	(r548452)
+++ head/graphics/dssim/pkg-descr	Sun Sep 13 05:56:34 2020	(r548453)
@@ -7,6 +7,6 @@ using a multi-scale variant of the SSIM algorithm.
 Features:
 - Supports alpha channel
 - Supports gamma correction
-- No OpenCV or MATLAB needed: uses C (C99) and libpng
+- No OpenCV or MATLAB needed: uses safe Rust without external dependencies
 
 WWW: https://kornel.ski/dssim

Added: head/graphics/libdssim/Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/libdssim/Makefile	Sun Sep 13 05:56:34 2020	(r548453)
@@ -0,0 +1,27 @@
+# $FreeBSD$
+
+PORTREVISION=	0
+PKGNAMEPREFIX=	lib
+
+MASTERDIR=	${.CURDIR}/../dssim
+PLIST=		${.CURDIR}/pkg-plist
+
+BUILD_DEPENDS=	cargo-cbuild:devel/cargo-c
+
+PLIST_FILES=	# empty
+PLIST_SUB=	VERSION=${DISTVERSION:C/-.*//}
+
+do-build:
+	@${CARGO_CARGO_RUN} cbuild \
+		${CARGO_BUILD_ARGS}
+
+do-install:
+	@${CARGO_CARGO_RUN} cinstall \
+		--destdir "${STAGEDIR}" \
+		--prefix "${PREFIX}" \
+		${CARGO_BUILD_ARGS}
+
+post-install:
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so
+
+.include "${MASTERDIR}/Makefile"

Added: head/graphics/libdssim/pkg-plist
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/libdssim/pkg-plist	Sun Sep 13 05:56:34 2020	(r548453)
@@ -0,0 +1,6 @@
+include/dssim/dssim.h
+lib/libdssim.a
+lib/libdssim.so
+lib/libdssim.so.2
+lib/libdssim.so.%%VERSION%%
+libdata/pkgconfig/dssim.pc



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202009130556.08D5uZ8F072779>