packages: glfw/glfw-opt.patch, glfw/glfw.spec, glfw/glfw-libdir.patch (NEW)...

qboosh qboosh at pld-linux.org
Sat Jul 30 20:47:30 CEST 2011 

Author: qboosh                       Date: Sat Jul 30 18:47:30 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 2.7.1
- updated opt patch
- dropped shared patch (shared library is supported upstream now) and outdated pic patch
- added libdir patch
- soname changed to match upstream (just libglfw.so)

---- Files affected:
packages/glfw:
   glfw-opt.patch (1.1 -> 1.2) , glfw.spec (1.6 -> 1.7) , glfw-libdir.patch (NONE -> 1.1)  (NEW), glfw-pic.patch (1.1 -> NONE)  (REMOVED), glfw-shared.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/glfw/glfw-opt.patch
diff -u packages/glfw/glfw-opt.patch:1.1 packages/glfw/glfw-opt.patch:1.2
--- packages/glfw/glfw-opt.patch:1.1	Thu Dec 28 00:47:52 2006
+++ packages/glfw/glfw-opt.patch	Sat Jul 30 20:47:25 2011
@@ -1,77 +1,49 @@
---- glfw-2.5/compile.sh.orig	2004-07-24 22:36:46.000000000 +0200
-+++ glfw-2.5/compile.sh	2006-12-27 23:32:06.166225461 +0100
-@@ -76,8 +76,6 @@
-   CC=${CC-cc}
- fi
- CFLAGS=
--LFLAGS=
--INCS=
- LIBS="-lGL -lX11"
- 
- 
-@@ -93,34 +91,7 @@
+--- 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 "Checking for X11 libraries location... " 1>&6
+ echo -n "Checking for X11 libraries location... " 1>&6
  
--# X11R6 in /usr/X11/lib ?
 -if [ -r "/usr/X11/lib" ]; then
-- LFLAGS="$LFLAGS -L/usr/X11/lib"
-- INCS="-I/usr/X11/include"
-- echo " X11 libraries location: /usr/X11/lib" 1>&6
--# X11R6 in /usr/X11R6/lib ?
+-  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
-- LFLAGS="$LFLAGS -L/usr/X11R6/lib"
-- INCS="-I/usr/X11R6/include"
-- echo " X11 libraries location: /usr/X11R6/lib" 1>&6
--# X11R5 in /usr/X11R5/lib ?
+-  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
-- LFLAGS="$LFLAGS -L/usr/X11R5/lib"
-- INCS="-I/usr/X11R5/include"
-- echo " X11 libraries location: /usr/X11R5/lib" 1>&6
--# X11R6 in /opt/X11R6/lib (e.g. QNX)?
+-  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
-- LFLAGS="$LFLAGS -L/opt/X11R6/lib"
-- INCS="-I/opt/X11R6/include"
-- echo " X11 libraries location: /opt/X11R6/lib" 1>&6
--# X11R6 in /usr/X/lib ?
+-  # 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
-- LFLAGS="$LFLAGS -L/usr/X/lib"
-- INCS="-I/usr/X/include"
-- echo " X11 libraries location: /usr/X/lib" 1>&6
+-  GLFW_LFLAGS="$GLFW_LFLAGS -L/usr/X/lib"
+-  GLFW_CFLAGS="-I/usr/X/include $GLFW_CFLAGS"
+-  echo "/usr/X/lib" 1>&6
 -else
-  echo " X11 libraries location: Unknown (assuming linker will find them)" 1>&6
+   # TODO: Detect and report X11R7 in /usr/lib
+   echo "unknown (assuming linker will find them)" 1>&6
 -fi
- echo " " 1>&6
- CFLAGS="$CFLAGS $INCS"
  
-@@ -145,9 +116,6 @@
- rm -f conftest*
- 
- echo " Using GNU C: ""$use_gcc" 1>&6
--if [ "x$use_gcc" = xyes ]; then
--  CC=gcc
--fi
- echo " " 1>&6
  
- 
-@@ -429,13 +397,13 @@
- # Post fixups
  ##########################################################################
- if [ "x$use_gcc" = xyes ]; then
--  CFLAGS_SPEED="-c -I. -I.. $CFLAGS -O3 -ffast-math -Wall"
--  CFLAGS="-c -I. -I.. $CFLAGS -Os -Wall"
--  CFLAGS_LINK="$INCS -O3 -ffast-math -Wall"
--else
--  CFLAGS_SPEED="-c -I. -I.. $CFLAGS -O"
--  CFLAGS="-c -I. -I.. $CFLAGS -O"
--  CFLAGS_LINK="$INCS -O"
-+  CFLAGS_SPEED="-c -I. -I.. $CFLAGS $OPT -ffast-math -Wall"
-+  CFLAGS="-c -I. -I.. $CFLAGS $OPT -Wall"
-+  CFLAGS_LINK="$INCS $OPT -ffast-math -Wall"
-+else
-+  CFLAGS_SPEED="-c -I. -I.. $CFLAGS $OPT"
-+  CFLAGS="-c -I. -I.. $CFLAGS $OPT"
-+  CFLAGS_LINK="$INCS $OPT"
+@@ -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
- CFLAGS_LINK="-I../include $CFLAGS_LINK"
- LFLAGS_LINK="-L../lib/x11 $LFLAGS -lglfw -lGLU $LIBS -lm"
+ 

================================================================
Index: packages/glfw/glfw.spec
diff -u packages/glfw/glfw.spec:1.6 packages/glfw/glfw.spec:1.7
--- packages/glfw/glfw.spec:1.6	Sun Nov  9 18:30:05 2008
+++ packages/glfw/glfw.spec	Sat Jul 30 20:47:25 2011
@@ -2,15 +2,14 @@
 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.5.0
-Release:	4
+Version:	2.7.1
+Release:	1
 License:	BSD-like
 Group:		Libraries
-Source0:	http://dl.sourceforge.net/glfw/%{name}-%{version}.tar.bz2
-# Source0-md5:	c6dffefbfbe4415c915851b09e76edd9
+Source0:	http://downloads.sourceforge.net/glfw/%{name}-%{version}.tar.bz2
+# Source0-md5:	1cf551916124fccfc303fa4e50080f91
 Patch0:		%{name}-opt.patch
-Patch1:		%{name}-shared.patch
-Patch2:		%{name}-pic.patch
+Patch1:		%{name}-libdir.patch
 URL:		http://glfw.sourceforge.net/
 BuildRequires:	OpenGL-GLU-devel
 BuildRequires:	OpenGL-GLX-devel
@@ -75,28 +74,29 @@
 Statyczna biblioteka GLFW.
 
 %prep
-%setup -q -n %{name}-2.5
+%setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 CC="%{__cc}" \
 LFLAGS="%{rpmldflags}" \
-INCS= \
-OPT="%{rpmcflags}" \
-./compile.sh
+CFLAGS="%{rpmcflags}" \
+sh ./compile.sh
 
 %{__make} -C lib/x11 -f Makefile.x11 \
-	LFLAGS_LINK="%{rpmldflags} -lGL -lXxf86vm -lX11 -lpthread" \
+	PREFIX=%{_prefix} \
 	LIBDIR=%{_libdir}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_libdir},%{_includedir}/GL,%{_examplesdir}/%{name}-%{version}}
+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}
 
-libtool --mode=install install lib/x11/libglfw.la $RPM_BUILD_ROOT%{_libdir}
-install include/GL/glfw.h $RPM_BUILD_ROOT%{_includedir}/GL
 install examples/{*.c,*.tga,Makefile.x11} $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
 %clean
@@ -107,15 +107,14 @@
 
 %files
 %defattr(644,root,root,755)
-%doc license.txt readme.html images
-%attr(755,root,root) %{_libdir}/libglfw.so.*.*.*
+%doc COPYING.txt readme.html
+%attr(755,root,root) %{_libdir}/libglfw.so
 
 %files devel
 %defattr(644,root,root,755)
-%doc docs/*.pdf
-%attr(755,root,root) %{_libdir}/libglfw.so
-%{_libdir}/libglfw.la
+%doc docs/GLFW*.pdf
 %{_includedir}/GL/glfw.h
+%{_pkgconfigdir}/libglfw.pc
 %{_examplesdir}/%{name}-%{version}
 
 %files static
@@ -128,6 +127,13 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7  2011/07/30 18:47:25  qboosh
+- updated to 2.7.1
+- updated opt patch
+- dropped shared patch (shared library is supported upstream now) and outdated pic patch
+- added libdir patch
+- soname changed to match upstream (just libglfw.so)
+
 Revision 1.6  2008/11/09 17:30:05  arekm
 - release 4
 

================================================================
Index: packages/glfw/glfw-libdir.patch
diff -u /dev/null packages/glfw/glfw-libdir.patch:1.1
--- /dev/null	Sat Jul 30 20:47:30 2011
+++ packages/glfw/glfw-libdir.patch	Sat Jul 30 20:47:25 2011
@@ -0,0 +1,71 @@
+--- 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
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/glfw/glfw-opt.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/glfw/glfw.spec?r1=1.6&r2=1.7&f=u

More information about the pld-cvs-commit mailing list