libepoxy 1.4.3
authorYaakov Selkowitz <yselkowi@redhat.com>
Tue, 5 Sep 2017 08:42:53 +0000 (03:42 -0500)
committerYaakov Selkowitz <yselkowi@redhat.com>
Tue, 5 Sep 2017 08:42:53 +0000 (03:42 -0500)
1.2-cygwin-fvisibility.patch [deleted file]
1.4-cygwin-dispatch.patch [moved from 1.3-cygwin-dispatch.patch with 56% similarity]
1.4-cygwin-fvisibility.patch [new file with mode: 0644]
1.4-cygwin-tests.patch [moved from 1.2-cygwin-tests.patch with 79% similarity]
libepoxy.cygport

diff --git a/1.2-cygwin-fvisibility.patch b/1.2-cygwin-fvisibility.patch
deleted file mode 100644 (file)
index 3cfb69e..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
---- origsrc/libepoxy-1.2/configure.ac  2015-05-17 11:18:26.664510600 -0500
-+++ src/libepoxy-1.2/configure.ac      2015-05-17 10:19:03.389032100 -0500
-@@ -122,7 +122,7 @@ AC_CHECK_LIB([dl], [dlopen], [DLOPEN_LIB
- AC_SUBST([DLOPEN_LIBS])
- case $host_os in
--    mingw*)
-+    cygwin*|mingw*)
-         # visibility flags aren't supported for windows DLLs, and the
-         # compiler whines to tell you so, so don't set them up.
-         ;;
similarity index 56%
rename from 1.3-cygwin-dispatch.patch
rename to 1.4-cygwin-dispatch.patch
index 7fb19c4afb3121b7f5ea76c98e2f592b6d76e269..f66681750cf03bc6b0da6b6a430778ac3dbe2af6 100644 (file)
@@ -1,6 +1,6 @@
---- origsrc/libepoxy-1.3.1/src/dispatch_common.c       2015-07-15 18:46:36.000000000 -0500
-+++ src/libepoxy-1.3.1/src/dispatch_common.c   2015-11-05 21:12:21.760475300 -0600
-@@ -106,6 +106,8 @@
+--- origsrc/libepoxy-1.4.3/src/dispatch_common.c       2017-06-06 04:55:43.000000000 -0500
++++ src/libepoxy-1.4.3/src/dispatch_common.c   2017-09-04 16:21:21.088483700 -0500
+@@ -177,6 +177,8 @@
  #define GLX_LIB "/opt/X11/lib/libGL.1.dylib"
  #elif defined(ANDROID)
  #define GLX_LIB "libGLESv2.so"
@@ -9,14 +9,14 @@
  #else
  #define GLX_LIB "libGL.so.1"
  #endif
-@@ -114,6 +116,10 @@
+@@ -185,6 +187,10 @@
  #define EGL_LIB "libEGL.so"
  #define GLES1_LIB "libGLESv1_CM.so"
  #define GLES2_LIB "libGLESv2.so"
-+#elif defined(__CYGWIN__)
++#elif defined (__CYGWIN__)
 +#define EGL_LIB "cygEGL-1.dll"
 +#define GLES1_LIB "cygGLESv1_CM-1.dll"
 +#define GLES2_LIB "cygGLESv2-2.dll"
- #else
- #define EGL_LIB "libEGL.so.1"
- #define GLES1_LIB "libGLESv1_CM.so.1"
+ #elif defined _WIN32
+ #define EGL_LIB "libEGL.dll"
+ #define GLES1_LIB "libGLES_CM.dll"
diff --git a/1.4-cygwin-fvisibility.patch b/1.4-cygwin-fvisibility.patch
new file mode 100644 (file)
index 0000000..f2fcebc
--- /dev/null
@@ -0,0 +1,11 @@
+--- origsrc/libepoxy-1.4.3/configure.ac        2017-06-06 04:55:43.000000000 -0500
++++ src/libepoxy-1.4.3/configure.ac    2017-09-04 16:07:16.307127000 -0500
+@@ -181,7 +181,7 @@ AC_SUBST([DLOPEN_LIBS])
+ VISIBILITY_CFLAGS=""
+ AS_CASE(["$host"],
+-  [*-*-mingw*], [
++  [*-*-cygwin*|*-*-mingw*], [
+     dnl on mingw32 we do -fvisibility=hidden and __declspec(dllexport)
+     AC_DEFINE([EPOXY_PUBLIC],
+               [__attribute__((visibility("default"))) __declspec(dllexport) extern],
similarity index 79%
rename from 1.2-cygwin-tests.patch
rename to 1.4-cygwin-tests.patch
index 84d2294856a1b33f6f748419418c6a768388cea6..65f4d221dac9dc54b64bdf29d6fe3d4f9b7905b4 100644 (file)
@@ -1,5 +1,5 @@
---- origsrc/libepoxy-1.2/test/Makefile.am      2014-05-13 19:22:08.000000000 -0500
-+++ src/libepoxy-1.2/test/Makefile.am  2015-05-17 10:58:52.341890600 -0500
+--- origsrc/libepoxy-1.4.3/test/Makefile.am    2017-06-06 04:55:43.000000000 -0500
++++ src/libepoxy-1.4.3/test/Makefile.am        2017-09-04 16:11:15.676245700 -0500
 @@ -31,11 +31,13 @@ libegl_common_la_SOURCES = \
        egl_common.c \
        egl_common.h
@@ -14,7 +14,7 @@
  
  libwgl_common_la_SOURCES = \
        wgl_common.c \
-@@ -179,7 +181,7 @@ glx_static_LDFLAGS = -static
+@@ -189,7 +191,7 @@ glx_static_LDFLAGS = -static
  
  glx_shared_znow_SOURCES = glx_static.c
  glx_shared_znow_LDADD = $(DLOPEN_LIBS) $(EPOXY) libglx_common.la $(X11_LIBS)
@@ -23,8 +23,8 @@
  
  khronos_typedefs_SOURCES = \
        khronos_typedefs.c \
---- origsrc/libepoxy-1.2/test/dlwrap.c 2015-05-17 11:18:26.787526300 -0500
-+++ src/libepoxy-1.2/test/dlwrap.c     2015-05-17 11:04:59.051456800 -0500
+--- origsrc/libepoxy-1.4.3/test/dlwrap.c       2017-06-06 04:55:43.000000000 -0500
++++ src/libepoxy-1.4.3/test/dlwrap.c   2017-09-04 16:17:53.317025100 -0500
 @@ -41,6 +41,16 @@
  #include <stdlib.h>
  #include <string.h>
 +#include <sys/cygwin.h>
 +#ifdef __x86_64__
 +#define RTLD_NEXT (void *)0x180040000
-+#define DLSYM_ADDR (void *)0x1800529f0
++#define DLSYM_ADDR (void *)0x180119e56
 +#else
 +#define RTLD_NEXT (void *)0x61000000
-+#define DLSYM_ADDR (void *)0x61028180
++#define DLSYM_ADDR (void *)0x610dde20
 +#endif
 +#endif
  
  };
  
  /* Match 'filename' against an internal list of libraries for which
-@@ -131,7 +147,11 @@ __dlclose(void *handle)
+@@ -131,7 +147,7 @@ __dlclose(void *handle)
  
      if (wrap < wrapped_libs ||
          wrap >= wrapped_libs + ARRAY_SIZE(wrapped_libs)) {
-+#ifdef __CYGWIN__
+-        void (*real_dlclose)(void *handle) = dlwrap_real_dlsym(RTLD_NEXT, "__dlclose");
 +        void (*real_dlclose)(void *handle) = dlwrap_real_dlsym(RTLD_NEXT, "dlclose");
-+#else
-         void (*real_dlclose)(void *handle) = dlwrap_real_dlsym(RTLD_NEXT, "__dlclose");
-+#endif
          real_dlclose(handle);
      }
  }
-@@ -211,6 +231,9 @@ dlwrap_real_dlsym(void *handle, const ch
+@@ -211,6 +227,9 @@ dlwrap_real_dlsym(void *handle, const ch
      static fips_dlsym_t real_dlsym = NULL;
  
      if (!real_dlsym) {
 +#ifdef __CYGWIN__
-+      real_dlsym = (fips_dlsym_t) DLSYM_ADDR;
++        real_dlsym = (fips_dlsym_t) DLSYM_ADDR;
 +#else
          /* FIXME: This brute-force, hard-coded searching for a versioned
           * symbol is really ugly. The only reason I'm doing this is because
           * I need some way to lookup the "dlsym" function in libdl, but
-@@ -262,6 +285,7 @@ dlwrap_real_dlsym(void *handle, const ch
+@@ -266,6 +285,7 @@ dlwrap_real_dlsym(void *handle, const ch
  
              exit(1);
          }
@@ -88,7 +85,7 @@
      }
  
      return real_dlsym(handle, name);
-@@ -276,7 +300,7 @@ override_GL_glXGetProcAddress(const char
+@@ -280,7 +300,7 @@ override_GL_glXGetProcAddress(const char
      if (symbol)
          return symbol;
  
@@ -97,7 +94,7 @@
                         "glXGetProcAddress", (name));
  }
  
-@@ -289,7 +313,7 @@ override_GL_glXGetProcAddressARB(const c
+@@ -293,7 +313,7 @@ override_GL_glXGetProcAddressARB(const c
      if (symbol)
          return symbol;
  
                         "glXGetProcAddressARB", (name));
  }
  
-@@ -310,6 +334,17 @@ override_EGL_eglGetProcAddress(const cha
+@@ -314,6 +334,14 @@ override_EGL_eglGetProcAddress(const cha
              return symbol;
      }
  
  }
 +
 +#ifdef __CYGWIN__
-+
-+__attribute__((constructor))
-+void _init (void)
++__attribute__((constructor)) void _init (void)
 +{
-+  cygwin_internal (CW_HOOK, "dlopen", dlopen);
-+  cygwin_internal (CW_HOOK, "dlsym", dlsym);
++    cygwin_internal (CW_HOOK, "dlopen", dlopen);
++    cygwin_internal (CW_HOOK, "dlsym", dlsym);
 +}
-+
 +#endif
---- origsrc/libepoxy-1.2/test/egl_and_glx_different_pointers.c 2014-05-13 19:22:08.000000000 -0500
-+++ src/libepoxy-1.2/test/egl_and_glx_different_pointers.c     2015-05-17 11:09:31.307528900 -0500
+--- origsrc/libepoxy-1.4.3/test/egl_and_glx_different_pointers.c       2017-06-06 04:55:43.000000000 -0500
++++ src/libepoxy-1.4.3/test/egl_and_glx_different_pointers.c   2017-09-04 16:19:29.806822000 -0500
 @@ -49,6 +49,14 @@
  #include "glx_common.h"
  #include "dlwrap.h"
                         "glGetString", (e));
  }
  
---- origsrc/libepoxy-1.2/test/egl_without_glx.c        2015-05-17 11:18:26.802528200 -0500
-+++ src/libepoxy-1.2/test/egl_without_glx.c    2015-05-17 10:49:05.170329300 -0500
+--- origsrc/libepoxy-1.4.3/test/egl_without_glx.c      2017-06-06 04:55:43.000000000 -0500
++++ src/libepoxy-1.4.3/test/egl_without_glx.c  2017-09-04 16:19:10.966522700 -0500
 @@ -43,6 +43,20 @@
  
  #include "egl_common.h"
index 2762e80dd76ad6ea75402fa93a87e20421cb69b2..78015034ad306e8f37ce2536eea8d6322066b7ba 100644 (file)
@@ -1,5 +1,5 @@
 NAME="libepoxy"
-VERSION=1.3.1
+VERSION=1.4.3
 RELEASE=1
 CATEGORY="Libs"
 SUMMARY="OpenGL function dispatch library"
@@ -9,11 +9,11 @@ eglGetProcAddress(), etc. from the app developer, with very little knowledge
 needed on their part. They get to read GL specs and write code using undecorated
 function names like glCompileShader()."
 HOMEPAGE="https://github.com/anholt/libepoxy"
-SRC_URI="https://github.com/anholt/libepoxy/archive/v${VERSION}/libepoxy-v${VERSION}.tar.gz"
+SRC_URI="https://github.com/anholt/libepoxy/archive/${VERSION}/libepoxy-${VERSION}.tar.gz"
 PATCH_URI="
-       1.3-cygwin-dispatch.patch
-       1.2-cygwin-fvisibility.patch
-       1.2-cygwin-tests.patch
+       1.4-cygwin-dispatch.patch
+       1.4-cygwin-fvisibility.patch
+       1.4-cygwin-tests.patch
 "
 
 PKG_NAMES="libepoxy0 libepoxy-devel"
This page took 0.031523 seconds and 5 git commands to generate.