[gentoo-commits] repo/gentoo:master commit in: games-engines/devilutionx/files/

[gentoo-commits] repo/gentoo:master commit in: games-engines/devilutionx/files/

[Lars Wendler]

commit:     f61d1cc3832f22c056cf3d647ac165d06b2da2f2
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Sep  3 07:41:03 2019 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Sep  3 07:41:03 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f61d1cc3

games-engines/devilutionx: Added missing patch

Package-Manager: Portage-2.3.75, Repoman-2.3.17
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 ...ilutionx-facebookincubator_find_libsodium.patch | 88 ++++++++++++++++++++++
 1 file changed, 88 insertions(+)

diff --git a/games-engines/devilutionx/files/devilutionx-facebookincubator_find_libsodium.patch b/games-engines/devilutionx/files/devilutionx-facebookincubator_find_libsodium.patch
new file mode 100644
index 00000000000..e81de974c4d
--- /dev/null
+++ b/games-engines/devilutionx/files/devilutionx-facebookincubator_find_libsodium.patch
@@ -0,0 +1,88 @@
+From 1f7f5bf3dccee957e23bdf4d976883b155d5e81a Mon Sep 17 00:00:00 2001
+From: Anders Jenbo <anders@jenbo.dk>
+Date: Tue, 23 Jul 2019 21:34:08 +0200
+Subject: [PATCH] Use facebookincubator findflindsodium cmake helper
+
+https://github.com/facebookincubator/fizz/blob/master/fizz/cmake/FindSodium.cmake
+---
+ CMake/Findsodium.cmake | 34 ++++++++++++++++++++--------------
+ 1 file changed, 20 insertions(+), 14 deletions(-)
+
+diff --git a/CMake/Findsodium.cmake b/CMake/Findsodium.cmake
+index 0667920c..c664ccbe 100644
+--- a/CMake/Findsodium.cmake
++++ b/CMake/Findsodium.cmake
+@@ -55,22 +55,22 @@ if (UNIX)
+     endif()
+ 
+     if(sodium_USE_STATIC_LIBS)
+-        if (sodium_PKG_STATIC_LIBRARIES)
+-            foreach(_libname ${sodium_PKG_STATIC_LIBRARIES})
+-                if (NOT _libname MATCHES "^lib.*\\.a$") # ignore strings already ending with .a
+-                    list(INSERT sodium_PKG_STATIC_LIBRARIES 0 "lib${_libname}.a")
+-                endif()
+-            endforeach()
+-            list(REMOVE_DUPLICATES sodium_PKG_STATIC_LIBRARIES)
+-        else()
+-            # if pkgconfig for libsodium doesn't provide
+-            # static lib info, then override PKG_STATIC here..
++        foreach(_libname ${sodium_PKG_STATIC_LIBRARIES})
++            if (NOT _libname MATCHES "^lib.*\\.a$") # ignore strings already ending with .a
++                list(INSERT sodium_PKG_STATIC_LIBRARIES 0 "lib${_libname}.a")
++            endif()
++        endforeach()
++        list(REMOVE_DUPLICATES sodium_PKG_STATIC_LIBRARIES)
++
++        # if pkgconfig for libsodium doesn't provide
++        # static lib info, then override PKG_STATIC here..
++        if (NOT sodium_PKG_STATIC_FOUND)
+             set(sodium_PKG_STATIC_LIBRARIES libsodium.a)
+         endif()
+ 
+         set(XPREFIX sodium_PKG_STATIC)
+     else()
+-        if (sodium_PKG_LIBRARIES STREQUAL "")
++        if (NOT sodium_PKG_FOUND)
+             set(sodium_PKG_LIBRARIES sodium)
+         endif()
+ 
+@@ -101,7 +101,7 @@ elseif (WIN32)
+ 
+     if (MSVC)
+         # detect target architecture
+-        file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/arch.c" [=[
++        file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/arch.cpp" [=[
+             #if defined _M_IX86
+             #error ARCH_VALUE x86_32
+             #elif defined _M_X64
+@@ -109,7 +109,7 @@ elseif (WIN32)
+             #endif
+             #error ARCH_VALUE unknown
+         ]=])
+-        try_compile(_UNUSED_VAR "${CMAKE_CURRENT_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/arch.c"
++        try_compile(_UNUSED_VAR "${CMAKE_CURRENT_BINARY_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/arch.cpp"
+             OUTPUT_VARIABLE _COMPILATION_LOG
+         )
+         string(REGEX REPLACE ".*ARCH_VALUE ([a-zA-Z0-9_]+).*" "\\1" _TARGET_ARCH "${_COMPILATION_LOG}")
+@@ -224,7 +224,8 @@ endif()
+ 
+ # communicate results
+ include(FindPackageHandleStandardArgs)
+-find_package_handle_standard_args(sodium
++find_package_handle_standard_args(
++    Sodium # The name must be either uppercase or match the filename case.
+     REQUIRED_VARS
+         sodium_LIBRARY_RELEASE
+         sodium_LIBRARY_DEBUG
+@@ -233,6 +234,11 @@ find_package_handle_standard_args(sodium
+         sodium_VERSION
+ )
+ 
++if(Sodium_FOUND)
++    set(sodium_LIBRARIES
++        optimized ${sodium_LIBRARY_RELEASE} debug ${sodium_LIBRARY_DEBUG})
++endif()
++
+ # mark file paths as advanced
+ mark_as_advanced(sodium_INCLUDE_DIR)
+ mark_as_advanced(sodium_LIBRARY_DEBUG)

[gentoo-commits] repo/gentoo:master commit in: games-engines/devilutionx/files/

[Sam James]

commit:     2f56448cbb1052dbaf2c4fee7686542036cfceeb
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 11 19:24:45 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Apr 11 19:24:52 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f56448c

games-engines/devilutionx: fix patch line endings

Closes: https://bugs.gentoo.org/837764
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/devilutionx-1.2.1-disable-ccache.patch   | 23 +++++++++++-----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/games-engines/devilutionx/files/devilutionx-1.2.1-disable-ccache.patch b/games-engines/devilutionx/files/devilutionx-1.2.1-disable-ccache.patch
index a89b53e63d34..177287810c94 100644
--- a/games-engines/devilutionx/files/devilutionx-1.2.1-disable-ccache.patch
+++ b/games-engines/devilutionx/files/devilutionx-1.2.1-disable-ccache.patch
@@ -1,17 +1,16 @@
 We let users enable ccache by themselves. Avoids sandbox violation.
-
 https://bugs.gentoo.org/813768
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -54,11 +54,6 @@ if(NOT VERSION_NUM)
-   endif()
- endif()
- 
--find_program(CCACHE_PROGRAM ccache)
--if(CCACHE_PROGRAM)
--  set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}")
--endif()
--
- if(VERSION_NUM MATCHES untagged)
-   project(DevilutionX
-     LANGUAGES C CXX)
+   endif()
+ endif()
+ 
+-find_program(CCACHE_PROGRAM ccache)
+-if(CCACHE_PROGRAM)
+-  set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}")
+-endif()
+-
+ if(VERSION_NUM MATCHES untagged)
+   project(DevilutionX
+     LANGUAGES C CXX)

[gentoo-commits] repo/gentoo:master commit in: games-engines/devilutionx/files/

[Ionen Wolkens]

commit:     c94241e125b0f4037e2886b3f3f661dfb8a5dfbc
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 30 02:46:56 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Jun 30 02:46:56 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c94241e1

games-engines/devilutionx: remove obsolete patch

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 .../files/devilutionx-1.1.0-no_bundled_font.patch  | 62 ----------------------
 1 file changed, 62 deletions(-)

diff --git a/games-engines/devilutionx/files/devilutionx-1.1.0-no_bundled_font.patch b/games-engines/devilutionx/files/devilutionx-1.1.0-no_bundled_font.patch
deleted file mode 100644
index 69131b562c8c..000000000000
--- a/games-engines/devilutionx/files/devilutionx-1.1.0-no_bundled_font.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-https://bugs.gentoo.org/704508
-
---- devilutionX-1.1.0/CMakeLists.txt
-+++ devilutionX-1.1.0/CMakeLists.txt
-@@ -298,7 +298,6 @@
-   SourceX/main.cpp
-   SourceX/devilutionx.exe.manifest
-   Packaging/macOS/AppIcon.icns
--  Packaging/resources/CharisSILB.ttf
-   Packaging/windows/devilutionx.rc)
- 
- if(NOT NONET)
-@@ -339,9 +338,6 @@
- 
- add_executable(${BIN_TARGET} WIN32 MACOSX_BUNDLE ${devilutionx_SRCS})
- 
--# Copy the font to the build directory to it works from the build directory
--file(COPY "Packaging/resources/CharisSILB.ttf" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
--
- # Use file GENERATE instead of configure_file because configure_file
- # does not support generator expressions.
- get_property(is_multi_config GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
-@@ -563,7 +559,6 @@
- 
- if(APPLE)
-   set_source_files_properties("./Packaging/macOS/AppIcon.icns" PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
--  set_source_files_properties("./Packaging/resources/CharisSILB.ttf" PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
-   set(MACOSX_BUNDLE_GUI_IDENTIFIER com.diasurgical.devilutionx)
-   set(MACOSX_BUNDLE_COPYRIGHT Unlicense)
-   set(MACOSX_BUNDLE_BUNDLE_NAME devilutionx)
-@@ -624,9 +619,6 @@
-       DESTINATION "share/icons/hicolor/512x512/apps"
-       RENAME "${project_name}.png"
-     )
--    install(FILES "${PROJECT_SOURCE_DIR}/Packaging/resources/CharisSILB.ttf"
--      DESTINATION "share/fonts/truetype"
--    )
- 
-     # -G DEB
-     set(CPACK_PACKAGE_CONTACT "anders@jenbo.dk")
---- devilutionX-1.1.0/SourceX/DiabloUI/fonts.cpp
-+++ devilutionX-1.1.0/SourceX/DiabloUI/fonts.cpp
-@@ -69,7 +69,7 @@
- #ifdef __linux__
- 	if (!FileExists(ttf_font_path))
- 	{
--		ttf_font_path = "/usr/share/fonts/truetype/" TTF_FONT_NAME;
-+		ttf_font_path = "/usr/share/fonts/" TTF_FONT_NAME;
- 	}
- #endif
- 	font = TTF_OpenFont(ttf_font_path, 17);
---- devilutionX-1.1.0/SourceX/DiabloUI/fonts.h
-+++ devilutionX-1.1.0/SourceX/DiabloUI/fonts.h
-@@ -11,7 +11,7 @@
- #endif
- 
- #ifndef TTF_FONT_NAME
--#define TTF_FONT_NAME "CharisSILB.ttf"
-+#define TTF_FONT_NAME "sil-charis/CharisSIL-B.ttf"
- #endif
- 
- namespace dvl {