joborun-pkg/jobextra
joborun-pkg/jobextra
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

upg ffmpeg limine mpd

Browse source
This commit is contained in:
joborun linux 2024-09-09 20:52:55 +03:00
parent 2769d82d22
commit f3e16cf8d6
8 changed files with 120 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ffmpeg/PKGBUILD
View file

@ -7,7 +7,7 @@
pkgname=ffmpeg
pkgver=7.0.2
pkgrel=01
pkgrel=02
epoch=2
pkgdesc='Complete solution to record, convert and stream audio and video'
url=https://ffmpeg.org
@ -36,6 +36,11 @@ source=( git+https://git.ffmpeg.org/ffmpeg.git?signed#tag=${_tag}
prepare() {
cd ffmpeg
patch -Np1 -i ../add-av_stream_get_first_dts-for-chromium.patch # https://crbug.com/1251779
# Fix VAAPI AV1 performance with Mesa
git cherry-pick -n fe9d889dcd79ea18d4dfaa39df4ddbd4c8c3b15c
git cherry-pick -n d2d911eb9a2fc6eb8d86b3ae025a56c1a2692fba
}
pkgver() {
@ -146,6 +151,5 @@ b2sums=('bcc0fb367d2822665f0918292a0cf581e0119d6ba6d2e3d0b6e794b6f74d30c118b5c47
sha256sums=(35fe2394e7ec13bbaafd70270b05f8baa9f4d6fa69ecabaea17fad2fa5f3d87c # ffmpeg
57e26caced5a1382cb639235f9555fc50e45e7bf8333f7c9ae3d49b3241d3f77) # add-av_stream_get_first_dts-for-chromium.patch
## 789d616e79b3464d45709ad846a6e2554605e08a8fb55268d441ad8f30cb214c ffmpeg-2_7.0.2-01-x86_64.pkg.tar.lz
## 6b58894fc7edf5e7bb45f00a9644876b9b0a2393ac5d8f4fcf4753f3587e44e5 ffmpeg-2_7.0.2-02-x86_64.pkg.tar.lz

7
ffmpeg/PKGBUILD-arch
View file

@ -6,7 +6,7 @@
pkgname=ffmpeg
pkgver=7.0.2
pkgrel=1
pkgrel=2
epoch=2
pkgdesc='Complete solution to record, convert and stream audio and video'
arch=(x86_64)
@ -128,6 +128,11 @@ validpgpkeys=(DD1EC9E8DE085C629B3E1846B18E8928B3948D64) # Michael Niedermayer <m
prepare() {
cd ffmpeg
patch -Np1 -i ../add-av_stream_get_first_dts-for-chromium.patch # https://crbug.com/1251779
# Fix VAAPI AV1 performance with Mesa
git cherry-pick -n fe9d889dcd79ea18d4dfaa39df4ddbd4c8c3b15c
git cherry-pick -n d2d911eb9a2fc6eb8d86b3ae025a56c1a2692fba
}
pkgver() {

6
limine/PKGBUILD
View file

@ -6,7 +6,7 @@
#-----------------------------------------| DESCRIPTION |---------------------------------------
pkgname=limine
pkgver=8.0.9
pkgver=8.0.10
pkgrel=01
pkgdesc="An advanced, portable, multiprotocol bootloader - no longer boots from ext4 it requires a FAT boot partition"
url="https://limine-bootloader.org/"
@ -73,7 +73,7 @@ arch=(x86_64)
license=('BSD-2-Clause')
sha256sums=(b29e9b7f85425cc2cf5df749ef2909b4b4337b2fc62d8be8e26c84ac28b0685f # limine 8.0.9
sha256sums=(c215cf56b7eaa3c67153f03fea116ec2981a3e8bb96a4b227a2459edee69b848 # limine 8.0.10
66c126c0ec5126dcae72a512a7ce6d24449185007efe7897f01df2e41e513db4 # limine.conf.0
cfcf8353254f8d7bc84f030ed37e5431f6997ade03619d49649a8e0ce16a9568 # jobo-limine.conf
15df8e06872a6cb89dfad3f99ad2b255dd1a54576e4343c954975e2ea48f28ab # bg.jpg
@ -82,5 +82,5 @@ sha256sums=(b29e9b7f85425cc2cf5df749ef2909b4b4337b2fc62d8be8e26c84ac28b0685f #
53de6eeb4d700cfc931c5b2f7067ca3bd813f2360ff895539133f7f8299bc5de # liminedeploy-uefi.hook
SKIP) # PKGBUILD
## 2146f26a2a27fc0926dc3987181ff66b5698d0e5d2cf08c8c53ac1f51103ce98 limine-8.0.9-01-x86_64.pkg.tar.lz
## 024a5c340d7f0335a4cae2b0d8903f0bd37cbe85ecf42c29eeaa204b2d74920f limine-8.0.10-01-x86_64.pkg.tar.lz

4
limine/PKGBUILD-arch
View file

@ -2,7 +2,7 @@
# Contributor: Mintsuki <mintsuki@protonmail.com>
pkgname=limine
pkgver=8.0.9
pkgver=8.0.10
pkgrel=1
pkgdesc="An advanced, portable, multiprotocol bootloader"
arch=('x86_64')
@ -11,7 +11,7 @@ license=('BSD-2-Clause')
depends=('glibc')
makedepends=('git' 'nasm' 'mtools' 'llvm' 'lld' 'clang')
source=("git+https://github.com/limine-bootloader/limine.git#tag=v${pkgver}")
sha256sums=('b29e9b7f85425cc2cf5df749ef2909b4b4337b2fc62d8be8e26c84ac28b0685f')
sha256sums=('c215cf56b7eaa3c67153f03fea116ec2981a3e8bb96a4b227a2459edee69b848')
prepare() {
cd "${pkgname}"

1
limine/deps
View file

@ -7,3 +7,4 @@ clang
autoconf
automake

23
mpd/PKGBUILD
View file

@ -7,7 +7,7 @@
pkgname=mpd
pkgver=0.23.15
pkgrel=05
pkgrel=06
pkgdesc="Flexible, powerful, server-side application for playing music w/o systemd"
url="https://www.musicpd.org/"
depends=(bzip2 chromaprint gcc-libs glibc hicolor-icon-theme lame libcdio libcdio-paranoia
@ -21,15 +21,16 @@ makedepends=(alsa-lib audiofile avahi boost curl dbus expat faad2 ffmpeg flac
backup=(etc/$pkgname.conf)
# options=(debug) ## uncomment this to produce the debug pkg
source=($pkgname::git+https://github.com/MusicPlayerDaemon/MPD.git#tag=v${pkgver}?signed
fmt-v11.patch::https://github.com/MusicPlayerDaemon/MPD/commit/1402869715e3efca87942d79c3173a6b21a6925d.patch
#https://www.musicpd.org/download/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz{,.sig}
$pkgname.conf
$pkgname.sysusers
$pkgname.tmpfiles)
# $pkgname.service.override)
#prepare() {
# patch -Np1 -d $pkgname-$pkgver -i ../$pkgname-0.23.14-ffmpeg6.1.patch
#}
prepare() {
patch -d $pkgname -Np1 -i "$srcdir/fmt-v11.patch"
}
build() {
local _meson_options=(
@ -83,12 +84,16 @@ license=( BSD-2-Clause GPL-2.0-or-later)
validpgpkeys=('0392335A78083894A4301C43236E8A58C6DB4512') # Max Kellermann <max@blarg.de>
b2sums=('c48d421ed44e13026ae880f62e03577b8a9dbf23e05adb217f5cfbc5702a7a66d08c353e9d85784203e0e511d23037836dad3053b9a82748c46f1b9d5a5d17a0'
SKIP SKIP SKIP)
sha256sums=(SKIP
#550132239ad1acf82ccf8905b56cc13dc2c81a4489b96fba7731b3049907661a # mpd-0.23.15.tar.xz
# d283aa4857e8df9385ecd671eef235de5f30d89e7d67e589a3b355cb7c5a3935 # mpd-0.23.15.tar.xz.sig
'830b76cf97a9c517db0445fed911ebedef5048a1bd2afc3ede0eaeca3ee327462ea124f3764df0905adba34ebd212d926b4dee1c5387544a7f544e78a21a826a'
'0969a3c477b6a3f34b44e067e515d7f306414dd14e0163584417b9d071e3cc825898219f7ff66ead7905b15429b8411304052d3b2b14a72e560bfabf9bf0adcf'
'4ab6e415284c77802a39d0913d701fe55e56f3c22b19557661fbef77e456b5e1d151da4202695282b956602e716a7afdb994aa2fc17368b9a0d0d051d47a3afb'
'd7b587c25dd5830c27af475a8fdd8102139d7c8fdd6f04fe23b36be030e4411582e289f575c299255ff8183096f7d47247327276f9a24641cbd032d9675b837a')
sha256sums=(6c80973a40065ee251d9455aa3760efc84bdedf6be934865cac0c702ef961354 # mpd
9f0cd00dede16b146c2d89a04c2b4ae51c31f323156b564987c04d48413a2de6 # fmt-v11.patch
f40f68205834ca53cea3372e930bfe6c2f9ecc9df3b1605df2fec63a658b2e03 # mpd.conf
0b74c6e5db08daab3091dc15a6b0c75210ba2f9e98fa074f6cfd605a461056b6 # mpd.sysusers
2faa85c12449a5b3ca422ff1c1fa06d057c7e262a74bfa6298c914a92d6f2e7a) # mpd.tmpfiles
## d3db796c74f2ce41e8ea97eb62bbd9970fa590740e0fb16d4f555cc8a9e71323 mpd-0.23.15-05-x86_64.pkg.tar.lz
## 3f6cc6efef56b68e11cad68fc80a02c77615a51b544fbb22dd8ecf34e51c56da mpd-0.23.15-06-x86_64.pkg.tar.lz

9
mpd/PKGBUILD-arch
View file

@ -8,7 +8,7 @@
pkgname=mpd
pkgver=0.23.15
pkgrel=5
pkgrel=6
pkgdesc="Flexible, powerful, server-side application for playing music"
arch=(x86_64)
url="https://www.musicpd.org/"
@ -83,23 +83,30 @@ makedepends=(
backup=(etc/$pkgname.conf)
source=(
$pkgname::git+https://github.com/MusicPlayerDaemon/MPD.git#tag=v${pkgver}?signed
fmt-v11.patch::https://github.com/MusicPlayerDaemon/MPD/commit/1402869715e3efca87942d79c3173a6b21a6925d.patch
$pkgname.conf
$pkgname.sysusers
$pkgname.tmpfiles
$pkgname.service.override
)
sha512sums=('bce2314087725e709e5936f9e5e74ac1b4713cb3402aecf75ebc81d7eb7cab0237a6dfc90ba71672ffe60593a9c627b918c44c79e4f081b1b8987dbc2c029e17'
'70be1c46cafc95751f6bc144f2263a3a6e1752f948005477edea15b07fd83959839c33d58021838af23bc25b6726c5e168a44dc7f23f138f811266da68df4039'
'25a823740d92da8e186916701413114142eb6ad91a172c592e68b569c8e4f50fa99580e555ccf6cd31fc4f55a09bfe0278efa46e4e76ee0fe02846292fadf3c1'
'6e467481406279767b709ec6d5c06dbd825c0de09045c52ffa2d21d0604dcfe19b7a92bf42bed25163d66a3a0d1dbde6185a648b433eaf5eac56be90491e2e18'
'db473db27cd68994c3ee26e78e0fb34d13126301d8861563dcc12a22d62ecb14c4ffb1e0798c6aaccdff34e73bae3fbeeff7b42606c901a2d35e278865cdf35d'
'c1782b82f9db1d30aece43a07230c5d57370f2494a16e108af03815d83968805472f10f53ea5495cf0e08ff8f245430c3c3bc44025af43aaf9ecd12fcd6afc6c')
b2sums=('c48d421ed44e13026ae880f62e03577b8a9dbf23e05adb217f5cfbc5702a7a66d08c353e9d85784203e0e511d23037836dad3053b9a82748c46f1b9d5a5d17a0'
'830b76cf97a9c517db0445fed911ebedef5048a1bd2afc3ede0eaeca3ee327462ea124f3764df0905adba34ebd212d926b4dee1c5387544a7f544e78a21a826a'
'0969a3c477b6a3f34b44e067e515d7f306414dd14e0163584417b9d071e3cc825898219f7ff66ead7905b15429b8411304052d3b2b14a72e560bfabf9bf0adcf'
'4ab6e415284c77802a39d0913d701fe55e56f3c22b19557661fbef77e456b5e1d151da4202695282b956602e716a7afdb994aa2fc17368b9a0d0d051d47a3afb'
'd7b587c25dd5830c27af475a8fdd8102139d7c8fdd6f04fe23b36be030e4411582e289f575c299255ff8183096f7d47247327276f9a24641cbd032d9675b837a'
'753664445d7d5cc0b36f51ac66549beea403b9731cbcb81b0a782974a0a73d90559ba93e6afcaa470b6f2f5a844c09ef695bdf3b1e6dfee97aa080f41b7fe513')
validpgpkeys=('0392335A78083894A4301C43236E8A58C6DB4512') # Max Kellermann <max@blarg.de>
prepare() {
patch -d $pkgname -Np1 -i "$srcdir/fmt-v11.patch"
}
build() {
local _meson_options=(
-D documentation=enabled

79
mpd/fmt-v11.patch Normal file
View file

@ -0,0 +1,79 @@
From 1402869715e3efca87942d79c3173a6b21a6925d Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Fri, 5 Jul 2024 14:27:45 +0000
Subject: [PATCH] lib/fmt: support build with libfmt-11.0.0
Upstream libfmt commit fmtlib/fmt@d707292
now requires the format function to be const.
Adjust the function prototype so it is const and can compile.
Signed-off-by: Rudi Heitbaum <rudi@heitbaum.com>
---
src/lib/ffmpeg/LibFmt.hxx | 2 +-
src/lib/fmt/AudioFormatFormatter.hxx | 4 ++--
src/lib/fmt/ExceptionFormatter.hxx | 2 +-
src/lib/fmt/PathFormatter.hxx | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/lib/ffmpeg/LibFmt.hxx b/src/lib/ffmpeg/LibFmt.hxx
index aa068711f3..dee83ed2d5 100644
--- a/src/lib/ffmpeg/LibFmt.hxx
+++ b/src/lib/ffmpeg/LibFmt.hxx
@@ -13,7 +13,7 @@ template<>
struct fmt::formatter<AVSampleFormat> : formatter<string_view>
{
template<typename FormatContext>
- auto format(const AVSampleFormat format, FormatContext &ctx) {
+ auto format(const AVSampleFormat format, FormatContext &ctx) const {
const char *name = av_get_sample_fmt_name(format);
if (name == nullptr)
name = "?";
diff --git a/src/lib/fmt/AudioFormatFormatter.hxx b/src/lib/fmt/AudioFormatFormatter.hxx
index e0ffb62160..8da98efd41 100644
--- a/src/lib/fmt/AudioFormatFormatter.hxx
+++ b/src/lib/fmt/AudioFormatFormatter.hxx
@@ -13,7 +13,7 @@ template<>
struct fmt::formatter<SampleFormat> : formatter<string_view>
{
template<typename FormatContext>
- auto format(const SampleFormat format, FormatContext &ctx) {
+ auto format(const SampleFormat format, FormatContext &ctx) const {
return formatter<string_view>::format(sample_format_to_string(format),
ctx);
}
@@ -23,7 +23,7 @@ template<>
struct fmt::formatter<AudioFormat> : formatter<string_view>
{
template<typename FormatContext>
- auto format(const AudioFormat &af, FormatContext &ctx) {
+ auto format(const AudioFormat &af, FormatContext &ctx) const {
return formatter<string_view>::format(ToString(af).c_str(),
ctx);
}
diff --git a/src/lib/fmt/ExceptionFormatter.hxx b/src/lib/fmt/ExceptionFormatter.hxx
index 3f342df672..f08b3bb228 100644
--- a/src/lib/fmt/ExceptionFormatter.hxx
+++ b/src/lib/fmt/ExceptionFormatter.hxx
@@ -12,7 +12,7 @@ template<>
struct fmt::formatter<std::exception_ptr> : formatter<string_view>
{
template<typename FormatContext>
- auto format(std::exception_ptr e, FormatContext &ctx) {
+ auto format(std::exception_ptr e, FormatContext &ctx) const {
return formatter<string_view>::format(GetFullMessage(e), ctx);
}
};
diff --git a/src/lib/fmt/PathFormatter.hxx b/src/lib/fmt/PathFormatter.hxx
index e5ae89dec5..add06df81b 100644
--- a/src/lib/fmt/PathFormatter.hxx
+++ b/src/lib/fmt/PathFormatter.hxx
@@ -13,7 +13,7 @@ template<std::convertible_to<Path> T>
struct fmt::formatter<T> : formatter<string_view>
{
template<typename FormatContext>
- auto format(Path path, FormatContext &ctx) {
+ auto format(Path path, FormatContext &ctx) const {
return formatter<string_view>::format(path.ToUTF8(), ctx);
}
};