From 3137e4193d733e8d9c6ee6f04592b9168fe0657c Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 23 May 2012 16:31:43 +0200 Subject: [PATCH] jasper: build as static library Signed-off-by: Stephan Raue --- packages/graphics/jasper/build | 6 +++--- packages/graphics/jasper/install | 26 -------------------------- packages/mediacenter/xbmc-frodo/meta | 2 +- packages/mediacenter/xbmc-pvr/meta | 2 +- packages/mediacenter/xbmc-rpi/meta | 2 +- packages/mediacenter/xbmc/meta | 2 +- packages/x11/toolkits/gdk-pixbuf/meta | 2 +- 7 files changed, 8 insertions(+), 34 deletions(-) delete mode 100755 packages/graphics/jasper/install diff --git a/packages/graphics/jasper/build b/packages/graphics/jasper/build index 88a0cac0f5..4611f66726 100755 --- a/packages/graphics/jasper/build +++ b/packages/graphics/jasper/build @@ -29,9 +29,9 @@ cd $PKG_BUILD --exec-prefix=/usr \ --sysconfdir=/etc \ --datadir=/usr/share \ - --enable-shared \ - --disable-static \ + --disable-shared \ + --enable-static \ make -$MAKEINSTALL \ No newline at end of file +$MAKEINSTALL diff --git a/packages/graphics/jasper/install b/packages/graphics/jasper/install deleted file mode 100755 index a351a70938..0000000000 --- a/packages/graphics/jasper/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/src/libjasper/.libs/*.so* $INSTALL/usr/lib diff --git a/packages/mediacenter/xbmc-frodo/meta b/packages/mediacenter/xbmc-frodo/meta index 7cce562b41..064a68106d 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 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 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 4b195bd196..04b56d50ba 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 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 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 4bc12f8d2f..975be34738 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 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 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 14c75573da..ea1f52f4e3 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 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 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/x11/toolkits/gdk-pixbuf/meta b/packages/x11/toolkits/gdk-pixbuf/meta index 776e65d85e..febb29cb34 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 jasper" +PKG_DEPENDS="glib" PKG_BUILD_DEPENDS="toolchain glib libjpeg-turbo libpng jasper" PKG_PRIORITY="optional" PKG_SECTION="x11/toolkits"