Merge pull request #59 from lrusak/upstream-changes

Thanks :)
This commit is contained in:
Christian Hewitt 2016-03-29 18:11:43 +04:00
commit 01b9aae849
20 changed files with 94 additions and 102 deletions

View File

@ -24,7 +24,7 @@ PKG_LICENSE="GPL"
PKG_SITE="https://github.com/bavison/arm-mem"
PKG_URL="https://github.com/bavison/arm-mem/archive/$PKG_VERSION.tar.gz"
PKG_DEPENDS_TARGET="toolchain"
PKG_DEPENDS_INIT="toolchain"
PKG_DEPENDS_INIT="toolchain arm-mem"
PKG_PRIORITY="optional"
PKG_SECTION="devel"
PKG_SHORTDESC="arm-mem: ARM-accelerated versions of selected functions from string.h"

View File

@ -23,7 +23,7 @@ PKG_ARCH="any"
PKG_LICENSE="BSD"
PKG_SITE="http://glew.sourceforge.net/"
PKG_URL="$SOURCEFORGE_SRC/glew/glew/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tgz"
PKG_DEPENDS_TARGET="toolchain libX11 libXext libXi libXmu"
PKG_DEPENDS_TARGET="toolchain"
PKG_PRIORITY="optional"
PKG_SECTION="graphics"
PKG_SHORTDESC="glew: The OpenGL Extension Wrangler Library"
@ -32,10 +32,6 @@ PKG_LONGDESC="The OpenGL Extension Wrangler Library (GLEW) is a cross-platform C
PKG_IS_ADDON="no"
PKG_AUTORECONF="no"
if [ ! "$OPENGL" = "no" ]; then
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET $OPENGL glu"
fi
make_target() {
make CC="$CC" LD="$CC" AR="$AR" \
POPT="$CFLAGS" LDFLAGS.EXTRA="$LDFLAGS" \

View File

@ -23,7 +23,7 @@ PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://projectm.sourceforge.net/"
PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.gz"
PKG_DEPENDS_TARGET="toolchain ftgl"
PKG_DEPENDS_TARGET="toolchain ftgl freetype $OPENGL"
PKG_PRIORITY="optional"
PKG_SECTION="multimedia"
PKG_SHORTDESC="libprojectM:"

View File

@ -19,12 +19,12 @@
PKG_NAME="vsxu"
PKG_VERSION="0.5.1"
PKG_REV="1"
PKG_ARCH="any"
PKG_ARCH="i386 x86_64"
PKG_LICENSE="GPL"
PKG_SITE="http://www.vsxu.com"
# repackaged from https://github.com/vovoid/vsxu/archive/$PKG_VERSION.tar.gz
PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.gz"
PKG_DEPENDS_TARGET="toolchain glew glfw"
PKG_DEPENDS_TARGET="toolchain $OPENGL libX11 glew glfw zlib libpng libjpeg-turbo freetype"
PKG_PRIORITY="optional"
PKG_SECTION="multimedia"
PKG_SHORTDESC="vsxu:"
@ -33,6 +33,8 @@ PKG_LONGDESC="vsxu:"
PKG_IS_ADDON="no"
PKG_AUTORECONF="no"
export LDFLAGS="$LDFLAGS -lX11"
configure_target() {
cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \
-DCMAKE_INSTALL_PREFIX=/usr \

View File

@ -0,0 +1,49 @@
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2016 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 <http://www.gnu.org/licenses/>.
################################################################################
PKG_NAME="visualization.shadertoy"
PKG_VERSION="f998800"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="https://github.com/notspiff/visualization.shadertoy"
PKG_GIT_URL="https://github.com/notspiff/visualization.shadertoy"
PKG_GIT_BRANCH="master"
PKG_DEPENDS_TARGET="toolchain kodi-platform $OPENGL glew"
PKG_PRIORITY="optional"
PKG_SECTION=""
PKG_SHORTDESC="visualization.shadertoy"
PKG_LONGDESC="visualization.shadertoy"
PKG_AUTORECONF="no"
PKG_IS_ADDON="yes"
PKG_ADDON_TYPE="xbmc.player.musicviz"
configure_target() {
cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_MODULE_PATH=$SYSROOT_PREFIX/usr/lib/kodi \
-DCMAKE_PREFIX_PATH=$SYSROOT_PREFIX/usr \
..
}
addon() {
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/
cp -PR $PKG_BUILD/.install_pkg/usr/share/kodi/addons/$PKG_NAME/* $ADDON_BUILD/$PKG_ADDON_ID/
cp -PL $PKG_BUILD/.install_pkg/usr/lib/kodi/addons/$PKG_NAME/*.so $ADDON_BUILD/$PKG_ADDON_ID/
}

View File

@ -19,7 +19,7 @@
PKG_NAME="visualization.vsxu"
PKG_VERSION="990332f"
PKG_REV="1"
PKG_ARCH="any"
PKG_ARCH="i386 x86_64"
PKG_LICENSE="GPL"
PKG_SITE="https://github.com/notspiff/visualization.vsxu"
PKG_URL="https://github.com/notspiff/visualization.vsxu/archive/$PKG_VERSION.tar.gz"
@ -33,17 +33,6 @@ PKG_AUTORECONF="no"
PKG_IS_ADDON="yes"
PKG_ADDON_TYPE="xbmc.player.musicviz"
if [ "$OPENGL" = "no" ] ; then
exit 0
fi
# dont build and upload for repos for now
# TODO fix
# undefined symbol: mt_32_to_double
# vis.vsxu also not linked against libGL ?
exit 0
configure_target() {
cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \
-DCMAKE_INSTALL_PREFIX=/usr \

View File

@ -42,6 +42,13 @@ if [ ! -f $HOME/.kodi/userdata/guisettings.xml ] ; then
fi
fi
# cleanup *.fi cache files from .kodi/temp as old version
# of these files can cause random problems/crashes, particularly
# after an upgrade
if [ -d $HOME/.kodi/temp ]; then
rm -f $HOME/.kodi/temp/*.fi
fi
if [ -e /run/lirc/lircd.irtrans ]; then
KODI_ARGS="--lircdev /run/lirc/lircd.irtrans"
else

View File

@ -0,0 +1,23 @@
From 101dcdc12659e7fc2ddc1393992e2b431e2c4da1 Mon Sep 17 00:00:00 2001
From: Hendrik Leppkes <h.leppkes@gmail.com>
Date: Fri, 22 Jan 2016 13:50:42 +0100
Subject: [PATCH] dxva2_h264: fix reference field marking in long slice struct
Fixes artifacts in interlaced decoding on old Intel GPUs.
---
libavcodec/dxva2_h264.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavcodec/dxva2_h264.c b/libavcodec/dxva2_h264.c
index eb5ecd1..242a79e 100644
--- a/libavcodec/dxva2_h264.c
+++ b/libavcodec/dxva2_h264.c
@@ -248,7 +248,7 @@ static void fill_slice_long(AVCodecContext *avctx, DXVA_Slice_H264_Long *slice,
else
index = get_refpic_index(pp, ff_dxva2_get_surface_index(avctx, ctx, r->f));
fill_picture_entry(&slice->RefPicList[list][i], index,
- r->reference == PICT_BOTTOM_FIELD);
+ sl->ref_list[list][i].reference == PICT_BOTTOM_FIELD);
for (plane = 0; plane < 3; plane++) {
int w, o;
if (plane == 0 && sl->luma_weight_flag[list]) {

View File

@ -22,7 +22,7 @@ PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="https://www.videolan.org/developers/libbdplus.html"
PKG_URL="ftp://ftp.videolan.org/pub/videolan/libbdplus/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.bz2"
PKG_URL="https://ftp.videolan.org/pub/videolan/libbluray/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.bz2"
PKG_DEPENDS_TARGET="toolchain libgcrypt libgpg-error"
PKG_PRIORITY="optional"
PKG_SECTION="multimedia"

View File

@ -1 +1 @@
SUSPEND_MODULES="jme asix anysee rtl8192se imon r8712u cx23885 cdc_acm ddbridge brcmfmac"
SUSPEND_MODULES="jme asix anysee rtl8192se imon r8712u cx23885 cdc_acm ddbridge brcmfmac 8812au"

View File

@ -17,7 +17,7 @@
################################################################################
PKG_NAME="ntfs-3g_ntfsprogs"
PKG_VERSION="2015.3.14"
PKG_VERSION="2016.2.22"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -39,10 +39,10 @@ pre_configure_target() {
configure_target() {
cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \
-DCMAKE_INSTALL_PREFIX=/usr \
-DBUILD_SHARED_LIBS=off \
..
}
post_makeinstall_target() {
rm $SYSROOT_PREFIX/usr/lib/libtinyxml2.so*
rm -rf $INSTALL/usr
}

View File

@ -1,6 +0,0 @@
startup_message off
set wingravity static
set transgravity static
set maxsizegravity static
set historysize 0
definekey top M-Tab next

View File

@ -1,53 +0,0 @@
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2016 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 <http://www.gnu.org/licenses/>.
################################################################################
PKG_NAME="ratpoison"
PKG_VERSION="1.4.8"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.nongnu.org/ratpoison"
PKG_URL="http://download.savannah.nongnu.org/releases/ratpoison/$PKG_NAME-$PKG_VERSION.tar.xz"
PKG_DEPENDS_TARGET="toolchain util-macros libICE libX11 libXext libXtst libXinerama"
PKG_PRIORITY="optional"
PKG_SECTION="x11/other"
PKG_SHORTDESC="ratpoison: A window manager that lets you say good-bye to the rodent"
PKG_LONGDESC="Ratpoison is a simple window manager with no large library dependencies, no fancy graphics, no window decorations, and no rodent dependence. It is largely modeled after GNU Screen, which has done wonders in the virtual terminal market. All interaction with the window manager is done through keystrokes. Ratpoison has a prefix map to minimize the key clobbering that cripples EMACS and other quality pieces of software. All windows are maximized and kept maximized to avoid wasting precious screen space."
PKG_IS_ADDON="no"
PKG_AUTORECONF="yes"
PKG_CONFIGURE_OPTS_TARGET="--x-includes=$SYSROOT_PREFIX/usr/include \
--x-libraries=$SYSROOT_PREFIX/usr/lib \
--disable-debug \
--disable-history \
--with-xterm=rxvt \
--without-xft \
--with-x"
pre_configure_target() {
LDFLAGS="$LDFLAGS -fwhole-program"
}
post_makeinstall_target() {
rm -rf $INSTALL/usr/bin/rpws
rm -rf $INSTALL/usr/share
mkdir -p $INSTALL/etc
cp $PKG_DIR/config/ratpoisonrc $INSTALL/etc
}

View File

@ -1,18 +0,0 @@
[Unit]
Description=Ratpoison Window Manager
Requires=xorg.service
After=xorg.service
Before=kodi.service
[Service]
Environment=DISPLAY=:0
Environment=HOME=/storage
ExecStart=/usr/bin/ratpoison --file /etc/ratpoisonrc
KillMode=process
Restart=always
RestartSec=1
StartLimitInterval=0
TimeoutStopSec=1s
[Install]
WantedBy=graphical.target

View File

@ -118,6 +118,9 @@ for addontxt in $KODI_DIR/project/cmake/addons/bootstrap/repositories/*-addons.t
else
echo "[mkpkg] Skipped $ADDON"
SKIPPED_ADDONS="$SKIPPED_ADDONS $ADDON"
fi
done
echo "followed addons was skipped, please add packages for this:"
echo "$SKIPPED_ADDONS"
done