Merge pull request #2081 from CvH/8.2-hyperion

hyperion: update to 1c21232
This commit is contained in:
Christian Hewitt 2017-10-12 10:51:25 +04:00 committed by GitHub
commit fb5fb91a3e
3 changed files with 21 additions and 19 deletions

View File

@ -1,6 +1,6 @@
################################################################################ ################################################################################
# This file is part of LibreELEC - https://libreelec.tv # This file is part of LibreELEC - https://libreelec.tv
# Copyright (C) 2016 Team LibreELEC # Copyright (C) 2016-present Team LibreELEC
# #
# LibreELEC is free software: you can redistribute it and/or modify # LibreELEC is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@ -17,17 +17,15 @@
################################################################################ ################################################################################
PKG_NAME="rpi_ws281x" PKG_NAME="rpi_ws281x"
PKG_VERSION="3e6ea50" PKG_VERSION="f580777"
PKG_ARCH="any" PKG_ARCH="any"
PKG_LICENSE="" PKG_LICENSE="BSD-3c"
PKG_SITE="https://github.com/hyperion-project/rpi_ws281x" PKG_SITE="https://github.com/hyperion-project/rpi_ws281x"
PKG_URL="https://github.com/hyperion-project/rpi_ws281x/archive/$PKG_VERSION.tar.gz" PKG_URL="https://github.com/hyperion-project/rpi_ws281x/archive/$PKG_VERSION.tar.gz"
PKG_DEPENDS_TARGET="toolchain" PKG_DEPENDS_TARGET="toolchain"
PKG_SECTION="" PKG_SECTION=""
PKG_SHORTDESC="Userspace Raspberry Pi PWM library for WS281X LEDs" PKG_SHORTDESC="Userspace Raspberry Pi PWM library for WS281X LEDs"
PKG_LONGDESC="Userspace Raspberry Pi PWM library for WS281X LEDs" PKG_LONGDESC="Userspace Raspberry Pi PWM library for WS281X LEDs"
PKG_IS_ADDON="no"
PKG_AUTORECONF="no" PKG_AUTORECONF="no"
make_target() { make_target() {

View File

@ -1,3 +1,6 @@
106
- Update to version 1c21232
105 105
- Update protobuf to 3.1.0 - Update protobuf to 3.1.0
- Fix build with gcc 6 - Fix build with gcc 6

View File

@ -1,6 +1,7 @@
################################################################################ ################################################################################
# This file is part of LibreELEC - https://libreelec.tv # This file is part of LibreELEC - https://libreelec.tv
# Copyright (C) 2009-2016 Lukas Rusak (lrusak@libreelec.tv) # Copyright (C) 2009-2016 Lukas Rusak (lrusak@libreelec.tv)
# Copyright (C) 2016-present Team LibreELEC
# #
# LibreELEC is free software: you can redistribute it and/or modify # LibreELEC is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@ -17,8 +18,8 @@
################################################################################ ################################################################################
PKG_NAME="hyperion" PKG_NAME="hyperion"
PKG_VERSION="355a324" PKG_VERSION="1c21232"
PKG_REV="105" PKG_REV="106"
PKG_LICENSE="GPL" PKG_LICENSE="GPL"
PKG_SITE="https://github.com/hyperion-project/hyperion" PKG_SITE="https://github.com/hyperion-project/hyperion"
PKG_URL="https://github.com/hyperion-project/hyperion/archive/$PKG_VERSION.tar.gz" PKG_URL="https://github.com/hyperion-project/hyperion/archive/$PKG_VERSION.tar.gz"
@ -31,21 +32,21 @@ PKG_IS_ADDON="yes"
PKG_ADDON_NAME="Hyperion" PKG_ADDON_NAME="Hyperion"
PKG_ADDON_TYPE="xbmc.service" PKG_ADDON_TYPE="xbmc.service"
AMLOGIC_SUPPORT="-DENABLE_AMLOGIC=0" PKG_AMLOGIC_SUPPORT="-DENABLE_AMLOGIC=0"
DISPMANX_SUPPORT="-DENABLE_DISPMANX=0" PKG_DISPMANX_SUPPORT="-DENABLE_DISPMANX=0"
FB_SUPPORT="-DENABLE_FB=1" PKG_FB_SUPPORT="-DENABLE_FB=1"
X11_SUPPORT="-DENABLE_X11=0" PKG_X11_SUPPORT="-DENABLE_X11=0"
if [ "$KODIPLAYER_DRIVER" = "libamcodec" ]; then if [ "$KODIPLAYER_DRIVER" = "libamcodec" ]; then
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libamcodec" PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libamcodec"
AMLOGIC_SUPPORT="-DENABLE_AMLOGIC=1" PKG_AMLOGIC_SUPPORT="-DENABLE_AMLOGIC=1"
elif [ "$KODIPLAYER_DRIVER" = "bcm2835-driver" ]; then elif [ "$KODIPLAYER_DRIVER" = "bcm2835-driver" ]; then
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET bcm2835-driver" PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET bcm2835-driver"
DISPMANX_SUPPORT="-DENABLE_DISPMANX=1" PKG_DISPMANX_SUPPORT="-DENABLE_DISPMANX=1"
FB_SUPPORT="-DENABLE_FB=0" PKG_FB_SUPPORT="-DENABLE_FB=0"
elif [ "$DISPLAYSERVER" = "x11" ]; then elif [ "$DISPLAYSERVER" = "x11" ]; then
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET xorg-server xrandr" PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET xorg-server xrandr"
X11_SUPPORT="-DENABLE_X11=1" PKG_X11_SUPPORT="-DENABLE_X11=1"
fi fi
pre_build_target() { pre_build_target() {
@ -58,9 +59,9 @@ pre_configure_target() {
PKG_CMAKE_OPTS_TARGET="-DCMAKE_NO_SYSTEM_FROM_IMPORTED=ON \ PKG_CMAKE_OPTS_TARGET="-DCMAKE_NO_SYSTEM_FROM_IMPORTED=ON \
-DHYPERION_VERSION_ID="$PKG_VERSION" \ -DHYPERION_VERSION_ID="$PKG_VERSION" \
$AMLOGIC_SUPPORT \ $PKG_AMLOGIC_SUPPORT \
$DISPMANX_SUPPORT \ $PKG_DISPMANX_SUPPORT \
$FB_SUPPORT \ $PKG_FB_SUPPORT \
-DENABLE_OSX=0 \ -DENABLE_OSX=0 \
-DUSE_SYSTEM_PROTO_LIBS=1 \ -DUSE_SYSTEM_PROTO_LIBS=1 \
-DENABLE_SPIDEV=1 \ -DENABLE_SPIDEV=1 \
@ -68,7 +69,7 @@ PKG_CMAKE_OPTS_TARGET="-DCMAKE_NO_SYSTEM_FROM_IMPORTED=ON \
-DENABLE_V4L2=1 \ -DENABLE_V4L2=1 \
-DENABLE_WS2812BPWM=0 \ -DENABLE_WS2812BPWM=0 \
-DENABLE_WS281XPWM=1 \ -DENABLE_WS281XPWM=1 \
$X11_SUPPORT \ $PKG_X11_SUPPORT \
-DENABLE_QT5=1 \ -DENABLE_QT5=1 \
-DENABLE_TESTS=0 \ -DENABLE_TESTS=0 \
-Wno-dev" -Wno-dev"