From 1ba26800e32184699f1aad3d59cbeb7c84ade7b0 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Mon, 27 May 2024 02:36:35 -0400 Subject: [PATCH] *: fix dependencies for vulkan-loader-devel split --- srcpkgs/CPU-X/template | 2 +- srcpkgs/MangoHud/template | 4 ++-- srcpkgs/SDL2/template | 4 ++-- srcpkgs/Vulkan-Tools/template | 2 +- srcpkgs/ffmpeg/template | 2 +- srcpkgs/gamescope/template | 4 ++-- srcpkgs/gst-plugins-bad1/template | 5 ++--- srcpkgs/gtk4/template | 4 ++-- srcpkgs/libplacebo/template | 6 +++--- srcpkgs/mesa/template | 2 +- srcpkgs/metacity/template | 3 +-- srcpkgs/mpv/template | 4 ++-- srcpkgs/pipewire/template | 4 ++-- srcpkgs/qt6-base/template | 4 ++-- srcpkgs/retroarch/template | 2 +- srcpkgs/vkQuake/template | 2 +- srcpkgs/wine/template | 2 +- srcpkgs/wlroots0.15/template | 4 ++-- srcpkgs/wlroots0.16/template | 4 ++-- srcpkgs/wlroots0.17/template | 4 ++-- 20 files changed, 33 insertions(+), 35 deletions(-) diff --git a/srcpkgs/CPU-X/template b/srcpkgs/CPU-X/template index 6c89acb6585..7d1aab355f5 100644 --- a/srcpkgs/CPU-X/template +++ b/srcpkgs/CPU-X/template @@ -7,7 +7,7 @@ build_style=cmake hostmakedepends="pkg-config nasm" makedepends="ncurses-devel gettext-devel libcpuid-devel pciutils-devel glfw-devel ocl-icd-devel procps-ng-devel libstatgrab gtk+3-devel - vulkan-loader Vulkan-Headers" + vulkan-loader-devel" #checkdepends="mawk nawk grep" short_desc="Free software that gathers information on CPU, motherboard and more" maintainer="Orphaned " diff --git a/srcpkgs/MangoHud/template b/srcpkgs/MangoHud/template index ac024dba897..ed2e2428f44 100644 --- a/srcpkgs/MangoHud/template +++ b/srcpkgs/MangoHud/template @@ -5,8 +5,8 @@ revision=1 build_style=meson configure_args="-Dwith_xnvctrl=disabled -Dwith_nvml=disabled -Duse_system_spdlog=enabled" -hostmakedepends="Vulkan-Headers python3-Mako glslang pkg-config" -makedepends="libglvnd-devel dbus-devel vulkan-loader spdlog json-c++" +hostmakedepends="python3-Mako glslang pkg-config" +makedepends="libglvnd-devel dbus-devel vulkan-loader-devel spdlog json-c++" short_desc="Vulkan and OpenGL overlay for monitoring FPS, temperatures and more" maintainer="John " license="MIT" diff --git a/srcpkgs/SDL2/template b/srcpkgs/SDL2/template index 999bcb16e8b..e2b27ed4926 100644 --- a/srcpkgs/SDL2/template +++ b/srcpkgs/SDL2/template @@ -1,7 +1,7 @@ # Template file for 'SDL2' pkgname=SDL2 version=2.30.1 -revision=1 +revision=2 build_style=cmake configure_args="-DSDL_ALSA=ON -DSDL_ESD=OFF -DSDL_RPATH=OFF -DSDL_CLOCK_GETTIME=ON -DSDL_PULSEAUDIO_SHARED=OFF @@ -101,7 +101,7 @@ fi if [ "$build_option_vulkan" ]; then configure_args+=" -DSDL_VULKAN=ON" - makedepends+=" Vulkan-Headers vulkan-loader" + makedepends+=" vulkan-loader-devel" else configure_args+=" -DSDL_VULKAN=OFF" fi diff --git a/srcpkgs/Vulkan-Tools/template b/srcpkgs/Vulkan-Tools/template index 1b3ed6a0848..d18c5518d97 100644 --- a/srcpkgs/Vulkan-Tools/template +++ b/srcpkgs/Vulkan-Tools/template @@ -7,7 +7,7 @@ configure_args="-DGLSLANG_INSTALL_DIR=/usr -DVULKAN_HEADERS_INSTALL_DIR=${XBPS_CROSS_BASE}/usr -Wno-dev -DWAYLAND_SCANNER_EXECUTABLE=/usr/bin/wayland-scanner" hostmakedepends="python3 pkg-config glslang wayland-devel" -makedepends="Vulkan-Headers vulkan-loader libxcb-devel libxkbcommon-devel +makedepends="vulkan-loader-devel libxcb-devel libxkbcommon-devel wayland-devel wayland-protocols libXrandr-devel" short_desc="Official Vulkan tools and utilities" maintainer="Orphaned " diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template index 9fbeffc22e5..93618cd9775 100644 --- a/srcpkgs/ffmpeg/template +++ b/srcpkgs/ffmpeg/template @@ -27,7 +27,7 @@ makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-deve $(vopt_if webp libwebp-devel) $(vopt_if sofa libmysofa-devel) $(vopt_if drm libdrm-devel) $(vopt_if svtav1 libsvt-av1-devel) $(vopt_if srt srt-devel) $(vopt_if rist librist-devel) - $(vopt_if vulkan 'vulkan-loader Vulkan-Headers') + $(vopt_if vulkan 'vulkan-loader-devel') $(vopt_if nvenc nv-codec-headers) $(vopt_if nvdec nv-codec-headers)" depends="ffplay>=${version}_${revision}" diff --git a/srcpkgs/gamescope/template b/srcpkgs/gamescope/template index a960ceeafc2..b73b2847ecd 100644 --- a/srcpkgs/gamescope/template +++ b/srcpkgs/gamescope/template @@ -8,9 +8,9 @@ _reshade_hash=9fdbea6892f9959fdc18095d035976c574b268b7 build_style=meson configure_args="-Denable_openvr_support=false --force-fallback-for=" hostmakedepends="glslang pkg-config wayland-devel" -makedepends="pipewire-devel Vulkan-Headers SPIRV-Headers libX11-devel +makedepends="pipewire-devel SPIRV-Headers libX11-devel libXdamage-devel libXcomposite-devel libXrender-devel libXxf86vm-devel - libXtst-devel libXres-devel libdrm-devel vulkan-loader wayland-protocols + libXtst-devel libXres-devel libdrm-devel vulkan-loader-devel wayland-protocols libxkbcommon-devel libcap-devel SDL2-devel hwids wlroots0.17-devel libliftoff-devel glm libXmu-devel libdisplay-info-devel benchmark-devel libavif-devel" diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template index ac45a5ab80b..9cf8454d232 100644 --- a/srcpkgs/gst-plugins-bad1/template +++ b/srcpkgs/gst-plugins-bad1/template @@ -25,9 +25,8 @@ makedepends="alsa-lib-devel celt-devel openssl-devel exempi-devel libsrtp-devel libopenal-devel gtk+3-devel libnice-devel libbluetooth-devel libgudev-devel libusb-devel libaom-devel libbs2b-devel chromaprint-devel fdk-aac-devel flite-devel fluidsynth-devel liblrdf-devel ladspa-sdk - lilv-devel lv2 libopenjpeg2-devel sbc-devel spandsp-devel vulkan-loader - Vulkan-Headers webrtc-audio-processing-devel libzbar-devel ffmpeg-devel - srt-devel libva-devel + lilv-devel lv2 libopenjpeg2-devel sbc-devel spandsp-devel vulkan-loader-devel + webrtc-audio-processing-devel libzbar-devel ffmpeg-devel srt-devel libva-devel $(vopt_if gme libgme-devel)" depends="gst-plugins-base1>=${version}" short_desc="GStreamer plugins from the bad set (v1.x)" diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template index d821f6534d5..15d78a84846 100644 --- a/srcpkgs/gtk4/template +++ b/srcpkgs/gtk4/template @@ -1,7 +1,7 @@ # Template file for 'gtk4' pkgname=gtk4 version=4.14.4 -revision=1 +revision=2 build_style=meson build_helper="gir" configure_args="-Dman-pages=true -Ddocumentation=true -Dbuild-tests=false @@ -23,7 +23,7 @@ makedepends="at-spi2-atk-devel gdk-pixbuf-devel libepoxy-devel pango-devel $(vopt_if wayland 'libxkbcommon-devel wayland-devel wayland-protocols MesaLib-devel') $(vopt_if x11 'libXcursor-devel libXdamage-devel libXext-devel libXinerama-devel libXi-devel libXrandr-devel libXcomposite-devel') $(vopt_if cloudproviders 'libcloudproviders-devel') - $(vopt_if vulkan 'vulkan-loader Vulkan-Headers') + $(vopt_if vulkan 'vulkan-loader-devel') $(vopt_if tracker 'tracker-devel')" depends="gtk-update-icon-cache shared-mime-info $(vopt_if x11 'dbus-x11')" short_desc="GIMP ToolKit (v4)" diff --git a/srcpkgs/libplacebo/template b/srcpkgs/libplacebo/template index 10610813e23..3d39ebf816a 100644 --- a/srcpkgs/libplacebo/template +++ b/srcpkgs/libplacebo/template @@ -1,13 +1,13 @@ # Template file for 'libplacebo' pkgname=libplacebo version=6.338.2 -revision=1 +revision=2 build_style=meson configure_args="-Dshaderc=enabled -Dvulkan=enabled -Ddemos=false $(vopt_feature lcms) $(vopt_feature opengl)" hostmakedepends="pkg-config python3-Mako Vulkan-Headers python3-Jinja2 $(vopt_if opengl python3-glad)" -makedepends="shaderc Vulkan-Headers vulkan-loader +makedepends="shaderc vulkan-loader-devel $(vopt_if lcms lcms2-devel)" short_desc="Reusable library for GPU-accelerated video/image rendering" maintainer="Enrico Belleri " @@ -27,7 +27,7 @@ build_options_default="lcms opengl" desc_option_lcms="Enable support for LittleCMS 2 engine" libplacebo-devel_package() { - depends="${sourcepkg}>=${version}_${revision} vulkan-loader + depends="${sourcepkg}>=${version}_${revision} vulkan-loader-devel $(vopt_if lcms lcms2-devel)" short_desc+=" - development files" pkg_install() { diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template index 73314ed86f2..0710fee6a87 100644 --- a/srcpkgs/mesa/template +++ b/srcpkgs/mesa/template @@ -171,7 +171,7 @@ fi if [ "$_have_zink" ]; then _gallium_drivers+=",zink" - makedepends+=" vulkan-loader" + makedepends+=" vulkan-loader-devel" fi configure_args+=" ${_gallium_drivers}" diff --git a/srcpkgs/metacity/template b/srcpkgs/metacity/template index ddf75848558..07973f80d4d 100644 --- a/srcpkgs/metacity/template +++ b/srcpkgs/metacity/template @@ -7,8 +7,7 @@ hostmakedepends="gettext gettext-devel glib-devel itstool pkg-config yelp-tools makedepends="gsettings-desktop-schemas-devel gtk+3-devel libcanberra-devel libglib-devel libgtop-devel libSM-devel libXcomposite-devel libXdamage-devel libXfixes-devel libXinerama-devel libXrender-devel libX11-devel libXres-devel - pango-devel startup-notification-devel Vulkan-Headers vulkan-loader - libXpresent-devel" + pango-devel startup-notification-devel vulkan-loader-devel libXpresent-devel" depends="zenity" short_desc="Window Manager for the GNOME environment" maintainer="Enno Boland " diff --git a/srcpkgs/mpv/template b/srcpkgs/mpv/template index 78ab959982e..32dd956c6bf 100644 --- a/srcpkgs/mpv/template +++ b/srcpkgs/mpv/template @@ -1,7 +1,7 @@ # Template file for 'mpv' pkgname=mpv version=0.38.0 -revision=1 +revision=2 build_style=meson configure_args="-Dcdda=enabled -Ddvbin=enabled -Ddvdnav=enabled -Dlibmpv=true -Dcplugins=enabled @@ -30,7 +30,7 @@ makedepends="MesaLib-devel ffmpeg-devel harfbuzz-devel libXv-devel libass-devel $(vopt_if pulseaudio pulseaudio-devel) $(vopt_if pipewire pipewire-devel) $(vopt_if sdl2 SDL2-devel) $(vopt_if vapoursynth vapoursynth-devel) $(vopt_if vdpau libvdpau-devel) $(vopt_if sndio sndio-devel) - $(vopt_if vulkan "Vulkan-Headers vulkan-loader") + $(vopt_if vulkan "vulkan-loader-devel") $(vopt_if wayland "wayland-devel wayland-protocols libxkbcommon-devel") $(vopt_if x11 "libXScrnSaver-devel libXinerama-devel libXrandr-devel libXpresent-devel")" depends="desktop-file-utils hicolor-icon-theme" diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template index 7e9f78a3404..8494024616d 100644 --- a/srcpkgs/pipewire/template +++ b/srcpkgs/pipewire/template @@ -23,8 +23,8 @@ configure_args=" hostmakedepends="doxygen graphviz pkg-config python3-docutils gettext glib-devel" makedepends="$(vopt_if sdl2 SDL2-devel) gst-plugins-base1-devel jack-devel sbc-devel v4l-utils-devel libva-devel libbluetooth-devel ncurses-devel - libfreeaptx-devel libusb-devel fdk-aac-devel libsndfile-devel Vulkan-Headers - vulkan-loader pulseaudio-devel avahi-libs-devel webrtc-audio-processing-devel + libfreeaptx-devel libusb-devel fdk-aac-devel libsndfile-devel + vulkan-loader-devel pulseaudio-devel avahi-libs-devel webrtc-audio-processing-devel readline-devel openssl-devel lilv-devel libcanberra-devel dbus-devel libmysofa-devel opus-devel $(vopt_if ffado libffado-devel) liblc3-devel $(vopt_if selinux libselinux-devel) libcamera-devel" diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template index 7dce54ae9c7..3311599dd87 100644 --- a/srcpkgs/qt6-base/template +++ b/srcpkgs/qt6-base/template @@ -1,7 +1,7 @@ # Template file for 'qt6-base' pkgname=qt6-base version=6.6.0 -revision=1 +revision=2 build_style=cmake configure_args="-DINSTALL_DATADIR=share/qt6 -DINSTALL_ARCHDATADIR=lib${XBPS_TARGET_WORDSIZE}/qt6 @@ -25,7 +25,7 @@ makedepends="zlib-devel libzstd-devel dbus-devel libmd4c-devel libpng-devel tslib-devel libinput-devel gtk+3-devel libmariadbclient-devel postgresql-libs-devel unixodbc-devel cups-devel libproxy-devel brotli-devel - sqlite-devel Vulkan-Headers mit-krb5-devel vulkan-loader libb2-devel + sqlite-devel mit-krb5-devel vulkan-loader-devel libb2-devel xcb-util-cursor-devel" short_desc="Cross-platform application and UI framework (QT6)" maintainer="John " diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template index cb3125c5dbf..5429d13ef3e 100644 --- a/srcpkgs/retroarch/template +++ b/srcpkgs/retroarch/template @@ -15,7 +15,7 @@ makedepends="alsa-lib-devel eudev-libudev-devel freetype-devel libusb-devel libx mbedtls-devel zlib-devel $(vopt_if ffmpeg ffmpeg-devel) $(vopt_if flac libflac-devel) $(vopt_if glslang 'glslang-devel SPIRV-Tools-devel') $(vopt_if jack jack-devel) $(vopt_if pulseaudio pulseaudio-devel) - $(vopt_if qt5 qt5-devel) $(vopt_if sdl2 SDL2-devel) $(vopt_if vulkan vulkan-loader) + $(vopt_if qt5 qt5-devel) $(vopt_if sdl2 SDL2-devel) $(vopt_if vulkan vulkan-loader-devel) $(vopt_if x11 'libXext-devel libXinerama-devel libXxf86vm-devel')" depends="$(vopt_if vulkan vulkan-loader) $(vopt_if x11 xdg-utils)" short_desc="Official reference frontend for the libretro API" diff --git a/srcpkgs/vkQuake/template b/srcpkgs/vkQuake/template index a0ff59a11f9..b52769d012d 100644 --- a/srcpkgs/vkQuake/template +++ b/srcpkgs/vkQuake/template @@ -5,7 +5,7 @@ revision=2 build_style=meson hostmakedepends="glslang SPIRV-Tools pkg-config" makedepends="SDL2-devel libvorbis-devel libmad-devel - Vulkan-Headers vulkan-loader opusfile-devel" + vulkan-loader-devel opusfile-devel" short_desc="Vulkan Quake port based on QuakeSpasm" maintainer="Andrew J. Hesford " license="GPL-2.0-or-later" diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template index abef7344d8e..897316a37ac 100644 --- a/srcpkgs/wine/template +++ b/srcpkgs/wine/template @@ -48,7 +48,7 @@ makedepends="gettext-devel ncurses-devel glu-devel libSM-devel alsa-lib-devel libgphoto2-devel glib-devel freetype-devel pulseaudio-devel giflib-devel v4l-utils-devel fontconfig-devel gnutls-devel dbus-devel sane-devel - libpcap-devel cups-devel ocl-icd-devel vulkan-loader gst-plugins-base1-devel + libpcap-devel cups-devel ocl-icd-devel vulkan-loader-devel gst-plugins-base1-devel SDL2-devel" depends="libXi libXinerama libXcomposite libXcursor libOSMesa desktop-file-utils hicolor-icon-theme liberation-fonts-ttf diff --git a/srcpkgs/wlroots0.15/template b/srcpkgs/wlroots0.15/template index 9dee296cded..18423a3e250 100644 --- a/srcpkgs/wlroots0.15/template +++ b/srcpkgs/wlroots0.15/template @@ -1,7 +1,7 @@ # Template file for 'wlroots0.15' pkgname=wlroots0.15 version=0.15.1 -revision=2 +revision=3 build_style=meson # Follow upstream packaging recommendations: # https://github.com/swaywm/wlroots/wiki/Packaging-recommendations @@ -10,7 +10,7 @@ configure_args="--auto-features=enabled -Dexamples=false -Dwerror=false hostmakedepends="pkg-config wayland-devel glslang" _devel_depends="libgbm-devel libglvnd-devel libseat-devel eudev-libudev-devel libdrm-devel libinput-devel libxkbcommon-devel pixman-devel wayland-devel - wayland-protocols vulkan-loader Vulkan-Headers xcb-util-errors-devel + wayland-protocols vulkan-loader-devel xcb-util-errors-devel xcb-util-wm-devel xcb-util-renderutil-devel " makedepends="${_devel_depends} libxcb-devel xcb-util-cursor-devel xcb-util-devel xcb-util-image-devel diff --git a/srcpkgs/wlroots0.16/template b/srcpkgs/wlroots0.16/template index 1b2c5e9969c..4a244665d7b 100644 --- a/srcpkgs/wlroots0.16/template +++ b/srcpkgs/wlroots0.16/template @@ -1,7 +1,7 @@ # Template file for 'wlroots0.16' pkgname=wlroots0.16 version=0.16.2 -revision=2 +revision=3 build_style=meson # Follow upstream packaging recommendations: # https://gitlab.freedesktop.org/wlroots/wlroots/-/wikis/Packaging-recommendations @@ -10,7 +10,7 @@ configure_args="--auto-features=enabled -Dexamples=false -Dwerror=false hostmakedepends="pkg-config wayland-devel glslang hwids" _devel_depends="libgbm-devel libglvnd-devel libseat-devel eudev-libudev-devel libdrm-devel libinput-devel libxkbcommon-devel pixman-devel wayland-devel - wayland-protocols vulkan-loader Vulkan-Headers xcb-util-errors-devel + wayland-protocols vulkan-loader-devel xcb-util-errors-devel xcb-util-wm-devel xcb-util-renderutil-devel " makedepends="${_devel_depends} libxcb-devel xcb-util-cursor-devel xcb-util-devel xcb-util-image-devel diff --git a/srcpkgs/wlroots0.17/template b/srcpkgs/wlroots0.17/template index 5d23b4508a2..b766860bcfe 100644 --- a/srcpkgs/wlroots0.17/template +++ b/srcpkgs/wlroots0.17/template @@ -1,7 +1,7 @@ # Template file for 'wlroots0.17' pkgname=wlroots0.17 version=0.17.3 -revision=1 +revision=2 build_style=meson # Follow upstream packaging recommendations: # https://gitlab.freedesktop.org/wlroots/wlroots/-/wikis/Packaging-recommendations @@ -10,7 +10,7 @@ configure_args="--auto-features=enabled -Dexamples=false -Dwerror=false hostmakedepends="pkg-config wayland-devel glslang hwids" _devel_depends="libgbm-devel libglvnd-devel libseat-devel eudev-libudev-devel libdrm-devel libinput-devel libxkbcommon-devel pixman-devel wayland-devel - wayland-protocols vulkan-loader Vulkan-Headers xcb-util-errors-devel + wayland-protocols vulkan-loader-devel xcb-util-errors-devel xcb-util-wm-devel xcb-util-renderutil-devel libdisplay-info-devel libliftoff-devel" makedepends="${_devel_depends} libxcb-devel xcb-util-cursor-devel xcb-util-devel xcb-util-image-devel