GNU bug report logs - #31161
[PATCH] gnu: mupen64plus-video-z64: Fix glew.h location.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 31161 in the body.
You can then email your comments to 31161 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: manolis837 <at> gmail.com
To: guix-patches <at> gnu.org
Cc: Manolis Ragkousis <manolis837 <at> gmail.com>
Subject: [PATCH] gnu: mupen64plus-video-z64: Fix glew.h location.
Date: Sun, 15 Apr 2018 13:15:44 +0300

From: Manolis Ragkousis <manolis837 <at> gmail.com>

* gnu/packages/patches/mupen64plus-video-z64-glew-correct-path.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/emulators.scm (mupen64plus-video-z64)[source]: Use it.
---
 gnu/local.mk                                       |  1 +
 gnu/packages/emulators.scm                         |  3 +-
 .../mupen64plus-video-z64-glew-correct-path.patch  | 36 ++++++++++++++++++++++
 3 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 gnu/packages/patches/mupen64plus-video-z64-glew-correct-path.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 295c83ee3..9f737a09d 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -936,6 +936,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/mupdf-CVE-2018-6544.patch		\
   %D%/packages/patches/mupdf-CVE-2018-1000051.patch		\
   %D%/packages/patches/mupen64plus-ui-console-notice.patch	\
+  %D%/packages/patches/mupen64plus-video-z64-glew-correct-path.patch    \
   %D%/packages/patches/mutt-store-references.patch		\
   %D%/packages/patches/net-tools-bitrot.patch			\
   %D%/packages/patches/netcdf-date-time.patch			\
diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm
index 9fb7d3272..232e14b47 100644
--- a/gnu/packages/emulators.scm
+++ b/gnu/packages/emulators.scm
@@ -882,7 +882,8 @@ Rice Video plugin.")
              version ".tar.gz"))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1x7wsjs5gx2iwx20p4cjcbf696zsjlh31qxmghwv0ifrq8x58s1b"))))
+        (base32 "1x7wsjs5gx2iwx20p4cjcbf696zsjlh31qxmghwv0ifrq8x58s1b"))
+       (patches (search-patches "mupen64plus-video-z64-glew-correct-path.patch"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)
diff --git a/gnu/packages/patches/mupen64plus-video-z64-glew-correct-path.patch b/gnu/packages/patches/mupen64plus-video-z64-glew-correct-path.patch
new file mode 100644
index 000000000..c3fcfbbd0
--- /dev/null
+++ b/gnu/packages/patches/mupen64plus-video-z64-glew-correct-path.patch
@@ -0,0 +1,36 @@
+From 21507b3600c616bca7049004eb518cf11f45f299 Mon Sep 17 00:00:00 2001
+From: "Anthony J. Bentley" <anthony <at> cathet.us>
+Date: Sun, 7 Jun 2015 02:41:28 -0600
+Subject: [PATCH] Correct the path to the GLEW header.
+
+---
+ src/glshader.cpp | 2 +-
+ src/rgl.h        | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/glshader.cpp b/src/glshader.cpp
+index 4729945..a8947ea 100644
+--- a/src/glshader.cpp
++++ b/src/glshader.cpp
+@@ -23,7 +23,7 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include "rgl_assert.h"
+-#include <glew.h>
++#include <GL/glew.h>
+ #if defined(__MACOSX__)
+ #include <OpenGL/gl.h>
+ #include <OpenGL/glext.h>
+diff --git a/src/rgl.h b/src/rgl.h
+index c15f93f..1748406 100644
+--- a/src/rgl.h
++++ b/src/rgl.h
+@@ -26,7 +26,7 @@
+ #include "rgl_assert.h"
+ #include "rdp.h"
+ 
+-#include <glew.h>
++#include <GL/glew.h>
+ #if defined(__MACOSX__)
+ #include <OpenGL/gl.h>
+ #elif defined(__MACOS__)
-- 
2.16.2

Message #8 received at 31161 <at> debbugs.gnu.org (full text, mbox):

From: Manolis Ragkousis <manolis837 <at> gmail.com>
To: 31161 <at> debbugs.gnu.org
Subject: Re: [PATCH] gnu: mupen64plus-video-z64: Fix glew.h location.
Date: Sun, 15 Apr 2018 13:27:01 +0300

Hello everyone,

This patch just applies an upstream fix, because in its current state it
cannot be built. If nobody objects I will push it to master.

Thank you,
Manolis

Message #11 received at 31161 <at> debbugs.gnu.org (full text, mbox):

From: Danny Milosavljevic <dannym <at> scratchpost.org>
To: manolis837 <at> gmail.com
Cc: 31161 <at> debbugs.gnu.org
Subject: Re: [bug#31161] [PATCH] gnu: mupen64plus-video-z64: Fix glew.h
 location.
Date: Sun, 15 Apr 2018 12:43:52 +0200

[Message part 1 (text/plain, inline)]

LGTM!

[Message part 2 (application/pgp-signature, inline)]

Message #16 received at 31161-done <at> debbugs.gnu.org (full text, mbox):

From: Manolis Ragkousis <manolis837 <at> gmail.com>
To: Danny Milosavljevic <dannym <at> scratchpost.org>
Cc: 31161-done <at> debbugs.gnu.org
Subject: Re: [bug#31161] [PATCH] gnu: mupen64plus-video-z64: Fix glew.h
 location.
Date: Sun, 15 Apr 2018 16:15:15 +0300

On 04/15/18 13:43, Danny Milosavljevic wrote:
> LGTM!
> 

Pushed, thank you!

Manolis

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.