Skip to content
Snippets Groups Projects
Commit d043f58d authored by Laurent Carlier's avatar Laurent Carlier
Browse files

Sync with testing

parent 31e4f565
No related branches found
No related tags found
No related merge requests found
......@@ -2,8 +2,8 @@
# Contributor: Andreas Radke <andyrtr@archlinux.org>
pkgbase=lib32-mesa
pkgname=('lib32-mesa' 'lib32-libgl' 'lib32-libgles' 'lib32-libegl' 'lib32-ati-dri' 'lib32-intel-dri' 'lib32-unichrome-dri' 'lib32-mach64-dri' 'lib32-mga-dri' 'lib32-r128-dri' 'lib32-savage-dri'
'lib32-sis-dri' 'lib32-tdfx-dri' 'lib32-nouveau-dri')
pkgname=('lib32-mesa' 'lib32-libgl' 'lib32-libglapi' 'lib32-libgles' 'lib32-libegl' 'lib32-ati-dri' 'lib32-intel-dri' 'lib32-unichrome-dri' 'lib32-mach64-dri' 'lib32-mga-dri'
'lib32-r128-dri' 'lib32-savage-dri' 'lib32-sis-dri' 'lib32-tdfx-dri' 'lib32-nouveau-dri')
_git=true
#_git=false
......@@ -15,7 +15,7 @@ if [ "${_git}" = "true" ]; then
pkgver=7.11rc1
fi
pkgrel=2
pkgrel=3
arch=(x86_64)
makedepends=('glproto>=1.4.14' 'lib32-libdrm>=2.4.26' 'lib32-libxxf86vm>=1.1.1' 'lib32-libxdamage>=1.1.3' 'lib32-expat>=2.0.1' 'lib32-libx11>=1.4.3' 'lib32-libxt>=1.1.1'
'lib32-gcc-libs>=4.6.1' 'dri2proto>=2.6' 'python2' 'libxml2' 'gcc-multilib' imake 'lib32-udev' 'lib32-llvm')
......@@ -24,8 +24,8 @@ license=('custom')
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=('ftp://ftp.archlinux.org/other/mesa/mesa-1ae00c5960af83bea9545a18a1754bad83d5cbd0.tar.bz2')
source=(git_fixes.patch "MesaLib-${pkgver}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-b033f050fd5179b051181a0a4b6d94110624d25c.tar.bz2")
md5sums=('62b7e9591737846ff0e98f970ffc8b78' '2246d97eb0cfb1f6d2bf8a54b533d07f')
source=(linking_fix.patch "MesaLib-${pkgver}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-ef9f16f6322a89fb699fbe3da868b10f9acaef98.tar.bz2")
md5sums=('887be83c01d126c2a4cb372af7d3b067' '817a63bb60b81f4f817ffc9ed0a3dddd')
else
source=("ftp://ftp.freedesktop.org/pub/mesa/${pkgver/rc1/}/MesaLib-${pkgver/rc/-rc}.zip")
md5sums=('2246d97eb0cfb1f6d2bf8a54b533d07f')
......@@ -45,7 +45,7 @@ build() {
autoreconf -vfi
if [ "${_git}" = "true" ]; then
patch -Np1 -i ${srcdir}/git_fixes.patch
patch -Np1 -i ${srcdir}/linking_fix.patch
./autogen.sh --prefix=/usr \
--with-dri-driverdir=/usr/lib32/xorg/modules/dri \
--with-gallium-drivers=r300,r600,nouveau,swrast \
......@@ -63,7 +63,6 @@ build() {
--enable-32-bit \
--libdir=/usr/lib32
# --enable-gallium-svga \
# --enable-shared-glapi EXPERIMENTAL. Enable shared glapi for OpenGL[default=no]
else
./configure --prefix=/usr \
--with-dri-driverdir=/usr/lib32/xorg/modules/dri \
......@@ -87,7 +86,7 @@ build() {
}
package_lib32-libgl() {
depends=('lib32-libdrm>=2.4.26' 'lib32-libxxf86vm>=1.1.1' 'lib32-libxdamage>=1.1.3' 'lib32-expat>=2.0.1' 'libgl')
depends=('lib32-libdrm>=2.4.26' 'lib32-libxxf86vm>=1.1.1' 'lib32-libxdamage>=1.1.3' 'lib32-expat>=2.0.1' 'lib32-libglapi' 'libgl')
pkgdesc="Mesa 3-D graphics library and DRI software rasterizer (32-bit)"
cd ${srcdir}/?esa-*
......@@ -107,8 +106,20 @@ package_lib32-libgl() {
ln -s libgl "$pkgdir/usr/share/licenses/libgl/lib32-libgl"
}
package_lib32-libglapi() {
depends=('lib32-glibc' 'libglapi')
pkgdesc="free implementation of the GL API -- shared library. The Mesa GL API module is responsible for dispatching all the gl* functions (32-bits)"
cd ${srcdir}/?esa-*
install -m755 -d "${pkgdir}/usr/lib32"
bin/minstall lib32/libglapi.so* "${pkgdir}/usr/lib32/"
install -m755 -d "${pkgdir}/usr/share/licenses/libglapi"
ln -s libglapi "${pkgdir}/usr/share/licenses/libglapi/lib32-libglapi"
}
package_lib32-libgles() {
depends=('libgles')
depends=('lib32-libglapi' 'libgles')
pkgdesc="Mesa GLES libraries (32-bit)"
cd ${srcdir}/?esa-*
......@@ -123,7 +134,7 @@ package_lib32-libgles() {
}
package_lib32-libegl() {
depends=('lib32-udev' 'libegl')
depends=('lib32-libglapi' 'lib32-libdrm' 'lib32-udev' 'lib32-libxfixes' 'lib32-libxext' 'libegl')
pkgdesc="Mesa libEGL libraries (32-bit)"
cd ${srcdir}/?esa-*
......@@ -141,13 +152,14 @@ package_lib32-libegl() {
}
package_lib32-mesa() {
depends=('lib32-libgl' 'lib32-libx11>=1.4.3' 'lib32-libxt>=1.1.1' 'lib32-libdrm>=2.4.26' 'lib32-gcc-libs>=4.6.1' 'mesa')
depends=('lib32-libgl' 'lib32-libx11>=1.4.3' 'lib32-libxt>=1.1.1' 'lib32-gcc-libs>=4.6.1' 'mesa')
pkgdesc="Mesa 3-D graphics libraries and include files (32-bit)"
cd ${srcdir}/?esa-*
make DESTDIR="${pkgdir}" install
rm -f "${pkgdir}/usr/lib32/libGL.so"*
rm -f "${pkgdir}/usr/lib32/libglapi.so"*
rm -f "${pkgdir}/usr/lib32/libGLESv"*
rm -f "${pkgdir}/usr/lib32/libEGL"*
rm -rf "${pkgdir}/usr/lib32/egl"
......@@ -164,10 +176,9 @@ package_lib32-ati-dri() {
conflicts=('xf86-video-ati<6.9.0-6')
cd ${srcdir}/?esa-*/src/mesa/drivers/dri
# classic mesa drivers for radeon,r200
make -C radeon DESTDIR="${pkgdir}" install
make -C r200 DESTDIR="${pkgdir}" install
# DRI drivers for r300 and r600 are removed
# gallium3D driver for R300 and R600 r300_dri.so/r600_dri.so
make -C ${srcdir}/?esa-*/src/gallium/targets/dri-r300 DESTDIR="${pkgdir}" install
make -C ${srcdir}/?esa-*/src/gallium/targets/dri-r600 DESTDIR="${pkgdir}" install
......@@ -177,18 +188,16 @@ package_lib32-intel-dri() {
depends=("lib32-libgl=${pkgver}")
pkgdesc="Mesa DRI drivers for Intel (32-bit)"
cd ${srcdir}/?esa-*/src/mesa/drivers/dri
make -C i810 DESTDIR="${pkgdir}" install
make -C i915 DESTDIR="${pkgdir}" install
make -C i965 DESTDIR="${pkgdir}" install
make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i810 DESTDIR="${pkgdir}" install
make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i915 DESTDIR="${pkgdir}" install
make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i965 DESTDIR="${pkgdir}" install
}
package_lib32-unichrome-dri() {
depends=("lib32-libgl=${pkgver}")
pkgdesc="Mesa DRI drivers for S3 Graphics/VIA Unichrome (32-bit)"
cd ${srcdir}/?esa-*/src/mesa/drivers/dri
make -C unichrome DESTDIR="${pkgdir}" install
make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/unichrome DESTDIR="${pkgdir}" install
}
package_lib32-mach64-dri() {
......@@ -196,8 +205,7 @@ package_lib32-mach64-dri() {
pkgdesc="Mesa DRI drivers for ATI Mach64 (32-bit)"
conflicts=('xf86-video-mach64<6.8.2')
cd ${srcdir}/?esa-*/src/mesa/drivers/dri
make -C mach64 DESTDIR="${pkgdir}" install
make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/mach64 DESTDIR="${pkgdir}" install
}
package_lib32-mga-dri() {
......@@ -205,8 +213,7 @@ package_lib32-mga-dri() {
pkgdesc="Mesa DRI drivers for Matrox (32-bit)"
conflicts=('xf86-video-mga<1.4.11')
cd ${srcdir}/?esa-*/src/mesa/drivers/dri
make -C mga DESTDIR="${pkgdir}" install
make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/mga DESTDIR="${pkgdir}" install
}
package_lib32-r128-dri() {
......@@ -214,8 +221,7 @@ package_lib32-r128-dri() {
pkgdesc="Mesa DRI drivers for ATI Rage128 (32-bit)"
conflicts=('xf86-video-r128<6.8.1')
cd ${srcdir}/?esa-*/src/mesa/drivers/dri
make -C r128 DESTDIR="${pkgdir}" install
make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/r128 DESTDIR="${pkgdir}" install
}
package_lib32-savage-dri() {
......@@ -223,8 +229,7 @@ package_lib32-savage-dri() {
pkgdesc="Mesa DRI drivers for S3 Sraphics/VIA Savage (32-bit)"
conflicts=('xf86-video-savage<2.3.1')
cd ${srcdir}/?esa-*/src/mesa/drivers/dri
make -C savage DESTDIR="${pkgdir}" install
make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/savage DESTDIR="${pkgdir}" install
}
package_lib32-sis-dri() {
......@@ -232,8 +237,7 @@ package_lib32-sis-dri() {
pkgdesc="Mesa DRI drivers for SiS (32-bit)"
conflicts=('xf86-video-sis<0.10.2')
cd ${srcdir}/?esa-*/src/mesa/drivers/dri
make -C sis DESTDIR="${pkgdir}" install
make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/sis DESTDIR="${pkgdir}" install
}
package_lib32-tdfx-dri() {
......@@ -241,17 +245,15 @@ package_lib32-tdfx-dri() {
pkgdesc="Mesa DRI drivers for 3dfx (32-bit)"
conflicts=('xf86-video-tdfx<1.4.3')
cd ${srcdir}/?esa-*/src/mesa/drivers/dri
make -C tdfx DESTDIR="${pkgdir}" install
make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/tdfx DESTDIR="${pkgdir}" install
}
package_lib32-nouveau-dri() {
depends=("lib32-libgl=${pkgver}")
pkgdesc="Mesa classic DRI + Gallium3D drivers for Nouveau (32-bit)"
cd ${srcdir}/?esa-*/src/mesa/drivers/dri
# classic mesa driver for nv10 , nv20 nouveau_vieux_dri.so
make -C nouveau DESTDIR="${pkgdir}" install
make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/nouveau DESTDIR="${pkgdir}" install
# gallium3D driver for nv30 - nv40 - nv50 nouveau_dri.so
make -C ${srcdir}/?esa-*/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install
}
......
From 5fe5d236c26b3b2428bc7395304e40cf21d3d3e1 Mon Sep 17 00:00:00 2001
From: Chia-I Wu <olv@lunarg.com>
Date: Wed, 13 Jul 2011 07:25:46 +0000
Subject: targets/egl-static: fix a linking error
rbug is always linked in and it needs libpthread.
---
diff --git a/src/gallium/targets/egl-static/Makefile b/src/gallium/targets/egl-static/Makefile
index 832d7ba..69e7eec 100644
--- a/src/gallium/targets/egl-static/Makefile
+++ b/src/gallium/targets/egl-static/Makefile
@@ -42,7 +42,7 @@ egl_CPPFLAGS += \
-I$(TOP)/src/egl/main \
-D_EGL_MAIN=_eglMain
egl_LIBS += $(TOP)/src/gallium/state_trackers/egl/libegl.a
-egl_SYS += $(LIBUDEV_LIBS) $(DLOPEN_LIBS) -lEGL -lm
+egl_SYS += $(LIBUDEV_LIBS) $(DLOPEN_LIBS) -lEGL -lm -lpthread
# EGL platforms
ifneq ($(findstring x11, $(EGL_PLATFORMS)),)
--
cgit v0.8.3-6-g21f6
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment