diff --git a/.gitignore b/.gitignore index 8fb73b7..3e3d469 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/v1.2.tar.gz +SOURCES/v1.3.1.tar.gz diff --git a/.libepoxy.metadata b/.libepoxy.metadata index f38b081..2c01ee8 100644 --- a/.libepoxy.metadata +++ b/.libepoxy.metadata @@ -1 +1 @@ -e700520711b9e4fa07c286aa36e431d8ad4133f5 SOURCES/v1.2.tar.gz +94d98d83a50d2f607ee9986b622a48df00d5926c SOURCES/v1.3.1.tar.gz diff --git a/SOURCES/0001-Fix-ppc64le-and-arm64.patch b/SOURCES/0001-Fix-ppc64le-and-arm64.patch new file mode 100644 index 0000000..e069baf --- /dev/null +++ b/SOURCES/0001-Fix-ppc64le-and-arm64.patch @@ -0,0 +1,24 @@ +From 50d865007906b79e4ba0e5dd717136f17de3713a Mon Sep 17 00:00:00 2001 +From: Adam Jackson +Date: Fri, 27 Jan 2017 13:38:37 -0500 +Subject: [PATCH] Fix ppc64le and arm64 + +--- + test/dlwrap.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/test/dlwrap.c b/test/dlwrap.c +index 9d1add5..5cda6b9 100644 +--- a/test/dlwrap.c ++++ b/test/dlwrap.c +@@ -232,6 +232,7 @@ dlwrap_real_dlsym(void *handle, const char *name) + * In the meantime, I'll just keep augmenting this + * hard-coded version list as people report bugs. */ + const char *version[] = { ++ "GLIBC_2.17", + "GLIBC_2.3", + "GLIBC_2.2.5", + "GLIBC_2.2", +-- +2.9.3 + diff --git a/SOURCES/0001-Use-the-EGL-pkgconfig-for-finding-eglplatform.h.patch b/SOURCES/0001-Use-the-EGL-pkgconfig-for-finding-eglplatform.h.patch deleted file mode 100644 index 812da6f..0000000 --- a/SOURCES/0001-Use-the-EGL-pkgconfig-for-finding-eglplatform.h.patch +++ /dev/null @@ -1,57 +0,0 @@ -From d56f21c494b315306215c4730835a9b291360e9b Mon Sep 17 00:00:00 2001 -From: Eric Anholt -Date: Fri, 13 Jun 2014 14:59:37 -0700 -Subject: [PATCH 1/3] Use the EGL pkgconfig for finding eglplatform.h. - -We don't ever explicity link against libEGL, so no need to make use of -EGL_LIBS. - -Fixes #30. ---- - configure.ac | 1 + - src/Makefile.am | 1 + - test/Makefile.am | 4 +++- - 3 files changed, 5 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 399e351..f97c9b0 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -98,6 +98,7 @@ AC_SUBST(EPOXY_LINK_LIBS) - - AM_CONDITIONAL(BUILD_EGL, test x$build_egl = xyes) - if test x$build_egl = xyes; then -+ PKG_CHECK_MODULES(EGL, [egl]) - AC_DEFINE([BUILD_EGL], [1], [build EGL tests]) - fi - -diff --git a/src/Makefile.am b/src/Makefile.am -index 8e20cd6..49c3507 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -28,6 +28,7 @@ AM_CFLAGS = \ - $(CWARNFLAGS) \ - $(VISIBILITY_CFLAGS) \ - $(X11_CFLAGS) \ -+ $(EGL_CFLAGS) \ - $() - - epoxyincludedir = $(includedir)/epoxy -diff --git a/test/Makefile.am b/test/Makefile.am -index ffb330e..f29baca 100644 ---- a/test/Makefile.am -+++ b/test/Makefile.am -@@ -46,7 +46,9 @@ libwgl_common_la_LIBADD = $(EPOXY) - AM_CPPFLAGS = \ - -I$(top_srcdir)/include \ - -I$(top_builddir)/include \ -- $(X11_CFLAGS) -+ $(X11_CFLAGS) \ -+ $(EGL_CFLAGS) \ -+ $() - - AM_CFLAGS = $(CWARNFLAGS) - --- -1.9.3 - diff --git a/SOURCES/0001-test-Fix-dlwrap-on-ppc64-and-s390x.patch b/SOURCES/0001-test-Fix-dlwrap-on-ppc64-and-s390x.patch new file mode 100644 index 0000000..dfd7c27 --- /dev/null +++ b/SOURCES/0001-test-Fix-dlwrap-on-ppc64-and-s390x.patch @@ -0,0 +1,29 @@ +From ce5afcca4648b34e2ce9f7804a5444f81d94e07d Mon Sep 17 00:00:00 2001 +From: Adam Jackson +Date: Thu, 5 Nov 2015 10:26:03 -0500 +Subject: [PATCH] test: Fix dlwrap on ppc64 and s390x + +These have dlsym versions of GLIBC_2.3 and GLIBC_2.2, respectively. + +Signed-off-by: Adam Jackson +--- + test/dlwrap.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/test/dlwrap.c b/test/dlwrap.c +index b104da4..9d1add5 100644 +--- a/test/dlwrap.c ++++ b/test/dlwrap.c +@@ -232,7 +232,9 @@ dlwrap_real_dlsym(void *handle, const char *name) + * In the meantime, I'll just keep augmenting this + * hard-coded version list as people report bugs. */ + const char *version[] = { ++ "GLIBC_2.3", + "GLIBC_2.2.5", ++ "GLIBC_2.2", + "GLIBC_2.0" + }; + int num_versions = sizeof(version) / sizeof(version[0]); +-- +2.9.3 + diff --git a/SOURCES/0002-Fix-context-type-detection-if-we-find-eglGetCurrentC.patch b/SOURCES/0002-Fix-context-type-detection-if-we-find-eglGetCurrentC.patch deleted file mode 100644 index 996a71b..0000000 --- a/SOURCES/0002-Fix-context-type-detection-if-we-find-eglGetCurrentC.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 0096b79923f4a2b73b004f679d48ef110936a459 Mon Sep 17 00:00:00 2001 -From: Eric Anholt -Date: Fri, 13 Jun 2014 15:00:31 -0700 -Subject: [PATCH 2/3] Fix context type detection if we find - eglGetCurrentContext(). - -Fixes #29. ---- - src/dispatch_common.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/dispatch_common.c b/src/dispatch_common.c -index b36b639..4e34d6e 100644 ---- a/src/dispatch_common.c -+++ b/src/dispatch_common.c -@@ -378,7 +378,7 @@ epoxy_current_context_is_glx(void) - sym = dlsym(NULL, "eglGetCurrentContext"); - if (sym) { - if (epoxy_egl_get_current_gl_context_api() != EGL_NONE) -- return true; -+ return false; - } else { - (void)dlerror(); - } --- -1.9.3 - diff --git a/SOURCES/0003-Avoid-name-conflicts-between-pkgconfig-s-EGL_LIBS-an.patch b/SOURCES/0003-Avoid-name-conflicts-between-pkgconfig-s-EGL_LIBS-an.patch deleted file mode 100644 index c7bb50c..0000000 --- a/SOURCES/0003-Avoid-name-conflicts-between-pkgconfig-s-EGL_LIBS-an.patch +++ /dev/null @@ -1,60 +0,0 @@ -From b2ae054b3aa0d6796b6936c7a89b8cce7cefe7ba Mon Sep 17 00:00:00 2001 -From: Eric Anholt -Date: Fri, 13 Jun 2014 15:54:29 -0700 -Subject: [PATCH 3/3] Avoid name conflicts between pkgconfig's EGL_LIBS and a - temporary var. - -I felt a little uncomfortable knowing I had two things defining -EGL_LIBS, but it worked on my system. It failed on the travis ci -build. ---- - test/Makefile.am | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/test/Makefile.am b/test/Makefile.am -index f29baca..1892b17 100644 ---- a/test/Makefile.am -+++ b/test/Makefile.am -@@ -22,9 +22,9 @@ - EPOXY = $(builddir)/../src/libepoxy.la - - check_LTLIBRARIES = \ -- $(EGL_LIBS) \ -- $(GLX_LIBS) \ -- $(WGL_LIBS) \ -+ $(EGL_UTIL_LIB) \ -+ $(GLX_UTIL_LIB) \ -+ $(WGL_UTIL_LIB) \ - $() - - libegl_common_la_SOURCES = \ -@@ -78,7 +78,7 @@ EGL_TESTS = \ - egl_gles2_without_glx \ - $() - --EGL_LIBS = libegl_common.la -+EGL_UTIL_LIB = libegl_common.la - endif - - if BUILD_GLX -@@ -116,7 +116,7 @@ GLX_TESTS = \ - $(GLX_NON_APPLE_TESTS) \ - $() - --GLX_LIBS = libglx_common.la -+GLX_UTIL_LIB = libglx_common.la - endif - - if BUILD_WGL -@@ -127,7 +127,7 @@ WGL_TESTS = \ - wgl_usefontbitmaps_unicode$(EXEEXT) \ - $() - --WGL_LIBS = libwgl_common.la -+WGL_UTIL_LIB = libwgl_common.la - endif - - egl_has_extension_nocontext_LDADD = $(EPOXY) libegl_common.la $(X11_LIBS) --- -1.9.3 - diff --git a/SPECS/libepoxy.spec b/SPECS/libepoxy.spec index 268457e..3acf2b1 100644 --- a/SPECS/libepoxy.spec +++ b/SPECS/libepoxy.spec @@ -5,13 +5,16 @@ Summary: epoxy runtime library Name: libepoxy -Version: 1.2 -Release: 2%{?dist} +Version: 1.3.1 +Release: 1%{?dist} License: MIT URL: http://github.com/anholt/libepoxy # github url - generated archive #ource0: https://github.com/anholt/libepoxy/archive/%{commit}/%{name}-%{commit}.tar.gz -Source0: https://github.com/anholt/libepoxy/archive/%{commit}/v%{version}.tar.gz +Source0: https://github.com/anholt/libepoxy/archive/v%{version}/v%{version}.tar.gz + +Patch0: 0001-test-Fix-dlwrap-on-ppc64-and-s390x.patch +Patch1: 0001-Fix-ppc64le-and-arm64.patch BuildRequires: automake autoconf libtool BuildRequires: mesa-libGL-devel @@ -20,10 +23,6 @@ BuildRequires: mesa-libGLES-devel BuildRequires: xorg-x11-util-macros BuildRequires: python -Patch1: 0001-Use-the-EGL-pkgconfig-for-finding-eglplatform.h.patch -Patch2: 0002-Fix-context-type-detection-if-we-find-eglGetCurrentC.patch -Patch3: 0003-Avoid-name-conflicts-between-pkgconfig-s-EGL_LIBS-an.patch - %description A library for handling OpenGL function pointer management. @@ -37,9 +36,8 @@ developing applications that use %{name}. %prep %setup -q +%patch0 -p1 %patch1 -p1 -%patch2 -p1 -%patch3 -p1 %build autoreconf -vif || exit 1 @@ -55,11 +53,7 @@ find $RPM_BUILD_ROOT -type f -name '*.la' -delete -print %check # In theory this is fixed in 1.2 but we still see errors on most platforms # https://github.com/anholt/libepoxy/issues/24 -%ifnarch %{arm} aarch64 %{power64} s390x -make check -%else -make check ||: -%endif +make check # || ( cat test/test-suite.log ; objdump -T %{_libdir}/libdl.so.? ) %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -76,6 +70,9 @@ make check ||: %{_libdir}/pkgconfig/epoxy.pc %changelog +* Fri Jan 27 2017 Adam Jackson - 1.3.1-1 +- libepoxy 1.3.1 + * Wed Mar 25 2015 Adam Jackson 1.2-2 - Fix description to not talk about DRM - Sync some small bugfixes from git