From 294f5f4d4713b56b7284d83bd6e22d5c15f189dc Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 23 May 2012 16:21:01 +0200 Subject: [PATCH] libpng: build as static library Signed-off-by: Stephan Raue --- packages/graphics/libpng/build | 2 +- packages/graphics/libpng/install | 26 -------------- .../graphics/libpng-initramfs/install | 28 --------------- .../initramfs/graphics/libpng-initramfs/meta | 36 ------------------- .../initramfs/sysutils/plymouth-lite/meta | 2 +- packages/mediacenter/xbmc-frodo/meta | 2 +- packages/mediacenter/xbmc-pvr/meta | 2 +- packages/mediacenter/xbmc-rpi/meta | 2 +- packages/mediacenter/xbmc/meta | 2 +- packages/multimedia/SDL_image/meta | 2 +- packages/x11/toolkits/gdk-pixbuf/meta | 2 +- 11 files changed, 8 insertions(+), 98 deletions(-) delete mode 100755 packages/graphics/libpng/install delete mode 100755 packages/initramfs/graphics/libpng-initramfs/install delete mode 100644 packages/initramfs/graphics/libpng-initramfs/meta diff --git a/packages/graphics/libpng/build b/packages/graphics/libpng/build index 9ab18af73a..34d7f128b5 100755 --- a/packages/graphics/libpng/build +++ b/packages/graphics/libpng/build @@ -29,7 +29,7 @@ ac_cv_lib_z_zlibVersion=yes \ --prefix=/usr \ --sysconfdir=/etc \ --enable-static \ - --enable-shared \ + --disable-shared \ make diff --git a/packages/graphics/libpng/install b/packages/graphics/libpng/install deleted file mode 100755 index 484bbac0fc..0000000000 --- a/packages/graphics/libpng/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/.libs/libpng*.so* $INSTALL/usr/lib diff --git a/packages/initramfs/graphics/libpng-initramfs/install b/packages/initramfs/graphics/libpng-initramfs/install deleted file mode 100755 index 69b07fbe6d..0000000000 --- a/packages/initramfs/graphics/libpng-initramfs/install +++ /dev/null @@ -1,28 +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 - -LIBPNG_DIR="$BUILD/libpng-[0-9]*" - -mkdir -p $INSTALL/lib - cp -P $LIBPNG_DIR/.libs/libpng*.so* $INSTALL/lib diff --git a/packages/initramfs/graphics/libpng-initramfs/meta b/packages/initramfs/graphics/libpng-initramfs/meta deleted file mode 100644 index 84348d4512..0000000000 --- a/packages/initramfs/graphics/libpng-initramfs/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="libpng-initramfs" -PKG_VERSION="" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="OSS" -PKG_SITE="http://www.libpng.org/" -PKG_URL="" -PKG_DEPENDS="zlib-initramfs" -PKG_BUILD_DEPENDS="toolchain libpng" -PKG_PRIORITY="optional" -PKG_SECTION="initramfs/graphics" -PKG_SHORTDESC="libpng: Portable Network Graphics (PNG) Reference Library" -PKG_LONGDESC="PNG (Portable Network Graphics) is an extensible file format for the lossless, portable, well-compressed storage of raster images. PNG provides a patent-free replacement for GIF and can also replace many common uses of TIFF. Indexed-color, grayscale, and truecolor images are supported, plus an optional alpha channel. Sample depths range from 1 to 16 bits." -PKG_IS_ADDON="no" - -PKG_AUTORECONF="no" diff --git a/packages/initramfs/sysutils/plymouth-lite/meta b/packages/initramfs/sysutils/plymouth-lite/meta index e267255868..a896a066fe 100644 --- a/packages/initramfs/sysutils/plymouth-lite/meta +++ b/packages/initramfs/sysutils/plymouth-lite/meta @@ -25,7 +25,7 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.meego.com" PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS="gcc-initramfs libpng-initramfs v86d" +PKG_DEPENDS="gcc-initramfs v86d" PKG_BUILD_DEPENDS="toolchain libpng" PKG_PRIORITY="optional" PKG_SECTION="system" diff --git a/packages/mediacenter/xbmc-frodo/meta b/packages/mediacenter/xbmc-frodo/meta index cfe47e17bb..165260b1d1 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 tinyxml libjpeg-turbo libpng freetype jasper libmad libogg libmodplug faad2 flac libmpeg2 yajl bc xbmc-addon-settings" +PKG_DEPENDS="boost Python zlib bzip2 pcre libass curl libssh rtmpdump fontconfig tinyxml libjpeg-turbo freetype jasper 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 dd2bd72589..e637f2f2a1 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 libjpeg-turbo libpng freetype jasper 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 libjpeg-turbo freetype jasper 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 2b3a844e6e..57f2a96534 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 libjpeg-turbo libpng freetype jasper libmad libogg libmodplug faad2 flac libmpeg2 yajl bc xbmc-addon-settings" +PKG_DEPENDS="boost Python zlib bzip2 pcre libass curl libssh rtmpdump fontconfig tinyxml libjpeg-turbo freetype jasper 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 0aa9d051c1..52b885137a 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 libjpeg-turbo libpng freetype jasper 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 libjpeg-turbo freetype jasper 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/SDL_image/meta b/packages/multimedia/SDL_image/meta index cae0741ad1..c40c36d77a 100644 --- a/packages/multimedia/SDL_image/meta +++ b/packages/multimedia/SDL_image/meta @@ -25,7 +25,7 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.libsdl.org/" PKG_URL="http://www.libsdl.org/projects/SDL_image/release/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS="SDL libjpeg-turbo libpng" +PKG_DEPENDS="SDL libjpeg-turbo" PKG_BUILD_DEPENDS="toolchain SDL libjpeg-turbo libpng tiff" PKG_PRIORITY="optional" PKG_SECTION="multimedia" diff --git a/packages/x11/toolkits/gdk-pixbuf/meta b/packages/x11/toolkits/gdk-pixbuf/meta index cdef243f2d..86c326a2db 100644 --- a/packages/x11/toolkits/gdk-pixbuf/meta +++ b/packages/x11/toolkits/gdk-pixbuf/meta @@ -25,7 +25,7 @@ PKG_ARCH="any" PKG_LICENSE="OSS" PKG_SITE="http://www.gtk.org/" PKG_URL="http://ftp.acc.umu.se/pub/gnome/sources/gdk-pixbuf/2.24/$PKG_NAME-$PKG_VERSION.tar.xz" -PKG_DEPENDS="glib tiff libjpeg-turbo libpng jasper" +PKG_DEPENDS="glib tiff libjpeg-turbo jasper" PKG_BUILD_DEPENDS="toolchain glib libjpeg-turbo libpng jasper" PKG_PRIORITY="optional" PKG_SECTION="x11/toolkits"