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-systemd
Conflicts: packages/x11/xserver/xorg-server/profile.d/xorg-server.conf
This commit is contained in:
Stephan Raue
commit
8b77438bec
@ -47,3 +47,19 @@ if [ "$VDPAU" = yes ]; then
|
||||
PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libvdpau"
|
||||
PKG_DEPENDS="$PKG_DEPENDS libvdpau"
|
||||
fi
|
||||
|
||||
if [ "$XVBA" = yes ]; then
|
||||
get_graphicdrivers
|
||||
for drv in $GRAPHIC_DRIVERS; do
|
||||
if [ "$drv" = "fglrx" ]; then
|
||||
PKG_DEPENDS="$PKG_DEPENDS xf86-video-fglrx"
|
||||
PKG_BUILD_DEPENDS_TARGET="$PKG_BUILD_DEPENDS_TARGET xf86-video-fglrx"
|
||||
elif [ "$drv" = "fglrx-legacy" ]; then
|
||||
PKG_DEPENDS="$PKG_DEPENDS xf86-video-fglrx-legacy"
|
||||
PKG_BUILD_DEPENDS_TARGET="$PKG_BUILD_DEPENDS_TARGET xf86-video-fglrx-legacy"
|
||||
fi
|
||||
done
|
||||
XBMC_XVBA="--enable-xvba"
|
||||
else
|
||||
XBMC_XVBA="--disable-xvba"
|
||||
fi
|
||||
|
||||
75
packages/multimedia/libXVBA/package.mk
Normal file
75
packages/multimedia/libXVBA/package.mk
Normal file
@ -0,0 +1,75 @@
|
||||
################################################################################
|
||||
# This file is part of OpenELEC - http://www.openelec.tv
|
||||
# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
|
||||
#
|
||||
# This Program is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation; either version 2, or (at your option)
|
||||
# any later version.
|
||||
#
|
||||
# This Program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with OpenELEC.tv; see the file COPYING. If not, write to
|
||||
# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
|
||||
# http://www.gnu.org/copyleft/gpl.html
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="libXVBA"
|
||||
PKG_VERSION="13.8"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://amd.com"
|
||||
PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
|
||||
PKG_DEPENDS="libX11"
|
||||
PKG_BUILD_DEPENDS="toolchain libX11 dri2proto libXext"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="multimedia"
|
||||
PKG_SHORTDESC="libXVBA: a Video Decode library for AMD"
|
||||
PKG_LONGDESC="libXVBA is a Video Decode library for AMD."
|
||||
|
||||
PKG_IS_ADDON="no"
|
||||
PKG_AUTORECONF="no"
|
||||
|
||||
if [ "$TARGET_ARCH" = i386 ]; then
|
||||
LIBXVBA_FGLRX_ARCH=x86
|
||||
LIBXVBA_LIBDIR=lib
|
||||
elif [ "$TARGET_ARCH" = x86_64 ]; then
|
||||
LIBXVBA_FGLRX_ARCH=x86_64
|
||||
LIBXVBA_LIBDIR=lib64
|
||||
fi
|
||||
|
||||
LIBXVBA_INSTALL_DIR="/usr/lib/fglrx/"
|
||||
|
||||
make_target() {
|
||||
: # nothing to make
|
||||
}
|
||||
|
||||
makeinstall_target() {
|
||||
mkdir -p $SYSROOT_PREFIX/usr/include/amd
|
||||
cp include/amdxvba.h $SYSROOT_PREFIX/usr/include/amd
|
||||
|
||||
mkdir -p $SYSROOT_PREFIX/usr/lib
|
||||
cp arch/$LIBXVBA_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
|
||||
}
|
||||
|
||||
post_makeinstall_target() {
|
||||
mkdir -p $INSTALL/$LIBXVBA_INSTALL_DIR/lib
|
||||
cp arch/$LIBXVBA_FGLRX_ARCH/usr/X11R6/$LIBXVBA_LIBDIR/libAMDXvBA.cap $INSTALL/$LIBXVBA_INSTALL_DIR/lib
|
||||
cp arch/$LIBXVBA_FGLRX_ARCH/usr/X11R6/$LIBXVBA_LIBDIR/libAMDXvBA.so* $INSTALL/$LIBXVBA_INSTALL_DIR/lib/libAMDXvBA.so.1
|
||||
cp arch/$LIBXVBA_FGLRX_ARCH/usr/X11R6/$LIBXVBA_LIBDIR/libXvBAW.so* $INSTALL/$LIBXVBA_INSTALL_DIR/lib/libXvBAW.so.1
|
||||
|
||||
(
|
||||
cd $INSTALL/$LIBXVBA_INSTALL_DIR/
|
||||
for lib in `find lib -type f`; do
|
||||
mkdir -p $INSTALL/usr/`dirname $lib`
|
||||
ln -sf /var/run/fglrx/$lib $INSTALL/usr/$lib
|
||||
done
|
||||
)
|
||||
}
|
||||
@ -39,8 +39,8 @@ PKG_AUTORECONF="yes"
|
||||
|
||||
PKG_CONFIGURE_OPTS_TARGET="export ac_cv_have_abstract_sockets=yes \
|
||||
--libexecdir=/usr/lib/dbus \
|
||||
--enable-verbose-mode \
|
||||
--enable-asserts \
|
||||
--disable-verbose-mode \
|
||||
--disable-asserts \
|
||||
--enable-checks \
|
||||
--disable-tests \
|
||||
--disable-ansi \
|
||||
@ -57,18 +57,18 @@ PKG_CONFIGURE_OPTS_TARGET="export ac_cv_have_abstract_sockets=yes \
|
||||
--without-x \
|
||||
--with-dbus-user=dbus"
|
||||
|
||||
PKG_CONFIGURE_OPTS_HOST="--enable-verbose-mode \
|
||||
--enable-asserts \
|
||||
--enable-checks \
|
||||
PKG_CONFIGURE_OPTS_HOST="--disable-verbose-mode \
|
||||
--disable-asserts \
|
||||
--disable-checks \
|
||||
--disable-tests \
|
||||
--disable-xml-docs \
|
||||
--disable-doxygen-docs"
|
||||
|
||||
PKG_CONFIGURE_OPTS_BOOTSTRAP="export ac_cv_have_abstract_sockets=yes \
|
||||
--libexecdir=/usr/lib/dbus \
|
||||
--enable-verbose-mode \
|
||||
--enable-asserts \
|
||||
--enable-checks \
|
||||
--disable-verbose-mode \
|
||||
--disable-asserts \
|
||||
--disable-checks \
|
||||
--disable-tests \
|
||||
--disable-ansi \
|
||||
--disable-xml-docs \
|
||||
|
||||
@ -101,20 +101,21 @@ cd $ROOT/$PKG_BUILD
|
||||
mkdir -p $INSTALL_DIR/lib/xorg/modules/linux
|
||||
cp -P $BASEDIR/usr/X11R6/$LIBDIR/modules/linux/*.so $INSTALL_DIR/lib/xorg/modules/linux
|
||||
|
||||
if [ "$XVBA" = yes ]; then
|
||||
cp arch/$FGLRX_ARCH/usr/X11R6/$LIBDIR/libAMDXvBA.cap $INSTALL_DIR/lib
|
||||
cp arch/$FGLRX_ARCH/usr/X11R6/$LIBDIR/libAMDXvBA.so* $INSTALL_DIR/lib/libAMDXvBA.so.1
|
||||
cp arch/$FGLRX_ARCH/usr/X11R6/$LIBDIR/libXvBAW.so* $INSTALL_DIR/lib/libXvBAW.so.1
|
||||
# disabled until we can expect non broken drivers from AMD:
|
||||
# if [ "$XVBA" = yes ]; then
|
||||
# cp arch/$FGLRX_ARCH/usr/X11R6/$LIBDIR/libAMDXvBA.cap $INSTALL_DIR/lib
|
||||
# cp arch/$FGLRX_ARCH/usr/X11R6/$LIBDIR/libAMDXvBA.so* $INSTALL_DIR/lib/libAMDXvBA.so.1
|
||||
# cp arch/$FGLRX_ARCH/usr/X11R6/$LIBDIR/libXvBAW.so* $INSTALL_DIR/lib/libXvBAW.so.1
|
||||
|
||||
# install needed files for toolchain
|
||||
mkdir -p $SYSROOT_PREFIX/usr/include/amd
|
||||
cp $PKG_DIR/source/amdxvba.h $SYSROOT_PREFIX/usr/include/amd
|
||||
# # install needed files for toolchain
|
||||
# mkdir -p $SYSROOT_PREFIX/usr/include/amd
|
||||
# cp $PKG_DIR/source/amdxvba.h $SYSROOT_PREFIX/usr/include/amd
|
||||
|
||||
mkdir -p $SYSROOT_PREFIX/usr/lib
|
||||
cp 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
|
||||
fi
|
||||
# mkdir -p $SYSROOT_PREFIX/usr/lib
|
||||
# cp 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
|
||||
# fi
|
||||
|
||||
(
|
||||
cd $INSTALL_DIR/
|
||||
|
||||
@ -35,3 +35,9 @@ PKG_LONGDESC="These binary drivers provide optimized hardware acceleration of Op
|
||||
PKG_IS_ADDON="no"
|
||||
|
||||
PKG_AUTORECONF="no"
|
||||
|
||||
if [ "$XVBA" = yes ]; then
|
||||
# hack around broken AMD drivers
|
||||
PKG_DEPENDS="libXVBA"
|
||||
PKG_BUILD_DEPENDS="toolchain libXVBA"
|
||||
fi
|
||||
|
||||
@ -25,3 +25,4 @@
|
||||
|
||||
DISPLAY=":0.0"
|
||||
export DISPLAY
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user