Date: Monday, February 11, 2013 @ 01:01:50 Author: lcarlier Revision: 84122
upgpkg: lib32-mesa 9.0.2-2 Add lib32-gbm and lib32-libegl packages Modified: lib32-mesa/trunk/PKGBUILD ----------+ PKGBUILD | 88 +++++++++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 60 insertions(+), 28 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-02-10 23:31:08 UTC (rev 84121) +++ PKGBUILD 2013-02-11 00:01:50 UTC (rev 84122) @@ -3,8 +3,8 @@ # Contributor: Andreas Radke <andy...@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 +pkgname=('lib32-libglapi' 'lib32-libgl' 'lib32-mesa' 'lib32-osmesa' 'lib32-libgbm' 'lib32-libgles' 'lib32-libegl' + 'lib32-ati-dri' 'lib32-intel-dri' 'lib32-nouveau-dri') #_git=true #_gitdate=20121005 _git=false @@ -15,11 +15,11 @@ pkgver=9.0.2 fi -pkgrel=1 +pkgrel=2 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-amdgpu-snapshot') + 'gcc-multilib' 'imake' 'lib32-llvm-amdgpu-snapshot' 'lib32-systemd') url="http://mesa3d.sourceforge.net" license=('custom') options=('!libtool') @@ -51,18 +51,18 @@ --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-egl \ + --enable-gallium-egl + --with-egl-platforms=x11,drm \ --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 \ @@ -139,35 +139,39 @@ optdepends=('opengl-man-pages: for the OpenGL API man pages') pkgdesc="Mesa 3D off-screen rendering library (32-bits)" + cd ${srcdir}/?esa-* + # fix linking because of splitted package - make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" install + make -C src/mapi/shared-glapi DESTDIR="${pkgdir}" install - make -C ${srcdir}/?esa-*/src/mesa/drivers/osmesa DESTDIR="${pkgdir}" install + make -C 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 + make -C 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-libgbm() { + depends=('lib32-systemd' '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 + + rm -r "${pkgdir}"/usr/include + + 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') + depends=('lib32-libglapi' 'lib32-libdrm' 'lib32-libgbm' 'libgles') pkgdesc="Mesa GLES libraries (32-bit)" cd ${srcdir}/?esa-* @@ -188,6 +192,34 @@ ln -s libgles "$pkgdir/usr/share/licenses/libgles/lib32-libgles" } +package_lib32-libegl() { + # check also egl.pc + depends=('lib32-libx11' 'lib32-libxext' 'lib32-libxdamage' 'lib32-libxfixes' 'lib32-libxxf86vm' 'lib32-libxcb' 'khrplatform-devel' 'libegl') + pkgdesc="Mesa EGL libraries and headers" + + cd ${srcdir}/?esa-* + + make -C src/gallium/targets/egl-static DESTDIR="${pkgdir}" install + + # fix linking because of splitted package + make -C src/mapi/shared-glapi DESTDIR="${pkgdir}" install + make -C src/gbm DESTDIR="${pkgdir}" install + + make -C src/egl DESTDIR="${pkgdir}" install + + # fix linking because of splitted package - cleanup + make -C src/gbm DESTDIR="${pkgdir}" uninstall + make -C src/mapi/shared-glapi DESTDIR="${pkgdir}" uninstall + + rm -r "${pkgdir}"/usr/include + + install -m755 -d "${pkgdir}/usr/share/licenses/libegl" + ln -s libegl "$pkgdir/usr/share/licenses/libegl/lib32-libegl" + + # fix file conflicts + rm -rf ${pkgdir}/usr/include/KHR +} + 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)"