d0ea56deb0
- This update brings in the latest 2 years of FreeRDP project work, which has had a long time between tagging releases. - Remove DIRECTFB option, as it no longer compiles, and gets little upstream maintenance - Use NEON on aarch64, and optionally on armv6 - Mark as broken on armv6 on FreeBSD 11.0-RELEASE and early versions of 12.0-CURRENT - Fix issue with X11_USE=xorg= being truncated due to whitespace as it wrapped over multiple lines - Move installed *.cmake files to correct location for modules net/freerdp1: - create new port based on previous net/freerdp 1.2.0, as it is required by net/guacamole-server net/vinagre: - patch to work with the new version of net/freerdp 2.0.0 net/guacamole-server: - patch to work with net/freerdp1 PR: 212004 PR: 214956 Submitted by: Kyle Evans (maintainer) Reported by: John Hein <z7dr6ut7gs@snkmail.com> Reviewed by: Mikael Urankar <mikael.urankar@gmail.com> Reviewed by: Ting-Wei Lan <lantw44@gmail.com> Reviewed by: Antenore Gatta <antenore@simbiosi.org> Reviewed by: amdmi3 Approved by: adamw (mentor) Differential Revision: https://reviews.freebsd.org/D8712
16 lines
740 B
CMake
16 lines
740 B
CMake
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 2016-10-21 07:29:51 UTC
|
|
+++ cmake/FindGStreamer_1_0.cmake
|
|
@@ -78,7 +78,8 @@ endmacro()
|
|
# 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 gstreamer-1.0)
|
|
+#FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0 gstreamer-1.0 gstreamer-1.0)
|
|
+pkg_check_modules (GSTREAMER_1_0 gstreamer-1.0)
|
|
FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0_BASE gstreamer-base-1.0 gstbase-1.0)
|
|
|
|
# 1.2. Check Gstreamer version
|