From 6a2990a005c02146c3e5d73dec95f8f62baf9a3e Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Sun, 8 Sep 2013 15:43:39 +0300
Subject: [PATCH 01/23] alsa-lib: make debug optional

---
 packages/audio/alsa/alsa-lib/package.mk | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/packages/audio/alsa/alsa-lib/package.mk b/packages/audio/alsa/alsa-lib/package.mk
index 8c9fa62465..aa4fe43ba0 100644
--- a/packages/audio/alsa/alsa-lib/package.mk
+++ b/packages/audio/alsa/alsa-lib/package.mk
@@ -35,9 +35,16 @@ PKG_LONGDESC="ALSA (Advanced Linux Sound Architecture) is the next generation Li
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
 
+if [ "$DEBUG" = yes ]; then
+  ALSA_DEBUG=--with-debug
+else
+  ALSA_DEBUG=--without-debug
+fi
+
 # package specific configure options
 PKG_CONFIGURE_OPTS_TARGET="--with-plugindir=/usr/lib/alsa \
                            --disable-python \
+                           $ALSA_DEBUG \
                            --disable-dependency-tracking"
 
 pre_configure_target() {

From c87aab4fae4197bdad634369e316adb353b61f58 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Sun, 8 Sep 2013 17:02:43 +0200
Subject: [PATCH 02/23] libICE: convert to new package format

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

diff --git a/packages/x11/lib/libICE/build b/packages/x11/lib/libICE/build
deleted file mode 100755
index 524924916a..0000000000
--- a/packages/x11/lib/libICE/build
+++ /dev/null
@@ -1,38 +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
-
-cd $PKG_BUILD
-./configure --host=$TARGET_NAME \
-            --build=$HOST_NAME \
-            --prefix=/usr \
-            --sysconfdir=/etc \
-            --localstatedir=/var \
-            --enable-static \
-            --disable-shared \
-            --disable-ipv6 \
-            --without-xmlto
-
-make
-
-$MAKEINSTALL
diff --git a/packages/x11/lib/libICE/meta b/packages/x11/lib/libICE/package.mk
similarity index 82%
rename from packages/x11/lib/libICE/meta
rename to packages/x11/lib/libICE/package.mk
index e29b26dd77..8c8f2cc4f1 100644
--- a/packages/x11/lib/libICE/meta
+++ b/packages/x11/lib/libICE/package.mk
@@ -26,11 +26,16 @@ 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=""
-PKG_BUILD_DEPENDS="toolchain util-macros xtrans"
+PKG_BUILD_DEPENDS_TARGET="toolchain util-macros xtrans"
 PKG_PRIORITY="optional"
 PKG_SECTION="x11/lib"
-PKG_SHORTDESC="libice: X Inter-Client Exchange (ICE) protocol library"
+PKG_SHORTDESC="libICE: X Inter-Client Exchange (ICE) protocol library"
 PKG_LONGDESC="X Inter-Client Exchange (ICE) protocol library."
-PKG_IS_ADDON="no"
 
+PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
+
+PKG_CONFIGURE_OPTS_TARGET="--enable-static \
+                           --disable-shared \
+                           --disable-ipv6 \
+                           --without-xmlto"

From c3557cd845b586545503e4fbf23271545456ba10 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Sun, 8 Sep 2013 17:04:02 +0200
Subject: [PATCH 03/23] libSM: convert to new package format, update to
 libSM-1.2.2

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

diff --git a/packages/x11/lib/libSM/build b/packages/x11/lib/libSM/build
deleted file mode 100755
index d4b9119a4a..0000000000
--- a/packages/x11/lib/libSM/build
+++ /dev/null
@@ -1,39 +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
-
-cd $PKG_BUILD
-./configure --host=$TARGET_NAME \
-            --build=$HOST_NAME \
-            --prefix=/usr \
-            --localstatedir=/var \
-            --sysconfdir=/etc \
-            --enable-static \
-            --disable-shared \
-            --with-libuuid \
-            --without-xmlto \
-            --without-fop
-
-make
-
-$MAKEINSTALL
diff --git a/packages/x11/lib/libSM/meta b/packages/x11/lib/libSM/package.mk
similarity index 83%
rename from packages/x11/lib/libSM/meta
rename to packages/x11/lib/libSM/package.mk
index 015a1d1e7e..0b80f64b94 100644
--- a/packages/x11/lib/libSM/meta
+++ b/packages/x11/lib/libSM/package.mk
@@ -19,18 +19,24 @@
 ################################################################################
 
 PKG_NAME="libSM"
-PKG_VERSION="1.2.1"
+PKG_VERSION="1.2.2"
 PKG_REV="1"
 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="util-linux"
-PKG_BUILD_DEPENDS="toolchain util-macros util-linux libICE"
+PKG_BUILD_DEPENDS_TARGET="toolchain util-macros util-linux libICE"
 PKG_PRIORITY="optional"
 PKG_SECTION="x11/lib"
 PKG_SHORTDESC="libSM: X11 Inter-Client Exchange library"
 PKG_LONGDESC="This package provides the main interface to the X11 Session Management library, which allows for applications to both manage sessions, and make use of session managers to save and restore their state for later use."
-PKG_IS_ADDON="no"
 
+PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
+
+PKG_CONFIGURE_OPTS_TARGET="--enable-static \
+                           --disable-shared \
+                           --with-libuuid \
+                           --without-xmlto \
+                           --without-fop"

From 30bde4e48c6f19cdfd200ff08fd1d4a907f852f4 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Sun, 8 Sep 2013 17:15:51 +0200
Subject: [PATCH 04/23] libX11: convert to new package format

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/x11/lib/libX11/build                | 61 --------------------
 packages/x11/lib/libX11/install              | 34 -----------
 packages/x11/lib/libX11/{meta => package.mk} | 30 +++++++++-
 3 files changed, 28 insertions(+), 97 deletions(-)
 delete mode 100755 packages/x11/lib/libX11/build
 delete mode 100755 packages/x11/lib/libX11/install
 rename packages/x11/lib/libX11/{meta => package.mk} (54%)

diff --git a/packages/x11/lib/libX11/build b/packages/x11/lib/libX11/build
deleted file mode 100755
index 7b073fc15d..0000000000
--- a/packages/x11/lib/libX11/build
+++ /dev/null
@@ -1,61 +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
-
-export CC_FOR_BUILD="$HOST_CC"
-export CPPFLAGS_FOR_BUILD="$HOST_CPPFLAGS"
-export CFLAGS_FOR_BUILD="$HOST_CFLAGS"
-export LDFLAGS_FOR_BUILD="$HOST_LDFLAGS"
-
-cd $PKG_BUILD
-./configure --host=$TARGET_NAME \
-            --build=$HOST_NAME \
-            --prefix=/usr \
-            --sysconfdir=/etc \
-            --localstatedir=/var \
-            --disable-static \
-            --enable-shared \
-            --disable-secure-rpc \
-            --enable-loadable-i18n \
-            --enable-xthreads \
-            --disable-xcms \
-            --enable-xlocale \
-            --disable-xlocaledir \
-            --enable-xkb \
-            --with-keysymdefdir="$SYSROOT_PREFIX/usr/include/X11" \
-            --disable-xf86bigfont \
-            --enable-malloc0returnsnull \
-            --disable-specs \
-            --without-xmlto \
-            --without-fop \
-            --enable-composecache \
-            --disable-lint-library \
-            --disable-ipv6 \
-            --without-launchd \
-            --without-lint
-
-make
-make -C nls DESTDIR=`pwd`/.install install
-
-$MAKEINSTALL
-
diff --git a/packages/x11/lib/libX11/install b/packages/x11/lib/libX11/install
deleted file mode 100755
index fb944d100e..0000000000
--- a/packages/x11/lib/libX11/install
+++ /dev/null
@@ -1,34 +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/libX11*.so* $INSTALL/usr/lib
-  rm -rf $INSTALL/usr/lib/libX11*.so*T
-
-mkdir -p $INSTALL
-  cp -R $PKG_BUILD/.install/* $INSTALL
-
-mkdir -p $INSTALL/usr/lib/X11/locale/common
-  cp -R $PKG_BUILD/modules/*/*/.libs/*.so* $INSTALL/usr/lib/X11/locale/common
-  rm -rf $INSTALL/usr/lib/X11/locale/common/*.so.*T
\ No newline at end of file
diff --git a/packages/x11/lib/libX11/meta b/packages/x11/lib/libX11/package.mk
similarity index 54%
rename from packages/x11/lib/libX11/meta
rename to packages/x11/lib/libX11/package.mk
index a9bc8e1bf6..d83221c3f7 100644
--- a/packages/x11/lib/libX11/meta
+++ b/packages/x11/lib/libX11/package.mk
@@ -26,11 +26,37 @@ 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=""
-PKG_BUILD_DEPENDS="toolchain xproto:host xproto util-macros xextproto xcmiscproto bigreqsproto kbproto inputproto xtrans libXau libxcb util-macros"
+PKG_BUILD_DEPENDS_TARGET="toolchain xproto:host xproto util-macros xextproto xcmiscproto bigreqsproto kbproto inputproto xtrans libXau libxcb util-macros"
 PKG_PRIORITY="optional"
 PKG_SECTION="x11/lib"
 PKG_SHORTDESC="libx11: The X11 library"
 PKG_LONGDESC="LibX11 is the main X11 library containing all the client-side code to access the X11 windowing system."
-PKG_IS_ADDON="no"
 
+PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
+
+PKG_CONFIGURE_OPTS_TARGET="--disable-secure-rpc \
+                           --enable-loadable-i18n \
+                           --enable-xthreads \
+                           --disable-xcms \
+                           --enable-xlocale \
+                           --disable-xlocaledir \
+                           --enable-xkb \
+                           --with-keysymdefdir=$SYSROOT_PREFIX/usr/include/X11 \
+                           --disable-xf86bigfont \
+                           --enable-malloc0returnsnull \
+                           --disable-specs \
+                           --without-xmlto \
+                           --without-fop \
+                           --enable-composecache \
+                           --disable-lint-library \
+                           --disable-ipv6 \
+                           --without-launchd \
+                           --without-lint"
+
+pre_configure_target() {
+  export CC_FOR_BUILD="$HOST_CC"
+  export CPPFLAGS_FOR_BUILD="$HOST_CPPFLAGS"
+  export CFLAGS_FOR_BUILD="$HOST_CFLAGS"
+  export LDFLAGS_FOR_BUILD="$HOST_LDFLAGS"
+}

From 7e6cd3c816d03176557490848926840a84aaf2a1 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Sun, 8 Sep 2013 17:21:08 +0200
Subject: [PATCH 05/23] libXau: convert to new package format

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/x11/lib/libXau/build                | 36 --------------------
 packages/x11/lib/libXau/{meta => package.mk} |  6 ++--
 2 files changed, 4 insertions(+), 38 deletions(-)
 delete mode 100755 packages/x11/lib/libXau/build
 rename packages/x11/lib/libXau/{meta => package.mk} (91%)

diff --git a/packages/x11/lib/libXau/build b/packages/x11/lib/libXau/build
deleted file mode 100755
index 74cff6ca74..0000000000
--- a/packages/x11/lib/libXau/build
+++ /dev/null
@@ -1,36 +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
-
-cd $PKG_BUILD
-./configure --host=$TARGET_NAME \
-            --build=$HOST_NAME \
-            --prefix=/usr \
-            --sysconfdir=/etc \
-            --localstatedir=/var \
-            --enable-static \
-            --disable-shared \
-            --enable-xthreads \
-
-make
-$MAKEINSTALL
diff --git a/packages/x11/lib/libXau/meta b/packages/x11/lib/libXau/package.mk
similarity index 91%
rename from packages/x11/lib/libXau/meta
rename to packages/x11/lib/libXau/package.mk
index 46b7bcf4d7..2922bc91c7 100644
--- a/packages/x11/lib/libXau/meta
+++ b/packages/x11/lib/libXau/package.mk
@@ -26,11 +26,13 @@ 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=""
-PKG_BUILD_DEPENDS="toolchain util-macros xproto"
+PKG_BUILD_DEPENDS_TARGET="toolchain util-macros xproto"
 PKG_PRIORITY="optional"
 PKG_SECTION="x11/lib"
 PKG_SHORTDESC="libXau: X authorization file management libary"
 PKG_LONGDESC="X authorization file management libary"
-PKG_IS_ADDON="no"
 
+PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
+
+PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared --enable-xthreads"

From cf37f2db536d7aecbbecc8877f2bb08d507f13dc Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Sun, 8 Sep 2013 17:24:25 +0200
Subject: [PATCH 06/23] libXcomposite: convert to new package format

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/x11/lib/libXcomposite/build          | 35 -------------------
 packages/x11/lib/libXcomposite/install        | 26 --------------
 .../lib/libXcomposite/{meta => package.mk}    |  4 +--
 3 files changed, 2 insertions(+), 63 deletions(-)
 delete mode 100755 packages/x11/lib/libXcomposite/build
 delete mode 100755 packages/x11/lib/libXcomposite/install
 rename packages/x11/lib/libXcomposite/{meta => package.mk} (93%)

diff --git a/packages/x11/lib/libXcomposite/build b/packages/x11/lib/libXcomposite/build
deleted file mode 100755
index bc16ebb259..0000000000
--- a/packages/x11/lib/libXcomposite/build
+++ /dev/null
@@ -1,35 +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
-
-cd $PKG_BUILD
-./configure --host=$TARGET_NAME \
-            --build=$HOST_NAME \
-            --prefix=/usr \
-            --sysconfdir=/etc \
-            --localstatedir=/var \
-            --disable-static \
-            --enable-shared \
-
-make
-$MAKEINSTALL
diff --git a/packages/x11/lib/libXcomposite/install b/packages/x11/lib/libXcomposite/install
deleted file mode 100755
index d8394ac5ca..0000000000
--- a/packages/x11/lib/libXcomposite/install
+++ /dev/null
@@ -1,26 +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/libXcomposite.so* $INSTALL/usr/lib
diff --git a/packages/x11/lib/libXcomposite/meta b/packages/x11/lib/libXcomposite/package.mk
similarity index 93%
rename from packages/x11/lib/libXcomposite/meta
rename to packages/x11/lib/libXcomposite/package.mk
index 6fc6fe5b34..06413b46fc 100644
--- a/packages/x11/lib/libXcomposite/meta
+++ b/packages/x11/lib/libXcomposite/package.mk
@@ -26,11 +26,11 @@ 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="libXfixes libXext libX11"
-PKG_BUILD_DEPENDS="toolchain util-macros compositeproto fixesproto libXfixes libXext libX11"
+PKG_BUILD_DEPENDS_TARGET="toolchain util-macros compositeproto fixesproto libXfixes libXext libX11"
 PKG_PRIORITY="optional"
 PKG_SECTION="x11/lib"
 PKG_SHORTDESC="libxcomposite: X Composite Library"
 PKG_LONGDESC="X Composite Library"
-PKG_IS_ADDON="no"
 
+PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"

From fb3d6402b11e8860fa88deb64d2042675614a14c Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Sun, 8 Sep 2013 17:27:17 +0200
Subject: [PATCH 07/23] libXdamage: convert to new package format

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/x11/lib/libXdamage/build             | 35 -------------------
 packages/x11/lib/libXdamage/install           | 26 --------------
 .../x11/lib/libXdamage/{meta => package.mk}   |  4 +--
 3 files changed, 2 insertions(+), 63 deletions(-)
 delete mode 100755 packages/x11/lib/libXdamage/build
 delete mode 100755 packages/x11/lib/libXdamage/install
 rename packages/x11/lib/libXdamage/{meta => package.mk} (94%)

diff --git a/packages/x11/lib/libXdamage/build b/packages/x11/lib/libXdamage/build
deleted file mode 100755
index bc16ebb259..0000000000
--- a/packages/x11/lib/libXdamage/build
+++ /dev/null
@@ -1,35 +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
-
-cd $PKG_BUILD
-./configure --host=$TARGET_NAME \
-            --build=$HOST_NAME \
-            --prefix=/usr \
-            --sysconfdir=/etc \
-            --localstatedir=/var \
-            --disable-static \
-            --enable-shared \
-
-make
-$MAKEINSTALL
diff --git a/packages/x11/lib/libXdamage/install b/packages/x11/lib/libXdamage/install
deleted file mode 100755
index e507eaae7a..0000000000
--- a/packages/x11/lib/libXdamage/install
+++ /dev/null
@@ -1,26 +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/libXdamage.so* $INSTALL/usr/lib
diff --git a/packages/x11/lib/libXdamage/meta b/packages/x11/lib/libXdamage/package.mk
similarity index 94%
rename from packages/x11/lib/libXdamage/meta
rename to packages/x11/lib/libXdamage/package.mk
index 1414a96c6a..9cea58aa3c 100644
--- a/packages/x11/lib/libXdamage/meta
+++ b/packages/x11/lib/libXdamage/package.mk
@@ -26,11 +26,11 @@ 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="libX11 libXfixes"
-PKG_BUILD_DEPENDS="toolchain util-macros damageproto fixesproto libX11 libXfixes"
+PKG_BUILD_DEPENDS_TARGET="toolchain util-macros damageproto fixesproto libX11 libXfixes"
 PKG_PRIORITY="optional"
 PKG_SECTION="x11/lib"
 PKG_SHORTDESC="libXdamage: X11 damaged region extension library"
 PKG_LONGDESC="LibXdamage provides an X Window System client interface to the DAMAGE extension to the X protocol. The Damage extension provides for notification of when on-screen regions have been 'damaged' (altered)."
-PKG_IS_ADDON="no"
 
+PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"

From d793580f76a019d6fcc35d118cba6f740b3de679 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Sun, 8 Sep 2013 17:33:56 +0200
Subject: [PATCH 08/23] libXext: convert to new package format

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/x11/lib/libXext/build                | 37 -------------------
 packages/x11/lib/libXext/install              | 26 -------------
 packages/x11/lib/libXext/{meta => package.mk} |  6 ++-
 3 files changed, 4 insertions(+), 65 deletions(-)
 delete mode 100755 packages/x11/lib/libXext/build
 delete mode 100755 packages/x11/lib/libXext/install
 rename packages/x11/lib/libXext/{meta => package.mk} (92%)

diff --git a/packages/x11/lib/libXext/build b/packages/x11/lib/libXext/build
deleted file mode 100755
index 24c92e1a83..0000000000
--- a/packages/x11/lib/libXext/build
+++ /dev/null
@@ -1,37 +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
-
-cd $PKG_BUILD
-./configure --host=$TARGET_NAME \
-            --build=$HOST_NAME \
-            --prefix=/usr \
-            --sysconfdir=/etc \
-            --localstatedir=/var \
-            --disable-static \
-            --enable-shared \
-            --enable-malloc0returnsnull \
-            --without-xmlto
-
-make
-$MAKEINSTALL
diff --git a/packages/x11/lib/libXext/install b/packages/x11/lib/libXext/install
deleted file mode 100755
index a8b2d63f60..0000000000
--- a/packages/x11/lib/libXext/install
+++ /dev/null
@@ -1,26 +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/libXext.so* $INSTALL/usr/lib
diff --git a/packages/x11/lib/libXext/meta b/packages/x11/lib/libXext/package.mk
similarity index 92%
rename from packages/x11/lib/libXext/meta
rename to packages/x11/lib/libXext/package.mk
index 5afffba8a9..20979318d3 100644
--- a/packages/x11/lib/libXext/meta
+++ b/packages/x11/lib/libXext/package.mk
@@ -26,11 +26,13 @@ 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="libX11"
-PKG_BUILD_DEPENDS="toolchain util-macros xextproto libX11"
+PKG_BUILD_DEPENDS_TARGET="toolchain util-macros xextproto libX11"
 PKG_PRIORITY="optional"
 PKG_SECTION="x11/lib"
 PKG_SHORTDESC="libxext: X11 miscellaneous extensions library"
 PKG_LONGDESC="LibXext provides an X Window System client interface to several extensions to the X protocol, iincluding DOUBLE-BUFFER (DBE), DPMS, Extended-Visual-Information (EVI), LBX, MIT-SHM, MIT-SUNDRY-NONSTANDARD, Multi-Buffering, SECURITY, SHAPE, SHAPE, SYNC, TOG-CUP, XC-APPGROUP, XC-MISC, XTEST and possibly others."
-PKG_IS_ADDON="no"
 
+PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
+
+PKG_CONFIGURE_OPTS_TARGET="--enable-malloc0returnsnull --without-xmlto"

From 9fda57fa4405056e9b655b48c49f9aa9b019af5f Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Sun, 8 Sep 2013 17:39:15 +0200
Subject: [PATCH 09/23] libXfixes: convert to new package format

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/x11/lib/libXfixes/build              | 35 -------------------
 packages/x11/lib/libXfixes/install            | 26 --------------
 .../x11/lib/libXfixes/{meta => package.mk}    |  4 +--
 3 files changed, 2 insertions(+), 63 deletions(-)
 delete mode 100755 packages/x11/lib/libXfixes/build
 delete mode 100755 packages/x11/lib/libXfixes/install
 rename packages/x11/lib/libXfixes/{meta => package.mk} (95%)

diff --git a/packages/x11/lib/libXfixes/build b/packages/x11/lib/libXfixes/build
deleted file mode 100755
index bc16ebb259..0000000000
--- a/packages/x11/lib/libXfixes/build
+++ /dev/null
@@ -1,35 +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
-
-cd $PKG_BUILD
-./configure --host=$TARGET_NAME \
-            --build=$HOST_NAME \
-            --prefix=/usr \
-            --sysconfdir=/etc \
-            --localstatedir=/var \
-            --disable-static \
-            --enable-shared \
-
-make
-$MAKEINSTALL
diff --git a/packages/x11/lib/libXfixes/install b/packages/x11/lib/libXfixes/install
deleted file mode 100755
index 6e14fd12dc..0000000000
--- a/packages/x11/lib/libXfixes/install
+++ /dev/null
@@ -1,26 +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/libXfixes.so* $INSTALL/usr/lib
diff --git a/packages/x11/lib/libXfixes/meta b/packages/x11/lib/libXfixes/package.mk
similarity index 95%
rename from packages/x11/lib/libXfixes/meta
rename to packages/x11/lib/libXfixes/package.mk
index 6f1007e70c..47e96e74b5 100644
--- a/packages/x11/lib/libXfixes/meta
+++ b/packages/x11/lib/libXfixes/package.mk
@@ -26,11 +26,11 @@ 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="libX11"
-PKG_BUILD_DEPENDS="toolchain util-macros fixesproto libX11"
+PKG_BUILD_DEPENDS_TARGET="toolchain util-macros fixesproto libX11"
 PKG_PRIORITY="optional"
 PKG_SECTION="x11/lib"
 PKG_SHORTDESC="libxfixes: X Fixes Library"
 PKG_LONGDESC="X Fixes Library"
-PKG_IS_ADDON="no"
 
+PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"

From d27c8fd507c5dc34862ca4499e37dd1b97e11def Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Sun, 8 Sep 2013 17:41:37 +0200
Subject: [PATCH 10/23] libXft: convert to new package format

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/x11/lib/libXft/build                | 35 --------------------
 packages/x11/lib/libXft/install              | 26 ---------------
 packages/x11/lib/libXft/{meta => package.mk} |  4 +--
 3 files changed, 2 insertions(+), 63 deletions(-)
 delete mode 100755 packages/x11/lib/libXft/build
 delete mode 100755 packages/x11/lib/libXft/install
 rename packages/x11/lib/libXft/{meta => package.mk} (94%)

diff --git a/packages/x11/lib/libXft/build b/packages/x11/lib/libXft/build
deleted file mode 100755
index 6523df5553..0000000000
--- a/packages/x11/lib/libXft/build
+++ /dev/null
@@ -1,35 +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
-
-cd $PKG_BUILD
-./configure --host=$TARGET_NAME \
-            --build=$HOST_NAME \
-            --prefix=/usr \
-            --enable-shared \
-            --disable-static \
-            --sysconfdir=/etc \
-            --localstatedir=/var \
-
-make
-$MAKEINSTALL
diff --git a/packages/x11/lib/libXft/install b/packages/x11/lib/libXft/install
deleted file mode 100755
index 9a1692eb11..0000000000
--- a/packages/x11/lib/libXft/install
+++ /dev/null
@@ -1,26 +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/*.so* $INSTALL/usr/lib
diff --git a/packages/x11/lib/libXft/meta b/packages/x11/lib/libXft/package.mk
similarity index 94%
rename from packages/x11/lib/libXft/meta
rename to packages/x11/lib/libXft/package.mk
index f4e06ed3b0..e12f8820bb 100644
--- a/packages/x11/lib/libXft/meta
+++ b/packages/x11/lib/libXft/package.mk
@@ -26,11 +26,11 @@ 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="libXrender fontconfig freetype"
-PKG_BUILD_DEPENDS="toolchain util-macros xproto libXrender fontconfig freetype"
+PKG_BUILD_DEPENDS_TARGET="toolchain util-macros xproto libXrender fontconfig freetype"
 PKG_PRIORITY="optional"
 PKG_SECTION="x11/lib"
 PKG_SHORTDESC="libxft: X FreeType library"
 PKG_LONGDESC="X FreeType library"
-PKG_IS_ADDON="no"
 
+PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"

From c82ae337f811ef2186ed08fd1943c56d04b4cebc Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Sun, 8 Sep 2013 17:45:23 +0200
Subject: [PATCH 11/23] libXi: convert to new package format

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/x11/lib/libXi/build                | 44 ---------------------
 packages/x11/lib/libXi/install              | 26 ------------
 packages/x11/lib/libXi/{meta => package.mk} | 14 ++++++-
 3 files changed, 12 insertions(+), 72 deletions(-)
 delete mode 100755 packages/x11/lib/libXi/build
 delete mode 100755 packages/x11/lib/libXi/install
 rename packages/x11/lib/libXi/{meta => package.mk} (75%)

diff --git a/packages/x11/lib/libXi/build b/packages/x11/lib/libXi/build
deleted file mode 100755
index 35a35e1f12..0000000000
--- a/packages/x11/lib/libXi/build
+++ /dev/null
@@ -1,44 +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
-
-cd $PKG_BUILD
-./configure --host=$TARGET_NAME \
-            --build=$HOST_NAME \
-            --prefix=/usr \
-            --sysconfdir=/etc \
-            --localstatedir=/var \
-            --disable-static \
-            --enable-shared \
-            --enable-malloc0returnsnull \
-            --disable-silent-rules \
-            --disable-docs \
-            --disable-specs \
-            --without-xmlto \
-            --without-fop \
-            --without-xsltproc \
-            --without-asciidoc \
-            --with-gnu-ld \
-
-make SUBDIRS="src"
-$MAKEINSTALL SUBDIRS="src"
diff --git a/packages/x11/lib/libXi/install b/packages/x11/lib/libXi/install
deleted file mode 100755
index 0235b93f17..0000000000
--- a/packages/x11/lib/libXi/install
+++ /dev/null
@@ -1,26 +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/libXi.so* $INSTALL/usr/lib
diff --git a/packages/x11/lib/libXi/meta b/packages/x11/lib/libXi/package.mk
similarity index 75%
rename from packages/x11/lib/libXi/meta
rename to packages/x11/lib/libXi/package.mk
index 04d287511b..5563a5e88c 100644
--- a/packages/x11/lib/libXi/meta
+++ b/packages/x11/lib/libXi/package.mk
@@ -26,11 +26,21 @@ 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="libX11"
-PKG_BUILD_DEPENDS="toolchain util-macros libX11 inputproto"
+PKG_BUILD_DEPENDS_TARGET="toolchain util-macros libX11 inputproto"
 PKG_PRIORITY="optional"
 PKG_SECTION="x11/lib"
 PKG_SHORTDESC="libxi: X11 Input extension library"
 PKG_LONGDESC="LibXi provides an X Window System client interface to the XINPUT extension to the X protocol."
-PKG_IS_ADDON="no"
 
+PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
+
+PKG_CONFIGURE_OPTS_TARGET="--enable-malloc0returnsnull \
+                           --disable-silent-rules \
+                           --disable-docs \
+                           --disable-specs \
+                           --without-xmlto \
+                           --without-fop \
+                           --without-xsltproc \
+                           --without-asciidoc \
+                           --with-gnu-ld"

From 0d144cae6082b28b402ef30b7b84c22adc2a0f9d Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Sun, 8 Sep 2013 17:51:10 +0200
Subject: [PATCH 12/23] libXinerama: convert to new package format

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/x11/lib/libXinerama/build            | 36 -------------------
 packages/x11/lib/libXinerama/install          | 26 --------------
 .../x11/lib/libXinerama/{meta => package.mk}  | 10 +++---
 3 files changed, 6 insertions(+), 66 deletions(-)
 delete mode 100755 packages/x11/lib/libXinerama/build
 delete mode 100755 packages/x11/lib/libXinerama/install
 rename packages/x11/lib/libXinerama/{meta => package.mk} (85%)

diff --git a/packages/x11/lib/libXinerama/build b/packages/x11/lib/libXinerama/build
deleted file mode 100755
index 9b972cd2dc..0000000000
--- a/packages/x11/lib/libXinerama/build
+++ /dev/null
@@ -1,36 +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
-
-cd $PKG_BUILD
-./configure --host=$TARGET_NAME \
-            --build=$HOST_NAME \
-            --prefix=/usr \
-            --sysconfdir=/etc \
-            --localstatedir=/var \
-            --disable-static \
-            --enable-shared \
-            --enable-malloc0returnsnull \
-
-make
-$MAKEINSTALL
diff --git a/packages/x11/lib/libXinerama/install b/packages/x11/lib/libXinerama/install
deleted file mode 100755
index 19156c2bd5..0000000000
--- a/packages/x11/lib/libXinerama/install
+++ /dev/null
@@ -1,26 +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/libXinerama.so* $INSTALL/usr/lib
diff --git a/packages/x11/lib/libXinerama/meta b/packages/x11/lib/libXinerama/package.mk
similarity index 85%
rename from packages/x11/lib/libXinerama/meta
rename to packages/x11/lib/libXinerama/package.mk
index 11b0da0c53..f5ae6c016c 100644
--- a/packages/x11/lib/libXinerama/meta
+++ b/packages/x11/lib/libXinerama/package.mk
@@ -26,11 +26,13 @@ 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="libXext"
-PKG_BUILD_DEPENDS="toolchain util-macros xineramaproto libXext"
+PKG_BUILD_DEPENDS_TARGET="toolchain util-macros xineramaproto libXext"
 PKG_PRIORITY="optional"
 PKG_SECTION="x11/lib"
-PKG_SHORTDESC="libxft: X FreeType library"
-PKG_LONGDESC="X FreeType library"
-PKG_IS_ADDON="no"
+PKG_SHORTDESC="libXinerama: The Xinerama library."
+PKG_LONGDESC="libXinerama is the Xinerama library."
 
+PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
+
+PKG_CONFIGURE_OPTS_TARGET="--enable-malloc0returnsnull"

From dd25ff34ebc74658294e521bee479d0c07db6747 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Sun, 8 Sep 2013 17:54:49 +0200
Subject: [PATCH 13/23] libXmu: convert to new package format, update to
 libXmu-1.1.2

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

diff --git a/packages/x11/lib/libXmu/build b/packages/x11/lib/libXmu/build
deleted file mode 100755
index a8ce43beb6..0000000000
--- a/packages/x11/lib/libXmu/build
+++ /dev/null
@@ -1,37 +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
-
-cd $PKG_BUILD
-./configure --host=$TARGET_NAME \
-            --build=$HOST_NAME \
-            --prefix=/usr \
-            --sysconfdir=/etc \
-            --localstatedir=/var \
-            --enable-static \
-            --disable-shared \
-            --with-gnu-ld \
-            --without-xmlto
-
-make
-$MAKEINSTALL
diff --git a/packages/x11/lib/libXmu/meta b/packages/x11/lib/libXmu/package.mk
similarity index 88%
rename from packages/x11/lib/libXmu/meta
rename to packages/x11/lib/libXmu/package.mk
index 40cecd59d3..6920f34fbd 100644
--- a/packages/x11/lib/libXmu/meta
+++ b/packages/x11/lib/libXmu/package.mk
@@ -19,18 +19,20 @@
 ################################################################################
 
 PKG_NAME="libXmu"
-PKG_VERSION="1.1.1"
+PKG_VERSION="1.1.2"
 PKG_REV="1"
 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="libXext libX11"
-PKG_BUILD_DEPENDS="toolchain util-macros xextproto libXext libX11 libXt"
+PKG_BUILD_DEPENDS_TARGET="toolchain util-macros xextproto libXext libX11 libXt"
 PKG_PRIORITY="optional"
 PKG_SECTION="x11/lib"
 PKG_SHORTDESC="libxmu: X11 miscellaneous utility library"
 PKG_LONGDESC="LibXmu provides a set of miscellaneous utility convenience functions for X libraries to use."
-PKG_IS_ADDON="no"
 
+PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
+
+PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared --with-gnu-ld --without-xmlto"

From 402fbaa6b56572d37b2d7b003e8e8dcac271fb06 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Sun, 8 Sep 2013 18:04:39 +0200
Subject: [PATCH 14/23] libXrandr: convert to new package format, update to
 libXrandr-1.4.2

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/x11/lib/libXrandr/build              | 36 -------------------
 packages/x11/lib/libXrandr/install            | 26 --------------
 .../x11/lib/libXrandr/{meta => package.mk}    |  8 +++--
 3 files changed, 5 insertions(+), 65 deletions(-)
 delete mode 100755 packages/x11/lib/libXrandr/build
 delete mode 100755 packages/x11/lib/libXrandr/install
 rename packages/x11/lib/libXrandr/{meta => package.mk} (91%)

diff --git a/packages/x11/lib/libXrandr/build b/packages/x11/lib/libXrandr/build
deleted file mode 100755
index 4c9ab67460..0000000000
--- a/packages/x11/lib/libXrandr/build
+++ /dev/null
@@ -1,36 +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
-
-cd $PKG_BUILD
-./configure --host=$TARGET_NAME \
-            --build=$HOST_NAME \
-            --prefix=/usr \
-            --sysconfdir=/etc \
-            --localstatedir=/var \
-            --disable-static \
-            --enable-shared \
-            --enable-malloc0returnsnull
-
-make
-$MAKEINSTALL
diff --git a/packages/x11/lib/libXrandr/install b/packages/x11/lib/libXrandr/install
deleted file mode 100755
index 73a2ef5595..0000000000
--- a/packages/x11/lib/libXrandr/install
+++ /dev/null
@@ -1,26 +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/libXrandr.so* $INSTALL/usr/lib
diff --git a/packages/x11/lib/libXrandr/meta b/packages/x11/lib/libXrandr/package.mk
similarity index 91%
rename from packages/x11/lib/libXrandr/meta
rename to packages/x11/lib/libXrandr/package.mk
index 16f58331fb..ae75cb9c58 100644
--- a/packages/x11/lib/libXrandr/meta
+++ b/packages/x11/lib/libXrandr/package.mk
@@ -19,18 +19,20 @@
 ################################################################################
 
 PKG_NAME="libXrandr"
-PKG_VERSION="1.4.1"
+PKG_VERSION="1.4.2"
 PKG_REV="1"
 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="libX11 libXrender libXext"
-PKG_BUILD_DEPENDS="toolchain util-macros randrproto libX11 libXrender libXext"
+PKG_BUILD_DEPENDS_TARGET="toolchain util-macros randrproto libX11 libXrender libXext"
 PKG_PRIORITY="optional"
 PKG_SECTION="x11/lib"
 PKG_SHORTDESC="libxrandr: X Resize, Rotate and Reflection extension client library"
 PKG_LONGDESC="Xrandr is a simple library designed to interface the X Resize and Rotate Extension. This allows clients to change the size and rotation of the root window of a screen, along with the ability to reflect the screen about either axis."
-PKG_IS_ADDON="no"
 
+PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
+
+PKG_CONFIGURE_OPTS_TARGET="--enable-malloc0returnsnull"

From ea4be9cb20106a7b895d4d83555d3ca526b0bb8b Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Sun, 8 Sep 2013 18:07:23 +0200
Subject: [PATCH 15/23] libXrender: convert to new package format

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/x11/lib/libXrender/build             | 36 -------------------
 packages/x11/lib/libXrender/install           | 26 --------------
 .../x11/lib/libXrender/{meta => package.mk}   |  6 ++--
 3 files changed, 4 insertions(+), 64 deletions(-)
 delete mode 100755 packages/x11/lib/libXrender/build
 delete mode 100755 packages/x11/lib/libXrender/install
 rename packages/x11/lib/libXrender/{meta => package.mk} (93%)

diff --git a/packages/x11/lib/libXrender/build b/packages/x11/lib/libXrender/build
deleted file mode 100755
index 2bcf380df0..0000000000
--- a/packages/x11/lib/libXrender/build
+++ /dev/null
@@ -1,36 +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
-
-cd $PKG_BUILD
-./configure --host=$TARGET_NAME \
-            --build=$HOST_NAME \
-            --prefix=/usr \
-            --sysconfdir=/etc \
-            --localstatedir=/var \
-            --disable-static \
-            --enable-shared \
-            --enable-malloc0returnsnull
-
-make
-$MAKEINSTALL
\ No newline at end of file
diff --git a/packages/x11/lib/libXrender/install b/packages/x11/lib/libXrender/install
deleted file mode 100755
index beb1abb691..0000000000
--- a/packages/x11/lib/libXrender/install
+++ /dev/null
@@ -1,26 +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/libXrender.so* $INSTALL/usr/lib
diff --git a/packages/x11/lib/libXrender/meta b/packages/x11/lib/libXrender/package.mk
similarity index 93%
rename from packages/x11/lib/libXrender/meta
rename to packages/x11/lib/libXrender/package.mk
index e282cf3a91..f5624db428 100644
--- a/packages/x11/lib/libXrender/meta
+++ b/packages/x11/lib/libXrender/package.mk
@@ -26,11 +26,13 @@ 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="libX11"
-PKG_BUILD_DEPENDS="toolchain util-macros renderproto libX11"
+PKG_BUILD_DEPENDS_TARGET="toolchain util-macros renderproto libX11"
 PKG_PRIORITY="optional"
 PKG_SECTION="x11/lib"
 PKG_SHORTDESC="libxrender: X Rendering Extension client library"
 PKG_LONGDESC="The X Rendering Extension (Render) introduces digital image composition as the foundation of a new rendering model within the X Window System. Rendering geometric figures is accomplished by client-side tesselation into either triangles or trapezoids."
-PKG_IS_ADDON="no"
 
+PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
+
+PKG_CONFIGURE_OPTS_TARGET="--enable-malloc0returnsnull"

From ee60f74792f73fb817a604953b2c5dd8526322df Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Sun, 8 Sep 2013 18:12:54 +0200
Subject: [PATCH 16/23] libXt: convert to new package format

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

diff --git a/packages/x11/lib/libXt/build b/packages/x11/lib/libXt/build
deleted file mode 100755
index 0610a486d3..0000000000
--- a/packages/x11/lib/libXt/build
+++ /dev/null
@@ -1,38 +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
-
-cd $PKG_BUILD
-./configure --host=$TARGET_NAME \
-            --build=$HOST_NAME \
-            --prefix=/usr \
-            --sysconfdir=/etc \
-            --localstatedir=/var \
-            --enable-static \
-            --disable-shared \
-            --with-gnu-ld \
-            --enable-malloc0returnsnull \
-
-make -C util CC=$HOST_CC CFLAGS="$HOST_CFLAGS -I$SYSROOT_PREFIX/usr/include" LDFLAGS="$HOST_LDFLAGS" makestrs
-make
-$MAKEINSTALL
diff --git a/packages/x11/lib/libXt/meta b/packages/x11/lib/libXt/package.mk
similarity index 78%
rename from packages/x11/lib/libXt/meta
rename to packages/x11/lib/libXt/package.mk
index db43008d18..5eb664a45e 100644
--- a/packages/x11/lib/libXt/meta
+++ b/packages/x11/lib/libXt/package.mk
@@ -26,11 +26,23 @@ 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="libX11"
-PKG_BUILD_DEPENDS="toolchain util-macros libX11 libSM"
+PKG_BUILD_DEPENDS_TARGET="toolchain util-macros libX11 libSM"
 PKG_PRIORITY="optional"
 PKG_SECTION="x11/lib"
 PKG_SHORTDESC="libxt: X11 toolkit intrinsics library"
 PKG_LONGDESC="LibXt provides the X Toolkit Intrinsics, an abstract widget library upon which other toolkits are based. Xt is the basis for many toolkits, including the Athena widgets (Xaw), and LessTif."
-PKG_IS_ADDON="no"
 
+PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
+
+PKG_CONFIGURE_OPTS_TARGET="--enable-static \
+                           --disable-shared \
+                           --with-gnu-ld \
+                           --enable-malloc0returnsnull"
+
+pre_make_target() {
+  make -C util CC=$HOST_CC \
+               CFLAGS="$HOST_CFLAGS -I$SYSROOT_PREFIX/usr/include" \
+               LDFLAGS="$HOST_LDFLAGS" \
+               makestrs
+}

From 93c5a1a99b835a1fa478c1c6ee08ac5cfa7aaa1b Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Sun, 8 Sep 2013 18:16:43 +0200
Subject: [PATCH 17/23] libXtst: convert to new package format

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/x11/lib/libXtst/build                | 37 -------------------
 packages/x11/lib/libXtst/install              | 26 -------------
 packages/x11/lib/libXtst/{meta => package.mk} |  6 ++-
 3 files changed, 4 insertions(+), 65 deletions(-)
 delete mode 100755 packages/x11/lib/libXtst/build
 delete mode 100755 packages/x11/lib/libXtst/install
 rename packages/x11/lib/libXtst/{meta => package.mk} (89%)

diff --git a/packages/x11/lib/libXtst/build b/packages/x11/lib/libXtst/build
deleted file mode 100755
index fa238f3205..0000000000
--- a/packages/x11/lib/libXtst/build
+++ /dev/null
@@ -1,37 +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
-
-cd $PKG_BUILD
-./configure --host=$TARGET_NAME \
-            --build=$HOST_NAME \
-            --prefix=/usr \
-            --sysconfdir=/etc \
-            --localstatedir=/var \
-            --disable-static \
-            --enable-shared \
-            --with-gnu-ld \
-            --without-xmlto \
-
-make
-$MAKEINSTALL
diff --git a/packages/x11/lib/libXtst/install b/packages/x11/lib/libXtst/install
deleted file mode 100755
index 9a1692eb11..0000000000
--- a/packages/x11/lib/libXtst/install
+++ /dev/null
@@ -1,26 +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/*.so* $INSTALL/usr/lib
diff --git a/packages/x11/lib/libXtst/meta b/packages/x11/lib/libXtst/package.mk
similarity index 89%
rename from packages/x11/lib/libXtst/meta
rename to packages/x11/lib/libXtst/package.mk
index 528d3f5cbd..1e820b5ba1 100644
--- a/packages/x11/lib/libXtst/meta
+++ b/packages/x11/lib/libXtst/package.mk
@@ -26,11 +26,13 @@ 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="libXext libXi libX11"
-PKG_BUILD_DEPENDS="toolchain util-macros recordproto xextproto libXext inputproto libXi libX11"
+PKG_BUILD_DEPENDS_TARGET="toolchain util-macros recordproto xextproto libXext inputproto libXi libX11"
 PKG_PRIORITY="optional"
 PKG_SECTION="x11/lib"
 PKG_SHORTDESC="libxtst: The Xtst Library"
 PKG_LONGDESC="The Xtst Library"
-PKG_IS_ADDON="no"
 
+PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
+
+PKG_CONFIGURE_OPTS_TARGET="--with-gnu-ld --without-xmlto"

From a4061d2b2366ee748684630e16b736951e30573a Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Sun, 8 Sep 2013 18:19:22 +0200
Subject: [PATCH 18/23] libXxf86vm: convert to new package format

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/x11/lib/libXxf86vm/build             | 36 -------------------
 .../x11/lib/libXxf86vm/{meta => package.mk}   |  6 ++--
 2 files changed, 4 insertions(+), 38 deletions(-)
 delete mode 100755 packages/x11/lib/libXxf86vm/build
 rename packages/x11/lib/libXxf86vm/{meta => package.mk} (90%)

diff --git a/packages/x11/lib/libXxf86vm/build b/packages/x11/lib/libXxf86vm/build
deleted file mode 100755
index 1d264cc37a..0000000000
--- a/packages/x11/lib/libXxf86vm/build
+++ /dev/null
@@ -1,36 +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
-
-cd $PKG_BUILD
-./configure --host=$TARGET_NAME \
-            --build=$HOST_NAME \
-            --prefix=/usr \
-            --sysconfdir=/etc \
-            --localstatedir=/var \
-            --enable-static \
-            --disable-shared \
-            --enable-malloc0returnsnull
-
-make
-$MAKEINSTALL
diff --git a/packages/x11/lib/libXxf86vm/meta b/packages/x11/lib/libXxf86vm/package.mk
similarity index 90%
rename from packages/x11/lib/libXxf86vm/meta
rename to packages/x11/lib/libXxf86vm/package.mk
index 75b9b814ea..625acd6d3d 100644
--- a/packages/x11/lib/libXxf86vm/meta
+++ b/packages/x11/lib/libXxf86vm/package.mk
@@ -26,11 +26,13 @@ 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="libX11 libXext"
-PKG_BUILD_DEPENDS="toolchain util-macros xf86vidmodeproto libX11 libXext"
+PKG_BUILD_DEPENDS_TARGET="toolchain util-macros xf86vidmodeproto libX11 libXext"
 PKG_PRIORITY="optional"
 PKG_SECTION="x11/lib"
 PKG_SHORTDESC="libxxf86vm: Extension library for the XFree86-VidMode X extension"
 PKG_LONGDESC="The libxxf86vm provides an interface to the server extension XFree86-VidModeExtension which allows the video modes to be queried and adjusted dynamically and mode switching to be controlled."
-PKG_IS_ADDON="no"
 
+PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
+
+PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared --enable-malloc0returnsnull"

From 1b0e4f5f2fc8aa0714e43f4d017f7147400d2d26 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Sun, 8 Sep 2013 18:23:34 +0200
Subject: [PATCH 19/23] libfontenc: convert to new package format

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/x11/lib/libfontenc/build             | 36 -------------------
 .../x11/lib/libfontenc/{meta => package.mk}   | 10 ++++--
 2 files changed, 8 insertions(+), 38 deletions(-)
 delete mode 100755 packages/x11/lib/libfontenc/build
 rename packages/x11/lib/libfontenc/{meta => package.mk} (88%)

diff --git a/packages/x11/lib/libfontenc/build b/packages/x11/lib/libfontenc/build
deleted file mode 100755
index 3e7e0df18c..0000000000
--- a/packages/x11/lib/libfontenc/build
+++ /dev/null
@@ -1,36 +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
-
-CFLAGS="$CFLAGS -fPIC -DPIC"
-
-cd $PKG_BUILD
-./configure --host=$TARGET_NAME \
-            --build=$HOST_NAME \
-            --prefix=/usr \
-            --sysconfdir=/etc \
-            --enable-static \
-            --disable-shared \
-
-make
-$MAKEINSTALL
diff --git a/packages/x11/lib/libfontenc/meta b/packages/x11/lib/libfontenc/package.mk
similarity index 88%
rename from packages/x11/lib/libfontenc/meta
rename to packages/x11/lib/libfontenc/package.mk
index 10ed333791..5256b02f47 100644
--- a/packages/x11/lib/libfontenc/meta
+++ b/packages/x11/lib/libfontenc/package.mk
@@ -26,11 +26,17 @@ 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=""
-PKG_BUILD_DEPENDS="toolchain util-macros xproto zlib font-util"
+PKG_BUILD_DEPENDS_TARGETS="toolchain util-macros xproto zlib font-util"
 PKG_PRIORITY="optional"
 PKG_SECTION="x11/lib"
 PKG_SHORTDESC="libfontenc: X11 font encoding library"
 PKG_LONGDESC="Libfontenc is a library which helps font libraries portably determine and deal with different encodings of fonts."
-PKG_IS_ADDON="no"
 
+PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
+
+PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared"
+
+pre_configure_target() {
+  export CFLAGS="$CFLAGS -fPIC -DPIC"
+}

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 20/23] 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"
+}

From f30cc4eab09d697d7cbf163480db83b1d27cdaa5 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Sun, 8 Sep 2013 18:44:06 +0200
Subject: [PATCH 21/23] libxkbfile: convert to new package format

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/x11/lib/libxkbfile/build             | 34 -------------------
 .../x11/lib/libxkbfile/{meta => package.mk}   |  6 ++--
 2 files changed, 4 insertions(+), 36 deletions(-)
 delete mode 100755 packages/x11/lib/libxkbfile/build
 rename packages/x11/lib/libxkbfile/{meta => package.mk} (92%)

diff --git a/packages/x11/lib/libxkbfile/build b/packages/x11/lib/libxkbfile/build
deleted file mode 100755
index b7354b673f..0000000000
--- a/packages/x11/lib/libxkbfile/build
+++ /dev/null
@@ -1,34 +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
-
-cd $PKG_BUILD
-./configure --host=$TARGET_NAME \
-            --build=$HOST_NAME \
-            --prefix=/usr \
-            --sysconfdir=/etc \
-            --enable-static \
-            --disable-shared \
-
-make
-$MAKEINSTALL
diff --git a/packages/x11/lib/libxkbfile/meta b/packages/x11/lib/libxkbfile/package.mk
similarity index 92%
rename from packages/x11/lib/libxkbfile/meta
rename to packages/x11/lib/libxkbfile/package.mk
index 11bb6bff9f..11b76c3685 100644
--- a/packages/x11/lib/libxkbfile/meta
+++ b/packages/x11/lib/libxkbfile/package.mk
@@ -26,11 +26,13 @@ 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=""
-PKG_BUILD_DEPENDS="toolchain util-macros kbproto libX11"
+PKG_BUILD_DEPENDS_TARGET="toolchain util-macros kbproto libX11"
 PKG_PRIORITY="optional"
 PKG_SECTION="x11/lib"
 PKG_SHORTDESC="libxkbfile: X11 keyboard file manipulation library"
 PKG_LONGDESC="Libxkbfile provides an interface to read and manipulate description files for XKB, the X11 keyboard configuration extension."
-PKG_IS_ADDON="no"
 
+PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
+
+PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared"

From bf9162c54818339eaada0723267b049e9597b105 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Sun, 8 Sep 2013 19:00:41 +0200
Subject: [PATCH 22/23] pixman: convert to new package format

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/x11/lib/pixman/build                | 62 --------------------
 packages/x11/lib/pixman/install              | 26 --------
 packages/x11/lib/pixman/{meta => package.mk} | 32 +++++++++-
 3 files changed, 30 insertions(+), 90 deletions(-)
 delete mode 100755 packages/x11/lib/pixman/build
 delete mode 100755 packages/x11/lib/pixman/install
 rename packages/x11/lib/pixman/{meta => package.mk} (57%)

diff --git a/packages/x11/lib/pixman/build b/packages/x11/lib/pixman/build
deleted file mode 100755
index 98b5b2e4de..0000000000
--- a/packages/x11/lib/pixman/build
+++ /dev/null
@@ -1,62 +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
-
-if [ "$TARGET_ARCH" = arm ]; then
-  if [ "$TARGET_FPU" = neon -o "$TARGET_FPU" = neon-fp16 ]; then
-    CFG_NEON="--enable-arm-neon"
-  else
-    CFG_NEON="--disable-arm-neon"
-  fi
-  ARCH_CONFIG="--disable-mmx --disable-sse2 --disable-vmx --enable-arm-simd $CFG_NEON --disable-arm-iwmmxt"
-elif [ "$TARGET_ARCH" = i386 -o "$TARGET_ARCH" = x86_64  ]; then
-  ARCH_CONFIG="--enable-mmx --enable-sse2 --disable-vmx --disable-arm-simd --disable-arm-neon"
-fi
-
-cd $PKG_BUILD
-./configure --host=$TARGET_NAME \
-            --build=$HOST_NAME \
-            --prefix=/usr \
-            --sysconfdir=/etc \
-            --disable-silent-rules \
-            --enable-shared \
-            --disable-static \
-            --disable-openmp \
-            --disable-loongson-mmi \
-            $ARCH_CONFIG \
-            --disable-mips-dspr2 \
-            --enable-gcc-inline-asm \
-            --disable-timers \
-            --disable-gtk \
-            --disable-libpng \
-            --with-gnu-ld
-
-echo "" > test/Makefile.am
-
-make
-$MAKEINSTALL
-
-cp $SYSROOT_PREFIX/usr/lib/pkgconfig/pixman-1.pc \
-   $SYSROOT_PREFIX/usr/lib/pkgconfig/pixman.pc
-cp -rf $SYSROOT_PREFIX/usr/include/pixman-1 \
-   $SYSROOT_PREFIX/usr/include/pixman
diff --git a/packages/x11/lib/pixman/install b/packages/x11/lib/pixman/install
deleted file mode 100755
index 31b32b8cf9..0000000000
--- a/packages/x11/lib/pixman/install
+++ /dev/null
@@ -1,26 +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/pixman/.libs/*.so* $INSTALL/usr/lib
diff --git a/packages/x11/lib/pixman/meta b/packages/x11/lib/pixman/package.mk
similarity index 57%
rename from packages/x11/lib/pixman/meta
rename to packages/x11/lib/pixman/package.mk
index 5ed83b3386..b70877a1b3 100644
--- a/packages/x11/lib/pixman/meta
+++ b/packages/x11/lib/pixman/package.mk
@@ -26,11 +26,39 @@ 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=""
-PKG_BUILD_DEPENDS="toolchain util-macros"
+PKG_BUILD_DEPENDS_TARGET="toolchain util-macros"
 PKG_PRIORITY="optional"
 PKG_SECTION="x11/lib"
 PKG_SHORTDESC="pixman: Pixel manipulation library"
 PKG_LONGDESC="Pixman is a generic library for manipulating pixel regions, contains low-level pixel manipulation routines and is used by both xorg and cairo."
-PKG_IS_ADDON="no"
 
+PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
+
+if [ "$TARGET_ARCH" = arm ]; then
+  if [ "$TARGET_FPU" = neon -o "$TARGET_FPU" = neon-fp16 ]; then
+    PIXMAN_NEON="--enable-arm-neon"
+  else
+    PIXMAN_NEON="--disable-arm-neon"
+  fi
+  PIXMAN_CONFIG="--disable-mmx --disable-sse2 --disable-vmx --enable-arm-simd $PIXMAN_NEON --disable-arm-iwmmxt"
+elif [ "$TARGET_ARCH" = i386 -o "$TARGET_ARCH" = x86_64  ]; then
+  PIXMAN_CONFIG="--enable-mmx --enable-sse2 --disable-vmx --disable-arm-simd --disable-arm-neon"
+fi
+
+PKG_CONFIGURE_OPTS_TARGET="--disable-openmp \
+                           --disable-loongson-mmi \
+                           $PIXMAN_CONFIG \
+                           --disable-mips-dspr2 \
+                           --enable-gcc-inline-asm \
+                           --disable-timers \
+                           --disable-gtk \
+                           --disable-libpng \
+                           --with-gnu-ld"
+
+post_makeinstall_target() {
+  cp $SYSROOT_PREFIX/usr/lib/pkgconfig/pixman-1.pc \
+     $SYSROOT_PREFIX/usr/lib/pkgconfig/pixman.pc
+  cp -rf $SYSROOT_PREFIX/usr/include/pixman-1 \
+     $SYSROOT_PREFIX/usr/include/pixman
+}

From 7ecad204450c1b4ba8e362c64dd90742256332c3 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Sun, 8 Sep 2013 19:06:16 +0200
Subject: [PATCH 23/23] xtrans convert to new package format

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

diff --git a/packages/x11/lib/xtrans/build b/packages/x11/lib/xtrans/build
deleted file mode 100755
index ef3a4338a6..0000000000
--- a/packages/x11/lib/xtrans/build
+++ /dev/null
@@ -1,36 +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
-
-cd $PKG_BUILD
-./configure --host=$TARGET_NAME \
-            --build=$HOST_NAME \
-            --prefix=/usr \
-            --sysconfdir=/etc \
-            --without-xmlto
-
-make
-$MAKEINSTALL
-
-mkdir -p $SYSROOT_PREFIX/usr/lib/pkgconfig
-  cp xtrans.pc $SYSROOT_PREFIX/usr/lib/pkgconfig
\ No newline at end of file
diff --git a/packages/x11/lib/xtrans/meta b/packages/x11/lib/xtrans/package.mk
similarity index 86%
rename from packages/x11/lib/xtrans/meta
rename to packages/x11/lib/xtrans/package.mk
index 1724f1df35..51b64bfa2c 100644
--- a/packages/x11/lib/xtrans/meta
+++ b/packages/x11/lib/xtrans/package.mk
@@ -26,11 +26,18 @@ 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=""
-PKG_BUILD_DEPENDS="toolchain util-macros"
+PKG_BUILD_DEPENDS_TARGET="toolchain util-macros"
 PKG_PRIORITY="optional"
 PKG_SECTION="x11/lib"
 PKG_SHORTDESC="xtrans: Abstract network code for X"
 PKG_LONGDESC="Abstract network code for X."
-PKG_IS_ADDON="no"
 
+PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
+
+PKG_CONFIGURE_OPTS_TARGET="--without-xmlto"
+
+post_makeinstall_target() {
+  mkdir -p $SYSROOT_PREFIX/usr/lib/pkgconfig
+    cp xtrans.pc $SYSROOT_PREFIX/usr/lib/pkgconfig
+}