Skip to content

Commit bbf7571

Browse files
committed
Merge branch 'master' of 192.168.60.2:archgitrepo
2 parents 705daec + d86e3f9 commit bbf7571

5 files changed

Lines changed: 34 additions & 7 deletions

File tree

alarmcn/neovim-git/PKGBUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
pkgname=neovim-git
66
_pkgname=${pkgname%-git}
7-
pkgver=0.12.0.r540.g9174157f74
7+
pkgver=0.12.0.r545.gdf5d559878
88
pkgrel=1
99
pkgdesc="Fork of Vim aiming to improve user experience, plugins, and GUIs."
1010
arch=('i686' 'x86_64' 'armv7h' 'armv6h' 'aarch64')

alarmcn/usd/PKGBUILD

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,9 @@
44
# Contributor: Adrià Cabello <adro.cc79 at protonmail dot com>
55
# Contributor: Started by https://github.com/qumaciel at https://github.com/PixarAnimationStudios/USD/issues/2000
66

7-
pkgname='usd'
8-
pkgbase=usd
7+
pkgname=usd
98
pkgver=26.05
10-
pkgrel=2
9+
pkgrel=3
1110
arch=(aarch64 x86_64)
1211
url='https://openusd.org'
1312
pkgdesc='3D VFX pipeline interchange file format'
@@ -42,10 +41,12 @@ makedepends=(cmake help2man boost git fmt)
4241
source=("git+https://github.com/PixarAnimationStudios/OpenUSD.git#tag=v${pkgver//.a/a}"
4342
https://openusd.org/images/USDLogoUnsized.svg
4443
usd-find-dependency-OpenGL.patch
44+
usd-fix-oneapi-tbb.patch
4545
"org.openusd.usdview.desktop")
4646
sha256sums=('7f7f6037675d9df00d0efbea6b7c1f44fdf3275dafe231a6a70123b3f4894e58'
4747
'529dea685836be7de95800d9688db4e1df6a8a3f341130069abdd2b5b1572128'
4848
'1cf9b9e4d902cecce278457af3092e8a180438388044939d3ab89e3a4520efc5'
49+
'39925347a48ac981e50eb16a5f43b9949471c400349e9e9f3d4b9a7e4686665c'
4950
'6b880a1dc44ee3286a19b3347f65be5337192d00bccd55fa549598db90a887da')
5051
replaces=('usd-extras')
5152
provides=('usd-extras')
@@ -56,6 +57,7 @@ prepare() {
5657
_pyver=$(python -c 'import sys; print(".".join(map(str, sys.version_info[:2])))')
5758

5859
patch -Np1 -i "$srcdir/usd-find-dependency-OpenGL.patch"
60+
patch -Np1 -i "$srcdir/usd-fix-oneapi-tbb.patch"
5961

6062
# Change directories to standard
6163
sed -i 's|plugin/usd|lib/usd/plugin|g' \

alarmcn/usd/REUSE.toml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,28 @@ path = [
66
"README.md",
77
"keys/**",
88
".SRCINFO",
9+
".gitignore",
910
".nvchecker.toml",
1011
"*.install",
1112
"*.sysusers",
13+
"*sysusers.conf",
1214
"*.tmpfiles",
15+
"*tmpfiles.conf",
1316
"*.logrotate",
1417
"*.pam",
1518
"*.service",
1619
"*.socket",
1720
"*.timer",
1821
"*.desktop",
1922
"*.hook",
20-
".gitignore",
2123
]
2224
SPDX-FileCopyrightText = "Arch Linux contributors"
2325
SPDX-License-Identifier = "0BSD"
2426

2527
[[annotations]]
26-
path = ["usd-find-dependency-OpenGL.patch"]
28+
path = [
29+
"usd-find-dependency-OpenGL.patch",
30+
"usd-fix-oneapi-tbb.patch",
31+
]
2732
SPDX-FileCopyrightText = "usd contributors"
2833
SPDX-License-Identifier = "Apache-2.0"
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
--- a/pxr/base/work/workTBB/dispatcher_impl.h
2+
+++ b/pxr/base/work/workTBB/dispatcher_impl.h
3+
@@ -14,6 +14,7 @@
4+
// the TBB version header in a way that works in all TBB versions.
5+
#include <tbb/blocked_range.h>
6+
#include <tbb/concurrent_vector.h>
7+
+#include <tbb/version.h>
8+
#if TBB_INTERFACE_VERSION_MAJOR >= 12
9+
#include <tbb/task_group.h>
10+
#else
11+
--- a/pxr/base/work/workTBB/detachedTask_impl.h
12+
+++ b/pxr/base/work/workTBB/detachedTask_impl.h
13+
@@ -8,6 +8,7 @@
14+
#define PXR_BASE_WORK_TBB_DETACHED_TASK_IMPL_H
15+
16+
#include <tbb/blocked_range.h>
17+
+#include <tbb/version.h>
18+
#include "pxr/base/work/workTBB/dispatcher_impl.h"
19+
#include "pxr/base/work/api.h"
20+

alarmcn/vcpkg-git/PKGBUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Maintainer: Kuan-Yen Chou <kuanyenchou at gmail dot com>
44

55
pkgname=vcpkg-git
6-
pkgver=2026.04.27.r139.g6b07d2d3730
6+
pkgver=2026.04.27.r140.gbc71aa640f8
77
pkgrel=1
88
pkgdesc='C++ library manager for Windows, Linux, and MacOS'
99
depends=('curl' 'zip' 'unzip')

0 commit comments

Comments
 (0)