diff --git a/comms/xastir/Makefile b/comms/xastir/Makefile index f43f5c04b272..5b509f5448b7 100644 --- a/comms/xastir/Makefile +++ b/comms/xastir/Makefile @@ -1,89 +1,90 @@ PORTNAME= xastir DISTVERSIONPREFIX= Release- DISTVERSION= 2.2.0 +PORTREVISION= 1 CATEGORIES= comms hamradio MAINTAINER= carl@stagecraft.cx COMMENT= X Amateur Station Tracking and Information Reporting WWW= http://www.xastir.org/ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= xfontsel:x11-fonts/xfontsel RUN_DEPENDS= wget:ftp/wget LIB_DEPENDS= libfreetype.so:print/freetype2 \ libjasper.so:graphics/jasper \ libjbig.so:graphics/jbigkit \ liblcms2.so:graphics/lcms2 \ libpng.so:graphics/png \ libshp.so:devel/shapelib \ libtiff.so:graphics/tiff \ libwebp.so:graphics/webp \ libwebpmux.so:graphics/webp \ libwmflite.so:graphics/libwmf \ libpcre2-8.so:devel/pcre2 \ libjxl.so:graphics/libjxl \ libjxl_threads.so:graphics/libjxl USES= autoreconf gmake gnome jpeg motif shebangfix xorg USE_XORG= ice sm x11 xext xt USE_GNOME+= libxml2 GNU_CONFIGURE= yes SHEBANG_FILES= scripts/gpx2shape SHEBANG_REGEX= ./scripts/.*\.(sh|pl|py) USE_GITHUB= yes GH_ACCOUNT= Xastir GH_PROJECT= Xastir SUB_FILES= pkg-message OPTIONS_DEFINE= BDB CURL DAVIS ERRORPOP FESTIVAL GEOTIFF GPSMAN OPTIONS_RADIO= MGG OPTIONS_RADIO_MGG= GMAGICK IMAGICK DAVIS_DESC= Include Davis Weatherstation Support CURL_DESC= Include CURL Internet Image support GEOTIFF_DESC= Include GeoTIFF Support GPSMAN_DESC= Include GPSMAN Support FESTIVAL_DESC= Include Festival Voice Synthesis Support ERRORPOP_DESC= Send error popups to stderr BDB_DESC= Tiger Map Caching using Berkeley DB MGG_DESC= Image library for raster map processing IMAGICK_DESC= ImageMagick (Version 6) GMAGICK_DESC= GraphicsMagick (Needs GCC to compile) OPTIONS_DEFAULT= BDB CURL GMAGICK DAVIS_CONFIGURE_ON= --enable-davis IMAGICK_USES= magick:6 IMAGICK_CONFIGURE_WITH= imagemagick GMAGICK_LIB_DEPENDS= libGraphicsMagickWand.so:graphics/GraphicsMagick GMAGICK_CONFIGURE_WITH= graphicsmagick GMAGICK_USES= compiler:gcc-c++11-lib CURL_LIB_DEPENDS= libcurl.so:ftp/curl GEOTIFF_LIB_DEPENDS= libgeotiff.so:graphics/libgeotiff GPSMAN_BUILD_DEPENDS= ${LOCALBASE}/share/doc/gpsmanshp/GPSManSHP.pdf:graphics/gpsmanshp GPSMAN_IMPLIES= SHAPELIB GPSMAN_CONFIGURE_WITH= gpsman FESTIVAL_BUILD_DEPENDS= festival:audio/festival FESTIVAL_CONFIGURE_WITH= festival #RTREE_CONFIGURE_WITH= rtree ERRORPOP_CONFIGURE_WITH= errorpopups BDB_USES= bdb BDB_CONFIGURE_ON= --with-bdb-incdir=${BDB_INCLUDE_DIR} \ --with-bdb-libdir=${BDB_LIB_DIR} .include diff --git a/graphics/GraphicsMagick/Makefile b/graphics/GraphicsMagick/Makefile index 03cd38dcd40f..8c4420fc8b7e 100644 --- a/graphics/GraphicsMagick/Makefile +++ b/graphics/GraphicsMagick/Makefile @@ -1,99 +1,99 @@ PORTNAME= GraphicsMagick PORTVERSION= 1.3.40 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= graphics MASTER_SITES= SF MAINTAINER= sunpoet@FreeBSD.org COMMENT= Fast image processing tools based on ImageMagick WWW= http://www.graphicsmagick.org/ LICENSE= MIT USES= cpe libtool localbase pathfix pkgconfig tar:zst CONFIGURE_ARGS= --enable-shared --enable-static \ --with-windows-font-dir=${WINDOWS_FONT_DIR} \ --without-dps --without-gdi32 --without-perl --without-trio CONFIGURE_ENV= PTHREAD_LIBS=-lpthread GNU_CONFIGURE= yes INSTALL_TARGET= install-strip TEST_TARGET= check USE_LDCONFIG= yes # Use fonts installed by x11-fonts/webfonts by default WINDOWS_FONT_DIR?= ${LOCALBASE}/share/fonts/webfonts OPTIONS_DEFINE= BZIP2 DOCS FPX FREETYPE HEIF JASPER JBIG JPEG JXL LCMS2 LZMA OPENMP Q8BIT PNG TEST TIFF WEBP WMF X11 XML ZLIB ZSTD OPTIONS_DEFAULT=BZIP2 FREETYPE JASPER JBIG JPEG JXL LCMS2 LZMA OPENMP PNG TIFF WEBP WMF X11 XML ZLIB Q8BIT_DESC= Use 8-bit pixels (speed) instead of 16-bit (quality) TEST_DESC= Run bundled self-tests after build BZIP2_CONFIGURE_WITH= bzlib FPX_CONFIGURE_WITH= fpx FPX_LIB_DEPENDS= libfpx.so:graphics/libfpx FREETYPE_CONFIGURE_WITH=ttf FREETYPE_LIB_DEPENDS= libfreetype.so:print/freetype2 HEIF_CONFIGURE_WITH= heif HEIF_LIB_DEPENDS= libheif.so:graphics/libheif JASPER_CONFIGURE_WITH= jp2 JASPER_LIB_DEPENDS= libjasper.so:graphics/jasper JBIG_CONFIGURE_WITH= jbig JBIG_LIB_DEPENDS= libjbig.so:graphics/jbigkit JPEG_CONFIGURE_WITH= jpeg JPEG_USES= jpeg JXL_CONFIGURE_WITH= jxl JXL_LIB_DEPENDS= libjxl.so:graphics/libjxl LCMS2_CONFIGURE_WITH= lcms2 LCMS2_LIB_DEPENDS= liblcms2.so:graphics/lcms2 LZMA_CONFIGURE_WITH= lzma OPENMP_CONFIGURE_OFF= --disable-openmp --without-threads OPENMP_CONFIGURE_ON= --disable-openmp-slow --enable-openmp --with-threads PNG_CONFIGURE_WITH= png PNG_LIB_DEPENDS= libpng.so:graphics/png Q8BIT_CONFIGURE_OFF= --with-quantum-depth=16 Q8BIT_CONFIGURE_ON= --with-quantum-depth=8 Q8BIT_PLIST_SUB= Q=8 Q8BIT_PLIST_SUB_OFF= Q=16 TEST_BUILD_DEPENDS= webfonts>=0:x11-fonts/webfonts TEST_RUN_DEPENDS= webfonts>=0:x11-fonts/webfonts TIFF_CONFIGURE_WITH= tiff TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff WEBP_CONFIGURE_WITH= webp WEBP_LIB_DEPENDS= libwebp.so:graphics/webp WMF_CONFIGURE_WITH= wmf X11_CONFIGURE_OFF= ac_cv_lib_ICE_IceConnectionNumber=no X11_CONFIGURE_WITH= x X11_USES= xorg X11_USE= XORG=ice,sm,x11,xext XML_CONFIGURE_WITH= xml XML_USE= GNOME=libxml2 XML_USES= gnome ZLIB_CONFIGURE_WITH= zlib ZSTD_CONFIGURE_WITH= zstd ZSTD_LIB_DEPENDS= libzstd.so:archivers/zstd .include .if ${PORT_OPTIONS:MOPENMP} .if ${ARCH} != aarch64 && ${ARCH} != amd64 && ${ARCH} != i386 && ${ARCH} != powerpc64 && ${ARCH} != powerpc64le && ${ARCH} != riscv64 USES+= compiler:gcc-c++11-lib .endif .endif .if ${PORT_OPTIONS:MWMF} .if ${PORT_OPTIONS:MX11} LIB_DEPENDS+= libwmflite.so:graphics/libwmf .else LIB_DEPENDS+= libwmflite.so:graphics/libwmf-nox11 .endif .endif post-install-Q8BIT-off: ${MKDIR} ${STAGEDIR}${PREFIX}/lib/GraphicsMagick/modules-Q16/coders ${STAGEDIR}${PREFIX}/lib/GraphicsMagick/modules-Q16/filters post-install-Q8BIT-on: ${MKDIR} ${STAGEDIR}${PREFIX}/lib/GraphicsMagick/modules-Q8/coders ${STAGEDIR}${PREFIX}/lib/GraphicsMagick/modules-Q8/filters .include diff --git a/graphics/GraphicsMagick/files/patch-coders_jxl.c b/graphics/GraphicsMagick/files/patch-coders_jxl.c new file mode 100644 index 000000000000..4cd9d9155818 --- /dev/null +++ b/graphics/GraphicsMagick/files/patch-coders_jxl.c @@ -0,0 +1,63 @@ +https://sourceforge.net/p/graphicsmagick/code/ci/43bc74dd0c13/ + +--- coders/jxl.c.orig 2023-01-14 15:40:53 UTC ++++ coders/jxl.c +@@ -631,8 +631,12 @@ static Image *ReadJXLImage(const ImageInfo *image_info + JxlColorEncoding + color_encoding; + +- status=JxlDecoderGetColorAsEncodedProfile(jxl_decoder,&pixel_format, +- JXL_COLOR_PROFILE_TARGET_DATA,&color_encoding); ++ status=JxlDecoderGetColorAsEncodedProfile(jxl_decoder, ++#if JPEGXL_NUMERIC_VERSION < JPEGXL_COMPUTE_NUMERIC_VERSION(0,9,0) ++ &pixel_format, ++#endif /* if JPEGXL_NUMERIC_VERSION < JPEGXL_COMPUTE_NUMERIC_VERSION(0,9,0) */ ++ JXL_COLOR_PROFILE_TARGET_DATA, ++ &color_encoding); + if (status == JXL_DEC_ERROR) + { + status=JXL_DEC_SUCCESS; +@@ -733,8 +737,12 @@ static Image *ReadJXLImage(const ImageInfo *image_info + size_t + profile_size; + +- if (JxlDecoderGetICCProfileSize(jxl_decoder,&pixel_format, +- JXL_COLOR_PROFILE_TARGET_ORIGINAL,&profile_size) ++ if (JxlDecoderGetICCProfileSize(jxl_decoder, ++#if JPEGXL_NUMERIC_VERSION < JPEGXL_COMPUTE_NUMERIC_VERSION(0,9,0) ++ &pixel_format, ++#endif /* if JPEGXL_NUMERIC_VERSION < JPEGXL_COMPUTE_NUMERIC_VERSION(0,9,0) */ ++ JXL_COLOR_PROFILE_TARGET_ORIGINAL, ++ &profile_size) + == JXL_DEC_SUCCESS) + { + unsigned char +@@ -743,10 +751,14 @@ static Image *ReadJXLImage(const ImageInfo *image_info + if ((profile=MagickAllocateResourceLimitedMemory(unsigned char *,profile_size)) + != NULL) + { +- if (JxlDecoderGetColorAsICCProfile(jxl_decoder,&pixel_format, ++ if (JxlDecoderGetColorAsICCProfile(jxl_decoder, ++#if JPEGXL_NUMERIC_VERSION < JPEGXL_COMPUTE_NUMERIC_VERSION(0,9,0) ++ &pixel_format, ++#endif /* if JPEGXL_NUMERIC_VERSION < JPEGXL_COMPUTE_NUMERIC_VERSION(0,9,0) */ + JXL_COLOR_PROFILE_TARGET_ORIGINAL, + profile, +- profile_size) == JXL_DEC_SUCCESS) ++ profile_size) ++ == JXL_DEC_SUCCESS) + { + (void) SetImageProfile(image,"ICM",profile,profile_size); + } +@@ -1268,8 +1280,11 @@ static unsigned int WriteJXLImage(const ImageInfo *ima + /* TODO better error codes */ + if (jxl_status == JXL_ENC_ERROR) + ThrowJXLWriterException(CoderError,NoDataReturned,image); ++#if JPEGXL_NUMERIC_VERSION < JPEGXL_COMPUTE_NUMERIC_VERSION(0,9,0) ++ /* JXL_ENC_NOT_SUPPORTED was removed for 0.9.0, although API docs still mention it. */ + else if (jxl_status == JXL_ENC_NOT_SUPPORTED) + ThrowJXLWriterException(CoderError,UnsupportedBitsPerSample,image); ++#endif /* if JPEGXL_NUMERIC_VERSION < JPEGXL_COMPUTE_NUMERIC_VERSION(0,9,0) */ + else + ThrowJXLWriterException(CoderFatalError,Default,image); + } diff --git a/graphics/ImageMagick7/Makefile b/graphics/ImageMagick7/Makefile index 57a4e3d20479..66fd6062c196 100644 --- a/graphics/ImageMagick7/Makefile +++ b/graphics/ImageMagick7/Makefile @@ -1,351 +1,351 @@ PORTNAME= ImageMagick DISTVERSION= 7.1.0-62 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= graphics perl5 MASTER_SITES= https://ftp.acc.umu.se/mirror/imagemagick.org/ftp/releases/ \ https://mirror.dogado.de/imagemagick/releases/ \ https://mirror.checkdomain.de/imagemagick/releases/ \ https://ftp.icm.edu.pl/pub/unix/graphics/ImageMagick/releases/ \ https://imagemagick.org/archive/releases/ PKGNAMESUFFIX= 7 MAINTAINER= desktop@FreeBSD.org COMMENT= Image processing tools WWW= https://imagemagick.org/ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libltdl.so:devel/libltdl \ libzip.so:archivers/libzip FLAVORS= x11 nox11 FLAVOR?= ${FLAVORS:[1]} FLAVORS_SUB= yes nox11_PKGNAMESUFFIX= 7-nox11 # bin/Magick++-config CONFLICTS_INSTALL= ImageMagick6 ImageMagick6-nox11 \ ImageMagick7 ImageMagick7-nox11 # This port uses .la files, keep libtool:keepla! (magick/module.c) USES= cpe gettext-runtime gmake gnome libtool:keepla localbase \ pathfix perl5 pkgconfig:both shebangfix tar:xz CPE_PRODUCT= imagemagick CPE_VENDOR= imagemagick SHEBANG_FILES= www/source/examples.pl GNU_CONFIGURE= yes CONFIGURE_ENV= MAKE=${MAKE_CMD} CONFIGURE_ARGS= --without-dps \ --without-flif \ --without-zstd USE_LDCONFIG= yes USE_GNOME= libxml2 SAMPLE_FILES= colors.xml delegates.xml log.xml mime.xml policy.xml \ quantization-table.xml thresholds.xml type-apple.xml \ type-dejavu.xml type-ghostscript.xml type-urw-base35.xml \ type-windows.xml type.xml PLIST_SUB= PORTVERSION=${PORTVERSION:R} OPTIONS_SUB= yes OPTIONS_DEFINE= BZIP2 DOCS DJVU FFMPEG FFTW FONTCONFIG FPX FREETYPE \ GRAPHVIZ GSLIB JPEG2000 JBIG JPEG JXL LCMS2 LZMA LQR MODULES \ OPENEXR OPENMP PDF PERL PNG TESTS TIFF WEBP WMF THREADS \ 16BIT_PIXEL HDRI HEIF RAW OPTIONS_DEFAULT= 16BIT_PIXEL BZIP2 FFTW FONTCONFIG FREETYPE HEIF \ JPEG2000 JBIG JPEG JXL LCMS2 LZMA LQR MODULES OPENEXR PDF PERL PNG \ TIFF WEBP WMF THREADS HDRI RAW .if ${FLAVOR:U} == x11 # the SVG and PANGO plugins need X11 OPTIONS_DEFINE+= PANGO RAQM SVG OPTIONS_DEFAULT+= RAQM SVG CONFIGURE_ARGS+= --with-x USES+= xorg USE_XORG= ice sm x11 xext xt .else CONFIGURE_ARGS+= --without-x .endif DJVU_DESC= DJVU format support (needs THREADS) GSLIB_DESC= libgs (Postscript SHLIB) support FFMPEG_DESC= VIDEO codec support as FFmpeg TESTS_DESC= Run bundled self-tests after build #SIMD_CONFIGURE_WITH= gcc-arch CONFIGURE_ARGS+= --without-gcc-arch 16BIT_PIXEL_DESC= 16bit pixel support 16BIT_PIXEL_CONFIGURE_OFF=--with-quantum-depth=8 16BIT_PIXEL_VARS= _QBIT=Q16 16BIT_PIXEL_VARS_OFF= _QBIT=Q8 PLIST_SUB+= QBIT=${_QBIT} # Produce BZip compressed MIFF images BZIP2_DESC= bzip2 compressed MIFF images BZIP2_CONFIGURE_WITH= bzlib FFTW_CONFIGURE_WITH= fftw FFTW_LIB_DEPENDS= libfftw3.so:math/fftw3 FONTCONFIG_CONFIGURE_WITH= fontconfig FONTCONFIG_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig FREETYPE_CONFIGURE_WITH= freetype FREETYPE_LIB_DEPENDS= libfreetype.so:print/freetype2 # FPX (FlashPIX) images FPX_CONFIGURE_WITH= fpx FPX_LIB_DEPENDS= libfpx.so:graphics/libfpx GRAPHVIZ_CONFIGURE_WITH= gvc GRAPHVIZ_LIB_DEPENDS= libgvc.so:graphics/graphviz GRAPHVIZ_CFLAGS= -I${LOCALBASE}/include/graphviz GRAPHVIZ_LDFLAGS= -L${LOCALBASE}/lib/graphviz HEIF_CONFIGURE_WITH= heic HEIF_LIB_DEPENDS= libheif.so:graphics/libheif HDRI_DESC= High dynamic range images support HDRI_CONFIGURE_ENABLE= hdri HDRI_VARS= _HDRI=HDRI HDRI_VARS_OFF= _HDRI="" PLIST_SUB+= HDRI=${_HDRI} # JBIG images (lossless compression for bi-level images) JBIG_CONFIGURE_WITH= jbig JBIG_LIB_DEPENDS= libjbig.so:graphics/jbigkit JPEG_CONFIGURE_WITH= jpeg JPEG_USES= jpeg # JPEG2000 images (wavelet-based lossy compression) JPEG2000_DESC= OpenJPEG 2000 support via openjpeg JPEG2000_CONFIGURE_WITH=openjp2 JPEG2000_LIB_DEPENDS= libopenjp2.so:graphics/openjpeg JXL_CONFIGURE_WITH= jxl JXL_LIB_DEPENDS= libjxl.so:graphics/libjxl LCMS2_CONFIGURE_WITH= lcms LCMS2_LIB_DEPENDS= liblcms2.so:graphics/lcms2 LQR_CONFIGURE_WITH= lqr LQR_LIB_DEPENDS= liblqr-1.so:graphics/liblqr-1 LQR_USE= gnome=glib20 LZMA_CONFIGURE_WITH= lzma # Loadable coders, smaller executable, but PerlMagick not really works # ('make test' there works) MODULES_DESC= Modules support MODULES_CONFIGURE_WITH= modules PANGO_CONFIGURE_WITH= pango PANGO_USE= gnome=pango PNG_CONFIGURE_WITH= png PNG_LIB_DEPENDS= libpng.so:graphics/png RAQM_DESC= Complex text layout support RAQM_CONFIGURE_WITH= raqm RAQM_LIB_DEPENDS= libraqm.so:print/libraqm # libraw is by default liked to lcms2, whichs also ends up in IM regardless # of the IM LCMS option. RAW_DESC= RAW format support (implies the lcms2 option) RAW_CONFIGURE_WITH= raw RAW_LIB_DEPENDS= libraw_r.so:graphics/libraw RAW_IMPLIES= LCMS2 SVG_DESC= SVG vector image format support (via librsvg, implies the x11 option) SVG_CONFIGURE_WITH= rsvg SVG_USE= gnome=cairo,gdkpixbuf2,librsvg2 TESTS_TEST_DEPENDS= gsfonts>=0:print/gsfonts TIFF_CONFIGURE_WITH= tiff TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff WEBP_CONFIGURE_WITH= webp WEBP_LIB_DEPENDS= libwebp.so:graphics/webp .include .if ${PORT_OPTIONS:MTHREADS} _IMAGEMAGICK_THREADS=yes _IMAGEMAGICK_THREADS_MSG=with threads . if exists(${PERL}) PERL_THREADED!= ${SH} -c 'case `perl --version` in *freebsd-thread*) ${ECHO_CMD} yes ;; esac'; ${ECHO_CMD} . else # if ${PERL} doesn't exists, assume we dealing with threaded perl. PERL_THREADED= yes . endif .else _IMAGEMAGICK_THREADS=no _IMAGEMAGICK_THREADS_MSG=without threads _IMAGEMAGICK_THREADS_IGNORE_MSG=. Define WITH_THREADS .endif .if ${PORT_OPTIONS:MPERL} CONFIGURE_ARGS+= --with-perl=${PERL} \ --with-perl-options="MAKE=${MAKE_CMD}" PLIST_SUB+= WITH_PERL='' # PerlMagick does not work with threads, if perl is not threaded, and vice versa . if defined(PERL_THREADED) _IMAGEMAGICK_THREADS_PERL_MSG=Perl is threaded _IMAGEMAGICK_THREADS=yes . else _IMAGEMAGICK_THREADS_PERL_MSG=Perl is non-threaded _IMAGEMAGICK_THREADS_IGNORE_MSG=. ${_IMAGEMAGICK_THREADS_PERL_MSG}. Reinstall Perl with threads or undefine WITH_IMAGEMAGICK_PERL . if ${_IMAGEMAGICK_THREADS} == "yes" IGNORE=${_IMAGEMAGICK_THREADS_IGNORE_MSG} or undefine WITH_THREADS . endif _IMAGEMAGICK_THREADS=no . endif .else CONFIGURE_ARGS+= --without-perl PLIST_SUB+= WITH_PERL='@comment ' .endif .if ${_IMAGEMAGICK_THREADS} == "yes" CONFIGURE_ARGS+= --with-threads CONFIGURE_ENV+= PTHREAD_LIBS="-lpthread" LDFLAGS+= -lpthread .else CONFIGURE_ARGS+= --without-threads _IMAGEMAGICK_THREADS=no .endif # OpenMP .if ${PORT_OPTIONS:MOPENMP} . if ${_IMAGEMAGICK_THREADS} == "no" IGNORE=OpenMP requires threads${_IMAGEMAGICK_THREADS_IGNORE_MSG} . else CONFIGURE_ARGS+= --enable-openmp . endif .else CONFIGURE_ARGS+= --disable-openmp .endif .if defined(WITH_WINDOWS_FONT_DIR) CONFIGURE_ARGS+= --with-windows-font-dir=${WITH_WINDOWS_FONT_DIR} .endif .if ${PORT_OPTIONS:MOPENEXR} . if ${_IMAGEMAGICK_THREADS} == "no" IGNORE=OpenEXR requires threads. ${_IMAGEMAGICK_THREADS_IGNORE_MSG} . else LIB_DEPENDS+= libOpenEXR.so:graphics/openexr \ libImath.so:math/Imath PLIST_SUB+= OPENEXR="" . endif .else CONFIGURE_ARGS+= --without-openexr PLIST_SUB+= OPENEXR="@comment " .endif .if ${PORT_OPTIONS:MDJVU} . if ${_IMAGEMAGICK_THREADS} == "no" IGNORE=DjVu requires threads${_IMAGEMAGICK_THREADS_IGNORE_MSG} . endif LIB_DEPENDS+= libdjvulibre.so:graphics/djvulibre PLIST_SUB+= DJVU="" .else CONFIGURE_ARGS+= --without-djvu PLIST_SUB+= DJVU="@comment " .endif .if ${PORT_OPTIONS:MGSLIB} CONFIGURE_ARGS+= --with-gslib . if ${FLAVOR:U} == x11 USES+= ghostscript:x11 . else USES+= ghostscript . endif .else CONFIGURE_ARGS+= --without-gslib .endif # WMF (Windows Meta File) images .if ${PORT_OPTIONS:MWMF} . if ${FLAVOR:U} == x11 LIB_DEPENDS+= libwmf.so:graphics/libwmf . else LIB_DEPENDS+= libwmf.so:graphics/libwmf-nox11 . endif CONFIGURE_ARGS+= --with-wmf=yes PLIST_SUB+= WMF="" .else CONFIGURE_ARGS+= --without-wmf PLIST_SUB+= WMF="@comment " .endif # PDF (Adobe Portable Document Format) support .if ${PORT_OPTIONS:MPDF} . if ${FLAVOR:U} == x11 USES+= ghostscript:x11 . else USES+= ghostscript . endif .endif .if ${PORT_OPTIONS:MPDF} || ${PORT_OPTIONS:MGSLIB} RUN_DEPENDS+= gsfonts>=0:print/gsfonts .endif .if ${PORT_OPTIONS:MFFMPEG} BUILD_DEPENDS+= ffmpeg:multimedia/ffmpeg RUN_DEPENDS+= ffmpeg:multimedia/ffmpeg .endif .if ${PORT_OPTIONS:MDOCS} INSTALL_TARGET= install-strip install-docDATA install-data-html .else INSTALL_TARGET= install-strip .endif .if ${PORT_OPTIONS:MTESTS} . if ${FLAVOR:U} == x11 USES+= ghostscript:x11,build . else USES+= ghostscript:build . endif .endif post-patch: # strip library name of variable parts that can change due to # the HDRI and Q16 option @${REINPLACE_CMD} -e 's|_@MAGICK_ABI_SUFFIX@||g; \ s|\.@MAGICK_ABI_SUFFIX@||g' \ ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e 's|@\.@MAGICK_ABI_SUFFIX@|@|g' \ ${WRKSRC}/PerlMagick/Makefile.PL.in \ ${WRKSRC}/PerlMagick/quantum/Makefile.PL.in \ ${WRKSRC}/Magick++/bin/Magick++-config.in \ ${WRKSRC}/Magick++/lib/Magick++.pc.in \ ${WRKSRC}/MagickCore/MagickCore-config.in \ ${WRKSRC}/MagickCore/MagickCore.pc.in \ ${WRKSRC}/MagickCore/ImageMagick.pc.in \ ${WRKSRC}/MagickWand/MagickWand-config.in \ ${WRKSRC}/MagickWand/MagickWand.pc.in pre-configure: .if defined(_IMAGEMAGICK_THREADS_PERL_MSG) @${ECHO_CMD} '###################################################################' @${ECHO_CMD} NOTICE: ${_IMAGEMAGICK_THREADS_PERL_MSG}. Building ImageMagick ${_IMAGEMAGICK_THREADS_MSG}. @${ECHO_CMD} '###################################################################' .endif post-install: .for i in ${SAMPLE_FILES} @${MV} ${STAGEDIR}${PREFIX}/etc/ImageMagick-7/${i} \ ${STAGEDIR}${PREFIX}/etc/ImageMagick-7/${i}.sample .endfor post-install-TESTS-on: test do-test: -cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} limits -m 20m ${MAKE} ${_MAKE_JOBS} check .include diff --git a/graphics/ImageMagick7/files/patch-coders_jxl.c b/graphics/ImageMagick7/files/patch-coders_jxl.c new file mode 100644 index 000000000000..83ce69bf5925 --- /dev/null +++ b/graphics/ImageMagick7/files/patch-coders_jxl.c @@ -0,0 +1,44 @@ +https://github.com/ImageMagick/ImageMagick/commit/9db502e6a70c + +--- coders/jxl.c.orig 2023-02-12 15:55:38 UTC ++++ coders/jxl.c +@@ -444,8 +444,13 @@ static Image *ReadJXLImage(const ImageInfo *image_info + *profile; + + JXLSetFormat(image,&pixel_format,exception); ++#if JPEGXL_NUMERIC_VERSION >= JPEGXL_COMPUTE_NUMERIC_VERSION(0,9,0) ++ jxl_status=JxlDecoderGetColorAsEncodedProfile(jxl_info, ++ JXL_COLOR_PROFILE_TARGET_DATA,&color_encoding); ++#else + jxl_status=JxlDecoderGetColorAsEncodedProfile(jxl_info,&pixel_format, + JXL_COLOR_PROFILE_TARGET_DATA,&color_encoding); ++#endif + if (jxl_status == JXL_DEC_SUCCESS) + { + if (color_encoding.transfer_function == JXL_TRANSFER_FUNCTION_LINEAR) +@@ -460,14 +465,25 @@ static Image *ReadJXLImage(const ImageInfo *image_info + else + if (jxl_status != JXL_DEC_ERROR) + break; ++#if JPEGXL_NUMERIC_VERSION >= JPEGXL_COMPUTE_NUMERIC_VERSION(0,9,0) ++ jxl_status=JxlDecoderGetICCProfileSize(jxl_info, ++ JXL_COLOR_PROFILE_TARGET_ORIGINAL,&profile_size); ++#else + jxl_status=JxlDecoderGetICCProfileSize(jxl_info,&pixel_format, + JXL_COLOR_PROFILE_TARGET_ORIGINAL,&profile_size); ++#endif + if (jxl_status != JXL_DEC_SUCCESS) + break; + profile=AcquireStringInfo(profile_size); ++#if JPEGXL_NUMERIC_VERSION >= JPEGXL_COMPUTE_NUMERIC_VERSION(0,9,0) ++ jxl_status=JxlDecoderGetColorAsICCProfile(jxl_info, ++ JXL_COLOR_PROFILE_TARGET_ORIGINAL,GetStringInfoDatum(profile), ++ profile_size); ++#else + jxl_status=JxlDecoderGetColorAsICCProfile(jxl_info,&pixel_format, + JXL_COLOR_PROFILE_TARGET_ORIGINAL,GetStringInfoDatum(profile), + profile_size); ++#endif + (void) SetImageProfile(image,"icc",profile,exception); + profile=DestroyStringInfo(profile); + if (jxl_status == JXL_DEC_SUCCESS) diff --git a/graphics/darktable/Makefile b/graphics/darktable/Makefile index b8d47b96be96..027ce0a22b7f 100644 --- a/graphics/darktable/Makefile +++ b/graphics/darktable/Makefile @@ -1,156 +1,156 @@ PORTNAME= darktable PORTVERSION= 4.4.2 -PORTREVISION= 5 +PORTREVISION= 6 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 CMAKE_ARGS+= -DBINARY_PACKAGE_BUILD=1 -DUSE_PORTMIDI:BOOL=OFF CMAKE_BOOL+= BUILD_CMSTEST USE_AVIF USE_CAMERA_SUPPORT USE_HEIF \ USE_ISOBMFF 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 ${OPSYS}_${OSREL:R} == FreeBSD_12 # Darktable fails to compile with GCC 13+ on FreeBSD 12.x with the following # error: # # In file included from /usr/include/c++/v1/__functional/weak_result_type.h:16, # from /usr/include/c++/v1/__functional/invoke.h:14, # from /usr/include/c++/v1/__functional_base:15, # from /usr/include/c++/v1/string:520, # from .../work/darktable-4.4.2/src/external/rawspeed/src/librawspeed/common/ChecksumFile.h:23, # from .../work/darktable-4.4.2/src/external/rawspeed/src/librawspeed/common/ChecksumFile.cpp:21: # /usr/include/c++/v1/type_traits:1770:8: error: expected identifier before '__is_convertible' # 1770 | struct __is_convertible # | ^~~~~~~~~~~~~~~~ # # This seems to be an incompatibility between GCC 13+ and libcxx provided with # FreeBSD 12.x. The workarounbd is to force the use of GCC 12 on this version # of FreeBSD. # # See: # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=273397 # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=273681 USE_GCC= 12 .else USE_GCC= yes .endif .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/geeqie/Makefile b/graphics/geeqie/Makefile index 0b0a30aea9bd..164364273027 100644 --- a/graphics/geeqie/Makefile +++ b/graphics/geeqie/Makefile @@ -1,88 +1,89 @@ PORTNAME= geeqie DISTVERSIONPREFIX= v DISTVERSION= 2.1 +PORTREVISION= 1 CATEGORIES= graphics MAINTAINER= amdmi3@FreeBSD.org COMMENT= Lightweight image viewer forked from GQview WWW= https://www.geeqie.org/ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= bash:shells/bash BUILD_DEPENDS= xxd:sysutils/xxd USES= desktop-file-utils gettext-tools gnome jpeg \ lua:53 meson pkgconfig shebangfix USE_GNOME= cairo gdkpixbuf2 gtk30 glib20 USE_GITHUB= yes GH_ACCOUNT= BestImageViewer GH_TAGNAME= ad80078 # a bunch of commits after 2.1 with mostly fixes, including exiv2 0.28 crash fix SHEBANG_FILES= plugins/*/geeqie-* CFLAGS+= -Wno-deprecated-declarations MESON_ARGS= -Ddoxygen=disabled MESON_ARGS+= -Dpandoc=disabled MESON_ARGS+= -Devince=disabled MESON_ARGS+= -Dgit=disabled PORTDOCS= * OPTIONS_DEFINE= EXIV2 LCMS MAP FFMPEGTHUMBNAILER ARCHIVE SPELL DOCS NLS OPTIONS_DEFAULT=EXIV2 LCMS MAP FFMPEGTHUMBNAILER ARCHIVE SPELL \ TIFF PDF HEIF DJVU OPENJPEG RAW JXL OPTIONS_GROUP= FORMATS OPTIONS_GROUP_FORMATS= TIFF PDF HEIF DJVU OPENJPEG RAW JXL OPTIONS_SUB= yes FORMATS_DESC= Image formats support EXIV2_DESC= Metadata editing EXIV2_LIB_DEPENDS= libexiv2.so:graphics/exiv2 EXIV2_MESON_ENABLED= exiv2 LCMS_DESC= Color adjusting LCMS_LIB_DEPENDS= liblcms2.so:graphics/lcms2 LCMS_MESON_ENABLED= cms MAP_DESC= GPS map support via libchamplain MAP_LIB_DEPENDS= libchamplain-0.12.so:graphics/libchamplain \ libclutter-gtk-1.0.so:graphics/clutter-gtk3 \ libclutter-1.0.so:graphics/clutter MAP_MESON_ENABLED= gps-map TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff TIFF_MESON_ENABLED= tiff PDF_LIB_DEPENDS= libpoppler-glib.so:graphics/poppler-glib PDF_MESON_ENABLED= pdf FFMPEGTHUMBNAILER_DESC= Video file thumbnails generating support FFMPEGTHUMBNAILER_MESON_ENABLED= videothumbnailer FFMPEGTHUMBNAILER_LIB_DEPENDS= libffmpegthumbnailer.so:multimedia/ffmpegthumbnailer HEIF_MESON_ENABLED= heif HEIF_LIB_DEPENDS= libheif.so:graphics/libheif DJVU_MESON_ENABLED= djvu DJVU_LIB_DEPENDS= libdjvulibre.so:graphics/djvulibre OPENJPEG_MESON_ENABLED= j2k OPENJPEG_LIB_DEPENDS= libopenjp2.so:graphics/openjpeg RAW_MESON_ENABLED= libraw RAW_LIB_DEPENDS= libraw.so:graphics/libraw ARCHIVE_MESON_ENABLED= archive ARCHIVE_USES= libarchive JXL_MESON_ENABLED= jpegxl JXL_LIB_DEPENDS= libjxl.so:graphics/libjxl SPELL_DESC= Spelling check through gspell SPELL_MESON_ENABLED= spell SPELL_LIB_DEPENDS= libgspell-1.so:textproc/gspell DOCS_BUILD_DEPENDS= yelp-build:textproc/yelp-tools .include diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile index 5b05a5f5aedd..ece2a3f69a4d 100644 --- a/graphics/gimp-app/Makefile +++ b/graphics/gimp-app/Makefile @@ -1,155 +1,155 @@ PORTNAME?= gimp PORTVERSION= 2.10.34 -PORTREVISION= 9 +PORTREVISION= 10 PORTEPOCH?= 1 CATEGORIES?= graphics gnome MASTER_SITES= GIMP/gimp/v${PORTVERSION:R} PKGNAMESUFFIX= -app #DISTNAME= gimp-${PORTVERSION} MAINTAINER= gnome@FreeBSD.org COMMENT= GNU Image Manipulation Program WWW= https://www.gimp.org/ LICENSE= GPLv3 LGPL3 LICENSE_COMB= multi BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:misc/iso-codes \ glib-networking>=0:net/glib-networking \ mypaint-brushes>0:graphics/mypaint-brushes LIB_DEPENDS= libasound.so:audio/alsa-lib \ libbabl-0.1.so:x11/babl \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libgegl-0.4.so:graphics/gegl \ libgexiv2.so:graphics/gexiv2 \ libharfbuzz.so:print/harfbuzz \ libjson-c.so:devel/json-c \ libjson-glib-1.0.so:devel/json-glib \ liblcms2.so:graphics/lcms2 \ libmypaint.so:graphics/libmypaint \ libpng.so:graphics/png \ libpoppler-glib.so:graphics/poppler-glib \ libtiff.so:graphics/tiff LIB_DEPENDS+= ${LIB_DEPENDS_${ARCH}} LIB_DEPENDS_aarch64= libunwind.so:devel/libunwind LIB_DEPENDS_amd64= libunwind.so:devel/libunwind LIB_DEPENDS_armv7= libunwind.so:devel/libunwind LIB_DEPENDS_i386= libunwind.so:devel/libunwind LIB_DEPENDS_powerpc64= libunwind.so:devel/libunwind LIB_DEPENDS_powerpc64le= libunwind.so:devel/libunwind RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:misc/iso-codes \ glib-networking>=0:net/glib-networking \ mypaint-brushes>0:graphics/mypaint-brushes USES+= compiler:c++14-lang cpe gettext gmake gnome jpeg libtool \ localbase pkgconfig shebangfix tar:bzip2 xorg CPE_VENDOR= gimp CPE_PRODUCT= gimp USE_GNOME+= cairo gtk20 intltool librsvg2 USE_LDCONFIG= yes USE_XORG= ice sm x11 xcursor xext xfixes xmu xpm xt SHEBANG_FILES= plug-ins/pygimp/plug-ins/*.py GNU_CONFIGURE= yes CONFIGURE_ARGS?= --with-html-dir=${PREFIX}/share/doc/gimp \ --with-bug-report-url="https://bugs.freebsd.org/" \ --disable-gtk-doc \ --without-linux-input \ --with-print \ --without-gudev \ --enable-default-binary \ --disable-gimp-console \ --disable-python \ --without-appdata-test \ --with-desktop-dir=${PREFIX}/share \ --docdir=${PREFIX}/share/doc/gimp \ --with-icc-directory=${LOCALBASE}/share/color/icc \ --without-webkit \ --enable-default-binary CONFIGURE_ENV= GIMP_THREAD_LIBS=-lpthread INSTALL_TARGET= install-strip .if !defined(XAUTHORITY) TEST_ENV= XAUTHORITY=${HOME}/.Xauthority .endif TEST_TARGET= check LIBS+= -lexecinfo -lm PLIST_SUB+= LIBVER=0.1000.${PORTVERSION:E} .if !defined(GIMP_SLAVE) USES+= desktop-file-utils OPTIONS_DEFINE?= AALIB GHOSTSCRIPT HEIF JXL LIBMNG OPENEXR OPENJPEG SIMD \ WEBP WMF OPTIONS_DEFAULT= AALIB HEIF JXL LIBMNG OPENEXR OPENJPEG SIMD WEBP WMF OPTIONS_SUB= yes .endif .if defined(GIMP_SLAVE) PKG_CONFIG?= ${LOCALBASE}/bin/pkg-config GIMP_LIBS= `${PKG_CONFIG} --libs gimp-2.0` GIMP_THUMB_LIBS= `${PKG_CONFIG} --libs gimpthumb-2.0` GIMP_UI_LIBS= `${PKG_CONFIG} --libs gimpui-2.0` LIB_DEPENDS+= libgimp-2.0.so:graphics/gimp-app .else AALIB_DESC= Ascii-art Plug-in OPENJPEG_DESC= Enhanced JPEG (jpeg2000) graphics support AALIB_LIB_DEPENDS= libaa.so:graphics/aalib AALIB_CONFIGURE_WITH= aa GHOSTSCRIPT_USES= ghostscript GHOSTSCRIPT_CONFIGURE_WITH= gs HEIF_LIB_DEPENDS= libheif.so:graphics/libheif HEIF_CONFIGURE_WITH= libheif JXL_LIB_DEPENDS= libjxl.so:graphics/libjxl JXL_CONFIGURE_WITH= jpegxl LIBMNG_LIB_DEPENDS= libmng.so:graphics/libmng LIBMNG_CONFIGURE_WITH= libmng OPENEXR_LIB_DEPENDS= libImath.so:math/Imath \ libOpenEXR.so:graphics/openexr OPENEXR_CONFIGURE_WITH= openexr OPENJPEG_LIB_DEPENDS= libopenjp2.so:graphics/openjpeg OPENJPEG_CONFIGURE_WITH= jpeg2000 SIMD_CONFIGURE_OFF= --disable-mmx \ --disable-sse \ --disable-altivec WEBP_LIB_DEPENDS= libwebp.so:graphics/webp WEBP_CONFIGURE_WITH= webp WMF_LIB_DEPENDS= libexpat.so:textproc/expat2 \ libwmf.so:graphics/libwmf WMF_CONFIGURE_WITH= wmf .endif post-patch: @${REINPLACE_CMD} -e 's|%%GIMP_LIBS%%|${GIMP_LIBS}|; \ s|%%GIMP_THUMB_LIBS%%|${GIMP_THUMB_LIBS}|; \ s|%%GIMP_UI_LIBS%%|${GIMP_UI_LIBS}|' \ ${WRKSRC}/plug-ins/pygimp/Makefile.in @${REINPLACE_CMD} \ -e 's|x86_64|amd64|g' \ ${WRKSRC}/configure .include diff --git a/graphics/gimp-app/files/patch-plug-ins_common_file-jpegxl.c b/graphics/gimp-app/files/patch-plug-ins_common_file-jpegxl.c new file mode 100644 index 000000000000..88442fda0428 --- /dev/null +++ b/graphics/gimp-app/files/patch-plug-ins_common_file-jpegxl.c @@ -0,0 +1,41 @@ +https://gitlab.gnome.org/GNOME/gimp/-/commit/a4f02398188b + +--- plug-ins/common/file-jpegxl.c.orig 2023-02-21 19:56:19 UTC ++++ plug-ins/common/file-jpegxl.c +@@ -335,7 +335,10 @@ load_image (const gchar *filename, + result_size = channel_depth * pixel_format.num_channels + * (size_t) basicinfo.xsize * (size_t) basicinfo.ysize; + +- if (JxlDecoderGetColorAsEncodedProfile (decoder, &pixel_format, ++ if (JxlDecoderGetColorAsEncodedProfile (decoder, ++#if JPEGXL_NUMERIC_VERSION < JPEGXL_COMPUTE_NUMERIC_VERSION(0,9,0) ++ &pixel_format, ++#endif + JXL_COLOR_PROFILE_TARGET_DATA, + &color_encoding) == JXL_DEC_SUCCESS) + { +@@ -379,7 +382,10 @@ load_image (const gchar *filename, + + if (! profile) + { +- if (JxlDecoderGetICCProfileSize (decoder, &pixel_format, ++ if (JxlDecoderGetICCProfileSize (decoder, ++#if JPEGXL_NUMERIC_VERSION < JPEGXL_COMPUTE_NUMERIC_VERSION(0,9,0) ++ &pixel_format, ++#endif + JXL_COLOR_PROFILE_TARGET_DATA, + &icc_size) == JXL_DEC_SUCCESS) + { +@@ -387,7 +393,11 @@ load_image (const gchar *filename, + { + gpointer raw_icc_profile = g_malloc (icc_size); + +- if (JxlDecoderGetColorAsICCProfile (decoder, &pixel_format, JXL_COLOR_PROFILE_TARGET_DATA, ++ if (JxlDecoderGetColorAsICCProfile (decoder, ++#if JPEGXL_NUMERIC_VERSION < JPEGXL_COMPUTE_NUMERIC_VERSION(0,9,0) ++ &pixel_format, ++#endif ++ JXL_COLOR_PROFILE_TARGET_DATA, + raw_icc_profile, icc_size) + == JXL_DEC_SUCCESS) + { diff --git a/graphics/gimp-jxl-plugin/Makefile b/graphics/gimp-jxl-plugin/Makefile index 0142578d55ed..642064cfb217 100644 --- a/graphics/gimp-jxl-plugin/Makefile +++ b/graphics/gimp-jxl-plugin/Makefile @@ -1,27 +1,27 @@ PORTNAME= gimp-jxl-plugin DISTVERSIONPREFIX= v -DISTVERSION= 0.8.2 +DISTVERSION= 0.9.0 CATEGORIES= graphics MAINTAINER= jbeich@FreeBSD.org COMMENT= GIMP plugin to read/write JPEG XL images WWW= https://jpeg.org/jpegxl/ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC:H:H}/LICENSE LIB_DEPENDS= libgegl-0.4.so:graphics/gegl \ libgimp-2.0.so:graphics/gimp-app \ libjxl.so:graphics/libjxl \ libbabl-0.1.so:x11/babl USES= cmake compiler:c++11-lang gnome pkgconfig USE_GITHUB= yes USE_GNOME= gtk20 GH_ACCOUNT= ${GH_PROJECT} GH_PROJECT= libjxl WRKSRC_SUBDIR= plugins/gimp LDFLAGS+= -Wl,--as-needed # GIMP deps PLIST_FILES= libexec/gimp/2.2/plug-ins/file-jxl/file-jxl .include diff --git a/graphics/gimp-jxl-plugin/distinfo b/graphics/gimp-jxl-plugin/distinfo index eba7d3d5cf81..19b40924732b 100644 --- a/graphics/gimp-jxl-plugin/distinfo +++ b/graphics/gimp-jxl-plugin/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1686728961 -SHA256 (libjxl-libjxl-v0.8.2_GH0.tar.gz) = c70916fb3ed43784eb840f82f05d390053a558e2da106e40863919238fa7b420 -SIZE (libjxl-libjxl-v0.8.2_GH0.tar.gz) = 1612062 +TIMESTAMP = 1703255621 +SHA256 (libjxl-libjxl-v0.9.0_GH0.tar.gz) = d83bbe188d8fa9725bb75109c922c37fcff8c3b802808f3a6c2c14aaf8337d9f +SIZE (libjxl-libjxl-v0.9.0_GH0.tar.gz) = 1871551 diff --git a/graphics/gthumb/Makefile b/graphics/gthumb/Makefile index b17aa05774b0..e7622a8e3f0f 100644 --- a/graphics/gthumb/Makefile +++ b/graphics/gthumb/Makefile @@ -1,107 +1,107 @@ PORTNAME= gthumb PORTVERSION= 3.12.2 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= graphics MASTER_SITES= GNOME DIST_SUBDIR= gnome PATCH_SITES= https://gitlab.gnome.org/GNOME/gthumb/-/commit/ PATCHFILES= 2133520496afd179702953a5d07aa99b5209f9cf.patch:-p1 #Fix build with libraw >= 0.21.0 MAINTAINER= gnome@FreeBSD.org COMMENT= Image viewer and browser for the GNOME environment WWW= https://wiki.gnome.org/Apps/gthumb/ LICENSE= GPLv2+ BUILD_DEPENDS= gsettings-desktop-schemas>0:devel/gsettings-desktop-schemas \ itstool:textproc/itstool LIB_DEPENDS= libclutter-1.0.so:graphics/clutter \ libcogl.so:graphics/cogl \ libgstreamer-1.0.so:multimedia/gstreamer1 \ libjson-glib-1.0.so:devel/json-glib \ liblcms2.so:graphics/lcms2 \ liboauth.so:net/liboauth \ libpng.so:graphics/png \ libsoup-2.4.so:devel/libsoup \ libtiff.so:graphics/tiff \ libcolord.so:graphics/colord RUN_DEPENDS= gsettings-desktop-schemas>0:devel/gsettings-desktop-schemas USES= bison compiler:c++11-lib cpe desktop-file-utils gettext gl \ gnome jpeg localbase:ldflags meson pkgconfig \ python:build shebangfix tar:xz xorg USE_GL= egl USE_GNOME= cairo gtk30 intltool librsvg2 USE_XORG= x11 xcomposite xdamage xext xfixes xrandr xi MESON_ARGS= -Dlibrsvg=true \ -Dlibchamplain=false CPE_VENDOR= gnome INSTALL_TARGET= install-strip USE_LDCONFIG= yes BINARY_ALIAS= python3=${PYTHON_CMD} SHEBANG_FILES= *.py data/gschemas/*.py gthumb/*.py po/*.py PLIST_SUB= GTHUMB_VER="3.10" GLIB_SCHEMAS= org.gnome.gthumb.change-date.gschema.xml \ org.gnome.gthumb.comments.gschema.xml \ org.gnome.gthumb.contact-sheet.gschema.xml \ org.gnome.gthumb.convert-format.gschema.xml \ org.gnome.gthumb.crop.gschema.xml \ org.gnome.gthumb.enums.xml \ org.gnome.gthumb.facebook.gschema.xml \ org.gnome.gthumb.file-manager.gschema.xml \ org.gnome.gthumb.flickr.gschema.xml \ org.gnome.gthumb.gschema.xml \ org.gnome.gthumb.gstreamer-tools.gschema.xml \ org.gnome.gthumb.image-print.gschema.xml \ org.gnome.gthumb.image-viewer.gschema.xml \ org.gnome.gthumb.importer.gschema.xml \ org.gnome.gthumb.photo-importer.gschema.xml \ org.gnome.gthumb.picasaweb.gschema.xml \ org.gnome.gthumb.pixbuf-savers.gschema.xml \ org.gnome.gthumb.rename-series.gschema.xml \ org.gnome.gthumb.resize-images.gschema.xml \ org.gnome.gthumb.resize.gschema.xml \ org.gnome.gthumb.rotate.gschema.xml \ org.gnome.gthumb.slideshow.gschema.xml \ org.gnome.gthumb.webalbums.gschema.xml \ org.gnome.gthumb.catalogs.gschema.xml \ org.gnome.gthumb.terminal.gschema.xml OPTIONS_DEFINE= BRASERO CLUTTER EXIV2 GSTREAMER JXL RAW SECRET \ WEBP WEBSERVICES YELP OPTIONS_DEFAULT= BRASERO CLUTTER EXIV2 GSTREAMER JXL RAW SECRET \ WEBP WEBSERVICES YELP OPTIONS_SUB= yes BRASERO_DESC= Write galleries to CD/DVD (large dependency) BRASERO_LIB_DEPENDS= libbrasero-media3.so:sysutils/brasero BRASERO_MESON_TRUE= libbrasero CLUTTER_DESC= Fancy slideshows CLUTTER_LIB_DEPENDS= libclutter-gtk-1.0.so:graphics/clutter-gtk3 CLUTTER_MESON_TRUE= clutter EXIV2_LIB_DEPENDS= libexiv2.so:graphics/exiv2 EXIV2_MESON_TRUE= exiv2 GSTREAMER_USES= gstreamer GSTREAMER_MESON_TRUE= gstreamer JXL_LIB_DEPENDS= libjxl.so:graphics/libjxl JXL_MESON_TRUE= libjxl RAW_DESC= Raw image support via libraw RAW_LIB_DEPENDS= libraw.so:graphics/libraw RAW_MESON_TRUE= libraw SECRET_DESC= Libsecret support for storing passwords SECRET_LIB_DEPENDS= libsecret-1.so:security/libsecret SECRET_MESON_TRUE= libsecret WEBP_LIB_DEPENDS= libwebp.so:graphics/webp WEBP_MESON_TRUE= libwebp WEBSERVICES_DESC= Web services WEBSERVICES_LIB_DEPENDS=\ libjson-glib-1.0.so:devel/json-glib \ libwebkit2gtk-4.0.so:www/webkit2-gtk3 WEBSERVICES_MESON_TRUE= webservices YELP_DESC= Viewer for built-in help system YELP_RUN_DEPENDS= yelp:x11/yelp .include diff --git a/graphics/gthumb/files/patch-extensions_cairo__io_cairo-image-surface-jxl.c b/graphics/gthumb/files/patch-extensions_cairo__io_cairo-image-surface-jxl.c new file mode 100644 index 000000000000..02ff064ccc9a --- /dev/null +++ b/graphics/gthumb/files/patch-extensions_cairo__io_cairo-image-surface-jxl.c @@ -0,0 +1,26 @@ +https://gitlab.gnome.org/GNOME/gthumb/-/issues/306 + +--- extensions/cairo_io/cairo-image-surface-jxl.c.orig 2022-04-03 18:38:59 UTC ++++ extensions/cairo_io/cairo-image-surface-jxl.c +@@ -234,18 +234,18 @@ _cairo_image_surface_create_from_jxl(GInputStream *is + + case JXL_DEC_COLOR_ENCODING: + #if HAVE_LCMS2 +- if (JxlDecoderGetColorAsEncodedProfile(dec, &pixel_format, JXL_COLOR_PROFILE_TARGET_DATA, NULL) == JXL_DEC_SUCCESS) ++ if (JxlDecoderGetColorAsEncodedProfile(dec, JXL_COLOR_PROFILE_TARGET_DATA, NULL) == JXL_DEC_SUCCESS) + break; + + { + gsize profile_size; +- if (JxlDecoderGetICCProfileSize(dec, &pixel_format, JXL_COLOR_PROFILE_TARGET_DATA, &profile_size) > 0) { ++ if (JxlDecoderGetICCProfileSize(dec, JXL_COLOR_PROFILE_TARGET_DATA, &profile_size) > 0) { + g_message("Could not get ICC profile size.\n"); + break; + } + + guchar *profile_data = g_new(guchar, profile_size); +- if (JxlDecoderGetColorAsICCProfile(dec, &pixel_format, JXL_COLOR_PROFILE_TARGET_DATA, profile_data, profile_size) > 0) { ++ if (JxlDecoderGetColorAsICCProfile(dec, JXL_COLOR_PROFILE_TARGET_DATA, profile_data, profile_size) > 0) { + g_message("Could not get ICC profile.\n"); + g_free(profile_data); + break; diff --git a/graphics/imlib2-jxl/Makefile b/graphics/imlib2-jxl/Makefile index 52c8f2b3a61a..797ab46c823d 100644 --- a/graphics/imlib2-jxl/Makefile +++ b/graphics/imlib2-jxl/Makefile @@ -1,39 +1,39 @@ PORTNAME= imlib2-jxl DISTVERSIONPREFIX= v DISTVERSION= 0.1.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MAINTAINER= jbeich@FreeBSD.org COMMENT= JPEG XL loader for imlib2 WWW= https://github.com/alistair7/imlib2-jxl LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE-BSD-ab LIB_DEPENDS= libImlib2.so:graphics/imlib2 \ libjxl.so:graphics/libjxl USES= gmake pkgconfig USE_GITHUB= yes GH_ACCOUNT= alistair7 MAKE_ENV= RELEASE_CFLAGS="${CFLAGS}" ALL_TARGET= # empty PLIST_FILES= lib/imlib2/loaders/jxl.so OPTIONS_DEFINE= LCMS2 OPTIONS_DEFAULT=LCMS2 LCMS2_LIB_DEPENDS= liblcms2.so:graphics/lcms2 post-patch-LCMS2-off: @${REINPLACE_CMD} -e '/-DIMLIB2JXL_USE_LCMS/d' \ -e 's/`pkg-config[^`]*lcms[^`]*`//' \ ${WRKSRC}/Makefile do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/${PLIST_FILES:M*.so:H} ${INSTALL_LIB} ${WRKSRC}/${PLIST_FILES:M*.so:T} \ ${STAGEDIR}${PREFIX}/${PLIST_FILES:M*.so:H} .include diff --git a/graphics/imlib2-jxl/files/patch-imlib2-jxl.c b/graphics/imlib2-jxl/files/patch-imlib2-jxl.c new file mode 100644 index 000000000000..9a1d71d329e3 --- /dev/null +++ b/graphics/imlib2-jxl/files/patch-imlib2-jxl.c @@ -0,0 +1,76 @@ +https://github.com/alistair7/imlib2-jxl/commit/3888defd345f +https://github.com/alistair7/imlib2-jxl/commit/06a3b71e4d13 +https://github.com/alistair7/imlib2-jxl/commit/de2b38f5f34f + +--- imlib2-jxl.c.orig 2022-01-20 21:53:36 UTC ++++ imlib2-jxl.c +@@ -402,7 +402,7 @@ char load(ImlibImage *im, ImlibProgressFunction progre + * extract an ICC profile and save it for later. */ + + JxlColorEncoding color_enc; +- if(JxlDecoderGetColorAsEncodedProfile(dec, &pixel_format, JXL_COLOR_PROFILE_TARGET_DATA, &color_enc) == JXL_DEC_SUCCESS) ++ if(JxlDecoderGetColorAsEncodedProfile(dec, JXL_COLOR_PROFILE_TARGET_DATA, &color_enc) == JXL_DEC_SUCCESS) + { + if(color_enc.color_space == JXL_COLOR_SPACE_RGB && color_enc.transfer_function == JXL_TRANSFER_FUNCTION_SRGB) + { +@@ -412,7 +412,7 @@ char load(ImlibImage *im, ImlibProgressFunction progre + } + } + +- if(JxlDecoderGetICCProfileSize(dec, &pixel_format, JXL_COLOR_PROFILE_TARGET_DATA, &icc_size) != JXL_DEC_SUCCESS) ++ if(JxlDecoderGetICCProfileSize(dec, JXL_COLOR_PROFILE_TARGET_DATA, &icc_size) != JXL_DEC_SUCCESS) + { + icc_size = 0; + break; +@@ -420,7 +420,7 @@ char load(ImlibImage *im, ImlibProgressFunction progre + if(!(icc_blob = malloc(icc_size))) + RETURN_ERR("Failed to allocate %zu B for ICC profile", icc_size); + +- if(JxlDecoderGetColorAsICCProfile(dec, &pixel_format, JXL_COLOR_PROFILE_TARGET_DATA, icc_blob, icc_size) != JXL_DEC_SUCCESS) ++ if(JxlDecoderGetColorAsICCProfile(dec, JXL_COLOR_PROFILE_TARGET_DATA, icc_blob, icc_size) != JXL_DEC_SUCCESS) + icc_size = 0; + + break; +@@ -596,9 +596,9 @@ char save(ImlibImage *im, ImlibProgressFunction progre + if(JxlEncoderSetParallelRunner(enc, JxlThreadParallelRunner, runner) != JXL_ENC_SUCCESS) + RETURN_ERR("Failed in JxlEncoderSetParallelRunner"); + +- JxlEncoderOptions *opts; +- if(!(opts = JxlEncoderOptionsCreate(enc, NULL))) +- RETURN_ERR("Failed in JxlEncoderOptionsCreate"); ++ JxlEncoderFrameSettings *opts; ++ if(!(opts = JxlEncoderFrameSettingsCreate(enc, NULL))) ++ RETURN_ERR("Failed in JxlEncoderFrameSettingsCreate"); + + JxlPixelFormat pixel_format = { .align = 0, .data_type = JXL_TYPE_UINT8, .num_channels = 4, .endianness = JXL_NATIVE_ENDIAN}; + +@@ -633,14 +633,14 @@ char save(ImlibImage *im, ImlibProgressFunction progre + quality = max_quality; + + // Transform quality 0-99 to distance 15-0 +- if(JxlEncoderOptionsSetDistance(opts, 15 - (quality * 15/(float)max_quality)) != JXL_ENC_SUCCESS) +- RETURN_ERR("Failed in JxlEncoderOptionsSetDistance: %.1f", 15 - (quality * 15/(float)max_quality)); ++ if(JxlEncoderSetFrameDistance(opts, 15 - (quality * 15/(float)max_quality)) != JXL_ENC_SUCCESS) ++ RETURN_ERR("Failed in JxlEncoderSetFrameDistance: %.1f", 15 - (quality * 15/(float)max_quality)); + + // If quality is maxed out, explicity enable lossless mode + if(quality == max_quality) + { +- if(JxlEncoderOptionsSetLossless(opts, 1) != JXL_ENC_SUCCESS) +- RETURN_ERR("Failed in JxlEncoderOptionsSetLossless"); ++ if(JxlEncoderSetFrameLossless(opts, JXL_TRUE) != JXL_ENC_SUCCESS) ++ RETURN_ERR("Failed in JxlEncoderSetFrameLossless"); + } + + } +@@ -659,8 +659,8 @@ char save(ImlibImage *im, ImlibProgressFunction progre + // Transform compression 0-9 to effort 3-9 + compression = 3 + (int)roundf(compression * 6/(float)max_compression); + +- if(JxlEncoderOptionsSetEffort(opts, compression) != JXL_ENC_SUCCESS) +- RETURN_ERR("Failed in JxlEncoderOptionsSetEffort: %d", compression); ++ if(JxlEncoderFrameSettingsSetOption(opts, JXL_ENC_FRAME_SETTING_EFFORT, compression) != JXL_ENC_SUCCESS) ++ RETURN_ERR("Failed in JxlEncoderFrameSettingsSetOption(JXL_ENC_FRAME_SETTING_EFFORT, %d)", compression); + } + + const size_t pixels_size = 4 * im->w * im->h; diff --git a/graphics/kf5-kimageformats/Makefile b/graphics/kf5-kimageformats/Makefile index 087f960c7cf9..8e062f603460 100644 --- a/graphics/kf5-kimageformats/Makefile +++ b/graphics/kf5-kimageformats/Makefile @@ -1,41 +1,42 @@ 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 RAW OPTIONS_DEFAULT= AVIF JXL HEIF OPENEXR RAW 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 RAW_LIB_DEPENDS= libraw.so:graphics/libraw RAW_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_libraw post-patch: ${REINPLACE_CMD} s,Imf::Int64,uint64_t, \ ${WRKSRC}/src/imageformats/exr.cpp .include diff --git a/graphics/krita/Makefile b/graphics/krita/Makefile index 260834ac6951..2d918764c54f 100644 --- a/graphics/krita/Makefile +++ b/graphics/krita/Makefile @@ -1,80 +1,81 @@ PORTNAME= krita DISTVERSION= 5.2.2 +PORTREVISION= 1 CATEGORIES= graphics kde MASTER_SITES= KDE/stable/${PORTNAME}/${DISTVERSION} DIST_SUBDIR= KDE/${PORTNAME} MAINTAINER= kde@FreeBSD.org COMMENT= Sketching and painting program WWW= https://krita.org LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= boost-libs>=1.65:devel/boost-libs \ immer>=0:devel/immer \ lager>=0:devel/lager \ zug>=0:devel/zug BUILD_DEPENDS+= ${BUILD_DEPENDS_${ARCH}} BUILD_DEPENDS_aarch64= xsimd>=8.1:devel/xsimd BUILD_DEPENDS_amd64= xsimd>=8.1:devel/xsimd LIB_DEPENDS= libImath.so:math/Imath \ libOpenColorIO.so:graphics/opencolorio \ libX11.so:x11/libX11 \ libexiv2.so:graphics/exiv2 \ libfftw3.so:math/fftw3 \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libfribidi.so:converters/fribidi \ libgif.so:graphics/giflib \ libgsl.so:math/gsl \ libharfbuzz.so:print/harfbuzz \ libheif.so:graphics/libheif \ libjson-c.so:devel/json-c \ libjxl.so:graphics/libjxl \ liblcms2.so:graphics/lcms2 \ libmypaint.so:graphics/libmypaint \ libopenjp2.so:graphics/openjpeg \ libpng16.so:graphics/png \ libpoppler.so:graphics/poppler \ libpoppler-qt5.so:graphics/poppler-qt5 \ libquazip1-qt5.so:archivers/quazip@qt5 \ libtiff.so:graphics/tiff \ libturbojpeg.so:graphics/libjpeg-turbo \ libunibreak.so:textproc/libunibreak \ libwebp.so:graphics/webp USES= cmake compiler:c++11-lib desktop-file-utils eigen:3 gettext \ gnome jpeg kde:5 localbase:ldflags mlt:7 pkgconfig python qt:5 \ sdl shared-mime-info tar:xz xorg USE_GNOME= glib20 USE_KDE= completion config coreaddons crash guiaddons i18n \ itemmodels itemviews libkdcraw service widgetsaddons \ windowsystem ecm:build USE_QT= concurrent core dbus declarative gui network \ printsupport sql svg widgets x11extras xml \ buildtools:build qmake:build testlib:build \ sql-sqlite3:run USE_SDL= sdl2 USE_XORG= ice sm xcb xext xi # Make Cmake use the python we installed dependencies for. CMAKE_ARGS= -DPython_EXECUTABLE:STRING=${PYTHON_CMD} PLIST_SUB= SHLIB_VER=19.0.0 \ SHLIB_SHVER=19 OPTIONS_DEFINE= PYTHON OPENEXR OPTIONS_DEFAULT= PYTHON OPENEXR OPTIONS_SUB= yes OPENEXR_LIB_DEPENDS= libOpenEXR.so:graphics/openexr \ libKSeExpr.so:graphics/kseexpr OPENEXR_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_OpenEXR PYTHON_BUILD_DEPENDS= ${PY_SETUPTOOLS} PYTHON_USES= pyqt:5 PYTHON_USE= PYQT=pyqt5,sip,pysip PYTHON_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_PyQt5 .include diff --git a/graphics/krita/files/patch-plugins_impex_jxl_JPEGXLImport.cpp b/graphics/krita/files/patch-plugins_impex_jxl_JPEGXLImport.cpp new file mode 100644 index 000000000000..f3fdc06afac7 --- /dev/null +++ b/graphics/krita/files/patch-plugins_impex_jxl_JPEGXLImport.cpp @@ -0,0 +1,74 @@ +plugins/impex/jxl/JPEGXLImport.cpp:513:20: error: no matching function for call to 'JxlDecoderGetColorAsEncodedProfile' + == JxlDecoderGetColorAsEncodedProfile(dec.get(), + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +/usr/local/include/jxl/decode.h:749:29: note: candidate function not viable: requires 3 arguments, but 4 were provided +JXL_EXPORT JxlDecoderStatus JxlDecoderGetColorAsEncodedProfile( + ^ +plugins/impex/jxl/JPEGXLImport.cpp:638:24: error: no matching function for call to 'JxlDecoderGetICCProfileSize' + != JxlDecoderGetICCProfileSize(dec.get(), nullptr, JXL_COLOR_PROFILE_TARGET_DATA, &iccSize)) { + ^~~~~~~~~~~~~~~~~~~~~~~~~~~ +/usr/local/include/jxl/decode.h:775:29: note: candidate function not viable: requires 3 arguments, but 4 were provided +JXL_EXPORT JxlDecoderStatus JxlDecoderGetICCProfileSize( + ^ +plugins/impex/jxl/JPEGXLImport.cpp:645:24: error: no matching function for call to 'JxlDecoderGetColorAsICCProfile' + != JxlDecoderGetColorAsICCProfile(dec.get(), + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +/usr/local/include/jxl/decode.h:793:29: note: candidate function not viable: requires 4 arguments, but 5 were provided +JXL_EXPORT JxlDecoderStatus JxlDecoderGetColorAsICCProfile( + ^ +plugins/impex/jxl/JPEGXLImport.cpp:659:28: error: no matching function for call to 'JxlDecoderGetICCProfileSize' + != JxlDecoderGetICCProfileSize(dec.get(), + ^~~~~~~~~~~~~~~~~~~~~~~~~~~ +/usr/local/include/jxl/decode.h:775:29: note: candidate function not viable: requires 3 arguments, but 4 were provided +JXL_EXPORT JxlDecoderStatus JxlDecoderGetICCProfileSize( + ^ +plugins/impex/jxl/JPEGXLImport.cpp:669:28: error: no matching function for call to 'JxlDecoderGetColorAsICCProfile' + != JxlDecoderGetColorAsICCProfile(dec.get(), + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +/usr/local/include/jxl/decode.h:793:29: note: candidate function not viable: requires 4 arguments, but 5 were provided +JXL_EXPORT JxlDecoderStatus JxlDecoderGetColorAsICCProfile( + ^ + +--- plugins/impex/jxl/JPEGXLImport.cpp.orig 2023-12-06 11:38:26 UTC ++++ plugins/impex/jxl/JPEGXLImport.cpp +@@ -511,7 +511,6 @@ JPEGXLImport::convert(KisDocument *document, QIODevice + JxlColorEncoding colorEncoding{}; + if (JXL_DEC_SUCCESS + == JxlDecoderGetColorAsEncodedProfile(dec.get(), +- nullptr, + JXL_COLOR_PROFILE_TARGET_DATA, + &colorEncoding)) { + const TransferCharacteristics transferFunction = [&]() { +@@ -635,7 +634,7 @@ JPEGXLImport::convert(KisDocument *document, QIODevice + size_t iccSize = 0; + QByteArray iccProfile; + if (JXL_DEC_SUCCESS +- != JxlDecoderGetICCProfileSize(dec.get(), nullptr, JXL_COLOR_PROFILE_TARGET_DATA, &iccSize)) { ++ != JxlDecoderGetICCProfileSize(dec.get(), JXL_COLOR_PROFILE_TARGET_DATA, &iccSize)) { + errFile << "ICC profile size retrieval failed"; + document->setErrorMessage(i18nc("JPEG-XL errors", "Unable to read the image profile.")); + return ImportExportCodes::ErrorWhileReading; +@@ -643,7 +642,6 @@ JPEGXLImport::convert(KisDocument *document, QIODevice + iccProfile.resize(static_cast(iccSize)); + if (JXL_DEC_SUCCESS + != JxlDecoderGetColorAsICCProfile(dec.get(), +- nullptr, + JXL_COLOR_PROFILE_TARGET_DATA, + reinterpret_cast(iccProfile.data()), + static_cast(iccProfile.size()))) { +@@ -657,7 +655,6 @@ JPEGXLImport::convert(KisDocument *document, QIODevice + if (!d.m_info.uses_original_profile) { + if (JXL_DEC_SUCCESS + != JxlDecoderGetICCProfileSize(dec.get(), +- nullptr, + JXL_COLOR_PROFILE_TARGET_ORIGINAL, + &iccTargetSize)) { + errFile << "ICC profile size retrieval failed"; +@@ -667,7 +664,6 @@ JPEGXLImport::convert(KisDocument *document, QIODevice + iccTargetProfile.resize(static_cast(iccTargetSize)); + if (JXL_DEC_SUCCESS + != JxlDecoderGetColorAsICCProfile(dec.get(), +- nullptr, + JXL_COLOR_PROFILE_TARGET_ORIGINAL, + reinterpret_cast(iccTargetProfile.data()), + static_cast(iccTargetProfile.size()))) { diff --git a/graphics/libjxl/Makefile b/graphics/libjxl/Makefile index 60e62a40bc93..aafc7b2b84ad 100644 --- a/graphics/libjxl/Makefile +++ b/graphics/libjxl/Makefile @@ -1,65 +1,66 @@ PORTNAME= libjxl DISTVERSIONPREFIX= v -DISTVERSION= 0.8.2 -PORTREVISION= 3 +DISTVERSION= 0.9.0 CATEGORIES= graphics MAINTAINER= jbeich@FreeBSD.org COMMENT= JPEG XL reference encoder/decoder WWW= https://jpeg.org/jpegxl/ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libbrotlienc.so:archivers/brotli \ libhwy.so:devel/highway TEST_DEPENDS= googletest>0:devel/googletest USES= cmake:testing compiler:c++11-lib cpe localbase:ldflags pkgconfig shared-mime-info CPE_VENDOR= ${PORTNAME}_project USE_GITHUB= yes USE_LDCONFIG= yes -GH_TUPLE= jbeich:skcms:b25b07b:skcms/third_party/skcms \ - libjxl:testdata:d6168ff:testdata/testdata \ - webmproject:sjpeg:868ab55:sjpeg/third_party/sjpeg \ +GH_TUPLE= jbeich:skcms:42030a7:skcms/third_party/skcms \ + libjpeg-turbo:libjpeg-turbo:2.1.5.1:libjpeg_turbo/third_party/libjpeg-turbo \ + libjxl:testdata:6c94363:testdata/testdata \ + webmproject:sjpeg:e5ab130:sjpeg/third_party/sjpeg \ ${NULL} CMAKE_ON= JPEGXL_ENABLE_PLUGINS CMAKE_OFF= ${BENCHMARK FUZZERS TCMALLOC:L:S/^/JPEGXL_ENABLE_/} CMAKE_OFF+= ${OpenGL GLUT:L:S/^/CMAKE_DISABLE_FIND_PACKAGE_/} # sjpeg CMAKE_OFF+= ${CMAKE_TESTING_ON} LDFLAGS+= -Wl,--as-needed # brotlicommon, OPENEXR/PNG deps OPTIONS_DEFINE= GIF JPEG LTO MANPAGES OPENEXR PIXBUF PNG OPTIONS_DEFAULT=GIF JPEG LTO MANPAGES OPENEXR PIXBUF PNG OPTIONS_EXCLUDE_i386= LTO # ConvolutionWithTranspose(): JXL_CHECK: out->xsize() == in.ysize() OPTIONS_EXCLUDE_riscv64= LTO # bug 262871 OPTIONS_SUB= yes GIF_LIB_DEPENDS= libgif.so:graphics/giflib GIF_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_GIF JPEG_USES= jpeg JPEG_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_JPEG +JPEG_CMAKE_BOOL_OFF+= JPEGXL_ENABLE_JPEGLI_LIBJPEG # XXX WITH_JPEG8, libmap.conf(5) LTO_CMAKE_BOOL= CMAKE_INTERPROCEDURAL_OPTIMIZATION LTO_CMAKE_ON= -DCMAKE_POLICY_DEFAULT_CMP0069:STRING=NEW MANPAGES_BUILD_DEPENDS= a2x:textproc/asciidoc MANPAGES_USES= python:build MANPAGES_CMAKE_BOOL= JPEGXL_ENABLE_MANPAGES OPENEXR_LIB_DEPENDS= libOpenEXR.so:graphics/openexr OPENEXR_CMAKE_BOOL= JPEGXL_ENABLE_OPENEXR PIXBUF_USES= gnome PIXBUF_USE= GNOME=gdkpixbuf2 PIXBUF_CMAKE_BOOL= JPEGXL_ENABLE_PLUGIN_GDKPIXBUF PNG_LIB_DEPENDS= libpng.so:graphics/png PNG_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_PNG post-patch: @${REINPLACE_CMD} 's,/usr,${LOCALBASE},' \ ${WRKSRC}/plugins/gdk-pixbuf/jxl.thumbnailer .include diff --git a/graphics/libjxl/distinfo b/graphics/libjxl/distinfo index b14ac6d0de3f..e6277dcec552 100644 --- a/graphics/libjxl/distinfo +++ b/graphics/libjxl/distinfo @@ -1,9 +1,11 @@ -TIMESTAMP = 1686728961 -SHA256 (libjxl-libjxl-v0.8.2_GH0.tar.gz) = c70916fb3ed43784eb840f82f05d390053a558e2da106e40863919238fa7b420 -SIZE (libjxl-libjxl-v0.8.2_GH0.tar.gz) = 1612062 -SHA256 (jbeich-skcms-b25b07b_GH0.tar.gz) = 3e1ce9bb99269f1093d1e4e04bcbdbbecf0920a0c67abace278e37c61b93fb0e -SIZE (jbeich-skcms-b25b07b_GH0.tar.gz) = 10041269 -SHA256 (libjxl-testdata-d6168ff_GH0.tar.gz) = ed133d390a516ff9f52f17ec4c43d15d735d99a39f39b76c17b5f4084ae15c40 -SIZE (libjxl-testdata-d6168ff_GH0.tar.gz) = 67547424 -SHA256 (webmproject-sjpeg-868ab55_GH0.tar.gz) = ffe757b376fed2fd94473f8625c25f82a3a23aa317fb1bbf1ac8159b6e0a7726 -SIZE (webmproject-sjpeg-868ab55_GH0.tar.gz) = 2472084 +TIMESTAMP = 1703255621 +SHA256 (libjxl-libjxl-v0.9.0_GH0.tar.gz) = d83bbe188d8fa9725bb75109c922c37fcff8c3b802808f3a6c2c14aaf8337d9f +SIZE (libjxl-libjxl-v0.9.0_GH0.tar.gz) = 1871551 +SHA256 (jbeich-skcms-42030a7_GH0.tar.gz) = b7537267dd0fda80a98939cc4e4d15614d2d6f433cc8421b797e0f47078c2979 +SIZE (jbeich-skcms-42030a7_GH0.tar.gz) = 10050433 +SHA256 (libjpeg-turbo-libjpeg-turbo-2.1.5.1_GH0.tar.gz) = 61846251941e5791005fb7face196eec24541fce04f12570c308557529e92c75 +SIZE (libjpeg-turbo-libjpeg-turbo-2.1.5.1_GH0.tar.gz) = 2264936 +SHA256 (libjxl-testdata-6c94363_GH0.tar.gz) = ffe4ab8ae3b80085c6f2107d1335804cfbe3729aad52f5ce382dae254d07505e +SIZE (libjxl-testdata-6c94363_GH0.tar.gz) = 69080987 +SHA256 (webmproject-sjpeg-e5ab130_GH0.tar.gz) = 89d706381311af14e1124276266aebf41977f5facfd2a984cd365835e4bb55ff +SIZE (webmproject-sjpeg-e5ab130_GH0.tar.gz) = 2481141 diff --git a/graphics/libjxl/files/patch-no-lcms2 b/graphics/libjxl/files/patch-no-lcms2 new file mode 100644 index 000000000000..9874c26babfb --- /dev/null +++ b/graphics/libjxl/files/patch-no-lcms2 @@ -0,0 +1,31 @@ +Unused since https://github.com/libjxl/libjxl/commit/726da4dbbe2e + +-- Could NOT find LCMS2 (missing: LCMS2_LIBRARY LCMS2_INCLUDE_DIR) (Required is at least version "2.12") +CMake Error at third_party/CMakeLists.txt:111 (message): + Please install lcms2 or run git submodule update --init + +FAILED: plugins/gdk-pixbuf/libpixbufloader-jxl.so +ld: error: unable to find library -llcms2 + +--- third_party/CMakeLists.txt.orig 2023-12-22 14:33:41 UTC ++++ third_party/CMakeLists.txt +@@ -104,7 +104,7 @@ endif () + configure_file("${CMAKE_CURRENT_SOURCE_DIR}/skcms/LICENSE" + ${PROJECT_BINARY_DIR}/LICENSE.skcms COPYONLY) + endif () +-if (JPEGXL_ENABLE_VIEWERS OR NOT JPEGXL_ENABLE_SKCMS OR JPEGXL_ENABLE_PLUGINS) ++if (JPEGXL_ENABLE_VIEWERS OR NOT JPEGXL_ENABLE_SKCMS) + if( NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/lcms/.git" OR JPEGXL_FORCE_SYSTEM_LCMS2 ) + find_package(LCMS2 2.12) + if ( NOT LCMS2_FOUND ) +--- plugins/gdk-pixbuf/CMakeLists.txt.orig 2023-12-22 14:33:41 UTC ++++ plugins/gdk-pixbuf/CMakeLists.txt +@@ -25,7 +25,7 @@ set_target_properties(pixbufloader-jxl PROPERTIES + + # Note: This only needs the decoder library, but we don't install the decoder + # shared library. +-target_link_libraries(pixbufloader-jxl jxl jxl_threads lcms2 PkgConfig::Gdk-Pixbuf) ++target_link_libraries(pixbufloader-jxl jxl jxl_threads PkgConfig::Gdk-Pixbuf) + + execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} gdk-pixbuf-2.0 --variable gdk_pixbuf_moduledir --define-variable=prefix=${CMAKE_INSTALL_PREFIX} OUTPUT_VARIABLE GDK_PIXBUF_MODULEDIR OUTPUT_STRIP_TRAILING_WHITESPACE) + install(TARGETS pixbufloader-jxl DESTINATION "${GDK_PIXBUF_MODULEDIR}") diff --git a/graphics/libjxl/pkg-plist b/graphics/libjxl/pkg-plist index 9fff17b6fd22..e75d7501c163 100644 --- a/graphics/libjxl/pkg-plist +++ b/graphics/libjxl/pkg-plist @@ -1,39 +1,45 @@ -%%JPEG%%bin/cjpeg_hdr +%%JPEG%%bin/cjpegli bin/cjxl +%%JPEG%%bin/djpegli bin/djxl bin/jxlinfo -include/jxl/butteraugli.h -include/jxl/butteraugli_cxx.h +include/jxl/cms.h include/jxl/cms_interface.h include/jxl/codestream_header.h include/jxl/color_encoding.h include/jxl/decode.h include/jxl/decode_cxx.h include/jxl/encode.h include/jxl/encode_cxx.h +include/jxl/jxl_cms_export.h include/jxl/jxl_export.h include/jxl/jxl_threads_export.h include/jxl/memory_manager.h include/jxl/parallel_runner.h include/jxl/resizable_parallel_runner.h include/jxl/resizable_parallel_runner_cxx.h +include/jxl/stats.h include/jxl/thread_parallel_runner.h include/jxl/thread_parallel_runner_cxx.h include/jxl/types.h include/jxl/version.h %%PIXBUF%%lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-jxl.so -lib/libjxl.a lib/libjxl.so -lib/libjxl.so.0.8 -lib/libjxl.so.0.8.2 -lib/libjxl_dec.a -lib/libjxl_threads.a +lib/libjxl.so.0.9 +lib/libjxl.so.0.9.0 +lib/libjxl_cms.so +lib/libjxl_cms.so.0.9 +lib/libjxl_cms.so.0.9.0 +lib/libjxl_extras_codec.so +lib/libjxl_extras_codec.so.0.9 +lib/libjxl_extras_codec.so.0.9.0 lib/libjxl_threads.so -lib/libjxl_threads.so.0.8 -lib/libjxl_threads.so.0.8.2 +lib/libjxl_threads.so.0.9 +lib/libjxl_threads.so.0.9.0 libdata/pkgconfig/libjxl.pc +libdata/pkgconfig/libjxl_cms.pc libdata/pkgconfig/libjxl_threads.pc %%MANPAGES%%share/man/man1/cjxl.1.gz %%MANPAGES%%share/man/man1/djxl.1.gz share/mime/packages/image-jxl.xml %%PIXBUF%%share/thumbnailers/jxl.thumbnailer diff --git a/graphics/sdl2_image/Makefile b/graphics/sdl2_image/Makefile index df6be96200a8..ee53f1f45c67 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= 3 +PORTREVISION= 4 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/vips/Makefile b/graphics/vips/Makefile index a450953d4e96..531dd86344f3 100644 --- a/graphics/vips/Makefile +++ b/graphics/vips/Makefile @@ -1,128 +1,132 @@ PORTNAME= vips PORTVERSION= 8.15.0 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= https://github.com/libvips/libvips/releases/download/v${PORTVERSION}/ +PATCH_SITES= https://github.com/libvips/libvips/commit/ +PATCHFILES+= 83b155909eb8.patch:-p1 # https://github.com/libvips/libvips/pull/3774 + MAINTAINER= sunpoet@FreeBSD.org COMMENT= Free image processing system WWW= https://www.libvips.org/ \ https://github.com/libvips/libvips LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libexpat.so:textproc/expat2 \ libfreetype.so:print/freetype2 \ libharfbuzz.so:print/harfbuzz RUN_DEPENDS= bash:shells/bash USES= compiler:c++11-lang cpe gettext gnome localbase meson pkgconfig python shebangfix tar:xz USE_GNOME= glib20 MESON_ARGS= --default-library=both \ -Danalyze=true \ -Dcplusplus=true \ -Ddeprecated=true \ -Ddoxygen=false \ -Dexamples=true \ -Dintrospection=disabled \ -Dmodules=disabled \ -Dnifti=disabled \ -Dnsgif=true \ -Dopenslide=disabled \ -Dpdfium=disabled \ -Dppm=true \ -Dquantizr=disabled \ -Dradiance=true \ -Dvapi=false \ -Dzlib=enabled USE_LDCONFIG= yes PLIST_SUB= VERSION=${PORTVERSION:R} SHEBANG_FILES= tools/vipsprofile OPTIONS_DEFINE= CFITSIO DOCS FFTW FONTCONFIG GIF HEIF IMAGEQUANT JPEG JXL LCMS2 LIBARCHIVE LIBEXIF LIBRSVG2 MATIO OPENEXR PANGO PNG POPPLER SPNG TIFF WEBP OPTIONS_RADIO= MAGICK SIMD OPTIONS_RADIO_MAGICK= IMAGEMAGICK GRAPHMAGICK OPTIONS_RADIO_SIMD= HIGHWAY ORC OPTIONS_DEFAULT=CFITSIO FFTW FONTCONFIG GIF HEIF HIGHWAY IMAGEMAGICK JPEG JXL LCMS2 LIBARCHIVE LIBEXIF LIBRSVG2 MATIO OPENEXR PANGO PNG POPPLER SPNG TIFF WEBP FONTCONFIG_IMPLIES= PANGO LIBARCHIVE_DESC=Save image pyramid via libarchive HIGHWAY_DESC= SIMD support via Highway (preferred) IMAGEQUANT_DESC=Image Quantization support MATIO_DESC= Matlab MAT format support ORC_DESC= Accelerate loops with ORC CFITSIO_LIB_DEPENDS= libcfitsio.so:astro/cfitsio CFITSIO_MESON_ENABLED= cfitsio DOCS_BUILD_DEPENDS= gtkdocize:textproc/gtk-doc DOCS_MESON_TRUE= gtk_doc FFTW_LIB_DEPENDS= libfftw3.so:math/fftw3 FFTW_MESON_ENABLED= fftw FONTCONFIG_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig FONTCONFIG_MESON_ENABLED= fontconfig GIF_BUILD_DEPENDS= cgif>=0.2.0:graphics/cgif GIF_LIB_DEPENDS= libcgif.so:graphics/cgif GIF_MESON_ENABLED= cgif GRAPHMAGICK_LIB_DEPENDS=libGraphicsMagick.so:graphics/GraphicsMagick GRAPHMAGICK_MESON_ON= -Dmagick=enabled -Dmagick-package=GraphicsMagick HEIF_BUILD_DEPENDS= libheif>=1.4.0:graphics/libheif HEIF_LIB_DEPENDS= libheif.so:graphics/libheif HEIF_MESON_ENABLED= heif HIGHWAY_BUILD_DEPENDS= highway>=1.0.5:devel/highway HIGHWAY_LIB_DEPENDS= libhwy.so:devel/highway HIGHWAY_MESON_ENABLED= highway IMAGEMAGICK_MESON_ON= -Dmagick=enabled -Dmagick-package=MagickCore IMAGEMAGICK_USES= magick IMAGEQUANT_LIB_DEPENDS= libimagequant.so:graphics/libimagequant IMAGEQUANT_MESON_ENABLED= imagequant JPEG_BUILD_DEPENDS= openjpeg>=2.4:graphics/openjpeg JPEG_LIB_DEPENDS= libopenjp2.so:graphics/openjpeg JPEG_MESON_ENABLED= jpeg openjpeg JPEG_USES= jpeg JXL_BUILD_DEPENDS= libjxl>=0.6:graphics/libjxl JXL_LIB_DEPENDS= libjxl.so:graphics/libjxl JXL_MESON_ENABLED= jpeg-xl LCMS2_LIB_DEPENDS= liblcms2.so:graphics/lcms2 LCMS2_MESON_ENABLED= lcms LIBEXIF_BUILD_DEPENDS= libexif>=0.6:graphics/libexif LIBEXIF_LIB_DEPENDS= libexif.so:graphics/libexif LIBEXIF_MESON_ENABLED= exif LIBARCHIVE_BUILD_DEPENDS= libarchive>=3.0.0:archivers/libarchive LIBARCHIVE_MESON_ENABLED= archive LIBARCHIVE_USES= libarchive LIBRSVG2_MESON_ENABLED= rsvg LIBRSVG2_USE= GNOME=cairo,librsvg2 MATIO_LIB_DEPENDS= libmatio.so:math/matio MATIO_MESON_ENABLED= matio OPENEXR_BUILD_DEPENDS= openexr>=1.2.2:graphics/openexr OPENEXR_LIB_DEPENDS= libOpenEXR.so:graphics/openexr OPENEXR_MESON_ENABLED= openexr ORC_BUILD_DEPENDS= orc>=0.4.31:devel/orc ORC_LIB_DEPENDS= liborc-0.4.so:devel/orc ORC_MESON_ENABLED= orc PANGO_MESON_ENABLED= pangocairo PANGO_USE= GNOME=pango PNG_BUILD_DEPENDS= png>=1.2.9:graphics/png PNG_LIB_DEPENDS= libpng.so:graphics/png PNG_MESON_ENABLED= png POPPLER_LIB_DEPENDS= libpoppler-glib.so:graphics/poppler-glib POPPLER_MESON_ENABLED= poppler POPPLER_USE= GNOME=cairo SPNG_BUILD_DEPENDS= libspng>=0.7:graphics/libspng SPNG_LIB_DEPENDS= libspng.so:graphics/libspng SPNG_MESON_ENABLED= spng TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff TIFF_MESON_ENABLED= tiff WEBP_BUILD_DEPENDS= webp>=0.6:graphics/webp WEBP_LIB_DEPENDS= libwebp.so:graphics/webp WEBP_MESON_ENABLED= webp .include .if !${PORT_OPTIONS:MGRAPHMAGICK} && !${PORT_OPTIONS:MIMAGEMAGICK} MESON_ARGS+= -Dmagick=disabled .endif .include diff --git a/graphics/vips/distinfo b/graphics/vips/distinfo index 58956a5db947..9cb107cf6819 100644 --- a/graphics/vips/distinfo +++ b/graphics/vips/distinfo @@ -1,3 +1,5 @@ TIMESTAMP = 1699774464 SHA256 (vips-8.15.0.tar.xz) = d33f81c6ab4bd1faeedc36dc32f880b19e9d5ff69b502e59d175332dfb8f63f1 SIZE (vips-8.15.0.tar.xz) = 18653932 +SHA256 (83b155909eb8.patch) = e878f269c98af7e85c6edc65fef98248bfc25f62839e2094c2572cfd92d302fb +SIZE (83b155909eb8.patch) = 3784 diff --git a/multimedia/aom/Makefile b/multimedia/aom/Makefile index d30b07cdf17c..0a242e7af896 100644 --- a/multimedia/aom/Makefile +++ b/multimedia/aom/Makefile @@ -1,44 +1,45 @@ PORTNAME= aom DISTVERSIONPREFIX= v DISTVERSION= 3.8.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia MAINTAINER= jbeich@FreeBSD.org COMMENT= AV1 reference encoder/decoder WWW= https://aomedia.org/ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${BUILD_DEPENDS_${ARCH}} BUILD_DEPENDS_amd64= nasm:devel/nasm BUILD_DEPENDS_i386= nasm:devel/nasm USES= cmake compiler:c++11-lib perl5 USE_GITHUB= yes USE_PERL5= build USE_LDCONFIG= yes GH_ACCOUNT= jbeich # mirror CMAKE_ON= BUILD_SHARED_LIBS CMAKE_OFF= ENABLE_DOCS ENABLE_TESTS OPTIONS_DEFINE= JXL VMAF OPTIONS_DEFAULT=JXL VMAF +OPTIONS_EXCLUDE=JXL # https://bugs.chromium.org/p/aomedia/issues/detail?id=3457 JXL_DESC= Encoding tuning for Butteraugli JXL_LIB_DEPENDS= libjxl.so:graphics/libjxl JXL_USES= pkgconfig JXL_CMAKE_ON= -DCONFIG_TUNE_BUTTERAUGLI:STRING=1 VMAF_DESC= Encoding tuning for VMAF VMAF_LIB_DEPENDS= libvmaf.so:multimedia/vmaf VMAF_USES= pkgconfig VMAF_CMAKE_ON= -DCONFIG_TUNE_VMAF:STRING=1 post-patch: # Extract (snapshot) version from the port instead of CHANGELOG @${REINPLACE_CMD} 's,$${AOM_ROOT}/CHANGELOG,${DISTVERSIONFULL:S/^v//},' \ ${WRKSRC}/build/cmake/version.cmake .include diff --git a/multimedia/emby-server/Makefile b/multimedia/emby-server/Makefile index e0a37412650b..9f57a433ed9f 100644 --- a/multimedia/emby-server/Makefile +++ b/multimedia/emby-server/Makefile @@ -1,148 +1,148 @@ PORTNAME= emby-server DISTVERSION?= 4.7.14.0 -PORTREVISION?= 6 +PORTREVISION?= 7 CATEGORIES= multimedia MASTER_SITES= https://github.com/MediaBrowser/Emby.Releases/releases/download/${DISTVERSION}/ \ https://mediabrowser.github.io/embytools/ DISTNAME= emby-server-freebsd13_${DISTVERSION}_amd64 DISTFILES= ${DISTNAME}.tar.xz \ ffdetect-${FFVERSION}-x64_freebsd13.tar.xz \ ffmpeg-${FFVERSION}.tar.gz \ license.docx DIST_SUBDIR?= ${PORTNAME} EXTRACT_ONLY= ${DISTNAME}.tar.xz \ ffdetect-${FFVERSION}-x64_freebsd13.tar.xz \ ffmpeg-${FFVERSION}.tar.gz MAINTAINER= driesm@FreeBSD.org COMMENT= Media server to organize, play & stream audio/video to various devices WWW= https://emby.media/ LICENSE= UNKNOWN LICENSE_NAME= custom LICENSE_FILE= ${DISTDIR}/${DIST_SUBDIR}/license.docx LICENSE_PERMS= dist-mirror no-dist-sell pkg-mirror no-pkg-sell auto-accept ONLY_FOR_ARCHS= amd64 BUILD_DEPENDS= nasm:devel/nasm \ ${LOCALBASE}/include/CL/opencl.h:devel/opencl LIB_DEPENDS= libaribb24.so:multimedia/aribb24 \ libass.so:multimedia/libass \ libchromaprint.so:audio/chromaprint \ libdav1d.so:multimedia/dav1d \ libdrm.so:graphics/libdrm \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libfribidi.so:converters/fribidi \ libmbedtls.so:security/mbedtls \ libmfx.so:multimedia/intel-media-sdk \ libOpenCL.so:devel/ocl-icd \ libogg.so:audio/libogg \ libopus.so:audio/opus \ libpng.so:graphics/png \ libraw.so:graphics/libraw \ libtesseract.so:graphics/tesseract \ libtheora.so:multimedia/libtheora \ libva.so:multimedia/libva \ libvorbis.so:audio/libvorbis \ libvpx.so:multimedia/libvpx \ libwebp.so:graphics/webp \ libx264.so:multimedia/libx264 \ libx265.so:multimedia/x265 \ libzvbi.so:devel/libzvbi RUN_DEPENDS= icu>0:devel/icu \ libexif>0:graphics/libexif \ libheif>0:graphics/libheif \ libimagequant>0:graphics/libimagequant \ libinotify>0:devel/libinotify \ libjxl>0:graphics/libjxl \ libunwind>0:devel/libunwind \ openjpeg>0:graphics/openjpeg \ orc>0:devel/orc USES= compiler:c11 gmake iconv localbase:ldflags pkgconfig sqlite ssl:run USE_RC_SUBR= ${PORTNAME} HAS_CONFIGURE= yes CONFIGURE_ARGS= --cc="${CC}" \ --disable-alsa \ --disable-doc \ --disable-ffplay \ --disable-libxcb \ --disable-outdev=xv \ --disable-sdl2 \ --disable-shared \ --disable-sndio \ --disable-v4l2-m2m \ --disable-vdpau \ --disable-xlib \ --enable-chromaprint \ --enable-fontconfig \ --enable-gpl \ --enable-iconv \ --enable-libaribb24 \ --enable-libass \ --enable-libdav1d \ --enable-libdrm \ --enable-libfreetype \ --enable-libfribidi \ --enable-libmfx \ --enable-libopus \ --enable-libtesseract \ --enable-libtheora \ --enable-libvorbis \ --enable-libvpx \ --enable-libwebp \ --enable-libx264 \ --enable-libx265 \ --enable-libzvbi \ --enable-mbedtls \ --enable-opencl \ --enable-optimizations \ --enable-static \ --enable-vaapi \ --enable-version3 MAKE_ENV= V=1 CONFLICTS_INSTALL?= emby-server-devel NOPRECIOUSMAKEVARS= yes SUB_FILES= SQLitePCLRaw.provider.sqlite3.dll.config SUB_LIST= GROUP=${GROUPS} \ PORTNAME=${PORTNAME} \ RC_NAME=emby_server \ USER=${USERS} WRKSRC= ${WRKDIR}/ffmpeg-${FFVERSION}_public USERS= emby GROUPS= emby OPTIONS_DEFINE= LAME OPTIONS_DEFAULT= LAME LAME_LIB_DEPENDS= libmp3lame.so:audio/lame LAME_CONFIGURE_ENABLE= libmp3lame FFVERSION= 2022_05_07 do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/lib/emby-server/bin (${INSTALL_PROGRAM} ${WRKDIR}/bin/ffdetect ${STAGEDIR}${PREFIX}/lib/emby-server/bin) (${INSTALL_PROGRAM} ${WRKSRC}/ffmpeg ${STAGEDIR}${PREFIX}/lib/emby-server/bin) (${INSTALL_PROGRAM} ${WRKSRC}/ffprobe ${STAGEDIR}${PREFIX}/lib/emby-server/bin) @${MKDIR} ${STAGEDIR}${PREFIX}/lib/emby-server/lib (cd ${WRKDIR}/lib && ${COPYTREE_BIN} . ${STAGEDIR}${PREFIX}/lib/emby-server/lib) ${RLN} ${LOCALBASE}/lib/libimagequant.so.0.0.4 ${STAGEDIR}${PREFIX}/lib/emby-server/lib/libimagequant.so.0 @${MKDIR} ${STAGEDIR}${PREFIX}/lib/emby-server/system (${INSTALL_DATA} ${WRKDIR}/SQLitePCLRaw.provider.sqlite3.dll.config ${STAGEDIR}${PREFIX}/lib/emby-server/system) (cd ${WRKDIR}/system && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/lib/emby-server/system "! -name EmbyServer") (${INSTALL_PROGRAM} ${WRKDIR}/system/EmbyServer ${STAGEDIR}${PREFIX}/lib/emby-server/system) post-install: @${FIND} -s ${STAGEDIR}${PREFIX}/lib -not -type d | ${SORT} | ${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST} .include diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index b58c464d33be..2ff2d3ba1d42 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -1,691 +1,691 @@ PORTNAME= ffmpeg PORTVERSION= 6.1 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 1 CATEGORIES= multimedia audio net MASTER_SITES= https://ffmpeg.org/releases/ MAINTAINER= multimedia@FreeBSD.org COMMENT= Realtime audio/video encoder/converter and streaming server WWW= https://ffmpeg.org/ LICENSE= GPLv2+ LGPL21+ LICENSE_COMB= multi BUILD_DEPENDS= ${BUILD_DEPENDS_${ARCH}} BUILD_DEPENDS_aarch64= as:devel/binutils BUILD_DEPENDS_amd64= nasm:devel/nasm BUILD_DEPENDS_armv6= as:devel/binutils BUILD_DEPENDS_armv7= as:devel/binutils BUILD_DEPENDS_i386= nasm:devel/nasm HAS_CONFIGURE= yes CONFIGURE_LOG= ffbuild/config.log USES= compiler:c11 cpe gmake localbase:ldflags perl5 \ pkgconfig shebangfix tar:xz USE_LDCONFIG= yes USE_PERL5= build SHEBANG_FILES= doc/texi2pod.pl NOPRECIOUSMAKEVARS= yes # ARCH PORTSCOUT= limit:^6\. # Option CHROMAPRINT disabled, it cannot work and people are baffled. OPTIONS_DEFINE= ALSA AMR_NB AMR_WB AOM ARIBB24 ARIBCAPTION ASM ASS BS2B CACA CDIO \ CODEC2 DAV1D DAVS2 DC1394 DEBUG DOCS DRM FDK_AAC FLITE \ FONTCONFIG FREETYPE FREI0R FRIBIDI GLSLANG GME GSM HARFBUZZ ICONV ILBC \ JACK JXL KLVANC KVAZAAR LADSPA LAME LCMS2 LENSFUN LIBBLURAY LIBPLACEBO LIBRSVG2 \ LIBXML2 LTO LV2 MODPLUG MYSOFA NETWORK NVENC OPENAL OPENCL OPENGL \ OPENH264 OPENJPEG OPENMPT OPENVINO OPTIMIZED_CFLAGS OPUS POCKETSPHINX \ PULSEAUDIO RAV1E RABBITMQ RIST RTCPU RUBBERBAND SDL SHADERC SMB SNAPPY \ SNDIO SOXR SPEEX SRT SSH SVTAV1 SVTHEVC SVTVP9 TENSORFLOW \ TESSERACT THEORA TWOLAME UAVS3D V4L VAAPI VAPOURSYNTH VDPAU VIDSTAB \ VMAF VO_AMRWBENC VORBIS VPX VULKAN WEBP X264 X265 \ XAVS2 XCB XVID XVIDEO ZIMG ZMQ ZVBI # intel-media-sdk only for i386/amd64 OPTIONS_DEFINE_amd64= MFX VPL OPTIONS_DEFINE_i386= MFX OPTIONS_DEFAULT= AOM ASM ASS DAV1D DRM FONTCONFIG FREETYPE FREI0R GMP \ GNUTLS HARFBUZZ ICONV JXL LAME LCMS2 LIBPLACEBO LIBXML2 NETWORK \ OPTIMIZED_CFLAGS OPUS RTCPU SVTAV1 V4L VAAPI VDPAU VMAF \ VORBIS VPX VULKAN WEBP X264 X265 XCB OPTIONS_DEFAULT_amd64= NVENC OPTIONS_DEFAULT_i386= NVENC # i386 is too register-starved for LTO (PR257124) OPTIONS_EXCLUDE_i386= LTO .if !exists(${.CURDIR:H:H}/multimedia/libaribcaption) # https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/b6138633cdf2 OPTIONS_EXCLUDE+= ARIBCAPTION .endif .if !exists(${.CURDIR:H:H}/multimedia/davs2) # https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/5985a1bf7233 OPTIONS_EXCLUDE+= DAVS2 .endif .if !exists(${.CURDIR:H:H}/multimedia/uavs3d) # https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/c952db9d68d3 OPTIONS_EXCLUDE+= UAVS3D .endif .if !exists(${.CURDIR:H:H}/multimedia/xavs2) # https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/85a921f4618 OPTIONS_EXCLUDE+= XAVS2 .endif .if !exists(${.CURDIR:H:H}/multimedia/klvanc) # https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/8732dfa9954 OPTIONS_EXCLUDE+= KLVANC .endif .if !exists(${.CURDIR:H:H}/science/openvino) # https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/ff37ebaf30e6 OPTIONS_EXCLUDE+= OPENVINO .endif OPTIONS_RADIO= RTMP SSL OPTIONS_RADIO_RTMP= GCRYPT GMP LIBRTMP OPTIONS_RADIO_SSL= GNUTLS MBEDTLS OPENSSL OPTIONS_GROUP= LICENSE OPTIONS_GROUP_LICENSE= GPL3 NONFREE ASS_DESC= Subtitles rendering via libass AOM_DESC= AV1 video encoding/decoding via libaom ARIBB24_DESC= ARIB text and caption decoding via libaribb24 ARIBCAPTION_DESC= ARIB text and caption decoding via libaribcaption BS2B_DESC= Bauer Stereophonic-to-Binaural filter CHROMAPRINT_DESC= Audio fingerprinting with chromaprint CODEC2_DESC= Codec 2 audio encoding/decoding via libcodec2 DAV1D_DESC= AV1 video decoding via libdav1d DAVS2_DESC= AVS2 decoding via libdavs2 DC1394_DESC= IIDC-1394 grabbing using libdc1394 DRM_DESC= KMS grabbing using libdrm FDK_AAC_DESC= AAC audio encoding via Fraunhofer FDK FLITE_DESC= Voice synthesis support via libflite GLSLANG_DESC= GLSL->SPIRV compilation via libglslang GME_DESC= Game Music Emu demuxer GPL3_DESC= Allow (L)GPL version 3 code(cs) HARFBUZZ_DESC= Text shaping via HarfBuzz ILBC_DESC= Internet Low Bit Rate codec KLVANC_DESC= Kernel Labs VANC processing KVAZAAR_DESC= H.265 video codec support via Kvazaar LICENSE_DESC= Licensing options LV2_DESC= LV2 audio filtering MFX_DESC= Intel MediaSDK (aka Quick Sync Video) MYSOFA_DESC= SOFAlizer binaural filter NETWORK_DESC= Networking support NONFREE_DESC= Allow use of nonfree code NVENC_DESC= NVIDIA decoder/encoder with CUDA support OPENMPT_DESC= Decoding tracked files via libopenmpt OPENH264_DESC= H.264 video codec support via OpenH264 OPENVINO_DESC= OpenVINO as a DNN module backend for DNN based filters like dnn_processing POCKETSPHINX_DESC= Automatic Speech Recognition via PocketSphinx RAV1E_DESC= AV1 encoding via librav1e RABBITMQ_DESC= AMQP 0-9-1 protocol via RabbitMQ RIST_DESC= Reliable Internet Stream Transport protocol via librist RUBBERBAND_DESC=Time-stretching and pitch-shifting with librubberband RTCPU_DESC= Detect CPU capabilities at runtime RTMP_DESC= RTMP(T)E protocol support SHADERC_DESC= GLSL->SPIRV compilation via libshaderc SRT_DESC= Haivision SRT protocol via libsrt SVTAV1_DESC= AV1 encoding via SVT-AV1 SVTHEVC_DESC= HEVC encoding via SVT-HEVC SVTVP9_DESC= VP9 encoding via SVT-VP9 LIBPLACEBO_DESC=GPU filters from libplacebo LIBRTMP_DESC= ${RTMP_DESC} via librtmp TENSORFLOW_DESC=TensorFlow as a DNN module backend for DNN based filters like sr TESSERACT_DESC= Optical Character Recognition via Tesseract THEORA_DESC= Encoding support for theora via libtheora UAVS3D_DESC= AVS3 decoding via libuavs3d VAPOURSYNTH_DESC= VapourSynth demuxer VIDSTAB_DESC= Video stabilization filter VMAF_DESC= VMAF filter via libvmaf VPL_DESC= Intel oneVPL (aka Quick Sync Video) VULKAN_DESC= Vulkan filters XAVS2_DESC= AVS2 encoding via libxavs2 XCB_DESC= X11 grabbing using XCB XVID_DESC= Encoding support for MPEG-4 ASP via libxvid ZIMG_DESC= "z" library video scaling filter ZMQ_DESC= Message passing via libzmq${ZMQ_VERSION} ZVBI_DESC= Teletext support via libzvbi OPTIONS_SUB= yes # alsa ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib ALSA_CONFIGURE_ENABLE= alsa # Opencore AMR NB AMR_NB_LIB_DEPENDS= libopencore-amrnb.so:audio/opencore-amr AMR_NB_CONFIGURE_ENABLE= libopencore-amrnb AMR_NB_IMPLIES= GPL3 # Opencore AMR WB AMR_WB_LIB_DEPENDS= libopencore-amrwb.so:audio/opencore-amr AMR_WB_CONFIGURE_ENABLE= libopencore-amrwb AMR_WB_IMPLIES= GPL3 # aom AOM_LIB_DEPENDS= libaom.so:multimedia/aom AOM_CONFIGURE_ENABLE= libaom # arib ARIBB24_LIB_DEPENDS= libaribb24.so:multimedia/aribb24 ARIBB24_CONFIGURE_ENABLE= libaribb24 # aribcaption ARIBCAPTION_LIB_DEPENDS= libaribcaption.so:multimedia/libaribcaption ARIBCAPTION_CONFIGURE_ENABLE= libaribcaption # asm support ASM_CONFIGURE_ENABLE= asm # ass ASS_LIB_DEPENDS= libass.so:multimedia/libass ASS_CONFIGURE_ENABLE= libass # bs2b BS2B_LIB_DEPENDS= libbs2b.so:audio/libbs2b BS2B_CONFIGURE_ENABLE= libbs2b # caca CACA_LIB_DEPENDS= libcaca.so:graphics/libcaca CACA_CONFIGURE_ENABLE= libcaca # cdio CDIO_LIB_DEPENDS= libcdio_paranoia.so:sysutils/libcdio-paranoia CDIO_CONFIGURE_ENABLE= libcdio # chromaprint CHROMAPRINT_BROKEN= Dependency loop CHROMAPRINT_LIB_DEPENDS= libchromaprint.so:audio/chromaprint CHROMAPRINT_CONFIGURE_ENABLE= chromaprint # codec2 CODEC2_LIB_DEPENDS= libcodec2.so:audio/codec2 CODEC2_CONFIGURE_ENABLE= libcodec2 # dav1d DAV1D_LIB_DEPENDS= libdav1d.so:multimedia/dav1d DAV1D_CONFIGURE_ENABLE= libdav1d # davs2 DAVS2_LIB_DEPENDS= libdavs2.so:multimedia/davs2 DAVS2_CONFIGURE_ENABLE= libdavs2 # dc1394 DC1394_LIB_DEPENDS= libdc1394.so:multimedia/libdc1394 DC1394_CONFIGURE_ENABLE= libdc1394 # debugging DEBUG_CONFIGURE_ON= --disable-stripping DEBUG_CONFIGURE_OFF= --disable-debug # docs DOCS_BUILD_DEPENDS= texi2html:textproc/texi2html DOCS_CONFIGURE_ENABLE= htmlpages DOCS_BINARY_ALIAS= makeinfo=${FALSE} # force texi2html # drm DRM_LIB_DEPENDS= libdrm.so:graphics/libdrm DRM_CONFIGURE_ENABLE= libdrm # fdk_aac FDK_AAC_LIB_DEPENDS= libfdk-aac.so:audio/fdk-aac FDK_AAC_CONFIGURE_ENABLE= libfdk-aac FDK_AAC_IMPLIES= NONFREE # flite FLITE_LIB_DEPENDS= libflite.so:audio/flite FLITE_CONFIGURE_ENABLE= libflite # fontconfig FONTCONFIG_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig FONTCONFIG_CONFIGURE_ENABLE= fontconfig # freetype FREETYPE_LIB_DEPENDS= libfreetype.so:print/freetype2 FREETYPE_CONFIGURE_ENABLE= libfreetype # frei0r FREI0R_BUILD_DEPENDS= ${LOCALBASE}/include/frei0r.h:graphics/frei0r FREI0R_CONFIGURE_ENABLE= frei0r # fribidi FRIBIDI_LIB_DEPENDS= libfribidi.so:converters/fribidi FRIBIDI_CONFIGURE_ENABLE= libfribidi # gcrypt GCRYPT_LIB_DEPENDS= libgcrypt.so:security/libgcrypt GCRYPT_CONFIGURE_ENABLE= gcrypt # glslang GLSLANG_BUILD_DEPENDS= glslang>0:graphics/glslang \ spirv-tools>0:graphics/spirv-tools GLSLANG_CONFIGURE_ENABLE= libglslang GLSLANG_LDFLAGS= -lm # gnutls GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls GNUTLS_CONFIGURE_ENABLE= gnutls # gme GME_LIB_DEPENDS= libgme.so:audio/libgme GME_CONFIGURE_ENABLE= libgme # gmp GMP_LIB_DEPENDS= libgmp.so:math/gmp GMP_CONFIGURE_ENABLE= gmp GMP_IMPLIES= GPL3 # gsm GSM_LIB_DEPENDS= libgsm.so:audio/gsm GSM_CONFIGURE_ENABLE= libgsm # harfbuzz HARFBUZZ_LIB_DEPENDS= libharfbuzz.so:print/harfbuzz HARFBUZZ_CONFIGURE_ENABLE= libharfbuzz # iconv ICONV_USES= iconv ICONV_CONFIGURE_ENABLE= iconv # ilbc ILBC_LIB_DEPENDS= libilbc.so:net/libilbc ILBC_CONFIGURE_ENABLE= libilbc # jack JACK_LIB_DEPENDS= libjack.so:audio/jack JACK_CONFIGURE_ENABLE= libjack # jxl JXL_LIB_DEPENDS= libjxl.so:graphics/libjxl JXL_CONFIGURE_ENABLE= libjxl # klvanc KLVANC_LIB_DEPENDS= libklvanc.so:multimedia/libklvanc KLVANC_CONFIGURE_ENABLE= libklvanc # kvazaar KVAZAAR_LIB_DEPENDS= libkvazaar.so:multimedia/kvazaar KVAZAAR_CONFIGURE_ENABLE= libkvazaar # ladspa LADSPA_BUILD_DEPENDS= ${LOCALBASE}/include/ladspa.h:audio/ladspa LADSPA_RUN_DEPENDS= ${LOCALBASE}/lib/ladspa/amp.so:audio/ladspa LADSPA_CONFIGURE_ENABLE= ladspa # lame LAME_LIB_DEPENDS= libmp3lame.so:audio/lame LAME_CONFIGURE_ENABLE= libmp3lame # lcms2 LCMS2_LIB_DEPENDS= liblcms2.so:graphics/lcms2 LCMS2_CONFIGURE_ENABLE= lcms2 # lensfun LENSFUN_LIB_DEPENDS= liblensfun.so:graphics/lensfun LENSFUN_CONFIGURE_ENABLE= liblensfun # libbluray LIBBLURAY_LIB_DEPENDS= libbluray.so:multimedia/libbluray LIBBLURAY_CONFIGURE_ENABLE= libbluray # libplacebo LIBPLACEBO_LIB_DEPENDS= libplacebo.so:graphics/libplacebo LIBPLACEBO_CONFIGURE_ENABLE= libplacebo LIBPLACEBO_IMPLIES= VULKAN # librsvg LIBRSVG2_USES= gnome LIBRSVG2_USE= GNOME=cairo,librsvg2 LIBRSVG2_CONFIGURE_ENABLE= librsvg # libxml LIBXML2_LIB_DEPENDS= libxml2.so:textproc/libxml2 LIBXML2_CONFIGURE_ENABLE= libxml2 # lto LTO_CONFIGURE_ON= --enable-lto # lv2 LV2_BUILD_DEPENDS= lv2>0:audio/lv2 LV2_LIB_DEPENDS= liblilv-0.so:audio/lilv LV2_CONFIGURE_ENABLE= lv2 # libv4l V4L_BUILD_DEPENDS= v4l_compat>0:multimedia/v4l_compat V4L_LIB_DEPENDS= libv4l2.so:multimedia/libv4l V4L_CONFIGURE_ENABLE= libv4l2 V4L_CONFIGURE_OFF= --disable-indev=v4l2 \ --disable-outdev=v4l2 # mbedtls MBEDTLS_LIB_DEPENDS= libmbedtls.so:security/mbedtls MBEDTLS_CONFIGURE_ENABLE= mbedtls # mfx MFX_LIB_DEPENDS= libmfx.so:multimedia/intel-media-sdk MFX_CONFIGURE_ENABLE= libmfx # modplug MODPLUG_LIB_DEPENDS= libmodplug.so:audio/libmodplug MODPLUG_CONFIGURE_ENABLE= libmodplug # mysofa MYSOFA_LIB_DEPENDS= libmysofa.so:audio/libmysofa MYSOFA_CONFIGURE_ENABLE= libmysofa # network NETWORK_CONFIGURE_ENABLE= network # nvenc NVENC_BUILD_DEPENDS= ffnvcodec-headers>=11.1.5.2:multimedia/ffnvcodec-headers NVENC_CONFIGURE_ENABLE= nvenc # OpenAL OPENAL_LIB_DEPENDS= libopenal.so:audio/openal-soft OPENAL_CONFIGURE_ENABLE= openal # opencl OPENCL_BUILD_DEPENDS= ${LOCALBASE}/include/CL/opencl.h:devel/opencl OPENCL_LIB_DEPENDS= libOpenCL.so:devel/ocl-icd OPENCL_CONFIGURE_ENABLE= opencl # opengl OPENGL_USES= gl OPENGL_USE= GL=gl OPENGL_CONFIGURE_ENABLE= opengl # openh264 OPENH264_LIB_DEPENDS= libopenh264.so:multimedia/openh264 OPENH264_CONFIGURE_ENABLE= libopenh264 # openjpeg OPENJPEG_LIB_DEPENDS= libopenjp2.so:graphics/openjpeg OPENJPEG_CONFIGURE_ENABLE= libopenjpeg # openmpt OPENMPT_LIB_DEPENDS= libopenmpt.so:audio/libopenmpt OPENMPT_CONFIGURE_ENABLE= libopenmpt # openssl/libtls OPENSSL_USES= ssl OPENSSL_CONFIGURE_ENABLE= ${"${SSL_DEFAULT:Mlibressl*}"!="":?libtls:openssl} OPENSSL_IMPLIES= NONFREE # openvino OPENVINO_LIB_DEPENDS= libinference_engine_c_api.so:science/openvino OPENVINO_CONFIGURE_ENABLE= libopenvino # optimizations OPTIMIZED_CFLAGS_CONFIGURE_ENABLE= optimizations # opus OPUS_LIB_DEPENDS= libopus.so:audio/opus OPUS_CONFIGURE_ENABLE= libopus # pocketsphinx POCKETSPHINX_LIB_DEPENDS= libpocketsphinx.so:audio/pocketsphinx POCKETSPHINX_CONFIGURE_ENABLE= pocketsphinx POCKETSPHINX_BROKEN= pocketsphinx < 5prealpha is not supported # pulseaudio PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_CONFIGURE_ENABLE= libpulse # rav1e RAV1E_LIB_DEPENDS= librav1e.so:multimedia/librav1e RAV1E_CONFIGURE_ENABLE= librav1e # rabbitmq RABBITMQ_LIB_DEPENDS= librabbitmq.so:net/rabbitmq-c RABBITMQ_CONFIGURE_ENABLE= librabbitmq # rist RIST_LIB_DEPENDS= librist.so:multimedia/librist RIST_CONFIGURE_ENABLE= librist # rubberband RUBBERBAND_LIB_DEPENDS= librubberband.so:audio/rubberband RUBBERBAND_CONFIGURE_ENABLE= librubberband # rtcpu RTCPU_CONFIGURE_ENABLE= runtime-cpudetect # rtmp LIBRTMP_LIB_DEPENDS= librtmp.so:multimedia/librtmp LIBRTMP_CONFIGURE_ENABLE= librtmp # sdl SDL_USES= sdl SDL_USE= SDL=sdl2 SDL_CONFIGURE_ENABLE= sdl2 # shaderc SHADERC_LIB_DEPENDS= libshaderc_shared.so:graphics/shaderc SHADERC_CONFIGURE_ENABLE= libshaderc SHADERC_PREVENTS= GLSLANG # smbclient SMB_USES= samba:lib SMB_CONFIGURE_ENABLE= libsmbclient SMB_IMPLIES= GPL3 # snappy SNAPPY_LIB_DEPENDS= libsnappy.so:archivers/snappy SNAPPY_CONFIGURE_ENABLE= libsnappy # sndio SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio SNDIO_CONFIGURE_ENABLE= sndio # soxr SOXR_LIB_DEPENDS= libsoxr.so:audio/libsoxr SOXR_CONFIGURE_ENABLE= libsoxr # speex SPEEX_LIB_DEPENDS= libspeex.so:audio/speex SPEEX_CONFIGURE_ENABLE= libspeex # ssh SSH_LIB_DEPENDS= libssh.so:security/libssh SSH_CONFIGURE_ENABLE= libssh # srt SRT_LIB_DEPENDS= libsrt.so:www/srt SRT_CONFIGURE_ENABLE= libsrt # svt-av1 SVTAV1_LIB_DEPENDS= libSvtAv1Enc.so:multimedia/svt-av1 SVTAV1_CONFIGURE_ON= --enable-libsvtav1 # svt-hevc SVTHEVC_LIB_DEPENDS= libSvtHevcEnc.so:multimedia/svt-hevc SVTHEVC_CONFIGURE_ON= --enable-libsvthevc SVTHEVC_PATCH_SITES= https://github.com/OpenVisualCloud/SVT-HEVC/raw/v1.5.1-12-g6cca5b93/ffmpeg_plugin/:svthevc SVTHEVC_PATCHFILES= master-0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch:-p1:svthevc \ 0002-doc-Add-libsvt_hevc-encoder-docs.patch:-p1:svthevc .if make(makesum) .MAKEFLAGS: WITH+=SVTHEVC .endif # svt-vp9 SVTVP9_LIB_DEPENDS= libSvtVp9Enc.so:multimedia/svt-vp9 SVTVP9_CONFIGURE_ON= --enable-libsvtvp9 SVTVP9_PATCH_SITES= https://github.com/OpenVisualCloud/SVT-VP9/raw/v0.3.0-20-gbab25a6/ffmpeg_plugin/:svtvp9 SVTVP9_PATCHFILES= master-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch:-p1:svtvp9 .if make(makesum) .MAKEFLAGS: WITH+=SVTVP9 .endif # tensorflow TENSORFLOW_LIB_DEPENDS= libtensorflow.so:science/py-tensorflow TENSORFLOW_CONFIGURE_ENABLE= libtensorflow # tesseract TESSERACT_LIB_DEPENDS= libtesseract.so:graphics/tesseract TESSERACT_CONFIGURE_ENABLE= libtesseract # theora THEORA_LIB_DEPENDS= libtheora.so:multimedia/libtheora THEORA_CONFIGURE_ENABLE= libtheora # twolame TWOLAME_LIB_DEPENDS= libtwolame.so:audio/twolame TWOLAME_CONFIGURE_ENABLE= libtwolame # uavs3d UAVS3D_LIB_DEPENDS= libuavs3d.so:multimedia/uavs3d UAVS3D_CONFIGURE_ENABLE= libuavs3d # vaapi VAAPI_LIB_DEPENDS= libva.so:multimedia/libva VAAPI_CONFIGURE_ENABLE= vaapi # vapoursynth VAPOURSYNTH_LIB_DEPENDS= libvapoursynth-script.so:multimedia/vapoursynth VAPOURSYNTH_CONFIGURE_ENABLE= vapoursynth # vdpau VDPAU_USES= xorg VDPAU_USE= XORG=x11 VDPAU_LIB_DEPENDS= libvdpau.so:multimedia/libvdpau VDPAU_CONFIGURE_ENABLE= vdpau # vmaf VMAF_LIB_DEPENDS= libvmaf.so:multimedia/vmaf VMAF_CONFIGURE_ENABLE= libvmaf # vo-amrwbenc VO_AMRWBENC_LIB_DEPENDS= libvo-amrwbenc.so:audio/vo-amrwbenc VO_AMRWBENC_CONFIGURE_ENABLE= libvo-amrwbenc VO_AMRWBENC_IMPLIES= GPL3 # vid.stab VIDSTAB_LIB_DEPENDS= libvidstab.so:multimedia/vid.stab VIDSTAB_CONFIGURE_ENABLE= libvidstab # vorbis VORBIS_LIB_DEPENDS= libvorbisenc.so:audio/libvorbis VORBIS_CONFIGURE_ENABLE= libvorbis # vpl VPL_LIB_DEPENDS= libvpl.so:multimedia/onevpl VPL_CONFIGURE_ENABLE= libvpl # vp8 VPX_LIB_DEPENDS= libvpx.so:multimedia/libvpx VPX_CONFIGURE_ENABLE= libvpx # vulkan VULKAN_BUILD_DEPENDS= vulkan-headers>0:graphics/vulkan-headers VULKAN_LIB_DEPENDS= libvulkan.so:graphics/vulkan-loader VULKAN_CONFIGURE_ENABLE= vulkan VULKAN_IMPLIES= ${"${PORT_OPTIONS:MGLSLANG}":?GLSLANG:SHADERC} # webp WEBP_LIB_DEPENDS= libwebp.so:graphics/webp WEBP_CONFIGURE_ENABLE= libwebp # x264 X264_LIB_DEPENDS= libx264.so:multimedia/libx264 X264_CONFIGURE_ENABLE= libx264 # x265 X265_LIB_DEPENDS= libx265.so:multimedia/x265 X265_CONFIGURE_ENABLE= libx265 # xavs2 XAVS2_LIB_DEPENDS= libxavs2.so:multimedia/xavs2 XAVS2_CONFIGURE_ENABLE= libxavs2 # xcb XCB_USES= xorg XCB_USE= XORG=xcb XCB_CONFIGURE_ENABLE= libxcb # xvid XVID_LIB_DEPENDS= libxvidcore.so:multimedia/xvid XVID_CONFIGURE_ENABLE= libxvid # xv XVIDEO_USES= xorg XVIDEO_USE= XORG=x11,xext,xv XVIDEO_CONFIGURE_OFF= --disable-outdev=xv # zimg ZIMG_LIB_DEPENDS= libzimg.so:graphics/sekrit-twc-zimg ZIMG_CONFIGURE_ENABLE= libzimg # zmq ZMQ_LIB_DEPENDS= libzmq.so:net/libzmq${ZMQ_VERSION} ZMQ_CONFIGURE_ENABLE= libzmq ZMQ_VERSION?= 4 # zvbi ZVBI_LIB_DEPENDS= libzvbi.so:devel/libzvbi ZVBI_CONFIGURE_ENABLE= libzvbi # License knobs GPL3_CONFIGURE_ENABLE= version3 GPL3_VARS= LICENSE="GPLv3+ LGPL3+" LICENSE_FILE_GPLv3+ = ${WRKSRC}/COPYING.GPLv3 LICENSE_FILE_LGPL3+ = ${WRKSRC}/COPYING.LGPLv3 NONFREE_CONFIGURE_ENABLE=nonfree INSTALL_TARGET= install-progs install-doc install-data \ install-libs install-headers install-examples DATADIR= ${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX} DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX} MAKE_ENV+= V=1 CFLAGS_armv6= -Wno-error=int-conversion CFLAGS_armv7= -Wno-error=int-conversion CFLAGS_i386= -Wno-error=int-conversion CFLAGS_powerpc= -Wno-error=int-conversion LDFLAGS_aarch64=-Wl,-z,notext LDFLAGS_armv6= -Wl,-z,notext LDFLAGS_armv7= -Wl,-z,notext LDFLAGS_i386= -Wl,-z,notext CONFIGURE_ARGS+=--prefix="${PREFIX}" \ --mandir="${PREFIX}/man" \ --datadir="${DATADIR}" \ --docdir="${DOCSDIR}" \ --pkgconfigdir="${PREFIX}/libdata/pkgconfig" \ --disable-static \ --disable-libcelt \ --enable-shared \ --enable-pic \ --enable-gpl \ --cc="${CC}" \ --cxx="${CXX}" DOC_FILES= Changelog CREDITS INSTALL.md LICENSE.md MAINTAINERS \ README.md RELEASE_NOTES # under doc subdirectory DOC_DOCFILES= APIchanges *.txt PORTDOCS= * .include .if ${PORT_OPTIONS:MNONFREE} LICENSE+= NONFREE LICENSE_COMB= multi LICENSE_NAME_NONFREE= Non free code LICENSE_TEXT_NONFREE= enabling OPENSSL or FDK_AAC restricts redistribution LICENSE_PERMS_NONFREE= auto-accept .endif post-install: (cd ${WRKSRC} && ${COPYTREE_SHARE} \ "${DOC_FILES}" ${STAGEDIR}${DOCSDIR}) (cd ${WRKSRC}/doc && ${COPYTREE_SHARE} \ "${DOC_DOCFILES}" ${STAGEDIR}${DOCSDIR}) .include diff --git a/x11/swayimg/Makefile b/x11/swayimg/Makefile index 120c871b57c7..c7cee9907723 100644 --- a/x11/swayimg/Makefile +++ b/x11/swayimg/Makefile @@ -1,87 +1,87 @@ PORTNAME= swayimg DISTVERSIONPREFIX= v DISTVERSION= 1.12 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11 wayland MAINTAINER= jbeich@FreeBSD.org COMMENT= Image viewer for Sway/Wayland WWW= https://github.com/artemsen/swayimg LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= wayland-protocols>0:graphics/wayland-protocols LIB_DEPENDS= libjson-c.so:devel/json-c \ libwayland-client.so:graphics/wayland \ libfreetype.so:print/freetype2 \ libfontconfig.so:x11-fonts/fontconfig \ libxkbcommon.so:x11/libxkbcommon USES= meson pkgconfig USE_GITHUB= yes GH_ACCOUNT= artemsen MESON_ARGS= -Dversion="${DISTVERSIONFULL}" PLIST_FILES= bin/${PORTNAME} \ man/man1/${PORTNAME}.1.gz \ man/man5/${PORTNAME}rc.5.gz \ share/applications/${PORTNAME}.desktop \ share/icons/hicolor/64x64/apps/${PORTNAME}.png \ ${NULL} # XXX Drop after FreeBSD 13.4 EOL around 2026-01-31 # https://cgit.freebsd.org/src/commit/?id=af93fea71038 .if !exists(/usr/include/sys/timerfd.h) LIB_DEPENDS+= libepoll-shim.so:devel/libepoll-shim .endif OPTIONS_DEFINE= BASH GIF HEIF JPEG JXL LIBEXIF LIBRSVG2 OPENEXR PNG TIFF WEBP ZSH OPTIONS_DEFAULT=BASH GIF HEIF JPEG JXL LIBEXIF LIBRSVG2 OPENEXR PNG TIFF WEBP ZSH OPTIONS_EXCLUDE=${LIBRSVG2_DEFAULT:Mlegacy:C/.+/LIBRSVG2/} BASH_BUILD_DEPENDS= bash-completion>0:shells/bash-completion BASH_MESON_ENABLED= bash BASH_PLIST_FILES= share/bash-completion/completions/${PORTNAME} GIF_LIB_DEPENDS= libgif.so:graphics/giflib GIF_USES= localbase:ldflags GIF_MESON_ENABLED= gif HEIF_LIB_DEPENDS= libheif.so:graphics/libheif HEIF_MESON_ENABLED= heif JPEG_USES= jpeg JPEG_MESON_ENABLED= jpeg JXL_LIB_DEPENDS= libjxl.so:graphics/libjxl JXL_MESON_ENABLED= jxl LIBEXIF_LIB_DEPENDS= libexif.so:graphics/libexif LIBEXIF_MESON_ENABLED= exif LIBRSVG2_USES= gnome LIBRSVG2_USE= GNOME=cairo,librsvg2 LIBRSVG2_MESON_ENABLED= svg OPENEXR_LIB_DEPENDS= libOpenEXR.so:graphics/openexr OPENEXR_MESON_ENABLED= exr PNG_LIB_DEPENDS= libpng.so:graphics/png PNG_MESON_ENABLED= png TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff TIFF_MESON_ENABLED= tiff WEBP_LIB_DEPENDS= libwebpdemux.so:graphics/webp WEBP_MESON_ENABLED= webp ZSH_MESON_ENABLED= zsh ZSH_PLIST_FILES= share/zsh/site-functions/_${PORTNAME} post-patch: # Respect PREFIX for system-wide config @${REINPLACE_CMD} 's,/etc,${PREFIX}&,' \ ${WRKSRC}/extra/${PORTNAME}rc.5 \ ${WRKSRC}/src/config.c .include