From owner-svn-ports-head@freebsd.org Sun Sep 27 18:15:52 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1EE6BA0AB08; Sun, 27 Sep 2015 18:15:52 +0000 (UTC) (envelope-from kwm@rainbow-runner.nl) Received: from fep15.mx.upcmail.net (fep15.mx.upcmail.net [62.179.121.35]) by mx1.freebsd.org (Postfix) with ESMTP id B29E2B6C; Sun, 27 Sep 2015 18:15:49 +0000 (UTC) (envelope-from kwm@rainbow-runner.nl) Received: from edge03.upcmail.net ([192.168.13.238]) by viefep15-int.chello.at (InterMail vM.8.01.05.18 201-2260-151-151-20140610) with ESMTP id <20150927181517.ICHJ28316.viefep15-int.chello.at@edge03.upcmail.net>; Sun, 27 Sep 2015 20:15:17 +0200 Received: from [127.0.0.1] ([178.84.134.112]) by edge03.upcmail.net with edge id NJFF1r00l2Rg3Ey01JFFsc; Sun, 27 Sep 2015 20:15:16 +0200 X-SourceIP: 178.84.134.112 Subject: Re: svn commit: r398029 - head/net/freerdp/files To: Jan Beich , Koop Mast References: <201509270904.t8R94P4L085010@repo.freebsd.org> Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org From: Koop Mast Message-ID: <56083233.20305@rainbow-runner.nl> Date: Sun, 27 Sep 2015 20:15:15 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:38.0) Gecko/20100101 Thunderbird/38.2.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-Antivirus: avast! (VPS 150927-0, 27/09/2015), Outbound message X-Antivirus-Status: Clean X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Sep 2015 18:15:52 -0000 On 27/09/2015 13:22, Jan Beich wrote: > Koop Mast writes: > >> +@@ -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) > GSTREAMER_1_0_LIBRARIES no longer holds full paths which means one more > dependency on LDFLAGS += -L${LOCALBASE}/lib in the port's Makefile. > > $ make clean configure > $ fgrep 1_0_LIBRARIES: $(make -V BUILD_WRKSRC)/CMakeCache.txt > GSTREAMER_1_0_LIBRARIES:INTERNAL=gstreamer-1.0;gobject-2.0;glib-2.0;intl > > Here's a better fix: I barely understand cmake enought ot make this patch. If you can improve it from my hacked together version go ahead. > $ svn mv files/patch-cmake_FindGStreamer_1_0.cmake \ > files/patch-cmake_FindGStreamer__1__0.cmake > $ svn diff files/patch-cmake_FindGStreamer__1__0.cmake > Index: net/freerdp/files/patch-cmake_FindGStreamer__1__0.cmake > =================================================================== > --- net/freerdp/files/patch-cmake_FindGStreamer__1__0.cmake (revision 398036) > +++ net/freerdp/files/patch-cmake_FindGStreamer__1__0.cmake (working copy) > @@ -2,15 +2,18 @@ Don't use custom code to find the include dirs for > 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) > +--- cmake/FindGStreamer_1_0.cmake.orig 2014-09-11 22:46:32 UTC > ++++ cmake/FindGStreamer_1_0.cmake > +@@ -59,11 +59,7 @@ macro(FIND_GSTREAMER_COMPONENT _componen > + # FIXME: The QUIET keyword can be used once we require CMake 2.8.2. > + pkg_check_modules(PC_${_component_prefix} ${_pkgconfig_name}) > > - # 1.2. Check Gstreamer version > +- find_path(${_component_prefix}_INCLUDE_DIRS > +- NAMES ${_header} > +- HINTS ${PC_${_component_prefix}_INCLUDE_DIRS} ${PC_${_component_prefix}_INCLUDEDIR} > +- PATH_SUFFIXES gstreamer-1.0 > +- ) > ++ set(${_component_prefix}_INCLUDE_DIRS ${PC_${_component_prefix}_INCLUDE_DIRS}) > + > + find_library(${_component_prefix}_LIBRARIES > + NAMES ${_library} gstreamer_android