Source Mage code commit list

[Treeve Jelbert <scm AT sourcemage.org>]

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

 disk/f2fs-tools/DEPENDS           |    3 ++-
 disk/f2fs-tools/DETAILS           |    4 ++--
 disk/f2fs-tools/HISTORY           |    5 +++++
 disk/f2fs-tools/PRE_BUILD         |    5 +++--
 disk/f2fs-tools/patches/lz4.patch |   17 +++++++++++++++++
 xorg-lib/pixman/DETAILS           |    4 ++--
 xorg-lib/pixman/HISTORY           |    3 +++
 7 files changed, 34 insertions(+), 7 deletions(-)

New commits:
commit d85a6f29eee3d334eb274782d51c4af1e6a4aba1
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    pixman: => 0.42.0

commit 57079ad9521f845a64d56c8e5a5b57ca95bc2593
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    f2fs-tools - fix build

commit d29e9f007a5f1675bd97d6056467b9f396644411
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    f2fs-tools: => 1.15.0

diff --git a/disk/f2fs-tools/DEPENDS b/disk/f2fs-tools/DEPENDS
index 9d3465c..8df6756 100755
--- a/disk/f2fs-tools/DEPENDS
+++ b/disk/f2fs-tools/DEPENDS
@@ -1 +1,2 @@
-depends util-linux
+depends util-linux &&
+depends lz4
diff --git a/disk/f2fs-tools/DETAILS b/disk/f2fs-tools/DETAILS
index d43dfd5..2d19439 100755
--- a/disk/f2fs-tools/DETAILS
+++ b/disk/f2fs-tools/DETAILS
@@ -1,6 +1,6 @@
            SPELL=f2fs-tools
-         VERSION=1.14.0
-     
SOURCE_HASH=sha512:951b74178f99722550e73f331be066f124f6ee6022710f6b47ae47390b978b08f12a7f2a268d82ca69a32bf440cd3ce3adddc8a4c49c32df83da87e7f659f98d
+         VERSION=1.15.0
+     
SOURCE_HASH=sha512:61e40f16296091b55cec2dbdc6306af6abc2d3f854f39ef03a741b7f6f47348f915498375789f017f8da27fa7d27c79c905dd047693518adde503ea7ebf89387
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    
SOURCE_URL[0]=https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git/snapshot/$SOURCE
diff --git a/disk/f2fs-tools/HISTORY b/disk/f2fs-tools/HISTORY
index e224801..a81df65 100644
--- a/disk/f2fs-tools/HISTORY
+++ b/disk/f2fs-tools/HISTORY
@@ -1,3 +1,8 @@
+2022-10-18 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 1.15.0
+       * PRE_BUILD lz4.patch: apply upstream patch
+       * DEPENDS: add lz4
+
 2020-08-29 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 1.14.0
 
diff --git a/disk/f2fs-tools/PRE_BUILD b/disk/f2fs-tools/PRE_BUILD
index c51d7b2..2a8d9ef 100755
--- a/disk/f2fs-tools/PRE_BUILD
+++ b/disk/f2fs-tools/PRE_BUILD
@@ -1,3 +1,4 @@
-default_pre_build    &&
+default_pre_build &&
 cd $SOURCE_DIRECTORY &&
-autoreconf -f -i --symlink
+apply_patch_dir patches &&
+ autoreconf -f -i --symlink
diff --git a/disk/f2fs-tools/patches/lz4.patch 
b/disk/f2fs-tools/patches/lz4.patch
new file mode 100644
index 0000000..1a707ca
--- /dev/null
+++ b/disk/f2fs-tools/patches/lz4.patch
@@ -0,0 +1,17 @@
+diff --git a/fsck/compress.c b/fsck/compress.c
+index b413492..b15f0a4 100644
+--- a/fsck/compress.c
++++ b/fsck/compress.c
+@@ -32,10 +32,7 @@
+ #ifdef HAVE_LIBLZ4
+ #define LZ4_MEMORY_USAGE              14
+ #define LZ4_MAX_INPUT_SIZE            0x7E000000 /* 2 113 929 216 bytes */
+-#ifndef LZ4_STREAMSIZE
+-#define LZ4_STREAMSIZE                        (LZ4_STREAMSIZE_U64 * 
sizeof(long long))
+-#endif
+-#define LZ4_MEM_COMPRESS              LZ4_STREAMSIZE
++#define LZ4_MEM_COMPRESS              sizeof(LZ4_stream_t)
+ #define LZ4_ACCELERATION_DEFAULT      1
+ #define LZ4_WORK_SIZE                 ALIGN_UP(LZ4_MEM_COMPRESS, 8)
+ #endif
+
diff --git a/xorg-lib/pixman/DETAILS b/xorg-lib/pixman/DETAILS
index aa8e4f8..03ab824 100755
--- a/xorg-lib/pixman/DETAILS
+++ b/xorg-lib/pixman/DETAILS
@@ -1,8 +1,8 @@
 source $GRIMOIRE/MESON_FUNCTIONS
            SPELL=pixman
-         VERSION=0.40.0
+         VERSION=0.42.0
       PATCHLEVEL=1
-     
SOURCE_HASH=sha512:8a60edb113d68791b41bd90b761ff7b3934260cb3dada3234c9351416f61394e4157353bc4d61b8f6c2c619de470f6feefffb4935bfcf79d291ece6285de7270
+     
SOURCE_HASH=sha512:43d43d1aef9b8a6167098ab68ce2cfd8c0429c4825d40a4fb468b5b51dc1a2035f8bd1b70413e4ecd77deb469b5d558f42171b423e348d5ddd8604c466ffc7d9
           SOURCE=$SPELL-$VERSION.tar.xz
    SOURCE_URL[0]=https://cairographics.org/releases/$SOURCE
    SOURCE_URL[1]=https://xorg.freedesktop.org/releases/individual/lib/$SOURCE
diff --git a/xorg-lib/pixman/HISTORY b/xorg-lib/pixman/HISTORY
index 7f6e056..6951c8e 100644
--- a/xorg-lib/pixman/HISTORY
+++ b/xorg-lib/pixman/HISTORY
@@ -1,3 +1,6 @@
+2022-10-18 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 0.42.0
+
 2022-05-28  Florian Franzmann  <bwlf AT bandrate.org>
        * DEPENDS: fix typo, use MESON_DEPENDS