helium-3rd-party/meta-openembedded
1
0
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-10-01 07:25:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

fltk: upgrade 1.3.5 -> 1.3.6

Browse Source 
* 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>
This commit is contained in:
Andreas Müller 2021-05-24 00:33:47 +02:00 committed by Khem Raj
parent 6c596c4acc
commit 08a6ca5283
6 changed files with 19 additions and 245 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
meta-oe/recipes-support/fltk/fltk-native.bb
View File

@ -9,12 +9,15 @@ EXTRA_OECMAKE += " \
-DOPTION_USE_THREADS=OFF \ -DOPTION_USE_THREADS=OFF \
-DOPTION_USE_XDBE=OFF \ -DOPTION_USE_XDBE=OFF \
-DOPTION_USE_XFT=OFF \ -DOPTION_USE_XFT=OFF \
-DOPTION_BUILD_EXAMPLES=OFF \ -DFLTK_BUILD_TEST=OFF \
-DOPTION_USE_XINERAMA=OFF \ -DOPTION_USE_XINERAMA=OFF \
-DOPTION_USE_XFIXES=OFF \ -DOPTION_USE_XFIXES=OFF \
-DOPTION_USE_XCURSOR=OFF \ -DOPTION_USE_XCURSOR=OFF \
" "
# lib/libfltk.a(Fl_Native_File_Chooser.cxx.o): undefined reference to symbol 'dlsym@@GLIBC_2.2.5'
LDFLAGS += "-ldl"
do_install_append() { do_install_append() {
# make sure native fltk-config is not used accidentaly # make sure native fltk-config is not used accidentaly
rm -f ${D}${bindir}/fltk-config rm -f ${D}${bindir}/fltk-config

7
meta-oe/recipes-support/fltk/fltk.bb
View File

@ -5,14 +5,10 @@ DEPENDS = "alsa-lib zlib jpeg libpng libxext libxft"
inherit features_check binconfig lib_package gtk-icon-cache mime mime-xdg inherit features_check binconfig lib_package gtk-icon-cache mime mime-xdg
REQUIRED_DISTRO_FEATURES = "x11" REQUIRED_DISTRO_FEATURES = "x11"
SRC_URI += " \
file://0003-CMake-build-Force-shared-libs-with-unsuffixed-names.patch \
file://0004-Fix-build-error-when-enable-package-config-examples.patch \
"
EXTRA_OECMAKE = " \ EXTRA_OECMAKE = " \
-DOPTION_BUILD_SHARED_LIBS=ON \ -DOPTION_BUILD_SHARED_LIBS=ON \
-DOPTION_USE_THREADS=ON \ -DOPTION_USE_THREADS=ON \
-DFLTK_BUILD_TEST=OFF \
-DOPTION_USE_XDBE=ON \ -DOPTION_USE_XDBE=ON \
-DOPTION_USE_XFT=ON \ -DOPTION_USE_XFT=ON \
-DFLTK_CONFIG_PATH=${libdir}/cmake \ -DFLTK_CONFIG_PATH=${libdir}/cmake \
@ -20,7 +16,6 @@ EXTRA_OECMAKE = " \
PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'opengl', d)}" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'opengl', d)}"
PACKAGECONFIG[examples] = "-DOPTION_BUILD_EXAMPLES=ON,-DOPTION_BUILD_EXAMPLES=OFF,fltk-native"
PACKAGECONFIG[cairo] = "-DOPTION_CAIRO=ON,-DOPTION_CAIRO=OFF,cairo" PACKAGECONFIG[cairo] = "-DOPTION_CAIRO=ON,-DOPTION_CAIRO=OFF,cairo"
PACKAGECONFIG[opengl] = "-DOPTION_USE_GL=ON,-DOPTION_USE_GL=OFF,virtual/libgl" PACKAGECONFIG[opengl] = "-DOPTION_USE_GL=ON,-DOPTION_USE_GL=OFF,virtual/libgl"
PACKAGECONFIG[xinerama] = "-DOPTION_USE_XINERAMA=ON,-DOPTION_USE_XINERAMA=OFF,libxinerama" PACKAGECONFIG[xinerama] = "-DOPTION_USE_XINERAMA=ON,-DOPTION_USE_XINERAMA=OFF,libxinerama"

5
meta-oe/recipes-support/fltk/fltk.inc
View File

@ -11,9 +11,8 @@ SRC_URI = " \
file://0002-always-build-fluid-and-export-pointers.patch \ file://0002-always-build-fluid-and-export-pointers.patch \
" "
PV = "1.3.5" PV = "1.3.6"
SRC_URI[md5sum] = "0de2b45a1896be2b4a8cafae89b84248" SRC_URI[sha256sum] = "20d2627c97b4485ee3eab5522303985bc22b798a878ba80239e6d43dcfed067e"
SRC_URI[sha256sum] = "2933c72400f9e7c0f4c3a81a1ce98bc9582b2a3edc44b8597ccd26e240e32c3c"
inherit cmake pkgconfig inherit cmake pkgconfig

24
meta-oe/recipes-support/fltk/fltk/0002-always-build-fluid-and-export-pointers.patch
View File

@ -1,6 +1,6 @@
From 16010cb1a69ea2326d8102b7f1e34b65aca4b278 Mon Sep 17 00:00:00 2001 From 16010cb1a69ea2326d8102b7f1e34b65aca4b278 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Tue, 28 Feb 2017 01:20:42 +0100 Date: Sat, 22 May 2021 12:33:15 +0200
Subject: [PATCH] always build fluid and export pointers Subject: [PATCH] always build fluid and export pointers
MIME-Version: 1.0 MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8 Content-Type: text/plain; charset=UTF-8
@ -8,24 +8,24 @@ Content-Transfer-Encoding: 8bit
Upstream-Status: Inappropriate [embedded specific] Upstream-Status: Inappropriate [embedded specific]
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
--- ---
CMake/export.cmake | 2 +- CMake/export.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CMake/export.cmake b/CMake/export.cmake diff --git a/CMake/export.cmake b/CMake/export.cmake
index 968186a..95e04eb 100644 index 6e8bc5d..71b6f6c 100644
--- a/CMake/export.cmake --- a/CMake/export.cmake
+++ b/CMake/export.cmake +++ b/CMake/export.cmake
@@ -21,7 +21,7 @@ @@ -20,7 +20,7 @@
# final config and export
####################################################################### #######################################################################
# Set the fluid executable path # Set the fluid executable path
-if(CMAKE_CROSSCOMPILING) -if (CMAKE_CROSSCOMPILING)
+if(FALSE) +if (FALSE)
find_file(FLUID_PATH find_file(FLUID_PATH
NAMES fluid fluid.exe NAMES fluid fluid.exe
PATHS ENV PATH PATHS ENV PATH
-- --
2.9.3 2.31.1

41
meta-oe/recipes-support/fltk/fltk/0003-CMake-build-Force-shared-libs-with-unsuffixed-names.patch
View File

@ -1,41 +0,0 @@
From bc38fb41044503c9debf5710910c51dd29674b6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Fri, 15 Dec 2017 22:14:01 +0100
Subject: [PATCH] CMake build: Force shared libs with unsuffixed names
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
For windows build sake CMake complains when a project wants to build shared and
static libraries with same name. This caused the authors of fltk to generate
libraries with names suffixed by '_SHARED' when building fltk with cmake -
autotools builds do not suffix.
Reasons to build shared libs with correct names:
* Shared libraries are the preferred choice for embedded devices
* There are projects (e.g yoshimi) expecting shared libraries with unsuffixed
names - as created by autotools build. These projects link against static
libraries by accident causing unusable binaries.
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
CMake/macros.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CMake/macros.cmake b/CMake/macros.cmake
index 4def62d..ab675f0 100644
--- a/CMake/macros.cmake
+++ b/CMake/macros.cmake
@@ -49,7 +49,7 @@ macro(FL_ADD_LIBRARY LIBNAME LIBTYPE LIBFILES)
PROPERTIES
VERSION ${FLTK_VERSION_FULL}
SOVERSION ${FLTK_VERSION_MAJOR}.${FLTK_VERSION_MINOR}
- PREFIX "lib" # for MSVC static/shared coexistence
+ OUTPUT_NAME ${LIBNAME} CLEAN_DIRECT_OUTPUT 1
)
endif (${LIBTYPE} STREQUAL "SHARED")
--
2.9.5

182
meta-oe/recipes-support/fltk/fltk/0004-Fix-build-error-when-enable-package-config-examples.patch
View File

@ -1,182 +0,0 @@
Fix build error when enable package config examples.
Upstream-Status: Backport [https://github.com/fltk/fltk/commit/16774dd]
Signed-off-by: Kai Kang <kai.kang@windriver.com>
From 16774ddc4e000c89e560fde0ced8be9814ef041e Mon Sep 17 00:00:00 2001
From: Albrecht Schlosser <albrechts.fltk@online.de>
Date: Wed, 8 Feb 2017 02:06:52 +0000
Subject: [PATCH] Rename test/help demo program to test/help_dialog.
This change avoids a name conflict with CMake's auto-generated target 'help'
for "Unix Makefiles", "Ninja", and supposedly other generators as well.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12171 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
CMake/macros.cmake | 5 -----
documentation/src/examples.dox | 8 +++----
test/CMakeLists.txt | 27 +++++++++++++++++++----
test/demo.menu | 2 +-
test/{help.cxx => help_dialog.cxx} | 6 ++---
test/{help-test.html => help_dialog.html} | 0
6 files changed, 31 insertions(+), 17 deletions(-)
rename test/{help.cxx => help_dialog.cxx} (88%)
rename test/{help-test.html => help_dialog.html} (100%)
diff --git a/CMake/macros.cmake b/CMake/macros.cmake
index 5b0d0fa..7134fcb 100644
--- a/CMake/macros.cmake
+++ b/CMake/macros.cmake
@@ -90,11 +90,6 @@ function(CREATE_EXAMPLE NAME SOURCES LIBRARIES)
set (tname ${NAME}) # target name
- # rename reserved target name "help" (CMake 2.8.12 and later)
- if (${tname} MATCHES "^help$")
- set (tname "test_help")
- endif (${tname} MATCHES "^help$")
-
foreach(src ${SOURCES})
if ("${src}" MATCHES "\\.fl$")
list(APPEND flsrcs ${src})
diff --git a/documentation/src/examples.dox b/documentation/src/examples.dox
index 5105b7b..7961b02 100644
--- a/documentation/src/examples.dox
+++ b/documentation/src/examples.dox
@@ -60,7 +60,7 @@ you build FLTK, unlike those in the 'test' directory shown below.
</tr>
<tr>
<td> \ref examples_hello </td>
-<td> \ref examples_help </td>
+<td> \ref examples_help_dialog </td>
<td> \ref examples_iconize </td>
<td> \ref examples_image </td>
<td> \ref examples_inactive </td>
@@ -326,13 +326,13 @@ easily under FLTK.
tiny demo shows how little is needed to get a functioning application
running with FLTK. Quite impressive, I'd say.
-\subsection examples_help help
+\subsection examples_help_dialog help_dialog
\par
-\c help displays the built-in FLTK help browser. The
+\c help_dialog displays the built-in FLTK help browser. The
Fl_Help_Dialog understands a subset of html and renders
various image formats. This widget makes it easy to provide help
-pages to the user without depending on the operating system's
+pages to the user without depending on the operating system's
html browser.
\subsection examples_iconize iconize
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 22ec9ab..4caffa5 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,3 +1,22 @@
+#
+# "$Id$"
+#
+# CMakeLists.txt used to build test and demo apps by the CMake build system
+#
+# Copyright 2004-2017 by Bill Spitzak and others.
+#
+# This library is free software. Distribution and use rights are outlined in
+# the file "COPYING" which should have been included with this file. If this
+# file is missing or damaged, see the license at:
+#
+# http://www.fltk.org/COPYING.php
+#
+# Please report all bugs and problems on the following page:
+#
+# http://www.fltk.org/str.php
+#
+#######################################################################
+
set(EXECUTABLE_OUTPUT_PATH ${FLTK_BINARY_DIR}/bin/examples)
#######################################################################
@@ -64,7 +83,7 @@ CREATE_EXAMPLE(file_chooser file_chooser.cxx "fltk;fltk_images")
CREATE_EXAMPLE(fonts fonts.cxx fltk)
CREATE_EXAMPLE(forms forms.cxx "fltk;fltk_forms")
CREATE_EXAMPLE(hello hello.cxx fltk)
-CREATE_EXAMPLE(help help.cxx "fltk;fltk_images")
+CREATE_EXAMPLE(help_dialog help_dialog.cxx "fltk;fltk_images")
CREATE_EXAMPLE(icon icon.cxx fltk)
CREATE_EXAMPLE(iconize iconize.cxx fltk)
CREATE_EXAMPLE(image image.cxx fltk)
@@ -134,7 +153,7 @@ endif(FLTK_HAVE_CAIRO)
# Note: this is incomplete as of 11 Feb 2015
# Todo: currently all files are copied, but some of them need configuration:
# - demo.menu: fluid can't be started (wrong path)
-# - demo.menu: help (help-test.html) can't find its images (not copied)
+# - demo.menu: help_dialog (help_dialog.html) can't find its images (not copied)
# - maybe more ...
# prepare for a "better" test file installation path
@@ -149,11 +168,11 @@ configure_file(demo.menu ${TESTFILE_PATH}/demo.menu COPYONLY)
# use target directory only to avoid redundancy
configure_file(rgb.txt ${TESTFILE_PATH} COPYONLY)
-configure_file(help-test.html ${TESTFILE_PATH} COPYONLY)
+configure_file(help_dialog.html ${TESTFILE_PATH} COPYONLY)
configure_file(browser.cxx ${TESTFILE_PATH} COPYONLY)
configure_file(editor.cxx ${TESTFILE_PATH} COPYONLY)
if(APPLE AND NOT OPTION_APPLE_X11)
configure_file(browser.cxx "${TESTFILE_PATH}/browser.app/Contents/Resources/browser.cxx" COPYONLY)
configure_file(rgb.txt ${TESTFILE_PATH}/colbrowser.app/Contents/Resources/rgb.txt COPYONLY)
- configure_file(help-test.html ${TESTFILE_PATH}/help.app/Contents/Resources/help-test.html COPYONLY)
+ configure_file(help_dialog.html ${TESTFILE_PATH}/help_dialog.app/Contents/Resources/help_dialog.html COPYONLY)
endif(APPLE AND NOT OPTION_APPLE_X11)
diff --git a/test/demo.menu b/test/demo.menu
index 337a71c..97e522a 100644
--- a/test/demo.menu
+++ b/test/demo.menu
@@ -77,7 +77,7 @@
@o:Font Tests...:@of
@of:Fonts:fonts
@of:UTF-8:utf8
- @o:HelpDialog:help
+ @o:HelpDialog:help_dialog
@o:Input Choice:input_choice
@o:Preferences:preferences
@o:Threading:threads
diff --git a/test/help.cxx b/test/help_dialog.cxx
similarity index 88%
rename from test/help.cxx
rename to test/help_dialog.cxx
index f5c51d6..7866641 100644
--- a/test/help.cxx
+++ b/test/help_dialog.cxx
@@ -3,7 +3,7 @@
//
// Fl_Help_Dialog test program.
//
-// Copyright 1999-2010 by Easy Software Products.
+// Copyright 2011-2017 by Bill Spitzak and others.
//
// This library is free software. Distribution and use rights are outlined in
// the file "COPYING" which should have been included with this file. If this
@@ -46,13 +46,13 @@ main(int argc, // I - Number of command-line arguments
strcpy(buf, argv[0]);
char *slash = strrchr(buf, '/');
if (slash)
- strcpy(slash, "/../Resources/help-test.html");
+ strcpy(slash, "/../Resources/help_dialog.html");
help->load(buf);
#else
if (argc <= 1)
- help->load("help-test.html");
+ help->load("help_dialog.html");
else
help->load(argv[1]);
diff --git a/test/help-test.html b/test/help_dialog.html
similarity index 100%
rename from test/help-test.html
rename to test/help_dialog.html