From mboxrd@z Thu Jan 1 00:00:00 1970
From: Adolf Belka <adolf.belka@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH 2/2] pixman: Update to version 0.42.2
Date: Wed, 25 Jan 2023 23:41:25 +0100
Message-ID: <20230125224125.3599166-6-adolf.belka@ipfire.org>
In-Reply-To: <20230125224125.3599166-1-adolf.belka@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1360303188286640316=="
List-Id: <development.lists.ipfire.org>
--===============1360303188286640316==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
- 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 c=
hange log
info on the webpage. The only source of change info are the commits from t=
he git repo
https://cgit.freedesktop.org/pixman/log/
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
---
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 28e7c692a..e58e467cb 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 f7a521a4d..4161fef73 100644
--- a/lfs/pixman
+++ b/lfs/pixman
@@ -1,7 +1,7 @@
############################################################################=
###
# =
#
# IPFire.org - A linux based firewall =
#
-# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> =
#
+# Copyright (C) 2007-2023 IPFire Team <info(a)ipfire.org> =
#
# =
#
# 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 @@
=20
include Config
=20
-VER =3D 0.40.0
+VER =3D 0.42.2
=20
THISAPP =3D pixman-$(VER)
-DL_FILE =3D $(THISAPP).tar.gz
+DL_FILE =3D $(THISAPP).tar.xz
DL_FROM =3D $(URL_IPFIRE)
DIR_APP =3D $(DIR_SRC)/$(THISAPP)
TARGET =3D $(DIR_INFO)/$(THISAPP)
@@ -40,7 +40,7 @@ objects =3D $(DL_FILE)
=20
$(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
=20
-$(DL_FILE)_BLAKE2 =3D 1333d2e052a0f6343e886fc4c9ca7e4823ec7bf9f1f5a3e2972310=
7de60c7b4e67ac67fb1f97fc00e4e495358945e6d12987dd56cb9c9fd56670a9b5cb8c9e62
+$(DL_FILE)_BLAKE2 =3D 6286a9d064a5a24017fccbb0a6e9f6ef932077c2e33ec043826d4a=
7a6c707c9111d3de4b806cbcdb47fc2794f1f930d24d078de1ff2912061967db0890540957
=20
install : $(TARGET)
=20
@@ -69,10 +69,13 @@ $(subst %,%_BLAKE2,$(objects)) :
=20
$(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=3D/usr --disable-arm-iwmmxt
- cd $(DIR_APP) && make $(MAKETUNING)
- cd $(DIR_APP) && make install
+ cd $(DIR_APP) && meson \
+ --prefix=3D/usr \
+ -D iwmmxt=3Ddisabled \
+ builddir/
+ cd $(DIR_APP) && ninja -C builddir/ $(MAKETUNING)
+ cd $(DIR_APP) && ninja -C builddir/ install
@rm -rf $(DIR_APP)
@$(POSTBUILD)
--=20
2.39.1
--===============1360303188286640316==--