libepoxy: rework dependencies/patches and add x11 PACKAGECONFIG
dependencies taken from oe-core Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
This commit is contained in:
Andreas Müller
@@ -1,46 +0,0 @@
|
||||
From 3f93930dc8acf938a6dc4907a082da71e3a31569 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Thu, 29 Jan 2015 13:22:58 +0100
|
||||
Subject: [PATCH 1/2] configure.ac: don't rely on Xorg.macros
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
---
|
||||
configure.ac | 12 ------------
|
||||
1 file changed, 12 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index a52fc58..d24d4a9 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -31,15 +31,6 @@ AC_CONFIG_HEADERS([config.h])
|
||||
# Initialize Automake
|
||||
AM_INIT_AUTOMAKE([foreign dist-bzip2 subdir-objects])
|
||||
|
||||
-# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
|
||||
-m4_ifndef([XORG_MACROS_VERSION],
|
||||
- [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen.
|
||||
- Hint: either install from source, git://anongit.freedesktop.org/xorg/util/macros or,
|
||||
- depending on you distribution, try package 'xutils-dev' or 'xorg-x11-util-macros'])])
|
||||
-
|
||||
-XORG_MACROS_VERSION(1.8)
|
||||
-XORG_DEFAULT_OPTIONS
|
||||
-
|
||||
AC_CHECK_PROGS([PYTHON], [python3 python2 python])
|
||||
|
||||
# Initialize libtool
|
||||
@@ -54,9 +45,6 @@ AC_CHECK_HEADER([KHR/khrplatform.h],
|
||||
)]
|
||||
)
|
||||
|
||||
-# OS X defaults to having -Wint-conversion ("warn when passing
|
||||
-# uintptr_t to a void *") by default. Kill that.
|
||||
-XORG_TESTSET_CFLAG(CWARNFLAGS, [-Wno-int-conversion])
|
||||
|
||||
has_znow=yes
|
||||
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
@@ -1,36 +1,34 @@
|
||||
From a1d0f9eae290432de4762c29d22183c524579c57 Mon Sep 17 00:00:00 2001
|
||||
From 3a93150bc0aec86afdb7d053247dc2448925e09a Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Thu, 29 Jan 2015 13:35:57 +0100
|
||||
Subject: [PATCH 2/2] take configuration into consideration when selecting
|
||||
supported platforms
|
||||
Date: Wed, 6 May 2015 10:45:22 +0200
|
||||
Subject: [PATCH 1/2] select platforms based on configuration results
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
doing so we can build properly on X11-less wayland environments
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
---
|
||||
configure.ac | 14 ++++++--------
|
||||
configure.ac | 13 +++++--------
|
||||
src/dispatch_common.c | 9 ++++++---
|
||||
src/dispatch_common.h | 9 +++++----
|
||||
2 files changed, 11 insertions(+), 12 deletions(-)
|
||||
3 files changed, 16 insertions(+), 15 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index d24d4a9..74dba1a 100644
|
||||
index a52fc58..bdd70da 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -45,6 +45,10 @@ AC_CHECK_HEADER([KHR/khrplatform.h],
|
||||
)]
|
||||
)
|
||||
@@ -58,6 +58,10 @@ AC_CHECK_HEADER([KHR/khrplatform.h],
|
||||
# uintptr_t to a void *") by default. Kill that.
|
||||
XORG_TESTSET_CFLAG(CWARNFLAGS, [-Wno-int-conversion])
|
||||
|
||||
+PKG_CHECK_MODULES(X11, [x11], [x11=yes], [x11=no])
|
||||
+
|
||||
+AM_CONDITIONAL(HAVE_X11, test x$x11 = xyes)
|
||||
+
|
||||
|
||||
has_znow=yes
|
||||
|
||||
@@ -74,7 +78,7 @@ case $host_os in
|
||||
case $host_os in
|
||||
@@ -86,7 +90,7 @@ case $host_os in
|
||||
;;
|
||||
*)
|
||||
build_egl=yes
|
||||
@@ -39,7 +37,7 @@ index d24d4a9..74dba1a 100644
|
||||
build_wgl=no
|
||||
# On platforms with dlopen, we load everything dynamically and
|
||||
# don't link against a specific window system or GL implementation.
|
||||
@@ -132,13 +136,6 @@ esac
|
||||
@@ -144,13 +148,6 @@ esac
|
||||
|
||||
AC_SUBST([VISIBILITY_CFLAGS])
|
||||
|
||||
@@ -53,14 +51,38 @@ index d24d4a9..74dba1a 100644
|
||||
PKG_CHECK_MODULES(GL, [gl], [gl=yes], [gl=no])
|
||||
|
||||
AC_CONFIG_FILES([
|
||||
@@ -150,6 +147,7 @@ AC_CONFIG_FILES([
|
||||
])
|
||||
AC_OUTPUT
|
||||
diff --git a/src/dispatch_common.c b/src/dispatch_common.c
|
||||
index 4e34d6e..2ab84ed 100644
|
||||
--- a/src/dispatch_common.c
|
||||
+++ b/src/dispatch_common.c
|
||||
@@ -615,10 +615,13 @@ epoxy_get_proc_address(const char *name)
|
||||
#elif defined(__APPLE__)
|
||||
return epoxy_gl_dlsym(name);
|
||||
#else
|
||||
+#if PLATFORM_HAS_GLX
|
||||
if (epoxy_current_context_is_glx()) {
|
||||
return glXGetProcAddressARB((const GLubyte *)name);
|
||||
- } else {
|
||||
+ } else
|
||||
+#endif /* PLATFORM_HAS_GLX */
|
||||
#if PLATFORM_HAS_EGL
|
||||
+ {
|
||||
GLenum egl_api = epoxy_egl_get_current_gl_context_api();
|
||||
|
||||
+echo " X11: $x11"
|
||||
echo " EGL: $build_egl"
|
||||
echo " GLX: $build_glx"
|
||||
echo " WGL: $build_wgl"
|
||||
switch (egl_api) {
|
||||
@@ -628,10 +631,10 @@ epoxy_get_proc_address(const char *name)
|
||||
case EGL_NONE:
|
||||
break;
|
||||
}
|
||||
-#endif
|
||||
}
|
||||
+#endif /* PLATFORM_HAS_EGL */
|
||||
errx(1, "Couldn't find current GLX or EGL context.\n");
|
||||
-#endif
|
||||
+#endif /* _WIN32 | __APPLE__*/
|
||||
}
|
||||
|
||||
void
|
||||
diff --git a/src/dispatch_common.h b/src/dispatch_common.h
|
||||
index 6b8503a..82681e4 100644
|
||||
--- a/src/dispatch_common.h
|
||||
@@ -98,5 +120,5 @@ index 6b8503a..82681e4 100644
|
||||
#define EPOXY_IMPORTEXPORT
|
||||
#endif
|
||||
--
|
||||
1.8.3.1
|
||||
1.9.3
|
||||
|
||||
@@ -0,0 +1,38 @@
|
||||
From 24868cbfb9dda5f6929dd277c47d35df016e8754 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Wed, 6 May 2015 11:05:48 +0200
|
||||
Subject: [PATCH 2/2] add an option to disable glx support
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
this option would help us in yocto to get deterministic build results
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
---
|
||||
configure.ac | 9 ++++++++-
|
||||
1 file changed, 8 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index bdd70da..6c7153d 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -58,7 +58,14 @@ AC_CHECK_HEADER([KHR/khrplatform.h],
|
||||
# uintptr_t to a void *") by default. Kill that.
|
||||
XORG_TESTSET_CFLAG(CWARNFLAGS, [-Wno-int-conversion])
|
||||
|
||||
-PKG_CHECK_MODULES(X11, [x11], [x11=yes], [x11=no])
|
||||
+AC_ARG_ENABLE([glx],
|
||||
+ [AS_HELP_STRING([--disable-glx],
|
||||
+ [disable if you don't want x11/glx support])],
|
||||
+ [],
|
||||
+ [enable_glx=yes]
|
||||
+ )
|
||||
+
|
||||
+PKG_CHECK_MODULES(X11, [x11], [x11=$enable_glx], [x11=no])
|
||||
|
||||
AM_CONDITIONAL(HAVE_X11, test x$x11 = xyes)
|
||||
|
||||
--
|
||||
1.9.3
|
||||
|
||||
@@ -1,17 +1,24 @@
|
||||
SUMMARY = "Epoxy is a library for handling OpenGL function pointer management"
|
||||
SUMMARY = "OpenGL function pointer management library"
|
||||
HOMEPAGE = "<http://github.com/anholt/libepoxy"
|
||||
SECTION = "libs"
|
||||
|
||||
LICENSE = "MIT"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=58ef4c80d401e07bd9ee8b6b58cf464b"
|
||||
|
||||
|
||||
SRC_URI = " \
|
||||
git://github.com/anholt/libepoxy.git;protocol=git;branch=master \
|
||||
file://0001-configure.ac-don-t-rely-on-Xorg.macros.patch \
|
||||
file://0002-take-configuration-into-consideration-when-selecting.patch \
|
||||
git://github.com/anholt/libepoxy.git \
|
||||
file://0001-select-platforms-based-on-configuration-results.patch \
|
||||
file://0002-add-an-option-to-disable-glx-support.patch \
|
||||
"
|
||||
SRCREV = "20062c25e7612cab023cdef44d3277ba1bd0b2de"
|
||||
PV = "1.2+git${SRCPV}"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
inherit autotools pkgconfig pythonnative
|
||||
inherit autotools pkgconfig
|
||||
|
||||
DEPENDS = "virtual/egl ${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/xserver", "", d)}"
|
||||
DEPENDS = "util-macros virtual/egl"
|
||||
|
||||
PACKAGECONFIG[x11] = "--enable-glx, --disable-glx, virtual/libx11"
|
||||
PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
|
||||
|
||||
Reference in New Issue
Block a user