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-next
This commit is contained in:
commit
aedba459d7
@ -26,9 +26,9 @@
|
||||
strip_lto
|
||||
|
||||
if [ "$TARGET_ARCH" = i386 ]; then
|
||||
ARCH=x86
|
||||
LLVM_ARCH=x86
|
||||
elif [ "$TARGET_ARCH" = x86_64 ]; then
|
||||
ARCH=x86_64
|
||||
LLVM_ARCH=x86_64
|
||||
fi
|
||||
|
||||
LLVM_DIR=`ls -d $BUILD/llvm-[0-9]*`
|
||||
@ -56,7 +56,7 @@ mkdir -p .build-target && cd .build-target
|
||||
--enable-shared \
|
||||
--enable-embed-stdcxx \
|
||||
--enable-timestamps \
|
||||
--enable-targets=$ARCH \
|
||||
--enable-targets=$LLVM_ARCH \
|
||||
|
||||
TBLGEN="$ROOT/$TOOLCHAIN/bin/tblgen" \
|
||||
TCLSH="$ROOT/$TOOLCHAIN/bin/tclsh" \
|
||||
|
@ -26,8 +26,22 @@ get_graphicdrivers
|
||||
|
||||
# dont use gold linker because of compiling issues
|
||||
strip_gold
|
||||
strip_linker_plugin
|
||||
strip_lto # Mesa fails to build with LTO optimization
|
||||
|
||||
# Mesa fails to build with LTO optimization
|
||||
strip_lto
|
||||
|
||||
# dont build with loop and graphite optimization
|
||||
CFLAGS=`echo $CFLAGS | sed -e "s|-ftree-loop-distribution||"`
|
||||
CFLAGS=`echo $CFLAGS | sed -e "s|-floop-interchange||"`
|
||||
CFLAGS=`echo $CFLAGS | sed -e "s|-floop-strip-mine||"`
|
||||
CFLAGS=`echo $CFLAGS | sed -e "s|-floop-block||"`
|
||||
CFLAGS=`echo $CFLAGS | sed -e "s|-fgraphite-identity||"`
|
||||
|
||||
CXXFLAGS=`echo $CXXFLAGS | sed -e "s|-ftree-loop-distribution||"`
|
||||
CXXFLAGS=`echo $CXXFLAGS | sed -e "s|-floop-interchange||"`
|
||||
CXXFLAGS=`echo $CXXFLAGS | sed -e "s|-floop-strip-mine||"`
|
||||
CXXFLAGS=`echo $CXXFLAGS | sed -e "s|-floop-block||"`
|
||||
CXXFLAGS=`echo $CXXFLAGS | sed -e "s|-fgraphite-identity||"`
|
||||
|
||||
if [ "$LLVM_SUPPORT" = "yes" ]; then
|
||||
export LLVM_CONFIG="$SYSROOT_PREFIX/usr/bin/llvm-config"
|
||||
@ -50,23 +64,35 @@ DRI_DRIVER_SEARCH_DIR="$XORG_PATH_DRI" \
|
||||
--localstatedir=/var \
|
||||
--disable-static \
|
||||
--enable-shared \
|
||||
--enable-shared-dricore \
|
||||
--disable-debug \
|
||||
--disable-texture-float \
|
||||
--disable-selinux \
|
||||
--enable-xcb \
|
||||
--enable-opengl \
|
||||
--disable-glx-tls \
|
||||
--enable-driglx-direct \
|
||||
--disable-egl \
|
||||
--disable-gles1 \
|
||||
--disable-gles2 \
|
||||
--disable-openvg \
|
||||
--disable-xorg \
|
||||
--enable-glu \
|
||||
--disable-gl-osmesa \
|
||||
--disable-glut \
|
||||
--disable-glw \
|
||||
--disable-motif \
|
||||
--with-gallium-drivers="$GALLIUM_DRIVERS" \
|
||||
--disable-d3d1x \
|
||||
--disable-egl \
|
||||
--disable-gbm \
|
||||
--disable-gallium-egl \
|
||||
--disable-gallium-gbm \
|
||||
--enable-shared-glapi \
|
||||
--enable-xcb \
|
||||
--enable-shared-dricore \
|
||||
--disable-egl \
|
||||
$MESA_GALLIUM_LLVM \
|
||||
--with-gallium-drivers="$GALLIUM_DRIVERS" \
|
||||
--with-driver="dri" \
|
||||
--with-dri-drivers="$DRI_DRIVERS" \
|
||||
--with-xorg-driver-dir="$XORG_PATH_DRIVERS" \
|
||||
--with-x \
|
||||
|
||||
make CC="$HOST_CC" \
|
||||
CXX="$HOST_CXX" \
|
||||
@ -82,5 +108,4 @@ sed -e "s#\.\/builtin_compiler#$ROOT/$TOOLCHAIN/bin/builtin_compiler#g" -i src/g
|
||||
|
||||
make
|
||||
|
||||
$MAKEINSTALL -C src/mesa
|
||||
$MAKEINSTALL -C src/glu
|
||||
$MAKEINSTALL
|
||||
|
@ -27,10 +27,11 @@ mkdir -p $INSTALL/usr/lib
|
||||
ln -sf libGL.so.1 $INSTALL/usr/lib/libGL.so
|
||||
ln -sf /var/lib/libGL.so $INSTALL/usr/lib/libGL.so.1
|
||||
cp -P $PKG_BUILD/lib/libGLU.so* $INSTALL/usr/lib
|
||||
cp -P $PKG_BUILD/lib/libdricore.so $INSTALL/usr/lib
|
||||
cp -P $PKG_BUILD/lib/libglsl.so $INSTALL/usr/lib
|
||||
cp -P $PKG_BUILD/lib/libglapi.so* $INSTALL/usr/lib
|
||||
|
||||
mkdir -p $INSTALL/usr/lib/dri
|
||||
cp -P $PKG_BUILD/lib/libdricore.so $INSTALL/usr/lib
|
||||
cp -P $PKG_BUILD/lib/libglsl.so $INSTALL/usr/lib
|
||||
cp -P $PKG_BUILD/lib/*_dri.so $INSTALL/usr/lib/dri || true
|
||||
cp -P $PKG_BUILD/lib/gallium/*_dri.so $INSTALL/usr/lib/dri || true
|
||||
|
||||
|
@ -40,6 +40,5 @@ get_graphicdrivers
|
||||
|
||||
if [ "$LLVM_SUPPORT" = "yes" ]; then
|
||||
PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS llvm"
|
||||
# actually we dont need llvm installed because its linked statically
|
||||
# PKG_DEPENDS="$PKG_DEPENDS llvm"
|
||||
PKG_DEPENDS="$PKG_DEPENDS llvm"
|
||||
fi
|
||||
|
12
packages/graphics/Mesa/patches/Mesa-7.11-rc2-llvm_so.patch
Normal file
12
packages/graphics/Mesa/patches/Mesa-7.11-rc2-llvm_so.patch
Normal file
@ -0,0 +1,12 @@
|
||||
diff -Naur Mesa-7.11-rc2-old/configure.ac Mesa-7.11-rc2-new/configure.ac
|
||||
--- Mesa-7.11-rc2-old/configure.ac 2011-07-19 16:39:56.000000000 -0700
|
||||
+++ Mesa-7.11-rc2-new/configure.ac 2011-07-21 10:08:33.000000000 -0700
|
||||
@@ -1737,7 +1737,7 @@
|
||||
if test "x$LLVM_CONFIG" != xno; then
|
||||
LLVM_VERSION=`$LLVM_CONFIG --version`
|
||||
LLVM_CFLAGS=`$LLVM_CONFIG --cppflags`
|
||||
- LLVM_LIBS="`$LLVM_CONFIG --libs` -lstdc++"
|
||||
+ LLVM_LIBS="-lLLVM-$LLVM_VERSION -lstdc++"
|
||||
|
||||
LLVM_LDFLAGS=`$LLVM_CONFIG --ldflags`
|
||||
GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS llvmpipe"
|
@ -19,13 +19,12 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="linux"
|
||||
PKG_VERSION="3.0-rc7"
|
||||
PKG_VERSION="3.0"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://www.kernel.org"
|
||||
#PKG_URL="http://www.kernel.org/pub/linux/kernel/v2.6/$PKG_NAME-$PKG_VERSION.tar.bz2"
|
||||
PKG_URL="http://www.kernel.org/pub/linux/kernel/v3.0/testing/$PKG_NAME-$PKG_VERSION.tar.bz2"
|
||||
PKG_URL="http://www.kernel.org/pub/linux/kernel/v3.0/$PKG_NAME-$PKG_VERSION.tar.bz2"
|
||||
PKG_DEPENDS="busybox linux-drivers linux-firmware"
|
||||
PKG_BUILD_DEPENDS="toolchain busybox-hosttools xz cpio"
|
||||
PKG_PRIORITY="optional"
|
||||
@ -37,9 +36,8 @@ PKG_IS_ADDON="no"
|
||||
PKG_AUTORECONF="no"
|
||||
|
||||
if [ "$LINUX_NEXT" = "yes" -a "$LINUX" = "default" ]; then
|
||||
PKG_VERSION="2.6.39-rc2"
|
||||
# PKG_URL="http://www.kernel.org/pub/linux/kernel/v2.6/$PKG_NAME-$PKG_VERSION.tar.bz2"
|
||||
PKG_URL="http://www.kernel.org/pub/linux/kernel/v2.6/testing/$PKG_NAME-$PKG_VERSION.tar.bz2"
|
||||
PKG_VERSION="3.0"
|
||||
PKG_URL="http://www.kernel.org/pub/linux/kernel/v3.0/$PKG_NAME-$PKG_VERSION.tar.bz2"
|
||||
fi
|
||||
|
||||
if [ "$LINUX" = "ti-omap4" ]; then
|
||||
|
@ -0,0 +1,12 @@
|
||||
diff -Naur linux-3.0/drivers/media/rc/nuvoton-cir.c linux-3.0.patch/drivers/media/rc/nuvoton-cir.c
|
||||
--- linux-3.0/drivers/media/rc/nuvoton-cir.c 2011-07-22 04:17:23.000000000 +0200
|
||||
+++ linux-3.0.patch/drivers/media/rc/nuvoton-cir.c 2011-07-22 21:30:48.374591146 +0200
|
||||
@@ -1110,7 +1110,7 @@
|
||||
rdev->dev.parent = &pdev->dev;
|
||||
rdev->driver_name = NVT_DRIVER_NAME;
|
||||
rdev->map_name = RC_MAP_RC6_MCE;
|
||||
- rdev->timeout = MS_TO_NS(100);
|
||||
+ rdev->timeout = US_TO_NS(1000);
|
||||
/* rx resolution is hardwired to 50us atm, 1, 25, 100 also possible */
|
||||
rdev->rx_resolution = US_TO_NS(CIR_SAMPLE_PERIOD);
|
||||
#if 0
|
@ -25,7 +25,7 @@ PKG_ARCH="any"
|
||||
PKG_LICENSE="OSS"
|
||||
PKG_SITE="http://pyyaml.org/"
|
||||
PKG_URL="http://pyyaml.org/download/pyyaml/$PKG_NAME-$PKG_VERSION.tar.gz"
|
||||
PKG_DEPENDS="Python disribute yaml"
|
||||
PKG_DEPENDS="Python distribute yaml"
|
||||
PKG_BUILD_DEPENDS="toolchain Python distribute distutilscross yaml"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="python/web"
|
||||
|
@ -4,38 +4,3 @@ DigitalHDTVDefaultUnderscan=V0
|
||||
|
||||
[AMDPCSROOT/SYSTEM/DDX]
|
||||
EnableTearFreeDesktop=V1
|
||||
OGLFMTA2R10G10B10Enable=V1
|
||||
VideoOverlay=Soff
|
||||
OpenGLOverlay=Soff
|
||||
TexturedVideo=Son
|
||||
TexturedVideoSync=Son
|
||||
|
||||
[AMDPCSROOT/SYSTEM/2ID-1002-9802-0/OpenGL]
|
||||
VSyncControl=V3
|
||||
|
||||
[AMDPCSROOT/SYSTEM/2ID-1002-9803-0/OpenGL]
|
||||
VSyncControl=V3
|
||||
|
||||
[AMDPCSROOT/SYSTEM/2ID-1002-9804-0/OpenGL]
|
||||
VSyncControl=V3
|
||||
|
||||
[AMDPCSROOT/SYSTEM/2ID-1002-9805-0/OpenGL]
|
||||
VSyncControl=V3
|
||||
|
||||
[AMDPCSROOT/SYSTEM/2ID-1002-9802-0/LDC]
|
||||
GammaChannelSelState=V0
|
||||
|
||||
[AMDPCSROOT/SYSTEM/2ID-1002-9803-0/LDC]
|
||||
GammaChannelSelState=V0
|
||||
|
||||
[AMDPCSROOT/SYSTEM/2ID-1002-9804-0/LDC]
|
||||
GammaChannelSelState=V0
|
||||
|
||||
[AMDPCSROOT/SYSTEM/2ID-1002-9805-0/LDC]
|
||||
GammaChannelSelState=V0
|
||||
|
||||
[AMDPCSROOT/SYSTEM/2ID-1002-980-0/LDC]
|
||||
GammaChannelSelState=V0
|
||||
|
||||
[AMDPCSROOT/SYSTEM/LDC]
|
||||
ColorPreviewDlgState=V0
|
41
packages/x11/driver/xf86-video-fglrx/config/amdpcsdb.bk
Normal file
41
packages/x11/driver/xf86-video-fglrx/config/amdpcsdb.bk
Normal file
@ -0,0 +1,41 @@
|
||||
AMDPCSDBV1
|
||||
[AMDPCSROOT/SYSTEM/MCIL]
|
||||
DigitalHDTVDefaultUnderscan=V0
|
||||
|
||||
[AMDPCSROOT/SYSTEM/DDX]
|
||||
EnableTearFreeDesktop=V1
|
||||
OGLFMTA2R10G10B10Enable=V1
|
||||
VideoOverlay=Soff
|
||||
OpenGLOverlay=Soff
|
||||
TexturedVideo=Son
|
||||
TexturedVideoSync=Son
|
||||
|
||||
[AMDPCSROOT/SYSTEM/2ID-1002-9802-0/OpenGL]
|
||||
VSyncControl=V3
|
||||
|
||||
[AMDPCSROOT/SYSTEM/2ID-1002-9803-0/OpenGL]
|
||||
VSyncControl=V3
|
||||
|
||||
[AMDPCSROOT/SYSTEM/2ID-1002-9804-0/OpenGL]
|
||||
VSyncControl=V3
|
||||
|
||||
[AMDPCSROOT/SYSTEM/2ID-1002-9805-0/OpenGL]
|
||||
VSyncControl=V3
|
||||
|
||||
[AMDPCSROOT/SYSTEM/2ID-1002-9802-0/LDC]
|
||||
GammaChannelSelState=V0
|
||||
|
||||
[AMDPCSROOT/SYSTEM/2ID-1002-9803-0/LDC]
|
||||
GammaChannelSelState=V0
|
||||
|
||||
[AMDPCSROOT/SYSTEM/2ID-1002-9804-0/LDC]
|
||||
GammaChannelSelState=V0
|
||||
|
||||
[AMDPCSROOT/SYSTEM/2ID-1002-9805-0/LDC]
|
||||
GammaChannelSelState=V0
|
||||
|
||||
[AMDPCSROOT/SYSTEM/2ID-1002-980-0/LDC]
|
||||
GammaChannelSelState=V0
|
||||
|
||||
[AMDPCSROOT/SYSTEM/LDC]
|
||||
ColorPreviewDlgState=V0
|
@ -64,8 +64,7 @@ mkdir -p $INSTALL/etc/X11
|
||||
|
||||
mkdir -p $INSTALL/etc/ati
|
||||
cp $PKG_BUILD/common/etc/ati/amdpcsdb.default $INSTALL/etc/ati
|
||||
# cp $PKG_DIR/config/amdpcsdb $INSTALL/usr/config/fglrx.conf
|
||||
touch $INSTALL/usr/config/fglrx.conf
|
||||
cp $PKG_DIR/config/amdpcsdb $INSTALL/usr/config/fglrx.conf
|
||||
ln -sf /storage/.config/fglrx.conf $INSTALL/etc/ati/amdpcsdb
|
||||
cp $PKG_BUILD/common/etc/ati/control $INSTALL/etc/ati
|
||||
cp $PKG_BUILD/common/etc/ati/signature $INSTALL/etc/ati
|
||||
|
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="xf86-video-nvidia"
|
||||
PKG_VERSION="275.19"
|
||||
PKG_VERSION="275.21"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="i386 x86_64"
|
||||
PKG_LICENSE="nonfree"
|
||||
|
@ -1,6 +1,6 @@
|
||||
#
|
||||
# Automatically generated make config: don't edit
|
||||
# Linux/i386 3.0.0-rc6 Kernel Configuration
|
||||
# Linux/i386 3.0.0 Kernel Configuration
|
||||
#
|
||||
# CONFIG_64BIT is not set
|
||||
CONFIG_X86_32=y
|
||||
|
@ -1,6 +1,6 @@
|
||||
#
|
||||
# Automatically generated make config: don't edit
|
||||
# Linux/i386 3.0.0-rc6 Kernel Configuration
|
||||
# Linux/i386 3.0.0 Kernel Configuration
|
||||
#
|
||||
# CONFIG_64BIT is not set
|
||||
CONFIG_X86_32=y
|
||||
|
@ -1,6 +1,6 @@
|
||||
#
|
||||
# Automatically generated make config: don't edit
|
||||
# Linux/i386 3.0.0-rc6 Kernel Configuration
|
||||
# Linux/i386 3.0.0 Kernel Configuration
|
||||
#
|
||||
# CONFIG_64BIT is not set
|
||||
CONFIG_X86_32=y
|
||||
|
@ -1,6 +1,6 @@
|
||||
#
|
||||
# Automatically generated make config: don't edit
|
||||
# Linux/i386 3.0.0-rc6 Kernel Configuration
|
||||
# Linux/i386 3.0.0 Kernel Configuration
|
||||
#
|
||||
# CONFIG_64BIT is not set
|
||||
CONFIG_X86_32=y
|
||||
|
@ -1,6 +1,6 @@
|
||||
#
|
||||
# Automatically generated make config: don't edit
|
||||
# Linux/x86_64 3.0.0-rc6 Kernel Configuration
|
||||
# Linux/x86_64 3.0.0 Kernel Configuration
|
||||
#
|
||||
CONFIG_64BIT=y
|
||||
# CONFIG_X86_32 is not set
|
||||
|
@ -1,6 +1,6 @@
|
||||
#
|
||||
# Automatically generated make config: don't edit
|
||||
# Linux/i386 3.0.0-rc7 Kernel Configuration
|
||||
# Linux/i386 3.0.0 Kernel Configuration
|
||||
#
|
||||
# CONFIG_64BIT is not set
|
||||
CONFIG_X86_32=y
|
||||
|
@ -1,6 +1,6 @@
|
||||
#
|
||||
# Automatically generated make config: don't edit
|
||||
# Linux/x86_64 3.0.0-rc7 Kernel Configuration
|
||||
# Linux/x86_64 3.0.0 Kernel Configuration
|
||||
#
|
||||
CONFIG_64BIT=y
|
||||
# CONFIG_X86_32 is not set
|
||||
|
@ -1,6 +1,6 @@
|
||||
#
|
||||
# Automatically generated make config: don't edit
|
||||
# Linux/x86_64 3.0.0-rc6 Kernel Configuration
|
||||
# Linux/x86_64 3.0.0 Kernel Configuration
|
||||
#
|
||||
CONFIG_64BIT=y
|
||||
# CONFIG_X86_32 is not set
|
||||
|
Loading…
x
Reference in New Issue
Block a user