summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Beich <jbeich@FreeBSD.org>2020-09-13 06:23:16 +0000
committerJan Beich <jbeich@FreeBSD.org>2020-09-13 06:23:16 +0000
commit9eb8b8e0957b33c0172b632e56fa4fe7fa0e87d6 (patch)
treecae8bc6e62c4dc4bb5d22e2513c1629091392668
parentWhile upstream development of SeExpr had apparently stalled, update the (diff)
graphics/libdssim: drop in favor of CARGO_CRATES
$ cat /usr/local/include/dssim/dssim.h #define DSSIM_MAJOR 2 #define DSSIM_MINOR 11 #define DSSIM_PATCH 3 #include <cstdarg> #include <cstdint> #include <cstdlib> #include <new> $ nm -D /usr/local/lib/libdssim.so w _Jv_RegisterClasses U _Unwind_GetDataRelBase U _Unwind_GetIPInfo U _Unwind_GetLanguageSpecificData U _Unwind_GetRegionStart U _Unwind_GetTextRelBase U _Unwind_SetGR U _Unwind_SetIP w __cxa_finalize 0000000000003920 T rust_eh_personality $ cat /usr/local/libdata/pkgconfig/dssim.pc prefix=/usr/local exec_prefix=${prefix} libdir=${exec_prefix}/lib includedir=${prefix}/include Name: dssim Description: Tool that measures structural similarity between images using a multi-scale variant of the SSIM algorithm. Version: 2.11.3 Libs: -L${libdir} -ldssim Cflags: -I${includedir}/dssim Libs.private: -lexecinfo -lpthread -lgcc_s -lc -lm -lrt -lpthread -lutil -lutil
-rw-r--r--MOVED1
-rw-r--r--graphics/Makefile1
-rw-r--r--graphics/dssim/Makefile3
-rw-r--r--graphics/libdssim/Makefile27
-rw-r--r--graphics/libdssim/pkg-plist6
5 files changed, 2 insertions, 36 deletions
diff --git a/MOVED b/MOVED
index 680d197963fc..b30847c61470 100644
--- a/MOVED
+++ b/MOVED
@@ -15428,3 +15428,4 @@ x11-wm/e-module-rmb||2020-09-09|Removed
x11-wm/e-module-wlan||2020-09-09|Removed
x11-wm/e-modules||2020-09-09|Removed
net/frr6|net/frr7|2020-09-10|Has expired: Uses deprecated version of python and upstream no longer maintained
+graphics/libdssim||2020-09-13|Removed: C API is empty, only usable from Rust
diff --git a/graphics/Makefile b/graphics/Makefile
index dcd2ca307767..63b3bde8b71b 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -435,7 +435,6 @@
SUBDIR += libchamplain
SUBDIR += libdmtx
SUBDIR += libdrm
- SUBDIR += libdssim
SUBDIR += libecwj2
SUBDIR += libemf
SUBDIR += libepoxy
diff --git a/graphics/dssim/Makefile b/graphics/dssim/Makefile
index 6590606f93c3..f78a20773700 100644
--- a/graphics/dssim/Makefile
+++ b/graphics/dssim/Makefile
@@ -2,7 +2,6 @@
PORTNAME= dssim
DISTVERSION= 2.11.3
-PORTREVISION?= 0
CATEGORIES= graphics
MASTER_SITES= CRATESIO
# XXX Teach USES=cargo to have proper default
@@ -15,7 +14,7 @@ LICENSE= AGPLv3+
LICENSE_FILE= ${WRKSRC}/LICENSE
USES= cargo
-PLIST_FILES?= bin/${PORTNAME}
+PLIST_FILES= bin/${PORTNAME}
CARGO_CRATES= adler-0.2.3 \
arrayvec-0.5.1 \
diff --git a/graphics/libdssim/Makefile b/graphics/libdssim/Makefile
deleted file mode 100644
index 5756f860ac62..000000000000
--- a/graphics/libdssim/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# $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"
diff --git a/graphics/libdssim/pkg-plist b/graphics/libdssim/pkg-plist
deleted file mode 100644
index c118b238d3e0..000000000000
--- a/graphics/libdssim/pkg-plist
+++ /dev/null
@@ -1,6 +0,0 @@
-include/dssim/dssim.h
-lib/libdssim.a
-lib/libdssim.so
-lib/libdssim.so.2
-lib/libdssim.so.%%VERSION%%
-libdata/pkgconfig/dssim.pc