mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-31 14:37:59 +00:00
Merge remote-tracking branch 'upstream/openelec-pvr' into openelec-pvr
This commit is contained in:
Gujs
commit
fb198a8b68
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="xbmc-theme-Confluence"
|
||||
PKG_VERSION="61bdb05"
|
||||
PKG_VERSION="4a0d15e"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="xbmc"
|
||||
PKG_VERSION="61bdb05"
|
||||
PKG_VERSION="4a0d15e"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="rtmpdump"
|
||||
PKG_VERSION="6155179"
|
||||
PKG_VERSION="c28f1ba"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
||||
@ -23,22 +23,22 @@
|
||||
. config/options $1
|
||||
|
||||
if [ "$TARGET_ARCH" = i386 ]; then
|
||||
ARCH=x86
|
||||
FGLRX_ARCH=x86
|
||||
elif [ "$TARGET_ARCH" = x86_64 ]; then
|
||||
ARCH=x86_64
|
||||
FGLRX_ARCH=x86_64
|
||||
fi
|
||||
|
||||
cd $PKG_BUILD/common/lib/modules/fglrx/build_mod
|
||||
# sed -i -e 's/__SMP__/CONFIG_SMP/' *.c *h
|
||||
# sed -i -e 's/ifdef MODVERSIONS/ifdef CONFIG_MODVERSIONS/' *.c *.h
|
||||
|
||||
ln -sf $ROOT/$PKG_BUILD/arch/$ARCH/lib/modules/fglrx/build_mod/libfglrx_ip.a .
|
||||
ln -sf $ROOT/$PKG_BUILD/arch/$FGLRX_ARCH/lib/modules/fglrx/build_mod/libfglrx_ip.a .
|
||||
|
||||
cd 2.6.x
|
||||
make CC=${CC} KDIR=$(kernel_path)
|
||||
|
||||
|
||||
cp $ROOT/$PKG_DIR/source/amdxvba.h $SYSROOT_PREFIX/usr/include
|
||||
cp $ROOT/$PKG_BUILD/arch/$ARCH/usr/X11R6/*/libXvBAW.so* $SYSROOT_PREFIX/usr/lib
|
||||
cp $ROOT/$PKG_BUILD/arch/$FGLRX_ARCH/usr/X11R6/*/libXvBAW.so* $SYSROOT_PREFIX/usr/lib
|
||||
ln -sf libXvBAW.so.1.0 $SYSROOT_PREFIX/usr/lib/libXvBAW.so.1
|
||||
ln -sf libXvBAW.so.1 $SYSROOT_PREFIX/usr/lib/libXvBAW.so
|
||||
|
||||
@ -27,11 +27,11 @@ $SCRIPTS/build busybox-hosttools
|
||||
VER=`ls $BUILD/linux*/modules/lib/modules`
|
||||
|
||||
if [ "$TARGET_ARCH" = i386 ]; then
|
||||
ARCH=x86
|
||||
FGLRX_ARCH=x86
|
||||
LIBDIR=lib
|
||||
BASEDIR=xpic
|
||||
elif [ "$TARGET_ARCH" = x86_64 ]; then
|
||||
ARCH=x86_64
|
||||
FGLRX_ARCH=x86_64
|
||||
LIBDIR=lib64
|
||||
BASEDIR=xpic_64a
|
||||
fi
|
||||
@ -72,24 +72,24 @@ mkdir -p $INSTALL/etc/ati
|
||||
|
||||
# DRI driver
|
||||
mkdir -p $INSTALL/usr/lib/dri
|
||||
cp $PKG_BUILD/arch/$ARCH/usr/X11R6/$LIBDIR/modules/dri/fglrx_dri.so* $INSTALL/usr/lib/dri
|
||||
cp $PKG_BUILD/arch/$FGLRX_ARCH/usr/X11R6/$LIBDIR/modules/dri/fglrx_dri.so* $INSTALL/usr/lib/dri
|
||||
|
||||
# OpenGL libs
|
||||
mkdir -p $INSTALL/usr/lib
|
||||
# rename to not conflicting with Mesa libGL.so
|
||||
cp -P $PKG_BUILD/arch/$ARCH/usr/X11R6/$LIBDIR/fglrx/fglrx-libGL.so* $INSTALL/usr/lib/libGL_fglrx.so.1
|
||||
cp -P $PKG_BUILD/arch/$FGLRX_ARCH/usr/X11R6/$LIBDIR/fglrx/fglrx-libGL.so* $INSTALL/usr/lib/libGL_fglrx.so.1
|
||||
|
||||
# System Libs
|
||||
mkdir -p $INSTALL/usr/lib
|
||||
cp $PKG_BUILD/arch/$ARCH/usr/$LIBDIR/libati*.so $INSTALL/usr/lib
|
||||
cp $PKG_BUILD/arch/$ARCH/usr/$LIBDIR/libatiuki.so* $INSTALL/usr/lib/libatiuki.so.1
|
||||
cp $PKG_BUILD/arch/$ARCH/usr/X11R6/$LIBDIR/libati*.so* $INSTALL/usr/lib
|
||||
cp $PKG_BUILD/arch/$ARCH/usr/X11R6/$LIBDIR/libfglrx*.so* $INSTALL/usr/lib
|
||||
cp $PKG_BUILD/arch/$FGLRX_ARCH/usr/$LIBDIR/libati*.so $INSTALL/usr/lib
|
||||
cp $PKG_BUILD/arch/$FGLRX_ARCH/usr/$LIBDIR/libatiuki.so* $INSTALL/usr/lib/libatiuki.so.1
|
||||
cp $PKG_BUILD/arch/$FGLRX_ARCH/usr/X11R6/$LIBDIR/libati*.so* $INSTALL/usr/lib
|
||||
cp $PKG_BUILD/arch/$FGLRX_ARCH/usr/X11R6/$LIBDIR/libfglrx*.so* $INSTALL/usr/lib
|
||||
|
||||
if [ "$VAAPI" = yes ]; then
|
||||
$SCRIPTS/install xvba-video
|
||||
|
||||
cp $PKG_BUILD/arch/$ARCH/usr/X11R6/$LIBDIR/libAMDXvBA.cap $INSTALL/usr/lib
|
||||
cp $PKG_BUILD/arch/$ARCH/usr/X11R6/$LIBDIR/libAMDXvBA.so* $INSTALL/usr/lib/libAMDXvBA.so.1
|
||||
cp $PKG_BUILD/arch/$ARCH/usr/X11R6/$LIBDIR/libXvBAW.so* $INSTALL/usr/lib/libXvBAW.so.1
|
||||
cp $PKG_BUILD/arch/$FGLRX_ARCH/usr/X11R6/$LIBDIR/libAMDXvBA.cap $INSTALL/usr/lib
|
||||
cp $PKG_BUILD/arch/$FGLRX_ARCH/usr/X11R6/$LIBDIR/libAMDXvBA.so* $INSTALL/usr/lib/libAMDXvBA.so.1
|
||||
cp $PKG_BUILD/arch/$FGLRX_ARCH/usr/X11R6/$LIBDIR/libXvBAW.so* $INSTALL/usr/lib/libXvBAW.so.1
|
||||
fi
|
||||
|
||||
@ -19,8 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="xf86-video-nvidia"
|
||||
#PKG_VERSION="280.04"
|
||||
PKG_VERSION="270.41.19"
|
||||
PKG_VERSION="280.04"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="i386 x86_64"
|
||||
PKG_LICENSE="nonfree"
|
||||
|
||||
@ -1,24 +0,0 @@
|
||||
diff -Naur NVIDIA-Linux-x86_64-270.41.19-no-compat32/kernel/conftest.sh NVIDIA-Linux-x86_64-270.41.19-no-compat32.patch/kernel/conftest.sh
|
||||
--- NVIDIA-Linux-x86_64-270.41.19-no-compat32/kernel/conftest.sh 2011-05-17 08:32:19.000000000 +0200
|
||||
+++ NVIDIA-Linux-x86_64-270.41.19-no-compat32.patch/kernel/conftest.sh 2011-07-09 18:21:30.602664961 +0200
|
||||
@@ -76,7 +76,7 @@
|
||||
}
|
||||
|
||||
build_cflags() {
|
||||
- BASE_CFLAGS="-D__KERNEL__ \
|
||||
+ BASE_CFLAGS="-O2 -D__KERNEL__ \
|
||||
-DKBUILD_BASENAME=\"#conftest$$\" -DKBUILD_MODNAME=\"#conftest$$\" \
|
||||
-nostdinc -isystem $ISYSTEM"
|
||||
|
||||
diff -Naur NVIDIA-Linux-x86_64-270.41.19-no-compat32/kernel/nv-linux.h NVIDIA-Linux-x86_64-270.41.19-no-compat32.patch/kernel/nv-linux.h
|
||||
--- NVIDIA-Linux-x86_64-270.41.19-no-compat32/kernel/nv-linux.h 2011-05-17 08:32:19.000000000 +0200
|
||||
+++ NVIDIA-Linux-x86_64-270.41.19-no-compat32.patch/kernel/nv-linux.h 2011-07-09 18:22:16.317252983 +0200
|
||||
@@ -34,6 +34,8 @@
|
||||
# error This driver does not support 2.5 kernels!
|
||||
#elif LINUX_VERSION_CODE < KERNEL_VERSION(2, 7, 0)
|
||||
# define KERNEL_2_6
|
||||
+#elif LINUX_VERSION_CODE < KERNEL_VERSION(3, 1, 0)
|
||||
+# define KERNEL_2_6
|
||||
#else
|
||||
# error This driver does not support development kernels!
|
||||
#endif
|
||||
@ -1,6 +1,6 @@
|
||||
#
|
||||
# Automatically generated make config: don't edit
|
||||
# Linux/i386 3.0.0-rc6 Kernel Configuration
|
||||
# Linux/i386 3.0.0-rc7 Kernel Configuration
|
||||
#
|
||||
# CONFIG_64BIT is not set
|
||||
CONFIG_X86_32=y
|
||||
@ -2141,7 +2141,7 @@ CONFIG_SND_HDA_PATCH_LOADER=y
|
||||
CONFIG_SND_HDA_CODEC_REALTEK=y
|
||||
# CONFIG_SND_HDA_CODEC_ANALOG is not set
|
||||
# CONFIG_SND_HDA_CODEC_SIGMATEL is not set
|
||||
# CONFIG_SND_HDA_CODEC_VIA is not set
|
||||
CONFIG_SND_HDA_CODEC_VIA=y
|
||||
CONFIG_SND_HDA_CODEC_HDMI=y
|
||||
# CONFIG_SND_HDA_CODEC_CIRRUS is not set
|
||||
CONFIG_SND_HDA_CODEC_CONEXANT=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-rc7 Kernel Configuration
|
||||
#
|
||||
CONFIG_64BIT=y
|
||||
# CONFIG_X86_32 is not set
|
||||
@ -2083,7 +2083,7 @@ CONFIG_SND_HDA_PATCH_LOADER=y
|
||||
CONFIG_SND_HDA_CODEC_REALTEK=y
|
||||
# CONFIG_SND_HDA_CODEC_ANALOG is not set
|
||||
# CONFIG_SND_HDA_CODEC_SIGMATEL is not set
|
||||
# CONFIG_SND_HDA_CODEC_VIA is not set
|
||||
CONFIG_SND_HDA_CODEC_VIA=y
|
||||
CONFIG_SND_HDA_CODEC_HDMI=y
|
||||
# CONFIG_SND_HDA_CODEC_CIRRUS is not set
|
||||
CONFIG_SND_HDA_CODEC_CONEXANT=y
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user