mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-24 11:16:51 +00:00
Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-6.0
This commit is contained in:
commit
7e0e21469c
@ -52,6 +52,11 @@ LINUX_DEPENDS="$PROJECT_DIR/$PROJECT/linux/linux.$TARGET_ARCH.conf $ROOT/package
|
||||
# If you have ccache installed, take care that LOCAL_CC don't point to it
|
||||
LOCAL_CC=`which gcc`
|
||||
|
||||
if [ -z "$LOCAL_CC" ] ; then
|
||||
echo "***** Please install gcc *****"
|
||||
exit 127
|
||||
fi
|
||||
|
||||
# Need to point to your actual g++
|
||||
# If you have ccache installed, take care that LOCAL_CXX don't point to it
|
||||
LOCAL_CXX=`which g++`
|
||||
|
@ -17,12 +17,12 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="libopenmpt"
|
||||
PKG_VERSION="0.2.5598"
|
||||
PKG_VERSION="0.2.4764"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="BSD"
|
||||
PKG_SITE="http://lib.openmpt.org/libopenmpt/"
|
||||
PKG_URL="http://buildbot.openmpt.org/builds/auto/src/$PKG_NAME-$PKG_VERSION.tar.gz"
|
||||
PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.gz"
|
||||
PKG_DEPENDS_TARGET="toolchain"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="audio"
|
||||
|
@ -51,7 +51,7 @@
|
||||
#
|
||||
# For sites which prefer IPv4 connections change the last line to
|
||||
#
|
||||
precedence ::ffff:0:0/96 100
|
||||
#precedence ::ffff:0:0/96 100
|
||||
|
||||
#
|
||||
# scopev4 <mask> <value>
|
||||
@ -60,6 +60,6 @@ precedence ::ffff:0:0/96 100
|
||||
# used. Changing these defaults should hardly ever be necessary.
|
||||
# The defaults are equivalent to:
|
||||
#
|
||||
scopev4 ::ffff:169.254.0.0/112 2
|
||||
scopev4 ::ffff:127.0.0.0/104 2
|
||||
scopev4 ::ffff:0.0.0.0/96 14
|
||||
#scopev4 ::ffff:169.254.0.0/112 2
|
||||
#scopev4 ::ffff:127.0.0.0/104 2
|
||||
#scopev4 ::ffff:0.0.0.0/96 14
|
||||
|
@ -37,7 +37,6 @@ pre_configure_target() {
|
||||
export CFLAGS="$CFLAGS -fPIC"
|
||||
export CXXFLAGS="$CXXFLAGS -fPIC"
|
||||
export LDFLAGS="$LDFLAGS -fPIC"
|
||||
export CSAFLAGS="$CFLAGS -Wall -fomit-frame-pointer -fexpensive-optimizations -funroll-loops"
|
||||
}
|
||||
|
||||
pre_make_target() {
|
||||
|
@ -1,16 +0,0 @@
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 278af2b..996dc77 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -85,8 +85,9 @@ OBJS = CAPMT.o DeCSA.o DeCsaTSBuffer.o dll.o DVBAPI.o DVBAPISetup.o SCDeviceProb
|
||||
|
||||
ifndef LIBDVBCSA
|
||||
# FFdeCSA
|
||||
-PARALLEL ?= PARALLEL_128_SSE2
|
||||
-CSAFLAGS ?= -fexpensive-optimizations -funroll-loops -mmmx -msse -msse2 -msse3
|
||||
+CPUOPT ?= pentium
|
||||
+PARALLEL ?= PARALLEL_32_INT
|
||||
+CSAFLAGS ?= -Wall -fPIC -g -O3 -mmmx -fomit-frame-pointer -fexpensive-optimizations -funroll-loops
|
||||
FFDECSADIR = FFdecsa
|
||||
FFDECSA = $(FFDECSADIR)/FFdecsa.o
|
||||
DECSALIB = $(FFDECSA)
|
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="busybox"
|
||||
PKG_VERSION="1.24.0"
|
||||
PKG_VERSION="1.24.1"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -1,12 +0,0 @@
|
||||
diff -Naur busybox-1.24.0/scripts/trylink busybox-1.24.0.patch/scripts/trylink
|
||||
--- busybox-1.24.0/scripts/trylink 2015-10-12 14:37:58.000000000 +0200
|
||||
+++ busybox-1.24.0.patch/scripts/trylink 2015-10-13 18:49:50.537508072 +0200
|
||||
@@ -49,7 +49,7 @@
|
||||
local tempname="$(mktemp)"
|
||||
# Can use "-o /dev/null", but older gcc tend to *unlink it* on failure! :(
|
||||
# "-xc": C language. "/dev/null" is an empty source file.
|
||||
- if $CC $CPPFLAGS $CFLAGS $1 -shared -xc /dev/null -o "$tempname".o >/dev/null 2>&1; then
|
||||
+ if $CC $CPPFLAGS $CFLAGS $LDFLAGS $1 -shared -xc /dev/null -o "$tempname".o >/dev/null 2>&1; then
|
||||
echo "$1";
|
||||
else
|
||||
echo "$2";
|
@ -70,6 +70,7 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_malloc_0_nonnull=yes \
|
||||
--disable-gnutls \
|
||||
--disable-libcurl \
|
||||
--disable-libidn \
|
||||
--disable-libiptc \
|
||||
--disable-binfmt \
|
||||
--disable-vconsole \
|
||||
--disable-bootchart \
|
||||
|
Loading…
x
Reference in New Issue
Block a user