diff --git a/lib32-llvm18/alr.sh b/lib32-llvm18/alr.sh index 6079f98..de00663 100644 --- a/lib32-llvm18/alr.sh +++ b/lib32-llvm18/alr.sh @@ -46,18 +46,16 @@ conflicts=( 'llvm18-libs(x86-32) < 18.1.8' ) -_pkgver="${version}" - -sources=("https://github.com/llvm/llvm-project/releases/download/llvmorg-${_pkgver}/llvm-project-${_pkgver}.src.tar.xz") +sources=("https://github.com/llvm/llvm-project/releases/download/llvmorg-${version}/llvm-project-${version}.src.tar.xz") checksums=('SKIP') prepare() { - cd "$srcdir/llvm-project-${_pkgver}.src" + cd "$srcdir/llvm-project-${version}.src" echo "==> Preparing LLVM ${version} (32-bit)..." } build() { - cd "$srcdir/llvm-project-${_pkgver}.src/llvm" + cd "$srcdir/llvm-project-${version}.src/llvm" export CFLAGS="-m32 -O2 -g1" export CXXFLAGS="-m32 -O2 -g1" @@ -94,12 +92,11 @@ build() { -DLLVM_ENABLE_LIBXML2=ON \ -DBUILD_SHARED_LIBS=OFF - echo "==> Building LLVM (32-bit) - this may take 30-60 minutes..." cmake --build build -j$(nproc) } package() { - cd "$srcdir/llvm-project-${_pkgver}.src/llvm" + cd "$srcdir/llvm-project-${version}.src/llvm" echo "==> Installing LLVM (32-bit) libraries..." DESTDIR="$pkgdir" cmake --install build @@ -146,6 +143,5 @@ package() { } files() { - # Find all installed files find "$pkgdir" -type f -o -type l | sed "s|^$pkgdir||" | sort } diff --git a/lib32-mesa/alr.sh b/lib32-mesa/alr.sh index b008a4a..7683bd1 100644 --- a/lib32-mesa/alr.sh +++ b/lib32-mesa/alr.sh @@ -1,9 +1,9 @@ name='lib32-mesa' -version='25.2.6' -release='15' +version='25.3.0' +release='1' epoch='1' -desc='Open-source OpenGL and Vulkan drivers (32-bit) with AMD RDNA 4 support for gaming' -desc_ru='OpenGL и Vulkan драйверы (32-бит) с открытым исходным кодом с поддержкой AMD RDNA 4 для игр' +desc='Open-source OpenGL and Vulkan drivers (32-bit)' +desc_ru='OpenGL и Vulkan драйверы (32-бит) с открытым исходным кодом' homepage='https://www.mesa3d.org/' maintainer='Evgeniy Khramov ' maintainer_ru='Евгений Храмов ' @@ -45,7 +45,6 @@ conflicts=( 'mesa-libGLES(x86-32) < 25.2.6' ) -# 32-битные зависимости deps=( 'expat(x86-32)' 'libdrm(x86-32)' @@ -63,7 +62,6 @@ deps=( 'vulkan-icd-loader(x86-32)' ) -# Зависимости для RedOS (32-бит) deps_redos=( 'expat(x86-32)' 'lib32-libdrm' @@ -84,7 +82,6 @@ deps_redos=( 'lib32-lm_sensors' ) -# Зависимости для сборки (в основном 64-бит tools + 32-бит libs) build_deps=( 'gcc' 'clang' @@ -135,13 +132,11 @@ build_deps=( build_deps_redos=("${build_deps[@]}") -_pkgver="${version}" - -sources=("https://archive.mesa3d.org/mesa-${_pkgver}.tar.xz") +sources=("https://archive.mesa3d.org/mesa-${version}.tar.xz") checksums=('361c97e8afa5fe20141c5362c5b489040751e12861c186a16c621a2fb182fc42') prepare() { - cd "$srcdir/mesa-${_pkgver}" + cd "$srcdir/mesa-${version}" # Установка версии для правильной идентификации echo "${version}-alr${epoch}.${release}" > VERSION @@ -177,18 +172,15 @@ EOF } build() { - cd "$srcdir/mesa-${_pkgver}" + cd "$srcdir/mesa-${version}" - # Set environment for 32-bit build export PKG_CONFIG_PATH="/usr/lib/pkgconfig:/usr/share/pkgconfig" export LLVM_CONFIG="/usr/bin/llvm-config-18-32" - # 32-bit CFLAGS/CXXFLAGS with LLVM 18 headers export CFLAGS="-m32 -O2 -g1 -I/usr/lib64/llvm18/include" export CXXFLAGS="-m32 -O2 -g1 -I/usr/lib64/llvm18/include" export LDFLAGS="-m32" - echo "==> Configuring Mesa (32-bit) with Meson..." meson setup builddir \ --cross-file="$srcdir/lib32-cross.ini" \ --prefix=/usr \ @@ -219,32 +211,23 @@ build() { -Dlibunwind=disabled \ -Dmicrosoft-clc=disabled - echo "==> Building Mesa (32-bit) - this may take 15-30 minutes..." meson compile -C builddir -j$(($(nproc) - 1)) } package() { - cd "$srcdir/mesa-${_pkgver}" + cd "$srcdir/mesa-${version}" - echo "==> Installing Mesa (32-bit)..." DESTDIR="$pkgdir" meson install -C builddir --no-rebuild - # Install license - install -Dm644 docs/license.rst "$pkgdir/usr/share/licenses/$name/LICENSE" + install-license docs/license.rst lib32-mesa/LICENSE - # Remove files that conflict with 64-bit mesa rm -rf "$pkgdir/usr/include" - rm -rf "$pkgdir/usr/share/drirc.d" - rm -rf "$pkgdir/usr/share/vulkan" - rm -rf "$pkgdir/usr/share/glvnd" rm -rf "$pkgdir/usr/lib/pkgconfig" rm -f "$pkgdir/usr/bin"/* - echo "==> Mesa ${version} (32-bit) installed with LLVM and AMD RDNA 4 gaming support" } files() { - # Find all installed 32-bit library files if [ -d ./usr/lib ]; then find ./usr/lib -type f -printf '%p\n' find ./usr/lib -type l -printf '%p\n' diff --git a/libdrm/alr.sh b/libdrm/alr.sh index 58c635d..1fc2bcb 100644 --- a/libdrm/alr.sh +++ b/libdrm/alr.sh @@ -54,20 +54,12 @@ conflicts=( 'libdrm-devel(x86-64) < 2.4.128' ) -_pkgver="${version}" - -sources=("https://dri.freedesktop.org/libdrm/libdrm-${_pkgver}.tar.xz") +sources=("https://dri.freedesktop.org/libdrm/libdrm-${version}.tar.xz") checksums=('SKIP') -prepare() { - cd "$srcdir/libdrm-${_pkgver}" - echo "==> Preparing libdrm ${version}..." -} - build() { - cd "$srcdir/libdrm-${_pkgver}" + cd "$srcdir/libdrm-${version}" - echo "==> Configuring libdrm with Meson..." meson setup builddir \ --prefix=/usr \ --libdir=lib64 \ @@ -88,23 +80,17 @@ build() { -Detnaviv=disabled \ -Dinstall-test-programs=false - echo "==> Building libdrm..." meson compile -C builddir -j$(nproc) } package() { - cd "$srcdir/libdrm-${_pkgver}" + cd "$srcdir/libdrm-${version}" - echo "==> Installing libdrm..." DESTDIR="$pkgdir" meson install -C builddir --no-rebuild - # Install license - install -Dm644 README.rst "$pkgdir/usr/share/licenses/$name/README.rst" - - echo "==> libdrm ${version} installed" + install-license README.rst libdrm/LICENSE" } files() { - # Find all installed files find "$pkgdir" -type f -o -type l | sed "s|^$pkgdir||" | sort } diff --git a/mesa/alr.sh b/mesa/alr.sh index 6204286..e2a0f87 100644 --- a/mesa/alr.sh +++ b/mesa/alr.sh @@ -1,9 +1,9 @@ name='mesa' -version='25.2.6' -release='6' +version='25.3.0' +release='1' epoch='1' -desc='Open-source OpenGL and Vulkan drivers with AMD RDNA 4 (RX 9070 XT) support' -desc_ru='OpenGL и Vulkan драйверы с открытым исходным кодом с поддержкой AMD RDNA 4 (RX 9070 XT)' +desc='Open-source OpenGL and Vulkan drivers' +desc_ru='OpenGL и Vulkan драйверы с открытым исходным кодом' homepage='https://www.mesa3d.org/' maintainer='Evgeniy Khramov ' maintainer_ru='Евгений Храмов ' @@ -142,27 +142,13 @@ build_deps=( build_deps_redos=("${build_deps[@]}") -_pkgver="${version}" - -sources=("https://archive.mesa3d.org/mesa-${_pkgver}.tar.xz") +sources=("https://archive.mesa3d.org/mesa-${version}.tar.xz") checksums=('361c97e8afa5fe20141c5362c5b489040751e12861c186a16c621a2fb182fc42') -prepare() { - cd "$srcdir/mesa-${_pkgver}" - - # Установка версии для правильной идентификации - echo "${version}-alr${epoch}.${release}" > VERSION - - echo "==> Preparing Mesa ${version} for AMD RDNA 4 (RX 9070 XT) support..." -} - build() { - cd "$srcdir/mesa-${_pkgver}" + cd "$srcdir/mesa-${version}" - # Set LLVM 18 paths export LLVM_CONFIG="/usr/bin/llvm-config-18" - - echo "==> Configuring Mesa with Meson..." meson setup builddir \ --prefix=/usr \ --libdir=lib64 \ @@ -190,24 +176,17 @@ build() { -Dlibunwind=disabled \ -Dmicrosoft-clc=disabled - echo "==> Building Mesa (this may take 15-30 minutes)..." meson compile -C builddir -j$(($(nproc) - 1)) } package() { - cd "$srcdir/mesa-${_pkgver}" - - echo "==> Installing Mesa..." + cd "$srcdir/mesa-${version}" DESTDIR="$pkgdir" meson install -C builddir --no-rebuild - # Install license - install -Dm644 docs/license.rst "$pkgdir/usr/share/licenses/$name/LICENSE" - - echo "==> Mesa ${_pkgver} installed with AMD RDNA 4 support" + install-license docs/license.rst mesa/LICENSE" } files() { - # Find all installed files if [ -d ./usr/lib64 ]; then find ./usr/lib64 -type f -printf '%p\n' find ./usr/lib64 -type l -printf '%p\n'