From nobody Thu Oct 07 12:44:32 2021 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 C23D012D928F; Thu, 7 Oct 2021 12:44:32 +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 4HQ9xr3znNz4tTc; Thu, 7 Oct 2021 12:44:32 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 6A09613E4B; Thu, 7 Oct 2021 12:44:32 +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 197CiWf2006484; Thu, 7 Oct 2021 12:44:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 197CiW79006483; Thu, 7 Oct 2021 12:44:32 GMT (envelope-from git) Date: Thu, 7 Oct 2021 12:44:32 GMT Message-Id: <202110071244.197CiW79006483@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Adriaan de Groot Subject: git: 03f9e999b6e8 - main - multimedia/qt5-multimedia: avoid gstreamer-gl 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: adridg X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 03f9e999b6e831bbfa2099ea6994e5231a164164 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by adridg: URL: https://cgit.FreeBSD.org/ports/commit/?id=03f9e999b6e831bbfa2099ea6994e5231a164164 commit 03f9e999b6e831bbfa2099ea6994e5231a164164 Author: Adriaan de Groot AuthorDate: 2021-10-04 20:25:19 +0000 Commit: Adriaan de Groot CommitDate: 2021-10-07 12:44:08 +0000 multimedia/qt5-multimedia: avoid gstreamer-gl While qt5-multimedia **works** with gstreamer-gl, it's unexpected, and not listed as a dependency. Sabotage the detection of gstreamer-gl by breaking the include path it looks for. We might consider adding gstreamer-gl to the dependencies, to get better overall GL support, but that's a more involved change. PR: 245909 Reported by: Martin Birgmeier --- multimedia/qt5-multimedia/Makefile | 2 +- .../files/patch-src_multimedia_configure.json | 15 +++++++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/multimedia/qt5-multimedia/Makefile b/multimedia/qt5-multimedia/Makefile index f8b900e65c0f..f6ae01be8222 100644 --- a/multimedia/qt5-multimedia/Makefile +++ b/multimedia/qt5-multimedia/Makefile @@ -1,6 +1,6 @@ PORTNAME= multimedia DISTVERSION= ${QT5_VERSION} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia PKGNAMEPREFIX= qt5- diff --git a/multimedia/qt5-multimedia/files/patch-src_multimedia_configure.json b/multimedia/qt5-multimedia/files/patch-src_multimedia_configure.json index 0c63a1c6db40..4b1919152e05 100644 --- a/multimedia/qt5-multimedia/files/patch-src_multimedia_configure.json +++ b/multimedia/qt5-multimedia/files/patch-src_multimedia_configure.json @@ -2,9 +2,9 @@ This adds a configure knob to Qt itself, which responds to the FreeBSD Makefile knobs; otherwise, we can't turn off finding OpenAL when it is installed. ---- src/multimedia/configure.json.orig 2019-10-15 04:21:48 UTC +--- src/multimedia/configure.json.orig 2020-10-27 08:02:12 UTC +++ src/multimedia/configure.json -@@ -12,6 +12,7 @@ +@@ -13,6 +13,7 @@ "directshow": { "type": "boolean" }, "wmf": { "type": "boolean" }, "gstreamer": { "type": "optionalString", "values": [ "no", "yes", "0.10", "1.0" ] }, @@ -12,3 +12,14 @@ OpenAL when it is installed. "pulseaudio": "boolean" } }, +@@ -101,9 +102,9 @@ + "gstreamer_gl_1_0": { + "label": "GStreamer OpenGL 1.0", + "export": "gstreamer_gl", + "test": { +- "include": "gst/gl/gl.h" ++ "include": "gst/gl/gl.h-BogusNotFound" + }, + "use": "gstreamer_1_0", + "sources": [ + { "type": "pkgConfig", "args": "gstreamer-gl-1.0" }