diff --git a/packages/3rdparty/multimedia/vdr/meta b/packages/3rdparty/multimedia/vdr/meta index 3544d4ff54..17144bd164 100644 --- a/packages/3rdparty/multimedia/vdr/meta +++ b/packages/3rdparty/multimedia/vdr/meta @@ -26,7 +26,7 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.tvdr.de" PKG_URL="ftp://ftp.tvdr.de/vdr/Developer/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS="fontconfig freetype libcap" +PKG_DEPENDS="fontconfig libcap" PKG_BUILD_DEPENDS="toolchain gettext fontconfig freetype fribidi libcap libjpeg-turbo" PKG_PRIORITY="optional" PKG_SECTION="multimedia" diff --git a/packages/debug/mrxvt/meta b/packages/debug/mrxvt/meta index b4dff10d4f..07b6b7a818 100644 --- a/packages/debug/mrxvt/meta +++ b/packages/debug/mrxvt/meta @@ -25,7 +25,7 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://materm.sourceforge.net/" PKG_URL="$SOURCEFORGE_SRC/materm/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS="libX11 libXrender freetype" +PKG_DEPENDS="libX11 libXrender" PKG_BUILD_DEPENDS="toolchain libX11 libXrender freetype" PKG_PRIORITY="optional" PKG_SECTION="debug" diff --git a/packages/graphics/cairo/meta b/packages/graphics/cairo/meta index 9321a0e682..f5ed806b77 100644 --- a/packages/graphics/cairo/meta +++ b/packages/graphics/cairo/meta @@ -25,7 +25,7 @@ PKG_ARCH="any" PKG_LICENSE="LGPL" PKG_SITE="http://cairographics.org/" PKG_URL="http://cairographics.org/releases/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS="zlib freetype fontconfig pixman libXrender libX11 Mesa" +PKG_DEPENDS="zlib fontconfig pixman libXrender libX11 Mesa" PKG_BUILD_DEPENDS="toolchain zlib freetype fontconfig libpng pixman libXrender libX11 Mesa" PKG_PRIORITY="optional" PKG_SECTION="graphics" diff --git a/packages/mediacenter/xbmc-frodo/meta b/packages/mediacenter/xbmc-frodo/meta index 064a68106d..e771a1092f 100644 --- a/packages/mediacenter/xbmc-frodo/meta +++ b/packages/mediacenter/xbmc-frodo/meta @@ -25,7 +25,7 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.xbmc.org" PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz" -PKG_DEPENDS="boost Python zlib bzip2 pcre libass curl libssh rtmpdump fontconfig tinyxmlfreetype libmad libogg libmodplug faad2 flac libmpeg2 yajl bc xbmc-addon-settings" +PKG_DEPENDS="boost Python zlib bzip2 pcre libass curl libssh rtmpdump fontconfig tinyxml libmad libogg libmodplug faad2 flac libmpeg2 yajl bc xbmc-addon-settings" PKG_BUILD_DEPENDS="toolchain boost Python zlib bzip2 lzo pcre libass enca curl libssh rtmpdump fontconfig fribidi tinyxml libjpeg-turbo libpng tiff freetype jasper libmad libsamplerate libogg libcdio libmodplug faad2 flac libmpeg2 yajl sqlite mysql" PKG_PRIORITY="optional" PKG_SECTION="mediacenter" diff --git a/packages/mediacenter/xbmc-pvr/meta b/packages/mediacenter/xbmc-pvr/meta index 04b56d50ba..8a6122c1ff 100644 --- a/packages/mediacenter/xbmc-pvr/meta +++ b/packages/mediacenter/xbmc-pvr/meta @@ -25,7 +25,7 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.xbmc.org" PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz" -PKG_DEPENDS="boost Python zlib bzip2 pcre alsa-lib libass curl libssh rtmpdump fontconfig freetype libmad libogg libvorbis libmodplug faad2 flac lame libmpeg2 SDL SDL_mixer SDL_image yajl alsa bc xbmc-addon-settings xbmc-addon-xvdr xbmc-addon-vuplus" +PKG_DEPENDS="boost Python zlib bzip2 pcre alsa-lib libass curl libssh rtmpdump fontconfig libmad libogg libvorbis libmodplug faad2 flac lame libmpeg2 SDL SDL_mixer SDL_image yajl alsa bc xbmc-addon-settings xbmc-addon-xvdr xbmc-addon-vuplus" PKG_BUILD_DEPENDS="toolchain boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump fontconfig fribidi libjpeg-turbo libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmodplug faad2 flac lame libmpeg2 SDL SDL_mixer SDL_image yajl sqlite mysql" PKG_PRIORITY="optional" PKG_SECTION="mediacenter" diff --git a/packages/mediacenter/xbmc-rpi/meta b/packages/mediacenter/xbmc-rpi/meta index 975be34738..8206a596b9 100644 --- a/packages/mediacenter/xbmc-rpi/meta +++ b/packages/mediacenter/xbmc-rpi/meta @@ -25,7 +25,7 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.xbmc.org" PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz" -PKG_DEPENDS="boost Python zlib bzip2 pcre libass curl libssh rtmpdump fontconfig tinyxml freetype libmad libogg libmodplug faad2 flac libmpeg2 yajl bc xbmc-addon-settings" +PKG_DEPENDS="boost Python zlib bzip2 pcre libass curl libssh rtmpdump fontconfig tinyxml libmad libogg libmodplug faad2 flac libmpeg2 yajl bc xbmc-addon-settings" PKG_BUILD_DEPENDS="toolchain boost Python zlib bzip2 lzo pcre libass enca curl libssh rtmpdump fontconfig fribidi tinyxml libjpeg-turbo libpng tiff freetype jasper libmad libsamplerate libogg libcdio libmodplug faad2 flac libmpeg2 yajl sqlite mysql" PKG_PRIORITY="optional" PKG_SECTION="mediacenter" diff --git a/packages/mediacenter/xbmc/meta b/packages/mediacenter/xbmc/meta index ea1f52f4e3..017375ded6 100644 --- a/packages/mediacenter/xbmc/meta +++ b/packages/mediacenter/xbmc/meta @@ -25,7 +25,7 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.xbmc.org" PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz" -PKG_DEPENDS="boost Python zlib bzip2 pcre alsa-lib libass curl libssh rtmpdump fontconfig freetype libmad libogg libvorbis libmodplug faad2 flac lame libmpeg2 SDL SDL_mixer SDL_image yajl alsa bc xbmc-addon-settings" +PKG_DEPENDS="boost Python zlib bzip2 pcre alsa-lib libass curl libssh rtmpdump fontconfig libmad libogg libvorbis libmodplug faad2 flac lame libmpeg2 SDL SDL_mixer SDL_image yajl alsa bc xbmc-addon-settings" PKG_BUILD_DEPENDS="toolchain boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump fontconfig fribidi libjpeg-turbo libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmodplug faad2 flac lame libmpeg2 SDL SDL_mixer SDL_image yajl sqlite mysql" PKG_PRIORITY="optional" PKG_SECTION="mediacenter" diff --git a/packages/multimedia/libass/meta b/packages/multimedia/libass/meta index 88a1abaf4d..416723664e 100644 --- a/packages/multimedia/libass/meta +++ b/packages/multimedia/libass/meta @@ -25,7 +25,7 @@ PKG_ARCH="any" PKG_LICENSE="BSD" PKG_SITE="http://code.google.com/p/libass/" PKG_URL="http://libass.googlecode.com/files/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS="freetype fontconfig" +PKG_DEPENDS="fontconfig" PKG_BUILD_DEPENDS="toolchain freetype fontconfig enca fribidi" PKG_PRIORITY="optional" PKG_SECTION="multimedia" diff --git a/packages/print/freetype/build b/packages/print/freetype/build index a25c6a2b64..d2cc7c63b9 100755 --- a/packages/print/freetype/build +++ b/packages/print/freetype/build @@ -33,8 +33,8 @@ sh autogen.sh --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ - --disable-static \ - --enable-shared \ + --enable-static \ + --disable-shared \ --with-zlib make diff --git a/packages/print/freetype/install b/packages/print/freetype/install deleted file mode 100755 index 32aedd9259..0000000000 --- a/packages/print/freetype/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/objs/.libs/libfreetype.so* $INSTALL/usr/lib diff --git a/packages/python/graphics/Imaging/meta b/packages/python/graphics/Imaging/meta index 68cfe9fdac..c078b5fe5f 100644 --- a/packages/python/graphics/Imaging/meta +++ b/packages/python/graphics/Imaging/meta @@ -25,7 +25,7 @@ PKG_ARCH="any" PKG_LICENSE="BSD" PKG_SITE="http://www.pythonware.com/products/pil/" PKG_URL="http://effbot.org/media/downloads/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS="Python distribute zlib freetype" +PKG_DEPENDS="Python distribute zlib" PKG_BUILD_DEPENDS="toolchain Python distribute distutilscross zlib freetype libjpeg-turbo" PKG_PRIORITY="optional" PKG_SECTION="python/system" diff --git a/packages/x11/lib/libXfont/meta b/packages/x11/lib/libXfont/meta index 0cccac5a56..d91718c44d 100644 --- a/packages/x11/lib/libXfont/meta +++ b/packages/x11/lib/libXfont/meta @@ -25,7 +25,7 @@ PKG_ARCH="any" PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS="freetype" +PKG_DEPENDS="" PKG_BUILD_DEPENDS="toolchain util-macros fontcacheproto fontsproto xtrans freetype libfontenc" PKG_PRIORITY="optional" PKG_SECTION="x11/lib" diff --git a/packages/x11/lib/libXft/meta b/packages/x11/lib/libXft/meta index 3238939319..4a4e538a6a 100644 --- a/packages/x11/lib/libXft/meta +++ b/packages/x11/lib/libXft/meta @@ -25,7 +25,7 @@ PKG_ARCH="any" PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS="libXrender fontconfig freetype" +PKG_DEPENDS="libXrender fontconfig" PKG_BUILD_DEPENDS="toolchain util-macros xproto libXrender fontconfig freetype" PKG_PRIORITY="optional" PKG_SECTION="x11/lib" diff --git a/packages/x11/other/fontconfig/meta b/packages/x11/other/fontconfig/meta index 8ed23cf82f..2f724f5b93 100644 --- a/packages/x11/other/fontconfig/meta +++ b/packages/x11/other/fontconfig/meta @@ -25,7 +25,7 @@ PKG_ARCH="any" PKG_LICENSE="OSS" PKG_SITE="http://www.fontconfig.org" PKG_URL="http://www.freedesktop.org/software/fontconfig/release/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS="freetype libxml2 zlib" +PKG_DEPENDS="libxml2 zlib" PKG_BUILD_DEPENDS="toolchain util-macros freetype libxml2 zlib" PKG_PRIORITY="optional" PKG_SECTION="x11/other" diff --git a/packages/x11/toolkits/pango/meta b/packages/x11/toolkits/pango/meta index eff1da00f7..2a61acb5e7 100644 --- a/packages/x11/toolkits/pango/meta +++ b/packages/x11/toolkits/pango/meta @@ -25,7 +25,7 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.pango.org/" PKG_URL="http://ftp.gnome.org/pub/gnome/sources/pango/1.28/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS="glib cairo freetype fontconfig libX11 libXft" +PKG_DEPENDS="glib cairo fontconfig libX11 libXft" PKG_BUILD_DEPENDS="toolchain glib cairo freetype fontconfig libX11 libXft" PKG_PRIORITY="optional" PKG_SECTION="x11/toolkits" diff --git a/packages/x11/xserver/xorg-server/meta b/packages/x11/xserver/xorg-server/meta index ab41d6cf98..ef9522457f 100644 --- a/packages/x11/xserver/xorg-server/meta +++ b/packages/x11/xserver/xorg-server/meta @@ -25,7 +25,7 @@ PKG_ARCH="any" PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" PKG_URL="http://xorg.freedesktop.org/archive/individual/xserver/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS="libpciaccess freetype libX11 libXfont libdrm Mesa openssl pixman udev" +PKG_DEPENDS="libpciaccess libX11 libXfont libdrm Mesa openssl pixman udev" PKG_BUILD_DEPENDS="toolchain util-macros font-util fontsproto randrproto recordproto renderproto scrnsaverproto videoproto inputproto xf86dgaproto xf86driproto xf86miscproto glproto libpciaccess libX11 libXfont libxkbfile libdrm Mesa openssl freetype pixman fontsproto udev" PKG_PRIORITY="optional" PKG_SECTION="x11/xserver"