Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-3.2

This commit is contained in:
Stephan Raue 2013-09-07 23:03:06 +02:00
commit bf5d408ad4
4 changed files with 18 additions and 6 deletions

View File

@ -1 +0,0 @@
KERNEL=="fuse", MODE="0666",OWNER="root",GROUP="root"

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="xf86-video-intel"
PKG_VERSION="2.99.901"
PKG_VERSION="2.99.902"
PKG_REV="1"
PKG_ARCH="i386 x86_64"
PKG_LICENSE="OSS"
@ -37,11 +37,11 @@ PKG_AUTORECONF="yes"
PKG_CONFIGURE_OPTS_TARGET="--enable-udev \
--enable-dri \
--enable-kms-only \
--disable-xvmc \
--disable-ums-only \
--enable-kms --enable-kms-only \
--disable-ums --disable-ums-only \
--enable-sna \
--enable-uxa \
--disable-xvmc \
--disable-glamor \
--disable-xaa \
--disable-dga \

View File

@ -0,0 +1,13 @@
diff -Naur xf86-video-intel-2.99.902/configure.ac xf86-video-intel-2.99.902.patch/configure.ac
--- xf86-video-intel-2.99.902/configure.ac 2013-09-07 09:47:33.000000000 +0200
+++ xf86-video-intel-2.99.902.patch/configure.ac 2013-09-07 22:55:59.418980080 +0200
@@ -394,9 +394,6 @@
AC_MSG_CHECKING([whether to include DRI2 support])
AM_CONDITIONAL(DRI2, test "x$DRI2" = "xyes")
AC_MSG_RESULT([$DRI2])
-if test "x$enable_dri" = "xyes" -a "x$KMS" = "xyes"; then
- AC_MSG_ERROR([DRI2 requested but prerequisites not found])
-fi
if test "x$DRI2" != "xno"; then
AC_DEFINE(HAVE_DRI2,1,[Enable DRI2 driver support])
dri_msg="$dri_msg DRI2"

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="util-macros"
PKG_VERSION="1.17"
PKG_VERSION="1.17.1"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="OSS"