pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

libretro-mgba: Add patch to stop finding/invoking git to make a version string.



Module Name:	pkgsrc-wip
Committed By:	Nia Alarie <nia.alarie%gmail.com@localhost>
Pushed By:	nee
Date:		Wed Apr 4 16:00:21 2018 +0100
Changeset:	52b3f6e05176297dbc4b688ce5a0f5489d8e9024

Modified Files:
	libretro-mgba/distinfo
Added Files:
	libretro-mgba/patches/patch-version.cmake

Log Message:
libretro-mgba: Add patch to stop finding/invoking git to make a
version string.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=52b3f6e05176297dbc4b688ce5a0f5489d8e9024

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 libretro-mgba/distinfo                    |  1 +
 libretro-mgba/patches/patch-version.cmake | 22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+)

diffs:
diff --git a/libretro-mgba/distinfo b/libretro-mgba/distinfo
index 979d7022c5..1fe959cf9c 100644
--- a/libretro-mgba/distinfo
+++ b/libretro-mgba/distinfo
@@ -6,3 +6,4 @@ SHA512 (libretro-mgba-0.6.2.tar.gz) = 8afe4fb331f4163f4cd96cc73a51136bdb9008178b
 Size (libretro-mgba-0.6.2.tar.gz) = 7441969 bytes
 SHA1 (patch-CMakeLists.txt) = 5b9dfe03254ba3cbd6757bd0caa700c79842f2a1
 SHA1 (patch-include_mgba-util_math.h) = 448ca1bb3bbe2812e7d9482917c488ddcf3b48f0
+SHA1 (patch-version.cmake) = 9b2a0413f686d7fa8f0ffea043bed0a6319e4dfe
diff --git a/libretro-mgba/patches/patch-version.cmake b/libretro-mgba/patches/patch-version.cmake
new file mode 100644
index 0000000000..3e055b9d37
--- /dev/null
+++ b/libretro-mgba/patches/patch-version.cmake
@@ -0,0 +1,22 @@
+$NetBSD$
+
+Avoid looking for git to determine the version string.
+
+--- version.cmake.orig	2018-04-04 04:10:29.000000000 +0000
++++ version.cmake
+@@ -8,15 +8,6 @@ set(LIB_VERSION_ABI 0.6)
+ set(LIB_VERSION_STRING ${LIB_VERSION_MAJOR}.${LIB_VERSION_MINOR}.${LIB_VERSION_PATCH})
+ set(SUMMARY "${PROJECT_NAME} Game Boy Advance Emulator")
+ 
+-find_program(GIT git)
+-if(GIT AND NOT SKIP_GIT)
+-	execute_process(COMMAND ${GIT} describe --always --abbrev=40 --dirty WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" OUTPUT_VARIABLE GIT_COMMIT ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
+-	execute_process(COMMAND ${GIT} describe --always --dirty WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" OUTPUT_VARIABLE GIT_COMMIT_SHORT ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
+-	execute_process(COMMAND ${GIT} symbolic-ref --short HEAD WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" OUTPUT_VARIABLE GIT_BRANCH ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
+-	execute_process(COMMAND ${GIT} rev-list HEAD --count WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" OUTPUT_VARIABLE GIT_REV ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
+-	execute_process(COMMAND ${GIT} describe --tag --exact-match WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" OUTPUT_VARIABLE GIT_TAG ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
+-endif()
+-
+ if(NOT GIT_REV)
+ 	set(GIT_REV -1)
+ endif()


Home | Main Index | Thread Index | Old Index