This is an automated email from the git hooks/post-receive script. ecsv-guest pushed a commit to branch master in repository mupen64plus-video-z64.
commit 1ce0c97365987623cb7933b24339a1e5a89b5c19 Author: Sven Eckelmann <[email protected]> Date: Sun May 10 14:28:15 2015 +0200 Fix glew >= 1.12 includes --- debian/changelog | 7 ++++ debian/patches/glew_include.patch | 69 +++++++++++++++++++++++++++++++++++++++ debian/patches/printf_fixup.patch | 6 ++-- debian/patches/series | 1 + 4 files changed, 80 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7642424..d5c9688 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +mupen64plus-video-z64 (2.0.0+13+g72af4f0-2) UNRELEASED; urgency=medium + + * debian/patches: + - Add glew_include.patch, Fix glew >= 1.12 includes + + -- Sven Eckelmann <[email protected]> Sun, 10 May 2015 14:27:54 +0200 + mupen64plus-video-z64 (2.0.0+13+g72af4f0-1) unstable; urgency=medium * New Upstream Snapshot from 72af4f0f9c508b8e6ba84b210f81b634c1a2480d diff --git a/debian/patches/glew_include.patch b/debian/patches/glew_include.patch new file mode 100644 index 0000000..cb807a2 --- /dev/null +++ b/debian/patches/glew_include.patch @@ -0,0 +1,69 @@ +Description: Fix glew >= 1.12 includes +Author: Sven Eckelmann <[email protected]> + +--- +diff --git a/src/glshader.cpp b/src/glshader.cpp +index fd70668b90f48294e90d3de6dc7c30a65abfac17..5ddb8d62b3dd96b4146de00ae9d7998aa20c6e3e 100644 +--- a/src/glshader.cpp ++++ b/src/glshader.cpp +@@ -19,7 +19,7 @@ + * + **/ + +-#include <glew.h> ++#include <GL/glew.h> + #include <stdio.h> + #include <stdlib.h> + #include <string.h> +diff --git a/src/rgl.cpp b/src/rgl.cpp +index 68910b6c1ddb6f0e270e74b425570116ab921258..4b115fa9748c09a3e6ac5226fe7f211850a39a1d 100644 +--- a/src/rgl.cpp ++++ b/src/rgl.cpp +@@ -77,7 +77,7 @@ + **/ + + #include <SDL.h> +-#include <glew.h> ++#include <GL/glew.h> + #include <stdio.h> + #include <sys/types.h> + +diff --git a/src/rgl.h b/src/rgl.h +index 2273293a42752adcbd89cbfa5c15b69881cf11c5..ce9169e4488a3643e0067d2203f90e58d34465f3 100644 +--- a/src/rgl.h ++++ b/src/rgl.h +@@ -22,7 +22,7 @@ + #ifndef _RGL_H_ + #define _RGL_H_ + +-#include <glew.h> ++#include <GL/glew.h> + #include <stdint.h> + + #include "m64p_plugin.h" +diff --git a/src/rgl_rendermode.cpp b/src/rgl_rendermode.cpp +index f4d3d3ead4ca378c66e0066b9224c1d73855695e..9255805af0a328c69d02fc2155ee5383c9bc382b 100644 +--- a/src/rgl_rendermode.cpp ++++ b/src/rgl_rendermode.cpp +@@ -20,7 +20,7 @@ + **/ + + #include <SDL.h> +-#include <glew.h> ++#include <GL/glew.h> + #include <stdint.h> + #include <stdio.h> + #include <string.h> +diff --git a/src/rgl_tiles.cpp b/src/rgl_tiles.cpp +index a77c943c449fb840767a4f36c548c7a180339338..5ec52d1057dcf6d92bf1160fe620058e0ebd0c5c 100644 +--- a/src/rgl_tiles.cpp ++++ b/src/rgl_tiles.cpp +@@ -20,7 +20,7 @@ + **/ + + #include <SDL.h> +-#include <glew.h> ++#include <GL/glew.h> + #include <stdint.h> + #include <string.h> + diff --git a/debian/patches/printf_fixup.patch b/debian/patches/printf_fixup.patch index 990b780..afd3a12 100644 --- a/debian/patches/printf_fixup.patch +++ b/debian/patches/printf_fixup.patch @@ -6,7 +6,7 @@ Author: Sven Eckelmann <[email protected]> --- diff --git a/src/rdp.h b/src/rdp.h -index 606ffd0d372917a91e7cab0b9f7caff4c78aca28..9979e3e5666cd8d5a7050b49277df4066a9ee3f2 100644 +index 703704ce4a916d070d0c9aa7d248d6490127d78c..1129752cfc89a0f1cd336edef3ad3132a794823f 100644 --- a/src/rdp.h +++ b/src/rdp.h @@ -247,7 +247,7 @@ int rdp_dasm(uint32_t * rdp_cmd_data, int rdp_cmd_cur, int length, char *buffer) @@ -27,10 +27,10 @@ index 606ffd0d372917a91e7cab0b9f7caff4c78aca28..9979e3e5666cd8d5a7050b49277df406 { va_list ap; diff --git a/src/rgl_debugger.cpp b/src/rgl_debugger.cpp -index 740be9e0c3d3f8361f8a133cbbabbd06cca3d440..ddae02caea5873a014d4acbb03f3ed6525792b91 100644 +index 3d074ab04afb15e6c7783f4f9deefd72c0051c89..1dfdd9210e9ee4c87c8780e327dfe59da9f843c5 100644 --- a/src/rgl_debugger.cpp +++ b/src/rgl_debugger.cpp -@@ -174,8 +174,8 @@ void gglPrint(int x, int y, const char * text) +@@ -175,8 +175,8 @@ void gglPrint(int x, int y, const char * text) //printf("%s\n", text); } diff --git a/debian/patches/series b/debian/patches/series index 5a5a78d..c879ec8 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ printf_fixup.patch +glew_include.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-video-z64.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
