mirror of
https://github.com/chromebrew/chromebrew.git
synced 2026-01-11 00:18:06 -05:00
Packages updated to work with OpenSSL (#4922)
* Nettle -> 3.7 & using openssl * gnutls -> 3.7.0 & use openssl * curl recompile with openssl & lto * git -> 2.30.0 & using openssl and LTO * xwayland compiled with openssl & dependencies * sommelier recompiled with llvm11, lto, openssl, xwayland * Update for openssl * fix transposition error * reintroduce spacing
This commit is contained in:
satmandu
34
install.sh
34
install.sh
@@ -94,15 +94,17 @@ case "${ARCH}" in
|
||||
urls+=('https://dl.bintray.com/chromebrew/chromebrew/zstd-1.4.7-chromeos-armv7l.tar.xz')
|
||||
sha256s+=('4a917969893ff2d985aa498d989219b2c569dd01ff1b198d3e6bd2a770b7d34c')
|
||||
urls+=('https://dl.bintray.com/chromebrew/chromebrew/ncurses-6.2-20201205-chromeos-armv7l.tar.xz')
|
||||
sha256s==('780763658f32364cdc24bef4fb8efcb14d2beba989c7c0a894bf73f3e4fccc9b')
|
||||
sha256s+=('780763658f32364cdc24bef4fb8efcb14d2beba989c7c0a894bf73f3e4fccc9b')
|
||||
urls+=('https://dl.bintray.com/chromebrew/chromebrew/ruby-3.0.0-chromeos-armv7l.tar.xz')
|
||||
sha256s+=('81509c5d3585f1a0c3c7d616d9f9a0d0192c6e3276c3ddea23c3905e78e56bfc')
|
||||
urls+=('https://dl.bintray.com/chromebrew/chromebrew/git-2.29.2-chromeos-armv7l.tar.xz')
|
||||
sha256s+=('892ed67dfc19d0f5056836d3a707c1f4d5717bdf82e0d6d0facd11f9eb964fa4')
|
||||
urls+=('https://dl.bintray.com/chromebrew/chromebrew/libressl-3.2.3-chromeos-armv7l.tar.xz')
|
||||
sha256s+=('59a8e3c3cf6bd97210f04882c2b0ce94566311f360536d1174d7e04e8f9884ab')
|
||||
urls+=('https://dl.bintray.com/chromebrew/chromebrew/curl-7.74.0-chromeos-armv7l.tar.xz')
|
||||
sha256s+=('6c817cc8f2043982148a08713fd5439efc26e80f44788788b58bde6d5a86186c')
|
||||
urls+=('https://dl.bintray.com/chromebrew/chromebrew/openssl-1.1.1i-chromeos-armv7l.tar.xz')
|
||||
sha256s+=('c3033ec7b37b5d451f528df4361a348a3dde750d71a131551039bed8880b5bb0')
|
||||
urls+=('https://dl.bintray.com/chromebrew/chromebrew/curl-7.74.0-1-chromeos-armv7l.tar.xz')
|
||||
sha256s+=('f54a7ff2c3521535af5873b061d26514005e3e080e5b444888e25dce95981201')
|
||||
urls+=('https://dl.bintray.com/chromebrew/chromebrew/git-2.30.0-chromeos-armv7l.tar.xz')
|
||||
sha256s+=('530242b602699db7a4f649c47ec44e81586128629b24b3e7fb7e1a9f877e8353')
|
||||
;;
|
||||
"i686")
|
||||
urls+=('https://dl.bintray.com/chromebrew/chromebrew/gcc10-10.2.1-0f64-chromeos-i686.tar.xz')
|
||||
@@ -139,12 +141,14 @@ case "${ARCH}" in
|
||||
sha256s+=('3119323613fefd0c8c4d6f0ec6d55d2ae3ec6390aeb19eb01ca47bff4903322f')
|
||||
urls+=('https://dl.bintray.com/chromebrew/chromebrew/ruby-3.0.0-chromeos-i686.tar.xz')
|
||||
sha256s+=('6a624ec30b5b6f32a842ec9f686278ce239d729f9736bf1b5d74ac08a716e0ef')
|
||||
urls+=('https://dl.bintray.com/chromebrew/chromebrew/git-2.29.2-chromeos-i686.tar.xz')
|
||||
sha256s+=('45af562bfd02b45839a92e5b14f67c267b5ddf60a526828b9a0567750d8eb085')
|
||||
urls+=('https://dl.bintray.com/chromebrew/chromebrew/libressl-3.2.3-chromeos-i686.tar.xz')
|
||||
sha256s+=('d6962728e73894df3382ad17035b838f213f246edb6dc4aa54522c3bc5c59dd8')
|
||||
urls+=('https://dl.bintray.com/chromebrew/chromebrew/curl-7.74.0-chromeos-i686.tar.xz')
|
||||
sha256s+=('77b6af733566a22e9eb1187470190b9c48e2480dd13589efc452da589530630d')
|
||||
urls+=('https://dl.bintray.com/chromebrew/chromebrew/openssl-1.1.1i-chromeos-i686.tar.xz')
|
||||
sha256s+=('a1435f3a49db9dd3f07f3558cfffdbb0f724b15b1dba430ce3ad028b5d861366')
|
||||
urls+=('https://dl.bintray.com/chromebrew/chromebrew/curl-7.74.0-1-chromeos-i686.tar.xz')
|
||||
sha256s+=('ba7b7abeda8592135d2ea851f906636716b1f1d577fdcc75ad68bd6f0b67e5e0')
|
||||
urls+=('https://dl.bintray.com/chromebrew/chromebrew/git-2.30.0-chromeos-i686.tar.xz')
|
||||
sha256s+=('fa19e5276870d4347259daf6b8c4c001eafdaabb0c02b7846014558cf6ca90a5')
|
||||
;;
|
||||
"x86_64")
|
||||
urls+=('https://dl.bintray.com/chromebrew/chromebrew/gcc10-10.2.1-0f64-chromeos-x86_64.tar.xz')
|
||||
@@ -181,12 +185,14 @@ case "${ARCH}" in
|
||||
sha256s+=('d342c29d70e7bb4405555954ee376ff72782b419025b673ee750fe7d0c9efa1f')
|
||||
urls+=('https://dl.bintray.com/chromebrew/chromebrew/ruby-3.0.0-chromeos-x86_64.tar.xz')
|
||||
sha256s+=('64ab9f4df6ab0185f7f74a0deb6a809d5ba910128f730522f21079062985108f')
|
||||
urls+=('https://dl.bintray.com/chromebrew/chromebrew/git-2.29.2-chromeos-x86_64.tar.xz')
|
||||
sha256s+=('652c8df51f2862f15e60f4e01e9308d25c5d7944cf51f7bd9a6dc922e7366a82')
|
||||
urls+=('https://dl.bintray.com/chromebrew/chromebrew/libressl-3.2.3-chromeos-x86_64.tar.xz')
|
||||
sha256s+=('be499bd46626d26ed6c333dc1a74df423537053e6afbf2a14e542c5ceec796ef')
|
||||
urls+=('https://dl.bintray.com/chromebrew/chromebrew/curl-7.74.0-chromeos-x86_64.tar.xz')
|
||||
sha256s+=('137ee2aadee4e1fad6a4f80b361bdbbb7181baea32cc0b8326aa693a1d3916d4')
|
||||
urls+=('https://dl.bintray.com/chromebrew/chromebrew/openssl-1.1.1i-chromeos-x86_64.tar.xz')
|
||||
sha256s+=('52a43bc84d243218a2bf98c8895b1e366887a7e5308e711a3145ffe7879fe9e0')
|
||||
urls+=('https://dl.bintray.com/chromebrew/chromebrew/curl-7.74.0-1-chromeos-x86_64.tar.xz')
|
||||
sha256s+=('7696a5014d09eaff0864ee36fe4a7f8032c99e7eeb56baf0e04a87427e0114c6')
|
||||
urls+=('https://dl.bintray.com/chromebrew/chromebrew/git-2.30.0-chromeos-x86_64.tar.xz')
|
||||
sha256s+=('70adb89d9f1e1a250cc84f0e1b3e98d7ed5c82ceb413f4ae451ef9cd748b9398')
|
||||
;;
|
||||
esac
|
||||
|
||||
@@ -200,7 +206,7 @@ function download_check () {
|
||||
|
||||
#verify
|
||||
echo -e "${BLUE}Verifying ${1}...${RESET}"
|
||||
echo -e ${GREEN}`echo "${4}" "${3}" | sha256sum -c -`${RESET}
|
||||
echo -e "${GREEN}$(echo "${4}" "${3}" | sha256sum -c -)${RESET}"
|
||||
case "${?}" in
|
||||
0) ;;
|
||||
*)
|
||||
|
||||
@@ -3,22 +3,23 @@ require 'package'
|
||||
class Curl < Package
|
||||
description 'Command line tool and library for transferring data with URLs.'
|
||||
homepage 'https://curl.se/'
|
||||
version '7.74.0'
|
||||
@_ver = "7.74.0"
|
||||
version @_ver + '-1'
|
||||
compatibility 'all'
|
||||
source_url 'https://curl.se/download/curl-7.74.0.tar.xz'
|
||||
source_url "https://curl.se/download/curl-#{@_ver}.tar.xz"
|
||||
source_sha256 '999d5f2c403cf6e25d58319fdd596611e455dd195208746bc6e6d197a77e878b'
|
||||
|
||||
binary_url ({
|
||||
aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/curl-7.74.0-chromeos-armv7l.tar.xz',
|
||||
armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/curl-7.74.0-chromeos-armv7l.tar.xz',
|
||||
i686: 'https://dl.bintray.com/chromebrew/chromebrew/curl-7.74.0-chromeos-i686.tar.xz',
|
||||
x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/curl-7.74.0-chromeos-x86_64.tar.xz',
|
||||
aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/curl-7.74.0-1-chromeos-armv7l.tar.xz',
|
||||
armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/curl-7.74.0-1-chromeos-armv7l.tar.xz',
|
||||
i686: 'https://dl.bintray.com/chromebrew/chromebrew/curl-7.74.0-1-chromeos-i686.tar.xz',
|
||||
x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/curl-7.74.0-1-chromeos-x86_64.tar.xz',
|
||||
})
|
||||
binary_sha256 ({
|
||||
aarch64: '6c817cc8f2043982148a08713fd5439efc26e80f44788788b58bde6d5a86186c',
|
||||
armv7l: '6c817cc8f2043982148a08713fd5439efc26e80f44788788b58bde6d5a86186c',
|
||||
i686: '77b6af733566a22e9eb1187470190b9c48e2480dd13589efc452da589530630d',
|
||||
x86_64: '137ee2aadee4e1fad6a4f80b361bdbbb7181baea32cc0b8326aa693a1d3916d4',
|
||||
aarch64: 'f54a7ff2c3521535af5873b061d26514005e3e080e5b444888e25dce95981201',
|
||||
armv7l: 'f54a7ff2c3521535af5873b061d26514005e3e080e5b444888e25dce95981201',
|
||||
i686: 'ba7b7abeda8592135d2ea851f906636716b1f1d577fdcc75ad68bd6f0b67e5e0',
|
||||
x86_64: '7696a5014d09eaff0864ee36fe4a7f8032c99e7eeb56baf0e04a87427e0114c6',
|
||||
})
|
||||
|
||||
depends_on 'groff' => :build
|
||||
@@ -35,7 +36,12 @@ class Curl < Package
|
||||
depends_on 'zstd'
|
||||
|
||||
def self.build
|
||||
system "./configure #{CREW_OPTIONS} --disable-maintainer-mode --enable-ares --with-ldap-lib=#{CREW_LIB_PREFIX}/libldap.so --with-lber-lib=#{CREW_LIB_PREFIX}/liblber.so"
|
||||
system "env CFLAGS='-flto=auto' CXXFLAGS='-flto=auto' \
|
||||
./configure #{CREW_OPTIONS} \
|
||||
--disable-maintainer-mode \
|
||||
--enable-ares \
|
||||
--with-ldap-lib=#{CREW_LIB_PREFIX}/libldap.so \
|
||||
--with-lber-lib=#{CREW_LIB_PREFIX}/liblber.so"
|
||||
system 'make'
|
||||
end
|
||||
|
||||
|
||||
@@ -3,30 +3,33 @@ require 'package'
|
||||
class Git < Package
|
||||
description 'Git is a free and open source distributed version control system designed to handle everything from small to very large projects with speed and efficiency.'
|
||||
homepage 'https://git-scm.com/'
|
||||
version '2.29.2'
|
||||
@_ver = '2.30.0'
|
||||
version @_ver
|
||||
compatibility 'all'
|
||||
source_url 'https://github.com/git/git/archive/v2.29.2.tar.gz'
|
||||
source_sha256 '8cc15abf2bc1cfa4b8acc37025cf92ec73c20efdb3f243793fef71dfe87478be'
|
||||
source_url "https://github.com/git/git/archive/v#{@_ver}.tar.gz"
|
||||
source_sha256 '8db4edd1a0a74ebf4b78aed3f9e25c8f2a7db3c00b1aaee94d1e9834fae24e61'
|
||||
|
||||
binary_url ({
|
||||
aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/git-2.29.2-chromeos-armv7l.tar.xz',
|
||||
armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/git-2.29.2-chromeos-armv7l.tar.xz',
|
||||
i686: 'https://dl.bintray.com/chromebrew/chromebrew/git-2.29.2-chromeos-i686.tar.xz',
|
||||
x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/git-2.29.2-chromeos-x86_64.tar.xz',
|
||||
aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/git-2.30.0-chromeos-armv7l.tar.xz',
|
||||
armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/git-2.30.0-chromeos-armv7l.tar.xz',
|
||||
i686: 'https://dl.bintray.com/chromebrew/chromebrew/git-2.30.0-chromeos-i686.tar.xz',
|
||||
x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/git-2.30.0-chromeos-x86_64.tar.xz',
|
||||
})
|
||||
binary_sha256 ({
|
||||
aarch64: '892ed67dfc19d0f5056836d3a707c1f4d5717bdf82e0d6d0facd11f9eb964fa4',
|
||||
armv7l: '892ed67dfc19d0f5056836d3a707c1f4d5717bdf82e0d6d0facd11f9eb964fa4',
|
||||
i686: '45af562bfd02b45839a92e5b14f67c267b5ddf60a526828b9a0567750d8eb085',
|
||||
x86_64: '652c8df51f2862f15e60f4e01e9308d25c5d7944cf51f7bd9a6dc922e7366a82',
|
||||
aarch64: '530242b602699db7a4f649c47ec44e81586128629b24b3e7fb7e1a9f877e8353',
|
||||
armv7l: '530242b602699db7a4f649c47ec44e81586128629b24b3e7fb7e1a9f877e8353',
|
||||
i686: 'fa19e5276870d4347259daf6b8c4c001eafdaabb0c02b7846014558cf6ca90a5',
|
||||
x86_64: '70adb89d9f1e1a250cc84f0e1b3e98d7ed5c82ceb413f4ae451ef9cd748b9398',
|
||||
})
|
||||
|
||||
|
||||
depends_on 'curl' => :build
|
||||
depends_on 'python3' => :build
|
||||
|
||||
def self.build
|
||||
system 'autoreconf -i'
|
||||
system "./configure \
|
||||
system "env CFLAGS='-flto=auto' CXXFLAGS='-flto=auto' \
|
||||
./configure \
|
||||
--with-openssl=#{CREW_PREFIX}/etc/ssl \
|
||||
--without-tcltk #{CREW_OPTIONS} \
|
||||
--with-perl=#{CREW_PREFIX}/bin/perl \
|
||||
|
||||
@@ -3,22 +3,22 @@ require 'package'
|
||||
class Gnutls < Package
|
||||
description 'GnuTLS is a secure communications library implementing the SSL, TLS and DTLS protocols and technologies around them.'
|
||||
homepage 'http://gnutls.org/'
|
||||
version '3.6.12'
|
||||
version '3.7.0'
|
||||
compatibility 'all'
|
||||
source_url 'https://www.gnupg.org/ftp/gcrypt/gnutls/v3.6/gnutls-3.6.12.tar.xz'
|
||||
source_sha256 'bfacf16e342949ffd977a9232556092c47164bd26e166736cf3459a870506c4b'
|
||||
source_url 'https://www.gnupg.org/ftp/gcrypt/gnutls/v3.7/gnutls-3.7.0.tar.xz'
|
||||
source_sha256 '49e2a22691d252c9f24a9829b293a8f359095bc5a818351f05f1c0a5188a1df8'
|
||||
|
||||
binary_url ({
|
||||
aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/gnutls-3.6.12-chromeos-armv7l.tar.xz',
|
||||
armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/gnutls-3.6.12-chromeos-armv7l.tar.xz',
|
||||
i686: 'https://dl.bintray.com/chromebrew/chromebrew/gnutls-3.6.12-chromeos-i686.tar.xz',
|
||||
x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/gnutls-3.6.12-chromeos-x86_64.tar.xz',
|
||||
aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/gnutls-3.7.0-chromeos-armv7l.tar.xz',
|
||||
armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/gnutls-3.7.0-chromeos-armv7l.tar.xz',
|
||||
i686: 'https://dl.bintray.com/chromebrew/chromebrew/gnutls-3.7.0-chromeos-i686.tar.xz',
|
||||
x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/gnutls-3.7.0-chromeos-x86_64.tar.xz',
|
||||
})
|
||||
binary_sha256 ({
|
||||
aarch64: 'ef7aac519396162958750c83622781f8f9e4c30cee06b911271a8ae3d8cb44a4',
|
||||
armv7l: 'ef7aac519396162958750c83622781f8f9e4c30cee06b911271a8ae3d8cb44a4',
|
||||
i686: 'd403e4200b18dfafba3c46bdf3c95e3e59088499b8fae5e22085f65b8a99fc49',
|
||||
x86_64: '261a3766026d916bdb4a68fd1b55a9409e52ac06e2949310371bf9a13dea3751',
|
||||
aarch64: '4e7f7e7314732e4716817f541e408a76489a53a9bb3b98e0c4072bb290c50cf5',
|
||||
armv7l: '4e7f7e7314732e4716817f541e408a76489a53a9bb3b98e0c4072bb290c50cf5',
|
||||
i686: 'c3ebd7f90ca13365f208afd7384f6979de959c38fd7cc2ea780b4f951e743b36',
|
||||
x86_64: '74ede0950a89488bf91cc9e144f7318d8e26b4a522d50db557f182cef66ced39',
|
||||
})
|
||||
|
||||
depends_on 'zlibpkg'
|
||||
@@ -33,10 +33,13 @@ class Gnutls < Package
|
||||
depends_on 'libidn2'
|
||||
|
||||
def self.build
|
||||
system "./configure", "--enable-shared", "--disable-static", "--with-pic",
|
||||
"--with-system-priority-file=#{CREW_PREFIX}/etc/gnutls/default-priorities",
|
||||
"--with-unbound-root-key-file=#{CREW_PREFIX}/etc/unbound/root.key",
|
||||
"--libdir=#{CREW_LIB_PREFIX}"
|
||||
system "./configure --help"
|
||||
system "env CFLAGS='-flto=1' CXXFLAGS='-flto=1' \
|
||||
./configure #{CREW_OPTIONS} \
|
||||
--enable-shared \
|
||||
--with-pic \
|
||||
--with-system-priority-file=#{CREW_PREFIX}/etc/gnutls/default-priorities \
|
||||
--with-unbound-root-key-file=#{CREW_PREFIX}/etc/unbound/root.key"
|
||||
system "make"
|
||||
end
|
||||
|
||||
|
||||
@@ -3,29 +3,30 @@ require 'package'
|
||||
class Nettle < Package
|
||||
description 'Nettle is a cryptographic library that is designed to fit easily in more or less any context: In crypto toolkits for object-oriented languages (C++, Python, Pike, ...), in applications like LSH or GNUPG, or even in kernel space.'
|
||||
homepage 'http://www.lysator.liu.se/~nisse/nettle/'
|
||||
version '3.5.1'
|
||||
@_ver = '3.7'
|
||||
version @_ver
|
||||
compatibility 'all'
|
||||
source_url 'https://ftpmirror.gnu.org/nettle/nettle-3.5.1.tar.gz'
|
||||
source_sha256 '75cca1998761b02e16f2db56da52992aef622bf55a3b45ec538bc2eedadc9419'
|
||||
source_url "https://ftpmirror.gnu.org/nettle/nettle-#{@_ver}.tar.gz"
|
||||
source_sha256 'f001f64eb444bf13dd91bceccbc20acbc60c4311d6e2b20878452eb9a9cec75a'
|
||||
|
||||
binary_url ({
|
||||
aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/nettle-3.5.1-chromeos-armv7l.tar.xz',
|
||||
armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/nettle-3.5.1-chromeos-armv7l.tar.xz',
|
||||
i686: 'https://dl.bintray.com/chromebrew/chromebrew/nettle-3.5.1-chromeos-i686.tar.xz',
|
||||
x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/nettle-3.5.1-chromeos-x86_64.tar.xz',
|
||||
aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/nettle-3.7-chromeos-armv7l.tar.xz',
|
||||
armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/nettle-3.7-chromeos-armv7l.tar.xz',
|
||||
i686: 'https://dl.bintray.com/chromebrew/chromebrew/nettle-3.7-chromeos-i686.tar.xz',
|
||||
x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/nettle-3.7-chromeos-x86_64.tar.xz',
|
||||
})
|
||||
binary_sha256 ({
|
||||
aarch64: 'a9605d17f44b2ca3f0aaad799a8f3100a803bc45bda5048a36012f9e0b7595dd',
|
||||
armv7l: 'a9605d17f44b2ca3f0aaad799a8f3100a803bc45bda5048a36012f9e0b7595dd',
|
||||
i686: '499d5354c73f68eba5fc2378ca81bec08ddd3e45860206f325d64f2d58c2ba5a',
|
||||
x86_64: '682ba5bd37d140b8dd70f3ce591253cef32fec7652e9ea42c7a5e754519fa13a',
|
||||
aarch64: 'ac62f7cd94b7047e87d413a8d6e338ebaeadbac613458b0a46290b9332ac647f',
|
||||
armv7l: 'ac62f7cd94b7047e87d413a8d6e338ebaeadbac613458b0a46290b9332ac647f',
|
||||
i686: '21eb9162bced72c824cdfa392bcb4b783ca6c7a5a7487134258027c8662c484f',
|
||||
x86_64: '2ea16fff4808cfa8105c8a7f1f6eab83157979aeb2b0cce06da8f8b6ab3bdd02',
|
||||
})
|
||||
|
||||
depends_on 'm4'
|
||||
depends_on 'openssl'
|
||||
|
||||
def self.build
|
||||
system "./configure --prefix=#{CREW_PREFIX} --libdir=#{CREW_LIB_PREFIX}"
|
||||
system "env CFLAGS='-flto=auto' CXXFLAGS='-flto=auto' ./configure #{CREW_OPTIONS}"
|
||||
system 'make'
|
||||
end
|
||||
|
||||
|
||||
@@ -3,25 +3,24 @@ require 'package'
|
||||
class Sommelier < Package
|
||||
description 'Sommelier works by redirecting X11 and Wayland programs to the built-in ChromeOS wayland server.'
|
||||
homepage 'https://chromium.googlesource.com/chromiumos/platform2/+/HEAD/vm_tools/sommelier/'
|
||||
version '20201222-3'
|
||||
version '20201222-4'
|
||||
compatibility 'all'
|
||||
source_url 'https://chromium-review.googlesource.com/changes/chromiumos%2Fplatform2~2476815/revisions/5/patch?zip&path=%2FCOMMIT_MSG'
|
||||
source_sha256 'd1850e1d4a1e1ec873b9e4add7a881e981f6c0bc17dfd2a1b85efd7df6dd84b4'
|
||||
|
||||
binary_url ({
|
||||
aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/sommelier-20201222-3-chromeos-armv7l.tar.xz',
|
||||
armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/sommelier-20201222-3-chromeos-armv7l.tar.xz',
|
||||
i686: 'https://dl.bintray.com/chromebrew/chromebrew/sommelier-20201222-3-chromeos-i686.tar.xz',
|
||||
x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/sommelier-20201222-3-chromeos-x86_64.tar.xz',
|
||||
aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/sommelier-20201222-4-chromeos-armv7l.tar.xz',
|
||||
armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/sommelier-20201222-4-chromeos-armv7l.tar.xz',
|
||||
i686: 'https://dl.bintray.com/chromebrew/chromebrew/sommelier-20201222-4-chromeos-i686.tar.xz',
|
||||
x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/sommelier-20201222-4-chromeos-x86_64.tar.xz',
|
||||
})
|
||||
binary_sha256 ({
|
||||
aarch64: 'd5d3790503673368cd882379d07bab0152c6a8e0aae7a390229b4748121c0345',
|
||||
armv7l: 'd5d3790503673368cd882379d07bab0152c6a8e0aae7a390229b4748121c0345',
|
||||
i686: 'a2ee97b81a19958dd79ebd8cd58e40319ea570b73113e477781542026e5ec148',
|
||||
x86_64: '58c024732ad5bf0cda4f15ca5104c0dff94837a3eae34408a2bd7457a18a0161',
|
||||
aarch64: '948b0cf4b09622fe91318bd410b633c621675252b2884a82fc107d718d24cb5f',
|
||||
armv7l: '948b0cf4b09622fe91318bd410b633c621675252b2884a82fc107d718d24cb5f',
|
||||
i686: '8ab9cc1429903fef93f2e09ca984de936f8b5769b48404e4b06eecbf5935ecde',
|
||||
x86_64: '3aa985686796cf13d23f974533682deb001d78bf88bc0bbdf710689359024b68',
|
||||
})
|
||||
|
||||
|
||||
depends_on 'mesa'
|
||||
depends_on 'xkbcomp'
|
||||
depends_on 'xorg_server' unless File.exists? "#{CREW_PREFIX}/bin/Xwayland.elf"
|
||||
@@ -70,8 +69,10 @@ class Sommelier < Package
|
||||
system "sed -i 's/sizeof(addr.sun_path))/sizeof(addr.sun_path) - 1)/' sommelier.cc"
|
||||
|
||||
# lld is needed so libraries linked to system libraries (e.g. libgbm.so) can be linked against, since those are required for graphics acceleration.
|
||||
|
||||
system "meson #{CREW_MESON_OPTIONS} \
|
||||
system "env CC=clang CXX=clang++ \
|
||||
meson #{CREW_MESON_OPTIONS} \
|
||||
-Dc_args='-flto=thin -fuse-ld=lld' \
|
||||
-Dcpp_args='-flto=thin -fuse-ld=lld' \
|
||||
-Dxwayland_path=#{CREW_PREFIX}/bin/Xwayland \
|
||||
-Dxwayland_gl_driver_path=/usr/#{ARCH_LIB}/dri -Ddefault_library=both \
|
||||
-Dxwayland_shm_driver=noop -Dshm_driver=noop -Dvirtwl_device=/dev/null \
|
||||
@@ -134,7 +135,6 @@ basedir=${base%/*}
|
||||
# ld.so supports forwarding the binary name.
|
||||
LD_ARGV0=\"$0\" LD_ARGV0_REL=\"../bin/sommelier\" exec \"${basedir}/..#{PEER_CMD_PREFIX}\" --library-path \"${basedir}/../#{ARCH_LIB}\" --inhibit-rpath '' \"${base}.elf\" \"$@\"
|
||||
EOF"
|
||||
|
||||
# sommelierd
|
||||
system "cat <<'EOF'> sommelierd
|
||||
#!/bin/bash
|
||||
@@ -172,7 +172,6 @@ echo \$! >#{CREW_PREFIX}/var/run/sommelier-xwayland.pid
|
||||
xhost +si:localuser:root &>/dev/null
|
||||
fi
|
||||
EOF"
|
||||
|
||||
# startsommelier
|
||||
system "cat <<'EOF'> startsommelier
|
||||
#!/bin/bash
|
||||
@@ -210,7 +209,6 @@ else
|
||||
exit 1
|
||||
fi
|
||||
EOF"
|
||||
|
||||
# stopsommelier
|
||||
system "cat <<'EOF'> stopsommelier
|
||||
#!/bin/bash
|
||||
@@ -229,7 +227,6 @@ else
|
||||
echo \"sommelier stopped\"
|
||||
fi
|
||||
EOF"
|
||||
|
||||
# restartsommelier
|
||||
system "echo '#!/bin/bash' > restartsommelier"
|
||||
system "echo 'stopsommelier && startsommelier' >> restartsommelier"
|
||||
@@ -250,7 +247,6 @@ EOF"
|
||||
system "install -Dm755 restartsommelier #{CREW_DEST_PREFIX}/bin/restartsommelier"
|
||||
system "install -Dm755 sommelierrc #{CREW_DEST_PREFIX}/etc/sommelierrc"
|
||||
system "install -Dm644 .sommelier-default.env #{CREW_DEST_HOME}/.sommelier-default.env"
|
||||
|
||||
end
|
||||
end
|
||||
end
|
||||
@@ -275,7 +271,6 @@ EOF"
|
||||
puts "To complete the installation, execute the following:".orange
|
||||
puts "source ~/.bashrc".orange
|
||||
end
|
||||
|
||||
puts
|
||||
puts "To adjust sommelier environment variables, create ~/.sommelier.env".lightblue
|
||||
puts "Default values are in ~/.sommelier-default.env".lightblue
|
||||
@@ -288,7 +283,7 @@ EOF"
|
||||
puts "sommelier daemon running.".orange
|
||||
puts
|
||||
puts "The sommelier daemon may also have to be restarted with".orange
|
||||
puts "'restartsommelier'after waking your device.".orange
|
||||
puts "'restartsommelier' after waking your device.".orange
|
||||
puts
|
||||
puts "(If you are upgrading from an earlier version of sommelier,".orange
|
||||
puts "also run 'restartsommelier'.)".orange
|
||||
|
||||
@@ -3,22 +3,23 @@ require 'package'
|
||||
class Xwayland < Package
|
||||
description 'X server configured to work with weston or sommelier'
|
||||
homepage 'https://x.org'
|
||||
version '1.20.10'
|
||||
@_ver = '1.20.10'
|
||||
version @_ver + '-1'
|
||||
compatibility 'all'
|
||||
source_url 'https://gitlab.freedesktop.org/xorg/xserver/-/archive/bc111a2e67e16d4e6d4f3196ab86c22c1e278c45/xserver-bc111a2e67e16d4e6d4f3196ab86c22c1e278c45.tar.bz2'
|
||||
source_sha256 '357e6edb0d7c6107e9e1d5bc4e86ced4f96cad25282b9d1c86796fe3fe60bfa7'
|
||||
source_url "https://github.com/freedesktop/xorg-xserver/archive/xorg-server-#{@_ver}.tar.gz"
|
||||
source_sha256 '499d2b79fdf78e2e06b0c17a4d735fe25ba9d44f689e06a7e82612c35083c4ad'
|
||||
|
||||
binary_url ({
|
||||
aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/xwayland-1.20.10-chromeos-armv7l.tar.xz',
|
||||
armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/xwayland-1.20.10-chromeos-armv7l.tar.xz',
|
||||
i686: 'https://dl.bintray.com/chromebrew/chromebrew/xwayland-1.20.10-chromeos-i686.tar.xz',
|
||||
x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/xwayland-1.20.10-chromeos-x86_64.tar.xz',
|
||||
aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/xwayland-1.20.10-1-chromeos-armv7l.tar.xz',
|
||||
armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/xwayland-1.20.10-1-chromeos-armv7l.tar.xz',
|
||||
i686: 'https://dl.bintray.com/chromebrew/chromebrew/xwayland-1.20.10-1-chromeos-i686.tar.xz',
|
||||
x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/xwayland-1.20.10-1-chromeos-x86_64.tar.xz',
|
||||
})
|
||||
binary_sha256 ({
|
||||
aarch64: '8235123cf2269d5b69528739ca055100156654452e74126454cb34a0823c8bbb',
|
||||
armv7l: '8235123cf2269d5b69528739ca055100156654452e74126454cb34a0823c8bbb',
|
||||
i686: '4b60240cfef6a103b2398fc477defff93f51753ba2bec078e7477defc4d493f9',
|
||||
x86_64: '3fc26b39b410c9bff20be53f2017cd4e21d2fa4b2c1a320be6632a6139f72189',
|
||||
aarch64: 'c0a7dc97b292c4e0b4f656e287662cc42d9f5d9faa153121af2febc6646b685d',
|
||||
armv7l: 'c0a7dc97b292c4e0b4f656e287662cc42d9f5d9faa153121af2febc6646b685d',
|
||||
i686: 'ebecd2f9921810166ffac629fb4a38c8157e5b675174ef514e2e386ad8b27f18',
|
||||
x86_64: '2423bbd76b41e395066641ba7cb889ca70a32a4b002226b6d0fc00bf0604d903',
|
||||
})
|
||||
|
||||
depends_on 'libepoxy'
|
||||
@@ -45,14 +46,13 @@ class Xwayland < Package
|
||||
depends_on 'xkbcomp'
|
||||
depends_on 'glproto'
|
||||
depends_on 'mesa'
|
||||
|
||||
# Patches are from Google xwayland overlay at https://source.chromium.org/chromiumos/chromiumos/codesearch/+/master:src/third_party/chromiumos-overlay/x11-base/xwayland/files/
|
||||
|
||||
def self.patch
|
||||
url_patch1 = "https://chromium.googlesource.com/chromiumos/overlays/chromiumos-overlay/+/067ac4b5060c16e6687a97cbb4bcdbaf5a0b5639/x11-base/xwayland/files/0001-Eliminate-conflict-with-X11-Xlib.h-with-khronos-eglp.patch?format=TEXT"
|
||||
uri_patch1 = URI.parse url_patch1
|
||||
filename_patch1 = 'patch1_base64'
|
||||
sha256sum_patch1 = '16f5d5d1986daf07b4e0f01eb0e68b53d8ef301d169f3cc9493158c8b4987f16'
|
||||
|
||||
puts "Downloading patch1".yellow
|
||||
system('curl', '-s', '--insecure', '-L', '-#', url_patch1, '-o', filename_patch1)
|
||||
abort 'Checksum mismatch. :/ Try again.'.lightred unless
|
||||
@@ -60,12 +60,10 @@ class Xwayland < Package
|
||||
puts "patch1 archive downloaded".lightgreen
|
||||
system 'base64 --decode patch1_base64 > patch1'
|
||||
system 'patch -p 1 < patch1'
|
||||
|
||||
url_patch2 = "https://chromium.googlesource.com/chromiumos/overlays/chromiumos-overlay/+/067ac4b5060c16e6687a97cbb4bcdbaf5a0b5639/x11-base/xwayland/files/0001-xwayland-Fall-back-to-gbm_bo_create-if-no-modifiers-.patch?format=TEXT"
|
||||
uri_patch2 = URI.parse url_patch2
|
||||
filename_patch2 = 'patch2_base64'
|
||||
sha256sum_patch2 = 'd44bfca0e26ca06892b37b12faca2a6756cdc2455aac36ac7607bfa188856b35'
|
||||
|
||||
puts "Downloading patch2".yellow
|
||||
system('curl', '-s', '--insecure', '-L', '-#', url_patch2, '-o', filename_patch2)
|
||||
abort 'Checksum mismatch. :/ Try again.'.lightred unless
|
||||
@@ -78,7 +76,6 @@ class Xwayland < Package
|
||||
uri_patch3 = URI.parse url_patch3
|
||||
filename_patch3 = 'patch3_base64'
|
||||
sha256sum_patch3 = 'b66eb66cc8023ab2170db91e4d6038dca99b814addfcb0977d30479a2e514ab8'
|
||||
|
||||
puts "Downloading patch3".yellow
|
||||
system('curl', '-s', '--insecure', '-L', '-#', url_patch3, '-o', filename_patch3)
|
||||
abort 'Checksum mismatch. :/ Try again.'.lightred unless
|
||||
@@ -98,13 +95,11 @@ class Xwayland < Package
|
||||
end
|
||||
|
||||
def self.build
|
||||
case ARCH
|
||||
when 'aarch64', 'armv7l', 'x86_64'
|
||||
ENV['CFLAGS'] = '-fuse-ld=lld'
|
||||
ENV['CXXFLAGS'] = '-fuse-ld=lld'
|
||||
end
|
||||
system 'meson setup build'
|
||||
system "meson configure #{CREW_MESON_OPTIONS} \
|
||||
-Dc_link_args='-fuse-ld=lld' \
|
||||
-Dcpp_link_args='-fuse-ld=lld' \
|
||||
-Db_asneeded=false \
|
||||
-Dipv6=true \
|
||||
-Dxvfb=true \
|
||||
-Dxnest=true \
|
||||
@@ -121,7 +116,6 @@ class Xwayland < Package
|
||||
build"
|
||||
system 'meson configure build'
|
||||
system 'ninja -C build'
|
||||
|
||||
system "cat <<'EOF'> Xwayland_sh
|
||||
#!/bin/bash
|
||||
if base=$(readlink \"$0\" 2>/dev/null); then
|
||||
|
||||
Reference in New Issue
Block a user