[oe-commits] Max Krummenacher : libvpx: fix build errors for gcc 5

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master-next
Commit: 183876cb292b127f7005a0def334780f962f7ae3
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=183876cb292b127f7005a0def334780f962f7ae3

Author: Max Krummenacher <max.oss.09 at gmail.com>
Date:   Sun Aug  9 18:20:13 2015 +0200

libvpx: fix build errors for gcc 5

Signed-off-by: Max Krummenacher <max.oss.09 at gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 .../webm/libvpx/gcc-5-max_align_t.patch            | 37 ++++++++++++++++++++++
 meta-oe/recipes-multimedia/webm/libvpx_1.3.0.bb    |  3 +-
 2 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/meta-oe/recipes-multimedia/webm/libvpx/gcc-5-max_align_t.patch b/meta-oe/recipes-multimedia/webm/libvpx/gcc-5-max_align_t.patch
new file mode 100644
index 0000000..e017fc0
--- /dev/null
+++ b/meta-oe/recipes-multimedia/webm/libvpx/gcc-5-max_align_t.patch
@@ -0,0 +1,37 @@
+max_align_t is a type in gcc5 thus the definition here throws a compile
+time error.
+patch taken from:
+https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=777976
+
+Upstream-Status: pending
+
+Signed-off-by: Max Krummenacher <max.oss.09 at gmail.com>
+--- libvpx-1.3.0/debian/patches/gcc-5.diff	1970-01-01 00:00:00.000000000 +0000
++++ libvpx-1.3.0/debian/patches/gcc-5.diff	2015-03-05 23:03:15.000000000 +0000
+@@ -0,0 +1,26 @@
++Index: b/nestegg/halloc/src/align.h
++===================================================================
++--- a/nestegg/halloc/src/align.h
+++++ b/nestegg/halloc/src/align.h
++@@ -30,7 +30,7 @@ union max_align
++ 	void (*q)(void);
++ };
++ 
++-typedef union max_align max_align_t;
+++typedef union max_align h_max_align_t;
++ 
++ #endif
++ 
++Index: b/nestegg/halloc/src/halloc.c
++===================================================================
++--- a/nestegg/halloc/src/halloc.c
+++++ b/nestegg/halloc/src/halloc.c
++@@ -30,7 +30,7 @@ typedef struct hblock
++ #endif
++ 	hlist_item_t  siblings; /* 2 pointers */
++ 	hlist_head_t  children; /* 1 pointer  */
++-	max_align_t   data[1];  /* not allocated, see below */
+++	h_max_align_t data[1];  /* not allocated, see below */
++ 	
++ } hblock_t;
++ 
diff --git a/meta-oe/recipes-multimedia/webm/libvpx_1.3.0.bb b/meta-oe/recipes-multimedia/webm/libvpx_1.3.0.bb
index eb19a57..cd0af50 100644
--- a/meta-oe/recipes-multimedia/webm/libvpx_1.3.0.bb
+++ b/meta-oe/recipes-multimedia/webm/libvpx_1.3.0.bb
@@ -9,7 +9,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=d5b04755015be901744a78cc30d390d4"
 
 SRC_URI += "http://webm.googlecode.com/files/libvpx-v${PV}.tar.bz2 \
             file://libvpx-configure-support-blank-prefix.patch \
-            file://0001-configure.sh-quote-local-variables.patch"
+            file://0001-configure.sh-quote-local-variables.patch \
+            file://fix_build_with_gcc5.patch"
 SRC_URI[md5sum] = "14783a148872f2d08629ff7c694eb31f"
 SRC_URI[sha256sum] = "d3dcc8d84af51c6c382b214397c62402e37a799e8ebcda6f4217aef0010451a9"