main/faac: fix gcc6 narrowing error

2 files changed, 58 insertions, 5 deletions

diff --git a/main/faac/APKBUILD b/main/faac/APKBUILD
index 2dc7a6687a..e9402c4455 100644
--- a/main/faac/APKBUILD
+++ b/main/faac/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=faac
 pkgver=1.28
-pkgrel=10
+pkgrel=11
 pkgdesc="FAAC is an AAC audio encoder."
 url="http://www.audiocoding.com/"
 arch="all"
@@ -12,7 +12,8 @@ makedepends="autoconf automake libtool"
 source="http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz
 	automake.patch
 	fix-libc-internals.patch
-"
+	fix-narrowing.patch
+	"
 
 prepare() {
 	cd "$srcdir/$pkgname-$pkgver"
@@ -49,10 +50,13 @@ package() {
 }
 md5sums="80763728d392c7d789cde25614c878f6  faac-1.28.tar.gz
 5a52db11e04cce0a7a32bc8565a7aa60  automake.patch
-b42dcaea1ef043f27f729730b292708f  fix-libc-internals.patch"
+b42dcaea1ef043f27f729730b292708f  fix-libc-internals.patch
+40f26e9c804137727092a3f21f064eb3  fix-narrowing.patch"
 sha256sums="c5141199f4cfb17d749c36ba8cfe4b25f838da67c22f0fec40228b6b9c3d19df  faac-1.28.tar.gz
 360f48a026644e8955c1a16228bdebb9f6281203b131d7e7e766ca3cb46d39a6  automake.patch
-3ad6d6d84324757ad86a01e489c0c6e63b9f7bc279d6c2514c09efbd927dafa3  fix-libc-internals.patch"
+3ad6d6d84324757ad86a01e489c0c6e63b9f7bc279d6c2514c09efbd927dafa3  fix-libc-internals.patch
+27a47ad16cd4bd2e903a52e51466b68937b099b9a87efb560565d555da6597e7  fix-narrowing.patch"
 sha512sums="0ef721ad28835e95cad41afc0cb6130e1ebb634cb6dd4b40f649bc2269b7bb5bf2887f6d8f023c74628d521f8bdf55b4dd070f972ecff162a5fe0384e026235b  faac-1.28.tar.gz
 364199eaf71cb4d8423545b086b24b16120e50f6944d1cdc54482c4639507c5a0156090315c39d749eb396cc029ef751c63cdec93a195fc25fee9b4f9c55ccaa  automake.patch
-c370cb5f2cca8676dc0b025774e7ac53d5021e97a809a13ef5d54bcd108ed96e667bbd1a98c8fc8071821a5e423f69275f09e0cc8c65d7c9401d0ff2cd77fd74  fix-libc-internals.patch"
+c370cb5f2cca8676dc0b025774e7ac53d5021e97a809a13ef5d54bcd108ed96e667bbd1a98c8fc8071821a5e423f69275f09e0cc8c65d7c9401d0ff2cd77fd74  fix-libc-internals.patch
+38d86bc1c6bcf0c516aec72419c56ab92145a71c4d94996ba22f0563648c9a9ee2c16f29e8e75bbd62e227e9608664f57fb724ed3379a6ff9caef878cdd8b1e2  fix-narrowing.patch"
diff --git a/main/faac/fix-narrowing.patch b/main/faac/fix-narrowing.patch
new file mode 100644
index 0000000000..a9854707f2
--- /dev/null
+++ b/main/faac/fix-narrowing.patch
@@ -0,0 +1,49 @@
+https://raw.githubusercontent.com/openembedded/meta-openembedded/master/meta-multimedia/recipes-multimedia/faac/files/address-gcc-6-narrowing-errors.patch
+
+--- faac-1.28/common/mp4v2/atom_standard.cpp.orig	2016-06-16 07:59:21.657040761 -0400
++++ faac-1.28/common/mp4v2/atom_standard.cpp	2016-06-16 08:01:50.613036724 -0400
+@@ -22,15 +22,15 @@
+ #include "mp4common.h"
+ #include "atoms.h"
+ 
+-static const char name[5]={0251,'n', 'a', 'm', '\0'};
+-static const char art[5]={0251,'A', 'R', 'T', '\0'};
+-static const char wrt[5]={0251,'w', 'r', 't', '\0'};
+-static const char alb[5]={0251,'a', 'l', 'b', '\0'};
+-static const char day[5]={0251,'d', 'a', 'y', '\0'};
+-static const char too[5]={0251,'t', 'o', 'o', '\0'};
+-static const char cmt[5]={0251,'c', 'm', 't', '\0'};
+-static const char gen[5]={0251,'g', 'e', 'n', '\0'};
+-static const char grp[5]={0251,'g', 'r', 'p', '\0'};
++static const char name[5]={(char)0251,'n', 'a', 'm', '\0'};
++static const char art[5]={(char)0251,'A', 'R', 'T', '\0'};
++static const char wrt[5]={(char)0251,'w', 'r', 't', '\0'};
++static const char alb[5]={(char)0251,'a', 'l', 'b', '\0'};
++static const char day[5]={(char)0251,'d', 'a', 'y', '\0'};
++static const char too[5]={(char)0251,'t', 'o', 'o', '\0'};
++static const char cmt[5]={(char)0251,'c', 'm', 't', '\0'};
++static const char gen[5]={(char)0251,'g', 'e', 'n', '\0'};
++static const char grp[5]={(char)0251,'g', 'r', 'p', '\0'};
+ 
+ MP4StandardAtom::MP4StandardAtom (const char *type) : MP4Atom(type)
+ {
+--- faac-1.28/common/mp4v2/mp4atom.cpp.orig	2016-06-16 08:03:07.777034633 -0400
++++ faac-1.28/common/mp4v2/mp4atom.cpp	2016-06-16 08:03:54.629033363 -0400
+@@ -264,11 +264,11 @@
+       }
+       break;
+     case 0251:
+-      static const char name[5]={0251,'n', 'a', 'm', '\0'};
+-      static const char cmt[5]={0251,'c', 'm', 't', '\0'};
+-      static const char cpy[5]={0251,'c', 'p', 'y', '\0'};
+-      static const char des[5]={0251,'d', 'e', 's','\0'};
+-      static const char prd[5]={0251, 'p', 'r', 'd', '\0'};
++      static const char name[5]={(char)0251,'n', 'a', 'm', '\0'};
++      static const char cmt[5]={(char)0251,'c', 'm', 't', '\0'};
++      static const char cpy[5]={(char)0251,'c', 'p', 'y', '\0'};
++      static const char des[5]={(char)0251,'d', 'e', 's','\0'};
++      static const char prd[5]={(char)0251, 'p', 'r', 'd', '\0'};
+       if (ATOMID(type) == ATOMID(name) ||
+ 	  ATOMID(type) == ATOMID(cmt) ||
+ 	  ATOMID(type) == ATOMID(cpy) ||
+