From c1abbf91fa74d3cd8a9e5322e7d5f658244ca5a2 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 11 Aug 2019 21:19:40 +0000 Subject: cygwin patches no longer needed git-svn-id: svn://tug.org/texlive/trunk@51866 c570f23f-e606-0410-a88d-b1316a301751 --- .../asymptote/patches/cygwin_freeglut-2.8.1.patch | 13 ---- .../asymptote/patches/cygwin_freeglut-3.0.0.patch | 48 ------------- .../source/utils/asymptote/patches/cygwin_gc.patch | 77 -------------------- .../utils/asymptote/patches/cygwin_glu.patch | 82 ---------------------- 4 files changed, 220 deletions(-) delete mode 100644 Build/source/utils/asymptote/patches/cygwin_freeglut-2.8.1.patch delete mode 100644 Build/source/utils/asymptote/patches/cygwin_freeglut-3.0.0.patch delete mode 100644 Build/source/utils/asymptote/patches/cygwin_gc.patch delete mode 100644 Build/source/utils/asymptote/patches/cygwin_glu.patch (limited to 'Build/source/utils') diff --git a/Build/source/utils/asymptote/patches/cygwin_freeglut-2.8.1.patch b/Build/source/utils/asymptote/patches/cygwin_freeglut-2.8.1.patch deleted file mode 100644 index 6b2ea618c70..00000000000 --- a/Build/source/utils/asymptote/patches/cygwin_freeglut-2.8.1.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -r -u freeglut-2.8.1/src/freeglut_internal.h freeglut-2.8.1J/src/freeglut_internal.h ---- freeglut-2.8.1/src/freeglut_internal.h 2012-11-19 06:14:16.000000000 -0700 -+++ freeglut-2.8.1J/src/freeglut_internal.h 2018-01-05 11:38:25.214161500 -0700 -@@ -32,6 +32,9 @@ - # include "config.h" - #endif - -+#define GCL_HCURSOR (-12) -+#define _snprintf snprintf -+ - /* XXX Update these for each release! */ - #define VERSION_MAJOR 2 - #define VERSION_MINOR 8 diff --git a/Build/source/utils/asymptote/patches/cygwin_freeglut-3.0.0.patch b/Build/source/utils/asymptote/patches/cygwin_freeglut-3.0.0.patch deleted file mode 100644 index bd27dfe356a..00000000000 --- a/Build/source/utils/asymptote/patches/cygwin_freeglut-3.0.0.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -ru freeglut-3.0.0/CMakeLists.txt freeglut-3.0.0J/CMakeLists.txt ---- freeglut-3.0.0/CMakeLists.txt 2015-02-17 23:59:57.000000000 -0500 -+++ freeglut-3.0.0J/CMakeLists.txt 2019-01-20 22:15:55.410415400 -0500 -@@ -20,7 +20,7 @@ - set(VERSION_MAJOR 3) - set(VERSION_MINOR 0) - set(VERSION_PATCH 0) -- -+set(WIN32 1) - # Update fg_version.h to match the versions number here in cmake - CONFIGURE_FILE(src/fg_version.h.in src/fg_version.h) - -@@ -32,7 +32,7 @@ - # FREEGLUT_BUILD_SHARED_LIBS is already a standard CMake variable, but we need to - # re-declare it here so it will show up in the GUI. - # by default, we want to build both --OPTION(FREEGLUT_BUILD_SHARED_LIBS "Build FreeGLUT shared library." ON) -+OPTION(FREEGLUT_BUILD_SHARED_LIBS "Build FreeGLUT shared library." OFF) - OPTION(FREEGLUT_BUILD_STATIC_LIBS "Build FreeGLUT static library." ON) - - # option for whether warnings and errors should be printed -@@ -439,7 +439,7 @@ - - - # Optionally build demos, on by default. --option( FREEGLUT_BUILD_DEMOS "Build FreeGLUT demos." ON ) -+option( FREEGLUT_BUILD_DEMOS "Build FreeGLUT demos." OFF ) - - SET(DEMO_LIBS ${OPENGL_glu_LIBRARY} ${LIBS}) - # lib m for math, not needed on windows -Only in freeglut-3.0.0J: CMakeLists.txt~ -diff -ru freeglut-3.0.0/src/fg_internal.h freeglut-3.0.0J/src/fg_internal.h ---- freeglut-3.0.0/src/fg_internal.h 2014-12-22 11:27:02.000000000 -0500 -+++ freeglut-3.0.0J/src/fg_internal.h 2019-01-20 22:13:40.317578700 -0500 -@@ -24,6 +24,13 @@ - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ -+#define FREEGLUT_EXPORTS 1 -+ -+#define TARGET_HOST_MS_WINDOWS 1 -+ -+#define GCL_HCURSOR (-12) -+#define _snprintf snprintf -+ - - #ifndef FREEGLUT_INTERNAL_H - #define FREEGLUT_INTERNAL_H diff --git a/Build/source/utils/asymptote/patches/cygwin_gc.patch b/Build/source/utils/asymptote/patches/cygwin_gc.patch deleted file mode 100644 index 1af6f6f2067..00000000000 --- a/Build/source/utils/asymptote/patches/cygwin_gc.patch +++ /dev/null @@ -1,77 +0,0 @@ -diff -ru gc-7.6.2.orig/include/config.h.in gc-7.6.2/include/config.h.in ---- gc-7.6.2.orig/include/config.h.in 2017-12-23 00:48:37.000000000 -0800 -+++ gc-7.6.2/include/config.h.in 2018-01-12 13:42:30.026704300 -0800 -@@ -100,19 +100,27 @@ - #undef GC_USE_DLOPEN_WRAP - - /* The major version number of this GC release. */ -+#ifndef GC_VERSION_MAJOR - #undef GC_VERSION_MAJOR -+#endif - - /* The micro version number of this GC release. */ -+#ifndef GC_VERSION_MICRO - #undef GC_VERSION_MICRO -+#endif - - /* The minor version number of this GC release. */ -+#ifndef GC_VERSION_MINOR - #undef GC_VERSION_MINOR -+#endif - - /* Define to support pthreads-win32 or winpthreads. */ - #undef GC_WIN32_PTHREADS - - /* Define to support Win32 threads. */ -+#ifndef GC_WIN32_THREADS - #undef GC_WIN32_THREADS -+#endif - - /* Define to install pthread_atfork() handlers by default. */ - #undef HANDLE_FORK -@@ -196,22 +204,32 @@ - #undef PACKAGE - - /* Define to the address where bug reports for this package should be sent. */ -+#ifndef PACKAGE_BUGREPORT - #undef PACKAGE_BUGREPORT -+#endif - - /* Define to the full name of this package. */ -+#ifndef PACKAGE_NAME - #undef PACKAGE_NAME -+#endif - - /* Define to the full name and version of this package. */ -+#ifndef PACKAGE_STRING - #undef PACKAGE_STRING -+#endif - - /* Define to the one symbol short name of this package. */ -+#ifndef PACKAGE_TARNAME - #undef PACKAGE_TARNAME -+#endif - - /* Define to the home page for this package. */ - #undef PACKAGE_URL - - /* Define to the version of this package. */ -+#ifndef PACKAGE_VERSION - #undef PACKAGE_VERSION -+#endif - - /* Define to enable parallel marking. */ - #undef PARALLEL_MARK -diff -ru gc-7.6.2.orig/include/gc_config_macros.h gc-7.6.2/include/gc_config_macros.h ---- gc-7.6.2.orig/include/gc_config_macros.h 2017-12-23 00:46:29.000000000 -0800 -+++ gc-7.6.2/include/gc_config_macros.h 2018-01-12 13:44:29.838482500 -0800 -@@ -48,7 +48,9 @@ - # define GC_LINUX_THREADS - #endif - #if defined(WIN32_THREADS) -+# ifndef GC_WIN32_THREADS - # define GC_WIN32_THREADS -+# endif - #endif - #if defined(RTEMS_THREADS) - # define GC_RTEMS_PTHREADS diff --git a/Build/source/utils/asymptote/patches/cygwin_glu.patch b/Build/source/utils/asymptote/patches/cygwin_glu.patch deleted file mode 100644 index 04090e8a45c..00000000000 --- a/Build/source/utils/asymptote/patches/cygwin_glu.patch +++ /dev/null @@ -1,82 +0,0 @@ ---- w32api.orig/GL/glu.h 2014-04-18 22:30:50.186158900 -0600 -+++ w32api/GL/glu.h 2014-04-18 22:42:59.095926900 -0600 -@@ -108,8 +108,12 @@ - typedef void (CALLBACK *GLUtessCombineDataProc)(GLdouble[3],void*[4],GLfloat[4],void**,void*); - typedef void (CALLBACK *GLUnurbsErrorProc)(GLenum); - -+#define GLU_EXT_object_space_tess 1 -+#define GLU_EXT_nurbs_tessellator 1 -+ - #define GLU_VERSION_1_1 1 - #define GLU_VERSION_1_2 1 -+#define GLU_VERSION_1_3 1 - - #define GLU_INVALID_ENUM 100900 - #define GLU_INVALID_VALUE 100901 -@@ -183,7 +187,17 @@ - #define GLU_SAMPLING_METHOD 100205 - #define GLU_U_STEP 100206 - #define GLU_V_STEP 100207 -- -+#define GLU_NURBS_MODE 100160 -+#define GLU_NURBS_MODE_EXT 100160 -+#define GLU_NURBS_TESSELLATOR 100161 -+#define GLU_NURBS_TESSELLATOR_EXT 100161 -+#define GLU_NURBS_RENDERER 100162 -+#define GLU_NURBS_RENDERER_EXT 100162 -+ -+#define GLU_OBJECT_PARAMETRIC_ERROR 100208 -+#define GLU_OBJECT_PARAMETRIC_ERROR_EXT 100208 -+#define GLU_OBJECT_PATH_LENGTH 100209 -+#define GLU_OBJECT_PATH_LENGTH_EXT 100209 - #define GLU_PATH_LENGTH 100215 - #define GLU_PARAMETRIC_ERROR 100216 - #define GLU_DOMAIN_DISTANCE 100217 -@@ -194,6 +208,33 @@ - #define GLU_OUTLINE_POLYGON 100240 - #define GLU_OUTLINE_PATCH 100241 - -+#define GLU_NURBS_ERROR 100103 -+#define GLU_ERROR 100103 -+#define GLU_NURBS_BEGIN 100164 -+#define GLU_NURBS_BEGIN_EXT 100164 -+#define GLU_NURBS_VERTEX 100165 -+#define GLU_NURBS_VERTEX_EXT 100165 -+#define GLU_NURBS_NORMAL 100166 -+#define GLU_NURBS_NORMAL_EXT 100166 -+#define GLU_NURBS_COLOR 100167 -+#define GLU_NURBS_COLOR_EXT 100167 -+#define GLU_NURBS_TEXTURE_COORD 100168 -+#define GLU_NURBS_TEX_COORD_EXT 100168 -+#define GLU_NURBS_END 100169 -+#define GLU_NURBS_END_EXT 100169 -+#define GLU_NURBS_BEGIN_DATA 100170 -+#define GLU_NURBS_BEGIN_DATA_EXT 100170 -+#define GLU_NURBS_VERTEX_DATA 100171 -+#define GLU_NURBS_VERTEX_DATA_EXT 100171 -+#define GLU_NURBS_NORMAL_DATA 100172 -+#define GLU_NURBS_NORMAL_DATA_EXT 100172 -+#define GLU_NURBS_COLOR_DATA 100173 -+#define GLU_NURBS_COLOR_DATA_EXT 100173 -+#define GLU_NURBS_TEXTURE_COORD_DATA 100174 -+#define GLU_NURBS_TEX_COORD_DATA_EXT 100174 -+#define GLU_NURBS_END_DATA 100175 -+#define GLU_NURBS_END_DATA_EXT 100175 -+ - #define GLU_NURBS_ERROR1 100251 - #define GLU_NURBS_ERROR2 100252 - #define GLU_NURBS_ERROR3 100253 -@@ -248,6 +289,13 @@ - #define GLU_ERROR GLU_TESS_ERROR - #define GLU_EDGE_FLAG GLU_TESS_EDGE_FLAG - -+/* Internal convenience typedefs */ -+#ifdef __cplusplus -+typedef void (APIENTRY *_GLUfuncptr)(); -+#else -+typedef void (APIENTRY *_GLUfuncptr)(GLvoid); -+#endif -+ - #ifdef __cplusplus - } - #endif -- cgit v1.2.3