[meta-oe][PATCH] libvpx: fix build errors for gcc 5

[meta-oe][PATCH] libvpx: fix build errors for gcc 5

[Max Krummenacher]

Signed-off-by: Max Krummenacher <max.oss.09@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(-)
 create mode 100644 meta-oe/recipes-multimedia/webm/libvpx/gcc-5-max_align_t.patch

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@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"
 
-- 
1.8.4.5

Re: [meta-oe][PATCH] libvpx: fix build errors for gcc 5

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 3387 bytes --]

On Sun, Aug 09, 2015 at 06:20:13PM +0200, Max Krummenacher wrote:
> Signed-off-by: Max Krummenacher <max.oss.09@gmail.com>

Please test your patches.

gcc-5-max_align_t.patch and in SRC_URI there is:
file://fix_build_with_gcc5.patch

I'll fix it this time when cherry-picking to master-next.

> ---
>  .../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(-)
>  create mode 100644 meta-oe/recipes-multimedia/webm/libvpx/gcc-5-max_align_t.patch
> 
> 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@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"
>  
> -- 
> 1.8.4.5
> 
> -- 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]

Re: [meta-oe][PATCH] libvpx: fix build errors for gcc 5

[Martin Jansa]

Sure, send v2 when ready.

On Thu, Aug 20, 2015 at 12:05 AM, Max Krummenacher <
max.krummenacher@solnet.ch> wrote:

> Hi Martin
>
> > Please test your patches.
> Sorry about that.
>
> >
> > gcc-5-max_align_t.patch and in SRC_URI there is:
> > file://fix_build_with_gcc5.patch
> >
> > I'll fix it this time when cherry-picking to master-next.
> >
> It is far worse than just a last minute filename change.
> Actually I had the missing file in another layer as I started the fix
> from a libvpx_xx.bbappend.
> So no obvious failure during bitbake and git status.
>
> The patch as it is now, even with the fixed filename, will do no harm
> but will also not fix anything.
> Can you not pull in the patch into master and give me some time to fix
> it properly?
>
> Regards
> Max
>
>