From 71b4644ec0036c446b29dddcb29f1cee9e765335 Mon Sep 17 00:00:00 2001 From: aheirman <48590738+aheirman@users.noreply.github.com> Date: Thu, 8 Apr 2021 12:27:54 +0200 Subject: [PATCH 1/6] Set ld to lld in createimg --- createimg.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/createimg.sh b/createimg.sh index 0fe0593..2f4910d 100755 --- a/createimg.sh +++ b/createimg.sh @@ -47,6 +47,9 @@ mount ${LOOPBACK} ${ROOT} packages=(musl mksh bmake gmake llvm libressl cmake curl rsync flex byacc om4 zlib samurai libffi python ca-certificates zlib expat gettext-tiny git kati netbsd-curses kakoune iglunix rust toybox busybox less file pci-ids e2fsprogs util-linux linux-pam kbd) cp_packages ${ROOT} +echo "Linked ld.lld (from llvm) to ld" +ln -s /usr/bin/ld.lld /usr/bin/ld + echo "Copying misc files & creating misc dirs for live-usb" mkdir ${ROOT}/proc/ mkdir ${ROOT}/dev/ From dafb2394b83a12709e654a6a4fff94c9be0c86b9 Mon Sep 17 00:00:00 2001 From: aheirman <48590738+aheirman@users.noreply.github.com> Date: Thu, 8 Apr 2021 19:17:45 +0200 Subject: [PATCH 2/6] add dep to wayland-protocols --- pkgs/wayland-protocols/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/wayland-protocols/build.sh b/pkgs/wayland-protocols/build.sh index b70b6db..0806795 100644 --- a/pkgs/wayland-protocols/build.sh +++ b/pkgs/wayland-protocols/build.sh @@ -1,5 +1,6 @@ pkgname=wayland-protocols pkgver=1.20 +deps="pkgconf" fetch() { curl "https://wayland.freedesktop.org/releases/wayland-protocols-1.20.tar.xz" -o $pkgname-$pkgver.tar.xz From 78cd5e5079c4eda99eb508fdffb265024ba6fed6 Mon Sep 17 00:00:00 2001 From: aheirman <48590738+aheirman@users.noreply.github.com> Date: Thu, 8 Apr 2021 19:38:36 +0200 Subject: [PATCH 3/6] Add extra dep to wayland-protocols --- pkgs/wayland-protocols/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/wayland-protocols/build.sh b/pkgs/wayland-protocols/build.sh index 0806795..097c6c5 100644 --- a/pkgs/wayland-protocols/build.sh +++ b/pkgs/wayland-protocols/build.sh @@ -1,6 +1,6 @@ pkgname=wayland-protocols pkgver=1.20 -deps="pkgconf" +deps="pkgconf:wayland" fetch() { curl "https://wayland.freedesktop.org/releases/wayland-protocols-1.20.tar.xz" -o $pkgname-$pkgver.tar.xz From 626071e635a3eeafbd24d39f0dea20d7854ca296 Mon Sep 17 00:00:00 2001 From: aheirman <48590738+aheirman@users.noreply.github.com> Date: Thu, 8 Apr 2021 19:41:35 +0200 Subject: [PATCH 4/6] Add deps to wayland --- pkgs/wayland/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/wayland/build.sh b/pkgs/wayland/build.sh index e02a3ad..6c8bcba 100644 --- a/pkgs/wayland/build.sh +++ b/pkgs/wayland/build.sh @@ -1,5 +1,6 @@ pkgname=wayland pkgver=1.19.0 +deps="libxml2" fetch() { curl "https://wayland.freedesktop.org/releases/wayland-1.19.0.tar.xz" -o $pkgname-$pkgver.tar.xz From 1cf9b0af349354a0db70d9301cbbb45c1ed58582 Mon Sep 17 00:00:00 2001 From: aheirman <48590738+aheirman@users.noreply.github.com> Date: Thu, 8 Apr 2021 20:21:32 +0200 Subject: [PATCH 5/6] Add mesa dep --- pkgs/mesa/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/mesa/build.sh b/pkgs/mesa/build.sh index a1eed96..b0dbceb 100644 --- a/pkgs/mesa/build.sh +++ b/pkgs/mesa/build.sh @@ -1,6 +1,6 @@ pkgname=mesa pkgver=build-byacc -deps="musl:wayland:wayland-protocols:llvm:zlib:expat:libffi:libdrm" +deps="musl:wayland:wayland-protocols:llvm:zlib:expat:libffi:libdrm:python-mako" ext=dev fetch() { From 015ec48c739f6e615e79a68f221a0b71e3276bb8 Mon Sep 17 00:00:00 2001 From: aheirman <48590738+aheirman@user.noreply.github.com> Date: Thu, 8 Apr 2021 17:50:18 +0000 Subject: [PATCH 6/6] add libpciaccess --- pkgs/libdrm/build.sh | 1 + pkgs/libpciaccess/build.sh | 30 ++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/libpciaccess/build.sh diff --git a/pkgs/libdrm/build.sh b/pkgs/libdrm/build.sh index 12766d4..034705f 100644 --- a/pkgs/libdrm/build.sh +++ b/pkgs/libdrm/build.sh @@ -1,5 +1,6 @@ pkgver=2.4.103 pkgname=libdrm +dep="libpciaccess" bad="" ext="dev" diff --git a/pkgs/libpciaccess/build.sh b/pkgs/libpciaccess/build.sh new file mode 100644 index 0000000..58a11cc --- /dev/null +++ b/pkgs/libpciaccess/build.sh @@ -0,0 +1,30 @@ +pkgname=libpciaccess +pkgver=master + +fetch() { + curl "https://gitlab.freedesktop.org/xorg/lib/libpciaccess/-/archive/master/libpciaccess-master.tar.gz" -o $pkgname-$pkgver.tar.xz + tar -xf $pkgname-$pkgver.tar.xz + mkdir $pkgname-$pkgver/build +} + +build() { + cd $pkgname-$pkgver + cd build + meson .. \ + --buildtype=release \ + --prefix=/usr \ + --libexecdir=lib + samu +} + +package() { + cd $pkgname-$pkgver + cd build + DESTDIR=$pkgdir samu install +} + +license() { + cd $pkgname-$pkgver +# cat LICENSE + cat COPYING +}