AOSC-Dev · MingcongBai · Jan 5, 2025 · Jan 5, 2025 · Jan 5, 2025 · Jan 5, 2025
diff --git a/groups/optenv32 b/groups/optenv32
@@ -0,0 +1,202 @@
+runtime-optenv32/linux+api+32
+runtime-optenv32/libxcrypt+32
+runtime-optenv32/mpc+32
+runtime-optenv32/mpfr+32
+runtime-optenv32/gmp+32
+runtime-optenv32/zlib+32
+runtime-optenv32/binutils+32
+runtime-optenv32/gcc+32
+runtime-optenv32/devel-base+32
+runtime-optenv32/glibc+32
+runtime-optenv32/lm-sensors+32
+runtime-optenv32/libidn+32
+runtime-optenv32/expat+32
+runtime-optenv32/brotli+32
+runtime-optenv32/bzip2+32
+runtime-optenv32/libpng+32
+runtime-optenv32/x11-proto+32
+runtime-optenv32/libxau+32
+runtime-optenv32/libxdmcp+32
+runtime-optenv32/ncurses+32
+runtime-optenv32/readline+32
+runtime-optenv32/xz+32
+runtime-optenv32/libxml2+32
+runtime-optenv32/libgpg-error+32
+runtime-optenv32/libgcrypt+32
+runtime-optenv32/libxslt+32
+runtime-optenv32/libxcb+32
+runtime-optenv32/tcl+32
+runtime-optenv32/sqlite+32
+runtime-optenv32/util-linux+32
+runtime-optenv32/json-c+32
+runtime-optenv32/elfutils+32
+runtime-optenv32/libffi+32
+runtime-optenv32/pcre2+32
+runtime-optenv32/glib+32
+runtime-optenv32/dbus+32
+runtime-optenv32/icu+32
+runtime-optenv32/x11-lib+32
+runtime-optenv32/libpng-1.6+32
+runtime-optenv32/harfbuzz+32
+runtime-optenv32/freetype+32
+runtime-optenv32/fontconfig+32
+runtime-optenv32/lzo+32
+runtime-optenv32/pixman+32
+runtime-optenv32/cairo+32
+runtime-optenv32/libdrm+32
+runtime-optenv32/libunwind+32
+runtime-optenv32/libjpeg-turbo+32
+runtime-optenv32/libtiff+32
+runtime-optenv32/giflib+32
+runtime-optenv32/libid3tag+32
+runtime-optenv32/imlib2+32
+runtime-optenv32/spirv-tools+32
+runtime-optenv32/alsa-lib+32
+runtime-optenv32/sdl+32
+runtime-optenv32/at-spi2-core+32
+runtime-optenv32/shared-mime-info+32
+runtime-optenv32/gdk-pixbuf+32
+runtime-optenv32/zstd+32
+runtime-optenv32/llvm+32
+runtime-optenv32/attr+32
+runtime-optenv32/acl+32
+runtime-optenv32/eudev+32
+runtime-optenv32/libvdpau+32
+runtime-optenv32/libglvnd+32
+runtime-optenv32/spirv-llvm-translator+32
+runtime-optenv32/wayland+32
+runtime-optenv32/rustc+32
+runtime-optenv32/mesa+32
+runtime-optenv32/libva+32
+runtime-optenv32/libepoxy+32
+runtime-optenv32/libxkbcommon+32
+runtime-optenv32/fribidi+32
+runtime-optenv32/libdatrie+32
+runtime-optenv32/libthai+32
+runtime-optenv32/pango+32
+runtime-optenv32/gtk-3+32
+runtime-optenv32/libcddb+32
+runtime-optenv32/libcdio+32
+runtime-optenv32/popt+32
+runtime-optenv32/dbus-glib+32
+runtime-optenv32/libxnvctrl+32
+runtime-optenv32/nettle+32
+runtime-optenv32/gnutls+32
+runtime-optenv32/openssl+32
+runtime-optenv32/openldap+32
+runtime-optenv32/krb5+32
+runtime-optenv32/libssh2+32
+runtime-optenv32/rtmpdump+32
+runtime-optenv32/curl+32
+runtime-optenv32/v4l-utils+32
+runtime-optenv32/orc+32
+runtime-optenv32/schroedinger+32
+runtime-optenv32/lame+32
+runtime-optenv32/libmpeg2+32
+runtime-optenv32/libraw1394+32
+runtime-optenv32/libiec61883+32
+runtime-optenv32/libavc1394+32
+runtime-optenv32/lcms2+32
+runtime-optenv32/openjpeg-legacy+32
+runtime-optenv32/nasm+32
+runtime-optenv32/xvidcore+32
+runtime-optenv32/recode+32
+runtime-optenv32/enca+32
+runtime-optenv32/libcap+32
+runtime-optenv32/libva-vdpau-driver+32
+runtime-optenv32/libogg+32
+runtime-optenv32/flac+32
+runtime-optenv32/libvorbis+32
+runtime-optenv32/libsndfile+32
+runtime-optenv32/openal-soft+32
+runtime-optenv32/freealut+32
+runtime-optenv32/libmd+32
+runtime-optenv32/aalib+32
+runtime-optenv32/glu+32
+runtime-optenv32/freeglut+32
+runtime-optenv32/libwebp+32
+runtime-optenv32/game-music-emu+32
+runtime-optenv32/fftw+32
+runtime-optenv32/libofa+32
+runtime-optenv32/libmms+32
+runtime-optenv32/gdbm+32
+runtime-optenv32/libasyncns+32
+runtime-optenv32/libtool+32
+runtime-optenv32/pulseaudio+32
+runtime-optenv32/libmikmod+32
+runtime-optenv32/s2tc+32
+runtime-optenv32/mp4v2+32
+runtime-optenv32/faac+32
+runtime-optenv32/cdparanoia+32
+runtime-optenv32/gsm+32
+runtime-optenv32/libass+32
+runtime-optenv32/libbluray+32
+runtime-optenv32/libmodplug+32
+runtime-optenv32/libssh+32
+runtime-optenv32/libtheora+32
+runtime-optenv32/libvpx+32
+runtime-optenv32/x264+32
+runtime-optenv32/x265+32
+runtime-optenv32/opencore-amr+32
+runtime-optenv32/opus+32
+runtime-optenv32/speex+32
+runtime-optenv32/soxr+32
+runtime-optenv32/ffmpeg+32
+runtime-optenv32/libnl+32
+runtime-optenv32/tk+32
+runtime-optenv32/libexif+32
+runtime-optenv32/libdvdcss+32
+runtime-optenv32/libdvdread+32
+runtime-optenv32/nspr+32
+runtime-optenv32/libusb+32
+runtime-optenv32/cups+32
+runtime-optenv32/a52dec+32
+runtime-optenv32/alsa-plugins+32
+runtime-optenv32/celt+32
+runtime-optenv32/fluidsynth+32
+runtime-optenv32/gconf+32
+runtime-optenv32/glew+32
+runtime-optenv32/glslang+32
+runtime-optenv32/gtk-2+32
+runtime-optenv32/libaio+32
+runtime-optenv32/libbsd+32
+runtime-optenv32/libcaca+32
+runtime-optenv32/libcroco+32
+runtime-optenv32/libdca+32
+runtime-optenv32/libdv+32
+runtime-optenv32/libdvdnav+32
+runtime-optenv32/libmad+32
+runtime-optenv32/libpcap+32
+runtime-optenv32/librsvg+32
+runtime-optenv32/libshout+32
+runtime-optenv32/libtasn1+32
+runtime-optenv32/libusb-compat+32
+runtime-optenv32/libva-intel-driver+32
+runtime-optenv32/nlohmann-json+32
+runtime-optenv32/vulkan-headers+32
+runtime-optenv32/mangohud+32
+runtime-optenv32/mbedtls+32
+runtime-optenv32/mjpegtools+32
+runtime-optenv32/mpg123+32
+runtime-optenv32/neon+32
+runtime-optenv32/p11-kit+32
+runtime-optenv32/nss+32
+runtime-optenv32/openssl-1.1+32
+runtime-optenv32/pcre+32
+runtime-optenv32/portaudio+32
+runtime-optenv32/proxychains-ng+32
+runtime-optenv32/sbc+32
+runtime-optenv32/sdl-ttf+32
+runtime-optenv32/smpeg+32
+runtime-optenv32/soundtouch+32
+runtime-optenv32/taglib+32
+runtime-optenv32/twolame+32
+runtime-optenv32/vulkan-loader+32
+runtime-optenv32/vkd3d+32
+runtime-optenv32/volk-meta-loader+32
+runtime-optenv32/vulkan-tools+32
+runtime-optenv32/vulkan+32
+runtime-optenv32/wavpack+32
+runtime-optenv32/wildmidi+32
+runtime-optenv32/faad2+32
+runtime-optenv32/32subsystem
diff --git a/runtime-display/libxnvctrl/autobuild/build b/runtime-display/libxnvctrl/autobuild/build
@@ -4,3 +4,7 @@ make
 abinfo "Installing libXNVCtrl.so ..."
 install -dvm755 "$PKGDIR"/usr/lib/
 cp -Pv "$SRCDIR"/_out/Linux_*/libXNVCtrl.so* "$PKGDIR"/usr/lib/
+
+abinfo "Installing headers ..."
+install -Dvm644 "$SRCDIR"/*.h \
+    -t "$PKGDIR"/usr/include/NVCtrl/
diff --git a/runtime-display/libxnvctrl/autobuild/defines b/runtime-display/libxnvctrl/autobuild/defines
@@ -4,3 +4,6 @@ PKGDEP="x11-lib"
 PKGDES="X extension for the NVIDIA NV-CONTROL API"
 
 FAIL_ARCH="!(amd64|arm64)"
+
+PKGBREAK="nvidia<=565.77 565.77+utils565.57.01<=565.77+utils565.57.01"
+PKGREP="nvidia<=565.77 565.77+utils565.57.01<=565.77+utils565.57.01"
diff --git a/runtime-display/libxnvctrl/spec b/runtime-display/libxnvctrl/spec
@@ -1,4 +1,5 @@
 VER=565.57.01
+REL=1
 SRCS="git::commit=tags/$VER::https://github.com/NVIDIA/nvidia-settings"
 CHKSUMS="SKIP"
 CHKUPDATE="anitya::id=5435"

diff --git a/runtime-display/nvidia-open/autobuild/build b/runtime-display/nvidia-open/autobuild/build
@@ -18,10 +18,6 @@ make -C doc install \
     DESTDIR="$PKGDIR" \
     PREFIX=/usr
 
-abinfo "Installing XNVCtrl headers ..."
-install -Dvm644 src/libXNVCtrl/*.h -t "$PKGDIR"/usr/include/NVCtrl
-popd
-
 pushd "$SRCDIR"/nvidia-xconfig
 abinfo "Building nvidia-xconfig ..."
 make all DO_STRIP=

diff --git a/runtime-display/nvidia-open/spec b/runtime-display/nvidia-open/spec
@@ -2,6 +2,7 @@ _DRIVER_VER=565.77
 # Note: sometimes utilities are not updated timely
 _UTILS_VERS=565.57.01
 VER=${_DRIVER_VER}+utils${_UTILS_VERS}
+REL=1
 SRCS="git::rename=nvidia-driver;commit=tags/aosc/${_DRIVER_VER}/1::https://github.com/AOSC-Tracking/nvidia-open
 	git::rename=nvidia-settings;commit=tags/${_UTILS_VERS}::https://github.com/NVIDIA/nvidia-settings
 	git::rename=nvidia-xconfig;commit=tags/${_UTILS_VERS}::https://github.com/NVIDIA/nvidia-xconfig

diff --git a/runtime-optenv32/32subsystem/autobuild/defines b/runtime-optenv32/32subsystem/autobuild/defines
@@ -1,35 +1,43 @@
 PKGNAME=32subsystem
-PKGDES="32 bit (i686) runtime and development support environment" 
 PKGSEC=libs 
-PKGDEP="\
-a52dec+32 aalib+32 acl+32 alsa-lib+32 alsa-plugins+32 atk+32 at-spi2-atk+32  \
-at-spi2-core+32 attr+32 binutils+32 bzip2+32 cairo+32 cdparanoia+32 celt+32 cg+32 cups+32  \
-curl+32 db+32 dbus+32 dbus-glib+32 elfutils+32 eudev+32 expat+32 faac+32 faad2+32 fftw+32  \
-flac+32 fontconfig+32 freealut+32 freeglut+32 freetype+32 game-music-emu+32 gcc+32 gconf+32  \
-gdbm+32 gdk-pixbuf+32 ghostscript+32 giflib+32 glew+32 glib+32 glibc+32 glu+32 gmp+32 gnutls+32  \
-gst-plugins-bad-1-0+32 gst-plugins-base-0-10+32 gst-plugins-base-1-0+32 gst-plugins-good-1-0+32  \
-gst-plugins-ugly-1-0+32 gstreamer-0-10+32 gstreamer-1-0+32 gtk-2+32 gtk-3+32 harfbuzz+32 icu+32  \
-imlib2+32 json-c+32 krb5+32 lame+32 lcms2+32 libaio+32 libasyncns+32 libavc1394+32 libcaca+32  \
-libcap+32 libcddb+32 libcdio+32 libcroco+32 libdca+32 libdrm+32 libdv+32 libdvdcss+32  \
-libdvdnav+32 libdvdread+32 libepoxy+32 libexif+32 libffi+32 libgcrypt+32 libgpg-error+32  \
-libid3tag+32 libidn+32 libiec61883+32 libjpeg-turbo+32 libmad+32 libmms+32 libmodplug+32  \
-libmpeg2+32 libnl+32 libofa+32 libogg+32 libpcap+32 libpng-1.6+32 libpng+32 libraw1394+32  \
-librsvg+32 libshout+32 libsidplay+32 libsndfile+32 libspectre+32 libssh2+32 libtasn1+32  \
-libtheora+32 libtiff+32 libtool+32 libusb+32 libva+32 libva-intel-driver+32  \
-libva-vdpau-driver+32 libvdpau+32 libvisual+32 libvorbis+32 libvpx+32 libwebp+32 libxau+32  \
-libxcb+32 libxdmcp+32 libxkbcommon+32 libxml2+32 libxslt+32 linux+api+32 llvm+32 mesa+32  \
-mjpegtools+32 mp4v2+32 mpc+32 mpfr+32 mpg123+32 nasm+32 ncurses+32 neon+32 nettle+32 nspr+32  \
-nss+32 openal-soft+32 opencore-amr+32 openjpeg-legacy+32 openldap+32 openssl+32 opus+32 orc+32  \
-p11-kit+32 pango+32 pcre+32 perl+32 perl-xml-parser+32 pixman+32 pkg-config+32 poppler+32  \
-popt+32 portaudio+32 pulseaudio+32 python-2+32 readline+32 rtmpdump+32 s2tc+32 sbc+32  \
-schroedinger+32 sdl+32 sdl-ttf+32 soundtouch+32 speex+32 sqlite+32 srtp+32 taglib+32 tbb+32  \
-tcl+32 tk+32 twolame+32 util-linux+32 util-macros+32 v4l-utils+32 wavpack+32 wildmidi+32  \
-wxgtk+32 wxgtk-3+32 x11-lib+32 x11-proto+32 x264+32 x265+32 xcb-proto+32 xz+32 zlib+32 \
-gsm+32 fribidi+32 recode+32 enca+32 libass+32 gst-libav-1-0+32 ffmpeg+32 xvidcore+32 \
-soxr+32 libssh+32 libbluray+32 vulkan+32"
+# Note: Everything, basically.
+PKGDEP="""
+a52dec+32 aalib+32 acl+32 alsa-lib+32 alsa-plugins+32 at-spi2-core+32 attr+32
+binutils+32 brotli+32 bzip2+32 cairo+32 cdparanoia+32 celt+32 cups+32 curl+32
+dbus+32 dbus-glib+32 devel-base+32 elfutils+32 enca+32 eudev+32 expat+32
+faac+32 faad2+32 ffmpeg+32 fftw+32 flac+32 fluidsynth+32 fontconfig+32
+freealut+32 freeglut+32 freetype+32 fribidi+32 game-music-emu+32 gcc+32
+gconf+32 gdbm+32 gdk-pixbuf+32 giflib+32 glew+32 glib+32 glibc+32 glslang+32
+glu+32 gmp+32 gnutls+32 gsm+32 gtk-2+32 gtk-3+32 harfbuzz+32 icu+32 imlib2+32
+json-c+32 krb5+32 lame+32 lcms2+32 libaio+32 libass+32 libasyncns+32
+libavc1394+32 libbluray+32 libbsd+32 libcaca+32 libcap+32 libcddb+32 libcdio+32
+libcroco+32 libdatrie+32 libdca+32 libdrm+32 libdv+32 libdvdcss+32 libdvdnav+32
+libdvdread+32 libepoxy+32 libexif+32 libffi+32 libgcrypt+32 libglvnd+32
+libgpg-error+32 libid3tag+32 libidn+32 libiec61883+32 libjpeg-turbo+32
+libmad+32 libmd+32 libmikmod+32 libmms+32 libmodplug+32 libmpeg2+32 libnl+32
+libofa+32 libogg+32 libpcap+32 libpng-1.6+32 libpng+32 libraw1394+32 librsvg+32
+libshout+32 libsndfile+32 libssh2+32 libssh+32 libtasn1+32 libthai+32
+libtheora+32 libtiff+32 libtool+32 libunwind+32 libusb+32 libusb-compat+32
+libva+32 libva-intel-driver+32 libva-vdpau-driver+32 libvdpau+32 libvorbis+32
+libvpx+32 libwebp+32 libxau+32 libxcb+32 libxcrypt+32 libxdmcp+32
+libxkbcommon+32 libxml2+32 libxnvctrl+32 libxslt+32 linux+api+32 llvm+32
+lm-sensors+32 lzo+32 mangohud+32 mbedtls+32 mesa+32 mjpegtools+32 mp4v2+32
+mpc+32 mpfr+32 mpg123+32 nasm+32 ncurses+32 neon+32 nettle+32 nlohmann-json+32
+nspr+32 nss+32 openal-soft+32 opencore-amr+32 openjpeg-legacy+32 openldap+32
+openssl-1.1+32 openssl+32 opus+32 orc+32 p11-kit+32 pango+32 pcre2+32 pcre+32
+pixman+32 popt+32 portaudio+32 proxychains-ng+32 pulseaudio+32 readline+32
+recode+32 rtmpdump+32 rustc+32 s2tc+32 sbc+32 schroedinger+32 sdl+32 sdl-ttf+32
+shared-mime-info+32 smpeg+32 soundtouch+32 soxr+32 speex+32
+spirv-llvm-translator+32 spirv-tools+32 sqlite+32 srtp+32 taglib+32 tcl+32
+tk+32 twolame+32 util-linux+32 v4l-utils+32 vkd3d+32 volk-meta-loader+32
+vulkan+32 vulkan-headers+32 vulkan-loader+32 vulkan-tools+32 wavpack+32
+wayland+32 wildmidi+32 x11-lib+32 x11-proto+32 x264+32 x265+32 xvidcore+32
+xz+32 zlib+32 zstd+32
+"""
+PKGDES="32-bit runtime and development environment"
 
 PKGPROV="optenv32 ia32-libs"
-NOLTO=1
-ABHOST=noarch
 
-PKGEPOCH=1
+ABHOST=optenv32
+# Note: Non-arch-agnostic package.
+ABSPLITDBG=0
diff --git a/runtime-optenv32/32subsystem/spec b/runtime-optenv32/32subsystem/spec
@@ -1,2 +1,2 @@
-VER=2
+VER=3
 DUMMYSRC=1
diff --git a/runtime-optenv32/a52dec+32/autobuild/build b/runtime-optenv32/a52dec+32/autobuild/build
diff --git a/runtime-optenv32/a52dec+32/autobuild/defines b/runtime-optenv32/a52dec+32/autobuild/defines
@@ -1,8 +1,8 @@
 PKGNAME=a52dec+32
-PKGDES="A free library for decoding ATSC A/52 streams (optenv32)"
 PKGSEC=libs
 PKGDEP="glibc+32"
+BUILDDEP="devel-base+32"
+PKGDES="A free library for decoding ATSC A/52 streams (32-bit x86 runtime)"
 
 AUTOTOOLS_AFTER="--enable-shared"
-NOLTO=1
-ABHOST=noarch
+ABHOST=optenv32
diff --git a/runtime-optenv32/a52dec+32/spec b/runtime-optenv32/a52dec+32/spec
@@ -1,5 +1,7 @@
 VER=0.7.4
-SRCS="tbl::http://liba52.sourceforge.net/files/a52dec-$VER.tar.gz"
+REL=3
+# FIXME: Upstream URL is now gone https://liba52.sourceforge.net/files/a52dec-0.7.4.tar.gz.
+# Use BLFS mirror until we update to 0.8.0.
+SRCS="tbl::https://ftp2.osuosl.org/pub/blfs/conglomeration/a52dec/a52dec-$VER.tar.gz"
 CHKSUMS="sha256::a21d724ab3b3933330194353687df82c475b5dfb997513eef4c25de6c865ec33"
-REL=2
 CHKUPDATE="anitya::id=13972"
diff --git a/runtime-optenv32/aalib+32/autobuild/build b/runtime-optenv32/aalib+32/autobuild/build
diff --git a/runtime-optenv32/aalib+32/autobuild/defines b/runtime-optenv32/aalib+32/autobuild/defines
@@ -1,9 +1,17 @@
 PKGNAME=aalib+32
 PKGSEC=libs
-PKGDES="ASCII Art Library (optenv32)"
-PKGDEP="x11-lib+32"
+PKGDEP="ncurses+32 x11-lib+32"
+BUILDDEP="devel-base+32"
+PKGDES="ASCII Art Library (32-bit x86 runtime)"
 
-ABSHADOW=no
-AUTOTOOLS_AFTER="--with-ncurses=/opt/32"
-NOLTO=1
-ABHOST=noarch
+# FIXME: /opt/32/bin/ld: cannot open linker script file aalib.1.4.ver:
+# No such file or directory
+ABSHADOW=0
+
+AUTOTOOLS_AFTER=(
+    '--with-ncurses=/opt/32'
+)
+
+ABHOST=optenv32
+
+PKGEPOCH=1
diff --git a/runtime-optenv32/aalib+32/autobuild/patch b/runtime-optenv32/aalib+32/autobuild/patch