glew 1.9.0

This commit is contained in:
Adam Jackson 2012-12-13 13:13:02 -05:00
parent 3e24c4470e
commit 98572364d7
5 changed files with 62 additions and 67 deletions

1
.gitignore vendored
View File

@ -4,3 +4,4 @@ glew-1.5.4.tgz
/glew-1.5.8.tgz
/glew-1.6.0.tgz
/glew-1.7.0.tgz
/glew-1.9.0.tgz

View File

@ -1,63 +0,0 @@
diff -up glew-1.6.0/config/Makefile.linux.jx glew-1.6.0/config/Makefile.linux
--- glew-1.6.0/config/Makefile.linux.jx 2011-04-27 12:16:34.000000000 -0400
+++ glew-1.6.0/config/Makefile.linux 2011-06-20 13:21:38.144060270 -0400
@@ -3,14 +3,8 @@ CC = cc
LD = cc
PICFLAG = -fPIC
M_ARCH ?= $(shell uname -m)
-ifeq (x86_64,${M_ARCH})
-LDFLAGS.EXTRA = -L/usr/X11R6/lib64
-LIBDIR = $(GLEW_DEST)/lib64
-else
-LDFLAGS.EXTRA = -L/usr/X11R6/lib
-LIBDIR = $(GLEW_DEST)/lib
-endif
-LDFLAGS.GL = -lXmu -lXi -lGLU -lGL -lXext -lX11
+LIBDIR = $(GLEW_DEST)$(libdir)
+LDFLAGS.GL = -lGL -lX11 -lGLU
LDFLAGS.STATIC = -Wl,-Bstatic
LDFLAGS.DYNAMIC = -Wl,-Bdynamic
NAME = GLEW
diff -up glew-1.6.0/Makefile.jx glew-1.6.0/Makefile
--- glew-1.6.0/Makefile.jx 2011-04-27 12:16:35.000000000 -0400
+++ glew-1.6.0/Makefile 2011-06-20 13:23:05.090373848 -0400
@@ -41,9 +41,9 @@ $(error "Platform '$(SYSTEM)' not suppor
endif
GLEW_DEST ?= /usr
-BINDIR ?= $(GLEW_DEST)/bin
-LIBDIR ?= $(GLEW_DEST)/lib
-INCDIR ?= $(GLEW_DEST)/include/GL
+BINDIR ?= $(GLEW_DEST)$(bindir)
+LIBDIR ?= $(GLEW_DEST)$(libdir)
+INCDIR ?= $(GLEW_DEST)$(includedir)/GL
SHARED_OBJ_EXT ?= o
TARDIR = ../glew-$(GLEW_VERSION)
@@ -56,7 +56,7 @@ DIST_SRC_TGZ = glew-$(GLEW_VERSION).tgz
AR = ar
INSTALL = install
-STRIP = strip
+STRIP = true
RM = rm -f
LN = ln -sf
ifeq ($(MAKECMDGOALS), debug)
@@ -186,7 +186,7 @@ ifeq ($(filter-out mingw% cygwin,$(SYSTE
$(INSTALL) -m 0755 lib/$(LIB.SHARED) $(BINDIR)/
else
$(STRIP) -x lib/$(LIB.SHARED)
- $(INSTALL) -m 0644 lib/$(LIB.SHARED) $(LIBDIR)/
+ $(INSTALL) -m 0755 lib/$(LIB.SHARED) $(LIBDIR)/
$(LN) $(LIB.SHARED) $(LIBDIR)/$(LIB.SONAME)
endif
# development files
@@ -221,7 +221,7 @@ endif
install.bin: glew.bin
$(INSTALL) -d -m 0755 $(BINDIR)
- $(INSTALL) -s -m 0755 bin/$(GLEWINFO.BIN) bin/$(VISUALINFO.BIN) $(BINDIR)/
+ $(INSTALL) -m 0755 bin/$(GLEWINFO.BIN) bin/$(VISUALINFO.BIN) $(BINDIR)/
install.include:
$(INSTALL) -d -m 0755 $(INCDIR)

54
glew-1.9.0-makefile.patch Normal file
View File

@ -0,0 +1,54 @@
diff -up glew-1.9.0/config/Makefile.linux.jx glew-1.9.0/config/Makefile.linux
--- glew-1.9.0/config/Makefile.linux.jx 2012-08-06 11:59:08.000000000 -0400
+++ glew-1.9.0/config/Makefile.linux 2012-12-13 13:03:05.044983152 -0500
@@ -3,14 +3,8 @@ CC = cc
LD = cc
PICFLAG = -fPIC
M_ARCH ?= $(shell uname -m)
-ifeq (x86_64,${M_ARCH})
-LDFLAGS.EXTRA = -L/usr/X11R6/lib64 -L/usr/lib64
-LIBDIR = $(GLEW_DEST)/lib64
-else
-LDFLAGS.EXTRA = -L/usr/X11R6/lib -L/usr/lib
-LIBDIR = $(GLEW_DEST)/lib
-endif
-LDFLAGS.GL = -lXmu -lXi -lGL -lXext -lX11
+LIBDIR = $(GLEW_DEST)$(libdir)
+LDFLAGS.GL = -lGLU -lGL -lX11
LDFLAGS.STATIC = -Wl,-Bstatic
LDFLAGS.DYNAMIC = -Wl,-Bdynamic
NAME = GLEW
diff -up glew-1.9.0/Makefile.jx glew-1.9.0/Makefile
--- glew-1.9.0/Makefile.jx 2012-12-13 13:00:59.000000000 -0500
+++ glew-1.9.0/Makefile 2012-12-13 13:04:58.027629027 -0500
@@ -41,9 +41,9 @@ $(error "Platform '$(SYSTEM)' not suppor
endif
GLEW_DEST ?= /usr
-BINDIR ?= $(GLEW_DEST)/bin
-LIBDIR ?= $(GLEW_DEST)/lib
-INCDIR ?= $(GLEW_DEST)/include/GL
+BINDIR ?= $(GLEW_DEST)$(bindir)
+LIBDIR ?= $(GLEW_DEST)$(libdir)
+INCDIR ?= $(GLEW_DEST)$(includedir)/GL
TARDIR = ../glew-$(GLEW_VERSION)
TARBALL = ../glew-$(GLEW_VERSION).tar.gz
@@ -224,7 +224,7 @@ ifeq ($(filter-out mingw% cygwin,$(SYSTE
$(INSTALL) -d -m 0755 $(BINDIR)
$(INSTALL) -m 0755 lib/$(LIB.SHARED) $(BINDIR)/
else
- $(INSTALL) -m 0644 lib/$(LIB.SHARED) $(LIBDIR)/
+ $(INSTALL) -m 0755 lib/$(LIB.SHARED) $(LIBDIR)/
endif
ifneq ($(LN),)
$(LN) $(LIB.SHARED) $(LIBDIR)/$(LIB.SONAME)
@@ -246,7 +246,7 @@ ifeq ($(filter-out mingw% cygwin,$(SYSTE
$(INSTALL) -d -m 0755 $(BINDIR)
$(INSTALL) -m 0755 lib/$(LIB.SHARED.MX) $(BINDIR)/
else
- $(INSTALL) -m 0644 lib/$(LIB.SHARED.MX) $(LIBDIR)/
+ $(INSTALL) -m 0755 lib/$(LIB.SHARED.MX) $(LIBDIR)/
endif
ifneq ($(LN),)
$(LN) $(LIB.SHARED.MX) $(LIBDIR)/$(LIB.SONAME.MX)

View File

@ -1,13 +1,13 @@
Name: glew
Version: 1.7.0
Release: 3%{?dist}
Version: 1.9.0
Release: 1%{?dist}
Summary: The OpenGL Extension Wrangler Library
Group: System Environment/Libraries
License: BSD and MIT
URL: http://glew.sourceforge.net
Source0: http://downloads.sourceforge.net/project/glew/glew/%{version}/glew-%{version}.tgz
Patch0: glew-1.6.0-makefile.patch
Patch0: glew-1.9.0-makefile.patch
BuildRequires: libGLU-devel
%description
@ -99,6 +99,9 @@ rm -rf $RPM_BUILD_ROOT
%doc doc/*
%changelog
* Thu Dec 13 2012 Adam Jackson <ajax@redhat.com> 1.9.0-1
- glew 1.9.0
* Sun Jul 22 2012 Ville Skyttä <ville.skytta@iki.fi> - 1.7.0-3
- Move/add ldconfig post(un)install scriptlets to appropriate subpackages.

View File

@ -1 +1 @@
fb7a8bb79187ac98a90b57f0f27a3e84 glew-1.7.0.tgz
69ce911decef6249d24742497e6ad06a glew-1.9.0.tgz