upg booster mercurial mesa onetbb samba syslog-ng xorg-server
This commit is contained in:
parent
7e1d509275
commit
8021e59445
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
pkgname=booster
|
||||
pkgver=0.10
|
||||
pkgrel=01
|
||||
pkgrel=02
|
||||
pkgdesc='Fast and secure initramfs generator'
|
||||
url='https://github.com/anatol/booster'
|
||||
depends=(bash)
|
||||
|
|
@ -74,6 +74,5 @@ license=(MIT)
|
|||
|
||||
sha256sums=(3b1c856544fc99fdf234040880817a5c7b7510c8d63c2b105a995bc700fc45b4) # booster-0.10.zip
|
||||
|
||||
## 5e1015046efa8e587a9daa7a0c8236a45e71d8c5e8be9c199494ebb8097ad06e booster-0.10-01-x86_64.pkg.tar.lz
|
||||
|
||||
## f776e3d022e746e463ae1b0396835587e2f699b95999060cdd20dde2489a711b booster-0.10-02-x86_64.pkg.tar.lz
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
pkgname=booster
|
||||
pkgver=0.10
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
pkgdesc='Fast and secure initramfs generator'
|
||||
arch=(x86_64)
|
||||
url='https://github.com/anatol/booster'
|
||||
|
|
@ -17,8 +17,16 @@ optdepends=(
|
|||
)
|
||||
backup=(etc/booster.yaml)
|
||||
provides=(initramfs)
|
||||
source=(booster-$pkgver.zip::https://github.com/anatol/booster/archive/$pkgver.zip)
|
||||
sha512sums=('4e98feda493a0e42c5f22a0471d09370a3751dc59548125a3ac218f14e6fe31f9af2b126a122c9a1055970ca9361d477949e351a23acd27d3a0e534e052df592')
|
||||
source=(booster-$pkgver.zip::https://github.com/anatol/booster/archive/$pkgver.zip
|
||||
zstd-support.patch)
|
||||
sha512sums=('4e98feda493a0e42c5f22a0471d09370a3751dc59548125a3ac218f14e6fe31f9af2b126a122c9a1055970ca9361d477949e351a23acd27d3a0e534e052df592'
|
||||
'6ca0fe522c416d98f7eaca09e886aafd29b6d1a46999abba5da29700fae670d38097a6bc3dd455b194ae0bedd3aa20bb0487d5719b71f611a792ada6faed8f9b')
|
||||
|
||||
prepare() {
|
||||
cd booster-$pkgver
|
||||
|
||||
patch -Np1 -i ../zstd-support.patch
|
||||
}
|
||||
|
||||
build() {
|
||||
cd booster-$pkgver
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
#-----------------------------------------| DESCRIPTION |---------------------------------------
|
||||
|
||||
pkgname=mercurial
|
||||
pkgver=6.4.5
|
||||
pkgver=6.5
|
||||
pkgrel=01
|
||||
pkgdesc='A scalable distributed SCM tool'
|
||||
url="https://www.mercurial-scm.org/"
|
||||
|
|
@ -81,8 +81,8 @@ validpgpkeys=(2BCCE14F5C6725AA2EA8AEB7B9C9DC824AA5BDD5 #
|
|||
818D87CD1AC180C394C86E633A33DE460D9EC39F # Pulkit Goyal <7895pulkit@gmail.com>
|
||||
1F66F8CDF654E905C11DA061A11E01CD0E05D956) # Raphaël Gomès <alphare@raphaelgomes.dev>
|
||||
|
||||
sha256sums=(b0b4b00b8b2639c8be387394796f0425beb339314df7e72937f8ddd2a41b1b8a # mercurial-6.4.5.tar.gz
|
||||
bc6af9b029a712ae3b46717e17ff17a082056f73d82b28ea67321ee668196324 # mercurial-6.4.5.tar.gz.asc
|
||||
sha256sums=(a5603d0d395ebf67fe5d27abbb3bd37fcc01871ecf394c793672d2c1e68be7e7 # mercurial-6.5.tar.gz
|
||||
028e23b78e2ffed18381c62e714abf980a4126dc72607ca49c721afe970d15d7 # mercurial-6.5.tar.gz.asc
|
||||
87427151713e689cd87dc50d50c048e0e58285815e4eb61962b50583532cbde5) # mercurial.profile
|
||||
|
||||
## ea2bd5c4fa0b732bbf0daf01dd5327750107e12e89ffd71108a28d964c28fbce mercurial-6.4.5-01-x86_64.pkg.tar.lz
|
||||
## 3a7e8291869769f84c7cc4154180d850eb68332508ea11fa38934b07cacd0a91 mercurial-6.5-01-x86_64.pkg.tar.lz
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
|
||||
|
||||
pkgname=mercurial
|
||||
pkgver=6.4.5
|
||||
pkgver=6.5
|
||||
pkgrel=1
|
||||
pkgdesc='A scalable distributed SCM tool'
|
||||
arch=(x86_64)
|
||||
|
|
@ -27,7 +27,7 @@ validpgpkeys=(2BCCE14F5C6725AA2EA8AEB7B9C9DC824AA5BDD5
|
|||
1F66F8CDF654E905C11DA061A11E01CD0E05D956) # Raphaël Gomès <alphare@raphaelgomes.dev>
|
||||
source=(https://www.mercurial-scm.org/release/${pkgname}-${pkgver}.tar.gz{,.asc}
|
||||
mercurial.profile)
|
||||
sha512sums=('873de469e2c56bac5cfb71bb1a801557f11c9a386c399bac3fe7fc18bbad599e2fa9e85dce6ad64bc7e4a4d12e18f8e16d67ef3e86b6823fa183250e6252d7a3'
|
||||
sha512sums=('34f61b3f6a7d488afeffbaed7a35ab2da682f18171b07f78e405e89b7871dd7e7cbc1e92ef30b3bf82e35e2185d44c7e5379fecba4fafbe9ae8de194e92c12f3'
|
||||
'SKIP'
|
||||
'710dcddb24d928efc97370e869d9caa083107929ed9a1086dd2a3ae0caaf2c71e2f29060597e29315b6b15b1616251c42412e268ce737109c48ae4d7aa1b9555')
|
||||
|
||||
|
|
|
|||
|
|
@ -6,9 +6,10 @@
|
|||
#-----------------------------------------| DESCRIPTION |---------------------------------------
|
||||
|
||||
pkgbase=mesa
|
||||
pkgname=('vulkan-mesa-layers' 'opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 'vulkan-swrast' 'vulkan-virtio' 'libva-mesa-driver' 'mesa-vdpau' 'mesa')
|
||||
pkgname=('vulkan-mesa-layers' 'opencl-clover-mesa' 'opencl-rusticl-mesa' 'vulkan-intel' 'vulkan-radeon'
|
||||
'vulkan-swrast' 'vulkan-virtio' 'libva-mesa-driver' 'mesa-vdpau' 'mesa')
|
||||
pkgver=23.1.3
|
||||
pkgrel=01
|
||||
pkgrel=02
|
||||
pkgdesc="An open-source implementation of the OpenGL specification w/o systemd or zstd"
|
||||
#makedepends=('python-mako' 'libxml2' 'libx11' 'xorgproto' 'libdrm' 'libxshmfence' 'libxxf86vm'
|
||||
# 'libxdamage' 'libvdpau' 'libva' 'wayland' 'wayland-protocols' 'elfutils' 'llvm'
|
||||
|
|
@ -157,16 +158,33 @@ package_vulkan-mesa-layers() {
|
|||
install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
|
||||
}
|
||||
|
||||
package_opencl-mesa() {
|
||||
pkgdesc="OpenCL support with clover and rusticl for mesa drivers"
|
||||
package_opencl-clover-mesa() {
|
||||
pkgdesc="OpenCL support with clover for mesa drivers"
|
||||
depends=('libdrm' 'libclc' 'clang' 'expat' 'spirv-llvm-translator')
|
||||
optdepends=('opencl-headers: headers necessary for OpenCL development')
|
||||
provides=('opencl-driver')
|
||||
replaces=("mesa-opencl<=23.1.3-01")
|
||||
conflicts=('opencl-mesa')
|
||||
|
||||
_install fakeinstall/etc/OpenCL
|
||||
_install fakeinstall/$_libdir/lib*OpenCL*
|
||||
_install fakeinstall/etc/OpenCL/vendors/mesa.icd
|
||||
_install fakeinstall/$_libdir/libMesaOpenCL*
|
||||
_install fakeinstall/$_libdir/gallium-pipe
|
||||
|
||||
|
||||
install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
|
||||
}
|
||||
|
||||
package_opencl-rusticl-mesa() {
|
||||
pkgdesc="OpenCL support with rusticl for mesa drivers"
|
||||
depends=('clang' 'expat' 'libdrm' 'libelf' 'libclc' 'spirv-llvm-translator')
|
||||
optdepends=('opencl-headers: headers necessary for OpenCL development')
|
||||
provides=('opencl-driver')
|
||||
replaces=("mesa-opencl<=23.1.3-01")
|
||||
conflicts=('opencl-mesa')
|
||||
|
||||
_install fakeinstall/etc/OpenCL/vendors/rusticl.icd
|
||||
_install fakeinstall/$_libdir/libRusticlOpenCL*
|
||||
|
||||
install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
|
||||
}
|
||||
|
||||
|
|
@ -300,13 +318,14 @@ sha256sums=(2f6d7381bc10fbd2d6263ad1022785b8b511046c1a904162f8f7da18eea8aed9 #
|
|||
7602fdbc8eca8730a9fe2aeeb7d198e5334da5c649f65a1a7f0347941592ac0a # mesa-23.1.3.tar.xz.sig
|
||||
7052ba73bb07ea78873a2431ee4e828f4e72bda7d176d07f770fa48373dec537) # LICENSE
|
||||
|
||||
## 6a29bb5b11286362b39cdaa6b61b03229a48e4f6d2df272aa0453ed6c5d4ba9b libva-mesa-driver-23.1.3-01-x86_64.pkg.tar.lz
|
||||
## 3bcb656701f000ecb060bea516e31abc3ff961db874bea11d2ab8dbafb679b3f mesa-23.1.3-01-x86_64.pkg.tar.lz
|
||||
## 5bf09caf5a34cde6db090509cdec89fe9a24ac76f4a0be62453cb9593d56d2b2 mesa-vdpau-23.1.3-01-x86_64.pkg.tar.lz
|
||||
## 942459ad730fc09ec1651bc3368d007cc41b6d6ba2b0f08ca693ba6e2cfa0ea1 opencl-mesa-23.1.3-01-x86_64.pkg.tar.lz
|
||||
## 075e146a25f867ab34f6e4eff0cdbf336fa5f621e351a1d37eb8113287fecfcb vulkan-intel-23.1.3-01-x86_64.pkg.tar.lz
|
||||
## 89a4c0d09ae8bcf2c67c4b38a46b9a005b21cf35573f5f24c49ef7a8f833e046 vulkan-mesa-layers-23.1.3-01-x86_64.pkg.tar.lz
|
||||
## 8d9a8fb21eb3d8ec78224dcb15321aa787aab4578125e69dfadcd0494dd1a1eb vulkan-radeon-23.1.3-01-x86_64.pkg.tar.lz
|
||||
## 01afd00becea03be442983d4250f5eab414837938d33f7e0f3901bac9d1a2aea vulkan-swrast-23.1.3-01-x86_64.pkg.tar.lz
|
||||
## 34e5b2bd025e417c5c66df010d8bb4f972dab3487bd302e8eadfabd0f474546c vulkan-virtio-23.1.3-01-x86_64.pkg.tar.lz
|
||||
## dd90ca303ea8272d56738e770f4a7b36e54a38727742ac1146eb088b8db5ca42 libva-mesa-driver-23.1.3-02-x86_64.pkg.tar.lz
|
||||
## 10544bf1e5bfc0c785668a1036d3413a92f51c6fcf831f1c2381c15b90dce044 mesa-23.1.3-02-x86_64.pkg.tar.lz
|
||||
## 760e5731b2d7fcf0fce2934d53d59a7cadef4aa5e4d5692c0a83ce0c8cb4de4d mesa-vdpau-23.1.3-02-x86_64.pkg.tar.lz
|
||||
## 4ea5edde4e8d2c5d56ff1ceb2fe040cf64051bd5d5eaa0b91488c6151052109f opencl-clover-mesa-23.1.3-02-x86_64.pkg.tar.lz
|
||||
## c77d53068e617492e65e77c0952cf356848aaaff5119f6939efa85e9a4fc7f68 opencl-rusticl-mesa-23.1.3-02-x86_64.pkg.tar.lz
|
||||
## d786d4136dc4e9ec0710e87b77365702b3612599a6fb11a6d2c9e79f3c6f4d6f vulkan-intel-23.1.3-02-x86_64.pkg.tar.lz
|
||||
## 3fa5e487b45731cc0e685c8ba5a4301b26734780263bf2183fa3c7804898535d vulkan-mesa-layers-23.1.3-02-x86_64.pkg.tar.lz
|
||||
## 1dab1348e98d88b5f48c03b463fe53778fd1d12252a6cc41ba08e886d49c0a62 vulkan-radeon-23.1.3-02-x86_64.pkg.tar.lz
|
||||
## 4b54740fdb613008701f62648d3cdb1c4069d1bb580057bd569da1b0cc87b82f vulkan-swrast-23.1.3-02-x86_64.pkg.tar.lz
|
||||
## 12581c2456d173ee6f2e018a70a2cdcfb3de55104218f73298721ff84d99bd02 vulkan-virtio-23.1.3-02-x86_64.pkg.tar.lz
|
||||
|
||||
|
|
|
|||
|
|
@ -6,7 +6,8 @@
|
|||
pkgbase=mesa
|
||||
pkgname=(
|
||||
'vulkan-mesa-layers'
|
||||
'opencl-mesa'
|
||||
'opencl-clover-mesa'
|
||||
'opencl-rusticl-mesa'
|
||||
'vulkan-intel'
|
||||
'vulkan-radeon'
|
||||
'vulkan-swrast'
|
||||
|
|
@ -16,7 +17,7 @@ pkgname=(
|
|||
'mesa'
|
||||
)
|
||||
pkgver=23.1.3
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
pkgdesc="An open-source implementation of the OpenGL specification"
|
||||
url="https://www.mesa3d.org/"
|
||||
arch=('x86_64')
|
||||
|
|
@ -174,8 +175,8 @@ package_vulkan-mesa-layers() {
|
|||
install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
|
||||
}
|
||||
|
||||
package_opencl-mesa() {
|
||||
pkgdesc="OpenCL support with clover and rusticl for mesa drivers"
|
||||
package_opencl-clover-mesa() {
|
||||
pkgdesc="OpenCL support with clover for mesa drivers"
|
||||
depends=(
|
||||
'clang'
|
||||
'expat'
|
||||
|
|
@ -188,14 +189,39 @@ package_opencl-mesa() {
|
|||
)
|
||||
optdepends=('opencl-headers: headers necessary for OpenCL development')
|
||||
provides=('opencl-driver')
|
||||
replaces=("mesa-opencl<=23.1.3-1")
|
||||
conflicts=('opencl-mesa')
|
||||
|
||||
_install fakeinstall/etc/OpenCL
|
||||
_install fakeinstall/$_libdir/lib*OpenCL*
|
||||
_install fakeinstall/etc/OpenCL/vendors/mesa.icd
|
||||
_install fakeinstall/$_libdir/libMesaOpenCL*
|
||||
_install fakeinstall/$_libdir/gallium-pipe
|
||||
|
||||
install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
|
||||
}
|
||||
|
||||
package_opencl-rusticl-mesa() {
|
||||
pkgdesc="OpenCL support with rusticl for mesa drivers"
|
||||
depends=(
|
||||
'clang'
|
||||
'expat'
|
||||
'libdrm'
|
||||
'libelf'
|
||||
'zstd'
|
||||
|
||||
'libclc'
|
||||
'spirv-llvm-translator'
|
||||
)
|
||||
optdepends=('opencl-headers: headers necessary for OpenCL development')
|
||||
provides=('opencl-driver')
|
||||
replaces=("mesa-opencl<=23.1.3-1")
|
||||
conflicts=('opencl-mesa')
|
||||
|
||||
_install fakeinstall/etc/OpenCL/vendors/rusticl.icd
|
||||
_install fakeinstall/$_libdir/libRusticlOpenCL*
|
||||
|
||||
install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
|
||||
}
|
||||
|
||||
package_vulkan-intel() {
|
||||
pkgdesc="Intel's Vulkan mesa driver"
|
||||
depends=(
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@
|
|||
#-----------------------------------------| DESCRIPTION |---------------------------------------
|
||||
|
||||
pkgname=onetbb
|
||||
pkgver=2021.8.0
|
||||
pkgrel=03
|
||||
pkgver=2021.9.0
|
||||
pkgrel=01
|
||||
pkgdesc='High level abstract threading library (oneAPI Threading Building Blocks)'
|
||||
url='https://oneapi-src.github.io/oneTBB/'
|
||||
depends=('gcc-libs' 'hwloc')
|
||||
|
|
@ -16,24 +16,38 @@ conflicts=('intel-tbb' 'tbb')
|
|||
provides=("intel-tbb=$pkgver" "tbb=$pkgver")
|
||||
replaces=('intel-tbb' 'tbb')
|
||||
source=(https://github.com/oneapi-src/oneTBB/archive/v$pkgver/$pkgname-$pkgver.tar.gz
|
||||
retry-pthread_create.patch::https://github.com/oneapi-src/oneTBB/pull/824.patch)
|
||||
$pkgname-gcc13.patch::https://github.com/oneapi-src/oneTBB/commit/154cc73ca4d359621202399cc0c3c91058e56e79.patch)
|
||||
|
||||
prepare() {
|
||||
cd oneTBB-$pkgver
|
||||
# FS#77894
|
||||
patch -p1 -i ../retry-pthread_create.patch
|
||||
patch -Np1 -i ../$pkgname-gcc13.patch
|
||||
}
|
||||
|
||||
build() {
|
||||
cd oneTBB-$pkgver
|
||||
cmake -G Ninja -D CMAKE_INSTALL_PREFIX=/usr -D TBB_STRICT=OFF -D TBB4PY_BUILD=ON .
|
||||
cmake . -GNinja \
|
||||
-DCMAKE_INSTALL_PREFIX=/usr \
|
||||
-DTBB_STRICT=OFF \
|
||||
-DTBB4PY_BUILD=ON \
|
||||
-DCMAKE_BUILD_TYPE=None
|
||||
ninja all python_build
|
||||
|
||||
}
|
||||
|
||||
#check() {
|
||||
# cd oneTBB-$pkgver
|
||||
# ninja test
|
||||
#}
|
||||
# 2021.9 comment check section out and rerun without the -f option
|
||||
#99% tests passed, 2 tests failed out of 137
|
||||
#
|
||||
#Total Test time (real) = 93.24 sec
|
||||
#
|
||||
#The following tests FAILED:
|
||||
# 68 - test_arena_constraints (Subprocess aborted)
|
||||
# 122 - conformance_arena_constraints (Failed)
|
||||
#
|
||||
check() {
|
||||
cd oneTBB-$pkgver
|
||||
ninja test
|
||||
}
|
||||
|
||||
package() {
|
||||
cd oneTBB-$pkgver
|
||||
|
|
@ -46,8 +60,8 @@ arch=(x86_64)
|
|||
|
||||
license=('Apache')
|
||||
|
||||
sha256sums=(eee380323bb7ce864355ed9431f85c43955faaae9e9bce35c62b372d7ffd9f8b # onetbb-2021.8.0.tar.gz
|
||||
5a8806497ecb3d5ee8c824658615ef08b940a3708ab98a5eb8c47a2db250652e) # retry-pthread_create.patch
|
||||
sha256sums=(1ce48f34dada7837f510735ff1172f6e2c261b09460e3bf773b49791d247d24e # onetbb-2021.9.0.tar.gz
|
||||
15925f0a94cb9a9705c10402c5dc73d662733b995767304ea2662afe33a21a88) # onetbb-gcc13.patch
|
||||
|
||||
## 89e4f3dca86740a3e4c82267c3b97069c0a9144734a6c216eab0086e36b0fd6b onetbb-2021.8.0-03-x86_64.pkg.tar.lz
|
||||
## 6d5346379205b6fa884188114c0a9d5acedc9ca429d7579983df93b0f2940a6e onetbb-2021.9.0-01-x86_64.pkg.tar.lz
|
||||
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@
|
|||
# Contributor: Bogdan Burlacu <bogdan.burlacu AT pm.me>
|
||||
|
||||
pkgname=onetbb
|
||||
pkgver=2021.8.0
|
||||
pkgrel=3
|
||||
pkgver=2021.9.0
|
||||
pkgrel=1
|
||||
pkgdesc='High level abstract threading library (oneAPI Threading Building Blocks)'
|
||||
arch=('x86_64')
|
||||
url='https://oneapi-src.github.io/oneTBB/'
|
||||
|
|
@ -18,19 +18,22 @@ conflicts=('intel-tbb' 'tbb')
|
|||
provides=("intel-tbb=$pkgver" "tbb=$pkgver")
|
||||
replaces=('intel-tbb' 'tbb')
|
||||
source=(https://github.com/oneapi-src/oneTBB/archive/v$pkgver/$pkgname-$pkgver.tar.gz
|
||||
retry-pthread_create.patch::https://github.com/oneapi-src/oneTBB/pull/824.patch)
|
||||
sha512sums=('72f68730dfd89409796f9548d3c302111787712089688a7c77092ed1b3a7bf4e7444fe4b58015d2c78b7b71259852526789b2483bf1e71bea8146c4b4676e7b4'
|
||||
'717d3f78b29ce9e2104cbf962b4ced8a4414dcb8af7259ba12dd62adbacfd59e064ae1771c217cbac46d691ab6bfd52aee90113a5aeb9a1f91379295d16e639a')
|
||||
$pkgname-gcc13.patch::https://github.com/oneapi-src/oneTBB/commit/154cc73ca4d359621202399cc0c3c91058e56e79.patch)
|
||||
sha512sums=('2ece7f678ad7c8968c0ad5cda9f987e4b318c6d9735169e1039beb0ff8dfca18815835875211acc6c7068913d9b0bdd4c9ded22962b0bb48f4a0ce0f7b78f31c'
|
||||
'31feea5ede2df7d09062435abbfa923be0bbe5b5e05a2a819ccd29cf00486d60b5e0775f29c933fea7df1df4412da8586fa12ce4bfa8a332bc6ac03b051bae23')
|
||||
|
||||
prepare() {
|
||||
cd oneTBB-$pkgver
|
||||
# FS#77894
|
||||
patch -p1 -i ../retry-pthread_create.patch
|
||||
patch -Np1 -i ../$pkgname-gcc13.patch
|
||||
}
|
||||
|
||||
build() {
|
||||
cd oneTBB-$pkgver
|
||||
cmake -G Ninja -D CMAKE_INSTALL_PREFIX=/usr -D TBB_STRICT=OFF -D TBB4PY_BUILD=ON .
|
||||
cmake . -GNinja \
|
||||
-DCMAKE_INSTALL_PREFIX=/usr \
|
||||
-DTBB_STRICT=OFF \
|
||||
-DTBB4PY_BUILD=ON \
|
||||
-DCMAKE_BUILD_TYPE=None
|
||||
ninja all python_build
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,36 @@
|
|||
From 154cc73ca4d359621202399cc0c3c91058e56e79 Mon Sep 17 00:00:00 2001
|
||||
From: Sam James <sam@cmpct.info>
|
||||
Date: Wed, 22 Feb 2023 14:16:46 +0000
|
||||
Subject: [PATCH] test: common: include <cstdlib> for abort() (fix build with
|
||||
GCC 13) (#1031)
|
||||
|
||||
GCC 13 (as usual for new compiler releases) shuffles around some
|
||||
internal includes and so <cstdint> etc is no longer transitively included.
|
||||
|
||||
See https://www.gnu.org/software/gcc/gcc-13/porting_to.html.
|
||||
|
||||
Signed-off-by: Sam James <sam@gentoo.org>
|
||||
---
|
||||
test/common/utils_assert.h | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/test/common/utils_assert.h b/test/common/utils_assert.h
|
||||
index 1df8ae72ac..0123ab881e 100644
|
||||
--- a/test/common/utils_assert.h
|
||||
+++ b/test/common/utils_assert.h
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
- Copyright (c) 2005-2022 Intel Corporation
|
||||
+ Copyright (c) 2005-2023 Intel Corporation
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
@@ -20,6 +20,8 @@
|
||||
#include "config.h"
|
||||
#include "utils_report.h"
|
||||
|
||||
+#include <cstdlib>
|
||||
+
|
||||
#define REPORT_FATAL_ERROR REPORT
|
||||
|
||||
namespace utils {
|
||||
|
|
@ -7,8 +7,8 @@
|
|||
|
||||
pkgbase=samba
|
||||
pkgname=('libwbclient' 'smbclient' 'samba')
|
||||
pkgver=4.18.3
|
||||
pkgrel=02
|
||||
pkgver=4.18.4
|
||||
pkgrel=01
|
||||
url="https://www.samba.org"
|
||||
makedepends=('python' 'python-markdown' 'python-dnspython' 'docbook-xsl' 'pkg-config' 'libbsd' 'popt' 'libcups'
|
||||
'readline' 'tevent' 'acl' 'libldap' 'libcap' 'ldb' 'krb5' 'pam'
|
||||
|
|
@ -212,13 +212,14 @@ license=('GPL3')
|
|||
|
||||
validpgpkeys=('81F5E2832BD2545A1897B713AA99442FB680B620') #Samba Distribution Verification Key <samba-bugs@samba.org>
|
||||
|
||||
sha256sums=(c67e1453165a3918ffffad600236ca3966b47bde4798e89ae600ae3903ccc32c # samba-4.18.3.tar.gz
|
||||
3980205420c6f3daf9ea052676ea49d55f4cc16648ac52cbc165e3f98423f973 # samba-4.18.3.tar.asc
|
||||
sha256sums=(6ba7b3503cc59c9ff4f6fcb1b510c2c855fff93e0b366ab891a32a4732e88e53 # samba-4.18.4.tar.gz
|
||||
0c454f3aeab1a22bf97c061226b0ae15fbd2b545f9b61f5bc6a0aff41c1598ac # samba-4.18.4.tar.asc
|
||||
0b570570ea49f82e6f9da47b1cce3b441859f52de105b54d4d79b873b924623f # samba.logrotate
|
||||
57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5 # samba.pam
|
||||
f2d11032015ef917f4af50f3933d432fa744b5f846ab4d980247e329e52d34bc # samba.sysconfig
|
||||
5398a42ccb36ac3b87cfa42c8050b535efc2ca38ab3b9354a52f4e0fe71b5800) # samba.tmpfiles
|
||||
|
||||
## a7d4277320e705e9e8c157d550ced0268fc6598c7d941374b1ea070dafd5fb35 libwbclient-4.18.3-02-x86_64.pkg.tar.lz
|
||||
## d760aba329c70e785eefcfb7805dc9263776fceb202b99aa313b673be2ce1761 samba-4.18.3-02-x86_64.pkg.tar.lz
|
||||
## 9864fbab698524e33daef425ee266837261e5af76df915019199c11613282c70 smbclient-4.18.3-02-x86_64.pkg.tar.lz
|
||||
## e2c7af92af53ab98fd9611ba54279ab3e0fc0ad97da1425f5da85a3101500c4f libwbclient-4.18.4-01-x86_64.pkg.tar.lz
|
||||
## 027b9933dde9c4ebbcc778615776c01f7011e9831899fd43bb354784f5b136f2 samba-4.18.4-01-x86_64.pkg.tar.lz
|
||||
## 7b56626836f154198ec4588475f02d35c4f770ac4750cbdb3516301209f7f75d smbclient-4.18.4-01-x86_64.pkg.tar.lz
|
||||
|
||||
|
|
|
|||
|
|
@ -9,8 +9,8 @@
|
|||
|
||||
pkgbase=samba
|
||||
pkgname=('libwbclient' 'smbclient' 'samba')
|
||||
pkgver=4.18.3
|
||||
pkgrel=2
|
||||
pkgver=4.18.4
|
||||
pkgrel=1
|
||||
arch=(x86_64)
|
||||
url="https://www.samba.org"
|
||||
license=('GPL3')
|
||||
|
|
@ -29,7 +29,7 @@ source=(https://us1.samba.org/samba/ftp/stable/${pkgbase}-${pkgver}.tar{.gz,.asc
|
|||
samba.pam
|
||||
samba.conf)
|
||||
validpgpkeys=('81F5E2832BD2545A1897B713AA99442FB680B620') #Samba Distribution Verification Key <samba-bugs@samba.org>
|
||||
sha512sums=('b0980291ca124641bd03ba51d4b4e2e492facb3939f8edf491133be83a82beed66f68f00442cb02c211a9e76eb6ba08387136e30eb7df756c3c90c76034689c4'
|
||||
sha512sums=('bc8d792b510061556c07b6844a825801a4271eed45e01133a4718c1839d123e2908fa0e31e67af43098500e98a9082eb104052e711a8a034fac23d86e15c29ee'
|
||||
'SKIP'
|
||||
'2ba0691ded467e4d6e40821f6de58c00f8962209efe2e60284c0c87756ab471c22c3d63b77d506e48c90ed0d852a2a24e41be1d499cf74a73cb99da0b503c858'
|
||||
'1e6183ab0eb812b3ef687ac2c26ce78f7cb30540f606d20023669ac00ba04075487fb72e4dc89cc05dab0269ff6aca98fc1167cc75669c225b88b592482fbf67'
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@
|
|||
#-----------------------------------------| DESCRIPTION |---------------------------------------
|
||||
|
||||
pkgname=syslog-ng
|
||||
pkgver=4.1.1
|
||||
pkgver=4.2.0
|
||||
pkgrel=01
|
||||
pkgdesc="Next-generation syslogd with advanced networking and filtering capabilities - w/o systemd and ipv6"
|
||||
url="https://www.syslog-ng.com/products/open-source-log-management/"
|
||||
depends=('awk' 'glib2' 'libnsl' 'json-c' 'curl' 'libnet' 'openssl' 'libcap')
|
||||
depends=('awk' 'glib2' 'libnsl' 'json-c' 'curl' 'libnet' 'openssl' 'pcre' 'libcap')
|
||||
makedepends=('libxslt' 'mongo-c-driver' 'librabbitmq-c' 'python' 'libesmtp' 'hiredis'
|
||||
'libdbi' 'libmaxminddb' 'net-snmp' 'librdkafka')
|
||||
checkdepends=('python-nose' 'python-ply')
|
||||
|
|
@ -38,6 +38,19 @@ prepare() {
|
|||
cd $pkgname-$pkgver
|
||||
# sed -i -e 's,/bin/,/usr/bin/,' -e 's,/sbin/,/bin/,' contrib/systemd/syslog-ng@.service
|
||||
# sed -i -e 's|/var/run|/run|g' contrib/systemd/syslog-ng@default
|
||||
|
||||
# _source_version=$(sed -rn 's#.*define VERSION_STR_CURRENT.* "(.*)"#\1#p' lib/versioning.h)
|
||||
# _config_version=$(head -1 "$srcdir/syslog-ng.conf" | cut -d\ -f2)
|
||||
#
|
||||
# if [[ "$_source_version" != "$_config_version" ]]; then
|
||||
# echo "Version in example config at '$srcdir/syslog-ng.conf' is: $_config_version"
|
||||
# echo "Expected version from code is: $_source_version"
|
||||
# echo "Check if config format has incompatible changes and adjust the"
|
||||
# echo "example config file and bump the version to continue the build."
|
||||
# echo "Usually simply bumping is fine since our config is simple enough"
|
||||
# return 1
|
||||
# fi
|
||||
|
||||
}
|
||||
|
||||
build() {
|
||||
|
|
@ -95,9 +108,10 @@ arch=(x86_64)
|
|||
|
||||
license=('GPL2' 'LGPL2.1')
|
||||
|
||||
sha256sums=(d7df3cfa32d1a750818d94b8ea582dea54c37226e7b55a88c3d2f3a543d8f20e # syslog-ng-4.1.1.tar.gz
|
||||
sha256sums=(092bd17fd47002c988aebdf81d0ed3f3cfd0e82b388d2453bcaa5e67934f4dda # syslog-ng-4.2.0.tar.gz
|
||||
d2e3328e2ac344ccddf1b38eab226f36c11ade1971c0c8c8ac8cd4d97c8b02e8 # syslog-ng.conf
|
||||
93c935eca56854011ea9e353b7a1da662ad40b2e8452954c5b4b5a1d5b2d5317) # syslog-ng.logrotate
|
||||
|
||||
## 95ba75fb7fda6e966ad32fda044b218e91493cb71a93e749938352580ca7a1b4 syslog-ng-4.1.1-01-x86_64.pkg.tar.lz
|
||||
## a76ca1278034f6b4761c29b3a9408c3a34313313ffd3144934b1c2e0b25798d1 syslog-ng-4.2.0-01-x86_64.pkg.tar.lz
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
# Contributor: Eric Bélanger <eric@archlinux.org>
|
||||
|
||||
pkgname=syslog-ng
|
||||
pkgver=4.1.1
|
||||
pkgver=4.2.0
|
||||
pkgrel=1
|
||||
pkgdesc="Next-generation syslogd with advanced networking and filtering capabilities"
|
||||
arch=('x86_64')
|
||||
|
|
@ -19,6 +19,7 @@ depends=(
|
|||
'libnet'
|
||||
'libnsl'
|
||||
'openssl'
|
||||
'pcre'
|
||||
'systemd-libs'
|
||||
)
|
||||
makedepends=('libxslt' 'mongo-c-driver' 'librabbitmq-c' 'python' 'libesmtp' 'hiredis'
|
||||
|
|
@ -43,8 +44,8 @@ backup=('etc/syslog-ng/scl.conf'
|
|||
'etc/default/syslog-ng@default')
|
||||
source=(https://github.com/balabit/syslog-ng/releases/download/syslog-ng-$pkgver/$pkgname-$pkgver.tar.gz
|
||||
syslog-ng.conf syslog-ng.logrotate)
|
||||
sha512sums=('89abb7a53570b6f7c0dc76905c97d207447117f1db1aa0c0da97c17366ea833b6404f9c7fc318436fd01be2bab032eccca9712063a7c683780026e7e52493dc8'
|
||||
'36629a566a8343574dc07430e744e20ce90574be0cc856bc43340f834cd6642a8f08889b9ba15996d088aeebeee4bc3ca64411265046c17c8e125fbed8948ded'
|
||||
sha512sums=('85442b57b7934e8afbb4e7d8285ed1fd16aaad2a8d853e3765db4f885d88bee4910a3b5d271f1cbd100c2d3a3f81f1a4fe845bc948fe68c22d32bc9b730af04b'
|
||||
'73239e783b6c4f8aabc30579153f531b022278aefecd84454935038274cc29f674a7093d68a3d797531e40c8f5d81e0b7e6b80d94e36fb11b60cfac6c2e93562'
|
||||
'cd39f545a6a855c866a466bf846e33940b2c2dd1fc2eaf50cce29c68e1a5753c7c4b56411e4f01c152f32e155104a98dd755a96319767f47c73a8853f720b2cc')
|
||||
|
||||
prepare() {
|
||||
|
|
@ -61,6 +62,18 @@ build() {
|
|||
export CXXFLAGS+=" -ffat-lto-objects"
|
||||
|
||||
|
||||
_source_version=$(sed -rn 's#.*define VERSION_STR_CURRENT.* "(.*)"#\1#p' lib/versioning.h)
|
||||
_config_version=$(head -1 "$srcdir/syslog-ng.conf" | cut -d\ -f2)
|
||||
|
||||
if [[ "$_source_version" != "$_config_version" ]]; then
|
||||
echo "Version in example config at '$srcdir/syslog-ng.conf' is: $_config_version"
|
||||
echo "Expected version from code is: $_source_version"
|
||||
echo "Check if config format has incompatible changes and adjust the"
|
||||
echo "example config file and bump the version to continue the build."
|
||||
echo "Usually simply bumping is fine since our config is simple enough"
|
||||
return 1
|
||||
fi
|
||||
|
||||
./autogen.sh
|
||||
./configure --prefix=/usr --sysconfdir=/etc/syslog-ng --libexecdir=/usr/lib \
|
||||
--sbindir=/usr/bin --localstatedir=/var/lib/syslog-ng --datadir=/usr/share \
|
||||
|
|
|
|||
|
|
@ -17,4 +17,3 @@ autoconf
|
|||
automake
|
||||
|
||||
|
||||
python-typing_extensions
|
||||
|
|
|
|||
|
|
@ -0,0 +1,2 @@
|
|||
/PKGBUILD
|
||||
/PKGBUILD-arch.new
|
||||
|
|
@ -0,0 +1,106 @@
|
|||
From b98fc07d3442a289c6bef82df50dd0a2d01de71a Mon Sep 17 00:00:00 2001
|
||||
From: Adam Jackson <ajax@redhat.com>
|
||||
Date: Thu, 2 Feb 2023 12:26:27 -0500
|
||||
Subject: [PATCH] present: Send a PresentConfigureNotify event for destroyed
|
||||
windows
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
This enables fixing a deadlock case on the client side, where the client
|
||||
ends up blocked waiting for a Present event that will never come because
|
||||
the window was destroyed. The new PresentWindowDestroyed flag allows the
|
||||
client to avoid blocking indefinitely.
|
||||
|
||||
Signed-off-by: Adam Jackson <ajax@redhat.com>
|
||||
See-also: https://gitlab.freedesktop.org/mesa/mesa/-/issues/116
|
||||
See-also: https://gitlab.freedesktop.org/mesa/mesa/-/issues/6685
|
||||
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
|
||||
(cherry picked from commit 462b06033e66a32308d940eb5fc47f5e4c914dc0)
|
||||
Signed-off-by: Laurent Carlier <lordheavym@gmail.com>
|
||||
---
|
||||
present/present_event.c | 5 +++--
|
||||
present/present_priv.h | 7 ++++++-
|
||||
present/present_screen.c | 11 ++++++++++-
|
||||
3 files changed, 19 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/present/present_event.c b/present/present_event.c
|
||||
index 435b26b70..849732dc8 100644
|
||||
--- a/present/present_event.c
|
||||
+++ b/present/present_event.c
|
||||
@@ -102,7 +102,8 @@ present_event_swap(xGenericEvent *from, xGenericEvent *to)
|
||||
}
|
||||
|
||||
void
|
||||
-present_send_config_notify(WindowPtr window, int x, int y, int w, int h, int bw, WindowPtr sibling)
|
||||
+present_send_config_notify(WindowPtr window, int x, int y, int w, int h,
|
||||
+ int bw, WindowPtr sibling, CARD32 flags)
|
||||
{
|
||||
present_window_priv_ptr window_priv = present_window_priv(window);
|
||||
|
||||
@@ -122,7 +123,7 @@ present_send_config_notify(WindowPtr window, int x, int y, int w, int h, int bw,
|
||||
.off_y = 0,
|
||||
.pixmap_width = w,
|
||||
.pixmap_height = h,
|
||||
- .pixmap_flags = 0
|
||||
+ .pixmap_flags = flags
|
||||
};
|
||||
present_event_ptr event;
|
||||
|
||||
diff --git a/present/present_priv.h b/present/present_priv.h
|
||||
index 6ebd009a2..4ad729864 100644
|
||||
--- a/present/present_priv.h
|
||||
+++ b/present/present_priv.h
|
||||
@@ -43,6 +43,11 @@
|
||||
#define DebugPresent(x)
|
||||
#endif
|
||||
|
||||
+/* XXX this belongs in presentproto */
|
||||
+#ifndef PresentWindowDestroyed
|
||||
+#define PresentWindowDestroyed (1 << 0)
|
||||
+#endif
|
||||
+
|
||||
extern int present_request;
|
||||
|
||||
extern DevPrivateKeyRec present_screen_private_key;
|
||||
@@ -307,7 +312,7 @@ void
|
||||
present_free_events(WindowPtr window);
|
||||
|
||||
void
|
||||
-present_send_config_notify(WindowPtr window, int x, int y, int w, int h, int bw, WindowPtr sibling);
|
||||
+present_send_config_notify(WindowPtr window, int x, int y, int w, int h, int bw, WindowPtr sibling, CARD32 flags);
|
||||
|
||||
void
|
||||
present_send_complete_notify(WindowPtr window, CARD8 kind, CARD8 mode, CARD32 serial, uint64_t ust, uint64_t msc);
|
||||
diff --git a/present/present_screen.c b/present/present_screen.c
|
||||
index 15684eda4..2c29aafd2 100644
|
||||
--- a/present/present_screen.c
|
||||
+++ b/present/present_screen.c
|
||||
@@ -93,6 +93,15 @@ present_destroy_window(WindowPtr window)
|
||||
present_screen_priv_ptr screen_priv = present_screen_priv(screen);
|
||||
present_window_priv_ptr window_priv = present_window_priv(window);
|
||||
|
||||
+ present_send_config_notify(window,
|
||||
+ window->drawable.x,
|
||||
+ window->drawable.y,
|
||||
+ window->drawable.width,
|
||||
+ window->drawable.height,
|
||||
+ window->borderWidth,
|
||||
+ window->nextSib,
|
||||
+ PresentWindowDestroyed);
|
||||
+
|
||||
if (window_priv) {
|
||||
present_clear_window_notifies(window);
|
||||
present_free_events(window);
|
||||
@@ -123,7 +132,7 @@ present_config_notify(WindowPtr window,
|
||||
ScreenPtr screen = window->drawable.pScreen;
|
||||
present_screen_priv_ptr screen_priv = present_screen_priv(screen);
|
||||
|
||||
- present_send_config_notify(window, x, y, w, h, bw, sibling);
|
||||
+ present_send_config_notify(window, x, y, w, h, bw, sibling, 0);
|
||||
|
||||
unwrap(screen_priv, screen, ConfigNotify);
|
||||
if (screen->ConfigNotify)
|
||||
--
|
||||
2.41.0
|
||||
|
||||
|
|
@ -9,7 +9,7 @@ pkgbase=xorg-server
|
|||
pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xvfb' 'xorg-server-xnest'
|
||||
'xorg-server-common' 'xorg-server-devel')
|
||||
pkgver=21.1.8
|
||||
pkgrel=01
|
||||
pkgrel=02
|
||||
groups=(xorg)
|
||||
url="https://xorg.freedesktop.org"
|
||||
# debug option now abandoned by Arch but the ability still is available
|
||||
|
|
@ -25,12 +25,16 @@ source=(https://xorg.freedesktop.org/releases/individual/xserver/${pkgbase}-${pk
|
|||
xvfb-run # with updates from FC master
|
||||
xvfb-run.1
|
||||
xorg-server.install
|
||||
0001-present-Send-a-PresentConfigureNotify-event-for-dest.patch
|
||||
0002-xephyr_Dont_check_for_SeatId_anymore.patch
|
||||
Xwrapper.config)
|
||||
|
||||
prepare() {
|
||||
cd ${pkgbase}-$pkgver
|
||||
|
||||
# upstream fix (merged)
|
||||
patch -Np1 -i ../0001-present-Send-a-PresentConfigureNotify-event-for-dest.patch
|
||||
|
||||
# FS#73274
|
||||
patch -Np1 -i ../0002-xephyr_Dont_check_for_SeatId_anymore.patch
|
||||
|
||||
|
|
@ -183,23 +187,26 @@ arch=(x86_64)
|
|||
|
||||
license=('custom')
|
||||
|
||||
#validpgpkeys=('FD0004A26EADFE43A4C3F249C6F7AE200374452D') # Povilas Kanapickas <povilas@radix.lt>
|
||||
#validpgpkeys=('3C2C43D9447D5938EF4551EBE23B7E70B467F0BF') # Peter Hutterer (Who-T) <office@who-t.net>
|
||||
validpgpkeys=(67DC86F2623FC5FD4BB5225D14706DBE1E4B4540) # Olivier Fourdan <fourdan@xfce.org>
|
||||
validpgpkeys=('3C2C43D9447D5938EF4551EBE23B7E70B467F0BF' # Peter Hutterer (Who-T) <office@who-t.net>
|
||||
'67DC86F2623FC5FD4BB5225D14706DBE1E4B4540' # Olivier Fourdan <fourdan@xfce.org>
|
||||
'FD0004A26EADFE43A4C3F249C6F7AE200374452D') # Povilas Kanapickas <povilas@radix.lt>
|
||||
|
||||
sha256sums=(38aadb735650c8024ee25211c190bf8aad844c5f59632761ab1ef4c4d5aeb152 # xorg-server-21.1.8.tar.xz
|
||||
544ce1c7e5ae33458ed91d86a8c74dca77892cf4bfff400039ba50bb39d83506 # xorg-server-21.1.8.tar.xz.sig
|
||||
a0a68505e3eb3ba6581388ae41b9dfd5208ec9b8983e78714778c20b71bc0ece # xvfb-run
|
||||
27ce50f4432e5549e662db857118761fa9cd74c6900aac52c4db768c956838db # xvfb-run
|
||||
2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776 # xvfb-run.1
|
||||
57316bf08e1934f983b03d085ca318dc27eaca9dc137c61ca62074ecfd5ede11 # xorg-server.install
|
||||
856e598e12d0391e957907259edd5ad5f6aabf590d8292693b8bd98536d255e4 # 0001-present-Send-a-PresentConfigureNotify-event-for-dest.patch
|
||||
057004ab36d4733e6c275f76bbc3851f6cdb9063305a3ae874f2fd83f14a6dc0 # 0002-xephyr_Dont_check_for_SeatId_anymore.patch
|
||||
1e02dbcce066746acb5de54c816add1d26349ff16b5f1833b6ab48f3b3a8e634) # Xwrapper.config
|
||||
|
||||
## 0cf966ff5e1c56effc05f806ba8a8301915ed256f19af773e8b9b5c9b4479c9c xorg-server-21.1.8-01-x86_64.pkg.tar.lz
|
||||
## 29fe31ba3a283272a3adc29f4c1200cfab4884270ce9be1c484e60713111b67b xorg-server-common-21.1.8-01-x86_64.pkg.tar.lz
|
||||
## 012bdc5b198f46d334b36f4261b1767564f737d18b61713982d2ee1f622abf62 xorg-server-devel-21.1.8-01-x86_64.pkg.tar.lz
|
||||
## 145baa35a6ea853a507a98799c7e7b2cb222e11502937afa0b95e56cb77229a4 xorg-server-xephyr-21.1.8-01-x86_64.pkg.tar.lz
|
||||
## e174dee8f76b33b5d3524d1fb8451145295648202b1eacde5afae43ee3fba37c xorg-server-xnest-21.1.8-01-x86_64.pkg.tar.lz
|
||||
## 3941b5a47ceedef1df19ce995a3659d4b0d4ee9432483733940aed1dcf45ba12 xorg-server-xvfb-21.1.8-01-x86_64.pkg.tar.lz
|
||||
|
||||
## 1d73fcf1aa7607d0abfe9ba9931a30424bcad8bacddc1195969e3e77f328e85f xorg-server-21.1.8-02-x86_64.pkg.tar.lz
|
||||
## 38aadb735650c8024ee25211c190bf8aad844c5f59632761ab1ef4c4d5aeb152 xorg-server-21.1.8.tar.xz
|
||||
## 544ce1c7e5ae33458ed91d86a8c74dca77892cf4bfff400039ba50bb39d83506 xorg-server-21.1.8.tar.xz.sig
|
||||
## 61b3b460a56b66dc8fbad30f42ccb3ad153528d47c655b4fb21b601c4bd1de55 xorg-server-common-21.1.8-02-x86_64.pkg.tar.lz
|
||||
## 502fa5bcfde53acaf0482effe2143e37e3c41549fa155ebb5eec7b6fc7b7d586 xorg-server-devel-21.1.8-02-x86_64.pkg.tar.lz
|
||||
## 9b58ea102bc30b30307b1c49c27c61b349de55358715bcb6c3511237d1477a76 xorg-server-xephyr-21.1.8-02-x86_64.pkg.tar.lz
|
||||
## 64c600b05f2d682870c601844657e9e768ac653e3d4d909316501df048fa593d xorg-server-xnest-21.1.8-02-x86_64.pkg.tar.lz
|
||||
## d91897915c0e7ba9bf37cbee6776d38933003dd9e3bca566f5e0669d136728ff xorg-server-xvfb-21.1.8-02-x86_64.pkg.tar.lz
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ pkgbase=xorg-server
|
|||
pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xvfb' 'xorg-server-xnest'
|
||||
'xorg-server-common' 'xorg-server-devel')
|
||||
pkgver=21.1.8
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
arch=('x86_64')
|
||||
license=('custom')
|
||||
groups=('xorg')
|
||||
|
|
@ -20,22 +20,26 @@ makedepends=('xorgproto' 'pixman' 'libx11' 'mesa' 'mesa-libgl' 'xtrans'
|
|||
source=(https://xorg.freedesktop.org/releases/individual/xserver/${pkgbase}-${pkgver}.tar.xz{,.sig}
|
||||
xvfb-run # with updates from FC master
|
||||
xvfb-run.1
|
||||
0002-xephyr_Dont_check_for_SeatId_anymore.patch
|
||||
xephyr_Dont_check_for_SeatId_anymore.patch
|
||||
0001-present-Send-a-PresentConfigureNotify-event-for-dest.patch
|
||||
)
|
||||
validpgpkeys=('3C2C43D9447D5938EF4551EBE23B7E70B467F0BF' # Peter Hutterer (Who-T) <office@who-t.net>
|
||||
'67DC86F2623FC5FD4BB5225D14706DBE1E4B4540' # Olivier Fourdan <fourdan@xfce.org>
|
||||
'FD0004A26EADFE43A4C3F249C6F7AE200374452D') # Povilas Kanapickas <povilas@radix.lt>
|
||||
sha512sums=('6104b3620ed2e1e27d9a8e963388bbe8785a764585b1bc03dbf5d719a92894773dda580d377ca18ceeab353e65a5d23cc947bab84a4012f9dd1eca31cac36937'
|
||||
'SKIP'
|
||||
'87c79b4a928e74463f96f58d277558783eac9b8ea6ba00d6bbbb67ad84c4d65b3792d960ea2a70089ae18162e82ae572a49ad36df169c974cc99dbaa51f63eb2'
|
||||
'672375cb5028ba9cda286e317d17bd8c9a9039483e7f79c21f223fd08ba07655729e9f59a082f4b8f5d8de45a77a9e9affce1002fb8c6657e26ef1a490654e49'
|
||||
'de5e2cb3c6825e6cf1f07ca0d52423e17f34d70ec7935e9dd24be5fb9883bf1e03b50ff584931bd3b41095c510ab2aa44d2573fd5feaebdcb59363b65607ff22'
|
||||
'34de52147054535256f35143d321e4d5e189baae502afca2bd3291094946dbead0829b1f196ae2a4d23bd6d0e1e04b65a387dee43f12dee55d247e37aec419d7')
|
||||
'34de52147054535256f35143d321e4d5e189baae502afca2bd3291094946dbead0829b1f196ae2a4d23bd6d0e1e04b65a387dee43f12dee55d247e37aec419d7'
|
||||
'bc7d054bef2b4550d067b3abb14eb7c534e5022ba0b0e59e14687886fe204914757b014c31150bce705baed5d8cb1be87e8624da43cb1fe874b138ced00ee18b')
|
||||
|
||||
prepare() {
|
||||
cd ${pkgbase}-$pkgver
|
||||
|
||||
# FS#73274
|
||||
patch -Np1 -i ../0002-xephyr_Dont_check_for_SeatId_anymore.patch
|
||||
patch -Np1 -i ../xephyr_Dont_check_for_SeatId_anymore.patch
|
||||
# upstream fix (merged)
|
||||
patch -Np1 -i ../0001-present-Send-a-PresentConfigureNotify-event-for-dest.patch
|
||||
}
|
||||
|
||||
build() {
|
||||
|
|
|
|||
|
|
@ -14,7 +14,6 @@
|
|||
# GNU General Public License can be found in the file COPYING.
|
||||
# --- T2-COPYRIGHT-NOTE-END ---
|
||||
|
||||
# $Id$
|
||||
# from: http://necrotic.deadbeast.net/xsf/XFree86/trunk/debian/local/xvfb-run
|
||||
|
||||
# This script starts an instance of Xvfb, the "fake" X server, runs a command
|
||||
|
|
|
|||
Loading…
Reference in New Issue