[packages/glfw] - updated to 3.0.1, removed obsolete patches

qboosh qboosh at pld-linux.org
Sun Jul 21 08:01:18 CEST 2013 

commit 1db7af746c58a2c6d3a8717beafb2f9ded7c2c42
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Jul 21 08:01:02 2013 +0200

    - updated to 3.0.1, removed obsolete patches

 glfw-libdir.patch | 71 -------------------------------------------------------
 glfw-opt.patch    | 49 --------------------------------------
 glfw.spec         | 66 ++++++++++++++++++++-------------------------------
 3 files changed, 25 insertions(+), 161 deletions(-)
---
diff --git a/glfw.spec b/glfw.spec
index 8d23b65..b7f90a1 100644
--- a/glfw.spec
+++ b/glfw.spec
@@ -1,19 +1,21 @@
 Summary:	Free, portable framework for OpenGL application development
 Summary(pl.UTF-8):	Wolnodostępny, przenośny szkielet do tworzenia aplikacji OpenGL
 Name:		glfw
-Version:	2.7.2
+Version:	3.0.1
 Release:	1
 License:	BSD-like
 Group:		Libraries
 Source0:	http://downloads.sourceforge.net/glfw/%{name}-%{version}.tar.bz2
-# Source0-md5:	bb4f33b43e40f8cd3015a653dca02ed1
-Patch0:		%{name}-opt.patch
-Patch1:		%{name}-libdir.patch
+# Source0-md5:	fe515f10ca2201006cda4c367f1e95b5
 URL:		http://glfw.sourceforge.net/
 BuildRequires:	OpenGL-GLU-devel
 BuildRequires:	OpenGL-GLX-devel
-BuildRequires:	libtool
+BuildRequires:	cmake >= 2.8
+BuildRequires:	doxygen
 BuildRequires:	xorg-lib-libX11-devel
+BuildRequires:	xorg-lib-libXext-devel
+BuildRequires:	xorg-lib-libXi-devel
+BuildRequires:	xorg-lib-libXrandr-devel
 BuildRequires:	xorg-lib-libXxf86vm-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -52,7 +54,10 @@ Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	OpenGL-GLX-devel
 Requires:	xorg-lib-libX11-devel
+Requires:	xorg-lib-libXi-devel
+Requires:	xorg-lib-libXrandr-devel
 Requires:	xorg-lib-libXxf86vm-devel
+Obsoletes:	glfw-static
 
 %description devel
 Header files for GLFW library.
@@ -60,43 +65,22 @@ Header files for GLFW library.
 %description devel -l pl.UTF-8
 Pliki nagłówkowe biblioteki GLFW.
 
-%package static
-Summary:	Static GLFW library
-Summary(pl.UTF-8):	Statyczna biblioteka GLFW
-Group:		Development/Libraries
-Requires:	%{name}-devel = %{version}-%{release}
-
-%description static
-Static GLFW library.
-
-%description static -l pl.UTF-8
-Statyczna biblioteka GLFW.
-
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
 %build
-CC="%{__cc}" \
-LFLAGS="%{rpmldflags}" \
-CFLAGS="%{rpmcflags}" \
-sh ./compile.sh
-
-%{__make} -C lib/x11 -f Makefile.x11 \
-	PREFIX=%{_prefix} \
-	LIBDIR=%{_libdir}
+install -d build
+cd build
+%cmake ..
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
-%{__make} -C lib/x11 -f Makefile.x11 dist-install \
-	DESTDIR=$RPM_BUILD_ROOT \
-	PREFIX=%{_prefix} \
-	LIBDIR=%{_libdir}
+%{__make} -C build install \
+	DESTDIR=$RPM_BUILD_ROOT
 
-install examples/{*.c,*.tga,Makefile.x11} $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+install examples/{*.c,CMakeLists.txt} $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -106,16 +90,16 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc COPYING.txt readme.html
-%attr(755,root,root) %{_libdir}/libglfw.so
+%doc COPYING.txt README.md
+%attr(755,root,root) %{_libdir}/libglfw.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libglfw.so.3
 
 %files devel
 %defattr(644,root,root,755)
-%doc docs/{Reference,UsersGuide}.pdf
-%{_includedir}/GL/glfw.h
-%{_pkgconfigdir}/libglfw.pc
+%doc docs/html/*
+%attr(755,root,root) %{_libdir}/libglfw.so
+%dir %{_includedir}/GLFW
+%{_includedir}/GLFW/glfw3*.h
+%{_pkgconfigdir}/glfw3.pc
+%{_libdir}/cmake/glfw
 %{_examplesdir}/%{name}-%{version}
-
-%files static
-%defattr(644,root,root,755)
-%{_libdir}/libglfw.a
diff --git a/glfw-libdir.patch b/glfw-libdir.patch
deleted file mode 100644
index ebecd06..0000000
--- a/glfw-libdir.patch
+++ /dev/null
@@ -1,71 +0,0 @@
---- glfw-2.7.1/lib/x11/Makefile.x11.in.orig	2009-11-08 20:22:48.000000000 +0100
-+++ glfw-2.7.1/lib/x11/Makefile.x11.in	2011-07-30 19:24:16.657456597 +0200
-@@ -3,7 +3,8 @@
- # Installation prefix (default to /usr/local)
- ##########################################################################
- PREFIX ?= /usr/local
--
-+LIBDIR ?= $(PREFIX)/lib
-+DESTDIR ?= 
- 
- ##########################################################################
- # Default: Build GLFW static library
-@@ -26,25 +27,25 @@ HEADERS     = ../../include/GL/glfw.h ..
- # Install GLFW static library
- ##########################################################################
- install: libglfw.a libglfw.pc
--	$(INSTALL) -d $(PREFIX)/lib
--	$(INSTALL) -c -m 644 libglfw.a $(PREFIX)/lib/libglfw.a
--	$(INSTALL) -d $(PREFIX)/include/GL
--	$(INSTALL) -c -m 644 ../../include/GL/glfw.h $(PREFIX)/include/GL/glfw.h
--	$(INSTALL) -d $(PREFIX)/lib/pkgconfig
--	$(INSTALL) -c -m 644 libglfw.pc $(PREFIX)/lib/pkgconfig/libglfw.pc
-+	$(INSTALL) -d $(DESTDIR)$(LIBDIR)
-+	$(INSTALL) -c -m 644 libglfw.a $(DESTDIR)$(LIBDIR)/libglfw.a
-+	$(INSTALL) -d $(DESTDIR)$(PREFIX)/include/GL
-+	$(INSTALL) -c -m 644 ../../include/GL/glfw.h $(DESTDIR)$(PREFIX)/include/GL/glfw.h
-+	$(INSTALL) -d $(DESTDIR)$(LIBDIR)/pkgconfig
-+	$(INSTALL) -c -m 644 libglfw.pc $(DESTDIR)$(LIBDIR)/pkgconfig/libglfw.pc
- 
- 
- ##########################################################################
- # Install GLFW static and shared libraries
- ##########################################################################
- dist-install: libglfw.a libglfw.so libglfw.pc
--	$(INSTALL) -d $(PREFIX)/lib
--	$(INSTALL) -c -m 644 libglfw.a $(PREFIX)/lib/libglfw.a
--	$(INSTALL) -c -m 644 libglfw.so $(PREFIX)/lib/libglfw.so
--	$(INSTALL) -d $(PREFIX)/include/GL
--	$(INSTALL) -c -m 644 ../../include/GL/glfw.h $(PREFIX)/include/GL/glfw.h
--	$(INSTALL) -d $(PREFIX)/lib/pkgconfig
--	$(INSTALL) -c -m 644 libglfw.pc $(PREFIX)/lib/pkgconfig/libglfw.pc
-+	$(INSTALL) -d $(DESTDIR)$(LIBDIR)
-+	$(INSTALL) -c -m 644 libglfw.a $(DESTDIR)$(LIBDIR)/libglfw.a
-+	$(INSTALL) -c -m 644 libglfw.so $(DESTDIR)$(LIBDIR)/libglfw.so
-+	$(INSTALL) -d $(DESTDIR)$(PREFIX)/include/GL
-+	$(INSTALL) -c -m 644 ../../include/GL/glfw.h $(DESTDIR)$(PREFIX)/include/GL/glfw.h
-+	$(INSTALL) -d $(DESTDIR)$(LIBDIR)/pkgconfig
-+	$(INSTALL) -c -m 644 libglfw.pc $(DESTDIR)$(LIBDIR)/pkgconfig/libglfw.pc
- 
- 
- ##########################################################################
-@@ -105,7 +106,7 @@ SHARED_OBJS = \
- # Rule for building libglfw.pc
- ##########################################################################
- libglfw.pc: libglfw.pc.in
--	$(SED) -e 's,\@PREFIX\@,$(PREFIX),' libglfw.pc.in > libglfw.pc
-+	$(SED) -e 's,\@PREFIX\@,$(PREFIX),;s,\@LIBDIR\@,$(LIBDIR),' libglfw.pc.in > libglfw.pc
- 
- 
- ##########################################################################
---- glfw-2.7.1/compile.sh.orig	2011-07-30 18:04:22.507296072 +0200
-+++ glfw-2.7.1/compile.sh	2011-07-30 19:23:56.354122584 +0200
-@@ -643,7 +643,7 @@ echo "$self: Creating $MKNAME" >&5
- cat > "$MKNAME" <<EOF
- prefix=@PREFIX@
- exec_prefix=@PREFIX@
--libdir=@PREFIX@/lib
-+libdir=@LIBDIR@
- includedir=@PREFIX@/include
- 
- Name: GLFW
diff --git a/glfw-opt.patch b/glfw-opt.patch
deleted file mode 100644
index c1c6601..0000000
--- a/glfw-opt.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- glfw-2.7.1/compile.sh.orig	2011-06-28 05:55:28.000000000 +0200
-+++ glfw-2.7.1/compile.sh	2011-07-30 18:04:01.660628707 +0200
-@@ -107,35 +107,8 @@
- ##########################################################################
- echo -n "Checking for X11 libraries location... " 1>&6
- 
--if [ -r "/usr/X11/lib" ]; then
--  GLFW_LFLAGS="$GLFW_LFLAGS -L/usr/X11/lib"
--  GLFW_CFLAGS="-I/usr/X11/include $GLFW_CFLAGS"
--  echo "/usr/X11/lib" 1>&6
--elif [ -r "/usr/X11R7/lib" ]; then
--  GLFW_LFLAGS="$GLFW_LFLAGS -L/usr/X11R7/lib"
--  GLFW_CFLAGS="-I/usr/X11R7/include $GLFW_CFLAGS"
--  echo "/usr/X11R7/lib" 1>&6
--elif [ -r "/usr/X11R6/lib" ]; then
--  GLFW_LFLAGS="$GLFW_LFLAGS -L/usr/X11R6/lib"
--  GLFW_CFLAGS="-I/usr/X11R6/include $GLFW_CFLAGS"
--  echo "/usr/X11R6/lib" 1>&6
--elif [ -r "/usr/X11R5/lib" ]; then
--  GLFW_LFLAGS="$GLFW_LFLAGS -L/usr/X11R5/lib"
--  GLFW_CFLAGS="-I/usr/X11R5/include $GLFW_CFLAGS"
--  echo "/usr/X11R5/lib" 1>&6
--elif [ -r "/opt/X11R6/lib" ]; then
--  # This location is used on QNX
--  GLFW_LFLAGS="$GLFW_LFLAGS -L/opt/X11R6/lib"
--  GLFW_CFLAGS="-I/opt/X11R6/include $GLFW_CFLAGS"
--  echo "/opt/X11R6/lib" 1>&6
--elif [ -r "/usr/X/lib" ]; then
--  GLFW_LFLAGS="$GLFW_LFLAGS -L/usr/X/lib"
--  GLFW_CFLAGS="-I/usr/X/include $GLFW_CFLAGS"
--  echo "/usr/X/lib" 1>&6
--else
-   # TODO: Detect and report X11R7 in /usr/lib
-   echo "unknown (assuming linker will find them)" 1>&6
--fi
- 
- 
- ##########################################################################
-@@ -571,9 +544,7 @@
- 
- if [ "x$CFLAGS" = x ]; then
-   if [ "x$use_gcc" = xyes ]; then
--    GLFW_CFLAGS="$GLFW_CFLAGS -O2 -Wall"
--  else
--    GLFW_CFLAGS="$GLFW_CFLAGS -O"
-+    GLFW_CFLAGS="$GLFW_CFLAGS -Wall"
-   fi
- fi
- 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/glfw.git/commitdiff/1db7af746c58a2c6d3a8717beafb2f9ded7c2c42

More information about the pld-cvs-commit mailing list