diff --git a/packages/3rdparty/multimedia/vdr/meta b/packages/3rdparty/multimedia/vdr/meta index aea3e0048c..3544d4ff54 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 libjpeg-turbo" +PKG_DEPENDS="fontconfig freetype libcap" PKG_BUILD_DEPENDS="toolchain gettext fontconfig freetype fribidi libcap libjpeg-turbo" PKG_PRIORITY="optional" PKG_SECTION="multimedia" diff --git a/packages/graphics/jasper/meta b/packages/graphics/jasper/meta index ab1d71cea4..7d5de71851 100644 --- a/packages/graphics/jasper/meta +++ b/packages/graphics/jasper/meta @@ -26,7 +26,7 @@ PKG_LICENSE="OpenSource" PKG_SITE="http://www.ece.uvic.ca/~mdadams/jasper/" PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2" PKG_DEPENDS="" -PKG_BUILD_DEPENDS="toolchain" +PKG_BUILD_DEPENDS="toolchain libjpeg-turbo" PKG_PRIORITY="optional" PKG_SECTION="graphics" PKG_SHORTDESC="jasper: JPEG-2000 Part-1 standard (i.e., ISO/IEC 15444-1) implementation" diff --git a/packages/graphics/libjpeg-turbo/build b/packages/graphics/libjpeg-turbo/build index 9c799c3717..b8caa25bfb 100755 --- a/packages/graphics/libjpeg-turbo/build +++ b/packages/graphics/libjpeg-turbo/build @@ -28,8 +28,8 @@ cd $PKG_BUILD --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ - --disable-static \ - --enable-shared \ + --enable-static \ + --disable-shared \ --with-jpeg8 make diff --git a/packages/graphics/libjpeg-turbo/install b/packages/graphics/libjpeg-turbo/install deleted file mode 100755 index 32163a5b62..0000000000 --- a/packages/graphics/libjpeg-turbo/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/*.so* $INSTALL/usr/lib diff --git a/packages/graphics/tiff/meta b/packages/graphics/tiff/meta index 419ec5e2e9..9bf5f2096c 100644 --- a/packages/graphics/tiff/meta +++ b/packages/graphics/tiff/meta @@ -25,7 +25,7 @@ PKG_ARCH="any" PKG_LICENSE="OSS" PKG_SITE="http://www.remotesensing.org/libtiff/" PKG_URL="http://download.osgeo.org/libtiff/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS="libjpeg-turbo zlib" +PKG_DEPENDS="zlib" PKG_BUILD_DEPENDS="toolchain libjpeg-turbo zlib" PKG_PRIORITY="optional" PKG_SECTION="graphics" diff --git a/packages/mediacenter/xbmc-frodo/meta b/packages/mediacenter/xbmc-frodo/meta index 165260b1d1..7cce562b41 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 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 tinyxmlfreetype 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 e637f2f2a1..4b195bd196 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 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 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 57f2a96534..4bc12f8d2f 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 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 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 52b885137a..14c75573da 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 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 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 c40c36d77a..fb748226c4 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" +PKG_DEPENDS="SDL" PKG_BUILD_DEPENDS="toolchain SDL libjpeg-turbo libpng tiff" PKG_PRIORITY="optional" PKG_SECTION="multimedia" diff --git a/packages/python/graphics/Imaging/meta b/packages/python/graphics/Imaging/meta index 1a4e3dd1d3..68cfe9fdac 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 libjpeg-turbo" +PKG_DEPENDS="Python distribute zlib freetype" PKG_BUILD_DEPENDS="toolchain Python distribute distutilscross zlib freetype libjpeg-turbo" PKG_PRIORITY="optional" PKG_SECTION="python/system" diff --git a/packages/x11/toolkits/gdk-pixbuf/meta b/packages/x11/toolkits/gdk-pixbuf/meta index 86c326a2db..776e65d85e 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 jasper" +PKG_DEPENDS="glib tiff jasper" PKG_BUILD_DEPENDS="toolchain glib libjpeg-turbo libpng jasper" PKG_PRIORITY="optional" PKG_SECTION="x11/toolkits"