September 2023 - CRUX - lists.crux.nu

Thoughts on making Crux more `alive' and `attractive'.
by Hans Bezemer 16 Mar '24

16 Mar '24

Dear fellow Crux-users, Recently there was some discussion in the IRC channel about how to make crux more `alive' and `attractive'. Being a relative new user I would like to share my thoughts. First of all, Crux has a lot of good things to offer: It's simplicity and script based orientation are unique. The package management through ports is simple but effective. Also there is some good documentation (but may be improved). And (last but not least) there's a friendly and helpful community. When I started out with Crux it took a while before I had everything up and running. Although I had used Arch for some while, went through the LFS-book twice, there was still a lot of ground to make up before I had my laptop configured the same way when using Arch. I had to hone several skills: building my own kernel, creating some udev rules, setting up networking using wpa_supplicant only (I know nm is at hand) and so on. Although the somewhat steep learning curve belongs to the way Crux works, there can be some minor improvements made which may help newcomers finding their way around more easily. First of, maybe Crux can become a rolling distro, with a new iso every month / 2 months. In practice it already seems to be. There are unofficial updated iso's and once you got everything installed everything can be kept up-to-date. As a new user I used the official iso (which is good practice I think), but after building the kernel, running a sysup was a bit of a showstopper. Almost all of the packages needed to be updated. When using the more recent unofficial iso, this is obvious not the case. Secondly, there is a lot of good documentation -especially on the Crux specific parts- but having two sources (Handbook and wiki) is somewhat confusing sometimes. Maybe merge the handbook into the wiki with an entry for installing Crux (like the installation guide on the Arch wiki)? The guide will walk the new user through a basic installation with links to several options (e.q. encrypting harddrive, using different bootloaders). At the end of the guide there can be some links to other entry (how to install packages, e.d.). It would be helpful if there is a basic `how to compile your own kernel'-tutorial. Something along the lines of `make defconfig', enabling audio and video support, untick some of the wlan firmware drivers, etc. Copying the bzImage and System.map and updating the boatloader. Lastly a guide on creating and maintaining your own repo (which is part of the charm of using Crux I think), would be very helpful. Beerman / Tim's guide would be a great starting point IMHO. https://gist.github.com/TimB87/6cf010c0c10d67faf98ae03e62ffb029 As for the documentation, for the most part it's a matter of reorganizing. Maybe a `further reading' section can be added at the end of an entry, with links to useful sources like the Arch wiki / offical kernel documentation and so on. The goal here is to keep it simple (of course ;-)) I'll be happy to help out with (re)writing some parts. What do you think? Would this be helpful? Or are there other / better options? Kind regards, Hans

9 13

Re: CRUX repo signature
by Steffen Nurpmeso 30 Sep '23

30 Sep '23

Hello Alex. I hope you do not mind i Cc crux. Alex Gendin wrote in <ZRhHecvOnJh9niTj(a)monztr.localdomain>: |I'd like to notify you that there is a wrong public key for stenur repo at |https://crux.nu/keys/stenur.pub | |Current content: |RWQEMWjN1NA433Yq0DdLR4RNIyPtJPUAwXr/foQb20AiPI2il3ZoU+4u | |Proper signature: |RWR3vzfQxghE/sh0Z+7BIfmmalVzCFOHJQ+jjpst4mew+hyORlWWEKyd Unfortunately yes, i asked two times to update it, but it was not done. You are right it is untrusted comment: steffen(a)sdaoden.eu public key RWR3vzfQxghE/sh0Z+7BIfmmalVzCFOHJQ+jjpst4mew+hyORlWWEKyd While having crux in Cc, libao removal was quite a hammer, no? vorbis-tools without ogg123 is quite odd. Just my humble opinion. Thank you, Alex! --steffen | |Der Kragenbaer, The moon bear, |der holt sich munter he cheerfully and one by one |einen nach dem anderen runter wa.ks himself off |(By Robert Gernhardt)

2 2

ports/xorg (3.7): [notify] mesa: 23.1.8 -> 23.2.1; new optional dependencies
by crux＠crux.nu 29 Sep '23

29 Sep '23

commit 6cfb6de28e160beb464086e333e7f9984fc3c27e Author: Tim Biermann <tbier(a)posteo.de> Date: Fri Sep 29 20:36:36 2023 +0200 [notify] mesa: 23.1.8 -> 23.2.1; new optional dependencies This update added and restructured new and existing dependencies! All of these are optional, see README.md Added: - directx-headers (optional) for gallium d3d12 support - libclc spirv-llvm-translator (optional) for gallium clover OpenCL frontend - libclc rust-bindgen spirv-llvm-translator (optional) for gallium rusticl OpenCL frontend - libunwind (optional) for stack-traces - lm_sensors (optional) for HUD lmsensors support Moved: - glslang (now optional), needed for vulkan support diff --git a/mesa/.footprint b/mesa/.footprint index abff3a83..1da15ad6 100644 --- a/mesa/.footprint +++ b/mesa/.footprint @@ -1,6 +1,4 @@ drwxr-xr-x root/root usr/ -drwxr-xr-x root/root usr/bin/ --r-xr-xr-x root/root usr/bin/mesa-overlay-control.py drwxr-xr-x root/root usr/include/ drwxr-xr-x root/root usr/include/EGL/ -rw-r--r-- root/root usr/include/EGL/eglext_angle.h @@ -36,17 +34,12 @@ lrwxrwxrwx root/root usr/lib/libGLX_mesa.so.0 -> libGLX_mesa.so.0.0.0 lrwxrwxrwx root/root usr/lib/libOSMesa.so -> libOSMesa.so.8 lrwxrwxrwx root/root usr/lib/libOSMesa.so.8 -> libOSMesa.so.8.0.0 -rwxr-xr-x root/root usr/lib/libOSMesa.so.8.0.0 --rwxr-xr-x root/root usr/lib/libVkLayer_INTEL_nullhw.so --rwxr-xr-x root/root usr/lib/libVkLayer_MESA_device_select.so --rwxr-xr-x root/root usr/lib/libVkLayer_MESA_overlay.so lrwxrwxrwx root/root usr/lib/libgbm.so -> libgbm.so.1 lrwxrwxrwx root/root usr/lib/libgbm.so.1 -> libgbm.so.1.0.0 -rwxr-xr-x root/root usr/lib/libgbm.so.1.0.0 lrwxrwxrwx root/root usr/lib/libglapi.so -> libglapi.so.0 lrwxrwxrwx root/root usr/lib/libglapi.so.0 -> libglapi.so.0.0.0 -rwxr-xr-x root/root usr/lib/libglapi.so.0.0.0 --rwxr-xr-x root/root usr/lib/libvulkan_intel.so --rwxr-xr-x root/root usr/lib/libvulkan_radeon.so lrwxrwxrwx root/root usr/lib/libxatracker.so -> libxatracker.so.2 lrwxrwxrwx root/root usr/lib/libxatracker.so.2 -> libxatracker.so.2.5.0 -rwxr-xr-x root/root usr/lib/libxatracker.so.2.5.0 @@ -58,16 +51,6 @@ drwxr-xr-x root/root usr/lib/pkgconfig/ drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/drirc.d/ -rw-r--r-- root/root usr/share/drirc.d/00-mesa-defaults.conf --rw-r--r-- root/root usr/share/drirc.d/00-radv-defaults.conf drwxr-xr-x root/root usr/share/glvnd/ drwxr-xr-x root/root usr/share/glvnd/egl_vendor.d/ -rw-r--r-- root/root usr/share/glvnd/egl_vendor.d/50_mesa.json -drwxr-xr-x root/root usr/share/vulkan/ -drwxr-xr-x root/root usr/share/vulkan/explicit_layer.d/ --rw-r--r-- root/root usr/share/vulkan/explicit_layer.d/VkLayer_INTEL_nullhw.json --rw-r--r-- root/root usr/share/vulkan/explicit_layer.d/VkLayer_MESA_overlay.json -drwxr-xr-x root/root usr/share/vulkan/icd.d/ --rw-r--r-- root/root usr/share/vulkan/icd.d/intel_icd.x86_64.json --rw-r--r-- root/root usr/share/vulkan/icd.d/radeon_icd.x86_64.json -drwxr-xr-x root/root usr/share/vulkan/implicit_layer.d/ --rw-r--r-- root/root usr/share/vulkan/implicit_layer.d/VkLayer_MESA_device_select.json diff --git a/mesa/.signature b/mesa/.signature index 75fb91ec..1f99af3d 100644 --- a/mesa/.signature +++ b/mesa/.signature @@ -1,5 +1,6 @@ untrusted comment: verify with /etc/ports/xorg.pub -RWTSGWF5Q7TndMZUh6CtS1yMoEogtMQajMu9S9dkm18VhfmV+wUhI7zVlgVRSTCCjcSgJU6O9EBNcqy2DmSPJOn7bzQH3QvGPQY= -SHA256 (Pkgfile) = bb3a938d94e9a807d4cb46464cf215cdf2e123f7a84a8e57a41ea318151ee8bb -SHA256 (.footprint) = 0a096e4a6066d23884d972266fbb66a32fe44c44877cebc2b82d4a9c694ece1e -SHA256 (mesa-23.1.8.tar.xz) = 45434ff91a709844130a3174d9c0ef39c6b50725b2bb0c13e736f36134db14ad +RWTSGWF5Q7TndNu1wro5Rp/Q3d9eriH0b7OG+dHAvMxdlHbKiC4oM+hukQO0JkYggC7mndzaM6eYOmoMv0rf1Q5AlncSf4DMGQ0= +SHA256 (Pkgfile) = 63172d7a4ad6e4fb377464bd7bcd1c21023ab121c55ce6f715a5f327c000f938 +SHA256 (.footprint) = 6924460d44cdb41ff53cb50c2c805ea5a8d2fa2b38127c474fa859b200f82f1c +SHA256 (mesa-23.2.1.tar.xz) = 64de0616fc2d801f929ab1ac2a4f16b3e2783c4309a724c8a259b20df8bbc1cc +SHA256 (U_clover-llvm-move-to-modern-pass-manager.patch) = 9174cd8a44d3841b2614e0386e212b0dfb56a6e26ea69c7c4415f77918d62f5d diff --git a/mesa/Pkgfile b/mesa/Pkgfile index f230ca9a..fe087b77 100644 --- a/mesa/Pkgfile +++ b/mesa/Pkgfile @@ -1,29 +1,34 @@ # Description: Mesa 3D Graphics Library # URL: https://www.mesa3d.org/ # Maintainer: CRUX Xorg Team, xorg-ports at crux dot nu -# Depends on: elfutils glslang libdrm libglvnd llvm python3-mako xorg-libxdamage xorg-libxrandr xorg-libxshmfence xorg-libxvmc xorg-libxxf86vm -# Optional: libva libvdpau wayland-protocols +# Depends on: elfutils libdrm libglvnd llvm python3-mako xorg-libxdamage xorg-libxrandr xorg-libxshmfence xorg-libxvmc xorg-libxxf86vm +# Optional: directx-headers glslang libclc libunwind libva libvdpau lm_sensors rust-bindgen spirv-llvm-translator vulkan-loader wayland-protocols name=mesa -version=23.1.8 -release=2 -source=(https://archive.mesa3d.org/$name-$version.tar.xz) +version=23.2.1 +release=1 +source=(https://archive.mesa3d.org/$name-$version.tar.xz + U_clover-llvm-move-to-modern-pass-manager.patch) build() { - prt-get isinst vulkan-loader && PKGMK_MESA_GALLIUM+='zink,' + prt-get isinst directx-headers && PKGMK_MESA_GALLIUM+='d3d12,' + prt-get isinst libclc spirv-llvm-translator && PKGMK_MESA+=' -D gallium-opencl=icd' + prt-get isinst libclc rust-bindgen spirv-llvm-translator && PKGMK_MESA+=' -D gallium-rusticl=true' + prt-get isinst glslang && PKGMK_MESA+=' -D vulkan-drivers=auto -D vulkan-layers=device-select,intel-nullhw,overlay' || PKGMK_MESA+=' -D vulkan-drivers=' + prt-get isinst libunwind && PKGMK_MESA+=' -D libunwind=enabled' + prt-get isinst libva && PKGMK_MESA+=' -D gallium-va=enabled' || PKGMK_MESA+=' -D gallium-va=disabled' prt-get isinst libvdpau && PKGMK_MESA+=' -D gallium-vdpau=enabled' || PKGMK_MESA+=' -D gallium-vdpau=disabled' + prt-get isinst lm_sensors && PKGMK_MESA+=' -D lmsensors=enabled' + prt-get isinst vulkan-loader && PKGMK_MESA_GALLIUM+='zink,' prt-get isinst wayland-protocols && PKGMK_MESA_PLATFORMS+='wayland' ## for future references #prt-get isinst xorg-libxdamage xorg-libxrandr xorg-libxshmfence xorg-libxvmc xorg-libxxf86vm && PKGMK_MESA_PLATFORMS+=',x11' PKGMK_MESA_PLATFORMS+=',x11' - CFLAGS+=' -mtls-dialect=gnu' - CXXFLAGS+=' -mtls-dialect=gnu' - - sed '/Scalar.h/d;/Utils.h/d' \ - -i mesa-$version/src/gallium/auxiliary/gallivm/lp_bld_init.c + # https://build.opensuse.org/package/show/openSUSE:Factory/Mesa + patch -Np1 -d $name-$version -i $SRC/U_clover-llvm-move-to-modern-pass-manager.patch - meson setup build mesa-$version $PKGMK_MESA \ + meson setup build $name-$version $PKGMK_MESA \ --prefix=/usr \ --sysconfdir=/etc \ --buildtype=plain \ @@ -43,8 +48,6 @@ build() { -D gallium-drivers=${PKGMK_MESA_GALLIUM}crocus,iris,nouveau,r300,r600,radeonsi,svga,swrast,virgl,i915 \ -D platforms=${PKGMK_MESA_PLATFORMS#,} \ -D shared-glapi=enabled \ - -D vulkan-drivers=amd,intel \ - -D vulkan-layers=device-select,intel-nullhw,overlay \ -D video-codecs=vc1dec,h264dec,h264enc,h265dec,h265enc \ -D glvnd=true diff --git a/mesa/README b/mesa/README deleted file mode 100644 index 123e4676..00000000 --- a/mesa/README +++ /dev/null @@ -1,6 +0,0 @@ -Install libva before building mesa to get hardware acceleration for the -following drivers: - -usr/lib/dri/nouveau_drv_video.so -usr/lib/dri/r600_drv_video.so -usr/lib/dri/radeonsi_drv_video.so diff --git a/mesa/README.md b/mesa/README.md new file mode 100644 index 00000000..dc019ac7 --- /dev/null +++ b/mesa/README.md @@ -0,0 +1,139 @@ +mesa options +============ + +Infos copied from various places*, built against current CRUX 3.7 + +*: +- [meson.build · main · Mesa / mesa · GitLab](https://gitlab.freedesktop.org/mesa/mesa/-/blob/main/meson.build?re… +- [meson_options.txt · main · Mesa / mesa · GitLab](https://gitlab.freedesktop.org/mesa/mesa/-/blob/main/meson_options.… +- [BLFS: Mesa-23.1.8](https://www.linuxfromscratch.org/blfs/view/svn/x/mesa.html) +- [File Mesa.spec of Package Mesa - openSUSE Build Service](https://build.opensuse.org/package/view_file/openSUSE:Factory/Mesa… + +## directx-headers + +``` +=======> New files found: +NEW -rwxr-xr-x root/root usr/lib/dri/d3d12_dri.so +=======> Building '/home/pkgmk/packages/mesa#23.2.1-1.pkg.tar.xz' succeeded. +``` + +## glslang + +glslang (for vulkan drivers) + +``` +=======> New files found: +NEW drwxr-xr-x root/root usr/bin/ +NEW -r-xr-xr-x root/root usr/bin/mesa-overlay-control.py +NEW -rwxr-xr-x root/root usr/lib/libVkLayer_MESA_overlay.so +NEW -rwxr-xr-x root/root usr/lib/libvulkan_intel.so +NEW -rwxr-xr-x root/root usr/lib/libvulkan_radeon.so +NEW -rw-r--r-- root/root usr/share/drirc.d/00-radv-defaults.conf +NEW -rw-r--r-- root/root usr/share/vulkan/explicit_layer.d/VkLayer_MESA_overlay.json +NEW -rw-r--r-- root/root usr/share/vulkan/icd.d/intel_icd.x86_64.json +NEW -rw-r--r-- root/root usr/share/vulkan/icd.d/radeon_icd.x86_64.json +=======> Building '/home/pkgmk/packages/mesa#23.2.1-1.pkg.tar.xz' succeeded. +``` + +## libclc spirv-llvm-translator + +``` +=======> New files found: +NEW drwxr-xr-x root/root etc/ +NEW drwxr-xr-x root/root etc/OpenCL/ +NEW drwxr-xr-x root/root etc/OpenCL/vendors/ +NEW -rw-r--r-- root/root etc/OpenCL/vendors/mesa.icd +NEW drwxr-xr-x root/root usr/lib/gallium-pipe/ +NEW -rwxr-xr-x root/root usr/lib/gallium-pipe/pipe_crocus.so +NEW -rwxr-xr-x root/root usr/lib/gallium-pipe/pipe_i915.so +NEW -rwxr-xr-x root/root usr/lib/gallium-pipe/pipe_iris.so +NEW -rwxr-xr-x root/root usr/lib/gallium-pipe/pipe_nouveau.so +NEW -rwxr-xr-x root/root usr/lib/gallium-pipe/pipe_r300.so +NEW -rwxr-xr-x root/root usr/lib/gallium-pipe/pipe_r600.so +NEW -rwxr-xr-x root/root usr/lib/gallium-pipe/pipe_radeonsi.so +NEW -rwxr-xr-x root/root usr/lib/gallium-pipe/pipe_swrast.so +NEW -rwxr-xr-x root/root usr/lib/gallium-pipe/pipe_vmwgfx.so +NEW lrwxrwxrwx root/root usr/lib/libMesaOpenCL.so -> libMesaOpenCL.so.1 +NEW lrwxrwxrwx root/root usr/lib/libMesaOpenCL.so.1 -> libMesaOpenCL.so.1.0.0 +NEW -rwxr-xr-x root/root usr/lib/libMesaOpenCL.so.1.0.0 +=======> Building '/home/pkgmk/packages/mesa#23.2.1-1.pkg.tar.xz' succeeded. +``` + +## libclc rust-bindgen spirv-llvm-translator + +``` +=======> New files found: +NEW drwxr-xr-x root/root etc/ +NEW drwxr-xr-x root/root etc/OpenCL/ +NEW drwxr-xr-x root/root etc/OpenCL/vendors/ +NEW -rw-r--r-- root/root etc/OpenCL/vendors/rusticl.icd +NEW lrwxrwxrwx root/root usr/lib/libRusticlOpenCL.so -> libRusticlOpenCL.so.1 +NEW lrwxrwxrwx root/root usr/lib/libRusticlOpenCL.so.1 -> libRusticlOpenCL.so.1.0.0 +NEW -rwxr-xr-x root/root usr/lib/libRusticlOpenCL.so.1.0.0 +=======> Building '/home/pkgmk/packages/mesa#23.2.1-1.pkg.tar.xz' succeeded. +``` + +## libunwind + +[unchanged] + +## libva + +Install libva before building mesa to get hardware acceleration for the +following drivers: + +> libva-2.19.0 (to provide VA-API support for some gallium drivers, note that +> there is a circular dependency. You must build libva first without EGL and +> GLX support, install this package, and rebuild libva) +[BLFS: Mesa-23.1.8](https://www.linuxfromscratch.org/blfs/view/svn/x/mesa.html) + +``` +=======> New files found: +NEW -rwxr-xr-x root/root usr/lib/dri/nouveau_drv_video.so +NEW -rwxr-xr-x root/root usr/lib/dri/r600_drv_video.so +NEW -rwxr-xr-x root/root usr/lib/dri/radeonsi_drv_video.so +NEW -rwxr-xr-x root/root usr/lib/dri/virtio_gpu_drv_video.so +=======> Building '/home/pkgmk/packages/mesa#23.2.1-1.pkg.tar.xz' succeeded. +``` + +## libvdpau + +libvdpau-1.5 (to build VDPAU drivers) + +``` +=======> New files found: +NEW drwxr-xr-x root/root usr/lib/vdpau/ +NEW lrwxrwxrwx root/root usr/lib/vdpau/libvdpau_nouveau.so -> libvdpau_nouveau.so.1.0.0 +NEW lrwxrwxrwx root/root usr/lib/vdpau/libvdpau_nouveau.so.1 -> libvdpau_nouveau.so.1.0.0 +NEW lrwxrwxrwx root/root usr/lib/vdpau/libvdpau_nouveau.so.1.0 -> libvdpau_nouveau.so.1.0.0 +NEW -rwxr-xr-x root/root usr/lib/vdpau/libvdpau_nouveau.so.1.0.0 +NEW lrwxrwxrwx root/root usr/lib/vdpau/libvdpau_r600.so -> libvdpau_r600.so.1.0.0 +NEW lrwxrwxrwx root/root usr/lib/vdpau/libvdpau_r600.so.1 -> libvdpau_r600.so.1.0.0 +NEW lrwxrwxrwx root/root usr/lib/vdpau/libvdpau_r600.so.1.0 -> libvdpau_r600.so.1.0.0 +NEW -rwxr-xr-x root/root usr/lib/vdpau/libvdpau_r600.so.1.0.0 +NEW lrwxrwxrwx root/root usr/lib/vdpau/libvdpau_radeonsi.so -> libvdpau_radeonsi.so.1.0.0 +NEW lrwxrwxrwx root/root usr/lib/vdpau/libvdpau_radeonsi.so.1 -> libvdpau_radeonsi.so.1.0.0 +NEW lrwxrwxrwx root/root usr/lib/vdpau/libvdpau_radeonsi.so.1.0 -> libvdpau_radeonsi.so.1.0.0 +NEW -rwxr-xr-x root/root usr/lib/vdpau/libvdpau_radeonsi.so.1.0.0 +NEW lrwxrwxrwx root/root usr/lib/vdpau/libvdpau_virtio_gpu.so -> libvdpau_virtio_gpu.so.1.0.0 +NEW lrwxrwxrwx root/root usr/lib/vdpau/libvdpau_virtio_gpu.so.1 -> libvdpau_virtio_gpu.so.1.0.0 +NEW lrwxrwxrwx root/root usr/lib/vdpau/libvdpau_virtio_gpu.so.1.0 -> libvdpau_virtio_gpu.so.1.0.0 +NEW -rwxr-xr-x root/root usr/lib/vdpau/libvdpau_virtio_gpu.so.1.0.0 +=======> Building '/home/pkgmk/packages/mesa#23.2.1-1.pkg.tar.xz' succeeded. +``` + +## lm_sensors + +[unchanged] + +## vulkan-loader + +``` +=======> New files found: +NEW -rwxr-xr-x root/root usr/lib/dri/zink_dri.so +=======> Building '/home/pkgmk/packages/mesa#23.2.1-1.pkg.tar.xz' succeeded. +``` + +## wayland-protocols + +[unchanged] diff --git a/mesa/U_clover-llvm-move-to-modern-pass-manager.patch b/mesa/U_clover-llvm-move-to-modern-pass-manager.patch new file mode 100644 index 00000000..7f33ad34 --- /dev/null +++ b/mesa/U_clover-llvm-move-to-modern-pass-manager.patch @@ -0,0 +1,126 @@ +From 2d4fe5f229791fde52846b3f583c12508b5109d6 Mon Sep 17 00:00:00 2001 +From: Dave Airlie <airlied(a)redhat.com> +Date: Fri, 25 Aug 2023 12:43:44 +1000 +Subject: [PATCH] clover/llvm: move to modern pass manager. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This seems like it should work, but I haven't tested it yet. + +Tested-by: Dieter Nützel <Dieter(a)nuetzel-hh.de> +Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24879> +--- + .../frontends/clover/llvm/invocation.cpp | 64 +++++++++++++++---- + 1 file changed, 51 insertions(+), 13 deletions(-) + +diff --git a/src/gallium/frontends/clover/llvm/invocation.cpp b/src/gallium/frontends/clover/llvm/invocation.cpp +index 7a50fea3323..43d26fe1abb 100644 +--- a/src/gallium/frontends/clover/llvm/invocation.cpp ++++ b/src/gallium/frontends/clover/llvm/invocation.cpp +@@ -27,13 +27,17 @@ + #include <llvm/IR/DiagnosticPrinter.h> + #include <llvm/IR/DiagnosticInfo.h> + #include <llvm/IR/LLVMContext.h> ++#include <llvm/IR/Module.h> + #include <llvm/Support/raw_ostream.h> +-#include <llvm/Transforms/IPO/PassManagerBuilder.h> ++#include <llvm/Transforms/IPO/Internalize.h> + #include <llvm-c/Target.h> + #ifdef HAVE_CLOVER_SPIRV + #include <LLVMSPIRVLib/LLVMSPIRVLib.h> + #endif + ++#include <llvm-c/TargetMachine.h> ++#include <llvm-c/Transforms/PassBuilder.h> ++#include <llvm/Support/CBindingWrapping.h> + #include <clang/CodeGen/CodeGenAction.h> + #include <clang/Lex/PreprocessorOptions.h> + #include <clang/Frontend/TextDiagnosticBuffer.h> +@@ -439,10 +443,10 @@ clover::llvm::compile_program(const std::string &source, + + namespace { + void +- optimize(Module &mod, unsigned optimization_level, ++ optimize(Module &mod, ++ const std::string& ir_target, ++ unsigned optimization_level, + bool internalize_symbols) { +- ::llvm::legacy::PassManager pm; +- + // By default, the function internalizer pass will look for a function + // called "main" and then mark all other functions as internal. Marking + // functions as internal enables the optimizer to perform optimizations +@@ -458,19 +462,53 @@ namespace { + if (internalize_symbols) { + std::vector<std::string> names = + map(std::mem_fn(&Function::getName), get_kernels(mod)); +- pm.add(::llvm::createInternalizePass( ++ internalizeModule(mod, + [=](const ::llvm::GlobalValue &gv) { + return std::find(names.begin(), names.end(), + gv.getName()) != names.end(); +- })); ++ }); + } + +- ::llvm::PassManagerBuilder pmb; +- pmb.OptLevel = optimization_level; +- pmb.LibraryInfo = new ::llvm::TargetLibraryInfoImpl( +- ::llvm::Triple(mod.getTargetTriple())); +- pmb.populateModulePassManager(pm); +- pm.run(mod); ++ ++ const char *opt_str = NULL; ++ LLVMCodeGenOptLevel level; ++ switch (optimization_level) { ++ case 0: ++ default: ++ opt_str = "default<O0>"; ++ level = LLVMCodeGenLevelNone; ++ break; ++ case 1: ++ opt_str = "default<O1>"; ++ level = LLVMCodeGenLevelLess; ++ break; ++ case 2: ++ opt_str = "default<O2>"; ++ level = LLVMCodeGenLevelDefault; ++ break; ++ case 3: ++ opt_str = "default<O3>"; ++ level = LLVMCodeGenLevelAggressive; ++ break; ++ } ++ ++ const target &target = ir_target; ++ LLVMTargetRef targ; ++ char *err_message; ++ ++ if (LLVMGetTargetFromTriple(target.triple.c_str(), &targ, &err_message)) ++ return; ++ LLVMTargetMachineRef tm = ++ LLVMCreateTargetMachine(targ, target.triple.c_str(), ++ target.cpu.c_str(), "", level, ++ LLVMRelocDefault, LLVMCodeModelDefault); ++ ++ if (!tm) ++ return; ++ LLVMPassBuilderOptionsRef opts = LLVMCreatePassBuilderOptions(); ++ LLVMRunPasses(wrap(&mod), opt_str, tm, opts); ++ ++ LLVMDisposeTargetMachine(tm); + } + + std::unique_ptr<Module> +@@ -500,7 +538,7 @@ clover::llvm::link_program(const std::vector<binary> &binaries, + auto c = create_compiler_instance(dev, dev.ir_target(), options, r_log); + auto mod = link(*ctx, *c, binaries, r_log); + +- optimize(*mod, c->getCodeGenOpts().OptimizationLevel, !create_library); ++ optimize(*mod, dev.ir_target(), c->getCodeGenOpts().OptimizationLevel, !create_library); + + static std::atomic_uint seq(0); + const std::string id = "." + mod->getModuleIdentifier() + "-" + +-- +2.42.0

1 0

ports/opt (3.7): [notify] thunderbird-bin: updated to version 115.3.0
by crux＠crux.nu 27 Sep '23

27 Sep '23

commit c6be78b2e38115da34c9d03620ae479e54fe6543 Author: Matt Housh <jaeger(a)crux.ninja> Date: Wed Sep 27 16:07:33 2023 -0500 [notify] thunderbird-bin: updated to version 115.3.0 Security release, fixes numerous CVEs; see https://www.mozilla.org/en-US/security/advisories/mfsa2023-43/ diff --git a/thunderbird-bin/.signature b/thunderbird-bin/.signature index d60057c88..f8ca24990 100644 --- a/thunderbird-bin/.signature +++ b/thunderbird-bin/.signature @@ -1,7 +1,7 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/dj09OtKUmCvi3wv3Fx/GBuhzzHszNnQOzaxYJRCIE/GZVPUQ/kuvClhAHfaPS88cK0xqf1/P2Oq1YZpL8UuMwo= -SHA256 (Pkgfile) = f4917352dc13fee6725c38f1a2cb0df96e1ec7cd54a91fd22ac569e4cd77c8e3 +RWSE3ohX2g5d/dy1WzsIuJmAYuZMtDdCmnh+mqeDArxE8DeT3UPpMs30wkdmxIUlU1k/0MhfeKw50xcMOh6UZ3KMiMpweMGLxAo= +SHA256 (Pkgfile) = be6fd337a63f71f00ebefc5d13d16a988d58084d1990b10b535d4ab52fb1e8d2 SHA256 (.footprint) = fb6d17faf972e295b3b5545f2a09d15697e86231f5802e2a709af00426f4c19c -SHA256 (thunderbird-115.2.3.tar.bz2) = b89f6d281224cbc9cabb419b7035a65dfc7bd9fc955d1416113c68dbb91335de +SHA256 (thunderbird-115.3.0.tar.bz2) = c75ba40ef9f8e1dd9b5311be29f2f83a27793d14b0438f1948dc6c64cf49aa2d SHA256 (policies.json) = cf856011307f7831d74cdacb4e80b6dceaa49882b8dcba008d527a78764903f4 SHA256 (thunderbird.desktop) = 8e3777e4d0c02418f0ea82240325c9f9b58cf60859b0b180217585e4ab288aba diff --git a/thunderbird-bin/Pkgfile b/thunderbird-bin/Pkgfile index dfa426566..538721507 100644 --- a/thunderbird-bin/Pkgfile +++ b/thunderbird-bin/Pkgfile @@ -4,7 +4,7 @@ # Depends on: gtk3 dbus-glib alsa-lib name=thunderbird-bin -version=115.2.3 +version=115.3.0 release=1 source=(https://ftp.mozilla.org/pub/thunderbird/releases/$version/linux-x86… policies.json thunderbird.desktop)

1 0

ports/contrib (3.7): [notify] ttf-unifont: not provided upstream anymore, use contrib/otf-unifont
by crux＠crux.nu 22 Sep '23

22 Sep '23

commit a080733a94c90be1828f958095ee64ed90a06108 Author: Tim Biermann <tbier(a)posteo.de> Date: Fri Sep 22 22:11:13 2023 +0200 [notify] ttf-unifont: not provided upstream anymore, use contrib/otf-unifont diff --git a/ttf-unifont/.footprint b/ttf-unifont/.footprint deleted file mode 100644 index e69de29bb..000000000 diff --git a/ttf-unifont/.signature b/ttf-unifont/.signature deleted file mode 100644 index e287f19f4..000000000 --- a/ttf-unifont/.signature +++ /dev/null @@ -1,5 +0,0 @@ -untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3/+vsYld2dbSRjd1aC1JPVu/rsZ/6ntDgMdr7a3paMCkG4mL6hV6Tw50w2UD8Fvnsl6u4k0UZXoBH/nTPPUOjQM= -SHA256 (Pkgfile) = c1216748320e56553c92b4730c396181631d3af919620d469ee1262a0a71b45e -SHA256 (.footprint) = e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 -SHA256 (unifont-15.1.01.tar.gz) = e15f4209a2f7937951681f4522b21a4deb9fb36220c82f8b8cb66e2b1466cdb7 diff --git a/ttf-unifont/Pkgfile b/ttf-unifont/Pkgfile deleted file mode 100644 index 59edce0c0..000000000 --- a/ttf-unifont/Pkgfile +++ /dev/null @@ -1,14 +0,0 @@ -# Description: TrueType version of the GNU Unifont -# URL: https://unifoundry.com/unifont.html -# Maintainer: Tim Biermann, tbier at posteo dot de - -name=ttf-unifont -version=15.1.01 -release=1 -source=(https://unifoundry.com/pub/unifont/unifont-$version/unifont-$version.tar.gz) - -build() { - find unifont-$version/font/precompiled \ - -iname "*.ttf" \ - -execdir install -Dm644 {} $PKG/usr/share/fonts/TTF/unifont/{} \; -}

1 0

ports/contrib (3.7): [notify] bind: updated to version 9.18.19
by crux＠crux.nu 21 Sep '23

21 Sep '23

commit 12c4bd37e7a578e6d6250bd056451adb33ed953c Author: Matt Housh <jaeger(a)crux.ninja> Date: Thu Sep 21 14:16:30 2023 -0500 [notify] bind: updated to version 9.18.19 Security fixes, see https://kb.isc.org/v1/docs/cve-2023-4236 and https://kb.isc.org/v1/docs/cve-2023-3341 diff --git a/bind/.footprint b/bind/.footprint index c6922b90c..d2ab385ce 100644 --- a/bind/.footprint +++ b/bind/.footprint @@ -266,27 +266,27 @@ drwxr-xr-x root/root usr/lib/bind/ -rwxr-xr-x root/root usr/lib/bind/filter-a.so -rwxr-xr-x root/root usr/lib/bind/filter-aaaa.la -rwxr-xr-x root/root usr/lib/bind/filter-aaaa.so --rwxr-xr-x root/root usr/lib/libbind9-9.18.18.so +-rwxr-xr-x root/root usr/lib/libbind9-9.18.19.so -rwxr-xr-x root/root usr/lib/libbind9.la -lrwxrwxrwx root/root usr/lib/libbind9.so -> libbind9-9.18.18.so --rwxr-xr-x root/root usr/lib/libdns-9.18.18.so +lrwxrwxrwx root/root usr/lib/libbind9.so -> libbind9-9.18.19.so +-rwxr-xr-x root/root usr/lib/libdns-9.18.19.so -rwxr-xr-x root/root usr/lib/libdns.la -lrwxrwxrwx root/root usr/lib/libdns.so -> libdns-9.18.18.so --rwxr-xr-x root/root usr/lib/libirs-9.18.18.so +lrwxrwxrwx root/root usr/lib/libdns.so -> libdns-9.18.19.so +-rwxr-xr-x root/root usr/lib/libirs-9.18.19.so -rwxr-xr-x root/root usr/lib/libirs.la -lrwxrwxrwx root/root usr/lib/libirs.so -> libirs-9.18.18.so --rwxr-xr-x root/root usr/lib/libisc-9.18.18.so +lrwxrwxrwx root/root usr/lib/libirs.so -> libirs-9.18.19.so +-rwxr-xr-x root/root usr/lib/libisc-9.18.19.so -rwxr-xr-x root/root usr/lib/libisc.la -lrwxrwxrwx root/root usr/lib/libisc.so -> libisc-9.18.18.so --rwxr-xr-x root/root usr/lib/libisccc-9.18.18.so +lrwxrwxrwx root/root usr/lib/libisc.so -> libisc-9.18.19.so +-rwxr-xr-x root/root usr/lib/libisccc-9.18.19.so -rwxr-xr-x root/root usr/lib/libisccc.la -lrwxrwxrwx root/root usr/lib/libisccc.so -> libisccc-9.18.18.so --rwxr-xr-x root/root usr/lib/libisccfg-9.18.18.so +lrwxrwxrwx root/root usr/lib/libisccc.so -> libisccc-9.18.19.so +-rwxr-xr-x root/root usr/lib/libisccfg-9.18.19.so -rwxr-xr-x root/root usr/lib/libisccfg.la -lrwxrwxrwx root/root usr/lib/libisccfg.so -> libisccfg-9.18.18.so --rwxr-xr-x root/root usr/lib/libns-9.18.18.so +lrwxrwxrwx root/root usr/lib/libisccfg.so -> libisccfg-9.18.19.so +-rwxr-xr-x root/root usr/lib/libns-9.18.19.so -rwxr-xr-x root/root usr/lib/libns.la -lrwxrwxrwx root/root usr/lib/libns.so -> libns-9.18.18.so +lrwxrwxrwx root/root usr/lib/libns.so -> libns-9.18.19.so drwxr-xr-x root/root usr/sbin/ -rwxr-xr-x root/root usr/sbin/ddns-confgen -rwxr-xr-x root/root usr/sbin/named diff --git a/bind/.signature b/bind/.signature index beb566a31..fdb0a1318 100644 --- a/bind/.signature +++ b/bind/.signature @@ -1,8 +1,8 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF38bjsdP3xpic5sqQAuRZpib37nSYOfm6/KmJrdE7hFeZVJUtx7WmuxFa5DSBqn4B0t3SL5A0XVJCzRlc+NTPjAw= -SHA256 (Pkgfile) = 0202a6056d20d3d65023bf199d3ef3c6135c5b40a18fbe30216d50f629191b5a -SHA256 (.footprint) = 58b6da7aa24ab543ac26c1ca30bee9a1d6c80fa47c8710524a64b2c952a10e95 -SHA256 (bind-9.18.18.tar.xz) = d735cdc127a6c5709bde475b5bf16fa2133f36fdba202f7c3c37d134e5192160 +RWSagIOpLGJF35g6XY6YN4kdgyZbP6vfHWm0JkdDSC0FHPbyp29nmDSFndgUyWRx7NMKNDEB21qarzuYUEzM3Xmz4sZaBbhohwo= +SHA256 (Pkgfile) = 308c099fb1859bd8908b280dbe8351e85e9121e52bd431d1e745817dbc36379d +SHA256 (.footprint) = 7ddfb48b14065da1258155cf96514d59930d98394d9b14a3fcd1ef9f1320ab38 +SHA256 (bind-9.18.19.tar.xz) = 115e09c05439bebade1d272eda08fa88eb3b60129edef690588c87a4d27612cc SHA256 (named.root) = 9fe5d2aa2e0537e30d370ca76c62982acfeb13c292d52e40e6e70a486b373d25 SHA256 (db.0.0.127) = 6c82640080a1c311005e7a264a2abbaabb7198f39430389b3ddf37cf22f42ff5 SHA256 (db.localhost) = 1a61cc85da0581a784c06535b2462f027bc850270ac7287c1152b8479dc7a053 diff --git a/bind/Pkgfile b/bind/Pkgfile index 180948049..0b466d56d 100644 --- a/bind/Pkgfile +++ b/bind/Pkgfile @@ -3,7 +3,7 @@ # Maintainer: Matt Housh, jaeger at crux dot ninja name=bind -version=9.18.18 +version=9.18.19 release=1 source=(https://downloads.isc.org/isc/bind9/$version/$name-$version.tar.xz named.root db.0.0.127 db.localhost db.ip6.arpa named named.conf)

1 0

ports/opt (3.7): [notify] libslirp: initial release, version 4.7.0
by crux＠crux.nu 16 Sep '23

16 Sep '23

commit c5a2033ee0ee99b809b7542049f47e2465f1b5ff Author: Juergen Daubert <jue(a)jue.li> Date: Sat Sep 16 18:25:03 2023 +0200 [notify] libslirp: initial release, version 4.7.0 if qemu version 8.1.0, release 3, is installed you have to force install this port because qemu includes the slirp libraries. As of release 4 of qemu this has been fixed and libslirp is needed for slirp support [1] in qemu. [1] https://wiki.qemu.org/Documentation/Networking#Network_HOWTOs diff --git a/libslirp/.footprint b/libslirp/.footprint new file mode 100644 index 000000000..f3160a993 --- /dev/null +++ b/libslirp/.footprint @@ -0,0 +1,11 @@ +drwxr-xr-x root/root usr/ +drwxr-xr-x root/root usr/include/ +drwxr-xr-x root/root usr/include/slirp/ +-rw-r--r-- root/root usr/include/slirp/libslirp-version.h +-rw-r--r-- root/root usr/include/slirp/libslirp.h +drwxr-xr-x root/root usr/lib/ +lrwxrwxrwx root/root usr/lib/libslirp.so -> libslirp.so.0 +lrwxrwxrwx root/root usr/lib/libslirp.so.0 -> libslirp.so.0.4.0 +-rwxr-xr-x root/root usr/lib/libslirp.so.0.4.0 +drwxr-xr-x root/root usr/lib/pkgconfig/ +-rw-r--r-- root/root usr/lib/pkgconfig/slirp.pc diff --git a/libslirp/.signature b/libslirp/.signature new file mode 100644 index 000000000..137e25e02 --- /dev/null +++ b/libslirp/.signature @@ -0,0 +1,5 @@ +untrusted comment: verify with /etc/ports/opt.pub +RWSE3ohX2g5d/S+Lw3lUnRVRSOGWLV/KD5PQEE8Y2PjNr/k7Ta1eQQi1N0OJxeK+VsVssKfCMpkoUCblxF2uqd4cnFMA+b62xwc= +SHA256 (Pkgfile) = 657a0f063e6a7ccf9c40ca70ab7fbdbe08cef05c68948855e6be83edb5b66276 +SHA256 (.footprint) = 721481d993facbba94eb2eafaec4dec9a303d88bd776f29625e33c3b926ffb16 +SHA256 (libslirp-v4.7.0.tar.bz2) = 358ce8b6ea59ec9deac937cc754f0115b992839e7b0cddf30ffb8f77dc21da82 diff --git a/libslirp/Pkgfile b/libslirp/Pkgfile new file mode 100644 index 000000000..70a06c945 --- /dev/null +++ b/libslirp/Pkgfile @@ -0,0 +1,21 @@ +# Description: A general purpose TCP-IP emulator +# URL: https://gitlab.freedesktop.org/slirp/libslirp +# Maintainer: Juergen Daubert, jue at crux dot nu +# Depends on: glib + +name=libslirp +version=4.7.0 +release=1 +source=(https://gitlab.freedesktop.org/slirp/$name/-/archive/v$version/$name-v$version.tar.bz2) + +build() { + meson setup build $name-v$version \ + --prefix=/usr \ + --buildtype=plain \ + --wrap-mode nodownload \ + -D b_lto=true \ + -D b_pie=true + + meson compile -C build -j ${JOBS:-1} + DESTDIR=$PKG meson install -C build +}

1 0

ports/opt (3.7): [notify] thunderbird-bin: updated to version 115.2.2
by crux＠crux.nu 13 Sep '23

13 Sep '23

commit c0348372ca083388df43d60c5d465363ef75332e Author: Matt Housh <jaeger(a)crux.ninja> Date: Wed Sep 13 18:19:27 2023 -0500 [notify] thunderbird-bin: updated to version 115.2.2 Security fixes, see https://www.mozilla.org/en-US/security/advisories/mfsa2023-40/ for details. diff --git a/thunderbird-bin/.signature b/thunderbird-bin/.signature index 0109d3bec..def873d1e 100644 --- a/thunderbird-bin/.signature +++ b/thunderbird-bin/.signature @@ -1,7 +1,7 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/QvxYxh5fmPp7fpzjuOnYl48bZnKyZPzG8h6QmxVj0e+rjYNLXDJ34oMEtHUk6MVL5VGROTEJp5XPbG+50VvHgI= -SHA256 (Pkgfile) = 06f9520d201117756a481b72e76aaa625a90d3216617aed255ff861d17782063 +RWSE3ohX2g5d/dEiY9psjfWwCC6njAqNQ+burX6GLj+kf6gkIIiesuS1zTJeKDqZE6B1wNWA7uxxlfDdj36d4ozwtxlhowRfggs= +SHA256 (Pkgfile) = 1426f1f31844d38f0eaaf60308b691b0292c00a5811021b95da0f259c5a39249 SHA256 (.footprint) = fb6d17faf972e295b3b5545f2a09d15697e86231f5802e2a709af00426f4c19c -SHA256 (thunderbird-115.2.0.tar.bz2) = 7e6d8a85bb88c70e20110e400044f6286b6986196e811158932663c2525cdefb +SHA256 (thunderbird-115.2.2.tar.bz2) = ffaee7ade088747636abf9ef9edafacc95591c1c317e39847a6dace08a863561 SHA256 (policies.json) = cf856011307f7831d74cdacb4e80b6dceaa49882b8dcba008d527a78764903f4 SHA256 (thunderbird.desktop) = 8e3777e4d0c02418f0ea82240325c9f9b58cf60859b0b180217585e4ab288aba diff --git a/thunderbird-bin/Pkgfile b/thunderbird-bin/Pkgfile index 297b8b6cf..881f89181 100644 --- a/thunderbird-bin/Pkgfile +++ b/thunderbird-bin/Pkgfile @@ -4,7 +4,7 @@ # Depends on: gtk3 dbus-glib alsa-lib name=thunderbird-bin -version=115.2.0 +version=115.2.2 release=1 source=(https://ftp.mozilla.org/pub/thunderbird/releases/$version/linux-x86… policies.json thunderbird.desktop)

1 0

ports/opt (3.7): [notify] poppler: update to 23.09.0
by crux＠crux.nu 08 Sep '23

08 Sep '23

commit ece87f13ed65d68dcd6ea0c73c25e0bf21442bd3 Author: Juergen Daubert <jue(a)jue.li> Date: Fri Sep 8 12:11:12 2023 +0200 [notify] poppler: update to 23.09.0 with this release we merge the ports poppler, poppler-glib, poppler-qt5 and poppler-qt6 together in one port poppler. The bindings for glib, qt5 and qt6 are build if the correlated ports are installed. To avoid file conflicts remove the old ports prior update: prt-get remove poppler-glib poppler-qt5 poppler-qt6 diff --git a/poppler/.footprint b/poppler/.footprint index 34bae3a2c..6ac2914e5 100644 --- a/poppler/.footprint +++ b/poppler/.footprint @@ -6,7 +6,6 @@ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/pdfimages -rwxr-xr-x root/root usr/bin/pdfinfo -rwxr-xr-x root/root usr/bin/pdfseparate --rwxr-xr-x root/root usr/bin/pdftocairo -rwxr-xr-x root/root usr/bin/pdftohtml -rwxr-xr-x root/root usr/bin/pdftoppm -rwxr-xr-x root/root usr/bin/pdftops @@ -20,9 +19,6 @@ drwxr-xr-x root/root usr/include/poppler/ -rw-r--r-- root/root usr/include/poppler/BBoxOutputDev.h -rw-r--r-- root/root usr/include/poppler/CMap.h -rw-r--r-- root/root usr/include/poppler/CachedFile.h --rw-r--r-- root/root usr/include/poppler/CairoFontEngine.h --rw-r--r-- root/root usr/include/poppler/CairoOutputDev.h --rw-r--r-- root/root usr/include/poppler/CairoRescaleBox.h -rw-r--r-- root/root usr/include/poppler/Catalog.h -rw-r--r-- root/root usr/include/poppler/CertificateInfo.h -rw-r--r-- root/root usr/include/poppler/CharCodeToUnicode.h @@ -124,7 +120,6 @@ drwxr-xr-x root/root usr/include/poppler/goo/ -rw-r--r-- root/root usr/include/poppler/goo/ImgWriter.h -rw-r--r-- root/root usr/include/poppler/goo/JpegWriter.h -rw-r--r-- root/root usr/include/poppler/goo/PNGWriter.h --rw-r--r-- root/root usr/include/poppler/goo/TiffWriter.h -rw-r--r-- root/root usr/include/poppler/goo/gdir.h -rw-r--r-- root/root usr/include/poppler/goo/gfile.h -rw-r--r-- root/root usr/include/poppler/goo/gmem.h @@ -157,9 +152,9 @@ drwxr-xr-x root/root usr/lib/ lrwxrwxrwx root/root usr/lib/libpoppler-cpp.so -> libpoppler-cpp.so.0 lrwxrwxrwx root/root usr/lib/libpoppler-cpp.so.0 -> libpoppler-cpp.so.0.11.0 -rwxr-xr-x root/root usr/lib/libpoppler-cpp.so.0.11.0 -lrwxrwxrwx root/root usr/lib/libpoppler.so -> libpoppler.so.130 -lrwxrwxrwx root/root usr/lib/libpoppler.so.130 -> libpoppler.so.130.0.0 --rwxr-xr-x root/root usr/lib/libpoppler.so.130.0.0 +lrwxrwxrwx root/root usr/lib/libpoppler.so -> libpoppler.so.131 +lrwxrwxrwx root/root usr/lib/libpoppler.so.131 -> libpoppler.so.131.0.0 +-rwxr-xr-x root/root usr/lib/libpoppler.so.131.0.0 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/poppler-cpp.pc -rw-r--r-- root/root usr/lib/pkgconfig/poppler.pc @@ -172,7 +167,6 @@ drwxr-xr-x root/root usr/share/man/man1/ -rw-r--r-- root/root usr/share/man/man1/pdfimages.1.gz -rw-r--r-- root/root usr/share/man/man1/pdfinfo.1.gz -rw-r--r-- root/root usr/share/man/man1/pdfseparate.1.gz --rw-r--r-- root/root usr/share/man/man1/pdftocairo.1.gz -rw-r--r-- root/root usr/share/man/man1/pdftohtml.1.gz -rw-r--r-- root/root usr/share/man/man1/pdftoppm.1.gz -rw-r--r-- root/root usr/share/man/man1/pdftops.1.gz diff --git a/poppler/.signature b/poppler/.signature index 59229e5d3..5ef8d8703 100644 --- a/poppler/.signature +++ b/poppler/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/UUzlvVMghNSQiej/6PbC411bt9lBWWpR7sbNvKpY42pHNgJ7FcVSSzRuGGQF2/IFwpGWsWXZMfFCNQzAQvY3g4= -SHA256 (Pkgfile) = 8fb3fa9a3e39034247e22568ab68688923d196b0d626f382f69eb9878722373b -SHA256 (.footprint) = ed283790f32d1c97dcc02b416fb8285e4d0b7ce619c2cf727bf231411fee48d6 -SHA256 (poppler-23.08.0.tar.xz) = 4a4bf7fc903b9f1a2ab7d04b7c5d8220db9bc6261cc73fdb9a826dc272f49aa8 +RWSE3ohX2g5d/QC+gsNLIfmXLWwQurSMbLv/WOszduKeFpbllOSHg9MeZGKVMEUZL9FcHO6y1+8TIkzVaRgnHZ0prKUuOUL9cwA= +SHA256 (Pkgfile) = ed2919262c818ecee6ed9a98cea54317fedc413f24fa7eb8407a71e88190f58c +SHA256 (.footprint) = db12d87aeecd23ec55d4dfdf92e13041e709eca6221bd70916028bf1466917c6 +SHA256 (poppler-23.09.0.tar.xz) = 80d1d44dd8bdf4ac1a47d56c5065075eb9991790974b1ed7d14b972acde88e55 diff --git a/poppler/Pkgfile b/poppler/Pkgfile index 7692d9881..5e8185c20 100644 --- a/poppler/Pkgfile +++ b/poppler/Pkgfile @@ -1,15 +1,22 @@ # Description: PDF rendering library based on xpdf 3.0 # URL: https://poppler.freedesktop.org/ # Maintainer: Juergen Daubert, jue at crux dot nu -# Depends on: cmake cairo lcms2 +# Depends on: freetype +# Optional: boost cairo curl gobject-introspection gpgme lcms2 libgd libtiff nss openjpeg2 qt5 qt6-base name=poppler -version=23.08.0 +version=23.09.0 release=1 source=(https://poppler.freedesktop.org/poppler-$version.tar.xz) build() { - cmake -S $name-$version -B build -G Ninja \ + prt-get isinst openjpeg2 || PKGMK_POPPLER+=' -D ENABLE_LIBOPENJPEG=none' + prt-get isinst boost || PKGMK_POPPLER+=' -D ENABLE_BOOST=off' + prt-get isinst gobject-introspection || PKGMK_POPPLER+=' -D ENABLE_GLIB=off' + prt-get isinst qt5 || PKGMK_POPPLER+=' -D ENABLE_QT5=off' + prt-get isinst qt6-base || PKGMK_POPPLER+=' -D ENABLE_QT6=off' + + cmake -S $name-$version -B build -G Ninja $PKGMK_POPPLER \ -D CMAKE_BUILD_TYPE=Release \ -D CMAKE_C_FLAGS_RELEASE="$CFLAGS" \ -D CMAKE_CXX_FLAGS_RELEASE="$CXXFLAGS" \ @@ -18,14 +25,10 @@ build() { -D ENABLE_UNSTABLE_API_ABI_HEADERS=ON \ -D ENABLE_UTILS=ON \ -D ENABLE_CPP=ON \ - -D ENABLE_GLIB=OFF \ - -D ENABLE_QT5=OFF \ - -D ENABLE_QT6=OFF \ - -D ENABLE_CMS=lcms2 \ - -D ENABLE_LIBOPENJPEG=none \ - -D ENABLE_BOOST=OFF \ - -D WITH_NSS3=OFF \ - -D RUN_GPERF_IF_PRESENT=OFF + -D BUILD_CPP_TESTS=OFF \ + -D BUILD_MANUAL_TESTS=OFF \ + -D BUILD_QT5_TESTS=OFF \ + -D BUILD_QT6_TESTS=OFF cmake --build build -j ${JOBS:-1} DESTDIR=$PKG cmake --install build

1 0

Re: prt-get functionality idea/suggestion - uninstalled port log
by John McQuah 07 Sep '23

07 Sep '23

Hi Dark_Bakura, On 1 September 2023, dark_bakura(a)protonmail.com wrote: > > wow, I know that I am a bit late to the reply (+year old), I had a > busy year and I do not open this account often as I should :) sorry > for a long delayed answer. No need to apologize for the long delay. It's a shame the original thread didn't receive another response. With more voices weighing in, you might have been steered toward a solution that better aligns with the CRUX Mantra, rather than making prt-get "just a bit" more complex and therefore no longer simple. > Even if I am not a very skilled C++ programmer, I just wrote a patch > which delete the removed package log file in /var/log/pkgbuild (if its > found), doing the behavior I wrote in my email to the crux list. I can see at least two reasons why you might have considered prt-get the natural tool to absorb your desired function: 1. Its own changelog reveals a commit that allowed prt-get to update the database of locked ports, upon removal of a package that was previously locked. You might point to that example to justify introducing another side effect of `prt-get remove`, and this argument could be made without appealing to anyone's experience doing package management on Slackware. 2. The other tool that cleans up a centralized directory (the Perl script ''oldfiles'') is specifically targeted at **pkgmk** artifacts, as evidenced by the fact that pkgmk.conf is the only global config it parses. But it requires **prt-get** to populate the central directory of build logs. Running pkgmk by hand will not put the logs into a central directory unless you redirect stderr and stdout yourself; if you do it that way, then ''oldfiles'' will have no clue what path you used to store the build logs. So in order to add this functionality to ''oldfiles'', I had to insert a routine that parses prt-get.conf, with the caveat that manual pkgmk processes might save logs in other places than what is specified by the "logfile" directive. 1+2. Seeing that automatic creation of build logs is the the consequence of orchestrating pkgmk processes through **prt-get** (while the downloads and built packages would be created no matter how you run pkgmk), the advice "clean up your own mess" would suggest delegating to prt-get any cleanup of those logs. Meanwhile **pkgmk** was always exempted from this advice (because from the beginning it expected to be paired with ''pkgadd'' and ''pkginfo'' -- or at least tar -- to do anything useful), and so companion scripts were written to provide the cleanup functionality (''prtwash'' or ''prtsweep'' when builds happen in the ports tree itself, ''oldfiles'' when central directories are used instead). Given that prt-get already accepts responsibility for "cleaning up its own mess" with respect to the locked ports database, you might naturally conclude that it should clean up its own mess with respect to build logs. If such was your thought process when you proposed this feature last year [1], I can see why you might consider it a good fit among the other features of prt-get. Arguing against this new feature in prt-get is the fact that it requires more explanation than code (at least 200 lines in the man-page and this thread, compared to less than 50 lines of C++), due to all the possible failure modes that the user must be made aware of. Note that ''oldfiles'' can incorporate your desired feature while better adhering to the principle of least surprise, because the user of ''oldfiles'' is already accustomed to post-processing the output with other tools. But by adding this feature to ''oldfiles'' we blur the line that previously demarcated whose mess ''oldfiles'' was designed to clean up. A user of this enhanced ''oldfiles'' will justifiably be confused as to which cleanup job was its primary role, and which cleanup job was tacked on later. We would be trading away some of the simplicity of prt-utils for better adherence to the principle of least surprise. I'm coming full-circle to the first reaction I had to your latest email. Namely, the tools we have are just fine as they are, and we should work on educating CRUX users how to combine them properly (FS#1410). A simple cron job, illustrated by the latest example in my expanded man-page [2], will accomplish what you asked for in your June thread last year. [1] https://lists.crux.nu/pipermail/crux/2022-June/007193.html [2] https://git.sdf.org/jmq/prt-get/src/branch/softdeps/doc/prt-get.8#L781 -- John

2 1