diff --git a/devel/efl/Makefile b/devel/efl/Makefile index 1b926b27681f..4cfed379580e 100644 --- a/devel/efl/Makefile +++ b/devel/efl/Makefile @@ -1,235 +1,235 @@ PORTNAME= efl DISTVERSION= 1.26.3 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= devel enlightenment MASTER_SITES= http://download.enlightenment.org/rel/libs/${PORTNAME}/ DIST_SUBDIR= enlightenment MAINTAINER= enlightenment@FreeBSD.org COMMENT= Enlightenment Foundation Libraries WWW= https://docs.enlightenment.org/efl/current/ LICENSE= BSD2CLAUSE LGPL21 LICENSE_COMB= multi BUILD_DEPENDS= checkmk:devel/check LIB_DEPENDS= libgif.so:graphics/giflib \ libpng.so:graphics/png \ libtiff.so:graphics/tiff \ libfreetype.so:print/freetype2 \ libfontconfig.so:x11-fonts/fontconfig \ libdbus-1.so:devel/dbus \ libcurl.so:ftp/curl \ libsndfile.so:audio/libsndfile # lib/libeio.so.1 CONFLICTS_INSTALL= libeio USES= compiler:c++14-lang gettext-tools gnome iconv \ jpeg libtool localbase:ldflags meson ninja ssl pathfix pkgconfig \ python shared-mime-info shebangfix tar:xz xorg SHEBANG_FILES= src/tests/elementary/spec/generator.py \ src/bin/exactness/exactness_play.in \ src/bin/exactness/exactness_record.in USE_XORG= x11 xcb xcursor xcomposite xdamage xext xfixes xi xinerama \ xrandr xrender xtst xscrnsaver USE_LDCONFIG= yes MESON_ARGS= -Dsystemd=false -Deeze=false -Dinput=false PLIST_SUB= BRANCHVERSION=${PORTVERSION:R} PORTVERSION=${PORTVERSION} OPTIONS_DEFINE= AVAHI FRIBIDI HARFBUZZ NLS PHYSICS PULSEAUDIO SDL VNC EFLONE ELUA EXAMPLES DOXYGEN WAYLAND OPTIONS_GROUP= EMOTION INPUT LOADER BINDINGS OPTIONS_GROUP_EMOTION= GSTREAMER V4L OPTIONS_GROUP_INPUT= IBUS SCIM XIM OPTIONS_GROUP_LOADER= OPENJPEG PDF PS RAW SVG WEBP XCF AVIF HEIF OPTIONS_GROUP_BINDINGS= LUA CXX OPTIONS_GROUP_WAYLAND= WAYLAND OPTIONS_SINGLE= CRYPTO ENGINE LUAL OPTIONS_SINGLE_CRYPTO= OPENSSL GNUTLS OPTIONS_SINGLE_ENGINE= OPENGL OPENGLES NONE OPTIONS_SINGLE_LUAL= LUAJIT LUALANG OPTIONS_DEFAULT= FRIBIDI HARFBUZZ PULSEAUDIO EXAMPLES GSTREAMER V4L SCIM XIM \ OPENSSL OPENJPEG PDF PS RAW SVG WEBP XCF OPENGLES LUAJIT CXX OPTIONS_SUB= yes HARFBUZZ_DESC= OpenType text shaping engine PHYSICS_DESC= Physics engine (bullet) - DEPRECATED UPSTREAM EFLONE_DESC= Create EFL-One library (single file library) - EXPERIMENTAL ELUA_DESC= Lua launcher binary support in efl VNC_DESC= VNC Server support IBUS_DESC= Intelligent Input Bus SCIM_DESC= Smart Common Input Method XIM_DESC= X Input Method SVG_DESC= Vector graphics support XCF_DESC= Gimp image format support LUAL_DESC= LUA LUALANG_DESC= Use Lua LUAJIT_DESC= Use Luajit OPENGLES_DESC= 2D/3D rendering support via OpenGL ES NONE_DESC= No acceleration, software only LUA_DESC= Lua Bindings CXX_DESC= C++ Bindings EXAMPLES_DESC= Build examples of using EFL AVAHI_LIB_DEPENDS= libavahi-client.so:net/avahi-app AVAHI_MESON_TRUE= avahi FRIBIDI_LIB_DEPENDS= libfribidi.so:converters/fribidi FRIBIDI_MESON_TRUE= fribidi HARFBUZZ_LIB_DEPENDS= libharfbuzz.so:print/harfbuzz HARFBUZZ_MESON_TRUE= harfbuzz NLS_USES= gettext-runtime NLS_MESON_TRUE= nls PHYSICS_LIB_DEPENDS= libBulletDynamics.so:devel/bullet PHYSICS_MESON_TRUE= physics PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_MESON_TRUE= pulseaudio EFLONE_BROKEN_i386= EFLONE option is broken on i386 by the upstream bug: https://phab.enlightenment.org/T8870 EFLONE_MESON_TRUE= efl-one ELUA_MESON_TRUE= elua EXAMPLES_MESON_TRUE= build-examples DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen VNC_MESON_TRUE= vnc-server VNC_LIB_DEPENDS= libvncserver.so:net/libvncserver LUA_IMPLIES= ELUA LUA_VARS= lua_binding=lua CXX_VARS= cxx_binding=cxx WAYLAND_BUILD_DEPENDS= wayland-protocols>=1.7:graphics/wayland-protocols WAYLAND_LIB_DEPENDS= libepoll-shim.so:devel/libepoll-shim \ libxkbcommon.so:x11/libxkbcommon \ libwayland-client.so:graphics/wayland \ libwayland-cursor.so:graphics/wayland WAYLAND_CFLAGS= -I${LOCALBASE}/include/libepoll-shim WAYLAND_LDFLAGS= -lepoll-shim WAYLAND_MESON_TRUE= wl WAYLAND_BROKEN= Wayland bits compile but don't yet work at runtime GSTREAMER_USES= gstreamer GSTREAMER_USE= GSTREAMER=core GSTREAMER_MESON_TRUE= gstreamer V4L_BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat V4L_MESON_TRUE= v4l2 IBUS_LIB_DEPENDS= libibus-1.0.so:textproc/ibus IBUS_USES= gnome IBUS_USE= GNOME=glib20 IBUS_MESON_TRUE= glib IBUS_VARS_OFF= ibus_disabler=ibus SCIM_LIB_DEPENDS= libscim-1.0.so:textproc/scim SCIM_VARS_OFF= scim_disabler=scim XIM_VARS_OFF= xim_disabler=xim OPENJPEG_LIB_DEPENDS= libopenjp2.so:graphics/openjpeg OPENJPEG_VARS_OFF= openjpeg_disabler=jp2k GNUTLS_LIB_DEPENDS= libgcrypt.so:security/libgcrypt \ libgnutls.so:security/gnutls GNUTLS_MESON_ON= -Dcrypto=gnutls GNUTLS_MESON_OFF= -Dcrypto=openssl GNUTLS_CFLAGS= -I${LOCALBASE}/include/gnutls/ GNUTLS_BROKEN= GNUTLS option is broken by the upstream bug: https://phab.enlightenment.org/T8807 PDF_LIB_DEPENDS= libpoppler.so:graphics/poppler PDF_VARS_OFF= pdf_disabler=pdf PS_LIB_DEPENDS= libspectre.so:print/libspectre PS_VARS_OFF= ps_disabler=ps RAW_LIB_DEPENDS= libraw.so:graphics/libraw RAW_VARS_OFF= raw_disabler=raw SVG_USES= gnome SVG_USE= GNOME=cairo GNOME=librsvg2 SVG_VARS_OFF= svg_disabler=rsvg AVIF_LIB_DEPENDS= libavif.so:graphics/libavif AVIF_VARS_OFF= avif_disabler=avif HEIF_LIB_DEPENDS= libheif.so:graphics/libheif HEIF_VARS_OFF= heif_disabler=heif WEBP_LIB_DEPENDS= libwebp.so:graphics/webp WEBP_VARS_OFF= webp_disabler=webp XCF_VARS_OFF= xcf_disabler=xcf LUAJIT_USES= luajit LUAJIT_MESON_ON= -Dlua-interpreter=luajit LUAJIT_PREVENTS= LUALANG LUALANG_USES= lua:51,build,run LUALANG_MESON_ON= -Dlua-interpreter=lua LUALANG_PREVENTS= LUAJIT OPENGL_USES= gl OPENGL_USE= GL=gl OPENGL_MESON_ON= -Dopengl=full OPENGLES_USES= gl OPENGLES_USE= GL=glesv2 OPENGLES_MESON_ON= -Dopengl=es-egl NONE_MESON_ON= -Dopengl=none SDL_USES= sdl SDL_USE= SDL=sdl2 SDL_MESON_TRUE= sdl IMF_DISABLERS= ${IBUS_DISABLER} ${SCIM_DISABLER} ${XIM_DISABLER} MESON_ARGS+= -Decore-imf-loaders-disabler="${IMF_DISABLERS:ts,}" EVAS_DISABLERS= json ${OPENJPEG_DISABLER} ${PDF_DISABLER} \ ${PS_DISABLER} ${RAW_DISABLER} ${SVG_DISABLER} \ ${AVIF_DISABLER} ${HEIF_DISABLER} ${WEBP_DISABLER} \ ${XCF_DISABLER} MESON_ARGS+= -Devas-loaders-disabler="${EVAS_DISABLERS:ts,}" EFL_BINDINGS= ${LUA_BINDING} ${CXX_BINDING} MESON_ARGS+= -Dbindings="${EFL_BINDINGS:ts,}" .include # Work-around build failure, which is caused by subtle problem in lld and -as-needed flag .if ${ARCH} == i386 MESON_ARGS+= -Db_asneeded=false .endif .if ${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH} == armv7 || ${ARCH} == i386 || ${ARCH} == powerpc || ${ARCH} == powerpc64 || ${ARCH} == powerpc64le LIB_DEPENDS+= libunwind.so:devel/libunwind .endif .if ${ARCH:Marmv?} BUILD_DEPENDS+= as:devel/binutils CFLAGS+= -no-integrated-as .endif post-install: #@${RM} -r ${STAGEDIR}${PREFIX}/share/gdb @for i in `${FIND} ${STAGEDIR}${PREFIX}/bin ${STAGEDIR}${PREFIX}/lib -type f`; do \ if ${FILE} $$i | ${GREP} -q "not stripped"; then ${STRIP_CMD} $$i; fi; \ done post-stage: @${ECHO_CMD} "autogenerating plist"; @cd ${STAGEDIR}${PREFIX} && ${FIND} * -type f -or -type l >> ${TMPPLIST} .include diff --git a/graphics/darktable/Makefile b/graphics/darktable/Makefile index 28dc9292ce1b..36129d5bc97d 100644 --- a/graphics/darktable/Makefile +++ b/graphics/darktable/Makefile @@ -1,132 +1,132 @@ PORTNAME= darktable PORTVERSION= 4.4.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= https://github.com/darktable-org/${PORTNAME}/releases/download/release-${PORTVERSION:C/\.rc/rc/}/ MAINTAINER= dumbbell@FreeBSD.org COMMENT= Virtual lighttable and darkroom for photographers WWW= https://www.darktable.org/ LICENSE= GPLv3 ONLY_FOR_ARCHS= aarch64 amd64 powerpc64le ONLY_FOR_ARCHS_REASON= uses 64-bit address space BUILD_DEPENDS= iso-codes>=0:misc/iso-codes \ p5-Pod-Parser>=0:textproc/p5-Pod-Parser \ po4a-translate:textproc/po4a \ xsltproc:textproc/libxslt \ bash:shells/bash LIB_DEPENDS= libavif.so:graphics/libavif \ libcolord-gtk.so:graphics/colord-gtk \ libcolord.so:graphics/colord \ libcurl.so:ftp/curl \ libexiv2.so:graphics/exiv2 \ libgphoto2.so:graphics/libgphoto2 \ libharfbuzz.so:print/harfbuzz \ libheif.so:graphics/libheif \ libicui18n.so:devel/icu \ libImath.so:math/Imath \ libjasper.so:graphics/jasper \ libjson-glib-1.0.so:devel/json-glib \ libjxl_threads.so:graphics/libjxl \ liblcms2.so:graphics/lcms2 \ liblensfun.so:graphics/lensfun \ libOpenEXR.so:graphics/openexr \ libopenjp2.so:graphics/openjpeg \ libosmgpsmap-1.0.so:x11-toolkits/osm-gps-map \ libpng.so:graphics/png \ libpugixml.so:textproc/pugixml \ libsoup-2.4.so:devel/libsoup \ libtiff.so:graphics/tiff \ libwebp.so:graphics/webp USES= cmake compiler:gcc-c++11-lib desktop-file-utils gl gnome jpeg \ llvm:15,build lua:54 perl5 pkgconfig sdl shebangfix sqlite \ tar:xz xorg USE_GL= gl USE_GNOME= cairo gtk30 intltool librsvg2 libxml2 USE_LDCONFIG= ${PREFIX}/lib/${PORTNAME} USE_SDL= sdl2 USE_XORG= ice sm x11 xext xrandr SHEBANG_FILES= tools/*.sh USE_GCC= yes CMAKE_ARGS+= -DBINARY_PACKAGE_BUILD=1 -DUSE_PORTMIDI:BOOL=OFF CMAKE_BOOL+= BUILD_CMSTEST USE_AVIF USE_CAMERA_SUPPORT USE_HEIF \ USE_KWALLET USE_LUA USE_MAP USE_OPENEXR USE_OPENJPEG \ USE_WEBP RAWSPEED_ENABLE_LTO CFLAGS+= -fopenmp -I${LOCALBASE}/include/Imath LDFLAGS+= -L${LOCALBASE}/lib WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:C/\.rc/~rc/} OPTIONS_DEFINE= DOCS GMIC GRAPHMAGICK LIBSECRET NLS PRINT TOOLS OPTIONS_DEFAULT= PRINT OPTIONS_SUB= yes GMIC_DESC= Support G'Mic-compressed LUT in lut3d LIBSECRET_DESC= Support libsecret as password backend TOOLS_DESC= Install additional scripts GMIC_LIB_DEPENDS= libgmic.so:graphics/gmic GMIC_CMAKE_BOOL= USE_GMIC GRAPHMAGICK_LIB_DEPENDS=libGraphicsMagick.so:graphics/GraphicsMagick GRAPHMAGICK_CMAKE_BOOL= USE_GRAPHICSMAGICK LIBSECRET_LIB_DEPENDS= libsecret-1.so:security/libsecret LIBSECRET_CMAKE_BOOL= USE_LIBSECRET # FIXME: Even with NLS turned off, darktable(1) is still linked to # libintl.so. NLS_USES= gettext NLS_USES_OFF= gettext-runtime NLS_CMAKE_BOOL= USE_NLS NLS_LDFLAGS= -L${LOCALBASE}/lib -lintl PRINT_LIB_DEPENDS= libcups.so:print/cups PRINT_CMAKE_BOOL= BUILD_PRINT TOOLS_BUILD_DEPENDS= exiftool:graphics/p5-Image-ExifTool TOOLS_RUN_DEPENDS= exiftool:graphics/p5-Image-ExifTool .include .if ${ARCH} == aarch64 || ${ARCH} == powerpc64le CMAKE_ARGS+= -DUSE_OPENCL:BOOL=OFF CXXFLAGS+= -DGDK_DISABLE_DEPRECATED PLIST_SUB+= NO_OPENCL="@comment " .else PLIST_SUB+= NO_OPENCL="" .endif .include # work around CMAKE/CCACHE flaw (cmake stomps over ccache) .if "${WITH_CCACHE_BUILD}" == "yes" && !defined(NO_CCACHE) CMAKE_ARGS+= -DCMAKE_C_COMPILER_LAUNCHER=${CCACHE_BIN} \ -DCMAKE_CXX_COMPILER_LAUNCHER=${CCACHE_BIN} .endif .if defined(WITH_DEBUG) CMAKE_BUILD_TYPE= RelWithDebInfo STRIP= .endif # darktable defines the __XOPEN_SOURCE preprocessor macro, which # restricts symbol visibility on FreeBSD and causes compilation failures # on, for instance, the cups_print module, because u_char remains # undefined. Remove _XOPEN_SOURCE maro definitions. post-patch: ${REINPLACE_CMD} '/add_definitions."-D_XOPEN_SOURCE=.*"/d' ${WRKSRC}/CMakeLists.txt post-install-TOOLS-off: @${RM} -f ${STAGEDIR}${DATADIR}/tools/extract_wb_from_images.sh .include diff --git a/graphics/darktable/files/patch-src_CMakeLists.txt b/graphics/darktable/files/patch-src_CMakeLists.txt index e67d581b6a58..a56917fac5fb 100644 --- a/graphics/darktable/files/patch-src_CMakeLists.txt +++ b/graphics/darktable/files/patch-src_CMakeLists.txt @@ -1,11 +1,20 @@ --- src/CMakeLists.txt.orig 2023-06-30 06:13:18 UTC +++ src/CMakeLists.txt +@@ -353,7 +353,7 @@ if (USE_AVIF) + endif(USE_WEBP) + + if (USE_AVIF) +- find_package(libavif 0.8.2 CONFIG) ++ find_package(libavif CONFIG) + if (TARGET avif) + list(APPEND LIBS avif) + add_definitions(-DHAVE_LIBAVIF=1) @@ -465,7 +465,7 @@ if(USE_OPENJPEG) add_definitions("-DHAVE_OPENJPEG") list(APPEND SOURCES "imageio/imageio_j2k.c") - include_directories(SYSTEM ${OpenJPEG_INCLUDE_DIRS}) + include_directories(BEFORE SYSTEM ${OpenJPEG_INCLUDE_DIRS}) list(APPEND LIBS ${OpenJPEG_LIBRARIES}) set(DT_SUPPORTED_EXTENSIONS ${DT_SUPPORTED_EXTENSIONS} j2c j2k jp2 jpc CACHE INTERNAL "") endif(OpenJPEG_FOUND) diff --git a/graphics/gd/Makefile b/graphics/gd/Makefile index 8908e093617e..0abc54d58d5d 100644 --- a/graphics/gd/Makefile +++ b/graphics/gd/Makefile @@ -1,135 +1,135 @@ PORTNAME= libgd PORTVERSION= 2.3.3 -PORTREVISION= 6 +PORTREVISION= 7 PORTEPOCH= 1 CATEGORIES+= graphics MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/gd-${PORTVERSION}/ MAINTAINER?= dinoex@FreeBSD.org COMMENT?= Graphics library for fast creation of images WWW= https://libgd.github.io/ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING CONFLICTS_INSTALL= libgd ??-libgd USES= cpe tar:xz pkgconfig pathfix libtool:keepla shebangfix SHEBANG_FILES= ${WRKSRC}/src/bdftogd GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-gd-formats TMPDIR?= /tmp MAKE_ENV= TMPDIR=${TMPDIR} SUB_FILES= gdlib-config USE_LDCONFIG= yes TEST_TARGET= check OPTIONS_DEFINE= PNG JPEG WEBP TIFF XPM HEIF AVIF LIQ FREETYPE FONTCONFIG RAQM ICONV THREADS OPTIONS_DEFAULT=PNG JPEG WEBP TIFF FREETYPE FONTCONFIG ICONV NO_OPTIONS_SORT=yes OPTIONS_SUB= yes PNG_LIB_DEPENDS= libpng.so:graphics/png PNG_CONFIGURE_OFF= --without-png PNG_CPPFLAGS= -I${LOCALBASE}/include JPEG_USES= jpeg JPEG_CONFIGURE_OFF= --without-jpeg JPEG_CPPFLAGS= -I${LOCALBASE}/include WEBP_LIB_DEPENDS= libwebp.so:graphics/webp WEBP_CONFIGURE_OFF= --without-webp WEBP_CPPFLAGS= -I${LOCALBASE}/include TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff TIFF_CONFIGURE_OFF= --without-tiff TIFF_CPPFLAGS= -I${LOCALBASE}/include HEIF_LIB_DEPENDS= libheif.so:graphics/libheif HEIF_CONFIGURE_OFF= --without-heif HEIF_CPPFLAGS= -I${LOCALBASE}/include AVIF_LIB_DEPENDS= libavif.so:graphics/libavif AVIF_CONFIGURE_OFF= --without-avif AVIF_CPPFLAGS= -I${LOCALBASE}/include AVIF_USES= autoreconf AVIF_BROKEN= option AVIF has a circular dependency loop LIQ_DESC= libimagequant color conversion support LIQ_LIB_DEPENDS= libimagequant.so:graphics/libimagequant LIQ_CONFIGURE_OFF= --with-liq=no LIQ_CPPFLAGS= -I${LOCALBASE}/include FREETYPE_LIB_DEPENDS= libfreetype.so:print/freetype2 FREETYPE_CONFIGURE_OFF= --without-freetype FREETYPE_CPPFLAGS= -I${LOCALBASE}/include FONTCONFIG_LIB_DEPENDS+= libfontconfig.so:x11-fonts/fontconfig FONTCONFIG_CONFIGURE_OFF= --with-fontconfig=no FONTCONFIG_CPPFLAGS= -I${LOCALBASE}/include RAQM_DESC= Raqm text layout support RAQM_LIB_DEPENDS= libraqm.so:print/libraqm RAQM_CONFIGURE_OFF= --with-raqm=no RAQM_CPPFLAGS= -I${LOCALBASE}/include XPM_USES= xorg XPM_USE= xorg=xpm,x11 XPM_CONFIGURE_ON= --with-x XPM_CONFIGURE_OFF= --with-xpm=no ICONV_USES= iconv ICONV_CONFIGURE_ON= ${ICONV_CONFIGURE_ARG} THREADS_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-threads THREADS_USES= autoreconf .include .if ${PORT_OPTIONS:MFREETYPE} # bin/annotate CONFLICTS_INSTALL+= mummer .endif # force gdlib-config --ldflags LDFLAGS+= -L${LOCALBASE}/lib # The GD_FONTS environment variable can be set to specify the gzipped # tar-ball containing the fonts in bdf format and the bdf file names. # The tarball is the first argument, the tiny, small, medium-bold, # large, and giant fonts follow. # # For example: # GD_FONTS="/usr/ports/distfiles/x-koi8u.tgz koi6x10.bdf koi8x13.bdf \ # koi9x15.bdf koi12x24.bdf koi10x20.bdf" # .if defined(GD_FONTS) USES+= perl5 USE_PERL5= build WRKFONTS= ${WRKSRC}/src .endif pre-extract:: @${ECHO_MSG} "" @${ECHO_MSG} "GD_FONTS can be set to specify an alternative list of .bdf files" @${ECHO_MSG} "" post-extract: .if defined(GD_FONTS) cd ${WRKFONTS} && ${SH} ${FILESDIR}/makefonts extract ${GD_FONTS} .endif pre-configure: .if defined(GD_FONTS) cd ${WRKFONTS} && ${SH} ${FILESDIR}/makefonts configure ${GD_FONTS} .endif # bump shlib version ${REINPLACE_CMD} \ -e 's|^GDLIB_LT_CURRENT=3|GDLIB_LT_CURRENT=6|' \ ${WRKSRC}/configure ${WRKSRC}/config/getlib.sh pre-configure-ICONV-off: ${REINPLACE_CMD} \ -e 's|iconv|noiconv|' \ ${WRKSRC}/configure .if defined(GD_FONTS) pre-build: cd ${WRKFONTS} && ${SH} ${FILESDIR}/makefonts build ${GD_FONTS} .endif post-install: ${INSTALL_DATA} ${WRKSRC}/src/gdhelpers.h \ ${STAGEDIR}${PREFIX}/include/ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgd.so.6* ${INSTALL_SCRIPT} ${WRKDIR}/gdlib-config \ ${STAGEDIR}${PREFIX}/bin/ .include diff --git a/graphics/kf5-kimageformats/Makefile b/graphics/kf5-kimageformats/Makefile index 48031bdacf9a..0053b443cc13 100644 --- a/graphics/kf5-kimageformats/Makefile +++ b/graphics/kf5-kimageformats/Makefile @@ -1,38 +1,39 @@ PORTNAME= kimageformats DISTVERSION= ${KDE_FRAMEWORKS_VERSION} +PORTREVISION= 1 CATEGORIES= graphics kde kde-frameworks MAINTAINER= kde@FreeBSD.org COMMENT= KF5 library providing support for additional image formats LIB_DEPENDS= libImath.so:math/Imath USES= cmake compiler:c++11-lib kde:5 pkgconfig qt:5 tar:xz USE_KDE= archive \ ecm:build USE_QT= core gui printsupport widgets \ buildtools:build qmake:build CFLAGS+= -I${LOCALBASE}/include/Imath OPTIONS_DEFINE= AVIF JXL HEIF OPENEXR OPTIONS_DEFAULT= AVIF JXL HEIF OPENEXR OPTIONS_SUB= yes AVIF_LIB_DEPENDS= libavif.so:graphics/libavif AVIF_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_libavif JXL_LIB_DEPENDS= libjxl.so:graphics/libjxl JXL_CMAKE_BOOL= KIMAGEFORMATS_JXL HEIF_LIB_DEPENDS= libheif.so:graphics/libheif HEIF_CMAKE_BOOL= KIMAGEFORMATS_HEIF OPENEXR_LIB_DEPENDS= libOpenEXR.so:graphics/openexr OPENEXR_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_OpenEXR post-patch: ${REINPLACE_CMD} s,Imf::Int64,uint64_t, \ ${WRKSRC}/src/imageformats/exr.cpp .include diff --git a/graphics/kf5-kimageformats/files/patch-CMakeLists.txt b/graphics/kf5-kimageformats/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..82a333a833bb --- /dev/null +++ b/graphics/kf5-kimageformats/files/patch-CMakeLists.txt @@ -0,0 +1,23 @@ +CMake Warning at CMakeLists.txt:54 (find_package): + Could not find a configuration file for package "libavif" that is + compatible with requested version "0.8.2". + + The following configuration files were considered but not accepted: + + /usr/local/lib/cmake/libavif/libavif-config.cmake, version: 1.0.0 +[...] +===> Checking for items in pkg-plist which are not in STAGEDIR +Error: Missing: %%QT_PLUGINDIR%%/imageformats/kimg_avif.so +Error: Missing: share/kservices5/qimageioplugins/avif.desktop + +--- CMakeLists.txt.orig 2023-08-05 12:37:26 UTC ++++ CMakeLists.txt +@@ -51,7 +51,7 @@ set_package_properties(OpenEXR PROPERTIES + PURPOSE "Required for the QImage plugin for OpenEXR images" + ) + +-find_package(libavif 0.8.2 CONFIG) ++find_package(libavif CONFIG) + set_package_properties(libavif PROPERTIES + TYPE OPTIONAL + PURPOSE "Required for the QImage plugin for AVIF images" diff --git a/graphics/kf5-kimageformats/files/patch-src_imageformats_avif.cpp b/graphics/kf5-kimageformats/files/patch-src_imageformats_avif.cpp new file mode 100644 index 000000000000..7c2ab4517ecc --- /dev/null +++ b/graphics/kf5-kimageformats/files/patch-src_imageformats_avif.cpp @@ -0,0 +1,15 @@ +src/imageformats/avif.cpp:428:40: error: no member named 'mode' in 'avifImageMirror' + switch (m_decoder->image->imir.mode) { + ~~~~~~~~~~~~~~~~~~~~~~ ^ + +--- src/imageformats/avif.cpp.orig 2023-08-05 12:37:26 UTC ++++ src/imageformats/avif.cpp +@@ -424,7 +424,7 @@ bool QAVIFHandler::decode_one_frame() + } + + if (m_decoder->image->transformFlags & AVIF_TRANSFORM_IMIR) { +-#if AVIF_VERSION > 90100 ++#if AVIF_VERSION > 90100 && AVIF_VERSION < 1000000 + switch (m_decoder->image->imir.mode) { + #else + switch (m_decoder->image->imir.axis) { diff --git a/graphics/libavif/Makefile b/graphics/libavif/Makefile index 8c8ad35cf69d..39fd12f708d8 100644 --- a/graphics/libavif/Makefile +++ b/graphics/libavif/Makefile @@ -1,66 +1,66 @@ PORTNAME= libavif DISTVERSIONPREFIX= v -DISTVERSION= 0.11.1 -PORTREVISION= 1 +DISTVERSION= 1.0.0 CATEGORIES= graphics PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ -PATCHFILES+= 2340cdb5f0c2.patch:-p1 # https://github.com/AOMediaCodec/libavif/pull/296 +PATCHFILES+= 648f8d0dd03f.patch:-p1 # https://github.com/AOMediaCodec/libavif/pull/1525 +PATCHFILES+= d854bb762db6.patch:-p1 # https://github.com/AOMediaCodec/libavif/pull/1525 MAINTAINER= jbeich@FreeBSD.org COMMENT= Library for encoding and decoding .avif files WWW= https://github.com/AOMediaCodec/libavif LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libpng.so:graphics/png TEST_DEPENDS= googletest>0:devel/googletest \ bash:shells/bash USES= cmake:testing compiler:c11 cpe jpeg pkgconfig CPE_VENDOR= aomedia USE_GITHUB= yes USE_LDCONFIG= yes GH_ACCOUNT= AOMediaCodec CMAKE_ON= AVIF_BUILD_APPS CMAKE_TESTING_ON= AVIF_BUILD_TESTS OPTIONS_DEFINE= AOM DAV1D GAV1 LIBSHARPYUV LIBYUV PIXBUF RAV1E SVTAV1 OPTIONS_DEFAULT=AOM DAV1D PIXBUF OPTIONS_SUB= yes AOM_DESC= AV1 encoding/decoding via libaom AOM_LIB_DEPENDS= libaom.so:multimedia/aom AOM_CMAKE_BOOL= AVIF_CODEC_AOM DAV1D_DESC= AV1 decoding via libdav1d DAV1D_LIB_DEPENDS= libdav1d.so:multimedia/dav1d DAV1D_CMAKE_BOOL= AVIF_CODEC_DAV1D GAV1_DESC= AV1 decoding via libgav1 GAV1_LIB_DEPENDS= libgav1.so:multimedia/libgav1 GAV1_CMAKE_BOOL= AVIF_CODEC_LIBGAV1 LIBSHARPYUV_DESC= Colorspace conversion via libsharpyuv LIBSHARPYUV_LIB_DEPENDS= libsharpyuv.so:graphics/webp LIBSHARPYUV_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_libsharpyuv LIBYUV_DESC= Colorspace conversion via libyuv LIBYUV_BUILD_DEPENDS= libyuv>=0.0.1774:graphics/libyuv LIBYUV_LIB_DEPENDS= libyuv.so:graphics/libyuv LIBYUV_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_libyuv PIXBUF_USES= gnome PIXBUF_USE= GNOME=gdkpixbuf2 PIXBUF_CMAKE_BOOL= AVIF_BUILD_GDK_PIXBUF RAV1E_DESC= AV1 encoding via librav1e RAV1E_LIB_DEPENDS= librav1e.so:multimedia/librav1e RAV1E_CMAKE_BOOL= AVIF_CODEC_RAV1E SVTAV1_DESC= AV1 encoding via SVT-AV1 SVTAV1_LIB_DEPENDS= libSvtAv1Enc.so:multimedia/svt-av1 SVTAV1_CMAKE_BOOL= AVIF_CODEC_SVT .include diff --git a/graphics/libavif/distinfo b/graphics/libavif/distinfo index 2c64bf9f2340..8ae3572182d8 100644 --- a/graphics/libavif/distinfo +++ b/graphics/libavif/distinfo @@ -1,5 +1,7 @@ -TIMESTAMP = 1666215155 -SHA256 (AOMediaCodec-libavif-v0.11.1_GH0.tar.gz) = 0eb49965562a0e5e5de58389650d434cff32af84c34185b6c9b7b2fccae06d4e -SIZE (AOMediaCodec-libavif-v0.11.1_GH0.tar.gz) = 5826813 -SHA256 (2340cdb5f0c2.patch) = 20ee35cb5581d7be24d7a455eebdd21e89d71bbed093e7fd76cd5caac4d3ed52 -SIZE (2340cdb5f0c2.patch) = 1716 +TIMESTAMP = 1693260220 +SHA256 (AOMediaCodec-libavif-v1.0.0_GH0.tar.gz) = 410f85cf0d13f403b41197c0774da469f5d73b89aa06d40fc726165377f215a0 +SIZE (AOMediaCodec-libavif-v1.0.0_GH0.tar.gz) = 10569801 +SHA256 (648f8d0dd03f.patch) = 2f6962ca019598dee5ec1d5c7db63e26ed462ae74f9701674dc8f79332bde3a8 +SIZE (648f8d0dd03f.patch) = 1680 +SHA256 (d854bb762db6.patch) = 00bdf5822e16c391b5b4854db92e848a057b346288a14b85c64e55fd11602c55 +SIZE (d854bb762db6.patch) = 1056 diff --git a/graphics/libavif/pkg-plist b/graphics/libavif/pkg-plist index 83035c4d4095..1bf5ea95a33a 100644 --- a/graphics/libavif/pkg-plist +++ b/graphics/libavif/pkg-plist @@ -1,12 +1,12 @@ bin/avifdec bin/avifenc include/avif/avif.h lib/cmake/libavif/libavif-config-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/libavif/libavif-config-version.cmake lib/cmake/libavif/libavif-config.cmake %%PIXBUF%%lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-avif.so lib/libavif.so -lib/libavif.so.15 -lib/libavif.so.15.0.1 +lib/libavif.so.16 +lib/libavif.so.16.0.0 libdata/pkgconfig/libavif.pc %%PIXBUF%%share/thumbnailers/avif.thumbnailer diff --git a/graphics/sdl2_image/Makefile b/graphics/sdl2_image/Makefile index 086ff491587a..df6be96200a8 100644 --- a/graphics/sdl2_image/Makefile +++ b/graphics/sdl2_image/Makefile @@ -1,50 +1,50 @@ PORTNAME= sdl2_image DISTVERSIONPREFIX= release- DISTVERSION= 2.6.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MAINTAINER= amdmi3@FreeBSD.org COMMENT= Simple library to load images of various formats as SDL surfaces WWW= https://github.com/libsdl-org/SDL_image LICENSE= ZLIB LICENSE_FILE= ${WRKSRC}/LICENSE.txt USES= cmake sdl USE_GITHUB= yes GH_ACCOUNT= libsdl-org GH_PROJECT= SDL_image USE_SDL= sdl2 CMAKE_OFF= SDL2IMAGE_DEPS_SHARED \ SDL2IMAGE_SAMPLES \ SDL2IMAGE_BACKEND_STB CMAKE_ARGS= -DSDL2IMAGE_DEBUG_POSTFIX:STRING= USE_LDCONFIG= yes OPTIONS_DEFINE= AVIF JPEG JXL PNG TIFF WEBP TEST OPTIONS_DEFAULT=AVIF JPEG JXL PNG WEBP JPEG_USES= jpeg JPEG_CMAKE_BOOL= SDL2IMAGE_JPG PNG_LIB_DEPENDS= libpng.so:graphics/png PNG_CMAKE_BOOL= SDL2IMAGE_PNG TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff TIFF_CMAKE_BOOL= SDL2IMAGE_TIF WEBP_LIB_DEPENDS= libwebp.so:graphics/webp WEBP_CMAKE_BOOL= SDL2IMAGE_WEBP AVIF_LIB_DEPENDS= libavif.so:graphics/libavif AVIF_CMAKE_BOOL= SDL2IMAGE_AVIF JXL_LIB_DEPENDS= libjxl.so:graphics/libjxl JXL_CMAKE_BOOL= SDL2IMAGE_JXL TEST_CMAKE_BOOL= SDL2IMAGE_TESTS TEST_CONFIGURE_ENV= LOCALBASE="${LOCALBASE}" TEST_LIB_DEPENDS= libunwind.so:devel/libunwind TEST_TEST_TARGET= test TEST_IMPLIES= PNG JPEG # does not build otherwise TEST_BROKEN= does not build # XXX: probably devel/sdl20 problem post-extract: @${RM} -rf ${WRKSRC}/external .include diff --git a/graphics/sdl2_image/files/patch-CMakeLists.txt b/graphics/sdl2_image/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..1b0c9bbcf77b --- /dev/null +++ b/graphics/sdl2_image/files/patch-CMakeLists.txt @@ -0,0 +1,27 @@ +CMake Error at CMakeLists.txt:348 (find_package): + Could not find a configuration file for package "libavif" that is + compatible with requested version "0.9.1". + + The following configuration files were considered but not accepted: + + /usr/local/lib/cmake/libavif/libavif-config.cmake, version: 1.0.0 + +--- CMakeLists.txt.orig 2023-02-07 00:38:32 UTC ++++ CMakeLists.txt +@@ -81,7 +81,6 @@ cmake_dependent_option(SDL2IMAGE_PNG_SAVE "Add PNG sav + cmake_dependent_option(SDL2IMAGE_JPG_SAVE "Add JPEG save support" ON SDL2IMAGE_JPG OFF) + cmake_dependent_option(SDL2IMAGE_PNG_SAVE "Add PNG save support" ON SDL2IMAGE_PNG OFF) + +-set(LIBAVIF_MINIMUM_VERSION "0.9.1") + if(SDL2IMAGE_VENDORED AND SDL2IMAGE_AVIF) + set(SDL2IMAGE_AVIF_VENDORED ON) + else() +@@ -345,7 +344,7 @@ if(SDL2IMAGE_AVIF) + endif() + else() + message(STATUS "${PROJECT_NAME}: Using system libavif") +- find_package(libavif ${LIBAVIF_MINIMUM_VERSION} REQUIRED) ++ find_package(libavif REQUIRED) + list(APPEND PC_REQUIRES libavif) + endif() + if(SDL2IMAGE_AVIF_SHARED) diff --git a/www/links/Makefile b/www/links/Makefile index a12759f4e64a..1c1b9bcd1a1e 100644 --- a/www/links/Makefile +++ b/www/links/Makefile @@ -1,111 +1,111 @@ PORTNAME= links PORTVERSION= 2.29 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= http://links.twibright.com/download/ MAINTAINER= portmaster@BSDforge.com COMMENT= Lynx-like text WWW browser WWW= http://links.twibright.com/ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING CONFLICTS_INSTALL= links1 LIB_DEPENDS= libzstd.so:archivers/zstd GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-ssl --without-pmshell --without-atheos \ --without-gpm --without-fb --without-windows USES= cpe localbase:ldflags ssl tar:bz2 CPE_VENDOR= twibright PLIST_FILES= bin/links man/man1/links.1.gz OPTIONS_DEFINE= BROTLI CIPHERSTRING DIRECTFB IPV6 SVG SVGALIB THREADS TRANS \ UTF8 X11 OPTIONS_DEFAULT= UTF8 X11 BROTLI_LIB_DEPENDS= libbrotlidec.so:archivers/brotli BROTLI_CONFIGURE_WITH= brotli CIPHERSTRING_DESC= Select the OpenSSL ciphers used via CIPHERSTRING DIRECTFB_DESC= DirectFB graphics support TRANS_DESC= Hack for background transparency DIRECTFB_LIB_DEPENDS= libdirectfb.so:devel/directfb DIRECTFB_CONFIGURE_WITH=directfb IPV6_CONFIGURE_WITH= ipv6 SVG_CONFIGURE_WITH= librsvg SVG_USES= gnome SVG_USE= gnome=librsvg2,glib20,gdkpixbuf2,cairo SVGALIB_LIB_DEPENDS= libvga.so:graphics/svgalib SVGALIB_CONFIGURE_WITH= svgalib THREADS_CFLAGS= -DHAVE_PTHREADS THREADS_LDFLAGS=-pthread TRANS_EXTRA_PATCHES= ${FILESDIR}/extra-terminal.c.diff UTF8_CONFIGURE_ENABLE= utf8 X11_USES= xorg X11_USE= xorg=x11,xorgproto X11_LIB_DEPENDS= libevent.so:devel/libevent \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 X11_CONFIGURE_WITH= x X11_PLIST_FILES= share/pixmaps/links.xpm .include #CIPHERSTRING must be a valid OpenSSL cipher string(see ciphers(1)): CIPHERSTRING?= HIGH:!SSLv2:!aNULL:!eNULL:@STRENGTH .if ${PORT_OPTIONS:MDIRECTFB} || ${PORT_OPTIONS:MSVGALIB} || ${PORT_OPTIONS:MX11} LIB_DEPENDS+= libavif.so:graphics/libavif \ libpng.so:graphics/png \ libtiff.so:graphics/tiff \ libwebp.so:graphics/webp USES+= jpeg pkgconfig CONFIGURE_ARGS+= --enable-graphics .else .if ${PORT_OPTIONS:MSVG} IGNORE= option SVG requires one of DIRECTFB, SVGALIB, or X11 .endif CONFIGURE_ARGS+= --disable-graphics --without-libavif \ --without-libjpeg --without-librsvg \ --without-libtiff --without-libwebp .endif .if ${PORT_OPTIONS:MX11} DESKTOP_ENTRIES="links" \ "${COMMENT}" \ "${PREFIX}/share/pixmaps/links.xpm" \ "links -g" \ "Network;WebBrowser;" \ false .endif post-patch: @${REINPLACE_CMD} -e "s!/etc/!${PREFIX}/etc/!" ${WRKSRC}/os_dep.h .if ${PORT_OPTIONS:MCIPHERSTRING} @${REINPLACE_CMD} -e '/SSL_CTX_set_options/ \ s/;/; SSL_CTX_set_cipher_list(ctx, "${CIPHERSTRING}");/' \ ${WRKSRC}/https.c .endif .if ${PORT_OPTIONS:MX11} post-install: ${INSTALL_DATA} ${WRKSRC}/graphics/links.xpm ${STAGEDIR}${PREFIX}/share/pixmaps/links.xpm .endif .include