From c927c37c53f8957a9b8b498068809e5923bfe128 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Fri, 31 May 2013 03:45:58 +0200
Subject: [PATCH] libxcb: build as static library

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/graphics/Mesa/meta                   |  2 +-
 .../x11/driver/xf86-video-virtualbox/meta     |  4 +--
 packages/x11/lib/libX11/meta                  |  2 +-
 packages/x11/lib/libxcb/build                 |  4 +--
 packages/x11/lib/libxcb/install               | 28 -------------------
 5 files changed, 6 insertions(+), 34 deletions(-)
 delete mode 100755 packages/x11/lib/libxcb/install

diff --git a/packages/graphics/Mesa/meta b/packages/graphics/Mesa/meta
index 5b4a351263..ff56a23b55 100644
--- a/packages/graphics/Mesa/meta
+++ b/packages/graphics/Mesa/meta
@@ -25,7 +25,7 @@ PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.mesa3d.org/"
 PKG_URL="ftp://freedesktop.org/pub/mesa/$PKG_VERSION/MesaLib-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS="libXdamage libdrm expat libXext libXfixes libXxf86vm libxcb libX11"
+PKG_DEPENDS="libXdamage libdrm expat libXext libXfixes libXxf86vm libX11"
 PKG_BUILD_DEPENDS="toolchain Python-host makedepend libxml2-host expat glproto dri2proto libdrm libXext libXdamage libXfixes libXxf86vm libxcb libX11"
 PKG_PRIORITY="optional"
 PKG_SECTION="graphics"
diff --git a/packages/x11/driver/xf86-video-virtualbox/meta b/packages/x11/driver/xf86-video-virtualbox/meta
index 1f899c16ed..14944ba405 100644
--- a/packages/x11/driver/xf86-video-virtualbox/meta
+++ b/packages/x11/driver/xf86-video-virtualbox/meta
@@ -25,8 +25,8 @@ PKG_ARCH="i386 x86_64"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.virtualbox.org"
 PKG_URL="${DISTRO_SRC}/${PKG_NAME}-${PKG_VERSION}-${TARGET_ARCH}.tar.bz2"
-PKG_DEPENDS="libXcomposite libXdamage libXfixes libXext libX11 libxcb libXau"
-PKG_BUILD_DEPENDS="toolchain"
+PKG_DEPENDS="libXcomposite libXdamage libXfixes libXext libX11 libXau"
+PKG_BUILD_DEPENDS="toolchain libXcomposite libXdamage libXfixes libXext libX11 libxcb libXau"
 PKG_PRIORITY="optional"
 PKG_SECTION="x11/driver"
 PKG_SHORTDESC="xf86-video-virtualbox: The Xorg driver for virtualbox video"
diff --git a/packages/x11/lib/libX11/meta b/packages/x11/lib/libX11/meta
index df20051573..7d2d4f4985 100644
--- a/packages/x11/lib/libX11/meta
+++ b/packages/x11/lib/libX11/meta
@@ -25,7 +25,7 @@ PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.x.org/"
 PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS="libXau libxcb"
+PKG_DEPENDS="libXau"
 PKG_BUILD_DEPENDS="toolchain xproto-host xproto util-macros xextproto xcmiscproto bigreqsproto kbproto inputproto xtrans libXau libxcb util-macros"
 PKG_PRIORITY="optional"
 PKG_SECTION="x11/lib"
diff --git a/packages/x11/lib/libxcb/build b/packages/x11/lib/libxcb/build
index ac69fdad8d..3dd5a8740a 100755
--- a/packages/x11/lib/libxcb/build
+++ b/packages/x11/lib/libxcb/build
@@ -33,8 +33,8 @@ cd $PKG_BUILD
             --prefix=/usr \
             --sysconfdir=/etc \
             --localstatedir=/var \
-            --disable-static \
-            --enable-shared \
+            --enable-static \
+            --disable-shared \
 
 make
 $MAKEINSTALL
diff --git a/packages/x11/lib/libxcb/install b/packages/x11/lib/libxcb/install
deleted file mode 100755
index 0c6aa5752a..0000000000
--- a/packages/x11/lib/libxcb/install
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-mkdir -p $INSTALL/usr/lib
-  cp -P $PKG_BUILD/src/.libs/libxcb.so* $INSTALL/usr/lib
-  cp -P $PKG_BUILD/src/.libs/libxcb-*.so* $INSTALL/usr/lib
-    rm -rf $INSTALL/usr/lib/libxcb-*.so*T