libepoxy 1.3.1
authorYaakov Selkowitz <yselkowi@redhat.com>
Tue, 12 Jul 2016 18:31:46 +0000 (13:31 -0500)
committerYaakov Selkowitz <yselkowi@redhat.com>
Tue, 12 Jul 2016 18:31:46 +0000 (13:31 -0500)
1.2-cygwin-dispatch.patch [deleted file]
1.2-cygwin-tests.patch
1.3-cygwin-dispatch.patch [new file with mode: 0644]
libepoxy.cygport

diff --git a/1.2-cygwin-dispatch.patch b/1.2-cygwin-dispatch.patch
deleted file mode 100644 (file)
index 02332b3..0000000
+++ /dev/null
@@ -1,82 +0,0 @@
---- origsrc/libepoxy-1.2/src/dispatch_common.c 2015-05-17 11:18:26.738020000 -0500
-+++ src/libepoxy-1.2/src/dispatch_common.c     2015-05-17 10:39:30.933410400 -0500
-@@ -104,8 +104,16 @@
- #ifdef __APPLE__
- #define GLX_LIB "/opt/X11/lib/libGL.1.dylib"
-+#elif defined __CYGWIN__
-+#define GLX_LIB "cygGL-1.dll"
-+#define EGL_LIB "cygEGL-1.dll"
-+#define ES1_LIB "cygGLESv1_CM-1.dll"
-+#define ES2_LIB "cygGLESv2-2.dll"
- #else
- #define GLX_LIB "libGL.so.1"
-+#define EGL_LIB "libEGL.so.1"
-+#define ES1_LIB "libGLESv1_CM.so.1"
-+#define ES2_LIB "libGLESv2.so.2"
- #endif
- struct api {
-@@ -380,7 +388,7 @@ epoxy_current_context_is_glx(void)
-         return true;
- #if PLATFORM_HAS_EGL
--    sym = do_dlsym(&api.egl_handle, "libEGL.so.1", "eglGetCurrentContext",
-+    sym = do_dlsym(&api.egl_handle, EGL_LIB, "eglGetCurrentContext",
-                    false);
-     if (sym && epoxy_egl_get_current_gl_context_api() != EGL_NONE)
-         return false;
-@@ -416,7 +424,7 @@ epoxy_conservative_has_gl_extension(cons
- void *
- epoxy_egl_dlsym(const char *name)
- {
--    return do_dlsym(&api.egl_handle, "libEGL.so.1", name, true);
-+    return do_dlsym(&api.egl_handle, EGL_LIB, name, true);
- }
- void *
-@@ -446,7 +454,7 @@ epoxy_gles1_dlsym(const char *name)
-     if (epoxy_current_context_is_glx()) {
-         return epoxy_get_proc_address(name);
-     } else {
--        return do_dlsym(&api.gles1_handle, "libGLESv1_CM.so.1", name, true);
-+        return do_dlsym(&api.gles1_handle, ES1_LIB, name, true);
-     }
- }
-@@ -456,7 +464,7 @@ epoxy_gles2_dlsym(const char *name)
-     if (epoxy_current_context_is_glx()) {
-         return epoxy_get_proc_address(name);
-     } else {
--        return do_dlsym(&api.gles2_handle, "libGLESv2.so.2", name, true);
-+        return do_dlsym(&api.gles2_handle, ES2_LIB, name, true);
-     }
- }
-@@ -476,7 +484,7 @@ epoxy_gles3_dlsym(const char *name)
-     if (epoxy_current_context_is_glx()) {
-         return epoxy_get_proc_address(name);
-     } else {
--        void *func = do_dlsym(&api.gles2_handle, "libGLESv2.so.2", name, false);
-+        void *func = do_dlsym(&api.gles2_handle, ES2_LIB, name, false);
-         if (func)
-             return func;
-@@ -564,7 +572,7 @@ epoxy_get_bootstrap_proc_address(const c
-      * non-X11 ES2 context from loading a bunch of X11 junk).
-      */
- #if PLATFORM_HAS_EGL
--    get_dlopen_handle(&api.egl_handle, "libEGL.so.1", false);
-+    get_dlopen_handle(&api.egl_handle, EGL_LIB, false);
-     if (api.egl_handle) {
-         switch (epoxy_egl_get_current_gl_context_api()) {
-         case EGL_OPENGL_API:
-@@ -575,7 +583,7 @@ epoxy_get_bootstrap_proc_address(const c
-              * us.  Try the GLES2 implementation first, and fall back
-              * to GLES1 otherwise.
-              */
--            get_dlopen_handle(&api.gles2_handle, "libGLESv2.so.2", false);
-+            get_dlopen_handle(&api.gles2_handle, ES2_LIB, false);
-             if (api.gles2_handle)
-                 return epoxy_gles2_dlsym(name);
-             else
index 34e69be86c0104497d30e2c6e6ec20bf870ca5e7..84d2294856a1b33f6f748419418c6a768388cea6 100644 (file)
@@ -18,8 +18,8 @@
  
  glx_shared_znow_SOURCES = glx_static.c
  glx_shared_znow_LDADD = $(DLOPEN_LIBS) $(EPOXY) libglx_common.la $(X11_LIBS)
--glx_shared_znow_LDFLAGS = -now
-+#glx_shared_znow_LDFLAGS = -now
+-glx_shared_znow_LDFLAGS = -Wl,-z,now
++#glx_shared_znow_LDFLAGS = -Wl,-z,now
  
  khronos_typedefs_SOURCES = \
        khronos_typedefs.c \
 +#include <sys/cygwin.h>
 +#ifdef __x86_64__
 +#define RTLD_NEXT (void *)0x180040000
-+#define DLSYM_ADDR (void *)0x1801246c1
++#define DLSYM_ADDR (void *)0x1800529f0
 +#else
 +#define RTLD_NEXT (void *)0x61000000
-+#define DLSYM_ADDR (void *)0x610e992c
++#define DLSYM_ADDR (void *)0x61028180
 +#endif
 +#endif
  
diff --git a/1.3-cygwin-dispatch.patch b/1.3-cygwin-dispatch.patch
new file mode 100644 (file)
index 0000000..7fb19c4
--- /dev/null
@@ -0,0 +1,22 @@
+--- 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 @@
+ #define GLX_LIB "/opt/X11/lib/libGL.1.dylib"
+ #elif defined(ANDROID)
+ #define GLX_LIB "libGLESv2.so"
++#elif defined(__CYGWIN__)
++#define GLX_LIB "cygGL-1.dll"
+ #else
+ #define GLX_LIB "libGL.so.1"
+ #endif
+@@ -114,6 +116,10 @@
+ #define EGL_LIB "libEGL.so"
+ #define GLES1_LIB "libGLESv1_CM.so"
+ #define GLES2_LIB "libGLESv2.so"
++#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"
index 01af7e935d0b2a7ace16e57c494fb25643b4d5ef..2762e80dd76ad6ea75402fa93a87e20421cb69b2 100644 (file)
@@ -1,5 +1,5 @@
 NAME="libepoxy"
-VERSION=1.2
+VERSION=1.3.1
 RELEASE=1
 CATEGORY="Libs"
 SUMMARY="OpenGL function dispatch library"
@@ -11,11 +11,7 @@ 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"
 PATCH_URI="
-       http://pkgs.fedoraproject.org/cgit/libepoxy.git/plain/0001-Use-the-EGL-pkgconfig-for-finding-eglplatform.h.patch
-       http://pkgs.fedoraproject.org/cgit/libepoxy.git/plain/0002-Fix-context-type-detection-if-we-find-eglGetCurrentC.patch
-       http://pkgs.fedoraproject.org/cgit/libepoxy.git/plain/0003-Avoid-name-conflicts-between-pkgconfig-s-EGL_LIBS-an.patch
-       http://pkgs.fedoraproject.org/cgit/libepoxy.git/plain/update-registry.patch
-       1.2-cygwin-dispatch.patch
+       1.3-cygwin-dispatch.patch
        1.2-cygwin-fvisibility.patch
        1.2-cygwin-tests.patch
 "
This page took 0.027086 seconds and 5 git commands to generate.