Date: Sun, 27 Sep 2015 13:22:25 +0200 From: Jan Beich <jbeich@FreeBSD.org> To: Koop Mast <kwm@FreeBSD.org> Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r398029 - head/net/freerdp/files Message-ID: <mvw8-yumm-wny@FreeBSD.org> References: <201509270904.t8R94P4L085010@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--=-=-=
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable
Koop Mast <kwm@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 +02=
00
> ++++ 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 gstreame=
r-1.0)
> ++pkg_check_modules (GSTREAMER_1_0 gstreamer-1.0)
> ++#FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0 gstreamer-1.0 gst/gst.h gstream=
er-1.0)
GSTREAMER_1_0_LIBRARIES no longer holds full paths which means one more
dependency on LDFLAGS +=3D -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=3Dgstreamer-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
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
=2D-- net/freerdp/files/patch-cmake_FindGStreamer__1__0.cmake (revision 398=
036)
+++ 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....
=20
=2D--- cmake/FindGStreamer_1_0.cmake.orig 2015-06-26 15:30:00.000000000 +02=
00
=2D+++ cmake/FindGStreamer_1_0.cmake 2015-09-27 10:43:55.754514000 +0200
=2D@@ -78,7 +78,8 @@
=2D # 1.1. Find headers and libraries
=2D set(GLIB_ROOT_DIR ${GSTREAMER_1_0_ROOT_DIR})
=2D find_package(Glib REQUIRED)
=2D-FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0 gstreamer-1.0 gst/gst.h gstreame=
r-1.0)
=2D+pkg_check_modules (GSTREAMER_1_0 gstreamer-1.0)
=2D+#FIND_GSTREAMER_COMPONENT(GSTREAMER_1_0 gstreamer-1.0 gst/gst.h gstream=
er-1.0)
=2D 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})
=20=20
=2D # 1.2. Check Gstreamer version
+- find_path(${_component_prefix}_INCLUDE_DIRS
+- NAMES ${_header}
+- HINTS ${PC_${_component_prefix}_INCLUDE_DIRS} ${PC_${_component_p=
refix}_INCLUDEDIR}
+- PATH_SUFFIXES gstreamer-1.0
+- )
++ set(${_component_prefix}_INCLUDE_DIRS ${PC_${_component_prefix}_INCLU=
DE_DIRS})
+=20
+ find_library(${_component_prefix}_LIBRARIES
+ NAMES ${_library} gstreamer_android
--=-=-=
Content-Type: application/pgp-signature; name="signature.asc"
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQF8BAEBCgBmBQJWB9FxXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXREQjQ0MzY3NEM3RDIzNTc4NkUxNDkyQ0VF
NEM3Nzg4MzQ3OURCRERCAAoJEOTHeINHnb3bspIH/jsDhp2vBY8XTkB4bQ+rrmLk
RiVH8JfOCetVSVv9NhgbF2YT+OSl/fJxSxBmgc5waMIhmiFLtD2GYVj749HxdPDt
Iq9LXYDm6NyqKDtrM3fF6uEM+XhUdZZku0DiciOBWCf4Xc3iX2PH4eDa6+WKefTX
XurQBzhaVbxwufvWSRY98CFaeKkLmB9ex4m1HkaZlizPKnuPTT3z5gPvhO0kcyW4
hnqvPYiK7oYvLjiyjeZw8m4KUsZh33q8vACb5LnR33GWjDHNAKXUUHfLp4ZM0+76
hTpKG37ejFVfXld3vP7kp6jqRCjXpQ1DnOyl2UsIEg2LXxFpZ7Ev00uMA1hnnwU=
=IldI
-----END PGP SIGNATURE-----
--=-=-=--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?mvw8-yumm-wny>