Page MenuHomeFreeBSD
Files F105779341

D29508.id88094.diff
No OneTemporary
Actions

D29508.id88094.diff
View Options

diff --git a/graphics/imv/Makefile b/graphics/imv/Makefile
--- a/graphics/imv/Makefile
+++ b/graphics/imv/Makefile
@@ -1,7 +1,6 @@
PORTNAME= imv
DISTVERSIONPREFIX= v
-DISTVERSION= 4.1.0
-PORTREVISION= 5
+DISTVERSION= 4.2.0
CATEGORIES= graphics
MAINTAINER= eduardo@FreeBSD.org
@@ -12,27 +11,16 @@
BUILD_DEPENDS= a2x:textproc/asciidoc
LIB_DEPENDS= libicuuc.so:devel/icu \
+ libinih.so:devel/inih \
libxkbcommon.so:x11/libxkbcommon
-TEST_DEPENDS= ${LOCALBASE}/lib/libcmocka.so:sysutils/cmocka
-USES= compiler:c11 desktop-file-utils gettext-runtime gl gmake gnome \
- pkgconfig
+USES= compiler:c11 desktop-file-utils gettext-runtime gl gnome \
+ meson pkgconfig
USE_GITHUB= yes
GH_ACCOUNT= eXeC64
USE_GL= gl
USE_GNOME= cairo glib20 pango
-MAKE_ARGS= CONFIGPREFIX=${PREFIX}/etc \
- INSTALL_DATA="${INSTALL_DATA}" \
- INSTALL_MAN="${INSTALL_MAN}" \
- INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
- INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
- MANPREFIX=${PREFIX}/man \
- V=1 \
- WINDOWS=${_IMV_WINDOWS}
-ALL_TARGET= imv doc
-TEST_TARGET= check
-
PLIST_FILES= bin/imv \
bin/imv-msg \
etc/imv_config \
@@ -41,56 +29,56 @@
man/man5/imv.5.gz \
share/applications/imv.desktop
-OPTIONS_DEFINE= FREEIMAGE JPEG NSGIF PNG SVG TIFF
-OPTIONS_DEFAULT= FREEIMAGE JPEG NSGIF PNG SVG TIFF WAYLAND X11
-OPTIONS_MULTI= WINDOWS
-OPTIONS_MULTI_WINDOWS= WAYLAND X11
+OPTIONS_DEFINE= FREEIMAGE HEIF JPEG NSGIF PNG SVG TEST TIFF
+OPTIONS_DEFAULT= FREEIMAGE HEIF JPEG NSGIF PNG SVG TIFF ALL
+OPTIONS_SINGLE= WIN
+OPTIONS_SINGLE_WIN= WAYLAND X11 ALL
OPTIONS_SUB= yes
FREEIMAGE_DESC= FreeImage backend (support for many image formats)
+HEIF_DESC= HEIF backend
NSGIF_DESC= NetSurf GIF backend (support for animated GIF)
-WINDOWS_DESC= Windowing system
+WIN_DESC= Windowing system
+
+ALL_USES= xorg
+ALL_USE= gl=egl,glu xorg=x11,xcb
+ALL_MESON_ON= -Dwindows=all
+ALL_PLIST_FILES= bin/imv-wayland \
+ bin/imv-x11
-FREEIMAGE_LIB_DEPENDS= libfreeimage.so:graphics/freeimage
-FREEIMAGE_MAKE_ARGS_OFF= BACKEND_FREEIMAGE=no
-FREEIMAGE_MAKE_ARGS= BACKEND_FREEIMAGE=yes
+FREEIMAGE_LIB_DEPENDS= libfreeimage.so:graphics/freeimage
+FREEIMAGE_MESON_ENABLED=freeimage
+
+HEIF_LIB_DEPENDS= libheif.so:graphics/libheif
+HEIF_MESON_ENABLED= libheif
JPEG_LIB_DEPENDS= libturbojpeg.so:graphics/libjpeg-turbo
-JPEG_MAKE_ARGS_OFF= BACKEND_LIBJPEG=no
-JPEG_MAKE_ARGS= BACKEND_LIBJPEG=yes
+JPEG_MESON_ENABLED= libjpeg
NSGIF_LIB_DEPENDS= libnsgif.so:graphics/libnsgif
-NSGIF_MAKE_ARGS_OFF= BACKEND_LIBNSGIF=no
-NSGIF_MAKE_ARGS= BACKEND_LIBNSGIF=yes
+NSGIF_MESON_ENABLED= libnsgif
PNG_LIB_DEPENDS= libpng.so:graphics/png
-PNG_MAKE_ARGS_OFF= BACKEND_LIBPNG=no
-PNG_MAKE_ARGS= BACKEND_LIBPNG=yes
+PNG_MESON_ENABLED= libpng
SVG_USE= GNOME=librsvg2
-SVG_MAKE_ARGS_OFF= BACKEND_LIBRSVG=no
-SVG_MAKE_ARGS= BACKEND_LIBRSVG=yes
+SVG_MESON_ENABLED= librsvg
+
+TEST_LIB_DEPENDS= libcmocka.so:sysutils/cmocka
+TEST_MESON_ENABLED= test
TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff
-TIFF_MAKE_ARGS_OFF= BACKEND_LIBTIFF=no
-TIFF_MAKE_ARGS= BACKEND_LIBTIFF=yes
+TIFF_MESON_ENABLED= libtiff
WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland \
libwayland-egl.so:graphics/wayland
-WAYLAND_USE= GL=egl
-WAYLAND_VARS= _IMV_WINDOWS=wayland
-X11_USES= xorg
-X11_USE= GL=glu \
- XORG=x11,xcb
-X11_VARS= _IMV_WINDOWS=x11
-
-.include <bsd.port.options.mk>
+WAYLAND_USE= gl=egl
+WAYLAND_MESON_ON= -Dwindows=wayland
-.if ${PORT_OPTIONS:MWAYLAND} && ${PORT_OPTIONS:MX11}
-_IMV_WINDOWS= all
-PLIST_FILES+= bin/imv-wayland \
- bin/imv-x11
-.endif
+X11_USES= xorg
+X11_USE= gl=glu \
+ xorg=x11,xcb
+X11_MESON_ON= -Dwindows=x11
.include <bsd.port.mk>
diff --git a/graphics/imv/distinfo b/graphics/imv/distinfo
--- a/graphics/imv/distinfo
+++ b/graphics/imv/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1576993342
-SHA256 (eXeC64-imv-v4.1.0_GH0.tar.gz) = 8c2f1baa4dce8bf1f6d1fb9dea8cf1da09fdf2c6de0f7030e91714df2ebcdf50
-SIZE (eXeC64-imv-v4.1.0_GH0.tar.gz) = 77341
+TIMESTAMP = 1618557342
+SHA256 (eXeC64-imv-v4.2.0_GH0.tar.gz) = 7d3de0462ce0cd705a719b12648661c8d91245cc7732eac4e459c465bc6b3d94
+SIZE (eXeC64-imv-v4.2.0_GH0.tar.gz) = 77809
diff --git a/graphics/imv/files/patch-meson.build b/graphics/imv/files/patch-meson.build
new file mode 100644
--- /dev/null
+++ b/graphics/imv/files/patch-meson.build
@@ -0,0 +1,11 @@
+--- meson.build.orig 2021-03-15 09:06:48 UTC
++++ meson.build
+@@ -101,7 +101,7 @@ files_msg = files('src/imv_msg.c', 'src/ipc_common.c')
+
+ enabled_backends = []
+ foreach backend : [
+- ['freeimage', 'library', 'freeimage'],
++ ['freeimage', 'dependency', 'freeimage', []],
+ ['libtiff', 'dependency', 'libtiff-4', []],
+ ['libpng', 'dependency', 'libpng', []],
+ ['libjpeg', 'dependency', 'libturbojpeg', []],

File Metadata

Mime Type
text/plain
Expires
Sat, Dec 21, 2:09 PM (15 h, 28 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
15542075
Default Alt Text
D29508.id88094.diff (4 KB)

Event Timeline