From owner-svn-ports-head@freebsd.org Sat Sep 16 17:45:56 2017 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 C2F0FE24400; Sat, 16 Sep 2017 17:45:56 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9F02182972; Sat, 16 Sep 2017 17:45:56 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v8GHjt4b082195; Sat, 16 Sep 2017 17:45:55 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8GHjtS8082193; Sat, 16 Sep 2017 17:45:55 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201709161745.v8GHjtS8082193@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sat, 16 Sep 2017 17:45:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r449973 - head/emulators/ppsspp/files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: head/emulators/ppsspp/files X-SVN-Commit-Revision: 449973 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 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: Sat, 16 Sep 2017 17:45:56 -0000 Author: jbeich Date: Sat Sep 16 17:45:55 2017 New Revision: 449973 URL: https://svnweb.freebsd.org/changeset/ports/449973 Log: emulators/ppsspp-qt5: move CMake 3.9 fix into a separate file Added: head/emulators/ppsspp/files/patch-CMakeLists.txt (contents, props changed) Modified: head/emulators/ppsspp/files/patch-system-libpng16 (contents, props changed) Added: head/emulators/ppsspp/files/patch-CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/ppsspp/files/patch-CMakeLists.txt Sat Sep 16 17:45:55 2017 (r449973) @@ -0,0 +1,23 @@ +===> Building for ppsspp-qt5-1.4.2 +ninja: error: dependency cycle: cmake_object_order_depends_target_Core -> Core_autogen -> CMakeFiles/Core_autogen -> /wrkdirs/usr/ports/emulators/ppsspp-qt5/work/ppsspp-1.4.2/git-version.cpp -> cmake_object_order_depends_target_Core + +https://github.com/hrydgard/ppsspp/issues/9972 + +--- CMakeLists.txt.orig 2017-05-27 09:58:05 UTC ++++ CMakeLists.txt +@@ -1618,12 +1618,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) Modified: head/emulators/ppsspp/files/patch-system-libpng16 ============================================================================== --- head/emulators/ppsspp/files/patch-system-libpng16 Sat Sep 16 17:31:59 2017 (r449972) +++ head/emulators/ppsspp/files/patch-system-libpng16 Sat Sep 16 17:45:55 2017 (r449973) @@ -1,7 +1,5 @@ Make build glue accept libpng 1.6.x and don't hardcode suffix -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 @@ -582,9 +582,10 @@ else() @@ -18,22 +16,6 @@ One hunk in src/CMakeLists.txt was added to fix target find_package(PackageHandleStandardArgs) find_package_handle_standard_args(PNG REQUIRED_VARS PNG_LIBRARY PNG_PNG_INCLUDE_DIR) if (PNG_FOUND) -@@ -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 @@ -21,7 +21,7 @@