Page MenuHomeFreeBSD
Files F153634903

D25162.id.diff
No OneTemporary
Actions

D25162.id.diff
View Options

Index: head/graphics/glew-wayland/Makefile
===================================================================
--- head/graphics/glew-wayland/Makefile
+++ head/graphics/glew-wayland/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PORTREVISION= 1
+PORTREVISION= 0
PKGNAMESUFFIX= -wayland
# https://github.com/nigels-com/glew/issues/172
Index: head/graphics/glew-wayland/pkg-plist
===================================================================
--- head/graphics/glew-wayland/pkg-plist
+++ head/graphics/glew-wayland/pkg-plist
@@ -4,5 +4,5 @@
lib/libGLEW-wayland.a
lib/libGLEW-wayland.so
lib/libGLEW-wayland.so.2
-lib/libGLEW-wayland.so.2.1.0
+lib/libGLEW-wayland.so.2.2.0
libdata/pkgconfig/glew-wayland.pc
Index: head/graphics/glew/Makefile
===================================================================
--- head/graphics/glew/Makefile
+++ head/graphics/glew/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= glew
-PORTVERSION= 2.1.0
+PORTVERSION= 2.2.0
PORTREVISION?= 0
CATEGORIES= graphics
MASTER_SITES= SF
Index: head/graphics/glew/distinfo
===================================================================
--- head/graphics/glew/distinfo
+++ head/graphics/glew/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1509375302
-SHA256 (glew-2.1.0.tgz) = 04de91e7e6763039bc11940095cd9c7f880baba82196a7765f727ac05a993c95
-SIZE (glew-2.1.0.tgz) = 764073
+TIMESTAMP = 1584273239
+SHA256 (glew-2.2.0.tgz) = d4fc82893cfb00109578d0a1a2337fb8ca335b3ceccf97b97e5cc7f08e4353e1
+SIZE (glew-2.2.0.tgz) = 835861
Index: head/graphics/glew/files/patch-Makefile
===================================================================
--- head/graphics/glew/files/patch-Makefile
+++ head/graphics/glew/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig 2017-10-30 16:24:12 UTC
+--- Makefile.orig 2020-03-15 11:53:59 UTC
+++ Makefile
-@@ -115,7 +115,7 @@ else ifneq ($(LIBTOOL),)
+@@ -116,7 +116,7 @@ else ifneq ($(LIBTOOL),)
$(LIBTOOL) $@ $^
endif
ifneq ($(STRIP),)
@@ -8,9 +8,9 @@
+ $(STRIP) $@
endif
- lib/$(LIB.SHARED): $(LIB.SOBJS)
-@@ -125,8 +125,9 @@ ifneq ($(LN),)
- $(LN) $(LIB.SHARED) lib/$(LIB.DEVLNK)
+ $(LIB.SHARED.DIR)/$(LIB.SHARED): $(LIB.SOBJS)
+@@ -126,8 +126,9 @@ ifneq ($(LN),)
+ $(LN) $(LIB.SHARED) $(LIB.SHARED.DIR)/$(LIB.DEVLNK)
endif
ifneq ($(STRIP),)
- $(STRIP) -x $@
@@ -20,7 +20,7 @@
tmp/$(SYSTEM)/default/static/glew.o: src/glew.c include/GL/glew.h include/GL/wglew.h include/GL/glxew.h
@mkdir -p $(dir $@)
-@@ -142,14 +143,14 @@ tmp/$(SYSTEM)/default/shared/glew.o: src/glew.c includ
+@@ -143,15 +144,15 @@ tmp/$(SYSTEM)/default/shared/glew.o: src/glew.c includ
glew.pc: glew.pc.in
sed \
@@ -31,6 +31,7 @@
- -e "s|@version@|$(GLEW_VERSION)|g" \
- -e "s|@cflags@||g" \
- -e "s|@libname@|$(NAME)|g" \
+- -e "s|@libgl@|$(LDFLAGS.GL)|g" \
- -e "s|@requireslib@|$(LIBGLU)|g" \
+ -e 's|@prefix@|$(GLEW_PREFIX)|g' \
+ -e 's|@libdir@|$${prefix}/lib|g' \
@@ -39,19 +40,20 @@
+ -e 's|@version@|$(GLEW_VERSION)|g' \
+ -e 's|@cflags@||g' \
+ -e 's|@libname@|$(NAME)|g' \
++ -e 's|@libgl@|$(LDFLAGS.GL)|g' \
+ -e 's|@requireslib@|$(LIBGLU)|g' \
< $< > $@
# GLEW utility programs
-@@ -180,22 +181,22 @@ bin:
- bin/$(GLEWINFO.BIN): $(GLEWINFO.BIN.OBJ) lib/$(LIB.SHARED)
+@@ -182,22 +183,22 @@ bin:
+ bin/$(GLEWINFO.BIN): $(GLEWINFO.BIN.OBJ) $(LIB.SHARED.DIR)/$(LIB.SHARED)
$(CC) $(CFLAGS) -o $@ $(GLEWINFO.BIN.OBJ) $(BIN.LIBS)
ifneq ($(STRIP),)
- $(STRIP) -x $@
+ $(STRIP) $@
endif
- bin/$(VISUALINFO.BIN): $(VISUALINFO.BIN.OBJ) lib/$(LIB.SHARED)
+ bin/$(VISUALINFO.BIN): $(VISUALINFO.BIN.OBJ) $(LIB.SHARED.DIR)/$(LIB.SHARED)
$(CC) $(CFLAGS) -o $@ $(VISUALINFO.BIN.OBJ) $(BIN.LIBS)
ifneq ($(STRIP),)
- $(STRIP) -x $@
Index: head/graphics/glew/files/patch-config__Makefile.freebsd
===================================================================
--- head/graphics/glew/files/patch-config__Makefile.freebsd
+++ head/graphics/glew/files/patch-config__Makefile.freebsd
@@ -1,17 +1,19 @@
---- config/Makefile.freebsd.orig 2017-07-31 11:25:39 UTC
+--- config/Makefile.freebsd.orig 2020-03-15 11:53:59 UTC
+++ config/Makefile.freebsd
-@@ -1,17 +1,17 @@
+@@ -1,19 +1,19 @@
+ # As of FreeBSD12 X11 is in /usr/local
+
NAME = $(GLEW_NAME)
-CC = cc
-LD = ld
--LDFLAGS.EXTRA = -L/usr/X11R6/lib
+-LDFLAGS.EXTRA = -L/usr/local/lib
+CC ?= cc
+LD ?= ld
+LDFLAGS.EXTRA ?= -L${LOCALBASE}/lib
LDFLAGS.GL = -lGL -lX11
LDFLAGS.STATIC = -Wl,-Bstatic
LDFLAGS.DYNAMIC = -Wl,-Bdynamic
--CFLAGS.EXTRA += -I/usr/X11R6/include -fPIC
+-CFLAGS.EXTRA += -I/usr/local/include -fPIC
+CFLAGS.EXTRA += -I${LOCALBASE}/include -fPIC
NAME = GLEW
WARN = -Wall -W
Index: head/graphics/glew/pkg-plist
===================================================================
--- head/graphics/glew/pkg-plist
+++ head/graphics/glew/pkg-plist
@@ -6,7 +6,7 @@
lib/libGLEW.a
lib/libGLEW.so
lib/libGLEW.so.2
-lib/libGLEW.so.2.1.0
+lib/libGLEW.so.2.2.0
libdata/pkgconfig/glew.pc
%%PORTDOCS%%%%DOCSDIR%%/advanced.html
%%PORTDOCS%%%%DOCSDIR%%/basic.html

File Metadata

Mime Type
text/plain
Expires
Thu, Apr 23, 12:57 PM (20 h, 22 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
32026837
Default Alt Text
D25162.id.diff (4 KB)

Event Timeline