Jan Alexander Steffens (heftig) pushed to branch main at Arch Linux / Packaging / Packages / tinycompress
Commits: d5d77c07 by Jan Alexander Steffens (heftig) at 2024-11-12T23:56:43+01:00 1.2.13-1 - - - - - 3 changed files: - .SRCINFO - − 0001-Fix-build-with-FFmpeg-7.patch - PKGBUILD Changes: ===================================== .SRCINFO ===================================== @@ -1,7 +1,7 @@ pkgbase = tinycompress pkgdesc = ALSA compressed device interface - pkgver = 1.2.11 - pkgrel = 3 + pkgver = 1.2.13 + pkgrel = 1 url = https://github.com/alsa-project/tinycompress arch = x86_64 license = BSD-3-Clause OR LGPL-2.1-only @@ -11,9 +11,7 @@ pkgbase = tinycompress optdepends = ffmpeg: fcplay utility provides = libtinycompress.so options = debug - source = git+https://github.com/alsa-project/tinycompress#commit=e98e500873c9c4fdd752d1c85b6116da426a8a70 - source = 0001-Fix-build-with-FFmpeg-7.patch - b2sums = e23df6e28228fc059613f182bf6d5c5edbd95932ccc6d36e7aefadaa7474f59a55dccb841d24c25453d416cbd31ffb3a1d651061b3441c21d813e7127fd451db - b2sums = 29ccd63a6c70397239ac7f9661c3b27256ae044b2de6458e55595886867300cd3c004bb9ba827a1304ba410dd3f5a869e8045755f7e9a04eebd34034bee2cd9a + source = git+https://github.com/alsa-project/tinycompress#tag=v1.2.13 + b2sums = a8317249749419196d820f3ee728519b6a8c1f0a49d2d3bec2c40d1be2ecbec68fd0decea14b60ea66aa40a2cdae326694759e2b4c1afb9bc85fa96b1ea80a94 pkgname = tinycompress ===================================== 0001-Fix-build-with-FFmpeg-7.patch deleted ===================================== @@ -1,33 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Antonio Rojas <aro...@archlinux.org> -Date: Sat, 25 May 2024 19:12:00 +0200 -Subject: [PATCH] Fix build with FFmpeg 7 - ---- - src/utils-lgpl/fcplay.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/utils-lgpl/fcplay.c b/src/utils-lgpl/fcplay.c -index aff091579d7d..eac0712b907c 100644 ---- a/src/utils-lgpl/fcplay.c -+++ b/src/utils-lgpl/fcplay.c -@@ -240,8 +240,8 @@ static int parse_file(char *file, struct snd_codec *codec) - if (!filled) { - /* we fill params from 1st audio stream */ - codec->id = get_codec_id(stream->codecpar->codec_id); -- codec->ch_in = stream->codecpar->channels; -- codec->ch_out = stream->codecpar->channels; -+ codec->ch_in = stream->codecpar->ch_layout.nb_channels; -+ codec->ch_out = stream->codecpar->ch_layout.nb_channels; - codec->sample_rate = stream->codecpar->sample_rate; - codec->bit_rate = ctx->bit_rate; - codec->profile = stream->codecpar->profile; -@@ -273,7 +273,7 @@ static int parse_file(char *file, struct snd_codec *codec) - fprintf(stderr, " Bits coded: %d", stream->codecpar->bits_per_coded_sample); - fprintf(stderr, " Profile: %d", stream->codecpar->profile); - fprintf(stderr, " Codec tag: %d", stream->codecpar->codec_tag); -- fprintf(stderr, " Channels: %d", stream->codecpar->channels); -+ fprintf(stderr, " Channels: %d", stream->codecpar->ch_layout.nb_channels); - fprintf(stderr, " Sample rate: %d", stream->codecpar->sample_rate); - fprintf(stderr, " block_align: %d", stream->codecpar->block_align); - if (codec->id == SND_AUDIOCODEC_FLAC) { ===================================== PKGBUILD ===================================== @@ -1,8 +1,8 @@ # Maintainer: Jan Alexander Steffens (heftig) <hef...@archlinux.org> pkgname=tinycompress -pkgver=1.2.11 -pkgrel=3 +pkgver=1.2.13 +pkgrel=1 pkgdesc="ALSA compressed device interface" url="https://github.com/alsa-project/tinycompress" arch=(x86_64) @@ -15,24 +15,15 @@ makedepends=( optdepends=("ffmpeg: fcplay utility") provides=(libtinycompress.so) options=(debug) -_commit=e98e500873c9c4fdd752d1c85b6116da426a8a70 # tags/v1.2.11^0 source=( - "git+$url#commit=$_commit" - 0001-Fix-build-with-FFmpeg-7.patch + "git+$url#tag=v$pkgver" ) -b2sums=('e23df6e28228fc059613f182bf6d5c5edbd95932ccc6d36e7aefadaa7474f59a55dccb841d24c25453d416cbd31ffb3a1d651061b3441c21d813e7127fd451db' - '29ccd63a6c70397239ac7f9661c3b27256ae044b2de6458e55595886867300cd3c004bb9ba827a1304ba410dd3f5a869e8045755f7e9a04eebd34034bee2cd9a') - -pkgver() { - cd tinycompress - git describe --tags | sed 's/^v//;s/[^-]*-g/r&/;s/-/+/g' -} +b2sums=('a8317249749419196d820f3ee728519b6a8c1f0a49d2d3bec2c40d1be2ecbec68fd0decea14b60ea66aa40a2cdae326694759e2b4c1afb9bc85fa96b1ea80a94') prepare() { mkdir -p build cd tinycompress - git apply -3 ../0001-Fix-build-with-FFmpeg-7.patch ./autogen.sh } View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/tinycompress/-/commit/d5d77c078ccad21f4b1af461fefafaf4be67406d -- View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/tinycompress/-/commit/d5d77c078ccad21f4b1af461fefafaf4be67406d You're receiving this email because of your account on gitlab.archlinux.org.