From c37e7b8a1a8132fb98fd348ea2717bcb72d783a8 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Fri, 18 Jan 2013 21:31:54 +0200 Subject: [PATCH 1/4] lcdproc: add 'CFontz' driver --- .../xbmc-addon-settings/source/resources/settings.xml | 2 +- projects/Fusion/options | 2 +- projects/Generic/options | 2 +- projects/Generic_OSS/options | 2 +- projects/ION/options | 2 +- projects/Intel/options | 2 +- projects/RPi/options | 2 +- projects/Virtual/options | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml b/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml index dff77a8eee..ca4682e154 100644 --- a/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml +++ b/packages/mediacenter/xbmc-addon-settings/source/resources/settings.xml @@ -12,7 +12,7 @@ - + diff --git a/projects/Fusion/options b/projects/Fusion/options index 00a188d25b..db251d065e 100755 --- a/projects/Fusion/options +++ b/projects/Fusion/options @@ -295,7 +295,7 @@ # 'all' compiles all drivers; # 'all,!xxx,!yyy' de-selects previously selected drivers # "none" for disable LCD support - LCD_DRIVER="irtrans,imon,imonlcd,mdm166a,MtxOrb,lis,dm140,hd44780" + LCD_DRIVER="irtrans,imon,imonlcd,mdm166a,MtxOrb,lis,dm140,hd44780,CFontz" # Modules to install in initramfs for early boot INITRAMFS_MODULES="uvesafb xhci-hcd" diff --git a/projects/Generic/options b/projects/Generic/options index 71a0d6e8a9..5b0a01c5ba 100755 --- a/projects/Generic/options +++ b/projects/Generic/options @@ -295,7 +295,7 @@ # 'all' compiles all drivers; # 'all,!xxx,!yyy' de-selects previously selected drivers # "none" for disable LCD support - LCD_DRIVER="irtrans,imon,imonlcd,mdm166a,MtxOrb,lis,dm140,hd44780" + LCD_DRIVER="irtrans,imon,imonlcd,mdm166a,MtxOrb,lis,dm140,hd44780,CFontz" # Modules to install in initramfs for early boot INITRAMFS_MODULES="uvesafb xhci-hcd" diff --git a/projects/Generic_OSS/options b/projects/Generic_OSS/options index d6fb78b838..e3514c2a00 100755 --- a/projects/Generic_OSS/options +++ b/projects/Generic_OSS/options @@ -295,7 +295,7 @@ # 'all' compiles all drivers; # 'all,!xxx,!yyy' de-selects previously selected drivers # "none" for disable LCD support - LCD_DRIVER="irtrans,imon,imonlcd,mdm166a,MtxOrb,lis,dm140,hd44780" + LCD_DRIVER="irtrans,imon,imonlcd,mdm166a,MtxOrb,lis,dm140,hd44780,CFontz" # Modules to install in initramfs for early boot INITRAMFS_MODULES="uvesafb xhci-hcd" diff --git a/projects/ION/options b/projects/ION/options index ec08935ee8..ae1381b64d 100755 --- a/projects/ION/options +++ b/projects/ION/options @@ -295,7 +295,7 @@ # 'all' compiles all drivers; # 'all,!xxx,!yyy' de-selects previously selected drivers # "none" for disable LCD support - LCD_DRIVER="irtrans,imon,imonlcd,mdm166a,MtxOrb,lis,dm140,hd44780" + LCD_DRIVER="irtrans,imon,imonlcd,mdm166a,MtxOrb,lis,dm140,hd44780,CFontz" # Modules to install in initramfs for early boot INITRAMFS_MODULES="uvesafb xhci-hcd" diff --git a/projects/Intel/options b/projects/Intel/options index c7bbb49e8c..2b25e104fb 100755 --- a/projects/Intel/options +++ b/projects/Intel/options @@ -295,7 +295,7 @@ # 'all' compiles all drivers; # 'all,!xxx,!yyy' de-selects previously selected drivers # "none" for disable LCD support - LCD_DRIVER="irtrans,imon,imonlcd,mdm166a,MtxOrb,lis,dm140,hd44780" + LCD_DRIVER="irtrans,imon,imonlcd,mdm166a,MtxOrb,lis,dm140,hd44780,CFontz" # Modules to install in initramfs for early boot INITRAMFS_MODULES="xhci-hcd" diff --git a/projects/RPi/options b/projects/RPi/options index 570a89d588..fe92136860 100755 --- a/projects/RPi/options +++ b/projects/RPi/options @@ -295,7 +295,7 @@ # 'all' compiles all drivers; # 'all,!xxx,!yyy' de-selects previously selected drivers # "none" for disable LCD support - LCD_DRIVER="irtrans,imon,imonlcd,mdm166a,MtxOrb,lis,dm140,hd44780" + LCD_DRIVER="irtrans,imon,imonlcd,mdm166a,MtxOrb,lis,dm140,hd44780,CFontz" # Modules to install in initramfs for early boot INITRAMFS_MODULES="" diff --git a/projects/Virtual/options b/projects/Virtual/options index 0e1bbe6937..a1c4cc78cb 100755 --- a/projects/Virtual/options +++ b/projects/Virtual/options @@ -290,7 +290,7 @@ # 'all' compiles all drivers; # 'all,!xxx,!yyy' de-selects previously selected drivers # "none" for disable LCD support - LCD_DRIVER="irtrans,imon,imonlcd,mdm166a,MtxOrb,lis,dm140,hd44780" + LCD_DRIVER="irtrans,imon,imonlcd,mdm166a,MtxOrb,lis,dm140,hd44780,CFontz" # Modules to install in initramfs for early boot INITRAMFS_MODULES="" From c3b7bca2ac77111f97b0e15e469836f78c7f451f Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sun, 20 Jan 2013 04:19:01 +0200 Subject: [PATCH 2/4] automake: update & install gtk-doc.m4 --- packages/toolchain/devel/autotools/automake/build | 1 + .../toolchain/devel/autotools/automake/files/gtk-doc.m4 | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/packages/toolchain/devel/autotools/automake/build b/packages/toolchain/devel/autotools/automake/build index c59aaae725..38b473ce14 100755 --- a/packages/toolchain/devel/autotools/automake/build +++ b/packages/toolchain/devel/autotools/automake/build @@ -34,3 +34,4 @@ cd $PKG_BUILD make make install make prefix=$SYSROOT_PREFIX/usr install +cp -P $ROOT/$PKG_DIR/files/gtk-doc.m4 $SYSROOT_PREFIX/usr/share/aclocal diff --git a/packages/toolchain/devel/autotools/automake/files/gtk-doc.m4 b/packages/toolchain/devel/autotools/automake/files/gtk-doc.m4 index 2cfa1e7178..0ada151935 100644 --- a/packages/toolchain/devel/autotools/automake/files/gtk-doc.m4 +++ b/packages/toolchain/devel/autotools/automake/files/gtk-doc.m4 @@ -6,6 +6,7 @@ dnl Usage: dnl GTK_DOC_CHECK([minimum-gtk-doc-version]) AC_DEFUN([GTK_DOC_CHECK], [ + AC_REQUIRE([PKG_PROG_PKG_CONFIG]) AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first @@ -33,6 +34,11 @@ AC_DEFUN([GTK_DOC_CHECK], AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))], [PKG_CHECK_EXISTS([gtk-doc >= $1],, AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build $PACKAGE_NAME]))]) + dnl don't check for glib if we build glib + if test "x$PACKAGE_NAME" != "xglib"; then + dnl don't fail if someone does not have glib + PKG_CHECK_MODULES(GTKDOC_DEPS, glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0,,) + fi fi AC_MSG_CHECKING([whether to build gtk-doc documentation]) From 8a5ad238d7fecec59696a0d94b940944dd631ba2 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sun, 20 Jan 2013 04:19:57 +0200 Subject: [PATCH 3/4] glib: do not depend on 'gtk-doc' --- packages/devel/glib/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/devel/glib/meta b/packages/devel/glib/meta index 24b35c5701..44acd1be87 100644 --- a/packages/devel/glib/meta +++ b/packages/devel/glib/meta @@ -26,7 +26,7 @@ PKG_LICENSE="LGPL" PKG_SITE="http://www.gtk.org/" PKG_URL="http://ftp.gnome.org/pub/gnome/sources/glib/2.34/$PKG_NAME-$PKG_VERSION.tar.xz" PKG_DEPENDS="zlib $ICONV libffi pcre" -PKG_BUILD_DEPENDS="toolchain zlib $ICONV libffi pcre glib-host gtk-doc Python-host" +PKG_BUILD_DEPENDS="toolchain zlib $ICONV libffi pcre glib-host Python-host" PKG_PRIORITY="optional" PKG_SECTION="devel" PKG_SHORTDESC="glib: C support library" From b4c045d1542f7b21ba98bc7a91a9b63fabc59814 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sun, 20 Jan 2013 04:20:27 +0200 Subject: [PATCH 4/4] remove package: 'gtk-doc' --- packages/x11/toolkits/gtk-doc/build | 27 ---------------------- packages/x11/toolkits/gtk-doc/meta | 36 ----------------------------- 2 files changed, 63 deletions(-) delete mode 100755 packages/x11/toolkits/gtk-doc/build delete mode 100644 packages/x11/toolkits/gtk-doc/meta diff --git a/packages/x11/toolkits/gtk-doc/build b/packages/x11/toolkits/gtk-doc/build deleted file mode 100755 index 309a4094b9..0000000000 --- a/packages/x11/toolkits/gtk-doc/build +++ /dev/null @@ -1,27 +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 - mkdir -p $SYSROOT_PREFIX/usr/share/aclocal - cp gtk-doc.m4 $SYSROOT_PREFIX/usr/share/aclocal diff --git a/packages/x11/toolkits/gtk-doc/meta b/packages/x11/toolkits/gtk-doc/meta deleted file mode 100644 index 05027309fe..0000000000 --- a/packages/x11/toolkits/gtk-doc/meta +++ /dev/null @@ -1,36 +0,0 @@ -################################################################################ -# 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 -################################################################################ - -PKG_NAME="gtk-doc" -PKG_VERSION="1.18" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="GPL" -PKG_SITE="http://www.gtk.org/gtk-doc/" -PKG_URL="http://ftp.gnome.org/pub/gnome/sources/gtk-doc/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.xz" -PKG_DEPENDS="" -PKG_BUILD_DEPENDS="toolchain" -PKG_PRIORITY="optional" -PKG_SECTION="x11/toolkits" -PKG_SHORTDESC="gtk-doc: a project which was started to generate API documentation from comments added to C code." -PKG_LONGDESC="GTK-Doc is a project which was started to generate API documentation from comments added to C code. It is typically used to document the public API of GTK+ and GNOME libraries, but it can also be used to document application code." -PKG_IS_ADDON="no" - -PKG_AUTORECONF="no"