From patchwork Sat Jan 4 13:38:31 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 306813 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id A510D2C00A1 for ; Sun, 5 Jan 2014 00:39:51 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 56E238ADCC; Sat, 4 Jan 2014 13:39:50 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id sSzwLdekXhR3; Sat, 4 Jan 2014 13:39:49 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 4A0F68A91D; Sat, 4 Jan 2014 13:39:49 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id A38221BF83B for ; Sat, 4 Jan 2014 13:39:47 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 9C31389C36 for ; Sat, 4 Jan 2014 13:39:47 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id g7VouFiq4bQq for ; Sat, 4 Jan 2014 13:39:47 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from blu0-omc3-s17.blu0.hotmail.com (blu0-omc3-s17.blu0.hotmail.com [65.55.116.92]) by whitealder.osuosl.org (Postfix) with ESMTP id 0243589565 for ; Sat, 4 Jan 2014 13:39:46 +0000 (UTC) Received: from BLU0-SMTP401 ([65.55.116.73]) by blu0-omc3-s17.blu0.hotmail.com with Microsoft SMTPSVC(6.0.3790.4675); Sat, 4 Jan 2014 05:39:46 -0800 X-TMN: [bSBkrU4Z0TCUmf3mECYXFzR8H/w9OOMf] X-Originating-Email: [berndkuhls@hotmail.com] Message-ID: Received: from fli4l.lan.fli4l ([79.247.157.201]) by BLU0-SMTP401.phx.gbl over TLS secured channel with Microsoft SMTPSVC(6.0.3790.4675); Sat, 4 Jan 2014 05:39:44 -0800 Received: from fli4lbuild.lan.fli4l ([192.168.1.50]:53075) by fli4l.lan.fli4l with esmtpsa (TLSv1:DHE-RSA-AES256-SHA:256) (Exim 4.80.1) (envelope-from ) id 1VzRS1-0006pU-KS; Sat, 04 Jan 2014 14:39:42 +0100 From: Bernd Kuhls To: buildroot@busybox.net Date: Sat, 4 Jan 2014 14:38:31 +0100 X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1388842746-12510-1-git-send-email-berndkuhls@hotmail.com> References: <1388842746-12510-1-git-send-email-berndkuhls@hotmail.com> X-OriginalArrivalTime: 04 Jan 2014 13:39:44.0809 (UTC) FILETIME=[6D9E4190:01CF0952] MIME-Version: 1.0 Cc: Bernd Kuhls Subject: [Buildroot] [PATCH 02/36] xorg: Bump xcb-proto & libxcb version to 1.10 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net updated pkgconfig variables code taken from OpenELEC: https://github.com/OpenELEC/OpenELEC.tv/blob/master/packages/x11/lib/libxcb/package.mk Signed-off-by: Bernd Kuhls --- package/x11r7/libxcb/libxcb.mk | 10 ++++++---- package/x11r7/xcb-proto/xcb-proto.mk | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/package/x11r7/libxcb/libxcb.mk b/package/x11r7/libxcb/libxcb.mk index dfcf6fa..c3cbfab 100644 --- a/package/x11r7/libxcb/libxcb.mk +++ b/package/x11r7/libxcb/libxcb.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBXCB_VERSION = 1.8.1 +LIBXCB_VERSION = 1.10 LIBXCB_SOURCE = libxcb-$(LIBXCB_VERSION).tar.bz2 LIBXCB_SITE = http://xcb.freedesktop.org/dist/ LIBXCB_LICENSE = MIT @@ -15,9 +15,11 @@ LIBXCB_INSTALL_STAGING = YES LIBXCB_DEPENDENCIES = \ host-libxslt xlib_libpthread-stubs xcb-proto xlib_libXdmcp xlib_libXau \ host-xcb-proto host-python host-pkgconf -LIBXCB_CONF_ENV = STAGING_DIR="$(STAGING_DIR)" -LIBXCB_MAKE_OPT = XCBPROTO_XCBINCLUDEDIR=$(STAGING_DIR)/usr/share/xcb \ - XCBPROTO_XCBPYTHONDIR=$(HOST_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages + +LIBXCB_CONF_ENV = PKG_CONFIG="$$PKG_CONFIG \ + --define-variable=pythondir=$(HOST_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages \ + --define-variable=xcbincludedir=$(STAGING_DIR)/usr/share/xcb" + LIBXCB_CONF_OPT = --disable-build-docs HOST_LIBXCB_CONF_OPT = --disable-build-docs diff --git a/package/x11r7/xcb-proto/xcb-proto.mk b/package/x11r7/xcb-proto/xcb-proto.mk index 98d0f02..39f06e7 100644 --- a/package/x11r7/xcb-proto/xcb-proto.mk +++ b/package/x11r7/xcb-proto/xcb-proto.mk @@ -4,7 +4,7 @@ # ################################################################################ -XCB_PROTO_VERSION = 1.7.1 +XCB_PROTO_VERSION = 1.10 XCB_PROTO_SOURCE = xcb-proto-$(XCB_PROTO_VERSION).tar.bz2 XCB_PROTO_SITE = http://xcb.freedesktop.org/dist/ XCB_PROTO_LICENSE = MIT