rebuild/update lib32 nvidia deps, and json-c

This commit is contained in:
AlmAck 2015-11-17 20:33:15 +01:00
parent 9a0e0a7bd3
commit 1638de7a28
5 changed files with 31 additions and 117 deletions

View File

@ -1,59 +1,38 @@
#
# Chakra Packages for Chakra, part of chakra-project.org
#
# Maintainer: Daniele Cocca <jmc@chakra-project.org>
<<<<<<< HEAD
# include global config
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgname=lib32-json-c
_basepkgname=json-c
pkgver=0.9
pkgrel=1
pkgdesc="JSON-C implements a reference counting object model that allows you to easily construct JSON objects in C, output them as JSON formatted strings and parse JSON formatted strings back into the C representation of JSON objects."
arch=('i686' 'x86_64')
url="http://oss.metaparadigm.com/json-c"
depends=($_basepkgname)
license=('GPL')
source=("http://oss.metaparadigm.com/${_basepkgname}/${_basepkgname}-${pkgver}.tar.gz")
md5sums=('3a13d264528dcbaf3931b0cede24abae')
=======
_pkgbasename=json-c
pkgname=lib32-$_pkgbasename
pkgver=0.11
pkgrel=2
pkgdesc="JSON-C implements a reference counting object model that allows you to easily construct JSON objects in C, output them as JSON formatted strings and parse JSON formatted strings back into the C representation of JSON objects."
pkgver=0.12
pkgrel=1
pkgdesc="A JSON implementation in C (32-bit)"
arch=('x86_64')
url="https://github.com/json-c/json-c/wiki"
depends=($_pkgbasename=$pkgver)
makedepends=('lib32-gcc-libs')
license=('GPL')
options=(!libtool !makeflags)
source=("https://s3.amazonaws.com/${_pkgbasename}_releases/releases/${_pkgbasename}-${pkgver}.tar.gz")
md5sums=('aa02367d2f7a830bf1e3376f77881e98')
>>>>>>> 600514ebcaaf80d91da28d7572f7905dbeed7b0a
md5sums=('3ca4bbb881dfc4017e8021b5e0a8c491')
build() {
cd $_pkgbasename-$pkgver
export CC="gcc -m32"
export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
<<<<<<< HEAD
cd "${srcdir}/${_basepkgname}-${pkgver}"
./configure --prefix=/usr --libdir=/usr/lib32
=======
cd "${srcdir}/${_pkgbasename}-${pkgver}"
CFLAGS+=" -Wno-error=unused-but-set-variable"
./configure --prefix=/usr --libdir=/usr/lib32 --disable-static
>>>>>>> 600514ebcaaf80d91da28d7572f7905dbeed7b0a
make
}
package() {
<<<<<<< HEAD
cd "${srcdir}/${_basepkgname}-${pkgver}"
=======
cd "${srcdir}/${_pkgbasename}-${pkgver}"
>>>>>>> 600514ebcaaf80d91da28d7572f7905dbeed7b0a
make DESTDIR="${pkgdir}" install
rm -rf ${pkgdir}/usr/include
cd $_pkgbasename-$pkgver
make DESTDIR="$pkgdir" install
rm -r "$pkgdir/usr/include"
mkdir -p "$pkgdir/usr/share/licenses"
ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
}
# vim:set ts=2 sw=2 et:

View File

@ -1,61 +0,0 @@
# Maintainer: Neophytos Kolokotronis <tetris4@gmail.com>
# Contributions from AUR file: https://aur.archlinux.org/packages/lib32-nvidia-utils-304xx/
_pkgbasename=nvidia-173xx-utils
pkgname=lib32-$_pkgbasename
pkgver=173.14.39
pkgrel=2
pkgdesc="NVIDIA drivers utilities and libraries, 173xx branch. (32-bit)"
arch=('x86_64')
url="http://www.nvidia.com/"
depends=('lib32-libxvmc' 'lib32-zlib' 'lib32-gcc-libs' 'lib32-mesa' "$_pkgbasename=$pkgver")
conflicts=('lib32-libgl')
provides=('lib32-libgl')
license=('custom')
options=('!strip')
_parch='x86'
_pkg="NVIDIA-Linux-${_parch}-${pkgver}-pkg0"
source=("http://us.download.nvidia.com/XFree86/Linux-${_parch}/${pkgver}/NVIDIA-Linux-${_parch}-${pkgver}-pkg0.run")
md5sums=('5b423543428554ef33a200fbbe3cb9fc')
prepare() {
cd "${srcdir}"
[[ -d ${_pkg} ]] && rm -rf ${_pkg}
sh ${_pkg}.run --extract-only
}
package() {
cd "${srcdir}/${_pkg}/usr/"
mkdir -p $pkgdir/usr/lib32
mkdir -p $pkgdir/usr/share/licenses/
install lib/{libGLcore,libGL,libnvidia-cfg,tls/libnvidia-tls}.so.${pkgver} \
$pkgdir/usr/lib32/
install X11R6/lib/libXv* $pkgdir/usr/lib32/
cd $pkgdir/usr/lib32/
ln -s libGL.so.$pkgver libGL.so
ln -s libGL.so.$pkgver libGL.so.1
ln -s libGLcore.so.$pkgver libGLcore.so.1
ln -s libnvidia-cfg.so.$pkgver libnvidia-cfg.so.1
ln -s libnvidia-tls.so.$pkgver libnvidia-tls.so.1
ln -s libXvMCNVIDIA.so.$pkgver libXvMCNVIDIA_dynamic.so.1
# We have to provide symlinks to mesa, as nvidia 173xx doesn't ship them
ln -s mesa/libEGL.so.1.0.0 "${pkgdir}/usr/lib32/libEGL.so.1.0.0"
ln -s libEGL.so.1.0.0 "${pkgdir}/usr/lib32/libEGL.so.1"
ln -s libEGL.so.1.0.0 "${pkgdir}/usr/lib32/libEGL.so"
ln -s mesa/libGLESv1_CM.so.1.1.0 "${pkgdir}/usr/lib32/libGLESv1_CM.so.1.1.0"
ln -s libGLESv1_CM.so.1.1.0 "${pkgdir}/usr/lib32/libGLESv1_CM.so.1"
ln -s libGLESv1_CM.so.1.1.0 "${pkgdir}/usr/lib32/libGLESv1_CM.so"
ln -s mesa/libGLESv2.so.2.0.0 "${pkgdir}/usr/lib32/libGLESv2.so.2.0.0"
ln -s libGLESv2.so.2.0.0 "${pkgdir}/usr/lib32/libGLESv2.so.2"
ln -s libGLESv2.so.2.0.0 "${pkgdir}/usr/lib32/libGLESv2.so"
ln -s nvidia-173xx $pkgdir/usr/share/licenses/lib32-nvidia-173xx-utils
find $pkgdir/usr -type d -exec chmod 755 {} \;
}

View File

@ -3,11 +3,7 @@
_pkgbasename=nvidia-304xx-utils
pkgname=lib32-$_pkgbasename
<<<<<<< HEAD
pkgver=304.117
=======
pkgver=304.125
>>>>>>> 600514ebcaaf80d91da28d7572f7905dbeed7b0a
pkgver=304.128
pkgrel=1
pkgdesc="NVIDIA drivers utilities and libraries. (32-bit)"
arch=('x86_64')
@ -21,11 +17,8 @@ options=('!strip')
_parch='x86'
_pkg="NVIDIA-Linux-${_parch}-${pkgver}"
source=("ftp://download.nvidia.com/XFree86/Linux-${_parch}/${pkgver}/${_pkg}.run")
<<<<<<< HEAD
md5sums=('023eb03da304a1842fc503c81e3c5694')
=======
md5sums=('bc3b0ac291fa998d5109a6f7e94fb2d4')
>>>>>>> 600514ebcaaf80d91da28d7572f7905dbeed7b0a
md5sums=('be2b40a4dc3339b050a4f76ddd27e96c')
build() {
cd "${srcdir}"

View File

@ -5,7 +5,7 @@
_pkgbasename=nvidia-340xx-utils
pkgbase=lib32-$_pkgbasename
pkgname=('lib32-nvidia-340xx-utils' 'lib32-nvidia-340xx-libgl' 'lib32-opencl-nvidia-340xx')
pkgver=340.76
pkgver=340.93
pkgrel=1
arch=('x86_64')
url="http://www.nvidia.com/"
@ -15,7 +15,7 @@ options=('!strip')
_ARCH='x86'
_pkg="NVIDIA-Linux-${_ARCH}-${pkgver}"
source=("ftp://download.nvidia.com/XFree86/Linux-${_ARCH}/${pkgver}/${_pkg}.run")
md5sums=('8064c0a0998c3e7ee3c98ac1832b8194')
md5sums=('4a7edf6838a80c77a57fb6f6ec7f0437')
create_links() {
# create soname links

View File

@ -3,7 +3,7 @@
_pkgbasename=nvidia-utils
pkgbase=lib32-$_pkgbasename
pkgname=('lib32-nvidia-utils' 'lib32-nvidia-libgl' 'lib32-opencl-nvidia')
pkgver=352.30
pkgver=355.11
pkgrel=1
arch=('x86_64')
url="http://www.nvidia.com/"
@ -12,7 +12,7 @@ options=('!strip')
_pkg="NVIDIA-Linux-x86-${pkgver}"
source=("ftp://download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run")
md5sums=('7e59d84eafe2482b2f02df692b9168d5')
md5sums=('16d143ccafe99328a2ca8e5a396fd4bc')
create_links() {
# create soname links
@ -57,9 +57,9 @@ package_lib32-nvidia-libgl() {
ln -s "libGL.so.${pkgver}" "${pkgdir}/usr/lib32/libGL.so.1"
ln -s "libGL.so.${pkgver}" "${pkgdir}/usr/lib32/libGL.so"
ln -s "/usr/lib32/nvidia/libEGL.so.${pkgver}" "${pkgdir}/usr/lib32/libEGL.so.${pkgver}"
ln -s "libEGL.so.${pkgver}" "${pkgdir}/usr/lib32/libEGL.so.1"
ln -s "libEGL.so.${pkgver}" "${pkgdir}/usr/lib32/libEGL.so"
ln -s "/usr/lib32/nvidia/libEGL.so.1" "${pkgdir}/usr/lib32/libEGL.so.1"
ln -s "libEGL.so.1" "${pkgdir}/usr/lib32/libEGL.so.${pkgver}"
ln -s "libEGL.so.1" "${pkgdir}/usr/lib32/libEGL.so"
ln -s "/usr/lib32/nvidia/libGLESv1_CM.so.${pkgver}" "${pkgdir}/usr/lib32/libGLESv1_CM.so.${pkgver}"
ln -s "libGLESv1_CM.so.${pkgver}" "${pkgdir}/usr/lib32/libGLESv1_CM.so.1"
@ -84,9 +84,12 @@ package_lib32-nvidia-utils() {
# OpenGL libraries
install -D -m755 "libGL.so.${pkgver}" "${pkgdir}/usr/lib32/nvidia/libGL.so.${pkgver}"
install -D -m755 "libEGL.so.${pkgver}" "${pkgdir}/usr/lib32/nvidia/libEGL.so.${pkgver}"
install -D -m755 "libEGL.so.1" "${pkgdir}/usr/lib32/nvidia/libEGL.so.1"
install -D -m755 "libEGL_nvidia.so.0" "${pkgdir}/usr/lib/libEGL_nvidia.so.0"
install -D -m755 "libGLESv1_CM.so.${pkgver}" "${pkgdir}/usr/lib32/nvidia/libGLESv1_CM.so.${pkgver}"
install -D -m755 "libGLESv2.so.${pkgver}" "${pkgdir}/usr/lib32/nvidia/libGLESv2.so.${pkgver}"
install -D -m755 "libOpenGL.so.0" "${pkgdir}/usr/lib/libOpenGL.so.0"
install -D -m755 "libGLdispatch.so.0" "${pkgdir}/usr/lib/libGLdispatch.so.0"
# OpenGL core library
install -D -m755 "libnvidia-glcore.so.${pkgver}" "${pkgdir}/usr/lib32/libnvidia-glcore.so.${pkgver}"