From bae8c36ff84cc642f8c86da2a310e5309c5b9492 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Mon, 5 Aug 2013 12:47:44 +0200 Subject: [PATCH 1/8] fontconfig: fix build Signed-off-by: Stephan Raue --- packages/x11/other/fontconfig/package.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/x11/other/fontconfig/package.mk b/packages/x11/other/fontconfig/package.mk index 4e69f1d120..9a48b6e011 100644 --- a/packages/x11/other/fontconfig/package.mk +++ b/packages/x11/other/fontconfig/package.mk @@ -36,7 +36,6 @@ PKG_IS_ADDON="no" PKG_AUTORECONF="yes" PKG_CONFIGURE_OPTS_TARGET="--with-arch=$TARGET_ARCH \ - --with-freetype-config=$ROOT/$TOOLCHAIN/bin/freetype-config \ --with-default-fonts=/usr/share/fonts/liberation \ --without-add-fonts \ --disable-dependency-tracking \ @@ -46,6 +45,8 @@ pre_configure_target() { # ensure we dont use '-O3' optimization. CFLAGS=`echo $CFLAGS | sed -e "s|-O3|-O2|"` CXXFLAGS=`echo $CXXFLAGS | sed -e "s|-O3|-O2|"` + CFLAGS="$CFLAGS -I$ROOT/$PKG_BUILD" + CXXFLAGS="$CXXFLAGS -I$ROOT/$PKG_BUILD" } post_makeinstall_target() { From e1e984aaf34a1ace4b56f47d971bf88c189d99da Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Tue, 6 Aug 2013 10:33:51 +0300 Subject: [PATCH 2/8] sync unofficial --- packages/unofficial | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/unofficial b/packages/unofficial index 726e8ef3d6..ff051d8de5 160000 --- a/packages/unofficial +++ b/packages/unofficial @@ -1 +1 @@ -Subproject commit 726e8ef3d6addd5ff2cf4525be574d6e5abd5a57 +Subproject commit ff051d8de5a8cc1cc378653df36e0a17ac95a9c1 From bb45d810726ac683b769c248429489df3add01bb Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Tue, 6 Aug 2013 11:20:32 +0300 Subject: [PATCH 3/8] bluez: obexd: use system bus --- .../patches/bluez-obexd-use-system-bus.patch | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 packages/network/bluez/patches/bluez-obexd-use-system-bus.patch diff --git a/packages/network/bluez/patches/bluez-obexd-use-system-bus.patch b/packages/network/bluez/patches/bluez-obexd-use-system-bus.patch new file mode 100644 index 0000000000..dd52a299ea --- /dev/null +++ b/packages/network/bluez/patches/bluez-obexd-use-system-bus.patch @@ -0,0 +1,25 @@ +From 20dfa1079c088236bcd63f1a986956b488177ebf Mon Sep 17 00:00:00 2001 +From: Stefan Saraev +Date: Tue, 6 Aug 2013 11:18:09 +0300 +Subject: [PATCH] obexd: use system bus + +--- + obexd/src/manager.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/obexd/src/manager.c b/obexd/src/manager.c +index dbfbef8..9a29f8c 100644 +--- a/obexd/src/manager.c ++++ b/obexd/src/manager.c +@@ -569,7 +569,7 @@ gboolean manager_init(void) + + dbus_error_init(&err); + +- connection = g_dbus_setup_bus(DBUS_BUS_SESSION, OBEXD_SERVICE, &err); ++ connection = g_dbus_setup_bus(DBUS_BUS_SYSTEM, OBEXD_SERVICE, &err); + if (connection == NULL) { + if (dbus_error_is_set(&err) == TRUE) { + fprintf(stderr, "%s\n", err.message); +-- +1.7.2.5 + From 6f8fc86e386ba015ffc63dc158f758da9a30523a Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Tue, 6 Aug 2013 11:21:30 +0300 Subject: [PATCH 4/8] bluez: install obexd as system service --- packages/network/bluez/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/network/bluez/package.mk b/packages/network/bluez/package.mk index ee94378618..823d702a95 100644 --- a/packages/network/bluez/package.mk +++ b/packages/network/bluez/package.mk @@ -71,6 +71,6 @@ pre_configure_target() { } post_makeinstall_target() { - mkdir -p $INSTALL/usr/share/dbus-1/services - cp $PKG_DIR/config/org.bluez.obex.service $INSTALL/usr/share/dbus-1/services + mkdir -p $INSTALL/usr/share/dbus-1/system-services + cp $PKG_DIR/config/org.bluez.obex.service $INSTALL/usr/share/dbus-1/system-services } From 2d7faa8b220b825f95d4e5f17e0948e1daaa0874 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Tue, 6 Aug 2013 12:37:04 +0300 Subject: [PATCH 5/8] bluez: add obexd policy --- .../patches/bluez-add-obexd-policy.patch | 53 +++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 packages/network/bluez/patches/bluez-add-obexd-policy.patch diff --git a/packages/network/bluez/patches/bluez-add-obexd-policy.patch b/packages/network/bluez/patches/bluez-add-obexd-policy.patch new file mode 100644 index 0000000000..f8080a0f32 --- /dev/null +++ b/packages/network/bluez/patches/bluez-add-obexd-policy.patch @@ -0,0 +1,53 @@ +From ef19c237a2578bd78cd75b4be636207c06e34c11 Mon Sep 17 00:00:00 2001 +From: Stefan Saraev +Date: Tue, 6 Aug 2013 12:35:27 +0300 +Subject: [PATCH] add obexd policy + +--- + src/bluetooth.conf | 16 ++++++++++++++++ + 1 files changed, 16 insertions(+), 0 deletions(-) + +diff --git a/src/bluetooth.conf b/src/bluetooth.conf +index 0495200..38020d7 100644 +--- a/src/bluetooth.conf ++++ b/src/bluetooth.conf +@@ -18,20 +18,36 @@ + + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + + ++ + + + + + ++ + + + + ++ + + + +-- +1.7.2.5 + From 3d6039d605499f99ba823f3c060a28d4926b3d20 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Tue, 6 Aug 2013 12:50:31 +0300 Subject: [PATCH 6/8] bluez: obexd: set root folder location --- packages/network/bluez/config/org.bluez.obex.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/network/bluez/config/org.bluez.obex.service b/packages/network/bluez/config/org.bluez.obex.service index 8c3a8a0517..4a34bd8b76 100644 --- a/packages/network/bluez/config/org.bluez.obex.service +++ b/packages/network/bluez/config/org.bluez.obex.service @@ -1,5 +1,5 @@ [D-BUS Service] Name=org.bluez.obex -Exec=/usr/lib/bluetooth/obexd +Exec=/usr/lib/bluetooth/obexd -r /storage/downloads User=root From 2689c5252f6fe1bf76f1c183e8faa88f24f69bd2 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 6 Aug 2013 11:54:08 +0200 Subject: [PATCH 7/8] wpa_supplicant: convert to new package format Signed-off-by: Stephan Raue --- packages/network/wpa_supplicant/build | 37 ------------------- packages/network/wpa_supplicant/install | 34 ----------------- .../wpa_supplicant/{meta => package.mk} | 30 ++++++++++++++- 3 files changed, 28 insertions(+), 73 deletions(-) delete mode 100755 packages/network/wpa_supplicant/build delete mode 100755 packages/network/wpa_supplicant/install rename packages/network/wpa_supplicant/{meta => package.mk} (64%) diff --git a/packages/network/wpa_supplicant/build b/packages/network/wpa_supplicant/build deleted file mode 100755 index 3111eda243..0000000000 --- a/packages/network/wpa_supplicant/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 - -# wpa_supplicant fails to build with LTO - strip_lto - -LDFLAGS="$LDFLAGS -lpthread" - -cd $PKG_BUILD/$1 - -cp $PKG_DIR/config/makefile.config .config - -# echo "CONFIG_TLS=gnutls" >> .config -# echo "CONFIG_GNUTLS_EXTRA=y" >> .config - -make V=1 LIBDIR=/usr/lib BINDIR=/usr/bin diff --git a/packages/network/wpa_supplicant/install b/packages/network/wpa_supplicant/install deleted file mode 100755 index 0bc3f95840..0000000000 --- a/packages/network/wpa_supplicant/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/etc/dbus-1/system.d - cp $PKG_BUILD/wpa_supplicant/dbus/dbus-wpa_supplicant.conf $INSTALL/etc/dbus-1/system.d - -mkdir -p $INSTALL/usr/bin - cp $PKG_BUILD/wpa_supplicant/wpa_supplicant $INSTALL/usr/bin - cp $PKG_BUILD/wpa_supplicant/wpa_passphrase $INSTALL/usr/bin - -mkdir -p $INSTALL/usr/share/dbus-1/system-services - cp $PKG_BUILD/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service $INSTALL/usr/share/dbus-1/system-services - cp $PKG_BUILD/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service $INSTALL/usr/share/dbus-1/system-services diff --git a/packages/network/wpa_supplicant/meta b/packages/network/wpa_supplicant/package.mk similarity index 64% rename from packages/network/wpa_supplicant/meta rename to packages/network/wpa_supplicant/package.mk index 07d28be926..2b8b8f9ffd 100644 --- a/packages/network/wpa_supplicant/meta +++ b/packages/network/wpa_supplicant/package.mk @@ -26,11 +26,37 @@ PKG_LICENSE="GPL" PKG_SITE="http://hostap.epitest.fi/wpa_supplicant/" PKG_URL="http://hostap.epitest.fi/releases/$PKG_NAME-$PKG_VERSION.tar.gz" PKG_DEPENDS="dbus openssl" -PKG_BUILD_DEPENDS="toolchain dbus libnl openssl" +PKG_BUILD_DEPENDS_TARGET="toolchain dbus libnl openssl" PKG_PRIORITY="optional" PKG_SECTION="network" PKG_SHORTDESC="wpa_supplicant: An IEEE 802.11i supplicant implementation" PKG_LONGDESC="The wpa_supplicant is a free software implementation of an IEEE 802.11i supplicant. In addition to being a full-featured WPA2 supplicant, it also has support for WPA and older wireless LAN security protocols." -PKG_IS_ADDON="no" +PKG_IS_ADDON="no" PKG_AUTORECONF="no" + +PKG_MAKE_OPTS_TARGET="-C wpa_supplicant V=1 LIBDIR=/usr/lib BINDIR=/usr/bin" +PKG_MAKEINSTALL_OPTS_TARGET="-C wpa_supplicant V=1 LIBDIR=/usr/lib BINDIR=/usr/bin" + +configure_target() { +# wpa_supplicant fails to build with LTO + strip_lto + + LDFLAGS="$LDFLAGS -lpthread" + + cp $PKG_DIR/config/makefile.config wpa_supplicant/.config + +# echo "CONFIG_TLS=gnutls" >> .config +# echo "CONFIG_GNUTLS_EXTRA=y" >> .config +} + +post_makeinstall_target() { + rm -r $INSTALL/usr/bin/wpa_cli + +mkdir -p $INSTALL/etc/dbus-1/system.d + cp wpa_supplicant/dbus/dbus-wpa_supplicant.conf $INSTALL/etc/dbus-1/system.d + +mkdir -p $INSTALL/usr/share/dbus-1/system-services + cp wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service $INSTALL/usr/share/dbus-1/system-services + cp wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service $INSTALL/usr/share/dbus-1/system-services +} From 9973ea84c8aa11e006ce937f6f8e1b6603e0d1d2 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 6 Aug 2013 12:44:14 +0200 Subject: [PATCH 8/8] fontconfig: use /storage/.cache/fontconfig as persistent font cache dir, create fontcache only on first boot Signed-off-by: Stephan Raue --- packages/x11/other/fontconfig/init.d/35_fontconfig | 7 ++++--- packages/x11/other/fontconfig/package.mk | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/x11/other/fontconfig/init.d/35_fontconfig b/packages/x11/other/fontconfig/init.d/35_fontconfig index 639deeda32..6b3ea3011c 100644 --- a/packages/x11/other/fontconfig/init.d/35_fontconfig +++ b/packages/x11/other/fontconfig/init.d/35_fontconfig @@ -22,7 +22,6 @@ # # runlevels: openelec, textmode - FC_CACHE_DIRS="/usr/share/fonts/ /usr/share/xbmc/media/Fonts/" # hack to support user installed fonts @@ -35,9 +34,11 @@ FC_CACHE_DIRS="/usr/share/fonts/ /usr/share/xbmc/media/Fonts/" mount --bind $SUBFONTS /usr/share/xbmc/media/Fonts/ fi - ( progress "Creating fontconfig cache" - fc-cache $FC_CACHE_DIRS + if [ ! -f /storage/.cache/fontconfig/CACHEDIR.TAG ]; then + mkdir -p /storage/.cache/fontconfig + fc-cache $FC_CACHE_DIRS + fi )& diff --git a/packages/x11/other/fontconfig/package.mk b/packages/x11/other/fontconfig/package.mk index 9a48b6e011..5d47cdaa89 100644 --- a/packages/x11/other/fontconfig/package.mk +++ b/packages/x11/other/fontconfig/package.mk @@ -36,6 +36,7 @@ PKG_IS_ADDON="no" PKG_AUTORECONF="yes" PKG_CONFIGURE_OPTS_TARGET="--with-arch=$TARGET_ARCH \ + --with-cache-dir=/storage/.cache/fontconfig \ --with-default-fonts=/usr/share/fonts/liberation \ --without-add-fonts \ --disable-dependency-tracking \