From bf48af08093a3191dec2211c820bacbed2555b6e Mon Sep 17 00:00:00 2001 From: joborun Date: Sat, 6 Apr 2024 17:42:33 +0300 Subject: [PATCH] upg dracut libunwind libx11 obs-studio patchelf --- dracut/PKGBUILD | 23 +++++++++-------------- dracut/PKGBUILD-arch | 6 +++--- dracut/clean | 2 +- libunwind/PKGBUILD | 19 +++++++++++-------- libunwind/PKGBUILD-arch | 3 ++- libx11/PKGBUILD | 28 ++++++++++++---------------- libx11/PKGBUILD-arch | 19 +++++-------------- obs-studio/PKGBUILD | 8 ++++---- obs-studio/PKGBUILD-arch | 6 +++--- patchelf/PKGBUILD | 32 +++++++++++++++++++++++--------- patchelf/PKGBUILD-arch | 19 ++++++++++--------- patchelf/clean | 2 +- patchelf/deps | 1 + 13 files changed, 85 insertions(+), 83 deletions(-) diff --git a/dracut/PKGBUILD b/dracut/PKGBUILD index 78b4b0b..2498465 100644 --- a/dracut/PKGBUILD +++ b/dracut/PKGBUILD @@ -6,16 +6,15 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=dracut -pkgver=060 -pkgrel=02 +pkgver=100 +pkgrel=01 pkgdesc="An event driven initramfs infrastructure w/o systemd" #url="https://dracut.wiki.kernel.org" url="https://github.com/dracut-ng/dracut-ng" depends=('bash' 'coreutils' 'cpio' 'filesystem' 'findutils' 'gawk' 'grep' 'gzip' 'kmod' 'pkgconf' 'procps-ng' 'sed' 'util-linux' 'xz') makedepends=('asciidoc' 'bash-completion' 'git') -optdepends=( - 'binutils: --uefi option support' +optdepends=('binutils: --uefi option support' 'bluez: bluetooth (keyboard)' 'btrfs-progs: scan for Btrfs on block devices' 'busybox: allows use of busybox (on your own risk)' @@ -33,7 +32,6 @@ optdepends=( 'lvm2: support Logical Volume Manager' 'lzop: lzop compression' 'mdadm: support MD devices, also known as software RAID devices' - 'multipath-tools: dmraid dracut module support' 'nbd: support network block devices' 'ndctl: NVDIMM support' @@ -49,8 +47,7 @@ optdepends=( 'squashfs-tools: support for building a squashed initramfs' 'tpm2-tools: tpm2 support for e.g. LUKS' 'xfsprogs: XFS filesystem utilities ' - 'xfsdump: Additional XFS filesystem utilities' -) + 'xfsdump: Additional XFS filesystem utilities') provides=('initramfs') backup=('etc/dracut.conf') #source=(https://mirrors.edge.kernel.org/pub/linux/utils/boot/dracut/dracut-${pkgver}.tar{.gz,.sign}) @@ -103,16 +100,14 @@ license=('GPL-2.0-or-later') validpgpkeys=('F66745589DE755B02AD947D71F1139EBBED1ACA9') # "Jóhann B. Guðmundsson " -sha512sums=('8dbdd67d0b86555aac4c2f315c809861c82358d3899ecdf3008e6203b9f32eac2e8a969fe972e9ce63316aeb0d3242e0e997d21c24bee8666ef3d3e7ddda067e' - SKIP SKIP SKIP SKIP) -b2sums=('41593a6205cf0a66ad49d903cf73e20b6a0b90628e185f93eb29d09df7d7dbcc342759901d204fb3d2c98ec6b8550ac14dbaef43c8243c0d9190b06a56a92a91' - SKIP SKIP SKIP SKIP) +sha512sums=('4369f71c0affaffa9a84c67502c12da76eab0eb027e1baedeaaaf2cabcfbedc2d90d10c10ff0d84bf7b230665486c2324b5ae5f83e8de31066d7855720c9a91b' + SKIP SKIP SKIP SKIP ) +b2sums=('f75ce99f53216ce9dbeea22d67b553fe18fbf32a05daa01b6ee1a01408eaaac36e8e0bb4e8da91828a233d1268a4f0fae587d831c9e4c4d767a438e2ea0976c8' + SKIP SKIP SKIP SKIP ) sha256sums=(SKIP 4c0ee4c9dc2941d34ebeecf4242c7577e3d193c2a00a9a465a39d42c8266ca6a # dracut-install 4d6ca5da247a19f290bd8e375c470ef6dc01476288cb8aba71c09c09d23331f5 # dracut-remove 7365ad289428c7f7dad522ea0a2c9381648912a626bd40237767051468d325ef # 90-dracut-install.hook 054dac9f1d55029a922ff05c3064e54d25790c7a18d2b598edc58ef3d295cba1) # 60-dracut-remove.hook -## a83c8707bc47cce782f943fe613429cb8bd417fcb8010baa67ed3b81fdcae167 dracut-060-01-x86_64.pkg.tar.lz - - +## eedf88f3092b20ea6816ef8585bb4c0395cebd836a540aea96fdc1e3f594d9e2 dracut-100-01-x86_64.pkg.tar.lz diff --git a/dracut/PKGBUILD-arch b/dracut/PKGBUILD-arch index ff918a2..0ea0d6f 100644 --- a/dracut/PKGBUILD-arch +++ b/dracut/PKGBUILD-arch @@ -1,6 +1,6 @@ # Maintainer: Giancarlo Razzolini pkgname=dracut -pkgver=060 +pkgver=100 pkgrel=1 pkgdesc="An event driven initramfs infrastructure" arch=('x86_64') @@ -71,8 +71,8 @@ backup=('etc/dracut.conf') source=( "${pkgname}-${pkgver}::git+${url}#tag=${pkgver}" ) -sha512sums=('8dbdd67d0b86555aac4c2f315c809861c82358d3899ecdf3008e6203b9f32eac2e8a969fe972e9ce63316aeb0d3242e0e997d21c24bee8666ef3d3e7ddda067e') -b2sums=('41593a6205cf0a66ad49d903cf73e20b6a0b90628e185f93eb29d09df7d7dbcc342759901d204fb3d2c98ec6b8550ac14dbaef43c8243c0d9190b06a56a92a91') +sha512sums=('4369f71c0affaffa9a84c67502c12da76eab0eb027e1baedeaaaf2cabcfbedc2d90d10c10ff0d84bf7b230665486c2324b5ae5f83e8de31066d7855720c9a91b') +b2sums=('f75ce99f53216ce9dbeea22d67b553fe18fbf32a05daa01b6ee1a01408eaaac36e8e0bb4e8da91828a233d1268a4f0fae587d831c9e4c4d767a438e2ea0976c8') build() { local prefix=/usr sysconfdir=/etc diff --git a/dracut/clean b/dracut/clean index 2dc8ff4..b353aad 100644 --- a/dracut/clean +++ b/dracut/clean @@ -1 +1 @@ -rm -rf {src,pkg,dracut-0*} +rm -rf {src,pkg,dracut-1*} diff --git a/libunwind/PKGBUILD b/libunwind/PKGBUILD index 70d1126..aaefbf4 100644 --- a/libunwind/PKGBUILD +++ b/libunwind/PKGBUILD @@ -7,7 +7,7 @@ pkgname=libunwind pkgver=1.8.1 -pkgrel=01 +pkgrel=02 pkgdesc="Determine and manipulate the call-chain of a program" #pkgdesc='Portable and efficient C programming interface (API) to determine the call-chain of a program' url="https://www.nongnu.org/libunwind/" @@ -30,15 +30,20 @@ build() { make } -# 2 tests fail on 1.7.2-1 -#check() { -# cd $pkgname-$pkgver -# make check -#} +# 2 tests fail on 1.7.2 & 1.8.1 run makepkg --nocheck (after the xz fiasco I don't know whether -e is a good option or not) +# +check() { + cd $pkgname-$pkgver + make check +} + +## package() { cd $pkgname-$pkgver make DESTDIR="$pkgdir" install + rm -r "$pkgdir"/usr/libexec + } #---- arch license gpg-key & sha256sums ---- @@ -55,5 +60,3 @@ validpgpkeys=(F86EB09F72717426F20D36470A0FF845B7DB3427) # Stephen M. Webb -sha512sums=('4e7ce8f2d88b9475f960ea1d5730ece8953509e0c057cf2d0a2f5fa6a36e6577b0dcd7f16ac91b8fdd804aabec6d7e8f3067a3a8667bd2e41d72dd68ab70ef82' - 'SKIP' - 'e07b0a7e77c6472019caa9b8c00a065f80f6fcfad292ce939994a420b8fbb3ab226511df566f85a6f944a2b8e0ea0398aa4372ae675d6ef7d6fe7448bf52248c') +sha512sums=('737af91818537295ac86be601b1e3d7e37d150716ec549580913b7cc9a44fee7a6ce9dbc3d46167eed91f23fe857c4dd355ed8f8440fe5fbbf8e9ebe47091b96' + 'SKIP') +sha256sums=(779d8f111d144ef93e2daa5f23a762ce9555affc99592844e71c4243d3bd3262 # libX11-1.8.9.tar.xz + f5d322f242809c632e0d2fc1f233b2317fe2ef0ec4d6366e2e84519e51b23616) # libX11-1.8.9.tar.xz.sig -sha256sums=(46afaebb2dd1a3a7348c0544a4b1c88c51de4bda885fde57d2cf98427ee5cbf6 # libX11-1.8.8.tar.xz - a7d57456c94d5cb8ed8d173abf44c72f5d889ff35568f64b6b6e082b46402803 # libX11-1.8.8.tar.xz.sig - 614dabfb372c9a9d3d0f875cf945715176425338b54244ad797d2cd5b1c28d5c) # MR236.patch - - -## b8232a185c045a720fed5f3107f459bb16e1a4c134ad6374d1ed37b4c6e2ceee libx11-1.8.8-03-x86_64.pkg.tar.lz +## 52f5631fe2d500b8c9b1a3f2698fb00a9cd795d2a3bae469e3bd8977968a9760 libx11-1.8.9-01-x86_64.pkg.tar.lz diff --git a/libx11/PKGBUILD-arch b/libx11/PKGBUILD-arch index b045a23..c7c97f1 100644 --- a/libx11/PKGBUILD-arch +++ b/libx11/PKGBUILD-arch @@ -1,8 +1,8 @@ # Maintainer: Andreas Radke pkgname=libx11 -pkgver=1.8.8 -pkgrel=3 +pkgver=1.8.9 +pkgrel=1 pkgdesc="X11 client-side library" arch=(x86_64) url="https://gitlab.freedesktop.org/xorg/lib/libx11" @@ -11,24 +11,15 @@ url="https://gitlab.freedesktop.org/xorg/lib/libx11" depends=('libxcb' 'glibc' 'xorgproto') makedepends=('xorg-util-macros' 'xtrans') license=('MIT AND X11') -source=(https://xorg.freedesktop.org//releases/individual/lib/libX11-${pkgver}.tar.xz{,.sig} - MR236.patch) -sha512sums=('4e7ce8f2d88b9475f960ea1d5730ece8953509e0c057cf2d0a2f5fa6a36e6577b0dcd7f16ac91b8fdd804aabec6d7e8f3067a3a8667bd2e41d72dd68ab70ef82' - 'SKIP' - 'e07b0a7e77c6472019caa9b8c00a065f80f6fcfad292ce939994a420b8fbb3ab226511df566f85a6f944a2b8e0ea0398aa4372ae675d6ef7d6fe7448bf52248c') +source=(https://xorg.freedesktop.org//releases/individual/lib/libX11-${pkgver}.tar.xz{,.sig}) +sha512sums=('737af91818537295ac86be601b1e3d7e37d150716ec549580913b7cc9a44fee7a6ce9dbc3d46167eed91f23fe857c4dd355ed8f8440fe5fbbf8e9ebe47091b96' + 'SKIP') validpgpkeys=('4A193C06D35E7C670FA4EF0BA2FB9E081F2D130E') # Alan Coopersmith #validpgpkeys=('C41C985FDCF1E5364576638B687393EE37D128F8') # Matthieu Herrb #validpgpkeys=('3BB639E56F861FA2E86505690FDD682D974CA72A') # Matt Turner #validpgpkeys=('995ED5C8A6138EB0961F18474C09DD83CAAA50B2') # Adam Jackson #validpgpkeys=('C383B778255613DFDB409D91DB221A6900000011') # "Keith Packard " -prepare() { - cd libX11-${pkgver} - # revert incompatible change - #1 - # https://gitlab.freedesktop.org/xorg/lib/libx11/-/issues/205 - patch -R -p1 -i ../MR236.patch -} - build() { cd libX11-${pkgver} ./configure --prefix=/usr \ diff --git a/obs-studio/PKGBUILD b/obs-studio/PKGBUILD index 7941c02..8200a47 100644 --- a/obs-studio/PKGBUILD +++ b/obs-studio/PKGBUILD @@ -6,8 +6,8 @@ #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgname=obs-studio -pkgver=30.1.0 -pkgrel=01 +pkgver=30.1.1 +pkgrel=02 pkgdesc="Free and open source software for video recording and live streaming Includes new AMF encoding patch w/o systemd pipewire pulseaudio" depends=('ffmpeg' 'jansson' 'libxinerama' 'libxkbcommon-x11' 'mbedtls' 'rnnoise' 'pciutils' @@ -75,10 +75,10 @@ arch=(x86_64) license=(GPL2) -sha256sums=(ec5c1932954fdfb5c5166ebd5f10f791c0557b0e241ece7443a24e8fce88bd56 # obs-studio-30.1.0.tar.gz +sha256sums=(7fe7f67d683fb1fdc2fc58b0c07dd75622a6daba36b90959fc5b5d642a293dab # obs-studio-30.1.1.tar.gz bdfbd062f080bc925588aec1989bb1df34bf779cc2fc08ac27236679cf612abd # fix_python_binary_loading.patch 60b0ee1f78df632e1a8c13cb0a7a5772b2a4b092c4a2a78f23464a7d239557c3 # ignore_unused_submodules.patch 155c6342fc95617f6add6240f06541b6725cbed3f0baa1b77ae6d85832f77f30) # com.obsproject.Studio.desktop -## 3a42ef8e3093e960cebd24e830a59479bccb594ab07c2eebbf2843f86945a879 obs-studio-30.1.0-01-x86_64.pkg.tar.lz +## 2d9e9d91e2375153171cc12b9c87dc16fb57bef69a0f99e7619b3620761c8123 obs-studio-30.1.1-02-x86_64.pkg.tar.lz diff --git a/obs-studio/PKGBUILD-arch b/obs-studio/PKGBUILD-arch index aab3250..81fc743 100644 --- a/obs-studio/PKGBUILD-arch +++ b/obs-studio/PKGBUILD-arch @@ -2,8 +2,8 @@ # Contributor: Benjamin Klettbach pkgname=obs-studio -pkgver=30.1.0 -pkgrel=1 +pkgver=30.1.1 +pkgrel=2 pkgdesc="Free, open source software for live streaming and recording" arch=('x86_64') url="https://obsproject.com" @@ -22,7 +22,7 @@ optdepends=('libfdk-aac: FDK AAC codec support' source=($pkgname-$pkgver.tar.gz::https://github.com/obsproject/obs-studio/archive/$pkgver.tar.gz fix_python_binary_loading.patch ignore_unused_submodules.patch) -sha256sums=('ec5c1932954fdfb5c5166ebd5f10f791c0557b0e241ece7443a24e8fce88bd56' +sha256sums=('7fe7f67d683fb1fdc2fc58b0c07dd75622a6daba36b90959fc5b5d642a293dab' 'bdfbd062f080bc925588aec1989bb1df34bf779cc2fc08ac27236679cf612abd' '60b0ee1f78df632e1a8c13cb0a7a5772b2a4b092c4a2a78f23464a7d239557c3') diff --git a/patchelf/PKGBUILD b/patchelf/PKGBUILD index ebc84ed..4e7fb59 100644 --- a/patchelf/PKGBUILD +++ b/patchelf/PKGBUILD @@ -7,30 +7,40 @@ pkgname=patchelf pkgver=0.18.0 -pkgrel=01 +pkgrel=02 pkgdesc='Small utility to modify the dynamic linker and RPATH of ELF executables' url='https://nixos.org/patchelf.html' depends=('gcc-libs') -source=(https://github.com/NixOS/patchelf/archive/${pkgver}/${pkgname}-${pkgver}.tar.gz) +makedepends=(git) +#source=(https://github.com/NixOS/patchelf/archive/${pkgver}/${pkgname}-${pkgver}.tar.gz) +source=(git+https://github.com/NixOS/patchelf.git#tag=${pkgver}) prepare() { - cd ${pkgname}-${pkgver} + + cd ${pkgname} +#cd ${pkgname}-${pkgver} autoreconf -fiv } build() { - cd ${pkgname}-${pkgver} + + cd ${pkgname} +# cd ${pkgname}-${pkgver} ./configure --prefix=/usr make } check() { - cd ${pkgname}-${pkgver} + + cd ${pkgname} +# cd ${pkgname}-${pkgver} make -C tests -j1 check } package() { - cd ${pkgname}-${pkgver} + + cd ${pkgname} +# cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install } @@ -38,8 +48,12 @@ package() { arch=('x86_64') -license=('GPL3') +license=('GPL-3.0-or-later') -sha256sums=(1451d01ee3a21100340aed867d0b799f46f0b1749680028d38c3f5d0128fb8a7) # patchelf-0.18.0.tar.gz -## 4f7a7afb3df956058508c5c32a7f166a3c1e15a104a8a7db32f803ccdefc5299 patchelf-0.18.0-01-x86_64.pkg.tar.lz +sha512sums=('aaef42f053ad423cc7319d8e91a9cdab4370c53e1b222b87656815332cb578a71794dca18a4265e51dba500b1c641c65002e78d08ebdd8aade05c125d6697236') +b2sums=('53ab064726205671c511698359a617aca78f86cf5af9529649b8dda5f505a44bf8f8a4ed06272fe3eb923f9e34ff4de5dfc6f43b33fa8d22a9ff24076aa5b6c7') +#sha256sums=(1451d01ee3a21100340aed867d0b799f46f0b1749680028d38c3f5d0128fb8a7) # patchelf-0.18.0.tar.gz + +## d8c4edece2a0ee6474eb9e5986d8deda5abaf4a6dbe6084c09b6af1c2147198f patchelf-0.18.0-02-x86_64.pkg.tar.lz + diff --git a/patchelf/PKGBUILD-arch b/patchelf/PKGBUILD-arch index 76e36bf..633869f 100644 --- a/patchelf/PKGBUILD-arch +++ b/patchelf/PKGBUILD-arch @@ -5,34 +5,35 @@ pkgname=patchelf pkgver=0.18.0 -pkgrel=1 +pkgrel=2 pkgdesc='Small utility to modify the dynamic linker and RPATH of ELF executables' url='https://nixos.org/patchelf.html' arch=('x86_64') -license=('GPL3') +license=('GPL-3.0-or-later') +makedepends=('git') depends=('gcc-libs') -source=(https://github.com/NixOS/patchelf/archive/${pkgver}/${pkgname}-${pkgver}.tar.gz) -sha512sums=('6a917d7336b1e8c59f42d4cd1dc725df1378d77657fce13cb31547da1d4805b9df8a834a7b8408fda8aa1dbeb37d0cdca74d8698844ea2f44149f800b802dea6') -b2sums=('e6ce4ec3bd89c280bb37230dbeb566b803f09900006e79f7dba74f138f66e17746d331baea4def6a43163024b3d86aa8dbac9b2c6545ac146298a8b84373d03b') +source=(git+https://github.com/NixOS/patchelf.git#tag=${pkgver}) +sha512sums=('aaef42f053ad423cc7319d8e91a9cdab4370c53e1b222b87656815332cb578a71794dca18a4265e51dba500b1c641c65002e78d08ebdd8aade05c125d6697236') +b2sums=('53ab064726205671c511698359a617aca78f86cf5af9529649b8dda5f505a44bf8f8a4ed06272fe3eb923f9e34ff4de5dfc6f43b33fa8d22a9ff24076aa5b6c7') prepare() { - cd ${pkgname}-${pkgver} + cd ${pkgname} autoreconf -fiv } build() { - cd ${pkgname}-${pkgver} + cd ${pkgname} ./configure --prefix=/usr make } check() { - cd ${pkgname}-${pkgver} + cd ${pkgname} make -C tests -j1 check } package() { - cd ${pkgname}-${pkgver} + cd ${pkgname} make DESTDIR="${pkgdir}" install } diff --git a/patchelf/clean b/patchelf/clean index 17665f6..9869932 100644 --- a/patchelf/clean +++ b/patchelf/clean @@ -1 +1 @@ -rm -rf {src,pkg,patchelf*tar.gz} +rm -rf {src,pkg,patchelf*tar.gz,patchelf} diff --git a/patchelf/deps b/patchelf/deps index 7d39372..bfb3044 100644 --- a/patchelf/deps +++ b/patchelf/deps @@ -1,4 +1,5 @@ autoconf automake +git