diff options
| -rw-r--r-- | main/mpg123/APKBUILD | 9 | ||||
| -rw-r--r-- | main/mpg123/fix-s390x.patch | 28 |
2 files changed, 3 insertions, 34 deletions
diff --git a/main/mpg123/APKBUILD b/main/mpg123/APKBUILD index 2591ef3be10..f91092daf71 100644 --- a/main/mpg123/APKBUILD +++ b/main/mpg123/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mpg123 -pkgver=1.26.0 +pkgver=1.26.1 pkgrel=0 pkgdesc="Console-based MPEG Audio Player for Layers 1, 2 and 3" url="http://www.mpg123.org" @@ -8,9 +8,7 @@ arch="all" license="LGPL-2.1-only" subpackages="$pkgname-libs $pkgname-dev $pkgname-doc" makedepends="libtool alsa-lib-dev linux-headers" -source="http://www.mpg123.org/download/mpg123-$pkgver.tar.bz2 - fix-s390x.patch - " +source="http://www.mpg123.org/download/mpg123-$pkgver.tar.bz2" options="libtool" build() { @@ -34,5 +32,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="0b58b02228f950320fa948fde17730f22a27e7bf6185fe678632281ca230fa5b84358382acb0f1f438631fcdfb93d1dce252d4fbfe616711144f181deb9f2a3e mpg123-1.26.0.tar.bz2 -5331a79f9cc33a55a01757f5676d174bad7ce10b05616eebd1554717a01a3c9cb5e3390e1d1e693abfbc4dbdda440dd2eb2eba258fd804e2f7d61a34072d60cd fix-s390x.patch" +sha512sums="e3a7318a4c5b2e043f6fa70d1ccc93e654d81ec0b1262578153c72a3e3c1d8a8ff7ec49a2a6553791d4f18e2fd59b5e2c3846dd1c002effd651d7d4c0fd8b0dc mpg123-1.26.1.tar.bz2" diff --git a/main/mpg123/fix-s390x.patch b/main/mpg123/fix-s390x.patch deleted file mode 100644 index 90b4394a177..00000000000 --- a/main/mpg123/fix-s390x.patch +++ /dev/null @@ -1,28 +0,0 @@ -Upstream: No (lives in sourceforge) -Reason: Fixes compilation on big endian systems - -diff --git a/src/libout123/hextxt.c b/src/libout123/hextxt.c -index 45c8134..f87c0dc 100644 ---- a/src/libout123/hextxt.c -+++ b/src/libout123/hextxt.c -@@ -194,6 +194,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) \ - { \ - uint32_t tmp = 0; \ -diff --git a/src/libmpg123/sample.h b/src/libmpg123/sample.h -index 5a98fe0..4d244fe 100644 ---- a/src/libmpg123/sample.h -+++ b/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];} |