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

glew 1.6.0

Browse Source
This commit is contained in:
Adam Jackson 2011-06-20 15:13:09 -04:00
parent adc4912cd3
commit fca1ffac66
5 changed files with 30 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -2,3 +2,4 @@ glew-1.5.4.tgz
/glew-1.5.5.tgz /glew-1.5.5.tgz
/glew-1.5.7.tgz /glew-1.5.7.tgz
/glew-1.5.8.tgz /glew-1.5.8.tgz
/glew-1.6.0.tgz

21
glew-1.5.8-soname.patch
View File

@ -1,21 +0,0 @@
--- glew-1.5.8/Makefile 2011-03-23 15:07:32.456140865 -0700
+++ glew-1.5.8/Makefile.new 2011-03-23 15:08:29.169450772 -0700
@@ -131,7 +131,7 @@
$(AR) cr $@ $^
lib/$(LIB.SHARED.MX): $(LIB.SOBJS.MX)
- $(LD) $(LDFLAGS.SO) -o $@ $^ $(LIB.LDFLAGS) $(LIB.LIBS)
+ $(LD) $(LDFLAGS.SO.MX) -o $@ $^ $(LIB.LDFLAGS) $(LIB.LIBS)
ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),)
else
$(LN) $(LIB.SHARED.MX) lib/$(LIB.SONAME.MX)
--- glew-1.5.8/config/Makefile.linux 2011-03-23 15:07:32.570143498 -0700
+++ glew-1.5.8/config/Makefile.linux.new 2011-03-23 15:08:09.650999994 -0700
@@ -3,6 +3,7 @@
LD = cc
PICFLAG = -fPIC
LDFLAGS.SO = -shared -Wl,-soname=$(LIB.SONAME)
+LDFLAGS.SO.MX = -shared -Wl,-soname=$(LIB.SONAME.MX)
M_ARCH ?= $(shell uname -m)
LIBDIR = $(GLEW_DEST)$(libdir)
LDFLAGS.GL = -lGL -lX11 -lGLU

36
glew-1.5.8-makefile.patch → glew-1.6.0-makefile.patch
View File

@ -1,9 +1,9 @@
diff -up glew-1.5.5/config/Makefile.linux.make glew-1.5.5/config/Makefile.linux diff -up glew-1.6.0/config/Makefile.linux.jx glew-1.6.0/config/Makefile.linux
--- glew-1.5.5/config/Makefile.linux.make 2010-07-13 12:36:44.000000000 -0400 --- glew-1.6.0/config/Makefile.linux.jx 2011-04-27 12:16:34.000000000 -0400
+++ glew-1.5.5/config/Makefile.linux 2010-08-25 16:24:05.000000000 -0400 +++ glew-1.6.0/config/Makefile.linux 2011-06-20 13:21:38.144060270 -0400
@@ -7,14 +7,8 @@ endif @@ -3,14 +3,8 @@ CC = cc
LD = cc
PICFLAG = -fPIC PICFLAG = -fPIC
LDFLAGS.SO = -shared -Wl,-soname=$(LIB.SONAME)
M_ARCH ?= $(shell uname -m) M_ARCH ?= $(shell uname -m)
-ifeq (x86_64,${M_ARCH}) -ifeq (x86_64,${M_ARCH})
-LDFLAGS.EXTRA = -L/usr/X11R6/lib64 -LDFLAGS.EXTRA = -L/usr/X11R6/lib64
@ -18,9 +18,9 @@ diff -up glew-1.5.5/config/Makefile.linux.make glew-1.5.5/config/Makefile.linux
LDFLAGS.STATIC = -Wl,-Bstatic LDFLAGS.STATIC = -Wl,-Bstatic
LDFLAGS.DYNAMIC = -Wl,-Bdynamic LDFLAGS.DYNAMIC = -Wl,-Bdynamic
NAME = GLEW NAME = GLEW
diff -up glew-1.5.5/Makefile.make glew-1.5.5/Makefile diff -up glew-1.6.0/Makefile.jx glew-1.6.0/Makefile
--- glew-1.5.5/Makefile.make 2010-07-13 12:36:45.000000000 -0400 --- glew-1.6.0/Makefile.jx 2011-04-27 12:16:35.000000000 -0400
+++ glew-1.5.5/Makefile 2010-08-25 16:25:27.000000000 -0400 +++ glew-1.6.0/Makefile 2011-06-20 13:23:05.090373848 -0400
@@ -41,9 +41,9 @@ $(error "Platform '$(SYSTEM)' not suppor @@ -41,9 +41,9 @@ $(error "Platform '$(SYSTEM)' not suppor
endif endif
@ -32,9 +32,9 @@ diff -up glew-1.5.5/Makefile.make glew-1.5.5/Makefile
+LIBDIR ?= $(GLEW_DEST)$(libdir) +LIBDIR ?= $(GLEW_DEST)$(libdir)
+INCDIR ?= $(GLEW_DEST)$(includedir)/GL +INCDIR ?= $(GLEW_DEST)$(includedir)/GL
SHARED_OBJ_EXT ?= o SHARED_OBJ_EXT ?= o
TARDIR = ../glew-$(GLEW_VERSION) TARDIR = ../glew-$(GLEW_VERSION)
TARBALL = ../glew-$(GLEW_VERSION).tar.gz @@ -56,7 +56,7 @@ DIST_SRC_TGZ = glew-$(GLEW_VERSION).tgz
@@ -55,7 +55,7 @@ DIST_SRC_TGZ = glew-$(GLEW_VERSION).tgz
AR = ar AR = ar
INSTALL = install INSTALL = install
@ -43,8 +43,8 @@ diff -up glew-1.5.5/Makefile.make glew-1.5.5/Makefile
RM = rm -f RM = rm -f
LN = ln -sf LN = ln -sf
ifeq ($(MAKECMDGOALS), debug) ifeq ($(MAKECMDGOALS), debug)
@@ -132,7 +132,7 @@ ifeq ($(patsubst mingw%,mingw,$(SYSTEM)) @@ -186,7 +186,7 @@ ifeq ($(filter-out mingw% cygwin,$(SYSTE
$(INSTALL) -m 0644 lib/$(LIB.SHARED) $(BINDIR)/ $(INSTALL) -m 0755 lib/$(LIB.SHARED) $(BINDIR)/
else else
$(STRIP) -x lib/$(LIB.SHARED) $(STRIP) -x lib/$(LIB.SHARED)
- $(INSTALL) -m 0644 lib/$(LIB.SHARED) $(LIBDIR)/ - $(INSTALL) -m 0644 lib/$(LIB.SHARED) $(LIBDIR)/
@ -52,12 +52,12 @@ diff -up glew-1.5.5/Makefile.make glew-1.5.5/Makefile
$(LN) $(LIB.SHARED) $(LIBDIR)/$(LIB.SONAME) $(LN) $(LIB.SHARED) $(LIBDIR)/$(LIB.SONAME)
endif endif
# development files # development files
@@ -148,7 +148,7 @@ else @@ -221,7 +221,7 @@ endif
$(LN) $(LIB.SHARED) $(LIBDIR)/$(LIB.DEVLNK)
endif install.bin: glew.bin
# utilities $(INSTALL) -d -m 0755 $(BINDIR)
- $(INSTALL) -s -m 0755 bin/$(GLEWINFO.BIN) bin/$(VISUALINFO.BIN) $(BINDIR)/ - $(INSTALL) -s -m 0755 bin/$(GLEWINFO.BIN) bin/$(VISUALINFO.BIN) $(BINDIR)/
+ $(INSTALL) -m 0755 bin/$(GLEWINFO.BIN) bin/$(VISUALINFO.BIN) $(BINDIR)/ + $(INSTALL) -m 0755 bin/$(GLEWINFO.BIN) bin/$(VISUALINFO.BIN) $(BINDIR)/
uninstall: install.include:
$(RM) $(INCDIR)/wglew.h $(INSTALL) -d -m 0755 $(INCDIR)

29
glew.spec
View File

@ -1,20 +1,13 @@
Name: glew Name: glew
Version: 1.5.8 Version: 1.6.0
Release: 3%{?dist} Release: 1%{?dist}
Summary: The OpenGL Extension Wrangler Library Summary: The OpenGL Extension Wrangler Library
Group: System Environment/Libraries Group: System Environment/Libraries
License: BSD and MIT License: BSD and MIT
URL: http://glew.sourceforge.net URL: http://glew.sourceforge.net
Source0: http://downloads.sourceforge.net/project/glew/glew/%{version}/glew-%{version}.tgz Source0: http://downloads.sourceforge.net/project/glew/glew/%{version}/glew-%{version}.tgz
Patch0: glew-1.5.8-makefile.patch Patch0: glew-1.6.0-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)
Patch1: glew-1.5.8-glewmx.patch
# Fixes the soname of libGLEWmx, sent upstream
Patch2: glew-1.5.8-soname.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libGLU-devel BuildRequires: libGLU-devel
%description %description
@ -56,8 +49,6 @@ libGLEWmx
%prep %prep
%setup -q %setup -q
%patch0 -p1 -b .make %patch0 -p1 -b .make
%patch1 -p1 -b .glewmx
%patch2 -p1 -b .soname
sed -i -e 's/\r//g' config/config.guess sed -i -e 's/\r//g' config/config.guess
@ -65,23 +56,20 @@ sed -i -e 's/\r//g' config/config.guess
make %{?_smp_mflags} CFLAGS.EXTRA="$RPM_OPT_FLAGS" includedir=%{_includedir} GLEW_DEST= libdir=%{_libdir} bindir=%{_bindir} make %{?_smp_mflags} CFLAGS.EXTRA="$RPM_OPT_FLAGS" includedir=%{_includedir} GLEW_DEST= libdir=%{_libdir} bindir=%{_bindir}
%install %install
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
make install.all GLEW_DEST="$RPM_BUILD_ROOT" libdir=%{_libdir} bindir=%{_bindir} \ make install.all GLEW_DEST="$RPM_BUILD_ROOT" libdir=%{_libdir} bindir=%{_bindir} includedir=%{_includedir}
includedir=%{_includedir} rm -f $RPM_BUILD_ROOT%{_libdir}/libGLEW.a $RPM_BUILD_ROOT%{_libdir}/libGLEWmx.a
rm $RPM_BUILD_ROOT%{_libdir}/libGLEW.a $RPM_BUILD_ROOT%{_libdir}/libGLEWmx.a # sigh
chmod 0755 $RPM_BUILD_ROOT%{_libdir}/*.so*
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
%post -p /sbin/ldconfig %post -p /sbin/ldconfig
%postun -p /sbin/ldconfig %postun -p /sbin/ldconfig
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc LICENSE.txt %doc LICENSE.txt
@ -107,6 +95,9 @@ rm -rf $RPM_BUILD_ROOT
%doc doc/* %doc doc/*
%changelog %changelog
* Mon Jun 20 2011 Adam Jackson <ajax@redhat.com> 1.6.0-1
- glew 1.6.0 (#714763)
* Wed Mar 23 2011 Adam Williamson <awilliam@redhat.com> - 1.5.8-3 * 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 - instead of taking flags out in makefile.patch and adding them back
in add-needed.patch, let's just not take them out... in add-needed.patch, let's just not take them out...

1
sources
View File

@ -1 +1,2 @@
342c8dc64fb9daa6af245b132e086bdd glew-1.5.8.tgz 342c8dc64fb9daa6af245b132e086bdd glew-1.5.8.tgz
7dfbb444b5a4e125bc5dba0aef403082 glew-1.6.0.tgz