Merge remote-tracking branch 'upstream/master' into openelec-systemd

Conflicts:
	packages/linux/config/modules
	packages/x11/xserver/xorg-server/profile.d/xorg-server.conf
This commit is contained in:
Stefan Saraev 2013-08-15 21:57:13 +03:00
commit 17a142a8d9
19 changed files with 129 additions and 37 deletions

View File

@ -134,11 +134,7 @@
# Display fatal error message # Display fatal error message
# $1:action which caused error, $2:message # $1:action which caused error, $2:message
echo "*** Error in $BOOT_STEP: $1: $2 ***" echo "*** Error in $BOOT_STEP: $1: $2 ***"
if [ -z "$DEBUG" ]; then debug_shell
halt
else
debug_shell
fi
} }
break_after() { break_after() {

View File

@ -47,3 +47,16 @@ if [ "$VDPAU" = yes ]; then
PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libvdpau" PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libvdpau"
PKG_DEPENDS="$PKG_DEPENDS libvdpau" PKG_DEPENDS="$PKG_DEPENDS libvdpau"
fi 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
fi

View 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
)
}

View File

@ -19,7 +19,7 @@
################################################################################ ################################################################################
PKG_NAME="bluez" PKG_NAME="bluez"
PKG_VERSION="5.7" PKG_VERSION="5.8"
PKG_REV="1" PKG_REV="1"
PKG_ARCH="any" PKG_ARCH="any"
PKG_LICENSE="GPL" PKG_LICENSE="GPL"

View File

@ -39,8 +39,8 @@ PKG_AUTORECONF="yes"
PKG_CONFIGURE_OPTS_TARGET="export ac_cv_have_abstract_sockets=yes \ PKG_CONFIGURE_OPTS_TARGET="export ac_cv_have_abstract_sockets=yes \
--libexecdir=/usr/lib/dbus \ --libexecdir=/usr/lib/dbus \
--enable-verbose-mode \ --disable-verbose-mode \
--enable-asserts \ --disable-asserts \
--enable-checks \ --enable-checks \
--disable-tests \ --disable-tests \
--disable-ansi \ --disable-ansi \
@ -57,9 +57,9 @@ PKG_CONFIGURE_OPTS_TARGET="export ac_cv_have_abstract_sockets=yes \
--without-x \ --without-x \
--with-dbus-user=dbus" --with-dbus-user=dbus"
PKG_CONFIGURE_OPTS_HOST="--enable-verbose-mode \ PKG_CONFIGURE_OPTS_HOST="--disable-verbose-mode \
--enable-asserts \ --disable-asserts \
--enable-checks \ --disable-checks \
--disable-tests \ --disable-tests \
--disable-xml-docs \ --disable-xml-docs \
--disable-doxygen-docs" --disable-doxygen-docs"

View File

@ -101,20 +101,21 @@ cd $ROOT/$PKG_BUILD
mkdir -p $INSTALL_DIR/lib/xorg/modules/linux mkdir -p $INSTALL_DIR/lib/xorg/modules/linux
cp -P $BASEDIR/usr/X11R6/$LIBDIR/modules/linux/*.so $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 # disabled until we can expect non broken drivers from AMD:
cp arch/$FGLRX_ARCH/usr/X11R6/$LIBDIR/libAMDXvBA.cap $INSTALL_DIR/lib # if [ "$XVBA" = yes ]; then
cp arch/$FGLRX_ARCH/usr/X11R6/$LIBDIR/libAMDXvBA.so* $INSTALL_DIR/lib/libAMDXvBA.so.1 # cp arch/$FGLRX_ARCH/usr/X11R6/$LIBDIR/libAMDXvBA.cap $INSTALL_DIR/lib
cp arch/$FGLRX_ARCH/usr/X11R6/$LIBDIR/libXvBAW.so* $INSTALL_DIR/lib/libXvBAW.so.1 # 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 # # install needed files for toolchain
mkdir -p $SYSROOT_PREFIX/usr/include/amd # mkdir -p $SYSROOT_PREFIX/usr/include/amd
cp $PKG_DIR/source/amdxvba.h $SYSROOT_PREFIX/usr/include/amd # cp $PKG_DIR/source/amdxvba.h $SYSROOT_PREFIX/usr/include/amd
mkdir -p $SYSROOT_PREFIX/usr/lib # mkdir -p $SYSROOT_PREFIX/usr/lib
cp arch/$FGLRX_ARCH/usr/X11R6/*/libXvBAW.so* $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.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
fi # fi
( (
cd $INSTALL_DIR/ cd $INSTALL_DIR/

View File

@ -35,3 +35,9 @@ PKG_LONGDESC="These binary drivers provide optimized hardware acceleration of Op
PKG_IS_ADDON="no" PKG_IS_ADDON="no"
PKG_AUTORECONF="no" PKG_AUTORECONF="no"
if [ "$XVBA" = yes ]; then
# hack around broken AMD drivers
PKG_DEPENDS="libXVBA"
PKG_BUILD_DEPENDS="toolchain libXVBA"
fi

View File

@ -1865,7 +1865,7 @@ CONFIG_SENSORS_FAM15H_POWER=m
# CONFIG_SENSORS_GL518SM is not set # CONFIG_SENSORS_GL518SM is not set
# CONFIG_SENSORS_GL520SM is not set # CONFIG_SENSORS_GL520SM is not set
# CONFIG_SENSORS_HIH6130 is not set # CONFIG_SENSORS_HIH6130 is not set
CONFIG_SENSORS_CORETEMP=m CONFIG_SENSORS_CORETEMP=y
CONFIG_SENSORS_IT87=m CONFIG_SENSORS_IT87=m
# CONFIG_SENSORS_JC42 is not set # CONFIG_SENSORS_JC42 is not set
# CONFIG_SENSORS_LINEAGE is not set # CONFIG_SENSORS_LINEAGE is not set

View File

@ -8,8 +8,6 @@ Section "Device"
Option "ModeValidation" "NoVesaModes, NoXServerModes" Option "ModeValidation" "NoVesaModes, NoXServerModes"
Option "HWCursor" "false" Option "HWCursor" "false"
Option "RegistryDwords" "RMDisableRenderToSysmem=1" Option "RegistryDwords" "RMDisableRenderToSysmem=1"
# To put Xorg in debug mode change "false" to "true" in the line below:
Option "ModeDebug" "false"
# To use a local /storage/.config/edid.bin file uncomment the 4 lines below: # To use a local /storage/.config/edid.bin file uncomment the 4 lines below:
# Option "ConnectedMonitor" "DFP-0" # Option "ConnectedMonitor" "DFP-0"
# Option "CustomEDID" "DFP-0:/storage/.config/edid.bin" # Option "CustomEDID" "DFP-0:/storage/.config/edid.bin"
@ -17,6 +15,9 @@ Section "Device"
# Option "UseEDID" "true" # Option "UseEDID" "true"
EndSection EndSection
# To put Xorg in debug mode "touch /storage/.config/debug.xorg" .. if you set
# "ModeDebug" "true" in xorg.conf IT WILL NOT WORK!
Section "Screen" Section "Screen"
Identifier "screen" Identifier "screen"
Device "nvidia" Device "nvidia"
@ -26,7 +27,7 @@ Section "Screen"
Option "TVStandard" "HD1080i" Option "TVStandard" "HD1080i"
# If Component video does not fill the screen uncomment the line below: # If Component video does not fill the screen uncomment the line below:
# Option "TVOverscan" "0.8" # use values from 0.0 (min) to 1.0 (max) # Option "TVOverscan" "0.8" # use values from 0.0 (min) to 1.0 (max)
Option "MetaModes" "DFP: 1920x1080; DFP: nvidia-auto-select; TV: 1280x720; TV: nvidia-auto-select" Option "MetaModes" "DFP: nvidia-auto-select; TV: 1280x720; TV: nvidia-auto-select"
SubSection "Display" SubSection "Display"
Depth 24 Depth 24
EndSubSection EndSubSection

View File

@ -1890,7 +1890,7 @@ CONFIG_SENSORS_FAM15H_POWER=m
# CONFIG_SENSORS_GL518SM is not set # CONFIG_SENSORS_GL518SM is not set
# CONFIG_SENSORS_GL520SM is not set # CONFIG_SENSORS_GL520SM is not set
# CONFIG_SENSORS_HIH6130 is not set # CONFIG_SENSORS_HIH6130 is not set
CONFIG_SENSORS_CORETEMP=m CONFIG_SENSORS_CORETEMP=y
CONFIG_SENSORS_IT87=m CONFIG_SENSORS_IT87=m
# CONFIG_SENSORS_JC42 is not set # CONFIG_SENSORS_JC42 is not set
# CONFIG_SENSORS_LINEAGE is not set # CONFIG_SENSORS_LINEAGE is not set

View File

@ -1866,7 +1866,7 @@ CONFIG_SENSORS_FAM15H_POWER=m
# CONFIG_SENSORS_GL518SM is not set # CONFIG_SENSORS_GL518SM is not set
# CONFIG_SENSORS_GL520SM is not set # CONFIG_SENSORS_GL520SM is not set
# CONFIG_SENSORS_HIH6130 is not set # CONFIG_SENSORS_HIH6130 is not set
CONFIG_SENSORS_CORETEMP=m CONFIG_SENSORS_CORETEMP=y
CONFIG_SENSORS_IT87=m CONFIG_SENSORS_IT87=m
# CONFIG_SENSORS_JC42 is not set # CONFIG_SENSORS_JC42 is not set
# CONFIG_SENSORS_LINEAGE is not set # CONFIG_SENSORS_LINEAGE is not set

View File

@ -1888,7 +1888,7 @@ CONFIG_SENSORS_FAM15H_POWER=m
# CONFIG_SENSORS_GL518SM is not set # CONFIG_SENSORS_GL518SM is not set
# CONFIG_SENSORS_GL520SM is not set # CONFIG_SENSORS_GL520SM is not set
# CONFIG_SENSORS_HIH6130 is not set # CONFIG_SENSORS_HIH6130 is not set
CONFIG_SENSORS_CORETEMP=m CONFIG_SENSORS_CORETEMP=y
CONFIG_SENSORS_IT87=m CONFIG_SENSORS_IT87=m
# CONFIG_SENSORS_JC42 is not set # CONFIG_SENSORS_JC42 is not set
# CONFIG_SENSORS_LINEAGE is not set # CONFIG_SENSORS_LINEAGE is not set

View File

@ -1818,7 +1818,7 @@ CONFIG_HWMON_VID=y
# CONFIG_SENSORS_GL518SM is not set # CONFIG_SENSORS_GL518SM is not set
# CONFIG_SENSORS_GL520SM is not set # CONFIG_SENSORS_GL520SM is not set
# CONFIG_SENSORS_HIH6130 is not set # CONFIG_SENSORS_HIH6130 is not set
CONFIG_SENSORS_CORETEMP=m CONFIG_SENSORS_CORETEMP=y
# CONFIG_SENSORS_IT87 is not set # CONFIG_SENSORS_IT87 is not set
# CONFIG_SENSORS_JC42 is not set # CONFIG_SENSORS_JC42 is not set
# CONFIG_SENSORS_LINEAGE is not set # CONFIG_SENSORS_LINEAGE is not set

View File

@ -1762,7 +1762,7 @@ CONFIG_HWMON_VID=y
# CONFIG_SENSORS_GL518SM is not set # CONFIG_SENSORS_GL518SM is not set
# CONFIG_SENSORS_GL520SM is not set # CONFIG_SENSORS_GL520SM is not set
# CONFIG_SENSORS_HIH6130 is not set # CONFIG_SENSORS_HIH6130 is not set
CONFIG_SENSORS_CORETEMP=m CONFIG_SENSORS_CORETEMP=y
# CONFIG_SENSORS_IT87 is not set # CONFIG_SENSORS_IT87 is not set
# CONFIG_SENSORS_JC42 is not set # CONFIG_SENSORS_JC42 is not set
# CONFIG_SENSORS_LINEAGE is not set # CONFIG_SENSORS_LINEAGE is not set

View File

@ -1836,7 +1836,7 @@ CONFIG_HWMON_VID=y
# CONFIG_SENSORS_GL518SM is not set # CONFIG_SENSORS_GL518SM is not set
# CONFIG_SENSORS_GL520SM is not set # CONFIG_SENSORS_GL520SM is not set
# CONFIG_SENSORS_HIH6130 is not set # CONFIG_SENSORS_HIH6130 is not set
CONFIG_SENSORS_CORETEMP=m CONFIG_SENSORS_CORETEMP=y
# CONFIG_SENSORS_IT87 is not set # CONFIG_SENSORS_IT87 is not set
# CONFIG_SENSORS_JC42 is not set # CONFIG_SENSORS_JC42 is not set
# CONFIG_SENSORS_LINEAGE is not set # CONFIG_SENSORS_LINEAGE is not set

View File

@ -1793,7 +1793,7 @@ CONFIG_HWMON_VID=y
# CONFIG_SENSORS_GL518SM is not set # CONFIG_SENSORS_GL518SM is not set
# CONFIG_SENSORS_GL520SM is not set # CONFIG_SENSORS_GL520SM is not set
# CONFIG_SENSORS_HIH6130 is not set # CONFIG_SENSORS_HIH6130 is not set
CONFIG_SENSORS_CORETEMP=m CONFIG_SENSORS_CORETEMP=y
# CONFIG_SENSORS_IT87 is not set # CONFIG_SENSORS_IT87 is not set
# CONFIG_SENSORS_JC42 is not set # CONFIG_SENSORS_JC42 is not set
# CONFIG_SENSORS_LINEAGE is not set # CONFIG_SENSORS_LINEAGE is not set

View File

@ -1072,7 +1072,7 @@ CONFIG_INPUT_MISC=y
# CONFIG_INPUT_POWERMATE is not set # CONFIG_INPUT_POWERMATE is not set
# CONFIG_INPUT_YEALINK is not set # CONFIG_INPUT_YEALINK is not set
# CONFIG_INPUT_CM109 is not set # CONFIG_INPUT_CM109 is not set
CONFIG_INPUT_UINPUT=m CONFIG_INPUT_UINPUT=y
# CONFIG_INPUT_PCF8574 is not set # CONFIG_INPUT_PCF8574 is not set
# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set # CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
# CONFIG_INPUT_ADXL34X is not set # CONFIG_INPUT_ADXL34X is not set

View File

@ -1889,7 +1889,7 @@ CONFIG_SENSORS_FAM15H_POWER=m
# CONFIG_SENSORS_GL518SM is not set # CONFIG_SENSORS_GL518SM is not set
# CONFIG_SENSORS_GL520SM is not set # CONFIG_SENSORS_GL520SM is not set
# CONFIG_SENSORS_HIH6130 is not set # CONFIG_SENSORS_HIH6130 is not set
CONFIG_SENSORS_CORETEMP=m CONFIG_SENSORS_CORETEMP=y
CONFIG_SENSORS_IT87=m CONFIG_SENSORS_IT87=m
# CONFIG_SENSORS_JC42 is not set # CONFIG_SENSORS_JC42 is not set
# CONFIG_SENSORS_LINEAGE is not set # CONFIG_SENSORS_LINEAGE is not set

View File

@ -1865,7 +1865,7 @@ CONFIG_SENSORS_FAM15H_POWER=m
# CONFIG_SENSORS_GL518SM is not set # CONFIG_SENSORS_GL518SM is not set
# CONFIG_SENSORS_GL520SM is not set # CONFIG_SENSORS_GL520SM is not set
# CONFIG_SENSORS_HIH6130 is not set # CONFIG_SENSORS_HIH6130 is not set
CONFIG_SENSORS_CORETEMP=m CONFIG_SENSORS_CORETEMP=y
CONFIG_SENSORS_IT87=m CONFIG_SENSORS_IT87=m
# CONFIG_SENSORS_JC42 is not set # CONFIG_SENSORS_JC42 is not set
# CONFIG_SENSORS_LINEAGE is not set # CONFIG_SENSORS_LINEAGE is not set