From b70a7739905c25e1f4a500a884ea0676948327b89b2d6d965751398e20d6c475 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 5 Dec 2014 08:34:32 +0000 Subject: [PATCH] - Version bump to 0.11.0: * support for OpenGL 4.5 - Removed patches no longer needed: * glew-1.10.0-destdir.patch OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/glew?expand=0&rev=41 --- baselibs.conf | 4 +- glew-1.10.0-destdir.patch | 130 -------------------------------------- glew-1.10.0.tgz | 3 - glew-1.11.0.tgz | 3 + glew.changes | 8 +++ glew.spec | 8 +-- 6 files changed, 16 insertions(+), 140 deletions(-) delete mode 100644 glew-1.10.0-destdir.patch delete mode 100644 glew-1.10.0.tgz create mode 100644 glew-1.11.0.tgz diff --git a/baselibs.conf b/baselibs.conf index 0f68830..edc6222 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,5 +1,5 @@ glew glew-devel requires -glew- - requires "libGLEW1_10- = " -libGLEW1_10 + requires "libGLEW1_11- = " +libGLEW1_11 diff --git a/glew-1.10.0-destdir.patch b/glew-1.10.0-destdir.patch deleted file mode 100644 index 6bc3845..0000000 --- a/glew-1.10.0-destdir.patch +++ /dev/null @@ -1,130 +0,0 @@ ---- glew-1.10.0/Makefile 2013-07-22 16:11:22.000000000 +0200 -+++ glew-1.10.0/Makefile 2014-05-26 21:43:14.091089329 +0200 -@@ -52,6 +52,8 @@ - - DIST_DIR := $(shell mktemp -d /tmp/glew.XXXXXX)/$(DIST_NAME) - -+DESTDIR ?= "" -+ - # To disable stripping of binaries either: - # - use STRIP= on gmake command-line - # - edit this makefile to set STRIP to the empty string -@@ -231,81 +233,81 @@ - install.mx: install.include install.lib.mx install.pkgconfig.mx - - install.lib: glew.lib -- $(INSTALL) -d -m 0755 $(LIBDIR) -+ $(INSTALL) -d -m 0755 $(DESTDIR)$(LIBDIR) - # runtime - ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),) -- $(INSTALL) -d -m 0755 $(BINDIR) -- $(INSTALL) -m 0755 lib/$(LIB.SHARED) $(BINDIR)/ -+ $(INSTALL) -d -m 0755 $(DESTDIR)$(BINDIR) -+ $(INSTALL) -m 0755 lib/$(LIB.SHARED) $(DESTDIR)$(BINDIR)/ - else -- $(INSTALL) -m 0644 lib/$(LIB.SHARED) $(LIBDIR)/ -+ $(INSTALL) -m 0644 lib/$(LIB.SHARED) $(DESTDIR)$(LIBDIR)/ - endif - ifneq ($(LN),) -- $(LN) $(LIB.SHARED) $(LIBDIR)/$(LIB.SONAME) -+ $(LN) $(LIB.SHARED) $(DESTDIR)$(LIBDIR)/$(LIB.SONAME) - endif - - # development files - ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),) -- $(INSTALL) -m 0644 lib/$(LIB.DEVLNK) $(LIBDIR)/ -+ $(INSTALL) -m 0644 lib/$(LIB.DEVLNK) $(DESTDIR)$(LIBDIR)/ - endif - ifneq ($(LN),) -- $(LN) $(LIB.SHARED) $(LIBDIR)/$(LIB.DEVLNK) -+ $(LN) $(LIB.SHARED) $(DESTDIR)$(LIBDIR)/$(LIB.DEVLNK) - endif -- $(INSTALL) -m 0644 lib/$(LIB.STATIC) $(LIBDIR)/ -+ $(INSTALL) -m 0644 lib/$(LIB.STATIC) $(DESTDIR)$(LIBDIR)/ - - install.lib.mx: glew.lib.mx -- $(INSTALL) -d -m 0755 $(LIBDIR) -+ $(INSTALL) -d -m 0755 $(DESTDIR)$(LIBDIR) - # runtime - ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),) -- $(INSTALL) -d -m 0755 $(BINDIR) -- $(INSTALL) -m 0755 lib/$(LIB.SHARED.MX) $(BINDIR)/ -+ $(INSTALL) -d -m 0755 $(DESTDIR)$(BINDIR) -+ $(INSTALL) -m 0755 lib/$(LIB.SHARED.MX) $(DESTDIR)$(BINDIR)/ - else -- $(INSTALL) -m 0644 lib/$(LIB.SHARED.MX) $(LIBDIR)/ -+ $(INSTALL) -m 0644 lib/$(LIB.SHARED.MX) $(DESTDIR)$(LIBDIR)/ - endif - ifneq ($(LN),) -- $(LN) $(LIB.SHARED.MX) $(LIBDIR)/$(LIB.SONAME.MX) -+ $(LN) $(LIB.SHARED.MX) $(DESTDIR)$(LIBDIR)/$(LIB.SONAME.MX) - endif - # development files - ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),) -- $(INSTALL) -m 0644 lib/$(LIB.DEVLNK.MX) $(LIBDIR)/ -+ $(INSTALL) -m 0644 lib/$(LIB.DEVLNK.MX) $(DESTDIR)$(LIBDIR)/ - endif - ifneq ($(LN),) -- $(LN) $(LIB.SHARED.MX) $(LIBDIR)/$(LIB.DEVLNK.MX) -+ $(LN) $(LIB.SHARED.MX) $(DESTDIR)$(LIBDIR)/$(LIB.DEVLNK.MX) - endif -- $(INSTALL) -m 0644 lib/$(LIB.STATIC.MX) $(LIBDIR)/ -+ $(INSTALL) -m 0644 lib/$(LIB.STATIC.MX) $(DESTDIR)$(LIBDIR)/ - - install.bin: glew.bin -- $(INSTALL) -d -m 0755 $(BINDIR) -- $(INSTALL) -s -m 0755 bin/$(GLEWINFO.BIN) bin/$(VISUALINFO.BIN) $(BINDIR)/ -+ $(INSTALL) -d -m 0755 $(DESTDIR)$(BINDIR) -+ $(INSTALL) -s -m 0755 bin/$(GLEWINFO.BIN) bin/$(VISUALINFO.BIN) $(DESTDIR)$(BINDIR)/ - - install.include: -- $(INSTALL) -d -m 0755 $(INCDIR) -- $(INSTALL) -m 0644 include/GL/wglew.h $(INCDIR)/ -- $(INSTALL) -m 0644 include/GL/glew.h $(INCDIR)/ -- $(INSTALL) -m 0644 include/GL/glxew.h $(INCDIR)/ -+ $(INSTALL) -d -m 0755 $(DESTDIR)$(INCDIR) -+ $(INSTALL) -m 0644 include/GL/wglew.h $(DESTDIR)$(INCDIR)/ -+ $(INSTALL) -m 0644 include/GL/glew.h $(DESTDIR)$(INCDIR)/ -+ $(INSTALL) -m 0644 include/GL/glxew.h $(DESTDIR)$(INCDIR)/ - - install.pkgconfig: glew.pc -- $(INSTALL) -d -m 0755 $(LIBDIR) -- $(INSTALL) -d -m 0755 $(LIBDIR)/pkgconfig -- $(INSTALL) -m 0644 glew.pc $(LIBDIR)/pkgconfig/ -+ $(INSTALL) -d -m 0755 $(DESTDIR)$(LIBDIR) -+ $(INSTALL) -d -m 0755 $(DESTDIR)$(LIBDIR)/pkgconfig -+ $(INSTALL) -m 0644 glew.pc $(DESTDIR)$(LIBDIR)/pkgconfig/ - - install.pkgconfig.mx: glewmx.pc -- $(INSTALL) -d -m 0755 $(LIBDIR) -- $(INSTALL) -d -m 0755 $(LIBDIR)/pkgconfig -- $(INSTALL) -m 0644 glewmx.pc $(LIBDIR)/pkgconfig/ -+ $(INSTALL) -d -m 0755 $(DESTDIR)$(LIBDIR) -+ $(INSTALL) -d -m 0755 $(DESTDIR)$(LIBDIR)/pkgconfig -+ $(INSTALL) -m 0644 glewmx.pc $(DESTDIR)$(LIBDIR)/pkgconfig/ - - uninstall: -- $(RM) $(INCDIR)/wglew.h -- $(RM) $(INCDIR)/glew.h -- $(RM) $(INCDIR)/glxew.h -- $(RM) $(LIBDIR)/$(LIB.DEVLNK) $(LIBDIR)/$(LIB.DEVLNK.MX) -+ $(RM) $(DESTDIR)$(INCDIR)/wglew.h -+ $(RM) $(DESTDIR)$(INCDIR)/glew.h -+ $(RM) $(DESTDIR)$(INCDIR)/glxew.h -+ $(RM) $(DESTDIR)$(LIBDIR)/$(LIB.DEVLNK) $(DESTDIR)$(LIBDIR)/$(LIB.DEVLNK.MX) - ifeq ($(filter-out mingw% cygwin,$(SYSTEM)),) -- $(RM) $(BINDIR)/$(LIB.SHARED) $(BINDIR)/$(LIB.SHARED.MX) -+ $(RM) $(DESTDIR)$(BINDIR)/$(LIB.SHARED) $(DESTDIR)$(BINDIR)/$(LIB.SHARED.MX) - else -- $(RM) $(LIBDIR)/$(LIB.SONAME) $(LIBDIR)/$(LIB.SONAME.MX) -- $(RM) $(LIBDIR)/$(LIB.SHARED) $(LIBDIR)/$(LIB.SHARED.MX) -+ $(RM) $(DESTDIR)$(LIBDIR)/$(LIB.SONAME) $(DESTDIR)$(LIBDIR)/$(LIB.SONAME.MX) -+ $(RM) $(DESTDIR)$(LIBDIR)/$(LIB.SHARED) $(DESTDIR)$(LIBDIR)/$(LIB.SHARED.MX) - endif -- $(RM) $(LIBDIR)/$(LIB.STATIC) $(LIBDIR)/$(LIB.STATIC.MX) -- $(RM) $(BINDIR)/$(GLEWINFO.BIN) $(BINDIR)/$(VISUALINFO.BIN) -+ $(RM) $(DESTDIR)$(LIBDIR)/$(LIB.STATIC) $(DESTDIR)$(LIBDIR)/$(LIB.STATIC.MX) -+ $(RM) $(DESTDIR)$(BINDIR)/$(GLEWINFO.BIN) $(DESTDIR)$(BINDIR)/$(VISUALINFO.BIN) - - clean: - $(RM) -r tmp/ diff --git a/glew-1.10.0.tgz b/glew-1.10.0.tgz deleted file mode 100644 index 3fe9d96..0000000 --- a/glew-1.10.0.tgz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:99c41320b63f6860869b5fb9af9a1854b15582796c64ee3dfd7096dc0c89f307 -size 567605 diff --git a/glew-1.11.0.tgz b/glew-1.11.0.tgz new file mode 100644 index 0000000..173eb96 --- /dev/null +++ b/glew-1.11.0.tgz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:69bbce306ac281c4fa806a7a7d02c0596281a2d8f9d70690e98126f23ba513d6 +size 601430 diff --git a/glew.changes b/glew.changes index aa207a3..3d6d270 100644 --- a/glew.changes +++ b/glew.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Dec 5 08:33:45 UTC 2014 - tchvatal@suse.com + +- Version bump to 0.11.0: + * support for OpenGL 4.5 +- Removed patches no longer needed: + * glew-1.10.0-destdir.patch + ------------------------------------------------------------------- Sun Sep 28 09:27:59 UTC 2014 - jengelh@inai.de diff --git a/glew.spec b/glew.spec index 2706480..132c7ae 100644 --- a/glew.spec +++ b/glew.spec @@ -17,9 +17,9 @@ # If you change so_ver, then you have to update baselibs.conf as well. -%define so_ver 1_10 +%define so_ver 1_11 Name: glew -Version: 1.10.0 +Version: 1.11.0 Release: 0 Summary: OpenGL Extension Wrangler Library License: BSD-3-Clause and GPL-2.0 and MIT @@ -28,7 +28,6 @@ Url: http://glew.sourceforge.net/ Source0: http://sourceforge.net/projects/glew/files/glew/%{version}/glew-%{version}.tgz Source1: baselibs.conf Source2: %{name}.rpmlintrc -Patch0: glew-1.10.0-destdir.patch BuildRequires: pkg-config BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(x11) @@ -65,7 +64,7 @@ Requires: xorg-x11-proto-devel Recommends: pkgconfig(glu) %if 0%{?suse_version} >= 1220 # X11/Xlib.h X11/Xutil.h -Requires: libX11-devel +Requires: pkgconfig(x11) %endif %description devel @@ -77,7 +76,6 @@ functionality is exposed in a single header file. %prep %setup -q -%patch0 -p1 %build make %{?_smp_mflags} POPT="%{optflags}" GLEW_DEST=%{_prefix} LIBDIR=%{_libdir} LDFLAGS.EXTRA= STRIP=