svn commit: r565053 - head/multimedia/libxine

[Tobias C. Berner]

Author: tcberner
Date: Fri Feb 12 19:21:42 2021
New Revision: 565053
URL: https://svnweb.freebsd.org/changeset/ports/565053

Log:
  multimedia/libxine: use IMAGEMAGICK_DEFAULT
  
  Default version handling for Image Magick was introduced in r564968.
  
  PR:		253443
  Submitted by:	VVD <vvd at unislabs.com>

Modified:
  head/multimedia/libxine/Makefile

Modified: head/multimedia/libxine/Makefile
==============================================================================
--- head/multimedia/libxine/Makefile	Fri Feb 12 19:02:11 2021	(r565052)
+++ head/multimedia/libxine/Makefile	Fri Feb 12 19:21:42 2021	(r565053)
@@ -3,6 +3,7 @@
 
 PORTNAME=	xine
 DISTVERSION=	1.2.11
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-lib/${PORTVERSION}
 PKGNAMEPREFIX=	lib
@@ -66,23 +67,19 @@ PLUGINSDIR=	lib/xine/plugins/2.9
 PLIST_SUB=	PLUGINSDIR="${PLUGINSDIR}"
 
 OPTIONS_DEFINE=		AALIB ALSA AOM CACA DAV1D DOCS DMX_IMAGE DVB GNOMEVFS2 \
-			IPV6 JACK LIBBLURAY NFS NLS PIXBUF PULSEAUDIO SDL SFTP \
-			SMB SNDIO V4L VAAPI WAVPACK WAYLAND XVMC
+			IMAGEMAGICK IPV6 JACK LIBBLURAY NFS NLS PIXBUF PULSEAUDIO \
+			SDL SFTP SMB SNDIO V4L VAAPI WAVPACK WAYLAND XVMC
 OPTIONS_DEFAULT=	DVB OPENSSL PIXBUF VAAPI
 OPTIONS_DEFINE_i386=	W32DLL
 OPTIONS_DEFAULT_i386=	W32DLL
 OPTIONS_GROUP=		TLS
 OPTIONS_GROUP_TLS=	GNUTLS OPENSSL
-OPTIONS_RADIO=		IMAGEMAGICK
-OPTIONS_RADIO_IMAGEMAGICK=IMAGEMAGICK6 IMAGEMAGICK7
 OPTIONS_SUB=		yes
 
 AOM_DESC=		Enable libaom AV1 decoder support
 DAV1D_DESC=		Enable dav1d AV1 decoder support
 DMX_IMAGE_DESC=		DMX image plugin
 DVB_DESC=		DVB plugin
-IMAGEMAGICK6_DESC=	${IMAGEMAGICK_DESC} version 6.x
-IMAGEMAGICK7_DESC=	${IMAGEMAGICK_DESC} version 7.x
 NFS_DESC=		Enable NFS support using libnfs
 SDL_DESC=		Enable support for SDL 1 video output
 SFTP_DESC=		Enable SFTP support using libssh2
@@ -106,14 +103,9 @@ GNOMEVFS2_USE=			GNOME=glib20,gconf2,gnomevfs2
 GNOMEVFS2_CONFIGURE_ENABLE=	gnomevfs
 GNUTLS_LIB_DEPENDS=		libgnutls.so:security/gnutls
 GNUTLS_CONFIGURE_ON=		--enable-tls
-IMAGEMAGICK_CONFIGURE_ON=	--with-imagemagick
+IMAGEMAGICK_LIB_DEPENDS=	libMagickWand-${IMAGEMAGICK_DEFAULT}.so:graphics/ImageMagick${IMAGEMAGICK_DEFAULT}
+IMAGEMAGICK_CONFIGURE_WITH=	imagemagick
 IMAGEMAGICK_IMPLIES=		DMX_IMAGE
-IMAGEMAGICK6_LIB_DEPENDS=	libMagickWand-6.so:graphics/ImageMagick6
-IMAGEMAGICK6_CONFIGURE_ON=	${IMAGEMAGICK_CONFIGURE_ON}
-IMAGEMAGICK6_IMPLIES=		${IMAGEMAGICK_IMPLIES}
-IMAGEMAGICK7_LIB_DEPENDS=	libMagickWand-7.so:graphics/ImageMagick7
-IMAGEMAGICK7_CONFIGURE_ON=	${IMAGEMAGICK_CONFIGURE_ON}
-IMAGEMAGICK7_IMPLIES=		${IMAGEMAGICK_IMPLIES}
 IPV6_CONFIGURE_ENABLE=		ipv6
 JACK_LIB_DEPENDS=		libjack.so:audio/jack
 JACK_CONFIGURE_WITH=		jack
@@ -170,13 +162,6 @@ XVMC_CONFIGURE_ENABLE=		xvmc
 
 .if ${ARCH} == aarch64
 BUILD_DEPENDS+=	as:devel/binutils
-.endif
-
-.if ${PORT_OPTIONS:MIMAGEMAGICK6} || ${PORT_OPTIONS:MIMAGEMAGICK7}
-PLIST_SUB+=		IMAGEMAGICK=""
-.else
-CONFIGURE_ARGS+=	--without-imagemagick
-PLIST_SUB+=		IMAGEMAGICK="@comment "
 .endif
 
 .if !${PORT_OPTIONS:MGNUTLS} && !${PORT_OPTIONS:MOPENSSL}