From 0dadc2ff1b29f9e68ff007fa8a72b055d9b6a227 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 20 Mar 2016 10:59:48 +0100 Subject: [PATCH 01/15] kodi: Clean Kodi view cache on startup Signed-off-by: Stephan Raue --- packages/mediacenter/kodi/scripts/kodi-config | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/packages/mediacenter/kodi/scripts/kodi-config b/packages/mediacenter/kodi/scripts/kodi-config index e20e35870c..f0ce394bc1 100755 --- a/packages/mediacenter/kodi/scripts/kodi-config +++ b/packages/mediacenter/kodi/scripts/kodi-config @@ -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 From 00ee7b6c3934507eb0cd127d93f7c47ead5292fb Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 20 Mar 2016 11:10:56 +0100 Subject: [PATCH 02/15] ffmpeg: add upstream patch Signed-off-by: Stephan Raue --- .../ffmpeg/patches/ffmpeg-2.8-upstream.patch | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 packages/multimedia/ffmpeg/patches/ffmpeg-2.8-upstream.patch diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-2.8-upstream.patch b/packages/multimedia/ffmpeg/patches/ffmpeg-2.8-upstream.patch new file mode 100644 index 0000000000..203132fe78 --- /dev/null +++ b/packages/multimedia/ffmpeg/patches/ffmpeg-2.8-upstream.patch @@ -0,0 +1,23 @@ +From 101dcdc12659e7fc2ddc1393992e2b431e2c4da1 Mon Sep 17 00:00:00 2001 +From: Hendrik Leppkes +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]) { From dabd3dc47bb5f3e62afb84d25b19fe0d8717f5b6 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 20 Mar 2016 12:40:02 +0100 Subject: [PATCH 03/15] ffmpeg: rename patches Signed-off-by: Stephan Raue --- .../patches/{ffmpeg-2.8-kodi.patch => ffmpeg-010-kodi.patch} | 0 ...g-libressl-is-free.patch => ffmpeg-050-libressl-is-free.patch} | 0 ...reation.patch => ffmpeg-100-Speed_up_wtv_index_creation.patch} | 0 ...01-mpeg4video-Signal-unsupported-GMC-with-more-than-one.patch} | 0 .../{ffmpeg-2.8-upstream.patch => ffmpeg-901-upstream.patch} | 0 5 files changed, 0 insertions(+), 0 deletions(-) rename packages/multimedia/ffmpeg/patches/{ffmpeg-2.8-kodi.patch => ffmpeg-010-kodi.patch} (100%) rename packages/multimedia/ffmpeg/patches/{ffmpeg-libressl-is-free.patch => ffmpeg-050-libressl-is-free.patch} (100%) rename packages/multimedia/ffmpeg/patches/{ffmpeg-Speed_up_wtv_index_creation.patch => ffmpeg-100-Speed_up_wtv_index_creation.patch} (100%) rename packages/multimedia/ffmpeg/patches/{ffmpeg-99.0011-mpeg4video-Signal-unsupported-GMC-with-more-than-one.patch => ffmpeg-101-mpeg4video-Signal-unsupported-GMC-with-more-than-one.patch} (100%) rename packages/multimedia/ffmpeg/patches/{ffmpeg-2.8-upstream.patch => ffmpeg-901-upstream.patch} (100%) diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-2.8-kodi.patch b/packages/multimedia/ffmpeg/patches/ffmpeg-010-kodi.patch similarity index 100% rename from packages/multimedia/ffmpeg/patches/ffmpeg-2.8-kodi.patch rename to packages/multimedia/ffmpeg/patches/ffmpeg-010-kodi.patch diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-libressl-is-free.patch b/packages/multimedia/ffmpeg/patches/ffmpeg-050-libressl-is-free.patch similarity index 100% rename from packages/multimedia/ffmpeg/patches/ffmpeg-libressl-is-free.patch rename to packages/multimedia/ffmpeg/patches/ffmpeg-050-libressl-is-free.patch diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-Speed_up_wtv_index_creation.patch b/packages/multimedia/ffmpeg/patches/ffmpeg-100-Speed_up_wtv_index_creation.patch similarity index 100% rename from packages/multimedia/ffmpeg/patches/ffmpeg-Speed_up_wtv_index_creation.patch rename to packages/multimedia/ffmpeg/patches/ffmpeg-100-Speed_up_wtv_index_creation.patch diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-99.0011-mpeg4video-Signal-unsupported-GMC-with-more-than-one.patch b/packages/multimedia/ffmpeg/patches/ffmpeg-101-mpeg4video-Signal-unsupported-GMC-with-more-than-one.patch similarity index 100% rename from packages/multimedia/ffmpeg/patches/ffmpeg-99.0011-mpeg4video-Signal-unsupported-GMC-with-more-than-one.patch rename to packages/multimedia/ffmpeg/patches/ffmpeg-101-mpeg4video-Signal-unsupported-GMC-with-more-than-one.patch diff --git a/packages/multimedia/ffmpeg/patches/ffmpeg-2.8-upstream.patch b/packages/multimedia/ffmpeg/patches/ffmpeg-901-upstream.patch similarity index 100% rename from packages/multimedia/ffmpeg/patches/ffmpeg-2.8-upstream.patch rename to packages/multimedia/ffmpeg/patches/ffmpeg-901-upstream.patch From 61979f8e898b8ad4492cb0ecd5956fbc5e8ae724 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 20 Mar 2016 15:10:21 +0100 Subject: [PATCH 04/15] new package: add pakage 'visualization.shadertoy' Signed-off-by: Stephan Raue --- .../visualization.shadertoy/package.mk | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 packages/mediacenter/kodi-binary-addons/visualization.shadertoy/package.mk diff --git a/packages/mediacenter/kodi-binary-addons/visualization.shadertoy/package.mk b/packages/mediacenter/kodi-binary-addons/visualization.shadertoy/package.mk new file mode 100644 index 0000000000..58f2ddd865 --- /dev/null +++ b/packages/mediacenter/kodi-binary-addons/visualization.shadertoy/package.mk @@ -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 . +################################################################################ + +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/ +} From 7a71d52428eed114887263e347e14e34e0b97f9a Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 20 Mar 2016 15:11:21 +0100 Subject: [PATCH 05/15] tools/mkpkg/update_binary-addons: show not packaged and skipped addons Signed-off-by: Stephan Raue --- tools/mkpkg/update_binary-addons | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/mkpkg/update_binary-addons b/tools/mkpkg/update_binary-addons index 526275d4dc..edfec11429 100755 --- a/tools/mkpkg/update_binary-addons +++ b/tools/mkpkg/update_binary-addons @@ -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 From 65a95ec7a3c75a281973ce5c3fd44ef716086628 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 20 Mar 2016 20:08:58 +0100 Subject: [PATCH 06/15] glew: dont depend on packages libX11 libXext libXi libXmu and OpenGL Signed-off-by: Stephan Raue --- packages/graphics/glew/package.mk | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/packages/graphics/glew/package.mk b/packages/graphics/glew/package.mk index 14139cef00..658ca86bf9 100644 --- a/packages/graphics/glew/package.mk +++ b/packages/graphics/glew/package.mk @@ -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" \ From 281eca91f1f386ed7af347d2e3ae46785b3666df Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 20 Mar 2016 20:12:34 +0100 Subject: [PATCH 07/15] libprojectM: depend on freetype and OpenGL Signed-off-by: Stephan Raue --- packages/graphics/libprojectM/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/graphics/libprojectM/package.mk b/packages/graphics/libprojectM/package.mk index 5b0c2eeb06..146f71a1b0 100644 --- a/packages/graphics/libprojectM/package.mk +++ b/packages/graphics/libprojectM/package.mk @@ -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:" From b0e3ff322106ae319b4ab5d8f35c4b8c7339d93e Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 20 Mar 2016 20:16:40 +0100 Subject: [PATCH 08/15] remove package 'ratpoison' Signed-off-by: Stephan Raue --- .../x11/other/ratpoison/config/ratpoisonrc | 6 --- packages/x11/other/ratpoison/package.mk | 53 ------------------- .../ratpoison/system.d/windowmanager.service | 18 ------- 3 files changed, 77 deletions(-) delete mode 100644 packages/x11/other/ratpoison/config/ratpoisonrc delete mode 100644 packages/x11/other/ratpoison/package.mk delete mode 100644 packages/x11/other/ratpoison/system.d/windowmanager.service diff --git a/packages/x11/other/ratpoison/config/ratpoisonrc b/packages/x11/other/ratpoison/config/ratpoisonrc deleted file mode 100644 index f1c4e69587..0000000000 --- a/packages/x11/other/ratpoison/config/ratpoisonrc +++ /dev/null @@ -1,6 +0,0 @@ -startup_message off -set wingravity static -set transgravity static -set maxsizegravity static -set historysize 0 -definekey top M-Tab next diff --git a/packages/x11/other/ratpoison/package.mk b/packages/x11/other/ratpoison/package.mk deleted file mode 100644 index 75d69597d3..0000000000 --- a/packages/x11/other/ratpoison/package.mk +++ /dev/null @@ -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 . -################################################################################ - -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 -} diff --git a/packages/x11/other/ratpoison/system.d/windowmanager.service b/packages/x11/other/ratpoison/system.d/windowmanager.service deleted file mode 100644 index d6d9cee209..0000000000 --- a/packages/x11/other/ratpoison/system.d/windowmanager.service +++ /dev/null @@ -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 From 52eb217ce7eefe90a358e234a9717d1737055e22 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 22 Mar 2016 08:16:55 +0100 Subject: [PATCH 09/15] ntfs-3g_ntfsprogs: update to ntfs-3g_ntfsprogs-2016.2.22 Signed-off-by: Stephan Raue --- packages/sysutils/ntfs-3g_ntfsprogs/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/sysutils/ntfs-3g_ntfsprogs/package.mk b/packages/sysutils/ntfs-3g_ntfsprogs/package.mk index 22cb58edaa..d8b7ff5233 100644 --- a/packages/sysutils/ntfs-3g_ntfsprogs/package.mk +++ b/packages/sysutils/ntfs-3g_ntfsprogs/package.mk @@ -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" From 6a757af6b36d5e98bb63e743877536c235813c52 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 22 Mar 2016 17:53:01 +0100 Subject: [PATCH 10/15] arm-mem: init build depends on target build Signed-off-by: Stephan Raue --- packages/devel/arm-mem/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/devel/arm-mem/package.mk b/packages/devel/arm-mem/package.mk index 7dc796fe2a..24b1b0b24d 100644 --- a/packages/devel/arm-mem/package.mk +++ b/packages/devel/arm-mem/package.mk @@ -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" From 37e056bb55dc1247a0e455681c936a6b267bdd64 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 22 Mar 2016 19:23:51 +0100 Subject: [PATCH 11/15] tinyxml2: build statically, fix build Signed-off-by: Stephan Raue --- packages/textproc/tinyxml2/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/textproc/tinyxml2/package.mk b/packages/textproc/tinyxml2/package.mk index 9f0a8161fe..04dc2bf138 100644 --- a/packages/textproc/tinyxml2/package.mk +++ b/packages/textproc/tinyxml2/package.mk @@ -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 } From 1a8f61d38dc0ec7528872a74dcfe1d56e366d7a6 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 23 Mar 2016 08:13:39 +0100 Subject: [PATCH 12/15] busybox: add '8812au' to SUSPEND_MODULES Signed-off-by: Stephan Raue --- packages/sysutils/busybox/config/suspend-modules.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/sysutils/busybox/config/suspend-modules.conf b/packages/sysutils/busybox/config/suspend-modules.conf index 6a0956732f..54ee22373b 100644 --- a/packages/sysutils/busybox/config/suspend-modules.conf +++ b/packages/sysutils/busybox/config/suspend-modules.conf @@ -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" From b3dd76a670ae6efb75964ae71c89d0a9a37f88ab Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 23 Mar 2016 08:51:59 +0100 Subject: [PATCH 13/15] libbdplus: update PKG_URL Signed-off-by: Stephan Raue --- packages/multimedia/libbdplus/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/multimedia/libbdplus/package.mk b/packages/multimedia/libbdplus/package.mk index 4111baa268..b8faea1662 100644 --- a/packages/multimedia/libbdplus/package.mk +++ b/packages/multimedia/libbdplus/package.mk @@ -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" From 556178ef66236e616eaed44edfcc76d4bc84a53a Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 23 Mar 2016 13:29:34 +0100 Subject: [PATCH 14/15] vsxu: fix dependencies, link agains libX11 because glfw is linked with this library, build only on x86 Signed-off-by: Stephan Raue --- packages/graphics/vsxu/package.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/graphics/vsxu/package.mk b/packages/graphics/vsxu/package.mk index 1a0c2b0d71..6c5842c558 100644 --- a/packages/graphics/vsxu/package.mk +++ b/packages/graphics/vsxu/package.mk @@ -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 \ From c3142ca4f28eb7bbec0d9761d7220ea2fdfdf52c Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 23 Mar 2016 13:38:00 +0100 Subject: [PATCH 15/15] visualization.vsxu: build only on x86, dont exit without error if opengl is not found Signed-off-by: Stephan Raue --- .../visualization.vsxu/package.mk | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/packages/mediacenter/kodi-binary-addons/visualization.vsxu/package.mk b/packages/mediacenter/kodi-binary-addons/visualization.vsxu/package.mk index 69b1499df4..86b8aae0b9 100644 --- a/packages/mediacenter/kodi-binary-addons/visualization.vsxu/package.mk +++ b/packages/mediacenter/kodi-binary-addons/visualization.vsxu/package.mk @@ -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 \