<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/9e3cd6fe1d61fe99b4223de2ff02f7092a54a9a7">https://github.com/macports/macports-ports/commit/9e3cd6fe1d61fe99b4223de2ff02f7092a54a9a7</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 9e3cd6fe1d6 sfml: update to 2.5.1
</span>9e3cd6fe1d6 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 9e3cd6fe1d61fe99b4223de2ff02f7092a54a9a7
</span>Author: Ekonoms <iekonom@gmail.com>
AuthorDate: Wed Aug 26 21:45:42 2020 +0300
<span style='display:block; white-space:pre;color:#404040;'> sfml: update to 2.5.1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - Update version to 2.5.1
</span><span style='display:block; white-space:pre;color:#404040;'> - Update URLs
</span><span style='display:block; white-space:pre;color:#404040;'> - Remove patch for 2.4.2
</span>---
multimedia/sfml/Portfile | 20 +-
.../0001-packaging-support-improvements.patch | 227 ---------------------
2 files changed, 8 insertions(+), 239 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/sfml/Portfile b/multimedia/sfml/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index db897f1410a..5c4b80d031a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/sfml/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/sfml/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup cmake 1.1
name sfml
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.4.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.5.1
</span> categories multimedia devel
platforms darwin
maintainers gmail.com:rkitover openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,21 +17,17 @@ long_description ${description}. It provides a simple interface to the variou
</span> multimedia applications. It is composed of five modules: system, \
window, graphics, audio and network.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://www.sfml-dev.org/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites http://www.sfml-dev.org/download/${name}/${version}/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://www.sfml-dev.org/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites https://www.sfml-dev.org/files/
</span> distname SFML-${version}-sources
use_zip yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 02c872a6937e59a710d3b1be97d7d2731b53f143 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 8ba04f6fde6a7b42527d69742c49da2ac529354f71f553409f9f821d618de4b6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 3b137887696a223f0c3576b16bae9f0e3535f16f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 bf1e0643acb92369b24572b703473af60bac82caf5af61e77c063b779471bb7f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 23283095
</span>
worksrcdir SFML-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# This is my upstream PR that has been merged to master and will be in 2.4.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://github.com/SFML/SFML/pull/1173
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles 0001-packaging-support-improvements.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_build-append port:doxygen
# and we are not using mesa because it uses X11
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,9 +50,9 @@ configure.args-append \
</span>
post-destroot {
file mkdir ${destroot}${prefix}/share/doc/${name}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- move {*}[glob ${destroot}${prefix}/share/SFML/*.txt] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move {*}[glob ${destroot}/usr/local/share/SFML/*.md] \
</span> ${destroot}${prefix}/share/doc/${name}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- move {*}[glob ${destroot}${prefix}/share/SFML/doc/*] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move {*}[glob ${destroot}/usr/local/share/SFML/doc/*] \
</span> ${destroot}${prefix}/share/doc/${name}
delete ${destroot}${prefix}/share/SFML/doc
copy ${worksrcpath}/examples/ \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/sfml/files/0001-packaging-support-improvements.patch b/multimedia/sfml/files/0001-packaging-support-improvements.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 1b9a306f740..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/sfml/files/0001-packaging-support-improvements.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,227 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From e6757089b465a041ea1a96252359f31afc2e323e Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Rafael Kitover <rkitover@gmail.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Mon, 19 Dec 2016 13:16:07 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] packaging support improvements
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-This grew out of my work creating an sfml port for macports, but should
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-be helpful for package maintainers of various distributions:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-* add an SFML_USE_SYSTEM_DEPS option to ignore everything in extlibs/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- except for headers/stb_image, and use the system versions
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-* install pkg-config files if a pkg-config program is found
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- and either lib/pkgconfig or libdata/pkgconfig exists under the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- INSTALL_PREFIX, or the SFML_INSTALL_PKGCONFIG_FILES flag is set
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- explicitly
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-* install pkg-config files for static libs too, add the necessary
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Requires.private and Libs.private entries to the .pc files to support
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static linking
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-* on OS X, honor all INSTALL_NAME and RPATH related cmake variables and
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- only set the INSTALL_NAME_DIR to "@rpath" if none of them is set, this
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- preserves the default behavior of using @rpath but also allows
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- overriding by the usual cmake mechanisms
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CMakeLists.txt | 73 ++++++++++++++++++++++++------------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cmake/Config.cmake | 13 +++++++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cmake/Macros.cmake | 14 +++++--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tools/pkg-config/sfml-audio.pc.in | 3 ++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tools/pkg-config/sfml-graphics.pc.in | 3 ++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tools/pkg-config/sfml-window.pc.in | 2 +
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 6 files changed, 81 insertions(+), 27 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/CMakeLists.txt b/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index e7914ac..419d56d 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -16,6 +16,9 @@ sfml_set_option(CMAKE_BUILD_TYPE Release STRING "Choose the type of build (Debug
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Suppress Cygwin legacy warning
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(CMAKE_LEGACY_CYGWIN_WIN32 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# Suppress Mac OS X RPATH warnings and adopt new related behaviors
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+cmake_policy(SET CMP0042 NEW)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # set Android specific options
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # define the minimum API level to be used
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -130,6 +133,39 @@ if(NOT BUILD_SHARED_LIBS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_definitions(-DSFML_STATIC)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# allow not using bundled dependencies with a switch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# (except for stb_image)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# yes this is horrible, but GLOB_RECURSE sucks
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+sfml_set_option(SFML_USE_SYSTEM_DEPS FALSE BOOL "TRUE to use system dependencies, FALSE to use the bundled ones.")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if(SFML_USE_SYSTEM_DEPS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(SFML_INSTALL_XCODE_TEMPLATES)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ message(FATAL_ERROR "XCode templates installation cannot be used with the SFML_USE_SYSTEM_DEPS option (the bundled frameworks are required.)")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ file(GLOB_RECURSE DEP_LIBS "${CMAKE_SOURCE_DIR}/extlibs/libs*/*")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ file(GLOB_RECURSE DEP_BINS "${CMAKE_SOURCE_DIR}/extlibs/bin*/*")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ file(GLOB_RECURSE DEP_HEADERS "${CMAKE_SOURCE_DIR}/extlibs/headers/*")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ foreach(DEP_FILE ${DEP_LIBS} ${DEP_BINS} ${DEP_HEADERS})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ get_filename_component(DEP_DIR ${DEP_FILE} PATH)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(NOT DEP_DIR MATCHES "/stb_image(/|$)")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(CMAKE_IGNORE_PATH ${CMAKE_IGNORE_PATH} ${DEP_DIR})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ get_filename_component(DEP_PARENT_DIR ${DEP_DIR} PATH)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ while(NOT DEP_PARENT_DIR STREQUAL "${CMAKE_SOURCE_DIR}/extlibs")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(NOT DEP_DIR MATCHES "/stb_image(/|$)")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(CMAKE_IGNORE_PATH ${CMAKE_IGNORE_PATH} ${DEP_PARENT_DIR})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ get_filename_component(DEP_PARENT_DIR ${DEP_PARENT_DIR} PATH)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ endwhile()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ endforeach()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ list(REMOVE_DUPLICATES CMAKE_IGNORE_PATH)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Visual C++: remove warnings regarding SL security and algorithms on pointers
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(SFML_COMPILER_MSVC)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # add an option to choose whether PDB debug symbols should be generated (defaults to true when possible)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -202,30 +238,6 @@ if(SFML_OS_MACOSX)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(XCODE_TEMPLATES_ARCH "\$(NATIVE_ARCH_ACTUAL)")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if(SFML_OS_LINUX OR SFML_OS_FREEBSD)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(PKGCONFIG_DIR lib${LIB_SUFFIX}/pkgconfig)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if(SFML_OS_FREEBSD)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(PKGCONFIG_DIR libdata/pkgconfig)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if(BUILD_SHARED_LIBS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- sfml_set_option(SFML_INSTALL_PKGCONFIG_FILES FALSE BOOL "TRUE to automatically install pkg-config files so other projects can find SFML")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if(SFML_INSTALL_PKGCONFIG_FILES)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- foreach(sfml_module IN ITEMS all system window graphics audio network)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CONFIGURE_FILE(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "tools/pkg-config/sfml-${sfml_module}.pc.in"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "tools/pkg-config/sfml-${sfml_module}.pc"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- @ONLY)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/tools/pkg-config/sfml-${sfml_module}.pc"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- DESTINATION "${CMAKE_INSTALL_PREFIX}/${PKGCONFIG_DIR}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- endforeach()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- else()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if(SFML_INSTALL_PKGCONFIG_FILES)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- message(WARNING "No pkg-config files are provided for the static SFML libraries (SFML_INSTALL_PKGCONFIG_FILES will be ignored).")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # enable project folders
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set_property(GLOBAL PROPERTY USE_FOLDERS ON)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set_property(GLOBAL PROPERTY PREDEFINED_TARGETS_FOLDER "CMake")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -239,6 +251,19 @@ if(SFML_BUILD_DOC)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_subdirectory(doc)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+sfml_set_option(SFML_INSTALL_PKGCONFIG_FILES FALSE BOOL "TRUE to automatically install pkg-config files so other projects can find SFML")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if(SFML_OS_SUPPORTS_PKGCONFIG OR SFML_INSTALL_PKGCONFIG_FILES)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ foreach(sfml_module IN ITEMS all system window graphics audio network)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CONFIGURE_FILE(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "tools/pkg-config/sfml-${sfml_module}.pc.in"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "tools/pkg-config/sfml-${sfml_module}.pc"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ @ONLY)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/tools/pkg-config/sfml-${sfml_module}.pc"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ DESTINATION "${CMAKE_INSTALL_PREFIX}/${SFML_OS_PKGCONFIG_DIR}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ endforeach()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # setup the install rules
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(NOT SFML_BUILD_FRAMEWORKS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install(DIRECTORY include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/cmake/Config.cmake b/cmake/Config.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index cff54d0..c447113 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/cmake/Config.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/cmake/Config.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -73,6 +73,19 @@ else()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# check if OS or package system supports pkg-config
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# this could be e.g. macports on mac or msys2 on windows etc.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+find_package(PkgConfig QUIET)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if(PKG_CONFIG_EXECUTABLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(EXISTS "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(SFML_OS_SUPPORTS_PKGCONFIG ON)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(SFML_OS_PKGCONFIG_DIR "/lib${LIB_SUFFIX}/pkgconfig")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ elseif(EXISTS "${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(SFML_OS_SUPPORTS_PKGCONFIG ON)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(SFML_OS_PKGCONFIG_DIR "/libdata/pkgconfig")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # detect the compiler and its version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Note: on some platforms (OS X), CMAKE_COMPILER_IS_GNUCXX is true
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # even when CLANG is used, therefore the Clang test is done first
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/cmake/Macros.cmake b/cmake/Macros.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index cd2ca8f..0f31603 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/cmake/Macros.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/cmake/Macros.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -105,9 +105,17 @@ macro(sfml_add_library target)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # adapt install directory to allow distributing dylibs/frameworks in user's frameworks/application bundle
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set_target_properties(${target} PROPERTIES
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- BUILD_WITH_INSTALL_RPATH 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- INSTALL_NAME_DIR "@rpath")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # but only if cmake rpath options aren't set
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(NOT CMAKE_SKIP_RPATH AND NOT CMAKE_SKIP_INSTALL_RPATH AND NOT CMAKE_INSTALL_RPATH AND NOT CMAKE_INSTALL_RPATH_USE_LINK_PATH AND NOT CMAKE_INSTALL_NAME_DIR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(CMAKE_SKIP_BUILD_RPATH)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set_target_properties(${target} PROPERTIES
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ INSTALL_NAME_DIR "@rpath")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set_target_properties(${target} PROPERTIES
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ BUILD_WITH_INSTALL_RPATH 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ INSTALL_NAME_DIR "@rpath")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # enable automatic reference counting on iOS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/tools/pkg-config/sfml-audio.pc.in b/tools/pkg-config/sfml-audio.pc.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 7456daa..0d7a3ce 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/tools/pkg-config/sfml-audio.pc.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/tools/pkg-config/sfml-audio.pc.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -8,5 +8,8 @@ Description: The Simple and Fast Multimedia Library, audio module.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- URL: http://www.sfml-dev.org
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Version: @VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Requires: sfml-system
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+Requires.private: openal, vorbisenc, vorbisfile, vorbis, ogg, flac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Libs: -L${libdir} -lsfml-audio
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# openal may be a system framework
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+Libs.private: @OPENAL_LIBRARY@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Cflags: -I${includedir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/tools/pkg-config/sfml-graphics.pc.in b/tools/pkg-config/sfml-graphics.pc.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index d0a88a1..a96b72c 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/tools/pkg-config/sfml-graphics.pc.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/tools/pkg-config/sfml-graphics.pc.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -8,5 +8,8 @@ Description: The Simple and Fast Multimedia Library, graphics module.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- URL: http://www.sfml-dev.org
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Version: @VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Requires: sfml-window
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+Requires.private: sfml-system, freetype2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Libs: -L${libdir} -lsfml-graphics
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# gl and jpeg may not be in pkg-config
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+Libs.private: @OPENGL_gl_LIBRARY@ @OPENGL_glu_LIBRARY@ @JPEG_LIBRARY@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Cflags: -I${includedir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/tools/pkg-config/sfml-window.pc.in b/tools/pkg-config/sfml-window.pc.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index b0266e6..93bf344 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/tools/pkg-config/sfml-window.pc.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/tools/pkg-config/sfml-window.pc.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -9,4 +9,6 @@ URL: http://www.sfml-dev.org
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Version: @VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Requires: sfml-system
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Libs: -L${libdir} -lsfml-window
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# gl may not be in pkg-config
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+Libs.private: @OPENGL_gl_LIBRARY@ @OPENGL_glu_LIBRARY@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Cflags: -I${includedir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.10.1 (Apple Git-78)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>