Commit 00ffa27c authored by Manuel Tortosa's avatar Manuel Tortosa

Upgrade mesa, and related libxxx

parent d2567349
......@@ -2,14 +2,14 @@
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=dri2proto
pkgver=2.1
pkgrel=2
pkgver=2.3
pkgrel=1
pkgdesc="X11 DRI protocol"
arch=(any)
license=('custom')
url="http://xorg.freedesktop.org/"
source=(${url}/releases/individual/proto/${pkgname}-${pkgver}.tar.bz2)
md5sums=('5cb7987d29db068153bdc8f23c767c43')
md5sums=('3407b494d5e90d584c9af52aa8f9f028')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
......
......@@ -2,15 +2,15 @@
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: Alexander Baldeck <alexander@archlinux.org>
pkgname=glproto
pkgver=1.4.11
pkgrel=2
pkgver=1.4.12
pkgrel=1
pkgdesc="X11 OpenGL extension wire protocol"
arch=(any)
url="http://xorg.freedesktop.org/"
license=('custom')
source=(http://xorg.freedesktop.org/releases/individual/proto/${pkgname}-${pkgver}.tar.bz2
COPYING)
md5sums=('78e7c4dc7dcb74b1869fee7897e00f59'
md5sums=('55edc5ff2efb734215c868f72f7cf27e'
'a2228066bf4e15d351290deec0d9c250')
build() {
......
# $Id: PKGBUILD 77295 2010-04-11 20:32:35Z thomas $
# $Id: PKGBUILD 86650 2010-08-02 19:36:00Z jgc $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=libdrm
pkgver=2.4.19
pkgver=2.4.21
pkgrel=2
pkgdesc="Userspace interface to kernel DRM services"
arch=(i686 x86_64)
......@@ -11,28 +11,28 @@ depends=('glibc')
options=('!libtool')
url="http://dri.freedesktop.org/"
source=(http://dri.freedesktop.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2
libdrm-2.4.21-b803918f3f.patch
no-pthread-stubs.patch
COPYING
intel-use-the-correct-size-when-allocating-reloc_target_info-array.patch)
md5sums=('c2699b5d8ebc9e47fb56da15f460107f'
COPYING)
md5sums=('273ed9dad986e3a931649f3d8762ff74'
'd67fab8381b371fe2a8f86e2819aef2b'
'9b5ec3bbebe86921e2057694c42f65b8'
'ba65e71c481b94ef0fb6c23c7f21ffa1'
'2dd7d84d3ebbc23c92b602104fae5df3')
'ba65e71c481b94ef0fb6c23c7f21ffa1')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
patch -Np1 -i "${srcdir}/no-pthread-stubs.patch" || return 1
patch -p1 -i "${srcdir}/intel-use-the-correct-size-when-allocating-reloc_target_info-array.patch" || return 1
libtoolize --force || return 1
aclocal || return 1
autoconf || return 1
automake || return 1
patch -Np1 -i "${srcdir}/libdrm-2.4.21-b803918f3f.patch"
patch -Np1 -i "${srcdir}/no-pthread-stubs.patch"
libtoolize --force
aclocal
autoconf
automake
./configure --prefix=/usr \
--enable-intel --enable-radeon \
--enable-vmwgfx-experimental-api --enable-nouveau-experimental-api \
--enable-udev || return 1
make || return 1
make DESTDIR="${pkgdir}" install || return 1
--enable-udev
make
make DESTDIR="${pkgdir}" install
install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
install -m644 "${srcdir}/COPYING" "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1
install -m644 "${srcdir}/COPYING" "${pkgdir}/usr/share/licenses/${pkgname}/"
}
From 3506173ba7e726a9d0a17ec42734a925a885b01e Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Sun, 11 Apr 2010 17:40:38 +0000
Subject: intel: Use the correct size when allocating reloc_target_info array
Thomas tracked down this error with kdm and commit b509640:
==4320== Invalid write of size 8
==4320== at 0x9A97998: do_bo_emit_reloc (in /usr/lib/libdrm_intel.so.1.0.0)
==4320== by 0x9A97B9C: drm_intel_gem_bo_emit_reloc (in /usr/lib/libdrm_intel.so.1.0.0)
==4320== by 0xAED3234: intel_batchbuffer_emit_reloc (in /usr/lib/xorg/modules/dri/i965_dri.so)
==4320== by 0xAF13827: brw_emit_vertices (in /usr/lib/xorg/modules/dri/i965_dri.so)
==4320== by 0xAF1F14D: brw_upload_state (in /usr/lib/xorg/modules/dri/i965_dri.so)
==4320== by 0xAF12122: brw_draw_prims (in /usr/lib/xorg/modules/dri/i965_dri.so)
==4320== by 0xB256824: vbo_exec_vtx_flush (in /usr/lib/xorg/modules/dri/libdricore.so)
==4320== by 0xB2523BB: vbo_exec_FlushVertices_internal (in /usr/lib/xorg/modules/dri/libdricore.so)
==4320== by 0xB252411: vbo_exec_FlushVertices (in /usr/lib/xorg/modules/dri/libdricore.so)
==4320== by 0xB195A3D: _mesa_PopAttrib (in /usr/lib/xorg/modules/dri/libdricore.so)
==4320== by 0x8DF0F02: __glXDisp_Render (in /usr/lib/xorg/modules/extensions/libglx.xorg)
==4320== by 0x8DF517F: __glXDispatch (in /usr/lib/xorg/modules/extensions/libglx.xorg)
==4320== Address 0x126a8b80 is 0 bytes after a block of size 16,368 alloc'd
==4320== at 0x4C23E03: malloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
==4320== by 0x9A97A64: do_bo_emit_reloc (in /usr/lib/libdrm_intel.so.1.0.0)
==4320== by 0x9A97B9C: drm_intel_gem_bo_emit_reloc (in /usr/lib/libdrm_intel.so.1.0.0)
==4320== by 0xAED3234: intel_batchbuffer_emit_reloc (in /usr/lib/xorg/modules/dri/i965_dri.so)
==4320== by 0xAF191DB: upload_binding_table_pointers (in /usr/lib/xorg/modules/dri/i965_dri.so)
==4320== by 0xAF1F14D: brw_upload_state (in /usr/lib/xorg/modules/dri/i965_dri.so)
==4320== by 0xAF12122: brw_draw_prims (in /usr/lib/xorg/modules/dri/i965_dri.so)
==4320== by 0xB255EF6: vbo_exec_DrawArrays (in /usr/lib/xorg/modules/dri/libdricore.so)
==4320== by 0x8DF67A3: __glXDisp_DrawArrays (in /usr/lib/xorg/modules/extensions/libglx.xorg)
==4320== by 0x8DF0F02: __glXDisp_Render (in /usr/lib/xorg/modules/extensions/libglx.xorg)
==4320== by 0x8DF517F: __glXDispatch (in /usr/lib/xorg/modules/extensions/libglx.xorg)
==4320== by 0x446293: ??? (in /usr/bin/Xorg)
which is simply due to only allocating space for the pointers and not
the structs themselves. D'oh.
Reported-by: Thomas Bächler <thomas@archlinux.org>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
diff --git a/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c
index 8e46e37..a2cf6e6 100644
--- a/intel/intel_bufmgr_gem.c
+++ b/intel/intel_bufmgr_gem.c
@@ -470,7 +470,7 @@ drm_intel_setup_reloc_list(drm_intel_bo *bo)
bo_gem->relocs = malloc(max_relocs *
sizeof(struct drm_i915_gem_relocation_entry));
bo_gem->reloc_target_info = malloc(max_relocs *
- sizeof(drm_intel_reloc_target *));
+ sizeof(drm_intel_reloc_target));
if (bo_gem->relocs == NULL || bo_gem->reloc_target_info == NULL) {
bo_gem->has_error = 1;
--
cgit v0.8.3-6-g21f6
This diff is collapsed.
From 88e8a8bbaf026aa10225880001ab7ca1c392168a Mon Sep 17 00:00:00 2001
From: Ben Skeggs <bskeggs@redhat.com>
Date: Tue, 16 Feb 2010 05:42:00 +0000
Subject: nouveau: bump MAX_PUSH to 512
---
diff --git a/include/drm/nouveau_drm.h b/include/drm/nouveau_drm.h
index af13e46..a6a9f4a 100644
--- a/include/drm/nouveau_drm.h
+++ b/include/drm/nouveau_drm.h
@@ -140,7 +140,7 @@ struct drm_nouveau_gem_pushbuf_reloc {
uint32_t tor;
};
-#define NOUVEAU_GEM_MAX_PUSH 64
+#define NOUVEAU_GEM_MAX_PUSH 512
struct drm_nouveau_gem_pushbuf_push {
uint32_t bo_index;
uint32_t pad;
--
cgit v0.8.3-6-g21f6
This diff is collapsed.
# This is an example PKGBUILD file. Use this as a start to creating your own,
# and remove these comments. For more information, see 'man PKGBUILD'.
# NOTE: Please fill out the license field for your package! If it is unknown,
# then please put 'unknown'.
# Contributor: Your Name <youremail@domain.com>
pkgname=libva-sds
_pkgname=libva
_pkgver_sds=13
_pkgver_libva=0.31.0
_pkgver_libva_minor=1
pkgver=${_pkgver_libva}_${_pkgver_libva_minor}_${_pkgver_sds}
pkgrel=1
pkgdesc="libva with patches to extend VA API with data needed for VDPAU and XvBA backends."
arch=('i686' 'x86_64')
url="http://www.splitted-desktop.com/~gbeauchesne/libva/"
license=('MIT')
groups=()
depends=()
makedepends=()
optdepends=()
provides=(libva=${_pkgver_libva})
conflicts=(libva)
replaces=(libva)
backup=()
options=()
install=
source=(http://www.splitted-desktop.com/~gbeauchesne/$_pkgname/${_pkgname}_$_pkgver_libva-$_pkgver_libva_minor+sds$_pkgver_sds.tar.gz)
noextract=()
md5sums=('0e3d5a49d336cf77e497dfa741d592a2')
build() {
cd "$srcdir/$_pkgname-$_pkgver_libva"
for p in debian/patches/*.patch; do patch -p1 < $p || return 1; done
autoreconf --install -v || return 1
./configure --prefix=/usr --disable-i965-driver --disable-dummy-driver
make || return 1
make DESTDIR="$pkgdir/" install
}
# vim:set ts=2 sw=2 et:
# $Id: PKGBUILD 86906 2010-08-06 21:29:25Z ibiru $
# Maintainer : Ionut Biru <ibiru@archlinux.org>
pkgname=libva
pkgver=1.0.4
pkgrel=1
pkgdesc="libva with patches to extend VA API with data needed for VDPAU and XvBA backends."
arch=('i686' 'x86_64')
url="http://freedesktop.org/wiki/Software/vaapi"
license=('MIT')
depends=('libgl' 'libdrm' 'libxfixes')
makedepends=('mesa')
optdepends=('vdpau-video: VDPAU backend for VA API')
options=('!libtool')
source=(http://cgit.freedesktop.org/libva/snapshot/${pkgname}-${pkgver}.tar.bz2)
md5sums=('3a16a9339dcc3c27234ba9f28fb38a63')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
autoreconf -fi
./configure --prefix=/usr \
--enable-i965-driver \
--enable-glx
make
}
package() {
cd ${srcdir}/${pkgname}-${pkgver}
make DESTDIR="${pkgdir}" install
install -m644 -D COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
}
# vim:set ts=2 sw=2 et:
# $Id: PKGBUILD 66498 2010-01-31 11:21:02Z jgc $
# Maintainer: Jan de Groot <jgc@archlinux.org>
#
# Platform Packages for Chakra, part of chakra-project.org
#
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
# include global config
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgname=libx11
pkgver=1.3.3
pkgver=1.3.5
pkgrel=1
pkgdesc="X11 client-side library"
arch=(i686 x86_64)
......@@ -13,7 +19,7 @@ options=('!libtool')
license=('custom:XFREE86')
source=(${url}/releases/individual/lib/libX11-${pkgver}.tar.bz2
xorg.sh)
sha1sums=('2a19724ccf78b5bb5a8eba9159d2b95e640e7b11'
sha1sums=('c5dda2b6279f3e3267646576138fcd091a7f3c54'
'b59214fe7d1d213f86b074a677eb624e52142ad7')
build() {
......
# $Id: PKGBUILD 55255 2009-10-12 16:08:54Z andyrtr $
# Maintainer: Jan de Groot <jgc@archlinux.org>
#
# Platform Packages for Chakra, part of chakra-project.org
#
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
# include global config
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgname=libxcomposite
pkgver=0.4.1
pkgver=0.4.2
pkgrel=1
pkgdesc="X11 Composite extension library"
arch=(i686 x86_64)
......@@ -12,7 +18,7 @@ depends=('libxfixes' 'libxext' 'compositeproto')
makedepends=('pkgconfig')
options=(!libtool)
source=(${url}/releases/individual/lib/libXcomposite-${pkgver}.tar.bz2)
md5sums=('0f1367f57fdf5df17a8dd71d0fa68248')
md5sums=('e38dc98509149083f6c31b49b484e63c')
build() {
cd ${srcdir}/libXcomposite-${pkgver}
......
# $Id: PKGBUILD 54656 2009-10-11 16:32:30Z andyrtr $
# Maintainer: Jan de Groot <jgc@archlinux.org>
#
# Platform Packages for Chakra, part of chakra-project.org
#
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
# include global config
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgname=libxdamage
pkgver=1.1.2
pkgver=1.1.3
pkgrel=1
pkgdesc="X11 damaged region extension library"
arch=(i686 x86_64)
......@@ -12,7 +18,7 @@ depends=('libxfixes>=4.0.4' 'damageproto>=1.2.0')
makedepends=('pkgconfig')
options=('!libtool')
source=(${url}/releases/individual/lib/libXdamage-${pkgver}.tar.bz2)
md5sums=('b42780bce703ec202a33e5693991c09d')
md5sums=('44774e1a065158b52f1a0da5100cebec')
build() {
cd ${srcdir}/libXdamage-${pkgver}
......
# $Id: PKGBUILD 56499 2009-10-22 04:41:08Z andyrtr $
# Maintainer: Jan de Groot <jgc@archlinux.org>
#
# Platform Packages for Chakra, part of chakra-project.org
#
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
# include global config
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgname=libxext
pkgver=1.1.1
pkgver=1.1.2
pkgrel=1
pkgdesc="X11 miscellaneous extensions library"
arch=(i686 x86_64)
......@@ -12,7 +18,7 @@ depends=('libx11>=1.3' 'xextproto>=7.1.1')
makedepends=('pkgconfig')
options=('!libtool')
source=(${url}/releases/individual/lib/libXext-${pkgver}.tar.bz2)
md5sums=('c417c0e8df39a067f90a2a2e7133637d')
md5sums=('9e51f9cb7e0a38c7099ac1c0de1a1add')
build() {
cd "${srcdir}/libXext-${pkgver}"
......
# $Id: PKGBUILD 54651 2009-10-11 16:27:24Z andyrtr $
#Maintainer: Jan de Groot <jgc@archlinux.org>
#
# Platform Packages for Chakra, part of chakra-project.org
#
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
# include global config
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgname=libxfixes
pkgver=4.0.4
pkgver=4.0.5
pkgrel=1
pkgdesc="X11 miscellaneous 'fixes' extension library"
arch=('i686' 'x86_64')
......@@ -12,7 +18,7 @@ depends=('libx11>=1.3' 'fixesproto>=4.1.1')
makedepends=('pkgconfig')
options=('!libtool')
source=(${url}/releases/individual/lib/libXfixes-${pkgver}.tar.bz2)
md5sums=('7f2c40852eb337b237ad944ca5c30d49')
md5sums=('1b4b8386bd5d1751b2c7177223ad4629')
build() {
cd ${srcdir}/libXfixes-${pkgver}
......
# $Id: PKGBUILD 55294 2009-10-12 16:49:40Z andyrtr $
# Maintainer: Jan de Groot <jgc@archlinux.org>
#
# Platform Packages for Chakra, part of chakra-project.org
#
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
# include global config
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgname=libxrender
pkgver=0.9.5
pkgver=0.9.6
pkgrel=1
pkgdesc="X Rendering Extension client library"
arch=(i686 x86_64)
......@@ -12,7 +18,7 @@ depends=('libx11' 'renderproto')
makedepends=('pkgconfig')
options=('!libtool')
source=(${url}/releases/individual/lib/libXrender-${pkgver}.tar.bz2)
md5sums=('276dd9e85daf0680616cd9f132b354c9')
md5sums=('3b3b7d076c2384b6c600c0b5f4ba971f')
build() {
cd ${srcdir}/libXrender-${pkgver}
......
This diff is collapsed.
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
commit 532d2051245a1d8afe7ca236f1d966d555bb121a
Author: Dave Airlie <airlied@linux.ie>
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 -up mesa-20091221/src/mesa/drivers/dri/Makefile.da mesa-20091221/src/mesa/drivers/dri/Makefile
--- mesa-20091221/src/mesa/drivers/dri/Makefile.da 2009-12-21 08:09:11.000000000 +1000
+++ mesa-20091221/src/mesa/drivers/dri/Makefile 2009-12-21 08:43:03.000000000 +1000
@@ -6,12 +6,17 @@ include $(TOP)/configs/current
-default: $(TOP)/$(LIB_DIR) subdirs dri.pc
+default: $(TOP)/$(LIB_DIR) $(TOP)/$(LIB_DIR)/libdricore.so subdirs dri.pc
$(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 \
@@ -32,12 +37,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
@@ -51,5 +58,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-20091221/src/mesa/drivers/dri/Makefile.template.da mesa-20091221/src/mesa/drivers/dri/Makefile.template
--- mesa-20091221/src/mesa/drivers/dri/Makefile.template.da 2009-12-21 08:09:11.000000000 +1000
+++ mesa-20091221/src/mesa/drivers/dri/Makefile.template 2009-12-21 08:43:40.000000000 +1000
@@ -1,6 +1,6 @@
# -*-makefile-*-
-MESA_MODULES = $(TOP)/src/mesa/libmesa.a
+MESA_MODULES = $(TOP)/$(LIB_DIR)/libdricore.so
COMMON_GALLIUM_SOURCES = \
../common/utils.c \
@@ -70,7 +70,8 @@ lib: symlinks subdirs depend
$(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(EXTRA_MODULES) $(WINOBJ) Makefile \
$(TOP)/src/mesa/drivers/dri/Makefile.template
$(MKLIB) -o $@ -noprefix -linker '$(CC)' -ldflags '$(LDFLAGS)' \
- $(OBJECTS) $(MESA_MODULES) $(EXTRA_MODULES) $(WINOBJ) \
+ $(OBJECTS) $(EXTRA_MODULES) $(WINOBJ) \
+ -L$(TOP)/$(LIB_DIR) -Wl,-R$(DRI_DRIVER_INSTALL_DIR) -ldricore \
$(DRI_LIB_DEPS)
diff -up mesa-20091221/src/mesa/x86/read_rgba_span_x86.S.da mesa-20091221/src/mesa/x86/read_rgba_span_x86.S
--- mesa-20091221/src/mesa/x86/read_rgba_span_x86.S.da 2009-12-21 08:09:11.000000000 +1000
+++ mesa-20091221/src/mesa/x86/read_rgba_span_x86.S 2009-12-21 08:43:03.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:
This diff is collapsed.
This diff is collapsed.
......@@ -11,7 +11,7 @@ pkgbase=vlc
pkgname=('vlc'
'vlc-plugin')
pkgver=1.1.4
pkgrel=1
pkgrel=2
arch=('i686' 'x86_64')
url="http://www.videolan.org/vlc/"
license=('GPL')
......
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