svn commit: r398029 - head/net/freerdp/files

[Jan Beich]

Koop Mast <kwm at FreeBSD.org> writes:

> +++ 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

|make makepatch| format is preferred for new patches as it properly
encodes timestamps and underscores in filenames.

> +@@ -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:

$ 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
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 602 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/svn-ports-all/attachments/20150927/5340ebc1/attachment.bin>