From nobody Sat Feb 08 06:47:19 2025 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 4YqhGb5TgJz5mSL9; Sat, 08 Feb 2025 06:47:19 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YqhGb3y8Bz4HTT; Sat, 08 Feb 2025 06:47:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738997239; 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=Mn3R+I59fdt3uZAwFApYXKRY24jugL8cs3mmsPb8eII=; b=VW3rnPDzwUtitrM/o2zt3qZCUcM+V09AJ4y6AWV1elYnvT3CNgeaDNAiDdKJeFx9Smj7Qi cx2bsbbMwcsqSH9fcJFiWUrbuJpwj4vKAni+dXUqyrSr5KdMLGfqTqxrfi2k5Kvku4r3Q3 wUvt/YKsoZnEaKR+9kQs4G9RJxbGE27hLBAL9mowwJzBj1N6DuZOQX4Tssdan9T7R+bmsQ l+dg77riEtHzkNsmujbpd7fQcI4dFti7BJsbypNkUGiP5vlCnpmMRbvUflXGZSA1S8Yg0T 424GwMd8QlAqMfNyYhE2j0sUHC5TGKIuLen9u7ifQ2ZIT4CMn6LE9a7vcgI5hA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738997239; 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=Mn3R+I59fdt3uZAwFApYXKRY24jugL8cs3mmsPb8eII=; b=lR2TuUtX3DeahncTlVc8G2RNw0yDoVZmbnwSa2h5dox40Tw26dcZojlqZtDL6V74SH2rsX dibtZesM73m5Rz3ftPirsoh62hOKuJve0Dp1FL/r95pmTfU4fyDJ6yqnrmEsVXAcTmB+BX Ppqs8FPzizxgRspjwv7uUMot9YSeukb0gzkHMi7WhzgCY4+dq85Bm/Txnpk1/e5141B9hT GJc59fVJCuDiaI81IUkx+n3+AsAwO3/DY6FiPIQFvPflJT14z2uwfXM+XnWJGW6Ugs/RHq qryuyVpPhH1qTrjsKAEWnuqN/vn+Ot59MS9xPI4kRUJp2PdoCaR7lKejIvDXQA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738997239; a=rsa-sha256; cv=none; b=gdY8/NUCp16645hIHPzRC+tvgV1+6Y8NeP+Cgxsl8DtQcMb9I0uiPIoFp0r9G4PlHeMzu7 NZtTdC0Rakt9KfMrLhENZacQxUTz6v1vNAGzaNVOx1nybO0pz7jU7L1eZZRk/Iqr3V0Oym MR4oVpy3QChdYY5kDd0rpXmqp6FBcXLXOZ+DoBr67A2VkROzEt+mb6Ki3FUssedWG7g7jw Z+W9/6vIkpLod+nhutNP46zX6gohf+tKGgxDOyFEJGxzSa6p1qd847VCkRJ7M8XyV9bhOL Y+y/lf1OE1309Do07fAFTvBSxc1qQaRdn3XKU1lcAzcn97PpF/AiUi2ZU6dIZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YqhGb2wCmz101S; Sat, 08 Feb 2025 06:47:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5186lJGl014171; Sat, 8 Feb 2025 06:47:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5186lJXN014168; Sat, 8 Feb 2025 06:47:19 GMT (envelope-from git) Date: Sat, 8 Feb 2025 06:47:19 GMT Message-Id: <202502080647.5186lJXN014168@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Jason E. Hale" Subject: git: 9526f730d524 - main - multimedia/vlc: Fix build with net/liveMedia >= 2024.11.28 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhale X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9526f730d5241149cfb2f663bb433a8674c226ff Auto-Submitted: auto-generated The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=9526f730d5241149cfb2f663bb433a8674c226ff commit 9526f730d5241149cfb2f663bb433a8674c226ff Author: Jason E. Hale AuthorDate: 2025-02-08 06:43:52 +0000 Commit: Jason E. Hale CommitDate: 2025-02-08 06:43:52 +0000 multimedia/vlc: Fix build with net/liveMedia >= 2024.11.28 access/live555.cpp:542:36: error: cannot initialize a parameter of type 'EventLoopWatchVariable *' (aka 'atomic *') with an rvalue of type 'char *' 542 | p_sys->scheduler->doEventLoop( &p_sys->event_rtsp ); | ^~~~~~~~~~~~~~~~~~ /usr/local/include/UsageEnvironment/UsageEnvironment.hh:155:52: note: passing argument to parameter 'watchVariable' here 155 | virtual void doEventLoop(EventLoopWatchVariable* watchVariable = NULL) = 0; | ^ access/live555.cpp:1444:36: error: cannot initialize a parameter of type 'EventLoopWatchVariable *' (aka 'atomic *') with an rvalue of type 'char *' 1444 | p_sys->scheduler->doEventLoop( &p_sys->event_data ); | ^~~~~~~~~~~~~~~~~~ /usr/local/include/UsageEnvironment/UsageEnvironment.hh:155:52: note: passing argument to parameter 'watchVariable' here 155 | virtual void doEventLoop(EventLoopWatchVariable* watchVariable = NULL) = 0; Reported by: pkg-fallout --- multimedia/vlc/Makefile | 2 +- multimedia/vlc/files/patch-modules_access_live555.cpp | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile index 8e9960fcb5b5..cab05edf8d5c 100644 --- a/multimedia/vlc/Makefile +++ b/multimedia/vlc/Makefile @@ -1,6 +1,6 @@ PORTNAME= vlc DISTVERSION= 3.0.21 -PORTREVISION= 11 +PORTREVISION= 12 PORTEPOCH= 4 CATEGORIES= multimedia audio net www MASTER_SITES= https://get.videolan.org/${PORTNAME}/${DISTVERSION:S/a$//}/ \ diff --git a/multimedia/vlc/files/patch-modules_access_live555.cpp b/multimedia/vlc/files/patch-modules_access_live555.cpp new file mode 100644 index 000000000000..e2cdbce158dd --- /dev/null +++ b/multimedia/vlc/files/patch-modules_access_live555.cpp @@ -0,0 +1,17 @@ +The signature of doEventLoop() was changed to match that of +triggerEvent(), by using std::atomic_char as the 'watch variable' +type in net/liveMedia 2024.11.28. + +--- modules/access/live555.cpp.orig 2024-06-05 15:56:07 UTC ++++ modules/access/live555.cpp +@@ -236,8 +236,8 @@ struct demux_sys_t + bool b_no_data; /* if we never received any data */ + int i_no_data_ti; /* consecutive number of TaskInterrupt */ + +- char event_rtsp; +- char event_data; ++ std::atomic_char event_rtsp; ++ std::atomic_char event_data; + + bool b_get_param; /* Does the server support GET_PARAMETER */ + bool b_paused; /* Are we paused? */