glfw: Update wip/glfw to 3.1.2.

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: glfw: Update wip/glfw to 3.1.2.
From: Leonardo Taccari <leot%NetBSD.org@localhost>
Date: Fri, 13 Nov 2015 09:39:23 +0000
Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Fri Nov 13 10:39:23 2015 +0100
Changeset:	6160aad9d819145e89e2dba81e7ecfc7b53c3e33

Modified Files:
	glfw/Makefile
	glfw/PLIST
	glfw/buildlink3.mk
	glfw/distinfo
Removed Files:
	glfw/TODO
	glfw/patches/patch-compile.sh
	glfw/patches/patch-lib_x11_Makefile.x11.in

Log Message:
glfw: Update wip/glfw to 3.1.2.

Changes:
3.1.2
-----
GLFW 3.1.2 is available for download. It adds fixes for a large number of bugs
that together affect all supported platforms, as well as dynamic loading work
that simplifies compilation and linking.

3.1.1
-----
GLFW 3.1.1 is available for download. It adds fixes for a number of bugs that
together affect all supported platforms, most notably workarounds for bugs in
some popular window managers.

3.1
---
GLFW 3.1 is available for download. It adds improved documentation, support for
custom system cursors, file drop events, main thread wake-up, window frame size
retrieval, floating windows, character input with modifier keys, single buffered
windows, build improvements and fixes for a large number of bugs.

3.0.4
-----
GLFW 3.0.4 is available for download. It adds fixes for a number of bugs that
together affect all supported platforms, most notably MinGW compilation issues
and cursor mode issues on OS X.

3.0.3
-----
GLFW 3.0.3 is available for download. It adds fixes for a number of bugs that
together affect all supported platforms, most notably MinGW compilation issues
and cursor mode issues on OS X.

3.0.2
-----
GLFW 3.0.2 is available for download. It adds support for OpenGL 4 and precise
scrolling deltas on OS X and fixes for a number of bugs that together affect all
supported platforms.

3.0.1
-----
GLFW 3.0.1 is available for download. It adds fixes for a number of bugs that
together affect all supported platforms.

3.0
---
GLFW 3.0 is available for download. It adds support for multiple windows,
multiple monitors, clipboard text I/O, gamma ramps, better error reporting, more
event callbacks, undecorated windows, joystick names, a new build system using
CMake, UTF-8 for all strings, experimental support for EGL and OpenGL ES and
more.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=6160aad9d819145e89e2dba81e7ecfc7b53c3e33

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 glfw/Makefile                              | 29 +++++++++------------------
 glfw/PLIST                                 | 14 +++++++++----
 glfw/TODO                                  |  1 -
 glfw/buildlink3.mk                         | 13 +++++++-----
 glfw/distinfo                              |  9 ++++-----
 glfw/patches/patch-compile.sh              | 27 -------------------------
 glfw/patches/patch-lib_x11_Makefile.x11.in | 32 ------------------------------
 7 files changed, 31 insertions(+), 94 deletions(-)

diffs:
diff --git a/glfw/Makefile b/glfw/Makefile
index 9ee99c3..1d68aa6 100644
--- a/glfw/Makefile
+++ b/glfw/Makefile
@@ -1,37 +1,26 @@
 # $NetBSD: Makefile,v 1.5 2014/10/19 17:42:27 nros Exp $
 #
 
-DISTNAME=	glfw-2.7.9
+DISTNAME=	glfw-3.1.2
 CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=glfw/}
-EXTRACT_SUFX=	.tar.bz2
+MASTER_SITES=	${MASTER_SITE_GITHUB:=glfw/}
 
 MAINTAINER=	ryo_on%yk.rim.or.jp@localhost
 HOMEPAGE=	http://www.glfw.org/
 COMMENT=	GLFW is a free, Open Source, multi-platform library of OpenGL
 LICENSE=	zlib
 
-USE_TOOLS+=	gmake pkg-config
+USE_CMAKE=	yes
+USE_TOOLS+=	pkg-config
 
-PKGCONFIG_OVERRIDE+=	lib/win32/libglfw.pc.in
-PKGCONFIG_OVERRIDE+=	lib/cocoa/libglfw.pc.in
-PKGCONFIG_OVERRIDE+=	lib/carbon/libglfw.pc.in
-PKGCONFIG_OVERRIDE+=	lib/x11/libglfw.pc.in
-
-PKGCONFIG_OVERRIDE_STAGE=post-configure
-
-
-BUILD_TARGET=	x11
-INSTALL_TARGET=	x11-dist-install
-
-MAKE_FLAGS=	SOFLAGS=-shared
-
-do-configure:
-	cd ${WRKSRC} && \
-	${PKGSRC_ENV} ${MAKE_ENV} ${SH} compile.sh
+CMAKE_ARGS+=	-DBUILD_SHARED_LIBS=ON
+CMAKE_ARGS+=	-DGLFW_BUILD_DOCS=OFF
 
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
+.include "../../x11/libICE/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXrandr/buildlink3.mk"
+.include "../../x11/libxkbcommon/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/glfw/PLIST b/glfw/PLIST
index af5d839..0b795a7 100644
--- a/glfw/PLIST
+++ b/glfw/PLIST
@@ -1,5 +1,11 @@
-@comment $NetBSD: PLIST,v 1.2 2014/10/19 17:42:27 nros Exp $
-include/GL/glfw.h
-lib/libglfw.a
+@comment $NetBSD$
+include/GLFW/glfw3.h
+include/GLFW/glfw3native.h
+lib/cmake/glfw/glfw3Config.cmake
+lib/cmake/glfw/glfw3ConfigVersion.cmake
+lib/cmake/glfw/glfwTargets-noconfig.cmake
+lib/cmake/glfw/glfwTargets.cmake
 lib/libglfw.so
-lib/pkgconfig/libglfw.pc
+lib/libglfw.so.3
+lib/libglfw.so.3.1
+lib/pkgconfig/glfw3.pc
diff --git a/glfw/TODO b/glfw/TODO
deleted file mode 100644
index 85f3b88..0000000
--- a/glfw/TODO
+++ /dev/null
@@ -1 +0,0 @@
-* correct dependencies
diff --git a/glfw/buildlink3.mk b/glfw/buildlink3.mk
index ba1ee16..12c6fd4 100644
--- a/glfw/buildlink3.mk
+++ b/glfw/buildlink3.mk
@@ -5,13 +5,16 @@ BUILDLINK_TREE+=	glfw
 .if !defined(GLFW_BUILDLINK3_MK)
 GLFW_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.glfw+=	glfw>=2.7
+BUILDLINK_API_DEPENDS.glfw+=	glfw>=3.1.2
 BUILDLINK_PKGSRCDIR.glfw?=	../../wip/glfw
 
-#.include "../../graphics/glu/buildlink3.mk"
-#.include "../../graphics/MesaLib/buildlink3.mk"
-#.include "../../x11/libX11/buildlink3.mk"
-#.include "../../x11/libXrandr/buildlink3.mk"
+.include "../../graphics/glu/buildlink3.mk"
+.include "../../graphics/MesaLib/buildlink3.mk"
+.include "../../x11/libICE/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/libXrandr/buildlink3.mk"
+.include "../../x11/libxkbcommon/buildlink3.mk"
 .endif	# GLFW_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-glfw
diff --git a/glfw/distinfo b/glfw/distinfo
index 2be4311..67c47c6 100644
--- a/glfw/distinfo
+++ b/glfw/distinfo
@@ -1,7 +1,6 @@
 $NetBSD: distinfo,v 1.2 2014/10/19 17:42:27 nros Exp $
 
-SHA1 (glfw-2.7.9.tar.bz2) = 50ffcbfa1fb47d23aa6ad1245da329bd21bbaeca
-RMD160 (glfw-2.7.9.tar.bz2) = 13e54430bb6ddeb7fdc87139bc6b4d353df8eec7
-Size (glfw-2.7.9.tar.bz2) = 946924 bytes
-SHA1 (patch-compile.sh) = 2f80796c3945ca0734d9f370271014b4e9391bfb
-SHA1 (patch-lib_x11_Makefile.x11.in) = b687efed6d56f36de4513733b7bf435543d342e7
+SHA1 (glfw-3.1.2.tar.gz) = 3033c604e3109c59cf04918bc473268fe18c828b
+RMD160 (glfw-3.1.2.tar.gz) = c149915bb724f99bde579da153c192163b9e6cc7
+SHA512 (glfw-3.1.2.tar.gz) = 07e8dcc2623fa87558f44e8a01e0f12c0fbbf8b67798337a500c8208ebebedfb545156feb11cba16fa6a4ae1ef0ae21c7ebf934791e4f62a953b727c48f9d150
+Size (glfw-3.1.2.tar.gz) = 461929 bytes
diff --git a/glfw/patches/patch-compile.sh b/glfw/patches/patch-compile.sh
deleted file mode 100644
index 16edf29..0000000
--- a/glfw/patches/patch-compile.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-compile.sh,v 1.1 2014/10/19 17:42:27 nros Exp $
-* Test and use $X11BASE/lib, add rpath
-* Fix version number in pkgconfig file
---- compile.sh.orig	2013-05-30 14:07:32.000000000 +0000
-+++ compile.sh
-@@ -107,7 +107,11 @@ esac
- ##########################################################################
- echo -n "Checking for X11 libraries location... " 1>&6
- 
--if [ -r "/usr/X11/lib" ]; then
-+if [ -r "$X11BASE/lib" ]; then
-+  GLFW_LFLAGS="$GLFW_LFLAGS -L$X11BASE/lib -R$X11BASE/lib"
-+  GLFW_CFLAGS="-I$X11BASE/include $GLFW_CFLAGS"
-+  echo "$X11BASE" 1>&6
-+elif [ -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
-@@ -738,7 +742,7 @@ libdir=\${exec_prefix}/lib
- 
- Name: GLFW
- Description: A portable framework for OpenGL development
--Version: 2.7.4
-+Version: 2.7.9
- URL: http://www.glfw.org/
- Requires.private: gl x11 $PKG_LIBS
- Libs: -L\${libdir} -lglfw $LFLAGS_THREAD $LFLAGS_CLOCK
diff --git a/glfw/patches/patch-lib_x11_Makefile.x11.in b/glfw/patches/patch-lib_x11_Makefile.x11.in
deleted file mode 100644
index d377af0..0000000
--- a/glfw/patches/patch-lib_x11_Makefile.x11.in
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-lib_x11_Makefile.x11.in,v 1.1 2014/10/19 17:42:27 nros Exp $
-* destdir support
-* fix libglfw.so permissions
---- lib/x11/Makefile.x11.in.orig	2013-05-30 14:07:32.000000000 +0000
-+++ lib/x11/Makefile.x11.in
-@@ -26,19 +26,19 @@ 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)$(PREFIX)/lib
-+	$(INSTALL) -c -m 644 libglfw.a $(DESTDIR)$(PREFIX)/lib/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)$(PREFIX)/lib/pkgconfig
-+	$(INSTALL) -c -m 644 libglfw.pc $(DESTDIR)$(PREFIX)/lib/pkgconfig/libglfw.pc
- 
- 
- ##########################################################################
- # Install GLFW static and shared libraries
- ##########################################################################
- dist-install: libglfw.so install
--	$(INSTALL) -c -m 644 libglfw.so $(PREFIX)/lib/libglfw.so
-+	$(INSTALL) -c -m 755 libglfw.so $(DESTDIR)$(PREFIX)/lib/libglfw.so
- 
- 
- ##########################################################################
Prev by Date: ctags-git: Fix PLIST
Next by Date: firefox-hg: remove patches that don't apply any more, update PLIST.
Previous by Thread: ctags-git: Fix PLIST
Next by Thread: firefox-hg: remove patches that don't apply any more, update PLIST.
Indexes:
Home | Main Index | Thread Index | Old Index