From owner-svn-ports-all@freebsd.org Fri Feb 12 19:21:42 2021 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9BF1052DD49; Fri, 12 Feb 2021 19:21:42 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DcjzV41XLz3nLL; Fri, 12 Feb 2021 19:21:42 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 71EDE1463; Fri, 12 Feb 2021 19:21:42 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 11CJLgRc002821; Fri, 12 Feb 2021 19:21:42 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 11CJLgPA002820; Fri, 12 Feb 2021 19:21:42 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <202102121921.11CJLgPA002820@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Fri, 12 Feb 2021 19:21:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r565053 - head/multimedia/libxine X-SVN-Group: ports-head X-SVN-Commit-Author: tcberner X-SVN-Commit-Paths: head/multimedia/libxine X-SVN-Commit-Revision: 565053 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Feb 2021 19:21:42 -0000 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 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}