From nobody Sat Mar 2 18:36:04 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TnDDj0Mjmz5CkBt; Sat, 2 Mar 2024 18:36:05 +0000 (UTC) (envelope-from git@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 4TnDDh6vZdz4MnJ; Sat, 2 Mar 2024 18:36:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709404565; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bfWi48ZscVttxSXfE2QgriXAT4qH8N7zVTLTUX7qc7Y=; b=J/+Ek8oxB9LPPpWzAUngtNIyoziP+0M+Q2VtV6UNbpA/yyjv6AsbJHiFalqmVpjclYTz3S v0d3fhREhhJDcx6Ufqqg7ghNPFNq8HNAIbID/7mu/EgxISxvMlJPgR8NJ8Cq/oUUIH7Ozk KxVkaRdhzFLuLf2Aw+AV9rzofOTC28rW3DKF9x0juOY9/XiZ6NfKqR0ecVGMR9zd5PlqX9 C+b6D+Rgk84+tQpFLP/w0UtlSl8//E1thvy3lG/dD8G0SxEqB9P3DUiIWCUAou9es+Et3b 2oIXWt8M0k7bh50nlZygv7J5ZRK+4yf/dgYRATmeiaxdk5hAtaL0Rygl0OhxTQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709404565; a=rsa-sha256; cv=none; b=hkbgKR6plIBPdN34YdCNyC87YpibJB22P1TxDyjg2NunXV03WjJlg2Y8tUWup90QJNJsj2 3KPWVvx6p2vlTbZugdZUjrq4+j6tczx3yrzA6mHyHKI1mtOAW1bj2GfpjA9yEwpDOaVzrR 0egGQpoiyxLV6F6b90M2cr0bKyxa4yU7aj76qf5z5UY3al4uOccmlMzKbJV8cLyhlrU8zb Hn3XYVBmWzEK0EZrP4UR+EAAXbpvblWDXMunDj+bxq4d+XidEqE72+6WrTmn1rQKqBy5ec 0m2+ecBuBCkAOE6odili6IUXDeypcBYt37G2uYxOta2LypeFIE1or3b7UCAuZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709404565; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bfWi48ZscVttxSXfE2QgriXAT4qH8N7zVTLTUX7qc7Y=; b=E19wqYldMZw5jcTi5T4mfVZ2PW+Ps9CxXQUnxXrNrgVT4uOzvykIhOwriAL0Kp/TdQbwSt IvjHgw6cYIUL/+oYeSv8WBMLFFRuVapSeM/d6maOt3tqzp8WXXbfswcmyx7XOcHO5f9m6a Fd8NIqJkOzAipnVJmGD5p1ylkZfocbj8s3l3JUWrf3u2dA7a7S50iKIcGBxwn+MfgkLtkn hHsZzc3PTsu/akK6PAuTctgVGNFuoBUFGsV5TvHfivwKgvBx4iVXCTVvaJOxjxzJbdxx/K 5dOcy2FEqWRABIvL9z8ERMiG0g1S9cAZNdbF7JR65tsFt7Aemp74/UZIDsiz9A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TnDDh6Vjzz1L6L; Sat, 2 Mar 2024 18:36:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 422Ia4Zp021757; Sat, 2 Mar 2024 18:36:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 422Ia4o2021754; Sat, 2 Mar 2024 18:36:04 GMT (envelope-from git) Date: Sat, 2 Mar 2024 18:36:04 GMT Message-Id: <202403021836.422Ia4o2021754@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Thomas Zander Subject: git: a995b8b0ab54 - main - multimedia/{mplayer/mencoder}: Move DEBUG from OPTIONS to WITH_DEBUG List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: riggs X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a995b8b0ab54b250167531dafc38fc1342558446 Auto-Submitted: auto-generated The branch main has been updated by riggs: URL: https://cgit.FreeBSD.org/ports/commit/?id=a995b8b0ab54b250167531dafc38fc1342558446 commit a995b8b0ab54b250167531dafc38fc1342558446 Author: Thomas Zander AuthorDate: 2024-03-02 10:26:32 +0000 Commit: Thomas Zander CommitDate: 2024-03-02 18:36:02 +0000 multimedia/{mplayer/mencoder}: Move DEBUG from OPTIONS to WITH_DEBUG Details: This is a revert of c1e0f931e3ddecb86d83ffc14cb8b05a38922cdd plus removing the DEBUG OPTION from mencoder as well, following the trend to phase out DEBUG as an option. --- multimedia/mencoder/Makefile | 2 +- multimedia/mplayer/Makefile | 2 +- multimedia/mplayer/Makefile.options | 4 ++++ multimedia/mplayer/Makefile.optvars | 2 -- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/multimedia/mencoder/Makefile b/multimedia/mencoder/Makefile index 30a7b88d3e2a..659d30b6ee48 100644 --- 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 index 126cfd597a82..b9d91327e2c4 100644 --- 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 index ebb2a84d0987..fd2ec8e9c602 100644 --- 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 index 110814732ad7..49b139d7a4a8 100644 --- 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