From 833827ca01ba579530288cc68de37fdece631525 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 8 Jan 2014 23:22:48 +0100 Subject: [PATCH] yasm: convert to new package format, move package Signed-off-by: Stephan Raue --- .../lang/yasm/meta => lang/yasm/package.mk} | 19 ++++++-- packages/multimedia/SDL-host/meta | 2 +- packages/multimedia/SDL/meta | 2 +- packages/multimedia/ffmpeg/meta | 4 +- packages/toolchain/lang/yasm/build | 43 ------------------- packages/toolchain/meta | 2 +- 6 files changed, 21 insertions(+), 51 deletions(-) rename packages/{toolchain/lang/yasm/meta => lang/yasm/package.mk} (73%) delete mode 100755 packages/toolchain/lang/yasm/build diff --git a/packages/toolchain/lang/yasm/meta b/packages/lang/yasm/package.mk similarity index 73% rename from packages/toolchain/lang/yasm/meta rename to packages/lang/yasm/package.mk index ee95e9267e..9763534deb 100644 --- a/packages/toolchain/lang/yasm/meta +++ b/packages/lang/yasm/package.mk @@ -23,12 +23,25 @@ PKG_ARCH="any" PKG_LICENSE="BSD" PKG_SITE="http://www.tortall.net/projects/yasm/" PKG_URL="http://www.tortall.net/projects/yasm/releases/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS="" -PKG_BUILD_DEPENDS="ccache:host" +PKG_DEPENDS_HOST="" +PKG_BUILD_DEPENDS_HOST="ccache:host" PKG_PRIORITY="optional" PKG_SECTION="toolchain/lang" PKG_SHORTDESC="yasm: A complete rewrite of the NASM assembler" PKG_LONGDESC="Yasm is a complete rewrite of the NASM assembler under the new BSD License (some portions are under other licenses, see COPYING for details). It is designed from the ground up to allow for multiple assembler syntaxes to be supported (eg, NASM, TASM, GAS, etc.) in addition to multiple output object formats and even multiple instruction sets. Another primary module of the overall design is an optimizer module." -PKG_IS_ADDON="no" +PKG_IS_ADDON="no" PKG_AUTORECONF="no" + +PKG_CONFIGURE_OPTS_HOST="--disable-debug \ + --disable-warnerror \ + --disable-profiling \ + --disable-gcov \ + --disable-python \ + --disable-python-bindings \ + --enable-nls \ + --disable-rpath \ + --without-dmalloc \ + --with-gnu-ld \ + --without-libiconv-prefix \ + --without-libintl-prefix" diff --git a/packages/multimedia/SDL-host/meta b/packages/multimedia/SDL-host/meta index b9a001b6ff..b19964fa13 100644 --- a/packages/multimedia/SDL-host/meta +++ b/packages/multimedia/SDL-host/meta @@ -24,7 +24,7 @@ PKG_LICENSE="GPL" PKG_SITE="http://www.libsdl.org/" PKG_URL="" PKG_DEPENDS="" -PKG_BUILD_DEPENDS="toolchain yasm" +PKG_BUILD_DEPENDS="toolchain yasm:host" PKG_PRIORITY="optional" PKG_SECTION="multimedia" PKG_SHORTDESC="libsdl: A cross-platform Graphic API" diff --git a/packages/multimedia/SDL/meta b/packages/multimedia/SDL/meta index ff52beee38..e1cd9d78f0 100644 --- a/packages/multimedia/SDL/meta +++ b/packages/multimedia/SDL/meta @@ -24,7 +24,7 @@ PKG_LICENSE="GPL" PKG_SITE="http://www.libsdl.org/" PKG_URL="http://www.libsdl.org/release/$PKG_NAME-$PKG_VERSION.tar.gz" PKG_DEPENDS="alsa-lib" -PKG_BUILD_DEPENDS="toolchain yasm alsa-lib" +PKG_BUILD_DEPENDS="toolchain yasm:host alsa-lib" PKG_PRIORITY="optional" PKG_SECTION="multimedia" PKG_SHORTDESC="libsdl: A cross-platform Graphic API" diff --git a/packages/multimedia/ffmpeg/meta b/packages/multimedia/ffmpeg/meta index 3689012cc2..48cbf6a82f 100644 --- a/packages/multimedia/ffmpeg/meta +++ b/packages/multimedia/ffmpeg/meta @@ -23,8 +23,8 @@ PKG_ARCH="any" PKG_LICENSE="LGPL" PKG_SITE="http://ffmpeg.org" PKG_URL="http://ffmpeg.org/releases/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS="yasm zlib bzip2 libvorbis gnutls" -PKG_BUILD_DEPENDS="toolchain yasm zlib bzip2 libvorbis gnutls" +PKG_DEPENDS="zlib bzip2 libvorbis gnutls" +PKG_BUILD_DEPENDS="toolchain yasm:host zlib bzip2 libvorbis gnutls" PKG_PRIORITY="optional" PKG_SECTION="multimedia" PKG_SHORTDESC="FFmpeg is a complete, cross-platform solution to record, convert and stream audio and video." diff --git a/packages/toolchain/lang/yasm/build b/packages/toolchain/lang/yasm/build deleted file mode 100755 index f9ea165ee8..0000000000 --- a/packages/toolchain/lang/yasm/build +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv) -# -# OpenELEC 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 of the License, or -# (at your option) any later version. -# -# OpenELEC 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. If not, see . -################################################################################ - -. config/options $1 - -setup_toolchain host - -cd $PKG_BUILD -./configure --host=$HOST_NAME \ - --build=$HOST_NAME \ - --prefix=$ROOT/$TOOLCHAIN \ - --disable-debug \ - --disable-warnerror \ - --disable-profiling \ - --disable-gcov \ - --disable-python \ - --disable-python-bindings \ - --enable-nls \ - --disable-rpath \ - --without-dmalloc \ - --with-gnu-ld \ - --without-libiconv-prefix \ - --without-libintl-prefix - -make -make install diff --git a/packages/toolchain/meta b/packages/toolchain/meta index 3f972e32c3..1e5513af1c 100644 --- a/packages/toolchain/meta +++ b/packages/toolchain/meta @@ -24,7 +24,7 @@ PKG_LICENSE="GPL" PKG_SITE="http://www.openelec.tv" PKG_URL="" PKG_DEPENDS="" -PKG_BUILD_DEPENDS="make:host xz:host sed:host pkg-config:host autotools gcc:host bison:host flex:host cmake:host scons:host yasm nasm:host" +PKG_BUILD_DEPENDS="make:host xz:host sed:host pkg-config:host autotools gcc:host bison:host flex:host cmake:host scons:host yasm:host nasm:host" PKG_PRIORITY="optional" PKG_SECTION="toolchain/devel" PKG_SHORTDESC="toolchain: OpenELEC.tv' toolchain"