mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-30 22:26:42 +00:00
Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-next
This commit is contained in:
commit
f743698f43
@ -23,22 +23,22 @@
|
|||||||
. config/options $1
|
. config/options $1
|
||||||
|
|
||||||
if [ "$TARGET_ARCH" = i386 ]; then
|
if [ "$TARGET_ARCH" = i386 ]; then
|
||||||
ARCH=x86
|
FGLRX_ARCH=x86
|
||||||
elif [ "$TARGET_ARCH" = x86_64 ]; then
|
elif [ "$TARGET_ARCH" = x86_64 ]; then
|
||||||
ARCH=x86_64
|
FGLRX_ARCH=x86_64
|
||||||
fi
|
fi
|
||||||
|
|
||||||
cd $PKG_BUILD/common/lib/modules/fglrx/build_mod
|
cd $PKG_BUILD/common/lib/modules/fglrx/build_mod
|
||||||
# sed -i -e 's/__SMP__/CONFIG_SMP/' *.c *h
|
# sed -i -e 's/__SMP__/CONFIG_SMP/' *.c *h
|
||||||
# sed -i -e 's/ifdef MODVERSIONS/ifdef CONFIG_MODVERSIONS/' *.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
|
cd 2.6.x
|
||||||
make CC=${CC} KDIR=$(kernel_path)
|
make CC=${CC} KDIR=$(kernel_path)
|
||||||
|
|
||||||
|
|
||||||
cp $ROOT/$PKG_DIR/source/amdxvba.h $SYSROOT_PREFIX/usr/include
|
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.0 $SYSROOT_PREFIX/usr/lib/libXvBAW.so.1
|
||||||
ln -sf libXvBAW.so.1 $SYSROOT_PREFIX/usr/lib/libXvBAW.so
|
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`
|
VER=`ls $BUILD/linux*/modules/lib/modules`
|
||||||
|
|
||||||
if [ "$TARGET_ARCH" = i386 ]; then
|
if [ "$TARGET_ARCH" = i386 ]; then
|
||||||
ARCH=x86
|
FGLRX_ARCH=x86
|
||||||
LIBDIR=lib
|
LIBDIR=lib
|
||||||
BASEDIR=xpic
|
BASEDIR=xpic
|
||||||
elif [ "$TARGET_ARCH" = x86_64 ]; then
|
elif [ "$TARGET_ARCH" = x86_64 ]; then
|
||||||
ARCH=x86_64
|
FGLRX_ARCH=x86_64
|
||||||
LIBDIR=lib64
|
LIBDIR=lib64
|
||||||
BASEDIR=xpic_64a
|
BASEDIR=xpic_64a
|
||||||
fi
|
fi
|
||||||
@ -72,24 +72,24 @@ mkdir -p $INSTALL/etc/ati
|
|||||||
|
|
||||||
# DRI driver
|
# DRI driver
|
||||||
mkdir -p $INSTALL/usr/lib/dri
|
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
|
# OpenGL libs
|
||||||
mkdir -p $INSTALL/usr/lib
|
mkdir -p $INSTALL/usr/lib
|
||||||
# rename to not conflicting with Mesa libGL.so
|
# 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
|
# System Libs
|
||||||
mkdir -p $INSTALL/usr/lib
|
mkdir -p $INSTALL/usr/lib
|
||||||
cp $PKG_BUILD/arch/$ARCH/usr/$LIBDIR/libati*.so $INSTALL/usr/lib
|
cp $PKG_BUILD/arch/$FGLRX_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/$FGLRX_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/$FGLRX_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/X11R6/$LIBDIR/libfglrx*.so* $INSTALL/usr/lib
|
||||||
|
|
||||||
if [ "$VAAPI" = yes ]; then
|
if [ "$VAAPI" = yes ]; then
|
||||||
$SCRIPTS/install xvba-video
|
$SCRIPTS/install xvba-video
|
||||||
|
|
||||||
cp $PKG_BUILD/arch/$ARCH/usr/X11R6/$LIBDIR/libAMDXvBA.cap $INSTALL/usr/lib
|
cp $PKG_BUILD/arch/$FGLRX_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/$FGLRX_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/libXvBAW.so* $INSTALL/usr/lib/libXvBAW.so.1
|
||||||
fi
|
fi
|
||||||
|
Loading…
x
Reference in New Issue
Block a user