From 62af3ffd3cd796116b55834811a5a1a60230b7e0 Mon Sep 17 00:00:00 2001 From: Cecil Hugh Watson Date: Sat, 4 Sep 2010 16:02:18 -0700 Subject: intel-dri:Removed for LinHES 7. --- abs/core-testing/intel-dri/PKGBUILD | 43 --------- .../intel-dri/intel-disable-ttm-warning.patch | 13 --- abs/core-testing/intel-dri/intel-revert-vbl.patch | 21 ----- .../intel-dri/mesa-7.1-link-shared.patch | 102 --------------------- 4 files changed, 179 deletions(-) delete mode 100644 abs/core-testing/intel-dri/PKGBUILD delete mode 100644 abs/core-testing/intel-dri/intel-disable-ttm-warning.patch delete mode 100644 abs/core-testing/intel-dri/intel-revert-vbl.patch delete mode 100644 abs/core-testing/intel-dri/mesa-7.1-link-shared.patch diff --git a/abs/core-testing/intel-dri/PKGBUILD b/abs/core-testing/intel-dri/PKGBUILD deleted file mode 100644 index 8da4e48..0000000 --- a/abs/core-testing/intel-dri/PKGBUILD +++ /dev/null @@ -1,43 +0,0 @@ -# $Id: $ -# Maintainer: Alexander Baldeck -# Contributor: Jan de Groot -pkgname=intel-dri -pkgver=7.2 -pkgrel=2 -pkgdesc="Mesa DRI drivers for Intel chipsets" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" -depends=('libdrm>=2.3.1' 'expat>=2.0.1' 'libgl>=7.2') -makedepends=('glproto>=1.4.9' 'pkgconfig' 'libxfixes' 'libxdamage' 'libxxf86vm' 'libxext') -options=('!libtool') -source=(http://downloads.sourceforge.net/mesa3d/MesaLib-${pkgver}.tar.bz2 - mesa-7.1-link-shared.patch - intel-revert-vbl.patch - intel-disable-ttm-warning.patch) -md5sums=('04d379292e023df0b0266825cb0dbde5' - 'f0baa948d9810f268413111ee439d24b' - 'a111f4dc82e894f8801bc3fa129af7af' - 'a393d374b5d187ff2a5bb90b0f347c9a') - -build() { - cd ${srcdir}/Mesa-${pkgver} - patch -Np1 -i "${srcdir}/intel-revert-vbl.patch" || return 1 - patch -Np1 -i "${srcdir}/intel-disable-ttm-warning.patch" || return 1 - patch -Np1 -i "${srcdir}/mesa-7.1-link-shared.patch" || return 1 - ./configure --prefix=/usr \ - --with-dri-driverdir=/usr/lib/xorg/modules/dri \ - --with-dri-drivers=i810,i915,i965 \ - --enable-glx-tls \ - --disable-ttm-api \ - --with-driver=dri \ - --enable-xcb \ - --disable-glu \ - --disable-glut \ - --disable-glw || return 1 - make || return 1 - cd src/mesa/drivers/dri || return 1 - make DESTDIR=${pkgdir} install || return 1 - rm -rf ${pkgdir}/usr/lib/pkgconfig - rm -rf ${pkgdir}/usr/include - rm -f ${pkgdir}/usr/lib/xorg/modules/dri/libdricore.so -} diff --git a/abs/core-testing/intel-dri/intel-disable-ttm-warning.patch b/abs/core-testing/intel-dri/intel-disable-ttm-warning.patch deleted file mode 100644 index f9d5223..0000000 --- a/abs/core-testing/intel-dri/intel-disable-ttm-warning.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -ruN Mesa-7.2.orig/src/mesa/drivers/dri/intel/intel_context.c Mesa-7.2/src/mesa/drivers/dri/intel/intel_context.c ---- Mesa-7.2.orig/src/mesa/drivers/dri/intel/intel_context.c 2008-09-13 20:25:44.000000000 +0000 -+++ Mesa-7.2/src/mesa/drivers/dri/intel/intel_context.c 2008-12-21 21:27:45.000000000 +0000 -@@ -490,9 +490,6 @@ - if (intel->bufmgr == NULL) { - if (ttm_disable) { - fprintf(stderr, "TTM buffer manager disabled. Using classic.\n"); -- } else { -- fprintf(stderr, "Failed to initialize TTM buffer manager. " -- "Falling back to classic.\n"); - } - - if (intelScreen->tex.size == 0) { diff --git a/abs/core-testing/intel-dri/intel-revert-vbl.patch b/abs/core-testing/intel-dri/intel-revert-vbl.patch deleted file mode 100644 index 0394414..0000000 --- a/abs/core-testing/intel-dri/intel-revert-vbl.patch +++ /dev/null @@ -1,21 +0,0 @@ -commit 532d2051245a1d8afe7ca236f1d966d555bb121a -Author: Dave Airlie -Date: Fri Sep 12 17:21:25 2008 +1000 - - Revert "intel: sync to vblank by default" - - This reverts commit e9bf3e4cc9a7e4bcd4c45bd707541d26ecdf0409. - -diff --git a/src/mesa/drivers/dri/intel/intel_screen.c b/src/mesa/drivers/dri/intel/intel_screen.c -index c193830..f02192d 100644 ---- a/src/mesa/drivers/dri/intel/intel_screen.c -+++ b/src/mesa/drivers/dri/intel/intel_screen.c -@@ -55,7 +55,7 @@ PUBLIC const char __driConfigOptions[] = - DRI_CONF_BEGIN - DRI_CONF_SECTION_PERFORMANCE - DRI_CONF_FTHROTTLE_MODE(DRI_CONF_FTHROTTLE_IRQS) -- DRI_CONF_VBLANK_MODE(DRI_CONF_VBLANK_ALWAYS_SYNC) -+ DRI_CONF_VBLANK_MODE(DRI_CONF_VBLANK_DEF_INTERVAL_0) - /* Options correspond to DRI_CONF_BO_REUSE_DISABLED, - * DRI_CONF_BO_REUSE_ALL - */ diff --git a/abs/core-testing/intel-dri/mesa-7.1-link-shared.patch b/abs/core-testing/intel-dri/mesa-7.1-link-shared.patch deleted file mode 100644 index 7fdbf14..0000000 --- a/abs/core-testing/intel-dri/mesa-7.1-link-shared.patch +++ /dev/null @@ -1,102 +0,0 @@ -diff -up mesa-20080814/src/mesa/drivers/dri/Makefile.dricore mesa-20080814/src/mesa/drivers/dri/Makefile ---- mesa-20080814/src/mesa/drivers/dri/Makefile.dricore 2008-08-14 02:28:38.000000000 +1000 -+++ mesa-20080814/src/mesa/drivers/dri/Makefile 2008-08-14 16:18:20.000000000 +1000 -@@ -6,12 +6,17 @@ include $(TOP)/configs/current - - - --default: $(TOP)/$(LIB_DIR) subdirs -+default: $(TOP)/$(LIB_DIR) $(TOP)/$(LIB_DIR)/libdricore.so subdirs - - - $(TOP)/$(LIB_DIR): - -mkdir $(TOP)/$(LIB_DIR) - -+libdricore.so: -+ gcc -shared -o libdricore.so -Wl,--whole-archive ../../libmesa.a -Wl,--no-whole-archive -lm -lpthread -lc -+ -+$(TOP)/$(LIB_DIR)/libdricore.so: $(TOP)/$(LIB_DIR) libdricore.so -+ $(INSTALL) libdricore.so $(TOP)/$(LIB_DIR) - - subdirs: - @for dir in $(DRI_DIRS) ; do \ -@@ -31,12 +36,14 @@ dri.pc: dri.pc.in - $(pcedit) $< > $@ - - --install: dri.pc -+install: dri.pc $(TOP)/$(LIB_DIR)/libdricore.so - @for dir in $(DRI_DIRS) ; do \ - if [ -d $$dir ] ; then \ - (cd $$dir && $(MAKE) install) || exit 1 ; \ - fi \ - done -+ $(INSTALL) -d $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR) -+ $(INSTALL) -m 755 $(TOP)/$(LIB_DIR)/libdricore.so $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR) - $(INSTALL) -d $(DESTDIR)$(INSTALL_INC_DIR)/GL/internal - $(INSTALL) -m 0644 $(TOP)/include/GL/internal/dri_interface.h \ - $(DESTDIR)$(INSTALL_INC_DIR)/GL/internal -@@ -52,5 +59,6 @@ clean: - (cd $$dir && $(MAKE) clean) ; \ - fi \ - done -+ -rm -f libdricore.so $(TOP)/$(LIB_DIR)/libdricore.so - -rm -f common/*.o - -rm -f *.pc -diff -up mesa-20080814/src/mesa/drivers/dri/Makefile.template.dricore mesa-20080814/src/mesa/drivers/dri/Makefile.template ---- mesa-20080814/src/mesa/drivers/dri/Makefile.template.dricore 2008-08-14 02:28:38.000000000 +1000 -+++ mesa-20080814/src/mesa/drivers/dri/Makefile.template 2008-08-14 16:19:37.000000000 +1000 -@@ -1,6 +1,6 @@ - # -*-makefile-*- - --MESA_MODULES = $(TOP)/src/mesa/libmesa.a -+MESA_MODULES = $(TOP)/$(LIB_DIR)/libdricore.so - - COMMON_SOURCES = \ - ../common/utils.c \ -@@ -64,7 +64,9 @@ default: symlinks depend $(LIBNAME) $(TO - - $(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile $(TOP)/src/mesa/drivers/dri/Makefile.template - $(MKLIB) -o $@ -noprefix -linker '$(CC)' -ldflags '$(LDFLAGS)' \ -- $(OBJECTS) $(MESA_MODULES) $(WINOBJ) $(DRI_LIB_DEPS) -+ $(OBJECTS) $(WINOBJ) \ -+ -L$(TOP)/$(LIB_DIR) -Wl,-R$(DRI_DRIVER_INSTALL_DIR) -ldricore \ -+ $(DRI_LIB_DEPS) - - - $(TOP)/$(LIB_DIR)/$(LIBNAME): $(LIBNAME) -diff -up mesa-20080814/src/mesa/x86/read_rgba_span_x86.S.dricore mesa-20080814/src/mesa/x86/read_rgba_span_x86.S ---- mesa-20080814/src/mesa/x86/read_rgba_span_x86.S.dricore 2008-08-14 02:28:38.000000000 +1000 -+++ mesa-20080814/src/mesa/x86/read_rgba_span_x86.S 2008-08-14 16:16:49.000000000 +1000 -@@ -77,7 +77,6 @@ - */ - - .globl _generic_read_RGBA_span_BGRA8888_REV_MMX --.hidden _generic_read_RGBA_span_BGRA8888_REV_MMX - .type _generic_read_RGBA_span_BGRA8888_REV_MMX, @function - _generic_read_RGBA_span_BGRA8888_REV_MMX: - pushl %ebx -@@ -172,7 +171,6 @@ _generic_read_RGBA_span_BGRA8888_REV_MMX - */ - - .globl _generic_read_RGBA_span_BGRA8888_REV_SSE --.hidden _generic_read_RGBA_span_BGRA8888_REV_SSE - .type _generic_read_RGBA_span_BGRA8888_REV_SSE, @function - _generic_read_RGBA_span_BGRA8888_REV_SSE: - pushl %esi -@@ -335,7 +333,6 @@ _generic_read_RGBA_span_BGRA8888_REV_SSE - - .text - .globl _generic_read_RGBA_span_BGRA8888_REV_SSE2 --.hidden _generic_read_RGBA_span_BGRA8888_REV_SSE2 - .type _generic_read_RGBA_span_BGRA8888_REV_SSE2, @function - _generic_read_RGBA_span_BGRA8888_REV_SSE2: - pushl %esi -@@ -494,7 +491,6 @@ _generic_read_RGBA_span_BGRA8888_REV_SSE - - .text - .globl _generic_read_RGBA_span_RGB565_MMX -- .hidden _generic_read_RGBA_span_RGB565_MMX - .type _generic_read_RGBA_span_RGB565_MMX, @function - - _generic_read_RGBA_span_RGB565_MMX: -- cgit v0.12