New upstream release

This commit is contained in:
Jochen Schmitt 2008-11-24 19:06:48 +00:00
parent 8dba423bae
commit ce17b6d0ce
4 changed files with 85 additions and 16 deletions

View File

@ -1 +1 @@
glew-1.5.0-src-clean.tgz glew-1.5.1-src.tgz

71
glew-1.5.1-makefile.patch Normal file
View File

@ -0,0 +1,71 @@
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

View File

@ -1,20 +1,13 @@
Name: glew Name: glew
Version: 1.5.0 Version: 1.5.1
Release: 2%{?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
# This is http://downloads.sourceforge.net/glew/glew-%{version}-src.tgz
# The files under the doc dir in this archive are under this non free license: Source0: http://downloads.sourceforge.net/glew/glew-%{version}-src.tgz
# Copyright (C) 2002-2008, Milan Ikits <milan ikits[]ieee org> Patch0: glew-1.5.1-makefile.patch
# Copyright (C) 2002-2008, Marcelo E. Magallon <mmagallo[]debian org>
# This documentation may not be modified or redistributed in any
# form, except by the copyright holder.
# and therefor these files have been removed.
Source0: glew-%{version}-src-clean.tgz
Patch0: glew-1.3.6-pathandstrip.patch
Patch1: glew-1.4.0-unused-direct-shlib-dependency.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libGLU-devel BuildRequires: libGLU-devel
@ -40,10 +33,11 @@ Development files for glew
%prep %prep
%setup -q -n %{name} %setup -q -n %{name}
%patch0 -p1 %patch0 -p1
%patch1 -p1
sed -i -e 's/\r//g' config/config.guess
%build %build
make %{?_smp_mflags} CFLAGS.EXTRA="$RPM_OPT_FLAGS" make %{?_smp_mflags} CFLAGS.EXTRA="$RPM_OPT_FLAGS"
@ -73,9 +67,13 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_libdir}/libGLEW.so %{_libdir}/libGLEW.so
%{_includedir}/GL/*.h %{_includedir}/GL/*.h
%doc doc/*
%changelog %changelog
* Thu Nov 13 2008 Jochen Schmitt <Jochen herr-schmitt de> - 1.5.1-1
- New upstream release (#469639)
- Fix licenseing issue with developer documentation
* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 1.5.0-2 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 1.5.0-2
- Autorebuild for GCC 4.3 - Autorebuild for GCC 4.3

View File

@ -1 +1 @@
2920724f7a462fff84346b4de2c8aebe glew-1.5.0-src-clean.tgz 759a59853dfaae4d007b414a3c1712f2 glew-1.5.1-src.tgz