rpms/glew
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge commit 'aff785b52f56d25417c5478ad1824f61ffb6da3d'

Browse Source
This commit is contained in:
Adam Williamson 2011-03-23 19:36:31 -07:00
commit adc4912cd3
4 changed files with 12 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
glew-1.5.7-add-needed.patch
View File

@ -1,11 +0,0 @@
--- glew-1.5.7/config/Makefile.linux 2011-03-23 14:00:51.146177580 -0700
+++ glew-1.5.7/config/Makefile.linux.new 2011-03-23 14:23:27.568295306 -0700
@@ -8,7 +8,7 @@
LDFLAGS.SO = -shared -Wl,-soname=$(LIB.SONAME)
M_ARCH ?= $(shell uname -m)
LIBDIR = $(GLEW_DEST)$(libdir)
-LDFLAGS.GL = -lGL
+LDFLAGS.GL = -lGL -lX11 -lGLU
LDFLAGS.STATIC = -Wl,-Bstatic
LDFLAGS.DYNAMIC = -Wl,-Bdynamic
NAME = GLEW

2
glew-1.5.8-glewmx.patch
View File

@ -51,7 +51,7 @@ index 2499b8d..ebba21a 100644
- $(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) -lGLU
- $(CC) $(CFLAGS) -o $@ $(VISUALINFO.BIN.OBJS) $(BIN.LIBS)
-
-%.o: %.c
- $(CC) -c $(CFLAGS) -o $@ $<

11
glew-1.5.2-makefile.patch → glew-1.5.8-makefile.patch
View File

@ -14,7 +14,7 @@ diff -up glew-1.5.5/config/Makefile.linux.make glew-1.5.5/config/Makefile.linux
-endif
-LDFLAGS.GL = -lXmu -lXi -lGLU -lGL -lXext -lX11
+LIBDIR = $(GLEW_DEST)$(libdir)
+LDFLAGS.GL = -lGL
+LDFLAGS.GL = -lGL -lX11 -lGLU
LDFLAGS.STATIC = -Wl,-Bstatic
LDFLAGS.DYNAMIC = -Wl,-Bdynamic
NAME = GLEW
@ -43,15 +43,6 @@ diff -up glew-1.5.5/Makefile.make glew-1.5.5/Makefile
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 $@ $<
@@ -132,7 +132,7 @@ ifeq ($(patsubst mingw%,mingw,$(SYSTEM))
$(INSTALL) -m 0644 lib/$(LIB.SHARED) $(BINDIR)/
else

18
glew.spec
View File

@ -1,20 +1,19 @@
Name: glew
Version: 1.5.8
Release: 2%{?dist}
Release: 3%{?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.5.2-makefile.patch
Patch1: glew-1.5.7-add-needed.patch
Patch0: glew-1.5.8-makefile.patch
# From upstream: build MX-enabled library, with a different soname
# http://glew.git.sourceforge.net/git/gitweb.cgi?p=glew/glew;a=commitdiff;h=18455eb40fe2d71f5f78cce0bf44eb302c224016
# (rediffed for our makefile changes)
Patch2: glew-1.5.8-glewmx.patch
Patch1: glew-1.5.8-glewmx.patch
# Fixes the soname of libGLEWmx, sent upstream
Patch3: glew-1.5.8-soname.patch
Patch2: glew-1.5.8-soname.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libGLU-devel
@ -57,9 +56,8 @@ libGLEWmx
%prep
%setup -q
%patch0 -p1 -b .make
%patch1 -p1 -b .add
%patch2 -p1 -b .glewmx
%patch3 -p1 -b .soname
%patch1 -p1 -b .glewmx
%patch2 -p1 -b .soname
sed -i -e 's/\r//g' config/config.guess
@ -109,6 +107,10 @@ rm -rf $RPM_BUILD_ROOT
%doc doc/*
%changelog
* Wed Mar 23 2011 Adam Williamson <awilliam@redhat.com> - 1.5.8-3
- instead of taking flags out in makefile.patch and adding them back
in add-needed.patch, let's just not take them out...
* Wed Mar 23 2011 Adam Jackson <ajax@redhat.com> 1.5.8-2
- glew-1.5.8-glewmx.patch: Install libGLEWmx 0755 so autoprovs work
- Split runtime libraries to their own packages