Merge branch 'openelec-next' of git://github.com/OpenELEC/OpenELEC.tv into openelec-pvr

This commit is contained in:
Stephan Raue 2011-05-23 14:06:30 +02:00
commit 7390152112
8 changed files with 108 additions and 9 deletions

View File

@ -22,6 +22,15 @@
. config/options $1
LIBVA_CONFIG="--disable-dummy-driver --disable-i965-driver"
get_graphicdrivers
for drv in $GRAPHIC_DRIVERS; do
if [ "$drv" = i965 ]; then
LIBVA_CONFIG=`echo $LIBVA_CONFIG | sed -e 's/disable-i965-driver/enable-i965-driver/'`
fi
done
cd $PKG_BUILD
./configure --host=$TARGET_NAME \
--build=$HOST_NAME \
@ -30,8 +39,7 @@ cd $PKG_BUILD
--disable-static \
--disable-silent-rules \
--enable-glx \
--disable-dummy-driver \
--enable-i965-driver \
$LIBVA_CONFIG \
--with-drivers-path="/usr/lib/va" \
make

View File

@ -22,12 +22,18 @@
. config/options $1
get_graphicdrivers
mkdir -p $INSTALL/usr/lib
cp -P $PKG_BUILD/va/.libs/libva*.so* $INSTALL/usr/lib
rm -rf $INSTALL/usr/lib/libva-*.so*T
mkdir -p $INSTALL/usr/lib/va
for drv in $GRAPHIC_DRIVERS; do
if [ "$drv" = i965 ]; then
mkdir -p $INSTALL/usr/lib/va
cp -P $PKG_BUILD/i965_drv_video/.libs/*.so $INSTALL/usr/lib/va
fi
done
if [ "$DEVTOOLS" = yes ]; then
mkdir -p $INSTALL/usr/bin

View File

@ -21,7 +21,7 @@
PKG_NAME="libva"
PKG_VERSION="1.0.12"
PKG_REV="1"
PKG_ARCH="any"
PKG_ARCH="i386 x86_64"
PKG_LICENSE="GPL"
PKG_SITE="http://freedesktop.org/wiki/Software/vaapi"
PKG_URL="http://cgit.freedesktop.org/libva/snapshot/$PKG_NAME-$PKG_VERSION.tar.gz"
@ -35,3 +35,10 @@ PKG_LONGDESC="The main motivation for VAAPI (Video Acceleration API) is to enabl
PKG_IS_ADDON="no"
PKG_AUTORECONF="yes"
get_graphicdrivers
for drv in $GRAPHIC_DRIVERS; do
if [ "$drv" = fglrx ]; then
PKG_DEPENDS="$PKG_DEPENDS xvba-video"
fi
done

View File

@ -64,6 +64,8 @@ mkdir -p $INSTALL/etc/X11
mkdir -p $INSTALL/etc/ati
cp $PKG_BUILD/common/etc/ati/amdpcsdb.default $INSTALL/etc/ati
cp $PKG_BUILD/common/etc/ati/control $INSTALL/etc/ati
cp $PKG_BUILD/common/etc/ati/signature $INSTALL/etc/ati
# DRI driver
mkdir -p $INSTALL/usr/lib/dri

View File

@ -964,7 +964,7 @@ CONFIG_NET_PCI=y
# CONFIG_KSZ884X_PCI is not set
# CONFIG_B44 is not set
CONFIG_FORCEDETH=y
# CONFIG_E100 is not set
CONFIG_E100=y
# CONFIG_FEALNX is not set
# CONFIG_NATSEMI is not set
# CONFIG_NE2K_PCI is not set

View File

@ -913,7 +913,7 @@ CONFIG_NET_PCI=y
# CONFIG_KSZ884X_PCI is not set
# CONFIG_B44 is not set
CONFIG_FORCEDETH=y
# CONFIG_E100 is not set
CONFIG_E100=y
# CONFIG_FEALNX is not set
# CONFIG_NATSEMI is not set
# CONFIG_NE2K_PCI is not set

View File

@ -943,7 +943,45 @@ CONFIG_NETDEVICES=y
# CONFIG_ARCNET is not set
CONFIG_MII=y
# CONFIG_PHYLIB is not set
# CONFIG_NET_ETHERNET is not set
CONFIG_NET_ETHERNET=y
# CONFIG_HAPPYMEAL is not set
# CONFIG_SUNGEM is not set
# CONFIG_CASSINI is not set
# CONFIG_NET_VENDOR_3COM is not set
# CONFIG_ETHOC is not set
# CONFIG_DNET is not set
# CONFIG_NET_TULIP is not set
# CONFIG_HP100 is not set
# CONFIG_IBM_NEW_EMAC_ZMII is not set
# CONFIG_IBM_NEW_EMAC_RGMII is not set
# CONFIG_IBM_NEW_EMAC_TAH is not set
# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
CONFIG_NET_PCI=y
# CONFIG_PCNET32 is not set
# CONFIG_AMD8111_ETH is not set
# CONFIG_ADAPTEC_STARFIRE is not set
# CONFIG_KSZ884X_PCI is not set
# CONFIG_B44 is not set
# CONFIG_FORCEDETH is not set
CONFIG_E100=y
# CONFIG_FEALNX is not set
# CONFIG_NATSEMI is not set
# CONFIG_NE2K_PCI is not set
# CONFIG_8139CP is not set
# CONFIG_8139TOO is not set
# CONFIG_R6040 is not set
# CONFIG_SIS900 is not set
# CONFIG_EPIC100 is not set
# CONFIG_SMSC9420 is not set
# CONFIG_SUNDANCE is not set
# CONFIG_TLAN is not set
# CONFIG_KS8851_MLL is not set
# CONFIG_VIA_RHINE is not set
# CONFIG_SC92031 is not set
# CONFIG_ATL2 is not set
CONFIG_NETDEV_1000=y
# CONFIG_ACENIC is not set
# CONFIG_DL2K is not set

View File

@ -893,7 +893,45 @@ CONFIG_NETDEVICES=y
# CONFIG_ARCNET is not set
CONFIG_MII=y
# CONFIG_PHYLIB is not set
# CONFIG_NET_ETHERNET is not set
CONFIG_NET_ETHERNET=y
# CONFIG_HAPPYMEAL is not set
# CONFIG_SUNGEM is not set
# CONFIG_CASSINI is not set
# CONFIG_NET_VENDOR_3COM is not set
# CONFIG_ETHOC is not set
# CONFIG_DNET is not set
# CONFIG_NET_TULIP is not set
# CONFIG_HP100 is not set
# CONFIG_IBM_NEW_EMAC_ZMII is not set
# CONFIG_IBM_NEW_EMAC_RGMII is not set
# CONFIG_IBM_NEW_EMAC_TAH is not set
# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
CONFIG_NET_PCI=y
# CONFIG_PCNET32 is not set
# CONFIG_AMD8111_ETH is not set
# CONFIG_ADAPTEC_STARFIRE is not set
# CONFIG_KSZ884X_PCI is not set
# CONFIG_B44 is not set
# CONFIG_FORCEDETH is not set
CONFIG_E100=y
# CONFIG_FEALNX is not set
# CONFIG_NATSEMI is not set
# CONFIG_NE2K_PCI is not set
# CONFIG_8139CP is not set
# CONFIG_8139TOO is not set
# CONFIG_R6040 is not set
# CONFIG_SIS900 is not set
# CONFIG_EPIC100 is not set
# CONFIG_SMSC9420 is not set
# CONFIG_SUNDANCE is not set
# CONFIG_TLAN is not set
# CONFIG_KS8851_MLL is not set
# CONFIG_VIA_RHINE is not set
# CONFIG_SC92031 is not set
# CONFIG_ATL2 is not set
CONFIG_NETDEV_1000=y
# CONFIG_ACENIC is not set
# CONFIG_DL2K is not set