- glew 1.5.2
This commit is contained in:
Adam Jackson
parent
a09119934c
commit
b007a0ba75
@ -1 +1 @@
|
||||
glew-1.5.1-src.tgz
|
||||
glew-1.5.2.tgz
|
||||
|
||||
@ -1,71 +1,72 @@
|
||||
diff -up glew/config/Makefile.linux.org glew/config/Makefile.linux
|
||||
--- glew/config/Makefile.linux.org 2008-11-03 07:25:20.000000000 +0100
|
||||
+++ glew/config/Makefile.linux 2008-11-13 19:38:43.000000000 +0100
|
||||
@@ -7,14 +7,8 @@ endif
|
||||
PICFLAG = -fPIC
|
||||
LDFLAGS.SO = -shared -Wl,-soname=$(LIB.SONAME)
|
||||
M_ARCH ?= $(shell arch)
|
||||
-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
|
||||
LDFLAGS.STATIC = -Wl,-Bstatic
|
||||
LDFLAGS.DYNAMIC = -Wl,-Bdynamic
|
||||
NAME = GLEW
|
||||
diff -up glew/Makefile.org glew/Makefile
|
||||
--- glew/Makefile.org 2008-11-03 07:25:21.000000000 +0100
|
||||
+++ glew/Makefile 2008-11-13 19:39:41.000000000 +0100
|
||||
@@ -41,16 +41,16 @@ $(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)
|
||||
TARBALL = ../glew_$(GLEW_VERSION).tar.gz
|
||||
|
||||
AR = ar
|
||||
INSTALL = install
|
||||
-STRIP = strip
|
||||
+STRIP = true
|
||||
RM = rm -f
|
||||
LN = ln -sf
|
||||
ifeq ($(MAKECMDGOALS), debug)
|
||||
@@ -95,7 +95,7 @@ bin/$(GLEWINFO.BIN): $(GLEWINFO.BIN.SRCS
|
||||
$(CC) $(CFLAGS) -o $@ $(GLEWINFO.BIN.SRCS) $(BIN.LIBS)
|
||||
|
||||
bin/$(VISUALINFO.BIN): $(VISUALINFO.BIN.SRCS) lib/$(LIB.SHARED)
|
||||
- $(CC) $(CFLAGS) -o $@ $(VISUALINFO.BIN.SRCS) $(BIN.LIBS)
|
||||
+ $(CC) $(CFLAGS) -o $@ $(VISUALINFO.BIN.SRCS) $(BIN.LIBS) -lGLU
|
||||
|
||||
%.o: %.c
|
||||
$(CC) -c $(CFLAGS) -o $@ $<
|
||||
@@ -117,7 +117,7 @@ ifeq ($(patsubst mingw%,mingw,$(SYSTEM))
|
||||
$(INSTALL) -m 0644 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
|
||||
@@ -132,7 +132,7 @@ else
|
||||
$(LN) $(LIB.SHARED) $(LIBDIR)/$(LIB.DEVLNK)
|
||||
endif
|
||||
# utilities
|
||||
- $(INSTALL) -s -m 0755 bin/$(GLEWINFO.BIN) bin/$(VISUALINFO.BIN) $(BINDIR)/
|
||||
+ $(INSTALL) -m 0755 bin/$(GLEWINFO.BIN) bin/$(VISUALINFO.BIN) $(BINDIR)/
|
||||
|
||||
uninstall:
|
||||
$(RM) $(INCDIR)/wglew.h
|
||||
diff -up glew-1.5.2/config/Makefile.linux.jx glew-1.5.2/config/Makefile.linux
|
||||
--- glew-1.5.2/config/Makefile.linux.jx 2009-12-31 12:06:19.000000000 -0500
|
||||
+++ glew-1.5.2/config/Makefile.linux 2010-02-02 10:16:40.000000000 -0500
|
||||
@@ -7,14 +7,8 @@ endif
|
||||
PICFLAG = -fPIC
|
||||
LDFLAGS.SO = -shared -Wl,-soname=$(LIB.SONAME)
|
||||
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
|
||||
LDFLAGS.STATIC = -Wl,-Bstatic
|
||||
LDFLAGS.DYNAMIC = -Wl,-Bdynamic
|
||||
NAME = GLEW
|
||||
diff -up glew-1.5.2/Makefile.jx glew-1.5.2/Makefile
|
||||
--- glew-1.5.2/Makefile.jx 2009-12-31 12:06:19.000000000 -0500
|
||||
+++ glew-1.5.2/Makefile 2010-02-02 10:21:23.000000000 -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
|
||||
SHARED_OBJ_EXT ?= o
|
||||
TARDIR = ../glew-$(GLEW_VERSION)
|
||||
TARBALL = ../glew-$(GLEW_VERSION).tar.gz
|
||||
@@ -55,7 +55,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)
|
||||
@@ -100,7 +100,7 @@ bin/$(GLEWINFO.BIN): $(GLEWINFO.BIN.OBJS
|
||||
$(CC) $(CFLAGS) -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) -o $@ $(VISUALINFO.BIN.OBJS) $(BIN.LIBS) -lGLU
|
||||
|
||||
%.o: %.c
|
||||
$(CC) -c $(CFLAGS) -o $@ $<
|
||||
@@ -122,7 +122,7 @@ ifeq ($(patsubst mingw%,mingw,$(SYSTEM))
|
||||
$(INSTALL) -m 0644 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
|
||||
@@ -137,7 +137,7 @@ else
|
||||
$(LN) $(LIB.SHARED) $(LIBDIR)/$(LIB.DEVLNK)
|
||||
endif
|
||||
# utilities
|
||||
- $(INSTALL) -s -m 0755 bin/$(GLEWINFO.BIN) bin/$(VISUALINFO.BIN) $(BINDIR)/
|
||||
+ $(INSTALL) -m 0755 bin/$(GLEWINFO.BIN) bin/$(VISUALINFO.BIN) $(BINDIR)/
|
||||
|
||||
uninstall:
|
||||
$(RM) $(INCDIR)/wglew.h
|
||||
13
glew.spec
13
glew.spec
@ -1,13 +1,13 @@
|
||||
Name: glew
|
||||
Version: 1.5.1
|
||||
Release: 3%{?dist}
|
||||
Version: 1.5.2
|
||||
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/glew/glew-%{version}-src.tgz
|
||||
Patch0: glew-1.5.1-makefile.patch
|
||||
Source0: http://downloads.sourceforge.net/project/glew/glew/%{version}/glew-%{version}.tgz
|
||||
Patch0: glew-1.5.2-makefile.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
BuildRequires: libGLU-devel
|
||||
|
||||
@ -31,7 +31,7 @@ Development files for glew
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
|
||||
sed -i -e 's/\r//g' config/config.guess
|
||||
@ -70,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%doc doc/*
|
||||
|
||||
%changelog
|
||||
* Tue Feb 02 2010 Adam Jackson <ajax@redhat.com> 1.5.2-1
|
||||
- glew 1.5.2
|
||||
|
||||
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.1-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user