summaryrefslogtreecommitdiff
path: root/graphics/MesaLib/patches
diff options
context:
space:
mode:
Diffstat (limited to 'graphics/MesaLib/patches')
-rw-r--r--graphics/MesaLib/patches/patch-ac8
-rw-r--r--graphics/MesaLib/patches/patch-ad45
-rw-r--r--graphics/MesaLib/patches/patch-ae19
-rw-r--r--graphics/MesaLib/patches/patch-af14
-rw-r--r--graphics/MesaLib/patches/patch-ag16
-rw-r--r--graphics/MesaLib/patches/patch-ah16
-rw-r--r--graphics/MesaLib/patches/patch-aj6
7 files changed, 66 insertions, 58 deletions
diff --git a/graphics/MesaLib/patches/patch-ac b/graphics/MesaLib/patches/patch-ac
index eaf93d61ad8..085728c0a71 100644
--- a/graphics/MesaLib/patches/patch-ac
+++ b/graphics/MesaLib/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.8 2005/11/08 16:41:30 tv Exp $
+$NetBSD: patch-ac,v 1.9 2006/01/19 12:53:17 adam Exp $
---- Makefile.orig 2004-12-05 13:25:19.000000000 -0500
+--- Makefile.orig 2005-11-29 23:38:49.000000000 +0100
+++ Makefile
@@ -2,7 +2,7 @@
@@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.8 2005/11/08 16:41:30 tv Exp $
default: $(TOP)/configs/current
-@@ -64,6 +64,7 @@ hpux11-64 \
+@@ -74,6 +74,7 @@ hpux11-64 \
hpux11-64-static \
hpux9 \
hpux9-gcc \
@@ -19,7 +19,7 @@ $NetBSD: patch-ac,v 1.8 2005/11/08 16:41:30 tv Exp $
irix6-64 \
irix6-64-static \
irix6-n32 \
-@@ -100,6 +101,7 @@ linux-x86-64-static \
+@@ -117,6 +118,7 @@ linux-x86-xcb \
linux-x86-glide \
linux-x86-static \
netbsd \
diff --git a/graphics/MesaLib/patches/patch-ad b/graphics/MesaLib/patches/patch-ad
index e8eafb217b1..a0cf00284f1 100644
--- a/graphics/MesaLib/patches/patch-ad
+++ b/graphics/MesaLib/patches/patch-ad
@@ -1,52 +1,59 @@
-$NetBSD: patch-ad,v 1.7 2005/07/13 18:39:58 kristerw Exp $
+$NetBSD: patch-ad,v 1.8 2006/01/19 12:53:17 adam Exp $
---- src/mesa/Makefile.orig 2004-10-04 09:44:50.000000000 -0500
+--- src/mesa/Makefile.orig 2005-07-26 07:55:56.000000000 +0200
+++ src/mesa/Makefile
-@@ -12,10 +12,10 @@ GL_TINY = 0$(MESA_MAJOR)0$(MESA_MINOR)0$
-
+@@ -14,13 +14,13 @@ GL_TINY = 0$(MESA_MAJOR)0$(MESA_MINOR)0$
+ .SUFFIXES : .cpp
.c.o:
- $(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $< -o $@
+ ${LIBTOOL} --mode=compile $(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $< -o $@
+ .cpp.o:
+- $(CXX) -c $(INCLUDE_DIRS) $(CXXFLAGS) $< -o $@
++ ${LIBTOOL} --mode=compile $(CXX) -c $(INCLUDE_DIRS) $(CXXFLAGS) $< -o $@
+
.S.o:
- $(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $< -o $@
+ ${LIBTOOL} --mode=compile $(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $< -o $@
# Figure out what to make here
-@@ -112,22 +112,23 @@ subdirs:
+@@ -150,25 +150,23 @@ subdirs:
# Make the GL library
$(LIB_DIR)/$(GL_LIB_NAME): $(STAND_ALONE_OBJECTS)
-- CC=$(CC) CXX=$(CXX) $(TOP)/bin/mklib -o $(GL_LIB) -major $(GL_MAJOR) \
-- -minor $(GL_MINOR) -patch $(GL_TINY) -install $(LIB_DIR) \
+- @ $(TOP)/bin/mklib -o $(GL_LIB) -linker '$(CC)' \
+- -major $(GL_MAJOR) -minor $(GL_MINOR) -patch $(GL_TINY) \
+- -install $(LIB_DIR) \
- $(MKLIB_OPTIONS) $(GL_LIB_DEPS) $(STAND_ALONE_OBJECTS)
+ ${LIBTOOL} --mode=link ${CC} -o ${GL_LIB_NAME:.so=.la} \
+ ${STAND_ALONE_OBJECTS:.o=.lo} \
+ -rpath ${PREFIX}/lib -version-info ${GL_MAJOR}:${GL_MINOR} \
-+ -L${X11BASE}/lib ${GL_LIB_DEPS} -R ${X11BASE}/lib
++ -L${X11BASE}/lib -Wl,-R${X11BASE}/lib ${GL_LIB_DEPS}
# Make the OSMesa library
$(LIB_DIR)/$(OSMESA_LIB_NAME): $(OSMESA_DRIVER_OBJECTS) $(OSMESA16_OBJECTS)
- if [ "${DRIVER_DIRS}" = "osmesa" ] ; then \
-- CC=$(CC) CXX=$(CXX) $(TOP)/bin/mklib -o $(OSMESA_LIB) -major $(MESA_MAJOR) \
+ @ if [ "${DRIVER_DIRS}" = "osmesa" ] ; then \
+- $(TOP)/bin/mklib -o $(OSMESA_LIB) -linker '$(CC)' \
+- -major $(MESA_MAJOR) \
- -minor $(MESA_MINOR) -patch $(MESA_TINY) \
- -install $(LIB_DIR) $(MKLIB_OPTIONS) \
- $(OSMESA_LIB_DEPS) $(OSMESA16_OBJECTS) ; \
-+ ${LIBTOOL} --mode=link ${CC} -o ${OSMESA_LIB_NAME:.so=.la} \
-+ ${OSMESA16_OBJECTS:.o=.lo} -rpath ${PREFIX}/lib \
-+ -version-info ${MESA_MAJOR}:${MESA_MINOR} \
-+ ${OSMESA_LIB_DEPS:M-l*:S|-lGL|libGL.la|} ; \
++ ${LIBTOOL} --mode=link ${CC} -o ${OSMESA_LIB_NAME:.so=.la} \
++ ${OSMESA16_OBJECTS:.o=.lo} -rpath ${PREFIX}/lib \
++ -version-info ${MESA_MAJOR}:${MESA_MINOR} \
++ ${OSMESA_LIB_DEPS:S|-lGL|libGL.la|} ; \
else \
-- CC=$(CC) CXX=$(CXX) $(TOP)/bin/mklib -o $(OSMESA_LIB) -major $(MESA_MAJOR) \
+- $(TOP)/bin/mklib -o $(OSMESA_LIB) -linker '$(CC)' \
+- -major $(MESA_MAJOR) \
- -minor $(MESA_MINOR) -patch $(GL_TINY) \
- -install $(LIB_DIR) $(MKLIB_OPTIONS) \
- $(OSMESA_LIB_DEPS) $(OSMESA_DRIVER_OBJECTS) ; \
-+ ${LIBTOOL} --mode=link ${CC} -o ${OSMESA_LIB_NAME:.so=.la} \
-+ ${OSMESA_DRIVER_OBJECTS:.o=.lo} -rpath ${PREFIX}/lib \
-+ -version-info ${MESA_MAJOR}:${MESA_MINOR} \
-+ ${OSMESA_LIB_DEPS:M-l*:S|-lGL|libGL.la|} ; \
++ ${LIBTOOL} --mode=link ${CC} -o ${OSMESA_LIB_NAME:.so=.la} \
++ ${OSMESA_DRIVER_OBJECTS:.o=.lo} -rpath ${PREFIX}/lib \
++ -version-info ${MESA_MAJOR}:${MESA_MINOR} \
++ ${OSMESA_LIB_DEPS:S|-lGL|libGL.la|} ; \
fi
diff --git a/graphics/MesaLib/patches/patch-ae b/graphics/MesaLib/patches/patch-ae
index 79ae3680348..e57ff89be2f 100644
--- a/graphics/MesaLib/patches/patch-ae
+++ b/graphics/MesaLib/patches/patch-ae
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.6 2005/06/05 15:39:06 minskim Exp $
+$NetBSD: patch-ae,v 1.7 2006/01/19 12:53:17 adam Exp $
---- src/glw/Makefile.orig 2004-06-25 17:51:39.000000000 -0500
+--- src/glw/Makefile.orig 2005-07-26 07:55:56.000000000 +0200
+++ src/glw/Makefile
@@ -17,7 +17,7 @@ OBJECTS = $(GLW_SOURCES:.c=.o)
##### RULES #####
@@ -11,17 +11,18 @@ $NetBSD: patch-ae,v 1.6 2005/06/05 15:39:06 minskim Exp $
-@@ -33,9 +33,10 @@ clean:
+@@ -33,10 +33,10 @@ clean:
# Make the library
$(LIB_DIR)/$(GLW_LIB_NAME): $(OBJECTS)
-- CC=$(CC) CXX=$(CXX) $(TOP)/bin/mklib -o $(GLW_LIB) -major $(MAJOR) -minor $(MINOR) \
-- -patch $(TINY) $(MKLIB_OPTIONS) -install $(LIB_DIR) \
+- $(TOP)/bin/mklib -o $(GLW_LIB) -linker '$(CC)' \
+- -major $(MAJOR) -minor $(MINOR) -patch $(TINY) \
+- $(MKLIB_OPTIONS) -install $(LIB_DIR) \
- $(GLW_LIB_DEPS) $(OBJECTS)
-+ ${LIBTOOL} --mode=link ${CC} -o ${GLW_LIB_NAME:.so=.la} ${OBJECTS:.o=.lo} \
-+ -rpath ${PREFIX}/lib -version-info ${MAJOR}:${MINOR} \
-+ -L${X11BASE}/lib ${GLW_LIB_DEPS:M-l*:S|-lGL|libGL.la}} \
-+ -R ${X11BASE}/lib
++ ${LIBTOOL} --mode=link ${CC} -o ${GLW_LIB_NAME:.so=.la} \
++ ${OBJECTS:.o=.lo} -rpath ${PREFIX}/lib \
++ -version-info ${MAJOR}:${MINOR} -L${X11BASE}/lib \
++ ${GLW_LIB_DEPS:S|-lGL|../mesa/libGL.la|} -Wl,-R${X11BASE}/lib
#
diff --git a/graphics/MesaLib/patches/patch-af b/graphics/MesaLib/patches/patch-af
index 785c0550954..2728a594ee4 100644
--- a/graphics/MesaLib/patches/patch-af
+++ b/graphics/MesaLib/patches/patch-af
@@ -1,6 +1,6 @@
-$NetBSD: patch-af,v 1.4 2005/06/07 14:21:42 minskim Exp $
+$NetBSD: patch-af,v 1.5 2006/01/19 12:53:17 adam Exp $
---- src/glu/sgi/Makefile.orig 2004-08-16 02:46:28.000000000 -0500
+--- src/glu/sgi/Makefile.orig 2005-07-26 07:55:56.000000000 +0200
+++ src/glu/sgi/Makefile
@@ -115,9 +115,11 @@ OBJECTS = $(C_OBJECTS) $(CC_OBJECTS)
##### RULES #####
@@ -18,13 +18,13 @@ $NetBSD: patch-af,v 1.4 2005/06/07 14:21:42 minskim Exp $
# Make the library:
$(LIB_DIR)/$(GLU_LIB_NAME): $(OBJECTS)
-- CC=$(CC) CXX=$(CXX) $(TOP)/bin/mklib -o $(GLU_LIB) -major $(GLU_MAJOR) \
-- -minor $(GLU_MINOR) -patch $(GLU_TINY) \
+- $(TOP)/bin/mklib -o $(GLU_LIB) -linker '$(CXX)' \
+- -major $(GLU_MAJOR) -minor $(GLU_MINOR) -patch $(GLU_TINY) \
- -cplusplus $(MKLIB_OPTIONS) -install $(LIB_DIR) \
- $(GLU_LIB_DEPS) $(OBJECTS)
-+ ${LIBTOOL} --mode=link ${CXX} -o ${GLU_LIB_NAME:.so=.la} ${OBJECTS:.o=.lo} \
-+ -rpath ${PREFIX}/lib -version-info ${GLU_MAJOR}:${GLU_MINOR} \
-+ ${GLU_LIB_DEPS:M-l*}
++ ${LIBTOOL} --mode=link ${CXX} -o ${GLU_LIB_NAME:.so=.la} \
++ ${OBJECTS:.o=.lo} -rpath ${PREFIX}/lib \
++ -version-info ${GLU_MAJOR}:${GLU_MINOR} ${GLU_LIB_DEPS}
clean:
diff --git a/graphics/MesaLib/patches/patch-ag b/graphics/MesaLib/patches/patch-ag
index d4521db80ab..88b473a4c04 100644
--- a/graphics/MesaLib/patches/patch-ag
+++ b/graphics/MesaLib/patches/patch-ag
@@ -1,6 +1,6 @@
-$NetBSD: patch-ag,v 1.7 2005/06/07 14:31:48 minskim Exp $
+$NetBSD: patch-ag,v 1.8 2006/01/19 12:53:17 adam Exp $
---- src/glut/glx/Makefile.orig 2004-12-05 12:00:20.000000000 -0600
+--- src/glut/glx/Makefile.orig 2005-07-26 07:55:56.000000000 +0200
+++ src/glut/glx/Makefile
@@ -79,6 +79,7 @@ OBJECTS = $(SOURCES:.c=.o)
##### RULES #####
@@ -14,14 +14,14 @@ $NetBSD: patch-ag,v 1.7 2005/06/07 14:31:48 minskim Exp $
# Make the library
$(LIB_DIR)/$(GLUT_LIB_NAME): depend $(OBJECTS)
-- CC=$(CC) CXX=$(CXX) $(TOP)/bin/mklib -o $(GLUT_LIB) \
-- -major $(GLUT_MAJOR) -minor $(GLUT_MINOR) \
-- -patch $(GLUT_TINY) $(MKLIB_OPTIONS) -install $(LIB_DIR) \
+- $(TOP)/bin/mklib -o $(GLUT_LIB) -linker '$(CC)' \
+- -major $(GLUT_MAJOR) -minor $(GLUT_MINOR) -patch $(GLUT_TINY) \
+- $(MKLIB_OPTIONS) -install $(LIB_DIR) \
- $(GLUT_LIB_DEPS) $(OBJECTS)
-+ ${LIBTOOL} --mode=link ${CC} -o ${GLUT_LIB_NAME:.so=.la} ${OBJECTS:.o=.lo} \
-+ -rpath ${PREFIX}/lib \
++ ${LIBTOOL} --mode=link ${CC} -o ${GLUT_LIB_NAME:.so=.la} \
++ ${OBJECTS:.o=.lo} -rpath ${PREFIX}/lib \
+ -version-info ${GLUT_MAJOR}:${GLUT_MINOR} \
-+ -L${X11BASE}/lib ${GLUT_LIB_DEPS:M-l*} -R${X11BASE}/lib
++ -L${X11BASE}/lib -Wl,-R${X11BASE}/lib ${GLUT_LIB_DEPS}
clean:
diff --git a/graphics/MesaLib/patches/patch-ah b/graphics/MesaLib/patches/patch-ah
index fadc6584af4..c8f6de7a8ff 100644
--- a/graphics/MesaLib/patches/patch-ah
+++ b/graphics/MesaLib/patches/patch-ah
@@ -1,6 +1,6 @@
-$NetBSD: patch-ah,v 1.2 2005/07/12 21:40:35 kristerw Exp $
+$NetBSD: patch-ah,v 1.3 2006/01/19 12:53:17 adam Exp $
---- configs/default.orig 2004-10-25 17:21:49.000000000 +0000
+--- configs/default.orig 2005-10-25 01:35:14.000000000 +0200
+++ configs/default
@@ -14,10 +14,6 @@ MESA_TINY=1
DRM_SOURCE_PATH=$(TOP)/../drm
@@ -13,7 +13,7 @@ $NetBSD: patch-ah,v 1.2 2005/07/12 21:40:35 kristerw Exp $
GLU_CFLAGS =
# Misc tools and flags
-@@ -52,7 +48,7 @@ GLW_SOURCES = GLwDrawA.c
+@@ -56,7 +52,7 @@ GLW_SOURCES = GLwDrawA.c
# Directories
LIB_DIR = $(TOP)/lib
@@ -22,12 +22,12 @@ $NetBSD: patch-ah,v 1.2 2005/07/12 21:40:35 kristerw Exp $
SRC_DIRS = mesa glu glut/glx glw
GLU_DIRS = sgi
DRIVER_DIRS = x11 osmesa
-@@ -60,7 +56,7 @@ PROGRAM_DIRS = demos redbook samples xde
-
+@@ -66,7 +62,7 @@ PROGRAM_DIRS = demos redbook samples xde
# Library/program dependencies
--GL_LIB_DEPS = -lX11 -lXext -lm -lpthread
-+GL_LIB_DEPS = -lX11 -lXext -lm ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
+ EXTRA_LIB_PATH ?=
+-GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread
++GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lm ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
OSMESA_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB)
GLU_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lm
- GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXmu -lXt -lXi -lm
+ GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lX11 -lXmu -lXt -lXi -lm
diff --git a/graphics/MesaLib/patches/patch-aj b/graphics/MesaLib/patches/patch-aj
index b1b22d1f229..4511df2cebd 100644
--- a/graphics/MesaLib/patches/patch-aj
+++ b/graphics/MesaLib/patches/patch-aj
@@ -1,6 +1,6 @@
-$NetBSD: patch-aj,v 1.1 2005/11/08 16:41:30 tv Exp $
+$NetBSD: patch-aj,v 1.2 2006/01/19 12:53:17 adam Exp $
---- src/mesa/drivers/x11/xmesaP.h.orig 2004-03-04 11:22:01.000000000 -0500
+--- src/mesa/drivers/x11/xmesaP.h.orig 2005-10-04 23:00:36.000000000 +0200
+++ src/mesa/drivers/x11/xmesaP.h
@@ -30,7 +30,7 @@
#ifdef XFree86Server
@@ -11,7 +11,7 @@ $NetBSD: patch-aj,v 1.1 2005/11/08 16:41:30 tv Exp $
# include <X11/extensions/XShm.h>
#endif
#include "GL/xmesa.h"
-@@ -185,7 +185,7 @@ struct xmesa_buffer {
+@@ -218,7 +218,7 @@ struct xmesa_buffer {
/* 0 = not available */
/* 1 = XImage support available */
/* 2 = Pixmap support available too */
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-29 10:05:25 +0000