diff options
author | adam <adam@pkgsrc.org> | 2012-12-07 16:01:15 +0000 |
---|---|---|
committer | adam <adam@pkgsrc.org> | 2012-12-07 16:01:15 +0000 |
commit | 484d2f014ed4153d864d30a14a87d9fce03c182d (patch) | |
tree | 3d59df1b39a5f2eb73f67d47bb8bc8adebc62d56 /graphics/glew/patches | |
parent | b23c74193d5a506420a69cd59bffecaa12572112 (diff) | |
download | pkgsrc-484d2f014ed4153d864d30a14a87d9fce03c182d.tar.gz |
Changes 1.9.0:
New features:
Support for OpenGL 4.2
New extensions:
GL_ARB_ES3_compatibility
GL_ARB_clear_buffer_object
GL_ARB_compute_shader
GL_ARB_copy_image
GL_ARB_explicit_uniform_location
GL_ARB_fragment_layer_viewport
GL_ARB_framebuffer_no_attachments
GL_ARB_internalformat_query2
GL_ARB_multi_draw_indirect
GL_ARB_program_interface_query
GL_ARB_robust_buffer_access_behavior
GL_ARB_robustness_application_isolation
GL_ARB_robustness_share_group_isolation
GL_ARB_shader_image_size
GL_ARB_shader_storage_buffer_object
GL_ARB_stencil_texturing
GL_ARB_texture_buffer_range
GL_ARB_texture_query_levels
GL_ARB_texture_storage_multisample
GL_ARB_texture_view
GL_ARB_vertex_attrib_binding
GL_EXT_debug_marker
GL_KHR_debug
GL_REGAL_error_string
GL_REGAL_extension_query
GL_REGAL_log
GLX_ARB_robustness_application_isolation
GLX_ARB_robustness_share_group_isolation
GLX_EXT_create_context_es_profile
WGL_EXT_create_context_es_profile
Bug fixes:
Not using GLU library for Makefile builds.
Diffstat (limited to 'graphics/glew/patches')
-rw-r--r-- | graphics/glew/patches/patch-ac | 62 | ||||
-rw-r--r-- | graphics/glew/patches/patch-ad | 4 | ||||
-rw-r--r-- | graphics/glew/patches/patch-config_Makefile.linux | 14 |
3 files changed, 42 insertions, 38 deletions
diff --git a/graphics/glew/patches/patch-ac b/graphics/glew/patches/patch-ac index 523503e2ea9..b7b555ccad6 100644 --- a/graphics/glew/patches/patch-ac +++ b/graphics/glew/patches/patch-ac @@ -1,30 +1,33 @@ -$NetBSD: patch-ac,v 1.8 2011/07/13 19:47:38 adam Exp $ +$NetBSD: patch-ac,v 1.9 2012/12/07 16:01:16 adam Exp $ ---- Makefile.orig 2011-04-27 16:16:35.000000000 +0000 +--- Makefile.orig 2012-08-06 15:59:08.000000000 +0000 +++ Makefile -@@ -100,7 +100,7 @@ lib/$(LIB.STATIC): $(LIB.OBJS) - $(AR) cr $@ $^ +@@ -106,7 +106,7 @@ ifneq ($(STRIP),) + endif lib/$(LIB.SHARED): $(LIB.SOBJS) - $(LD) $(LDFLAGS.SO) -o $@ $^ $(LIB.LDFLAGS) $(LIB.LIBS) + $(LD) $(LDFLAGS) $(LDFLAGS.SO) -o $@ $^ $(LIB.LDFLAGS) $(LIB.LIBS) - ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),) - else + ifneq ($(LN),) $(LN) $(LIB.SHARED) lib/$(LIB.SONAME) -@@ -164,10 +164,10 @@ bin: - glew.bin: glew.lib bin bin/$(GLEWINFO.BIN) bin/$(VISUALINFO.BIN) - - bin/$(GLEWINFO.BIN): $(GLEWINFO.BIN.OBJS) lib/$(LIB.SHARED) -- $(CC) $(CFLAGS) -o $@ $(GLEWINFO.BIN.OBJS) $(BIN.LIBS) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(GLEWINFO.BIN.OBJS) $(BIN.LIBS) - - bin/$(VISUALINFO.BIN): $(VISUALINFO.BIN.OBJS) lib/$(LIB.SHARED) -- $(CC) $(CFLAGS) -o $@ $(VISUALINFO.BIN.OBJS) $(BIN.LIBS) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(VISUALINFO.BIN.OBJS) $(BIN.LIBS) + $(LN) $(LIB.SHARED) lib/$(LIB.DEVLNK) +@@ -190,13 +190,13 @@ bin: + mkdir bin - # Install targets + bin/$(GLEWINFO.BIN): $(GLEWINFO.BIN.OBJ) lib/$(LIB.SHARED) +- $(CC) $(CFLAGS) -o $@ $(GLEWINFO.BIN.OBJ) $(BIN.LIBS) ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(GLEWINFO.BIN.OBJ) $(BIN.LIBS) + ifneq ($(STRIP),) + $(STRIP) -x $@ + endif -@@ -178,66 +178,62 @@ install: install.include install.lib + bin/$(VISUALINFO.BIN): $(VISUALINFO.BIN.OBJ) lib/$(LIB.SHARED) +- $(CC) $(CFLAGS) -o $@ $(VISUALINFO.BIN.OBJ) $(BIN.LIBS) ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(VISUALINFO.BIN.OBJ) $(BIN.LIBS) + ifneq ($(STRIP),) + $(STRIP) -x $@ + endif +@@ -218,16 +218,16 @@ install: install.include install.lib install.mx: install.include install.lib.mx install.pkgconfig.mx install.lib: glew.lib @@ -33,23 +36,24 @@ $NetBSD: patch-ac,v 1.8 2011/07/13 19:47:38 adam Exp $ # runtime ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),) $(INSTALL) -d -m 0755 $(BINDIR) - $(STRIP) -x lib/$(LIB.SHARED) $(INSTALL) -m 0755 lib/$(LIB.SHARED) $(BINDIR)/ else -- $(STRIP) -x lib/$(LIB.SHARED) - $(INSTALL) -m 0644 lib/$(LIB.SHARED) $(LIBDIR)/ -- $(LN) $(LIB.SHARED) $(LIBDIR)/$(LIB.SONAME) + $(INSTALL) -m 0644 lib/$(LIB.SHARED) $(DESTDIR)$(LIBDIR)/ + endif + ifneq ($(LN),) +- $(LN) $(LIB.SHARED) $(LIBDIR)/$(LIB.SONAME) + $(LN) $(LIB.SHARED) $(DESTDIR)$(LIBDIR)/$(LIB.SONAME) endif + # development files - ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),) +@@ -235,50 +235,50 @@ ifeq ($(filter-out mingw% cygwin,$(SYSTE $(INSTALL) -m 0644 lib/$(LIB.DEVLNK) $(LIBDIR)/ - else + endif + ifneq ($(LN),) - $(LN) $(LIB.SHARED) $(LIBDIR)/$(LIB.DEVLNK) + $(LN) $(LIB.SHARED) $(DESTDIR)$(LIBDIR)/$(LIB.DEVLNK) endif -- $(STRIP) -x lib/$(LIB.STATIC) - $(INSTALL) -m 0644 lib/$(LIB.STATIC) $(LIBDIR)/ + $(INSTALL) -m 0644 lib/$(LIB.STATIC) $(DESTDIR)$(LIBDIR)/ @@ -59,23 +63,23 @@ $NetBSD: patch-ac,v 1.8 2011/07/13 19:47:38 adam Exp $ # runtime ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),) $(INSTALL) -d -m 0755 $(BINDIR) - $(STRIP) -x lib/$(LIB.SHARED.MX) $(INSTALL) -m 0755 lib/$(LIB.SHARED.MX) $(BINDIR)/ else -- $(STRIP) -x lib/$(LIB.SHARED.MX) - $(INSTALL) -m 0644 lib/$(LIB.SHARED.MX) $(LIBDIR)/ -- $(LN) $(LIB.SHARED.MX) $(LIBDIR)/$(LIB.SONAME.MX) + $(INSTALL) -m 0644 lib/$(LIB.SHARED.MX) $(DESTDIR)$(LIBDIR)/ + endif + ifneq ($(LN),) +- $(LN) $(LIB.SHARED.MX) $(LIBDIR)/$(LIB.SONAME.MX) + $(LN) $(LIB.SHARED.MX) $(DESTDIR)$(LIBDIR)/$(LIB.SONAME.MX) endif # development files ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),) $(INSTALL) -m 0644 lib/$(LIB.DEVLNK.MX) $(LIBDIR)/ - else + endif + ifneq ($(LN),) - $(LN) $(LIB.SHARED.MX) $(LIBDIR)/$(LIB.DEVLNK.MX) + $(LN) $(LIB.SHARED.MX) $(DESTDIR)$(LIBDIR)/$(LIB.DEVLNK.MX) endif -- $(STRIP) -x lib/$(LIB.STATIC.MX) - $(INSTALL) -m 0644 lib/$(LIB.STATIC.MX) $(LIBDIR)/ + $(INSTALL) -m 0644 lib/$(LIB.STATIC.MX) $(DESTDIR)$(LIBDIR)/ diff --git a/graphics/glew/patches/patch-ad b/graphics/glew/patches/patch-ad index 71d20081680..b830815d461 100644 --- a/graphics/glew/patches/patch-ad +++ b/graphics/glew/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.3 2011/07/13 19:47:38 adam Exp $ +$NetBSD: patch-ad,v 1.4 2012/12/07 16:01:16 adam Exp $ --- config/Makefile.darwin.orig 2011-04-27 16:16:34.000000000 +0000 +++ config/Makefile.darwin -@@ -13,7 +13,7 @@ endif +@@ -14,7 +14,7 @@ endif LDFLAGS.STATIC = LDFLAGS.DYNAMIC = WARN = -Wall -W diff --git a/graphics/glew/patches/patch-config_Makefile.linux b/graphics/glew/patches/patch-config_Makefile.linux index 14d2b335535..1712763b23d 100644 --- a/graphics/glew/patches/patch-config_Makefile.linux +++ b/graphics/glew/patches/patch-config_Makefile.linux @@ -1,6 +1,6 @@ -$NetBSD: patch-config_Makefile.linux,v 1.1 2011/08/20 20:25:51 abs Exp $ +$NetBSD: patch-config_Makefile.linux,v 1.2 2012/12/07 16:01:16 adam Exp $ ---- config/Makefile.linux.orig 2011-04-27 16:16:34.000000000 +0000 +--- config/Makefile.linux.orig 2012-12-07 09:27:51.000000000 +0000 +++ config/Makefile.linux @@ -1,16 +1,12 @@ NAME = $(GLEW_NAME) @@ -11,15 +11,15 @@ $NetBSD: patch-config_Makefile.linux,v 1.1 2011/08/20 20:25:51 abs Exp $ +X11 ?= /usr/X11R6 M_ARCH ?= $(shell uname -m) -ifeq (x86_64,${M_ARCH}) --LDFLAGS.EXTRA = -L/usr/X11R6/lib64 +-LDFLAGS.EXTRA = -L/usr/X11R6/lib64 -L/usr/lib64 -LIBDIR = $(GLEW_DEST)/lib64 -else --LDFLAGS.EXTRA = -L/usr/X11R6/lib -+LDFLAGS.EXTRA ?= -L${X11}/lib +-LDFLAGS.EXTRA = -L/usr/X11R6/lib -L/usr/lib ++LDFLAGS.EXTRA ?= -L/usr/X11R6/lib -L/usr/lib LIBDIR = $(GLEW_DEST)/lib -endif --LDFLAGS.GL = -lXmu -lXi -lGLU -lGL -lXext -lX11 -+LDFLAGS.GL = -lXmu -lXi -lGLU -lGL -lXext -lX11 -lpthread +-LDFLAGS.GL = -lXmu -lXi -lGL -lXext -lX11 ++LDFLAGS.GL = -lXmu -lXi -lGL -lXext -lX11 -lpthread LDFLAGS.STATIC = -Wl,-Bstatic LDFLAGS.DYNAMIC = -Wl,-Bdynamic NAME = GLEW |