Commit 24b2edb5 authored by Giuseppe's avatar Giuseppe

big pkgs update

parent d22f1983
......@@ -5,7 +5,7 @@
_pkgsourcename=catalyst-utils
pkgname=lib32-$_pkgsourcename
pkgver=11.3
pkgver=11.4
pkgrel=1
pkgdesc="AMD/ATI catalyst driver utilities and libraries. (32-bit)"
url="http://www.ati.amd.com"
......@@ -16,9 +16,9 @@ conflicts=('lib32-libgl' 'lib32-nvidia-utils')
replaces=('lib32-ati-fglrx-utils' 'lib32-fglrx-utils' 'lib32-libgl')
provides=('lib32-libgl')
source=(http://www2.ati.com/drivers/linux/ati-driver-installer-${pkgver/./-}-x86.x86_64.run
lib32-catalyst.sh)
lib32-catalyst.sh)
md5sums=('22d00ea687851f2be410f0776946f679'
'af7fb8ee4fc96fd54c5b483e33dc71c4')
'af7fb8ee4fc96fd54c5b483e33dc71c4')
build() {
# Extract Catalyst driver installer
......@@ -32,20 +32,27 @@ package() {
# Install lib32 libraries
cd "${srcdir}/archive_files/arch/x86/usr" || return 1
install -dm755 "${pkgdir}/usr/lib32" || return 1
install -dm755 "${pkgdir}/usr/lib32/fglrx" || return 1 # since 11.4
install -dm755 "${pkgdir}/usr/lib32/xorg/modules/dri" || return 1
install -m755 lib/*.so* "${pkgdir}/usr/lib32/" || return 1
install -m755 X11R6/lib/*.so* "${pkgdir}/usr/lib32/" || return 1
install -m755 X11R6/lib/fglrx-libGL.so.1.2 "${pkgdir}/usr/lib32/fglrx" || return 1 # since 11.4
ln -sf /usr/lib32/fglrx/fglrx-libGL.so.1.2 "${pkgdir}/usr/lib32/fglrx/libGL.so.1.2" # since 11.4
ln -sf /usr/lib32/fglrx/fglrx-libGL.so.1.2 "${pkgdir}/usr/lib32/fglrx-libGL.so.1.2" # since 11.4
ln -sf /usr/lib32/fglrx/fglrx-libGL.so.1.2 "${pkgdir}/usr/lib32/libGL.so.1.2" # since 11.4
ln -sf /usr/lib32/fglrx/fglrx-libGL.so.1.2 "${pkgdir}/usr/lib32/libGL.so.1" # since 11.4
ln -sf /usr/lib32/fglrx/fglrx-libGL.so.1.2 "${pkgdir}/usr/lib32/libGL.so" # since 11.4
install -m755 X11R6/lib/libAMDXvBA.so.1.0 "${pkgdir}/usr/lib32/" || return 1 # since 11.4
install -m755 X11R6/lib/libatiadlxx.so "${pkgdir}/usr/lib32/" || return 1 # since 11.4
install -m755 X11R6/lib/libfglrx_dm.so.1.0 "${pkgdir}/usr/lib32/" || return 1 # since 11.4
install -m755 X11R6/lib/libXvBAW.so.1.0 "${pkgdir}/usr/lib32/" || return 1 # since 11.4
install -m755 X11R6/lib/modules/dri/*.so "${pkgdir}/usr/lib32/xorg/modules/dri/" || return 1
cd "$pkgdir/usr/lib32/" || return 1
ln -sf libfglrx_dm.so.1.0 libfglrx_dm.so.1 || return 1
# ln -sf libfglrx_pp.so.1.0 libfglrx_pp.so.1 || return 1
# ln -sf libfglrx_tvout.so.1.0 libfglrx_tvout.so.1 || return 1
ln -sf libfglrx_gamma.so.1.0 libfglrx_gamma.so.1 || return 1
ln -sf libAMDXvBA.so.1.0 libAMDXvBA.so.1 || return 1
ln -sf libXvBAW.so.1.0 libXvBAW.so.1 || return 1
ln -sf libGL.so.1.2 libGL.so.1 || return 1
ln -sf libGL.so.1.2 libGL.so || return 1
ln -sf libatiuki.so.1.0 libatiuki.so.1 || return 1
ln -sf libatiuki.so.1.0 libatiuki.so || return 1
}
......
......@@ -5,7 +5,7 @@
_pkgbasename=libdrm
pkgname=lib32-$_pkgbasename
pkgver=2.4.23
pkgver=2.4.25
pkgrel=1
pkgdesc="Userspace interface to kernel DRM services (32-bit)"
arch=(x86_64)
......@@ -17,7 +17,7 @@ url="http://dri.freedesktop.org/"
source=(http://dri.freedesktop.org/${_pkgbasename}/${_pkgbasename}-${pkgver}.tar.bz2
no-pthread-stubs.patch)
md5sums=('7577ff36ec364d88fae466d4f7fc5fc6'
md5sums=('f53dc4c72109b17908e4113c3b8addfe'
'9b5ec3bbebe86921e2057694c42f65b8')
build() {
......@@ -29,14 +29,13 @@ build() {
patch -Np1 -i "${srcdir}/no-pthread-stubs.patch"
libtoolize --force
aclocal
autoconf
automake
autoreconf --force --install
./configure --prefix=/usr --libdir=/usr/lib32 \
--enable-intel --enable-radeon \
--enable-vmwgfx-experimental-api --enable-nouveau-experimental-api \
--enable-udev
--enable-udev \
--enable-intel \
--enable-radeon \
--enable-vmwgfx-experimental-api \
--enable-nouveau-experimental-api
make
}
......
......@@ -5,7 +5,7 @@
_pkgbasename=libx11
pkgname=lib32-$_pkgbasename
pkgver=1.3.99.902
pkgver=1.4.3
pkgrel=1
pkgdesc="X11 client-side library (32-bit)"
arch=(x86_64)
......@@ -15,7 +15,7 @@ makedepends=('xorg-util-macros' 'xextproto' 'xtrans' 'inputproto' 'gcc-multilib'
options=('!libtool')
license=('custom:XFREE86')
source=(${url}/releases/individual/lib/libX11-${pkgver}.tar.bz2)
sha1sums=('2014c0e26f008a689c20682f99cfcd9470140856')
sha1sums=('174270a0e51614b5077026fc6c20701d4e09aef8')
build() {
export CC="gcc -m32"
......
......@@ -5,7 +5,7 @@
_pkgbasename=libxdmcp
pkgname=lib32-$_pkgbasename
pkgver=1.0.3
pkgver=1.1.0
pkgrel=1
pkgdesc="X11 Display Manager Control Protocol library (32-bit)"
arch=(x86_64)
......@@ -15,7 +15,7 @@ depends=('xproto' 'lib32-glibc' $_pkgbasename)
makedepends=('xorg-util-macros' 'gcc-multilib')
options=('!libtool')
source=(${url}/releases/individual/lib/libXdmcp-${pkgver}.tar.bz2)
md5sums=('d60941d471800f41a3f19b24bea855a7')
sha1sums=('28132db24727552f77e998e6a6798a5b9b30789f')
build() {
cd ${srcdir}/libXdmcp-${pkgver}
......@@ -23,7 +23,9 @@ build() {
export CC="gcc -m32"
export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
./configure --prefix=/usr --sysconfdir=/etc --disable-static \
./configure --prefix=/usr \
--sysconfdir=/etc \
--disable-static \
--libdir=/usr/lib32
make
}
......
......@@ -5,7 +5,7 @@
_pkgbasename=libxfixes
pkgname=lib32-$_pkgbasename
pkgver=4.0.5
pkgver=5.0
pkgrel=1
pkgdesc="X11 miscellaneous 'fixes' extension library (32-bit)"
arch=('x86_64')
......@@ -15,7 +15,7 @@ depends=('lib32-libx11>=1.3.3' $_pkgbasename)
makedepends=('pkg-config' 'gcc-multilib' "fixesproto>=4.1.1")
options=('!libtool')
source=(${url}/releases/individual/lib/libXfixes-${pkgver}.tar.bz2)
md5sums=('1b4b8386bd5d1751b2c7177223ad4629')
md5sums=('678071bd7f9f7467e2fc712d81022318')
build() {
export CC="gcc -m32"
......@@ -23,7 +23,10 @@ build() {
export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
cd "${srcdir}/libXfixes-${pkgver}"
./configure --prefix=/usr --sysconfdir=/etc --disable-static --libdir=/usr/lib32
./configure --prefix=/usr \
--sysconfdir=/etc \
--disable-static \
--libdir=/usr/lib32
make
}
......
......@@ -5,7 +5,7 @@
_pkgbasename=libxi
pkgname=lib32-$_pkgbasename
pkgver=1.3.2
pkgver=1.4.2
pkgrel=1
pkgdesc="X11 Input extension library (32-bit)"
arch=('x86_64')
......@@ -15,7 +15,7 @@ makedepends=('pkgconfig' 'xorg-util-macros' gcc-multilib)
options=(!libtool)
license=('custom')
source=(${url}/releases/individual/lib/libXi-${pkgver}.tar.bz2)
md5sums=('26f93781356b1fdde08f7ee9cd5884d6')
md5sums=('3d14f7bfc4a4335cf0144de9b67a5444')
build() {
export CC="gcc -m32"
......@@ -23,8 +23,10 @@ build() {
export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
cd "${srcdir}/libXi-${pkgver}"
./configure --prefix=/usr --sysconfdir=/etc --disable-static \
--libdir=/usr/lib32
./configure --prefix=/usr \
--sysconfdir=/etc \
--disable-static \
--libdir=/usr/lib32
make
}
......
......@@ -5,7 +5,7 @@
_pkgbasename=libxinerama
pkgname=lib32-$_pkgbasename
pkgver=1.1
pkgver=1.1.1
pkgrel=1
pkgdesc="X11 Xinerama extension library (32-bit)"
arch=(x86_64)
......@@ -15,7 +15,7 @@ depends=('lib32-libxext' 'xineramaproto' $_pkgbasename)
makedepends=('xorg-util-macros' gcc-multilib)
options=(!libtool)
source=(${url}/releases/individual/lib/libXinerama-${pkgver}.tar.bz2)
md5sums=('a2ac01fc0426cdbb713c5d59cf9955ed')
md5sums=('ecd4839ad01f6f637c6fb5327207f89b')
build() {
export CC="gcc -m32"
......@@ -23,7 +23,8 @@ build() {
export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
cd "${srcdir}/libXinerama-${pkgver}"
./configure --prefix=/usr --libdir=/usr/lib32
./configure --prefix=/usr \
--libdir=/usr/lib32
make
}
......
......@@ -5,7 +5,7 @@
_pkgbasename=libxt
pkgname=lib32-$_pkgbasename
pkgver=1.0.8
pkgver=1.1.1
pkgrel=1
pkgdesc="X11 toolkit intrinsics library (32-bit)"
arch=(x86_64)
......@@ -15,7 +15,7 @@ depends=('lib32-libsm' 'lib32-libx11' $_pkgbasename)
makedepends=('xorg-util-macros' 'gcc-multilib')
options=('!libtool')
source=(${url}/releases/individual/lib/libXt-${pkgver}.tar.bz2)
sha1sums=('d5e3dfba90a12169771399b3e2ccae07243489c9')
md5sums=('eb22c0a1f172b06b97a3f5ae89768412')
build() {
cd "${srcdir}/libXt-${pkgver}"
......@@ -23,7 +23,10 @@ build() {
export CC="gcc -m32"
export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
./configure --prefix=/usr --sysconfdir=/etc --disable-static --libdir=/usr/lib32
./configure --prefix=/usr \
--sysconfdir=/etc \
--disable-static \
--libdir=/usr/lib32
make
}
......
......@@ -4,98 +4,138 @@
# maintainer (x86_64): Anke Boersma <abveritas[at]chakra-project[dot]org>
pkgbase=lib32-mesa
pkgname=('lib32-mesa' 'lib32-libgl' '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')
pkgver=7.10
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')
pkgver=7.10.2
pkgrel=2
arch=(x86_64)
makedepends=('glproto>=1.4.12' 'pkgconfig' 'lib32-libdrm>=2.4.22' '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' 'lib32-talloc' 'python2' 'libxml2' 'gcc-multilib' 'imake')
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')
url="http://mesa3d.sourceforge.net"
license=('custom')
source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2
ftp://ftp.freedesktop.org/pub/mesa/demos/8.0.1/mesa-demos-8.0.1.tar.bz2)
md5sums=('33fb94eccc02cbb4d8d1365615e38e46'
'320c2a4b6edc6faba35d9cb1e2a30bf4')
source=("ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2"
nouveau-fix-header.patch)
md5sums=('f5de82852f1243f42cc004039e10b771'
'67c87b77cc2236b52a3b47dad3fbb5d4')
build() {
export CC="gcc -m32"
export CXX="g++ -m32"
export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
# python2 build fixes
sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
-e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" $(find $srcdir -name '*.py')
sed -i -e "s|PYTHON2 = python|PYTHON2 = python2|" "${srcdir}/Mesa-${pkgver}"/configs/{default,autoconf.in}
sed -i -e "s|python|python2|" "${srcdir}/Mesa-${pkgver}"/src/gallium/auxiliary/Makefile
cd "${srcdir}/Mesa-${pkgver}"
patch -Np1 -i "${srcdir}/nouveau-fix-header.patch"
cd "${srcdir}/Mesa-${pkgver}"
./configure --prefix=/usr \
--with-dri-driverdir=/usr/lib32/xorg/modules/dri \
--disable-egl \
--enable-gallium-radeon \
--enable-gallium-nouveau \
--enable-glx-tls \
--with-driver=dri \
--enable-xcb \
--with-state-trackers=dri,glx \
--disable-glut \
--enable-32-bit \
--libdir=/usr/lib32
--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 \
--enable-32-bit \
--libdir=/usr/lib32
make
}
package_lib32-libgl() {
depends=('lib32-libdrm>=2.4.22' '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.23' '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}"
cd "${srcdir}/Mesa-${pkgver}"
install -m755 -d "${pkgdir}/usr/lib32"
install -m755 -d "${pkgdir}/usr/lib32/xorg/modules/extensions"
bin/minstall lib32/libGL.so* "${pkgdir}/usr/lib32/"
cd src/mesa/drivers/dri
make -C swrast DESTDIR="${pkgdir}" install
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}
install -m755 -d "${pkgdir}/usr/share/licenses/libgl"
ln -s libgl "$pkgdir/usr/share/licenses/libgl/$pkgname"
ln -s libgl "$pkgdir/usr/share/licenses/libgl/lib32-libgl"
}
package_lib32-libgles() {
depends=('libgles')
pkgdesc="Mesa GLES libraries (32-bit)"
cd "${srcdir}/Mesa-${pkgver}"
install -m755 -d "${pkgdir}/usr/lib32"
install -m755 -d "${pkgdir}/usr/lib32/pkgconfig"
bin/minstall lib32/libGLESv* "${pkgdir}/usr/lib32/"
bin/minstall src/mapi/es1api/glesv1_cm.pc "${pkgdir}/usr/lib32/pkgconfig/"
bin/minstall src/mapi/es2api/glesv2.pc "${pkgdir}/usr/lib32/pkgconfig/"
install -m755 -d "${pkgdir}/usr/share/licenses/libgles"
ln -s libgles "$pkgdir/usr/share/licenses/libgles/lib32-libgles"
}
package_lib32-libegl() {
depends=('lib32-udev' 'libegl')
pkgdesc="Mesa libEGL libraries (32-bit)"
cd "${srcdir}/Mesa-${pkgver}"
install -m755 -d "${pkgdir}/usr/lib32"
install -m755 -d "${pkgdir}/usr/lib32/egl"
install -m755 -d "${pkgdir}/usr/lib32/pkgconfig"
bin/minstall lib32/libEGL.so* "${pkgdir}/usr/lib32/"
bin/minstall lib32/egl/* "${pkgdir}/usr/lib32/egl/"
bin/minstall src/egl/main/egl.pc "${pkgdir}/usr/lib32/pkgconfig/"
install -m755 -d "${pkgdir}/usr/share/licenses/libegl"
ln -s libgles "$pkgdir/usr/share/licenses/libegl/lib32-libegl"
}
package_lib32-mesa() {
depends=('lib32-libgl' 'lib32-libx11>=1.3.5' 'lib32-libxt>=1.0.8' 'dri2proto=2.3' 'lib32-libdrm>=2.4.22' 'glproto>=1.4.12' "mesa")
depends=('lib32-libgl' 'lib32-libx11>=1.3.5' 'lib32-libxt>=1.0.8' 'mesa')
pkgdesc="Mesa 3-D graphics libraries and include files (32-bit)"
cd "${srcdir}/Mesa-${pkgver}"
cd "${srcdir}/Mesa-${pkgver}"
make DESTDIR="${pkgdir}" install
cd "${srcdir}/mesa-demos-8.0.1/src/xdemos"
install -m755 -d "${pkgdir}/usr/bin"
$CC glxinfo.c -I${pkgdir}/usr/include -L${pkgdir}/usr/lib32 -lX11 -lGL -o "${pkgdir}/usr/bin/glxinfo32"
rm -f "${pkgdir}/usr/lib32/libGL.so"*
rm -rf "${pkgdir}/usr/lib32/xorg"
rm -rf "${pkgdir}"/usr/{include,share}
rm -f "${pkgdir}/usr/lib32/libGLESv"*
rm -f "${pkgdir}/usr/lib32/libEGL"*
rm -rf "${pkgdir}/usr/lib32/egl"
rm -f ${pkgdir}/usr/lib32/pkgconfig/{glesv1_cm.pc,glesv2.pc,egl.pc}
rm -rf "$pkgdir"/{usr/include,usr/lib32/xorg}
install -m755 -d "${pkgdir}/usr/share/licenses/mesa"
ln -s mesa "$pkgdir/usr/share/licenses/mesa/$pkgname"
ln -s mesa "$pkgdir/usr/share/licenses/mesa/lib32-mesa"
}
package_lib32-ati-dri() {
depends=("lib32-libgl=${pkgver}")
pkgdesc="Mesa DRI + Gallium3D r300 drivers for AMD/ATI Radeon (32-bit)"
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"
make -C radeon DESTDIR="${pkgdir}" install
make -C r200 DESTDIR="${pkgdir}" install
# classic mesa driver for R300 r300_dri.so
#make -C r300 DESTDIR="${pkgdir}" install <------- depricated
# gallium3D driver for R300 r300_dri.so
# 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 r600 DESTDIR="${pkgdir}" install
make -C ${srcdir}/Mesa-${pkgver}/src/gallium/targets/dri-r600 DESTDIR="${pkgdir}" install
}
package_lib32-intel-dri() {
......@@ -103,6 +143,7 @@ package_lib32-intel-dri() {
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
......@@ -113,6 +154,7 @@ package_lib32-unichrome-dri() {
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
}
......@@ -122,6 +164,7 @@ package_lib32-mach64-dri() {
conflicts=('xf86-video-mach64<6.8.2')
cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
make -C mach64 DESTDIR="${pkgdir}" install
}
......@@ -131,6 +174,7 @@ package_lib32-mga-dri() {
conflicts=('xf86-video-mga<1.4.11')
cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
make -C mga DESTDIR="${pkgdir}" install
}
......@@ -140,6 +184,7 @@ package_lib32-r128-dri() {
conflicts=('xf86-video-r128<6.8.1')
cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
make -C r128 DESTDIR="${pkgdir}" install
}
......@@ -149,6 +194,7 @@ package_lib32-savage-dri() {
conflicts=('xf86-video-savage<2.3.1')
cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
make -C savage DESTDIR="${pkgdir}" install
}
......@@ -158,6 +204,7 @@ package_lib32-sis-dri() {
conflicts=('xf86-video-sis<0.10.2')
cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
make -C sis DESTDIR="${pkgdir}" install
}
......@@ -167,6 +214,7 @@ package_lib32-tdfx-dri() {
conflicts=('xf86-video-tdfx<1.4.3')
cd "${srcdir}/Mesa-${pkgver}/src/mesa/drivers/dri"
make -C tdfx DESTDIR="${pkgdir}" install
}
......@@ -175,9 +223,9 @@ package_lib32-nouveau-dri() {
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}/Mesa-${pkgver}/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install
}
From 5c102dd94f435e97507213fbd128e50dd15f5f54 Mon Sep 17 00:00:00 2001
From: Ben Skeggs <bskeggs@redhat.com>
Date: Mon, 20 Dec 2010 03:39:36 +0000
Subject: nouveau: fix includes for latest libdrm
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
---
diff --git a/src/gallium/drivers/nouveau/nouveau_winsys.h b/src/gallium/drivers/nouveau/nouveau_winsys.h
index ab480ca..747b084 100644
--- a/src/gallium/drivers/nouveau/nouveau_winsys.h
+++ b/src/gallium/drivers/nouveau/nouveau_winsys.h
@@ -10,7 +10,7 @@
#include "nouveau/nouveau_grobj.h"
#include "nouveau/nouveau_notifier.h"
#include "nouveau/nouveau_resource.h"
-#include "nouveau/nouveau_pushbuf.h"
+#include "nouveau/nv04_pushbuf.h"
#ifndef NV04_PFIFO_MAX_PACKET_LEN
#define NV04_PFIFO_MAX_PACKET_LEN 2047
diff --git a/src/gallium/drivers/nv50/nv50_surface.c b/src/gallium/drivers/nv50/nv50_surface.c
index ce48022..a99df76 100644
--- a/src/gallium/drivers/nv50/nv50_surface.c
+++ b/src/gallium/drivers/nv50/nv50_surface.c
@@ -22,7 +22,7 @@
#define __NOUVEAU_PUSH_H__
#include <stdint.h>
-#include "nouveau/nouveau_pushbuf.h"
+#include "nouveau/nv04_pushbuf.h"
#include "nv50_context.h"
#include "nv50_resource.h"
#include "pipe/p_defines.h"
diff --git a/src/gallium/drivers/nvfx/nv04_2d.c b/src/gallium/drivers/nvfx/nv04_2d.c
index e0e65e7..e2fadd3 100644
--- a/src/gallium/drivers/nvfx/nv04_2d.c
+++ b/src/gallium/drivers/nvfx/nv04_2d.c
@@ -34,11 +34,11 @@
#include <stdio.h>
#include <stdint.h>
#include <nouveau/nouveau_device.h>
-#include <nouveau/nouveau_pushbuf.h>
#include <nouveau/nouveau_channel.h>
#include <nouveau/nouveau_bo.h>
#include <nouveau/nouveau_notifier.h>
#include <nouveau/nouveau_grobj.h>
+#include <nouveau/nv04_pushbuf.h>
#include "nv04_2d.h"
#include "nouveau/nv_object.xml.h"
diff --git a/src/gallium/drivers/nvfx/nvfx_vbo.c b/src/gallium/drivers/nvfx/nvfx_vbo.c
index 597664e..339b317 100644
--- a/src/gallium/drivers/nvfx/nvfx_vbo.c
+++ b/src/gallium/drivers/nvfx/nvfx_vbo.c
@@ -9,8 +9,7 @@
#include "nvfx_resource.h"
#include "nouveau/nouveau_channel.h"
-
-#include "nouveau/nouveau_pushbuf.h"
+#include "nouveau/nv04_pushbuf.h"
static inline unsigned
util_guess_unique_indices_count(unsigned mode, unsigned indices)
diff --git a/src/mesa/drivers/dri/nouveau/nouveau_driver.h b/src/mesa/drivers/dri/nouveau/nouveau_driver.h
index 8036b18..c5ac128 100644
--- a/src/mesa/drivers/dri/nouveau/nouveau_driver.h
+++ b/src/mesa/drivers/dri/nouveau/nouveau_driver.h
@@ -38,7 +38,6 @@
#include <assert.h>
#include "nouveau_device.h"
-#include "nouveau_pushbuf.h"
#include "nouveau_grobj.h"
#include "nouveau_channel.h"
#include "nouveau_bo.h"
@@ -46,6 +45,7 @@
#include "nouveau_screen.h"
#include "nouveau_state.h"
#include "nouveau_surface.h"
+#include "nv04_pushbuf.h"
#define DRIVER_DATE "20091015"
#define DRIVER_AUTHOR "Nouveau"
--
cgit v0.8.3-6-g21f6
This diff is collapsed.
......@@ -5,21 +5,21 @@
_pkgbasename=nvidia-utils
pkgname=lib32-$_pkgbasename
pkgver=260.19.36
pkgver=270.41.06
pkgrel=1
pkgdesc="NVIDIA drivers utilities and libraries. (32-bit)"
arch=('x86_64')
url="http://www.nvidia.com/"
depends=('lib32-libxvmc' $_pkgbasename)
depends=('lib32-libxvmc' 'lib32-zlib' 'lib32-gcc-libs' $_pkgbasename)
conflicts=('lib32-libgl')
provides=('lib32-libgl=7.9.0')
provides=('lib32-libgl=7.10.2')
license=('custom')
options=('!strip')
_arch='x86'
_pkg="NVIDIA-Linux-${_arch}-${pkgver}"
source=("http://us.download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run")
md5sums=('2826484d87827351774449382e45c4a9')
source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run")
md5sums=('702868c77b13bba46f0fce26ed7a1fb7')
build() {
cd $srcdir
......@@ -47,6 +47,9 @@ package() {
install -D -m755 libnvidia-compiler.so.$pkgver $pkgdir/usr/lib32/libnvidia-compiler.so.$pkgver
install -D -m755 libOpenCL.so.1.0.0 $pkgdir/usr/lib32/libOpenCL.so.1.0.0
install -D -m755 libnvidia-cfg.so.$pkgver $pkgdir/usr/lib32/libnvidia-cfg.so.$pkgver
install -D -m755 libnvidia-ml.so.$pkgver $pkgdir/usr/lib32/libnvidia-ml.so.$pkgver
# create soname links
for _lib in $(find $pkgdir -name '*.so*'); do
_soname="$(dirname ${_lib})/$(readelf -d "$_lib" | sed -nr 's/.*Library soname: \[(.*)\].*/\1/p')"
......@@ -60,3 +63,4 @@ package() {
mkdir -p "$pkgdir/usr/share/licenses"
ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
}
......@@ -5,7 +5,7 @@
_pkgbasename=pixman
pkgname=lib32-$_pkgbasename
pkgver=0.20.0
pkgver=0.21.8
pkgrel=1
pkgdesc="Pixman library (32-bit)"
arch=('x86_64')
......@@ -15,7 +15,7 @@ depends=('lib32-glibc' $_pkgbasename)
makedepends=('gcc-multilib')
options=('!libtool')
source=(http://xorg.freedesktop.org/releases/individual/lib/${_pkgbasename}-${pkgver}.tar.bz2)
sha1sums=('2d9e3416f8bcf561a85c381a568d23fd53e0e922')
md5sums=('1a46b77586fbfd517cccf8ced3a835a1')
build() {
export CC="gcc -m32"
......@@ -23,7 +23,9 @@ build() {