summaryrefslogtreecommitdiff
path: root/multilib/lib32-mesa
diff options
context:
space:
mode:
Diffstat (limited to 'multilib/lib32-mesa')
-rw-r--r--multilib/lib32-mesa/PKGBUILD257
-rw-r--r--multilib/lib32-mesa/git_fixes.diff93
-rw-r--r--multilib/lib32-mesa/mesa-8.0.3-llvm-3.1-fixes.patch44
3 files changed, 0 insertions, 394 deletions
diff --git a/multilib/lib32-mesa/PKGBUILD b/multilib/lib32-mesa/PKGBUILD
deleted file mode 100644
index 284026eef..000000000
--- a/multilib/lib32-mesa/PKGBUILD
+++ /dev/null
@@ -1,257 +0,0 @@
-# $Id: PKGBUILD 77676 2012-10-13 12:39:51Z bluewind $
-# Contributor: Jan de Groot <jgc@archlinux.org>
-# Contributor: Andreas Radke <andyrtr@archlinux.org>
-
-pkgbase=lib32-mesa
-pkgname=('lib32-libglapi' 'lib32-libgl' 'lib32-mesa' 'lib32-osmesa' 'lib32-libgles' 'lib32-ati-dri' 'lib32-intel-dri'
- 'lib32-nouveau-dri') # lib32-libgbm needs udev
-#_git=true
-#_gitdate=20121005
-_git=false
-
-if [ "${_git}" = "true" ]; then
- pkgver=8.99.git_$_gitdate
- else
- pkgver=9.0
-fi
-
-pkgrel=1
-arch=('x86_64')
-makedepends=('glproto>=1.4.16' 'lib32-libdrm>=2.4.39' 'lib32-libxxf86vm>=1.1.2' 'lib32-libxdamage>=1.1.3' 'lib32-expat>=2.1.0'
- 'lib32-libx11>=1.5.0' 'lib32-libxt>=1.1.3' 'lib32-gcc-libs>=4.7.1-6' 'dri2proto>=2.8' 'python2' 'libxml2'
- 'gcc-multilib' 'imake' 'lib32-llvm')
-url="http://mesa3d.sourceforge.net"
-license=('custom')
-options=('!libtool')
-source=(git_fixes.diff)
-if [ "${_git}" = "true" ]; then
- # mesa git shot from 9.0 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/log/?h=9.0
- #source=(${source[@]} 'ftp://ftp.archlinux.org/other/mesa/mesa-41d14eaf193c6b1eb87fe1998808a887f1c6c698.tar.gz')
- source=(${source[@]} "MesaLib-git${_gitdate}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-542f6feda9bf18267dbd337943a5e871400d425a.tar.gz")
-else
- source=(${source[@]} "ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2")
-fi
-md5sums=('2ebce12196dbb7b69bdf7ef53b8afdee'
- '60e557ce407be3732711da484ab3db6c')
-
-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
-
- # fix segfault with gfx cards > Ati R700
- export CFLAGS="${CFLAGS} -O1"
- export CXXFLAGS="${CXXFLAGS} -O1"
-
- cd ${srcdir}/?esa-*
-
- # build fix from master http://cgit.freedesktop.org/mesa/mesa/commit/?id=dd4fde8f674f5e3efa19e929f97de4ecfd82391b
- patch -Np1 -i ${srcdir}/git_fixes.diff
-
- COMMONOPTS="--prefix=/usr \
- --sysconfdir=/etc \
- --with-dri-driverdir=/usr/lib32/xorg/modules/dri \
- --with-gallium-drivers=r300,r600,radeonsi,nouveau,swrast \
- --with-dri-drivers=i915,i965,r200,radeon,nouveau,swrast \
- --enable-gallium-llvm \
- --disable-gallium-egl --enable-shared-glapi \
- --enable-shared-glapi \
- --enable-glx-tls \
- --enable-dri \
- --enable-gles1 \
- --enable-gles2 \
- --disable-egl \
- --enable-texture-float \
- --enable-osmesa \
- --enable-32-bit \
- --libdir=/usr/lib32 "
- # --enable-gbm disabled because it needs udev
-
- if [ "${_git}" = "true" ]; then
- ./autogen.sh \
- $COMMONOPTS
- else
- autoreconf -vfi
- ./configure \
- $COMMONOPTS
- fi
-
- make
-}
-
-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-*
-
- make -C src/mapi/shared-glapi DESTDIR="${pkgdir}" install
-
- install -m755 -d "${pkgdir}/usr/share/licenses/libglapi"
- ln -s libglapi "${pkgdir}/usr/share/licenses/libglapi/lib32-libglapi"
-}
-
-package_lib32-libgl() {
- depends=('lib32-libdrm>=2.4.39' 'lib32-libxxf86vm>=1.1.2' 'lib32-libxdamage>=1.1.3' 'lib32-expat>=2.1.0' 'lib32-libglapi'
- 'libgl')
- pkgdesc="Mesa 3-D graphics library and DRI software rasterizer (32-bit)"
- # currently disabled so force the remove
- conflicts=('lib32-libgbm')
- replace=('lib32-libgbm')
-
- cd ${srcdir}/?esa-*
-
- # fix linking because of splitted package
- make -C src/mapi/shared-glapi DESTDIR="${pkgdir}" install
-
- # libGL & libdricore
- make -C src/glx DESTDIR="${pkgdir}" install
- make -C src/mesa/libdricore DESTDIR="${pkgdir}" install
-
- # fix linking because of splitted package - cleanup
- make -C src/mapi/shared-glapi DESTDIR="${pkgdir}" uninstall
-
- # --with-gallium-drivers=swrast
- make -C src/gallium/targets/dri-swrast DESTDIR="${pkgdir}" install
-
- install -m755 -d "${pkgdir}/usr/share/licenses/libgl"
- ln -s libgl "${pkgdir}/usr/share/licenses/libgl/lib32-libgl"
-}
-
-package_lib32-mesa() {
- # check also gl.pc
- depends=('lib32-libgl' 'lib32-libx11>=1.5.0' 'lib32-libxext>=1.3.1' 'lib32-libxdamage' 'lib32-libxfixes' 'lib32-libxcb'
- 'lib32-libxxf86vm' 'mesa')
- pkgdesc="Mesa 3-D graphics libraries and include files (32-bit)"
-
- cd ${srcdir}/?esa-*
-
- # .pc files
- make -C src/mesa DESTDIR="${pkgdir}" install-pkgconfigDATA
- make -C src/mesa/drivers/dri DESTDIR="${pkgdir}" install-pkgconfigDATA
-
- install -m755 -d "${pkgdir}/usr/share/licenses/mesa"
- ln -s mesa "$pkgdir/usr/share/licenses/mesa/lib32-mesa"
-}
-
-package_lib32-osmesa() {
- depends=('lib32-libglapi' 'lib32-gcc-libs' 'osmesa')
- optdepends=('opengl-man-pages: for the OpenGL API man pages')
- pkgdesc="Mesa 3D off-screen rendering library (32-bits)"
-
- # fix linking because of splitted package
- make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" install
-
- make -C ${srcdir}/?esa-*/src/mesa/drivers/osmesa DESTDIR="${pkgdir}" install
-
- # fix linking because of splitted package - cleanup
- make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" uninstall
-}
-
-# package_lib32-libgbm() {
-# depends=('lib32-libglapi' 'lib32-libdrm' 'libgbm')
-# pkgdesc="Mesa gbm library (32-bit)"
-#
-# cd ${srcdir}/?esa-*
-#
-# # fix linking because of splitted package
-# make -C src/mapi/shared-glapi DESTDIR="${pkgdir}" install
-#
-# make -C src/gbm DESTDIR="${pkgdir}" install
-#
-# # fix linking because of splitted package - cleanup
-# make -C src/mapi/shared-glapi DESTDIR="${pkgdir}" uninstall
-#
-# install -m755 -d "${pkgdir}/usr/share/licenses/libgbm"
-# ln -s libgbm "$pkgdir/usr/share/licenses/libgbm/lib32-libgbm"
-# }
-
-package_lib32-libgles() {
- depends=('lib32-libglapi' 'lib32-libdrm' 'libgles')
- pkgdesc="Mesa GLES libraries (32-bit)"
-
- cd ${srcdir}/?esa-*
-
- # fix linking because of splitted package
- make -C src/mapi/shared-glapi DESTDIR="${pkgdir}" install
-
- # --enable-gles1 --enable-gles2
- make -C src/mapi/es1api DESTDIR="${pkgdir}" install
- make -C src/mapi/es2api DESTDIR="${pkgdir}" install
-
- # fix linking because of splitted package - cleanup
- make -C src/mapi/shared-glapi DESTDIR="${pkgdir}" uninstall
-
- rm -r "${pkgdir}"/usr/include
-
- install -m755 -d "${pkgdir}/usr/share/licenses/libgles"
- ln -s libgles "$pkgdir/usr/share/licenses/libgles/lib32-libgles"
-}
-
-package_lib32-ati-dri() {
- depends=("lib32-libgl=${pkgver}" 'ati-dri')
- pkgdesc="Mesa DRI radeon/r200 + Gallium3D for r300 and later chipsets drivers for AMD/ATI Radeon (32-bit)"
- conflicts=('xf86-video-ati<6.9.0-6')
-
- cd ${srcdir}/?esa-*
-
- # fix linking because of splitted package
- make -C src/mesa/libdricore DESTDIR="${pkgdir}" install
-
- # classic mesa drivers for radeon,r200
- make -C src/mesa/drivers/dri/radeon DESTDIR="${pkgdir}" install
- make -C src/mesa/drivers/dri/r200 DESTDIR="${pkgdir}" install
- # gallium3D driver for r300,r600
- make -C src/gallium/targets/dri-r300 DESTDIR="${pkgdir}" install
- make -C src/gallium/targets/dri-r600 DESTDIR="${pkgdir}" install
- make -C src/gallium/targets/dri-radeonsi DESTDIR="${pkgdir}" install
-
- # fix linking because of splitted package - cleanup
- make -C src/mesa/libdricore DESTDIR="${pkgdir}" uninstall
-
- install -m755 -d "${pkgdir}/usr/share/licenses/ati-dri"
- ln -s ati-dri "$pkgdir/usr/share/licenses/ati-dri/lib32-ati-dri"
-}
-
-package_lib32-intel-dri() {
- depends=("lib32-libgl=${pkgver}" 'intel-dri')
- pkgdesc="Mesa DRI drivers for Intel (32-bit)"
-
- cd ${srcdir}/?esa-*
-
- # fix linking because of splitted package
- make -C src/mesa/libdricore DESTDIR="${pkgdir}" install
-
- make -C src/mesa/drivers/dri/i915 DESTDIR="${pkgdir}" install
- make -C src/mesa/drivers/dri/i965 DESTDIR="${pkgdir}" install
-
- # fix linking because of splitted package - cleanup
- make -C src/mesa/libdricore DESTDIR="${pkgdir}" uninstall
-
- install -m755 -d "${pkgdir}/usr/share/licenses/intel-dri"
- ln -s intel-dri "$pkgdir/usr/share/licenses/intel-dri/lib32-intel-dri"
-}
-
-package_lib32-nouveau-dri() {
- depends=("lib32-libgl=${pkgver}" 'nouveau-dri')
- pkgdesc="Mesa classic DRI + Gallium3D drivers for Nouveau (32-bit)"
-
- cd ${srcdir}/?esa-*
-
- # fix linking because of splitted package
- make -C src/mesa/libdricore DESTDIR="${pkgdir}" install
-
- # classic mesa driver for nv10 , nv20 nouveau_vieux_dri.so
- make -C src/mesa/drivers/dri/nouveau DESTDIR="${pkgdir}" install
- # gallium3D driver for nv30 - nv40 - nv50 nouveau_dri.so
- make -C src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install
-
- # fix linking because of splitted package - cleanup
- make -C src/mesa/libdricore DESTDIR="${pkgdir}" uninstall
-
- install -m755 -d "${pkgdir}/usr/share/licenses/nouveau-dri"
- ln -s nouveau-dri "$pkgdir/usr/share/licenses/nouveau-dri/lib32-nouveau-dri"
-}
-
diff --git a/multilib/lib32-mesa/git_fixes.diff b/multilib/lib32-mesa/git_fixes.diff
deleted file mode 100644
index 8132d1d10..000000000
--- a/multilib/lib32-mesa/git_fixes.diff
+++ /dev/null
@@ -1,93 +0,0 @@
-From 161aababc659e23c4a8523366a31f63b3d14e280 Mon Sep 17 00:00:00 2001
-From: Ian Romanick <ian.d.romanick@intel.com>
-Date: Mon, 08 Oct 2012 22:07:10 +0000
-Subject: docs: Add 9.0 release md5sums
-
-Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
----
-diff --git a/docs/relnotes-9.0.html b/docs/relnotes-9.0.html
-index d72c5bb..02b7324 100644
---- a/docs/relnotes-9.0.html
-+++ b/docs/relnotes-9.0.html
-@@ -26,7 +26,9 @@ because GL_ARB_compatibility is not supported.
-
- <h2>MD5 checksums</h2>
- <pre>
--tbd
-+be4cd34c6599a7cb9d254b05c48bdb1f MesaLib-9.0.tar.gz
-+60e557ce407be3732711da484ab3db6c MesaLib-9.0.tar.bz2
-+16b128544cd3f7e237927bb9f8aab7ce MesaLib-9.0.zip
- </pre>
-
-
---
-cgit v0.9.0.2-2-gbebe
-From 32faf7ab0de8b88bb15a2cb262a73c411dce9d0d Mon Sep 17 00:00:00 2001
-From: Brian Paul <brianp@vmware.com>
-Date: Fri, 05 Oct 2012 22:47:40 +0000
-Subject: mesa: don't call TexImage driver hooks for zero-sized images
-
-This simply avoids some failed assertions but there's no reason to
-call the driver hooks for storing a tex image if its size is zero.
-
-Note: This is a candidate for the stable branches.
-(cherry picked from commit 91d84096497ff538f55591f7e6bb0b563726db8d)
----
-diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
-index 21646cc..8004876 100644
---- a/src/mesa/main/teximage.c
-+++ b/src/mesa/main/teximage.c
-@@ -3034,13 +3034,15 @@ teximage(struct gl_context *ctx, GLboolean compressed, GLuint dims,
- border, internalFormat, texFormat);
-
- /* Give the texture to the driver. <pixels> may be null. */
-- if (compressed) {
-- ctx->Driver.CompressedTexImage(ctx, dims, texImage,
-- imageSize, pixels);
-- }
-- else {
-- ctx->Driver.TexImage(ctx, dims, texImage, format,
-- type, pixels, unpack);
-+ if (width > 0 && height > 0 && depth > 0) {
-+ if (compressed) {
-+ ctx->Driver.CompressedTexImage(ctx, dims, texImage,
-+ imageSize, pixels);
-+ }
-+ else {
-+ ctx->Driver.TexImage(ctx, dims, texImage, format,
-+ type, pixels, unpack);
-+ }
- }
-
- check_gen_mipmap(ctx, target, texObj, level);
---
-cgit v0.9.0.2-2-gbebe
-From e75051d1967350ceff0209dde24ae42696b13b5c Mon Sep 17 00:00:00 2001
-From: Brian Paul <brianp@vmware.com>
-Date: Fri, 05 Oct 2012 22:59:27 +0000
-Subject: mesa: fix error check for zero-sized compressed subtexture
-
-For glCompressedTexSubImage, width or height = 0 is legal.
-Fixes a failure in piglit's s3tc-errors test.
-
-This is for the 9.0 and 8.0 branches. Already fixed on master.
----
-diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
-index 8004876..38fa9fa 100644
---- a/src/mesa/main/teximage.c
-+++ b/src/mesa/main/teximage.c
-@@ -3598,10 +3598,10 @@ compressed_subtexture_error_check(struct gl_context *ctx, GLint dimensions,
- if (!_mesa_is_compressed_format(ctx, format))
- return GL_INVALID_ENUM;
-
-- if (width < 1 || width > maxTextureSize)
-+ if (width < 0 || width > maxTextureSize)
- return GL_INVALID_VALUE;
-
-- if ((height < 1 || height > maxTextureSize)
-+ if ((height < 0 || height > maxTextureSize)
- && dimensions > 1)
- return GL_INVALID_VALUE;
-
---
-cgit v0.9.0.2-2-gbebe
diff --git a/multilib/lib32-mesa/mesa-8.0.3-llvm-3.1-fixes.patch b/multilib/lib32-mesa/mesa-8.0.3-llvm-3.1-fixes.patch
deleted file mode 100644
index 922577aef..000000000
--- a/multilib/lib32-mesa/mesa-8.0.3-llvm-3.1-fixes.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-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
- }
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-11-09 00:31:53 +0000