multimedia/{mplayer/mencoder}: Move DEBUG from OPTIONS to WITH_DEBUG

Details: This is a revert of c1e0f93 plus removing the DEBUG OPTION from mencoder as well, following the trend to phase out DEBUG as an option.
freebsd · Mar 2, 2024 · a995b8b · a995b8b
1 parent 12b1194
commit a995b8b
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/multimedia/mencoder/Makefile b/multimedia/mencoder/Makefile
@@ -8,7 +8,7 @@ WWW=		http://www.mplayerhq.hu/
 
 .include "${.CURDIR}/../mplayer/Makefile.common"
 
-OPTIONS_DEFINE=	AMR_NB AMR_WB ASS BLURAY CDIO DEBUG DV DVDNAV FAAC FONTCONFIG \
+OPTIONS_DEFINE=	AMR_NB AMR_WB ASS BLURAY CDIO DV DVDNAV FAAC FONTCONFIG \
 		FRIBIDI GIF GNUTLS GSM IPV6 JACK JPEG LADSPA LIBMNG LZO \
 		MAD NAS NLS OPENAL OPENJPEG OPUS PULSEAUDIO \
 		RTMP SMB SPEEX THEORA TWOLAME V4L VPX \

diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile
@@ -8,7 +8,7 @@ WWW=		http://www.mplayerhq.hu/
 
 .include "${.CURDIR}/../../multimedia/mplayer/Makefile.common"
 
-OPTIONS_DEFINE=	AALIB AMR_NB AMR_WB ASS BLURAY CACA CDIO DEBUG DV DVDNAV \
+OPTIONS_DEFINE=	AALIB AMR_NB AMR_WB ASS BLURAY CACA CDIO DV DVDNAV \
 		ENCA FONTCONFIG FRIBIDI GIF GNUTLS GSM GUI IPV6 JACK \
 		JPEG LADSPA LIBMNG LIRC LZO NAS NLS OPENAL OPENGL \
 		OPENJPEG OPUS PULSEAUDIO RTMP \

diff --git a/multimedia/mplayer/Makefile.options b/multimedia/mplayer/Makefile.options
@@ -57,6 +57,10 @@ CFLAGS+=	-no-integrated-as
 CONFIGURE_ARGS+=	--enable-altivec
 .endif
 
+.if defined(WITH_DEBUG)
+CONFIGURE_ARGS+=	--enable-debug=3
+.endif
+
 LDFLAGS_i386+=	-Wl,-z,notext
 
 # Win32 DLL codecs support on i386, mostly superseded by ffmpeg

diff --git a/multimedia/mplayer/Makefile.optvars b/multimedia/mplayer/Makefile.optvars
@@ -24,8 +24,6 @@ CACA_CONFIGURE_OFF=	--disable-caca
 CDIO_LIB_DEPENDS=	libcdio_paranoia.so:sysutils/libcdio-paranoia
 CDIO_CONFIGURE_OFF=	--disable-libcdio
 
-DEBUG_CONFIGURE_ON=	--enable-debug=3
-
 DV_LIB_DEPENDS=		libdv.so:multimedia/libdv
 DV_CONFIGURE_ENABLE=	libdv