From nobody Sun Aug 7 14:26:37 2022 X-Original-To: dev-commits-ports-branches@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 4M11qL0ZS3z4Y3r4; Sun, 7 Aug 2022 14:26:38 +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 4M11qK74J2z3ZMX; Sun, 7 Aug 2022 14:26:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659882398; 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=k/tuBhD5ZpxZbdkMNCeMAYtnOT72NdNFJKut/O3d3ZA=; b=fdQRfNmp70D3nPxU8PlMA4+XCivYrVEJ48oTGjKxjvpVXCU/Exduqrb1bvUPnWkuzBsmhP oNfRkjOtQR7i5eg/1P+9V5atQLr78Qr2w62SnsxHleWSWqaFxjOOE3IEBsjXSs5iB0fhji MopdePCJq5PyoglXPQJzXo1Lxmk7zVYchsL71yvAPM/bJIbFLO0Zhd/uNMoHwBd+Ngdhgg eDstkyWU+5P0jNorLAuzIGv4+6FkPjXGfmN3MH/arWi8l3jn52McYOhPXRqiyna5criBt8 /PVSW0iiV4dwAmkHUayP3pjM6i9f3I6izplKI2TzHuL15A7+frAVDxDcDT+Z+w== 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 4M11qK5tcKzG7P; Sun, 7 Aug 2022 14:26:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 277EQbku060231; Sun, 7 Aug 2022 14:26:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 277EQbwm060230; Sun, 7 Aug 2022 14:26:37 GMT (envelope-from git) Date: Sun, 7 Aug 2022 14:26:37 GMT Message-Id: <202208071426.277EQbwm060230@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Thomas Zander Subject: git: 3ecd18593d24 - 2022Q3 - multimedia/{mplayer|mencoder}: Fix stage-qa warnings List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@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/2022Q3 X-Git-Reftype: branch X-Git-Commit: 3ecd18593d247445a95b024cb4c7f3f9f84cc9e4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659882398; 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=k/tuBhD5ZpxZbdkMNCeMAYtnOT72NdNFJKut/O3d3ZA=; b=VH18+KuqW+jpu4m4LCd2etClW1uXtwY0/IH+HqViUIfnqh2Q5FBwNxJetgC4ivInCahN0Y +6fQpUUMVkQM82eiFjZjYH4S1ffpzneuhEDe7QAAJPDz8j/eiLle1mUB/DRiSfdyxC6f6I zyr9dAyF15JC4QHgBhMGoY+Kxy5/Ej54/E/BOGMFxsrpryaowuPZOBBgHIn+P9dvKHwxH5 AXDV0CTebHeVSTZLUvAVJ7D6mxhz6ruLA1HYSf/KRxE/q02SrawcNH/QtFPxDWzRrpOghH noswf3SKO9FdTgQzDJHQaM9TmpM30HQ+ExGeN4D6cdOMUMtHt3mc4uCLNlLVXA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659882398; a=rsa-sha256; cv=none; b=SRtWliI8Ol7BggplVmBINlbMOEbV+fFU6tw5YFox96GPVVh7REPE6zYkSwqYjbgmSE+EcS L+6bO1GFBVyL+9w5mw7ztEYmsCUDoaz4JpWPiTDCfjiBhXPNYC5YF+twMjTuEWaemCZV60 ofYlHby4eK/bFvgr+0NwobZ9i38mQcPk7SAhExZANfhNow/v1bwaCURbsA9Ep9IRhCdtAQ 2a8osxs55eRh/co6598vDCkpU0a99k8TtSLX/eviBDs6MgMqyHOpdkdmtVE2yisVar9c9Y qPZ34VRJieZ/4iP3ZwOw9pztSpCSdZ0bGOaPeTiRhP8lOUAWD0lF3lV1EvcNBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q3 has been updated by riggs: URL: https://cgit.FreeBSD.org/ports/commit/?id=3ecd18593d247445a95b024cb4c7f3f9f84cc9e4 commit 3ecd18593d247445a95b024cb4c7f3f9f84cc9e4 Author: Thomas Zander AuthorDate: 2022-08-07 12:11:20 +0000 Commit: Thomas Zander CommitDate: 2022-08-07 12:56:16 +0000 multimedia/{mplayer|mencoder}: Fix stage-qa warnings Details: - Rework dependencies to fix stage-qa warnings, at least for the default packages and a couple configs tested. - Add JPEG OPTION to allow to actually disable it (as it is picked up automatically in most systems via build dependencies, even if the user does not want to include it). PR: 256994 Reported by: bsd@philippost.de MFH: 2022Q3 (cherry picked from commit 381fe1e14c076068b8a4f14f11db176dc683b668) --- multimedia/mencoder/Makefile | 5 +++-- multimedia/mplayer/Makefile | 3 ++- multimedia/mplayer/Makefile.optvars | 16 +++++++++++----- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/multimedia/mencoder/Makefile b/multimedia/mencoder/Makefile index 2df6b5c12581..452b71c42ce0 100644 --- a/multimedia/mencoder/Makefile +++ b/multimedia/mencoder/Makefile @@ -2,6 +2,7 @@ PORTNAME= mencoder PORTVERSION= ${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g} +PORTREVISION= 1 CATEGORIES= multimedia audio MAINTAINER= riggs@FreeBSD.org @@ -10,12 +11,12 @@ COMMENT= Convenient video file and movie encoder .include "${.CURDIR}/../mplayer/Makefile.common" OPTIONS_DEFINE= AMR_NB AMR_WB ASS BLURAY CDIO DEBUG DV DVDNAV FAAC FONTCONFIG \ - FRIBIDI GIF GNUTLS GSM IPV6 JACK LADSPA LIBMNG LZO \ + FRIBIDI GIF GNUTLS GSM IPV6 JACK JPEG LADSPA LIBMNG LZO \ MAD NAS NLS OPENAL OPENJPEG OPUS PULSEAUDIO \ RTMP SMB SPEEX THEORA TWOLAME V4L VPX \ X264 XVID -OPTIONS_DEFAULT=ASS DVDNAV FONTCONFIG GIF GNUTLS X264 XVID +OPTIONS_DEFAULT=ASS DVDNAV FONTCONFIG GIF GNUTLS JPEG X264 XVID OPTIONS_DEFINE_i386= RTCPU OPTIONS_DEFINE_amd64= RTCPU diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile index 09ddd828f6a4..5e3e03192af6 100644 --- a/multimedia/mplayer/Makefile +++ b/multimedia/mplayer/Makefile @@ -2,6 +2,7 @@ PORTNAME= mplayer PORTVERSION= ${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g} +PORTREVISION= 1 CATEGORIES= multimedia audio MAINTAINER= riggs@FreeBSD.org @@ -11,7 +12,7 @@ COMMENT= High performance media player supporting many formats OPTIONS_DEFINE= AALIB AMR_NB AMR_WB ASS BLURAY CACA CDIO DV DVDNAV \ ENCA FONTCONFIG FRIBIDI GIF GNUTLS GSM GUI IPV6 JACK \ - LADSPA LIBMNG LIRC LZO NAS NLS OPENAL OPENGL \ + JPEG LADSPA LIBMNG LIRC LZO NAS NLS OPENAL OPENGL \ OPENJPEG OPUS PULSEAUDIO RTMP \ SDL SKINS SNDIO SMB SPEEX SVGALIB V4L VDPAU VPX \ X11 X11DGA X11VM XINERAMA XVIDEO XVMC diff --git a/multimedia/mplayer/Makefile.optvars b/multimedia/mplayer/Makefile.optvars index 6beab30a82e3..49b139d7a4a8 100644 --- a/multimedia/mplayer/Makefile.optvars +++ b/multimedia/mplayer/Makefile.optvars @@ -11,7 +11,8 @@ AMR_NB_CONFIGURE_ENABLE=libopencore_amrnb AMR_WB_LIB_DEPENDS= libopencore-amrwb.so:audio/opencore-amr AMR_WB_CONFIGURE_ENABLE=libopencore_amrwb -ASS_LIB_DEPENDS= libass.so:multimedia/libass +ASS_LIB_DEPENDS= libass.so:multimedia/libass \ + libharfbuzz.so:print/harfbuzz ASS_CONFIGURE_OFF= --disable-ass BLURAY_LIB_DEPENDS= libbluray.so:multimedia/libbluray @@ -26,7 +27,8 @@ CDIO_CONFIGURE_OFF= --disable-libcdio DV_LIB_DEPENDS= libdv.so:multimedia/libdv DV_CONFIGURE_ENABLE= libdv -DVDNAV_LIB_DEPENDS= libdvdnav.so:multimedia/libdvdnav +DVDNAV_LIB_DEPENDS= libdvdnav.so:multimedia/libdvdnav \ + libdvdread.so:multimedia/libdvdread DVDNAV_CONFIGURE_OFF= --disable-dvdnav ENCA_LIB_DEPENDS= libenca.so:converters/enca @@ -51,16 +53,19 @@ GSM_LIB_DEPENDS= libgsm.so:audio/gsm GSM_CONFIGURE_OFF= --disable-libgsm GUI_CONFIGURE_ENABLE= gui -GUI_USE= GNOME=gtk20 +GUI_USE= GNOME=cairo,gdkpixbuf2,gtk20 GUI_USES= gnome GUI_DESKTOP_ENTRIES= "MPlayer" "High performance media player" "mplayer" "gmplayer" "" false -GUI_IMPLIES= ASS X11 +GUI_IMPLIES= ASS JPEG X11 IPV6_CONFIGURE_OFF= --disable-inet6 JACK_LIB_DEPENDS= libjack.so:audio/jack JACK_CONFIGURE_OFF= --disable-jack +JPEG_USES= jpeg +JPEG_CONFIGURE_OFF= --disable-jpeg + LADSPA_RUN_DEPENDS= ${LOCALBASE}/lib/ladspa/amp.so:audio/ladspa LADSPA_CONFIGURE_OFF= --disable-ladspa @@ -122,7 +127,8 @@ SPEEX_CONFIGURE_OFF= --disable-speex SVGALIB_LIB_DEPENDS= libvga.so:graphics/svgalib SVGALIB_CONFIGURE_OFF= --disable-svga -THEORA_LIB_DEPENDS= libtheora.so:multimedia/libtheora +THEORA_LIB_DEPENDS= libtheora.so:multimedia/libtheora \ + libogg.so:audio/libogg THEORA_CONFIGURE_OFF= --disable-theora TWOLAME_LIB_DEPENDS= libtwolame.so:audio/twolame