godotengine/buildroot
1
0
Fork 0
mirror of https://github.com/godotengine/buildroot.git synced 2026-01-04 06:10:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'next'

Browse Source 
Conflicts:
	Makefile
	package/flac/0001-fix-altivec-logic.patch
	package/grantlee/Config.in

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Peter Korsgaard
2014-12-01 11:15:54 +01:00
parent 9a5434fbfc 9b47f40bb2
commit fe1b2ef1d3
182 changed files with 1452 additions and 953 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
package/flac/0001-configure-don-t-try-to-unset-g-from-CFLAGS.txt Normal file
View File

@@ -0,0 +1,27 @@
The sed expression is wrong, any flags with '-g' in any position gets
zapped, for example:
-mfloat-gprs=double (for powerpc e500) -> -mfloatprs=double.
Which gives build errors and is perfectly valid in real use scenarios to
switch from e500v1 (single precision) code to e500v2 (double precision) code.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
diff -Nura flac-1.3.1.orig/configure flac-1.3.1/configure
--- flac-1.3.1.orig/configure 2014-11-27 20:43:29.921303105 -0300
+++ flac-1.3.1/configure 2014-11-27 20:45:33.460250179 -0300
@@ -19870,11 +19870,10 @@
if test "x$debug" = xtrue; then
CPPFLAGS="-DDEBUG $CPPFLAGS"
- CFLAGS=$(echo "$CFLAGS" | sed 's/-g//')
- CFLAGS="-g $CFLAGS"
+ CFLAGS=$(echo "-g $CFLAGS")
else
CPPFLAGS="-DNDEBUG $CPPFLAGS"
- CFLAGS=$(echo "$CFLAGS" | sed 's/-O2//;s/-g//')
+ CFLAGS=$(echo "$CFLAGS" | sed 's/-O2//')
CFLAGS="-O3 -funroll-loops $CFLAGS"
fi

32
package/flac/0001-fix-altivec-logic.patch
View File

@@ -1,32 +0,0 @@
From d65ede3e874c79348efc85cf3a185c170046c4c8 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Wed, 4 Dec 2013 13:31:28 -0300
Subject: [PATCH] Fix Makefile.am altivec logic
Besides SPE (FSL e500v? cores) there are other powerpc processors
that don't support altivec instructions so only enable them when it's
100% sure that the target has it.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Erik de Castro Lopo <erikd@mega-nerd.com>
---
src/libFLAC/Makefile.am | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/libFLAC/Makefile.am b/src/libFLAC/Makefile.am
index 247e33c..258de40 100644
--- a/src/libFLAC/Makefile.am
+++ b/src/libFLAC/Makefile.am
@@ -47,8 +47,7 @@ CPUCFLAGS = -faltivec -force_cpusubtype_ALL -DFLAC__NO_ASM
else
# Linux-gcc for PPC does not have -force_cpusubtype_ALL, it is Darwin-specific
CPUCFLAGS =
-if FLaC__CPU_PPC_SPE
-else
+if FLaC__USE_ALTIVEC
CPUCFLAGS += -maltivec -mabi=altivec
endif
#@@@ PPC optimizations temporarily disabled
--
1.8.3.2

2
package/flac/flac.hash Normal file
View File

@@ -0,0 +1,2 @@
# From http://downloads.xiph.org/releases/flac/SHA256SUMS.txt
sha256 4773c0099dba767d963fd92143263be338c48702172e8754b9bc5103efe1c56c flac-1.3.1.tar.xz

3
package/flac/flac.mk
View File

@@ -4,11 +4,10 @@
#
################################################################################
FLAC_VERSION = 1.3.0
FLAC_VERSION = 1.3.1
FLAC_SITE = http://downloads.xiph.org/releases/flac
FLAC_SOURCE = flac-$(FLAC_VERSION).tar.xz
FLAC_INSTALL_STAGING = YES
FLAC_AUTORECONF = YES
FLAC_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv)
FLAC_LICENSE = Xiph BSD-like (libFLAC), GPLv2+ (tools), LGPLv2.1+ (other libraries)
FLAC_LICENSE_FILES = COPYING.Xiph COPYING.GPL COPYING.LGPL