diff options
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-graphics/libepoxy')
| -rw-r--r-- | import-layers/yocto-poky/meta/recipes-graphics/libepoxy/libepoxy/Add-fallback-definition-for-EGL-CAST.patch | 33 | ||||
| -rw-r--r-- | import-layers/yocto-poky/meta/recipes-graphics/libepoxy/libepoxy/no-tests.patch | 33 | ||||
| -rw-r--r-- | import-layers/yocto-poky/meta/recipes-graphics/libepoxy/libepoxy_1.5.0.bb (renamed from import-layers/yocto-poky/meta/recipes-graphics/libepoxy/libepoxy_1.4.3.bb) | 17 |
3 files changed, 42 insertions, 41 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/libepoxy/libepoxy/Add-fallback-definition-for-EGL-CAST.patch b/import-layers/yocto-poky/meta/recipes-graphics/libepoxy/libepoxy/Add-fallback-definition-for-EGL-CAST.patch deleted file mode 100644 index b9297257d..000000000 --- a/import-layers/yocto-poky/meta/recipes-graphics/libepoxy/libepoxy/Add-fallback-definition-for-EGL-CAST.patch +++ /dev/null @@ -1,33 +0,0 @@ -Add fallback definition for EGL_CAST - -The EGL API update from d11104f introduced a dependency on the -EGL_CAST() macro, provided by an updated eglplatform.h. Given that we -don't provide eglplatform.h, add a fallback definition for if we're -building against Mesa 17.0.x or similar. - -https://bugs.gentoo.org/show_bug.cgi?id=623926 - -Upstream-Status: Backport [https://github.com/anholt/libepoxy/commit/ebe3a53db1c0bb34e1ca963b95d1f222115f93f8] - -Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com> - -Index: libepoxy-1.4.3/src/gen_dispatch.py -=================================================================== ---- libepoxy-1.4.3.orig/src/gen_dispatch.py 2017-06-06 04:24:13.000000000 -0500 -+++ libepoxy-1.4.3/src/gen_dispatch.py 2017-11-06 12:45:43.594966473 -0600 -@@ -491,6 +491,15 @@ - self.outln('#include "epoxy/gl.h"') - if self.target == "egl": - self.outln('#include "EGL/eglplatform.h"') -+ # Account for older eglplatform.h, which doesn't define -+ # the EGL_CAST macro. -+ self.outln('#ifndef EGL_CAST') -+ self.outln('#if defined(__cplusplus)') -+ self.outln('#define EGL_CAST(type, value) (static_cast<type>(value))') -+ self.outln('#else') -+ self.outln('#define EGL_CAST(type, value) ((type) (value))') -+ self.outln('#endif') -+ self.outln('#endif') - else: - # Add some ridiculous inttypes.h redefinitions that are - # from khrplatform.h and not included in the XML. We diff --git a/import-layers/yocto-poky/meta/recipes-graphics/libepoxy/libepoxy/no-tests.patch b/import-layers/yocto-poky/meta/recipes-graphics/libepoxy/libepoxy/no-tests.patch new file mode 100644 index 000000000..d2b6c1a25 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-graphics/libepoxy/libepoxy/no-tests.patch @@ -0,0 +1,33 @@ +Add option to disable tests. + +Upstream-Status: Submitted (https://github.com/anholt/libepoxy/pull/158) +Signed-off-by: Ross Burton <ross.burton@intel.com> + +diff --git a/meson.build b/meson.build +index b2ebaef..9632c7a 100644 +--- a/meson.build ++++ b/meson.build +@@ -242,7 +242,10 @@ libepoxy_inc = [ + + subdir('include/epoxy') + subdir('src') +-subdir('test') ++ ++if get_option('tests') ++ subdir('test') ++endif + + if get_option('docs') + doxygen = find_program('doxygen', required: false) +diff --git a/meson_options.txt b/meson_options.txt +index b5d7c98..dc30e68 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -15,3 +15,7 @@ option('x11', + type: 'boolean', + value: true, + description: 'Enable X11 support (GLX or EGL-X11)') ++option('tests', ++ type: 'boolean', ++ value: true, ++ description: 'Build the test suite') diff --git a/import-layers/yocto-poky/meta/recipes-graphics/libepoxy/libepoxy_1.4.3.bb b/import-layers/yocto-poky/meta/recipes-graphics/libepoxy/libepoxy_1.5.0.bb index 0172322b9..5ca0868c2 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/libepoxy/libepoxy_1.4.3.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/libepoxy/libepoxy_1.5.0.bb @@ -6,17 +6,18 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=58ef4c80d401e07bd9ee8b6b58cf464b" SRC_URI = "https://github.com/anholt/${BPN}/releases/download/${PV}/${BP}.tar.xz \ - file://Add-fallback-definition-for-EGL-CAST.patch" -SRC_URI[md5sum] = "af4c3ce0fb1143bdc4e43f85695a9bed" -SRC_URI[sha256sum] = "0b808a06c9685a62fca34b680abb8bc7fb2fda074478e329b063c1f872b826f6" + file://no-tests.patch \ + " +SRC_URI[md5sum] = "63fe3847789258254dcd7e3fdb9e7f5e" +SRC_URI[sha256sum] = "4c94995398a6ebf691600dda2e9685a0cac261414175c2adf4645cdfab42a5d5" UPSTREAM_CHECK_URI = "https://github.com/anholt/libepoxy/releases" -inherit autotools pkgconfig distro_features_check +inherit meson pkgconfig distro_features_check REQUIRED_DISTRO_FEATURES = "opengl" -DEPENDS = "util-macros" - -PACKAGECONFIG[egl] = "--enable-egl, --disable-egl, virtual/egl" -PACKAGECONFIG[x11] = "--enable-glx, --disable-glx, virtual/libx11" +PACKAGECONFIG[egl] = "-Degl=yes, -Degl=no, virtual/egl" +PACKAGECONFIG[x11] = "-Dglx=yes, -Dglx=no, virtual/libx11 virtual/libgl" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)} egl" + +EXTRA_OEMESON += "-Dtests=false" |
