diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec index 8f1c521224..a373c9eb75 100644 --- a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec +++ b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary-openasar -Version: 0.0.453 +Version: 0.0.454 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-canary/discord-canary.spec b/anda/apps/discord-canary/discord-canary.spec index 54875f9d9a..238c3f7bf2 100644 --- a/anda/apps/discord-canary/discord-canary.spec +++ b/anda/apps/discord-canary/discord-canary.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary -Version: 0.0.453 +Version: 0.0.454 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: discord.com diff --git a/anda/apps/mpv/mpv-nightly.spec b/anda/apps/mpv/mpv-nightly.spec index 5978c65309..6f7cc821d8 100644 --- a/anda/apps/mpv/mpv-nightly.spec +++ b/anda/apps/mpv/mpv-nightly.spec @@ -1,6 +1,6 @@ -%global commit 07acdf09b3f067f7e48ac05573893cc2ff626928 +%global commit e509ec0aaffce74e520702e16e3e21ea0f168940 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20240719 +%global commit_date 20240720 %global ver v0.38.0 Name: mpv-nightly diff --git a/anda/devs/zed/preview/zed-preview.spec b/anda/devs/zed/preview/zed-preview.spec index 7a8a9a2c00..2bdd137b8a 100644 --- a/anda/devs/zed/preview/zed-preview.spec +++ b/anda/devs/zed/preview/zed-preview.spec @@ -1,6 +1,6 @@ %bcond_without check %global debug_package %{nil} -%global ver 0.145.0 +%global ver 0.145.1 %global crate zed %global app_id dev.zed.Zed-Preview diff --git a/anda/devs/zed/stable/zed.spec b/anda/devs/zed/stable/zed.spec index 7a854d7ab2..e3c5aebb56 100644 --- a/anda/devs/zed/stable/zed.spec +++ b/anda/devs/zed/stable/zed.spec @@ -7,7 +7,7 @@ %global app_id dev.zed.Zed Name: zed -Version: 0.144.3 +Version: 0.144.4 Release: 1%?dist Summary: Zed is a high-performance, multiplayer code editor diff --git a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec index 6297a180dc..2256bac83f 100644 --- a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec +++ b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec @@ -1,11 +1,11 @@ %global real_name prismlauncher %global nice_name PrismLauncher -%global commit dcc58c8b752d0946c1d7f72cbfbb992f23c30068 +%global commit 0041d2a126ae6f35ce1ca2bb5c793ec5853c4343 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global libnbtplusplus_commit a5e8fd52b8bf4ab5d5bcc042b2a247867589985f -%global commit_date 20240719 +%global commit_date 20240720 %global snapshot_info %{commit_date}.%{shortcommit} %bcond_without qt6 diff --git a/anda/langs/crystal/crystal/update.rhai b/anda/langs/crystal/crystal/update.rhai index abafab625e..b2159a6775 100644 --- a/anda/langs/crystal/crystal/update.rhai +++ b/anda/langs/crystal/crystal/update.rhai @@ -1,9 +1,9 @@ let v = gh("crystal-lang/crystal"); -let url = `https://github.com/crystal-lang/crystal/releases/download/${v}/crystal-${v}-1-linux-x86_64-bundled.tar.gz`; -try { - find(url, get(`https://github.com/crystal-lang/crystal/releases/tag/${v}`), 0); +let url = `crystal-${v}-1-linux-x86_64-bundled.tar.gz`; + +if get(`https://github.com/crystal-lang/crystal/releases/expanded_assets/${v}`).contains(url) { rpm.version(v); -} catch { +} else { print(`crystal: ${v} (waiting for bundle)`); terminate(); } diff --git a/anda/langs/nim/nim-nightly/nim-nightly.spec b/anda/langs/nim/nim-nightly/nim-nightly.spec index adbe6eb6ce..a60e07fe0f 100644 --- a/anda/langs/nim/nim-nightly/nim-nightly.spec +++ b/anda/langs/nim/nim-nightly/nim-nightly.spec @@ -1,8 +1,8 @@ %global csrc_commit 561b417c65791cd8356b5f73620914ceff845d10 -%global commit 3a103669d18408cd75ca5c5c97c34f4222c6e217 +%global commit 97f54745459b8651b7a38c174b3a8135224ebd09 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 2.1.9 -%global commit_date 20240719 +%global commit_date 20240720 %global debug_package %nil Name: nim-nightly diff --git a/anda/lib/libhelium/libhelium.spec b/anda/lib/libhelium/libhelium.spec index 1f8cf9f9fa..9a0c4b9938 100644 --- a/anda/lib/libhelium/libhelium.spec +++ b/anda/lib/libhelium/libhelium.spec @@ -1,10 +1,12 @@ +%global ver 1.8.12-10 +%global sanitized_ver %(echo %{ver} | sed -E 's/-/~/g') Summary: The Application Framework for tauOS apps Name: libhelium -Version: 1.8.12.7 +Version: %{sanitized_ver} Release: 1%?dist License: GPL-3.0 URL: https://github.com/tau-OS/libhelium -Source0: https://github.com/tau-OS/libhelium/archive/refs/tags/%{version}.tar.gz +Source0: https://github.com/tau-OS/libhelium/archive/refs/tags/%{ver}.tar.gz BuildRequires: sass BuildRequires: meson @@ -21,6 +23,7 @@ Requires: gtk4 >= 4.4 Requires: glib2 >= 2.66.0 Requires: libgee >= 0.20 Requires: tau-helium >= 1.1.25 +Requires: tau-hydrogen %description The Application Framework for tauOS apps @@ -34,7 +37,7 @@ This package contains the libraries and header files that are needed for writing applications with libhelium. %prep -%autosetup -n libhelium-%{version} +%autosetup -n libhelium-%{ver} %build %meson \ diff --git a/anda/lib/libhelium/update.rhai b/anda/lib/libhelium/update.rhai index 67592e6360..019b70b830 100644 --- a/anda/lib/libhelium/update.rhai +++ b/anda/lib/libhelium/update.rhai @@ -1 +1 @@ -rpm.version(gh("tau-OS/libhelium")); +rpm.global("ver",gh("tau-OS/libhelium")); diff --git a/anda/lib/terra-mesa/Mesa-MLAA-License-Clarification-Email.txt b/anda/lib/terra-mesa/Mesa-MLAA-License-Clarification-Email.txt deleted file mode 100644 index 30bdf2e9dd..0000000000 --- a/anda/lib/terra-mesa/Mesa-MLAA-License-Clarification-Email.txt +++ /dev/null @@ -1,117 +0,0 @@ - -Subject: RE: Question about Mesa MLAA license -From: Jorge Jimenez -Date: 01/08/2013 12:50 PM -To: Tom Callaway -CC: "jorge@iryoku.com" - -Yes to both questions. - -Thanks, -Jorge - -From: Tom Callaway -Sent: January 8, 2013 6:49 PM -To: Jorge Jimenez -CC: jorge@iryoku.com -Subject: Re: Question about Mesa MLAA license - -On 01/08/2013 12:39 PM, Jorge Jimenez wrote: -> Hi Tom, -> -> What we meant with that is that we made an exception for clause 2. -> Instead of clause 2, in the case of the Mesa project, you have to name -> the technique Jimenez's MLAA in the config options of Mesa. We did that -> just to allow them to solve license issues. This exception should be for -> the Mesa project, and any project using Mesa, like Fedora. -> -> We want to widespread usage of our MLAA, so we want to avoid any kind of -> license complications. Hope current one is good for Fedora, if not -> please tell, and we'll see what we can do! - -Okay, a few more questions: - -* If Fedora decides to simply reproduce the quoted statement: -"Uses Jimenez's MLAA. Copyright (C) 2010 by Jorge Jimenez, Belen Masia, -Jose I. Echevarria, Fernando Navarro and Diego Gutierrez." - -Specifically, if this is done as part of documentation included with -Mesa, is that sufficient to meet clause 2 even if the Mesa config option -is not set as described in your exception? - -* Currently, the Mesa config option for MLAA says: "Morphological -anti-aliasing based on Jimenez\' MLAA. 0 to disable, 8 for default -quality". Is this in compliance with your exception? - -Thanks again, - -~tom - -== -Fedora Project - -Subject: RE: Question about Mesa MLAA license -From: Jorge Jimenez -Date: 01/08/2013 12:39 PM -To: "jorge@iryoku.com" , Tom Callaway - -Hi Tom, - -What we meant with that is that we made an exception for clause 2. -Instead of clause 2, in the case of the Mesa project, you have to name -the technique Jimenez's MLAA in the config options of Mesa. We did that -just to allow them to solve license issues. This exception should be for -the Mesa project, and any project using Mesa, like Fedora. - -We want to widespread usage of our MLAA, so we want to avoid any kind of -license complications. Hope current one is good for Fedora, if not -please tell, and we'll see what we can do! - -Cheers, -Jorge - -From: Tom Callaway -Sent: January 8, 2013 6:30 PM -To: jorge@iryoku.com -Subject: Question about Mesa MLAA license - -Jorge, - -Thanks for all of your fantastic graphics work! I have been auditing -Fedora (a popular distribution of Linux) for license compliance and I -came across your MLAA code in Mesa. - -The license says: - - * 2. Redistributions in binary form must reproduce the following -statement: - * - * "Uses Jimenez's MLAA. Copyright (C) 2010 by Jorge Jimenez, Belen Masia, - * Jose I. Echevarria, Fernando Navarro and Diego Gutierrez." - * - * Only for use in the Mesa project, this point 2 is filled by naming the - * technique Jimenez's MLAA in the Mesa config options. - -That wording is unclear. When you say "Only for use in the Mesa -project...", it seems like you could either be saying: - -- This code may only be used as part of Mesa. - -OR - -- In Mesa, you can comply with clause 2 by simply selecting "Jimenez's -MLAA" in the Mesa config options. - -***** - -If the first item is true, then we may have to remove the MLAA code from -Fedora's copy of Mesa. However, looking at the license on your SMAA -code, I do not believe it to be the case. Please let me know either way! - -Thanks in advance, - -Tom Callaway -Fedora Legal - -== -Fedora Project diff --git a/anda/lib/terra-mesa/anda.hcl b/anda/lib/terra-mesa/anda.hcl deleted file mode 100644 index 93ca4544e1..0000000000 --- a/anda/lib/terra-mesa/anda.hcl +++ /dev/null @@ -1,5 +0,0 @@ -project pkg { - rpm { - spec = "terra-mesa.spec" - } -} diff --git a/anda/lib/terra-mesa/terra-mesa.spec b/anda/lib/terra-mesa/terra-mesa.spec deleted file mode 100644 index ec7bbd9f16..0000000000 --- a/anda/lib/terra-mesa/terra-mesa.spec +++ /dev/null @@ -1,774 +0,0 @@ -%global srcname mesa - -## START: Set by rpmautospec -## (rpmautospec version 0.6.3) -## RPMAUTOSPEC: autorelease, autochangelog -%define autorelease(e:s:pb:n) %{?-p:0.}%{lua: - release_number = 2; - base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}")); - print(release_number + base_release_number - 1); -}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}} -## END: Set by rpmautospec - -%ifnarch s390x -%global with_hardware 1 -%global with_radeonsi 1 -%global with_vmware 1 -%global with_vulkan_hw 1 -%global with_vdpau 1 -%global with_va 1 -%if !0%{?rhel} -%global with_r300 1 -%global with_r600 1 -%global with_nine 1 -%global with_nvk %{with vulkan_hw} -%global with_omx 1 -%global with_opencl 1 -%endif -%global base_vulkan ,amd -%endif - -%ifnarch %{ix86} -%if !0%{?rhel} -%global with_teflon 1 -%endif -%endif - -%ifarch %{ix86} x86_64 -%global with_crocus 1 -%global with_i915 1 -%global with_iris 1 -%global with_xa 1 -%global with_intel_clc 1 -%global intel_platform_vulkan ,intel,intel_hasvk -%endif -%ifarch x86_64 -%global with_intel_vk_rt 1 -%endif - -%ifarch aarch64 x86_64 %{ix86} -%if !0%{?rhel} -%global with_lima 1 -%global with_vc4 1 -%endif -%global with_etnaviv 1 -%global with_freedreno 1 -%global with_kmsro 1 -%global with_panfrost 1 -%global with_tegra 1 -%global with_v3d 1 -%global with_xa 1 -%global extra_platform_vulkan ,broadcom,freedreno,panfrost,imagination-experimental -%endif - -%if !0%{?rhel} -%global with_libunwind 1 -%global with_lmsensors 1 -%endif - -%ifarch %{valgrind_arches} -%bcond_without valgrind -%else -%bcond_with valgrind -%endif - -%global vulkan_drivers swrast%{?base_vulkan}%{?intel_platform_vulkan}%{?extra_platform_vulkan}%{?with_nvk:,nouveau} -Name: terra-%{srcname} -Summary: Mesa graphics libraries -%global ver 24.1.4 -Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} -Release: %autorelease -License: MIT AND BSD-3-Clause AND SGI-B-2.0 -URL: http://www.mesa3d.org - -Source0: https://archive.mesa3d.org/%{srcname}-%{ver}.tar.xz -# src/gallium/auxiliary/postprocess/pp_mlaa* have an ... interestingly worded license. -# Source1 contains email correspondence clarifying the license terms. -# Fedora opts to ignore the optional part of clause 2 and treat that code as 2 clause BSD. -Source1: Mesa-MLAA-License-Clarification-Email.txt - -Patch10: https://src.fedoraproject.org/rpms/mesa/raw/e89544b7a4d811a64ca23b402add29524cc6f704/f/gnome-shell-glthread-disable.patch -# Patch11: https://src.fedoraproject.org/rpms/mesa/raw/e89544b7a4d811a64ca23b402add29524cc6f704/f/0001-llvmpipe-Init-eglQueryDmaBufModifiersEXT-num_modifie.patch -Patch12: https://src.fedoraproject.org/rpms/mesa/raw/e89544b7a4d811a64ca23b402add29524cc6f704/f/0001-Revert-ac-radeonsi-remove-has_syncobj-has_fence_to_h.patch -# s390x: fix build -# Patch100: https://src.fedoraproject.org/rpms/mesa/raw/e89544b7a4d811a64ca23b402add29524cc6f704/f/fix-egl-on-s390x.patch - -BuildRequires: meson >= 1.3.0 -BuildRequires: gcc -BuildRequires: gcc-c++ -BuildRequires: gettext -%if 0%{?with_hardware} -BuildRequires: kernel-headers -%endif -# We only check for the minimum version of pkgconfig(libdrm) needed so that the -# SRPMs for each arch still have the same build dependencies. See: -# https://bugzilla.redhat.com/show_bug.cgi?id=1859515 -BuildRequires: pkgconfig(libdrm) >= 2.4.97 -%if 0%{?with_libunwind} -BuildRequires: pkgconfig(libunwind) -%endif -BuildRequires: pkgconfig(expat) -BuildRequires: pkgconfig(zlib) >= 1.2.3 -BuildRequires: pkgconfig(libzstd) -BuildRequires: pkgconfig(libselinux) -BuildRequires: pkgconfig(wayland-scanner) -BuildRequires: pkgconfig(wayland-protocols) >= 1.8 -BuildRequires: pkgconfig(wayland-client) >= 1.11 -BuildRequires: pkgconfig(wayland-server) >= 1.11 -BuildRequires: pkgconfig(wayland-egl-backend) >= 3 -BuildRequires: pkgconfig(x11) -BuildRequires: pkgconfig(xext) -BuildRequires: pkgconfig(xdamage) >= 1.1 -BuildRequires: pkgconfig(xfixes) -BuildRequires: pkgconfig(xcb-glx) >= 1.8.1 -BuildRequires: pkgconfig(xxf86vm) -BuildRequires: pkgconfig(xcb) -BuildRequires: pkgconfig(x11-xcb) -BuildRequires: pkgconfig(xcb-dri2) >= 1.8 -BuildRequires: pkgconfig(xcb-dri3) -BuildRequires: pkgconfig(xcb-present) -BuildRequires: pkgconfig(xcb-sync) -BuildRequires: pkgconfig(xshmfence) >= 1.1 -BuildRequires: pkgconfig(dri2proto) >= 2.8 -BuildRequires: pkgconfig(glproto) >= 1.4.14 -BuildRequires: pkgconfig(xcb-xfixes) -BuildRequires: pkgconfig(xcb-randr) -BuildRequires: pkgconfig(xrandr) >= 1.3 -BuildRequires: bison -BuildRequires: flex -%if 0%{?with_lmsensors} -BuildRequires: lm_sensors-devel -%endif -%if 0%{?with_vdpau} -BuildRequires: pkgconfig(vdpau) >= 1.1 -%endif -%if 0%{?with_va} -BuildRequires: pkgconfig(libva) >= 0.38.0 -%endif -%if 0%{?with_omx} -BuildRequires: pkgconfig(libomxil-bellagio) -%endif -BuildRequires: pkgconfig(libelf) -BuildRequires: pkgconfig(libglvnd) >= 1.3.2 -BuildRequires: llvm-devel >= 7.0.0 -%if 0%{?with_teflon} -BuildRequires: flatbuffers-devel -BuildRequires: flatbuffers-compiler -BuildRequires: xtensor-devel -%endif -%if 0%{?with_opencl} || 0%{?with_nvk} || 0%{?with_intel_clc} -BuildRequires: clang-devel -BuildRequires: bindgen -BuildRequires: rust-packaging -BuildRequires: pkgconfig(libclc) -BuildRequires: pkgconfig(SPIRV-Tools) -BuildRequires: pkgconfig(LLVMSPIRVLib) -%endif -%if 0%{?with_opencl} || 0%{?with_nvk} -BuildRequires: cbindgen -BuildRequires: (crate(paste) >= 1.0.14 with crate(paste) < 2) -BuildRequires: (crate(proc-macro2) >= 1.0.56 with crate(proc-macro2) < 2) -BuildRequires: (crate(quote) >= 1.0.25 with crate(quote) < 2) -BuildRequires: (crate(syn/clone-impls) >= 2.0.15 with crate(syn/clone-impls) < 3) -BuildRequires: (crate(unicode-ident) >= 1.0.6 with crate(unicode-ident) < 2) -%endif -%if %{with valgrind} -BuildRequires: pkgconfig(valgrind) -%endif -BuildRequires: python3-devel -BuildRequires: python3-mako -%if 0%{?with_intel_clc} -BuildRequires: python3-ply -%endif -BuildRequires: python3-pycparser -BuildRequires: vulkan-headers -BuildRequires: glslang -%if 0%{?with_vulkan_hw} -BuildRequires: pkgconfig(vulkan) -%endif - -%description -%{summary}. - -%package filesystem -Provides: %{srcname}-filesystem = %{?epoch:%{epoch}:}%{version}-%{release} -Summary: Mesa driver filesystem -Provides: mesa-dri-filesystem = %{?epoch:%{epoch}:}%{version}-%{release} - -%description filesystem -%{summary}. - -%package libGL -Provides: %{srcname}-libGL = %{?epoch:%{epoch}:}%{version}-%{release} -Summary: Mesa libGL runtime libraries -Requires: %{name}-libglapi%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} -Requires: libglvnd-glx%{?_isa} >= 1:1.3.2 -Recommends: %{name}-dri-drivers%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} - -%description libGL -%{summary}. - -%package libGL-devel -Provides: %{srcname}-libGL-devel = %{?epoch:%{epoch}:}%{version}-%{release} -Summary: Mesa libGL development package -Requires: %{name}-libGL%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} -Provides: %{srcname}-libGL-devel%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} -Requires: libglvnd-devel%{?_isa} >= 1:1.3.2 -Provides: libGL-devel -Provides: libGL-devel%{?_isa} -Recommends: gl-manpages - -%description libGL-devel -%{summary}. - -%package libEGL -Provides: %{srcname}-libEGL = %{?epoch:%{epoch}:}%{version}-%{release} -Summary: Mesa libEGL runtime libraries -Requires: libglvnd-egl%{?_isa} >= 1:1.3.2 -Requires: %{name}-libgbm%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} -Requires: %{name}-libglapi%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} -Recommends: %{name}-dri-drivers%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} -%description libEGL -%{summary}. - -%package libEGL-devel -Provides: %{srcname}-libEGL-devel = %{?epoch:%{epoch}:}%{version}-%{release} -Summary: Mesa libEGL development package -Requires: %{name}-libEGL%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} -Requires: libglvnd-devel%{?_isa} >= 1:1.3.2 -Requires: %{srcname}-khr-devel%{?_isa} -Provides: libEGL-devel -Provides: libEGL-devel%{?_isa} - -%description libEGL-devel -%{summary}. - -%package dri-drivers -Provides: %{srcname}-dri-drivers = %{?epoch:%{epoch}:}%{version}-%{release} -Summary: Mesa-based DRI drivers -Requires: %{name}-filesystem%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} -Requires: %{name}-libglapi%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} -%if 0%{?with_va} -Recommends: %{name}-va-drivers%{?_isa} -%endif - -%description dri-drivers -%{summary}. - -%if 0%{?with_omx} -%package omx-drivers -Provides: %{srcname}-omx-drivers = %{?epoch:%{epoch}:}%{version}-%{release} -Summary: Mesa-based OMX drivers -Requires: %{name}-filesystem%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} - -%description omx-drivers -%{summary}. -%endif - -%if 0%{?with_va} -%package va-drivers -Provides: %{srcname}-va-drivers = %{?epoch:%{epoch}:}%{version}-%{release} -Summary: Mesa-based VA-API video acceleration drivers -Requires: %{name}-filesystem%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} -Obsoletes: %{name}-vaapi-drivers < 22.2.0-5 - -%description va-drivers -%{summary}. -%endif - -%if 0%{?with_vdpau} -%package vdpau-drivers -Provides: %{srcname}-vdpau-drivers = %{?epoch:%{epoch}:}%{version}-%{release} -Summary: Mesa-based VDPAU drivers -Requires: %{name}-filesystem%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} - -%description vdpau-drivers -%{summary}. -%endif - -%package libOSMesa -Provides: %{srcname}-libOSMesa = %{?epoch:%{epoch}:}%{version}-%{release} -Summary: Mesa offscreen rendering libraries -Requires: %{name}-libglapi%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} -Provides: libOSMesa -Provides: libOSMesa%{?_isa} - -%description libOSMesa -%{summary}. - -%package libOSMesa-devel -Provides: %{srcname}-libOSMesa-devel = %{?epoch:%{epoch}:}%{version}-%{release} -Summary: Mesa offscreen rendering development package -Requires: %{name}-libOSMesa%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} - -%description libOSMesa-devel -%{summary}. - -%package libgbm -Provides: %{srcname}-libgbm = %{?epoch:%{epoch}:}%{version}-%{release} -Summary: Mesa gbm runtime library -Provides: libgbm -Provides: libgbm%{?_isa} -Recommends: %{name}-dri-drivers%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} -# If mesa-dri-drivers are installed, they must match in version. This is here to prevent using -# older mesa-dri-drivers together with a newer mesa-libgbm and its dependants. -# See https://bugzilla.redhat.com/show_bug.cgi?id=2193135 . -Requires: (%{name}-dri-drivers%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} if %{name}-dri-drivers%{?_isa}) - -%description libgbm -%{summary}. - -%package libgbm-devel -Provides: %{srcname}-libgbm-devel = %{?epoch:%{epoch}:}%{version}-%{release} -Summary: Mesa libgbm development package -Requires: %{name}-libgbm%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} -Provides: libgbm-devel -Provides: libgbm-devel%{?_isa} - -%description libgbm-devel -%{summary}. - -%if 0%{?with_xa} -%package libxatracker -Provides: %{srcname}-libxatracker = %{?epoch:%{epoch}:}%{version}-%{release} -Summary: Mesa XA state tracker -Provides: libxatracker -Provides: libxatracker%{?_isa} - -%description libxatracker -%{summary}. - -%package libxatracker-devel -Provides: %{srcname}-libxatracker-devel = %{?epoch:%{epoch}:}%{version}-%{release} -Summary: Mesa XA state tracker development package -Requires: %{name}-libxatracker%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} -Provides: libxatracker-devel -Provides: libxatracker-devel%{?_isa} - -%description libxatracker-devel -%{summary}. -%endif - -%package libglapi -Provides: %{srcname}-libglapi = %{?epoch:%{epoch}:}%{version}-%{release} -Summary: Mesa shared glapi -Provides: libglapi -Provides: libglapi%{?_isa} -# If mesa-dri-drivers are installed, they must match in version. This is here to prevent using -# older mesa-dri-drivers together with a newer mesa-libglapi or its dependants. -# See https://bugzilla.redhat.com/show_bug.cgi?id=2193135 . -Requires: (%{name}-dri-drivers%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} if %{name}-dri-drivers%{?_isa}) - -%description libglapi -%{summary}. - -%if 0%{?with_opencl} -%package libOpenCL -Provides: %{srcname}-libOpenCL = %{?epoch:%{epoch}:}%{version}-%{release} -Summary: Mesa OpenCL runtime library -Requires: ocl-icd%{?_isa} -Requires: libclc%{?_isa} -Requires: %{name}-libgbm%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} -Requires: opencl-filesystem - -%description libOpenCL -%{summary}. - -%package libOpenCL-devel -Provides: %{srcname}-libOpenCL-devel = %{?epoch:%{epoch}:}%{version}-%{release} -Summary: Mesa OpenCL development package -Requires: %{name}-libOpenCL%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} - -%description libOpenCL-devel -%{summary}. -%endif - -%if 0%{?with_teflon} -%package libTeflon -Summary: Mesa TensorFlow Lite delegate -Provides: %{srcname}-libTeflon = %{?epoch:%{epoch}:}%{version}-%{release} - - -%description libTeflon -%{summary}. -%endif - -%if 0%{?with_nine} -%package libd3d -Provides: %{srcname}-libd3d = %{?epoch:%{epoch}:}%{version}-%{release} -Summary: Mesa Direct3D9 state tracker - -%description libd3d -%{summary}. - -%package libd3d-devel -Provides: %{srcname}-libd3d-devel = %{?epoch:%{epoch}:}%{version}-%{release} -Summary: Mesa Direct3D9 state tracker development package -Requires: %{name}-libd3d%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} - -%description libd3d-devel -%{summary}. -%endif - -%package vulkan-drivers -Provides: %{srcname}-vulkan-drivers = %{?epoch:%{epoch}:}%{version}-%{release} -Summary: Mesa Vulkan drivers -Requires: vulkan%{_isa} -Obsoletes: mesa-vulkan-devel < %{?epoch:%{epoch}:}%{version}-%{release} - -%description vulkan-drivers -The drivers with support for the Vulkan API. - -%prep -%autosetup -n %{srcname}-%{ver} -p1 -cp %{SOURCE1} docs/ - -%build -# ensure standard Rust compiler flags are set -export RUSTFLAGS="%build_rustflags" - -%if 0%{?with_nvk} -export MESON_PACKAGE_CACHE_DIR="%{cargo_registry}/" -# So... Meson can't actually find them without tweaks -%define inst_crate_nameversion() %(basename %{cargo_registry}/%{1}-*) -%define rewrite_wrap_file() sed -e "/source.*/d" -e "s/%{1}-.*/%{inst_crate_nameversion %{1}}/" -i subprojects/%{1}.wrap - -%rewrite_wrap_file proc-macro2 -%rewrite_wrap_file quote -%rewrite_wrap_file syn -%rewrite_wrap_file unicode-ident -%rewrite_wrap_file paste -%endif - -# We've gotten a report that enabling LTO for mesa breaks some games. See -# https://bugzilla.redhat.com/show_bug.cgi?id=1862771 for details. -# Disable LTO for now -%define _lto_cflags %{nil} - -%meson \ - -Dplatforms=x11,wayland \ - -Ddri3=enabled \ - -Dosmesa=true \ -%if 0%{?with_hardware} - -Dgallium-drivers=swrast,virgl,nouveau%{?with_r300:,r300}%{?with_crocus:,crocus}%{?with_i915:,i915}%{?with_iris:,iris}%{?with_vmware:,svga}%{?with_radeonsi:,radeonsi}%{?with_r600:,r600}%{?with_freedreno:,freedreno}%{?with_etnaviv:,etnaviv}%{?with_tegra:,tegra}%{?with_vc4:,vc4}%{?with_v3d:,v3d}%{?with_kmsro:,kmsro}%{?with_lima:,lima}%{?with_panfrost:,panfrost}%{?with_vulkan_hw:,zink} \ -%else - -Dgallium-drivers=swrast,virgl \ -%endif - -Dgallium-vdpau=%{?with_vdpau:enabled}%{!?with_vdpau:disabled} \ - -Dgallium-omx=%{?with_omx:bellagio}%{!?with_omx:disabled} \ - -Dgallium-va=%{?with_va:enabled}%{!?with_va:disabled} \ - -Dgallium-xa=%{?with_xa:enabled}%{!?with_xa:disabled} \ - -Dgallium-nine=%{?with_nine:true}%{!?with_nine:false} \ - -Dteflon=%{?with_teflon:true}%{!?with_teflon:false} \ - -Dgallium-opencl=%{?with_opencl:icd}%{!?with_opencl:disabled} \ -%if 0%{?with_opencl} - -Dgallium-rusticl=true \ -%endif - -Dvideo-codecs=h264dec,h264enc,h265dec,h265enc,vc1dec,av1dec,av1enc,vp9dec \ - -Dvulkan-drivers=%{?vulkan_drivers} \ - -Dvulkan-layers=device-select \ - -Dshared-glapi=enabled \ - -Dgles1=enabled \ - -Dgles2=enabled \ - -Dopengl=true \ - -Dgbm=enabled \ - -Dglx=dri \ - -Degl=enabled \ - -Dglvnd=enabled \ -%if 0%{?with_intel_clc} - -Dintel-clc=enabled \ -%endif - -Dintel-rt=%{?with_intel_vk_rt:enabled}%{!?with_intel_vk_rt:disabled} \ - -Dmicrosoft-clc=disabled \ - -Dllvm=enabled \ - -Dshared-llvm=enabled \ - -Dvalgrind=%{?with_valgrind:enabled}%{!?with_valgrind:disabled} \ - -Dbuild-tests=false \ - -Dselinux=true \ -%if !0%{?with_libunwind} - -Dlibunwind=disabled \ -%endif -%if !0%{?with_lmsensors} - -Dlmsensors=disabled \ -%endif - -Dandroid-libbacktrace=disabled \ -%ifarch %{ix86} - -Dglx-read-only-text=true \ -%endif - %{nil} -%meson_build - - -%install -%meson_install - -# libvdpau opens the versioned name, don't bother including the unversioned -rm -vf %{buildroot}%{_libdir}/vdpau/*.so -# likewise glvnd -rm -vf %{buildroot}%{_libdir}/libGLX_mesa.so -rm -vf %{buildroot}%{_libdir}/libEGL_mesa.so -# XXX can we just not build this -rm -vf %{buildroot}%{_libdir}/libGLES* - -# glvnd needs a default provider for indirect rendering where it cannot -# determine the vendor -ln -s %{_libdir}/libGLX_mesa.so.0 %{buildroot}%{_libdir}/libGLX_system.so.0 - -# this keeps breaking, check it early. note that the exit from eu-ftr is odd. -pushd %{buildroot}%{_libdir} -for i in libOSMesa*.so libGL.so ; do - eu-findtextrel $i && exit 1 -done -popd - -%files filesystem -%doc docs/Mesa-MLAA-License-Clarification-Email.txt -%dir %{_libdir}/dri -%if 0%{?with_hardware} -%if 0%{?with_vdpau} -%dir %{_libdir}/vdpau -%endif -%endif - -%files libGL -%{_libdir}/libGLX_mesa.so.0* -%{_libdir}/libGLX_system.so.0* -%files libGL-devel -%dir %{_includedir}/GL/internal -%{_includedir}/GL/internal/dri_interface.h -%{_libdir}/pkgconfig/dri.pc -%{_libdir}/libglapi.so - -%files libEGL -%{_datadir}/glvnd/egl_vendor.d/50_mesa.json -%{_libdir}/libEGL_mesa.so.0* -%files libEGL-devel -%dir %{_includedir}/EGL -%{_includedir}/EGL/eglext_angle.h -%{_includedir}/EGL/eglmesaext.h - -%files libglapi -%{_libdir}/libglapi.so.0 -%{_libdir}/libglapi.so.0.* - -%files libOSMesa -%{_libdir}/libOSMesa.so.8* -%files libOSMesa-devel -%dir %{_includedir}/GL -%{_includedir}/GL/osmesa.h -%{_libdir}/libOSMesa.so -%{_libdir}/pkgconfig/osmesa.pc - -%files libgbm -%{_libdir}/libgbm.so.1 -%{_libdir}/libgbm.so.1.* -%files libgbm-devel -%{_libdir}/libgbm.so -%{_includedir}/gbm.h -%{_libdir}/pkgconfig/gbm.pc - -%if 0%{?with_xa} -%files libxatracker -%if 0%{?with_hardware} -%{_libdir}/libxatracker.so.2 -%{_libdir}/libxatracker.so.2.* -%endif - -%files libxatracker-devel -%if 0%{?with_hardware} -%{_libdir}/libxatracker.so -%{_includedir}/xa_tracker.h -%{_includedir}/xa_composite.h -%{_includedir}/xa_context.h -%{_libdir}/pkgconfig/xatracker.pc -%endif -%endif - -%if 0%{?with_teflon} -%files libTeflon -%{_libdir}/libteflon.so -%endif - -%if 0%{?with_opencl} -%files libOpenCL -%{_libdir}/libMesaOpenCL.so.* -%{_libdir}/libRusticlOpenCL.so.* -%{_sysconfdir}/OpenCL/vendors/mesa.icd -%{_sysconfdir}/OpenCL/vendors/rusticl.icd - -%files libOpenCL-devel -%{_libdir}/libMesaOpenCL.so -%{_libdir}/libRusticlOpenCL.so -%endif - -%if 0%{?with_nine} -%files libd3d -%dir %{_libdir}/d3d/ -%{_libdir}/d3d/*.so.* - -%files libd3d-devel -%{_libdir}/pkgconfig/d3d.pc -%{_includedir}/d3dadapter/ -%{_libdir}/d3d/*.so -%endif - -%files dri-drivers -%dir %{_datadir}/drirc.d -%{_datadir}/drirc.d/00-mesa-defaults.conf -%{_libdir}/dri/kms_swrast_dri.so -%{_libdir}/dri/swrast_dri.so -%{_libdir}/dri/virtio_gpu_dri.so - -%if 0%{?with_hardware} -%if 0%{?with_r300} -%{_libdir}/dri/r300_dri.so -%endif -%if 0%{?with_radeonsi} -%if 0%{?with_r600} -%{_libdir}/dri/r600_dri.so -%endif -%{_libdir}/dri/radeonsi_dri.so -%endif -%ifarch %{ix86} x86_64 -%{_libdir}/dri/crocus_dri.so -%{_libdir}/dri/i915_dri.so -%{_libdir}/dri/iris_dri.so -%endif -%ifarch aarch64 x86_64 %{ix86} -%{_libdir}/dri/ingenic-drm_dri.so -%{_libdir}/dri/imx-drm_dri.so -%{_libdir}/dri/imx-lcdif_dri.so -%{_libdir}/dri/kirin_dri.so -%{_libdir}/dri/komeda_dri.so -%{_libdir}/dri/mali-dp_dri.so -%{_libdir}/dri/mcde_dri.so -%{_libdir}/dri/mxsfb-drm_dri.so -%{_libdir}/dri/rcar-du_dri.so -%{_libdir}/dri/stm_dri.so -%endif -%if 0%{?with_vc4} -%{_libdir}/dri/vc4_dri.so -%endif -%if 0%{?with_v3d} -%{_libdir}/dri/v3d_dri.so -%endif -%if 0%{?with_freedreno} -%{_libdir}/dri/kgsl_dri.so -%{_libdir}/dri/msm_dri.so -%endif -%if 0%{?with_etnaviv} -%{_libdir}/dri/etnaviv_dri.so -%endif -%if 0%{?with_tegra} -%{_libdir}/dri/tegra_dri.so -%endif -%if 0%{?with_lima} -%{_libdir}/dri/lima_dri.so -%endif -%if 0%{?with_panfrost} -%{_libdir}/dri/panfrost_dri.so -%{_libdir}/dri/panthor_dri.so -%endif -%{_libdir}/dri/nouveau_dri.so -%if 0%{?with_vmware} -%{_libdir}/dri/vmwgfx_dri.so -%endif -%endif -%if 0%{?with_opencl} -%dir %{_libdir}/gallium-pipe -%{_libdir}/gallium-pipe/*.so -%endif -%if 0%{?with_kmsro} -%{_libdir}/dri/armada-drm_dri.so -%{_libdir}/dri/exynos_dri.so -%{_libdir}/dri/gm12u320_dri.so -%{_libdir}/dri/hdlcd_dri.so -%{_libdir}/dri/hx8357d_dri.so -%{_libdir}/dri/ili9163_dri.so -%{_libdir}/dri/ili9225_dri.so -%{_libdir}/dri/ili9341_dri.so -%{_libdir}/dri/ili9486_dri.so -%{_libdir}/dri/imx-dcss_dri.so -%{_libdir}/dri/mediatek_dri.so -%{_libdir}/dri/meson_dri.so -%{_libdir}/dri/mi0283qt_dri.so -%{_libdir}/dri/panel-mipi-dbi_dri.so -%{_libdir}/dri/pl111_dri.so -%{_libdir}/dri/repaper_dri.so -%{_libdir}/dri/rockchip_dri.so -%{_libdir}/dri/rzg2l-du_dri.so -%{_libdir}/dri/ssd130x_dri.so -%{_libdir}/dri/st7586_dri.so -%{_libdir}/dri/st7735r_dri.so -%{_libdir}/dri/sti_dri.so -%{_libdir}/dri/sun4i-drm_dri.so -%{_libdir}/dri/udl_dri.so -%{_libdir}/dri/zynqmp-dpsub_dri.so -%endif -%if 0%{?with_vulkan_hw} -%{_libdir}/dri/zink_dri.so -%endif - -%if 0%{?with_omx} -%files omx-drivers -%{_libdir}/bellagio/libomx_mesa.so -%endif - -%if 0%{?with_va} -%files va-drivers -%{_libdir}/dri/nouveau_drv_video.so -%if 0%{?with_r600} -%{_libdir}/dri/r600_drv_video.so -%endif -%if 0%{?with_radeonsi} -%{_libdir}/dri/radeonsi_drv_video.so -%endif -%{_libdir}/dri/virtio_gpu_drv_video.so -%endif - -%if 0%{?with_vdpau} -%files vdpau-drivers -%{_libdir}/vdpau/libvdpau_nouveau.so.1* -%if 0%{?with_r600} -%{_libdir}/vdpau/libvdpau_r600.so.1* -%endif -%if 0%{?with_radeonsi} -%{_libdir}/vdpau/libvdpau_radeonsi.so.1* -%endif -%{_libdir}/vdpau/libvdpau_virtio_gpu.so.1* -%endif - -%files vulkan-drivers -%{_libdir}/libvulkan_lvp.so -%{_datadir}/vulkan/icd.d/lvp_icd.*.json -%{_libdir}/libVkLayer_MESA_device_select.so -%{_datadir}/vulkan/implicit_layer.d/VkLayer_MESA_device_select.json -%if 0%{?with_vulkan_hw} -%{_libdir}/libvulkan_radeon.so -%{_datadir}/drirc.d/00-radv-defaults.conf -%{_datadir}/vulkan/icd.d/radeon_icd.*.json -%if 0%{?with_nvk} -%{_libdir}/libvulkan_nouveau.so -%{_datadir}/vulkan/icd.d/nouveau_icd.*.json -%endif -%ifarch %{ix86} x86_64 -%{_libdir}/libvulkan_intel.so -%{_datadir}/vulkan/icd.d/intel_icd.*.json -%{_libdir}/libvulkan_intel_hasvk.so -%{_datadir}/vulkan/icd.d/intel_hasvk_icd.*.json -%endif -%ifarch aarch64 x86_64 %{ix86} -%{_libdir}/libvulkan_broadcom.so -%{_datadir}/vulkan/icd.d/broadcom_icd.*.json -%{_libdir}/libvulkan_freedreno.so -%{_datadir}/vulkan/icd.d/freedreno_icd.*.json -%{_libdir}/libvulkan_panfrost.so -%{_datadir}/vulkan/icd.d/panfrost_icd.*.json -%{_libdir}/libpowervr_rogue.so -%{_libdir}/libvulkan_powervr_mesa.so -%{_datadir}/vulkan/icd.d/powervr_mesa_icd.*.json -%endif -%endif - -%changelog -%autochangelog \ No newline at end of file diff --git a/anda/lib/terra-mesa/update.rhai b/anda/lib/terra-mesa/update.rhai deleted file mode 100644 index 5bfae0c21c..0000000000 --- a/anda/lib/terra-mesa/update.rhai +++ /dev/null @@ -1,3 +0,0 @@ -let v = gitlab_tag("gitlab.freedesktop.org", "176"); -v.crop(5); -rpm.global("ver", v); diff --git a/anda/themes/tau-helium/tau-helium.spec b/anda/themes/tau-helium/tau-helium.spec index 5a73aad022..9f5f34258c 100644 --- a/anda/themes/tau-helium/tau-helium.spec +++ b/anda/themes/tau-helium/tau-helium.spec @@ -1,4 +1,4 @@ -%global ver 1.8.12-5 +%global ver 1.8.12-10 Summary: tauOS GTK/GNOME Shell Themes Name: tau-helium diff --git a/anda/tools/buildsys/anda/rust-anda.spec b/anda/tools/buildsys/anda/rust-anda.spec index 048072fa92..c838281859 100644 --- a/anda/tools/buildsys/anda/rust-anda.spec +++ b/anda/tools/buildsys/anda/rust-anda.spec @@ -5,7 +5,7 @@ %global crate anda Name: rust-anda -Version: 0.2.1 +Version: 0.2.2 Release: 1%?dist Summary: Andaman Build toolchain