pkgsrc-WIP-changes archive

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

mupdf: Avoid freeglut-isms to fix opengl option.



Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Sun May 6 14:40:31 2018 +0200
Changeset:	b3a27d097380c3c45c463f70c5133c7f5a76f63e

Modified Files:
	mupdf/TODO
	mupdf/distinfo
Added Files:
	mupdf/patches/patch-platform_gl_gl-main.c

Log Message:
mupdf: Avoid freeglut-isms to fix opengl option.

Avoid a freeglut-ism.

Now both `curl' and `opengl' option seems to work, delete the corresponding
entry in the TODO.

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

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

diffstat:
 mupdf/TODO                                |  2 --
 mupdf/distinfo                            |  1 +
 mupdf/patches/patch-platform_gl_gl-main.c | 16 ++++++++++++++++
 3 files changed, 17 insertions(+), 2 deletions(-)

diffs:
diff --git a/mupdf/TODO b/mupdf/TODO
index 68a4d9e131..87e8a5707c 100644
--- a/mupdf/TODO
+++ b/mupdf/TODO
@@ -1,4 +1,2 @@
-- Test `curl' and `opengl' options.
-
 After updating print/mupdf:
  - print/zathura-pdf-mupdf needs a PKGREVISION++
diff --git a/mupdf/distinfo b/mupdf/distinfo
index 4dccf7c828..116f6d8faa 100644
--- a/mupdf/distinfo
+++ b/mupdf/distinfo
@@ -9,5 +9,6 @@ SHA1 (patch-ab) = 5ca9de36a7f38cdcf0578cded98cdd54bed78ab5
 SHA1 (patch-ac) = 0c140ee7f0a86bc300c91845da0bd3bf5f0b7c14
 SHA1 (patch-ae) = c6b113818b32cb4470e8549c00a16e0b2f364ede
 SHA1 (patch-platform_gl_gl-app.h) = 6e5e547df27ecb2b82cadd71489d2eb9138c1ce2
+SHA1 (patch-platform_gl_gl-main.c) = 526c3e8c1c548490ef97f59e491b237f803f250e
 SHA1 (patch-source_fitz_load-jpx.c) = b507c1ebab027167af363c9f0f64d8690ea75ff3
 SHA1 (patch-thirdparty_mujs_Makefile) = d3e163bcc4e3d2509401b87e5da8eddb35394dc9
diff --git a/mupdf/patches/patch-platform_gl_gl-main.c b/mupdf/patches/patch-platform_gl_gl-main.c
new file mode 100644
index 0000000000..6b1ebcb618
--- /dev/null
+++ b/mupdf/patches/patch-platform_gl_gl-main.c
@@ -0,0 +1,16 @@
+$NetBSD$
+
+glutSetOption() is available only on freeglut.
+
+--- platform/gl/gl-main.c.orig	2018-04-12 13:14:06.000000000 +0000
++++ platform/gl/gl-main.c
+@@ -1674,7 +1674,9 @@ int main(int argc, char **argv)
+ 
+ 	/* Init GLUT */
+ 
++#if defined(FREEGLUT)
+ 	glutSetOption(GLUT_ACTION_ON_WINDOW_CLOSE, GLUT_ACTION_GLUTMAINLOOP_RETURNS);
++#endif
+ 
+ 	glutInitErrorFunc(on_error);
+ 	glutInitWarningFunc(on_warning);


Home | Main Index | Thread Index | Old Index