Commit a4e6fef7 authored by Phil's avatar Phil

libdrm: bump to 2.4.26 - fixes intel

parent fc5314de
......@@ -107,24 +107,24 @@ hwdetect_graphics()
touch /tmp/nvidia-173xx
# or maybe another legacy card
#elif [ $(grep -i "$CARD_NVIDIA" ${HW_DB_PATH}/${NV96XX_DB}) ]
#then
#
# printhl "NVIDIA hardware detected"
# printhl "Installing driver: nvidia-96xx. This can take some seconds."
#
# rmmod -f nouveau
# rmmod -f ttm
# rmmod -f drm_kms_helper
# rmmod -f drm
# pacman -Rdd --noconfirm libgl &>/dev/null
# pacman -Rdd --noconfirm nouveau-dri &>/dev/null
# pacman -Rdd --noconfirm xf86-video-nv &>/dev/null
# pacman -Rdd --noconfirm xf86-video-nouveau &>/dev/null
# pacman -Udf --noconfirm ${HW_DRIVER_PATH}/nvidia-96xx* &>/dev/null
#
# # add a status file in /tmp
# touch /tmp/nvidia-96xx
elif [ $(grep -i "$CARD_NVIDIA" ${HW_DB_PATH}/${NV96XX_DB}) ]
then
printhl "NVIDIA hardware detected"
printhl "Installing driver: nvidia-96xx. This can take some seconds."
rmmod -f nouveau
rmmod -f ttm
rmmod -f drm_kms_helper
rmmod -f drm
pacman -Rdd --noconfirm libgl &>/dev/null
pacman -Rdd --noconfirm nouveau-dri &>/dev/null
pacman -Rdd --noconfirm xf86-video-nv &>/dev/null
pacman -Rdd --noconfirm xf86-video-nouveau &>/dev/null
pacman -Udf --noconfirm ${HW_DRIVER_PATH}/nvidia-96xx* &>/dev/null
# add a status file in /tmp
touch /tmp/nvidia-96xx
else
printhl "No non-free drivers available for this hardware"
fi
......
......@@ -5,20 +5,20 @@
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
pkgname=libdrm
pkgver=2.4.25
pkgver=2.4.26
pkgrel=1
pkgdesc="Userspace interface to kernel DRM services"
arch=(i686 x86_64)
license=('custom')
depends=('glibc')
depends=('glibc' 'libpciaccess')
options=('!libtool')
url="http://dri.freedesktop.org/"
source=(http://dri.freedesktop.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2
no-pthread-stubs.patch
COPYING)
sha1sums=('b950f29cd1c4bb9f1c98a926486a47256b0a4194'
'af2d9871565ea4cf524873f897691a18b2bba944'
'ba3dcd636997ee0d30df14b03dae05c24ae5d094')
md5sums=('062569426773f69b11a47a7712bba770'
'c722c8406507b7e3a8da7a3030d1d9cf'
'ba65e71c481b94ef0fb6c23c7f21ffa1')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
......
diff -ru libdrm-2.4.0/configure.ac libdrm-2.4.0-nostubs/configure.ac
--- libdrm-2.4.0/configure.ac 2008-10-09 21:57:09.000000000 +0200
+++ libdrm-2.4.0-nostubs/configure.ac 2008-10-21 10:48:24.000000000 +0200
@@ -32,10 +32,6 @@
AC_HEADER_STDC
AC_SYS_LARGEFILE
@@ -47,10 +47,6 @@
LT_INIT([disable-static])
-PKG_CHECK_MODULES(PTHREADSTUBS, pthread-stubs)
-AC_SUBST(PTHREADSTUBS_CFLAGS)
-AC_SUBST(PTHREADSTUBS_LIBS)
-
pkgconfigdir=${libdir}/pkgconfig
AC_SUBST(pkgconfigdir)
AC_ARG_ENABLE(udev, AS_HELP_STRING([--enable-udev],
PKG_CHECK_MODULES(PCIACCESS, [pciaccess >= 0.10])
AC_SUBST(PCIACCESS_CFLAGS)
AC_SUBST(PCIACCESS_LIBS)
--- libdrm-2.4.16/intel/Makefile.am 2009-11-20 23:54:36.000000000 +0000
+++ libdrm-2.4.16/intel/Makefile.am.new 2009-12-07 08:11:32.235748069 +0000
@@ -26,13 +26,12 @@
@@ -26,14 +26,13 @@
$(WARN_CFLAGS) \
-I$(top_srcdir) \
-I$(top_srcdir)/intel \
- $(PTHREADSTUBS_CFLAGS) \
$(PCIACCESS_CFLAGS) \
-I$(top_srcdir)/include/drm
libdrm_intel_la_LTLIBRARIES = libdrm_intel.la
libdrm_intel_ladir = $(libdir)
libdrm_intel_la_LDFLAGS = -version-number 1:0:0 -no-undefined
-libdrm_intel_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ @CLOCK_LIB@
+libdrm_intel_la_LIBADD = ../libdrm.la @CLOCK_LIB@
-libdrm_intel_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ @PCIACCESS_LIBS@ @CLOCK_LIB@
+libdrm_intel_la_LIBADD = ../libdrm.la @PCIACCESS_LIBS@ @CLOCK_LIB@
libdrm_intel_la_SOURCES = \
intel_atomic.h \
intel_bufmgr.c \
--- libdrm-2.4.16/radeon/Makefile.am 2009-11-20 23:54:36.000000000 +0000
+++ libdrm-2.4.16/radeon/Makefile.am.new 2009-12-07 08:12:31.889075388 +0000
@@ -26,13 +26,12 @@
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment