aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorkwm <kwm@FreeBSD.org>2015-09-27 17:04:24 +0800
committerkwm <kwm@FreeBSD.org>2015-09-27 17:04:24 +0800
commit28c4cc6890e33c6fbb0e029178574c5da7040155 (patch)
tree969deaf0af7fb42a5603b71ef9add77d592b8c5d /net
parent994b51ed8acfb4b29814c70eff4b3e6b63cc7f00 (diff)
downloadfreebsd-ports-gnome-28c4cc6890e33c6fbb0e029178574c5da7040155.tar.gz
freebsd-ports-gnome-28c4cc6890e33c6fbb0e029178574c5da7040155.tar.zst
freebsd-ports-gnome-28c4cc6890e33c6fbb0e029178574c5da7040155.zip
Fix the build with GStreamer 1.6.0.
The GStreamer core how has multiple include dirs, and freerdp rolls it own detection code and figuring our which include dirs to use. Instead use pkg-config to get the correct include dirs. Submitted by: antoine@
Diffstat (limited to 'net')
-rw-r--r--net/freerdp/files/patch-cmake_FindGStreamer_1_0.cmake16
1 files changed, 16 insertions, 0 deletions
diff --git a/net/freerdp/files/patch-cmake_FindGStreamer_1_0.cmake b/net/freerdp/files/patch-cmake_FindGStreamer_1_0.cmake
new file mode 100644
index 000000000000..ca21ee35ad8f
--- /dev/null
+++ b/net/freerdp/files/patch-cmake_FindGStreamer_1_0.cmake
@@ -0,0 +1,16 @@
+Don't use custom code to find the include dirs for gstreamer 1.0 (core).
+Since 1.6.0 there are multiple include paths. So use pkg-config to find
+which. IMO the rest of this file should use pkg-config....
+
+--- cmake/FindGStreamer_1_0.cmake.orig 2015-06-26 15:30:00.000000000 +0200
++++ cmake/FindGStreamer_1_0.cmake 2015-09-27 10:43:55.754514000 +0200
+@@ -78,7 +78,8 @@
+ # 1.1. Find headers and libraries
+ set(GLIB_ROOT_DIR ${GSTREAMER_1_0_ROOT_DIR})
+ find_package(Glib REQUIRED)
+-FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0 gstreamer-1.0 gst/gst.h gstreamer-1.0)
++pkg_check_modules (GSTREAMER_1_0 gstreamer-1.0)
++#FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0 gstreamer-1.0 gst/gst.h gstreamer-1.0)
+ FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_BASE gstreamer-base-1.0 gst/gst.h gstbase-1.0)
+
+ # 1.2. Check Gstreamer version