diff options
Diffstat (limited to 'x11/mesa')
| -rw-r--r-- | x11/mesa/APKBUILD | 13 | ||||
| -rw-r--r-- | x11/mesa/mesa-7.7-link-shared.patch (renamed from x11/mesa/mesa-7.1-link-shared.patch) | 37 |
2 files changed, 24 insertions, 26 deletions
diff --git a/x11/mesa/APKBUILD b/x11/mesa/APKBUILD index 876d2e6bc4..19c4d4c7a9 100644 --- a/x11/mesa/APKBUILD +++ b/x11/mesa/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mesa -pkgver=7.6.1 +pkgver=7.7 pkgrel=0 pkgdesc="Mesa DRI OpenGL library" url="http://www.mesa3d.org" @@ -8,8 +8,7 @@ license="LGPL" depends= subpackages="$pkgname-dev $pkgname-dri-ati:ati $pkgname-dri-ffb:ffb $pkgname-dri-intel:intel - $pkgname-dri-trident:trident $pkgname-dri-mach64:mach64 - $pkgname-dri-mga:mga $pkgname-dri-r128:r128 $pkgname-dri-s3v:s3v + $pkgname-dri-mach64:mach64 $pkgname-dri-mga:mga $pkgname-dri-r128:r128 $pkgname-dri-savage:savage $pkgname-dri-sis:sis $pkgname-dri-tdfx:tdfx $pkgname-dri-unichrome:unichrome " @@ -17,7 +16,7 @@ subpackages="$pkgname-dev makedepends="pkgconfig libdrm-dev libxxf86vm-dev libxdamage-dev expat-dev dri2proto xextproto libx11-dev glproto python" source="ftp://ftp.freedesktop.org/pub/mesa/$pkgver/MesaLib-$pkgver.tar.bz2 - mesa-7.1-link-shared.patch + mesa-7.7-link-shared.patch intel-revert-vbl.patch mesa-7.4-parallel.patch mesa-7.6.1-ldflags.patch @@ -74,7 +73,7 @@ _mv_dri() { ati() { _mv_dri radeon_dri r200_dri r300_dri r600_dri; } ffb() { _mv_dri ffb_dri; } -intel() { _mv_dri i810_dri i915_dri i965_dri EGL_i915; } +intel() { _mv_dri i810_dri i915_dri i965_dri; } mach64() { _mv_dri mach64_dri; } mga() { _mv_dri mga_dri; } r128() { _mv_dri r128_dri; } @@ -85,8 +84,8 @@ tdfx() { _mv_dri tdfx_dri; } trident() { _mv_dri trident_dri; } unichrome() { _mv_dri unichrome_dri; } -md5sums="7db4617e9e10ad3aca1b64339fd71b7d MesaLib-7.6.1.tar.bz2 -6e2bd02a8035fb165cf9d861fcf19e79 mesa-7.1-link-shared.patch +md5sums="e3fa64a1508bc23dd9de9dd2cea7cfb1 MesaLib-7.7.tar.bz2 +a966f459b6430dbe87a57c5f28f19816 mesa-7.7-link-shared.patch a111f4dc82e894f8801bc3fa129af7af intel-revert-vbl.patch 75e1bb69f384e9d60544fa03c15cc0ec mesa-7.4-parallel.patch eb6bb53bb1643782aa572edc40d28629 mesa-7.6.1-ldflags.patch diff --git a/x11/mesa/mesa-7.1-link-shared.patch b/x11/mesa/mesa-7.7-link-shared.patch index 46b54b78bb..8c6b562d75 100644 --- a/x11/mesa/mesa-7.1-link-shared.patch +++ b/x11/mesa/mesa-7.7-link-shared.patch @@ -1,6 +1,6 @@ -diff -up mesa-20080814/src/mesa/drivers/dri/Makefile.dricore mesa-20080814/src/mesa/drivers/dri/Makefile ---- mesa-20080814/src/mesa/drivers/dri/Makefile.dricore 2008-08-14 02:28:38.000000000 +1000 -+++ mesa-20080814/src/mesa/drivers/dri/Makefile 2008-08-14 16:18:20.000000000 +1000 +diff -up mesa-20091221/src/mesa/drivers/dri/Makefile.da mesa-20091221/src/mesa/drivers/dri/Makefile +--- mesa-20091221/src/mesa/drivers/dri/Makefile.da 2009-12-21 08:09:11.000000000 +1000 ++++ mesa-20091221/src/mesa/drivers/dri/Makefile 2009-12-21 08:43:03.000000000 +1000 @@ -6,12 +6,17 @@ include $(TOP)/configs/current @@ -20,7 +20,7 @@ diff -up mesa-20080814/src/mesa/drivers/dri/Makefile.dricore mesa-20080814/src/m subdirs: @for dir in $(DRI_DIRS) ; do \ -@@ -31,12 +36,14 @@ dri.pc: dri.pc.in +@@ -32,12 +37,14 @@ dri.pc: dri.pc.in $(pcedit) $< > $@ @@ -36,38 +36,37 @@ diff -up mesa-20080814/src/mesa/drivers/dri/Makefile.dricore mesa-20080814/src/m $(INSTALL) -d $(DESTDIR)$(INSTALL_INC_DIR)/GL/internal $(INSTALL) -m 0644 $(TOP)/include/GL/internal/dri_interface.h \ $(DESTDIR)$(INSTALL_INC_DIR)/GL/internal -@@ -52,5 +59,6 @@ clean: +@@ -51,5 +58,6 @@ clean: (cd $$dir && $(MAKE) clean) ; \ fi \ done + -rm -f libdricore.so $(TOP)/$(LIB_DIR)/libdricore.so -rm -f common/*.o -rm -f *.pc -diff -up mesa-20080814/src/mesa/drivers/dri/Makefile.template.dricore mesa-20080814/src/mesa/drivers/dri/Makefile.template ---- mesa-20080814/src/mesa/drivers/dri/Makefile.template.dricore 2008-08-14 02:28:38.000000000 +1000 -+++ mesa-20080814/src/mesa/drivers/dri/Makefile.template 2008-08-14 16:19:37.000000000 +1000 +diff -up mesa-20091221/src/mesa/drivers/dri/Makefile.template.da mesa-20091221/src/mesa/drivers/dri/Makefile.template +--- mesa-20091221/src/mesa/drivers/dri/Makefile.template.da 2009-12-21 08:09:11.000000000 +1000 ++++ mesa-20091221/src/mesa/drivers/dri/Makefile.template 2009-12-21 08:43:40.000000000 +1000 @@ -1,6 +1,6 @@ # -*-makefile-*- -MESA_MODULES = $(TOP)/src/mesa/libmesa.a +MESA_MODULES = $(TOP)/$(LIB_DIR)/libdricore.so - COMMON_SOURCES = \ + COMMON_GALLIUM_SOURCES = \ ../common/utils.c \ -@@ -64,7 +64,9 @@ default: symlinks depend $(LIBNAME) $(TO - - $(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile $(TOP)/src/mesa/drivers/dri/Makefile.template +@@ -70,7 +70,8 @@ lib: symlinks subdirs depend + $(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(EXTRA_MODULES) $(WINOBJ) Makefile \ + $(TOP)/src/mesa/drivers/dri/Makefile.template $(MKLIB) -o $@ -noprefix -linker '$(CC)' -ldflags '$(LDFLAGS)' \ -- $(OBJECTS) $(PIPE_DRIVERS) $(MESA_MODULES) $(WINOBJ) $(DRI_LIB_DEPS) +- $(OBJECTS) $(MESA_MODULES) $(EXTRA_MODULES) $(WINOBJ) \ + -L$(TOP)/$(LIB_DIR) -Wl,-R$(DRI_DRIVER_INSTALL_DIR) -ldricore \ -+ $(OBJECTS) $(PIPE_DRIVERS) $(WINOBJ) \ -+ $(DRI_LIB_DEPS) ++ $(OBJECTS) $(EXTRA_MODULES) $(WINOBJ) \ + $(DRI_LIB_DEPS) - $(TOP)/$(LIB_DIR)/$(LIBNAME): $(LIBNAME) -diff -up mesa-20080814/src/mesa/x86/read_rgba_span_x86.S.dricore mesa-20080814/src/mesa/x86/read_rgba_span_x86.S ---- mesa-20080814/src/mesa/x86/read_rgba_span_x86.S.dricore 2008-08-14 02:28:38.000000000 +1000 -+++ mesa-20080814/src/mesa/x86/read_rgba_span_x86.S 2008-08-14 16:16:49.000000000 +1000 +diff -up mesa-20091221/src/mesa/x86/read_rgba_span_x86.S.da mesa-20091221/src/mesa/x86/read_rgba_span_x86.S +--- mesa-20091221/src/mesa/x86/read_rgba_span_x86.S.da 2009-12-21 08:09:11.000000000 +1000 ++++ mesa-20091221/src/mesa/x86/read_rgba_span_x86.S 2009-12-21 08:43:03.000000000 +1000 @@ -77,7 +77,6 @@ */ |