build: use nasm with x86_64 only

Signed-off-by: Ian Leonard <antonlacon@gmail.com>
This commit is contained in:
Ian Leonard 2018-12-04 20:09:00 +00:00
parent 18c87849dc
commit a3c001541e
7 changed files with 23 additions and 11 deletions

View File

@ -7,7 +7,7 @@ PKG_SHA256="1fec931eb5c94279ad219a5b6e0202358e94a93a90cfb1603578c326abfc1238"
PKG_LICENSE="BSD"
PKG_SITE="https://www.webmproject.org"
PKG_URL="https://github.com/webmproject/libvpx/archive/v${PKG_VERSION}.tar.gz"
PKG_DEPENDS_TARGET="toolchain nasm:host"
PKG_DEPENDS_TARGET="toolchain"
PKG_LONGDESC="WebM VP8/VP9 Codec"
configure_target() {
@ -20,6 +20,7 @@ configure_target() {
PKG_TARGET_NAME_LIBVPX="armv7-linux-gcc"
;;
x86_64)
PKG_DEPENDS_TARGET+=" nasm:host"
PKG_TARGET_NAME_LIBVPX="x86_64-linux-gcc"
;;
esac

View File

@ -18,6 +18,10 @@ if [ "$KODIPLAYER_DRIVER" == "bcm2835-driver" ]; then
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET bcm2835-driver"
fi
if [ "$TARGET_ARCH" = "x86_64" ]; then
PKG_DEPENDS_TARGET+=" nasm:host"
fi
if [[ ! $TARGET_ARCH = arm ]] || target_has_feature neon; then
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libvpx"
fi

View File

@ -5,6 +5,7 @@
PKG_NAME="nasm"
PKG_VERSION="2.14"
PKG_SHA256="97c615dbf02ef80e4e2b6c385f7e28368d51efc214daa98e600ca4572500eec0"
PKG_ARCH="x86_64"
PKG_LICENSE="BSD"
PKG_SITE="https://www.nasm.us/"
PKG_URL="http://www.nasm.us/pub/nasm/releasebuilds/${PKG_VERSION}/nasm-${PKG_VERSION}.tar.xz"

View File

@ -1,5 +1,6 @@
# SPDX-License-Identifier: GPL-2.0-or-later
# Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="SDL2"
PKG_VERSION="2.0.8"
@ -7,15 +8,23 @@ PKG_SHA256="edc77c57308661d576e843344d8638e025a7818bff73f8fbfab09c3c5fd092ec"
PKG_LICENSE="GPL"
PKG_SITE="https://www.libsdl.org/"
PKG_URL="https://www.libsdl.org/release/$PKG_NAME-$PKG_VERSION.tar.gz"
PKG_DEPENDS_TARGET="toolchain nasm:host alsa-lib systemd dbus"
PKG_DEPENDS_TARGET="toolchain alsa-lib systemd dbus"
PKG_LONGDESC="A cross-platform multimedia library designed to provide fast access to the graphics framebuffer and audio device. "
PKG_BUILD_FLAGS="+pic"
if [ "$TARGET_ARCH" = "x86_64" ]; then
PKG_DEPENDS_TARGET+=" nasm:host"
PKG_SDL2_X86ASM="-DASSEMBLY=ON"
else
# Only x86(-64) and ppc assembly present as of 2.0.8
PKG_SDL2_X86ASM="-DASSEMBLY=OFF"
fi
PKG_CMAKE_OPTS_TARGET="-DSDL_STATIC=ON \
-DSDL_SHARED=OFF \
-DLIBC=ON \
-DGCC_ATOMICS=ON \
-DASSEMBLY=ON \
$PKG_SDL2_X86ASM \
-DALTIVEC=OFF \
-DOSS=OFF \
-DALSA=ON \

View File

@ -9,7 +9,7 @@ PKG_SHA256="f25559d4b803321483b28ac9b513671200bdc8e3531c02f0affdd622846a9c5e"
PKG_LICENSE="LGPLv2.1+"
PKG_SITE="https://ffmpeg.org"
PKG_URL="https://github.com/xbmc/FFmpeg/archive/${PKG_VERSION}.tar.gz"
PKG_DEPENDS_TARGET="toolchain nasm:host zlib bzip2 openssl speex"
PKG_DEPENDS_TARGET="toolchain zlib bzip2 openssl speex"
PKG_LONGDESC="FFmpeg is a complete, cross-platform solution to record, convert and stream audio and video."
PKG_BUILD_FLAGS="-gold"
@ -61,9 +61,7 @@ else
fi
if [ "$TARGET_ARCH" = "x86_64" ]; then
PKG_FFMPEG_X86ASM="--enable-x86asm --x86asmexe=nasm"
else
PKG_FFMPEG_X86ASM="--disable-x86asm"
PKG_DEPENDS_TARGET+=" nasm:host"
fi
if target_has_feature "(neon|sse)"; then
@ -189,7 +187,6 @@ configure_target() {
--enable-asm \
--disable-altivec \
$PKG_FFMPEG_FPU \
$PKG_FFMPEG_X86ASM \
--disable-symver
}

View File

@ -18,6 +18,6 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-test \
--with-gnu-ld"
if [ $TARGET_ARCH = "x86_64" ]; then
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET nasm:host"
PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --enable-asm"
PKG_DEPENDS_TARGET+=" nasm:host"
PKG_CONFIGURE_OPTS_TARGET+=" --enable-asm"
fi

View File

@ -6,6 +6,6 @@ PKG_VERSION=""
PKG_LICENSE="GPL"
PKG_SITE="https://libreelec.tv"
PKG_URL=""
PKG_DEPENDS_TARGET="configtools:host make:host xz:host sed:host pkg-config:host autoconf:host automake:host intltool:host libtool:host autoconf-archive:host gcc:host bison:host flex:host cmake:host xmlstarlet:host nasm:host p7zip:host ninja:host meson:host"
PKG_DEPENDS_TARGET="configtools:host make:host xz:host sed:host pkg-config:host autoconf:host automake:host intltool:host libtool:host autoconf-archive:host gcc:host bison:host flex:host cmake:host xmlstarlet:host p7zip:host ninja:host meson:host"
PKG_SECTION="virtual"
PKG_LONGDESC="LibreELEC.tv' toolchain to compile all packages"