diff options
| author | Adriaan de Groot <adridg@FreeBSD.org> | 2021-10-04 20:25:19 +0000 |
|---|---|---|
| committer | Adriaan de Groot <adridg@FreeBSD.org> | 2021-10-07 12:44:08 +0000 |
| commit | 03f9e999b6e831bbfa2099ea6994e5231a164164 (patch) | |
| tree | 2a59fc9e1dff8bb5abb8a1bd8d69aacca5075dc3 | |
| parent | a8f4add22623b1380efc4278d0e8672487aadfc3 (diff) | |
| download | ports-03f9e999b6e831bbfa2099ea6994e5231a164164.tar.gz ports-03f9e999b6e831bbfa2099ea6994e5231a164164.zip | |
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
| -rw-r--r-- | multimedia/qt5-multimedia/Makefile | 2 | ||||
| -rw-r--r-- | multimedia/qt5-multimedia/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" } |