From 67c153ff2f6c6b30a68d3dbc49e2b289adfa7295 Mon Sep 17 00:00:00 2001 From: aliriza Date: Thu, 19 Jan 2023 14:09:02 +0000 Subject: [PATCH] fixes --- dev/libs/wayland/ympbuild | 1 + media/libs/libva/ympbuild | 1 + sys/apps/openrc/ympbuild | 15 ++++++++++++--- x11/libs/libdrm/ympbuild | 1 + x11/libs/libvdpau/ympbuild | 1 + 5 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dev/libs/wayland/ympbuild b/dev/libs/wayland/ympbuild index fe40a8b1..8af953d2 100644 --- a/dev/libs/wayland/ympbuild +++ b/dev/libs/wayland/ympbuild @@ -21,6 +21,7 @@ cd $name-$version setup(){ meson setup build --prefix=/usr \ --libdir=/usr/lib64 \ + -Ddefault_library=both \ -Ddocumentation=$(use_opt doc true false) } diff --git a/media/libs/libva/ympbuild b/media/libs/libva/ympbuild index 5051ab8e..156f1d4e 100644 --- a/media/libs/libva/ympbuild +++ b/media/libs/libva/ympbuild @@ -22,6 +22,7 @@ cd $name-$version setup(){ meson setup build --prefix=/usr \ --libdir=/usr/lib64/ \ + -Ddefault_library=both \ -Db_lto=true \ -Dwith_glx=no \ -Dwith_x11=$(use_opt x11 yes no) \ diff --git a/sys/apps/openrc/ympbuild b/sys/apps/openrc/ympbuild index 85694ac5..b25eaa24 100644 --- a/sys/apps/openrc/ympbuild +++ b/sys/apps/openrc/ympbuild @@ -15,16 +15,21 @@ md5sums=('8b74d3db544b496f6bb33d2648db5d2f' 'SKIP') group=() uses=() +uses_extra=(pam) +pam_depends=(pam) arch=('x86_64') cd $name-$version setup(){ meson setup build \ + --sysconfdir=/etc \ + --prefix=/ \ + -Ddefault_library=both \ -Dzsh-completions=true \ - -Dbash-completions=true \ - -Dpam=false \ - -Dpkgconfig=true + -Dbash-completions=true \ + -Dpam=$(use_opt pam true false) \ + -Dpkgconfig=true } build(){ @@ -32,6 +37,7 @@ build(){ } package(){ + export DESTDIR=${DESTDIR}// ninja -C build install # disable all services rm -f ${DESTDIR}/etc/runlevels/*/* @@ -46,5 +52,8 @@ package(){ echo "uucp:x:10:14:uucp:/var/spool/uucp:/bin/false" > ${DESTDIR}/etc/passwd.d/uucp # symlink init ln -s openrc-init ${DESTDIR}/sbin/init + # move /share to /usr/share + mkdir ${DESTDIR}/usr + mv ${DESTDIR}/{,usr}/share } diff --git a/x11/libs/libdrm/ympbuild b/x11/libs/libdrm/ympbuild index 0a919966..0943ee40 100644 --- a/x11/libs/libdrm/ympbuild +++ b/x11/libs/libdrm/ympbuild @@ -19,6 +19,7 @@ cd $name-$version setup(){ meson setup build --prefix=/usr \ + -D default_library=both \ -D udev=false \ -D etnaviv=disabled \ -D freedreno=disabled \ diff --git a/x11/libs/libvdpau/ympbuild b/x11/libs/libvdpau/ympbuild index 3f53026e..98a5936e 100644 --- a/x11/libs/libvdpau/ympbuild +++ b/x11/libs/libvdpau/ympbuild @@ -19,6 +19,7 @@ cd $name-$version setup(){ meson setup build --prefix=/usr \ + -Ddefault_library=both \ --libdir=/usr/lib64 \ -Ddri2=true }