pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

glfw: fix glfwInit(), tested and spotted via print/mupdf.



Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Fri Nov 13 15:18:33 2015 +0100
Changeset:	a951f98485cd5f8d91c8a0461965955914e51c72

Modified Files:
	glfw/Makefile

Log Message:
glfw: fix glfwInit(), tested and spotted via print/mupdf.

mupdf-gl failed when calling glfwInit(). After analysing it via gdb(1) in
_glfwInitContextAPI() libGL.so was loaded via dlopen(3) and it was hard-coded as
"libGL.so.1".

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

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

diffstat:
 glfw/Makefile | 7 +++++++
 1 file changed, 7 insertions(+)

diffs:
diff --git a/glfw/Makefile b/glfw/Makefile
index 1d68aa6..5702ab7 100644
--- a/glfw/Makefile
+++ b/glfw/Makefile
@@ -16,6 +16,12 @@ USE_TOOLS+=	pkg-config
 CMAKE_ARGS+=	-DBUILD_SHARED_LIBS=ON
 CMAKE_ARGS+=	-DGLFW_BUILD_DOCS=OFF
 
+SUBST_CLASSES+=		soname
+SUBST_STAGE.soname=	pre-configure
+SUBST_MESSAGE.soname=	Avoid hardcoded libGL.so
+SUBST_FILES.soname=	src/glx_context.c
+SUBST_SED.soname=	-e '/soname/ s/libGL\.so\.1/libGL.so/'
+
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../x11/libICE/buildlink3.mk"
@@ -23,4 +29,5 @@ CMAKE_ARGS+=	-DGLFW_BUILD_DOCS=OFF
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXrandr/buildlink3.mk"
 .include "../../x11/libxkbcommon/buildlink3.mk"
+.include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"


Home | Main Index | Thread Index | Old Index