diff --git a/source-mesa24.dif b/source-mesa24.dif new file mode 100644 index 0000000..31f36fc --- /dev/null +++ b/source-mesa24.dif @@ -0,0 +1,32 @@ +--- + utils/asymptote/GL/glew.h | 2 ++ + utils/asymptote/glrender.h | 5 ++++- + 2 files changed, 6 insertions(+), 1 deletion(-) + +--- utils/asymptote/glrender.h ++++ utils/asymptote/glrender.h 2024-03-20 13:23:12.655945047 +0000 +@@ -29,7 +29,10 @@ + #define _WIN32 + #endif + +-#include "GL/glew.h" ++#include ++#ifndef APIENTRY ++#define APIENTRY GLAPIENTRY ++#endif + + #ifdef __APPLE__ + #define GL_SILENCE_DEPRECATION +--- utils/asymptote/GL/glew.h ++++ utils/asymptote/GL/glew.h 2024-03-20 14:07:14.155520573 +0000 +@@ -23667,8 +23667,10 @@ GLEWAPI const GLubyte * GLEWAPIENTRY gle + + #ifdef GLEW_APIENTRY_DEFINED + #undef GLEW_APIENTRY_DEFINED ++#ifndef GLAPIENTRY + #undef APIENTRY + #endif ++#endif + + #ifdef GLEW_CALLBACK_DEFINED + #undef GLEW_CALLBACK_DEFINED diff --git a/texlive.changes b/texlive.changes index fe45867..2879e42 100644 --- a/texlive.changes +++ b/texlive.changes @@ -1,7 +1,13 @@ +------------------------------------------------------------------- +Wed Mar 20 10:01:34 UTC 2024 - Dr. Werner Fink + +- Do not use --disable-offscreen for asymptote configuration + but define missed cpp macro instead + ------------------------------------------------------------------- Wed Mar 20 09:38:45 UTC 2024 - Dr. Werner Fink -- Make asymptote build with mesa 24 +- Make asymptote build with mesa 24 with --disable-offscreen ------------------------------------------------------------------- Thu Mar 14 12:35:01 UTC 2024 - Dr. Werner Fink diff --git a/texlive.spec b/texlive.spec index 94f949a..29d69d1 100644 --- a/texlive.spec +++ b/texlive.spec @@ -254,6 +254,7 @@ Patch3: source-arraysubs.dif Patch4: source-decNumber.dif Patch5: source-texdoc.dif Patch6: source-dviutils.dif +Patch7: source-mesa24.dif Patch8: source-psutils.dif Patch11: source-lacheck.dif Patch12: source-warns.dif @@ -4231,6 +4232,7 @@ This package is required by the package texlive-biber-bin. %patch -P4 -p0 -b .unicode %patch -P5 -p0 -b .texdoc %patch -P6 -p0 -b .dviutils +%patch -P7 -p0 -b .mesa24 %patch -P8 -p0 -b .psutils %patch -P11 -p0 -b .lacheck %patch -P12 -p0 -b .warns @@ -4485,7 +4487,6 @@ popd --libdir=%{_libdir} \ --datadir=%{_texmfmaindir} \ --disable-texlive-build \ - --disable-offscreen \ --enable-offscreen \ --enable-readline \ --enable-gsl \