jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-31 23:17:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

flac: bump to version 1.3.0

Browse Source 
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Gustavo Zacarias 2014-04-11 07:55:05 -03:00 committed by Peter Korsgaard
parent e4a021d63c
commit 230d1af54e
3 changed files with 49 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
package/flac/flac-01-fix-altivec-logic.patch Normal file
View File

@ -0,0 +1,32 @@
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

28
package/flac/flac-no-altivec.patch
View File

@ -1,28 +0,0 @@
FLAC assumes every powerpc around has altivec ABI which is wrong.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
diff -Nura flac-1.2.1/src/libFLAC/Makefile.am flac-1.2.1-noaltivec/src/libFLAC/Makefile.am
--- flac-1.2.1/src/libFLAC/Makefile.am 2007-09-14 18:06:17.000000000 -0300
+++ flac-1.2.1-noaltivec/src/libFLAC/Makefile.am 2011-01-06 15:14:36.384242614 -0300
@@ -41,7 +41,7 @@
else
# Linux-gcc for PPC does not have -force_cpusubtype_ALL, it is Darwin-specific
#@@@ PPC optimizations temporarily disabled
-CPUCFLAGS = -maltivec -mabi=altivec -DFLAC__NO_ASM
+CPUCFLAGS = -DFLAC__NO_ASM
endif
endif
diff -Nura flac-1.2.1/src/libFLAC/Makefile.in flac-1.2.1-noaltivec/src/libFLAC/Makefile.in
--- flac-1.2.1/src/libFLAC/Makefile.in 2007-09-16 17:05:12.000000000 -0300
+++ flac-1.2.1-noaltivec/src/libFLAC/Makefile.in 2011-01-06 15:14:50.997545602 -0300
@@ -240,7 +240,7 @@
@FLaC__CPU_PPC_TRUE@@FLaC__SYS_DARWIN_TRUE@CPUCFLAGS = -faltivec -force_cpusubtype_ALL -DFLAC__NO_ASM
# Linux-gcc for PPC does not have -force_cpusubtype_ALL, it is Darwin-specific
#@@@ PPC optimizations temporarily disabled
-@FLaC__CPU_PPC_TRUE@@FLaC__SYS_DARWIN_FALSE@CPUCFLAGS = -maltivec -mabi=altivec -DFLAC__NO_ASM
+@FLaC__CPU_PPC_TRUE@@FLaC__SYS_DARWIN_FALSE@CPUCFLAGS = -DFLAC__NO_ASM
AM_CFLAGS = $(DEBUGCFLAGS) $(CPUCFLAGS) @OGG_CFLAGS@
@FLaC__CPU_PPC_TRUE@@FLaC__NO_ASM_FALSE@ARCH_SUBDIRS = ppc

22
package/flac/flac.mk
View File

@ -4,19 +4,31 @@
# #
################################################################################ ################################################################################
FLAC_VERSION = 1.2.1 FLAC_VERSION = 1.3.0
FLAC_SITE = http://downloads.sourceforge.net/project/flac/flac-src/flac-$(FLAC_VERSION)-src FLAC_SITE = http://downloads.xiph.org/releases/flac
FLAC_SOURCE = flac-$(FLAC_VERSION).tar.xz
FLAC_INSTALL_STAGING = YES 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
FLAC_CONF_OPT = \ FLAC_CONF_OPT = \
--disable-cpplibs \ --disable-cpplibs \
--disable-xmms-plugin --disable-xmms-plugin \
--disable-altivec
ifeq ($(BR2_PACKAGE_LIBOGG),y) ifeq ($(BR2_PACKAGE_LIBOGG),y)
FLAC_CONF_OPT += --with-ogg=$(STAGING_DIR)/usr FLAC_CONF_OPT += --with-ogg=$(STAGING_DIR)/usr
FLAC_DEPENDENCIES = libogg FLAC_DEPENDENCIES += libogg
else else
FLAC_CONF_OPT += --disable-ogg FLAC_CONF_OPT += --disable-ogg
endif endif
ifeq ($(BR2_X86_CPU_HAS_SSE),y)
FLAC_DEPENDENCIES += host-nasm
FLAC_CONF_OPT += --enable-sse
else
FLAC_CONF_OPT += --disable-sse
endif
$(eval $(autotools-package)) $(eval $(autotools-package))