From 7682636ce5ac6702798f24ddca3ebc5f517f8520 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Sun, 8 Sep 2013 18:36:00 +0200
Subject: [PATCH] libxcb: convert to new package format

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/x11/lib/libxcb/build                | 40 --------------------
 packages/x11/lib/libxcb/{meta => package.mk} | 13 ++++++-
 2 files changed, 11 insertions(+), 42 deletions(-)
 delete mode 100755 packages/x11/lib/libxcb/build
 rename packages/x11/lib/libxcb/{meta => package.mk} (75%)

diff --git a/packages/x11/lib/libxcb/build b/packages/x11/lib/libxcb/build
deleted file mode 100755
index 3dd5a8740a..0000000000
--- a/packages/x11/lib/libxcb/build
+++ /dev/null
@@ -1,40 +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
-
-PYTHON_LIBDIR="`ls -d $SYSROOT_PREFIX/usr/lib/python*`"
-PYTHON_TOOLCHAIN_PATH=`ls -d $PYTHON_LIBDIR/site-packages`
-PKG_CONFIG="$PKG_CONFIG --define-variable=pythondir=$PYTHON_TOOLCHAIN_PATH"
-PKG_CONFIG="$PKG_CONFIG --define-variable=xcbincludedir=$SYSROOT_PREFIX/usr/share/xcb"
-
-cd $PKG_BUILD
-./configure --host=$TARGET_NAME \
-            --build=$HOST_NAME \
-            --prefix=/usr \
-            --sysconfdir=/etc \
-            --localstatedir=/var \
-            --enable-static \
-            --disable-shared \
-
-make
-$MAKEINSTALL
diff --git a/packages/x11/lib/libxcb/meta b/packages/x11/lib/libxcb/package.mk
similarity index 75%
rename from packages/x11/lib/libxcb/meta
rename to packages/x11/lib/libxcb/package.mk
index 7a0fabf6dc..24dfa93486 100644
--- a/packages/x11/lib/libxcb/meta
+++ b/packages/x11/lib/libxcb/package.mk
@@ -26,11 +26,20 @@ PKG_LICENSE="OSS"
 PKG_SITE="http://xcb.freedesktop.org"
 PKG_URL="http://xcb.freedesktop.org/dist/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain util-macros Python-host xcb-proto libpthread-stubs libXau"
+PKG_BUILD_DEPENDS_TARGET="toolchain util-macros Python-host xcb-proto libpthread-stubs libXau"
 PKG_PRIORITY="optional"
 PKG_SECTION="x11/lib"
 PKG_SHORTDESC="libxcb: X C-language Bindings library"
 PKG_LONGDESC="X C-language Bindings library."
-PKG_IS_ADDON="no"
 
+PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
+
+PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared"
+
+pre_configure_target() {
+  PYTHON_LIBDIR="`ls -d $SYSROOT_PREFIX/usr/lib/python*`"
+  PYTHON_TOOLCHAIN_PATH=`ls -d $PYTHON_LIBDIR/site-packages`
+  PKG_CONFIG="$PKG_CONFIG --define-variable=pythondir=$PYTHON_TOOLCHAIN_PATH"
+  PKG_CONFIG="$PKG_CONFIG --define-variable=xcbincludedir=$SYSROOT_PREFIX/usr/share/xcb"
+}