Attachment 222375 Details for Bug 253442 – make respect of IMAGEMAGICK_DEFAULT

[patch] make respect of IMAGEMAGICK_DEFAULT

lives.diff (text/plain), 2.08 KB, created by Vladimir Druzenko on 2021-02-11 21:08:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vladimir Druzenko

Created: 2021-02-11 21:08:44 UTC

Size: 2.08 KB

patch

obsolete

>diff -ur multimedia/lives.orig/Makefile multimedia/lives/Makefile
>--- multimedia/lives.orig/Makefile
>+++ multimedia/lives/Makefile
>@@ -52,8 +52,8 @@
> 		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_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_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

Flags:

vvd: maintainer-approval+

Actions: View | Diff

Attachments on bug 253442: 222375