Commit: 81d098a0a47a05593abab71a64a6e79c4d39ef4e
Parent: 71b01b9ecd03f8daf4ded4893b2bb2983307f24c
Author: Randy Palamar
Date: Sat, 10 Aug 2024 07:22:23 -0600
bump portage config
Nothing major here besides:
* remove CHOST from make.conf
* switch to a 23.0 profile
Diffstat:
12 files changed, 126 insertions(+), 14 deletions(-)
diff --git a/.config/sys/etc/portage/make.conf b/.config/sys/etc/portage/make.conf
@@ -1,5 +1,3 @@
-CHOST="x86_64-gentoo-linux-musl"
-
COMMON_FLAGS="-O2 -pipe -march=native"
CFLAGS="${COMMON_FLAGS}"
CXXFLAGS="${COMMON_FLAGS}"
@@ -26,6 +24,7 @@ USE="alsa clang cjk ffmpeg opengl savedconfig \
gif jpeg png vpx webp -jpeg2k -svg \
-acl -accessibility -bzip2 -cups -deprecated \
-cxx -fortran -openmp \
+ -initramfs \
-gdbm -gnome -gnome-keyring -gnutls -idn -ldap \
-ncurses -nls -pam -pcre -readline -smartcard \
dbus -gtk3 -udisks -systemd"
diff --git a/.config/sys/etc/portage/make.profile b/.config/sys/etc/portage/make.profile
@@ -1 +1 @@
-/usr/portage/clang-musl/profiles/default/linux/amd64/17.0/musl/llvm-toolchain/hardened
-\ No newline at end of file
+/usr/portage/clang-musl/profiles/default/linux/amd64/23.0/split-usr/musl/llvm/hardened
+\ No newline at end of file
diff --git a/.config/sys/etc/portage/package.accept_keywords/set b/.config/sys/etc/portage/package.accept_keywords/set
@@ -27,10 +27,17 @@ media-libs/libplacebo ~amd64
media-sound/ncmpcpp ~amd64
media-video/mpv ~amd64
+~media-libs/glfw-3.4 ~amd64
+
# No stable version
~x11-misc/xidle-26052015 ~amd64
+media-gfx/renderdoc ~amd64
+media-video/obs-studio ~amd64
+
www-client/firefox ~amd64
+~dev-libs/nss-3.103 ~amd64
+~net-libs/nodejs-22.4.1::clang-musl ~amd64
app-text/tesseract ~amd64
@@ -39,5 +46,5 @@ app-text/tesseract ~amd64
sys-kernel/gentoo-sources ~amd64
-dev-lang/rust::clang-musl ~amd64
-virtual/rust ~amd64
+# TEMP: needed to build with clang-18
+~app-text/doxygen-1.11.0
diff --git a/.config/sys/etc/portage/package.unmask b/.config/sys/etc/portage/package.unmask
@@ -1 +1,2 @@
+media-gfx/renderdoc
x11-wm/dwm::rnpnr
diff --git a/.config/sys/etc/portage/package.use/app b/.config/sys/etc/portage/package.use/app
@@ -2,10 +2,14 @@ app-alternatives/gzip pigz -reference
app-alternatives/ninja samurai -reference
app-alternatives/sh dash -bash
app-alternatives/yacc byacc -bison
+app-arch/libarchive bzip2
app-arch/zstd static-libs
+app-crypt/gcr gtk
app-crypt/gnupg -ssl
+app-crypt/libsecret -vala -introspection
app-crypt/mit-krb5 -keyutils -pkinit
app-dicts/myspell-en l10n_en
+app-editors/vim -crypt -X # for running vis tests
app-emulation/qemu -curl -doc -gtk -pin-upstream-blobs -usb -vnc
app-i18n/ibus gtk3
app-i18n/kakasi l10n_ja
@@ -16,6 +20,7 @@ app-text/mandoc system-man
app-text/mupdf -opengl -curl -javascript -ssl
app-text/pandoc-cli -server -lua
app-text/poppler cairo
+app-text/tessdata_fast l10n_ja
app-text/tesseract float32 tiff
app-text/texlive graphics luatex science l10n_ja -X
app-text/texlive-core xetex
diff --git a/.config/sys/etc/portage/package.use/dev b/.config/sys/etc/portage/package.use/dev
@@ -17,6 +17,7 @@ dev-libs/popt static-libs # cryptsetup
dev-lua/ldoc lua_single_target_luajit
dev-python/matplotlib latex
dev-python/numpy -lapack
+dev-python/pillow tiff
dev-qt/qtgui dbus egl ibus
dev-qt/qtwebchannel qml
dev-vcs/git -iconv -python -pcre -webdav
diff --git a/.config/sys/etc/portage/package.use/media b/.config/sys/etc/portage/package.use/media
@@ -1,6 +1,7 @@
media-fonts/source-han-sans L10N: ja ko zh-TW
media-fonts/source-pro cjk
media-gfx/imagemagick svg tiff xml
+media-gfx/renderdoc qt5
media-libs/freetype harfbuzz
media-libs/gegl cairo -ffmpeg
media-libs/harfbuzz icu # needed for Tex
@@ -14,7 +15,6 @@ media-libs/libpng apng
media-libs/libsdl2 gles2 ibus dbus
media-libs/libvpx postproc
media-libs/mesa libglvnd gles1 gles2 osmesa
-media-libs/tiff -jpeg
media-sound/alsa-utils ncurses
media-sound/lame -frontend
media-sound/mpd fifo -mad -curl -icu -network -audiofile
@@ -22,4 +22,5 @@ media-sound/ncmpcpp visualizer taglib outputs
media-sound/vorbis-tools -ogg123
media-video/ffmpeg openssl libplacebo libdrm libass mp3 x264 x265 -hardcoded-tables
media-video/mpv cli drm gbm lua -jpeg -uchardet -vaapi -pulseaudio
+media-video/obs-studio v4l
media-video/pipewire extra sound-server flatpak pipewire-alsa -X
diff --git a/.config/sys/etc/portage/package.use/net b/.config/sys/etc/portage/package.use/net
@@ -1,4 +1,6 @@
net-dns/unbound threads
+net-libs/mbedtls threads
+net-libs/ngtcp2 gnutls
net-libs/nodejs icu system-icu -npm
net-misc/curl ssh
net-misc/openntpd constraints
diff --git a/.config/sys/etc/portage/patches/media-gfx/inkscape/Avoid-std-shared_ptr-T-unique.patch b/.config/sys/etc/portage/patches/media-gfx/inkscape/Avoid-std-shared_ptr-T-unique.patch
@@ -0,0 +1,23 @@
+https://gitlab.com/inkscape/lib2geom/-/issues/74
+https://gitlab.com/inkscape/lib2geom/-/commit/9b1ff56ae90db7fbbceebaac3ccf521f6ceb32f4
+
+---
+ src/3rdparty/2geom/include/2geom/path.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/3rdparty/2geom/include/2geom/path.h b/src/3rdparty/2geom/include/2geom/path.h
+index f3042d7..f6fb759 100644
+--- a/src/3rdparty/2geom/include/2geom/path.h
++++ b/src/3rdparty/2geom/include/2geom/path.h
+@@ -843,7 +843,7 @@ private:
+ void _unshare() {
+ // Called before every mutation.
+ // Ensure we have our own copy of curve data and reset cached values
+- if (!_data.unique()) {
++ if (_data.use_count() != 1) {
+ _data.reset(new PathData(*_data));
+ _closing_seg = static_cast<ClosingSegment*>(&_data->curves.back());
+ }
+--
+2.45.2
+
diff --git a/.config/sys/etc/portage/patches/media-gfx/renderdoc/musl-fix.patch b/.config/sys/etc/portage/patches/media-gfx/renderdoc/musl-fix.patch
@@ -0,0 +1,52 @@
+diff --git a/renderdoc/3rdparty/plthook/plthook_elf.c b/renderdoc/3rdparty/plthook/plthook_elf.c
+index 612f689d6..907e7f63e 100644
+--- a/renderdoc/3rdparty/plthook/plthook_elf.c
++++ b/renderdoc/3rdparty/plthook/plthook_elf.c
+@@ -233,7 +233,11 @@ int plthook_open_by_address(plthook_t **plthook_out, void *address)
+ struct link_map *lmap = NULL;
+
+ *plthook_out = NULL;
++#ifdef __GLIBC__
+ if (dladdr1(address, &info, (void**)&lmap, RTLD_DL_LINKMAP) == 0) {
++#else
++ if (dladdr(address, &info) == 0) {
++#endif
+ set_errmsg("dladdr error");
+ return PLTHOOK_FILE_NOT_FOUND;
+ }
+@@ -243,7 +247,7 @@ int plthook_open_by_address(plthook_t **plthook_out, void *address)
+
+ static int plthook_open_executable(plthook_t **plthook_out)
+ {
+-#if defined __linux__
++#if defined __linux__ && defined __GLIBC__
+ return plthook_open_real(plthook_out, _r_debug.r_map);
+ #elif defined __sun
+ const char *auxv_file = "/proc/self/auxv";
+diff --git a/renderdoc/os/os_specific.h b/renderdoc/os/os_specific.h
+index cc9a6b09e..844597450 100644
+--- a/renderdoc/os/os_specific.h
++++ b/renderdoc/os/os_specific.h
+@@ -31,6 +31,7 @@
+
+ #pragma once
+
++#include <time.h>
+ #include <stdarg.h>
+ #include <stddef.h>
+ #include <stdint.h>
+diff --git a/renderdoc/os/posix/linux/linux_hook.cpp b/renderdoc/os/posix/linux/linux_hook.cpp
+index 4989e2865..0acb3ac0b 100644
+--- a/renderdoc/os/posix/linux/linux_hook.cpp
++++ b/renderdoc/os/posix/linux/linux_hook.cpp
+@@ -36,6 +36,10 @@
+ #include "plthook/plthook.h"
+ #include "strings/string_utils.h"
+
++#ifndef __GLIBC__
++#define RTLD_DEEPBIND 0
++#endif
++
+ Threading::CriticalSection libLock;
+
+ RDOC_EXTERN_CONFIG(bool, Linux_Debug_PtraceLogging);
diff --git a/.config/sys/etc/portage/patches/media-gfx/renderdoc/no-execinfo.patch b/.config/sys/etc/portage/patches/media-gfx/renderdoc/no-execinfo.patch
@@ -0,0 +1,21 @@
+diff --git a/renderdoc/os/posix/linux/linux_callstack.cpp b/renderdoc/os/posix/linux/linux_callstack.cpp
+index f0b44b0..558765d 100644
+--- a/renderdoc/os/posix/linux/linux_callstack.cpp
++++ b/renderdoc/os/posix/linux/linux_callstack.cpp
+@@ -27,7 +27,6 @@
+ #define _GNU_SOURCE
+ #endif
+
+-#include <execinfo.h>
+ #include <link.h>
+ #include <stdio.h>
+ #include <string.h>
+@@ -66,7 +65,7 @@ private:
+ {
+ void *addrs_ptr[ARRAY_COUNT(addrs)];
+
+- int ret = backtrace(addrs_ptr, ARRAY_COUNT(addrs));
++ int ret = 0;
+
+ numLevels = 0;
+ if(ret > 0)
diff --git a/.config/sys/var/lib/portage/world b/.config/sys/var/lib/portage/world
@@ -1,14 +1,11 @@
app-admin/doas
app-crypt/pinentry-dmenu
app-dicts/kasumi
-app-emulation/qemu
app-i18n/ibus-anthy
app-i18n/kakasi
app-i18n/uchardet
app-misc/abduco
app-misc/cmatrix
-app-misc/scroll
-app-office/calcurse
app-portage/gentoolkit
app-portage/smart-live-rebuild
app-shells/dash
@@ -28,11 +25,9 @@ dev-libs/libtermkey
dev-lua/ldoc
dev-lua/lpeg
dev-lua/luacheck
-dev-python/black
dev-python/eyeD3
-dev-python/matplotlib
-dev-python/pandas
dev-tex/biber
+dev-texlive/texlive-publishers
dev-util/perf
dev-util/shellcheck
media-fonts/dejavu
@@ -42,10 +37,12 @@ media-fonts/shinonome
media-fonts/source-han-sans
media-fonts/source-sans
media-fonts/source-serif
-media-gfx/farbfeld
media-gfx/gimp
media-gfx/imagemagick
+media-gfx/inkscape
+media-gfx/mypaint
media-gfx/pdf2svg
+media-gfx/renderdoc
media-libs/glfw
media-sound/mpc
media-sound/mpd
@@ -56,13 +53,16 @@ media-sound/vorbis-tools
media-video/ffmpeg
media-video/mkvtoolnix
media-video/mpv
+media-video/obs-studio
net-mail/isync
net-misc/dhcpcd
net-misc/openntpd
net-misc/yt-dlp
net-p2p/syncthing
+net-p2p/transmission-remote-gtk
net-wireless/wpa_supplicant
sys-apps/flatpak
+sys-apps/man-pages
sys-devel/mold
sys-fs/cryptsetup
sys-fs/ntfs3g