summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorhasso <hasso>2009-06-19 18:19:15 +0000
committerhasso <hasso>2009-06-19 18:19:15 +0000
commit8d466ec3cd81110e70c15d9058374ffd35e9e0ab (patch)
treea3f60b9aea2f939e65216ee171d049b85eca4c7c /graphics
parentf9bb62dac4a3ebae67dedc11db5053bf41039c0f (diff)
downloadpkgsrc-8d466ec3cd81110e70c15d9058374ffd35e9e0ab.tar.gz
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.
Diffstat (limited to 'graphics')
-rw-r--r--graphics/MesaLib/Makefile5
-rw-r--r--graphics/MesaLib/PLIST5
-rw-r--r--graphics/MesaLib/distinfo3
-rw-r--r--graphics/MesaLib/patches/patch-be57
4 files changed, 65 insertions, 5 deletions
diff --git a/graphics/MesaLib/Makefile b/graphics/MesaLib/Makefile
index b7fecce8150..b2ef1da5e96 100644
--- a/graphics/MesaLib/Makefile
+++ b/graphics/MesaLib/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.78 2009/06/10 17:28:06 wiz Exp $
+# $NetBSD: Makefile,v 1.79 2009/06/19 18:19:15 hasso Exp $
PKGNAME= MesaLib-${MESA_PKGVERSION}
-PKGREVISION= 2
+PKGREVISION= 3
COMMENT= Graphics library similar to SGI's OpenGL
MESA_HEADERS= gl.h gl_mangle.h glext.h glx.h glxext.h \
@@ -17,6 +17,7 @@ PLIST_VARS= dri nodri
PKGCONFIG_OVERRIDE+= src/mesa/drivers/dri/dri.pc.in
PKGCONFIG_OVERRIDE+= src/mesa/gl.pc.in
+PKGCONFIG_OVERRIDE+= src/mesa/osmesa.pc.in
PKGCONFIG_OVERRIDE+= src/glw/glw.pc.in
# no configure stage
PKGCONFIG_OVERRIDE_STAGE= pre-build
diff --git a/graphics/MesaLib/PLIST b/graphics/MesaLib/PLIST
index dedf24ae1de..0bbf5984e4a 100644
--- a/graphics/MesaLib/PLIST
+++ b/graphics/MesaLib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.23 2009/06/14 20:05:40 joerg Exp $
+@comment $NetBSD: PLIST,v 1.24 2009/06/19 18:19:15 hasso Exp $
include/GL/GLwDrawA.h
include/GL/GLwDrawAP.h
include/GL/GLwMDrawA.h
@@ -29,6 +29,7 @@ ${PLIST.dri}lib/dri/sis_dri.la
${PLIST.dri}lib/dri/swrast_dri.la
${PLIST.dri}lib/dri/tdfx_dri.la
${PLIST.dri}lib/dri/unichrome_dri.la
-lib/pkgconfig/dri.pc
+${PLIST.dri}lib/pkgconfig/dri.pc
lib/pkgconfig/gl.pc
lib/pkgconfig/glw.pc
+${PLIST.nodri}lib/pkgconfig/osmesa.pc
diff --git a/graphics/MesaLib/distinfo b/graphics/MesaLib/distinfo
index f142fb059b6..cc5021750f1 100644
--- a/graphics/MesaLib/distinfo
+++ b/graphics/MesaLib/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.65 2009/06/11 13:11:32 tnn Exp $
+$NetBSD: distinfo,v 1.66 2009/06/19 18:19:15 hasso Exp $
SHA1 (Mesa-7.4.2/MesaDemos-7.4.2.tar.bz2) = cbba586829c76a5e7a54a906567b4b2174d6e1aa
RMD160 (Mesa-7.4.2/MesaDemos-7.4.2.tar.bz2) = c6434d325897540618130e97891f391721b543b5
@@ -31,5 +31,6 @@ SHA1 (patch-ba) = 44e258235ac949713c4fcead25cb7ab7498cbb7f
SHA1 (patch-bb) = 4fd8a770bd0275c3467447f77f51e957996c93ac
SHA1 (patch-bc) = 6b8df3762d666c2e7720183b6d292053bda86f5a
SHA1 (patch-bd) = 61cb50ef49e64ecc0f87750d60244f1ff7b44bd4
+SHA1 (patch-be) = 5407ae34110aa37b8d05801723f2b4739fd95021
SHA1 (patch-cb) = 83789d71de41aed2ba81a8239fb035a4cd295477
SHA1 (patch-cc) = 737d8b474b1c296f3ceb4de515dd385aae072394
diff --git a/graphics/MesaLib/patches/patch-be b/graphics/MesaLib/patches/patch-be
new file mode 100644
index 00000000000..fad67dd644a
--- /dev/null
+++ b/graphics/MesaLib/patches/patch-be
@@ -0,0 +1,57 @@
+$NetBSD: patch-be,v 1.1 2009/06/19 18:19:15 hasso Exp $
+
+--- 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
+
+-CORE_MESA = $(TOP)/src/mesa/libmesa.a $(TOP)/src/mesa/libglapi.a
++CORE_MESA = $(TOP)/src/mesa/libmesa.la $(TOP)/src/mesa/libglapi.la
+
+
+ .PHONY: osmesa8
+@@ -27,7 +27,8 @@ CORE_MESA = $(TOP)/src/mesa/libmesa.a $(
+
+
+ .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)
+@@ -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)
+- $(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)
+
+
+