upg at bind libqalculate libxml2 mesa postfix qt5-base qt6-base rsync samba vte3

This commit is contained in:
joborun linux 2022-10-23 01:34:37 +03:00
parent f75e6aee10
commit 67ec5cd12f
32 changed files with 357 additions and 109 deletions

View File

@ -7,7 +7,7 @@
pkgname=at
pkgver=3.2.5
pkgrel=01
pkgrel=02
pkgdesc='AT and batch delayed command scheduling utility and daemon w/o systemd'
arch=('x86_64')
url='https://salsa.debian.org/debian/at'
@ -50,4 +50,6 @@ validpgpkeys=('464BC7CD439FEE5E8B4098A0348A778D6885EF8F') # Jose M Calhariz (Té
sha256sums=(bb066b389d7c9bb9d84a35738032b85c30cba7d949f758192adc72c9477fd3b8 # at_3.2.5.orig.tar.gz
e3096c67a4c844c67f63802369dbb316aa5288d8eb5d9cdcbc5ad4e0c868e049 # at_3.2.5.orig.tar.gz.sig
# a7048d6dbd8aa4d881979716829d16053b5007c2d83eb2167edd5221f9e48a33 80-atd.hook
e51630c26765e88bc9c3046c62bf12c56d9863f22bcf04eb00ccd5eb421c7e18) # pam.conf
663cd2f7c5abf56d1ea3f38dfac8d3e64896f1384ca5e97b7ec6d26fd6afafef) # pam.conf

View File

@ -5,7 +5,7 @@
pkgname=at
pkgver=3.2.5
pkgrel=1
pkgrel=2
pkgdesc='AT and batch delayed command scheduling utility and daemon'
arch=('x86_64')
url='https://salsa.debian.org/debian/at'
@ -23,7 +23,7 @@ source=("http://software.calhariz.com/$pkgname/${pkgname}_${pkgver}.orig.tar.gz"
sha256sums=('bb066b389d7c9bb9d84a35738032b85c30cba7d949f758192adc72c9477fd3b8'
'SKIP'
'a7048d6dbd8aa4d881979716829d16053b5007c2d83eb2167edd5221f9e48a33'
'e51630c26765e88bc9c3046c62bf12c56d9863f22bcf04eb00ccd5eb421c7e18')
'663cd2f7c5abf56d1ea3f38dfac8d3e64896f1384ca5e97b7ec6d26fd6afafef')
build() {
cd "$pkgname-$pkgver"

View File

@ -1,3 +1,6 @@
git
msmtp-mta
bison

View File

@ -1,7 +1,7 @@
#%PAM-1.0
auth required pam_unix.so
auth required pam_env.so user_readenv=1
auth required pam_env.so
account required pam_access.so
account required pam_unix.so

View File

@ -8,7 +8,7 @@
_pkgver=9.18.7
pkgname=bind
pkgver=${_pkgver//-/.}
pkgrel=01
pkgrel=02
pkgdesc='A complete, highly portable implementation of the DNS protocol w/o systemd geoip'
url='https://www.isc.org/software/bind/'
arch=('x86_64')
@ -112,4 +112,3 @@ sha256sums=(9e2acf1698f49d70ad12ffbad39ec6716a7da524e9ebd98429c7c70ba1262981 # b
# c06fc270e32a843c8b6d86335a2ec607d405dfba6875de8d8a9abde39a9e2c17 # localhost.ip6.zone
b88fd2b99e7d42d414b329b814b9ff3304fa0ef9c67df81bde235bbfa0f3a3b8) # 127.0.0.zone

View File

@ -7,7 +7,7 @@
pkgname=libqalculate
pkgver=4.4.0
pkgrel=01
pkgrel=02
pkgdesc='Multi-purpose desktop calculator'
arch=(x86_64)
url='https://qalculate.github.io/'
@ -35,4 +35,3 @@ license=(GPL)
sha256sums=(79cfdc4d4af9dfcd6902c2ec680ed1f3d5845d07b5ee1c76255fdca731a8b758) # libqalculate-4.4.0.tar.gz

View File

@ -3,7 +3,7 @@
pkgname=libqalculate
pkgver=4.4.0
pkgrel=1
pkgrel=2
pkgdesc='Multi-purpose desktop calculator'
arch=(x86_64)
url='https://qalculate.github.io/'

View File

@ -8,7 +8,7 @@
#pkgbase=libxml2
#pkgname=(libxml2 libxml2-docs)
pkgname=libxml2
pkgver=2.10.2
pkgver=2.10.3
pkgrel=02
pkgdesc="XML C parser and toolkit"
url="https://gitlab.gnome.org/GNOME/libxml2/-/wikis/home"
@ -18,7 +18,7 @@ makedepends=(python git)
optdepends=('python: Python bindings')
provides=(libxml2.so)
#options=(debug) ## uncomment this to have the debug pkg produced
_commit=21b24b51608d471bb9f7c4225e23d0db2acecc52 # tags/v2.10.2^0
_commit=f507d167f1755b7eaea09fb1a44d29aab828b6d1 # tags/v2.10.3^0
source=("git+https://gitlab.gnome.org/GNOME/libxml2.git#commit=$_commit"
libxml2-2.9.8-python3-unicode-errors.patch
no-fuzz.diff
@ -96,3 +96,4 @@ sha256sums=(SKIP
9b61db9f5dbffa545f4b8d78422167083a8568c59bd1129f94138f936cf6fc1f) # xmlts20130923.tar.gz

View File

@ -6,7 +6,7 @@
pkgbase=libxml2
pkgname=(libxml2 libxml2-docs)
pkgver=2.10.2
pkgver=2.10.3
pkgrel=2
pkgdesc="XML C parser and toolkit"
url="https://gitlab.gnome.org/GNOME/libxml2/-/wikis/home"
@ -24,7 +24,7 @@ makedepends=(
python
)
options=(debug)
_commit=21b24b51608d471bb9f7c4225e23d0db2acecc52 # tags/v2.10.2^0
_commit=f507d167f1755b7eaea09fb1a44d29aab828b6d1 # tags/v2.10.3^0
source=("git+https://gitlab.gnome.org/GNOME/libxml2.git#commit=$_commit"
libxml2-2.9.8-python3-unicode-errors.patch
no-fuzz.diff

View File

@ -0,0 +1,40 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Date: Sun, 12 Jun 2022 23:59:05 +0300
Subject: [PATCH] anv: force MEDIA_INTERFACE_DESCRIPTOR_LOAD reemit after
3D->GPGPU switch
Seems to fix a hang in Age of Empire 4 where the HW is hung on a
PIPE_CONTROL after a GPGPU_WALKER but no
MEDIA_INTERFACE_DESCRIPTOR_LOAD was emitted since the switch from 3D
to GPGPU.
This would happen in the following case :
vkCmdBindPipeline(COMPUTE, cs_pipeline);
vkCmdDispatch(...);
vkCmdBindPipeline(GRAPHICS, gfx_pipeline);
vkCmdDraw(...);
vkCmdDispatch(...);
Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
---
src/intel/vulkan/genX_cmd_buffer.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/src/intel/vulkan/genX_cmd_buffer.c b/src/intel/vulkan/genX_cmd_buffer.c
index 240630d84124..77822ec89404 100644
--- a/src/intel/vulkan/genX_cmd_buffer.c
+++ b/src/intel/vulkan/genX_cmd_buffer.c
@@ -5917,6 +5917,11 @@ genX(flush_pipeline_select)(struct anv_cmd_buffer *cmd_buffer,
}
#endif
+#if GFX_VERx10 == 120
+ if (pipeline == _3D)
+ cmd_buffer->state.compute.pipeline_dirty = true;
+#endif
+
/* From "BXML » GT » MI » vol1a GPU Overview » [Instruction]
* PIPELINE_SELECT [DevBWR+]":
*

View File

@ -0,0 +1,83 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Date: Sat, 25 Jun 2022 23:38:45 +0300
Subject: [PATCH] intel/fs: always mask the bottom bits of the sampler extended
descriptor
Fixes a hang in Age Of Empire 4. The HW is hang with the sampler input
unit busy. Replaying on simulation showed the extended message length
in the extended descriptor is invalid. Since the Anv ensures the input
is correct in anv_surface_state_to_handle(), the likely reason for
this issue is the use of VK_VALVE_mutable_descriptor_type and the
application leaving a previous value for a different descriptor type.
Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
---
src/intel/compiler/brw_fs.cpp | 2 +-
.../compiler/brw_lower_logical_sends.cpp | 20 +++++++++++++++----
2 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/src/intel/compiler/brw_fs.cpp b/src/intel/compiler/brw_fs.cpp
index 0f282dcd345f..165d8b33b677 100644
--- a/src/intel/compiler/brw_fs.cpp
+++ b/src/intel/compiler/brw_fs.cpp
@@ -4421,7 +4421,7 @@ brw_fb_write_msg_control(const fs_inst *inst,
return mctl;
}
- /**
+/**
* Predicate the specified instruction on the sample mask.
*/
void
diff --git a/src/intel/compiler/brw_lower_logical_sends.cpp b/src/intel/compiler/brw_lower_logical_sends.cpp
index 255ce7594811..e99c7b8ab844 100644
--- a/src/intel/compiler/brw_lower_logical_sends.cpp
+++ b/src/intel/compiler/brw_lower_logical_sends.cpp
@@ -1112,30 +1112,42 @@ lower_sampler_logical_send_gfx7(const fs_builder &bld, fs_inst *inst, opcode op,
inst->src[1] = brw_imm_ud(0);
} else if (surface_handle.file != BAD_FILE) {
/* Bindless surface */
+ const fs_builder ubld = bld.group(1, 0).exec_all();
assert(devinfo->ver >= 9);
inst->desc = brw_sampler_desc(devinfo,
GFX9_BTI_BINDLESS,
sampler.file == IMM ? sampler.ud % 16 : 0,
msg_type,
simd_mode,
0 /* return_format unused on gfx7+ */);
/* For bindless samplers, the entire address is included in the message
* header so we can leave the portion in the message descriptor 0.
*/
if (sampler_handle.file != BAD_FILE || sampler.file == IMM) {
inst->src[0] = brw_imm_ud(0);
} else {
- const fs_builder ubld = bld.group(1, 0).exec_all();
fs_reg desc = ubld.vgrf(BRW_REGISTER_TYPE_UD);
ubld.SHL(desc, sampler, brw_imm_ud(8));
inst->src[0] = desc;
}
- /* We assume that the driver provided the handle in the top 20 bits so
- * we can use the surface handle directly as the extended descriptor.
+ /* We previously assumed that the driver provided the handle in the top
+ * 20 bits (leaving the bottom 12 bits at 0). But with extensions like
+ * VK_VALVE_mutable_descriptor_type, the application is more in control
+ * of the content of VkDescriptors which is where we store
+ * surface/sampler offsets. We experience GPU hangs because the
+ * application left an invalid value in the descriptor (probably used
+ * for another descriptor type than sampler) and the lower 12bits of the
+ * surface handle overlapping with the extended descriptor length make
+ * the HW hang. The following AND() clears those bits and fixes a hang
+ * in Age Of Empire 4.
*/
- inst->src[1] = retype(surface_handle, BRW_REGISTER_TYPE_UD);
+ fs_reg ex_desc = ubld.vgrf(BRW_REGISTER_TYPE_UD);
+ ubld.AND(ex_desc,
+ retype(surface_handle, BRW_REGISTER_TYPE_UD),
+ brw_imm_ud(INTEL_MASK(31, 12)));
+ inst->src[1] = component(ex_desc, 0);
} else {
/* Immediate portion of the descriptor */
inst->desc = brw_sampler_desc(devinfo,

View File

@ -8,7 +8,7 @@
pkgbase=mesa
pkgname=('vulkan-mesa-layers' 'opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 'vulkan-swrast' 'libva-mesa-driver' 'mesa-vdpau' 'mesa')
pkgdesc="An open-source implementation of the OpenGL specification w/o zstd"
pkgver=22.2.1
pkgver=22.2.2
pkgrel=01
arch=('x86_64')
#options=('debug' '!lto') # uncomment this if you want the debug package built
@ -234,14 +234,10 @@ validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D' # Emil Velikov <emil.l
'71C4B75620BC75708B4BDB254C95FAAB3EB073EC' # Dylan Baker <dylan@pnwbakers.com>
'57551DE15B968F6341C248F68D8E31AFC32428A6') # Eric Engestrom <eric@engestrom.ch>
sha256sums=(0079beac0a33f45e7e0aec59e6913eafbc4268a3f1e2e330017440494f91b13c # mesa-22.2.1.tar.xz
966198babaaa292d0b79586b6bd88ddcabe5f04c00120e83a016dbd94bbd4bed # mesa-22.2.1.tar.xz.sig
sha256sums=(2de11fb74fc5cc671b818e49fe203cea0cd1d8b69756e97cdb06a2f4e78948f9 # mesa-22.2.2.tar.xz
cf236663cd70fac3c8d892c23aea254551c75eed61c344a9e1d5e286e7603ffa # mesa-22.2.2.tar.xz.sig
3563afc26125e79cc1943c518b47d4f534861171808fc1fd5a1564fced36ec2c # 0001-anv-force-MEDIA_INTERFACE_DESCRIPTOR_LOAD-reemit-aft.patch
d0c6401daff346054f1b4dd6d88e82b83a236fa235983ca54085c90948f0c1be # 0002-intel-fs-always-mask-the-bottom-bits-of-the-sampler-.patch
7052ba73bb07ea78873a2431ee4e828f4e72bda7d176d07f770fa48373dec537) # LICENSE
sha512sums=('cb69c808453474f77aad68afae7cdb427e6720e1d2259f7b911a5476a03144bbe8adfbe040f9bed3954d92805eea302757b76fd29f03f692f725c0fd2295df7e'
'SKIP'
'9bf47019a7c1da6724393cf571c6e1ce6b56ca24fe32045bc056d2e1bb2584f6a81e886dd8b2f1b1aabb953367dd068f9833f520fa41a9b2bbce20fdc15d07b4'
'3df104f4abbecb12fcf9631cabdc7fe883b6c529abebaf36a0d47933ebd0c57235f11767060604dec71acefdf55f2f025eb997b1dd1cf0b92c02af0a604cae98'
'f9f0d0ccf166fe6cb684478b6f1e1ab1f2850431c06aa041738563eb1808a004e52cdec823c103c9e180f03ffc083e95974d291353f0220fe52ae6d4897fecc7')

View File

@ -6,7 +6,7 @@
pkgbase=mesa
pkgname=('vulkan-mesa-layers' 'opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 'vulkan-swrast' 'libva-mesa-driver' 'mesa-vdpau' 'mesa')
pkgdesc="An open-source implementation of the OpenGL specification"
pkgver=22.2.1
pkgver=22.2.2
pkgrel=1
arch=('x86_64')
makedepends=('python-mako' 'libxml2' 'libx11' 'xorgproto' 'libdrm' 'libxshmfence' 'libxxf86vm'
@ -20,7 +20,7 @@ source=(https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig}
0001-anv-force-MEDIA_INTERFACE_DESCRIPTOR_LOAD-reemit-aft.patch
0002-intel-fs-always-mask-the-bottom-bits-of-the-sampler-.patch
LICENSE)
sha512sums=('cb69c808453474f77aad68afae7cdb427e6720e1d2259f7b911a5476a03144bbe8adfbe040f9bed3954d92805eea302757b76fd29f03f692f725c0fd2295df7e'
sha512sums=('a1eb67e1ae4880c79b1fdc570f4389baba0b8ba796da7e695c9af19a7d92b6c06b95570e6c796548b61355989025fb7efbf9acac74cbd695f7e297dc913b933c'
'SKIP'
'9bf47019a7c1da6724393cf571c6e1ce6b56ca24fe32045bc056d2e1bb2584f6a81e886dd8b2f1b1aabb953367dd068f9833f520fa41a9b2bbce20fdc15d07b4'
'3df104f4abbecb12fcf9631cabdc7fe883b6c529abebaf36a0d47933ebd0c57235f11767060604dec71acefdf55f2f025eb997b1dd1cf0b92c02af0a604cae98'

View File

@ -28,3 +28,9 @@ real 15m2.686s
user 53m29.028s
sys 2m19.544s
mesa 22.2.2-01
real 14m9.349s
user 50m19.615s
sys 2m30.148s

View File

@ -9,7 +9,7 @@ pkgbase=postfix
pkgname=(postfix postfix-cdb postfix-ldap postfix-lmdb postfix-mysql
postfix-pcre postfix-pgsql postfix-sqlite)
pkgver=3.7.3
pkgrel=01
pkgrel=02
pkgdesc="Fast, easy to administer, secure mail server w/o systemd"
arch=(x86_64)
url="http://www.postfix.org/"
@ -234,5 +234,6 @@ sha256sums=(d22f3d37ef75613d5d573b56fc51ef097f2c0d0b0e407923711f71c1fb72911b # p
fec58a3edb242daa9e45d1dd58cf19193fcadb44bc8ad8dc4e6f92f04b7257e5 # postfix.install
63f39147887336bdd173fb9425998f0a0c6f00a31241f922a255c157bfd8d02e # postfix.sysusers
825106bc3a6db8872160c5d65be04ad92828a043b8c8decc531341f0fe4a5742) # postfix.tmpfiles

View File

@ -7,7 +7,7 @@ pkgbase=postfix
pkgname=(postfix postfix-cdb postfix-ldap postfix-lmdb postfix-mysql
postfix-pcre postfix-pgsql postfix-sqlite)
pkgver=3.7.3
pkgrel=1
pkgrel=2
pkgdesc="Fast, easy to administer, secure mail server"
arch=(x86_64)
url="http://www.postfix.org/"

View File

@ -1,5 +1,6 @@
real 0m53.516s
user 1m50.547s
sys 0m11.206s
real 1m18.980s
user 1m12.694s
sys 0m8.449s

View File

@ -10,7 +10,7 @@ pkgname=(qt5-base qt5-xcb-private-headers)
_basever=5.15.6
pkgver=5.15.6+kde+r180
_commit=23996edc504e9e5b5b0ec907380598bbe4bf591c
pkgrel=01
pkgrel=02
arch=('x86_64')
url='https://www.qt.io'
pkgdesc='A cross-platform application and UI framework'
@ -125,3 +125,5 @@ sha256sums=(SKIP
4abc22150fa3e06b2fdcec32146abc9be4e316692aa4d5bd5aa53b4b726783fa) # qmake-config.patch

View File

@ -5,7 +5,7 @@ pkgbase=qt5-base
pkgname=(qt5-base qt5-xcb-private-headers)
_basever=5.15.6
pkgver=5.15.6+kde+r180
pkgrel=1
pkgrel=2
_commit=23996edc504e9e5b5b0ec907380598bbe4bf591c
arch=('x86_64')
url='https://www.qt.io'

View File

@ -1,3 +1,4 @@
at-spi2-core
libjpeg-turbo
xcb-util-keysyms
xcb-util-renderutil

View File

@ -8,7 +8,7 @@
pkgname=qt6-base
_qtver=6.4.0
pkgver=${_qtver/-/}
pkgrel=01
pkgrel=02
arch=(x86_64)
url='https://www.qt.io'
pkgdesc='A cross-platform application and UI framework'
@ -84,4 +84,6 @@ license=(GPL3 LGPL3 FDL custom)
sha256sums=(cb6475a0bd8567c49f7ffbb072a05516ee6671171bed55db75b22b94ead9b37d # qtbase-everywhere-src-6.4.0.tar.xz
5411edbe215c24b30448fac69bd0ba7c882f545e8cf05027b2b6e2227abc5e78 # qt6-base-cflags.patch
4b93f6a79039e676a56f9d6990a324a64a36f143916065973ded89adc621e094) # qt6-base-nostrip.patch

View File

@ -5,7 +5,7 @@
pkgname=qt6-base
_qtver=6.4.0
pkgver=${_qtver/-/}
pkgrel=1
pkgrel=2
arch=(x86_64)
url='https://www.qt.io'
license=(GPL3 LGPL3 FDL custom)

View File

@ -34,3 +34,5 @@ xmlstarlet
cmake
jsoncpp
at-spi2-core

View File

@ -6,9 +6,9 @@
#-----------------------------------------| DESCRIPTION |---------------------------------------
pkgname=rsync
_tag='40695f1e31d29e5d715d986a53cdad1fe0ce0210' # git rev-parse v${pkgver}
pkgver=3.2.6
pkgrel=02
_tag='b13e7a8ef4fa430223f66403506fb821caae5cfd' # git rev-parse v${pkgver}
pkgver=3.2.7
pkgrel=01
pkgdesc='A fast and versatile file copying tool for remote and local files w/o systemd zstd ipv6'
arch=('x86_64')
url='https://rsync.samba.org/'
@ -21,13 +21,13 @@ backup=('etc/rsyncd.conf'
source=("git+https://github.com/WayneD/rsync#tag=${_tag}?signed"
'rsyncd.conf')
_backports=(
# Fix really silly bug with --relative rules.
'464555ea923b32f3504678d05bc7de9205e5c8da'
# Fix bug with validing remote filter rules.
'950730313de994d191ba2d5be575e97690b355e8'
)
#_backports=(
# # Fix really silly bug with --relative rules.
# '464555ea923b32f3504678d05bc7de9205e5c8da'
#
# # Fix bug with validing remote filter rules.
# '950730313de994d191ba2d5be575e97690b355e8'
#)
_reverts=(
)
@ -89,4 +89,3 @@ sha256sums=(SKIP
733ccb571721433c3a6262c58b658253ca6553bec79c2bdd0011810bb4f2156b) # rsyncd.conf

View File

@ -1,9 +1,9 @@
# Maintainer: Christian Hesse <mail@eworm.de>
pkgname=rsync
_tag='40695f1e31d29e5d715d986a53cdad1fe0ce0210' # git rev-parse v${pkgver}
pkgver=3.2.6
pkgrel=2
_tag='b13e7a8ef4fa430223f66403506fb821caae5cfd' # git rev-parse v${pkgver}
pkgver=3.2.7
pkgrel=1
pkgdesc='A fast and versatile file copying tool for remote and local files'
arch=('x86_64')
url='https://rsync.samba.org/'
@ -21,11 +21,6 @@ sha256sums=('SKIP'
'733ccb571721433c3a6262c58b658253ca6553bec79c2bdd0011810bb4f2156b')
_backports=(
# Fix really silly bug with --relative rules.
'464555ea923b32f3504678d05bc7de9205e5c8da'
# Fix bug with validing remote filter rules.
'950730313de994d191ba2d5be575e97690b355e8'
)
_reverts=(

View File

@ -1,4 +1,6 @@
real 1m35.339s
user 0m39.030s
sys 0m5.136s
real 1m54.520s
user 0m37.353s
sys 0m4.809s

View File

@ -8,7 +8,7 @@
pkgbase=samba
pkgname=('smbclient' 'samba')
pkgver=4.17.1
pkgrel=01
pkgrel=02
arch=(x86_64)
url="https://www.samba.org"
makedepends=('python' 'python-markdown' 'python-dnspython' 'docbook-xsl' 'pkg-config' 'libbsd' 'db' 'popt' 'libcups'

View File

@ -11,7 +11,7 @@
pkgbase=samba
pkgname=('smbclient' 'samba')
pkgver=4.17.1
pkgrel=1
pkgrel=2
arch=(x86_64)
url="https://www.samba.org"
license=('GPL3')

View File

@ -5,16 +5,19 @@
#-----------------------------------------| DESCRIPTION |---------------------------------------
pkgbase=vte3
pkgname=(vte3 vte-common)
pkgver=0.68.0
pkgrel=02
pkgdesc="Virtual Terminal Emulator widget"
pkgname=(vte-common vte3 vte4)
pkgver=0.70.1
pkgrel=01
pkgdesc="Virtual Terminal Emulator widget w/o systemd"
url="https://wiki.gnome.org/Apps/Terminal/VTE"
arch=(x86_64)
depends=(gtk3 pcre2 gnutls fribidi)
makedepends=(gobject-introspection vala git gtk-doc gperf meson)
# _commit=6a0a9fed4d54122df31c13d601b1509597a36f2b # tags/0.66.2^0 # fallback commit
_commit=0f438924f9f8a858b1b82434c876e31c2de180d4 # tags/0.68.0^0
# # makedepends=(gobject-introspection vala git gtk-doc gperf meson) ## previous dependencies
makedepends=(fribidi gi-docgen git gnutls gobject-introspection gperf
gtk3 gtk4 meson pcre2 vala)
## options=(debug !lto) ## uncomment this to have the debug pkg produced
options=(!lto)
_commit=5bf476f1d7283bc805ac8ae6abe94f81ffd7be05 # tags/0.70.1^0
source=("git+https://gitlab.gnome.org/GNOME/vte.git#commit=$_commit")
pkgver() {
@ -27,10 +30,14 @@ prepare() {
}
build() {
arch-meson vte build \
-D b_lto=false \
-D docs=true \
local meson_options=(
-D b_lto=false
-D docs=false
-D_systemd=false
-D gtk4=true
)
arch-meson vte build "${meson_options[@]}"
meson compile -C build
}
@ -48,20 +55,59 @@ _pick() {
done
}
package_vte3() {
depends+=(vte-common)
provides+=(libvte-2.91.so)
meson install -C build --destdir "$pkgdir"
_pick vte-common "$pkgdir"/etc/profile.d
_pick vte-common "$pkgdir"/usr/lib/vte-urlencode-cwd
}
package_vte-common() {
pkgdesc="Files shared by VTE libraries"
depends=(sh)
mv vte-common/* "$pkgdir"
meson install -C build --destdir "$pkgdir"
cd "$pkgdir"
_pick gtk3 usr/bin/vte-2.91
_pick gtk3 usr/include/vte-2.91
_pick gtk3 usr/lib/libvte-2.91.so*
_pick gtk3 usr/lib/pkgconfig/vte-2.91.pc
_pick gtk3 usr/lib/girepository-1.0/Vte-2.91.typelib
_pick gtk3 usr/share/gir-1.0/Vte-2.91.gir
_pick gtk3 usr/share/glade
_pick gtk3 usr/share/vala/vapi/vte-2.91.{deps,vapi}
_pick gtk4 usr/bin/vte-2.91-gtk4
_pick gtk4 usr/include/vte-2.91-gtk4
_pick gtk4 usr/lib/libvte-2.91-gtk4.so*
_pick gtk4 usr/lib/pkgconfig/vte-2.91-gtk4.pc
_pick gtk4 usr/lib/girepository-1.0/Vte-3.91.typelib
_pick gtk4 usr/share/gir-1.0/Vte-3.91.gir
_pick gtk4 usr/share/vala/vapi/vte-2.91-gtk4.{deps,vapi}
}
package_vte3() {
pkgdesc+=" (GTK3)"
depends=(
fribidi
gnutls
gtk3
pcre2
vte-common
)
provides+=(libvte-2.91.so)
mv gtk3/* "$pkgdir"
}
package_vte4() {
pkgdesc+=" (GTK4)"
depends=(
fribidi
gnutls
gtk4
pcre2
vte-common
)
provides+=(libvte-2.91-gtk4.so)
mv gtk4/* "$pkgdir"
}
#---- license gpg-key sha256sums ----
@ -69,3 +115,4 @@ package_vte-common() {
license=(LGPL)
sha256sums=(SKIP)

View File

@ -2,17 +2,29 @@
# Contributor: Ionut Biru <ibiru@archlinux.org>
pkgbase=vte3
pkgname=(vte3 vte-common)
pkgver=0.68.0
pkgrel=2
pkgname=(vte-common vte3 vte4 vte-docs)
pkgver=0.70.1
pkgrel=1
pkgdesc="Virtual Terminal Emulator widget"
url="https://wiki.gnome.org/Apps/Terminal/VTE"
arch=(x86_64)
license=(LGPL)
depends=(gtk3 pcre2 gnutls fribidi systemd)
makedepends=(gobject-introspection vala git gtk-doc gperf meson)
options=(debug)
_commit=0f438924f9f8a858b1b82434c876e31c2de180d4 # tags/0.68.0^0
makedepends=(
fribidi
gi-docgen
git
gnutls
gobject-introspection
gperf
gtk3
gtk4
meson
pcre2
systemd
vala
)
options=(debug !lto)
_commit=5bf476f1d7283bc805ac8ae6abe94f81ffd7be05 # tags/0.70.1^0
source=("git+https://gitlab.gnome.org/GNOME/vte.git#commit=$_commit")
sha256sums=('SKIP')
@ -26,9 +38,13 @@ prepare() {
}
build() {
arch-meson vte build \
-D b_lto=false \
local meson_options=(
-D b_lto=false
-D docs=true
-D gtk4=true
)
arch-meson vte build "${meson_options[@]}"
meson compile -C build
}
@ -46,20 +62,69 @@ _pick() {
done
}
package_vte3() {
depends+=(vte-common)
provides+=(libvte-2.91.so)
package_vte-common() {
pkgdesc+=" (common files)"
depends=(sh)
meson install -C build --destdir "$pkgdir"
_pick vte-common "$pkgdir"/etc/profile.d
_pick vte-common "$pkgdir"/usr/lib/{systemd,vte-urlencode-cwd}
cd "$pkgdir"
_pick gtk3 usr/bin/vte-2.91
_pick gtk3 usr/include/vte-2.91
_pick gtk3 usr/lib/libvte-2.91.so*
_pick gtk3 usr/lib/pkgconfig/vte-2.91.pc
_pick gtk3 usr/lib/girepository-1.0/Vte-2.91.typelib
_pick gtk3 usr/share/gir-1.0/Vte-2.91.gir
_pick gtk3 usr/share/glade
_pick gtk3 usr/share/vala/vapi/vte-2.91.{deps,vapi}
_pick gtk4 usr/bin/vte-2.91-gtk4
_pick gtk4 usr/include/vte-2.91-gtk4
_pick gtk4 usr/lib/libvte-2.91-gtk4.so*
_pick gtk4 usr/lib/pkgconfig/vte-2.91-gtk4.pc
_pick gtk4 usr/lib/girepository-1.0/Vte-3.91.typelib
_pick gtk4 usr/share/gir-1.0/Vte-3.91.gir
_pick gtk4 usr/share/vala/vapi/vte-2.91-gtk4.{deps,vapi}
_pick docs usr/share/doc
}
package_vte-common() {
pkgdesc="Files shared by VTE libraries"
depends=(sh)
mv vte-common/* "$pkgdir"
package_vte3() {
pkgdesc+=" (GTK3)"
depends=(
fribidi
gnutls
gtk3
pcre2
systemd
vte-common
)
provides+=(libvte-2.91.so)
mv gtk3/* "$pkgdir"
}
# vim:set sw=2 et:
package_vte4() {
pkgdesc+=" (GTK4)"
depends=(
fribidi
gnutls
gtk4
pcre2
systemd
vte-common
)
provides+=(libvte-2.91-gtk4.so)
mv gtk4/* "$pkgdir"
}
package_vte-docs() {
pkgdesc+=" (documentation)"
mv docs/* "$pkgdir"
}
# vim:set sw=2 sts=-1 et:

View File

@ -1,11 +1,12 @@
gtk3
fribidi
gobject-introspection
vala
gi-docgen
git
gtk-doc
gobject-introspection
gperf
gtk3
gtk4
meson
ttf-liberation
vala
at-spi2-core
gettext

View File

@ -1,5 +1,6 @@
real 1m26.263s
user 2m23.440s
sys 0m9.137s
real 1m33.679s
user 4m21.160s
sys 0m14.491s