Chakra_Linux/lib32
1
0
Fork 0
mirror of https://gitdl.cn/https://github.com/chakralinux/lib32.git synced 2025-01-24 09:52:15 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

rebuild mesa with new xorg

Browse Source
This commit is contained in:
Weng Xuetian 2014-07-03 20:34:49 +00:00
parent 113621c0f6
commit af2483dbbf
4 changed files with 76 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib32-libxshmfence/PKGBUILD
View File

@ -3,7 +3,7 @@
_pkgbasename=libxshmfence
pkgname=lib32-${_pkgbasename}
pkgver=1.1
pkgrel=1
pkgrel=2
pkgdesc="a library that exposes a event API on top of Linux futexes"
arch=('x86_64')
url="http://xorg.freedesktop.org/"

2
lib32-mesa/PKGBUILD
View File

@ -5,7 +5,7 @@ _pkgbasename=mesa
pkgbase=lib32-mesa
pkgname=('lib32-ati-dri' 'lib32-intel-dri' 'lib32-nouveau-dri' 'lib32-mesa' 'lib32-mesa-libgl')
pkgver=10.2.2
pkgrel=1
pkgrel=2
arch=('x86_64')
makedepends=('python2' 'lib32-libxml2' 'lib32-expat' 'lib32-libx11' 'glproto' 'lib32-libdrm' 'dri2proto' 'presentproto' 'dri3proto'
'lib32-libxxf86vm' 'lib32-libxdamage' 'gcc-multilib' 'lib32-elfutils' 'lib32-llvm' 'lib32-systemd' 'lib32-libvdpau' 'lib32-wayland' 'lib32-libxshmfence')

12
lib32-pcre/PKGBUILD
View File

@ -3,7 +3,7 @@
_pkgbasename=pcre
pkgname=lib32-$_pkgbasename
pkgver=8.34
pkgver=8.35
pkgrel=1
pkgdesc="A library that implements Perl 5-style regular expressions (32-bit)"
arch=('x86_64')
@ -11,9 +11,15 @@ url="http://pcre.sourceforge.net"
license=('custom')
depends=('lib32-gcc-libs' $_pkgbasename=$pkgver)
makedepends=('gcc-multilib')
source=(ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${_pkgbasename}-${pkgver}.tar.bz2)
source=("ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${_pkgbasename}-${pkgver}.tar.bz2"
"pcre-8.35-Do-not-rely-on-wrapping-signed-integer-while-parsein.patch")
md5sums=('5439e321351bddd5533551bbce128d07')
prepare() {
cd "${srcdir}"/${_pkgbasename}-${pkgver}
patch -Np1 -i "../pcre-8.35-Do-not-rely-on-wrapping-signed-integer-while-parsein.patch" || return 1
}
build() {
cd "${srcdir}"/${_pkgbasename}-${pkgver}
export CC="gcc -m32"
@ -33,3 +39,5 @@ package() {
mkdir -p "$pkgdir/usr/share/licenses"
ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
}
md5sums=('6aacb23986adccd9b3bc626c00979958'
'a2bc385e8c65edc84e98c9ea5471f169')

64
lib32-pcre/pcre-8.35-Do-not-rely-on-wrapping-signed-integer-while-parsein.patch Normal file
View File

@ -0,0 +1,64 @@
From a05e11ff3a663c06e0a30dfa86aa7ed4544a6008 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
Date: Fri, 11 Apr 2014 13:41:13 +0200
Subject: [PATCH] Do not rely on wrapping signed integer while parseing
{min,max}
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed integer overflow is not defined in C language. GCC 4.9 bails
out here.
Signed-off-by: Petr Písař <ppisar@redhat.com>
---
pcre_compile.c | 24 ++++++++++++++++--------
1 file changed, 16 insertions(+), 8 deletions(-)
diff --git a/pcre_compile.c b/pcre_compile.c
index 8a5b723..ce65058 100644
--- a/pcre_compile.c
+++ b/pcre_compile.c
@@ -1586,11 +1586,15 @@ int max = -1;
/* Read the minimum value and do a paranoid check: a negative value indicates
an integer overflow. */
-while (IS_DIGIT(*p)) min = min * 10 + (int)(*p++ - CHAR_0);
-if (min < 0 || min > 65535)
+while (IS_DIGIT(*p))
{
- *errorcodeptr = ERR5;
- return p;
+ min = min * 10 + (int)(*p++ - CHAR_0);
+ if (min > 65535)
+ {
+ *errorcodeptr = ERR5;
+ while (*p != CHAR_RIGHT_CURLY_BRACKET) p++;
+ return p;
+ }
}
/* Read the maximum value if there is one, and again do a paranoid on its size.
@@ -1601,11 +1605,15 @@ if (*p == CHAR_RIGHT_CURLY_BRACKET) max = min; else
if (*(++p) != CHAR_RIGHT_CURLY_BRACKET)
{
max = 0;
- while(IS_DIGIT(*p)) max = max * 10 + (int)(*p++ - CHAR_0);
- if (max < 0 || max > 65535)
+ while(IS_DIGIT(*p))
{
- *errorcodeptr = ERR5;
- return p;
+ max = max * 10 + (int)(*p++ - CHAR_0);
+ if (max > 65535)
+ {
+ *errorcodeptr = ERR5;
+ while (*p != CHAR_RIGHT_CURLY_BRACKET) p++;
+ return p;
+ }
}
if (max < min)
{
--
1.9.0