aboutsummaryrefslogtreecommitdiff
path: root/package/fltk
diff options
context:
space:
mode:
authorGravatar Peter Korsgaard <peter@korsgaard.com>2015-03-02 23:26:20 +0100
committerGravatar Peter Korsgaard <peter@korsgaard.com>2015-03-02 23:26:20 +0100
commit7403ea730d75ce0af51cb1bd5665674bb5bfae42 (patch)
treed93cc0b4a8878d90ab0bb79c76d75805ee1c2a9d /package/fltk
parent1021766976319b40e64ca8dee12d21c758197801 (diff)
parente6803b9f91357773154daed13d6e83712d49476c (diff)
downloadbuildroot-7403ea730d75ce0af51cb1bd5665674bb5bfae42.tar.gz
buildroot-7403ea730d75ce0af51cb1bd5665674bb5bfae42.tar.bz2
Merge branch 'next'
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/fltk')
-rw-r--r--package/fltk/fltk.hash4
-rw-r--r--package/fltk/fltk.mk16
2 files changed, 19 insertions, 1 deletions
diff --git a/package/fltk/fltk.hash b/package/fltk/fltk.hash
new file mode 100644
index 0000000000..7b9b67dcfb
--- /dev/null
+++ b/package/fltk/fltk.hash
@@ -0,0 +1,4 @@
+# From http://www.fltk.org/software.php?VERSION=1.3.3
+md5 9ccdb0d19dc104b87179bd9fd10822e3 fltk-1.3.3-source.tar.gz
+# Locally generated
+sha256 f8398d98d7221d40e77bc7b19e761adaf2f1ef8bb0c30eceb7beb4f2273d0d97 fltk-1.3.3-source.tar.gz
diff --git a/package/fltk/fltk.mk b/package/fltk/fltk.mk
index d1acb86514..9b67bd32ae 100644
--- a/package/fltk/fltk.mk
+++ b/package/fltk/fltk.mk
@@ -4,7 +4,7 @@
#
################################################################################
-FLTK_VERSION = 1.3.2
+FLTK_VERSION = 1.3.3
FLTK_SOURCE = fltk-$(FLTK_VERSION)-source.tar.gz
FLTK_SITE = http://fltk.org/pub/fltk/$(FLTK_VERSION)
FLTK_INSTALL_STAGING = YES
@@ -27,6 +27,20 @@ FLTK_CONF_OPTS += --enable-cairo
FLTK_DEPENDENCIES += cairo
endif
+ifeq ($(BR2_PACKAGE_XLIB_LIBXCURSOR),y)
+FLTK_DEPENDENCIES += xlib_libXcursor
+FLTK_CONF_OPTS += --enable-xcursor
+else
+FLTK_CONF_OPTS += --disable-xcursor
+endif
+
+ifeq ($(BR2_PACKAGE_XLIB_LIBXFIXES),y)
+FLTK_DEPENDENCIES += xlib_libXfixes
+FLTK_CONF_OPTS += --enable-xfixes
+else
+FLTK_CONF_OPTS += --disable-xfixes
+endif
+
ifeq ($(BR2_PACKAGE_XLIB_LIBXFT),y)
FLTK_CONF_ENV += ac_cv_path_FTCONFIG=$(STAGING_DIR)/usr/bin/freetype-config
FLTK_DEPENDENCIES += xlib_libXft