From 0192d9b5977007e76bba36e2bf30df9e6e9c03ef Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 12 Jun 2012 19:35:08 +0200 Subject: [PATCH] Revert "freetype: build as static library" This reverts commit bc6455743fbdb1423d0695fe814ac297f26d49e6. Conflicts: packages/3rdparty/multimedia/vdr/meta packages/mediacenter/xbmc-frodo/meta packages/mediacenter/xbmc-pvr/meta packages/mediacenter/xbmc-rpi/meta packages/mediacenter/xbmc/meta packages/python/graphics/Imaging/meta packages/x11/xserver/xorg-server/meta --- packages/3rdparty/multimedia/vdr/meta | 2 +- packages/debug/mrxvt/meta | 2 +- packages/graphics/cairo/meta | 2 +- packages/mediacenter/xbmc-frodo/meta | 2 +- packages/mediacenter/xbmc-rpi/meta | 2 +- packages/mediacenter/xbmc/meta | 2 +- packages/multimedia/libass/meta | 2 +- packages/print/freetype/build | 4 ++-- packages/print/freetype/install | 26 ++++++++++++++++++++++++++ packages/python/graphics/Imaging/meta | 2 +- packages/x11/lib/libXfont/meta | 2 +- packages/x11/lib/libXft/meta | 2 +- packages/x11/other/fontconfig/meta | 2 +- packages/x11/toolkits/pango/meta | 2 +- packages/x11/xserver/xorg-server/meta | 2 +- 15 files changed, 41 insertions(+), 15 deletions(-) create mode 100755 packages/print/freetype/install diff --git a/packages/3rdparty/multimedia/vdr/meta b/packages/3rdparty/multimedia/vdr/meta index 48c9ddb707..42c1904bf6 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 libcap" +PKG_DEPENDS="fontconfig freetype libcap" PKG_BUILD_DEPENDS="toolchain gettext fontconfig freetype fribidi libcap libjpeg-turbo bzip2 libXfont expat" PKG_PRIORITY="optional" PKG_SECTION="multimedia" diff --git a/packages/debug/mrxvt/meta b/packages/debug/mrxvt/meta index 07b6b7a818..b4dff10d4f 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" +PKG_DEPENDS="libX11 libXrender freetype" 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 f5ed806b77..9321a0e682 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 fontconfig pixman libXrender libX11 Mesa" +PKG_DEPENDS="zlib freetype 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 266581ed0c..528a90edd8 100644 --- a/packages/mediacenter/xbmc-frodo/meta +++ b/packages/mediacenter/xbmc-frodo/meta @@ -29,7 +29,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 systemd pcre ffmpeg libass curl libssh rtmpdump fontconfig tinyxml libmad libogg libmodplug faad2 flac libmpeg2 yajl bc xbmc-addon-settings" +PKG_DEPENDS="boost Python zlib bzip2 systemd pcre ffmpeg libass curl libssh rtmpdump fontconfig tinyxml freetype libmad libogg libmodplug faad2 flac libmpeg2 yajl bc xbmc-addon-settings" PKG_BUILD_DEPENDS="toolchain boost Python zlib bzip2 systemd lzo pcre ffmpeg 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-rpi/meta b/packages/mediacenter/xbmc-rpi/meta index 21578d3f35..c955266e69 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 systemd pcre ffmpeg libass curl libssh rtmpdump fontconfig tinyxml libmad libogg libmodplug faad2 flac libmpeg2 yajl bc xbmc-addon-settings" +PKG_DEPENDS="boost Python zlib bzip2 systemd pcre ffmpeg libass curl libssh rtmpdump fontconfig tinyxml freetype libmad libogg libmodplug faad2 flac libmpeg2 yajl bc xbmc-addon-settings" PKG_BUILD_DEPENDS="toolchain boost Python zlib bzip2 systemd lzo pcre ffmpeg 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 57d07c340c..9e99f813fb 100644 --- a/packages/mediacenter/xbmc/meta +++ b/packages/mediacenter/xbmc/meta @@ -29,7 +29,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 systemd pcre ffmpeg 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_DEPENDS="boost Python zlib bzip2 systemd pcre ffmpeg 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_BUILD_DEPENDS="toolchain boost Python zlib bzip2 systemd lzo pcre alsa-lib ffmpeg 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 416723664e..88a1abaf4d 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="fontconfig" +PKG_DEPENDS="freetype 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 d2cc7c63b9..a25c6a2b64 100755 --- a/packages/print/freetype/build +++ b/packages/print/freetype/build @@ -33,8 +33,8 @@ sh autogen.sh --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ - --enable-static \ - --disable-shared \ + --disable-static \ + --enable-shared \ --with-zlib make diff --git a/packages/print/freetype/install b/packages/print/freetype/install new file mode 100755 index 0000000000..32aedd9259 --- /dev/null +++ b/packages/print/freetype/install @@ -0,0 +1,26 @@ +#!/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 abe02e35b9..7507343094 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 zlib" +PKG_DEPENDS="Python zlib freetype" PKG_BUILD_DEPENDS="toolchain Python 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 d91718c44d..0cccac5a56 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="" +PKG_DEPENDS="freetype" 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 bcba7369d2..f4e06ed3b0 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" +PKG_DEPENDS="libXrender fontconfig freetype" 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 2f724f5b93..8ed23cf82f 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="libxml2 zlib" +PKG_DEPENDS="freetype 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 2a61acb5e7..eff1da00f7 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 fontconfig libX11 libXft" +PKG_DEPENDS="glib cairo freetype 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 3efc0c008c..6b67996f9a 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 libX11 libXfont libdrm openssl pixman systemd" +PKG_DEPENDS="libpciaccess libX11 libXfont libdrm openssl freetype pixman systemd" PKG_BUILD_DEPENDS="toolchain util-macros font-util fontsproto randrproto recordproto renderproto dri2proto fixesproto damageproto scrnsaverproto videoproto inputproto xf86dgaproto xf86vidmodeproto xf86driproto xf86miscproto glproto libpciaccess libX11 libXfont libxkbfile libdrm openssl freetype pixman fontsproto systemd" PKG_PRIORITY="optional" PKG_SECTION="x11/xserver"