diff options
| author |   Andreas Müller <schnitzeltony@gmail.com> | 2019-04-18 17:54:06 +0200 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2019-04-27 10:13:07 -0700 |
| commit | d9b57a7244bda29127dd8fc94f55daa0d7d66dd7 (patch) | |
| tree | f63fc4d263d5f9a032e11192765a273e6e0099df /meta-oe/recipes-support | |
| parent | 855be6408dc3e4b7fd5a3cb53c06cda9eefe355d (diff) | |
| download | meta-openembedded-contrib-d9b57a7244bda29127dd8fc94f55daa0d7d66dd7.tar.gz | |
fltk: upgrade 1.3.4-2 -> 1.3.5
* upstream tries pkconfig first to check for freetype -> patch can be removed
* looks like a bugfix release [1]
[1] https://raw.githubusercontent.com/fltk/fltk/25b947aa7d28d60a8ab41c21e4fa07bdcb614c7f/CHANGES
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')
| -rw-r--r-- | meta-oe/recipes-support/fltk/fltk.inc | 9 | ||||
| -rw-r--r-- | meta-oe/recipes-support/fltk/fltk/fltk-no-freetype-config.patch | 40 |
2 files changed, 4 insertions, 45 deletions
diff --git a/meta-oe/recipes-support/fltk/fltk.inc b/meta-oe/recipes-support/fltk/fltk.inc index d3416c8bc4..97a1fbfc7e 100644 --- a/meta-oe/recipes-support/fltk/fltk.inc +++ b/meta-oe/recipes-support/fltk/fltk.inc @@ -5,16 +5,15 @@ LICENSE = "LGPLv2 & FLTK" LIC_FILES_CHKSUM = "file://COPYING;md5=f6b26344a24a941a01a5b0826e80b5ca" SRC_URI = " \ - http://fltk.org/pub/fltk/1.3.4/${BP}-source.tar.gz \ + http://fltk.org/pub/fltk/${PV}/${BP}-source.tar.bz2 \ file://disable_test.patch \ - file://fltk-no-freetype-config.patch \ file://0001-Fl_Preferences.cxx-do-not-use-dlopen-in-case-glibc-s.patch \ file://0002-always-build-fluid-and-export-pointers.patch \ " -PV = "1.3.4-2" -SRC_URI[md5sum] = "b8e291343357e49dd81a22408744e400" -SRC_URI[sha256sum] = "25d349c18c99508737d48f225a2eb26a43338f9247551cab72a317fa42cda910" +PV = "1.3.5" +SRC_URI[md5sum] = "0de2b45a1896be2b4a8cafae89b84248" +SRC_URI[sha256sum] = "2933c72400f9e7c0f4c3a81a1ce98bc9582b2a3edc44b8597ccd26e240e32c3c" inherit cmake pkgconfig diff --git a/meta-oe/recipes-support/fltk/fltk/fltk-no-freetype-config.patch b/meta-oe/recipes-support/fltk/fltk/fltk-no-freetype-config.patch deleted file mode 100644 index 2a9915bea7..0000000000 --- a/meta-oe/recipes-support/fltk/fltk/fltk-no-freetype-config.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 699420d306cadbb5285942e09f4383d84b01985d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> -Date: Fri, 13 Jan 2017 13:21:23 +0100 -Subject: [PATCH] replace freetype-config by pkg-config -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Pending - -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> ---- - configure.ac | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/configure.ac b/configure.ac -index f0efd48..3af5ecb 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1006,12 +1006,12 @@ case $host_os_gui in - - xft_found=no - if test x$enable_xft != xno; then -- AC_PATH_PROG(FTCONFIG, freetype-config) -+ AC_PATH_PROG(PKGCONFIG,pkg-config) - -- if test "x$FTCONFIG" != x; then -- CPPFLAGS="`$FTCONFIG --cflags` $CPPFLAGS" -- CFLAGS="`$FTCONFIG --cflags` $CFLAGS" -- CXXFLAGS="`$FTCONFIG --cflags` $CXXFLAGS" -+ if test "x$PKGCONFIG" != x; then -+ CPPFLAGS="`$PKGCONFIG --cflags xft` $CPPFLAGS" -+ CFLAGS="`$PKGCONFIG --cflags xft` $CFLAGS" -+ CXXFLAGS="`$PKGCONFIG --cflags xft` $CXXFLAGS" - - AC_CHECK_LIB(fontconfig, FcPatternCreate) - AC_CHECK_HEADER(X11/Xft/Xft.h, --- -2.7.4 - |