From 665b38f135626eec9cb3fd6f14fe66fc240bf35d Mon Sep 17 00:00:00 2001 From: Satadru Pramanik Date: Tue, 15 Nov 2022 12:04:24 -0500 Subject: [PATCH] X11 updates, and updates of packages which used to depend upon xorg_lib (#7634) * initial updates * mesa_utils -> 8.5.0 * libx11 -> 1.8.2 * mesa updates to support libglvnd * more updates * rev xorg_server * more changes * cleanup xhost * tk -> 8.6.12 * add binaries * add more binaries * sound updates * lint fixup * adjust libsoup2 * fixup chromaprint deps * change pulseaudio deps * cleanup gstreamer deps * rebuild libxrender * make gsettings dep adjustments * modify chromaprint deps * modify alsa_plugins deps * adjust libgconf deps * pulseaudio -> 16.1 * cleanup libglu * mpv -> 0.35.0 * modify sommelier mesa logic * make llvm build dep of mesa * cleanup more deps * lint * fix indentation --- packages/alsa_plugins.rb | 3 +- packages/chromaprint.rb | 4 +- packages/gsettings_desktop_schemas.rb | 8 +- packages/gstreamer.rb | 16 +- packages/libgconf.rb | 7 +- packages/libglu.rb | 41 +- packages/libglvnd.rb | 22 +- packages/libsdl.rb | 7 +- packages/libsdl2.rb | 5 +- packages/libsoup2.rb | 11 +- packages/libwebp.rb | 12 +- packages/libx11.rb | 22 +- packages/libxrandr.rb | 41 +- packages/libxrender.rb | 31 +- packages/mesa.rb | 565 ++++++++++++++------------ packages/mesa_utils.rb | 41 +- packages/mpv.rb | 71 ++-- packages/pipewire.rb | 50 ++- packages/pulseaudio.rb | 45 +- packages/sommelier.rb | 53 ++- packages/tk.rb | 52 ++- packages/xclock.rb | 32 +- packages/xhost.rb | 4 +- packages/xmessage.rb | 32 +- packages/xorg_server.rb | 87 ++-- packages/xprop.rb | 3 +- packages/xwayland.rb | 41 +- 27 files changed, 726 insertions(+), 580 deletions(-) diff --git a/packages/alsa_plugins.rb b/packages/alsa_plugins.rb index 8dee6a4f1..2e8cf8e0b 100644 --- a/packages/alsa_plugins.rb +++ b/packages/alsa_plugins.rb @@ -24,8 +24,7 @@ class Alsa_plugins < Package depends_on 'alsa_lib' # R depends_on 'dbus' - depends_on 'ffmpeg' - depends_on 'pulseaudio' + # depends_on 'ffmpeg' depends_on 'pulseaudio' # R depends_on 'speexdsp' # R diff --git a/packages/chromaprint.rb b/packages/chromaprint.rb index 2c4f84518..81e15663e 100644 --- a/packages/chromaprint.rb +++ b/packages/chromaprint.rb @@ -22,7 +22,9 @@ class Chromaprint < Package x86_64: '6ed504a7975b1d7dc30eba8d7cf9203ea95c7970948ec5a061a8fc85c691673f' }) - depends_on 'ffmpeg' + # depends_on 'ffmpeg' => :build + depends_on 'gcc' # R + depends_on 'glibc' # R def self.build suffix = '' diff --git a/packages/gsettings_desktop_schemas.rb b/packages/gsettings_desktop_schemas.rb index fc04637d1..abb2ce9e0 100644 --- a/packages/gsettings_desktop_schemas.rb +++ b/packages/gsettings_desktop_schemas.rb @@ -23,10 +23,10 @@ class Gsettings_desktop_schemas < Package x86_64: '6df95b4f1cea0c2ffcb39a606ddb87686a15f682f7777bc35ae68793cea1e371' }) - depends_on 'gnome_common' - depends_on 'glib' - depends_on 'gobject_introspection' - depends_on 'gtk4' + # depends_on 'gnome_common' + depends_on 'glib' => :build + depends_on 'gobject_introspection' => :build + # depends_on 'gtk4' gnome diff --git a/packages/gstreamer.rb b/packages/gstreamer.rb index 7e7b4e42f..0953c73d8 100644 --- a/packages/gstreamer.rb +++ b/packages/gstreamer.rb @@ -23,26 +23,25 @@ class Gstreamer < Package x86_64: '23752e3b1a1cb4feb2c3c0a7286833ef2d49598ab615ef93f0874b535e4d1e06' }) - depends_on 'elfutils' - depends_on 'glib' - depends_on 'gsl' - depends_on 'gtk3' - depends_on 'libcap' - depends_on 'libjpeg' - depends_on 'libunwind' depends_on 'alsa_lib' # R depends_on 'atk' # R + depends_on 'at_spi2_core' # R depends_on 'bz2' # R + depends_on 'cairo' # R depends_on 'chromaprint' # R + depends_on 'elfutils' depends_on 'ffmpeg' # R depends_on 'flac' # R depends_on 'gcc' # R depends_on 'gdk_pixbuf' # R + depends_on 'glib' depends_on 'glibc' # R depends_on 'gmp' # R depends_on 'gnutls' # R depends_on 'graphene' # R + depends_on 'gsl' depends_on 'gsm' # R + depends_on 'gtk3' depends_on 'harfbuzz' # R depends_on 'intel_media_sdk' if ARCH.eql?('x86_64') # R depends_on 'jack' # R @@ -51,6 +50,7 @@ class Gstreamer < Package depends_on 'libaom' # R depends_on 'libass' # R depends_on 'libavc1394' # R + depends_on 'libcap' depends_on 'libcurl' # R depends_on 'libde265' # R depends_on 'libdrm' # R @@ -59,6 +59,7 @@ class Gstreamer < Package depends_on 'libglvnd' # R depends_on 'libgudev' # R depends_on 'libiec61883' # R + depends_on 'libjpeg' depends_on 'libmodplug' # R depends_on 'libmp3lame' # R depends_on 'libogg' # R @@ -68,6 +69,7 @@ class Gstreamer < Package depends_on 'librsvg' # R depends_on 'libsndfile' # R depends_on 'libtheora' # R + depends_on 'libunwind' depends_on 'libusb' # R depends_on 'libva' # R depends_on 'libvorbis' # R diff --git a/packages/libgconf.rb b/packages/libgconf.rb index 2a8a9cdc8..292d75fe2 100644 --- a/packages/libgconf.rb +++ b/packages/libgconf.rb @@ -22,8 +22,11 @@ class Libgconf < Package x86_64: 'be97ae6807ad929e22b58e5ce3b561d0b0b49532b9980024aa854ffd762a1ec5' }) - depends_on 'dbus_glib' - depends_on 'gtk3' + depends_on 'dbus' # R + depends_on 'dbus_glib' # R + depends_on 'glib' # R + depends_on 'glibc' # R + depends_on 'libxml2' # R def self.build system "./configure --prefix=#{CREW_PREFIX} --libdir=#{CREW_LIB_PREFIX} --disable-orbit" diff --git a/packages/libglu.rb b/packages/libglu.rb index 17f98180c..76c52f152 100644 --- a/packages/libglu.rb +++ b/packages/libglu.rb @@ -3,34 +3,43 @@ require 'package' class Libglu < Package description 'Mesa OpenGL Utility library' homepage 'https://www.mesa3d.org/' - version '9.0.1' + version '9.0.2' license 'SGI-B-2.0' compatibility 'all' - source_url 'https://archive.mesa3d.org/glu/glu-9.0.1.tar.xz' - source_sha256 'fb5a4c2dd6ba6d1c21ab7c05129b0769544e1d68e1e3b0ffecb18e73c93055bc' + source_url 'https://gitlab.freedesktop.org/mesa/glu.git' + git_hashtag "glu-#{version}" binary_url({ - aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/libglu/9.0.1_armv7l/libglu-9.0.1-chromeos-armv7l.tar.xz', - armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/libglu/9.0.1_armv7l/libglu-9.0.1-chromeos-armv7l.tar.xz', - i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/libglu/9.0.1_i686/libglu-9.0.1-chromeos-i686.tar.xz', - x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/libglu/9.0.1_x86_64/libglu-9.0.1-chromeos-x86_64.tar.xz' + i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/libglu/9.0.2_i686/libglu-9.0.2-chromeos-i686.tar.zst', + aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/libglu/9.0.2_armv7l/libglu-9.0.2-chromeos-armv7l.tar.zst', + armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/libglu/9.0.2_armv7l/libglu-9.0.2-chromeos-armv7l.tar.zst', + x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/libglu/9.0.2_x86_64/libglu-9.0.2-chromeos-x86_64.tar.zst' }) binary_sha256({ - aarch64: '0bf229621676810287e72253faf88af8d6fc7e2c295a6110c30e50b4c841dd36', - armv7l: '0bf229621676810287e72253faf88af8d6fc7e2c295a6110c30e50b4c841dd36', - i686: 'f37f39c65fcf0e22e741da79e7cd3a7e21e61ddd84f871996b81a1df6b376d53', - x86_64: 'ce186ee083b0c2b6061b72fa1d8af22ada95d3b9c3ae1bfbc48bc2977b65e176' + i686: '1019df9d060a8deffe29d83c5f7bc3ae36aad7ce5aa0922ef992630cb5a54b9c', + aarch64: 'ac1d9cc34fd08c5fcff392ba91b28e58e99bf86b9d1575be073404516d297898', + armv7l: 'ac1d9cc34fd08c5fcff392ba91b28e58e99bf86b9d1575be073404516d297898', + x86_64: '55358e0044362fd6a9a4c1abf11f6d5757cd8cc757d96787da850e3b107ef4d1' }) - depends_on 'mesa' - depends_on 'xorg_lib' + depends_on 'gcc' # R + depends_on 'glibc' # R + depends_on 'mesa' # R + depends_on 'libglvnd' # R def self.build - system "./configure #{CREW_OPTIONS}" - system 'make' + system 'meson setup build' + system "meson configure #{CREW_MESON_OPTIONS} \ + build" + system 'ninja -C build' end def self.install - system 'make', "DESTDIR=#{CREW_DEST_DIR}", 'install' + system "DESTDIR=#{CREW_DEST_DIR} ninja -C build install" + # Get these from xorg_server package + @deletefiles = %W[#{CREW_DEST_PREFIX}/bin/X #{CREW_DEST_MAN_PREFIX}/man1/Xserver.1] + @deletefiles.each do |f| + FileUtils.rm_f f + end end end diff --git a/packages/libglvnd.rb b/packages/libglvnd.rb index d4ee8e472..568fff31b 100644 --- a/packages/libglvnd.rb +++ b/packages/libglvnd.rb @@ -3,29 +3,31 @@ require 'package' class Libglvnd < Package description 'The GL Vendor-Neutral Dispatch library' homepage 'https://gitlab.freedesktop.org/glvnd/libglvnd' - version '1.4.0' + @_ver = '1.5.0' + version "#{@_ver}-1" license 'MIT' compatibility 'all' source_url 'https://gitlab.freedesktop.org/glvnd/libglvnd.git' - git_hashtag "v#{version}" + git_hashtag "v#{@_ver}" binary_url({ - aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/libglvnd/1.4.0_armv7l/libglvnd-1.4.0-chromeos-armv7l.tar.zst', - armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/libglvnd/1.4.0_armv7l/libglvnd-1.4.0-chromeos-armv7l.tar.zst', - i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/libglvnd/1.4.0_i686/libglvnd-1.4.0-chromeos-i686.tar.zst', - x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/libglvnd/1.4.0_x86_64/libglvnd-1.4.0-chromeos-x86_64.tar.zst' + aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/libglvnd/1.5.0-1_armv7l/libglvnd-1.5.0-1-chromeos-armv7l.tar.zst', + armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/libglvnd/1.5.0-1_armv7l/libglvnd-1.5.0-1-chromeos-armv7l.tar.zst', + i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/libglvnd/1.5.0-1_i686/libglvnd-1.5.0-1-chromeos-i686.tar.zst', + x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/libglvnd/1.5.0-1_x86_64/libglvnd-1.5.0-1-chromeos-x86_64.tar.zst' }) binary_sha256({ - aarch64: '9f38d8734bbcd7e2258edf3a8e872093d10e71a5bcae250b211798413d2c617b', - armv7l: '9f38d8734bbcd7e2258edf3a8e872093d10e71a5bcae250b211798413d2c617b', - i686: '5e293d8f35f240ea212d1df3ca0fc852f60ac0fc79eb18d38489da7231022ac0', - x86_64: 'f17ee5a381d022cdc3ad36601ba4d2df0550b51a540e81c9c0486b61fca014bd' + aarch64: '977a403cea84ffa10f1d36699909679be3e1ebbb1c736c8334ea0885fd9ebd94', + armv7l: '977a403cea84ffa10f1d36699909679be3e1ebbb1c736c8334ea0885fd9ebd94', + i686: '9c9e4edbaff44cb62c30700363cfc1fd18c61e912d28446242e8419504d6456b', + x86_64: '212b02d81595f1048de400fd2049b961912ce118ababdfaefa524ff7cd91ae6a' }) depends_on 'libxext' depends_on 'libx11' depends_on 'glproto' depends_on 'python3' => :build + depends_on 'glibc' # R def self.build system "meson #{CREW_MESON_OPTIONS} \ diff --git a/packages/libsdl.rb b/packages/libsdl.rb index 5873d4ba5..876ffdaab 100644 --- a/packages/libsdl.rb +++ b/packages/libsdl.rb @@ -22,7 +22,9 @@ class Libsdl < Package x86_64: '1ff00ecd7af2ce401776cbdaa75a8b1d2d7c35d48688124bc986d7f5ef4108da' }) - depends_on 'xorg_server' + depends_on 'glibc' # R + # depends_on 'xorg_server' + # depends_on 'xwayland' depends_on 'alsa_lib' depends_on 'pulseaudio' depends_on 'mesa' @@ -45,8 +47,7 @@ class Libsdl < Package end def self.build - system "env #{CREW_ENV_OPTIONS} \ - ./configure \ + system "./configure \ #{CREW_OPTIONS}" system 'make' end diff --git a/packages/libsdl2.rb b/packages/libsdl2.rb index e23da986d..10383d82e 100644 --- a/packages/libsdl2.rb +++ b/packages/libsdl2.rb @@ -23,12 +23,13 @@ class Libsdl2 < Package armv7l: '359f785c46faa39300fcdca8a52f9b35a3cbc143cf02d88d0a7aacb0b7df068e' }) - depends_on 'xorg_server' + # depends_on 'xorg_server' + # depends_on 'xwayland' + depends_on 'glibc' # R depends_on 'alsa_lib' depends_on 'ibus' depends_on 'pulseaudio' depends_on 'nasm' => :build - patchelf def self.patch system 'filefix' diff --git a/packages/libsoup2.rb b/packages/libsoup2.rb index e24efc14d..1fd67f065 100644 --- a/packages/libsoup2.rb +++ b/packages/libsoup2.rb @@ -22,18 +22,19 @@ class Libsoup2 < Package x86_64: 'f5ed2100923109b22f46b8eefeffa429b4b98d1cb8a27d6fe3ac39fb3d38603c' }) - depends_on 'glib_networking' - depends_on 'libevent' - depends_on 'qtbase' - depends_on 'vala' depends_on 'brotli' # R - depends_on 'glib' # R depends_on 'glibc' # R + depends_on 'glib_networking' + depends_on 'glib' # R depends_on 'krb5' # R + depends_on 'libevent' depends_on 'libpsl' # R depends_on 'libxml2' # R + # depends_on 'qtbase' => :build depends_on 'sqlite' # R + depends_on 'vala' => :build depends_on 'zlibpkg' # R + gnome def self.build diff --git a/packages/libwebp.rb b/packages/libwebp.rb index 9511fa29c..664626c11 100644 --- a/packages/libwebp.rb +++ b/packages/libwebp.rb @@ -22,15 +22,15 @@ class Libwebp < Package x86_64: '1abbb91a453ce229b295d6a1383799bc7a1898140d711b866f13a69ea9d318da' }) - depends_on 'libpng' - depends_on 'libtiff' - depends_on 'libjpeg' - depends_on 'libsdl' - depends_on 'giflib' - depends_on 'mesa' depends_on 'freeglut' # R + depends_on 'giflib' # R depends_on 'glibc' # R depends_on 'libdeflate' # R + depends_on 'libglvnd' # R + depends_on 'libjpeg' # R + depends_on 'libpng' # R + depends_on 'libsdl' => :build + depends_on 'libtiff' # R depends_on 'xzutils' # R depends_on 'zlibpkg' # R depends_on 'zstd' # R diff --git a/packages/libx11.rb b/packages/libx11.rb index a42e7b22b..dc549cab8 100644 --- a/packages/libx11.rb +++ b/packages/libx11.rb @@ -3,23 +3,23 @@ require 'package' class Libx11 < Package description 'C interface to the X window system' homepage 'https://x.org' - version '1.8.1' - license 'custom' + version '1.8.2' + license 'X11' compatibility 'all' source_url 'https://gitlab.freedesktop.org/xorg/lib/libx11.git' git_hashtag "libX11-#{version}" binary_url({ - aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/libx11/1.8.1_armv7l/libx11-1.8.1-chromeos-armv7l.tar.zst', - armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/libx11/1.8.1_armv7l/libx11-1.8.1-chromeos-armv7l.tar.zst', - i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/libx11/1.8.1_i686/libx11-1.8.1-chromeos-i686.tar.zst', - x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/libx11/1.8.1_x86_64/libx11-1.8.1-chromeos-x86_64.tar.zst' + aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/libx11/1.8.2_armv7l/libx11-1.8.2-chromeos-armv7l.tar.zst', + armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/libx11/1.8.2_armv7l/libx11-1.8.2-chromeos-armv7l.tar.zst', + i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/libx11/1.8.2_i686/libx11-1.8.2-chromeos-i686.tar.zst', + x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/libx11/1.8.2_x86_64/libx11-1.8.2-chromeos-x86_64.tar.zst' }) binary_sha256({ - aarch64: 'e23c725908bc59c35e3775397b04ffd75c7688b62c1fd306a070e05df635b737', - armv7l: 'e23c725908bc59c35e3775397b04ffd75c7688b62c1fd306a070e05df635b737', - i686: 'b5d5653133f3c620c0da79bd8dcd4217501fe32145469591bc7dd2c98d63fb8d', - x86_64: 'ec9093b929bfdd0ea92e7c87eaa169f528a8da2480d231fe52bf53befc0f8354' + aarch64: 'd2b730b028358c1954c91b395e16df9458bd11470f33d3763f8bc66614ff4586', + armv7l: 'd2b730b028358c1954c91b395e16df9458bd11470f33d3763f8bc66614ff4586', + i686: '57d1124f8242759a79a13f9055cd04cc6e048aa8d857d29316f36deb9e2aade2', + x86_64: '245e743d40b645bc08fc46d01d94eec907acfd4361af4022cfc2105aea747140' }) depends_on 'glibc' # R @@ -33,7 +33,7 @@ class Libx11 < Package depends_on 'xorg_proto' => :build def self.build - system 'NOCONFIGURE=1 ./autogen.sh' + system '[ -x configure ] || NOCONFIGURE=1 ./autogen.sh' system 'filefix' system "./configure #{CREW_OPTIONS}" system 'make' diff --git a/packages/libxrandr.rb b/packages/libxrandr.rb index 1f36dc507..5618c7c04 100644 --- a/packages/libxrandr.rb +++ b/packages/libxrandr.rb @@ -2,39 +2,46 @@ require 'package' class Libxrandr < Package description 'X.org X Resize, Rotate and Reflection extension library' - homepage 'https://www.x.org' - version '1.5.2-1' + homepage 'https://xorg.freedesktop.org/' + @_ver = '1.5.2' + version "#{@_ver}-2" license 'MIT' compatibility 'all' - source_url 'https://www.x.org/archive/individual/lib/libXrandr-1.5.2.tar.gz' - source_sha256 '3f10813ab355e7a09f17e147d61b0ce090d898a5ea5b5519acd0ef68675dcf8e' + source_url 'https://gitlab.freedesktop.org/xorg/lib/libxrandr.git' + git_hashtag "libXrandr-#{@_ver}" binary_url({ - aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/libxrandr/1.5.2-1_armv7l/libxrandr-1.5.2-1-chromeos-armv7l.tar.xz', - armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/libxrandr/1.5.2-1_armv7l/libxrandr-1.5.2-1-chromeos-armv7l.tar.xz', - i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/libxrandr/1.5.2-1_i686/libxrandr-1.5.2-1-chromeos-i686.tar.xz', - x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/libxrandr/1.5.2-1_x86_64/libxrandr-1.5.2-1-chromeos-x86_64.tar.xz' + aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/libxrandr/1.5.2-2_armv7l/libxrandr-1.5.2-2-chromeos-armv7l.tar.zst', + armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/libxrandr/1.5.2-2_armv7l/libxrandr-1.5.2-2-chromeos-armv7l.tar.zst', + i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/libxrandr/1.5.2-2_i686/libxrandr-1.5.2-2-chromeos-i686.tar.zst', + x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/libxrandr/1.5.2-2_x86_64/libxrandr-1.5.2-2-chromeos-x86_64.tar.zst' }) binary_sha256({ - aarch64: '795885bddb9431b2522f1d78ced0bcf06dcbbb988b1aec402223a8d5c42ad4ba', - armv7l: '795885bddb9431b2522f1d78ced0bcf06dcbbb988b1aec402223a8d5c42ad4ba', - i686: 'c744ec234f8362ce658f5acccfd978287e73f7a41d64ca2a0593de096b6ec41d', - x86_64: 'c4d10ac43c01b0e857536b939775597ffe0adf533925c1a2146695213f10f7c9' + aarch64: '1fd4c4cbaf1d23c91908689adf29874d2a9de83bece2428c92603fa39cdef70e', + armv7l: '1fd4c4cbaf1d23c91908689adf29874d2a9de83bece2428c92603fa39cdef70e', + i686: '4859f0646ca15fb1240c8e586eb8a30cfe9cb486d0ecd1c9a84844529e0b11d7', + x86_64: '76c42361b5df7706ade70aa94f21afe89d25dd0710931b39023d4b1493dbd30e' }) - depends_on 'libx11' depends_on 'libxext' depends_on 'libxrender' - depends_on 'llvm' => :build + depends_on 'util_macros' => :build + depends_on 'xorg_proto' => :build + depends_on 'glibc' # R + depends_on 'libbsd' # R + depends_on 'libmd' # R + depends_on 'libx11' # R + depends_on 'libxau' # R + depends_on 'libxcb' # R + depends_on 'libxdmcp' # R def self.build - ENV['CFLAGS'] = '-fuse-ld=lld' - ENV['CXXFLAGS'] = '-fuse-ld=lld' + system '[ -x configure ] || NOCONFIGURE=1 ./autogen.sh' system "./configure #{CREW_OPTIONS}" system 'make' end def self.install - system 'make', "DESTDIR=#{CREW_DEST_DIR}", 'install' + system "make DESTDIR=#{CREW_DEST_DIR} install" end end diff --git a/packages/libxrender.rb b/packages/libxrender.rb index b9ef6305a..9bc426c4a 100644 --- a/packages/libxrender.rb +++ b/packages/libxrender.rb @@ -3,29 +3,36 @@ require 'package' class Libxrender < Package description 'X Rendering Extension client library.' homepage 'https://www.x.org' - version '0.9.10-0' + version '0.9.11' license 'custom' compatibility 'all' - source_url 'https://www.x.org/releases/individual/lib/libXrender-0.9.10.tar.gz' - source_sha256 '770527cce42500790433df84ec3521e8bf095dfe5079454a92236494ab296adf' + source_url 'https://gitlab.freedesktop.org/xorg/lib/libxrender.git' + git_hashtag "libXrender-#{version}" binary_url({ - aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/libxrender/0.9.10-0_armv7l/libxrender-0.9.10-0-chromeos-armv7l.tar.xz', - armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/libxrender/0.9.10-0_armv7l/libxrender-0.9.10-0-chromeos-armv7l.tar.xz', - i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/libxrender/0.9.10-0_i686/libxrender-0.9.10-0-chromeos-i686.tar.xz', - x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/libxrender/0.9.10-0_x86_64/libxrender-0.9.10-0-chromeos-x86_64.tar.xz' + aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/libxrender/0.9.11_armv7l/libxrender-0.9.11-chromeos-armv7l.tar.zst', + armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/libxrender/0.9.11_armv7l/libxrender-0.9.11-chromeos-armv7l.tar.zst', + i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/libxrender/0.9.11_i686/libxrender-0.9.11-chromeos-i686.tar.zst', + x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/libxrender/0.9.11_x86_64/libxrender-0.9.11-chromeos-x86_64.tar.zst' }) binary_sha256({ - aarch64: 'f6a33f234184d2dae8646449940234d749deefffb7148a141ac09a402a054e22', - armv7l: 'f6a33f234184d2dae8646449940234d749deefffb7148a141ac09a402a054e22', - i686: '883bce06a7813a3640258c2d1f9f81bac128330a34726691d8c5e76959525e40', - x86_64: '561c5a0e8f4b0cd4d9b7e1f7c2b53901e687d3be91e0dfdcb93f3c2184f61dbc' + aarch64: '859bf33ee1c94216071d6ef524e3f7ccb977cede86ab483b8936d6ef02ad802f', + armv7l: '859bf33ee1c94216071d6ef524e3f7ccb977cede86ab483b8936d6ef02ad802f', + i686: '73b44d73f9b0075adb1eb8413ed2e029bef828d0841f92061833e103e0b14110', + x86_64: '247dda42e157a2eb78da0f9408e0cd8281787df630f6bba62e428d02dd31f217' }) depends_on 'libx11' + depends_on 'glibc' # R + depends_on 'libbsd' # R + depends_on 'libmd' # R + depends_on 'libxau' # R + depends_on 'libxcb' # R + depends_on 'libxdmcp' # R def self.build - system "./configure --prefix=#{CREW_PREFIX} --libdir=#{CREW_LIB_PREFIX}" + system '[ -x configure ] || NOCONFIGURE=1 ./autogen.sh' + system "./configure #{CREW_OPTIONS}" system 'make' end diff --git a/packages/mesa.rb b/packages/mesa.rb index 160acb5f4..ac8700a2c 100644 --- a/packages/mesa.rb +++ b/packages/mesa.rb @@ -3,30 +3,55 @@ require 'package' class Mesa < Package description 'Open-source implementation of the OpenGL specification' homepage 'https://www.mesa3d.org' - @_ver = '21.3.9' - version @_ver + if CREW_KERNEL_VERSION.to_f < 5.10 + @_ver = '21.3.9' + version "#{@_ver}-1" + else + @_ver = '22.3.0-rc2' + version @_ver + end license 'MIT' compatibility 'all' source_url 'https://gitlab.freedesktop.org/mesa/mesa.git' git_hashtag "mesa-#{@_ver}" - binary_url({ - aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/mesa/21.3.9_armv7l/mesa-21.3.9-chromeos-armv7l.tar.zst', - armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/mesa/21.3.9_armv7l/mesa-21.3.9-chromeos-armv7l.tar.zst', - i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/mesa/21.3.9_i686/mesa-21.3.9-chromeos-i686.tar.zst', - x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/mesa/21.3.9_x86_64/mesa-21.3.9-chromeos-x86_64.tar.zst' - }) - binary_sha256({ - aarch64: '82dc00e1a2ada502a8eb4a2e29298c74f0ff86a39b548dab770cf00664080b7e', - armv7l: '82dc00e1a2ada502a8eb4a2e29298c74f0ff86a39b548dab770cf00664080b7e', - i686: '181353683d09203978c391e84348b287788c9c30f18b11fa85c1b91ce186b994', - x86_64: 'fa0127418c2be0a32ba48518cdc7f3b042f659c6fd7904b81fad2eb1c78f51b1' - }) + if CREW_KERNEL_VERSION.to_f < 5.10 + binary_url({ + aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/mesa/21.3.9-1_armv7l/mesa-21.3.9-1-chromeos-armv7l.tar.zst', + armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/mesa/21.3.9-1_armv7l/mesa-21.3.9-1-chromeos-armv7l.tar.zst', + i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/mesa/21.3.9-1_i686/mesa-21.3.9-1-chromeos-i686.tar.zst', + x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/mesa/21.3.9-1_x86_64/mesa-21.3.9-1-chromeos-x86_64.tar.zst' + }) + binary_sha256({ + aarch64: '3551d426b877be55dd2f1b9819e017cb7e7ae11e09c427b27af40f883006b60e', + armv7l: '3551d426b877be55dd2f1b9819e017cb7e7ae11e09c427b27af40f883006b60e', + i686: '115dd712b7f93ddffa8aaa8b3c3d97eaaec91f5554ed10e575dae33f1e062a50', + x86_64: '8ade2ad7da701c927ce63ba60057a7c35b8d7fbbb145a0c4cf5f5a419aaf376d' + }) + else + binary_url({ + aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/mesa/22.3.0-rc2_armv7l/mesa-22.3.0-rc2-chromeos-armv7l.tar.zst', + armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/mesa/22.3.0-rc2_armv7l/mesa-22.3.0-rc2-chromeos-armv7l.tar.zst', + x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/mesa/22.3.0-rc2_x86_64/mesa-22.3.0-rc2-chromeos-x86_64.tar.zst' + }) + binary_sha256({ + aarch64: '5726ac5cd71ac69fdde03f308c6c0d57a698583f7ff15f8d82f65d6761103027', + armv7l: '5726ac5cd71ac69fdde03f308c6c0d57a698583f7ff15f8d82f65d6761103027', + x86_64: '8450e1dd41f3130aef69839b56c0c011ca36b4a3c0b9984dc0529a569fe2951a' + }) + end + depends_on 'elfutils' # R + depends_on 'eudev' # R + depends_on 'expat' # R + depends_on 'gcc' # R + depends_on 'glibc' # R depends_on 'glslang' => :build depends_on 'libdrm' # R + depends_on 'libglvnd' # R depends_on 'libomxil_bellagio' => :build depends_on 'libunwind' + depends_on 'libva' => :build # Enable only during build to avoid circular dep. depends_on 'libvdpau' => :build depends_on 'libx11' # R depends_on 'libxcb' # R @@ -40,254 +65,284 @@ class Mesa < Package depends_on 'libxvmc' # R depends_on 'libxv' # R depends_on 'libxxf86vm' # R - # depends_on 'libva' => :build # Enable only during build to avoid circular dep. depends_on 'llvm' => :build depends_on 'lm_sensors' # R depends_on 'py3_mako' depends_on 'valgrind' => :build depends_on 'vulkan_headers' => :build depends_on 'vulkan_icd_loader' => :build + depends_on 'vulkan_icd_loader' # R depends_on 'wayland_protocols' => :build depends_on 'wayland' # R + depends_on 'zlibpkg' # R + depends_on 'zstd' # R - def self.patch - case ARCH - when 'aarch64', 'armv7l' - # See https://gitlab.freedesktop.org/mesa/mesa/-/issues/5067 - @freedrenopatch = <<~FREEDRENOPATCHEOF - --- a/src/gallium/drivers/freedreno/freedreno_util.h 2021-08-05 14:40:22.000000000 +0000 - +++ b/src/gallium/drivers/freedreno/freedreno_util.h 2021-08-05 19:52:53.115410668 +0000 - @@ -44,6 +44,15 @@ - #include "adreno_pm4.xml.h" - #include "disasm.h" - #{' '} - +#include - +#include - + - +#ifndef SYS_gettid - +#error "SYS_gettid unavailable on this system" - +#endif - + - +#define gettid() ((pid_t)syscall(SYS_gettid)) - + - #ifdef __cplusplus - extern "C" { - #endif - FREEDRENOPATCHEOF - File.write('freedreno.patch', @freedrenopatch) - system 'patch -Np1 -i freedreno.patch' - # See https://gitlab.freedesktop.org/mesa/mesa/-/issues/3505 - @tegrapatch = <<~TEGRAPATCHEOF - diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_state_validate.c b/src/gallium/drivers/nouveau/nvc0/nvc0_state_validate.c - index 48d81f197db..f9b7bd57b27 100644 - --- a/src/gallium/drivers/nouveau/nvc0/nvc0_state_validate.c - +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_state_validate.c - @@ -255,6 +255,10 @@ nvc0_validate_fb(struct nvc0_context *nvc0) - #{' '} - nvc0_resource_fence(res, NOUVEAU_BO_WR); - #{' '} - + // hack to make opengl at least halfway working on a tegra k1 - + // see: https://gitlab.freedesktop.org/mesa/mesa/-/issues/3505#note_627006 - + fb->zsbuf=NULL; - + - assert(!fb->zsbuf); - } - TEGRAPATCHEOF - File.write('tegra.patch', @tegrapatch) - system 'patch -Np1 -i tegra.patch' + if CREW_KERNEL_VERSION.to_f < 5.10 + def self.patch + case ARCH + when 'aarch64', 'armv7l' + # See https://gitlab.freedesktop.org/mesa/mesa/-/issues/5067 + @freedrenopatch = <<~FREEDRENOPATCHEOF + --- a/src/gallium/drivers/freedreno/freedreno_util.h 2021-08-05 14:40:22.000000000 +0000 + +++ b/src/gallium/drivers/freedreno/freedreno_util.h 2021-08-05 19:52:53.115410668 +0000 + @@ -44,6 +44,15 @@ + #include "adreno_pm4.xml.h" + #include "disasm.h" + #{' '} + +#include + +#include + + + +#ifndef SYS_gettid + +#error "SYS_gettid unavailable on this system" + +#endif + + + +#define gettid() ((pid_t)syscall(SYS_gettid)) + + + #ifdef __cplusplus + extern "C" { + #endif + FREEDRENOPATCHEOF + File.write('freedreno.patch', @freedrenopatch) + system 'patch -Np1 -i freedreno.patch' + # See https://gitlab.freedesktop.org/mesa/mesa/-/issues/3505 + @tegrapatch = <<~TEGRAPATCHEOF + diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_state_validate.c b/src/gallium/drivers/nouveau/nvc0/nvc0_state_validate.c + index 48d81f197db..f9b7bd57b27 100644 + --- a/src/gallium/drivers/nouveau/nvc0/nvc0_state_validate.c + +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_state_validate.c + @@ -255,6 +255,10 @@ nvc0_validate_fb(struct nvc0_context *nvc0) + #{' '} + nvc0_resource_fence(res, NOUVEAU_BO_WR); + #{' '} + + // hack to make opengl at least halfway working on a tegra k1 + + // see: https://gitlab.freedesktop.org/mesa/mesa/-/issues/3505#note_627006 + + fb->zsbuf=NULL; + + + assert(!fb->zsbuf); + } + TEGRAPATCHEOF + File.write('tegra.patch', @tegrapatch) + system 'patch -Np1 -i tegra.patch' + end + # llvm 13/14 patch See https://gitlab.freedesktop.org/mesa/mesa/-/issues/5455 + # & https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13273.patch + downloader 'https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13273.diff', + '76d2dd16532336837bccd4885c40efed0ab5f1de8e8fa114a7835dc269f221ac' + system 'patch -Np1 -i 13273.diff' + # mesa: Implement ANGLE_sync_control_rate (used by Chrome browser) + downloader 'https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15381.diff', + '1391e189f5ad40a711a6f72a7d59aef1b943ec9dc408852f5f562699bf50ba6c' + system 'patch -Np1 -i 15381.diff' + # llvm 15 patch + puts 'patch 1' + downloader 'https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15091.diff', + 'c53387c9fce1f34b6d7c0272ebef148dda59dea35fd83df2f3f4a0033732ebbd' + system 'patch -Np1 -i 15091.diff' + # another llvm 15 patch + downloader 'https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15232.diff', + 'c66b6b03a59ad43a89bc7ab4e04f8c311631d27c3ea6769217c09beef707d6c3' + system 'patch -Np1 -i 15232.diff' + # another llvm 15 patch + puts 'patch 3' + downloader 'https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16129.diff', + '88e5d7f6b4e6dd4ac7220cf194aab6e86d748a8cb99a86515eb4c6bdf9b20959' + system 'patch -Np1 -i 16129.diff' + # another llvm 15 patch + puts 'patch 4' + # downloader 'https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16289.diff', + # '56725f4238d8bb60d813db1724e37bf149345ff456c0c2792f0982d237c18cf1' + system 'curl -OLf https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16289.diff' + puts 'installing patch 4' + system 'patch -Np1 -F 10 -i 16289.diff' + # another llvm 15 patch + puts 'patch 5' + # downloader 'https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17514.diff', + # 'b769f0eb2db0b71723f8ad6f20c03a166a54eab74bfd292cf5b9c8ea86d2c73b' + system 'curl -OLf https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17514.diff' + system 'patch -Np1 -i 17514.diff' + puts 'downloader done' + # another llvm 15 patch + # Refreshed patch from https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17518.diff + @mesa_patch = <<~'PATCH_EOF' + diff -Npaur a/lp_bld_arit.c b/lp_bld_arit.c + --- a/src/gallium/auxiliary/gallivm/lp_bld_arit.c + +++ b/src/gallium/auxiliary/gallivm/lp_bld_arit.c + @@ -391,16 +391,10 @@ lp_build_comp(struct lp_build_context *b + return LLVMBuildNot(builder, a, ""); + } + + - if(LLVMIsConstant(a)) + - if (type.floating) + - return LLVMConstFSub(bld->one, a); + - else + - return LLVMConstSub(bld->one, a); + + if (type.floating) + + return LLVMBuildFSub(builder, bld->one, a, ""); + else + - if (type.floating) + - return LLVMBuildFSub(builder, bld->one, a, ""); + - else + - return LLVMBuildSub(builder, bld->one, a, ""); + + return LLVMBuildSub(builder, bld->one, a, ""); + } + + + @@ -479,16 +473,10 @@ lp_build_add(struct lp_build_context *bl + } + } + + - if(LLVMIsConstant(a) && LLVMIsConstant(b)) + - if (type.floating) + - res = LLVMConstFAdd(a, b); + - else + - res = LLVMConstAdd(a, b); + + if (type.floating) + + res = LLVMBuildFAdd(builder, a, b, ""); + else + - if (type.floating) + - res = LLVMBuildFAdd(builder, a, b, ""); + - else + - res = LLVMBuildAdd(builder, a, b, ""); + + res = LLVMBuildAdd(builder, a, b, ""); + + /* clamp to ceiling of 1.0 */ + if(bld->type.norm && (bld->type.floating || bld->type.fixed)) + @@ -815,16 +803,10 @@ lp_build_sub(struct lp_build_context *bl + } + } + + - if(LLVMIsConstant(a) && LLVMIsConstant(b)) + - if (type.floating) + - res = LLVMConstFSub(a, b); + - else + - res = LLVMConstSub(a, b); + + if (type.floating) + + res = LLVMBuildFSub(builder, a, b, ""); + else + - if (type.floating) + - res = LLVMBuildFSub(builder, a, b, ""); + - else + - res = LLVMBuildSub(builder, a, b, ""); + + res = LLVMBuildSub(builder, a, b, ""); + + if(bld->type.norm && (bld->type.floating || bld->type.fixed)) + res = lp_build_max_simple(bld, res, bld->zero, GALLIVM_NAN_RETURN_OTHER_SECOND_NONNAN); + @@ -980,29 +962,15 @@ lp_build_mul(struct lp_build_context *bl + else + shift = NULL; + + - if(LLVMIsConstant(a) && LLVMIsConstant(b)) { + - if (type.floating) + - res = LLVMConstFMul(a, b); + - else + - res = LLVMConstMul(a, b); + - if(shift) { + - if(type.sign) + - res = LLVMConstAShr(res, shift); + - else + - res = LLVMConstLShr(res, shift); + - } + - } + - else { + - if (type.floating) + - res = LLVMBuildFMul(builder, a, b, ""); + + if (type.floating) + + res = LLVMBuildFMul(builder, a, b, ""); + + else + + res = LLVMBuildMul(builder, a, b, ""); + + if (shift) { + + if (type.sign) + + res = LLVMBuildAShr(builder, res, shift, ""); + else + - res = LLVMBuildMul(builder, a, b, ""); + - if(shift) { + - if(type.sign) + - res = LLVMBuildAShr(builder, res, shift, ""); + - else + - res = LLVMBuildLShr(builder, res, shift, ""); + - } + + res = LLVMBuildLShr(builder, res, shift, ""); + } + + return res; + @@ -1288,15 +1256,6 @@ lp_build_div(struct lp_build_context *bl + if(a == bld->undef || b == bld->undef) + return bld->undef; + + - if(LLVMIsConstant(a) && LLVMIsConstant(b)) { + - if (type.floating) + - return LLVMConstFDiv(a, b); + - else if (type.sign) + - return LLVMConstSDiv(a, b); + - else + - return LLVMConstUDiv(a, b); + - } + - + /* fast rcp is disabled (just uses div), so makes no sense to try that */ + if(FALSE && + ((util_get_cpu_caps()->has_sse && type.width == 32 && type.length == 4) || + @@ -2643,7 +2602,7 @@ lp_build_rcp(struct lp_build_context *bl + assert(type.floating); + + if(LLVMIsConstant(a)) + - return LLVMConstFDiv(bld->one, a); + + return LLVMBuildFDiv(builder, bld->one, a, ""); + + /* + * We don't use RCPPS because: + + PATCH_EOF + File.write('mesa.patch', @mesa_patch) + system 'patch -p1 -i mesa.patch' end - # llvm 13/14 patch See https://gitlab.freedesktop.org/mesa/mesa/-/issues/5455 - # & https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13273.patch - downloader 'https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13273.diff', - '76d2dd16532336837bccd4885c40efed0ab5f1de8e8fa114a7835dc269f221ac' - system 'patch -Np1 -i 13273.diff' - # mesa: Implement ANGLE_sync_control_rate (used by Chrome browser) - downloader 'https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15381.diff', - '1391e189f5ad40a711a6f72a7d59aef1b943ec9dc408852f5f562699bf50ba6c' - system 'patch -Np1 -i 15381.diff' - # llvm 15 patch - downloader 'https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15091.diff', - 'c53387c9fce1f34b6d7c0272ebef148dda59dea35fd83df2f3f4a0033732ebbd' - system 'patch -Np1 -i 15091.diff' - # another llvm 15 patch - downloader 'https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15232.diff', - 'c66b6b03a59ad43a89bc7ab4e04f8c311631d27c3ea6769217c09beef707d6c3' - system 'patch -Np1 -i 15232.diff' - # another llvm 15 patch - downloader 'https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16129.diff', - '88e5d7f6b4e6dd4ac7220cf194aab6e86d748a8cb99a86515eb4c6bdf9b20959' - system 'patch -Np1 -i 16129.diff' - # another llvm 15 patch - downloader 'https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16289.diff', - '56725f4238d8bb60d813db1724e37bf149345ff456c0c2792f0982d237c18cf1' - system 'patch -Np1 -F 10 -i 16289.diff' - # another llvm 15 patch - downloader 'https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17514.diff', - 'b769f0eb2db0b71723f8ad6f20c03a166a54eab74bfd292cf5b9c8ea86d2c73b' - system 'patch -Np1 -i 17514.diff' - # another llvm 15 patch - # Refreshed patch from https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17518.diff - @mesa_patch = <<~'PATCH_EOF' - diff -Npaur a/lp_bld_arit.c b/lp_bld_arit.c - --- a/src/gallium/auxiliary/gallivm/lp_bld_arit.c - +++ b/src/gallium/auxiliary/gallivm/lp_bld_arit.c - @@ -391,16 +391,10 @@ lp_build_comp(struct lp_build_context *b - return LLVMBuildNot(builder, a, ""); - } - - if(LLVMIsConstant(a)) - - if (type.floating) - - return LLVMConstFSub(bld->one, a); - - else - - return LLVMConstSub(bld->one, a); - + if (type.floating) - + return LLVMBuildFSub(builder, bld->one, a, ""); - else - - if (type.floating) - - return LLVMBuildFSub(builder, bld->one, a, ""); - - else - - return LLVMBuildSub(builder, bld->one, a, ""); - + return LLVMBuildSub(builder, bld->one, a, ""); - } - - - @@ -479,16 +473,10 @@ lp_build_add(struct lp_build_context *bl - } - } - - - if(LLVMIsConstant(a) && LLVMIsConstant(b)) - - if (type.floating) - - res = LLVMConstFAdd(a, b); - - else - - res = LLVMConstAdd(a, b); - + if (type.floating) - + res = LLVMBuildFAdd(builder, a, b, ""); - else - - if (type.floating) - - res = LLVMBuildFAdd(builder, a, b, ""); - - else - - res = LLVMBuildAdd(builder, a, b, ""); - + res = LLVMBuildAdd(builder, a, b, ""); - - /* clamp to ceiling of 1.0 */ - if(bld->type.norm && (bld->type.floating || bld->type.fixed)) - @@ -815,16 +803,10 @@ lp_build_sub(struct lp_build_context *bl - } - } - - - if(LLVMIsConstant(a) && LLVMIsConstant(b)) - - if (type.floating) - - res = LLVMConstFSub(a, b); - - else - - res = LLVMConstSub(a, b); - + if (type.floating) - + res = LLVMBuildFSub(builder, a, b, ""); - else - - if (type.floating) - - res = LLVMBuildFSub(builder, a, b, ""); - - else - - res = LLVMBuildSub(builder, a, b, ""); - + res = LLVMBuildSub(builder, a, b, ""); - - if(bld->type.norm && (bld->type.floating || bld->type.fixed)) - res = lp_build_max_simple(bld, res, bld->zero, GALLIVM_NAN_RETURN_OTHER_SECOND_NONNAN); - @@ -980,29 +962,15 @@ lp_build_mul(struct lp_build_context *bl - else - shift = NULL; - - - if(LLVMIsConstant(a) && LLVMIsConstant(b)) { - - if (type.floating) - - res = LLVMConstFMul(a, b); - - else - - res = LLVMConstMul(a, b); - - if(shift) { - - if(type.sign) - - res = LLVMConstAShr(res, shift); - - else - - res = LLVMConstLShr(res, shift); - - } - - } - - else { - - if (type.floating) - - res = LLVMBuildFMul(builder, a, b, ""); - + if (type.floating) - + res = LLVMBuildFMul(builder, a, b, ""); - + else - + res = LLVMBuildMul(builder, a, b, ""); - + if (shift) { - + if (type.sign) - + res = LLVMBuildAShr(builder, res, shift, ""); - else - - res = LLVMBuildMul(builder, a, b, ""); - - if(shift) { - - if(type.sign) - - res = LLVMBuildAShr(builder, res, shift, ""); - - else - - res = LLVMBuildLShr(builder, res, shift, ""); - - } - + res = LLVMBuildLShr(builder, res, shift, ""); - } - - return res; - @@ -1288,15 +1256,6 @@ lp_build_div(struct lp_build_context *bl - if(a == bld->undef || b == bld->undef) - return bld->undef; - - - if(LLVMIsConstant(a) && LLVMIsConstant(b)) { - - if (type.floating) - - return LLVMConstFDiv(a, b); - - else if (type.sign) - - return LLVMConstSDiv(a, b); - - else - - return LLVMConstUDiv(a, b); - - } - - - /* fast rcp is disabled (just uses div), so makes no sense to try that */ - if(FALSE && - ((util_get_cpu_caps()->has_sse && type.width == 32 && type.length == 4) || - @@ -2643,7 +2602,7 @@ lp_build_rcp(struct lp_build_context *bl - assert(type.floating); - - if(LLVMIsConstant(a)) - - return LLVMConstFDiv(bld->one, a); - + return LLVMBuildFDiv(builder, bld->one, a, ""); - - /* - * We don't use RCPPS because: - - PATCH_EOF - File.write('mesa.patch', @mesa_patch) - system 'patch -p1 -i mesa.patch' - end - - def self.build - case ARCH - when 'i686' - @vk = 'intel,swrast' - @galliumdrivers = 'swrast,svga,virgl,zink' - @lto = CREW_MESON_FNO_LTO_OPTIONS - @osmesa = 'false' - when 'aarch64', 'armv7l' - @vk = 'auto' - @galliumdrivers = 'auto' - @lto = CREW_MESON_OPTIONS - @osmesa = 'true' - when 'x86_64' - @vk = 'auto' - @galliumdrivers = 'r300,r600,radeonsi,nouveau,virgl,svga,swrast,iris,crocus' - @lto = CREW_MESON_OPTIONS - @osmesa = 'true' + def self.build + case ARCH + when 'i686' + @vk = 'intel,swrast' + @galliumdrivers = 'swrast,svga,virgl,zink' + @lto = CREW_MESON_FNO_LTO_OPTIONS + @osmesa = 'false' + when 'aarch64', 'armv7l' + @vk = 'auto' + @galliumdrivers = 'auto' + @lto = CREW_MESON_OPTIONS + @osmesa = 'true' + when 'x86_64' + @vk = 'auto' + @galliumdrivers = 'r300,r600,radeonsi,nouveau,virgl,svga,swrast,iris,crocus' + @lto = CREW_MESON_OPTIONS + @osmesa = 'true' + end + system "meson #{@lto} \ + -Db_asneeded=false \ + -Ddri-drivers=auto \ + -Dvulkan-drivers=#{@vk} \ + -Dgallium-drivers=#{@galliumdrivers} \ + -Dosmesa=#{@osmesa} \ + -Dglvnd=true \ + builddir" + system 'meson configure builddir' + system 'mold -run samu -C builddir' + end + else + def self.build + system "meson #{CREW_MESON_OPTIONS} \ + -Db_asneeded=false \ + -Ddri3=enabled \ + -Degl=enabled \ + -Dgbm=enabled \ + -Dgles1=disabled \ + -Dgles2=enabled \ + -Dglvnd=true \ + -Dglx=dri \ + -Dllvm=enabled \ + -Dvulkan-drivers=auto \ + -Dvideo-codecs='vc1dec,h264dec,h264enc,h265dec,h265enc' \ + builddir" + system 'meson configure builddir' + system 'mold -run samu -C builddir' end - system "meson #{@lto} \ - -Db_asneeded=false \ - -Ddri-drivers=auto \ - -Dvulkan-drivers=#{@vk} \ - -Dgallium-drivers=#{@galliumdrivers} \ - -Dosmesa=#{@osmesa} \ - -Dglvnd=false \ - builddir" - system 'meson configure builddir' - system 'mold -run samu -C builddir' end def self.install @@ -296,11 +351,11 @@ class Mesa < Package Dir.chdir("#{CREW_DEST_LIB_PREFIX}/dri") do FileUtils.ln_s '.', 'tls' unless File.exist?('tls') end - if ARCH == 'x86_64' - FileUtils.mkdir_p "#{CREW_DEST_LIB_PREFIX}/gbm/tls" - Dir.chdir("#{CREW_DEST_LIB_PREFIX}/gbm/tls") do - FileUtils.ln_s '../../libgbm.so', 'i915_gbm.so' - end + return unless ARCH == 'x86_64' + + FileUtils.mkdir_p "#{CREW_DEST_LIB_PREFIX}/gbm/tls" + Dir.chdir("#{CREW_DEST_LIB_PREFIX}/gbm/tls") do + FileUtils.ln_s '../../libgbm.so', 'i915_gbm.so' end end end diff --git a/packages/mesa_utils.rb b/packages/mesa_utils.rb index 0e8755581..f8b4d662d 100644 --- a/packages/mesa_utils.rb +++ b/packages/mesa_utils.rb @@ -3,37 +3,44 @@ require 'package' class Mesa_utils < Package description 'Open-source implementation of the OpenGL specification - Provides tools such as glxinfo, glxgears' homepage 'https://www.mesa3d.org' - version '8.4.0-1' - license 'custom' + version '8.5.0' + license 'mesa' compatibility 'all' - source_url 'https://mesa.freedesktop.org/archive/demos/mesa-demos-8.4.0.tar.bz2' - source_sha256 '01e99c94a0184e63e796728af89bfac559795fb2a0d6f506fa900455ca5fff7d' + source_url 'https://gitlab.freedesktop.org/mesa/demos.git' + git_hashtag "mesa-demos-#{version}" binary_url({ - aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/mesa_utils/8.4.0-1_armv7l/mesa_utils-8.4.0-1-chromeos-armv7l.tar.xz', - armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/mesa_utils/8.4.0-1_armv7l/mesa_utils-8.4.0-1-chromeos-armv7l.tar.xz', - i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/mesa_utils/8.4.0-1_i686/mesa_utils-8.4.0-1-chromeos-i686.tar.xz', - x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/mesa_utils/8.4.0-1_x86_64/mesa_utils-8.4.0-1-chromeos-x86_64.tar.xz' + aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/mesa_utils/8.5.0_armv7l/mesa_utils-8.5.0-chromeos-armv7l.tar.zst', + armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/mesa_utils/8.5.0_armv7l/mesa_utils-8.5.0-chromeos-armv7l.tar.zst', + i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/mesa_utils/8.5.0_i686/mesa_utils-8.5.0-chromeos-i686.tar.zst', + x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/mesa_utils/8.5.0_x86_64/mesa_utils-8.5.0-chromeos-x86_64.tar.zst' }) binary_sha256({ - aarch64: '79f7aa0c1e8b69ab4b12045e2362ee75c98e700e01a3808a74c0f7d6aef4f74b', - armv7l: '79f7aa0c1e8b69ab4b12045e2362ee75c98e700e01a3808a74c0f7d6aef4f74b', - i686: '03db825ab275db23372dca3e76cb9676f4de8b0be232f96a15f5c500ee7b438a', - x86_64: 'c9f1bd525f7ace061488cc1780928f9e6face4509210bd5c348ad60dee2c97c9' + aarch64: '0b3f8f18610f75ed076605c2a05e9748710939b29bbe8279b5957bddeacdec9b', + armv7l: '0b3f8f18610f75ed076605c2a05e9748710939b29bbe8279b5957bddeacdec9b', + i686: '5ac984ba6126371d59dbf96828fe87ef084ca4f3427067d2920440a36615ed5b', + x86_64: 'e6f20f9a1f631d085934c3fce0d90c1945f88e72c3ee436a0b8460cf7d3d8150' }) depends_on 'mesa' depends_on 'glew' depends_on 'freeglut' + depends_on 'wayland_protocols' => :build + depends_on 'glibc' # R + depends_on 'libglu' # R + depends_on 'libglvnd' # R + depends_on 'libx11' # R + depends_on 'libxext' # R + depends_on 'wayland' # R def self.build - # ENV['CFLAGS'] = "-fuse-ld=lld" - # ENV['CXXFLAGS'] = "-fuse-ld=lld" - system "./configure #{CREW_OPTIONS}" - system 'make' + system 'meson setup build' + system "meson configure #{CREW_MESON_OPTIONS} \ + build" + system 'ninja -C build' end def self.install - system 'make', "DESTDIR=#{CREW_DEST_DIR}", 'install' + system "DESTDIR=#{CREW_DEST_DIR} ninja -C build install" end end diff --git a/packages/mpv.rb b/packages/mpv.rb index 7c7f137f2..a74aa75c8 100644 --- a/packages/mpv.rb +++ b/packages/mpv.rb @@ -3,30 +3,30 @@ require 'package' class Mpv < Package description 'Video player based on MPlayer/mplayer2' homepage 'https://mpv.io/' - @_ver = '0.34.1' - version "#{@_ver}-1" + @_ver = '0.35.0' + version @_ver license 'LGPL-2.1+, GPL-2+, BSD, ISC and GPL-3+' compatibility 'all' source_url 'https://github.com/mpv-player/mpv.git' git_hashtag "v#{@_ver}" binary_url({ - aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/mpv/0.34.1-1_armv7l/mpv-0.34.1-1-chromeos-armv7l.tar.zst', - armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/mpv/0.34.1-1_armv7l/mpv-0.34.1-1-chromeos-armv7l.tar.zst', - i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/mpv/0.34.1-1_i686/mpv-0.34.1-1-chromeos-i686.tar.zst', - x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/mpv/0.34.1-1_x86_64/mpv-0.34.1-1-chromeos-x86_64.tar.zst' + aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/mpv/0.35.0_armv7l/mpv-0.35.0-chromeos-armv7l.tar.zst', + armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/mpv/0.35.0_armv7l/mpv-0.35.0-chromeos-armv7l.tar.zst', + i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/mpv/0.35.0_i686/mpv-0.35.0-chromeos-i686.tar.zst', + x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/mpv/0.35.0_x86_64/mpv-0.35.0-chromeos-x86_64.tar.zst' }) binary_sha256({ - aarch64: '38725711d4f9281cd22c8435b90f7ced26619ceff3a3c6e202931d4f0d2716e3', - armv7l: '38725711d4f9281cd22c8435b90f7ced26619ceff3a3c6e202931d4f0d2716e3', - i686: 'ffdc4b1704eb05ccb15be4925910c77f7c64e37616622b501cf856870c0589c9', - x86_64: 'b002cdc8921c278fe4ebe0684cc7fb24de7d8d039081e919f8cf85f652a28a7c' + aarch64: '184895e4391246001fbe6b1a945880440ae591401db014de9914f80397527215', + armv7l: '184895e4391246001fbe6b1a945880440ae591401db014de9914f80397527215', + i686: '1649db6f99162855051d4823b9e24fe265bfe24d55f1c13f820fd9ec328f16f4', + x86_64: 'a5cad18396c8a8d3e8be1add95c457bda0eb71c6c78fa635aa594f5c04970b19' }) - depends_on 'py3_docutils' => :build - depends_on 'vulkan_headers' => :build depends_on 'alsa_lib' # R depends_on 'ffmpeg' # R + depends_on 'gcc' # R + depends_on 'glibc' # R depends_on 'jack' # R depends_on 'lcms' # R depends_on 'libarchive' # R @@ -38,6 +38,7 @@ class Mpv < Package depends_on 'libdrm' # R depends_on 'libdvdnav' # R depends_on 'libdvdread' # R + depends_on 'libglvnd' # R depends_on 'libjpeg' # R depends_on 'libsdl2' # R depends_on 'libva' # R @@ -49,52 +50,48 @@ class Mpv < Package depends_on 'libxrandr' # R depends_on 'libxss' # R depends_on 'libxv' # R - depends_on 'openmp' # R depends_on 'luajit' # R depends_on 'mesa' # R depends_on 'mujs' # R + depends_on 'openmp' # R depends_on 'pipewire' # R depends_on 'pulseaudio' # R + depends_on 'py3_docutils' => :build depends_on 'rubberband' # R depends_on 'shaderc' # R - depends_on 'wayland' # R - depends_on 'zimg' # R - depends_on 'xdg_base' # L - depends_on 'vulkan_icd_loader' # L depends_on 'sommelier' # L - depends_on 'gcc' # R - depends_on 'glibc' # R - depends_on 'libglvnd' # R depends_on 'uchardet' # R + depends_on 'vulkan_headers' => :build + depends_on 'vulkan_icd_loader' # L + depends_on 'wayland' # R + depends_on 'xdg_base' # L + depends_on 'zimg' # R depends_on 'zlibpkg' # R + depends_on 'libxpresent' # R def self.build - system './bootstrap.py' - system "#{CREW_ENV_OPTIONS} \ - ./waf \ - configure \ - --confdir=#{CREW_PREFIX}/etc/mpv \ - --enable-cdda \ - --enable-dvdnav \ - --enable-gl-x11 \ - --enable-libarchive \ - --enable-libmpv-shared \ - --enable-sdl2 \ - #{CREW_OPTIONS.sub(/--build=.*/, '')}" - system "./waf -j#{CREW_NPROC}" + # Wayland is disabled because mpv has moved to + # wl_compositor 4, while ChromeOS still uses + # the ancient wl_compositor 3. + system "meson \ + #{CREW_MESON_OPTIONS} \ + -Dwayland=disabled \ + -Dgl-x11=enabled \ + builddir" # mpv conf file File.write 'mpv.conf', <<~MPVCONF hwdec=auto-safe hwdec-codecs=all fs=yes MPVCONF + system 'meson configure builddir' + system 'ninja -C builddir' end def self.install - FileUtils.mkdir_p CREW_DEST_LIB_PREFIX - system './waf', "--destdir=#{CREW_DEST_DIR}", 'install' - FileUtils.mkdir_p "#{CREW_DEST_PREFIX}/etc/mpv" - FileUtils.install 'mpv.conf', "#{CREW_DEST_PREFIX}/etc/mpv/mpv.conf", mode: 0o644 + system "DESTDIR=#{CREW_DEST_DIR} ninja -C builddir install" + FileUtils.mkdir_p "#{CREW_DEST_HOME}/.mpv" + FileUtils.install 'mpv.conf', "#{CREW_DEST_HOME}/.mpv/mpv.conf", mode: 0o644 end def self.postinstall diff --git a/packages/pipewire.rb b/packages/pipewire.rb index 28c58212f..2d87cb3a1 100644 --- a/packages/pipewire.rb +++ b/packages/pipewire.rb @@ -3,25 +3,36 @@ require 'package' class Pipewire < Package description 'PipeWire is a project that aims to greatly improve handling of audio and video under Linux.' homepage 'https://pipewire.org' - @_ver = '0.3.29' + @_ver = if CREW_KERNEL_VERSION.to_f < 3.9 + '0.3.29' + else + '0.3.60' + end version @_ver license 'LGPL-2.1+' compatibility 'all' - source_url "https://github.com/PipeWire/pipewire/archive/#{@_ver}.tar.gz" - source_sha256 'b733532d6460fb94d202a8b2104b0a87344e8484e69ccfdf44096dde91c21cf0' + source_url 'https://gitlab.freedesktop.org/pipewire/pipewire.git' + git_hashtag @_ver - binary_url({ - aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/pipewire/0.3.29_armv7l/pipewire-0.3.29-chromeos-armv7l.tpxz', - armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/pipewire/0.3.29_armv7l/pipewire-0.3.29-chromeos-armv7l.tpxz', - i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/pipewire/0.3.29_i686/pipewire-0.3.29-chromeos-i686.tpxz', - x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/pipewire/0.3.29_x86_64/pipewire-0.3.29-chromeos-x86_64.tpxz' - }) - binary_sha256({ - aarch64: '4dcdc0d5ea6d83011bef5521c495cde21ae518616bde047e52179a3b95b2a56a', - armv7l: '4dcdc0d5ea6d83011bef5521c495cde21ae518616bde047e52179a3b95b2a56a', - i686: '0dbeda58c4e1db7a180ebfb2b7bc3057cc6966927f4d5ee543953b734dfc4510', - x86_64: '41c64acd73abcd9aa21fb936bf64371b6f82d36cd2a397b8f14f91de0d4c70df' - }) + if CREW_KERNEL_VERSION.to_f < 3.9 + binary_url({ + i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/pipewire/0.3.29_i686/pipewire-0.3.29-chromeos-i686.tpxz' + }) + binary_sha256({ + i686: '0dbeda58c4e1db7a180ebfb2b7bc3057cc6966927f4d5ee543953b734dfc4510' + }) + else + binary_url({ + aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/pipewire/0.3.60_armv7l/pipewire-0.3.60-chromeos-armv7l.tar.zst', + armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/pipewire/0.3.60_armv7l/pipewire-0.3.60-chromeos-armv7l.tar.zst', + x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/pipewire/0.3.60_x86_64/pipewire-0.3.60-chromeos-x86_64.tar.zst' + }) + binary_sha256({ + aarch64: '237ad8299b16e6d294a6561a4959efb47fc72ee66d06f51a3863f55dbdedcf78', + armv7l: '237ad8299b16e6d294a6561a4959efb47fc72ee66d06f51a3863f55dbdedcf78', + x86_64: '1534c6a7d71870ac60ec77aab0f795e148e63cf2eac61ff6ec58a5d3af23d994' + }) + end depends_on 'alsa_lib' # R depends_on 'alsa_plugins' => :build @@ -34,6 +45,15 @@ class Pipewire < Package depends_on 'libsndfile' # R depends_on 'vulkan_headers' => :build depends_on 'vulkan_icd_loader' # R + depends_on 'avahi' # R + depends_on 'gcc' # R + depends_on 'glibc' # R + depends_on 'lilv' # R + depends_on 'ncurses' # R + depends_on 'openssl' # R + depends_on 'pulseaudio' # R + depends_on 'readline' # R + depends_on 'webrtc_audio_processing' # R def self.build system "meson \ diff --git a/packages/pulseaudio.rb b/packages/pulseaudio.rb index 1fa99525d..53c066d7a 100644 --- a/packages/pulseaudio.rb +++ b/packages/pulseaudio.rb @@ -3,28 +3,28 @@ require 'package' class Pulseaudio < Package description 'PulseAudio is a sound system for POSIX OSes, meaning that it is a proxy for your sound applications.' homepage 'https://www.freedesktop.org/wiki/Software/PulseAudio/' - @_ver = '14.2' - version "#{@_ver}-2" + @_ver = '16.1' + version @_ver license 'LGPL-2.1 and GPL-2' compatibility 'all' - source_url "https://freedesktop.org/software/pulseaudio/releases/pulseaudio-#{@_ver}.tar.xz" - source_sha256 '75d3f7742c1ae449049a4c88900e454b8b350ecaa8c544f3488a2562a9ff66f1' + source_url 'https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git' + git_hashtag "v#{@_ver}" binary_url({ - aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/pulseaudio/14.2-2_armv7l/pulseaudio-14.2-2-chromeos-armv7l.tar.xz', - armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/pulseaudio/14.2-2_armv7l/pulseaudio-14.2-2-chromeos-armv7l.tar.xz', - i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/pulseaudio/14.2-2_i686/pulseaudio-14.2-2-chromeos-i686.tar.xz', - x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/pulseaudio/14.2-2_x86_64/pulseaudio-14.2-2-chromeos-x86_64.tar.xz' + aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/pulseaudio/16.1_armv7l/pulseaudio-16.1-chromeos-armv7l.tar.zst', + armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/pulseaudio/16.1_armv7l/pulseaudio-16.1-chromeos-armv7l.tar.zst', + i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/pulseaudio/16.1_i686/pulseaudio-16.1-chromeos-i686.tar.zst', + x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/pulseaudio/16.1_x86_64/pulseaudio-16.1-chromeos-x86_64.tar.zst' }) binary_sha256({ - aarch64: 'b63bb927efd3f315ebe04781e5a1173acbd01ee58bd384b43f7e97e3006e14a2', - armv7l: 'b63bb927efd3f315ebe04781e5a1173acbd01ee58bd384b43f7e97e3006e14a2', - i686: '557c79d8841fbdb52c8289e8e174a4f68a1db477a8a1ec7e1a352de8f60ecd95', - x86_64: 'cbb4cd934818825e7bc006a82c02e67179d17c25922a04574853374c4760a095' + aarch64: 'e8edeba8f44d27128c2679d249b8199894574c195bab7ac0950e49fe037a2036', + armv7l: 'e8edeba8f44d27128c2679d249b8199894574c195bab7ac0950e49fe037a2036', + i686: 'd72a2bcb9e1185aa1d528217ba4ac58e6c6fba6ae109ab7bba3366f1969ffcdb', + x86_64: 'ad53a21305519ea3d25aeb3e3905035e94ecb25890355063eaaf26e5a6620d42' }) depends_on 'alsa_lib' # R - depends_on 'alsa_plugins' => :build + # depends_on 'alsa_plugins' => :build depends_on 'avahi' # R depends_on 'check' => :build depends_on 'cras' # L @@ -34,7 +34,7 @@ class Pulseaudio < Package depends_on 'gcc' # R depends_on 'glibc' # R depends_on 'glib' # R - depends_on 'gsettings_desktop_schemas' # L + # depends_on 'gsettings_desktop_schemas' # L depends_on 'jack' # R depends_on 'jsonc' => :build depends_on 'libcap' # R @@ -45,28 +45,30 @@ class Pulseaudio < Package depends_on 'libsoxr' # R depends_on 'libtool' # R depends_on 'libx11' # R + depends_on 'libxfixes' => :build depends_on 'libxcb' # R depends_on 'libxtst' # R - depends_on 'gstreamer' # R - depends_on 'pipewire' # R + depends_on 'openssl' # R depends_on 'speexdsp' # R depends_on 'tcpwrappers' => :build depends_on 'tdb' # R depends_on 'valgrind' => :build depends_on 'webrtc_audio_processing' # R - depends_on 'xorg_lib' => :build + depends_on 'elogind' # R + depends_on 'tcpwrappers' # R + + git_fetchtags def self.build system "meson #{CREW_MESON_OPTIONS} \ - --default-library=both \ -Dsystem_user=chronos \ -Dsystem_group=cras \ -Daccess_group=cras \ - -Dbluez5=false \ + -Dbluez5=disabled \ -Dalsa=enabled \ - -Dgstreamer=enabled \ + -Dgstreamer=disabled \ -Delogind=enabled \ - -Dtests=true \ + -Dtests=false \ -Dudevrulesdir=#{CREW_PREFIX}/libexec/rules.d \ -Dalsadatadir=#{CREW_PREFIX}/share/alsa-card-profile \ builddir" @@ -75,7 +77,6 @@ class Pulseaudio < Package end def self.check - b63bb927efd3f315ebe04781e5a1173acbd01ee58bd384b43f7e97e3006e14a2 # 39/50 thread-test FAIL 4.02s exit status 1 # >>> MALLOC_PERTURB_=232 MAKE_CHECK=1 /usr/local/tmp/crew/pulseaudio-14.2.tar.xz.dir/pulseaudio-14.2/builddir/src/tests/thread-test # ――――――――――――――――――――――――――――――――――――― ✀ ――――――――――――――――――――――――――――――――――――― diff --git a/packages/sommelier.rb b/packages/sommelier.rb index ef1fe7638..ebb8ea957 100644 --- a/packages/sommelier.rb +++ b/packages/sommelier.rb @@ -3,23 +3,23 @@ require 'package' class Sommelier < Package description 'Sommelier works by redirecting X11 programs to the built-in ChromeOS Exo Wayland server.' homepage 'https://chromium.googlesource.com/chromiumos/platform2/+/HEAD/vm_tools/sommelier/' - version '20210109-8' + version '20210109-9' license 'BSD-Google' compatibility 'all' source_url 'https://chromium.googlesource.com/chromiumos/platform2.git' git_hashtag 'f3b2e2b6a8327baa2e62ef61036658c258ab4a09' binary_url({ - aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/sommelier/20210109-8_armv7l/sommelier-20210109-8-chromeos-armv7l.tar.zst', - armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/sommelier/20210109-8_armv7l/sommelier-20210109-8-chromeos-armv7l.tar.zst', - i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/sommelier/20210109-8_i686/sommelier-20210109-8-chromeos-i686.tar.zst', - x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/sommelier/20210109-8_x86_64/sommelier-20210109-8-chromeos-x86_64.tar.zst' + aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/sommelier/20210109-9_armv7l/sommelier-20210109-9-chromeos-armv7l.tar.zst', + armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/sommelier/20210109-9_armv7l/sommelier-20210109-9-chromeos-armv7l.tar.zst', + i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/sommelier/20210109-9_i686/sommelier-20210109-9-chromeos-i686.tar.zst', + x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/sommelier/20210109-9_x86_64/sommelier-20210109-9-chromeos-x86_64.tar.zst' }) binary_sha256({ - aarch64: 'ca036c280df41469239b3b7dd16d7c9bba6f0a5f2cbcc8c311dd46c0dd663054', - armv7l: 'ca036c280df41469239b3b7dd16d7c9bba6f0a5f2cbcc8c311dd46c0dd663054', - i686: '8d84714a692a10946baf8b2e0a9aa862f1d6c2f0343cd51076eae94ed8a9482e', - x86_64: '6973bfecac7bc42fb71c50ef07f9cb13d63e3bf7bfd1a58dddb4b0e1857c1aea' + aarch64: '74359bcc06aed87aa0b4172f4ef5a620962fbaa476d57db430206390031f2f29', + armv7l: '74359bcc06aed87aa0b4172f4ef5a620962fbaa476d57db430206390031f2f29', + i686: '0bf67633fa9b4cf68c4feb8f1c8f92493b303e9f86e83a2977295d12e3156853', + x86_64: '81559f65c2db3aa8846fe1b99ce1b16e53aafaabc20a8fcdf5dce4137a7c11da' }) depends_on 'libdrm' @@ -96,14 +96,33 @@ class Sommelier < Package WAYLAND_DISPLAY=wayland-0 XDG_RUNTIME_DIR=/var/run/chrome - case "$(uname -m)" in - x86_64|i686) - sort_result="$(sort -V <<< "$(uname -r)"$'\\n'"4.16.0" | tail -n1)" - if [[ "${sort_result}" == "4.16.0" ]]; then - MESA_LOADER_DRIVER_OVERRIDE=i965 - fi - ;; - esac + if grep -q GenuineIntel /proc/cpuinfo ;then + check_linux_version() { + maj_ver=$1 + min_ver=$2 + version_good=$(uname -r | awk 'BEGIN{ FS="."}; + { if ($1 < '"${maj_ver}"') { print "N"; } + else if ($1 == '"${maj_ver}"') { + if ($2 < '"${min_ver}"') { print "N"; } + else { print "Y"; } + } + else { print "Y"; } + }') + + if [ "$version_good" = "N" ]; then + return 1 + fi + } + case "$(uname -m)" in + x86_64|i686) + if ! check_linux_version 4 16; then + MESA_LOADER_DRIVER_OVERRIDE=i965 + elif check_linux_version 5 10; then + MESA_LOADER_DRIVER_OVERRIDE=iris + fi + ;; + esac + fi if [ -f "~/.sommelier.env" ]; then source ~/.sommelier.env diff --git a/packages/tk.rb b/packages/tk.rb index c10a8ee80..3cfc6f11d 100644 --- a/packages/tk.rb +++ b/packages/tk.rb @@ -3,51 +3,45 @@ require 'package' class Tk < Package description 'Tk is a graphical user interface toolkit that takes developing desktop applications to a higher level than conventional approaches.' homepage 'http://www.tcl.tk/' - @_ver = '8.6.11' + @_ver = '8.6.12' @_ver_prelastdot = @_ver.rpartition('.')[0] - version "#{@_ver}-1" + version @_ver license 'tcltk' compatibility 'all' source_url "https://downloads.sourceforge.net/project/tcl/Tcl/#{@_ver}/tk#{@_ver}-src.tar.gz" - source_sha256 '5228a8187a7f70fa0791ef0f975270f068ba9557f57456f51eb02d9d4ea31282' + source_sha256 '12395c1f3fcb6bed2938689f797ea3cdf41ed5cb6c4766eec8ac949560310630' binary_url({ - aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/tk/8.6.11-1_armv7l/tk-8.6.11-1-chromeos-armv7l.tar.xz', - armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/tk/8.6.11-1_armv7l/tk-8.6.11-1-chromeos-armv7l.tar.xz', - i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/tk/8.6.11-1_i686/tk-8.6.11-1-chromeos-i686.tar.xz', - x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/tk/8.6.11-1_x86_64/tk-8.6.11-1-chromeos-x86_64.tar.xz' + aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/tk/8.6.12_armv7l/tk-8.6.12-chromeos-armv7l.tar.zst', + armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/tk/8.6.12_armv7l/tk-8.6.12-chromeos-armv7l.tar.zst', + i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/tk/8.6.12_i686/tk-8.6.12-chromeos-i686.tar.zst', + x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/tk/8.6.12_x86_64/tk-8.6.12-chromeos-x86_64.tar.zst' }) binary_sha256({ - aarch64: '45f352f6979be6011f5f1d4a8ee6caef842ae2d8579f2d3ae69bf361a41e320d', - armv7l: '45f352f6979be6011f5f1d4a8ee6caef842ae2d8579f2d3ae69bf361a41e320d', - i686: '13d38ebfee7bec6dc28f0785fed724d459b22e3dbf8e8f2c7483c05ee75e0c25', - x86_64: '05b1753d45c1820ec8f51e28fe523376efaf04589b93bcefd38fc83752587390' + aarch64: '286a469693791ce624b499e0770b72aebc33748c0e2e991608124d22416e8257', + armv7l: '286a469693791ce624b499e0770b72aebc33748c0e2e991608124d22416e8257', + i686: '388a87aa2d49248fcb10c1d51a16a3a09e77980e3400d7c683d6a9993f76568d', + x86_64: '6c7df4328c26a2573c07d34f6047633dcbca88406d01d732cdf9ec9082b83f5b' }) - depends_on 'xorg_lib' - depends_on 'tcl' + depends_on 'freetype' # R + depends_on 'glibc' # R + depends_on 'harfbuzz' # R + depends_on 'libx11' # R + depends_on 'libxext' # R + depends_on 'libxft' # R + depends_on 'libxss' # R + depends_on 'tcl' # R + depends_on 'zlibpkg' # R def self.build FileUtils.chdir('unix') do - if ARCH == 'x86_64' - system "env CFLAGS='-pipe -fno-stack-protector -U_FORTIFY_SOURCE -flto=auto' \ - CXXFLAGS='-pipe -fno-stack-protector -U_FORTIFY_SOURCE -flto=auto' \ - LDFLAGS='-fno-stack-protector -U_FORTIFY_SOURCE -flto=auto' \ - ./configure \ + @bit64 = ARCH == 'x86_64' ? 'enable' : 'disable' + system "./configure \ #{CREW_OPTIONS} \ --with-tcl=#{CREW_LIB_PREFIX} \ --enable-threads \ - --enable-64bit" - else - system "env CFLAGS='-pipe -fno-stack-protector -U_FORTIFY_SOURCE -flto=auto' \ - CXXFLAGS='-pipe -fno-stack-protector -U_FORTIFY_SOURCE -flto=auto' \ - LDFLAGS='-fno-stack-protector -U_FORTIFY_SOURCE -flto=auto' \ - ./configure \ - #{CREW_OPTIONS} \ - --with-tcl=#{CREW_LIB_PREFIX} \ - --enable-threads \ - --disable-64bit" - end + --#{@bit64}-64bit" system 'make' end end diff --git a/packages/xclock.rb b/packages/xclock.rb index 93c425ff7..6937c26f7 100644 --- a/packages/xclock.rb +++ b/packages/xclock.rb @@ -3,28 +3,36 @@ require 'package' class Xclock < Package description 'The xclock package contains a simple clock application which is used in the default xinit configuration.' homepage 'https://www.x.org/archive/X11R6.8.1/doc/xclock.1.html' - version '1.0.9' + version '1.1.1' license 'MIT-with-advertising' compatibility 'all' - source_url 'https://www.x.org/pub/individual/app/xclock-1.0.9.tar.bz2' - source_sha256 'cf461fb2c6f2ac42c54d8429ee2010fdb9a1442a370adfbfe8a7bfaf33c123bb' + source_url 'https://gitlab.freedesktop.org/xorg/app/xclock.git' + git_hashtag "xclock-#{version}" binary_url({ - aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/xclock/1.0.9_armv7l/xclock-1.0.9-chromeos-armv7l.tar.xz', - armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/xclock/1.0.9_armv7l/xclock-1.0.9-chromeos-armv7l.tar.xz', - i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/xclock/1.0.9_i686/xclock-1.0.9-chromeos-i686.tar.xz', - x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/xclock/1.0.9_x86_64/xclock-1.0.9-chromeos-x86_64.tar.xz' + aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/xclock/1.1.1_armv7l/xclock-1.1.1-chromeos-armv7l.tar.zst', + armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/xclock/1.1.1_armv7l/xclock-1.1.1-chromeos-armv7l.tar.zst', + i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/xclock/1.1.1_i686/xclock-1.1.1-chromeos-i686.tar.zst', + x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/xclock/1.1.1_x86_64/xclock-1.1.1-chromeos-x86_64.tar.zst' }) binary_sha256({ - aarch64: 'b70ff42097e49252e239a56873c7c1422da7bb545a4828b62997561735bbbd39', - armv7l: 'b70ff42097e49252e239a56873c7c1422da7bb545a4828b62997561735bbbd39', - i686: 'a67eeb8b77425bcd0b90e43ac8d7f9b9ae0a441712238b63ea172addd33bfb35', - x86_64: 'd1af7fe7bf45b9a2b9ea6c58882d40c377603dd82f700e894971125d3ec4c905' + aarch64: 'b35b8f4abbab0da7b6f8c04f7eabd4bddefb2b0ca56de1cbd94975c9119c5aae', + armv7l: 'b35b8f4abbab0da7b6f8c04f7eabd4bddefb2b0ca56de1cbd94975c9119c5aae', + i686: '6011367b96a13f19900fb84ebea21af2e955ecba1235525a00d60a6d47f8cfae', + x86_64: '388bff5a287f56d332c7f2cf8f0e7a8915fb6723e0b1dcdac826c4e966658c47' }) - depends_on 'xorg_lib' + depends_on 'glibc' # R + depends_on 'libx11' # R + depends_on 'libxaw' # R + depends_on 'libxft' # R + depends_on 'libxkbfile' # R + depends_on 'libxmu' # R + depends_on 'libxrender' # R + depends_on 'libxt' # R def self.build + system '[ -x configure ] || NOCONFIGURE=1 ./autogen.sh' system "./configure #{CREW_OPTIONS}" system 'make' end diff --git a/packages/xhost.rb b/packages/xhost.rb index 15e8d6413..c9c5eab29 100644 --- a/packages/xhost.rb +++ b/packages/xhost.rb @@ -22,12 +22,10 @@ class Xhost < Package x86_64: '8e108d51711153c01c45343af91d6b1c7bd493e4da823ebe85209eb5278ee25a' }) - depends_on 'xorg_lib' + depends_on 'glibc' # R depends_on 'libx11' # R depends_on 'libxmu' # R - patchelf - def self.build system "./configure \ --enable-ipv6 \ diff --git a/packages/xmessage.rb b/packages/xmessage.rb index 14b67a68c..063ff05eb 100644 --- a/packages/xmessage.rb +++ b/packages/xmessage.rb @@ -3,31 +3,33 @@ require 'package' class Xmessage < Package description 'Xmessage displays a message or query in a window.' homepage 'https://www.x.org/' - version '1.0.5' + version '1.0.6' license 'MIT-with-advertising' compatibility 'all' - source_url 'https://www.x.org/releases/individual/app/xmessage-1.0.5.tar.bz2' - source_sha256 '373dfb81e7a6f06d3d22485a12fcde6e255d58c6dee1bbaeb00c7d0caa9b2029' + source_url 'https://gitlab.freedesktop.org/xorg/app/xmessage.git' + git_hashtag "xmessage-#{version}" binary_url({ - aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/xmessage/1.0.5_armv7l/xmessage-1.0.5-chromeos-armv7l.tar.xz', - armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/xmessage/1.0.5_armv7l/xmessage-1.0.5-chromeos-armv7l.tar.xz', - i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/xmessage/1.0.5_i686/xmessage-1.0.5-chromeos-i686.tar.xz', - x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/xmessage/1.0.5_x86_64/xmessage-1.0.5-chromeos-x86_64.tar.xz' + aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/xmessage/1.0.6_armv7l/xmessage-1.0.6-chromeos-armv7l.tar.zst', + armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/xmessage/1.0.6_armv7l/xmessage-1.0.6-chromeos-armv7l.tar.zst', + i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/xmessage/1.0.6_i686/xmessage-1.0.6-chromeos-i686.tar.zst', + x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/xmessage/1.0.6_x86_64/xmessage-1.0.6-chromeos-x86_64.tar.zst' }) binary_sha256({ - aarch64: '6df6c32406b06cc78f207c28b3a8cec0c41fe98a7566bf7d73e53553c55a4ccc', - armv7l: '6df6c32406b06cc78f207c28b3a8cec0c41fe98a7566bf7d73e53553c55a4ccc', - i686: '9af874eed48fcad769c3eea3382448c26958b101af58f0708eefab8454d3eeed', - x86_64: '1ccd1102b9debf4c9a7b7ca877b2010622ac013cc551fb0d7d9b3a772355ac80' + aarch64: 'ea8d6e673d1f82e0aa006ee2bc504c6d8704490133e11740fe817cbc2bbe5ecc', + armv7l: 'ea8d6e673d1f82e0aa006ee2bc504c6d8704490133e11740fe817cbc2bbe5ecc', + i686: 'edf5fa4b86fa2a7b854d8cda28f85b31d9334e47e285366b23464ede7f06a88a', + x86_64: '97a8472c63527ae07a93370511899898d7b727669ad27b52a1123f5dc8fadc73' }) - depends_on 'xorg_lib' + depends_on 'glibc' # R + depends_on 'libx11' # R + depends_on 'libxaw' # R + depends_on 'libxt' # R def self.build - system './configure', - "--prefix=#{CREW_PREFIX}", - "--libdir=#{CREW_LIB_PREFIX}" + system '[ -x configure ] || NOCONFIGURE=1 ./autogen.sh' + system "./configure #{CREW_OPTIONS}" system 'make' end diff --git a/packages/xorg_server.rb b/packages/xorg_server.rb index 198fed42a..a739ff2a2 100644 --- a/packages/xorg_server.rb +++ b/packages/xorg_server.rb @@ -4,55 +4,65 @@ class Xorg_server < Package description 'The Xorg Server is the core of the X Window system.' homepage 'https://www.x.org' @_ver = '21.1.4' - version @_ver + version "#{@_ver}-1" license 'BSD-3, MIT, BSD-4, MIT-with-advertising, ISC and custom' compatibility 'all' source_url 'https://gitlab.freedesktop.org/xorg/xserver.git' git_hashtag "xorg-server-#{@_ver}" binary_url({ - aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/xorg_server/21.1.4_armv7l/xorg_server-21.1.4-chromeos-armv7l.tar.zst', - armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/xorg_server/21.1.4_armv7l/xorg_server-21.1.4-chromeos-armv7l.tar.zst', - i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/xorg_server/21.1.4_i686/xorg_server-21.1.4-chromeos-i686.tar.zst', - x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/xorg_server/21.1.4_x86_64/xorg_server-21.1.4-chromeos-x86_64.tar.zst' + aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/xorg_server/21.1.4-1_armv7l/xorg_server-21.1.4-1-chromeos-armv7l.tar.zst', + armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/xorg_server/21.1.4-1_armv7l/xorg_server-21.1.4-1-chromeos-armv7l.tar.zst', + i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/xorg_server/21.1.4-1_i686/xorg_server-21.1.4-1-chromeos-i686.tar.zst', + x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/xorg_server/21.1.4-1_x86_64/xorg_server-21.1.4-1-chromeos-x86_64.tar.zst' }) binary_sha256({ - aarch64: '91416891d077c48cd4f1f4091d3f5517b5f00c02835632742671f257cc3ebb6e', - armv7l: '91416891d077c48cd4f1f4091d3f5517b5f00c02835632742671f257cc3ebb6e', - i686: '43f95cb97da63890363d4db67806cd15033f83b7a7b25ba705552019e35f868e', - x86_64: '9f0a81171130931ab006419baa15e9822121c5bcdc0bb615d5461fd57d5fccc9' + aarch64: 'a9d526be5c144b29b17ee2bb149b186e362c1d88ab9865c4139d90349cee5f5c', + armv7l: 'a9d526be5c144b29b17ee2bb149b186e362c1d88ab9865c4139d90349cee5f5c', + i686: '923a9fdfcef675ff34b919709ee50e821b50f15d99b2c0eda76f5079faf734f4', + x86_64: '3b8d3fc545bdd8e802b3d0466963aceb435c6b393c940525dc021f5568b899ba' }) - depends_on 'libepoxy' - depends_on 'libxtrans' - depends_on 'libxkbfile' - depends_on 'wayland' - depends_on 'eudev' - depends_on 'libxfont' - depends_on 'libbsd' - depends_on 'pixman' - depends_on 'graphite' - depends_on 'libxkbcommon' - depends_on 'libunwind' - depends_on 'font_util' - depends_on 'xorg_lib' - depends_on 'font_util' - depends_on 'libbsd' - depends_on 'dbus' + depends_on 'dbus' # R + depends_on 'eudev' # R + depends_on 'font_util' => :build + depends_on 'glibc' # R + depends_on 'glproto' => :build + depends_on 'graphite' => :build + depends_on 'libbsd' # R + depends_on 'libdrm' # R + depends_on 'libepoxy' # R + depends_on 'libglvnd' # R + depends_on 'libinput' => :build + depends_on 'libmd' # R + depends_on 'libpciaccess' # R + depends_on 'libtirpc' # R + depends_on 'libunwind' => :build + depends_on 'libx11' # R + depends_on 'libxau' # R + depends_on 'libxcb' # R + depends_on 'libxcvt' # R + depends_on 'libxdmcp' # R + depends_on 'libxext' # R + depends_on 'libxfont' => :build + depends_on 'libxfont2' # R + depends_on 'libxfont' # R + depends_on 'libxkbcommon' => :build + depends_on 'libxkbfile' # R + depends_on 'libxshmfence' # R + depends_on 'libxtrans' => :build depends_on 'lzma' => :build - depends_on 'xkbcomp' - depends_on 'glproto' - depends_on 'xcb_util_renderutil' => :build - depends_on 'xcb_util_image' => :build - depends_on 'xcb_util_keysyms' => :build - depends_on 'xcb_util_wm' => :build - depends_on 'xcb_util_xrm' => :build + depends_on 'mesa' # R + depends_on 'pixman' # R depends_on 'xcb_util_cursor' => :build - depends_on 'libxcvt' - depends_on 'libinput' - depends_on 'libxdmcp' - depends_on 'xorg_proto' - depends_on 'mesa' + depends_on 'xcb_util' # R + depends_on 'xcb_util_xrm' => :build + depends_on 'xkbcomp' => :build + depends_on 'xorg_proto' => :build + depends_on 'xcb_util_image' # R + depends_on 'xcb_util_keysyms' # R + depends_on 'xcb_util_renderutil' # R + depends_on 'xcb_util_wm' # R case ARCH when 'armv7l', 'aarch64' @@ -65,7 +75,7 @@ class Xorg_server < Package def self.build system 'meson setup build' - system "meson configure #{CREW_MESON_OPTIONS.sub("-Dcpp_args='-O2'", '')} \ + system "meson configure #{CREW_MESON_OPTIONS.sub(/(-Dcpp_args='*)(.*)(')/, '')} \ -Db_asneeded=false \ -Dipv6=true \ -Dxvfb=true \ @@ -80,7 +90,6 @@ class Xorg_server < Package -Dint10=auto \ -Dlog_dir=#{CREW_PREFIX}/var/log \ build" - system 'meson configure build' system 'ninja -C build' end diff --git a/packages/xprop.rb b/packages/xprop.rb index 05fc49100..05f66e968 100644 --- a/packages/xprop.rb +++ b/packages/xprop.rb @@ -22,7 +22,8 @@ class Xprop < Package x86_64: '47d22d5a8bd02ce77b7ccc1955cf821e39c865e637598746a9ca7a38297f1c6f' }) - depends_on 'xorg_lib' + depends_on 'glibc' # R + depends_on 'libx11' # R def self.build system "./configure #{CREW_OPTIONS}" diff --git a/packages/xwayland.rb b/packages/xwayland.rb index b2d6e1f47..f448f451d 100644 --- a/packages/xwayland.rb +++ b/packages/xwayland.rb @@ -3,7 +3,7 @@ require 'package' class Xwayland < Package description 'X server configured to work with weston or sommelier' homepage 'https://x.org' - @_ver = '22.1.3' + @_ver = '22.1.5' version @_ver license 'MIT-with-advertising, ISC, BSD-3, BSD and custom' compatibility 'all' @@ -11,57 +11,58 @@ class Xwayland < Package git_hashtag "xwayland-#{@_ver}" binary_url({ - aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/xwayland/22.1.3_armv7l/xwayland-22.1.3-chromeos-armv7l.tar.zst', - armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/xwayland/22.1.3_armv7l/xwayland-22.1.3-chromeos-armv7l.tar.zst', - i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/xwayland/22.1.3_i686/xwayland-22.1.3-chromeos-i686.tar.zst', - x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/xwayland/22.1.3_x86_64/xwayland-22.1.3-chromeos-x86_64.tar.zst' + aarch64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/xwayland/22.1.5_armv7l/xwayland-22.1.5-chromeos-armv7l.tar.zst', + armv7l: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/xwayland/22.1.5_armv7l/xwayland-22.1.5-chromeos-armv7l.tar.zst', + i686: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/xwayland/22.1.5_i686/xwayland-22.1.5-chromeos-i686.tar.zst', + x86_64: 'https://gitlab.com/api/v4/projects/26210301/packages/generic/xwayland/22.1.5_x86_64/xwayland-22.1.5-chromeos-x86_64.tar.zst' }) binary_sha256({ - aarch64: '88d2b2a530e5c41a3c5e94c247ff189a472d4ca998fe78f3beeafe256f4f5e17', - armv7l: '88d2b2a530e5c41a3c5e94c247ff189a472d4ca998fe78f3beeafe256f4f5e17', - i686: '78f652ff3a1dcec7e2bf6a07ef2693e0a98c554446e935a669becb16da652cec', - x86_64: 'c11d28840e9f7d4cb74ef568c356fc38499ca95921f439d588140d727d341bee' + aarch64: '3babcd5261d4adb1a45d22e88c7d2fdbc5790d7ea08b38a0a56521eb5a6872aa', + armv7l: '3babcd5261d4adb1a45d22e88c7d2fdbc5790d7ea08b38a0a56521eb5a6872aa', + i686: 'a3bd580d6d60cbed86a53ea4dad7535c443bf1df8d0eccfb420631e44f3eab4f', + x86_64: '268548204f57320b78a000d62f55a726a306a4b0137f77e2159b9e5fe64b5adf' }) no_env_options - depends_on 'dbus' - depends_on 'eudev' - depends_on 'font_util' + depends_on 'dbus' => :build + depends_on 'eudev' => :build + depends_on 'font_util' => :build + depends_on 'gcc' # R + depends_on 'glibc' # R depends_on 'glproto' depends_on 'graphite' depends_on 'libbsd' # R - depends_on 'libxcvt' # R depends_on 'libdrm' # R depends_on 'libepoxy' # R - depends_on 'libtirpc' => :build + depends_on 'libmd' # R + depends_on 'libtirpc' # R depends_on 'libunwind' # Runtime dependency for sommelier depends_on 'libxau' # R - depends_on 'libxcvt' => :build + depends_on 'libxcvt' # R depends_on 'libxdmcp' # R depends_on 'libxfont2' # R depends_on 'libxfont' # R depends_on 'libxkbcommon' depends_on 'libxkbfile' # R depends_on 'libxshmfence' # R - depends_on 'libxtrans' + depends_on 'libxtrans' => :build depends_on 'mesa' # R depends_on 'pixman' # R depends_on 'rendercheck' # R depends_on 'wayland' # R - depends_on 'xkbcomp' - depends_on 'xorg_lib' + depends_on 'xkbcomp' => :build + depends_on 'libglvnd' # R def self.build system 'meson setup build' - system "meson configure #{CREW_MESON_OPTIONS.sub("-Dcpp_args='-O2'", '')} \ + system "meson configure #{CREW_MESON_OPTIONS.sub(/(-Dcpp_args='*)(.*)(')/, '')} \ -Db_asneeded=false \ -Dipv6=true \ -Dxvfb=true \ -Dxcsecurity=true \ -Dglamor=true \ build" - system 'meson configure build' system 'ninja -C build' end