Commit 45e5accf authored by Phil's avatar Phil

mesa: bump to 7.11.1

intel: bump to 2.17.0
virtuoso: prepare new version - update before KDE SC update
parent 81097807
......@@ -8,34 +8,38 @@
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgbase=mesa
pkgname=('mesa' 'libgl' 'libglapi' 'libgles' 'libegl' 'ati-dri' 'intel-dri' 'unichrome-dri' 'mach64-dri' 'mga-dri' 'r128-dri' 'savage-dri' 'sis-dri' 'tdfx-dri' 'nouveau-dri') # 'llvm-dri')
pkgname=('mesa' 'libgl' 'libglapi' 'libgles' 'libegl' 'khrplatform-devel' 'ati-dri' 'intel-dri' 'unichrome-dri' 'mach64-dri' 'mga-dri' 'r128-dri' 'savage-dri' 'sis-dri' 'tdfx-dri' 'nouveau-dri') # 'llvm-dri')
# prepare 7.12/8.0
#pkgname=('mesa' 'libgl' 'libglapi' 'libgles' 'libegl' 'ati-dri' 'intel-dri' 'nouveau-dri') # 'llvm-dri')
#_git=true
_gitdate=20111031
_git=false
if [ "${_git}" = "true" ]; then
#pkgver=7.10.99.git20110709
pkgver=7.11
else
pkgver=7.11
pkgver=7.11.1
fi
pkgrel=1
arch=('i686' 'x86_64')
makedepends=('glproto>=1.4.14' 'libdrm>=2.4.26' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libx11>=1.4.3' 'libxt>=1.1.1'
'gcc-libs' 'dri2proto>=2.6' 'python2' 'libxml2' 'imake' 'llvm' 'udev')
'gcc-libs>=4.6.1' 'dri2proto>=2.6' 'python2' 'libxml2' 'imake' 'llvm' 'udev')
url="http://mesa3d.sourceforge.net"
license=('custom')
source=(LICENSE)
if [ "${_git}" = "true" ]; then
# mesa git shot from 7.11 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/commit/?h=7.11&id=1ae00c5960af83bea9545a18a1754bad83d5cbd0
#source=(${source[@]} 'ftp://ftp.archlinux.org/other/mesa/mesa-1ae00c5960af83bea9545a18a1754bad83d5cbd0.tar.bz2')
source=(${source[@]} "MesaLib-${pkgver}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-ef9f16f6322a89fb699fbe3da868b10f9acaef98.tar.bz2")
source=(${source[@]} "MesaLib-git${_gitdate}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-ef9f16f6322a89fb699fbe3da868b10f9acaef98.tar.bz2")
else
source=(${source[@]} "ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2"
#source=(${source[@]} "MesaLib-git${_gitdate}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-4464ee1a9aa3745109cee23531e3fb2323234d07.tar.bz2"
)
fi
md5sums=('5c65a0fe315dd347e09b1f2826a1df5a'
'ff03aca82d0560009a076a87c888cf13')
'a77307102cee844ff6544ffa8fafeac1')
build() {
cd ${srcdir}/?esa-*
......@@ -93,12 +97,8 @@ package_libgl() {
bin/minstall lib/libglsl.so* "${pkgdir}/usr/lib/"
cd src/mesa/drivers/dri
#make -C swrast DESTDIR="${pkgdir}" install
if [ "${_git}" = "true" ]; then
make -C ${srcdir}/mesa-*/src/gallium/targets/dri-swrast DESTDIR="${pkgdir}" install
else
make -C ${srcdir}/Mesa-${pkgver/rc/-rc}/src/gallium/targets/dri-swrast DESTDIR="${pkgdir}" install
fi
make -C ${srcdir}/?esa-*/src/gallium/targets/dri-swrast DESTDIR="${pkgdir}" install
ln -s swrastg_dri.so "${pkgdir}/usr/lib/xorg/modules/dri/swrast_dri.so"
ln -s libglx.xorg "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so"
......@@ -119,7 +119,7 @@ package_libglapi() {
}
package_libgles() {
depends=('libglapi')
depends=('libglapi' 'khrplatform-devel')
pkgdesc="Mesa GLES libraries and headers"
cd ${srcdir}/?esa-*
......@@ -140,7 +140,7 @@ package_libgles() {
}
package_libegl() {
depends=('libglapi' 'libdrm' 'libxext' 'libxfixes' 'udev')
depends=('libglapi' 'libdrm' 'libxext' 'libxfixes' 'udev' 'khrplatform-devel')
pkgdesc="Mesa EGL libraries and headers"
cd ${srcdir}/?esa-*
......@@ -150,7 +150,6 @@ package_libegl() {
install -m755 -d "${pkgdir}/usr/include"
install -m755 -d "${pkgdir}/usr/include/"
install -m755 -d "${pkgdir}/usr/include/EGL"
install -m755 -d "${pkgdir}/usr/include/KHR"
install -m755 -d "${pkgdir}/usr/share"
install -m755 -d "${pkgdir}/usr/share/doc"
install -m755 -d "${pkgdir}/usr/share/doc/libegl"
......@@ -159,15 +158,26 @@ package_libegl() {
bin/minstall lib/egl/* "${pkgdir}/usr/lib/egl/"
bin/minstall src/egl/main/egl.pc "${pkgdir}/usr/lib/pkgconfig/"
bin/minstall include/EGL/* "${pkgdir}/usr/include/EGL/"
bin/minstall include/KHR/khrplatform.h "${pkgdir}/usr/include/KHR/"
bin/minstall docs/egl.html "${pkgdir}/usr/share/doc/libegl/"
install -m755 -d "${pkgdir}/usr/share/licenses/libegl"
install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libegl/"
}
package_khrplatform-devel() {
depends=()
pkgdesc="Khronos platform development package"
cd ${srcdir}/?esa-*
install -m755 -d "${pkgdir}/usr/include/KHR"
bin/minstall include/KHR/khrplatform.h "${pkgdir}/usr/include/KHR/"
install -m755 -d "${pkgdir}/usr/share/licenses/khrplatform-devel"
install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/khrplatform-devel/"
}
package_mesa() {
depends=('libgl' 'libx11>=1.4.3' 'libxt>=1.1.1' 'gcc-libs' 'dri2proto>=2.6' 'glproto>=1.4.14')
depends=('libgl' 'libx11>=1.4.3' 'libxt>=1.1.1' 'gcc-libs>=4.6' 'dri2proto>=2.6' 'glproto>=1.4.14') #dri2proto + glproto needed for gl.pc
optdepends=('opengl-man-pages: for the OpenGL API man pages')
pkgdesc="Mesa 3-D graphics libraries and include files"
......@@ -208,7 +218,7 @@ package_intel-dri() {
depends=("libgl=${pkgver}")
pkgdesc="Mesa DRI drivers for Intel"
make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i810 DESTDIR="${pkgdir}" install
make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i810 DESTDIR="${pkgdir}" install # dead in 7.12
make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i915 DESTDIR="${pkgdir}" install
make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i965 DESTDIR="${pkgdir}" install
}
......
From 8f13c69e7658df3a97e388f210dae175639d6d8d Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Fri, 16 Jul 2010 12:24:53 +0100
Subject: [PATCH] intel: Fix invalidate before initialisation
Fixes:
Bug 29091 - 1.9RC5 server crash when starting GLX 1.3 app with mesa 7.8
Intel dri2 driver.
https://bugs.freedesktop.org/show_bug.cgi?id=29091
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
src/mesa/drivers/dri/common/dri_util.c | 2 +-
src/mesa/drivers/dri/intel/intel_screen.c | 19 +++++++++++++++----
2 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/src/mesa/drivers/dri/common/dri_util.c b/src/mesa/drivers/dri/common/dri_util.c
index 75c9882..9a9bfed 100644
--- a/src/mesa/drivers/dri/common/dri_util.c
+++ b/src/mesa/drivers/dri/common/dri_util.c
@@ -432,7 +432,7 @@ driCreateNewDrawable(__DRIscreen *psp, const __DRIconfig *config,
*/
(void) attrs;
- pdp = malloc(sizeof *pdp);
+ pdp = calloc(1, sizeof *pdp);
if (!pdp) {
return NULL;
}
diff --git a/src/mesa/drivers/dri/intel/intel_screen.c b/src/mesa/drivers/dri/intel/intel_screen.c
index 6e4bb64..083b7bb 100644
--- a/src/mesa/drivers/dri/intel/intel_screen.c
+++ b/src/mesa/drivers/dri/intel/intel_screen.c
@@ -102,10 +102,21 @@ static const __DRItexBufferExtension intelTexBufferExtension = {
intelSetTexBuffer2,
};
+static inline struct intel_context *
+to_intel_context(__DRIdrawable *drawable)
+{
+ if (drawable->driContextPriv == NULL)
+ return NULL;
+
+ return drawable->driContextPriv->driverPrivate;
+}
+
static void
intelDRI2Flush(__DRIdrawable *drawable)
{
- struct intel_context *intel = drawable->driContextPriv->driverPrivate;
+ struct intel_context *intel = to_intel_context(drawable);
+ if (!intel)
+ return;
if (intel->gen < 4)
INTEL_FIREVERTICES(intel);
@@ -117,9 +128,9 @@ intelDRI2Flush(__DRIdrawable *drawable)
static void
intelDRI2Invalidate(__DRIdrawable *drawable)
{
- struct intel_context *intel = drawable->driContextPriv->driverPrivate;
-
- intel->using_dri2_swapbuffers = GL_TRUE;
+ struct intel_context *intel = to_intel_context(drawable);
+ if (intel)
+ intel->using_dri2_swapbuffers = GL_TRUE;
dri2InvalidateDrawable(drawable);
}
--
1.7.1
This diff is collapsed.
From 5c102dd94f435e97507213fbd128e50dd15f5f54 Mon Sep 17 00:00:00 2001
From: Ben Skeggs <bskeggs@redhat.com>
Date: Mon, 20 Dec 2010 03:39:36 +0000
Subject: nouveau: fix includes for latest libdrm
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
---
diff --git a/src/gallium/drivers/nouveau/nouveau_winsys.h b/src/gallium/drivers/nouveau/nouveau_winsys.h
index ab480ca..747b084 100644
--- a/src/gallium/drivers/nouveau/nouveau_winsys.h
+++ b/src/gallium/drivers/nouveau/nouveau_winsys.h
@@ -10,7 +10,7 @@
#include "nouveau/nouveau_grobj.h"
#include "nouveau/nouveau_notifier.h"
#include "nouveau/nouveau_resource.h"
-#include "nouveau/nouveau_pushbuf.h"
+#include "nouveau/nv04_pushbuf.h"
#ifndef NV04_PFIFO_MAX_PACKET_LEN
#define NV04_PFIFO_MAX_PACKET_LEN 2047
diff --git a/src/gallium/drivers/nv50/nv50_surface.c b/src/gallium/drivers/nv50/nv50_surface.c
index ce48022..a99df76 100644
--- a/src/gallium/drivers/nv50/nv50_surface.c
+++ b/src/gallium/drivers/nv50/nv50_surface.c
@@ -22,7 +22,7 @@
#define __NOUVEAU_PUSH_H__
#include <stdint.h>
-#include "nouveau/nouveau_pushbuf.h"
+#include "nouveau/nv04_pushbuf.h"
#include "nv50_context.h"
#include "nv50_resource.h"
#include "pipe/p_defines.h"
diff --git a/src/gallium/drivers/nvfx/nv04_2d.c b/src/gallium/drivers/nvfx/nv04_2d.c
index e0e65e7..e2fadd3 100644
--- a/src/gallium/drivers/nvfx/nv04_2d.c
+++ b/src/gallium/drivers/nvfx/nv04_2d.c
@@ -34,11 +34,11 @@
#include <stdio.h>
#include <stdint.h>
#include <nouveau/nouveau_device.h>
-#include <nouveau/nouveau_pushbuf.h>
#include <nouveau/nouveau_channel.h>
#include <nouveau/nouveau_bo.h>
#include <nouveau/nouveau_notifier.h>
#include <nouveau/nouveau_grobj.h>
+#include <nouveau/nv04_pushbuf.h>
#include "nv04_2d.h"
#include "nouveau/nv_object.xml.h"
diff --git a/src/gallium/drivers/nvfx/nvfx_vbo.c b/src/gallium/drivers/nvfx/nvfx_vbo.c
index 597664e..339b317 100644
--- a/src/gallium/drivers/nvfx/nvfx_vbo.c
+++ b/src/gallium/drivers/nvfx/nvfx_vbo.c
@@ -9,8 +9,7 @@
#include "nvfx_resource.h"
#include "nouveau/nouveau_channel.h"
-
-#include "nouveau/nouveau_pushbuf.h"
+#include "nouveau/nv04_pushbuf.h"
static inline unsigned
util_guess_unique_indices_count(unsigned mode, unsigned indices)
diff --git a/src/mesa/drivers/dri/nouveau/nouveau_driver.h b/src/mesa/drivers/dri/nouveau/nouveau_driver.h
index 8036b18..c5ac128 100644
--- a/src/mesa/drivers/dri/nouveau/nouveau_driver.h
+++ b/src/mesa/drivers/dri/nouveau/nouveau_driver.h
@@ -38,7 +38,6 @@
#include <assert.h>
#include "nouveau_device.h"
-#include "nouveau_pushbuf.h"
#include "nouveau_grobj.h"
#include "nouveau_channel.h"
#include "nouveau_bo.h"
@@ -46,6 +45,7 @@
#include "nouveau_screen.h"
#include "nouveau_state.h"
#include "nouveau_surface.h"
+#include "nv04_pushbuf.h"
#define DRIVER_DATE "20091015"
#define DRIVER_AUTHOR "Nouveau"
--
cgit v0.8.3-6-g21f6
This diff is collapsed.
......@@ -8,8 +8,8 @@
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgname=virtuoso
pkgver=6.1.3
pkgrel=2
pkgver=6.1.4
pkgrel=1
arch=('i686' 'x86_64')
pkgdesc='A scalable cross-platform server that combines SQL/RDF/XML Data Management with Web Application Server and Web Services Platform functionality'
url='http://virtuoso.openlinksw.com/wiki/main/Main/'
......@@ -19,7 +19,7 @@ makedepends=('bison' 'flex')
options=('!libtool' '!makeflags')
source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-opensource-${pkgver}.tar.gz"
"truegpatch")
md5sums=('7d4b0497411ff1c34d7ca247618cdd17'
md5sums=('7110a0b4b171b84850d346f4fe648172'
'12f6afee5597eadf0a8df60f91fe53c2')
build() {
......
--- src/intel_driver.c.orig 2010-10-12 15:05:37.893365410 +0200
+++ src/intel_driver.c 2010-10-12 15:33:48.090032432 +0200
@@ -573,7 +573,7 @@
}
intel->use_shadow = FALSE;
- if (IS_GEN6(intel))
+ if (IS_845G(intel) || IS_GEN6(intel))
intel->use_shadow = TRUE;
if (xf86IsOptionSet(intel->Options, OPTION_SHADOW)) {
......@@ -8,22 +8,23 @@
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgname=xf86-video-intel
pkgver=2.16.0
pkgver=2.17.0
pkgrel=1
pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers"
arch=(i686 x86_64)
url="http://xorg.freedesktop.org/"
license=('custom')
depends=('intel-dri' 'libxvmc' 'libpciaccess' 'libdrm' 'xcb-util' 'libxfixes' 'udev')
makedepends=('xorg-server' 'libx11' 'libdrm' 'xf86driproto' 'glproto' 'mesa' 'libxvmc' 'xcb-util' 'libxrender')
conflicts=('xorg-server<1.10.1' 'xf86-video-i810' 'xf86-video-intel-legacy')
depends=(intel-dri libxvmc libpciaccess libdrm xcb-util libxfixes udev)
makedepends=('xorg-server>=1.10' 'libx11' 'libdrm' 'xf86driproto' 'glproto' 'mesa' 'libxvmc' 'xcb-util' 'libxrender')
conflicts=('xorg-server<1.10' 'xf86-video-i810' 'xf86-video-intel-legacy')
options=('!libtool')
groups=('xorg-drivers' 'xorg')
source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
sha1sums=('53441ea4d4335b501d32809b6b92593cbb1f79cf')
sha1sums=('04ad9fa1f4c4e0a90f48752a709bf14700c864af')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
./configure --prefix=/usr --enable-dri
make
}
......
This diff is collapsed.
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