diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2012-03-15 12:56:39 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2012-03-15 12:56:39 +0000 |
| commit | 27ea70e01bb3a594eddcc08280bf20718ad859bd (patch) | |
| tree | 783b169b240c10aca8315a1cc0f1f7682db2b4dd | |
| parent | 18f767a1f908924e194eb7516444c827b62c24cd (diff) | |
| download | aports-27ea70e01bb3a594eddcc08280bf20718ad859bd.tar.bz2 aports-27ea70e01bb3a594eddcc08280bf20718ad859bd.tar.xz | |
main/mesa: add pach for pax'ed kernels
| -rw-r--r-- | main/mesa/APKBUILD | 11 | ||||
| -rw-r--r-- | main/mesa/glx_ro_text_segm.patch | 28 |
2 files changed, 36 insertions, 3 deletions
diff --git a/main/mesa/APKBUILD b/main/mesa/APKBUILD index 6ba55652e5..5269d13562 100644 --- a/main/mesa/APKBUILD +++ b/main/mesa/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mesa pkgver=8.0.1 -pkgrel=0 +pkgrel=1 pkgdesc="Mesa DRI OpenGL library" url="http://www.mesa3d.org" arch="all" @@ -19,11 +19,13 @@ subpackages="$pkgname-dev depends_dev="libdrm-dev dri2proto libx11-dev libxext-dev libxxf86vm-dev libxdamage-dev libxfixes-dev libxcb-dev glproto" makedepends="$depends_dev expat-dev xextproto python libxt-dev makedepend - talloc-dev py-libxml2 flex bison llvm-dev" + talloc-dev py-libxml2 flex bison llvm-dev + autoconf automake" source="ftp://ftp.freedesktop.org/pub/mesa/$pkgver/MesaLib-$pkgver.tar.bz2 mesa-7.10-uclibc-glsl.patch mesa-7.10-uclibc-gallium.patch imports-uclibc.patch + glx_ro_text_segm.patch " @@ -47,6 +49,7 @@ prepare() { *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; esac done + aclocal && automake --add-missing && autoreconf || return 1 } dev() { @@ -66,6 +69,7 @@ build() { --enable-gles2 \ --with-gallium-drivers=i915,nouveau,r300,r600,svga,swrast \ --disable-gallium-egl \ + --enable-glx-rts \ || return 1 make || return 1 @@ -130,4 +134,5 @@ vmwgfx() { _mv_dri vmwgfx_dri; } md5sums="24eeebf66971809d8f40775a379b36c9 MesaLib-8.0.1.tar.bz2 03e9685b0d714e915c35fd0fb5fde810 mesa-7.10-uclibc-glsl.patch 90a2ea438ff328443a0436a91a74d518 mesa-7.10-uclibc-gallium.patch -9dc5080bb4d9d436b476bfeb878ca224 imports-uclibc.patch" +9dc5080bb4d9d436b476bfeb878ca224 imports-uclibc.patch +a1a766b4c6a96d67cad9bd7ad5c578e8 glx_ro_text_segm.patch" diff --git a/main/mesa/glx_ro_text_segm.patch b/main/mesa/glx_ro_text_segm.patch new file mode 100644 index 0000000000..8cad4876b0 --- /dev/null +++ b/main/mesa/glx_ro_text_segm.patch @@ -0,0 +1,28 @@ +2011-02-09 Jeremy Huddleston <jeremyhu@freedesktop.org + + #240956 + * configure.ac add support to enable readonly test segment on x86 + +--- ./configure.ac.orig 2008-11-17 23:19:38.000000000 +0100 ++++ ./configure.ac 2008-11-17 23:20:17.000000000 +0100 +@@ -499,6 +499,20 @@ + enable_xcb=no + fi + ++ ++dnl readonly text segment on x86 hardened platforms ++AC_ARG_ENABLE([glx_rts], ++ [AS_HELP_STRING([--enable-glx-rts], ++ [on x86, use a readonly text segment for libGL @<:@default=disabled@:>@])], ++ [enable_glx_rts="$enableval"], ++ [enable_glx_rts=no]) ++if test "x$enable_glx_rts" = xyes; then ++ DEFINES="$DEFINES -DGLX_X86_READONLY_TEXT" ++else ++ enable_glx_rts=no ++fi ++ ++ + dnl + dnl libGL configuration per driver + dnl |