From d295a5a3633b52c6413cfbd426a6d326d9c9af46 Mon Sep 17 00:00:00 2001 From: Adolf Belka Date: Wed, 25 Jan 2023 23:41:25 +0100 Subject: [PATCH] pixman: Update to version 0.42.2 - Update from version 0.40.0 to 0.42.2 - Update of rootfile - Build converted to meson - Changelog is empty in the source tarball as is the NEWS file. There is no change log info on the webpage. The only source of change info are the commits from the git repo https://cgit.freedesktop.org/pixman/log/ Signed-off-by: Adolf Belka --- config/rootfiles/common/pixman | 5 ++--- lfs/pixman | 19 +++++++++++-------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/config/rootfiles/common/pixman b/config/rootfiles/common/pixman index 28e7c692aa..e58e467cb9 100644 --- a/config/rootfiles/common/pixman +++ b/config/rootfiles/common/pixman @@ -1,9 +1,8 @@ #usr/include/pixman-1 #usr/include/pixman-1/pixman-version.h #usr/include/pixman-1/pixman.h -#usr/lib/libpixman-1.a #usr/lib/libpixman-1.la -usr/lib/libpixman-1.so +#usr/lib/libpixman-1.so usr/lib/libpixman-1.so.0 -usr/lib/libpixman-1.so.0.40.0 +usr/lib/libpixman-1.so.0.42.2 #usr/lib/pkgconfig/pixman-1.pc diff --git a/lfs/pixman b/lfs/pixman index f7a521a4d3..4161fef73a 100644 --- a/lfs/pixman +++ b/lfs/pixman @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team # +# Copyright (C) 2007-2023 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,10 +24,10 @@ include Config -VER = 0.40.0 +VER = 0.42.2 THISAPP = pixman-$(VER) -DL_FILE = $(THISAPP).tar.gz +DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 1333d2e052a0f6343e886fc4c9ca7e4823ec7bf9f1f5a3e29723107de60c7b4e67ac67fb1f97fc00e4e495358945e6d12987dd56cb9c9fd56670a9b5cb8c9e62 +$(DL_FILE)_BLAKE2 = 6286a9d064a5a24017fccbb0a6e9f6ef932077c2e33ec043826d4a7a6c707c9111d3de4b806cbcdb47fc2794f1f930d24d078de1ff2912061967db0890540957 install : $(TARGET) @@ -69,10 +69,13 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) $(UPDATE_AUTOMAKE) - cd $(DIR_APP) && ./configure --prefix=/usr --disable-arm-iwmmxt - cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && make install + cd $(DIR_APP) && meson \ + --prefix=/usr \ + -D iwmmxt=disabled \ + builddir/ + cd $(DIR_APP) && ninja -C builddir/ $(MAKETUNING) + cd $(DIR_APP) && ninja -C builddir/ install @rm -rf $(DIR_APP) @$(POSTBUILD) -- 2.39.5