diff options
| -rw-r--r-- | package/libglew/Makefile | 8 | ||||
| -rw-r--r-- | package/libglew/patches/patch-Makefile | 141 | ||||
| -rw-r--r-- | package/libglew/patches/patch-config_Makefile_linux | 14 |
3 files changed, 16 insertions, 147 deletions
diff --git a/package/libglew/Makefile b/package/libglew/Makefile index c5f3eb253..2257bfb7d 100644 --- a/package/libglew/Makefile +++ b/package/libglew/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libglew -PKG_VERSION:= 1.10.0 -PKG_RELEASE:= 3 -PKG_HASH:= 99c41320b63f6860869b5fb9af9a1854b15582796c64ee3dfd7096dc0c89f307 +PKG_VERSION:= 1.13.0 +PKG_RELEASE:= 1 +PKG_HASH:= aa25dc48ed84b0b64b8d41cdd42c8f40f149c37fa2ffa39cd97f42c78d128bc7 PKG_DESCR:= opengl extension wrangler library PKG_SECTION:= libs/video PKG_DEPENDS:= libx11 libxmu libxi libxext mesa @@ -25,7 +25,7 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBGLEW,libglew,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) CONFIG_STYLE:= manual -XAKE_FLAGS+= STRIP='' GLEW_DEST='${WRKINST}/usr' SYSTEMS=linux +XAKE_FLAGS+= STRIP='' SYSTEMS=linux libglew-install: $(INSTALL_DIR) $(IDIR_LIBGLEW)/usr/lib diff --git a/package/libglew/patches/patch-Makefile b/package/libglew/patches/patch-Makefile index 51cabbe77..184cd2441 100644 --- a/package/libglew/patches/patch-Makefile +++ b/package/libglew/patches/patch-Makefile @@ -1,143 +1,12 @@ ---- glew-1.10.0.orig/Makefile 2013-07-22 16:11:22.000000000 +0200 -+++ glew-1.10.0/Makefile 2013-12-08 15:26:15.000000000 +0100 -@@ -31,13 +31,13 @@ - include config/version - - SHELL = /bin/sh --SYSTEM ?= $(shell config/config.guess | cut -d - -f 3 | sed -e 's/[0-9\.]//g;') --SYSTEM.SUPPORTED = $(shell test -f config/Makefile.$(SYSTEM) && echo 1) -+SYSTEMS ?= $(shell config/config.guess | cut -d - -f 3 | sed -e 's/[0-9\.]//g;') -+SYSTEM.SUPPORTED = $(shell test -f config/Makefile.$(SYSTEMS) && echo 1) - - ifeq ($(SYSTEM.SUPPORTED), 1) --include config/Makefile.$(SYSTEM) -+include config/Makefile.$(SYSTEMS) - else --$(error "Platform '$(SYSTEM)' not supported") -+$(error "Platform '$(SYSTEMS)' not supported") - endif - - GLEW_DEST ?= /usr -@@ -71,7 +71,8 @@ else +--- glew-1.13.0.orig/Makefile 2015-08-10 13:47:22.000000000 +0200 ++++ glew-1.13.0/Makefile 2015-11-09 00:30:11.275929451 +0100 +@@ -77,7 +77,8 @@ else OPT = $(POPT) endif INCLUDE = -Iinclude -CFLAGS = $(OPT) $(WARN) $(INCLUDE) $(CFLAGS.EXTRA) -+CFLAGS ?= $(OPT) $(WARN) $(CFLAGS.EXTRA) -+CFLAGS += $(INCLUDE) ++CFLAGS ?= ++CFLAGS += $(INCLUDE) $(CFLAGS.EXTRA) all debug: glew.lib glew.lib.mx glew.bin -@@ -83,14 +84,14 @@ LIB.LIBS := $(GL_LDFLAGS) - LIB.SRCS := src/glew.c - LIB.SRCS.NAMES := $(notdir $(LIB.SRCS)) - --LIB.OBJS := $(addprefix tmp/$(SYSTEM)/default/static/,$(LIB.SRCS.NAMES)) -+LIB.OBJS := $(addprefix tmp/$(SYSTEMS)/default/static/,$(LIB.SRCS.NAMES)) - LIB.OBJS := $(LIB.OBJS:.c=.o) --LIB.SOBJS := $(addprefix tmp/$(SYSTEM)/default/shared/,$(LIB.SRCS.NAMES)) -+LIB.SOBJS := $(addprefix tmp/$(SYSTEMS)/default/shared/,$(LIB.SRCS.NAMES)) - LIB.SOBJS := $(LIB.SOBJS:.c=.o) - --LIB.OBJS.MX := $(addprefix tmp/$(SYSTEM)/mx/static/,$(LIB.SRCS.NAMES)) -+LIB.OBJS.MX := $(addprefix tmp/$(SYSTEMS)/mx/static/,$(LIB.SRCS.NAMES)) - LIB.OBJS.MX := $(LIB.OBJS.MX:.c=.o) --LIB.SOBJS.MX := $(addprefix tmp/$(SYSTEM)/mx/shared/,$(LIB.SRCS.NAMES)) -+LIB.SOBJS.MX := $(addprefix tmp/$(SYSTEMS)/mx/shared/,$(LIB.SRCS.NAMES)) - LIB.SOBJS.MX := $(LIB.SOBJS.MX:.c=.o) - - glew.lib: lib lib/$(LIB.SHARED) lib/$(LIB.STATIC) glew.pc -@@ -114,11 +115,11 @@ ifneq ($(STRIP),) - $(STRIP) -x $@ - endif - --tmp/$(SYSTEM)/default/static/glew.o: src/glew.c include/GL/glew.h include/GL/wglew.h include/GL/glxew.h -+tmp/$(SYSTEMS)/default/static/glew.o: src/glew.c include/GL/glew.h include/GL/wglew.h include/GL/glxew.h - @mkdir -p $(dir $@) - $(CC) -DGLEW_NO_GLU -DGLEW_STATIC $(CFLAGS) $(CFLAGS.SO) -o $@ -c $< - --tmp/$(SYSTEM)/default/shared/glew.o: src/glew.c include/GL/glew.h include/GL/wglew.h include/GL/glxew.h -+tmp/$(SYSTEMS)/default/shared/glew.o: src/glew.c include/GL/glew.h include/GL/wglew.h include/GL/glxew.h - @mkdir -p $(dir $@) - $(CC) -DGLEW_NO_GLU $(CFLAGS) $(CFLAGS.SO) -o $@ -c $< - -@@ -154,11 +155,11 @@ ifneq ($(STRIP),) - $(STRIP) -x $@ - endif - --tmp/$(SYSTEM)/mx/static/glew.o: src/glew.c include/GL/glew.h include/GL/wglew.h include/GL/glxew.h -+tmp/$(SYSTEMS)/mx/static/glew.o: src/glew.c include/GL/glew.h include/GL/wglew.h include/GL/glxew.h - @mkdir -p $(dir $@) - $(CC) -DGLEW_NO_GLU -DGLEW_MX -DGLEW_STATIC $(CFLAGS) $(CFLAGS.SO) -o $@ -c $< - --tmp/$(SYSTEM)/mx/shared/glew.o: src/glew.c include/GL/glew.h include/GL/wglew.h include/GL/glxew.h -+tmp/$(SYSTEMS)/mx/shared/glew.o: src/glew.c include/GL/glew.h include/GL/wglew.h include/GL/glxew.h - @mkdir -p $(dir $@) - $(CC) -DGLEW_NO_GLU -DGLEW_MX $(CFLAGS) $(CFLAGS.SO) -o $@ -c $< - -@@ -183,17 +184,17 @@ BIN.LIBS = -Llib $(LDFLAGS.DYNAMIC) -l$( - - GLEWINFO.BIN := glewinfo$(BIN.SUFFIX) - GLEWINFO.BIN.SRC := src/glewinfo.c --GLEWINFO.BIN.OBJ := $(addprefix tmp/$(SYSTEM)/default/shared/,$(notdir $(GLEWINFO.BIN.SRC))) -+GLEWINFO.BIN.OBJ := $(addprefix tmp/$(SYSTEMS)/default/shared/,$(notdir $(GLEWINFO.BIN.SRC))) - GLEWINFO.BIN.OBJ := $(GLEWINFO.BIN.OBJ:.c=.o) - - VISUALINFO.BIN := visualinfo$(BIN.SUFFIX) - VISUALINFO.BIN.SRC := src/visualinfo.c --VISUALINFO.BIN.OBJ := $(addprefix tmp/$(SYSTEM)/default/shared/,$(notdir $(VISUALINFO.BIN.SRC))) -+VISUALINFO.BIN.OBJ := $(addprefix tmp/$(SYSTEMS)/default/shared/,$(notdir $(VISUALINFO.BIN.SRC))) - VISUALINFO.BIN.OBJ := $(VISUALINFO.BIN.OBJ:.c=.o) - - # Don't build glewinfo or visualinfo for NaCL, yet. - --ifneq ($(filter nacl%,$(SYSTEM)),) -+ifneq ($(filter nacl%,$(SYSTEMS)),) - glew.bin: glew.lib bin - else - glew.bin: glew.lib bin bin/$(GLEWINFO.BIN) bin/$(VISUALINFO.BIN) -@@ -233,7 +234,7 @@ install.mx: install.include install.lib - install.lib: glew.lib - $(INSTALL) -d -m 0755 $(LIBDIR) - # runtime --ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),) -+ifeq ($(filter-out mingw% cygwin,$(SYSTEMS)),) - $(INSTALL) -d -m 0755 $(BINDIR) - $(INSTALL) -m 0755 lib/$(LIB.SHARED) $(BINDIR)/ - else -@@ -244,7 +245,7 @@ ifneq ($(LN),) - endif - - # development files --ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),) -+ifeq ($(filter-out mingw% cygwin,$(SYSTEMS)),) - $(INSTALL) -m 0644 lib/$(LIB.DEVLNK) $(LIBDIR)/ - endif - ifneq ($(LN),) -@@ -255,7 +256,7 @@ endif - install.lib.mx: glew.lib.mx - $(INSTALL) -d -m 0755 $(LIBDIR) - # runtime --ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),) -+ifeq ($(filter-out mingw% cygwin,$(SYSTEMS)),) - $(INSTALL) -d -m 0755 $(BINDIR) - $(INSTALL) -m 0755 lib/$(LIB.SHARED.MX) $(BINDIR)/ - else -@@ -265,7 +266,7 @@ ifneq ($(LN),) - $(LN) $(LIB.SHARED.MX) $(LIBDIR)/$(LIB.SONAME.MX) - endif - # development files --ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),) -+ifeq ($(filter-out mingw% cygwin,$(SYSTEMS)),) - $(INSTALL) -m 0644 lib/$(LIB.DEVLNK.MX) $(LIBDIR)/ - endif - ifneq ($(LN),) -@@ -298,7 +299,7 @@ uninstall: - $(RM) $(INCDIR)/glew.h - $(RM) $(INCDIR)/glxew.h - $(RM) $(LIBDIR)/$(LIB.DEVLNK) $(LIBDIR)/$(LIB.DEVLNK.MX) --ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),) -+ifeq ($(filter-out mingw% cygwin,$(SYSTEMS)),) - $(RM) $(BINDIR)/$(LIB.SHARED) $(BINDIR)/$(LIB.SHARED.MX) - else - $(RM) $(LIBDIR)/$(LIB.SONAME) $(LIBDIR)/$(LIB.SONAME.MX) diff --git a/package/libglew/patches/patch-config_Makefile_linux b/package/libglew/patches/patch-config_Makefile_linux index 7b810c7b3..857008caa 100644 --- a/package/libglew/patches/patch-config_Makefile_linux +++ b/package/libglew/patches/patch-config_Makefile_linux @@ -1,12 +1,10 @@ ---- glew-1.10.0.orig/config/Makefile.linux 2013-07-22 16:11:22.000000000 +0200 -+++ glew-1.10.0/config/Makefile.linux 2013-07-30 13:17:09.000000000 +0200 -@@ -1,21 +1,7 @@ +--- glew-1.13.0.orig/config/Makefile.linux 2015-08-10 13:47:22.000000000 +0200 ++++ glew-1.13.0/config/Makefile.linux 2015-11-09 00:29:07.515846709 +0100 +@@ -1,21 +1,6 @@ NAME = $(GLEW_NAME) -CC = cc -LD = cc -+CC ?= cc -+LD = $(CC) - M_ARCH ?= $(shell uname -m) +-M_ARCH ?= $(shell uname -m) -ARCH64 = false -ifeq (x86_64,${M_ARCH}) - ARCH64 = true @@ -21,6 +19,8 @@ - LDFLAGS.EXTRA = -L/usr/X11R6/lib -L/usr/lib - LIBDIR = $(GLEW_DEST)/lib -endif - LDFLAGS.GL = -lXmu -lXi -lGL -lXext -lX11 ++CC ?= cc ++LD = $(CC) + LDFLAGS.GL = -lGL -lX11 LDFLAGS.STATIC = -Wl,-Bstatic LDFLAGS.DYNAMIC = -Wl,-Bdynamic |