mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-31 14:37:59 +00:00
Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-next
This commit is contained in:
Stephan Raue
commit
e7b1ac3ac1
@ -244,6 +244,7 @@ show_config() {
|
||||
config_message="$config_message\n - CPU (ARCH):\t\t\t\t $TARGET_CPU ($TARGET_ARCH)"
|
||||
config_message="$config_message\n - FLOAT:\t\t\t\t $TARGET_FLOAT"
|
||||
config_message="$config_message\n - FPU:\t\t\t\t\t $TARGET_FPU"
|
||||
config_message="$config_message\n - SIMD support:\t\t\t $SIMD_SUPPORT"
|
||||
config_message="$config_message\n - Optimizations:\t\t\t $OPTIMIZATIONS"
|
||||
config_message="$config_message\n - LTO (Link Time Optimization) support: $LTO_SUPPORT"
|
||||
config_message="$config_message\n - LLVM support:\t\t\t $LLVM_SUPPORT"
|
||||
|
||||
@ -22,6 +22,15 @@
|
||||
|
||||
. config/options $1
|
||||
|
||||
if [ "$OPENMAX" = "bcm2835-driver" ]; then
|
||||
LIBCEC_RPI="--enable-rpi --with-rpi-include-path=$SYSROOT_PREFIX/usr/include --with-rpi-lib-path=$SYSROOT_PREFIX/usr/lib"
|
||||
else
|
||||
LIBCEC_RPI="--disable-rpi"
|
||||
fi
|
||||
|
||||
# dont use some optimizations because of build problems
|
||||
LDFLAGS=`echo $LDFLAGS | sed -e "s|-Wl,--as-needed||"`
|
||||
|
||||
cd $PKG_BUILD
|
||||
./configure --host=$TARGET_NAME \
|
||||
--build=$HOST_NAME \
|
||||
@ -29,6 +38,7 @@ cd $PKG_BUILD
|
||||
--sysconfdir=/etc \
|
||||
--disable-static \
|
||||
--enable-shared \
|
||||
$LIBCEC_RPI
|
||||
|
||||
make
|
||||
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="libcec"
|
||||
PKG_VERSION="1.7.1"
|
||||
PKG_VERSION="1.8.0"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
@ -34,3 +34,8 @@ PKG_LONGDESC="libCEC is an open-source dual licensed library designed for commun
|
||||
PKG_IS_ADDON="no"
|
||||
|
||||
PKG_AUTORECONF="yes"
|
||||
|
||||
if [ "$OPENMAX" = "bcm2835-driver" ]; then
|
||||
PKG_DEPENDS="$PKG_DEPENDS bcm2835-driver"
|
||||
PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS bcm2835-driver"
|
||||
fi
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="bcm2835-driver"
|
||||
PKG_VERSION="1309b3d"
|
||||
PKG_VERSION="c2c114a"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="nonfree"
|
||||
|
||||
@ -22,5 +22,9 @@
|
||||
|
||||
. config/options $1
|
||||
|
||||
# dont use our LDFLAGS, use the KERNEL LDFLAGS
|
||||
LDFLAGS=""
|
||||
|
||||
cd $PKG_BUILD
|
||||
make V=1 CC=$CC KDIR=$(kernel_path)
|
||||
make V=1 CC=$CC KDIR=$(kernel_path)
|
||||
|
||||
|
||||
@ -32,6 +32,9 @@ sed -i "s|KDIR = .*|KDIR = $(kernel_path)|" Makefile
|
||||
sed -i "s|KSRC = .*|KSRC = \$KDIR|" Makefile
|
||||
sed -i "s|KINS = .*|KINS = \./modules|" Makefile
|
||||
|
||||
# dont use our LDFLAGS, use the KERNEL LDFLAGS
|
||||
LDFLAGS=""
|
||||
|
||||
make CC=$CC
|
||||
|
||||
# ultraman: Original build module doesn't depends on dvb-usb module
|
||||
|
||||
@ -22,5 +22,8 @@
|
||||
|
||||
. config/options $1
|
||||
|
||||
# dont use our LDFLAGS, use the KERNEL LDFLAGS
|
||||
LDFLAGS=""
|
||||
|
||||
cd $PKG_BUILD
|
||||
make V=1 CC=$CC KDIR=$(kernel_path)
|
||||
make V=1 CC=$CC KDIR=$(kernel_path)
|
||||
|
||||
@ -22,7 +22,8 @@
|
||||
|
||||
. config/options $1
|
||||
|
||||
LDFLAGS=""
|
||||
# dont use our LDFLAGS, use the KERNEL LDFLAGS
|
||||
LDFLAGS=""
|
||||
|
||||
cd $PKG_BUILD
|
||||
make V=1 CC=$CC KDIR=$(kernel_path)
|
||||
make V=1 CC=$CC KDIR=$(kernel_path)
|
||||
|
||||
@ -24,6 +24,9 @@
|
||||
|
||||
$SCRIPTS/unpack dvbhdhomerun
|
||||
|
||||
# dont use our LDFLAGS, use the KERNEL LDFLAGS
|
||||
LDFLAGS=""
|
||||
|
||||
cd $BUILD/dvbhdhomerun-*/kernel
|
||||
make dvb_hdhomerun KERNEL_DIR=$(kernel_path)
|
||||
fix_module_depends dvb_hdhomerun_core.ko "dvb_core"
|
||||
|
||||
@ -24,6 +24,9 @@
|
||||
|
||||
cd $PKG_BUILD
|
||||
|
||||
# dont use our LDFLAGS, use the KERNEL LDFLAGS
|
||||
LDFLAGS=""
|
||||
|
||||
make KDIR=$(kernel_path) CC=$CC
|
||||
fix_module_depends vtunerc.ko "dvb_core"
|
||||
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="xbmc-rpi-theme-Confluence"
|
||||
PKG_VERSION="2acdae7"
|
||||
PKG_VERSION="365953f"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
||||
@ -82,6 +82,9 @@ fi
|
||||
|
||||
if [ "$CEC_SUPPORT" = yes ]; then
|
||||
XBMC_CEC="--enable-libcec"
|
||||
if [ "$OPENMAX" = "bcm2835-driver" ]; then
|
||||
XBMC_CEC="$XBMC_CEC --enable-rpi-cec-api"
|
||||
fi
|
||||
else
|
||||
XBMC_CEC="--disable-libcec"
|
||||
fi
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="xbmc-rpi"
|
||||
PKG_VERSION="2acdae7"
|
||||
PKG_VERSION="365953f"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
@ -85,9 +85,6 @@ fi
|
||||
if [ "$CEC_SUPPORT" = yes ]; then
|
||||
PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libcec"
|
||||
PKG_DEPENDS="$PKG_DEPENDS libcec"
|
||||
if [ "$OPENMAX" = "bcm2835-driver" ]; then
|
||||
PKG_DEPENDS="$PKG_DEPENDS rpi-cecd"
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ "$XBMC_SCR_RSXS" = yes ]; then
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="bcm2835-bootloader"
|
||||
PKG_VERSION="1309b3d"
|
||||
PKG_VERSION="c2c114a"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="arm"
|
||||
PKG_LICENSE="nonfree"
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Linux/arm 3.2.23 Kernel Configuration
|
||||
# Linux/arm 3.2.24 Kernel Configuration
|
||||
#
|
||||
CONFIG_ARM=y
|
||||
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
|
||||
@ -81,12 +81,12 @@ CONFIG_CGROUPS=y
|
||||
# CONFIG_CGROUP_FREEZER is not set
|
||||
# CONFIG_CGROUP_DEVICE is not set
|
||||
# CONFIG_CPUSETS is not set
|
||||
CONFIG_CGROUP_CPUACCT=y
|
||||
# CONFIG_CGROUP_CPUACCT is not set
|
||||
# CONFIG_RESOURCE_COUNTERS is not set
|
||||
CONFIG_CGROUP_SCHED=y
|
||||
CONFIG_FAIR_GROUP_SCHED=y
|
||||
# CONFIG_CFS_BANDWIDTH is not set
|
||||
CONFIG_RT_GROUP_SCHED=y
|
||||
# CONFIG_RT_GROUP_SCHED is not set
|
||||
# CONFIG_BLK_CGROUP is not set
|
||||
# CONFIG_NAMESPACES is not set
|
||||
CONFIG_SCHED_AUTOGROUP=y
|
||||
@ -103,7 +103,7 @@ CONFIG_RD_GZIP=y
|
||||
# CONFIG_RD_LZO is not set
|
||||
CONFIG_INITRAMFS_COMPRESSION_NONE=y
|
||||
# CONFIG_INITRAMFS_COMPRESSION_GZIP is not set
|
||||
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
|
||||
# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
|
||||
CONFIG_SYSCTL=y
|
||||
CONFIG_ANON_INODES=y
|
||||
CONFIG_EXPERT=y
|
||||
@ -347,8 +347,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
|
||||
CONFIG_HAVE_MEMBLOCK=y
|
||||
CONFIG_PAGEFLAGS_EXTENDED=y
|
||||
CONFIG_SPLIT_PTLOCK_CPUS=4
|
||||
CONFIG_COMPACTION=y
|
||||
CONFIG_MIGRATION=y
|
||||
# CONFIG_COMPACTION is not set
|
||||
# CONFIG_PHYS_ADDR_T_64BIT is not set
|
||||
CONFIG_ZONE_DMA_FLAG=0
|
||||
CONFIG_VIRT_TO_BUS=y
|
||||
|
||||
@ -85,7 +85,7 @@
|
||||
esac
|
||||
|
||||
# Build optimizations (size/normal/speed)
|
||||
OPTIMIZATIONS="size"
|
||||
OPTIMIZATIONS="fast"
|
||||
|
||||
# Project CFLAGS
|
||||
PROJECT_CFLAGS=""
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user