From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60330) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f7eiY-0002t2-Nq for guix-patches@gnu.org; Sun, 15 Apr 2018 06:17:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f7eiU-0003iC-Lr for guix-patches@gnu.org; Sun, 15 Apr 2018 06:17:06 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:45156) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1f7eiU-0003i8-HV for guix-patches@gnu.org; Sun, 15 Apr 2018 06:17:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1f7eiU-0001KV-Ab for guix-patches@gnu.org; Sun, 15 Apr 2018 06:17:02 -0400 Subject: [bug#31161] [PATCH] gnu: mupen64plus-video-z64: Fix glew.h location. Resent-Message-ID: Received: from eggs.gnu.org ([2001:4830:134:3::10]:59639) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f7ehS-0002cH-E1 for guix-patches@gnu.org; Sun, 15 Apr 2018 06:16:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f7ehO-0002yM-Bk for guix-patches@gnu.org; Sun, 15 Apr 2018 06:15:58 -0400 Received: from mail-wr0-x231.google.com ([2a00:1450:400c:c0c::231]:44586) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1f7ehO-0002x1-5m for guix-patches@gnu.org; Sun, 15 Apr 2018 06:15:54 -0400 Received: by mail-wr0-x231.google.com with SMTP id u46so18255050wrc.11 for ; Sun, 15 Apr 2018 03:15:53 -0700 (PDT) From: manolis837@gmail.com Date: Sun, 15 Apr 2018 13:15:44 +0300 Message-Id: <20180415101544.14484-1-manolis837@gmail.com> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 31161@debbugs.gnu.org From: Manolis Ragkousis * 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" +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 + #include + #include "rgl_assert.h" +-#include ++#include + #if defined(__MACOSX__) + #include + #include +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 ++#include + #if defined(__MACOSX__) + #include + #elif defined(__MACOS__) -- 2.16.2