Commit 7b43fca2 authored by Mateusz's avatar Mateusz

lib32-mesa updated, nouveau removed(bug https://bugs.freedesktop.org/show_bug.cgi?id=50280)

parent 8a7f6dfc
......@@ -4,45 +4,48 @@
# maintainer (x86_64): Anke Boersma <abveritas[at]chakra-project[dot]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-svga-dri')
pkgver=7.10.2
pkgver=8.0.3
pkgrel=2
arch=(x86_64)
makedepends=('glproto>=1.4.12' 'pkgconfig' 'lib32-libdrm>=2.4.23' 'lib32-libxxf86vm>=1.1.0' 'lib32-libxdamage>=1.1.3' 'lib32-expat>=2.0.1' 'lib32-libx11>=1.3.5' 'lib32-libxt>=1.0.8' 'lib32-gcc-libs>=4.5' 'dri2proto=2.3' 'python2' 'libxml2' 'gcc-multilib' imake 'lib32-udev')
makedepends=('glproto>=1.4.12' 'pkgconfig' 'lib32-libdrm>=2.4.37' 'lib32-libxxf86vm>=1.1.0' 'lib32-libxdamage>=1.1.3' 'lib32-expat>=2.0.1' 'lib32-libx11>=1.3.5' 'lib32-libxt>=1.0.8' 'lib32-gcc-libs>=4.5' 'lib32-llvm>=3.0' 'dri2proto>=2.6' 'python2' 'libxml2' 'gcc-multilib' imake 'lib32-udev')
url="http://mesa3d.sourceforge.net"
license=('custom')
source=("ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2"
nouveau-fix-header.patch)
md5sums=('f5de82852f1243f42cc004039e10b771'
'67c87b77cc2236b52a3b47dad3fbb5d4')
'mesa-8.0.3-llvm-3.1-fixes.patch')
md5sums=('cc5ee15e306b8c15da6a478923797171'
'0082f4d17674155aa13bc611a5687788')
build() {
export CC="gcc -m32"
export CXX="g++ -m32"
export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
# for our llvm-config for 32 bit
export LLVM_CONFIG=/usr/bin/llvm-config32
cd "${srcdir}/Mesa-${pkgver}"
patch -Np1 -i "${srcdir}/nouveau-fix-header.patch"
patch -Np1 -i "${srcdir}/mesa-8.0.3-llvm-3.1-fixes.patch"
./configure --prefix=/usr \
autoreconf -vfi
./autogen.sh --prefix=/usr \
--with-dri-driverdir=/usr/lib32/xorg/modules/dri \
--enable-gallium-radeon \
--enable-gallium-r600 \
--enable-gallium-nouveau \
--enable-gallium-swrast \
--enable-glx-tls \
--with-driver=dri \
--enable-xcb \
--with-state-trackers=dri,glx \
--disable-glut \
--enable-gles1 \
--enable-gles2 \
--enable-egl \
--disable-gallium-egl \
--with-gallium-drivers=r300,r600,svga,swrast, \
--with-dri-drivers=i915,i965,r200,radeon,swrast \
--enable-gallium-llvm \
--enable-gallium-egl \
--enable-shared-glapi\
--enable-glx-tls \
--enable-dri \
--enable-glx \
--enable-gles1 \
--enable-gles2 \
--enable-egl \
--enable-texture-float \
--enable-shared-dricore \
--enable-32-bit \
--libdir=/usr/lib32
......@@ -50,7 +53,7 @@ build() {
}
package_lib32-libgl() {
depends=('lib32-libdrm>=2.4.23' 'lib32-libxxf86vm>=1.1.0' 'lib32-libxdamage>=1.1.3' 'lib32-expat>=2.0.1' 'lib32-gcc-libs>=4.5' 'libgl')
depends=('lib32-libdrm>=2.4.33' 'lib32-libxxf86vm>=1.1.0' 'lib32-libxdamage>=1.1.3' 'lib32-expat>=2.0.1' 'lib32-gcc-libs>=4.5' 'libgl')
pkgdesc="Mesa 3-D graphics library and DRI software rasterizer (32-bit)"
cd "${srcdir}/Mesa-${pkgver}"
......@@ -61,7 +64,6 @@ package_lib32-libgl() {
bin/minstall lib32/libGL.so* "${pkgdir}/usr/lib32/"
make -C ${srcdir}/Mesa-${pkgver}/src/gallium/targets/dri-swrast DESTDIR="${pkgdir}" install
ln -s swrastg_dri.so "${pkgdir}/usr/lib32/xorg/modules/dri/swrast_dri.so"
ln -s libglx.xorg "${pkgdir}/usr/lib32/xorg/modules/extensions/libglx.so"
rm -rf "${pkgdir}"/usr/{include,share,bin}
......@@ -69,6 +71,18 @@ package_lib32-libgl() {
ln -s libgl "$pkgdir/usr/share/licenses/libgl/lib32-libgl"
}
package_lib32-libglapi() {
depends=('glibc')
pkgdesc="free implementation of the GL API -- shared library. The Mesa GL API module is responsible for dispatching all the gl* functions"
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')
pkgdesc="Mesa GLES libraries (32-bit)"
......@@ -127,105 +141,25 @@ package_lib32-ati-dri() {
pkgdesc="Mesa DRI + Gallium3D for r300 and later chipsets drivers for AMD/ATI Radeon (32-bit)"
conflicts=('xf86-video-ati<6.9.0-6')
cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
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}/Mesa-${pkgver}/src/gallium/targets/dri-r300 DESTDIR="${pkgdir}" install
make -C ${srcdir}/Mesa-${pkgver}/src/gallium/targets/dri-r600 DESTDIR="${pkgdir}" install
make -C ${srcdir}/?esa-*/src/gallium/targets/dri-r300 DESTDIR="${pkgdir}" install
make -C ${srcdir}/?esa-*/src/gallium/targets/dri-r600 DESTDIR="${pkgdir}" install
}
package_lib32-intel-dri() {
depends=("lib32-libgl=${pkgver}")
pkgdesc="Mesa DRI drivers for Intel (32-bit)"
cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
make -C i810 DESTDIR="${pkgdir}" install
make -C i915 DESTDIR="${pkgdir}" install
make -C 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}/Mesa-${pkgver}/src/mesa/drivers/dri"
make -C unichrome DESTDIR="${pkgdir}" install
}
package_lib32-mach64-dri() {
depends=("lib32-libgl=${pkgver}")
pkgdesc="Mesa DRI drivers for ATI Mach64 (32-bit)"
conflicts=('xf86-video-mach64<6.8.2')
cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
make -C mach64 DESTDIR="${pkgdir}" install
}
package_lib32-mga-dri() {
depends=("lib32-libgl=${pkgver}")
pkgdesc="Mesa DRI drivers for Matrox (32-bit)"
conflicts=('xf86-video-mga<1.4.11')
cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
make -C mga 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-svga-dri() {
depends=("mesa=${pkgver}")
pkgdesc="Gallium3D VMware guest GL driver"
package_lib32-r128-dri() {
depends=("lib32-libgl=${pkgver}")
pkgdesc="Mesa DRI drivers for ATI Rage128 (32-bit)"
conflicts=('xf86-video-r128<6.8.1')
cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
make -C r128 DESTDIR="${pkgdir}" install
}
package_lib32-savage-dri() {
depends=("lib32-libgl=${pkgver}")
pkgdesc="Mesa DRI drivers for S3 Sraphics/VIA Savage (32-bit)"
conflicts=('xf86-video-savage<2.3.1')
cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
make -C savage DESTDIR="${pkgdir}" install
}
package_lib32-sis-dri() {
depends=("lib32-libgl=${pkgver}")
pkgdesc="Mesa DRI drivers for SiS (32-bit)"
conflicts=('xf86-video-sis<0.10.2')
cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
make -C sis DESTDIR="${pkgdir}" install
}
package_lib32-tdfx-dri() {
depends=("lib32-libgl=${pkgver}")
pkgdesc="Mesa DRI drivers for 3dfx (32-bit)"
conflicts=('xf86-video-tdfx<1.4.3')
cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
make -C tdfx DESTDIR="${pkgdir}" install
}
package_lib32-nouveau-dri() {
depends=("lib32-libgl=${pkgver}")
pkgdesc="Mesa classic DRI + Gallium3D drivers for Nouveau (32-bit)"
cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
# classic mesa driver for nv10 , nv20 nouveau_vieux_dri.so
make -C nouveau DESTDIR="${pkgdir}" install
# gallium3D driver for nv30 - nv40 - nv50 nouveau_dri.so
make -C ${srcdir}/Mesa-${pkgver}/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install
}
make -C ${srcdir}/?esa-*/src/gallium/targets/dri-vmwgfx DESTDIR="${pkgdir}" install
}
\ No newline at end of file
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
index a50a51d..f1bb4d9 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
+++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
@@ -235,7 +235,24 @@ lp_disassemble(const void* func)
int AsmPrinterVariant = AsmInfo->getAssemblerDialect();
#endif
-#if HAVE_LLVM >= 0x0300
+#if HAVE_LLVM >= 0x0301
+ OwningPtr<const MCRegisterInfo> MRI(T->createMCRegInfo(Triple));
+ if (!MRI) {
+ debug_printf("error: no register info for target %s\n", Triple.c_str());
+ return;
+ }
+
+ OwningPtr<const MCInstrInfo> MII(T->createMCInstrInfo());
+ if (!MII) {
+ debug_printf("error: no instruction info for target %s\n", Triple.c_str());
+ return;
+ }
+#endif
+
+#if HAVE_LLVM >= 0x0301
+ OwningPtr<MCInstPrinter> Printer(
+ T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *MII, *MRI, *STI));
+#elif HAVE_LLVM == 0x0300
OwningPtr<MCInstPrinter> Printer(
T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *STI));
#elif HAVE_LLVM >= 0x0208
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
index fe7616b..68f8808 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
+++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
@@ -62,7 +62,11 @@
extern "C" void
lp_register_oprofile_jit_event_listener(LLVMExecutionEngineRef EE)
{
+#if HAVE_LLVM >= 0x0301
+ llvm::unwrap(EE)->RegisterJITEventListener(llvm::JITEventListener::createOProfileJITEventListener());
+#else
llvm::unwrap(EE)->RegisterJITEventListener(llvm::createOProfileJITEventListener());
+#endif
}
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