diff options
author | Andreas Müller <schnitzeltony@gmail.com> | 2021-05-24 00:33:47 +0200 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2021-05-24 07:39:35 -0700 |
commit | 08a6ca528311bab9c246977f626577565adf170c (patch) | |
tree | 762404254fbae0ef20d91896821eaaaa12e56c51 /meta-oe/recipes-support/fltk/fltk.bb | |
parent | 6c596c4acc1d2b8a2d1f87bec915260f882f1be2 (diff) | |
download | meta-openembedded-08a6ca528311bab9c246977f626577565adf170c.tar.gz |
fltk: upgrade 1.3.5 -> 1.3.6
* DOPTION_BUILD_EXAMPLES was deprecated in favor of FLTK_BUILD_TEST
* FLTK_BUILD_TEST fails for native due to reduced build
* FLTK_BUILD_TEST fails for cross due ti trying to run cross fluid
* Patches: 0002.. adjust / 0003.. upstream has acknowledged it a bad ides so
change was commented out / 0004.. upstreamed
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/fltk/fltk.bb')
-rw-r--r-- | meta-oe/recipes-support/fltk/fltk.bb | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/meta-oe/recipes-support/fltk/fltk.bb b/meta-oe/recipes-support/fltk/fltk.bb index 09344cf7d..51b4a0bc8 100644 --- a/meta-oe/recipes-support/fltk/fltk.bb +++ b/meta-oe/recipes-support/fltk/fltk.bb | |||
@@ -5,14 +5,10 @@ DEPENDS = "alsa-lib zlib jpeg libpng libxext libxft" | |||
5 | inherit features_check binconfig lib_package gtk-icon-cache mime mime-xdg | 5 | inherit features_check binconfig lib_package gtk-icon-cache mime mime-xdg |
6 | REQUIRED_DISTRO_FEATURES = "x11" | 6 | REQUIRED_DISTRO_FEATURES = "x11" |
7 | 7 | ||
8 | SRC_URI += " \ | ||
9 | file://0003-CMake-build-Force-shared-libs-with-unsuffixed-names.patch \ | ||
10 | file://0004-Fix-build-error-when-enable-package-config-examples.patch \ | ||
11 | " | ||
12 | |||
13 | EXTRA_OECMAKE = " \ | 8 | EXTRA_OECMAKE = " \ |
14 | -DOPTION_BUILD_SHARED_LIBS=ON \ | 9 | -DOPTION_BUILD_SHARED_LIBS=ON \ |
15 | -DOPTION_USE_THREADS=ON \ | 10 | -DOPTION_USE_THREADS=ON \ |
11 | -DFLTK_BUILD_TEST=OFF \ | ||
16 | -DOPTION_USE_XDBE=ON \ | 12 | -DOPTION_USE_XDBE=ON \ |
17 | -DOPTION_USE_XFT=ON \ | 13 | -DOPTION_USE_XFT=ON \ |
18 | -DFLTK_CONFIG_PATH=${libdir}/cmake \ | 14 | -DFLTK_CONFIG_PATH=${libdir}/cmake \ |
@@ -20,7 +16,6 @@ EXTRA_OECMAKE = " \ | |||
20 | 16 | ||
21 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'opengl', d)}" | 17 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'opengl', d)}" |
22 | 18 | ||
23 | PACKAGECONFIG[examples] = "-DOPTION_BUILD_EXAMPLES=ON,-DOPTION_BUILD_EXAMPLES=OFF,fltk-native" | ||
24 | PACKAGECONFIG[cairo] = "-DOPTION_CAIRO=ON,-DOPTION_CAIRO=OFF,cairo" | 19 | PACKAGECONFIG[cairo] = "-DOPTION_CAIRO=ON,-DOPTION_CAIRO=OFF,cairo" |
25 | PACKAGECONFIG[opengl] = "-DOPTION_USE_GL=ON,-DOPTION_USE_GL=OFF,virtual/libgl" | 20 | PACKAGECONFIG[opengl] = "-DOPTION_USE_GL=ON,-DOPTION_USE_GL=OFF,virtual/libgl" |
26 | PACKAGECONFIG[xinerama] = "-DOPTION_USE_XINERAMA=ON,-DOPTION_USE_XINERAMA=OFF,libxinerama" | 21 | PACKAGECONFIG[xinerama] = "-DOPTION_USE_XINERAMA=ON,-DOPTION_USE_XINERAMA=OFF,libxinerama" |