From owner-svn-ports-head@freebsd.org Fri Feb 12 19:33:49 2021 Return-Path: Delivered-To: svn-ports-head@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 3681C52E2AA; Fri, 12 Feb 2021 19:33:49 +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 4DckFT0w99z3pHL; Fri, 12 Feb 2021 19:33:49 +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 07AD316C0; Fri, 12 Feb 2021 19:33:49 +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 11CJXmLB010294; Fri, 12 Feb 2021 19:33:48 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 11CJXmpe010293; Fri, 12 Feb 2021 19:33:48 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <202102121933.11CJXmpe010293@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:33:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r565054 - head/multimedia/lives X-SVN-Group: ports-head X-SVN-Commit-Author: tcberner X-SVN-Commit-Paths: head/multimedia/lives X-SVN-Commit-Revision: 565054 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Feb 2021 19:33:49 -0000 Author: tcberner Date: Fri Feb 12 19:33:48 2021 New Revision: 565054 URL: https://svnweb.freebsd.org/changeset/ports/565054 Log: multimedia/lives: use IMAGEMAGICK_DEFAULT Default version handling for Image Magick was introduced in r564968. PR: 253442 Submitted by: VVD (maintainer) Modified: head/multimedia/lives/Makefile Modified: head/multimedia/lives/Makefile ============================================================================== --- head/multimedia/lives/Makefile Fri Feb 12 19:21:42 2021 (r565053) +++ head/multimedia/lives/Makefile Fri Feb 12 19:33:48 2021 (r565054) @@ -3,7 +3,7 @@ PORTNAME= lives DISTVERSION= 3.2.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= multimedia MASTER_SITES= http://lives-video.com/releases/ DISTNAME= LiVES-${PORTVERSION} @@ -52,8 +52,8 @@ DOC_FILES= AUTHORS COPYING COPYING.LGPL ChangeLog FEAT lives-plugins/marcos-encoders/README.multi_encoder \ weed-docs/weedspec.txt weed-docs/weedevents.txt -OPTIONS_DEFINE= ALSA DOCS DOXYGEN DV FFTW FREI0R JACK LIBEXPLAIN LIBVISUAL \ - OGG OPENCV OPTIMIZED_CFLAGS NLS PROJECTM PULSEAUDIO \ +OPTIONS_DEFINE= ALSA DOCS DOXYGEN DV FFTW FREI0R JACK IMAGEMAGICK LIBEXPLAIN \ + LIBVISUAL OGG OPENCV OPTIMIZED_CFLAGS NLS PROJECTM PULSEAUDIO \ SCHROEDINGER THEORA V4L WAYLAND OPTIONS_GROUP= RUNTIME EXT_WIN_CAPTURE MPLAYERS MP3 YOUTUBE_DLX OPTIONS_GROUP_RUNTIME= CDDA2WAV GHOSTSCRIPT LAME MATROSKA MENCODER OGG123 OGM \ @@ -62,13 +62,9 @@ OPTIONS_GROUP_EXT_WIN_CAPTURE= WMCTRL XDOTOOL OPTIONS_GROUP_MP3= MPG123 MPG321 OPTIONS_GROUP_MPLAYERS= MPLAYER MPV OPTIONS_GROUP_YOUTUBE_DLX= YOUTUBE_DL YOUTUBE_DLC -OPTIONS_RADIO= IMAGEMAGICK -OPTIONS_RADIO_IMAGEMAGICK= IMAGEMAGICK6 IMAGEMAGICK7 -OPTIONS_DEFAULT= CDDA2WAV DOCS DV FFTW GHOSTSCRIPT \ - IMAGEMAGICK7 JACK LAME MATROSKA MPG123 \ - MPLAYER NLS OGG OGG123 OGM OPENCV \ - SCHROEDINGER THEORA X264 XDG_SCREENSAVER \ - XDOTOOL XWININFO YOUTUBE_DL +OPTIONS_DEFAULT= CDDA2WAV DOCS DV FFTW GHOSTSCRIPT IMAGEMAGICK JACK LAME \ + MPG123 MPLAYER NLS OGG OGG123 OGM OPENCV SCHROEDINGER \ + THEORA X264 XDG_SCREENSAVER XDOTOOL XWININFO YOUTUBE_DL OPTIONS_SUB= yes ALSA_CONFIGURE_OFF= --disable-alsa @@ -87,12 +83,8 @@ FREI0R_BUILD_DEPENDS= frei0r>0:graphics/frei0r FREI0R_CONFIGURE_OFF= --disable-frei0r FREI0R_RUN_DEPENDS= frei0r>0:graphics/frei0r GHOSTSCRIPT_USES= ghostscript:run -IMAGEMAGICK6_DESC= ${IMAGEMAGICK_DESC} version 6.x -IMAGEMAGICK6_RUN_DEPENDS= convert:graphics/ImageMagick6 \ - composite:graphics/ImageMagick6 -IMAGEMAGICK7_DESC= ${IMAGEMAGICK_DESC} version 7.x -IMAGEMAGICK7_RUN_DEPENDS= convert:graphics/ImageMagick7 \ - composite:graphics/ImageMagick7 +IMAGEMAGICK_RUN_DEPENDS= convert:graphics/ImageMagick${IMAGEMAGICK_DEFAULT} \ + composite:graphics/ImageMagick${IMAGEMAGICK_DEFAULT} JACK_CONFIGURE_OFF= --disable-jack JACK_LIB_DEPENDS= libjack.so:audio/jack \ libjackserver.so:audio/jack