From nobody Wed Dec 27 15:15:23 2023 X-Original-To: dev-commits-ports-main@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 4T0Zvb6Z0xz55nls; Wed, 27 Dec 2023 15:15:23 +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 4T0Zvb65HZz3K3G; Wed, 27 Dec 2023 15:15:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703690123; 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=kisWohLV1v5CVry5ME94VBscHv8GzwipoZWnlSCYNU4=; b=sUhqiEvM8X/PMziKrL118cJjh9miG068VUggAJy+xAxjGBis8IRJR9KW0fEOGpT6yuJjw2 Y/vmKf1YxRz8wqYmRdEYkoaOW2J9IdUxFQulr+mzO/7trnnvnTmWLPWz8iMwuv4OjNkiGF kyfkk5qjQlkadGAK6PKJEWYOx3aDY6E1Exfpla+EJO43HIxbGaTa2kBXsYEo+rtxfggnpE KhYYbndn8XIU/DBnS65ccuzlLk06RXR6TaEtbEBcHfnznuCnEJey+kYwUI5Dkaa8NSNbEK hBQJSbzFX1fOvi8EYSDSVol6EznzJ3+DMJArZdGKDlDii/9xFDYpwln11InRjA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703690123; a=rsa-sha256; cv=none; b=rNKXAQkTsYv90tBjozp0DyZi0/zrxZNTvGz42fqFp8uBiRS00iICu4dAlzOqv0KxpM4k8m QHKbrx7CgVnlUYK/OH5x3HyOLEEs8r8+OV/i9vR26iVVZW++uefySBlwNshcwq/hQEqZj1 MsUvGXtiAN5KBwYi5F/UNNG1R34zne35Y7DOerNkQPfvZ3v1Q4T0ZePyXBlRxPKo8otHWT w20djgHaR1MiXS3SFopNkek99ZOIBXLKVQUvK6eAJb2B4ul3HFyoK5lAJJUXS+NJetjJf9 JnCh0Egpxrj5e5rG01NlaJxC/N29WKpes1tODDcvxYniJEv393GPa3eFb1mX0w== 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=1703690123; 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=kisWohLV1v5CVry5ME94VBscHv8GzwipoZWnlSCYNU4=; b=v2KSyesUgJLHRf0zHVbXrhqfB46ncOK6IzxsV8leKaMGxKGcdVWMwrz7NjlGQMa/ovef5p rquKlC9cKwUF25634p4ORmfhuanfdbciiV2tDvEY+o933gCD+pnmLO9xi9EOB3juPgRtLF NP23jz34HQt9i1gFZaMpe2yK2aeJIX9RiyjN7UUVOLJJhoCmbg0mHupdA4YyYoLfX8DVG5 RWZdogrAeVPrTk3gWFziDxxSzxCDn6JB5pRoIohI9IKi4gjpDaQGXF1k1aEInGwoMl15i0 0BMWClCGAh/reuYF6Og+Cyyp3ttj/55HgwjgOyrAD/P+CRmDHPYfi6bOK6r7Uw== 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 4T0Zvb5BC0zkRP; Wed, 27 Dec 2023 15:15:23 +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 3BRFFNCK047925; Wed, 27 Dec 2023 15:15:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BRFFNd8047922; Wed, 27 Dec 2023 15:15:23 GMT (envelope-from git) Date: Wed, 27 Dec 2023 15:15:23 GMT Message-Id: <202312271515.3BRFFNd8047922@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Vladimir Druzenko Subject: git: 96a9498e4753 - main - multimedia/vlc: fix build with CHROMECAST ON and devel/protobuf 24 and fix plist error if QT5 is ON and xext,xinerama,xpm installed List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 96a9498e4753107d04013305f509ac8a0dc79351 Auto-Submitted: auto-generated The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=96a9498e4753107d04013305f509ac8a0dc79351 commit 96a9498e4753107d04013305f509ac8a0dc79351 Author: Vladimir Druzenko AuthorDate: 2023-12-27 15:06:33 +0000 Commit: Vladimir Druzenko CommitDate: 2023-12-27 15:14:57 +0000 multimedia/vlc: fix build with CHROMECAST ON and devel/protobuf 24 and fix plist error if QT5 is ON and xext,xinerama,xpm installed 1. Non default option CHROMECAST require devel/protobuf. After this commit https://cgit.freebsd.org/ports/commit/?id=69e2e87fa56b54e267429b326f7f6188a7baaa71 consumers require USE_CXXSTD=c++17. 2. There is default ON configure option "skins2" in vlc. It require QT5 and xext,xinerama,xpm - if they installed then it build bin/svlc and it is in stage after build. Added option SKINS default OFF to handle bin/svlc. Approved by: arrowd (mentor) Differential Revision: https://reviews.freebsd.org/D43128 --- multimedia/vlc/Makefile | 9 ++++++++- multimedia/vlc/pkg-plist | 1 + 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile index 0d12ef199451..7242e09200a0 100644 --- a/multimedia/vlc/Makefile +++ b/multimedia/vlc/Makefile @@ -74,7 +74,7 @@ OPTIONS_DEFINE= A52 AALIB AOM ASS AVAHI CACA CHROMECAST DAV1D DBUS DCA DOCS DVDR LIVEMEDIA LUA MAD MFX MODPLUG MPEG2 MTP MUSEPACK \ NCURSES NFS NLS NOTIFY OGG OGGSPOTS OPTIMIZED_CFLAGS OPUS PNG PULSEAUDIO \ QT5 REALRTSP RUNROOT SAMPLERATE SIDPLAY \ - SDL SHOUTCAST SMB SNDIO STREAM SPEEX TAGLIB THEORA \ + SDL SHOUTCAST SKINS SMB SNDIO STREAM SPEEX TAGLIB THEORA \ TWOLAME UPNP V4L VAAPI VCD VDPAU VPX VORBIS WAYLAND X11 X264 X265 ZVBI OPTIONS_DEFINE_powerpc= ALTIVEC OPTIONS_DEFINE_powerpc64= ALTIVEC @@ -106,6 +106,7 @@ OGGSPOTS_DESC= Experimental OggSpots codec REALRTSP_DESC= Real RTSP access module RUNROOT_DESC= Enable running as root SIDPLAY_DESC= C64 sid demux support +SKINS_DESC= Build skins2 interface module (implies QT5) STREAM_DESC= stream output TAGLIB_DESC= ID3 tag and Ogg comment support VCD_DESC= Audio/Video CD support @@ -135,6 +136,7 @@ CACA_CONFIGURE_ENABLE= caca CHROMECAST_LIB_DEPENDS= libprotobuf-lite.so:devel/protobuf CHROMECAST_CONFIGURE_ENABLE= chromecast +CHROMECAST_USE= cxxstd=c++17 DAV1D_LIB_DEPENDS= libdav1d.so:multimedia/dav1d DAV1D_CONFIGURE_ENABLE= dav1d @@ -300,6 +302,11 @@ CONFIGURE_ARGS+= --disable-sid SHOUTCAST_LIB_DEPENDS= libshout.so:audio/libshout SHOUTCAST_CONFIGURE_ENABLE= shout +SKINS_USE= XORG=xext,xinerama,xpm +SKINS_USES= xorg +SKINS_CONFIGURE_ENABLE= skins2 +SKINS_IMPLIES= QT5 + SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio SNDIO_CONFIGURE_ENABLE= sndio diff --git a/multimedia/vlc/pkg-plist b/multimedia/vlc/pkg-plist index 1fdcf86b45af..4b4388bacfdd 100644 --- a/multimedia/vlc/pkg-plist +++ b/multimedia/vlc/pkg-plist @@ -2,6 +2,7 @@ bin/cvlc %%NCURSES%%bin/nvlc %%QT5%%bin/qvlc bin/rvlc +%%SKINS%%bin/svlc bin/vlc bin/vlc-wrapper include/vlc/deprecated.h