Skip to content

Commit 615a338

Browse files
authored
Merge pull request #149 from rhubert/updates
Updates I
2 parents 93ec17b + 37f64e1 commit 615a338

33 files changed

Lines changed: 204 additions & 99 deletions

recipes/devel/intltool.yaml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
inherit: [autotools, perl5]
1+
inherit: [autotools, patch, perl5]
22

33
metaEnvironment:
4-
PKG_VERSION: "0.50.2"
4+
PKG_VERSION: "0.51.0"
55
PKG_LICENSE: "GPL-2.0-only"
66

77
depends:
@@ -13,13 +13,19 @@ depends:
1313
checkoutSCM:
1414
scm: url
1515
url: http://launchpad.net/intltool/trunk/${PKG_VERSION}/+download/intltool-${PKG_VERSION}.tar.gz
16-
digestSHA1: "7fddbd8e1bf94adbf1bc947cbf3b8ddc2453f8ad"
16+
digestSHA1: "a0c3bcb99d1bcfc5db70f8d848232a47c47da090"
1717
stripComponents: 1
1818

19+
checkoutDeterministic: True
20+
checkoutScript: |
21+
patchApplySeries -p 0 $<@intltool/*.patch@>
22+
1923
buildScript: |
2024
autotoolsBuild $1
2125
2226
packageScript: |
2327
autotoolsPackageTgt
2428
2529
provideDeps: ['*-tgt']
30+
provideTools:
31+
intltool: "usr/bin"
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
--- intltoolize.in.orig 2025-10-01 06:09:50.940635121 +0000
2+
+++ intltoolize.in 2025-10-01 06:10:24.540727031 +0000
3+
@@ -36,15 +36,9 @@ PACKAGE=@PACKAGE@
4+
VERSION=@VERSION@
5+
6+
# Directory names.
7+
-prefix=@prefix@
8+
-
9+
-case "`uname`" in
10+
-MINGW32*)
11+
- # Assume intltoolize is in $prefix/bin. Strip off the script name and the "bin"
12+
- prefix=`dirname $0`
13+
- prefix=`dirname $prefix`
14+
- ;;
15+
-esac
16+
+# Assume intltoolize is in $prefix/bin. Strip off the script name and the "bin"
17+
+prefix=`dirname $0`
18+
+prefix=`dirname $prefix`
19+
20+
datarootdir=@datarootdir@
21+
datadir=@datadir@

recipes/graphics/imagemagick.yaml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,28 @@
11
inherit: [autotools]
22

33
depends:
4+
- libs::freetype-dev
5+
- libs::libiconv-dev
46
- libs::libpng-dev
7+
- libs::libxml2-dev
58
- virtual::libs::libjpeg-dev
69

710
- use: []
811
depends:
12+
- libs::freetype-tgt
13+
- libs::libiconv-tgt
914
- libs::libpng-tgt
15+
- libs::libxml2-tgt
1016
- virtual::libs::libjpeg-tgt
1117

1218
metaEnvironment:
13-
PKG_VERSION: "7.1.1-38"
19+
PKG_VERSION: "7.1.2-15"
1420
PKG_LICENSE: "Apache-2.0"
1521

1622
checkoutSCM:
1723
scm: url
1824
url: ${GITHUB_MIRROR}/ImageMagick/ImageMagick/archive/refs/tags/${PKG_VERSION}.tar.gz
19-
digestSHA1: 041bd8e67e984e61fca8443078b37a7851371de7
25+
digestSHA256: bf646e7fffdf50b7d886eec6bbe51c3ced1c4d68fbabfcc534e014575359fe7f
2026
stripComponents: 1
2127

2228
buildScript: |

recipes/kernel/kmod.yaml

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
inherit: [autotools]
22

33
metaEnvironment:
4-
PKG_VERSION: "33"
4+
PKG_VERSION: "34.2"
55
PKG_LICENSE: "GPL-2.0-or-later AND LGPL-2.1-or-later"
66

77
privateEnvironment:
@@ -10,21 +10,13 @@ privateEnvironment:
1010
checkoutSCM:
1111
scm: url
1212
url: ${KERNEL_MIRROR}/linux/utils/kernel/kmod/kmod-${PKG_VERSION}.tar.gz
13-
digestSHA1: "1514ec6d35a35ba625e2e817e8646c23ee0437e7"
13+
digestSHA256: "d60a79fb12a85feab75674ce5b86b2c8bae1714f775f481eae926bd2657b2ffe"
1414
stripComponents: 1
1515

1616
buildScript: |
1717
autotoolsBuild $1 \
1818
--disable-manpages
1919
20-
# We have to create the symlinks ourself. Not sure why "make
21-
# install" doesn't do it
22-
mkdir -p install/usr/sbin
23-
for i in depmod insmod lsmod modinfo modprobe rmmod ; do
24-
ln -s ../bin/kmod install/usr/sbin/$i
25-
done
26-
ln -s kmod install/usr/lsmod
27-
2820
multiPackage:
2921
"":
3022
depends:

recipes/libs/cairo.yaml

Lines changed: 30 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,30 @@
11
inherit: [meson]
22

33
metaEnvironment:
4-
PKG_VERSION: "1.18.0"
4+
PKG_VERSION: "1.18.4"
55
PKG_LICENSE: "LGPL-2.1-only OR MPL-1.1"
66

7+
Config:
8+
CAIRO_XLIB:
9+
type: bool
10+
default: false
11+
help: Enable X Window System output target
12+
713
depends:
814
- libs::glib-dev
915
- libs::libpng-dev
1016
- libs::pixman-dev
1117
- libs::zlib-dev
1218
- libs::freetype-dev
1319
- libs::fontconfig-dev
20+
21+
- if: "$CAIRO_XLIB"
22+
depends:
23+
- graphics::xorg::proto::xorgproto-dev
24+
- libs::xorg::libX11-dev
25+
- libs::xorg::libXext-dev
26+
- libs::xorg::libXrender-dev
27+
1428
- use: []
1529
depends:
1630
- libs::glib-tgt
@@ -20,16 +34,29 @@ depends:
2034
- libs::freetype-tgt
2135
- libs::fontconfig-tgt
2236

37+
- if: "$CAIRO_XLIB"
38+
depends:
39+
- libs::xorg::libX11-tgt
40+
- libs::xorg::libXext-tgt
41+
- libs::xorg::libXrender-tgt
42+
2343
checkoutSCM:
2444
scm: url
2545
url: https://www.cairographics.org/releases/cairo-${PKG_VERSION}.tar.xz
26-
digestSHA256: 243a0736b978a33dee29f9cca7521733b78a65b5418206fef7bd1c3d4cf10b64
46+
digestSHA256: 445ed8208a6e4823de1226a74ca319d3600e83f6369f99b14265006599c32ccb
2747
stripComponents: 1
2848

2949
buildTools: [host-toolchain]
50+
buildVars: [CAIRO_XLIB]
3051
buildScript: |
52+
CONFIG=""
53+
if [[ ${CAIRO_XLIB:-0} == "1" ]]; then
54+
CONFIG="-Dxlib=enabled"
55+
export MESON_ADDITIONAL_PROPERTIES="ipc_rmid_deferred_release=false"
56+
fi
3157
mesonBuild $1 \
32-
-Dtests=disabled
58+
-Dtests=disabled \
59+
${CONFIG}
3360
3461
multiPackage:
3562
dev:

recipes/libs/dbus-glib.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ inherit: [autotools]
33
metaEnvironment:
44
PKG_DESCRIPTION: "D-Bus client library (binding) for C using GLib"
55
PKG_LICENSE: "AFL-2.1 OR GPL-2.0-or-later"
6-
PKG_VERSION: "0.112"
6+
PKG_VERSION: "0.114"
77

88
depends:
99
- core::dbus-dev
@@ -18,7 +18,7 @@ depends:
1818
checkoutSCM:
1919
scm: url
2020
url: https://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PKG_VERSION}.tar.gz
21-
digestSHA1: 9eb81f50e36e349f57297d1a2a61b48707a551cc
21+
digestSHA256: c09c5c085b2a0e391b8ee7d783a1d63fe444e96717cc1814d61b5e8fc2827a7c
2222
stripComponents: 1
2323

2424
multiPackage:

recipes/libs/elfutils.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
inherit: [autotools]
22

33
metaEnvironment:
4-
PKG_VERSION: "0.190"
4+
PKG_VERSION: "0.194"
55
PKG_LICENSE: "GPL-3.0-or-later"
66

77
depends:
@@ -13,7 +13,7 @@ depends:
1313
checkoutSCM:
1414
scm: url
1515
url: ${SOURCEWARE_MIRROR}/elfutils/${PKG_VERSION}/elfutils-${PKG_VERSION}.tar.bz2
16-
digestSHA256: 8e00a3a9b5f04bc1dc273ae86281d2d26ed412020b391ffcc23198f10231d692
16+
digestSHA256: 09e2ff033d39baa8b388a2d7fbc5390bfde99ae3b7c67c7daaf7433fbcf0f01e
1717
stripComponents: 1
1818

1919
buildTools: [m4]

recipes/libs/fontconfig.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
inherit: [autotools]
1+
inherit: [meson]
22

33
metaEnvironment:
4-
PKG_VERSION: "2.13.92"
4+
PKG_VERSION: "2.17.1"
55
PKG_LICENSE: "HPND AND Unicode-DFS-2016"
66

77
depends:
@@ -24,19 +24,19 @@ depends:
2424

2525
checkoutSCM:
2626
scm: url
27-
url: https://www.freedesktop.org/software/fontconfig/release/fontconfig-${PKG_VERSION}.tar.xz
28-
digestSHA256: 506e61283878c1726550bc94f2af26168f1e9f2106eac77eaaf0b2cdfad66e4e
27+
url: https://gitlab.freedesktop.org/fontconfig/fontconfig/-/archive/${PKG_VERSION}/fontconfig-${PKG_VERSION}.tar.bz2
28+
digestSHA256: bc1a90697eb8ec6c3eed118105ef9cbdfdd676e563905bf1cb571a705598300e
2929
stripComponents: 1
3030

3131
buildTools: [gettext, gperf]
3232
buildScript: |
33-
autotoolsBuild "$1"
33+
mesonBuild "$1"
3434
3535
multiPackage:
3636
dev:
37-
packageScript: autotoolsPackageDev
37+
packageScript: mesonPackageDev
3838
provideDeps: ["*-dev"]
3939

4040
tgt:
41-
packageScript: autotoolsPackageTgt
41+
packageScript: mesonPackageTgt
4242
provideDeps: ["*-tgt"]

recipes/libs/freetype.yaml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,30 @@
1-
inherit: [autotools]
1+
inherit: [meson]
22

33
metaEnvironment:
4-
PKG_VERSION: "2.10.4"
4+
PKG_VERSION: "2.14.2"
55
PKG_LICENSE: "FTL OR GPL-2.0-or-later"
66

77
depends:
88
- libs::libpng-dev
9-
109
- use: []
1110
depends:
1211
- libs::libpng-tgt
1312

1413
checkoutSCM:
1514
scm: url
1615
url: ${SOURCEFORGE_MIRROR}/freetype/freetype-${PKG_VERSION}.tar.xz
17-
digestSHA256: 86a854d8905b19698bbc8f23b860bc104246ce4854dcea8e3b0fb21284f75784
16+
digestSHA256: 4b62dcab4c920a1a860369933221814362e699e26f55792516d671e6ff55b5e1
1817
stripComponents: 1
1918

2019
buildTools: [host-toolchain]
2120
buildScript: |
22-
autotoolsBuild $1
21+
mesonBuild $1
2322
2423
multiPackage:
2524
dev:
26-
packageScript: autotoolsPackageDev
25+
packageScript: mesonPackageDev
2726
provideDeps: ["*-dev"]
2827

2928
tgt:
30-
packageScript: autotoolsPackageTgt
29+
packageScript: mesonPackageTgt
3130
provideDeps: ["*-tgt"]

recipes/libs/fribidi.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
inherit: [meson]
22

33
metaEnvironment:
4-
PKG_VERSION: "1.0.11"
4+
PKG_VERSION: "1.0.16"
55
PKG_LICENSE: "LGPL-2.1-or-later"
66

77
checkoutSCM:
88
scm: url
99
url: ${GITHUB_MIRROR}/fribidi/fribidi/releases/download/v${PKG_VERSION}/fribidi-${PKG_VERSION}.tar.xz
10-
digestSHA256: 30f93e9c63ee627d1a2cedcf59ac34d45bf30240982f99e44c6e015466b4e73d
10+
digestSHA256: 1b1cde5b235d40479e91be2f0e88a309e3214c8ab470ec8a2744d82a5a9ea05c
1111
stripComponents: 1
1212

1313
buildTools: [host-toolchain]

0 commit comments

Comments
 (0)