mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-07-17 04:37:19 +00:00
Code Issues Projects Releases Wiki Activity

fltk: upgrade 1.3.4-2 -> 1.3.5

Browse Source 
* 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>
This commit is contained in:
Andreas Müller
2019-04-18 17:54:06 +02:00
committed by Khem Raj
parent 855be6408d
commit d9b57a7244
2 changed files with 4 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-support/fltk/fltk.inc
+4 -5
View File
@@ -5,16 +5,15 @@ LICENSE = "LGPLv2 & FLTK"
LIC_FILES_CHKSUM = "file://COPYING;md5=f6b26344a24a941a01a5b0826e80b5ca" LIC_FILES_CHKSUM = "file://COPYING;md5=f6b26344a24a941a01a5b0826e80b5ca"
SRC_URI = " \ 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://disable_test.patch \
file://fltk-no-freetype-config.patch \
file://0001-Fl_Preferences.cxx-do-not-use-dlopen-in-case-glibc-s.patch \ file://0001-Fl_Preferences.cxx-do-not-use-dlopen-in-case-glibc-s.patch \
file://0002-always-build-fluid-and-export-pointers.patch \ file://0002-always-build-fluid-and-export-pointers.patch \
" "
PV = "1.3.4-2" PV = "1.3.5"
SRC_URI[md5sum] = "b8e291343357e49dd81a22408744e400" SRC_URI[md5sum] = "0de2b45a1896be2b4a8cafae89b84248"
SRC_URI[sha256sum] = "25d349c18c99508737d48f225a2eb26a43338f9247551cab72a317fa42cda910" SRC_URI[sha256sum] = "2933c72400f9e7c0f4c3a81a1ce98bc9582b2a3edc44b8597ccd26e240e32c3c"
inherit cmake pkgconfig inherit cmake pkgconfig
meta-oe/recipes-support/fltk/fltk/fltk-no-freetype-config.patch
-40
View File
@@ -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