commit ec16b2d

hovercats  ·  2024-09-16 00:27:58 +0000 UTC
parent 7bbe9bc 
u-config: import to oasis' buildsystem.
its a smaller pkg-config implementation, and is less than half of pkgconf's size.
This will from now on serve as our pkg-config implementation.
There is also a linux specific implementation in the repo, but for the moment, it just segfaults. So the generic one will do for now.
70 files changed,  +18, -83
M .gitmodules
M pkg/gen.lua
A pkg/u-config/.gitignore
A pkg/u-config/gen.lua
A pkg/u-config/src
A pkg/u-config/ver
M repo/atk/depends
M repo/cairo/depends
M repo/ffmpeg/depends
M repo/fontconfig/depends
M repo/freetype-harfbuzz/depends
M repo/gdk-pixbuf/depends
M repo/glib-networking/depends
M repo/glib/depends
M repo/gnutls/depends
M repo/gtk+3/depends
M repo/libICE/depends
M repo/libSM/depends
M repo/libX11/depends
M repo/libXScrnSaver/depends
M repo/libXau/depends
M repo/libXcomposite/depends
M repo/libXcursor/depends
M repo/libXdamage/depends
M repo/libXdmcp/depends
M repo/libXext/depends
M repo/libXfixes/depends
M repo/libXfont/depends
M repo/libXft/depends
M repo/libXi/depends
M repo/libXinerama/depends
M repo/libXmu/depends
M repo/libXpresent/depends
M repo/libXrandr/depends
M repo/libXrender/depends
M repo/libXt/depends
M repo/libXtst/depends
M repo/libXxf86vm/depends
M repo/libass/depends
M repo/libdrm/depends
M repo/libelf/depends
M repo/libfontenc/depends
M repo/libsoup3/depends
M repo/libxcb/depends
M repo/libxkbcommon/depends
M repo/libxshmfence/depends
M repo/libxslt/depends
M repo/mesa/depends
M repo/mpv/depends
M repo/muon/depends
M repo/mupdf/depends
M repo/nettle/depends
M repo/pango/depends
D repo/pkgconf/build
D repo/pkgconf/checksums
D repo/pkgconf/sources
D repo/pkgconf/version
M repo/python/depends
M repo/st/depends
M repo/surf/depends
M repo/wayland/depends
M repo/xauth/depends
M repo/xcb-util-cursor/depends
M repo/xcb-util-image/depends
M repo/xcb-util-keysyms/depends
M repo/xcb-util-renderutil/depends
M repo/xcb-util/depends
M repo/xprop/depends
M repo/xtrans/depends
M sets.lua
M .gitmodules
+3, -0 
1@@ -284,3 +284,6 @@
2 [submodule "pkg/fribidi/src"]
3 	path = pkg/fribidi/src
4 	url = https://github.com/fribidi/fribidi
5+[submodule "pkg/u-config/src"]
6+	path = pkg/u-config/src
7+	url = https://github.com/skeeto/u-config
M pkg/gen.lua
+1, -0 
1@@ -87,6 +87,7 @@ subgen 'the_silver_searcher'
2 subgen 'tinyalsa'
3 subgen 'transmission'
4 subgen 'tz'
5+subgen 'u-config'
6 subgen 'ubase'
7 subgen 'unzip'
8 subgen 'utf8proc'
A pkg/u-config/.gitignore
+1, -0 
1@@ -0,0 +1 @@
2+/local.ninja
A pkg/u-config/gen.lua
+9, -0 
 1@@ -0,0 +1,9 @@
 2+exe('u-config', {'generic_main.c'})
 3+
 4+file('bin/u-config', '755', '$outdir/u-config')
 5+man{'u-config.1'}
 6+
 7+sym('bin/pkg-config', 'u-config')
 8+sym('share/man/man1/pkg-config.1.gz', 'u-config.1.gz')
 9+
10+fetch 'git'
A pkg/u-config/src
+1, -0 
1@@ -0,0 +1 @@
2+Subproject commit dee0676fbf4fdf470d7fcde7bbc29b0f0941ed4f
A pkg/u-config/ver
+1, -0 
1@@ -0,0 +1 @@
2+v0.33.1-2-gdee0676 r0
M repo/atk/depends
+0, -1 
1@@ -1,4 +1,3 @@
2 glib
3 libffi
4 meson   make
5-pkgconf make
M repo/cairo/depends
+0, -1 
1@@ -7,5 +7,4 @@ libpng
2 mesa
3 meson   make
4 pixman
5-pkgconf make
6 zlib
M repo/ffmpeg/depends
+0, -1 
1@@ -9,6 +9,5 @@ libvpx
2 libwebp
3 libxcb
4 opus
5-pkgconf make
6 xvidcore
7 zlib
M repo/fontconfig/depends
+0, -1 
1@@ -1,3 +1,2 @@
2 expat
3 freetype-harfbuzz
4-pkgconf make
M repo/freetype-harfbuzz/depends
+0, -1 
1@@ -13,4 +13,3 @@ libxcb
2 libxshmfence
3 meson   make
4 pixman
5-pkgconf make
M repo/gdk-pixbuf/depends
+0, -1 
1@@ -3,4 +3,3 @@ libX11
2 libjpeg-turbo
3 libpng
4 meson   make
5-pkgconf make
M repo/glib-networking/depends
+0, -1 
1@@ -1,4 +1,3 @@
2 glib
3 gnutls
4 meson	make
5-pkgconf make
M repo/glib/depends
+0, -1 
1@@ -1,6 +1,5 @@
2 libffi
3 meson   make
4 pcre2
5-pkgconf make
6 python-packaging make
7 zlib
M repo/gnutls/depends
+0, -1 
1@@ -1,2 +1 @@
2 nettle
3-pkgconf make
M repo/gtk+3/depends
+0, -1 
1@@ -16,5 +16,4 @@ libxkbcommon
2 mesa
3 meson   make
4 pango
5-pkgconf make
6 python  make
M repo/libICE/depends
+0, -1 
1@@ -1,3 +1,2 @@
2-pkgconf   make
3 xorgproto make
4 xtrans    make
M repo/libSM/depends
+0, -1 
1@@ -1,3 +1,2 @@
2 libICE
3-pkgconf make
4 xtrans  make
M repo/libX11/depends
+0, -1 
1@@ -1,5 +1,4 @@
2 libXau
3 libxcb
4-pkgconf make
5 xorgproto
6 xtrans  make
M repo/libXScrnSaver/depends
+0, -1 
1@@ -1,4 +1,3 @@
2 libX11
3 libXext
4-pkgconf   make
5 xorgproto make
M repo/libXau/depends
+0, -1 
1@@ -1,2 +1 @@
2-pkgconf   make
3 xorgproto make
M repo/libXcomposite/depends
+0, -1 
1@@ -1,3 +1,2 @@
2 libXfixes
3-pkgconf   make
4 xorgproto make
M repo/libXcursor/depends
+0, -1 
1@@ -1,4 +1,3 @@
2 libXfixes
3 libXrender
4-pkgconf   make
5 xorgproto make
M repo/libXdamage/depends
+0, -1 
1@@ -1,4 +1,3 @@
2 libX11
3 libXfixes
4-pkgconf   make
5 xorgproto make
M repo/libXdmcp/depends
+0, -1 
1@@ -1,2 +1 @@
2-pkgconf   make
3 xorgproto make
M repo/libXext/depends
+0, -1 
1@@ -1,3 +1,2 @@
2 libX11
3-pkgconf   make
4 xorgproto make
M repo/libXfixes/depends
+0, -1 
1@@ -1,2 +1 @@
2 libX11
3-pkgconf make
M repo/libXfont/depends
+0, -1 
1@@ -1,6 +1,5 @@
2 freetype-harfbuzz
3 libfontenc
4-pkgconf   make
5 xorgproto make
6 xtrans    make
7 zlib	  make
M repo/libXft/depends
+0, -1 
1@@ -1,5 +1,4 @@
2 fontconfig        make
3 freetype-harfbuzz make
4 libXrender        make
5-pkgconf           make
6 xorgproto         make
M repo/libXi/depends
+0, -1 
1@@ -1,5 +1,4 @@
2 libX11
3 libXext
4 libXfixes
5-pkgconf   make
6 xorgproto make
M repo/libXinerama/depends
+0, -1 
1@@ -1,3 +1,2 @@
2 libXext
3-pkgconf make
4 xorgproto
M repo/libXmu/depends
+0, -1 
1@@ -1,4 +1,3 @@
2 libXext
3 libXt
4-pkgconf          make
5 xorg-util-macros make
M repo/libXpresent/depends
+0, -1 
1@@ -2,5 +2,4 @@ libX11
2 libXext
3 libXfixes
4 libXrandr
5-pkgconf   make
6 xorgproto make
M repo/libXrandr/depends
+0, -1 
1@@ -1,4 +1,3 @@
2 libXext
3 libXrender
4-pkgconf   make
5 xorgproto make
M repo/libXrender/depends
+0, -1 
1@@ -1,4 +1,3 @@
2 libX11
3 libXext   make
4-pkgconf   make
5 xorgproto make
M repo/libXt/depends
+0, -1 
1@@ -1,4 +1,3 @@
2 libSM
3 libX11
4-pkgconf   make
5 xorgproto make
M repo/libXtst/depends
+0, -1 
1@@ -3,4 +3,3 @@ libXau
2 libXext
3 libXi
4 libxcb
5-pkgconf make
M repo/libXxf86vm/depends
+0, -1 
1@@ -1,4 +1,3 @@
2 libX11
3 libXext
4-pkgconf   make
5 xorgproto make
M repo/libass/depends
+0, -1 
1@@ -2,4 +2,3 @@ expat
2 fontconfig
3 freetype-harfbuzz
4 meson   make
5-pkgconf make
M repo/libdrm/depends
+0, -1 
1@@ -1,3 +1,2 @@
2 libpciaccess
3 meson         make
4-pkgconf       make
M repo/libelf/depends
+0, -1 
1@@ -1,2 +1 @@
2-pkgconf make
3 zlib
M repo/libfontenc/depends
+0, -1 
1@@ -1,3 +1,2 @@
2-pkgconf   make
3 xorgproto make
4 zlib	  make
M repo/libsoup3/depends
+0, -1 
1@@ -4,5 +4,4 @@ libnghttp2
2 libpsl
3 libxml2
4 meson make
5-pkgconf make
6 sqlite
M repo/libxcb/depends
+0, -1 
1@@ -1,5 +1,4 @@
2 libXau
3-pkgconf make
4 python  make
5 xcb-proto
6 xorg-util-macros
M repo/libxkbcommon/depends
+0, -1 
1@@ -1,2 +1 @@
2 meson    make
3-pkgconf make
M repo/libxshmfence/depends
+0, -1 
1@@ -1,2 +1 @@
2-pkgconf   make
3 xorgproto make
M repo/libxslt/depends
+0, -1 
1@@ -1,2 +1 @@
2 libxml2
3-pkgconf make
M repo/mesa/depends
+0, -1 
1@@ -10,7 +10,6 @@ libelf
2 libxcb
3 libxshmfence
4 meson         make
5-pkgconf       make
6 python        make
7 python-mako   make
8 xorgproto
M repo/mpv/depends
+0, -1 
1@@ -8,5 +8,4 @@ libXrandr
2 libass
3 libxkbcommon
4 meson make
5-pkgconf make
6 python  make
M repo/muon/depends
+0, -1 
1@@ -1 +0,0 @@
2-pkgconf make
M repo/mupdf/depends
+0, -1 
1@@ -6,5 +6,4 @@ libXext           make
2 libjpeg-turbo     make
3 libpng            make
4 libxcb            make
5-pkgconf           make
6 zlib              make
M repo/nettle/depends
+1, -1 
1@@ -1 +1 @@
2-m4 make
3+m4 make
M repo/pango/depends
+0, -1 
1@@ -5,4 +5,3 @@ glib
2 libXft
3 libXrender
4 meson   make
5-pkgconf make
D repo/pkgconf/build
+0, -21 
 1@@ -1,21 +0,0 @@
 2-#!/bin/sh -e
 3-
 4-export LDFLAGS="$LDFLAGS -static-pie"
 5-export CFLAGS="$CFLAGS -fPIE"
 6-
 7-./configure \
 8-    --prefix=/usr \
 9-    --sysconfdir=/etc \
10-    --mandir=/usr/share/man \
11-    --disable-shared
12-
13-make bin_PROGRAMS=pkgconf
14-make bin_PROGRAMS=pkgconf DESTDIR="$1" install
15-
16-ln -s pkgconf "$1/usr/bin/pkg-config"
17-
18-# Remove documentation (README, etc).
19-rm -rf "$1/usr/share/doc"
20-
21-# Compress manpages
22-find "$1/usr/share/man" -type f -exec gzip -n -9 {} +
D repo/pkgconf/checksums
+0, -1 
1@@ -1 +0,0 @@
2-edcfc85fb8ea61f9405d1f57fa644c3f2d2c581f5b14c2b3d409e19135168f0876
D repo/pkgconf/sources
+0, -1 
1@@ -1 +0,0 @@
2-https://distfiles.dereferenced.org/pkgconf/pkgconf-2.3.0.tar.xz
D repo/pkgconf/version
+0, -1 
1@@ -1 +0,0 @@
2-2.3.0 1
M repo/python/depends
+0, -1 
1@@ -1,5 +1,4 @@
2 libffi
3 libressl
4-pkgconf make
5 sqlite
6 zlib
M repo/st/depends
+0, -1 
1@@ -1,4 +1,3 @@
2 fontconfig make
3 libX11 make
4 libXft make
5-pkgconf make
M repo/surf/depends
+0, -1 
1@@ -1,3 +1,2 @@
2-pkgconf make
3 webkit2gtk
4 xprop
M repo/wayland/depends
+0, -1 
1@@ -1,4 +1,3 @@
2 expat
3 libffi
4 meson   make
5-pkgconf make
M repo/xauth/depends
+0, -1 
1@@ -1,3 +1,2 @@
2 libXmu make
3-pkgconf make
4 xorg-util-macros make
M repo/xcb-util-cursor/depends
+0, -1 
1@@ -1,6 +1,5 @@
2 libXau
3 libxcb
4-pkgconf make
5 xcb-util
6 xcb-util-image
7 xcb-util-renderutil
M repo/xcb-util-image/depends
+0, -1 
1@@ -1,4 +1,3 @@
2 libXau
3 libxcb
4-pkgconf make
5 xcb-util
M repo/xcb-util-keysyms/depends
+0, -1 
1@@ -1,3 +1,2 @@
2 libxcb
3-pkgconf  make
4 xcb-util make
M repo/xcb-util-renderutil/depends
+0, -1 
1@@ -1,3 +1,2 @@
2 libXau
3 libxcb
4-pkgconf make
M repo/xcb-util/depends
+0, -1 
1@@ -1,3 +1,2 @@
2 libXau
3 libxcb
4-pkgconf make
M repo/xprop/depends
+0, -1 
1@@ -1,3 +1,2 @@
2 libX11
3 libXmu
4-pkgconf make
M repo/xtrans/depends
+0, -1 
1@@ -1 +0,0 @@
2-pkgconf make
M sets.lua
+1, -0 
1@@ -46,6 +46,7 @@ return {
2 		'qbe',
3 		'strace',
4 		'the_silver_searcher',
5+		'u-config',
6 		'wayland',
7 	},
8 	net={