diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2012-06-12 18:25:28 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2012-06-13 00:24:19 +0200 |
| commit | a9e839a80ac361c140ea52af3ac01292c709c81b (patch) | |
| tree | 723c922c1daf6ba32b9058b9255da5e3b764d983 /rules/libxcb.make | |
| parent | 1be3c3ac24099fb86f0672e74f31ade5e3ce01ba (diff) | |
| download | ptxdist-a9e839a80ac361c140ea52af3ac01292c709c81b.tar.gz ptxdist-a9e839a80ac361c140ea52af3ac01292c709c81b.tar.xz | |
libxcb: version bump 1.5 -> 1.8.1
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/libxcb.make')
| -rw-r--r-- | rules/libxcb.make | 54 |
1 files changed, 34 insertions, 20 deletions
diff --git a/rules/libxcb.make b/rules/libxcb.make index ad87514b0..d80c5293c 100644 --- a/rules/libxcb.make +++ b/rules/libxcb.make @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_LIBXCB) += libxcb # # Paths and names # -LIBXCB_VERSION := 1.5 -LIBXCB_MD5 := d19c0ba6ba42ebccd3d62d8bb147b551 +LIBXCB_VERSION := 1.8.1 +LIBXCB_MD5 := 9da03df9e2f4c048202920d9f6a7e123 LIBXCB := libxcb-$(LIBXCB_VERSION) LIBXCB_SUFFIX := tar.bz2 LIBXCB_URL := http://xcb.freedesktop.org/dist/$(LIBXCB).$(LIBXCB_SUFFIX) @@ -25,35 +25,47 @@ LIBXCB_SOURCE := $(SRCDIR)/$(LIBXCB).$(LIBXCB_SUFFIX) LIBXCB_DIR := $(BUILDDIR)/$(LIBXCB) # ---------------------------------------------------------------------------- -# Get -# ---------------------------------------------------------------------------- - -$(LIBXCB_SOURCE): - @$(call targetinfo) - @$(call get, LIBXCB) - -# ---------------------------------------------------------------------------- # Prepare # ---------------------------------------------------------------------------- -LIBXCB_PATH := PATH=$(CROSS_PATH) -LIBXCB_ENV := $(CROSS_ENV) ac_cv_prog_BUILD_DOCS=no +LIBXCB_CONF_ENV := $(CROSS_ENV) ac_cv_prog_BUILD_DOCS=no ifndef PTXCONF_XORG_SERVER_EXT_XDMCP -LIBXCB_ENV += ac_cv_lib_Xdmcp_XdmcpWrap=no +LIBXCB_CONF_ENV += ac_cv_lib_Xdmcp_XdmcpWrap=no endif # # autoconf # -LIBXCB_AUTOCONF := \ +LIBXCB_CONF_TOOL := autoconf +LIBXCB_CONF_OPT := \ $(CROSS_AUTOCONF_USR) \ - --disable-build-docs -# -# configure outputs: checking for XDMCP... no -# How to control this in a reliable way? -# What's here detected depends on the build order! -# + --disable-build-docs \ + --enable-composite \ + --enable-damage \ + --enable-dpms \ + --enable-dri2 \ + --enable-glx \ + --enable-randr \ + --enable-record \ + --enable-render \ + --enable-resource \ + --enable-screensaver \ + --enable-shape \ + --enable-shm \ + --enable-sync \ + --enable-xevie \ + --enable-xfixes \ + --enable-xfree86-dri \ + --enable-xinerama \ + --enable-xinput \ + --enable-xkb \ + --enable-xprint \ + --disable-selinux \ + --enable-xtest \ + --enable-xv \ + --enable-xvmc \ + --without-doxygen # ---------------------------------------------------------------------------- # Target-Install @@ -85,6 +97,8 @@ $(STATEDIR)/libxcb.targetinstall: @$(call install_lib, libxcb, 0, 0, 0644, libxcb-xf86dri) @$(call install_lib, libxcb, 0, 0, 0644, libxcb-xfixes) @$(call install_lib, libxcb, 0, 0, 0644, libxcb-xinerama) + @$(call install_lib, libxcb, 0, 0, 0644, libxcb-xinput) + @$(call install_lib, libxcb, 0, 0, 0644, libxcb-xkb) # @$(call install_lib, libxcb, 0, 0, 0644, libxcb-xlib) @$(call install_lib, libxcb, 0, 0, 0644, libxcb-xprint) @$(call install_lib, libxcb, 0, 0, 0644, libxcb-xtest) |