head	1.3;
access;
symbols
	pkgsrc-2013Q2:1.3.0.2
	pkgsrc-2013Q2-base:1.3
	pkgsrc-2013Q1:1.2.0.30
	pkgsrc-2013Q1-base:1.2
	pkgsrc-2012Q4:1.2.0.28
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2012Q3:1.2.0.26
	pkgsrc-2012Q3-base:1.2
	pkgsrc-2012Q2:1.2.0.24
	pkgsrc-2012Q2-base:1.2
	pkgsrc-2012Q1:1.2.0.22
	pkgsrc-2012Q1-base:1.2
	pkgsrc-2011Q4:1.2.0.20
	pkgsrc-2011Q4-base:1.2
	pkgsrc-2011Q3:1.2.0.18
	pkgsrc-2011Q3-base:1.2
	pkgsrc-2011Q2:1.2.0.16
	pkgsrc-2011Q2-base:1.2
	pkgsrc-2011Q1:1.2.0.14
	pkgsrc-2011Q1-base:1.2
	pkgsrc-2010Q4:1.2.0.12
	pkgsrc-2010Q4-base:1.2
	pkgsrc-2010Q3:1.2.0.10
	pkgsrc-2010Q3-base:1.2
	pkgsrc-2010Q2:1.2.0.8
	pkgsrc-2010Q2-base:1.2
	pkgsrc-2010Q1:1.2.0.6
	pkgsrc-2010Q1-base:1.2
	pkgsrc-2009Q4:1.2.0.4
	pkgsrc-2009Q4-base:1.2
	pkgsrc-2009Q3:1.2.0.2
	pkgsrc-2009Q3-base:1.2
	pkgsrc-2009Q2:1.1.0.2
	pkgsrc-2009Q2-base:1.1;
locks; strict;
comment	@# @;


1.3
date	2013.05.16.05.22.02;	author richard;	state dead;
branches;
next	1.2;
commitid	zN883Sx1YLZWAOPw;

1.2
date	2009.07.08.20.00.58;	author hasso;	state Exp;
branches;
next	1.1;

1.1
date	2009.06.19.18.19.15;	author hasso;	state Exp;
branches;
next	;


desc
@@


1.3
log
@upgrade to MesaLib-7.11.2
@
text
@$NetBSD: patch-be,v 1.2 2009/07/08 20:00:58 hasso Exp $

--- src/mesa/drivers/osmesa/Makefile.orig	2009-06-17 20:30:03 +0300
+++ src/mesa/drivers/osmesa/Makefile	2009-06-22 07:52:00 +0300
@@@@ -21,14 +21,15 @@@@ INCLUDE_DIRS = \
 
 # Standalone osmesa needs to be linked with core Mesa APIs
 ifeq ($(DRIVER_DIRS), osmesa)
-CORE_MESA = $(TOP)/src/mesa/libmesa.a $(TOP)/src/mesa/libglapi.a
+CORE_MESA = $(TOP)/src/mesa/libmesa.la $(TOP)/src/mesa/libglapi.la
 else
 CORE_MESA =
 endif
 
 
 .c.o:
-	$(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $< -o $@@
+	$(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(INCLUDE_DIRS) \
+		$(CFLAGS) $< -o $(@@:.o=.lo)
 
 
 default: $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME)
@@@@ -38,11 +39,11 @@@@ default: $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_
 # sources. We can also build libOSMesa16/libOSMesa32 by setting
 # -DCHAN_BITS=16/32.
 $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME): $(OBJECTS) $(CORE_MESA)
-	$(MKLIB) -o $(OSMESA_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \
-		-major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \
-		-install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \
-		-id $(INSTALL_LIB_DIR)/lib$(OSMESA_LIB).$(MESA_MAJOR).dylib \
-		$(OSMESA_LIB_DEPS) $(OBJECTS) $(CORE_MESA)
+	$(LIBTOOL) --mode=link $(CC) \
+		-o $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME:.so=.la) $(LDFLAGS) \
+		-rpath $(PREFIX)/lib \
+		-version-info $(MESA_MAJOR):$(MESA_MINOR):0 \
+		$(OSMESA_LIB_DEPS) $(OBJECTS:.o=.lo) $(CORE_MESA)
 
 
 
@


1.2
log
@Update to 7.4.4. Make software ratserizer actually work. Add one patch from
upstream repo to fix null pointer dereference.

Changes in 7.4.4:

* Fixed i965/i915 segfault in screen destruction (bug 22408)

Changes in 7.4.3:

* Fixed texture object reference counting bug (bug 21756)
* Allow depth/stencil textures to be attached to GL_STENCIL_ATTACHMENT
  point (SF bug 2793846)
* Added missing glGet case for GL_VERTEX_ARRAY_BINDING_APPLE
* Fixed some OSMesa build issues
* Fixed a vertex buffer object crash
* Fixed broken glTexImage3D() when image type = GL_BITMAP
* Fixed some GLSL preprocessor bugs
* Fixed framebuffer mem leak in i945/i965 DRI drivers
* Fixed texture coordinate repeat bug in swrast (bug 21872)
* Fixed incorrect viewport clamping (lower bound is zero, not one)
* GLX fix for glean's makeCurrent test case
@
text
@d1 1
a1 1
$NetBSD$
@


1.1
log
@Attempt to make it build cleanly and to solve PLIST problems without dri
option (default for most of platforms). Tested on DragonFly only. Bump
PKGREVISION.
@
text
@d3 3
a5 5
--- src/mesa/drivers/osmesa/Makefile.orig	2009-06-19 13:36:30 +0300
+++ src/mesa/drivers/osmesa/Makefile	2009-06-19 13:45:04 +0300
@@@@ -19,7 +19,7 @@@@ INCLUDE_DIRS = \
 	-I$(TOP)/src/mesa \
 	-I$(TOP)/src/mesa/main
d7 2
d11 3
a13 4
 
 
 .PHONY: osmesa8
@@@@ -27,7 +27,8 @@@@ CORE_MESA = $(TOP)/src/mesa/libmesa.a $(
d23 4
a26 21
@@@@ -44,11 +45,11 @@@@ default: $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_
 osmesa8: $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME)
 
 $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME): $(OBJECTS)
-	$(MKLIB) -o $(OSMESA_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \
-		-major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \
-		-install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \
-		-id $(INSTALL_LIB_DIR)/lib$(OSMESA_LIB).$(MESA_MAJOR).dylib \
-		$(OSMESA_LIB_DEPS) $(OBJECTS)
+	$(LIBTOOL) --mode=link $(CC) \
+		-o $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME:.so=.la) $(LDFLAGS) \
+		-rpath $(PREFIX)/lib \
+		-version-info $(MESA_MAJOR):$(MESA_MINOR):0 \
+		$(OSMESA_LIB_DEPS) $(OBJECTS:.o=.lo)
 
 
 
@@@@ -56,11 +57,11 @@@@ $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME): $(
 # The libOSMesa16/libOSMesa32 libraries do not use libGL but rather are built
 # with all the other Mesa sources (compiled with -DCHAN_BITS=16/32
 osmesa16: $(OBJECTS) $(CORE_MESA)
@