diff options
| author | Adriaan de Groot <adridg@FreeBSD.org> | 2017-09-14 21:02:51 +0000 |
|---|---|---|
| committer | Adriaan de Groot <adridg@FreeBSD.org> | 2017-09-14 21:02:51 +0000 |
| commit | c91270bd8d6b60bd7c36fb2ad128e2a8165e0686 (patch) | |
| tree | 570aeb8e9fcad4efb19711621999d3df8296b6b9 /emulators | |
| parent | net-mgmt/py-pdagent: Remove command_args. It was a no-op. (diff) | |
Update CMake to 3.9, merge devel/cmake-modules into devel/cmake
Thanks to antoine@ for the exp-run.
Approved by: rakuco (mentor)
Reviewed by: tcberner (mentor)
Reviewed by: mat
PR: 222000 (exp-run)
Differential Revision: https://reviews.freebsd.org/D12299
Notes
Notes:
svn path=/head/; revision=449853
Diffstat (limited to 'emulators')
| -rw-r--r-- | emulators/ppsspp/files/patch-system-libpng16 | 30 |
1 files changed, 24 insertions, 6 deletions
diff --git a/emulators/ppsspp/files/patch-system-libpng16 b/emulators/ppsspp/files/patch-system-libpng16 index efc8393d8821..8f80147b01e3 100644 --- a/emulators/ppsspp/files/patch-system-libpng16 +++ b/emulators/ppsspp/files/patch-system-libpng16 @@ -1,8 +1,10 @@ Make build glue accept libpng 1.6.x and don't hardcode suffix ---- CMakeLists.txt.orig 2015-11-19 15:07:48 UTC +One hunk in src/CMakeLists.txt was added to fix target generation with ninja. + +--- CMakeLists.txt.orig 2017-05-27 09:58:05 UTC +++ CMakeLists.txt -@@ -709,9 +709,10 @@ else() +@@ -582,9 +582,10 @@ else() set(LIBZIP_LIBRARY libzip) endif() @@ -16,9 +18,25 @@ Make build glue accept libpng 1.6.x and don't hardcode suffix find_package(PackageHandleStandardArgs) find_package_handle_standard_args(PNG REQUIRED_VARS PNG_LIBRARY PNG_PNG_INCLUDE_DIR) if (PNG_FOUND) ---- Core/Screenshot.cpp.orig 2015-02-26 20:05:06 UTC +@@ -1618,12 +1619,11 @@ endif() + + setup_target_project(${CoreLibName} Core) + +-# Generate git-version.cpp at build time. +-add_custom_target(GitVersion ALL +- DEPENDS something_that_never_exists) +-add_custom_command(OUTPUT something_that_never_exists ++add_custom_command(OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/git-version.cpp + COMMAND ${CMAKE_COMMAND} -DSOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR} + -P ${CMAKE_CURRENT_SOURCE_DIR}/git-version.cmake) ++# Generate git-version.cpp at build time. ++add_custom_target(GitVersion DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/git-version.cpp) + + set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/git-version.cpp + PROPERTIES GENERATED TRUE) +--- Core/Screenshot.cpp.orig 2017-05-27 09:58:05 UTC +++ Core/Screenshot.cpp -@@ -18,7 +18,7 @@ +@@ -21,7 +21,7 @@ #ifdef USING_QT_UI #include <QtGui/QImage> #else @@ -27,7 +45,7 @@ Make build glue accept libpng 1.6.x and don't hardcode suffix #include "ext/jpge/jpge.h" #endif ---- ext/native/image/png_load.cpp.orig 2015-09-06 20:37:59 UTC +--- ext/native/image/png_load.cpp.orig 2017-05-27 09:58:05 UTC +++ ext/native/image/png_load.cpp @@ -5,7 +5,7 @@ #ifdef USING_QT_UI @@ -38,7 +56,7 @@ Make build glue accept libpng 1.6.x and don't hardcode suffix #endif #include "png_load.h" ---- Core/TextureReplacer.cpp.orig 2016-05-03 00:47:54 UTC +--- Core/TextureReplacer.cpp.orig 2017-05-27 09:58:05 UTC +++ Core/TextureReplacer.cpp @@ -16,7 +16,7 @@ // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. |