Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (c185c53fea39ad4b7c7f31d3253d258889fdc24e)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (c185c53fea39ad4b7c7f31d3253d258889fdc24e)
  • Date: Sat, 16 Jul 2022 12:35:26 +0000

GIT changes to master grimoire by Florian Franzmann <bwlf AT bandrate.org>:

kernels/linux/HISTORY | 5 ++
kernels/linux/info/patches/maintenance_patches_5/patch-5.18.11 | 5 --
kernels/linux/info/patches/maintenance_patches_5/patch-5.18.12 | 5 ++
kernels/linux/latest.defaults | 2 -
libs/libtcod/BUILD | 2 -
libs/libtcod/DEPENDS | 19
+++++++---
libs/libtcod/DETAILS | 6 +--
libs/libtcod/HISTORY | 4 ++
8 files changed, 33 insertions(+), 15 deletions(-)

New commits:
commit c185c53fea39ad4b7c7f31d3253d258889fdc24e
Author: Florian Franzmann <bwlf AT bandrate.org>
Commit: Florian Franzmann <bwlf AT bandrate.org>

libs/libtcod: version 1.21.0

commit ae3d7db46173b2959b59b8822999f4bf55a2aa8c
Author: Florian Franzmann <bwlf AT bandrate.org>
Commit: Florian Franzmann <bwlf AT bandrate.org>

kernels/linux: version 5.18.12

diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY
index f7165f9..4711717 100644
--- a/kernels/linux/HISTORY
+++ b/kernels/linux/HISTORY
@@ -1,3 +1,8 @@
+2022-07-16 Florian Franzmann <bwlf AT bandrate.org>
+ * latest.defaults: latest_maintenance_patches_5=patch-5.18.12
+ * info/patches/maintenance_patches_5/patch-5.18.12: added
+ * info/patches/maintenance_patches_5/patch-5.18.11: removed
+
2022-07-14 Pavel Vinogradov <public AT sourcemage.org>
* latest.defaults: latest_maintenance_patches_5=patch-5.18.11
* info/patches/maintenance_patches_5/patch-5.18.11: added
diff --git a/kernels/linux/info/patches/maintenance_patches_5/patch-5.18.11
b/kernels/linux/info/patches/maintenance_patches_5/patch-5.18.11
deleted file mode 100755
index 8441793..0000000
--- a/kernels/linux/info/patches/maintenance_patches_5/patch-5.18.11
+++ /dev/null
@@ -1,5 +0,0 @@
-appliedkernels="5.18"
-patchversion="${appliedkernels}.11"
-source="patch-${patchversion}.xz"
-source_url="${KERNEL_URL}/pub/linux/kernel/v5.x/${source}"
-sha512sum="5a4972b96438b38aa2bd6b1893557aab528bc465464613ba2c1ef069e501761d995efb26b9a910f638383a821d249d1f6c748e1da993b428c0c4bcbb24621415"
diff --git a/kernels/linux/info/patches/maintenance_patches_5/patch-5.18.12
b/kernels/linux/info/patches/maintenance_patches_5/patch-5.18.12
new file mode 100755
index 0000000..2ec90b0
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_5/patch-5.18.12
@@ -0,0 +1,5 @@
+appliedkernels="5.18"
+patchversion="${appliedkernels}.12"
+source="patch-${patchversion}.xz"
+source_url="${KERNEL_URL}/pub/linux/kernel/v5.x/${source}"
+sha512sum="f05070722545b324cdf5d59288b752c896916301b767fd7323e398ab814f1c1e43e6670e450f8aacf2602b5de54659d0ebec008147135f665016ea43e9671779"
diff --git a/kernels/linux/latest.defaults b/kernels/linux/latest.defaults
index 32ccf20..adfa0b0 100644
--- a/kernels/linux/latest.defaults
+++ b/kernels/linux/latest.defaults
@@ -1,2 +1,2 @@
LATEST_5=5.18
-LATEST_maintenance_patches_5=patch-5.18.11
+LATEST_maintenance_patches_5=patch-5.18.12
diff --git a/libs/libtcod/BUILD b/libs/libtcod/BUILD
index 7ffbf98..ac8981d 100755
--- a/libs/libtcod/BUILD
+++ b/libs/libtcod/BUILD
@@ -5,4 +5,4 @@ OPTS+=" -DLIBTCOD_LODEPNG=vendored" &&
OPTS+=" -DLIBTCOD_UTF8PROC=vendored" &&
OPTS+=" -DLIBTCOD_STB=vendored" &&

-cmake_build
+default_build
diff --git a/libs/libtcod/DEPENDS b/libs/libtcod/DEPENDS
index 627cecc..0ca6d09 100755
--- a/libs/libtcod/DEPENDS
+++ b/libs/libtcod/DEPENDS
@@ -1,7 +1,16 @@
. "$GRIMOIRE"/CMAKE_DEPENDS &&

-depends OPENGL &&
-depends glu &&
-depends sdl2 "-DLIBTCOD_SDL2=find_package" &&
-depends upx &&
-depends zlib "-DLIBTCOD_ZLIB=find_package"
+depends OPENGL &&
+depends glu &&
+
+depends upx &&
+
+optional_depends sdl2 \
+ "-DLIBTCOD_SDL2=find_package" \
+ "-DCMAKE_DISABLE_FIND_PACKAGE_SDL2=1" \
+ "for graphics via SDL2" &&
+
+optional_depends zlib \
+ "-DLIBTCOD_ZLIB=find_package" \
+ "-DCMAKE_DISABLE_FIND_PACKAGE_ZLIB=1" \
+ "for zlib compression support"
diff --git a/libs/libtcod/DETAILS b/libs/libtcod/DETAILS
index cdd02c9..8d5643f 100755
--- a/libs/libtcod/DETAILS
+++ b/libs/libtcod/DETAILS
@@ -1,10 +1,10 @@
. "$GRIMOIRE"/CMAKE_FUNCTIONS
SPELL=libtcod
- VERSION=1.20.1
+ VERSION=1.21.0
SOURCE="${SPELL}-${VERSION}.tar.gz"

SOURCE_URL[0]=https://github.com/libtcod/libtcod/archive/refs/tags/${VERSION}.tar.gz
-
SOURCE_HASH=sha512:bef3751dd1b190769163ff7c188479fe100d425fa98d3f0f97a3a81045fe0f0c24690b64bcde29f7af1eb7fd34915371223146598b1f0cab173e69a78c1dfc76
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/jice-${SPELL}-${VERSION}"
+
SOURCE_HASH=sha512:1d18a49b0d66337e2b29ad6b9a4a412cc4d2fd723d9a3d3c983ff3ef2f5bee4422ea3469513e0fe3b2f885773fb5d70e17128bc473b952ab6e0de27f687c905e
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://doryen.eptalys.net/libtcod/";
LICENSE[0]=BSD
ENTERED=20140407
diff --git a/libs/libtcod/HISTORY b/libs/libtcod/HISTORY
index b757cc1..8340192 100644
--- a/libs/libtcod/HISTORY
+++ b/libs/libtcod/HISTORY
@@ -1,3 +1,7 @@
+2022-07-16 Florian Franzmann <bwlf AT bandrate.org>
+ * DEPENDS, DETAILS: version 1.21.0
+ * BUILD: use default_build
+
2022-07-15 Florian Franzmann <bwlf AT bandrate.org>
* BUILD, CONFIGURE, DEPENDS, DETAILS, INSTALL, PRE_BUILD,
patches/0001-Do-not-require-CMAKE_TOOLCHAIN_FILE.patch: version 1.20.1



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (c185c53fea39ad4b7c7f31d3253d258889fdc24e), Florian Franzmann, 07/16/2022

Archive powered by MHonArc 2.6.24.

Top of Page