ae69000001
* arduino and antiword is kept at -Np0 ```sh git grep -l '^patch_args=-Np0' "srcpkgs/$1*/template" | while read template; do for p in ${template%/template}/patches/*; do sed -i ' \,^[+-][+-][+-] /dev/null,b /^[*-]\+ [0-9]\+\(,[0-9]\+\)\? [*-]\+$/b s,^[*][*][*] ,&a/, /^--- /{ s,\(^--- \)\(./\)*,\1a/, s,[.][Oo][Rr][Ii][Gg]\([ /]\),\1, s/[.][Oo][Rr][Ii][Gg]$// s/[.]patched[.]\([^.]\)/.\1/ h } /^+++ -/{ g s/^--- a/+++ b/ b } s,\(^+++ \)\(./\)*,\1b/, ' "$p" done sed -i '/^patch_args=/d' $template done ```
22 lines
1,009 B
Diff
22 lines
1,009 B
Diff
Mesa<=10.0.1 removed the GLXContextID from glx.h and it has been re-added since:
|
|
|
|
http://cgit.freedesktop.org/mesa/mesa/commit/?id=f425d56ba41382be04366d011536ee78a03a2f33
|
|
|
|
For now, use the same type (XID) than GLXContextID; we can remove this patch
|
|
once mesa-10 contains the above commit.
|
|
|
|
-- xtraeme
|
|
|
|
--- a/addons/allegrogl/include/allegrogl/GLext/glx_ext_api.h 2014-01-05 09:08:26.796542194 +0100
|
|
+++ b/addons/allegrogl/include/allegrogl/GLext/glx_ext_api.h 2014-01-05 09:08:46.115682136 +0100
|
|
@@ -59,8 +59,8 @@ AGL_API(void, DestroyGLXVideoSourceSGIX,
|
|
/* GLX_EXT_import_context */
|
|
AGL_API(Display *, GetCurrentDisplayEXT, (void))
|
|
AGL_API(int, QueryContextInfoEXT, (Display *, GLXContext, int, int *))
|
|
-AGL_API(GLXContextID, GetContextIDEXT, (const GLXContext))
|
|
-AGL_API(GLXContext, ImportContextEXT, (Display *, GLXContextID))
|
|
+AGL_API(XID, GetContextIDEXT, (const GLXContext))
|
|
+AGL_API(GLXContext, ImportContextEXT, (Display *, XID))
|
|
AGL_API(void, FreeContextEXT, (Display *, GLXContext))
|
|
#endif
|
|
|