From 9d2169fa6052b7162d35ef193b8e1e6647e51ae9 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Sat, 10 Mar 2018 15:23:49 -0600
Subject: harmony/libsndfile: fix 32-bit build

---
 harmony/libsndfile/APKBUILD            | 13 ++++---------
 harmony/libsndfile/varargs-32bit.patch | 11 +++++++++++
 2 files changed, 15 insertions(+), 9 deletions(-)
 create mode 100644 harmony/libsndfile/varargs-32bit.patch

(limited to 'harmony')

diff --git a/harmony/libsndfile/APKBUILD b/harmony/libsndfile/APKBUILD
index 5101cde93..66abef4f7 100644
--- a/harmony/libsndfile/APKBUILD
+++ b/harmony/libsndfile/APKBUILD
@@ -15,6 +15,7 @@ source="http://www.mega-nerd.com/$pkgname/files/$pkgname-$pkgver.tar.gz
 	CVE-2017-8361_CVE-2017-8363_CVE-2017-8365.patch
 	CVE-2017-8362.patch
 	CVE-2017-12562.patch
+	varargs-32bit.patch
 	"
 
 # secfixes:
@@ -52,15 +53,9 @@ package() {
 	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
-md5sums="646b5f98ce89ac60cdb060fcd398247c  libsndfile-1.0.28.tar.gz
-cdd75dee754a3f97a2b9852193858e8b  CVE-2017-8361_CVE-2017-8363_CVE-2017-8365.patch
-883e150165932d7dc89aee64795a5e5e  CVE-2017-8362.patch
-bcee757ad4ec56f92c0c2ad5c9c9bf96  CVE-2017-12562.patch"
-sha256sums="1ff33929f042fa333aed1e8923aa628c3ee9e1eb85512686c55092d1e5a9dfa9  libsndfile-1.0.28.tar.gz
-c2d2665744b32facab093540bd0b0c28e72496dd03f8fd51e0aef42fb76d9631  CVE-2017-8361_CVE-2017-8363_CVE-2017-8365.patch
-3dc977a26f36a779874bda304685a221a9da08d3e6b8d239f19785a31e18dbf7  CVE-2017-8362.patch
-5e13e843a247c5cc3e33e926183281003512bd34dbb32acab6c9360e06e6e3c9  CVE-2017-12562.patch"
+
 sha512sums="890731a6b8173f714155ce05eaf6d991b31632c8ab207fbae860968861a107552df26fcf85602df2e7f65502c7256c1b41735e1122485a3a07ddb580aa83b57f  libsndfile-1.0.28.tar.gz
 f98c40696fca3e7bca867df993de55bb4145c23428e65d1a669182eb2293046478ac727ae7f94bb77123ef0355c3c53be4f9d6a432665c90c74687d8d3afd9e3  CVE-2017-8361_CVE-2017-8363_CVE-2017-8365.patch
 dfd4b5f1c7471fc416eed5c6040580a020543f145de9103751adaad6ce1c5c6a22abc1cf0ffd381aed3072644cd5ee03ba3598265aa7d202d63167da251cb595  CVE-2017-8362.patch
-814139567d90fb07908014e858c341fe933e04dca69b88ad66078910888237bbeba94f85d9e1489883c424f35fca312eb98c21ae2b122d9289bb6418725cd02e  CVE-2017-12562.patch"
+814139567d90fb07908014e858c341fe933e04dca69b88ad66078910888237bbeba94f85d9e1489883c424f35fca312eb98c21ae2b122d9289bb6418725cd02e  CVE-2017-12562.patch
+2b83bacec23665cd31a596a1ce1fb543f935c7609dfff93a85822f81d66b3483cd547cd043eefb901d543276c270a17add70bf0db6348b5279220a7ecbd8b339  varargs-32bit.patch"
diff --git a/harmony/libsndfile/varargs-32bit.patch b/harmony/libsndfile/varargs-32bit.patch
new file mode 100644
index 000000000..81f149add
--- /dev/null
+++ b/harmony/libsndfile/varargs-32bit.patch
@@ -0,0 +1,11 @@
+--- libsndfile-1.0.28/src/rf64.c.old	2017-04-02 02:43:22.000000000 -0500
++++ libsndfile-1.0.28/src/rf64.c	2018-03-04 22:35:31.072461118 -0600
+@@ -737,7 +737,7 @@
+ 
+ 	pad_size = psf->dataoffset - 16 - psf->header.indx ;
+ 	if (pad_size >= 0)
+-		psf_binheader_writef (psf, "m4z", PAD_MARKER, pad_size, make_size_t (pad_size)) ;
++		psf_binheader_writef (psf, "m4z", PAD_MARKER, (unsigned int) pad_size, make_size_t (pad_size)) ;
+ 
+ 	if (wpriv->rf64_downgrade && (psf->filelength < RIFF_DOWNGRADE_BYTES))
+ 		psf_binheader_writef (psf, "tm8", data_MARKER, psf->datalength) ;
-- 
cgit v1.2.3-60-g2f50