From 928ee00d0f7cc351e3fd6bdf22951be2bfd88803 Mon Sep 17 00:00:00 2001 From: Vincent Pelletier <vincent@nexedi.com> Date: Thu, 9 Feb 2017 16:24:19 +0900 Subject: [PATCH] component/ffmpeg: Update libvpx to latest release. 0.9.6 fails to build on (at least) gcc 6.3.0, with: [CC] nestegg/halloc/src/halloc.c.o In file included from nestegg/halloc/src/halloc.c:19:0: nestegg/halloc/src/align.h:33:25: error: conflicting types for 'max_align_t' typedef union max_align max_align_t; ^~~~~~~~~~~ In file included from nestegg/halloc/src/../halloc.h:18:0, from nestegg/halloc/src/halloc.c:18: /usr/lib/gcc/x86_64-linux-gnu/6/include/stddef.h:429:3: note: previous declaration of 'max_align_t' was here } max_align_t; ^~~~~~~~~~~ Makefile:104: recipe for target 'nestegg/halloc/src/halloc.c.o' failed Also, add --disable-static configure option. Also, reindent configure options. --- component/ffmpeg/buildout.cfg | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/component/ffmpeg/buildout.cfg b/component/ffmpeg/buildout.cfg index 434308bd1..d0939befc 100644 --- a/component/ffmpeg/buildout.cfg +++ b/component/ffmpeg/buildout.cfg @@ -49,10 +49,11 @@ url = http://www.tortall.net/projects/yasm/releases/yasm-1.1.0.tar.gz [libvpx] recipe = slapos.recipe.cmmi -url = http://webm.googlecode.com/files/libvpx-v0.9.6.tar.bz2 -md5sum = 383f3f07a76099682abb43f79b692b72 +url = http://storage.googleapis.com/downloads.webmproject.org/releases/webm/libvpx-1.6.1.tar.bz2 +md5sum = a19518c8111fa93bdabdd85259162611 configure-options = - --enable-shared + --enable-shared + --disable-static environment = PATH=${yasm:location}/bin:%(PATH)s -- 2.30.9