diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-11-22 14:05:07 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-11-22 14:05:07 -0300 |
commit | c5d0267480dce7ea1149cae6f63111678588c772 (patch) | |
tree | d06726989018701c05b8c93b1b548f14cfc541f3 /multilib-testing | |
parent | a221a452890917ec65b617a0be21b472a63e2a81 (diff) | |
parent | 13c6302fab6118693af345756375923b9fb7da69 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/allegro/PKGBUILD
community/erlang/PKGBUILD
community/python-openbabel/PKGBUILD
core/vi/PKGBUILD
extra/accountsservice/PKGBUILD
extra/calligra/PKGBUILD
kde-unstable/kactivities/PKGBUILD
kde-unstable/kdeaccessibility-jovie/PKGBUILD
kde-unstable/kdeaccessibility-kaccessible/PKGBUILD
kde-unstable/kdeaccessibility-kmag/PKGBUILD
kde-unstable/kdeaccessibility-kmousetool/PKGBUILD
kde-unstable/kdeaccessibility-kmouth/PKGBUILD
kde-unstable/kdeadmin/PKGBUILD
kde-unstable/kdeartwork/PKGBUILD
kde-unstable/kdebase-konsole/PKGBUILD
kde-unstable/kdebase-workspace/PKGBUILD
kde-unstable/kdebase-workspace/kde-np.pam
kde-unstable/kdebase-workspace/kde.pam
kde-unstable/kdebase-workspace/kdebase-workspace.install
kde-unstable/kdebase/PKGBUILD
kde-unstable/kdebindings-kimono/PKGBUILD
kde-unstable/kdebindings-korundum/PKGBUILD
kde-unstable/kdebindings-korundum/ruby19.patch
kde-unstable/kdebindings-kross/PKGBUILD
kde-unstable/kdebindings-perlkde/PKGBUILD
kde-unstable/kdebindings-perlqt/PKGBUILD
kde-unstable/kdebindings-python/PKGBUILD
kde-unstable/kdebindings-qtruby/PKGBUILD
kde-unstable/kdebindings-qyoto/PKGBUILD
kde-unstable/kdebindings-smokegen/PKGBUILD
kde-unstable/kdebindings-smokekde/PKGBUILD
kde-unstable/kdebindings-smokeqt/PKGBUILD
kde-unstable/kdeedu-analitza/PKGBUILD
kde-unstable/kdeedu-blinken/PKGBUILD
kde-unstable/kdeedu-cantor/PKGBUILD
kde-unstable/kdeedu-kalgebra/PKGBUILD
kde-unstable/kdeedu-kalzium/PKGBUILD
kde-unstable/kdeedu-kalzium/kdeedu-kalzium.install
kde-unstable/kdeedu-kanagram/PKGBUILD
kde-unstable/kdeedu-kbruch/PKGBUILD
kde-unstable/kdeedu-kgeography/PKGBUILD
kde-unstable/kdeedu-khangman/PKGBUILD
kde-unstable/kdeedu-kig/PKGBUILD
kde-unstable/kdeedu-kiten/PKGBUILD
kde-unstable/kdeedu-klettres/PKGBUILD
kde-unstable/kdeedu-kmplot/PKGBUILD
kde-unstable/kdeedu-kstars/PKGBUILD
kde-unstable/kdeedu-ktouch/PKGBUILD
kde-unstable/kdeedu-kturtle/PKGBUILD
kde-unstable/kdeedu-kwordquiz/PKGBUILD
kde-unstable/kdeedu-marble/PKGBUILD
kde-unstable/kdeedu-marble/kdeedu-marble.install
kde-unstable/kdeedu-pairs/PKGBUILD
kde-unstable/kdeedu-parley/PKGBUILD
kde-unstable/kdeedu-rocs/PKGBUILD
kde-unstable/kdeedu-step/PKGBUILD
kde-unstable/kdegraphics-gwenview/PKGBUILD
kde-unstable/kdegraphics-kamera/PKGBUILD
kde-unstable/kdegraphics-kcolorchooser/PKGBUILD
kde-unstable/kdegraphics-kgamma/PKGBUILD
kde-unstable/kdegraphics-kolourpaint/PKGBUILD
kde-unstable/kdegraphics-kruler/PKGBUILD
kde-unstable/kdegraphics-ksaneplugin/PKGBUILD
kde-unstable/kdegraphics-ksnapshot/PKGBUILD
kde-unstable/kdegraphics-mobipocket/PKGBUILD
kde-unstable/kdegraphics-okular/PKGBUILD
kde-unstable/kdegraphics-strigi-analyzer/PKGBUILD
kde-unstable/kdegraphics-svgpart/PKGBUILD
kde-unstable/kdegraphics-thumbnailers/PKGBUILD
kde-unstable/kdemultimedia-audiocd-kio/PKGBUILD
kde-unstable/kdemultimedia-dragonplayer/PKGBUILD
kde-unstable/kdemultimedia-ffmpegthumbs/PKGBUILD
kde-unstable/kdemultimedia-juk/PKGBUILD
kde-unstable/kdemultimedia-kmix/PKGBUILD
kde-unstable/kdemultimedia-kscd/PKGBUILD
kde-unstable/kdemultimedia-mplayerthumbs/PKGBUILD
kde-unstable/kdenetwork/PKGBUILD
kde-unstable/kdepim-runtime/PKGBUILD
kde-unstable/kdepim/PKGBUILD
kde-unstable/kdepim/fix-build.patch
kde-unstable/kdepimlibs/PKGBUILD
kde-unstable/kdeplasma-addons/PKGBUILD
kde-unstable/kdesdk-kate/PKGBUILD
kde-unstable/kdesdk-kate/pkgbuild-syntax-highlight.patch
kde-unstable/kdesdk/PKGBUILD
kde-unstable/kdetoys/PKGBUILD
kde-unstable/kdeutils-filelight/PKGBUILD
kde-unstable/kdeutils-kcalc/PKGBUILD
kde-unstable/kdeutils-kcharselect/PKGBUILD
kde-unstable/kdeutils-kdf/PKGBUILD
kde-unstable/kdeutils-kfloppy/PKGBUILD
kde-unstable/kdeutils-kgpg/PKGBUILD
kde-unstable/kdeutils-kremotecontrol/PKGBUILD
kde-unstable/kdeutils-ktimer/PKGBUILD
kde-unstable/kdeutils-kwallet/PKGBUILD
kde-unstable/kdeutils-superkaramba/PKGBUILD
kde-unstable/kdeutils-sweeper/PKGBUILD
kde-unstable/kdewebdev/PKGBUILD
kde-unstable/libkcddb/PKGBUILD
kde-unstable/libkcompactdisc/PKGBUILD
kde-unstable/libkdcraw/PKGBUILD
kde-unstable/libkdeedu/PKGBUILD
kde-unstable/libkexiv2/PKGBUILD
kde-unstable/libkipi/PKGBUILD
kde-unstable/libksane/PKGBUILD
kde-unstable/nepomuk-core/PKGBUILD
Diffstat (limited to 'multilib-testing')
-rw-r--r-- | multilib-testing/lib32-glew/PKGBUILD | 33 | ||||
-rw-r--r-- | multilib-testing/lib32-glu/PKGBUILD | 45 | ||||
-rw-r--r-- | multilib-testing/lib32-libxcb/PKGBUILD | 47 | ||||
-rw-r--r-- | multilib-testing/lib32-libxcb/libxcb-1.1-no-pthread-stubs.patch | 11 | ||||
-rw-r--r-- | multilib-testing/lib32-mesa/PKGBUILD | 257 | ||||
-rw-r--r-- | multilib-testing/lib32-mesa/git_fixes.diff | 93 | ||||
-rw-r--r-- | multilib-testing/lib32-mesa/pthread_fix.diff | 23 | ||||
-rw-r--r-- | multilib-testing/wine/PKGBUILD | 154 | ||||
-rw-r--r-- | multilib-testing/wine/wine.install | 12 |
9 files changed, 0 insertions, 675 deletions
diff --git a/multilib-testing/lib32-glew/PKGBUILD b/multilib-testing/lib32-glew/PKGBUILD deleted file mode 100644 index b5302e8ef..000000000 --- a/multilib-testing/lib32-glew/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 77251 2012-10-08 08:13:50Z bluewind $ -# Maintainer: Florian Pritz <flo@xinu.at> - -_pkgbasename=glew -pkgname=lib32-$_pkgbasename -pkgver=1.8.0 -pkgrel=2 -pkgdesc="A cross-platform C/C++ extension loading library (32 bit)" -arch=('x86_64') -url="http://glew.sourceforge.net" -license=('BSD' 'MIT' 'GPL') -depends=('lib32-libxmu' 'lib32-libxi' 'lib32-glu' "$_pkgbasename>=$pkgver") -makedepends=('gcc-multilib') -source=(http://downloads.sourceforge.net/${_pkgbasename}/${_pkgbasename}-${pkgver}.tgz) -sha1sums=('641c6bb3f924ec786e1e6cf2b1b230f594e0f0e4') - -build() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - sed -i 's|CC = cc|CC = gcc -m32|' config/Makefile.linux - sed -i 's|LD = cc|LD = gcc -m32|' config/Makefile.linux - sed -i 's|lib64|lib32|' config/Makefile.linux - make -} - -package() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - make GLEW_DEST="${pkgdir}/usr" install - chmod 0755 "${pkgdir}/usr/lib32/libGLEW.so.${pkgver}" - - rm -rf "${pkgdir}"/usr/{include,bin} - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib-testing/lib32-glu/PKGBUILD b/multilib-testing/lib32-glu/PKGBUILD deleted file mode 100644 index ff718f165..000000000 --- a/multilib-testing/lib32-glu/PKGBUILD +++ /dev/null @@ -1,45 +0,0 @@ -# $Id: PKGBUILD 77209 2012-10-06 21:02:42Z lcarlier $ -# Maintainer: Laurent Carlier <lordheavym@gmail.com> - -pkgname=lib32-glu -pkgver=9.0.0 -pkgrel=1 -pkgdesc="Mesa OpenGL utility library (32 bits)" -arch=('x86_64') -url="http://mesa.freedesktop.org/" -license=('LGPL') -depends=('lib32-libgl') -makedepends=('gcc-multilib' 'lib32-mesa') -options=('!libtool') -source=(ftp://ftp.freedesktop.org/pub/mesa/glu/glu-$pkgver.tar.bz2) -sha256sums=('1f7ad0d379a722fcbd303aa5650c6d7d5544fde83196b42a73d1193568a4df12') - -build() { - cd ${srcdir}/glu-$pkgver - - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - ./configure --prefix=/usr --disable-static \ - --libdir=/usr/lib32 - make -} - -check() { - cd "$srcdir/glu-$pkgver" - - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - make -k check -} - -package() { - cd ${srcdir}/glu-$pkgver - - make DESTDIR=${pkgdir} install - - rm -rf ${pkgdir}/usr/include -} diff --git a/multilib-testing/lib32-libxcb/PKGBUILD b/multilib-testing/lib32-libxcb/PKGBUILD deleted file mode 100644 index 1de801819..000000000 --- a/multilib-testing/lib32-libxcb/PKGBUILD +++ /dev/null @@ -1,47 +0,0 @@ -# $Id: PKGBUILD 77207 2012-10-06 21:00:14Z bluewind $ -# Maintainer: Alexander Baldeck <alexander@archlinux.org> -# Contributor: Jan de Groot <jgc@archlinux.org> - -_pkgbasename=libxcb -pkgname=lib32-$_pkgbasename -pkgver=1.9 -pkgrel=1 -pkgdesc="X11 client-side library (32-bit)" -arch=(x86_64) -url="http://xcb.freedesktop.org/" -depends=('lib32-libxdmcp' 'lib32-libxau' $_pkgbasename) -makedepends=('pkgconfig' 'libxslt' 'python2' 'gcc-multilib' - 'autoconf') -options=('!libtool') -license=('custom') -source=(${url}/dist/${_pkgbasename}-${pkgver}.tar.bz2 - libxcb-1.1-no-pthread-stubs.patch) -sha1sums=('ad2fb95eeec41ba3d39502a4f7460c3b64fdf061' - 'd2df03ddf3e949c10c2c185256b0eb7fa02837ab') - -build() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - - patch -Np1 -i "${srcdir}/libxcb-1.1-no-pthread-stubs.patch" - - export CC="gcc -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - PYTHON=/usr/bin/python2 ./autogen.sh \ - --prefix=/usr \ - --enable-xinput \ - --libdir=/usr/lib32 \ - --disable-static - make -} - -package() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - - make DESTDIR="${pkgdir}" install - - rm -rf "${pkgdir}"/usr/{include,share} - - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib-testing/lib32-libxcb/libxcb-1.1-no-pthread-stubs.patch b/multilib-testing/lib32-libxcb/libxcb-1.1-no-pthread-stubs.patch deleted file mode 100644 index 8e8162f0a..000000000 --- a/multilib-testing/lib32-libxcb/libxcb-1.1-no-pthread-stubs.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- libxcb-1.8.1/configure.ac 2012-03-09 15:38:38.000000000 +0100 -+++ libxcb-1.8.1/configure.ac.new 2012-03-09 16:50:40.107109896 +0100 -@@ -35,7 +35,7 @@ - - # Checks for pkg-config packages - PKG_CHECK_MODULES(XCBPROTO, xcb-proto >= 1.7) --NEEDED="pthread-stubs xau >= 0.99.2" -+NEEDED="xau >= 0.99.2" - PKG_CHECK_MODULES(NEEDED, $NEEDED) - - have_xdmcp="no" diff --git a/multilib-testing/lib32-mesa/PKGBUILD b/multilib-testing/lib32-mesa/PKGBUILD deleted file mode 100644 index 35b76887b..000000000 --- a/multilib-testing/lib32-mesa/PKGBUILD +++ /dev/null @@ -1,257 +0,0 @@ -# $Id: PKGBUILD 77479 2012-10-10 21:26:42Z lcarlier $ -# 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-testing/lib32-mesa/git_fixes.diff b/multilib-testing/lib32-mesa/git_fixes.diff deleted file mode 100644 index 8132d1d10..000000000 --- a/multilib-testing/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-testing/lib32-mesa/pthread_fix.diff b/multilib-testing/lib32-mesa/pthread_fix.diff deleted file mode 100644 index bdfe2d865..000000000 --- a/multilib-testing/lib32-mesa/pthread_fix.diff +++ /dev/null @@ -1,23 +0,0 @@ -From dd4fde8f674f5e3efa19e929f97de4ecfd82391b Mon Sep 17 00:00:00 2001 -From: Matt Turner <mattst88@gmail.com> -Date: Thu, 27 Sep 2012 22:49:52 +0000 -Subject: build: Set PTHREAD_LIBS for pkgconfig files if empty - ---- -diff --git a/configure.ac b/configure.ac -index 770df2f..dc2720d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -509,6 +509,10 @@ AC_CHECK_DECLS([signbit],[], - - dnl Check for pthreads - AX_PTHREAD -+dnl AX_PTHREADS leaves PTHREAD_LIBS empty for gcc and sets PTHREAD_CFLAGS -+dnl to -pthread, which causes problems if we need -lpthread to appear in -+dnl pkgconfig files. -+test -z "$PTHREAD_LIBS" && PTHREAD_LIBS="-lpthread" - - dnl SELinux awareness. - AC_ARG_ENABLE([selinux], --- -cgit v0.9.0.2-2-gbebe diff --git a/multilib-testing/wine/PKGBUILD b/multilib-testing/wine/PKGBUILD deleted file mode 100644 index 6bffe1ffb..000000000 --- a/multilib-testing/wine/PKGBUILD +++ /dev/null @@ -1,154 +0,0 @@ -# $Id: PKGBUILD 77392 2012-10-09 14:39:41Z bluewind $ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> -# Contributor: Eduardo Romero <eduardo@archlinux.org> -# Contributor: Giovanni Scafora <giovanni@archlinux.org> - -pkgname=wine -pkgver=1.5.14 -pkgrel=2 - -_pkgbasever=${pkgver/rc/-rc} - -source=(http://prdownloads.sourceforge.net/$pkgname/$pkgname-$_pkgbasever.tar.bz2{,.sign}) -md5sums=('f84c54bd7422328e96b6cf14ee6e163c' - 'dd0c87e2dea529f0c898fe2ffa5390ce') - -pkgdesc="A compatibility layer for running Windows programs" -url="http://www.winehq.com" -arch=(i686 x86_64) -license=(LGPL) -install=wine.install - -depends=( - fontconfig lib32-fontconfig - mesa lib32-mesa - libxcursor lib32-libxcursor - libxrandr lib32-libxrandr - libxdamage lib32-libxdamage - libxi lib32-libxi - gettext lib32-gettext - glu lib32-glu - desktop-file-utils -) - -makedepends=(autoconf ncurses bison perl fontforge flex prelink - 'gcc>=4.5.0-2' 'gcc-multilib>=4.5.0-2' - giflib lib32-giflib - libpng lib32-libpng - gnutls lib32-gnutls - libxinerama lib32-libxinerama - libxcomposite lib32-libxcomposite - libxmu lib32-libxmu - libxxf86vm lib32-libxxf86vm - libxml2 lib32-libxml2 - libldap lib32-libldap - lcms lib32-lcms - mpg123 lib32-mpg123 - openal lib32-openal - v4l-utils lib32-v4l-utils - alsa-lib lib32-alsa-lib - libxcomposite lib32-libxcomposite - oss - samba -) - -optdepends=( - giflib lib32-giflib - libpng lib32-libpng - libldap lib32-libldap - gnutls lib32-gnutls - lcms lib32-lcms - libxml2 lib32-libxml2 - mpg123 lib32-mpg123 - openal lib32-openal - v4l-utils lib32-v4l-utils - libpulse lib32-libpulse - alsa-plugins lib32-alsa-plugins - alsa-lib lib32-alsa-lib - libjpeg-turbo lib32-libjpeg-turbo - libxcomposite lib32-libxcomposite - oss cups - samba -) - -if [[ $CARCH == i686 ]]; then - # Strip lib32 etc. on i686 - depends=(${depends[@]/*32-*/}) - makedepends=(${makedepends[@]/*32-*/}) - makedepends=(${makedepends[@]/*-multilib*/}) - optdepends=(${optdepends[@]/*32-*/}) -else - provides=("bin32-wine=$pkgver" "wine-wow64=$pkgver") - conflicts=('bin32-wine' 'wine-wow64') - replaces=('bin32-wine') -fi - -build() { - cd "$srcdir" - - # Allow ccache to work - mv $pkgname-$_pkgbasever $pkgname - - # Get rid of old build dirs - rm -rf $pkgname-{32,64}-build - mkdir $pkgname-32-build - - # These additional CFLAGS solve FS#27662 - export CFLAGS="${CFLAGS/-D_FORTIFY_SOURCE=2/} -D_FORTIFY_SOURCE=0" - export CXXFLAGS="${CXXFLAGS/-D_FORTIFY_SOURCE=2/} -D_FORTIFY_SOURCE=0" - - if [[ $CARCH == x86_64 ]]; then - msg2 "Building Wine-64..." - - mkdir $pkgname-64-build - cd "$srcdir/$pkgname-64-build" - ../$pkgname/configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --libdir=/usr/lib \ - --with-x \ - --enable-win64 - - make - - _wine32opts=( - --libdir=/usr/lib32 - --with-wine64="$srcdir/$pkgname-64-build" - ) - - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - fi - - msg2 "Building Wine-32..." - cd "$srcdir/$pkgname-32-build" - ../$pkgname/configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --with-x \ - "${_wine32opts[@]}" - - # These additional CFLAGS solve FS#27560 and FS#23277 - make CFLAGS+="-mstackrealign -mincoming-stack-boundary=2" CXXFLAGS+="-mstackrealign -mincoming-stack-boundary=2" -} - -package() { - msg2 "Packaging Wine-32..." - cd "$srcdir/$pkgname-32-build" - - if [[ $CARCH == i686 ]]; then - make prefix="$pkgdir/usr" install - else - make prefix="$pkgdir/usr" \ - libdir="$pkgdir/usr/lib32" \ - dlldir="$pkgdir/usr/lib32/wine" install - - msg2 "Packaging Wine-64..." - cd "$srcdir/$pkgname-64-build" - make prefix="$pkgdir/usr" \ - libdir="$pkgdir/usr/lib" \ - dlldir="$pkgdir/usr/lib/wine" install - fi -} - -# vim:set ts=8 sts=2 sw=2 et: diff --git a/multilib-testing/wine/wine.install b/multilib-testing/wine/wine.install deleted file mode 100644 index 0548b7ffd..000000000 --- a/multilib-testing/wine/wine.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - update-desktop-database -q - #echo "This wine package is wow64 enabled. This means it can run 32bit/64bit Windows apps on x86_64." - #echo "If you are on x86_64, the default WINEARCH will be win64." - #echo "This will cause a lot of Windows applications to malfunction even if they usually work in wine." - #echo "Please create your ~/.wine with 'WINEARCH=win32 winecfg' if you are unsure and on x86_64." - #echo "See the Arch wiki on wine for more information." -} - -post_remove() { - update-desktop-database -q -} |