From fca1ffac668536a7d0357974e8592903cc274221 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Jun 20 2011 19:13:09 +0000 Subject: glew 1.6.0 --- diff --git a/.gitignore b/.gitignore index ad4dff6..c67d6b1 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ glew-1.5.4.tgz /glew-1.5.5.tgz /glew-1.5.7.tgz /glew-1.5.8.tgz +/glew-1.6.0.tgz diff --git a/glew-1.5.8-makefile.patch b/glew-1.5.8-makefile.patch deleted file mode 100644 index b23215a..0000000 --- a/glew-1.5.8-makefile.patch +++ /dev/null @@ -1,63 +0,0 @@ -diff -up glew-1.5.5/config/Makefile.linux.make glew-1.5.5/config/Makefile.linux ---- glew-1.5.5/config/Makefile.linux.make 2010-07-13 12:36:44.000000000 -0400 -+++ glew-1.5.5/config/Makefile.linux 2010-08-25 16:24:05.000000000 -0400 -@@ -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 -lX11 -lGLU - LDFLAGS.STATIC = -Wl,-Bstatic - LDFLAGS.DYNAMIC = -Wl,-Bdynamic - NAME = GLEW -diff -up glew-1.5.5/Makefile.make glew-1.5.5/Makefile ---- glew-1.5.5/Makefile.make 2010-07-13 12:36:45.000000000 -0400 -+++ glew-1.5.5/Makefile 2010-08-25 16:25:27.000000000 -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) - 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) -@@ -132,7 +132,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 -@@ -148,7 +148,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 --git a/glew-1.5.8-soname.patch b/glew-1.5.8-soname.patch deleted file mode 100644 index 686664c..0000000 --- a/glew-1.5.8-soname.patch +++ /dev/null @@ -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 diff --git a/glew-1.6.0-makefile.patch b/glew-1.6.0-makefile.patch new file mode 100644 index 0000000..4643b14 --- /dev/null +++ b/glew-1.6.0-makefile.patch @@ -0,0 +1,63 @@ +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) diff --git a/glew.spec b/glew.spec index 0322ba9..99040ae 100644 --- a/glew.spec +++ b/glew.spec @@ -1,20 +1,13 @@ Name: glew -Version: 1.5.8 -Release: 3%{?dist} +Version: 1.6.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.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) -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) +Patch0: glew-1.6.0-makefile.patch BuildRequires: libGLU-devel %description @@ -56,8 +49,6 @@ libGLEWmx %prep %setup -q %patch0 -p1 -b .make -%patch1 -p1 -b .glewmx -%patch2 -p1 -b .soname 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} - %install rm -rf $RPM_BUILD_ROOT -make install.all GLEW_DEST="$RPM_BUILD_ROOT" libdir=%{_libdir} bindir=%{_bindir} \ - includedir=%{_includedir} -rm $RPM_BUILD_ROOT%{_libdir}/libGLEW.a $RPM_BUILD_ROOT%{_libdir}/libGLEWmx.a - +make install.all GLEW_DEST="$RPM_BUILD_ROOT" libdir=%{_libdir} bindir=%{_bindir} includedir=%{_includedir} +rm -f $RPM_BUILD_ROOT%{_libdir}/libGLEW.a $RPM_BUILD_ROOT%{_libdir}/libGLEWmx.a +# sigh +chmod 0755 $RPM_BUILD_ROOT%{_libdir}/*.so* %clean rm -rf $RPM_BUILD_ROOT - %post -p /sbin/ldconfig %postun -p /sbin/ldconfig - %files %defattr(-,root,root,-) %doc LICENSE.txt @@ -107,6 +95,9 @@ rm -rf $RPM_BUILD_ROOT %doc doc/* %changelog +* Mon Jun 20 2011 Adam Jackson 1.6.0-1 +- glew 1.6.0 (#714763) + * Wed Mar 23 2011 Adam Williamson - 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... diff --git a/sources b/sources index 060841f..1d01090 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 342c8dc64fb9daa6af245b132e086bdd glew-1.5.8.tgz +7dfbb444b5a4e125bc5dba0aef403082 glew-1.6.0.tgz