mpg123: update to 1.26.1.

This commit is contained in:
Anthony Iliopoulos 2020-06-06 16:39:40 +02:00 committed by Helmut Pozimski
parent db58aaffe1
commit 6ec7607cb4
2 changed files with 2 additions and 51 deletions

View File

@ -1,49 +0,0 @@
From 56faaffd2d67d48ea746bdbdf3dbddc57ed342de Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Mon, 1 Jun 2020 00:17:31 +0200
Subject: [PATCH] big endian fixes from upstream
---
src/libmpg123/sample.h | 2 +-
src/libout123/hextxt.c | 5 ++---
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git src/libmpg123/sample.h src/libmpg123/sample.h
index 5a98fe0..4d244fe 100644
--- src/libmpg123/sample.h
+++ src/libmpg123/sample.h
@@ -185,7 +185,7 @@ static inline int16_t ftoi16(float x)
#ifdef WORDS_BIGENDIAN
/* Highest byte first. Drop last. */
#define DROP4BYTE(w,r) {(w)[0]=(r)[0]; (w)[1]=(r)[1]; (w)[2]=(r)[2];}
-#define ADD4BYTE(w,r) {(w)[0]=(r)[0]; (w)[1]=(r)[1]; (w)[2]=(r)[2]; (w)[3]=0}
+#define ADD4BYTE(w,r) {(w)[0]=(r)[0]; (w)[1]=(r)[1]; (w)[2]=(r)[2]; (w)[3]=0;}
#else
/* Lowest byte first, drop that. */
#define DROP4BYTE(w,r) {(w)[0]=(r)[1]; (w)[1]=(r)[2]; (w)[2]=(r)[3];}
diff --git src/libout123/hextxt.c src/libout123/hextxt.c
index 45c8134..9e9010e 100644
--- src/libout123/hextxt.c
+++ src/libout123/hextxt.c
@@ -194,7 +194,7 @@ int txt_write(out123_handle *ao, unsigned char *buf, int len)
#define CHANPRINT24(type, ptype, fmt) \
{ \
unsigned char *ff = f; \
- for(c=0; c<ao->channels; ++c) \
+ for(int c=0; c<ao->channels; ++c) \
{ \
uint32_t tmp = 0; \
tmp |= ((uint32_t)(*(ff++))) << 24; \
@@ -208,8 +208,7 @@ int txt_write(out123_handle *ao, unsigned char *buf, int len)
#define CHANPRINT24(type, ptype, fmt) \
{ \
unsigned char *ff = f; \
- int c; \
- for(c=0; c<ao->channels; ++c) \
+ for(int c=0; c<ao->channels; ++c) \
{ \
uint32_t tmp = 0; \
tmp |= ((uint32_t)(*(ff++))) << 8; \
--
2.25.1

View File

@ -1,6 +1,6 @@
# Template file for 'mpg123'
pkgname=mpg123
version=1.26.0
version=1.26.1
revision=1
build_style=gnu-configure
configure_args="--with-optimization=0 --with-default-audio=alsa
@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-only"
homepage="https://www.mpg123.org/"
distfiles="${SOURCEFORGE_SITE}/mpg123/mpg123-${version}.tar.bz2"
checksum=e4e405f4abd794b96c3b11f69b303a743fe577d2394f49012446985f0b99c268
checksum=74d6629ab7f3dd9a588b0931528ba7ecfa989a2cad6bf53ffeef9de31b0fe032
case "$XBPS_TARGET_MACHINE" in
# No LFS required with musl