summaryrefslogtreecommitdiffstats
path: root/x11
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2009-07-26 20:19:28 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2009-07-26 20:19:28 +0000
commitab32ec073fa077d1c1a2da9c6058efd99a0f2d7c (patch)
tree27d67e0ceaa10a97212e2d68fccc2db6ab44e627 /x11
parent8d1ae7101fe035d7598b52dac438429f8e98fab6 (diff)
downloadaports-ab32ec073fa077d1c1a2da9c6058efd99a0f2d7c.tar.bz2
aports-ab32ec073fa077d1c1a2da9c6058efd99a0f2d7c.tar.xz
x11/mesa: upgrade to 7.5
Diffstat (limited to 'x11')
-rw-r--r--x11/mesa/APKBUILD8
-rw-r--r--x11/mesa/mesa-7.1-link-shared.patch8
2 files changed, 8 insertions, 8 deletions
diff --git a/x11/mesa/APKBUILD b/x11/mesa/APKBUILD
index 493eda91..110d1414 100644
--- a/x11/mesa/APKBUILD
+++ b/x11/mesa/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=mesa
-pkgver=7.4.4
-pkgrel=2
+pkgver=7.5
+pkgrel=0
pkgdesc="Mesa DRI OpenGL library and drivers"
url="http://www.mesa3d.org"
license="LGPL"
@@ -42,6 +42,6 @@ build ()
install -m755 -d "$pkgdir"/usr/lib/xorg/modules/extensions
ln -sf libglx.xorg "$pkgdir"/usr/lib/xorg/modules/extensions/libglx.so || return 1
}
-md5sums="b66528d314c574dccbe0ed963cac5e93 MesaLib-7.4.4.tar.bz2
-f0baa948d9810f268413111ee439d24b mesa-7.1-link-shared.patch
+md5sums="459f332551f6ebb86f384d21dd15e1f0 MesaLib-7.5.tar.bz2
+9eddc02e23ec08295822911e726ae89a mesa-7.1-link-shared.patch
75e1bb69f384e9d60544fa03c15cc0ec mesa-7.4-parallel.patch"
diff --git a/x11/mesa/mesa-7.1-link-shared.patch b/x11/mesa/mesa-7.1-link-shared.patch
index 7fdbf143..f0423831 100644
--- a/x11/mesa/mesa-7.1-link-shared.patch
+++ b/x11/mesa/mesa-7.1-link-shared.patch
@@ -5,8 +5,8 @@ diff -up mesa-20080814/src/mesa/drivers/dri/Makefile.dricore mesa-20080814/src/m
--default: $(TOP)/$(LIB_DIR) subdirs
-+default: $(TOP)/$(LIB_DIR) $(TOP)/$(LIB_DIR)/libdricore.so subdirs
+-default: $(TOP)/$(LIB_DIR) subdirs dri.pc
++default: $(TOP)/$(LIB_DIR) $(TOP)/$(LIB_DIR)/libdricore.so subdirs dri.pc
$(TOP)/$(LIB_DIR):
@@ -58,8 +58,8 @@ diff -up mesa-20080814/src/mesa/drivers/dri/Makefile.template.dricore mesa-20080
$(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile $(TOP)/src/mesa/drivers/dri/Makefile.template
$(MKLIB) -o $@ -noprefix -linker '$(CC)' -ldflags '$(LDFLAGS)' \
-- $(OBJECTS) $(MESA_MODULES) $(WINOBJ) $(DRI_LIB_DEPS)
-+ $(OBJECTS) $(WINOBJ) \
+- $(OBJECTS) $(PIPE_DRIVERS) $(MESA_MODULES) $(WINOBJ) $(DRI_LIB_DEPS)
++ $(OBJECTS) $(PIPE_DRIVERS) $(WINOBJ) \
+ -L$(TOP)/$(LIB_DIR) -Wl,-R$(DRI_DRIVER_INSTALL_DIR) -ldricore \
+ $(DRI_LIB_DEPS)