[arch-commits] Commit in mesa/trunk (PKGBUILD git_fixes.patch)
Date: Thursday, July 18, 2013 @ 14:47:35
Author: lcarlier
Revision: 190836
upgpkg: mesa 9.1.5-1
upstream update 9.1.5
Modified:
mesa/trunk/PKGBUILD
Deleted:
mesa/trunk/git_fixes.patch
-+
PKGBUILD| 16 -
git_fixes.patch | 476 --
2 files changed, 6 insertions(+), 486 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-07-18 12:20:11 UTC (rev 190835)
+++ PKGBUILD2013-07-18 12:47:35 UTC (rev 190836)
@@ -4,8 +4,8 @@
pkgbase=mesa
pkgname=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa' 'mesa-libgl')
-pkgver=9.1.4
-pkgrel=5
+pkgver=9.1.5
+pkgrel=1
arch=('i686' 'x86_64')
makedepends=('python2' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto'
'libxxf86vm' 'libxdamage'
'libvdpau' 'wayland' 'llvm-amdgpu-snapshot' 'systemd')
@@ -13,17 +13,10 @@
license=('custom')
options=('!libtool')
source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2
-git_fixes.patch
LICENSE)
-md5sums=('a2c4e25d0e27918bc67f61bae04d0cb8'
- '8ec30e1bd7abe5e8e540df4fa618540f'
+md5sums=('4ed2af5943141a85a21869053a2fc2eb'
'5c65a0fe315dd347e09b1f2826a1df5a')
-prepare() {
-cd ?esa-*
-patch -Np1 -i ../git_fixes.patch
-}
-
build() {
cd ${srcdir}/?esa-*
@@ -61,6 +54,7 @@
package_ati-dri() {
pkgdesc=Mesa drivers for AMD/ATI Radeon
depends=(mesa-libgl=${pkgver})
+ optdepends=('libtxc_dxtn: S3 Texture Compressed support')
conflicts=('xf86-video-ati6.9.0-6')
install -m755 -d ${pkgdir}/usr/lib/vdpau/
@@ -78,6 +72,7 @@
package_intel-dri() {
pkgdesc=Mesa drivers for Intel
+ optdepends=('libtxc_dxtn: S3 Texture Compressed support')
depends=(mesa-libgl=${pkgver})
install -m755 -d ${pkgdir}/usr/lib/xorg/modules/dri
@@ -89,6 +84,7 @@
package_nouveau-dri() {
pkgdesc=Mesa drivers for Nouveau
+ optdepends=('libtxc_dxtn: S3 Texture Compressed support')
depends=(mesa-libgl=${pkgver})
# vdpau driver is problematic, so remove it (FS#36004)
Deleted: git_fixes.patch
===
--- git_fixes.patch 2013-07-18 12:20:11 UTC (rev 190835)
+++ git_fixes.patch 2013-07-18 12:47:35 UTC (rev 190836)
@@ -1,476 +0,0 @@
-From 6194644a49f841488e23ce021e7817ec02927eef Mon Sep 17 00:00:00 2001
-From: Ian Romanick ian.d.roman...@intel.com
-Date: Mon, 01 Jul 2013 21:31:03 +
-Subject: docs: Add 9.1.4 release md5sums
-
-Signed-off-by: Ian Romanick ian.d.roman...@intel.com
-diff --git a/docs/relnotes-9.1.4.html b/docs/relnotes-9.1.4.html
-index 48e421b..fa6fe67 100644
a/docs/relnotes-9.1.4.html
-+++ b/docs/relnotes-9.1.4.html
-@@ -30,7 +30,9 @@ because GL_ARB_compatibility is not supported.
-
- h2MD5 checksums/h2
- pre
--TBD
-+a2c4e25d0e27918bc67f61bae04d0cb8 MesaLib-9.1.4.tar.bz2
-+8c7e9ce5b05cb2223f0587396dd9dc08 MesaLib-9.1.4.tar.gz
-+020459c5793d4279bdcb2daa1f7dd9f6 MesaLib-9.1.4.zip
- /pre
-
- h2New features/h2
---
-cgit v0.9.0.2-2-gbebe
-
-From e94a89de4deeabd0f8347795385b2f098aa35365 Mon Sep 17 00:00:00 2001
-From: Vinson Lee v...@freedesktop.org
-Date: Fri, 01 Feb 2013 07:28:41 +
-Subject: swrast: Fix memory leak.
-
-Fixes resource leak defect reported by Coverity.
-
-Signed-off-by: Vinson Lee v...@freedesktop.org
-Reviewed-by: Brian Paul bri...@vmware.com
-(cherry picked from commit 985e710c0d1f4f3bbd18448f04e611bd57ae9100)
-diff --git a/src/mesa/drivers/dri/swrast/swrast.c
b/src/mesa/drivers/dri/swrast/swrast.c
-index 9638271..b380de3 100644
a/src/mesa/drivers/dri/swrast/swrast.c
-+++ b/src/mesa/drivers/dri/swrast/swrast.c
-@@ -363,6 +363,7 @@ swrast_new_renderbuffer(const struct gl_config *visual,
__DRIdrawable *dPriv,
- xrb-bpp = 8;
- break;
- default:
-+ free(xrb);
- return NULL;
- }
-
---
-cgit v0.9.0.2-2-gbebe
-
-From ab159327a7dc2dd41f9887d053d4abb3de69d195 Mon Sep 17 00:00:00 2001
-From: Ian Romanick ian.d.roman...@intel.com
-Date: Mon, 10 Jun 2013 17:33:59 +
-Subject: glsl: Add a gl_shader_program parameter to
_mesa_uniform_{merge,split}_location_offset
-
-This will be used in the next commit.
-
-NOTE: This is a candidate for stable release branches.
-
-Signed-off-by: Ian Romanick ian.d.roman...@intel.com
-Reviewed-by: Brian Paul bri...@vmware.com
-Reviewed-and-tested-by: Chad Versace chad.vers...@linux.intel.com
-(cherry picked from commit 5097f358419c067a71e96e39764b3bb0a716bdbb)
-diff --git a/src/mesa/main/uniform_query.cpp b/src/mesa/main/uniform_query.cpp
-index b8335fe..fbbe577 100644
a/src/mesa/main/uniform_query.cpp
-+++ b/src/mesa/main/uniform_query.cpp
-@@ -234,7 +234,7 @@ validate_uniform_parameters(struct gl_context *ctx,
- return false;
-}
-
-- _mesa_uniform_split_location_offset(location, loc, array_index);
-+ _mesa_uniform_split_location_offset(shProg, location, loc, array_index);
-
-
[arch-commits] Commit in mesa/trunk (PKGBUILD git_fixes.patch linking_fix.patch)
Date: Monday, August 1, 2011 @ 08:57:59
Author: ibiru
Revision: 134098
update to 7.11 final
Modified:
mesa/trunk/PKGBUILD
Deleted:
mesa/trunk/git_fixes.patch
mesa/trunk/linking_fix.patch
---+
PKGBUILD | 15 +--
git_fixes.patch | 36
linking_fix.patch | 22 --
3 files changed, 5 insertions(+), 68 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-08-01 11:25:34 UTC (rev 134097)
+++ PKGBUILD2011-08-01 12:57:59 UTC (rev 134098)
@@ -10,9 +10,9 @@
if [ ${_git} = true ]; then
#pkgver=7.10.99.git20110709
-pkgver=7.11rc4
+pkgver=7.11
else
-pkgver=7.11rc4
+pkgver=7.11
fi
pkgrel=1
arch=('i686' 'x86_64')
@@ -20,27 +20,22 @@
'gcc-libs=4.6.1' 'dri2proto=2.6' 'python2' 'libxml2' 'imake'
'llvm' 'udev')
url=http://mesa3d.sourceforge.net;
license=('custom')
-source=(LICENSE
- #git_fixes.patch
- linking_fix.patch)
+source=(LICENSE)
if [ ${_git} = true ]; then
# mesa git shot from 7.11 branch - see for state:
http://cgit.freedesktop.org/mesa/mesa/commit/?h=7.11id=1ae00c5960af83bea9545a18a1754bad83d5cbd0
#source=(${source[@]}
'ftp://ftp.archlinux.org/other/mesa/mesa-1ae00c5960af83bea9545a18a1754bad83d5cbd0.tar.bz2')
source=(${source[@]}
MesaLib-${pkgver}.zip::http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-ef9f16f6322a89fb699fbe3da868b10f9acaef98.tar.bz2;)
else
- source=(${source[@]}
ftp://ftp.freedesktop.org/pub/mesa/${pkgver/rc4/}/MesaLib-${pkgver/rc/-rc}.tar.bz2;
+ source=(${source[@]}
ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2;
)
fi
md5sums=('5c65a0fe315dd347e09b1f2826a1df5a'
- '887be83c01d126c2a4cb372af7d3b067'
- '1236827baf4b274233341e8651ece8fd')
+ 'ff03aca82d0560009a076a87c888cf13')
build() {
cd ${srcdir}/?esa-*
if [ ${_git} = true ]; then
-#patch -Np1 -i ${srcdir}/git_fixes.patch
-patch -Np1 -i ${srcdir}/linking_fix.patch
autoreconf -vfi
./autogen.sh --prefix=/usr \
--with-dri-driverdir=/usr/lib/xorg/modules/dri \
Deleted: git_fixes.patch
===
--- git_fixes.patch 2011-08-01 11:25:34 UTC (rev 134097)
+++ git_fixes.patch 2011-08-01 12:57:59 UTC (rev 134098)
@@ -1,36 +0,0 @@
-From 804995807dfea9cbdbd676e52b95d42715101913 Mon Sep 17 00:00:00 2001
-From: Eric Anholt e...@anholt.net
-Date: Fri, 08 Jul 2011 22:30:48 +
-Subject: i965/gen4: Fix GPU hangs since the program streaming change.
-
-This was tricky. We were doing a use-before-initialize of
-grf_reg_count, but the value usually got overwritten anyway -- when we
-didn't have to do a relocation (typical), or on gen5 when we didn't
-have relocations at all.
-
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=38771
-Reviewed-by: Kenneth Graunke kenn...@whitecape.org
-(cherry picked from commit d03fdc4cdefdfdc5b59547945704c6037a5061c7)
-diff --git a/src/mesa/drivers/dri/i965/brw_vs_state.c
b/src/mesa/drivers/dri/i965/brw_vs_state.c
-index d5010a2..179ca19 100644
a/src/mesa/drivers/dri/i965/brw_vs_state.c
-+++ b/src/mesa/drivers/dri/i965/brw_vs_state.c
-@@ -47,6 +47,7 @@ brw_prepare_vs_unit(struct brw_context *brw)
-memset(vs, 0, sizeof(*vs));
-
-/* BRW_NEW_PROGRAM_CACHE | CACHE_NEW_VS_PROG */
-+ vs-thread0.grf_reg_count = ALIGN(brw-vs.prog_data-total_grf, 16) / 16 -
1;
-vs-thread0.kernel_start_pointer =
- brw_program_reloc(brw,
- brw-vs.state_offset +
-@@ -54,7 +55,6 @@ brw_prepare_vs_unit(struct brw_context *brw)
- brw-vs.prog_offset +
- (vs-thread0.grf_reg_count 1)) 6;
-
-- vs-thread0.grf_reg_count = ALIGN(brw-vs.prog_data-total_grf, 16) / 16 -
1;
-vs-thread1.floating_point_mode = BRW_FLOATING_POINT_NON_IEEE_754;
-/* Choosing multiple program flow means that we may get 2-vertex threads,
- * which will have the channel mask for dwords 4-7 enabled in the thread,
---
-cgit v0.8.3-6-g21f6
Deleted: linking_fix.patch
===
--- linking_fix.patch 2011-08-01 11:25:34 UTC (rev 134097)
+++ linking_fix.patch 2011-08-01 12:57:59 UTC (rev 134098)
@@ -1,22 +0,0 @@
-From 5fe5d236c26b3b2428bc7395304e40cf21d3d3e1 Mon Sep 17 00:00:00 2001
-From: Chia-I Wu o...@lunarg.com
-Date: Wed, 13 Jul 2011 07:25:46 +
-Subject: targets/egl-static: fix a linking error
-
-rbug is always linked in and it needs libpthread.
-diff --git a/src/gallium/targets/egl-static/Makefile
b/src/gallium/targets/egl-static/Makefile
-index 832d7ba..69e7eec 100644
a/src/gallium/targets/egl-static/Makefile
-+++ b/src/gallium/targets/egl-static/Makefile
-@@ -42,7 +42,7 @@ egl_CPPFLAGS += \
- -I$(TOP)/src/egl/main \
- -D_EGL_MAIN=_eglMain
- egl_LIBS +=
[arch-commits] Commit in mesa/trunk (PKGBUILD git_fixes.patch)
Date: Sunday, July 10, 2011 @ 05:28:29
Author: andyrtr
Revision: 131079
upgpkg: mesa 7.11rc1-2
add one late upstream fix that should solve FS#25080
Added:
mesa/trunk/git_fixes.patch
Modified:
mesa/trunk/PKGBUILD
-+
PKGBUILD|6 --
git_fixes.patch | 36
2 files changed, 40 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-07-10 02:10:58 UTC (rev 131078)
+++ PKGBUILD2011-07-10 09:28:29 UTC (rev 131079)
@@ -14,13 +14,13 @@
else
pkgver=7.11rc1
fi
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
makedepends=('glproto=1.4.14' 'libdrm=2.4.26' 'libxxf86vm=1.1.1'
'libxdamage=1.1.3' 'expat=2.0.1' 'libx11=1.4.3' 'libxt=1.1.1'
'gcc-libs=4.6.1' 'dri2proto=2.6' 'python2' 'libxml2' 'imake'
'llvm')
url=http://mesa3d.sourceforge.net;
license=('custom')
-source=(LICENSE)
+source=(LICENSE git_fixes.patch)
if [ ${_git} = true ]; then
# mesa git shot from 7.11 branch - see for state:
http://cgit.freedesktop.org/mesa/mesa/commit/?h=7.11id=1ae00c5960af83bea9545a18a1754bad83d5cbd0
#source=(${source[@]}
'ftp://ftp.archlinux.org/other/mesa/mesa-1ae00c5960af83bea9545a18a1754bad83d5cbd0.tar.bz2')
@@ -30,12 +30,14 @@
)
fi
md5sums=('5c65a0fe315dd347e09b1f2826a1df5a'
+ '62b7e9591737846ff0e98f970ffc8b78'
'2246d97eb0cfb1f6d2bf8a54b533d07f')
build() {
cd ${srcdir}/?esa-*
if [ ${_git} = true ]; then
+patch -Np1 -i ${srcdir}/git_fixes.patch
autoreconf -vfi
./autogen.sh --prefix=/usr \
--with-dri-driverdir=/usr/lib/xorg/modules/dri \
Added: git_fixes.patch
===
--- git_fixes.patch (rev 0)
+++ git_fixes.patch 2011-07-10 09:28:29 UTC (rev 131079)
@@ -0,0 +1,36 @@
+From 804995807dfea9cbdbd676e52b95d42715101913 Mon Sep 17 00:00:00 2001
+From: Eric Anholt e...@anholt.net
+Date: Fri, 08 Jul 2011 22:30:48 +
+Subject: i965/gen4: Fix GPU hangs since the program streaming change.
+
+This was tricky. We were doing a use-before-initialize of
+grf_reg_count, but the value usually got overwritten anyway -- when we
+didn't have to do a relocation (typical), or on gen5 when we didn't
+have relocations at all.
+
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=38771
+Reviewed-by: Kenneth Graunke kenn...@whitecape.org
+(cherry picked from commit d03fdc4cdefdfdc5b59547945704c6037a5061c7)
+---
+diff --git a/src/mesa/drivers/dri/i965/brw_vs_state.c
b/src/mesa/drivers/dri/i965/brw_vs_state.c
+index d5010a2..179ca19 100644
+--- a/src/mesa/drivers/dri/i965/brw_vs_state.c
b/src/mesa/drivers/dri/i965/brw_vs_state.c
+@@ -47,6 +47,7 @@ brw_prepare_vs_unit(struct brw_context *brw)
+memset(vs, 0, sizeof(*vs));
+
+/* BRW_NEW_PROGRAM_CACHE | CACHE_NEW_VS_PROG */
++ vs-thread0.grf_reg_count = ALIGN(brw-vs.prog_data-total_grf, 16) / 16 -
1;
+vs-thread0.kernel_start_pointer =
+ brw_program_reloc(brw,
+ brw-vs.state_offset +
+@@ -54,7 +55,6 @@ brw_prepare_vs_unit(struct brw_context *brw)
+ brw-vs.prog_offset +
+ (vs-thread0.grf_reg_count 1)) 6;
+
+- vs-thread0.grf_reg_count = ALIGN(brw-vs.prog_data-total_grf, 16) / 16 -
1;
+vs-thread1.floating_point_mode = BRW_FLOATING_POINT_NON_IEEE_754;
+/* Choosing multiple program flow means that we may get 2-vertex threads,
+ * which will have the channel mask for dwords 4-7 enabled in the thread,
+--
+cgit v0.8.3-6-g21f6
