chore: sync AUR packages (edge)
This commit is contained in:
committed by
github-actions[bot]
parent
5024f3d41c
commit
8b0dd25b38
@@ -1,6 +1,6 @@
|
|||||||
pkgbase = cliamp
|
pkgbase = cliamp
|
||||||
pkgdesc = A retro terminal music player inspired by Winamp 2.x
|
pkgdesc = A retro terminal music player inspired by Winamp 2.x
|
||||||
pkgver = 1.23.1
|
pkgver = 1.27.1
|
||||||
pkgrel = 1
|
pkgrel = 1
|
||||||
url = https://github.com/bjarneo/cliamp
|
url = https://github.com/bjarneo/cliamp
|
||||||
arch = x86_64
|
arch = x86_64
|
||||||
@@ -13,7 +13,9 @@ pkgbase = cliamp
|
|||||||
depends = libogg
|
depends = libogg
|
||||||
depends = ffmpeg
|
depends = ffmpeg
|
||||||
depends = yt-dlp
|
depends = yt-dlp
|
||||||
source = cliamp-1.23.1.tar.gz::https://github.com/bjarneo/cliamp/archive/refs/tags/v1.23.1.tar.gz
|
optdepends = pipewire-alsa: audio output on PipeWire systems
|
||||||
sha256sums = 4f447792ef10f426e7dba26bc0882b0b9c50bb54e01573c30ebcc9858e87f5fa
|
optdepends = pulseaudio-alsa: audio output on PulseAudio systems
|
||||||
|
source = cliamp-1.27.1.tar.gz::https://github.com/bjarneo/cliamp/archive/refs/tags/v1.27.1.tar.gz
|
||||||
|
sha256sums = cb382e6b961f26aa7fcf7363513a02c24e09eae91aaaadeb80e04665fa280a67
|
||||||
|
|
||||||
pkgname = cliamp
|
pkgname = cliamp
|
||||||
|
|||||||
@@ -1,15 +1,17 @@
|
|||||||
# Maintainer: bjarneo <https://github.com/bjarneo>
|
# Maintainer: bjarneo <https://github.com/bjarneo>
|
||||||
pkgname=cliamp
|
pkgname=cliamp
|
||||||
pkgver=1.23.1
|
pkgver=1.27.1
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
pkgdesc='A retro terminal music player inspired by Winamp 2.x'
|
pkgdesc='A retro terminal music player inspired by Winamp 2.x'
|
||||||
arch=('x86_64' 'aarch64')
|
arch=('x86_64' 'aarch64')
|
||||||
url='https://github.com/bjarneo/cliamp'
|
url='https://github.com/bjarneo/cliamp'
|
||||||
license=('MIT')
|
license=('MIT')
|
||||||
depends=('alsa-lib' 'flac' 'libvorbis' 'libogg' 'ffmpeg' 'yt-dlp')
|
depends=('alsa-lib' 'flac' 'libvorbis' 'libogg' 'ffmpeg' 'yt-dlp')
|
||||||
|
optdepends=('pipewire-alsa: audio output on PipeWire systems'
|
||||||
|
'pulseaudio-alsa: audio output on PulseAudio systems')
|
||||||
makedepends=('go')
|
makedepends=('go')
|
||||||
source=("${pkgname}-${pkgver}.tar.gz::https://github.com/bjarneo/cliamp/archive/refs/tags/v${pkgver}.tar.gz")
|
source=("${pkgname}-${pkgver}.tar.gz::https://github.com/bjarneo/cliamp/archive/refs/tags/v${pkgver}.tar.gz")
|
||||||
sha256sums=('4f447792ef10f426e7dba26bc0882b0b9c50bb54e01573c30ebcc9858e87f5fa')
|
sha256sums=('cb382e6b961f26aa7fcf7363513a02c24e09eae91aaaadeb80e04665fa280a67')
|
||||||
|
|
||||||
build() {
|
build() {
|
||||||
cd "${pkgname}-${pkgver}"
|
cd "${pkgname}-${pkgver}"
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
pkgbase = nvidia-580xx-utils
|
pkgbase = nvidia-580xx-utils
|
||||||
pkgver = 580.142
|
pkgver = 580.142
|
||||||
pkgrel = 1
|
pkgrel = 2
|
||||||
url = http://www.nvidia.com/
|
url = http://www.nvidia.com/
|
||||||
arch = x86_64
|
arch = x86_64
|
||||||
license = custom
|
license = custom
|
||||||
@@ -13,6 +13,7 @@ pkgbase = nvidia-580xx-utils
|
|||||||
source = nvidia-sleep.conf
|
source = nvidia-sleep.conf
|
||||||
source = https://download.nvidia.com/XFree86/Linux-x86_64/580.142/NVIDIA-Linux-x86_64-580.142.run
|
source = https://download.nvidia.com/XFree86/Linux-x86_64/580.142/NVIDIA-Linux-x86_64-580.142.run
|
||||||
source = 0001-Enable-atomic-kernel-modesetting-by-default.patch
|
source = 0001-Enable-atomic-kernel-modesetting-by-default.patch
|
||||||
|
source = 0002-Fix-hardware-cursor-crash.patch
|
||||||
source = limit-vram-usage
|
source = limit-vram-usage
|
||||||
sha256sums = be99ff3def641bb900c2486cce96530394c5dc60548fc4642f19d3a4c784134d
|
sha256sums = be99ff3def641bb900c2486cce96530394c5dc60548fc4642f19d3a4c784134d
|
||||||
sha256sums = f77a5247a3ba63e9fad3a3b2822d0fcfa51e0f79b5a90bd79bf08ea34b64ab07
|
sha256sums = f77a5247a3ba63e9fad3a3b2822d0fcfa51e0f79b5a90bd79bf08ea34b64ab07
|
||||||
@@ -22,6 +23,7 @@ pkgbase = nvidia-580xx-utils
|
|||||||
sha256sums = 12d31a5425aba66be9e9129012cde82755ad4d5b7ce9933df8fc398c4fa8d631
|
sha256sums = 12d31a5425aba66be9e9129012cde82755ad4d5b7ce9933df8fc398c4fa8d631
|
||||||
sha256sums = 20915fcf3ffe89c3550cf93b60a04a285453150d92e2468e1911a43620447563
|
sha256sums = 20915fcf3ffe89c3550cf93b60a04a285453150d92e2468e1911a43620447563
|
||||||
sha256sums = 163c57160cc1033020680f638b44ebd94b496152dcd8951e87d5077d4d5c2009
|
sha256sums = 163c57160cc1033020680f638b44ebd94b496152dcd8951e87d5077d4d5c2009
|
||||||
|
sha256sums = c1a1cf05dd12efd67858180461ad97a6ebe206b55b56df207854b322ce734613
|
||||||
sha256sums = b14f7a65359c05c373ddfc750cd4cf086a48e815489d93ad5cbe1dbf84bf8f5a
|
sha256sums = b14f7a65359c05c373ddfc750cd4cf086a48e815489d93ad5cbe1dbf84bf8f5a
|
||||||
|
|
||||||
pkgname = nvidia-580xx-utils
|
pkgname = nvidia-580xx-utils
|
||||||
|
|||||||
@@ -0,0 +1,43 @@
|
|||||||
|
diff --git a/nvidia-drm/nvidia-drm-fb.c b/nvidia-drm/nvidia-drm-fb.c
|
||||||
|
index 05506435..d6f38ee8 100644
|
||||||
|
--- a/nvidia-drm/nvidia-drm-fb.c
|
||||||
|
+++ b/nvidia-drm/nvidia-drm-fb.c
|
||||||
|
@@ -141,7 +141,6 @@ static int nv_drm_framebuffer_init(struct drm_device *dev,
|
||||||
|
struct NvKmsKapiCreateSurfaceParams params = { };
|
||||||
|
struct nv_drm_gem_object *nv_gem;
|
||||||
|
struct drm_framebuffer *fb = &nv_fb->base;
|
||||||
|
- bool non_scanout_mem_backed = false;
|
||||||
|
uint32_t i;
|
||||||
|
int ret;
|
||||||
|
|
||||||
|
@@ -163,10 +162,6 @@ static int nv_drm_framebuffer_init(struct drm_device *dev,
|
||||||
|
params.planes[i].memory = nv_gem->pMemory;
|
||||||
|
params.planes[i].offset = fb->offsets[i];
|
||||||
|
params.planes[i].pitch = fb->pitches[i];
|
||||||
|
-
|
||||||
|
- if (!nvKms->isVidmem(nv_gem->pMemory) && nv_dev->hasVideoMemory) {
|
||||||
|
- non_scanout_mem_backed = true;
|
||||||
|
- }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
params.height = fb->height;
|
||||||
|
@@ -233,15 +228,10 @@ static int nv_drm_framebuffer_init(struct drm_device *dev,
|
||||||
|
|
||||||
|
/* Create NvKmsKapiSurface */
|
||||||
|
|
||||||
|
- if (non_scanout_mem_backed) {
|
||||||
|
- /* Do not register drm_framebuffer against nvkms */
|
||||||
|
- nv_fb->pSurface = NULL;
|
||||||
|
- } else {
|
||||||
|
- nv_fb->pSurface = nvKms->createSurface(nv_dev->pDevice, ¶ms);
|
||||||
|
- if (nv_fb->pSurface == NULL) {
|
||||||
|
- NV_DRM_DEV_DEBUG_DRIVER(nv_dev, "Failed to create NvKmsKapiSurface");
|
||||||
|
- goto fail;
|
||||||
|
- }
|
||||||
|
+ nv_fb->pSurface = nvKms->createSurface(nv_dev->pDevice, ¶ms);
|
||||||
|
+ if (nv_fb->pSurface == NULL) {
|
||||||
|
+ NV_DRM_DEV_DEBUG_DRIVER(nv_dev, "Failed to create NvKmsKapiSurface");
|
||||||
|
+ goto fail;
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
@@ -8,7 +8,7 @@
|
|||||||
pkgbase=nvidia-580xx-utils
|
pkgbase=nvidia-580xx-utils
|
||||||
pkgname=('nvidia-580xx-utils' 'opencl-nvidia-580xx' 'nvidia-580xx-dkms')
|
pkgname=('nvidia-580xx-utils' 'opencl-nvidia-580xx' 'nvidia-580xx-dkms')
|
||||||
pkgver=580.142
|
pkgver=580.142
|
||||||
pkgrel=1
|
pkgrel=2
|
||||||
arch=('x86_64')
|
arch=('x86_64')
|
||||||
url="http://www.nvidia.com/"
|
url="http://www.nvidia.com/"
|
||||||
license=('custom')
|
license=('custom')
|
||||||
@@ -23,6 +23,7 @@ source=('nvidia-drm-outputclass.conf'
|
|||||||
'nvidia-sleep.conf'
|
'nvidia-sleep.conf'
|
||||||
"https://download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run"
|
"https://download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run"
|
||||||
'0001-Enable-atomic-kernel-modesetting-by-default.patch'
|
'0001-Enable-atomic-kernel-modesetting-by-default.patch'
|
||||||
|
'0002-Fix-hardware-cursor-crash.patch'
|
||||||
'limit-vram-usage')
|
'limit-vram-usage')
|
||||||
|
|
||||||
sha256sums=(
|
sha256sums=(
|
||||||
@@ -34,6 +35,7 @@ sha256sums=(
|
|||||||
'12d31a5425aba66be9e9129012cde82755ad4d5b7ce9933df8fc398c4fa8d631'
|
'12d31a5425aba66be9e9129012cde82755ad4d5b7ce9933df8fc398c4fa8d631'
|
||||||
'20915fcf3ffe89c3550cf93b60a04a285453150d92e2468e1911a43620447563'
|
'20915fcf3ffe89c3550cf93b60a04a285453150d92e2468e1911a43620447563'
|
||||||
'163c57160cc1033020680f638b44ebd94b496152dcd8951e87d5077d4d5c2009'
|
'163c57160cc1033020680f638b44ebd94b496152dcd8951e87d5077d4d5c2009'
|
||||||
|
'c1a1cf05dd12efd67858180461ad97a6ebe206b55b56df207854b322ce734613'
|
||||||
'b14f7a65359c05c373ddfc750cd4cf086a48e815489d93ad5cbe1dbf84bf8f5a'
|
'b14f7a65359c05c373ddfc750cd4cf086a48e815489d93ad5cbe1dbf84bf8f5a'
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -58,6 +60,11 @@ prepare() {
|
|||||||
# https://github.com/rpmfusion/nvidia-kmod/blob/master/make_modeset_default.patch
|
# https://github.com/rpmfusion/nvidia-kmod/blob/master/make_modeset_default.patch
|
||||||
patch -Np1 -i "${srcdir}/0001-Enable-atomic-kernel-modesetting-by-default.patch" -d "${srcdir}/${_pkg}/kernel"
|
patch -Np1 -i "${srcdir}/0001-Enable-atomic-kernel-modesetting-by-default.patch" -d "${srcdir}/${_pkg}/kernel"
|
||||||
|
|
||||||
|
# Fixes KDE Plasma Wayland crash without using KWIN_FORCE_SW_CURSOR=1
|
||||||
|
# Author: thesword53
|
||||||
|
# https://forums.developer.nvidia.com/t/580-release-feedback-discussion/341205/1058
|
||||||
|
patch -Np1 -i "${srcdir}/0002-Fix-hardware-cursor-crash.patch" -d "${srcdir}/${_pkg}/kernel"
|
||||||
|
|
||||||
shopt -s globstar
|
shopt -s globstar
|
||||||
for conf in "${srcdir}"/**/dkms.conf; do
|
for conf in "${srcdir}"/**/dkms.conf; do
|
||||||
sed -i "s/__VERSION_STRING/${pkgver}/" "$conf"
|
sed -i "s/__VERSION_STRING/${pkgver}/" "$conf"
|
||||||
|
|||||||
Reference in New Issue
Block a user