Date: Sun, 27 Sep 2015 09:04:25 +0000 (UTC) From: Koop Mast <kwm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r398029 - head/net/freerdp/files Message-ID: <201509270904.t8R94P4L085010@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kwm Date: Sun Sep 27 09:04:24 2015 New Revision: 398029 URL: https://svnweb.freebsd.org/changeset/ports/398029 Log: 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@ Added: head/net/freerdp/files/patch-cmake_FindGStreamer_1_0.cmake (contents, props changed) Added: head/net/freerdp/files/patch-cmake_FindGStreamer_1_0.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/freerdp/files/patch-cmake_FindGStreamer_1_0.cmake Sun Sep 27 09:04:24 2015 (r398029) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509270904.t8R94P4L085010>