diff --git a/graphics/ImageMagick6/Makefile b/graphics/ImageMagick6/Makefile index f13cbdb9bdd3..163fd4be0a48 100644 --- a/graphics/ImageMagick6/Makefile +++ b/graphics/ImageMagick6/Makefile @@ -1,365 +1,366 @@ PORTNAME= ImageMagick DISTVERSION= 6.9.12-47 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= graphics perl5 MASTER_SITES= https://www.imagemagick.org/download/ \ https://www.imagemagick.org/download/releases/ \ http://servingzone.com/mirrors/ImageMagick/ \ http://mirror.checkdomain.de/imagemagick/ \ http://imagemagick.spd.co.il/ \ http://www.champground.com/imagemagick/ \ http://ftp.surfnet.nl/pub/ImageMagick/ \ http://mirror.searchdaimon.com/ImageMagick/ \ http://mirror.is.co.za/pub/imagemagick/ \ http://imagemagick.mirrorcatalogs.com/ \ ftp://ftp.imagemagick.org/pub/ImageMagick/ \ ftp://mirror.aarnet.edu.au/pub/imagemagick/ \ ftp://mirror.checkdomain.de/imagemagick/ \ ftp://ftp.kddlabs.co.jp/graphics/ImageMagick/ \ ftp://ftp.u-aizu.ac.jp/pub/graphics/image/ImageMagick/imagemagick.org/ \ ftp://ftp.nluug.nl/pub/ImageMagick/ \ ftp://mirror.searchdaimon.com/ImageMagick/ \ ftp://sunsite.icm.edu.pl/packages/ImageMagick/ \ ftp://ftp.tpnet.pl/pub/graphics/ImageMagick/ \ ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ \ ftp://ftp.is.co.za/pub/imagemagick/ \ ftp://ftp.fifi.org/pub/ImageMagick/ PKGNAMESUFFIX= 6 MAINTAINER= desktop@FreeBSD.org COMMENT= Image processing tools (legacy version) LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libltdl.so:devel/libltdl TESTS_DEPENDS= gsfonts>=0:print/gsfonts PORTSCOUT?= limit:^6\.9\. CONFLICTS_INSTALL= ImageMagick7 ImageMagick7-nox11 # bin/Magick++-config # This port uses .la files, keep libtool:keepla! (magick/module.c) USES= compiler:c++11-lang 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= coder.xml colors.xml delegates.xml log.xml magic.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 HEIF JPEG2000 JBIG JPEG LCMS2 LZMA LQR MODULES \ OPENEXR OPENMP PANGO PDF PERL PNG RAQM SVG TESTS TIFF WEBP WMF \ THREADS X11 16BIT_PIXEL HDRI RAW OPTIONS_DEFAULT= 16BIT_PIXEL BZIP2 FFTW FONTCONFIG FREETYPE \ JPEG2000 JBIG JPEG LCMS2 LZMA LQR MODULES PDF PERL PNG RAQM SVG \ TIFF WEBP WMF THREADS X11 RAW DJVU_DESC= DJVU format support (needs THREADS) GSLIB_DESC= libgs (Postscript SHLIB) support 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 FFMPEG_DESC= Video CODEC support from FFmpeg 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_DESC= ISO/IEC 23008-12:2017 HEIF file format support 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 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 PANGO_IMPLIES= X11 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 SVG_IMPLIES= X11 TIFF_CONFIGURE_WITH= tiff TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff WEBP_CONFIGURE_WITH= webp WEBP_LIB_DEPENDS= libwebp.so:graphics/webp X11_CONFIGURE_WITH= x X11_USES= xorg X11_USE= xorg=ice,sm,x11,xext,xt X11_VARS= CONFLICTS_INSTALL+="ImageMagick6-nox11" X11_VARS_OFF= CONFLICTS_INSTALL+="ImageMagick6" \ PKGNAMESUFFIX=6-nox11 .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:MFFMPEG} BUILD_DEPENDS+= ffmpeg:multimedia/ffmpeg RUN_DEPENDS+= ffmpeg:multimedia/ffmpeg .endif .if ${PORT_OPTIONS:MGSLIB} CONFIGURE_ARGS+= --with-gslib . if ${PORT_OPTIONS:MX11} USES+= ghostscript:x11 . else USES+= ghostscript . endif .else CONFIGURE_ARGS+= --without-gslib .endif # WMF (Windows Meta File) images .if ${PORT_OPTIONS:MWMF} . if ${PORT_OPTIONS:MX11} 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 ${PORT_OPTIONS:MX11} 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:MDOCS} INSTALL_TARGET= install-strip install-docDATA install-data-html .else INSTALL_TARGET= install-strip .endif .if ${PORT_OPTIONS:MTESTS} . if ${PORT_OPTIONS:MX11} 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}/Magick++/lib/ImageMagick++.pc.in \ ${WRKSRC}/magick/ImageMagick.pc.in \ ${WRKSRC}/magick/MagickCore-config.in \ ${WRKSRC}/magick/MagickCore.pc.in \ ${WRKSRC}/wand/Wand.pc.in \ ${WRKSRC}/wand/MagickWand-config.in \ ${WRKSRC}/wand/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 .if ${PORT_OPTIONS:MSVG} && ! ${PORT_OPTIONS:MX11} @${ECHO_CMD} NOTICE: SVG format support disabled, requires X11 .endif post-install: .for i in ${SAMPLE_FILES} @${MV} ${STAGEDIR}${PREFIX}/etc/ImageMagick-6/${i} \ ${STAGEDIR}${PREFIX}/etc/ImageMagick-6/${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/ImageMagick6/files/patch-magick_log.c b/graphics/ImageMagick6/files/patch-magick_log.c new file mode 100644 index 000000000000..932050f2905b --- /dev/null +++ b/graphics/ImageMagick6/files/patch-magick_log.c @@ -0,0 +1,38 @@ +--- magick/log.c.orig 2022-05-05 04:09:18 UTC ++++ magick/log.c +@@ -394,7 +394,7 @@ MagickExport void CloseMagickLog(void) + % const char *GetLogEventMask(void) + % + */ +-MagickExport const LogEventType GetLogEventMask(void) ++MagickExport LogEventType GetLogEventMask(void) + { + ExceptionInfo + *exception; +@@ -515,7 +515,7 @@ static int LogInfoCompare(const void *x,const void *y) + } + #endif + +-MagickExport const LogInfo **GetLogInfoList(const char *pattern, ++MagickExport LogInfo **GetLogInfoList(const char *pattern, + size_t *number_preferences,ExceptionInfo *exception) + { + const LogInfo +@@ -674,7 +674,7 @@ MagickExport char **GetLogList(const char *pattern, + % const char *GetLogName(void) + % + */ +-MagickExport const char *GetLogName(void) ++MagickExport char *GetLogName(void) + { + return(log_name); + } +@@ -1930,7 +1930,7 @@ MagickExport void SetLogMethod(MagickLogMethod method) + % o name: Specifies the new client name. + % + */ +-MagickExport const char *SetLogName(const char *name) ++MagickExport char *SetLogName(const char *name) + { + if ((name != (char *) NULL) && (*name != '\0')) + (void) CopyMagickString(log_name,name,MaxTextExtent); diff --git a/graphics/ImageMagick6/files/patch-magick_log.h b/graphics/ImageMagick6/files/patch-magick_log.h new file mode 100644 index 000000000000..4e34c4d5a40d --- /dev/null +++ b/graphics/ImageMagick6/files/patch-magick_log.h @@ -0,0 +1,20 @@ +--- magick/log.h.orig 2022-05-05 04:04:28 UTC ++++ magick/log.h +@@ -66,14 +66,14 @@ typedef void + extern MagickExport char + **GetLogList(const char *,size_t *,ExceptionInfo *); + +-extern MagickExport const char ++extern MagickExport char + *GetLogName(void) magick_attribute((__pure__)), + *SetLogName(const char *); + +-extern MagickExport const LogEventType ++extern MagickExport LogEventType + GetLogEventMask(void) magick_attribute((__pure__)); + +-extern MagickExport const LogInfo ++extern MagickExport LogInfo + **GetLogInfoList(const char *,size_t *,ExceptionInfo *); + + extern MagickExport LogEventType diff --git a/graphics/ImageMagick6/files/patch-magick_pixel-accessor.h b/graphics/ImageMagick6/files/patch-magick_pixel-accessor.h new file mode 100644 index 000000000000..47fbc0450532 --- /dev/null +++ b/graphics/ImageMagick6/files/patch-magick_pixel-accessor.h @@ -0,0 +1,80 @@ +--- magick/pixel-accessor.h.orig 2022-05-05 04:22:46 UTC ++++ magick/pixel-accessor.h +@@ -103,12 +103,12 @@ extern "C" { + #define SetPixelYellow(pixel,value) ((pixel)->blue=(Quantum) (value)) + #define SetPixelY(pixel,value) ((pixel)->red=(Quantum) (value)) + +-static inline const MagickRealType AbsolutePixelValue(const MagickRealType x) ++static inline MagickRealType AbsolutePixelValue(const MagickRealType x) + { + return(x < 0.0f ? -x : x); + } + +-static inline const Quantum ClampPixel(const MagickRealType value) ++static inline Quantum ClampPixel(const MagickRealType value) + { + if (value < 0.0f) + return((Quantum) 0); +@@ -121,7 +121,7 @@ static inline const Quantum ClampPixel(const MagickRea + #endif + } + +-static inline const double PerceptibleReciprocal(const double x) ++static inline double PerceptibleReciprocal(const double x) + { + double + sign; +@@ -135,7 +135,7 @@ static inline const double PerceptibleReciprocal(const + return(sign/MagickEpsilon); + } + +-static inline const MagickRealType GetPixelLuma( ++static inline MagickRealType GetPixelLuma( + const Image *magick_restrict image,const PixelPacket *magick_restrict pixel) + { + MagickRealType +@@ -147,7 +147,7 @@ static inline const MagickRealType GetPixelLuma( + return(intensity); + } + +-static inline const MagickRealType GetPixelLuminance( ++static inline MagickRealType GetPixelLuminance( + const Image *magick_restrict image,const PixelPacket *magick_restrict pixel) + { + MagickRealType +@@ -165,7 +165,7 @@ static inline const MagickRealType GetPixelLuminance( + return(intensity); + } + +-static inline const MagickBooleanType IsPixelAtDepth(const Quantum pixel, ++static inline MagickBooleanType IsPixelAtDepth(const Quantum pixel, + const QuantumAny range) + { + Quantum +@@ -183,7 +183,7 @@ static inline const MagickBooleanType IsPixelAtDepth(c + return(pixel == quantum ? MagickTrue : MagickFalse); + } + +-static inline const MagickBooleanType IsPixelGray(const PixelPacket *pixel) ++static inline MagickBooleanType IsPixelGray(const PixelPacket *pixel) + { + MagickRealType + green_blue, +@@ -197,7 +197,7 @@ static inline const MagickBooleanType IsPixelGray(cons + return(MagickFalse); + } + +-static inline const MagickBooleanType IsPixelMonochrome( ++static inline MagickBooleanType IsPixelMonochrome( + const PixelPacket *pixel) + { + MagickRealType +@@ -217,7 +217,7 @@ static inline const MagickBooleanType IsPixelMonochrom + return(MagickFalse); + } + +-static inline const Quantum PixelPacketIntensity(const PixelPacket *pixel) ++static inline Quantum PixelPacketIntensity(const PixelPacket *pixel) + { + MagickRealType + intensity; diff --git a/multimedia/lebiniou/Makefile b/multimedia/lebiniou/Makefile index fdd75169e38c..a4ab22a868fd 100644 --- a/multimedia/lebiniou/Makefile +++ b/multimedia/lebiniou/Makefile @@ -1,42 +1,43 @@ PORTNAME= lebiniou DISTVERSION= 3.66.0 +PORTREVISION= 1 CATEGORIES= multimedia graphics MAINTAINER= olivier@biniou.info COMMENT= User-friendly, powerful music visualization / VJing tool LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= v4l_compat>0:multimedia/v4l_compat LIB_DEPENDS= libavutil.so:multimedia/ffmpeg \ libcaca.so:graphics/libcaca \ libfftw3.so:math/fftw3 \ libjack.so:audio/jack \ libsndfile.so:audio/libsndfile \ liborcania.so:devel/orcania \ libyder.so:devel/yder \ libulfius.so:www/ulfius \ libjansson.so:devel/jansson \ liblo.so:audio/liblo \ libasound.so:audio/alsa-lib \ libpulse.so:audio/pulseaudio \ libsndio.so:audio/sndio \ libsndfile.so:audio/libsndfile \ libfreetype.so:print/freetype2 RUN_DEPENDS= v4l_compat>0:multimedia/v4l_compat \ ${LOCALBASE}/share/lebiniou/vue/index.html:multimedia/lebiniou-data USES= autoreconf gnome magick:6 sdl USE_GNOME= glib20 USE_SDL= sdl2 USE_LDCONFIG= YES USE_GITLAB= YES GL_ACCOUNT= lebiniou GL_COMMIT= 2049ce3d9ee5f860fb6a5d516c4af797f4669b58 GNU_CONFIGURE= YES INSTALLS_ICONS= YES .include