summaryrefslogtreecommitdiffstats
path: root/rules/libxkbcommon.make
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2014-03-28 08:02:27 +0100
committerMichael Olbrich <m.olbrich@pengutronix.de>2014-03-28 08:04:46 +0100
commit29868c4b9ea13e849ead9cf6c5f65750dc6c822b (patch)
tree7657b2baffadd13b93379b129c1c51790c391916 /rules/libxkbcommon.make
parent3ea699645e59485c972be157b26010cada60f12e (diff)
downloadptxdist-29868c4b9ea13e849ead9cf6c5f65750dc6c822b.tar.gz
ptxdist-29868c4b9ea13e849ead9cf6c5f65750dc6c822b.tar.xz
libxkbcommon: version bump 0.2.0 -> 0.4.0
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/libxkbcommon.make')
-rw-r--r--rules/libxkbcommon.make10
1 files changed, 7 insertions, 3 deletions
diff --git a/rules/libxkbcommon.make b/rules/libxkbcommon.make
index 2285e1459..29d28ee11 100644
--- a/rules/libxkbcommon.make
+++ b/rules/libxkbcommon.make
@@ -16,10 +16,10 @@ PACKAGES-$(PTXCONF_LIBXKBCOMMON) += libxkbcommon
#
# Paths and names
#
-LIBXKBCOMMON_VERSION := 0.2.0
-LIBXKBCOMMON_MD5 := 2be3d4a255d02c7d46fc6a9486f21f6a
+LIBXKBCOMMON_VERSION := 0.4.0
+LIBXKBCOMMON_MD5 := bb782f1700e45b4f57c84ef513e3cf85
LIBXKBCOMMON := libxkbcommon-$(LIBXKBCOMMON_VERSION)
-LIBXKBCOMMON_SUFFIX := tar.bz2
+LIBXKBCOMMON_SUFFIX := tar.xz
LIBXKBCOMMON_URL := http://xkbcommon.org/download/$(LIBXKBCOMMON).$(LIBXKBCOMMON_SUFFIX)
LIBXKBCOMMON_SOURCE := $(SRCDIR)/$(LIBXKBCOMMON).$(LIBXKBCOMMON_SUFFIX)
LIBXKBCOMMON_DIR := $(BUILDDIR)/$(LIBXKBCOMMON)
@@ -39,6 +39,7 @@ LIBXKBCOMMON_CONF_OPT := \
--disable-selective-werror \
--disable-strict-compilation \
--disable-docs \
+ --$(call ptx/endis, PTXCONF_LIBXKBCOMMON_X11)-x11 \
--with-xkb-config-root=$(PTXCONF_XORG_DEFAULT_DATA_DIR)/X11/xkb
# ----------------------------------------------------------------------------
@@ -55,6 +56,9 @@ $(STATEDIR)/libxkbcommon.targetinstall:
@$(call install_fixup, libxkbcommon,DESCRIPTION,missing)
@$(call install_lib, libxkbcommon, 0, 0, 0644, libxkbcommon)
+ifdef PTXCONF_LIBXKBCOMMON_X11
+ @$(call install_lib, libxkbcommon, 0, 0, 0644, libxkbcommon-x11)
+endif
@$(call install_finish, libxkbcommon)