upg various add vulkan-headers dep of qt5
This commit is contained in:
parent
bb21e98b36
commit
0b80250b11
|
|
@ -5,7 +5,7 @@
|
|||
# Website : https://pozol.eu
|
||||
#-----------------------------------------| DESCRIPTION |---------------------------------------
|
||||
|
||||
_pkgver=9.18.2
|
||||
_pkgver=9.18.3
|
||||
pkgname=bind
|
||||
pkgver=${_pkgver//-/.}
|
||||
pkgrel=01
|
||||
|
|
@ -102,8 +102,8 @@ license=('MPL2')
|
|||
|
||||
validpgpkeys=('7E1C91AC8030A5A59D1EFAB9750F3C87723E4012') #ISC Code Signing Key 2021 – 2022 (codesign@isc.org)
|
||||
|
||||
sha256sums=(2e4b38779bba0a23ee634fdf7c525fd9794c41d692bfd83cda25823a2a3ed969 # bind-9.18.2.tar.xz
|
||||
4ce457ab53c6b187fa108bc7e5b4f7cab08f6ecf42c798eb3471e355583b6fc7 # bind-9.18.2.tar.xz.asc
|
||||
sha256sums=(0ad8da773bd93cba0ef66cc81999698ebdf9c3e51faed5e5c8c1eb75cad2ae6f # bind-9.18.3.tar.xz
|
||||
94f8c3bcddb7bc1ac9f2743f86884709fa19a37ba0db5a27fa2e959c0b0dae4a # bind-9.18.3.tar.xz.asc
|
||||
f0423c4ee8495da487e07e9144bec1d25f46a0cd2dfa7cfd7a761ef15bfefc98 # tmpfiles.conf
|
||||
7c0acefcfcc3ae093550caed7ec90fe84bec8f7477459ffa7e71dda76bcbdb2c # sysusers.conf
|
||||
e08a01d41b18bdb771d534daca99642314939aafdb088e5cfcf0ef2d33f8e7eb # named.conf
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
# Contributor: judd <jvinet@zeroflux.org>
|
||||
# Contributor: Mario Vazquez <mario_vazq@hotmail.com>
|
||||
|
||||
_pkgver=9.18.2
|
||||
_pkgver=9.18.3
|
||||
pkgname=bind
|
||||
pkgver=${_pkgver//-/.}
|
||||
pkgrel=1
|
||||
|
|
@ -35,7 +35,7 @@ source=("https://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.xz"{,.asc}
|
|||
'localhost.zone'
|
||||
'localhost.ip6.zone'
|
||||
'127.0.0.zone')
|
||||
sha256sums=('2e4b38779bba0a23ee634fdf7c525fd9794c41d692bfd83cda25823a2a3ed969'
|
||||
sha256sums=('0ad8da773bd93cba0ef66cc81999698ebdf9c3e51faed5e5c8c1eb75cad2ae6f'
|
||||
'SKIP'
|
||||
'f0423c4ee8495da487e07e9144bec1d25f46a0cd2dfa7cfd7a761ef15bfefc98'
|
||||
'7c0acefcfcc3ae093550caed7ec90fe84bec8f7477459ffa7e71dda76bcbdb2c'
|
||||
|
|
|
|||
15
gdb/PKGBUILD
15
gdb/PKGBUILD
|
|
@ -9,7 +9,7 @@ pkgbase=gdb
|
|||
# gdb-common is a package that contains files common for all cross compiled versions
|
||||
# of gdb (for arm/avr/...)
|
||||
pkgname=(gdb gdb-common)
|
||||
pkgver=11.2
|
||||
pkgver=12.1
|
||||
pkgrel=01
|
||||
pkgdesc='The GNU Debugger'
|
||||
arch=(x86_64)
|
||||
|
|
@ -67,8 +67,17 @@ package_gdb() {
|
|||
|
||||
|
||||
#---- license gpg-key sha256sums ----
|
||||
|
||||
license=(GPL3)
|
||||
|
||||
validpgpkeys=('F40ADB902B24264AA42E50BF92EDB04BFF325CF3') # Joel Brobecker
|
||||
|
||||
sha256sums=(1497c36a71881b8671a9a84a0ee40faab788ca30d7ba19d8463c3cc787152e32 # gdb-11.2.tar.xz
|
||||
1e7bb5cb9a0521762d244f268700a4600a219d40b95965e8257e4b22b03634fa) # gdb-11.2.tar.xz.sig
|
||||
sha256sums=(0e1793bf8f2b54d53f46dea84ccfd446f48f81b297b28c4f7fc017b818d69fed # gdb-12.1.tar.xz
|
||||
a9f28af2d2fd97e8f82a778bc9b9346940e255eb382651d80a8b85ef69c41809) # gdb-12.1.tar.xz.sig
|
||||
|
||||
sha1sums=('2edabd9f5766b84889b07b366b4438e93e994005'
|
||||
'SKIP')
|
||||
|
||||
b2sums=('7f6f853d1640908cf2c79932cdc1ba02549a07721c005d9c7ce2946a715761719cc164a4e68235a18664ec8a029afe3a2a0cfb57e1635f280076d6bed91317fd'
|
||||
'SKIP')
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ pkgbase=gdb
|
|||
# gdb-common is a package that contains files common for all cross compiled versions
|
||||
# of gdb (for arm/avr/...)
|
||||
pkgname=(gdb gdb-common)
|
||||
pkgver=11.2
|
||||
pkgver=12.1
|
||||
pkgrel=1
|
||||
pkgdesc='The GNU Debugger'
|
||||
arch=(x86_64)
|
||||
|
|
@ -16,9 +16,9 @@ license=(GPL3)
|
|||
makedepends=(glibc gcc-libs texinfo python guile ncurses expat xz mpfr source-highlight
|
||||
readline)
|
||||
source=(https://ftp.gnu.org/gnu/gdb/${pkgname}-${pkgver}.tar.xz{,.sig})
|
||||
sha1sums=('7c72b1d4a38bb6e155aaad29f4c1abf818b4595d'
|
||||
sha1sums=('2edabd9f5766b84889b07b366b4438e93e994005'
|
||||
'SKIP')
|
||||
b2sums=('66ce7e12c99c33c8b4e6ababa673204aab525e72c90ba54cc34a5fd69948a09dc2a9ef2050764b2464544231b1d1a6431279c2877388551ca6fbf384a3f9b464'
|
||||
b2sums=('7f6f853d1640908cf2c79932cdc1ba02549a07721c005d9c7ce2946a715761719cc164a4e68235a18664ec8a029afe3a2a0cfb57e1635f280076d6bed91317fd'
|
||||
'SKIP')
|
||||
validpgpkeys=('F40ADB902B24264AA42E50BF92EDB04BFF325CF3') # Joel Brobecker
|
||||
|
||||
|
|
|
|||
6
gdb/time
6
gdb/time
|
|
@ -1,4 +1,4 @@
|
|||
|
||||
real 6m36.201s
|
||||
user 19m7.648s
|
||||
sys 1m26.261s
|
||||
real 6m54.406s
|
||||
user 24m4.741s
|
||||
sys 1m22.295s
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@
|
|||
|
||||
pkgbase=gtk3
|
||||
pkgname=(gtk3 gtk3-docs gtk3-demos)
|
||||
pkgver=3.24.33
|
||||
pkgrel=04 # silly rebuild after 2 days by Arch because they forgot to create the dbug pkg
|
||||
pkgver=3.24.34
|
||||
pkgrel=01 # silly rebuild after 2 days by Arch because they forgot to create the dbug pkg
|
||||
epoch=1
|
||||
pkgdesc="GObject-based multi-platform GUI toolkit"
|
||||
arch=(x86_64)
|
||||
|
|
@ -24,7 +24,7 @@ makedepends=(gobject-introspection gtk-doc git glib2-docs sassc meson
|
|||
wayland-protocols)
|
||||
#options=(debug) # uncomment to produce the gtk3-debug pkg
|
||||
optdepends=('evince: Default print preview command')
|
||||
_commit=8ff9b2f83ff491cbfcbf9b30c706bd917679e7cc # tags/3.24.33^0
|
||||
_commit=4e3a3f05533789e1a68c70c185e1755d386d6c47 # tags/3.24.34^0
|
||||
source=("git+https://gitlab.gnome.org/GNOME/gtk.git#commit=$_commit"
|
||||
gtk-query-immodules-3.0.hook)
|
||||
|
||||
|
|
@ -112,3 +112,5 @@ license=(LGPL)
|
|||
|
||||
sha256sums=(SKIP
|
||||
a0319b6795410f06d38de1e8695a9bf9636ff2169f40701671580e60a108e229) # gtk-query-immodules-3.0.hook
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@
|
|||
|
||||
pkgbase=gtk3
|
||||
pkgname=(gtk3 gtk3-docs gtk3-demos)
|
||||
pkgver=3.24.33
|
||||
pkgrel=2
|
||||
pkgver=3.24.34
|
||||
pkgrel=1
|
||||
epoch=1
|
||||
pkgdesc="GObject-based multi-platform GUI toolkit"
|
||||
url="https://www.gtk.org/"
|
||||
|
|
@ -18,7 +18,7 @@ makedepends=(gobject-introspection gtk-doc git glib2-docs sassc meson
|
|||
wayland-protocols)
|
||||
license=(LGPL)
|
||||
options=(debug)
|
||||
_commit=8ff9b2f83ff491cbfcbf9b30c706bd917679e7cc # tags/3.24.33^0
|
||||
_commit=4e3a3f05533789e1a68c70c185e1755d386d6c47 # tags/3.24.34^0
|
||||
source=("git+https://gitlab.gnome.org/GNOME/gtk.git#commit=$_commit"
|
||||
gtk-query-immodules-3.0.hook)
|
||||
sha256sums=('SKIP'
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
#-----------------------------------------| DESCRIPTION |---------------------------------------
|
||||
|
||||
pkgname=libbpf
|
||||
pkgver=0.7.0
|
||||
pkgver=0.8.0
|
||||
pkgrel=01
|
||||
pkgdesc='Library for loading eBPF programs and reading and manipulating eBPF objects from user-space'
|
||||
url='https://github.com/libbpf/libbpf'
|
||||
|
|
@ -32,4 +32,7 @@ package() {
|
|||
|
||||
license=('LGPL2.1')
|
||||
|
||||
sha256sums=(5083588ce5a3a620e395ee1e596af77b4ec5771ffc71cff2af49dfee38c06361) # libbpf-0.7.0.tar.gz
|
||||
sha256sums=(f4480242651a93c101ece320030f6b2b9b437f622f807719c13cb32569a6d65a) # libbpf-0.8.0.tar.gz
|
||||
|
||||
sha512sums=('8b034a9c8f23207638630b95ff95a651148a800589eb52f2fe09698bf3c4147f2e2008b24de45a70832cc7669cdfebd78bc491e575ca0b27de5c2de3b1fb5637')
|
||||
b2sums=('c8e380d80f69f10da9d8a6ea4d19a53e8b34ed5a6072e1b57c61273f0714d13135c917224086de37246d9e47e9b848cbe75aced79278711a3007aa9e564db4b5')
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
# Contributor: Adrian Bacircea <adrian.bacircea@gmail.com>
|
||||
|
||||
pkgname=libbpf
|
||||
pkgver=0.7.0
|
||||
pkgver=0.8.0
|
||||
pkgrel=1
|
||||
pkgdesc='Library for loading eBPF programs and reading and manipulating eBPF objects from user-space'
|
||||
url='https://github.com/libbpf/libbpf'
|
||||
|
|
@ -12,8 +12,8 @@ depends=('glibc' 'libelf' 'linux-api-headers')
|
|||
makedepends=('rsync')
|
||||
provides=('libbpf.so')
|
||||
source=(https://github.com/libbpf/libbpf/archive/v${pkgver}/${pkgname}-${pkgver}.tar.gz)
|
||||
sha512sums=('9677cd42124766713d8d773ebef1fc1782a167f2469e48d83ad28a68f7f8fb5f840aad62ffe27c4cd5acba34dfa969c21e8cf6390d7832a378f87a63607eee76')
|
||||
b2sums=('e35116d622f3bb7dda0d5f6fbcae776277a5154a3c75d26dec325dcd7795826cbe69344da7fd19f2ab60a54225d4a77e64d4d5a6cb14dfd20e6372ac16ebc868')
|
||||
sha512sums=('8b034a9c8f23207638630b95ff95a651148a800589eb52f2fe09698bf3c4147f2e2008b24de45a70832cc7669cdfebd78bc491e575ca0b27de5c2de3b1fb5637')
|
||||
b2sums=('c8e380d80f69f10da9d8a6ea4d19a53e8b34ed5a6072e1b57c61273f0714d13135c917224086de37246d9e47e9b848cbe75aced79278711a3007aa9e564db4b5')
|
||||
|
||||
build() {
|
||||
cd ${pkgname}-${pkgver}
|
||||
|
|
|
|||
|
|
@ -1 +1,3 @@
|
|||
rsync
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -8,17 +8,19 @@
|
|||
pkgname=librewolf
|
||||
provides=($pkgname-bin $pkgname)
|
||||
conflicts=($pkgname-bin $pkgname)
|
||||
pkgver=99.0.1
|
||||
pkgrel=04
|
||||
pkgver=100.0.2
|
||||
pkgrel=01
|
||||
pkgdesc="Community-maintained fork of Firefox, focused on privacy, security and freedom."
|
||||
arch=(x86_64)
|
||||
options=(!emptydirs)
|
||||
install=librewolf.install
|
||||
makedepends=(zstd sh)
|
||||
proj_id=12875785
|
||||
url=https://gitlab.com/api/v4/projects/$proj_id/packages/generic/librewolf/$pkgver-1
|
||||
source=($url/$pkgname-$pkgver-4-x86_64.pkg.tar.zst{,.sig}
|
||||
librewolf.install)
|
||||
url=https://gitlab.com/api/v4/projects
|
||||
info_url="https://librewolf-community.gitlab.io/"
|
||||
source=($url/${proj_id}/packages/generic/librewolf/${pkgver}-1/${pkgname//-bin/""}-${pkgver}-1-x86_64.pkg.tar.zst
|
||||
$url/${proj_id}/packages/generic/librewolf/${pkgver}-1/${pkgname//-bin/""}-${pkgver}-1-x86_64.pkg.tar.zst.sig
|
||||
librewolf.install)
|
||||
|
||||
package() {
|
||||
depends=(gtk3 libxt startup-notification mime-types dbus-glib
|
||||
|
|
@ -38,6 +40,6 @@ license=(MPL GPL LGPL)
|
|||
|
||||
validpgpkeys=(031F7104E932F7BD7416E7F6D2845E1305D6E801) # <1813007-ohfp@users.noreply.gitlab.com>
|
||||
|
||||
sha256sums=(5c12e438b10d08d17ac00fab4b443f78bbfe2c1dcdd7bc03fd297c818a96f60e # librewolf-99.0.1-4-x86_64.pkg.tar.zst
|
||||
e1d03e071616ce477ebc951eae67331331bd8d7186baa78eacc5c958d641230c # librewolf-99.0.1-4-x86_64.pkg.tar.zst.sig
|
||||
sha256sums=(b4c2a5670a1c7613baff64f2e15691782c9aa1dd036540f2606a2f6f5f77c87c # librewolf-100.0.2-1-x86_64.pkg.tar.zst
|
||||
9a6d4ae5c7ff367447c0385c1983e3c24a0937be26f9341a3f0f8e46c2bcd319 # librewolf-100.0.2-1-x86_64.pkg.tar.zst.sig
|
||||
c3d94f33b96944e80b6fe84e36eaa9b4179ab144fe7aa58c5aa2efae0e2004b9) # librewolf.install
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
# Maintainer: lsf
|
||||
# Maintainer: lsf <lsf at pfho dot net>
|
||||
|
||||
pkgname=librewolf-bin
|
||||
provides=(${pkgname//-bin/""})
|
||||
conflicts=(${pkgname//-bin/""})
|
||||
pkgver=99.0.1
|
||||
pkgrel=4
|
||||
pkgver=100.0.2
|
||||
pkgrel=1
|
||||
pkgdesc="Community-maintained fork of Firefox, focused on privacy, security and freedom."
|
||||
arch=(x86_64 aarch64)
|
||||
license=(MPL GPL LGPL)
|
||||
|
|
@ -30,9 +30,9 @@ _uploadpath_sig_aarch64=${_base_url}/${pkgname//-bin/""}-${pkgver}-${pkgrel}-aar
|
|||
_uploadpath_sig_x86_64=${_base_url}/${pkgname//-bin/""}-${pkgver}-${pkgrel}-x86_64.pkg.tar.zst.sig
|
||||
source_aarch64=("${_uploadpath_aarch64}" "${_uploadpath_sig_aarch64}")
|
||||
source_x86_64=("${_uploadpath_x86_64}" "${_uploadpath_sig_x86_64}")
|
||||
sha256sums_x86_64=('5c12e438b10d08d17ac00fab4b443f78bbfe2c1dcdd7bc03fd297c818a96f60e'
|
||||
sha256sums_x86_64=('b4c2a5670a1c7613baff64f2e15691782c9aa1dd036540f2606a2f6f5f77c87c'
|
||||
'SKIP')
|
||||
sha256sums_aarch64=('263b9b29aac7f89a9bd60c11b0b27cc7eb23235a0adf9f8e52f67d676b6614a6'
|
||||
sha256sums_aarch64=('760acdece049b48040cbb0806d162c6d4f83cca07796117552aea93651570952'
|
||||
'SKIP')
|
||||
|
||||
package() {
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
pkgname=('llvm' 'llvm-libs' 'llvm-ocaml')
|
||||
pkgver=13.0.1
|
||||
pkgrel=02
|
||||
pkgrel=04
|
||||
_ocaml_ver=4.13.1
|
||||
arch=('x86_64')
|
||||
url="https://llvm.org/"
|
||||
|
|
@ -19,9 +19,11 @@ options=('staticlibs' '!lto') # Getting thousands of test failures with LTO
|
|||
_source_base=https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver
|
||||
source=($_source_base/$pkgname-$pkgver.src.tar.xz{,.sig}
|
||||
don-t-accept-nullptr-as-GEP-element-type.patch
|
||||
don-t-override-__attribute__-no_stack_protector.patch
|
||||
don-t-move-DBG_VALUE-instructions.patch
|
||||
no-strict-aliasing-DwarfCompileUnit.patch
|
||||
disable-bswap-for-spir.patch
|
||||
disable-A-B-A-B-and-BSWAP-in-InstCombine.patch
|
||||
disable-DIArgList-in-SPIR-V.patch
|
||||
llvm-config.h)
|
||||
|
||||
prepare() {
|
||||
|
|
@ -31,6 +33,11 @@ prepare() {
|
|||
# https://github.com/intel/intel-graphics-compiler/issues/204
|
||||
patch -Rp2 -i ../don-t-accept-nullptr-as-GEP-element-type.patch
|
||||
|
||||
# Fixes Chromium error "*** stack smashing detected ***: terminated"
|
||||
# (which also goes away with "--change-stack-guard-on-fork=disabled")
|
||||
# https://reviews.llvm.org/D116589
|
||||
patch -Np2 -i ../don-t-override-__attribute__-no_stack_protector.patch
|
||||
|
||||
# https://github.com/llvm/llvm-project/issues/53243
|
||||
# https://github.com/rust-lang/rust/issues/92869
|
||||
patch -Np2 -i ../don-t-move-DBG_VALUE-instructions.patch
|
||||
|
|
@ -39,8 +46,10 @@ prepare() {
|
|||
# https://bugs.llvm.org/show_bug.cgi?id=50611#c3
|
||||
patch -Np2 -i ../no-strict-aliasing-DwarfCompileUnit.patch
|
||||
|
||||
# Fix an ISPC build failure (https://github.com/ispc/ispc/issues/2189)
|
||||
patch -Np2 -i ../disable-bswap-for-spir.patch
|
||||
# Patches needed for ISPC for Xe only
|
||||
patch -Np2 -i ../disable-A-B-A-B-and-BSWAP-in-InstCombine.patch
|
||||
patch -Np2 -i ../disable-DIArgList-in-SPIR-V.patch
|
||||
|
||||
}
|
||||
|
||||
build() {
|
||||
|
|
@ -150,7 +159,11 @@ validpgpkeys+=('474E22316ABF4785A88C6E8EA2C794A986419D8A') # Tom Stellard <tstel
|
|||
sha256sums=(ec6b80d82c384acad2dc192903a6cf2cdbaffb889b84bfb98da9d71e630fc834 # llvm-13.0.1.src.tar.xz
|
||||
be6a73345158b13b11c74f1c678078f3724fa033969f076c03bed9c1413add2d # llvm-13.0.1.src.tar.xz.sig
|
||||
a7e902a7612d0fdabe436a917468b043cc296bc89d8954bfc3126f737beb9ac4 # don-t-accept-nullptr-as-GEP-element-type.patch
|
||||
9f0a4578b94eb8853b83af2f65e92705254b4b56d96f9a941714d174b932f465 # don-t-override-__attribute__-no_stack_protector.patch
|
||||
f7d69f84241416398fdb3df8bb44f9fae3c49d89889c7ffa3b37aa2e9d78f708 # don-t-move-DBG_VALUE-instructions.patch
|
||||
d1eff24508e35aae6c26a943dbaa3ef5acb60a145b008fd1ef9ac6f6c4faa662 # no-strict-aliasing-DwarfCompileUnit.patch
|
||||
af163392fbc19d65d11ab4b1510a2eae39b417d6228023b3ba5395b138bb41f5 # disable-bswap-for-spir.patch
|
||||
34cc0d79a30599cb2287b47b4e9a1a5bf03d57a1f8bb35be3fe976ffc4a604f6 # disable-A-B-A-B-and-BSWAP-in-InstCombine.patch
|
||||
8642da2d556092e4284873ba6ddc6c9a67841f42cc16f923bcd523e4b304a3ff # disable-DIArgList-in-SPIR-V.patch
|
||||
597dc5968c695bbdbb0eac9e8eb5117fcd2773bc91edf5ec103ecffffab8bc48) # llvm-config.h
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
pkgname=('llvm' 'llvm-libs' 'llvm-ocaml')
|
||||
pkgver=13.0.1
|
||||
pkgrel=2
|
||||
pkgrel=4
|
||||
_ocaml_ver=4.13.1
|
||||
arch=('x86_64')
|
||||
url="https://llvm.org/"
|
||||
|
|
@ -16,16 +16,20 @@ options=('staticlibs' '!lto') # Getting thousands of test failures with LTO
|
|||
_source_base=https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver
|
||||
source=($_source_base/$pkgname-$pkgver.src.tar.xz{,.sig}
|
||||
don-t-accept-nullptr-as-GEP-element-type.patch
|
||||
don-t-override-__attribute__-no_stack_protector.patch
|
||||
don-t-move-DBG_VALUE-instructions.patch
|
||||
no-strict-aliasing-DwarfCompileUnit.patch
|
||||
disable-bswap-for-spir.patch
|
||||
disable-A-B-A-B-and-BSWAP-in-InstCombine.patch
|
||||
disable-DIArgList-in-SPIR-V.patch
|
||||
llvm-config.h)
|
||||
sha256sums=('ec6b80d82c384acad2dc192903a6cf2cdbaffb889b84bfb98da9d71e630fc834'
|
||||
'SKIP'
|
||||
'a7e902a7612d0fdabe436a917468b043cc296bc89d8954bfc3126f737beb9ac4'
|
||||
'9f0a4578b94eb8853b83af2f65e92705254b4b56d96f9a941714d174b932f465'
|
||||
'f7d69f84241416398fdb3df8bb44f9fae3c49d89889c7ffa3b37aa2e9d78f708'
|
||||
'd1eff24508e35aae6c26a943dbaa3ef5acb60a145b008fd1ef9ac6f6c4faa662'
|
||||
'af163392fbc19d65d11ab4b1510a2eae39b417d6228023b3ba5395b138bb41f5'
|
||||
'34cc0d79a30599cb2287b47b4e9a1a5bf03d57a1f8bb35be3fe976ffc4a604f6'
|
||||
'8642da2d556092e4284873ba6ddc6c9a67841f42cc16f923bcd523e4b304a3ff'
|
||||
'597dc5968c695bbdbb0eac9e8eb5117fcd2773bc91edf5ec103ecffffab8bc48')
|
||||
validpgpkeys+=('B6C8F98282B944E3B0D5C2530FC3042E345AD05D') # Hans Wennborg <hans@chromium.org>
|
||||
validpgpkeys+=('474E22316ABF4785A88C6E8EA2C794A986419D8A') # Tom Stellard <tstellar@redhat.com>
|
||||
|
|
@ -37,6 +41,11 @@ prepare() {
|
|||
# https://github.com/intel/intel-graphics-compiler/issues/204
|
||||
patch -Rp2 -i ../don-t-accept-nullptr-as-GEP-element-type.patch
|
||||
|
||||
# Fixes Chromium error "*** stack smashing detected ***: terminated"
|
||||
# (which also goes away with "--change-stack-guard-on-fork=disabled")
|
||||
# https://reviews.llvm.org/D116589
|
||||
patch -Np2 -i ../don-t-override-__attribute__-no_stack_protector.patch
|
||||
|
||||
# https://github.com/llvm/llvm-project/issues/53243
|
||||
# https://github.com/rust-lang/rust/issues/92869
|
||||
patch -Np2 -i ../don-t-move-DBG_VALUE-instructions.patch
|
||||
|
|
@ -45,8 +54,9 @@ prepare() {
|
|||
# https://bugs.llvm.org/show_bug.cgi?id=50611#c3
|
||||
patch -Np2 -i ../no-strict-aliasing-DwarfCompileUnit.patch
|
||||
|
||||
# Fix an ISPC build failure (https://github.com/ispc/ispc/issues/2189)
|
||||
patch -Np2 -i ../disable-bswap-for-spir.patch
|
||||
# Patches needed for ISPC for Xe only
|
||||
patch -Np2 -i ../disable-A-B-A-B-and-BSWAP-in-InstCombine.patch
|
||||
patch -Np2 -i ../disable-DIArgList-in-SPIR-V.patch
|
||||
}
|
||||
|
||||
build() {
|
||||
|
|
|
|||
|
|
@ -0,0 +1,52 @@
|
|||
# This patch is needed for ISPC for Xe only
|
||||
|
||||
# 1. Transformation of add to or is not safe for VC backend.
|
||||
# 2. bswap intrinsics is not supported in VC backend yet.
|
||||
diff --git a/llvm/lib/Transforms/InstCombine/InstCombineAddSub.cpp b/llvm/lib/Transforms/InstCombine/InstCombineAddSub.cpp
|
||||
index d01a021bf3f4..bccce825a03d 100644
|
||||
--- a/llvm/lib/Transforms/InstCombine/InstCombineAddSub.cpp
|
||||
+++ b/llvm/lib/Transforms/InstCombine/InstCombineAddSub.cpp
|
||||
@@ -15,6 +15,7 @@
|
||||
#include "llvm/ADT/APInt.h"
|
||||
#include "llvm/ADT/STLExtras.h"
|
||||
#include "llvm/ADT/SmallVector.h"
|
||||
+#include "llvm/ADT/Triple.h"
|
||||
#include "llvm/Analysis/InstructionSimplify.h"
|
||||
#include "llvm/Analysis/ValueTracking.h"
|
||||
#include "llvm/IR/Constant.h"
|
||||
@@ -1369,9 +1370,12 @@ Instruction *InstCombinerImpl::visitAdd(BinaryOperator &I) {
|
||||
}
|
||||
}
|
||||
|
||||
- // A+B --> A|B iff A and B have no bits set in common.
|
||||
- if (haveNoCommonBitsSet(LHS, RHS, DL, &AC, &I, &DT))
|
||||
- return BinaryOperator::CreateOr(LHS, RHS);
|
||||
+ // Disable this transformation for ISPC SPIR-V
|
||||
+ if (!Triple(I.getModule()->getTargetTriple()).isSPIR()) {
|
||||
+ // A+B --> A|B iff A and B have no bits set in common.
|
||||
+ if (haveNoCommonBitsSet(LHS, RHS, DL, &AC, &I, &DT))
|
||||
+ return BinaryOperator::CreateOr(LHS, RHS);
|
||||
+ }
|
||||
|
||||
// add (select X 0 (sub n A)) A --> select X A n
|
||||
{
|
||||
diff --git a/llvm/lib/Transforms/InstCombine/InstCombineAndOrXor.cpp b/llvm/lib/Transforms/InstCombine/InstCombineAndOrXor.cpp
|
||||
index 120852c44474..8de55311ce3e 100644
|
||||
--- a/llvm/lib/Transforms/InstCombine/InstCombineAndOrXor.cpp
|
||||
+++ b/llvm/lib/Transforms/InstCombine/InstCombineAndOrXor.cpp
|
||||
@@ -2671,9 +2671,12 @@ Instruction *InstCombinerImpl::visitOr(BinaryOperator &I) {
|
||||
if (Instruction *FoldedLogic = foldBinOpIntoSelectOrPhi(I))
|
||||
return FoldedLogic;
|
||||
|
||||
- if (Instruction *BitOp = matchBSwapOrBitReverse(I, /*MatchBSwaps*/ true,
|
||||
- /*MatchBitReversals*/ true))
|
||||
- return BitOp;
|
||||
+ // Disable this transformation for ISPC SPIR-V
|
||||
+ if (!Triple(I.getModule()->getTargetTriple()).isSPIR()) {
|
||||
+ if (Instruction *BitOp = matchBSwapOrBitReverse(I, /*MatchBSwaps*/ true,
|
||||
+ /*MatchBitReversals*/ true))
|
||||
+ return BitOp;
|
||||
+ }
|
||||
|
||||
if (Instruction *Funnel = matchFunnelShift(I, *this))
|
||||
return Funnel;
|
||||
|
|
@ -0,0 +1,23 @@
|
|||
# This patch is needed for ISPC for Xe only
|
||||
# It disables using of DIArgList for dbg.val if SPIR-V target is used.
|
||||
# It is needed till DIArgList is supported in SPIR-V Translator.
|
||||
diff --git a/llvm/lib/Transforms/Utils/Local.cpp b/llvm/lib/Transforms/Utils/Local.cpp
|
||||
index d03d76f57ca1..0b86e454df57 100644
|
||||
--- a/llvm/lib/Transforms/Utils/Local.cpp
|
||||
+++ b/llvm/lib/Transforms/Utils/Local.cpp
|
||||
@@ -1771,7 +1771,14 @@ void llvm::salvageDebugInfoForDbgValues(
|
||||
} else if (isa<DbgValueInst>(DII) &&
|
||||
DII->getNumVariableLocationOps() + AdditionalValues.size() <=
|
||||
MaxDebugArgs) {
|
||||
- DII->addVariableLocationOps(AdditionalValues, SalvagedExpr);
|
||||
+ if (!Triple(I.getModule()->getTargetTriple()).isSPIR()) {
|
||||
+ DII->addVariableLocationOps(AdditionalValues, SalvagedExpr);
|
||||
+ } else {
|
||||
+ // Do not salvage using DIArgList for dbg.val fpr SPIR-V target, as it is
|
||||
+ // not currently supported by SPIR-V Translator.
|
||||
+ Value *Undef = UndefValue::get(I.getOperand(0)->getType());
|
||||
+ DII->replaceVariableLocationOp(I.getOperand(0), Undef);
|
||||
+ }
|
||||
} else {
|
||||
// Do not salvage using DIArgList for dbg.addr/dbg.declare, as it is
|
||||
// currently only valid for stack value expressions.
|
||||
|
|
@ -0,0 +1,540 @@
|
|||
From 4a7c9b7d6f4a183fef8f43aef004ec865c37bbd8 Mon Sep 17 00:00:00 2001
|
||||
From: Hans Wennborg <hans@chromium.org>
|
||||
Date: Thu, 13 Jan 2022 11:31:11 +0100
|
||||
Subject: [PATCH 1/2] Simplify llvm/test/Transforms/Inline/inline_ssp.ll (NFC)
|
||||
|
||||
The nounwind and uwtable attributes were just cluttering up the test.
|
||||
Using regexes to give symbolic names to the attribute lists make the
|
||||
test more readable.
|
||||
|
||||
This is pre-committing parts of D116589.
|
||||
|
||||
(cherry picked from commit 2eb7d8d749997e5f3048d39201a4d38b6b8d6455)
|
||||
---
|
||||
llvm/test/Transforms/Inline/inline_ssp.ll | 81 +++++++++++------------
|
||||
1 file changed, 40 insertions(+), 41 deletions(-)
|
||||
|
||||
diff --git a/llvm/test/Transforms/Inline/inline_ssp.ll b/llvm/test/Transforms/Inline/inline_ssp.ll
|
||||
index 2bf93d322842..ccfe93453159 100644
|
||||
--- a/llvm/test/Transforms/Inline/inline_ssp.ll
|
||||
+++ b/llvm/test/Transforms/Inline/inline_ssp.ll
|
||||
@@ -12,150 +12,149 @@
|
||||
; propagated correctly. The caller should have its SSP attribute set as:
|
||||
; strictest(caller-ssp-attr, callee-ssp-attr), where strictness is ordered as:
|
||||
; sspreq > sspstrong > ssp > [no ssp]
|
||||
-define internal void @fun_sspreq() nounwind sspreq uwtable {
|
||||
+define internal void @fun_sspreq() sspreq {
|
||||
entry:
|
||||
%call = call i32 (i8*, ...) @printf(i8* getelementptr inbounds ([12 x i8], [12 x i8]* @.str3, i32 0, i32 0))
|
||||
ret void
|
||||
}
|
||||
|
||||
-define internal void @fun_sspstrong() nounwind sspstrong uwtable {
|
||||
+define internal void @fun_sspstrong() sspstrong {
|
||||
entry:
|
||||
%call = call i32 (i8*, ...) @printf(i8* getelementptr inbounds ([15 x i8], [15 x i8]* @.str2, i32 0, i32 0))
|
||||
ret void
|
||||
}
|
||||
|
||||
-define internal void @fun_ssp() nounwind ssp uwtable {
|
||||
+define internal void @fun_ssp() ssp {
|
||||
entry:
|
||||
%call = call i32 (i8*, ...) @printf(i8* getelementptr inbounds ([9 x i8], [9 x i8]* @.str1, i32 0, i32 0))
|
||||
ret void
|
||||
}
|
||||
|
||||
-define internal void @fun_nossp() nounwind uwtable {
|
||||
+define internal void @fun_nossp() {
|
||||
entry:
|
||||
%call = call i32 (i8*, ...) @printf(i8* getelementptr inbounds ([11 x i8], [11 x i8]* @.str, i32 0, i32 0))
|
||||
ret void
|
||||
}
|
||||
|
||||
-; Tests start below
|
||||
+; Tests start below.
|
||||
|
||||
-define void @inline_req_req() nounwind sspreq uwtable {
|
||||
+define void @inline_req_req() sspreq {
|
||||
entry:
|
||||
-; CHECK: @inline_req_req() #0
|
||||
+; CHECK: @inline_req_req() #[[SSPREQ:[0-9]]]
|
||||
call void @fun_sspreq()
|
||||
ret void
|
||||
}
|
||||
|
||||
-define void @inline_req_strong() nounwind sspstrong uwtable {
|
||||
+define void @inline_req_strong() sspstrong {
|
||||
entry:
|
||||
-; CHECK: @inline_req_strong() #0
|
||||
+; CHECK: @inline_req_strong() #[[SSPREQ]]
|
||||
call void @fun_sspreq()
|
||||
ret void
|
||||
}
|
||||
|
||||
-define void @inline_req_ssp() nounwind ssp uwtable {
|
||||
+define void @inline_req_ssp() ssp {
|
||||
entry:
|
||||
-; CHECK: @inline_req_ssp() #0
|
||||
+; CHECK: @inline_req_ssp() #[[SSPREQ]]
|
||||
call void @fun_sspreq()
|
||||
ret void
|
||||
}
|
||||
|
||||
-define void @inline_req_nossp() nounwind uwtable {
|
||||
+define void @inline_req_nossp() {
|
||||
entry:
|
||||
-; CHECK: @inline_req_nossp() #3
|
||||
+; CHECK: @inline_req_nossp() {
|
||||
call void @fun_sspreq()
|
||||
ret void
|
||||
}
|
||||
|
||||
-define void @inline_strong_req() nounwind sspreq uwtable {
|
||||
+define void @inline_strong_req() sspreq {
|
||||
entry:
|
||||
-; CHECK: @inline_strong_req() #0
|
||||
+; CHECK: @inline_strong_req() #[[SSPREQ]]
|
||||
call void @fun_sspstrong()
|
||||
ret void
|
||||
}
|
||||
|
||||
|
||||
-define void @inline_strong_strong() nounwind sspstrong uwtable {
|
||||
+define void @inline_strong_strong() sspstrong {
|
||||
entry:
|
||||
-; CHECK: @inline_strong_strong() #1
|
||||
+; CHECK: @inline_strong_strong() #[[SSPSTRONG:[0-9]]]
|
||||
call void @fun_sspstrong()
|
||||
ret void
|
||||
}
|
||||
|
||||
-define void @inline_strong_ssp() nounwind ssp uwtable {
|
||||
+define void @inline_strong_ssp() ssp {
|
||||
entry:
|
||||
-; CHECK: @inline_strong_ssp() #1
|
||||
+; CHECK: @inline_strong_ssp() #[[SSPSTRONG]]
|
||||
call void @fun_sspstrong()
|
||||
ret void
|
||||
}
|
||||
|
||||
-define void @inline_strong_nossp() nounwind uwtable {
|
||||
+define void @inline_strong_nossp() {
|
||||
entry:
|
||||
-; CHECK: @inline_strong_nossp() #3
|
||||
+; CHECK: @inline_strong_nossp() {
|
||||
call void @fun_sspstrong()
|
||||
ret void
|
||||
}
|
||||
|
||||
-define void @inline_ssp_req() nounwind sspreq uwtable {
|
||||
+define void @inline_ssp_req() sspreq {
|
||||
entry:
|
||||
-; CHECK: @inline_ssp_req() #0
|
||||
+; CHECK: @inline_ssp_req() #[[SSPREQ]]
|
||||
call void @fun_ssp()
|
||||
ret void
|
||||
}
|
||||
|
||||
|
||||
-define void @inline_ssp_strong() nounwind sspstrong uwtable {
|
||||
+define void @inline_ssp_strong() sspstrong {
|
||||
entry:
|
||||
-; CHECK: @inline_ssp_strong() #1
|
||||
+; CHECK: @inline_ssp_strong() #[[SSPSTRONG]]
|
||||
call void @fun_ssp()
|
||||
ret void
|
||||
}
|
||||
|
||||
-define void @inline_ssp_ssp() nounwind ssp uwtable {
|
||||
+define void @inline_ssp_ssp() ssp {
|
||||
entry:
|
||||
-; CHECK: @inline_ssp_ssp() #2
|
||||
+; CHECK: @inline_ssp_ssp() #[[SSP:[0-9]]]
|
||||
call void @fun_ssp()
|
||||
ret void
|
||||
}
|
||||
|
||||
-define void @inline_ssp_nossp() nounwind uwtable {
|
||||
+define void @inline_ssp_nossp() {
|
||||
entry:
|
||||
-; CHECK: @inline_ssp_nossp() #3
|
||||
+; CHECK: @inline_ssp_nossp() {
|
||||
call void @fun_ssp()
|
||||
ret void
|
||||
}
|
||||
|
||||
-define void @inline_nossp_req() nounwind uwtable sspreq {
|
||||
+define void @inline_nossp_req() sspreq {
|
||||
entry:
|
||||
-; CHECK: @inline_nossp_req() #0
|
||||
+; CHECK: @inline_nossp_req() #[[SSPREQ]]
|
||||
call void @fun_nossp()
|
||||
ret void
|
||||
}
|
||||
|
||||
|
||||
-define void @inline_nossp_strong() nounwind sspstrong uwtable {
|
||||
+define void @inline_nossp_strong() sspstrong {
|
||||
entry:
|
||||
-; CHECK: @inline_nossp_strong() #1
|
||||
+; CHECK: @inline_nossp_strong() #[[SSPSTRONG]]
|
||||
call void @fun_nossp()
|
||||
ret void
|
||||
}
|
||||
|
||||
-define void @inline_nossp_ssp() nounwind ssp uwtable {
|
||||
+define void @inline_nossp_ssp() ssp {
|
||||
entry:
|
||||
-; CHECK: @inline_nossp_ssp() #2
|
||||
+; CHECK: @inline_nossp_ssp() #[[SSP]]
|
||||
call void @fun_nossp()
|
||||
ret void
|
||||
}
|
||||
|
||||
-define void @inline_nossp_nossp() nounwind uwtable {
|
||||
+define void @inline_nossp_nossp() {
|
||||
entry:
|
||||
-; CHECK: @inline_nossp_nossp() #3
|
||||
+; CHECK: @inline_nossp_nossp() {
|
||||
call void @fun_nossp()
|
||||
ret void
|
||||
}
|
||||
|
||||
declare i32 @printf(i8*, ...)
|
||||
|
||||
-; CHECK: attributes #0 = { nounwind sspreq uwtable }
|
||||
-; CHECK: attributes #1 = { nounwind sspstrong uwtable }
|
||||
-; CHECK: attributes #2 = { nounwind ssp uwtable }
|
||||
-; CHECK: attributes #3 = { nounwind uwtable }
|
||||
+; CHECK: attributes #[[SSPREQ]] = { sspreq }
|
||||
+; CHECK: attributes #[[SSPSTRONG]] = { sspstrong }
|
||||
+; CHECK: attributes #[[SSP]] = { ssp }
|
||||
|
||||
From b52296ecaa3878648ceeb3aa39df05dc71e44597 Mon Sep 17 00:00:00 2001
|
||||
From: Hans Wennborg <hans@chromium.org>
|
||||
Date: Mon, 3 Jan 2022 18:03:43 +0100
|
||||
Subject: [PATCH 2/2] Don't override __attribute__((no_stack_protector)) by
|
||||
inlining (PR52886)
|
||||
|
||||
Since 26c6a3e736d3, LLVM's inliner will "upgrade" the caller's stack protector
|
||||
attribute based on the callee. This lead to surprising results with Clang's
|
||||
no_stack_protector attribute added in 4fbf84c1732f (D46300). Consider the
|
||||
following code compiled with clang -fstack-protector-strong -Os
|
||||
(https://godbolt.org/z/7s3rW7a1q).
|
||||
|
||||
extern void h(int* p);
|
||||
|
||||
inline __attribute__((always_inline)) int g() {
|
||||
return 0;
|
||||
}
|
||||
|
||||
int __attribute__((__no_stack_protector__)) f() {
|
||||
int a[1];
|
||||
h(a);
|
||||
return g();
|
||||
}
|
||||
|
||||
LLVM will inline g() into f(), and f() would get a stack protector, against the
|
||||
users explicit wishes, potentially breaking the program e.g. if h() changes the
|
||||
value of the stack cookie. That's a miscompile.
|
||||
|
||||
More recently, bc044a88ee3c (D91816) addressed this problem by preventing
|
||||
inlining when the stack protector is disabled in the caller and enabled in the
|
||||
callee or vice versa. However, the problem remained if the callee is marked
|
||||
always_inline as in the example above. This affected users, see e.g.
|
||||
http://crbug.com/1274129 and http://llvm.org/pr52886.
|
||||
|
||||
One way to fix this would be to prevent inlining also in the always_inline
|
||||
case. Despite the name, always_inline does not guarantee inlining, so this
|
||||
would be legal but potentially surprising to users.
|
||||
|
||||
However, I think the better fix is to not enable the stack protector in a
|
||||
caller based on the callee. The motivation for the old behaviour is unclear, it
|
||||
seems counter-intuitive, and causes real problems as we've seen.
|
||||
|
||||
This commit implements that fix, which means in the example above, g() gets
|
||||
inlined into f() (also without always_inline), and f() is emitted without stack
|
||||
protector. I think that matches most developers' expectations, and that's also
|
||||
what GCC does.
|
||||
|
||||
Another effect of this change is that a no_stack_protector function can now be
|
||||
inlined into a stack protected function, e.g. (https://godbolt.org/z/hafP6W856):
|
||||
|
||||
extern void h(int* p);
|
||||
|
||||
inline int __attribute__((__no_stack_protector__)) __attribute__((always_inline)) g() {
|
||||
return 0;
|
||||
}
|
||||
|
||||
int f() {
|
||||
int a[1];
|
||||
h(a);
|
||||
return g();
|
||||
}
|
||||
|
||||
I think that's fine. Such code would be unusual since no_stack_protector is
|
||||
normally applied to a program entry point which sets up the stack canary. And
|
||||
even if such code exists, inlining doesn't change the semantics: there is still
|
||||
no stack cookie setup/check around entry/exit of the g() code region, but there
|
||||
may be in the surrounding context, as there was before inlining. This also
|
||||
matches GCC.
|
||||
|
||||
See also the discussion at https://gcc.gnu.org/bugzilla/show_bug.cgi?id=94722
|
||||
|
||||
Differential revision: https://reviews.llvm.org/D116589
|
||||
|
||||
(cherry picked from commit 2bc57d85ebf244f19a3046295b58eb8c667f947d)
|
||||
---
|
||||
llvm/docs/LangRef.rst | 26 +++++------
|
||||
llvm/lib/Analysis/InlineCost.cpp | 9 ----
|
||||
llvm/lib/IR/Attributes.cpp | 6 +++
|
||||
llvm/test/ThinLTO/X86/nossp.ll | 23 ++++++----
|
||||
llvm/test/Transforms/Inline/inline_nossp.ll | 50 ---------------------
|
||||
llvm/test/Transforms/Inline/inline_ssp.ll | 19 +++++++-
|
||||
6 files changed, 48 insertions(+), 85 deletions(-)
|
||||
delete mode 100644 llvm/test/Transforms/Inline/inline_nossp.ll
|
||||
|
||||
diff --git a/llvm/docs/LangRef.rst b/llvm/docs/LangRef.rst
|
||||
index 36e09355e485..69393eba3906 100644
|
||||
--- a/llvm/docs/LangRef.rst
|
||||
+++ b/llvm/docs/LangRef.rst
|
||||
@@ -1965,11 +1965,9 @@ example:
|
||||
Variables that are identified as requiring a protector will be arranged
|
||||
on the stack such that they are adjacent to the stack protector guard.
|
||||
|
||||
- A function with the ``ssp`` attribute but without the ``alwaysinline``
|
||||
- attribute cannot be inlined into a function without a
|
||||
- ``ssp/sspreq/sspstrong`` attribute. If inlined, the caller will get the
|
||||
- ``ssp`` attribute. ``call``, ``invoke``, and ``callbr`` instructions with
|
||||
- the ``alwaysinline`` attribute force inlining.
|
||||
+ If a function with an ``ssp`` attribute is inlined into a calling function,
|
||||
+ the attribute is not carried over to the calling function.
|
||||
+
|
||||
``sspstrong``
|
||||
This attribute indicates that the function should emit a stack smashing
|
||||
protector. This attribute causes a strong heuristic to be used when
|
||||
@@ -1994,12 +1992,10 @@ example:
|
||||
|
||||
This overrides the ``ssp`` function attribute.
|
||||
|
||||
- A function with the ``sspstrong`` attribute but without the
|
||||
- ``alwaysinline`` attribute cannot be inlined into a function without a
|
||||
- ``ssp/sspstrong/sspreq`` attribute. If inlined, the caller will get the
|
||||
- ``sspstrong`` attribute unless the ``sspreq`` attribute exists. ``call``,
|
||||
- ``invoke``, and ``callbr`` instructions with the ``alwaysinline`` attribute
|
||||
- force inlining.
|
||||
+ If a function with an ``sspstrong`` attribute is inlined into a calling
|
||||
+ function which has an ``ssp`` attribute, the calling function's attribute
|
||||
+ will be upgraded to ``sspstrong``.
|
||||
+
|
||||
``sspreq``
|
||||
This attribute indicates that the function should *always* emit a stack
|
||||
smashing protector. This overrides the ``ssp`` and ``sspstrong`` function
|
||||
@@ -2016,11 +2012,9 @@ example:
|
||||
#. Variables that have had their address taken are 3rd closest to the
|
||||
protector.
|
||||
|
||||
- A function with the ``sspreq`` attribute but without the ``alwaysinline``
|
||||
- attribute cannot be inlined into a function without a
|
||||
- ``ssp/sspstrong/sspreq`` attribute. If inlined, the caller will get the
|
||||
- ``sspreq`` attribute. ``call``, ``invoke``, and ``callbr`` instructions
|
||||
- with the ``alwaysinline`` attribute force inlining.
|
||||
+ If a function with an ``sspreq`` attribute is inlined into a calling
|
||||
+ function which has an ``ssp`` or ``sspstrong`` attribute, the calling
|
||||
+ function's attribute will be upgraded to ``sspreq``.
|
||||
|
||||
``strictfp``
|
||||
This attribute indicates that the function was called from a scope that
|
||||
diff --git a/llvm/lib/Analysis/InlineCost.cpp b/llvm/lib/Analysis/InlineCost.cpp
|
||||
index e8f79a28a8e8..1e68ec8ff7d6 100644
|
||||
--- a/llvm/lib/Analysis/InlineCost.cpp
|
||||
+++ b/llvm/lib/Analysis/InlineCost.cpp
|
||||
@@ -2823,15 +2823,6 @@ Optional<InlineResult> llvm::getAttributeBasedInliningDecision(
|
||||
if (Call.isNoInline())
|
||||
return InlineResult::failure("noinline call site attribute");
|
||||
|
||||
- // Don't inline functions if one does not have any stack protector attribute
|
||||
- // but the other does.
|
||||
- if (Caller->hasStackProtectorFnAttr() && !Callee->hasStackProtectorFnAttr())
|
||||
- return InlineResult::failure(
|
||||
- "stack protected caller but callee requested no stack protector");
|
||||
- if (Callee->hasStackProtectorFnAttr() && !Caller->hasStackProtectorFnAttr())
|
||||
- return InlineResult::failure(
|
||||
- "stack protected callee but caller requested no stack protector");
|
||||
-
|
||||
return None;
|
||||
}
|
||||
|
||||
diff --git a/llvm/lib/IR/Attributes.cpp b/llvm/lib/IR/Attributes.cpp
|
||||
index 5cd1bafccc47..eec4629aa725 100644
|
||||
--- a/llvm/lib/IR/Attributes.cpp
|
||||
+++ b/llvm/lib/IR/Attributes.cpp
|
||||
@@ -1957,6 +1957,12 @@ static void setOR(Function &Caller, const Function &Callee) {
|
||||
/// If the inlined function had a higher stack protection level than the
|
||||
/// calling function, then bump up the caller's stack protection level.
|
||||
static void adjustCallerSSPLevel(Function &Caller, const Function &Callee) {
|
||||
+ // If the calling function has *no* stack protection level (e.g. it was built
|
||||
+ // with Clang's -fno-stack-protector or no_stack_protector attribute), don't
|
||||
+ // change it as that could change the program's semantics.
|
||||
+ if (!Caller.hasStackProtectorFnAttr())
|
||||
+ return;
|
||||
+
|
||||
// If upgrading the SSP attribute, clear out the old SSP Attributes first.
|
||||
// Having multiple SSP attributes doesn't actually hurt, but it adds useless
|
||||
// clutter to the IR.
|
||||
diff --git a/llvm/test/ThinLTO/X86/nossp.ll b/llvm/test/ThinLTO/X86/nossp.ll
|
||||
index c542a85c6f74..cfc54d595ad7 100644
|
||||
--- a/llvm/test/ThinLTO/X86/nossp.ll
|
||||
+++ b/llvm/test/ThinLTO/X86/nossp.ll
|
||||
@@ -23,7 +23,8 @@ declare void @ssp_callee() ssp
|
||||
|
||||
; nossp caller should be able to inline nossp callee.
|
||||
define void @nossp_caller() {
|
||||
-; CHECK-LABEL: @nossp_caller
|
||||
+; CHECK-LABEL: define void @nossp_caller()
|
||||
+; CHECK-NOT: #0
|
||||
; CHECK-NEXT: tail call void @foo
|
||||
tail call void @nossp_callee()
|
||||
ret void
|
||||
@@ -31,28 +32,34 @@ define void @nossp_caller() {
|
||||
|
||||
; ssp caller should be able to inline ssp callee.
|
||||
define void @ssp_caller() ssp {
|
||||
-; CHECK-LABEL: @ssp_caller
|
||||
+; CHECK-LABEL: define void @ssp_caller()
|
||||
+; CHECK-SAME: #0
|
||||
; CHECK-NEXT: tail call void @foo
|
||||
tail call void @ssp_callee()
|
||||
ret void
|
||||
}
|
||||
|
||||
-; nossp caller should *NOT* be able to inline ssp callee.
|
||||
+; nossp caller should be able to inline ssp callee.
|
||||
+; the ssp attribute is not propagated.
|
||||
define void @nossp_caller2() {
|
||||
-; CHECK-LABEL: @nossp_caller2
|
||||
-; CHECK-NEXT: tail call void @ssp_callee
|
||||
+; CHECK-LABEL: define void @nossp_caller2()
|
||||
+; CHECK-NOT: #0
|
||||
+; CHECK-NEXT: tail call void @foo
|
||||
tail call void @ssp_callee()
|
||||
ret void
|
||||
}
|
||||
|
||||
-; ssp caller should *NOT* be able to inline nossp callee.
|
||||
+; ssp caller should be able to inline nossp callee.
|
||||
define void @ssp_caller2() ssp {
|
||||
-; CHECK-LABEL: @ssp_caller2
|
||||
-; CHECK-NEXT: tail call void @nossp_callee
|
||||
+; CHECK-LABEL: define void @ssp_caller2()
|
||||
+; CHECK-SAME: #0
|
||||
+; CHECK-NEXT: tail call void @foo
|
||||
tail call void @nossp_callee()
|
||||
ret void
|
||||
}
|
||||
|
||||
+; CHECK: attributes #0 = { ssp }
|
||||
+
|
||||
;--- b.ll
|
||||
target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
|
||||
target triple = "x86_64-pc-linux-gnu"
|
||||
diff --git a/llvm/test/Transforms/Inline/inline_nossp.ll b/llvm/test/Transforms/Inline/inline_nossp.ll
|
||||
deleted file mode 100644
|
||||
index 24fdab0b9f13..000000000000
|
||||
--- a/llvm/test/Transforms/Inline/inline_nossp.ll
|
||||
+++ /dev/null
|
||||
@@ -1,50 +0,0 @@
|
||||
-; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
|
||||
-; RUN: opt -passes='cgscc(inline)' %s -S -pass-remarks-missed=inline 2>&1 | FileCheck --check-prefixes=CHECK,CHECK-INLINE %s
|
||||
-; RUN: opt -passes=always-inline -o - -S %s | FileCheck %s
|
||||
-
|
||||
-; CHECK-INLINE: ssp not inlined into nossp_caller because it should never be inlined (cost=never): stack protected callee but caller requested no stack protector
|
||||
-; CHECK-INLINE: nossp not inlined into ssp_caller because it should never be inlined (cost=never): stack protected caller but callee requested no stack protector
|
||||
-
|
||||
-; Not interesting to test.
|
||||
-define i32 @nossp() { ret i32 41 }
|
||||
-define i32 @ssp() sspstrong { ret i32 42 }
|
||||
-define i32 @nossp_alwaysinline() alwaysinline { ret i32 43 }
|
||||
-define i32 @ssp_alwaysinline() sspstrong alwaysinline { ret i32 44 }
|
||||
-
|
||||
-; @ssp should not be inlined due to mismatch stack protector.
|
||||
-; @ssp_alwaysinline should be inlined due to alwaysinline.
|
||||
-define i32 @nossp_caller() {
|
||||
-; CHECK-LABEL: @nossp_caller(
|
||||
-; CHECK-NEXT: [[TMP1:%.*]] = call i32 @ssp()
|
||||
-; CHECK-NEXT: ret i32 44
|
||||
-;
|
||||
- call i32 @ssp()
|
||||
- %2 = call i32 @ssp_alwaysinline()
|
||||
- ret i32 %2
|
||||
-}
|
||||
-; @nossp should not be inlined due to mismatch stack protector.
|
||||
-; @nossp_alwaysinline should be inlined due to alwaysinline.
|
||||
-define i32 @ssp_caller() sspstrong {
|
||||
-; CHECK-LABEL: @ssp_caller(
|
||||
-; CHECK-NEXT: [[TMP1:%.*]] = call i32 @nossp()
|
||||
-; CHECK-NEXT: ret i32 43
|
||||
-;
|
||||
- call i32 @nossp()
|
||||
- %2 = call i32 @nossp_alwaysinline()
|
||||
- ret i32 %2
|
||||
-}
|
||||
-
|
||||
-; The alwaysinline attribute can also appear on the CallBase (ie. the call
|
||||
-; site), ie. when __attribute__((flatten)) is used on the caller. Treat this
|
||||
-; the same as if the caller had the fn attr alwaysinline and permit inline
|
||||
-; substitution, despite the mismatch between caller and callee on ssp attrs.
|
||||
-;
|
||||
-; Curiously, the always_inline attribute on a CallInst is only expanded by the
|
||||
-; inline pass, but not always_inline pass!
|
||||
-define i32 @nossp_alwaysinline_caller() {
|
||||
-; CHECK-INLINE-LABEL: @nossp_alwaysinline_caller(
|
||||
-; CHECK-INLINE-NEXT: ret i32 42
|
||||
-;
|
||||
- %1 = call i32 @ssp() alwaysinline
|
||||
- ret i32 %1
|
||||
-}
|
||||
diff --git a/llvm/test/Transforms/Inline/inline_ssp.ll b/llvm/test/Transforms/Inline/inline_ssp.ll
|
||||
index ccfe93453159..a4f73f4dcd5a 100644
|
||||
--- a/llvm/test/Transforms/Inline/inline_ssp.ll
|
||||
+++ b/llvm/test/Transforms/Inline/inline_ssp.ll
|
||||
@@ -9,15 +9,23 @@
|
||||
|
||||
; These first four functions (@fun_sspreq, @fun_sspstrong, @fun_ssp, @fun_nossp)
|
||||
; are used by the remaining functions to ensure that the SSP attributes are
|
||||
-; propagated correctly. The caller should have its SSP attribute set as:
|
||||
+; propagated correctly. If the caller had an SSP attribute before inlining, it
|
||||
+; should have its new SSP attribute set as:
|
||||
; strictest(caller-ssp-attr, callee-ssp-attr), where strictness is ordered as:
|
||||
-; sspreq > sspstrong > ssp > [no ssp]
|
||||
+; sspreq > sspstrong > ssp
|
||||
+
|
||||
define internal void @fun_sspreq() sspreq {
|
||||
entry:
|
||||
%call = call i32 (i8*, ...) @printf(i8* getelementptr inbounds ([12 x i8], [12 x i8]* @.str3, i32 0, i32 0))
|
||||
ret void
|
||||
}
|
||||
|
||||
+define internal void @fun_sspreq_alwaysinline() sspreq alwaysinline {
|
||||
+entry:
|
||||
+ %call = call i32 (i8*, ...) @printf(i8* getelementptr inbounds ([12 x i8], [12 x i8]* @.str3, i32 0, i32 0))
|
||||
+ ret void
|
||||
+}
|
||||
+
|
||||
define internal void @fun_sspstrong() sspstrong {
|
||||
entry:
|
||||
%call = call i32 (i8*, ...) @printf(i8* getelementptr inbounds ([15 x i8], [15 x i8]* @.str2, i32 0, i32 0))
|
||||
@@ -66,6 +74,13 @@ entry:
|
||||
ret void
|
||||
}
|
||||
|
||||
+define void @alwaysinline_req_nossp() {
|
||||
+entry:
|
||||
+; CHECK: @alwaysinline_req_nossp() {
|
||||
+ call void @fun_sspreq_alwaysinline()
|
||||
+ ret void
|
||||
+}
|
||||
+
|
||||
define void @inline_strong_req() sspreq {
|
||||
entry:
|
||||
; CHECK: @inline_strong_req() #[[SSPREQ]]
|
||||
|
|
@ -1,20 +1,21 @@
|
|||
#!/usr/bin/bash
|
||||
# JOBoRun : Jwm OpenBox Obarun RUNit
|
||||
# Maintainer : Joe Bo Run <joborun@disroot.org>
|
||||
# Maintainer : Joe Bo Run <joborun@disroot.org>
|
||||
# PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobextra/$pkgname"
|
||||
# Website : https://pozol.eu
|
||||
#-----------------------------------------| DESCRIPTION |---------------------------------------
|
||||
|
||||
pkgbase=mariadb
|
||||
pkgname=('mariadb-libs' 'mariadb-clients' 'mariadb' 'mytop')
|
||||
pkgdesc='Fast SQL database server, derived from MySQL'
|
||||
pkgver=10.7.3
|
||||
pkgdesc='Fast SQL database server, derived from MySQL w/o systemd and zstd'
|
||||
pkgver=10.7.4
|
||||
pkgrel=01
|
||||
arch=('x86_64')
|
||||
#options=('debug')
|
||||
url='https://mariadb.org/'
|
||||
makedepends=('boost' 'bzip2' 'cmake' 'jemalloc' 'libaio' 'libxcrypt'
|
||||
'libxml2' 'lz4' 'lzo' 'openssl' 'zlib' 'zstd' 'curl'
|
||||
'krb5' 'cracklib' 'judy' 'xz')
|
||||
makedepends=('boost' 'bzip2' 'cmake' 'cracklib' 'curl' 'jemalloc' 'judy' 'krb5' 'libaio'
|
||||
'libxcrypt' 'libxml2' 'lz4' 'openssl' 'zlib' 'xz')
|
||||
|
||||
#options=('debug')
|
||||
# The default links with mirror redirection fail for signatures, specific
|
||||
# mirrors may be out of date every now and then. Let's use the upstream
|
||||
# rsync source via https and hope it does not hurt them too much.
|
||||
|
|
@ -24,25 +25,20 @@ source=("https://rsync.osuosl.org/pub/mariadb/mariadb-${pkgver}/source/mariadb-$
|
|||
mariadb.tmpfile.conf)
|
||||
# '0001-arch-specific.patch')
|
||||
|
||||
#prepare() {
|
||||
# cd $pkgbase-$pkgver/
|
||||
#
|
||||
# # Arch Linux specific patches:
|
||||
# # * enable PrivateTmp for a little bit more security
|
||||
# # * force preloading jemalloc for memory management
|
||||
# # * make systemd-tmpfiles create MYSQL_DATADIR
|
||||
## patch -Np1 < ../0001-arch-specific.patch
|
||||
##}
|
||||
prepare() {
|
||||
cd $pkgbase-$pkgver/
|
||||
|
||||
# removed config entries from build below
|
||||
# -DINSTALL_SYSTEMD_UNITDIR=/usr/lib/systemd/system/
|
||||
# -DINSTALL_SYSTEMD_SYSUSERSDIR=/usr/lib/sysusers.d/
|
||||
# -DINSTALL_SYSTEMD_TMPFILESDIR=/usr/lib/tmpfiles.d/
|
||||
# Arch Linux specific patches:
|
||||
# * enable PrivateTmp for a little bit more security
|
||||
# * force preloading jemalloc for memory management
|
||||
# * make systemd-tmpfiles create MYSQL_DATADIR
|
||||
## patch -Np1 < ../0001-arch-specific.patch
|
||||
}
|
||||
|
||||
build() {
|
||||
local _cmake_options=(
|
||||
# build options
|
||||
-DCOMPILATION_COMMENT="joborun-pkg Linux"
|
||||
-DCOMPILATION_COMMENT="joborun Linux"
|
||||
-DCMAKE_BUILD_TYPE=RelWithDebInfo
|
||||
-Wno-dev
|
||||
|
||||
|
|
@ -162,14 +158,14 @@ package_mariadb() {
|
|||
'etc/my.cnf.d/provider_bzip2.cnf'
|
||||
'etc/my.cnf.d/provider_lz4.cnf'
|
||||
'etc/my.cnf.d/provider_lzma.cnf'
|
||||
'etc/my.cnf.d/server.cnf'
|
||||
'etc/my.cnf.d/s3.cnf'
|
||||
'etc/my.cnf.d/server.cnf'
|
||||
'etc/my.cnf.d/spider.cnf'
|
||||
'etc/security/user_map.conf')
|
||||
#
|
||||
# install=mariadb.install # this is systemd specific post install manipulation
|
||||
#
|
||||
depends=( "mariadb-clients=${pkgver}" 'bzip2' 'libxml2' 'lz4' 'libxml2' 'zstd')
|
||||
depends=( "mariadb-clients=${pkgver}" 'bzip2' 'libxml2' 'lz4' 'libxml2')
|
||||
optdepends=('cracklib: for cracklib plugin'
|
||||
'curl: for ha_s3 plugin'
|
||||
'galera: for MariaDB cluster with Galera WSREP'
|
||||
|
|
@ -247,7 +243,8 @@ license=('GPL')
|
|||
|
||||
validpgpkeys=('199369E5404BD5FC7D2FE43BCBCB082A1BB943DB') # MariaDB Package Signing Key <package-signing-key@mariadb.org>
|
||||
|
||||
sha256sums=(da286919ffc9c913282202349709b6ba4ebcd342815e8dae0aa6b6bd8f515cd4 # mariadb-10.7.3.tar.gz
|
||||
e841210836d4e893bee977f85e73537c2d9bd707f715b6f64a6022aa8cd05024 # mariadb-10.7.3.tar.gz.asc
|
||||
sha256sums=(73dd9c9d325520f20ca5e0ef16f94b7be1146bed7e4a78e735c20daebf3a4173 # mariadb-10.7.4.tar.gz
|
||||
6effe802267b7dfaf0facac47437e7ea9c544f72356f259eb050528abb67892b # mariadb-10.7.4.tar.gz.asc
|
||||
711b4e7cf40e2b1ab132655a8d64f5a721027296f7a5731ffa70b504b3d805cd # mariadb.sysusers.conf
|
||||
5ff8916c32c87ac45f05171669ff94e5a1a81c6bd7e6516b63fd9db8723916fc) # mariadb.tmpfile.conf
|
||||
|
||||
|
|
|
|||
|
|
@ -4,14 +4,13 @@
|
|||
pkgbase=mariadb
|
||||
pkgname=('mariadb-libs' 'mariadb-clients' 'mariadb' 'mytop')
|
||||
pkgdesc='Fast SQL database server, derived from MySQL'
|
||||
pkgver=10.6.7
|
||||
pkgver=10.7.4
|
||||
pkgrel=1
|
||||
arch=('x86_64')
|
||||
license=('GPL')
|
||||
url='https://mariadb.org/'
|
||||
makedepends=('boost' 'bzip2' 'cmake' 'jemalloc' 'libaio' 'libxcrypt'
|
||||
'libxml2' 'lz4' 'lzo' 'openssl' 'systemd' 'zlib' 'zstd' 'curl'
|
||||
'krb5' 'cracklib' 'judy')
|
||||
makedepends=('boost' 'bzip2' 'cmake' 'cracklib' 'curl' 'jemalloc' 'judy' 'krb5' 'libaio'
|
||||
'libxcrypt' 'libxml2' 'lz4' 'openssl' 'systemd' 'zlib' 'zstd' 'xz')
|
||||
options=('debug')
|
||||
validpgpkeys=('199369E5404BD5FC7D2FE43BCBCB082A1BB943DB') # MariaDB Package Signing Key <package-signing-key@mariadb.org>
|
||||
# The default links with mirror redirection fail for signatures, specific
|
||||
|
|
@ -20,7 +19,7 @@ validpgpkeys=('199369E5404BD5FC7D2FE43BCBCB082A1BB943DB') # MariaDB Package Sign
|
|||
# https://mariadb.com/kb/en/library/mirror-sites-for-mariadb/
|
||||
source=("https://rsync.osuosl.org/pub/mariadb/mariadb-${pkgver}/source/mariadb-${pkgver}.tar.gz"{,.asc}
|
||||
'0001-arch-specific.patch')
|
||||
sha256sums=('75ee0f1f865a765fc461ab165419417a719e308faba784b2c97ecbe9e4b4b2c5'
|
||||
sha256sums=('73dd9c9d325520f20ca5e0ef16f94b7be1146bed7e4a78e735c20daebf3a4173'
|
||||
'SKIP'
|
||||
'3289efb3452d199aec872115f35da3f1d6fd4ce774615076690e9bc8afae1460')
|
||||
|
||||
|
|
@ -105,7 +104,7 @@ check() {
|
|||
|
||||
package_mariadb-libs() {
|
||||
pkgdesc='MariaDB libraries'
|
||||
depends=('bzip2' 'libaio' 'libxcrypt' 'libcrypt.so' 'lz4' 'lzo' 'openssl' 'xz' 'zlib')
|
||||
depends=('libaio' 'libxcrypt' 'libcrypt.so' 'openssl' 'zlib')
|
||||
optdepends=('krb5: for gssapi authentication')
|
||||
conflicts=('libmysqlclient' 'libmariadbclient' 'mariadb-connector-c')
|
||||
provides=('libmariadbclient' 'mariadb-connector-c' 'libmariadb.so' 'libmariadbd.so')
|
||||
|
|
@ -155,18 +154,22 @@ package_mariadb() {
|
|||
'etc/my.cnf.d/client.cnf'
|
||||
'etc/my.cnf.d/enable_encryption.preset'
|
||||
'etc/my.cnf.d/mysql-clients.cnf'
|
||||
'etc/my.cnf.d/server.cnf'
|
||||
'etc/my.cnf.d/provider_bzip2.cnf'
|
||||
'etc/my.cnf.d/provider_lz4.cnf'
|
||||
'etc/my.cnf.d/provider_lzma.cnf'
|
||||
'etc/my.cnf.d/s3.cnf'
|
||||
'etc/my.cnf.d/server.cnf'
|
||||
'etc/my.cnf.d/spider.cnf'
|
||||
'etc/security/user_map.conf')
|
||||
install=mariadb.install
|
||||
depends=("mariadb-clients=${pkgver}" 'systemd-libs' 'libxml2' 'zstd')
|
||||
depends=("mariadb-clients=${pkgver}" 'bzip2' 'libxml2' 'lz4' 'systemd-libs' 'libxml2' 'zstd')
|
||||
optdepends=('cracklib: for cracklib plugin'
|
||||
'curl: for ha_s3 plugin'
|
||||
'galera: for MariaDB cluster with Galera WSREP'
|
||||
'judy: for Open Query GRAPH (OQGraph) computation engine'
|
||||
'perl-dbd-mariadb: for mariadb-hotcopy, mariadb-convert-table-format and mariadb-setpermission'
|
||||
'python-mysqlclient: for myrocks_hotbackup'
|
||||
'perl-dbd-mariadb: for mariadb-hotcopy, mariadb-convert-table-format and mariadb-setpermission')
|
||||
'xz: lzma provider')
|
||||
conflicts=('mysql')
|
||||
provides=("mysql=$pkgver")
|
||||
options=('emptydirs')
|
||||
|
|
|
|||
|
|
@ -1,7 +1,9 @@
|
|||
|
||||
boost
|
||||
cmake
|
||||
jemalloc
|
||||
libaio
|
||||
lzo
|
||||
cracklib
|
||||
jemalloc
|
||||
judy
|
||||
libaio
|
||||
libxml2
|
||||
|
||||
|
|
|
|||
|
|
@ -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.0.3
|
||||
pkgver=22.1.0
|
||||
pkgrel=01
|
||||
arch=('x86_64')
|
||||
#options=(debug) # uncomment this if you want the debug package built
|
||||
|
|
@ -224,7 +224,6 @@ validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D' # Emil Velikov <emil.l
|
|||
'71C4B75620BC75708B4BDB254C95FAAB3EB073EC' # Dylan Baker <dylan@pnwbakers.com>
|
||||
'57551DE15B968F6341C248F68D8E31AFC32428A6') # Eric Engestrom <eric@engestrom.ch>
|
||||
|
||||
sha256sums=(9f2b30f5276a9abaf71aafc6979685e2636189de1a87aea2c9e69744a6d0ebb9 # mesa-22.0.3.tar.xz
|
||||
1a665daa44390d2ad3da2f4421985ae47a831b3db45b7a98c11a9a7a317d8e2e # mesa-22.0.3.tar.xz.sig
|
||||
sha256sums=(df6270c1371eaa2aa6eb65b95cbbb2a98b14fa4b7ba0ed45e4ca2fd32df60477 # mesa-22.1.0.tar.xz
|
||||
ef3cf6e0522fbfa9aaf065461b6431a71984eb6c811b25ab72f6aa26b67e8ee5 # mesa-22.1.0.tar.xz.sig
|
||||
7052ba73bb07ea78873a2431ee4e828f4e72bda7d176d07f770fa48373dec537) # LICENSE
|
||||
|
||||
|
|
|
|||
|
|
@ -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.0.3
|
||||
pkgver=22.1.0
|
||||
pkgrel=1
|
||||
arch=('x86_64')
|
||||
makedepends=('python-mako' 'libxml2' 'libx11' 'xorgproto' 'libdrm' 'libxshmfence' 'libxxf86vm'
|
||||
|
|
@ -18,7 +18,7 @@ license=('custom')
|
|||
options=('debug')
|
||||
source=(https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig}
|
||||
LICENSE)
|
||||
sha512sums=('3982cd2fadca5349b2513885ed734c2422e3f2dced85f471f245b120ffaf018acafcd929dc5ec317f2c568bb5f619f5a3475d3a92495f766a2eefb225efcac14'
|
||||
sha512sums=('a2a6f6f37d1e63aa5537a2bbdfd8634fafebf7e223099deb0fd96749d6d1880ea692231fe12eb06ade78a5eb483d11d6f9ef746e94fe3fd58b4381d469afa934'
|
||||
'SKIP'
|
||||
'f9f0d0ccf166fe6cb684478b6f1e1ab1f2850431c06aa041738563eb1808a004e52cdec823c103c9e180f03ffc083e95974d291353f0220fe52ae6d4897fecc7')
|
||||
validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D' # Emil Velikov <emil.l.velikov@gmail.com>
|
||||
|
|
|
|||
|
|
@ -1,11 +1,12 @@
|
|||
#!/usr/bin/bash
|
||||
# JOBoRun : Jwm OpenBox Obarun RUNit
|
||||
# Maintainer : Joe Bo Run <joborun@disroot.org>
|
||||
# Maintainer : Joe Bo Run <joborun@disroot.org>
|
||||
# PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobextra/$pkgname"
|
||||
# Website : https://pozol.eu
|
||||
#-----------------------------------------| DESCRIPTION |---------------------------------------
|
||||
|
||||
pkgname=ninja
|
||||
pkgver=1.10.2
|
||||
pkgver=1.11.0
|
||||
pkgrel=01
|
||||
pkgdesc='Small build system with a focus on speed'
|
||||
arch=(x86_64)
|
||||
|
|
@ -48,6 +49,4 @@ package() {
|
|||
|
||||
license=(Apache)
|
||||
|
||||
sha1sums=('8415866400a85a1ced2140e52c5db714baec7444')
|
||||
|
||||
sha256sums=(4e7b67da70a84084d5147a97fcfb867660eff55cc60a95006c389c4ca311b77d) # ninja-1.10.2.zip
|
||||
sha256sums=(3500dd5a302e9648701539e33e974e227490c98591165aa40540a0a4765cdc36) # ninja-1.11.0.zip
|
||||
|
|
|
|||
|
|
@ -0,0 +1,46 @@
|
|||
# Maintainer: Anatol Pomozov <anatol.pomozov@gmail.com>
|
||||
# Contributor: Filip Brcic <brcha@gna.org>
|
||||
# Contributor: Mika Fischer <mika.fischer@zoopnet.de>
|
||||
# Contributor: Gergely Imreh <imrehgATgmailDOTcom>
|
||||
|
||||
pkgname=ninja
|
||||
pkgver=1.11.0
|
||||
pkgrel=1
|
||||
pkgdesc='Small build system with a focus on speed'
|
||||
arch=(x86_64)
|
||||
url='https://ninja-build.org/'
|
||||
license=(Apache)
|
||||
depends=(gcc-libs)
|
||||
makedepends=(python re2c emacs-nox)
|
||||
source=($pkgname-$pkgver.zip::https://github.com/martine/ninja/archive/v$pkgver.zip)
|
||||
sha1sums=('e2de757c4dfa38985b348863b43e2609b56ad305')
|
||||
|
||||
build() {
|
||||
cd ninja-$pkgver
|
||||
|
||||
python configure.py --bootstrap
|
||||
emacs -Q --batch -f batch-byte-compile misc/ninja-mode.el
|
||||
}
|
||||
|
||||
check() {
|
||||
cd ninja-$pkgver
|
||||
|
||||
python ./configure.py
|
||||
./ninja ninja_test
|
||||
./ninja_test
|
||||
}
|
||||
|
||||
package() {
|
||||
cd ninja-$pkgver
|
||||
|
||||
install -m755 -D ninja "$pkgdir/usr/bin/ninja"
|
||||
install -m644 -D doc/manual.asciidoc "$pkgdir/usr/share/doc/ninja/manual.asciidoc"
|
||||
install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
|
||||
|
||||
install -m644 -D misc/ninja-mode.el "$pkgdir/usr/share/emacs/site-lisp/ninja-mode.el"
|
||||
install -m644 -D misc/ninja-mode.elc "$pkgdir/usr/share/emacs/site-lisp/ninja-mode.elc"
|
||||
install -m644 -D misc/ninja.vim "$pkgdir/usr/share/vim/vimfiles/syntax/ninja.vim"
|
||||
|
||||
install -m644 -D misc/bash-completion "$pkgdir/usr/share/bash-completion/completions/ninja"
|
||||
install -m644 -D misc/zsh-completion "$pkgdir/usr/share/zsh/site-functions/_ninja"
|
||||
}
|
||||
|
|
@ -1 +1,4 @@
|
|||
python re2c emacs-git
|
||||
python
|
||||
re2c
|
||||
emacs-git
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
|
||||
real 1m1.976s
|
||||
user 2m13.493s
|
||||
sys 0m5.785s
|
||||
|
||||
real 1m21.772s
|
||||
user 2m45.395s
|
||||
sys 0m7.168s
|
||||
|
||||
|
|
|
|||
|
|
@ -1,12 +1,13 @@
|
|||
#!/usr/bin/bash
|
||||
# JOBoRun : Jwm OpenBox Obarun RUNit
|
||||
# Maintainer : Joe Bo Run <joborun@disroot.org>
|
||||
# Maintainer : Joe Bo Run <joborun@disroot.org>
|
||||
# PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobextra/$pkgname"
|
||||
# Website : https://pozol.eu
|
||||
#-----------------------------------------| DESCRIPTION |---------------------------------------
|
||||
|
||||
pkgname=numactl
|
||||
pkgver=2.0.14
|
||||
pkgrel=02
|
||||
pkgrel=03
|
||||
pkgdesc="Simple NUMA policy support"
|
||||
arch=(x86_64)
|
||||
groups=( jobbot )
|
||||
|
|
@ -14,8 +15,7 @@ groups=( jobbot )
|
|||
## Instead the author is an ex-employee and a few contributors, but the initial 2.0 SGI code is still under the code. The url is false though, surprisingly nobody in Arch has noticed for 7 years.
|
||||
depends=(glibc)
|
||||
provides=(libnuma.so)
|
||||
## NOTE: debug pkg currently unavailable as it contains /build dir
|
||||
###options=(!debug)
|
||||
#options=(!debug) # uncomment this to produce the debug pkg
|
||||
source=("https://github.com/numactl/numactl/releases/download/v${pkgver}/${pkgname}-${pkgver}.tar.gz")
|
||||
|
||||
prepare(){
|
||||
|
|
@ -36,7 +36,7 @@ check() {
|
|||
|
||||
package() {
|
||||
make DESTDIR="$pkgdir" install -C $pkgname-$pkgver
|
||||
install -vDm 644 $pkgname-$pkgver/README.md -t "${pkgdir}/usr/share/doc/${pkgname}"
|
||||
install -vDm 644 $pkgname-$pkgver/README.md -t "$pkgdir/usr/share/doc/$pkgname/"
|
||||
# move_pages(2) is provided by man-pages and is more up-to-date there anyway
|
||||
rm -rf "$pkgdir/usr/share/man/man2"
|
||||
}
|
||||
|
|
@ -46,3 +46,4 @@ package() {
|
|||
license=('LGPL2.1' 'GPL2')
|
||||
|
||||
sha256sums=(826bd148c1b6231e1284e42a4db510207747484b112aee25ed6b1078756bcff6) # numactl-2.0.14.tar.gz
|
||||
|
||||
|
|
|
|||
|
|
@ -4,37 +4,36 @@
|
|||
|
||||
pkgname=numactl
|
||||
pkgver=2.0.14
|
||||
pkgrel=1
|
||||
pkgrel=3
|
||||
pkgdesc="Simple NUMA policy support"
|
||||
arch=('x86_64')
|
||||
url="http://oss.sgi.com/projects/libnuma/"
|
||||
license=('LGPL2.1' 'GPL2')
|
||||
depends=('glibc')
|
||||
provides=('libnuma.so')
|
||||
source=("https://github.com/numactl/numactl/releases/download/v${pkgver}/${pkgname}-${pkgver}.tar.gz")
|
||||
arch=(x86_64)
|
||||
url="https://github.com/numactl/numactl"
|
||||
license=(LGPL2.1 GPL2)
|
||||
depends=(glibc)
|
||||
provides=(libnuma.so)
|
||||
options=(debug)
|
||||
source=(https://github.com/numactl/numactl/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz)
|
||||
sha512sums=('28b95985d6b2f26c5f6f15fe235224c998c86f534adf5fdaa355a292cf2fd65515c91ba2a76c899d552d439b18ea1209a1712bd6755f8ee3a442f3935993b2e6')
|
||||
b2sums=('5f2abe25061ac29ecad8a6b24fe800d72c3538d9a155358f4b329ed1140053c7dbd93f01891904f76db94ed01113a34b4ebcbbf40e4060caf747958785ac9590')
|
||||
|
||||
prepare(){
|
||||
cd "${pkgname}-${pkgver}"
|
||||
autoreconf -vfi
|
||||
cd $pkgname-$pkgver
|
||||
autoreconf -fiv
|
||||
}
|
||||
|
||||
build() {
|
||||
cd "${pkgname}-${pkgver}"
|
||||
cd $pkgname-$pkgver
|
||||
./configure --prefix=/usr
|
||||
make
|
||||
}
|
||||
|
||||
check() {
|
||||
cd "${pkgname}-${pkgver}"
|
||||
make -k test || echo "Tests known to fail depending on system load."
|
||||
make -k test -C $pkgname-$pkgver || echo "Tests known to fail depending on system load."
|
||||
}
|
||||
|
||||
package() {
|
||||
cd "${pkgname}-${pkgver}"
|
||||
make DESTDIR="$pkgdir" install
|
||||
make DESTDIR="$pkgdir" install -C $pkgname-$pkgver
|
||||
install -vDm 644 $pkgname-$pkgver/README.md -t "$pkgdir/usr/share/doc/$pkgname/"
|
||||
# move_pages(2) is provided by man-pages and is more up-to-date there anyway
|
||||
rm -rf "$pkgdir/usr/share/man/man2"
|
||||
install -vDm 644 README.md -t "${pkgdir}/usr/share/doc/${pkgname}"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
autoconf
|
||||
automake
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
#-----------------------------------------| DESCRIPTION |---------------------------------------
|
||||
|
||||
pkgname=python-setuptools
|
||||
pkgver=59.8.0
|
||||
pkgver=60.6.0
|
||||
pkgrel=01
|
||||
epoch=1
|
||||
pkgdesc="Easily download, build, install, upgrade, and uninstall Python packages"
|
||||
|
|
@ -15,9 +15,9 @@ url="https://pypi.org/project/setuptools/"
|
|||
depends=('python-appdirs' 'python-more-itertools' 'python-ordered-set' 'python-packaging'
|
||||
'python-pyparsing')
|
||||
makedepends=('git' 'python-setuptools')
|
||||
checkdepends=('python-jaraco.envs' 'python-jaraco.path' 'python-mock' 'python-pip'
|
||||
checkdepends=('python-jaraco.envs' 'python-jaraco.path' 'python-mock' 'python-pip' 'python-pip-run'
|
||||
'python-pytest-fixture-config' 'python-pytest-flake8' 'python-pytest-virtualenv'
|
||||
'python-wheel' 'python-paver' 'python-pytest-cov' 'python-sphinx')
|
||||
'python-wheel' 'python-paver' 'python-pytest-cov' 'python-sphinx' 'python-build')
|
||||
provides=('python-distribute')
|
||||
replaces=('python-distribute')
|
||||
source=("$pkgname-$pkgver.tar.gz::https://github.com/pypa/setuptools/archive/v$pkgver.tar.gz")
|
||||
|
|
@ -75,7 +75,11 @@ check() { (
|
|||
export PYTHONDONTWRITEBYTECODE=1
|
||||
|
||||
cd setuptools-$pkgver
|
||||
python -m pytest --deselect setuptools/tests/test_distutils_adoption.py
|
||||
SETUPTOOLS_USE_DISTUTILS=stdlib python -m pytest \
|
||||
--deselect setuptools/tests/test_distutils_adoption.py \
|
||||
--deselect setuptools/tests/integration/test_pip_install_sdist.py \
|
||||
--deselect setuptools/tests/test_setuptools.py::test_its_own_wheel_does_not_contain_tests
|
||||
|
||||
)}
|
||||
|
||||
package() {
|
||||
|
|
@ -87,6 +91,4 @@ package() {
|
|||
|
||||
license=('PSF')
|
||||
|
||||
sha256sums=(53b636f214f390f5d78f947dea13a5e47a18b45fa5d75a3c5d70d0853fad7d6d) # python-setuptools-59.8.0.tar.gz
|
||||
|
||||
|
||||
sha256sums=(48a5a29318c0517d0ebb05c7a776895bb9c82422d72c31661d91b58be11b65d8) # python-setuptools-60.6.0.tar.gz
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
# Contributor: Eli Schwartz <eschwartz@archlinux.org>
|
||||
|
||||
pkgname=python-setuptools
|
||||
pkgver=59.8.0
|
||||
pkgver=60.6.0
|
||||
pkgrel=1
|
||||
epoch=1
|
||||
pkgdesc="Easily download, build, install, upgrade, and uninstall Python packages"
|
||||
|
|
@ -13,13 +13,13 @@ url="https://pypi.org/project/setuptools/"
|
|||
depends=('python-appdirs' 'python-more-itertools' 'python-ordered-set' 'python-packaging'
|
||||
'python-pyparsing')
|
||||
makedepends=('git' 'python-setuptools')
|
||||
checkdepends=('python-jaraco.envs' 'python-jaraco.path' 'python-mock' 'python-pip'
|
||||
checkdepends=('python-jaraco.envs' 'python-jaraco.path' 'python-mock' 'python-pip' 'python-pip-run'
|
||||
'python-pytest-fixture-config' 'python-pytest-flake8' 'python-pytest-virtualenv'
|
||||
'python-wheel' 'python-paver' 'python-pytest-cov' 'python-sphinx')
|
||||
'python-wheel' 'python-paver' 'python-pytest-cov' 'python-sphinx' 'python-build')
|
||||
provides=('python-distribute')
|
||||
replaces=('python-distribute')
|
||||
source=("$pkgname-$pkgver.tar.gz::https://github.com/pypa/setuptools/archive/v$pkgver.tar.gz")
|
||||
sha512sums=('9aaaf0565f54c0b998de67a79be7ffb54369d05d516b1294d4aecf4f47a38619111836262013053fd73d84a8b5206072e542f59afc011e8b0331009a8f3d2c69')
|
||||
sha512sums=('29685c27cb9ebd0a8ab9673f449f7ec0c71f29e724bc19055a2a5c5cceb323c33f1dd79ef6f11b94af232c6103bdf23cff18812e3f6cef014b2fc344fe2f9f17')
|
||||
|
||||
export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=0
|
||||
|
||||
|
|
@ -74,7 +74,10 @@ check() { (
|
|||
export PYTHONDONTWRITEBYTECODE=1
|
||||
|
||||
cd setuptools-$pkgver
|
||||
python -m pytest --deselect setuptools/tests/test_distutils_adoption.py
|
||||
SETUPTOOLS_USE_DISTUTILS=stdlib python -m pytest \
|
||||
--deselect setuptools/tests/test_distutils_adoption.py \
|
||||
--deselect setuptools/tests/integration/test_pip_install_sdist.py \
|
||||
--deselect setuptools/tests/test_setuptools.py::test_its_own_wheel_does_not_contain_tests
|
||||
)}
|
||||
|
||||
package() {
|
||||
|
|
|
|||
|
|
@ -17,4 +17,6 @@ python-paver
|
|||
python-pytest-cov
|
||||
python-sphinx
|
||||
|
||||
python-pip-run
|
||||
python-build
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,6 @@
|
|||
|
||||
real 2m9.455s
|
||||
user 1m26.833s
|
||||
sys 0m8.562s
|
||||
real 1m11.200s
|
||||
user 1m1.035s
|
||||
sys 0m6.687s
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -7,10 +7,10 @@
|
|||
|
||||
pkgbase=qt5-base
|
||||
pkgname=(qt5-base qt5-xcb-private-headers)
|
||||
_basever=5.15.3
|
||||
pkgver=5.15.3+kde+r145
|
||||
_basever=5.15.4
|
||||
pkgver=5.15.4+kde+r144
|
||||
pkgrel=02 ## rebuild against postgresql
|
||||
_commit=cfa044e74c4f3be46fe2f177d022af3321766b1f
|
||||
_commit=0b45b0e13a87f08f5a3f452000aa26734d3c2bdf
|
||||
arch=('x86_64')
|
||||
url='https://www.qt.io'
|
||||
pkgdesc='A cross-platform application and UI framework'
|
||||
|
|
|
|||
|
|
@ -3,10 +3,10 @@
|
|||
|
||||
pkgbase=qt5-base
|
||||
pkgname=(qt5-base qt5-xcb-private-headers)
|
||||
_basever=5.15.3
|
||||
pkgver=5.15.3+kde+r145
|
||||
_basever=5.15.4
|
||||
pkgver=5.15.4+kde+r144
|
||||
pkgrel=1
|
||||
_commit=cfa044e74c4f3be46fe2f177d022af3321766b1f
|
||||
_commit=0b45b0e13a87f08f5a3f452000aa26734d3c2bdf
|
||||
arch=('x86_64')
|
||||
url='https://www.qt.io'
|
||||
license=('GPL3' 'LGPL3' 'FDL' 'custom')
|
||||
|
|
|
|||
|
|
@ -0,0 +1,265 @@
|
|||
#!/usr/bin/bash
|
||||
# JOBoRun : Jwm OpenBox Obarun RUNit
|
||||
# Maintainer : Joe Bo Run <joborun@disroot.org>
|
||||
# PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobextra/$pkgname"
|
||||
# Website : https://pozol.eu
|
||||
#-----------------------------------------| DESCRIPTION |---------------------------------------
|
||||
|
||||
pkgname=vlc
|
||||
_vlcver=3.0.17.4
|
||||
# optional fixup version including hyphen
|
||||
_vlcfixupver=
|
||||
pkgver=${_vlcver}${_vlcfixupver//-/.r}
|
||||
pkgrel=03
|
||||
pkgdesc='Multi-platform MPEG, VCD/DVD, and DivX player - no systemd,avahi,dbus '
|
||||
url='https://www.videolan.org/vlc/'
|
||||
arch=('x86_64')
|
||||
# NOTE: switch to ffmpeg4.4, as ffmpeg >= 5 requires extensive changes disabling VAAPI (only supported with vlc >= 4)
|
||||
depends=('a52dec' 'libdvbpsi' 'libxpm' 'libdca' 'libproxy' 'lua52' 'libidn'
|
||||
'libmatroska' 'taglib' 'libmpcdec' 'ffmpeg4.4' 'faad2' 'libmad'
|
||||
'libmpeg2' 'xcb-util-keysyms' 'libtar' 'libxinerama' 'libsecret'
|
||||
'libupnp' 'libixml.so' 'libupnp.so' 'libarchive' 'qt5-base'
|
||||
'qt5-x11extras' 'qt5-svg' 'freetype2' 'fribidi' 'harfbuzz'
|
||||
'fontconfig' 'libxml2' 'gnutls' 'libplacebo' 'wayland-protocols')
|
||||
makedepends=('gst-plugins-base-libs' 'live-media' 'libnotify' 'libbluray'
|
||||
'flac' 'libdc1394' 'libavc1394' 'libcaca' 'gtk3'
|
||||
'librsvg' 'libgme' 'xosd' 'twolame' 'aalib' 'avahi'
|
||||
'libmtp' 'libmicrodns' 'libdvdcss' 'smbclient'
|
||||
'vcdimager' 'libssh2' 'mesa' 'protobuf' 'libnfs' 'mpg123'
|
||||
'libdvdread' 'libdvdnav' 'libogg' 'libshout' 'libmodplug' 'libvpx'
|
||||
'libvorbis' 'speex' 'opus' 'libtheora' 'libpng' 'libjpeg-turbo'
|
||||
'libx265.so' 'libx264.so' 'zvbi' 'libass' 'libkate' 'libtiger'
|
||||
'sdl_image' 'libpulse' 'alsa-lib' 'jack' 'libsamplerate' 'libsoxr'
|
||||
'lirc' 'libgoom2' 'projectm' 'aom' 'srt'
|
||||
'aribb24' 'aribb25' 'pcsclite')
|
||||
|
||||
# 'chromaprint: Chromaprint audio fingerprinter'
|
||||
optdepends=('avahi: service discovery using bonjour protocol'
|
||||
'aom: AOM AV1 codec'
|
||||
'gst-plugins-base-libs: for libgst plugins'
|
||||
# 'dav1d: dav1d AV1 decoder' ## dav1d has been disabled as makedependency to avoid build error
|
||||
'libdvdcss: decoding encrypted DVDs'
|
||||
'libavc1394: devices using the 1394ta AV/C'
|
||||
'libdc1394: IEEE 1394 access plugin'
|
||||
'kwallet: kwallet keystore'
|
||||
'libva-vdpau-driver: vdpau backend nvidia'
|
||||
'libva-intel-driver: video backend intel'
|
||||
'libbluray: Blu-Ray video input'
|
||||
'flac: Free Lossless Audio Codec plugin'
|
||||
'twolame: TwoLAME mpeg2 encoder plugin'
|
||||
'libgme: Game Music Emu plugin'
|
||||
'vcdimager: navigate VCD with libvcdinfo'
|
||||
'libmtp: MTP devices discovery'
|
||||
'smbclient: SMB access plugin'
|
||||
'libcdio: audio CD playback'
|
||||
'gnu-free-fonts: subtitle font '
|
||||
'ttf-dejavu: subtitle font'
|
||||
'libssh2: sftp access'
|
||||
'libnfs: NFS access'
|
||||
'mpg123: mpg123 codec'
|
||||
'protobuf: chromecast streaming'
|
||||
'libmicrodns: mDNS services discovery (chromecast etc)'
|
||||
'lua52-socket: http interface'
|
||||
'libdvdread: DVD input module'
|
||||
'libdvdnav: DVD with navigation input module'
|
||||
'libogg: Ogg and OggSpots codec'
|
||||
'libshout: shoutcast/icecast output plugin'
|
||||
'libmodplug: MOD output plugin'
|
||||
'libvpx: VP8 and VP9 codec'
|
||||
'libvorbis: Vorbis decoder/encoder'
|
||||
'speex: Speex codec'
|
||||
'opus: opus codec'
|
||||
'libtheora: theora codec'
|
||||
'libpng: PNG support'
|
||||
'libjpeg-turbo: JPEG support'
|
||||
'librsvg: SVG plugin'
|
||||
'x264: H264 encoding'
|
||||
'x265: HEVC/H.265 encoder'
|
||||
'zvbi: VBI/Teletext/webcam/v4l2 capture/decoding'
|
||||
'libass: Subtitle support'
|
||||
'libkate: Kate codec'
|
||||
'libtiger: Tiger rendering for Kate streams'
|
||||
'sdl_image: SDL image support'
|
||||
'srt: SRT input/output plugin'
|
||||
'aalib: ASCII art video output'
|
||||
'libcaca: colored ASCII art video output'
|
||||
'libpulse: PulseAudio audio output'
|
||||
'alsa-lib: ALSA audio output'
|
||||
'jack: jack audio server'
|
||||
'libsamplerate: audio Resampler'
|
||||
'libsoxr: SoX audio Resampler'
|
||||
'lirc: lirc control'
|
||||
'libgoom2: Goom visualization'
|
||||
'projectm: ProjectM visualisation'
|
||||
'ncurses: ncurses interface'
|
||||
'libnotify: notification plugin'
|
||||
'gtk3: notification plugin'
|
||||
'aribb24: aribsub support'
|
||||
'aribb25: aribcam support'
|
||||
'pcsclite: aribcam support')
|
||||
conflicts=('vlc-plugin')
|
||||
replaces=('vlc-plugin')
|
||||
options=('!emptydirs')
|
||||
#options=(debug '!emptydirs') ## uncomment this and comment the above options to produce the debug pkg
|
||||
source=(https://download.videolan.org/${pkgname}/${_vlcver}/${pkgname}-${_vlcver}${_vlcfixupver}.tar.xz{,.asc}
|
||||
update-vlc-plugin-cache.hook
|
||||
caca-fix-to-newer-version.patch
|
||||
vlc-live-media-2021.patch)
|
||||
|
||||
prepare() {
|
||||
cd ${pkgname}-${_vlcver}
|
||||
sed -e 's:truetype/ttf-dejavu:TTF:g' -i modules/visualization/projectm.cpp
|
||||
sed -e 's|-Werror-implicit-function-declaration||g' -i configure
|
||||
sed 's|whoami|echo builduser|g' -i configure
|
||||
sed 's|hostname -f|echo arch|g' -i configure
|
||||
local src
|
||||
for src in "${source[@]}"; do
|
||||
src="${src%%::*}"
|
||||
src="${src##*/}"
|
||||
[[ $src = *.patch ]] || continue
|
||||
echo "Applying patch $src..."
|
||||
patch -Np1 < "../$src"
|
||||
done
|
||||
autoreconf -vf
|
||||
}
|
||||
|
||||
build() {
|
||||
cd ${pkgname}-${_vlcver}
|
||||
|
||||
export CFLAGS+=" -I/usr/include/samba-4.0 -ffat-lto-objects"
|
||||
export CPPFLAGS+=" -I/usr/include/samba-4.0"
|
||||
export CXXFLAGS+=" -std=c++11"
|
||||
# upstream doesn't support lua 5.4 yet: https://trac.videolan.org/vlc/ticket/25036
|
||||
export LUAC=/usr/bin/luac5.2
|
||||
export LUA_LIBS="$(pkg-config --libs lua5.2)"
|
||||
export RCC=/usr/bin/rcc-qt5
|
||||
export PKG_CONFIG_PATH="/usr/lib/ffmpeg4.4/pkgconfig/:$PKG_CONFIG_PATH"
|
||||
|
||||
./configure \
|
||||
--prefix=/usr \
|
||||
--sysconfdir=/etc \
|
||||
--with-kde-solid=/usr/share/solid/actions/ \
|
||||
--disable-rpath \
|
||||
--enable-nls \
|
||||
--enable-archive \
|
||||
--enable-live555 \
|
||||
--enable-dc1394 \
|
||||
--enable-dv1394 \
|
||||
--enable-dvdread \
|
||||
--enable-dvdnav \
|
||||
--enable-bluray \
|
||||
--disable-opencv \
|
||||
--enable-smbclient \
|
||||
--enable-sftp \
|
||||
--enable-nfs \
|
||||
--enable-realrtsp \
|
||||
--enable-dvbpsi \
|
||||
--enable-gme \
|
||||
--enable-ogg \
|
||||
--enable-shout \
|
||||
--enable-matroska \
|
||||
--enable-mod \
|
||||
--enable-mpc \
|
||||
--enable-mad \
|
||||
--enable-mpg123 \
|
||||
--enable-gst-decode \
|
||||
--enable-avcodec \
|
||||
--enable-libva \
|
||||
--enable-avformat \
|
||||
--enable-postproc \
|
||||
--enable-faad \
|
||||
--enable-vpx \
|
||||
--enable-twolame \
|
||||
--disable-fdkaac \
|
||||
--enable-a52 \
|
||||
--enable-dca \
|
||||
--enable-flac \
|
||||
--enable-libmpeg2 \
|
||||
--enable-vorbis \
|
||||
--enable-speex \
|
||||
--enable-opus \
|
||||
--enable-oggspots \
|
||||
--disable-schroedinger \
|
||||
--enable-png \
|
||||
--enable-jpeg \
|
||||
--enable-x264 \
|
||||
--enable-x265 \
|
||||
--enable-zvbi \
|
||||
--enable-libass \
|
||||
--enable-kate \
|
||||
--enable-tiger \
|
||||
--enable-vdpau \
|
||||
--enable-wayland \
|
||||
--enable-sdl-image \
|
||||
--enable-freetype \
|
||||
--enable-fribidi \
|
||||
--enable-harfbuzz \
|
||||
--enable-fontconfig \
|
||||
--enable-svg \
|
||||
--enable-svgdec \
|
||||
--enable-aa \
|
||||
--enable-caca \
|
||||
--disable-pulse \
|
||||
--enable-alsa \
|
||||
--enable-jack \
|
||||
--enable-samplerate \
|
||||
--enable-soxr \
|
||||
--disable-chromaprint \
|
||||
--enable-chromecast \
|
||||
--enable-qt \
|
||||
--enable-skins2 \
|
||||
--enable-libtar \
|
||||
--enable-ncurses \
|
||||
--enable-lirc \
|
||||
--enable-goom \
|
||||
--enable-projectm \
|
||||
--disable-avahi \
|
||||
--enable-mtp \
|
||||
--enable-upnp \
|
||||
--enable-microdns \
|
||||
--enable-libxml2 \
|
||||
--disable-libgcrypt \
|
||||
--enable-gnutls \
|
||||
--enable-taglib \
|
||||
--enable-secret \
|
||||
--enable-kwallet \
|
||||
--disable-update-check \
|
||||
--enable-notify \
|
||||
--enable-libplacebo \
|
||||
--enable-vlc \
|
||||
--enable-aribsub \
|
||||
--enable-aribcam \
|
||||
--enable-aom \
|
||||
--enable-srt \
|
||||
--disable-dav1d \
|
||||
--disable-dbus
|
||||
|
||||
# prevent excessive overlinking due to libtool
|
||||
sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
|
||||
make
|
||||
}
|
||||
|
||||
package() {
|
||||
cd ${pkgname}-${_vlcver}
|
||||
|
||||
make DESTDIR="${pkgdir}" install
|
||||
|
||||
for res in 16 32 48 128 256; do
|
||||
install -Dm 644 "${srcdir}/vlc-${_vlcver}/share/icons/${res}x${res}/vlc.png" \
|
||||
"${pkgdir}/usr/share/icons/hicolor/${res}x${res}/apps/vlc.png"
|
||||
done
|
||||
install -Dm 644 "${srcdir}/update-vlc-plugin-cache.hook" -t "${pkgdir}/usr/share/libalpm/hooks"
|
||||
}
|
||||
|
||||
#---- license gpg-key sha256sums ----
|
||||
|
||||
license=('LGPL2.1' 'GPL2')
|
||||
|
||||
validpgpkeys=('65F7C6B4206BD057A7EB73787180713BE58D1ADC') # VideoLAN Release Signing Key
|
||||
|
||||
sha256sums=(8c5a62d88a4fb45c1b095cf10befef217dfa87aedcec5184b9e7d590b6dd4133 # vlc-3.0.17.4.tar.xz
|
||||
f310f9eda5cca0fda31f90ddc95b615f6de7c648bbfeac3f1de5b9ee67e57bee # vlc-3.0.17.4.tar.xz.asc
|
||||
b98043683dd90d3f5a3f501212dfc629839b661100de5ac79fd30cb7b4a06f13 # update-vlc-plugin-cache.hook
|
||||
a45340d4f4fc371c70ae96e13ee8ced28930e77b1598b2429ac84a4a31029b86 # caca-fix-to-newer-version.patch
|
||||
08f6a07a149039255d34ff04db08c3de477966118f62339a631b53ffa2dfd85a) # vlc-live-media-2021.patch
|
||||
|
||||
|
|
@ -0,0 +1,258 @@
|
|||
# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
|
||||
# Contributor: Giovanni Scafora <giovanni@archlinux.org>
|
||||
# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
|
||||
# Contributor: Martin Sandsmark <martin.sandsmark@kde.org>
|
||||
|
||||
pkgname=vlc
|
||||
_vlcver=3.0.17.4
|
||||
# optional fixup version including hyphen
|
||||
_vlcfixupver=
|
||||
pkgver=${_vlcver}${_vlcfixupver//-/.r}
|
||||
pkgrel=3
|
||||
pkgdesc='Multi-platform MPEG, VCD/DVD, and DivX player'
|
||||
url='https://www.videolan.org/vlc/'
|
||||
arch=('x86_64')
|
||||
license=('LGPL2.1' 'GPL2')
|
||||
# NOTE: switch to ffmpeg4.4, as ffmpeg >= 5 requires extensive changes disabling VAAPI (only supported with vlc >= 4)
|
||||
depends=('a52dec' 'libdvbpsi' 'libxpm' 'libdca' 'libproxy' 'lua52' 'libidn'
|
||||
'libmatroska' 'taglib' 'libmpcdec' 'ffmpeg4.4' 'faad2' 'libmad'
|
||||
'libmpeg2' 'xcb-util-keysyms' 'libtar' 'libxinerama' 'libsecret'
|
||||
'libupnp' 'libixml.so' 'libupnp.so' 'libarchive' 'qt5-base'
|
||||
'qt5-x11extras' 'qt5-svg' 'freetype2' 'fribidi' 'harfbuzz'
|
||||
'fontconfig' 'libxml2' 'gnutls' 'libplacebo' 'wayland-protocols')
|
||||
makedepends=('gst-plugins-base-libs' 'live-media' 'libnotify' 'libbluray'
|
||||
'flac' 'libdc1394' 'libavc1394' 'libcaca' 'gtk3'
|
||||
'librsvg' 'libgme' 'xosd' 'twolame' 'aalib' 'avahi' 'systemd-libs'
|
||||
'libmtp' 'libmicrodns' 'libdvdcss' 'smbclient'
|
||||
'vcdimager' 'libssh2' 'mesa' 'protobuf' 'libnfs' 'mpg123'
|
||||
'libdvdread' 'libdvdnav' 'libogg' 'libshout' 'libmodplug' 'libvpx'
|
||||
'libvorbis' 'speex' 'opus' 'libtheora' 'libpng' 'libjpeg-turbo'
|
||||
'libx265.so' 'libx264.so' 'zvbi' 'libass' 'libkate' 'libtiger'
|
||||
'sdl_image' 'libpulse' 'alsa-lib' 'jack' 'libsamplerate' 'libsoxr'
|
||||
'lirc' 'libgoom2' 'projectm' 'aom' 'srt' 'dav1d'
|
||||
'aribb24' 'aribb25' 'pcsclite')
|
||||
|
||||
# 'chromaprint: Chromaprint audio fingerprinter'
|
||||
optdepends=('avahi: service discovery using bonjour protocol'
|
||||
'aom: AOM AV1 codec'
|
||||
'gst-plugins-base-libs: for libgst plugins'
|
||||
'dav1d: dav1d AV1 decoder'
|
||||
'libdvdcss: decoding encrypted DVDs'
|
||||
'libavc1394: devices using the 1394ta AV/C'
|
||||
'libdc1394: IEEE 1394 access plugin'
|
||||
'kwallet: kwallet keystore'
|
||||
'libva-vdpau-driver: vdpau backend nvidia'
|
||||
'libva-intel-driver: video backend intel'
|
||||
'libbluray: Blu-Ray video input'
|
||||
'flac: Free Lossless Audio Codec plugin'
|
||||
'twolame: TwoLAME mpeg2 encoder plugin'
|
||||
'libgme: Game Music Emu plugin'
|
||||
'vcdimager: navigate VCD with libvcdinfo'
|
||||
'libmtp: MTP devices discovery'
|
||||
'systemd-libs: udev services discovery'
|
||||
'smbclient: SMB access plugin'
|
||||
'libcdio: audio CD playback'
|
||||
'gnu-free-fonts: subtitle font '
|
||||
'ttf-dejavu: subtitle font'
|
||||
'libssh2: sftp access'
|
||||
'libnfs: NFS access'
|
||||
'mpg123: mpg123 codec'
|
||||
'protobuf: chromecast streaming'
|
||||
'libmicrodns: mDNS services discovery (chromecast etc)'
|
||||
'lua52-socket: http interface'
|
||||
'libdvdread: DVD input module'
|
||||
'libdvdnav: DVD with navigation input module'
|
||||
'libogg: Ogg and OggSpots codec'
|
||||
'libshout: shoutcast/icecast output plugin'
|
||||
'libmodplug: MOD output plugin'
|
||||
'libvpx: VP8 and VP9 codec'
|
||||
'libvorbis: Vorbis decoder/encoder'
|
||||
'speex: Speex codec'
|
||||
'opus: opus codec'
|
||||
'libtheora: theora codec'
|
||||
'libpng: PNG support'
|
||||
'libjpeg-turbo: JPEG support'
|
||||
'librsvg: SVG plugin'
|
||||
'x264: H264 encoding'
|
||||
'x265: HEVC/H.265 encoder'
|
||||
'zvbi: VBI/Teletext/webcam/v4l2 capture/decoding'
|
||||
'libass: Subtitle support'
|
||||
'libkate: Kate codec'
|
||||
'libtiger: Tiger rendering for Kate streams'
|
||||
'sdl_image: SDL image support'
|
||||
'srt: SRT input/output plugin'
|
||||
'aalib: ASCII art video output'
|
||||
'libcaca: colored ASCII art video output'
|
||||
'libpulse: PulseAudio audio output'
|
||||
'alsa-lib: ALSA audio output'
|
||||
'jack: jack audio server'
|
||||
'libsamplerate: audio Resampler'
|
||||
'libsoxr: SoX audio Resampler'
|
||||
'lirc: lirc control'
|
||||
'libgoom2: Goom visualization'
|
||||
'projectm: ProjectM visualisation'
|
||||
'ncurses: ncurses interface'
|
||||
'libnotify: notification plugin'
|
||||
'gtk3: notification plugin'
|
||||
'aribb24: aribsub support'
|
||||
'aribb25: aribcam support'
|
||||
'pcsclite: aribcam support')
|
||||
conflicts=('vlc-plugin')
|
||||
replaces=('vlc-plugin')
|
||||
options=(debug '!emptydirs')
|
||||
source=(https://download.videolan.org/${pkgname}/${_vlcver}/${pkgname}-${_vlcver}${_vlcfixupver}.tar.xz{,.asc}
|
||||
update-vlc-plugin-cache.hook
|
||||
caca-fix-to-newer-version.patch
|
||||
vlc-live-media-2021.patch)
|
||||
sha512sums=('dac14c6586603c064294672eb878253e52b3a7bef431fb10303345e5400591b5c1f2d452a2af03f503db0ca186582a84be06fdf05ab011c33f7b0bd5389c51fb'
|
||||
'SKIP'
|
||||
'b247510ffeadfd439a5dadd170c91900b6cdb05b5ca00d38b1a17c720ffe5a9f75a32e0cb1af5ebefdf1c23c5acc53513ed983a736e8fa30dd8fad237ef49dd3'
|
||||
'ef479a246dc98f882a05ca56a1c2872cc67ced154c625790070b887858ddc250d55b1295db82c9122e5ecd3c2c9c712ec9718e28d0a9d21ff6a230eb6c5010ce'
|
||||
'ad17d6f4f2cc83841c1c89623c339ec3ee94f6084ea980e2c8cbc3903854c85e5396e31bfd8dc90745b41794670903d854c4d282d8adec263087a9d47b226ccc')
|
||||
validpgpkeys=('65F7C6B4206BD057A7EB73787180713BE58D1ADC') # VideoLAN Release Signing Key
|
||||
|
||||
prepare() {
|
||||
cd ${pkgname}-${_vlcver}
|
||||
sed -e 's:truetype/ttf-dejavu:TTF:g' -i modules/visualization/projectm.cpp
|
||||
sed -e 's|-Werror-implicit-function-declaration||g' -i configure
|
||||
sed 's|whoami|echo builduser|g' -i configure
|
||||
sed 's|hostname -f|echo arch|g' -i configure
|
||||
local src
|
||||
for src in "${source[@]}"; do
|
||||
src="${src%%::*}"
|
||||
src="${src##*/}"
|
||||
[[ $src = *.patch ]] || continue
|
||||
echo "Applying patch $src..."
|
||||
patch -Np1 < "../$src"
|
||||
done
|
||||
autoreconf -vf
|
||||
}
|
||||
|
||||
build() {
|
||||
cd ${pkgname}-${_vlcver}
|
||||
|
||||
export CFLAGS+=" -I/usr/include/samba-4.0 -ffat-lto-objects"
|
||||
export CPPFLAGS+=" -I/usr/include/samba-4.0"
|
||||
export CXXFLAGS+=" -std=c++11"
|
||||
# upstream doesn't support lua 5.4 yet: https://trac.videolan.org/vlc/ticket/25036
|
||||
export LUAC=/usr/bin/luac5.2
|
||||
export LUA_LIBS="$(pkg-config --libs lua5.2)"
|
||||
export RCC=/usr/bin/rcc-qt5
|
||||
export PKG_CONFIG_PATH="/usr/lib/ffmpeg4.4/pkgconfig/:$PKG_CONFIG_PATH"
|
||||
|
||||
./configure \
|
||||
--prefix=/usr \
|
||||
--sysconfdir=/etc \
|
||||
--with-kde-solid=/usr/share/solid/actions/ \
|
||||
--disable-rpath \
|
||||
--enable-nls \
|
||||
--enable-archive \
|
||||
--enable-live555 \
|
||||
--enable-dc1394 \
|
||||
--enable-dv1394 \
|
||||
--enable-dvdread \
|
||||
--enable-dvdnav \
|
||||
--enable-bluray \
|
||||
--disable-opencv \
|
||||
--enable-smbclient \
|
||||
--enable-sftp \
|
||||
--enable-nfs \
|
||||
--enable-realrtsp \
|
||||
--enable-dvbpsi \
|
||||
--enable-gme \
|
||||
--enable-ogg \
|
||||
--enable-shout \
|
||||
--enable-matroska \
|
||||
--enable-mod \
|
||||
--enable-mpc \
|
||||
--enable-mad \
|
||||
--enable-mpg123 \
|
||||
--enable-gst-decode \
|
||||
--enable-avcodec \
|
||||
--enable-libva \
|
||||
--enable-avformat \
|
||||
--enable-postproc \
|
||||
--enable-faad \
|
||||
--enable-vpx \
|
||||
--enable-twolame \
|
||||
--disable-fdkaac \
|
||||
--enable-a52 \
|
||||
--enable-dca \
|
||||
--enable-flac \
|
||||
--enable-libmpeg2 \
|
||||
--enable-vorbis \
|
||||
--enable-speex \
|
||||
--enable-opus \
|
||||
--enable-oggspots \
|
||||
--disable-schroedinger \
|
||||
--enable-png \
|
||||
--enable-jpeg \
|
||||
--enable-x264 \
|
||||
--enable-x265 \
|
||||
--enable-zvbi \
|
||||
--enable-libass \
|
||||
--enable-kate \
|
||||
--enable-tiger \
|
||||
--enable-vdpau \
|
||||
--enable-wayland \
|
||||
--enable-sdl-image \
|
||||
--enable-freetype \
|
||||
--enable-fribidi \
|
||||
--enable-harfbuzz \
|
||||
--enable-fontconfig \
|
||||
--enable-svg \
|
||||
--enable-svgdec \
|
||||
--enable-aa \
|
||||
--enable-caca \
|
||||
--enable-pulse \
|
||||
--enable-alsa \
|
||||
--enable-jack \
|
||||
--enable-samplerate \
|
||||
--enable-soxr \
|
||||
--disable-chromaprint \
|
||||
--enable-chromecast \
|
||||
--enable-qt \
|
||||
--enable-skins2 \
|
||||
--enable-libtar \
|
||||
--enable-ncurses \
|
||||
--enable-lirc \
|
||||
--enable-goom \
|
||||
--enable-projectm \
|
||||
--enable-avahi \
|
||||
--enable-mtp \
|
||||
--enable-upnp \
|
||||
--enable-microdns \
|
||||
--enable-libxml2 \
|
||||
--disable-libgcrypt \
|
||||
--enable-gnutls \
|
||||
--enable-taglib \
|
||||
--enable-secret \
|
||||
--enable-kwallet \
|
||||
--disable-update-check \
|
||||
--enable-notify \
|
||||
--enable-libplacebo \
|
||||
--enable-vlc \
|
||||
--enable-aribsub \
|
||||
--enable-aribcam \
|
||||
--enable-aom \
|
||||
--enable-srt \
|
||||
--enable-dav1d
|
||||
|
||||
# prevent excessive overlinking due to libtool
|
||||
sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
|
||||
make
|
||||
}
|
||||
|
||||
package() {
|
||||
cd ${pkgname}-${_vlcver}
|
||||
|
||||
make DESTDIR="${pkgdir}" install
|
||||
|
||||
for res in 16 32 48 128 256; do
|
||||
install -Dm 644 "${srcdir}/vlc-${_vlcver}/share/icons/${res}x${res}/vlc.png" \
|
||||
"${pkgdir}/usr/share/icons/hicolor/${res}x${res}/apps/vlc.png"
|
||||
done
|
||||
install -Dm 644 "${srcdir}/update-vlc-plugin-cache.hook" -t "${pkgdir}/usr/share/libalpm/hooks"
|
||||
}
|
||||
|
||||
# vim: ts=2 sw=2 et:
|
||||
|
|
@ -0,0 +1,130 @@
|
|||
From 900318072a7ebce28745aa3863e1364b7258baff Mon Sep 17 00:00:00 2001
|
||||
From: Alexandre Janniaux <ajanni@videolabs.io>
|
||||
Date: Wed, 10 Nov 2021 15:37:52 +0100
|
||||
Subject: [PATCH] caca: fix to newer version
|
||||
|
||||
Migrate to the new API instead of libcucul API, which has been merged
|
||||
into libcaca since 0.99.beta15:
|
||||
|
||||
commit f61816ceb7445f8bf818936151554ac060764b39
|
||||
Author: Sam Hocevar <sam@hocevar.net>
|
||||
Date: Sat Sep 27 13:12:46 2008 +0000
|
||||
|
||||
Starting refactoring to get rid of libcucul. The initial reason for the
|
||||
split is rendered moot by the plugin system: when enabled, binaries do
|
||||
not link directly with libX11 or libGL. I hope this is a step towards
|
||||
more consisteny and clarity.
|
||||
|
||||
It was then completely wiped out by the following commit, which is part
|
||||
of v0.99.beta20:
|
||||
|
||||
commit 5f0ec215f8c9915ed028324a8ecac8212f68e18d
|
||||
Author: Sam Hocevar <sam@hocevar.net>
|
||||
Date: Thu May 3 10:33:30 2018 +0200
|
||||
|
||||
Remove legacy code from 10 years ago.
|
||||
|
||||
(cherry picked from commit d35391caa03c046149e7fe2497f51bf59ed8551d)
|
||||
---
|
||||
modules/video_output/caca.c | 30 +++++++++++++++---------------
|
||||
1 file changed, 15 insertions(+), 15 deletions(-)
|
||||
|
||||
diff --git a/modules/video_output/caca.c b/modules/video_output/caca.c
|
||||
index 33a0409820..a2e922a864 100644
|
||||
--- a/modules/video_output/caca.c
|
||||
+++ b/modules/video_output/caca.c
|
||||
@@ -74,9 +74,9 @@ static void Place(vout_display_t *, vout_display_place_t *);
|
||||
|
||||
/* */
|
||||
struct vout_display_sys_t {
|
||||
- cucul_canvas_t *cv;
|
||||
+ caca_canvas_t *cv;
|
||||
caca_display_t *dp;
|
||||
- cucul_dither_t *dither;
|
||||
+ caca_dither_t *dither;
|
||||
|
||||
picture_pool_t *pool;
|
||||
vout_display_event_thread_t *et;
|
||||
@@ -153,9 +153,9 @@ static int Open(vlc_object_t *object)
|
||||
if (!sys)
|
||||
goto error;
|
||||
|
||||
- sys->cv = cucul_create_canvas(0, 0);
|
||||
+ sys->cv = caca_create_canvas(0, 0);
|
||||
if (!sys->cv) {
|
||||
- msg_Err(vd, "cannot initialize libcucul");
|
||||
+ msg_Err(vd, "cannot initialize libcaca");
|
||||
goto error;
|
||||
}
|
||||
|
||||
@@ -209,11 +209,11 @@ error:
|
||||
if (sys->pool)
|
||||
picture_pool_Release(sys->pool);
|
||||
if (sys->dither)
|
||||
- cucul_free_dither(sys->dither);
|
||||
+ caca_free_dither(sys->dither);
|
||||
if (sys->dp)
|
||||
caca_free_display(sys->dp);
|
||||
if (sys->cv)
|
||||
- cucul_free_canvas(sys->cv);
|
||||
+ caca_free_canvas(sys->cv);
|
||||
|
||||
free(sys);
|
||||
}
|
||||
@@ -235,9 +235,9 @@ static void Close(vlc_object_t *object)
|
||||
if (sys->pool)
|
||||
picture_pool_Release(sys->pool);
|
||||
if (sys->dither)
|
||||
- cucul_free_dither(sys->dither);
|
||||
+ caca_free_dither(sys->dither);
|
||||
caca_free_display(sys->dp);
|
||||
- cucul_free_canvas(sys->cv);
|
||||
+ caca_free_canvas(sys->cv);
|
||||
|
||||
#if defined(_WIN32)
|
||||
FreeConsole();
|
||||
@@ -266,7 +266,7 @@ static void Prepare(vout_display_t *vd, picture_t *picture, subpicture_t *subpic
|
||||
|
||||
if (!sys->dither) {
|
||||
/* Create the libcaca dither object */
|
||||
- sys->dither = cucul_create_dither(32,
|
||||
+ sys->dither = caca_create_dither(32,
|
||||
vd->source.i_visible_width,
|
||||
vd->source.i_visible_height,
|
||||
picture->p[0].i_pitch,
|
||||
@@ -284,12 +284,12 @@ static void Prepare(vout_display_t *vd, picture_t *picture, subpicture_t *subpic
|
||||
vout_display_place_t place;
|
||||
Place(vd, &place);
|
||||
|
||||
- cucul_set_color_ansi(sys->cv, CUCUL_COLOR_DEFAULT, CUCUL_COLOR_BLACK);
|
||||
- cucul_clear_canvas(sys->cv);
|
||||
+ caca_set_color_ansi(sys->cv, CACA_DEFAULT, CACA_BLACK);
|
||||
+ caca_clear_canvas(sys->cv);
|
||||
|
||||
const int crop_offset = vd->source.i_y_offset * picture->p->i_pitch +
|
||||
vd->source.i_x_offset * picture->p->i_pixel_pitch;
|
||||
- cucul_dither_bitmap(sys->cv, place.x, place.y,
|
||||
+ caca_dither_bitmap(sys->cv, place.x, place.y,
|
||||
place.width, place.height,
|
||||
sys->dither,
|
||||
&picture->p->p_pixels[crop_offset]);
|
||||
@@ -328,7 +328,7 @@ static int Control(vout_display_t *vd, int query, va_list args)
|
||||
|
||||
case VOUT_DISPLAY_CHANGE_SOURCE_CROP:
|
||||
if (sys->dither)
|
||||
- cucul_free_dither(sys->dither);
|
||||
+ caca_free_dither(sys->dither);
|
||||
sys->dither = NULL;
|
||||
return VLC_SUCCESS;
|
||||
|
||||
@@ -366,8 +366,8 @@ static void Place(vout_display_t *vd, vout_display_place_t *place)
|
||||
|
||||
vout_display_PlacePicture(place, &vd->source, vd->cfg, false);
|
||||
|
||||
- const int canvas_width = cucul_get_canvas_width(sys->cv);
|
||||
- const int canvas_height = cucul_get_canvas_height(sys->cv);
|
||||
+ const int canvas_width = caca_get_canvas_width(sys->cv);
|
||||
+ const int canvas_height = caca_get_canvas_height(sys->cv);
|
||||
const int display_width = caca_get_display_width(sys->dp);
|
||||
const int display_height = caca_get_display_height(sys->dp);
|
||||
|
||||
|
|
@ -0,0 +1,87 @@
|
|||
a52dec
|
||||
libdvbpsi
|
||||
libxpm
|
||||
libdca
|
||||
libproxy
|
||||
lua52
|
||||
libidn
|
||||
libmatroska
|
||||
taglib
|
||||
libmpcdec
|
||||
ffmpeg4.4
|
||||
faad2
|
||||
libmad
|
||||
libmpeg2
|
||||
xcb-util-keysyms
|
||||
libtar
|
||||
libxinerama
|
||||
libupnp
|
||||
qt5-base
|
||||
qt5-x11extras
|
||||
qt5-svg
|
||||
freetype2
|
||||
fribidi
|
||||
harfbuzz
|
||||
fontconfig
|
||||
libxml2
|
||||
libplacebo
|
||||
wayland-protocols
|
||||
gst-plugins-base-libs
|
||||
live-media
|
||||
libnotify
|
||||
libbluray
|
||||
flac
|
||||
libdc1394
|
||||
libavc1394
|
||||
libcaca
|
||||
gtk3
|
||||
librsvg
|
||||
libgme
|
||||
xosd
|
||||
twolame
|
||||
aalib
|
||||
avahi
|
||||
libmtp
|
||||
libmicrodns
|
||||
libdvdcss
|
||||
smbclient
|
||||
vcdimager
|
||||
mesa
|
||||
protobuf
|
||||
libnfs
|
||||
mpg123
|
||||
libdvdread
|
||||
libdvdnav
|
||||
libogg
|
||||
libshout
|
||||
libmodplug
|
||||
libvpx
|
||||
libvorbis
|
||||
speex
|
||||
opus
|
||||
libtheora
|
||||
libpng
|
||||
libjpeg-turbo
|
||||
x265
|
||||
x264
|
||||
zvbi
|
||||
libass
|
||||
libkate
|
||||
libtiger
|
||||
sdl_image
|
||||
libpulse
|
||||
alsa-lib
|
||||
jack2
|
||||
libsamplerate
|
||||
libsoxr
|
||||
lirc
|
||||
libgoom2
|
||||
projectm
|
||||
aom
|
||||
srt
|
||||
aribb24
|
||||
aribb25
|
||||
pcsclite
|
||||
autoconf
|
||||
automake
|
||||
gettext
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
[Trigger]
|
||||
Type = Path
|
||||
Operation = Install
|
||||
Operation = Upgrade
|
||||
Operation = Remove
|
||||
Target = usr/lib/vlc/plugins/*
|
||||
|
||||
[Action]
|
||||
Description = Updating the vlc plugin cache...
|
||||
When = PostTransaction
|
||||
Exec = /usr/lib/vlc/vlc-cache-gen /usr/lib/vlc/plugins
|
||||
|
|
@ -0,0 +1,26 @@
|
|||
diff -ru vlc-3.0.13.orig/configure.ac vlc-3.0.13/configure.ac
|
||||
--- vlc-3.0.13.orig/configure.ac 2021-04-27 15:18:39.000000000 +0200
|
||||
+++ vlc-3.0.13/configure.ac 2021-05-03 16:26:26.691200904 +0200
|
||||
@@ -1825,7 +1825,7 @@
|
||||
AC_MSG_ERROR([Update live555 or pass --disable-live555 to disable RTSP input support.])
|
||||
])
|
||||
], [
|
||||
- other_libs="-lgroupsock -lBasicUsageEnvironment -lUsageEnvironment"
|
||||
+ other_libs="-lcrypto -lssl -lgroupsock -lBasicUsageEnvironment -lUsageEnvironment"
|
||||
other_libs_pic="-lgroupsock_pic -lBasicUsageEnvironment_pic -lUsageEnvironment_pic"
|
||||
AS_IF([test "${SYS}" = "mingw32"], [
|
||||
# add ws2_32 for closesocket, select, recv
|
||||
diff -ru vlc-3.0.13.orig/modules/access/live555.cpp vlc-3.0.13/modules/access/live555.cpp
|
||||
--- vlc-3.0.13.orig/modules/access/live555.cpp 2019-03-29 20:01:15.000000000 +0100
|
||||
+++ vlc-3.0.13/modules/access/live555.cpp 2021-05-03 16:04:38.030121796 +0200
|
||||
@@ -852,7 +852,9 @@
|
||||
if( !p_sys->b_multicast )
|
||||
{
|
||||
/* We need different rollover behaviour for multicast */
|
||||
- p_sys->b_multicast = IsMulticastAddress( sub->connectionEndpointAddress() );
|
||||
+ struct sockaddr_storage tempAddr;
|
||||
+ sub->getConnectionEndpointAddress(tempAddr);
|
||||
+ p_sys->b_multicast = IsMulticastAddress( tempAddr );
|
||||
}
|
||||
|
||||
tk = (live_track_t*)malloc( sizeof( live_track_t ) );
|
||||
|
|
@ -0,0 +1,43 @@
|
|||
#!/usr/bin/bash
|
||||
# JOBoRun : Jwm OpenBox Obarun RUNit
|
||||
# Maintainer : Joe Bo Run <joborun@disroot.org>
|
||||
# PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobextra/$pkgname"
|
||||
# Website : https://pozol.eu
|
||||
#-----------------------------------------| DESCRIPTION |---------------------------------------
|
||||
|
||||
pkgname=vulkan-headers
|
||||
_pkgname=Vulkan-Headers
|
||||
pkgver=1.3.213
|
||||
pkgrel=01
|
||||
epoch=1
|
||||
pkgdesc="Vulkan header files"
|
||||
arch=(any)
|
||||
url="https://www.khronos.org/vulkan/"
|
||||
makedepends=(cmake git)
|
||||
provides=("vulkan-hpp=${pkgver}")
|
||||
groups=(vulkan-devel)
|
||||
source=("${pkgname}-${pkgver}.tar.gz::https://github.com/KhronosGroup/Vulkan-Headers/archive/v${pkgver}.tar.gz")
|
||||
|
||||
build() {
|
||||
cd Vulkan-Headers*
|
||||
|
||||
rm -rf build ; mkdir build ; cd build
|
||||
cmake -DCMAKE_INSTALL_PREFIX=/usr \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
..
|
||||
make
|
||||
}
|
||||
|
||||
package() {
|
||||
cd Vulkan-Headers*/build
|
||||
|
||||
make DESTDIR="${pkgdir}" install
|
||||
}
|
||||
|
||||
#---- license gpg-key sha256sums ----
|
||||
|
||||
license=('APACHE')
|
||||
|
||||
sha256sums=(7f4a6118dc3524703c1ce0a44089379e89eeb930fbe28188b90fdac1f10ef676) # v1.3.213.tar.gz
|
||||
|
||||
|
||||
|
|
@ -0,0 +1,32 @@
|
|||
# Maintainer: Laurent Carlier <lordheavym@gmail.com>
|
||||
|
||||
pkgname=vulkan-headers
|
||||
_pkgname=Vulkan-Headers
|
||||
pkgver=1.3.213
|
||||
pkgrel=1
|
||||
epoch=1
|
||||
pkgdesc="Vulkan header files"
|
||||
arch=(any)
|
||||
url="https://www.khronos.org/vulkan/"
|
||||
license=('APACHE')
|
||||
makedepends=(cmake git)
|
||||
provides=("vulkan-hpp=${pkgver}")
|
||||
groups=(vulkan-devel)
|
||||
source=("${pkgname}-${pkgver}.tar.gz::https://github.com/KhronosGroup/Vulkan-Headers/archive/v${pkgver}.tar.gz")
|
||||
sha256sums=('7f4a6118dc3524703c1ce0a44089379e89eeb930fbe28188b90fdac1f10ef676')
|
||||
|
||||
build() {
|
||||
cd Vulkan-Headers*
|
||||
|
||||
rm -rf build ; mkdir build ; cd build
|
||||
cmake -DCMAKE_INSTALL_PREFIX=/usr \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
..
|
||||
make
|
||||
}
|
||||
|
||||
package() {
|
||||
cd Vulkan-Headers*/build
|
||||
|
||||
make DESTDIR="${pkgdir}" install
|
||||
}
|
||||
|
|
@ -0,0 +1 @@
|
|||
rm -rf {src,pkg,vulk*tar.gz}
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
cmake
|
||||
git
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
|
||||
|
||||
real 0m9.452s
|
||||
user 0m4.904s
|
||||
sys 0m0.434s
|
||||
|
|
@ -6,7 +6,7 @@
|
|||
#-----------------------------------------| DESCRIPTION |---------------------------------------
|
||||
|
||||
pkgname=xfce4-terminal
|
||||
pkgver=1.0.2
|
||||
pkgver=1.0.4
|
||||
pkgrel=01
|
||||
pkgdesc="An xfce4 modern terminal emulator no html docs"
|
||||
arch=('x86_64')
|
||||
|
|
@ -43,4 +43,4 @@ package() {
|
|||
|
||||
license=('GPL2')
|
||||
|
||||
sha256sums=(ac1543167b43322ad2483ffb033a7e74669ecb59f4b63016a3c183d96141d326) # xfce4-terminal-1.0.2.tar.bz2
|
||||
sha256sums=(78e55957af7c6fc1f283e90be33988661593a4da98383da1b0b54fdf6554baf4) # xfce4-terminal-1.0.4.tar.bz2
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
# Contributor: Aurelien Foret <orelien@chez.com>
|
||||
|
||||
pkgname=xfce4-terminal
|
||||
pkgver=1.0.2
|
||||
pkgver=1.0.4
|
||||
pkgrel=1
|
||||
pkgdesc="A modern terminal emulator primarily for the Xfce desktop environment"
|
||||
arch=('x86_64')
|
||||
|
|
@ -13,7 +13,7 @@ groups=('xfce4')
|
|||
depends=('libxfce4ui' 'vte3' 'hicolor-icon-theme')
|
||||
makedepends=('intltool')
|
||||
source=(https://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2)
|
||||
sha256sums=('ac1543167b43322ad2483ffb033a7e74669ecb59f4b63016a3c183d96141d326')
|
||||
sha256sums=('78e55957af7c6fc1f283e90be33988661593a4da98383da1b0b54fdf6554baf4')
|
||||
|
||||
prepare() {
|
||||
cd "$srcdir/$pkgname-$pkgver"
|
||||
|
|
|
|||
|
|
@ -3,3 +3,4 @@ vte3
|
|||
hicolor-icon-theme
|
||||
intltool
|
||||
gettext
|
||||
cmake
|
||||
|
|
|
|||
Loading…
Reference in New Issue