On Wed, 11 Jan 2017 23:10:22 +0100, Gregor Best <[email protected]>
wrote:
> Hi people,
Hi Gregor,
> this patch updates graphics/glfw from 3.1.2 to 3.2.1 and drops a patch
> that is no longer required.
>
Here's an updated diff:
- fix WANTLIB
- regen some patches
I looked at the difference between the two .so and symbols were added,
I guess a major bump would be the safe bet. I don't know why it doesn't
create ${WRKBUILD}/shared_libs.log so the diff doesn't change that (as
I can't copy/paste :p). Anyway what would you prefer about the bumping?
Cheers,
Daniel
Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/glfw/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile 26 Apr 2016 15:30:50 -0000 1.1.1.1
+++ Makefile 14 Jan 2017 02:37:20 -0000
@@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.1.1.1 2016/04/26 15:30:50 jca Exp $
COMMENT = open source, multi-platform library for creating windows
-DISTNAME = glfw-3.1.2
+DISTNAME = glfw-3.2.1
CATEGORIES = graphics x11
SHARED_LIBS += glfw 0.0 # 3.1
@@ -12,7 +12,7 @@ MAINTAINER = Gregor Best <gbe@unobtanium
# zlib
PERMIT_PACKAGE_CDROM = Yes
-WANTLIB += GL X11 Xcursor Xi Xinerama Xrandr Xxf86vm m pthread
+WANTLIB += X11 Xcursor Xinerama Xrandr Xxf86vm m pthread
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=glfw/}
Index: distinfo
===================================================================
RCS file: /cvs/ports/graphics/glfw/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo 26 Apr 2016 15:30:50 -0000 1.1.1.1
+++ distinfo 14 Jan 2017 02:37:20 -0000
@@ -1,2 +1,2 @@
-SHA256 (glfw-3.1.2.tar.gz) = 34phOp8QGy1qRziIuszOG9lvHxssOuo+R5Cbn4WuBpA=
-SIZE (glfw-3.1.2.tar.gz) = 817618
+SHA256 (glfw-3.2.1.tar.gz) = jjJSky+xUTSt7YeAyMXMidoKkAfhOcptmrDtffbT+aA=
+SIZE (glfw-3.2.1.tar.gz) = 870660
Index: patches/patch-CMakeLists_txt
===================================================================
RCS file: /cvs/ports/graphics/glfw/patches/patch-CMakeLists_txt,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt 26 Apr 2016 15:30:50 -0000 1.1.1.1
+++ patches/patch-CMakeLists_txt 14 Jan 2017 02:37:20 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-CMakeLists_txt,v 1.1.1.1 2016/04/26 15:30:50 jca Exp $
---- CMakeLists.txt.orig Mon Oct 12 21:09:07 2015
-+++ CMakeLists.txt Tue Apr 26 14:59:36 2016
-@@ -213,13 +213,6 @@ endif()
+--- CMakeLists.txt.orig Thu Aug 18 07:32:27 2016
++++ CMakeLists.txt Fri Jan 13 21:20:41 2017
+@@ -172,13 +172,6 @@ endif()
# Find and add Unix math and time libraries
#--------------------------------------------------------------------
if (UNIX AND NOT APPLE)
Index: patches/patch-src-egl_context-c
===================================================================
RCS file: /cvs/ports/graphics/glfw/patches/patch-src-egl_context-c,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-src-egl_context-c
--- patches/patch-src-egl_context-c 26 Apr 2016 15:30:50 -0000 1.1.1.1
+++ patches/patch-src-egl_context-c 14 Jan 2017 02:37:20 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src-egl_context-c,v 1.1.1.1 2016/04/26 15:30:50 jca Exp $
---- src/egl_context.c.orig Mon Oct 12 21:09:07 2015
-+++ src/egl_context.c Tue Apr 26 14:59:36 2016
-@@ -488,6 +488,8 @@ int _glfwCreateContext(_GLFWwindow* window,
+--- src/egl_context.c.orig Thu Aug 18 07:32:27 2016
++++ src/egl_context.c Fri Jan 13 21:20:41 2017
+@@ -615,6 +615,8 @@ GLFWbool _glfwCreateContextEGL(_GLFWwindow* window,
{
#if defined(_GLFW_WIN32)
#elif defined(_GLFW_COCOA)
Index: patches/patch-src-glx_context-c
===================================================================
RCS file: /cvs/ports/graphics/glfw/patches/patch-src-glx_context-c,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-src-glx_context-c
--- patches/patch-src-glx_context-c 26 Apr 2016 15:30:50 -0000 1.1.1.1
+++ patches/patch-src-glx_context-c 14 Jan 2017 02:37:20 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src-glx_context-c,v 1.1.1.1 2016/04/26 15:30:50 jca Exp $
---- src/glx_context.c.orig Mon Oct 12 21:09:07 2015
-+++ src/glx_context.c Tue Apr 26 14:59:36 2016
-@@ -158,6 +158,8 @@ int _glfwInitContextAPI(void)
- {
- #if defined(__CYGWIN__)
- const char* soname = "libGL-1.so";
-+#elif defined(__OpenBSD__)
-+ const char* soname = "libGL.so";
- #else
- const char* soname = "libGL.so.1";
- #endif
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/glfw/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 26 Apr 2016 15:30:50 -0000 1.1.1.1
+++ pkg/PLIST 14 Jan 2017 02:37:20 -0000
@@ -3,10 +3,10 @@ include/GLFW/
include/GLFW/glfw3.h
include/GLFW/glfw3native.h
lib/cmake/
-lib/cmake/glfw/
-lib/cmake/glfw/glfw3Config.cmake
-lib/cmake/glfw/glfw3ConfigVersion.cmake
-lib/cmake/glfw/glfwTargets${MODCMAKE_BUILD_SUFFIX}
-lib/cmake/glfw/glfwTargets.cmake
+lib/cmake/glfw3/
+lib/cmake/glfw3/glfw3Config.cmake
+lib/cmake/glfw3/glfw3ConfigVersion.cmake
+lib/cmake/glfw3/glfw3Targets${MODCMAKE_BUILD_SUFFIX}
+lib/cmake/glfw3/glfw3Targets.cmake
@lib lib/libglfw.so.${LIBglfw_VERSION}
lib/pkgconfig/glfw3.pc
