Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
1966f893
Commit
1966f893
authored
Feb 25, 2012
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update GLEW to 1.7.0
parent
9457b4e1
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
115 additions
and
97 deletions
+115
-97
contrib/src/glew/SHA512SUMS
contrib/src/glew/SHA512SUMS
+1
-1
contrib/src/glew/rules.mak
contrib/src/glew/rules.mak
+6
-8
contrib/src/glew/win32.patch
contrib/src/glew/win32.patch
+108
-88
No files found.
contrib/src/glew/SHA512SUMS
View file @
1966f893
9107f88aac67788bb0d3ac1c017b37f2cd507b0c8a1f2b4e55cc8364bea9ddab74163e31117e9c6df9926a4cc21c1bb07050e123097b1e0374452d1887e840b5 glew-1.5.1-src
.tar.gz
03d7a816fde0c445c964280ac9e679a0d2dfca839e87345360adec4fdb2292b4ddfc85538954b052c538ca355e559d8ee3a5ea7ea2a99130687054a92e0df857 glew-1.7.0
.tar.gz
contrib/src/glew/rules.mak
View file @
1966f893
# GLEW
# GLEW
GLEW_VERSION
:=
1.
5.1
GLEW_VERSION
:=
1.
7.0
GLEW_URL
:=
$(SF)
/glew/glew/
$(GLEW_VERSION)
/glew-
$(GLEW_VERSION)
-src
.tgz
GLEW_URL
:=
$(SF)
/glew/glew/
$(GLEW_VERSION)
/glew-
$(GLEW_VERSION)
.tgz
$(TARBALLS)/glew-$(GLEW_VERSION)
-src
.tar.gz
:
$(TARBALLS)/glew-$(GLEW_VERSION).tar.gz
:
$(
call
download,
$(GLEW_URL)
)
$(
call
download,
$(GLEW_URL)
)
.sum-glew
:
glew-$(GLEW_VERSION)
-src
.tar.gz
.sum-glew
:
glew-$(GLEW_VERSION).tar.gz
glew
:
glew-$(GLEW_VERSION)
-src
.tar.gz .sum-glew
glew
:
glew-$(GLEW_VERSION).tar.gz .sum-glew
$(UNPACK)
$(UNPACK)
mv
glew glew-
$(GLEW_VERSION)
-src
ifdef
HAVE_WIN32
ifdef
HAVE_WIN32
$(APPLY)
$(SRC)
/glew/win32.patch
$(APPLY)
$(SRC)
/glew/win32.patch
endif
endif
$(MOVE)
$(MOVE)
cd
$@
&&
sed
-e
's/.$$//'
-iorig
config/config.guess
.glew
:
glew
.glew
:
glew
cd
$<
&&
$(HOSTVARS)
CFLAGS
=
"
$(CFLAGS)
-DGLEW_STATIC"
$(MAKE)
cd
$<
&&
$(HOSTVARS)
CFLAGS
=
"
$(CFLAGS)
-DGLEW_STATIC"
$(MAKE)
cd
$<
&&
$(HOSTVARS)
GLEW_DEST
=
$(PREFIX)
$(MAKE)
install
cd
$<
&&
$(HOSTVARS)
GLEW_DEST
=
$(PREFIX)
$(MAKE)
install
ifdef
HAVE_WIN32
ifdef
HAVE_WIN32
-
rm
$(PREFIX)
/lib/
lib
glew32.dll
*
-
rm
$(PREFIX)
/lib/
*
glew32.dll
*
endif
endif
touch
$@
touch
$@
contrib/src/glew/win32.patch
View file @
1966f893
--- glew/Makefile 20
08-11-03 07:25:21.000000000 +01
00
--- glew/Makefile 20
11-08-25 16:17:55.000000000 +02
00
+++ glew.new/Makefile 20
09-12-03 22:30:47.000000000
+0100
+++ glew.new/Makefile 20
12-02-25 16:47:22.070430867
+0100
@@ -31,7 +31,7 @@
@@ -31,7 +31,7 @@
include config/version
include config/version
SHELL = /bin/sh
SHELL = /bin/sh
-SYSTEM = $(shell config/config.guess | cut -d - -f 3 | sed -e 's/[0-9\.]//g;')
-SYSTEM ?= $(shell config/config.guess | cut -d - -f 3 | sed -e 's/[0-9\.]//g;')
+SYSTEM = mingw
+SYSTEM ?= mingw
SYSTEM.SUPPORTED = $(shell test -f config/Makefile.$(SYSTEM) && echo 1)
SYSTEM.SUPPORTED = $(shell test -f config/Makefile.$(SYSTEM) && echo 1)
ifeq ($(SYSTEM.SUPPORTED), 1)
ifeq ($(SYSTEM.SUPPORTED), 1)
@@ -48,9 +48,7 @@
@@ -54,9 +54,7 @@
TARDIR = ../glew-$(GLEW_VERSION)
DIST_SRC_ZIP = glew-$(GLEW_VERSION).zip
TARBALL = ../glew_$(GLEW_VERSION).tar.gz
DIST_SRC_TGZ = glew-$(GLEW_VERSION).tgz
-AR = ar
-AR = ar
INSTALL = install
INSTALL = install
-STRIP = strip
-STRIP = strip
RM = rm -f
RM = rm -f
LN = ln -sf
LN = ln -sf
ifeq ($(MAKECMDGOALS), debug)
ifeq ($(MAKECMDGOALS), debug)
@@ -75,7 +73,7 @@
@@ -84,7 +82,7 @@
VISUALINFO.BIN.OBJS = $(VISUALINFO_BIN.SRCS:.c=.o)
VISUALINFO.BIN.OBJS = $(VISUALINFO.BIN.SRCS:.c=.o)
BIN.LIBS = -Llib $(LDFLAGS.DYNAMIC) -l$(NAME) $(LDFLAGS.EXTRA) $(LDFLAGS.GL)
BIN.LIBS = -Llib $(LDFLAGS.DYNAMIC) -l$(NAME) $(LDFLAGS.EXTRA) $(LDFLAGS.GL)
-all debug: lib/$(LIB.SHARED) lib/$(LIB.STATIC) bin/$(GLEWINFO.BIN) bin/$(VISUALINFO.BIN)
-all debug: glew.lib glew.lib.mx glew.bin
+all debug: lib/$(LIB.SHARED) lib/$(LIB.STATIC)
+all debug: glew.lib glew.lib.mx
lib:
%.o: %.c
mkdir lib
$(CC) -c $(CFLAGS) -o $@ $<
@@ -112,27 +110,17 @@
@@ -180,42 +178,20 @@
$(INSTALL) -d -m 0755 $(INCDIR)
install.lib: glew.lib
$(INSTALL) -d -m 0755 $(LIBDIR)
$(INSTALL) -d -m 0755 $(LIBDIR)
# runtime
# runtime
-ifeq ($(patsubst mingw%,mingw,$(SYSTEM)), mingw)
-ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),)
- $(STRIP) -x lib/$(LIB.SHARED)
- $(INSTALL) -d -m 0755 $(BINDIR)
- $(INSTALL) -m 0644 lib/$(LIB.SHARED) $(BINDIR)/
- $(STRIP) -x lib/$(LIB.SHARED)
-else
- $(INSTALL) -m 0755 lib/$(LIB.SHARED) $(BINDIR)/
$(STRIP) -x lib/$(LIB.SHARED)
-else
$(INSTALL) -m 0644 lib/$(LIB.SHARED) $(LIBDIR)/
$(STRIP) -x lib/$(LIB.SHARED)
$(LN) $(LIB.SHARED) $(LIBDIR)/$(LIB.SONAME)
$(INSTALL) -m 0644 lib/$(LIB.SHARED) $(LIBDIR)/
-endif
$(LN) $(LIB.SHARED) $(LIBDIR)/$(LIB.SONAME)
# development files
-endif
$(INSTALL) -m 0644 include/GL/wglew.h $(INCDIR)/
# development files
$(INSTALL) -m 0644 include/GL/glew.h $(INCDIR)/
-ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),)
$(INSTALL) -m 0644 include/GL/glxew.h $(INCDIR)/
- $(INSTALL) -m 0644 lib/$(LIB.DEVLNK) $(LIBDIR)/
-ifeq ($(patsubst mingw%,mingw,$(SYSTEM)), mingw)
-else
- $(INSTALL) -m 0644 lib/$(LIB.DEVLNK) $(LIBDIR)/
- $(LN) $(LIB.SHARED) $(LIBDIR)/$(LIB.DEVLNK)
-else
-endif
- strip -x lib/$(LIB.STATIC)
$(STRIP) -x lib/$(LIB.STATIC)
+ $(STRIP) -x lib/$(LIB.STATIC)
$(INSTALL) -m 0644 lib/$(LIB.STATIC) $(LIBDIR)/
$(INSTALL) -m 0644 lib/$(LIB.STATIC) $(LIBDIR)/
$(LN) $(LIB.SHARED) $(LIBDIR)/$(LIB.DEVLNK)
install.lib.mx: glew.lib.mx
-endif
$(INSTALL) -d -m 0755 $(LIBDIR)
# utilities
# runtime
- $(INSTALL) -s -m 0755 bin/$(GLEWINFO.BIN) bin/$(VISUALINFO.BIN) $(BINDIR)/
-ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),)
- $(INSTALL) -d -m 0755 $(BINDIR)
uninstall:
- $(STRIP) -x lib/$(LIB.SHARED.MX)
$(RM) $(INCDIR)/wglew.h
- $(INSTALL) -m 0755 lib/$(LIB.SHARED.MX) $(BINDIR)/
--- glew/config/Makefile.mingw 2008-11-03 07:25:20.000000000 +0100
-else
+++ glew.new/config/Makefile.mingw 2009-12-03 22:18:32.000000000 +0100
$(STRIP) -x lib/$(LIB.SHARED.MX)
@@ -1,13 +1,11 @@
$(INSTALL) -m 0644 lib/$(LIB.SHARED.MX) $(LIBDIR)/
NAME = glew32
$(LN) $(LIB.SHARED.MX) $(LIBDIR)/$(LIB.SONAME.MX)
-CC = gcc
-endif
# use gcc for linking, with ld it does not work
# development files
-LD = gcc
-ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),)
ifneq (undefined, $(origin GLEW_MX))
- $(INSTALL) -m 0644 lib/$(LIB.DEVLNK.MX) $(LIBDIR)/
CFLAGS.EXTRA = -DGLEW_MX
-else
endif
- $(LN) $(LIB.SHARED.MX) $(LIBDIR)/$(LIB.DEVLNK.MX)
-CFLAGS.SO = -DGLEW_BUILD
-endif
+CFLAGS.SO = -DGLEW_BUILD -DSTATIC
$(STRIP) -x lib/$(LIB.STATIC.MX)
#LDFLAGS.SO = -shared -soname $(LIB.SONAME) --out-implib lib/$(LIB.DEVLNK)
$(INSTALL) -m 0644 lib/$(LIB.STATIC.MX) $(LIBDIR)/
-LDFLAGS.SO = -shared -Wl,-soname,$(LIB.SONAME) -Wl,--out-implib,lib/$(LIB.DEVLNK)
+#LDFLAGS.SO = -shared -Wl,-soname,$(LIB.SONAME) -Wl,--out-implib,lib/$(LIB.DEVLNK)
diff -ruN glew/config/Makefile.mingw glew.new/config/Makefile.mingw
LDFLAGS.GL = -lglu32 -lopengl32 -lgdi32 -luser32 -lkernel32
--- glew/config/Makefile.mingw 2011-08-25 16:17:55.000000000 +0200
LDFLAGS.EXTRA = -L/mingw/lib
+++ glew.new/config/Makefile.mingw 2012-02-25 16:42:36.603751173 +0100
WARN = -Wall -W
@@ -1,8 +1,6 @@
diff -ur glew.orig//include/GL/glew.h glew/include/GL/glew.h
NAME = glew32
--- glew.orig//include/GL/glew.h 2011-09-23 01:38:28.524786958 -0400
-CC = gcc
+++ glew/include/GL/glew.h 2011-09-23 01:45:16.405385194 -0400
# use gcc for linking, with ld it does not work
@@ -150,7 +150,7 @@
-LD = gcc
#endif
-CFLAGS.SO = -DGLEW_BUILD
#if !defined(_PTRDIFF_T_DEFINED) && !defined(_PTRDIFF_T_)
+CFLAGS.SO = -DGLEW_BUILD -DSTATIC
# ifdef _WIN64
LDFLAGS.GL = -lglu32 -lopengl32 -lgdi32 -luser32 -lkernel32
-typedef __int64 ptrdiff_t;
LDFLAGS.EXTRA = -L/mingw/lib
+#include <stdint.h>
WARN = -Wall -W
# else
@@ -12,9 +10,9 @@
typedef _W64 int ptrdiff_t;
LIB.DEVLNK = lib$(NAME).dll.a # for mingw this is the dll import lib
# endif
LIB.SHARED = $(NAME).dll
LIB.STATIC = lib$(NAME).a # the static lib will be broken (see CFLAGS.SO)
-LDFLAGS.SO = -shared -Wl,-soname,$(LIB.SONAME) -Wl,--out-implib,lib/$(LIB.DEVLNK)
+#LDFLAGS.SO = -shared -Wl,-soname,$(LIB.SONAME) -Wl,--out-implib,lib/$(LIB.DEVLNK)
LIB.SONAME.MX = lib$(NAME)mx.dll
LIB.DEVLNK.MX = lib$(NAME)mx.dll.a # for mingw this is the dll import lib
LIB.SHARED.MX = $(NAME)mx.dll
LIB.STATIC.MX = lib$(NAME)mx.a # the static lib will be broken (see CFLAGS.SO)
-LDFLAGS.SO.MX = -shared -Wl,-soname,$(LIB.SONAME.MX) -Wl,--out-implib,lib/$(LIB.DEVLNK.MX)
+#LDFLAGS.SO.MX = -shared -Wl,-soname,$(LIB.SONAME.MX) -Wl,--out-implib,lib/$(LIB.DEVLNK.MX)
--- glew/include/GL/glew.h 2011-08-25 16:17:55.000000000 +0200
+++ glew.new/include/GL/glew.h 2012-02-25 16:39:44.970410007 +0100
@@ -151,7 +151,7 @@
#endif
#if !defined(_PTRDIFF_T_DEFINED) && !defined(_PTRDIFF_T_) && !defined(__MINGW64__)
# ifdef _WIN64
-typedef __int64 ptrdiff_t;
+# include <stdint.h>
# else
typedef _W64 int ptrdiff_t;
# endif
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment