From 3805f7f3f4bc14a8dcd5cc74dd65c99004a1dc31 Mon Sep 17 00:00:00 2001 From: dataCobra Date: Thu, 3 Oct 2024 16:24:06 +0200 Subject: [PATCH] retroarch: use builtin glslang --- srcpkgs/retroarch/template | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template index 7292681e4e3..0999380657c 100644 --- a/srcpkgs/retroarch/template +++ b/srcpkgs/retroarch/template @@ -1,20 +1,19 @@ # Template file for 'retroarch' pkgname=retroarch version=1.19.1 -revision=3 +revision=4 build_style=configure configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking - --enable-udev --disable-builtinflac --disable-builtinglslang - --enable-systemmbedtls --disable-builtinbearssl --disable-builtinzlib - $(vopt_enable ffmpeg) $(vopt_enable flac) $(vopt_enable glslang) $(vopt_enable jack) + --enable-udev --disable-builtinflac --enable-systemmbedtls + --disable-builtinbearssl --disable-builtinzlib + $(vopt_enable ffmpeg) $(vopt_enable flac) $(vopt_enable jack) $(vopt_enable pulseaudio pulse) $(vopt_enable qt5 qt) $(vopt_enable sdl2) $(vopt_enable vulkan) $(vopt_enable wayland) $(vopt_enable x11)" conf_files="/etc/retroarch.cfg" hostmakedepends="pkg-config" makedepends="alsa-lib-devel eudev-libudev-devel freetype-devel libusb-devel libxkbcommon-devel mbedtls-devel zlib-devel $(vopt_if ffmpeg ffmpeg6-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 jack jack-devel) $(vopt_if pulseaudio pulseaudio-devel) $(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)" @@ -26,11 +25,10 @@ changelog="https://raw.githubusercontent.com/libretro/RetroArch/master/CHANGES.m distfiles="https://github.com/libretro/RetroArch/archive/v$version.tar.gz" checksum=504a3a8a6e5861eb43a61be8339f61183e7ea940c1ff68ac2a2f57d35c67f8ff -build_options="ffmpeg flac glcore gles2 glslang jack neon pulseaudio qt5 sdl2 vulkan wayland x11" -build_options_default="ffmpeg flac glcore glslang pulseaudio sdl2 vulkan wayland x11" +build_options="ffmpeg flac glcore gles2 jack neon pulseaudio qt5 sdl2 vulkan wayland x11" +build_options_default="ffmpeg flac glcore pulseaudio sdl2 vulkan wayland x11" desc_option_glcore="Enable support for OpenGL 3.2 core+ and OpenGL ES 3+" -desc_option_glslang="Enable support for GLSL shaders" desc_option_neon="Enable support for ARM Neon SIMD extension" vopt_conflict glcore gles2 # gles2 disables glcore support @@ -42,9 +40,6 @@ else fi if [ "$build_option_glcore" ]; then - if [ -z "$build_option_glslang" ]; then - msg_error "$pkgname: 'glcore' option requires 'glslang'.\n" - fi configure_args+=" --enable-opengl_core" else configure_args+=" --disable-opengl_core" @@ -61,12 +56,6 @@ if [ "$build_option_qt5" ]; then fi fi -if [ "$build_option_vulkan" ]; then - if [ -z "$build_option_glslang" ]; then - msg_error "$pkgname: 'vulkan' option requires 'glslang'.\n" - fi -fi - if [ "$build_option_wayland" ]; then if [ -z "$build_option_gles2" -a -z "$build_option_glcore" ]; then msg_error "$pkgname: 'wayland' option requires 'gles2' or 'glcore'.\n"