mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-24 11:16:51 +00:00
Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-6.0
This commit is contained in:
Stephan Raue
commit
eda3895783
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="cpio"
|
||||
PKG_VERSION="2.11"
|
||||
PKG_VERSION="2.12"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
||||
@ -1,14 +0,0 @@
|
||||
diff --git a/gnu/stdio.in.h b/gnu/stdio.in.h
|
||||
index 88b368b..44f1087 100644
|
||||
--- a/gnu/stdio.in.h
|
||||
+++ b/gnu/stdio.in.h
|
||||
@@ -139,7 +139,9 @@ _GL_WARN_ON_USE (fflush, "fflush is not always POSIX compliant - "
|
||||
so any use of gets warrants an unconditional warning. Assume it is
|
||||
always declared, since it is required by C89. */
|
||||
#undef gets
|
||||
+#if HAVE_RAW_DECL_GETS
|
||||
_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
|
||||
+#endif
|
||||
|
||||
#if @GNULIB_FOPEN@
|
||||
# if @REPLACE_FOPEN@
|
||||
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="xz"
|
||||
PKG_VERSION="5.2.1"
|
||||
PKG_VERSION="5.2.2"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="glibc"
|
||||
PKG_VERSION="2.21"
|
||||
PKG_VERSION="2.22"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
||||
@ -1,41 +0,0 @@
|
||||
################################################################################
|
||||
# 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 <http://www.gnu.org/licenses/>.
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="scons"
|
||||
PKG_VERSION="2.2.0"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="OSS"
|
||||
PKG_SITE="http://www.scons.org/"
|
||||
PKG_URL="$SOURCEFORGE_SRC/scons/$PKG_NAME-$PKG_VERSION.tar.gz"
|
||||
PKG_DEPENDS_HOST="Python:host"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="python/devel"
|
||||
PKG_SHORTDESC="SCons: an Open Source software construction tool—that is, a next-generation build tool."
|
||||
PKG_LONGDESC="SCons is an Open Source software construction tool—that is, a next-generation build tool."
|
||||
|
||||
PKG_IS_ADDON="no"
|
||||
PKG_AUTORECONF="no"
|
||||
|
||||
make_host() {
|
||||
: # nothing todo
|
||||
}
|
||||
|
||||
makeinstall_host() {
|
||||
python setup.py install --prefix=$ROOT/$TOOLCHAIN
|
||||
}
|
||||
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="bcm2835-driver"
|
||||
PKG_VERSION="9a21e6a"
|
||||
PKG_VERSION="960832a"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="nonfree"
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="libpng"
|
||||
PKG_VERSION="1.6.17"
|
||||
PKG_VERSION="1.6.18"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="OSS"
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="mesa"
|
||||
PKG_VERSION="10.6.8"
|
||||
PKG_VERSION="10.6.9"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="OSS"
|
||||
|
||||
@ -0,0 +1,12 @@
|
||||
diff -Naur dvbhdhomerun-20130704/userhdhomerun/hdhomerun_controller.cpp dvbhdhomerun-20130704.patch/userhdhomerun/hdhomerun_controller.cpp
|
||||
--- dvbhdhomerun-20130704/userhdhomerun/hdhomerun_controller.cpp 2013-02-17 22:37:34.000000000 +0100
|
||||
+++ dvbhdhomerun-20130704.patch/userhdhomerun/hdhomerun_controller.cpp 2015-09-23 14:13:00.659818567 +0200
|
||||
@@ -71,7 +71,7 @@
|
||||
// ...really fragile API design...
|
||||
memset(devices, 0, sizeof(devices));
|
||||
|
||||
- int numOfDevices = hdhomerun_discover_find_devices_custom(0, HDHOMERUN_DEVICE_TYPE_TUNER, HDHOMERUN_DEVICE_ID_WILDCARD, devices, m_maxDevices);
|
||||
+ int numOfDevices = hdhomerun_discover_find_devices_custom_v2(0, HDHOMERUN_DEVICE_TYPE_TUNER, HDHOMERUN_DEVICE_ID_WILDCARD, devices, m_maxDevices);
|
||||
LOG() << "Num of devices = " << numOfDevices << endl;
|
||||
|
||||
if(numOfDevices == 0) {
|
||||
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="wetekdvb"
|
||||
PKG_VERSION="20150503"
|
||||
PKG_VERSION="20150930"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="arm"
|
||||
PKG_LICENSE="nonfree"
|
||||
|
||||
@ -31,7 +31,7 @@ PKG_SHORTDESC="linux26: The Linux kernel 2.6 precompiled kernel binary image and
|
||||
PKG_LONGDESC="This package contains a precompiled kernel image and the modules."
|
||||
case "$LINUX" in
|
||||
amlogic)
|
||||
PKG_VERSION="amlogic-3.10-a9cef51"
|
||||
PKG_VERSION="amlogic-3.10-753dc30"
|
||||
PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
|
||||
;;
|
||||
imx6)
|
||||
@ -40,7 +40,7 @@ case "$LINUX" in
|
||||
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET imx6-status-led imx6-soc-fan"
|
||||
;;
|
||||
*)
|
||||
PKG_VERSION="4.1.7"
|
||||
PKG_VERSION="4.1.9"
|
||||
PKG_URL="http://www.kernel.org/pub/linux/kernel/v4.x/$PKG_NAME-$PKG_VERSION.tar.xz"
|
||||
;;
|
||||
esac
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="audioencoder.flac"
|
||||
PKG_VERSION="a5e2d12"
|
||||
PKG_VERSION="8e67185"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="pvr.argustv"
|
||||
PKG_VERSION="96c8026"
|
||||
PKG_VERSION="32f0327"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="pvr.filmon"
|
||||
PKG_VERSION="5c41f4e"
|
||||
PKG_VERSION="67abb56"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="pvr.hts"
|
||||
PKG_VERSION="5c22440"
|
||||
PKG_VERSION="016b0b3"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="pvr.mythtv"
|
||||
PKG_VERSION="538e24d"
|
||||
PKG_VERSION="ce6b801"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="pvr.pctv"
|
||||
PKG_VERSION="d23160c"
|
||||
PKG_VERSION="bca8165"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="pvr.stalker"
|
||||
PKG_VERSION="5f6eb19"
|
||||
PKG_VERSION="a89afb8"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="pvr.vbox"
|
||||
PKG_VERSION="874eb88"
|
||||
PKG_VERSION="0b1d571"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="kodi-platform"
|
||||
PKG_VERSION="054a42f66"
|
||||
PKG_VERSION="054a42f"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="kodi-theme-Confluence"
|
||||
PKG_VERSION="15.1-f4dda26"
|
||||
PKG_VERSION="15.2-rc2-4ed3eb6"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
||||
@ -1,29 +0,0 @@
|
||||
From be7118372ed9ed86ad99187eff4f6f056dfde416 Mon Sep 17 00:00:00 2001
|
||||
From: ronie <ronie@poedel.net>
|
||||
Date: Tue, 18 Aug 2015 12:24:46 +0200
|
||||
Subject: [PATCH 11/17] [Confluence] fix watched flag in media info 3 view
|
||||
|
||||
---
|
||||
720p/ViewsVideoLibrary.xml | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/720p/ViewsVideoLibrary.xml b/720p/ViewsVideoLibrary.xml
|
||||
index 443cd62..d7de36c 100644
|
||||
--- a/720p/ViewsVideoLibrary.xml
|
||||
+++ b/720p/ViewsVideoLibrary.xml
|
||||
@@ -1632,7 +1632,6 @@
|
||||
<texture>OverlayWatching.png</texture>
|
||||
<visible>ListItem.IsResumable</visible>
|
||||
</control>
|
||||
- </itemlayout>
|
||||
<control type="image">
|
||||
<left>320</left>
|
||||
<top>14</top>
|
||||
@@ -1641,6 +1640,7 @@
|
||||
<texture>$INFO[ListItem.Overlay]</texture>
|
||||
<aspectratio>keep</aspectratio>
|
||||
</control>
|
||||
+ </itemlayout>
|
||||
<focusedlayout height="40" width="345">
|
||||
<control type="image">
|
||||
<left>0</left>
|
||||
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="kodi"
|
||||
PKG_VERSION="15.1-f4dda26"
|
||||
PKG_VERSION="15.2-rc2-4ed3eb6"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="libhdhomerun"
|
||||
PKG_VERSION="20150406"
|
||||
PKG_VERSION="20150826"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="LGPL"
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="bluez"
|
||||
PKG_VERSION="5.29"
|
||||
PKG_VERSION="5.35"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
diff -Naur bluez-5.25/Makefile.tools bluez-5.25.patch/Makefile.tools
|
||||
--- bluez-5.25/Makefile.tools 2014-10-05 21:31:20.000000000 +0200
|
||||
+++ bluez-5.25.patch/Makefile.tools 2014-11-21 19:10:03.450218527 +0100
|
||||
@@ -7,7 +7,7 @@
|
||||
client/agent.h client/agent.c \
|
||||
diff -Naur bluez-5.35/Makefile.tools bluez-5.35.patch/Makefile.tools
|
||||
--- bluez-5.35/Makefile.tools 2015-09-04 03:19:36.000000000 +0200
|
||||
+++ bluez-5.35.patch/Makefile.tools 2015-10-02 15:28:03.406835739 +0200
|
||||
@@ -8,7 +8,7 @@
|
||||
client/gatt.h client/gatt.c \
|
||||
monitor/uuid.h monitor/uuid.c
|
||||
client_bluetoothctl_LDADD = gdbus/libgdbus-internal.la @GLIB_LIBS@ @DBUS_LIBS@ \
|
||||
- -lreadline
|
||||
@ -10,7 +10,7 @@ diff -Naur bluez-5.25/Makefile.tools bluez-5.25.patch/Makefile.tools
|
||||
endif
|
||||
|
||||
if MONITOR
|
||||
@@ -288,12 +288,12 @@
|
||||
@@ -340,12 +340,12 @@
|
||||
attrib/utils.c src/log.c client/display.c \
|
||||
client/display.h
|
||||
attrib_gatttool_LDADD = lib/libbluetooth-internal.la \
|
||||
@ -25,7 +25,7 @@ diff -Naur bluez-5.25/Makefile.tools bluez-5.25.patch/Makefile.tools
|
||||
|
||||
tools_obex_server_tool_SOURCES = $(gobex_sources) $(btio_sources) \
|
||||
tools/obex-server-tool.c
|
||||
@@ -302,12 +302,12 @@
|
||||
@@ -354,16 +354,16 @@
|
||||
tools_bluetooth_player_SOURCES = tools/bluetooth-player.c \
|
||||
client/display.h client/display.c
|
||||
tools_bluetooth_player_LDADD = gdbus/libgdbus-internal.la \
|
||||
@ -37,6 +37,11 @@ diff -Naur bluez-5.25/Makefile.tools bluez-5.25.patch/Makefile.tools
|
||||
tools_obexctl_LDADD = gdbus/libgdbus-internal.la \
|
||||
- @GLIB_LIBS@ @DBUS_LIBS@ -lreadline
|
||||
+ @GLIB_LIBS@ @DBUS_LIBS@ -lreadline -lncurses
|
||||
|
||||
tools_btmgmt_SOURCES = tools/btmgmt.c src/uuid-helper.c client/display.c
|
||||
tools_btmgmt_LDADD = lib/libbluetooth-internal.la src/libshared-mainloop.la \
|
||||
- -lreadline
|
||||
+ -lreadline -lncurses
|
||||
endif
|
||||
|
||||
if EXPERIMENTAL
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="libnfs"
|
||||
PKG_VERSION="1.9.7"
|
||||
PKG_VERSION="1.9.8"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
||||
@ -17,12 +17,12 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="libssh"
|
||||
PKG_VERSION="0.7.0"
|
||||
PKG_VERSION="0.7.2"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="OpenSource"
|
||||
PKG_SITE="http://www.libssh.org/"
|
||||
PKG_URL="https://red.libssh.org/attachments/download/140/$PKG_NAME-$PKG_VERSION.tar.xz"
|
||||
PKG_URL="https://red.libssh.org/attachments/download/177/$PKG_NAME-$PKG_VERSION.tar.xz"
|
||||
PKG_DEPENDS_TARGET="toolchain zlib libressl"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="network"
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="wpa_supplicant"
|
||||
PKG_VERSION="2.4"
|
||||
PKG_VERSION="2.5"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
||||
@ -0,0 +1,69 @@
|
||||
$OpenBSD: patch-src_crypto_tls_openssl_c,v 1.3 2015/09/29 11:57:54 dcoppa Exp $
|
||||
|
||||
Compatibility fixes for LibreSSL
|
||||
|
||||
--- a/src/crypto/tls_openssl.c.orig Sun Sep 27 21:02:05 2015
|
||||
+++ b/src/crypto/tls_openssl.c Mon Sep 28 13:43:46 2015
|
||||
@@ -2229,7 +2229,7 @@ static int tls_parse_pkcs12(struct tls_data *data, SSL
|
||||
}
|
||||
|
||||
if (certs) {
|
||||
-#if OPENSSL_VERSION_NUMBER >= 0x10002000L
|
||||
+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
|
||||
SSL_clear_chain_certs(ssl);
|
||||
while ((cert = sk_X509_pop(certs)) != NULL) {
|
||||
X509_NAME_oneline(X509_get_subject_name(cert), buf,
|
||||
@@ -2247,7 +2247,7 @@ static int tls_parse_pkcs12(struct tls_data *data, SSL
|
||||
/* Try to continue anyway */
|
||||
}
|
||||
sk_X509_free(certs);
|
||||
-#ifndef OPENSSL_IS_BORINGSSL
|
||||
+#if !defined(OPENSSL_IS_BORINGSSL) && !defined(LIBRESSL_VERSION_NUMBER)
|
||||
res = SSL_build_cert_chain(ssl,
|
||||
SSL_BUILD_CHAIN_FLAG_CHECK |
|
||||
SSL_BUILD_CHAIN_FLAG_IGNORE_ERROR);
|
||||
@@ -2812,7 +2812,7 @@ int tls_connection_get_random(void *ssl_ctx, struct tl
|
||||
if (conn == NULL || keys == NULL)
|
||||
return -1;
|
||||
ssl = conn->ssl;
|
||||
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
||||
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
|
||||
if (ssl == NULL || ssl->s3 == NULL || ssl->session == NULL)
|
||||
return -1;
|
||||
|
||||
@@ -2841,7 +2841,7 @@ int tls_connection_get_random(void *ssl_ctx, struct tl
|
||||
#ifndef CONFIG_FIPS
|
||||
static int openssl_get_keyblock_size(SSL *ssl)
|
||||
{
|
||||
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
||||
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
|
||||
const EVP_CIPHER *c;
|
||||
const EVP_MD *h;
|
||||
int md_size;
|
||||
@@ -2911,7 +2911,7 @@ static int openssl_tls_prf(struct tls_connection *conn
|
||||
"mode");
|
||||
return -1;
|
||||
#else /* CONFIG_FIPS */
|
||||
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
||||
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
|
||||
SSL *ssl;
|
||||
u8 *rnd;
|
||||
int ret = -1;
|
||||
@@ -3394,7 +3394,7 @@ int tls_connection_set_cipher_list(void *tls_ctx, stru
|
||||
|
||||
wpa_printf(MSG_DEBUG, "OpenSSL: cipher suites: %s", buf + 1);
|
||||
|
||||
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
|
||||
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
|
||||
#if defined(EAP_FAST) || defined(EAP_FAST_DYNAMIC) || defined(EAP_SERVER_FAST)
|
||||
if (os_strstr(buf, ":ADH-")) {
|
||||
/*
|
||||
@@ -3977,7 +3977,7 @@ static int tls_sess_sec_cb(SSL *s, void *secret, int *
|
||||
struct tls_connection *conn = arg;
|
||||
int ret;
|
||||
|
||||
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
||||
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
|
||||
if (conn == NULL || conn->session_ticket_cb == NULL)
|
||||
return 0;
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="dbus"
|
||||
PKG_VERSION="1.8.18"
|
||||
PKG_VERSION="1.8.20"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
||||
@ -17,10 +17,10 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="dosfstools"
|
||||
PKG_VERSION="3.0.27"
|
||||
PKG_VERSION="3.0.28"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_LICENSE="GPLv3"
|
||||
PKG_SITE="https://github.com/dosfstools/dosfstools"
|
||||
PKG_URL="https://github.com/dosfstools/dosfstools/releases/download/v$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.xz"
|
||||
PKG_DEPENDS_TARGET="toolchain"
|
||||
|
||||
@ -17,31 +17,17 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="fuse-exfat"
|
||||
PKG_VERSION="1.1.0"
|
||||
PKG_VERSION="1.2.0"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://code.google.com/p/exfat"
|
||||
#PKG_URL="http://exfat.googlecode.com/files/$PKG_NAME-$PKG_VERSION.tar.gz"
|
||||
PKG_URL="http://distfiles.gentoo.org/distfiles/$PKG_NAME-$PKG_VERSION.tar.gz"
|
||||
PKG_DEPENDS_TARGET="toolchain scons:host fuse"
|
||||
PKG_LICENSE="GPLv2+"
|
||||
PKG_SITE="https://github.com/relan/exfat"
|
||||
PKG_URL="https://github.com/relan/exfat/releases/download/v$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.gz"
|
||||
PKG_DEPENDS_TARGET="toolchain fuse"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="system"
|
||||
PKG_SHORTDESC="fuse-exfat: aims to provide a full-featured exFAT file system implementation for GNU/Linux other Unix-like systems as a FUSE module."
|
||||
PKG_LONGDESC="This project aims to provide a full-featured exFAT file system implementation for GNU/Linux other Unix-like systems as a FUSE module."
|
||||
|
||||
PKG_IS_ADDON="no"
|
||||
PKG_AUTORECONF="no"
|
||||
|
||||
|
||||
make_target() {
|
||||
export CCFLAGS="$CFLAGS -std=c99"
|
||||
|
||||
scons
|
||||
}
|
||||
|
||||
makeinstall_target() {
|
||||
mkdir -p $INSTALL/usr/bin
|
||||
cp fuse/mount.exfat-fuse $INSTALL/usr/bin
|
||||
ln -sf mount.exfat-fuse $INSTALL/usr/bin/mount.exfat
|
||||
}
|
||||
PKG_AUTORECONF="yes"
|
||||
|
||||
@ -17,11 +17,11 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="libusb"
|
||||
PKG_VERSION="1.0.19"
|
||||
PKG_VERSION="1.0.20"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://libusb.sourceforge.net/"
|
||||
PKG_LICENSE="LGPLv2.1"
|
||||
PKG_SITE="http://libusb.info/"
|
||||
PKG_URL="$SOURCEFORGE_SRC/libusb/files/$PKG_NAME-$PKG_VERSION.tar.bz2"
|
||||
PKG_DEPENDS_TARGET="toolchain systemd"
|
||||
PKG_PRIORITY="optional"
|
||||
@ -38,3 +38,8 @@ PKG_CONFIGURE_OPTS_TARGET="--enable-shared \
|
||||
--disable-debug-log \
|
||||
--enable-udev \
|
||||
--disable-examples-build"
|
||||
|
||||
pre_configure_target () {
|
||||
#libusb sometimes fails to build if building paralell
|
||||
export MAKEFLAGS=-j1
|
||||
}
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="pciutils"
|
||||
PKG_VERSION="3.3.1"
|
||||
PKG_VERSION="3.4.0"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="x86_64"
|
||||
PKG_LICENSE="GPL"
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="bcm2835-bootloader"
|
||||
PKG_VERSION="9a21e6a"
|
||||
PKG_VERSION="960832a"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="arm"
|
||||
PKG_LICENSE="nonfree"
|
||||
|
||||
@ -70,7 +70,7 @@ get_device_unmount() {
|
||||
# provides: DEVICES
|
||||
|
||||
DEVICES=""
|
||||
DEVICES=$(parted -s -m -l | grep -E '^/dev/sd|^/dev/mmcblk' | grep -E -v '.?rpmb|.?boot?' | cut -f1 -d ":")
|
||||
DEVICES=$(parted -s -m -l 2>/dev/null | grep -E '^/dev/sd|^/dev/mmcblk|^/dev/nvme' | grep -E -v '.?rpmb|.?boot?' | cut -f1 -d ":")
|
||||
|
||||
for i in $(cat /proc/mounts | grep -E '^/dev/sd' | cut -f1 -d " " | sed "s/[0-9].*$//"); do
|
||||
DEVICES=$(echo $DEVICES |sed -e "s|$i||")
|
||||
@ -79,6 +79,10 @@ get_device_unmount() {
|
||||
for i in $(cat /proc/mounts | grep -E '^/dev/mmcblk' | cut -f1 -d " " | sed "s/p.*$//"); do
|
||||
DEVICES=$(echo $DEVICES |sed -e "s|$i||")
|
||||
done
|
||||
|
||||
for i in $(cat /proc/mounts | grep -E '^/dev/nvme' | cut -f1 -d " " | sed "s/p.*$//"); do
|
||||
DEVICES=$(echo $DEVICES |sed -e "s|$i||")
|
||||
done
|
||||
}
|
||||
|
||||
get_partition() {
|
||||
@ -195,7 +199,7 @@ do_install_quick() {
|
||||
INSTALL_DEVICE_FULL=$(echo $DEVICE_LIST | sed "s|.*$INSTALL_DEVICE \([^ ]*\).*|$INSTALL_DEVICE \1|")
|
||||
|
||||
case $INSTALL_DEVICE in
|
||||
"/dev/mmcblk"*)
|
||||
"/dev/mmcblk"*|"/dev/nvme"*)
|
||||
PART1="p1"
|
||||
PART2="p2"
|
||||
;;
|
||||
@ -491,26 +495,10 @@ do_install_custom() {
|
||||
esac
|
||||
}
|
||||
|
||||
msg_not_implemented() {
|
||||
# show a dialog that this function is not yet implemented
|
||||
MSG_TITLE="\Z2[ WORK IN PROGRESS ]\Zn"
|
||||
MSG_INFOBOX=" This function is not implemented yet."
|
||||
|
||||
dialog --colors --backtitle "$BACKTITLE" --title "$MSG_TITLE" --msgbox "$MSG_INFOBOX" 7 70
|
||||
}
|
||||
|
||||
msg_oem_only() {
|
||||
# show a dialog that this function is only implemented on special builds
|
||||
MSG_TITLE="\Z2[ FOR OEM ONLY ]\Zn"
|
||||
MSG_INFOBOX=" OEM only feature, this function is not implemented in this build. \n if you have questions about this feature \n visit http://www.openelec.tv"
|
||||
|
||||
dialog --colors --backtitle "$BACKTITLE" --title "$MSG_TITLE" --msgbox "$MSG_INFOBOX" 7 70
|
||||
}
|
||||
|
||||
msg_no_device() {
|
||||
# show a warning dialog if we dont find not mounted devices for install and return to main menu
|
||||
MSG_TITLE="\Z1[ WARNING ]\Zn"
|
||||
MSG_INFOBOX=" No devices were found. \n If you are trying to install on a brand new harddisk you must \n create atleast one partition. \n Otherwise it won't be found. \n If you dont know how, ask in the forum or on IRC."
|
||||
MSG_INFOBOX=" No devices were found. "
|
||||
|
||||
dialog --colors --backtitle "$BACKTITLE" --title "$MSG_TITLE" --msgbox "$MSG_INFOBOX" 9 70
|
||||
|
||||
|
||||
@ -23,7 +23,7 @@ PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://www.openelec.tv"
|
||||
PKG_URL=""
|
||||
PKG_DEPENDS_TARGET="make:host xz:host sed:host pkg-config:host autoconf:host automake:host libtool:host intltool:host autoconf-archive:host gcc:host bison:host flex:host cmake:host scons:host yasm:host"
|
||||
PKG_DEPENDS_TARGET="make:host xz:host sed:host pkg-config:host autoconf:host automake:host libtool:host intltool:host autoconf-archive:host gcc:host bison:host flex:host cmake:host yasm:host"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="virtual"
|
||||
PKG_SHORTDESC="toolchain: OpenELEC.tv' toolchain"
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="libmicrohttpd"
|
||||
PKG_VERSION="0.9.43"
|
||||
PKG_VERSION="0.9.44"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="LGPLv2.1"
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Linux/x86_64 4.1.6 Kernel Configuration
|
||||
# Linux/x86_64 4.1.8 Kernel Configuration
|
||||
#
|
||||
CONFIG_64BIT=y
|
||||
CONFIG_X86_64=y
|
||||
@ -1093,7 +1093,7 @@ CONFIG_BLK_DEV_LOOP_MIN_COUNT=0
|
||||
# CONFIG_BLK_DEV_CRYPTOLOOP is not set
|
||||
# CONFIG_BLK_DEV_DRBD is not set
|
||||
CONFIG_BLK_DEV_NBD=y
|
||||
# CONFIG_BLK_DEV_NVME is not set
|
||||
CONFIG_BLK_DEV_NVME=y
|
||||
# CONFIG_BLK_DEV_SKD is not set
|
||||
# CONFIG_BLK_DEV_SX8 is not set
|
||||
CONFIG_BLK_DEV_RAM=y
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Linux/arm 4.1.6 Kernel Configuration
|
||||
# Linux/arm 4.1.8 Kernel Configuration
|
||||
#
|
||||
CONFIG_ARM=y
|
||||
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
|
||||
@ -940,6 +940,7 @@ CONFIG_BLK_DEV_RAM_SIZE=4096
|
||||
# Misc devices
|
||||
#
|
||||
# CONFIG_SENSORS_LIS3LV02D is not set
|
||||
CONFIG_BCM2835_SMI=m
|
||||
# CONFIG_AD525X_DPOT is not set
|
||||
# CONFIG_DUMMY_IRQ is not set
|
||||
# CONFIG_ICS932S401 is not set
|
||||
@ -1387,6 +1388,7 @@ CONFIG_BCM2708_VCMEM=y
|
||||
CONFIG_BCM_VCIO=y
|
||||
CONFIG_BCM_VC_SM=y
|
||||
CONFIG_BCM2835_DEVGPIOMEM=m
|
||||
CONFIG_BCM2835_SMI_DEV=m
|
||||
# CONFIG_XILLYBUS is not set
|
||||
|
||||
#
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -1,6 +1,6 @@
|
||||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Linux/arm 4.1.6 Kernel Configuration
|
||||
# Linux/arm 4.1.8 Kernel Configuration
|
||||
#
|
||||
CONFIG_ARM=y
|
||||
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
|
||||
@ -992,6 +992,7 @@ CONFIG_BLK_DEV_RAM_SIZE=4096
|
||||
# Misc devices
|
||||
#
|
||||
# CONFIG_SENSORS_LIS3LV02D is not set
|
||||
CONFIG_BCM2835_SMI=m
|
||||
# CONFIG_AD525X_DPOT is not set
|
||||
# CONFIG_DUMMY_IRQ is not set
|
||||
# CONFIG_ICS932S401 is not set
|
||||
@ -1439,6 +1440,7 @@ CONFIG_BCM2708_VCMEM=y
|
||||
CONFIG_BCM_VCIO=y
|
||||
CONFIG_BCM_VC_SM=y
|
||||
CONFIG_BCM2835_DEVGPIOMEM=m
|
||||
CONFIG_BCM2835_SMI_DEV=m
|
||||
# CONFIG_XILLYBUS is not set
|
||||
|
||||
#
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -1,24 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
||||
<addon id="service.multimedia.vdr-addon"
|
||||
name="vdr-addon"
|
||||
version="0.0.1"
|
||||
provider-name="openelec.tv">
|
||||
<requires>
|
||||
<import addon="os.openelec.tv" version="5.0"/>
|
||||
<import addon="xbmc.python" version="2.1.0"/>
|
||||
|
||||
</requires>
|
||||
<extension point="xbmc.service" library="default.py">
|
||||
<provides>executable</provides>
|
||||
</extension>
|
||||
<extension point="xbmc.addon.metadata">
|
||||
<summary>vdr: A powerful DVB TV application</summary>
|
||||
<description>
|
||||
This project describes how to build your own digital satellite receiver and video disk recorder. It is based mainly on the DVB-S digital satellite receiver card, which used to be available from Fujitsu Siemens and the driver software developed by the LinuxTV project.
|
||||
</description>
|
||||
<disclaimer>
|
||||
|
||||
</disclaimer>
|
||||
<platform>all</platform>
|
||||
</extension>
|
||||
</addon>
|
||||
@ -1,2 +0,0 @@
|
||||
0.0.1
|
||||
- dummy vdr-addon
|
||||
@ -1,17 +0,0 @@
|
||||
################################################################################
|
||||
# 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 <http://www.gnu.org/licenses/>.
|
||||
################################################################################
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 43 KiB |
@ -1,6 +1,6 @@
|
||||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Linux/arm 3.10.76 Kernel Configuration
|
||||
# Linux/arm 3.10.89 Kernel Configuration
|
||||
#
|
||||
CONFIG_ARM=y
|
||||
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
|
||||
@ -302,6 +302,7 @@ CONFIG_ARCH_MESON6=y
|
||||
# CONFIG_ARCH_MESON8B is not set
|
||||
# CONFIG_ARCH_MESON8M2 is not set
|
||||
# CONFIG_ARCH_MESONG9TV is not set
|
||||
# CONFIG_ARCH_MESONG9BB is not set
|
||||
|
||||
#
|
||||
# Meson development boards
|
||||
@ -926,6 +927,12 @@ CONFIG_EARLY_INIT=y
|
||||
# CONFIG_AML_REG_DEBUG is not set
|
||||
CONFIG_AM_UART=y
|
||||
CONFIG_AM_UART_CONSOLE=y
|
||||
# CONFIG_PRINTK_NOBLOCK_MODE is not set
|
||||
|
||||
#
|
||||
# Amlogic UM220 GPS Support
|
||||
#
|
||||
# CONFIG_GPS_UM220 is not set
|
||||
CONFIG_OF_LM=y
|
||||
CONFIG_AML_RTC=y
|
||||
|
||||
@ -941,6 +948,7 @@ CONFIG_MESON_INPUT_REMOTE=y
|
||||
CONFIG_AM_REMOTE=y
|
||||
# CONFIG_AM_IR_RECEIVER is not set
|
||||
# CONFIG_VIRTUAL_REMOTE is not set
|
||||
# CONFIG_AM_IR_IRBLASTER is not set
|
||||
CONFIG_MESON_NEW_INPUT_REMOTE=y
|
||||
# CONFIG_NEW_AM_REMOTE is not set
|
||||
# CONFIG_NEW_AM_IR_TX is not set
|
||||
@ -990,12 +998,17 @@ CONFIG_EFUSE=y
|
||||
# CONFIG_EFUSE_WRITE_VERSION_PERMIT is not set
|
||||
CONFIG_EFUSE_LAYOUT_VERSION=3
|
||||
|
||||
#
|
||||
# defend img file update support
|
||||
#
|
||||
# CONFIG_DEFEND_IMG is not set
|
||||
|
||||
#
|
||||
# Smartcard support
|
||||
#
|
||||
# CONFIG_AM_SMARTCARD is not set
|
||||
CONFIG_AML_VIRTUAL_THERMAL=y
|
||||
# CONFIG_AMLOGIC_THERMAL is not set
|
||||
# CONFIG_AML_PLATFORM_THERMAL is not set
|
||||
# CONFIG_AML_WDT is not set
|
||||
|
||||
#
|
||||
@ -1006,6 +1019,7 @@ CONFIG_AML_VIRTUAL_THERMAL=y
|
||||
#
|
||||
# USB Support
|
||||
#
|
||||
# CONFIG_AMLOGIC_USB_3 is not set
|
||||
CONFIG_AMLOGIC_USB=y
|
||||
CONFIG_USB_DWC_OTG_HCD=y
|
||||
CONFIG_USB_HOST_ELECT_TEST=y
|
||||
@ -1051,12 +1065,13 @@ CONFIG_NAND_KEY_BLOCK_NUM=8
|
||||
# Ethernet Support
|
||||
#
|
||||
CONFIG_AM_ETHERNET=y
|
||||
CONFIG_AM_PHY=y
|
||||
CONFIG_PHYLIB=y
|
||||
|
||||
#
|
||||
# MII PHY device drivers
|
||||
#
|
||||
# CONFIG_AML_PHY is not set
|
||||
CONFIG_AML_PHY=y
|
||||
CONFIG_AML_LAN8720=y
|
||||
CONFIG_AML_IP101_PHY=y
|
||||
CONFIG_AML_KSZ8091=y
|
||||
@ -1118,6 +1133,7 @@ CONFIG_AML_VFM=y
|
||||
CONFIG_AM_PTSSERVER=y
|
||||
# CONFIG_H264_4K2K_SINGLE_CORE is not set
|
||||
CONFIG_VSYNC_RDMA=y
|
||||
# CONFIG_TVIN_VIUIN is not set
|
||||
CONFIG_AM_VIDEO=y
|
||||
# CONFIG_AM_VIDEO2 is not set
|
||||
# CONFIG_KEEP_FRAME_RESERVED is not set
|
||||
@ -1155,6 +1171,7 @@ CONFIG_AM_DISPLAY_MODULE=y
|
||||
#
|
||||
CONFIG_AM_TV_OUTPUT=y
|
||||
CONFIG_AML_VOUT_FRAMERATE_AUTOMATION=y
|
||||
# CONFIG_AML_VDAC_HW_SWITCH is not set
|
||||
# CONFIG_AM_LCD_OUTPUT is not set
|
||||
|
||||
#
|
||||
@ -1166,6 +1183,7 @@ CONFIG_AML_VOUT_FRAMERATE_AUTOMATION=y
|
||||
# Amlogic TV LCD Support
|
||||
#
|
||||
# CONFIG_AML_TV_LCD is not set
|
||||
# CONFIG_AML_TV_LCD_V2 is not set
|
||||
|
||||
#
|
||||
# Amlogic osd module
|
||||
@ -1184,7 +1202,6 @@ CONFIG_FB_OSD1_DEFAULT_WIDTH=1280
|
||||
CONFIG_FB_OSD1_DEFAULT_HEIGHT=720
|
||||
CONFIG_FB_OSD1_DEFAULT_WIDTH_VIRTUAL=1280
|
||||
CONFIG_FB_OSD1_DEFAULT_HEIGHT_VIRTUAL=1440
|
||||
# CONFIG_FB_AMLOGIC_UMP is not set
|
||||
|
||||
#
|
||||
# Amlogic osd_ext module
|
||||
@ -1202,12 +1219,17 @@ CONFIG_AM_GE2D=y
|
||||
CONFIG_AM_LOGO=y
|
||||
CONFIG_AM_HDMI_ONLY=y
|
||||
|
||||
#
|
||||
# Amlogic Sys led Support
|
||||
#
|
||||
# CONFIG_AMLOGIC_SYS_LED is not set
|
||||
|
||||
#
|
||||
# HDMI TX Support
|
||||
#
|
||||
# CONFIG_AML_HDMI_TX_20 is not set
|
||||
CONFIG_AML_HDMI_TX=y
|
||||
# CONFIG_AML_HDMI_TX_HDCP is not set
|
||||
# CONFIG_AML_HDMI_TX_CTS_DVI is not set
|
||||
# CONFIG_TVIN is not set
|
||||
# CONFIG_AML_EXT_HDMIIN is not set
|
||||
# CONFIG_DEBUG_DRIVER is not set
|
||||
@ -1257,6 +1279,7 @@ CONFIG_DEINTERLACE=y
|
||||
# Amlogic DVB driver
|
||||
#
|
||||
# CONFIG_AM_DVB is not set
|
||||
# CONFIG_AM_ATVDEMOD is not set
|
||||
|
||||
#
|
||||
# AMLOGIC CI Driver
|
||||
@ -1301,8 +1324,7 @@ CONFIG_MESON6_GPU_EXTRA=y
|
||||
#
|
||||
# Amlogic Crypto Support
|
||||
#
|
||||
CONFIG_CRYPTO_AML_HW_CRYPRO=y
|
||||
# CONFIG_CRYPTO_DEVICE_DRIVER is not set
|
||||
CONFIG_CRYPTO_AML_HW_CRYPTO=y
|
||||
|
||||
#
|
||||
# MHL Support
|
||||
@ -1659,6 +1681,8 @@ CONFIG_USB_NET_RNDIS_HOST=m
|
||||
# CONFIG_USB_IPHETH is not set
|
||||
# CONFIG_USB_SIERRA_NET is not set
|
||||
# CONFIG_USB_VL600 is not set
|
||||
# CONFIG_USB_NET_QF9700 is not set
|
||||
# CONFIG_USB_NET_SR9600 is not set
|
||||
CONFIG_WLAN=y
|
||||
# CONFIG_LIBERTAS_THINFIRM is not set
|
||||
# CONFIG_AT76C50X_USB is not set
|
||||
@ -1865,6 +1889,7 @@ CONFIG_HVC_DCC=y
|
||||
CONFIG_HW_RANDOM=m
|
||||
# CONFIG_HW_RANDOM_TIMERIOMEM is not set
|
||||
# CONFIG_HW_RANDOM_ATMEL is not set
|
||||
CONFIG_HW_RANDOM_MESON=m
|
||||
# CONFIG_HW_RANDOM_EXYNOS is not set
|
||||
# CONFIG_R3964 is not set
|
||||
# CONFIG_RAW_DRIVER is not set
|
||||
@ -2844,7 +2869,7 @@ CONFIG_USB_HIDDEV=y
|
||||
# CONFIG_I2C_HID is not set
|
||||
# CONFIG_USB_ARCH_HAS_OHCI is not set
|
||||
# CONFIG_USB_ARCH_HAS_EHCI is not set
|
||||
# CONFIG_USB_ARCH_HAS_XHCI is not set
|
||||
CONFIG_USB_ARCH_HAS_XHCI=y
|
||||
CONFIG_USB_SUPPORT=y
|
||||
CONFIG_USB_COMMON=y
|
||||
CONFIG_USB_ARCH_HAS_HCD=y
|
||||
@ -2867,6 +2892,7 @@ CONFIG_USB_DEFAULT_PERSIST=y
|
||||
# USB Host Controller Drivers
|
||||
#
|
||||
# CONFIG_USB_C67X00_HCD is not set
|
||||
# CONFIG_USB_XHCI_HCD is not set
|
||||
# CONFIG_USB_OXU210HP_HCD is not set
|
||||
# CONFIG_USB_ISP116X_HCD is not set
|
||||
# CONFIG_USB_ISP1760_HCD is not set
|
||||
@ -3331,6 +3357,7 @@ CONFIG_FAT_FS=y
|
||||
CONFIG_VFAT_FS=y
|
||||
CONFIG_FAT_DEFAULT_CODEPAGE=437
|
||||
CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
|
||||
# CONFIG_EXFAT_FS is not set
|
||||
# CONFIG_NTFS_FS is not set
|
||||
|
||||
#
|
||||
|
||||
@ -1,69 +0,0 @@
|
||||
diff -Naur linux-amlogic-3.10-fa4c242/drivers/amlogic/gpu/mali/Kbuild linux-amlogic-3.10-fa4c242.patch/drivers/amlogic/gpu/mali/Kbuild
|
||||
--- linux-amlogic-3.10-fa4c242/drivers/amlogic/gpu/mali/Kbuild 2015-01-22 21:04:55.000000000 +0100
|
||||
+++ linux-amlogic-3.10-fa4c242.patch/drivers/amlogic/gpu/mali/Kbuild 2015-01-23 20:17:06.225678942 +0100
|
||||
@@ -220,32 +220,32 @@
|
||||
# Get subversion revision number, fall back to only ${MALI_RELEASE_NAME} if no svn info is available
|
||||
MALI_RELEASE_NAME=$(shell cat $(TOP_KBUILD_SRC)$(DRIVER_DIR)/.version 2> /dev/null)
|
||||
|
||||
-SVN_INFO = (cd $(TOP_KBUILD_SRC)$(DRIVER_DIR); svn info 2>/dev/null)
|
||||
+#SVN_INFO = (cd $(TOP_KBUILD_SRC)$(DRIVER_DIR); svn info 2>/dev/null)
|
||||
|
||||
-ifneq ($(shell $(SVN_INFO) 2>/dev/null),)
|
||||
-# SVN detected
|
||||
-SVN_REV := $(shell $(SVN_INFO) | grep '^Revision: '| sed -e 's/^Revision: //' 2>/dev/null)
|
||||
-DRIVER_REV := $(MALI_RELEASE_NAME)-r$(SVN_REV)
|
||||
-CHANGE_DATE := $(shell $(SVN_INFO) | grep '^Last Changed Date: ' | cut -d: -f2- | cut -b2-)
|
||||
-CHANGED_REVISION := $(shell $(SVN_INFO) | grep '^Last Changed Rev: ' | cut -d: -f2- | cut -b2-)
|
||||
-REPO_URL := $(shell $(SVN_INFO) | grep '^URL: ' | cut -d: -f2- | cut -b2-)
|
||||
-
|
||||
-else # SVN
|
||||
-GIT_REV := $(shell cd $(TOP_KBUILD_SRC)$(DRIVER_DIR); git describe --always 2>/dev/null)
|
||||
-ifneq ($(GIT_REV),)
|
||||
-# Git detected
|
||||
-DRIVER_REV := $(MALI_RELEASE_NAME)-$(GIT_REV)
|
||||
-CHANGE_DATE := $(shell cd $(TOP_KBUILD_SRC)$(DRIVER_DIR); git log -1 --format="%ci")
|
||||
-CHANGED_REVISION := $(GIT_REV)
|
||||
-REPO_URL := $(shell cd $(TOP_KBUILD_SRC)$(DRIVER_DIR); git describe --all --always 2>/dev/null)
|
||||
+#ifneq ($(shell $(SVN_INFO) 2>/dev/null),)
|
||||
+## SVN detected
|
||||
+#SVN_REV := $(shell $(SVN_INFO) | grep '^Revision: '| sed -e 's/^Revision: //' 2>/dev/null)
|
||||
+#DRIVER_REV := $(MALI_RELEASE_NAME)-r$(SVN_REV)
|
||||
+#CHANGE_DATE := $(shell $(SVN_INFO) | grep '^Last Changed Date: ' | cut -d: -f2- | cut -b2-)
|
||||
+#CHANGED_REVISION := $(shell $(SVN_INFO) | grep '^Last Changed Rev: ' | cut -d: -f2- | cut -b2-)
|
||||
+#REPO_URL := $(shell $(SVN_INFO) | grep '^URL: ' | cut -d: -f2- | cut -b2-)
|
||||
+
|
||||
+#else # SVN
|
||||
+#GIT_REV := $(shell cd $(TOP_KBUILD_SRC)$(DRIVER_DIR); git describe --always 2>/dev/null)
|
||||
+#ifneq ($(GIT_REV),)
|
||||
+## Git detected
|
||||
+#DRIVER_REV := $(MALI_RELEASE_NAME)-$(GIT_REV)
|
||||
+#CHANGE_DATE := $(shell cd $(TOP_KBUILD_SRC)$(DRIVER_DIR); git log -1 --format="%ci")
|
||||
+#CHANGED_REVISION := $(GIT_REV)
|
||||
+#REPO_URL := $(shell cd $(TOP_KBUILD_SRC)$(DRIVER_DIR); git describe --all --always 2>/dev/null)
|
||||
|
||||
-else # Git
|
||||
+#else # Git
|
||||
# No Git or SVN detected
|
||||
DRIVER_REV := $(MALI_RELEASE_NAME)
|
||||
CHANGE_DATE := $(MALI_RELEASE_NAME)
|
||||
CHANGED_REVISION := $(MALI_RELEASE_NAME)
|
||||
-endif
|
||||
-endif
|
||||
+#endif
|
||||
+#endif
|
||||
|
||||
ccflags-y += -DSVN_REV_STRING=\"$(DRIVER_REV)\"
|
||||
|
||||
diff -Naur linux-amlogic-3.10-fa4c242/drivers/amlogic/gpu/ump/Kbuild linux-amlogic-3.10-fa4c242.patch/drivers/amlogic/gpu/ump/Kbuild
|
||||
--- linux-amlogic-3.10-fa4c242/drivers/amlogic/gpu/ump/Kbuild 2015-01-22 21:04:55.000000000 +0100
|
||||
+++ linux-amlogic-3.10-fa4c242.patch/drivers/amlogic/gpu/ump/Kbuild 2015-01-23 20:18:02.544746215 +0100
|
||||
@@ -32,7 +32,8 @@
|
||||
UDD_FILE_PREFIX = ../mali/
|
||||
|
||||
# Get subversion revision number, fall back to 0000 if no svn info is available
|
||||
-SVN_REV := $(shell ((svnversion | grep -qv exported && echo -n 'Revision: ' && svnversion) || git svn info | sed -e 's/$$$$/M/' | grep '^Revision: ' || echo ${MALI_RELEASE_NAME}) 2>/dev/null | sed -e 's/^Revision: //')
|
||||
+#SVN_REV := $(shell ((svnversion | grep -qv exported && echo -n 'Revision: ' && svnversion) || git svn info | sed -e 's/$$$$/M/' | grep '^Revision: ' || echo ${MALI_RELEASE_NAME}) 2>/dev/null | sed -e 's/^Revision: //')
|
||||
+SVN_REV := $(shell (echo ${MALI_RELEASE_NAME}) 2>/dev/null | sed -e 's/^Revision: //')
|
||||
|
||||
ccflags-y += -DSVN_REV=$(SVN_REV)
|
||||
ccflags-y += -DSVN_REV_STRING=\"$(SVN_REV)\"
|
||||
@ -1,13 +0,0 @@
|
||||
diff --git a/include/uapi/linux/xattr.h b/include/uapi/linux/xattr.h
|
||||
index e4629b9..f7a2d1f 100644
|
||||
--- a/include/uapi/linux/xattr.h
|
||||
+++ b/include/uapi/linux/xattr.h
|
||||
@@ -10,6 +10,8 @@
|
||||
#ifndef _UAPI_LINUX_XATTR_H
|
||||
#define _UAPI_LINUX_XATTR_H
|
||||
|
||||
+#define __USE_KERNEL_XATTR_DEFS
|
||||
+
|
||||
#define XATTR_CREATE 0x1 /* set value, fail if attr already exists */
|
||||
#define XATTR_REPLACE 0x2 /* set value, fail if attr does not exist */
|
||||
|
||||
@ -1,141 +0,0 @@
|
||||
--- a/drivers/amlogic/amports/amvideocap.c 2015-01-12 19:17:17.003191369 +0100
|
||||
+++ b/drivers/amlogic/amports/amvideocap.c 2015-01-12 19:20:50.855003956 +0100
|
||||
@@ -163,13 +163,13 @@
|
||||
//printk("vf->type:0x%x\n", vf->type);
|
||||
|
||||
if ((vf->type & VIDTYPE_VIU_422) == VIDTYPE_VIU_422) {
|
||||
- printk("********************Into VIDTYPE_VIU_422*********************\n");
|
||||
+ //printk("********************Into VIDTYPE_VIU_422*********************\n");
|
||||
format = GE2D_FORMAT_S16_YUV422;
|
||||
} else if ((vf->type & VIDTYPE_VIU_444) == VIDTYPE_VIU_444) {
|
||||
- printk("********************Into VIDTYPE_VIU_444*********************\n");
|
||||
+ //printk("********************Into VIDTYPE_VIU_444*********************\n");
|
||||
format = GE2D_FORMAT_S24_YUV444;
|
||||
} else if((vf->type & VIDTYPE_VIU_NV21) == VIDTYPE_VIU_NV21){
|
||||
- printk("********************Into VIDTYPE_VIU_NV21*********************\n");
|
||||
+ //printk("********************Into VIDTYPE_VIU_NV21*********************\n");
|
||||
format= GE2D_FORMAT_M24_NV21;
|
||||
}
|
||||
return format;
|
||||
@@ -195,13 +195,13 @@
|
||||
printk("%s: failed to alloc y addr\n", __FUNCTION__);
|
||||
return -1;
|
||||
}
|
||||
- printk("RGB_phy_addr:%x\n", (unsigned int)priv->phyaddr);
|
||||
+ //printk("RGB_phy_addr:%x\n", (unsigned int)priv->phyaddr);
|
||||
RGB_addr = (unsigned long)priv->vaddr;
|
||||
if (!RGB_addr) {
|
||||
printk("%s: failed to remap y addr\n", __FUNCTION__);
|
||||
return -1;
|
||||
}
|
||||
- printk("RGB_addr:%x\n", (unsigned int)RGB_addr);
|
||||
+ //printk("RGB_addr:%x\n", (unsigned int)RGB_addr);
|
||||
|
||||
if(vf == NULL) {
|
||||
printk("%s: vf is NULL\n", __FUNCTION__);
|
||||
@@ -250,7 +250,7 @@
|
||||
canvas_read(y_index, &cs0);
|
||||
canvas_read(u_index, &cs1);
|
||||
canvas_read(v_index, &cs2);
|
||||
- printk("y_index=[0x%x] u_index=[0x%x] cur_index:%x\n", y_index, u_index, cur_index);
|
||||
+ //printk("y_index=[0x%x] u_index=[0x%x] cur_index:%x\n", y_index, u_index, cur_index);
|
||||
ge2d_config.src_planes[0].addr = cs0.addr;
|
||||
ge2d_config.src_planes[0].w = cs0.width;
|
||||
ge2d_config.src_planes[0].h = cs0.height;
|
||||
@@ -260,7 +260,7 @@
|
||||
ge2d_config.src_planes[2].addr = cs2.addr;
|
||||
ge2d_config.src_planes[2].w = cs2.width;
|
||||
ge2d_config.src_planes[2].h = cs2.height;
|
||||
- printk("w=%d-height=%d cur_index:%x\n", cs0.width, cs0.height, cur_index);
|
||||
+ //printk("w=%d-height=%d cur_index:%x\n", cs0.width, cs0.height, cur_index);
|
||||
|
||||
ge2d_config.src_key.key_enable = 0;
|
||||
ge2d_config.src_key.key_mask = 0;
|
||||
@@ -282,7 +282,7 @@
|
||||
|
||||
|
||||
canvas_read(canvas_idx, &cd);
|
||||
- printk("cd.addr:%x\n", (unsigned int)cd.addr);
|
||||
+ //printk("cd.addr:%x\n", (unsigned int)cd.addr);
|
||||
ge2d_config.dst_planes[0].addr = cd.addr;
|
||||
ge2d_config.dst_planes[0].w = cd.width;
|
||||
ge2d_config.dst_planes[0].h = cd.height;
|
||||
@@ -349,7 +349,7 @@
|
||||
int curindex;
|
||||
vframe_t *vf = vfput;
|
||||
int ret = 0;
|
||||
- printk("%s:start vf=%p,index=%x\n", __func__,vf,index);
|
||||
+ //printk("%s:start vf=%p,index=%x\n", __func__,vf,index);
|
||||
if (!vf) {
|
||||
ret = amvideocap_capture_get_frame(priv, &vf, &curindex);
|
||||
}else{
|
||||
@@ -358,7 +358,7 @@
|
||||
if (ret < 0 || !vf) {
|
||||
return -EAGAIN;
|
||||
}
|
||||
- printk("%s: get vf type=%x\n", __func__,vf->type);
|
||||
+ //printk("%s: get vf type=%x\n", __func__,vf->type);
|
||||
|
||||
|
||||
#define CHECK_AND_SETVAL(val,want,def) (val)=(want)>0?(want):(def)
|
||||
@@ -374,7 +374,7 @@
|
||||
amvideocap_capture_put_frame(priv, vf);
|
||||
|
||||
if (!ret) {
|
||||
- printk("%s: capture ok priv->want.fmt=%d\n", __func__,priv->want.fmt);
|
||||
+ //printk("%s: capture ok priv->want.fmt=%d\n", __func__,priv->want.fmt);
|
||||
priv->state = AMVIDEOCAP_STATE_FINISHED_CAPTURE;
|
||||
priv->src.width=vf->width;
|
||||
priv->src.height=vf->height;
|
||||
@@ -387,7 +387,7 @@
|
||||
}else{
|
||||
priv->state = AMVIDEOCAP_STATE_ERROR;
|
||||
}
|
||||
- printk("amvideocap_capture_one_frame priv->state=%d\n", priv->state);
|
||||
+ //printk("amvideocap_capture_one_frame priv->state=%d\n", priv->state);
|
||||
return ret;
|
||||
}
|
||||
static int amvideocap_capture_one_frame_callback(unsigned long data, vframe_t *vfput, int index)
|
||||
@@ -427,7 +427,7 @@
|
||||
}
|
||||
} else {
|
||||
ret = amvideocap_capture_one_frame(priv, NULL, 0);
|
||||
- printk("amvideocap_capture_one_frame_wait ret=%d\n", ret);
|
||||
+ //printk("amvideocap_capture_one_frame_wait ret=%d\n", ret);
|
||||
}
|
||||
} while (ret == -EAGAIN && time_before(jiffies, timeout));
|
||||
ext_register_end_frame_callback(NULL);/*del req*/
|
||||
@@ -606,7 +606,7 @@
|
||||
printk("set_cached: failed remap_pfn_range\n");
|
||||
return -EAGAIN;
|
||||
}
|
||||
- printk("amvideocap_mmap ok\n");
|
||||
+ //printk("amvideocap_mmap ok\n");
|
||||
return 0;
|
||||
}
|
||||
static ssize_t amvideocap_read(struct file *file, char __user *buf, size_t count, loff_t * ppos)
|
||||
@@ -626,12 +626,12 @@
|
||||
waitdelay=file->f_flags & O_NONBLOCK ? HZ/100 : HZ * 10;
|
||||
}
|
||||
if(!pos){/*trigger a new capture,*/
|
||||
- printk("start amvideocap_read waitdelay=%d\n",waitdelay);
|
||||
+ //printk("start amvideocap_read waitdelay=%d\n",waitdelay);
|
||||
ret = amvideocap_capture_one_frame_wait(priv,waitdelay);
|
||||
- printk("amvideocap_read=%d,priv->state=%d,priv->vaddr=%p\n", ret,priv->state,priv->vaddr);
|
||||
+ //printk("amvideocap_read=%d,priv->state=%d,priv->vaddr=%p\n", ret,priv->state,priv->vaddr);
|
||||
if ((ret == 0) && (priv->state==AMVIDEOCAP_STATE_FINISHED_CAPTURE) && (priv->vaddr != NULL)) {
|
||||
int size = min((int)count, (priv->out.byte_per_pix * priv->out.width_aligned* priv->out.height));
|
||||
- printk("priv->out_width=%d priv->out_height=%d priv->outfmt_byteppix=%d, size=%d\n", priv->out.width,priv->out.height,priv->out.byte_per_pix,size);
|
||||
+ //printk("priv->out_width=%d priv->out_height=%d priv->outfmt_byteppix=%d, size=%d\n", priv->out.width,priv->out.height,priv->out.byte_per_pix,size);
|
||||
copied=copy_to_user(buf, priv->vaddr, size);
|
||||
if(copied){
|
||||
printk("amvideocap_read %d copy_to_user failed \n",size);
|
||||
@@ -646,7 +646,7 @@
|
||||
int maxsize = priv->out.byte_per_pix * priv->out.width_aligned* priv->out.height;
|
||||
if(pos<maxsize){
|
||||
int rsize=min((int)count,(maxsize-(int)pos));
|
||||
- ///printk("amvideocap_read11 try copy %d,pos=%d\n",rsize,pos);
|
||||
+ //printk("amvideocap_read11 try copy %d,pos=%d\n",rsize,pos);
|
||||
copied=copy_to_user(buf, priv->vaddr+pos, rsize);
|
||||
if(copied){
|
||||
printk("amvideocap_read11 %d copy_to_user failed \n",rsize);
|
||||
@ -1,11 +0,0 @@
|
||||
--- a/drivers/amlogic/display/vout/tvconf.c.orig 2015-01-14 22:43:43.861634189 +0100
|
||||
+++ b/drivers/amlogic/display/vout/tvconf.c 2015-01-14 22:46:45.289865564 +0100
|
||||
@@ -390,7 +390,7 @@
|
||||
.aspect_ratio_den = 9,
|
||||
.sync_duration_num = 2397,
|
||||
.sync_duration_den = 100,
|
||||
- .video_clk = 74250000,
|
||||
+ .video_clk = 74176000,//74250000,
|
||||
},
|
||||
#endif
|
||||
{ /* VMODE_4K2K_30HZ */
|
||||
@ -1,13 +0,0 @@
|
||||
diff --git a/drivers/amlogic/ethernet/am_net8218.c b/drivers/amlogic/ethernet/am_net8218.c
|
||||
index aec2980..697984f 100755
|
||||
--- a/drivers/amlogic/ethernet/am_net8218.c
|
||||
+++ b/drivers/amlogic/ethernet/am_net8218.c
|
||||
@@ -890,7 +890,7 @@ static int mac_pmt_enable(unsigned int enable)
|
||||
* @return
|
||||
*/
|
||||
/* --------------------------------------------------------------------------*/
|
||||
-//#undef CONFIG_AML_NAND_KEY
|
||||
+#undef CONFIG_AML_NAND_KEY
|
||||
#ifdef CONFIG_AML_NAND_KEY
|
||||
extern int get_aml_key_kernel(const char* key_name, unsigned char* data, int ascii_flag);
|
||||
extern int extenal_api_key_set_version(char *devvesion);
|
||||
@ -328,6 +328,7 @@ if [ ! -f $STAMP ]; then
|
||||
if [ -d $INSTALL ] ; then
|
||||
for i in $INSTALL $INSTALL/usr; do
|
||||
rm -rf $i/include
|
||||
rm -rf $i/lib/cmake
|
||||
rm -rf $i/lib/pkgconfig
|
||||
rm -rf $i/man
|
||||
rm -rf $i/share/aclocal
|
||||
|
||||
125
tools/mkpkg/mkpkg_binary-addons-Isengard
Executable file
125
tools/mkpkg/mkpkg_binary-addons-Isengard
Executable file
@ -0,0 +1,125 @@
|
||||
#!/bin/sh
|
||||
################################################################################
|
||||
# This file is part of OpenELEC - http://www.openelec.tv
|
||||
# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
|
||||
#
|
||||
# This Program 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, or (at your option)
|
||||
# any later version.
|
||||
#
|
||||
# This Program 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.tv; see the file COPYING. If not, write to
|
||||
# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
|
||||
# http://www.gnu.org/copyleft/gpl.html
|
||||
################################################################################
|
||||
|
||||
KODI_DIR="kodi-Isengard.git"
|
||||
|
||||
git_clone() {
|
||||
# git_clone https://repo.url branch ./target_dir [githash]
|
||||
echo "[mkpkg] Checking out $1 ..."
|
||||
if [ ! -d "$3" ]; then
|
||||
git clone "$1" -b $2 "$3"
|
||||
else
|
||||
if [ -d "$3" ] ; then
|
||||
cd "$3"
|
||||
git checkout $2 >/dev/null 2>/dev/null
|
||||
git pull
|
||||
cd ..
|
||||
fi
|
||||
fi
|
||||
if [ ! -z "$4" ] ; then
|
||||
cd "$3"
|
||||
git fetch >/dev/null 2>/dev/null
|
||||
git branch -D $4 >/dev/null 2>/dev/null
|
||||
git checkout $4 -b ref-$4 >/dev/null 2>/dev/null
|
||||
cd ..
|
||||
fi
|
||||
}
|
||||
|
||||
copy_sources() {
|
||||
# copy_sources source_dir package_name package_version
|
||||
if [ -d "$1" ] ; then
|
||||
echo "[mkpkg] Copying sources: $2-$3" ...
|
||||
rm -rf "$2-$3"
|
||||
cp -R "$1" "$2-$3"
|
||||
echo "$GIT_HASH" > "$2-$3/VERSION"
|
||||
|
||||
echo "[mkpkg] Cleaning $2-$3 ..."
|
||||
rm -rf "$2-$3/.git"
|
||||
fi
|
||||
}
|
||||
|
||||
package_sources() {
|
||||
# package_sources source_dir
|
||||
if [ -d "$1" ] ; then
|
||||
echo "[mkpkg] Packing $1.tar.xz ..."
|
||||
if [ ! -f "$1.tar.xz" ] ; then
|
||||
tar cvJf "$1.tar.xz" "$1"
|
||||
fi
|
||||
rm -rf "$1"
|
||||
fi
|
||||
}
|
||||
|
||||
resolve_hash() {
|
||||
if [ -d "$1" ] ; then
|
||||
cd "$1"
|
||||
git rev-parse --short $2 2>/dev/null
|
||||
fi
|
||||
}
|
||||
|
||||
copy_and_package() {
|
||||
REPO="$1"
|
||||
PKG_NAME="$2"
|
||||
GIT_HASH="$3"
|
||||
git_clone $REPO master $PKG_NAME.git $GIT_HASH
|
||||
RESOLVED_HASH=$(resolve_hash $PKG_NAME.git $GIT_HASH)
|
||||
if [ ! -e $PKG_NAME-$RESOLVED_HASH.tar.xz ] ; then
|
||||
copy_sources $PKG_NAME.git $PKG_NAME $RESOLVED_HASH
|
||||
package_sources $PKG_NAME-$RESOLVED_HASH
|
||||
else
|
||||
echo "[mkpkg] $PKG_NAME-$RESOLVED_HASH.tar.xz already exists ..."
|
||||
fi
|
||||
}
|
||||
|
||||
if [ ! -d $KODI_DIR ] ; then
|
||||
echo "meh.. $KODI_DIR does not exist"
|
||||
exit 127
|
||||
fi
|
||||
|
||||
# kodi-platform
|
||||
REPO=$(cat $KODI_DIR/project/cmake/addons/depends/common/kodi-platform/kodi-platform.txt | awk '{print $2}')
|
||||
GIT_HASH=$(cat $KODI_DIR/project/cmake/addons/depends/common/kodi-platform/kodi-platform.txt | awk '{print $3}')
|
||||
|
||||
copy_and_package $REPO kodi-platform $GIT_HASH
|
||||
|
||||
if [ -f ../../packages/mediacenter/kodi-platform/package.mk ] ; then
|
||||
# update package.mk
|
||||
RESOLVED_HASH=$(resolve_hash $PKG_NAME.git $GIT_HASH)
|
||||
sed -i "s|PKG_VERSION=.*|PKG_VERSION=\"$RESOLVED_HASH\"|g" ../../packages/mediacenter/kodi-platform/package.mk
|
||||
fi
|
||||
|
||||
# addons
|
||||
for addon in $KODI_DIR/project/cmake/addons/addons/*.* ; do
|
||||
ADDON=$(basename $addon)
|
||||
REPO=$(cat $KODI_DIR/project/cmake/addons/addons/$ADDON/$ADDON.txt | awk '{print $2}')
|
||||
GIT_HASH=$(cat $KODI_DIR/project/cmake/addons/addons/$ADDON/$ADDON.txt | awk '{print $3}')
|
||||
|
||||
if ! grep -q all $addon/platforms.txt && ! grep -q linux $addon/platforms.txt ; then
|
||||
continue
|
||||
fi
|
||||
|
||||
copy_and_package $REPO $ADDON $GIT_HASH
|
||||
|
||||
if [ -f ../../packages/mediacenter/kodi-binary-addons/$ADDON/package.mk ] ; then
|
||||
# update package.mk
|
||||
RESOLVED_HASH=$(resolve_hash $PKG_NAME.git $GIT_HASH)
|
||||
sed -i "s|PKG_VERSION=.*|PKG_VERSION=\"$RESOLVED_HASH\"|g" ../../packages/mediacenter/kodi-binary-addons/$ADDON/package.mk
|
||||
fi
|
||||
done
|
||||
@ -1,120 +0,0 @@
|
||||
#!/bin/sh
|
||||
################################################################################
|
||||
# This file is part of OpenELEC - http://www.openelec.tv
|
||||
# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
|
||||
#
|
||||
# This Program 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, or (at your option)
|
||||
# any later version.
|
||||
#
|
||||
# This Program 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.tv; see the file COPYING. If not, write to
|
||||
# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
|
||||
# http://www.gnu.org/copyleft/gpl.html
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="kodi"
|
||||
PKG_VERSION=""
|
||||
BRANCH="master"
|
||||
BRANCH_FOR_ADDONS="master"
|
||||
GIT_REPO="git://github.com/xbmc/xbmc.git"
|
||||
DEST_DIR="$PKG_NAME-$BRANCH"
|
||||
|
||||
git_clone() {
|
||||
# git_clone https://repo.url branch ./target_dir [githash]
|
||||
echo "[mkpkg] Checking out $1 ..."
|
||||
if [ ! -d "$3" ]; then
|
||||
git clone "$1" -b $2 "$3"
|
||||
else
|
||||
if [ -d "$3" ] ; then
|
||||
cd "$3"
|
||||
git checkout $2 >/dev/null 2>/dev/null
|
||||
git pull
|
||||
if [ ! -z "$4" ] ; then
|
||||
git branch -D $4 >/dev/null 2>/dev/null
|
||||
git checkout $4 -b $4 >/dev/null 2>/dev/null
|
||||
fi
|
||||
cd ..
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
copy_sources() {
|
||||
# copy_sources source_dir package_name package_version
|
||||
if [ -d "$1" ] ; then
|
||||
echo "[mkpkg] Copying sources: $2-$3" ...
|
||||
rm -rf "$2-$3"
|
||||
cp -R "$1" "$2-$3"
|
||||
echo "$GIT_HASH" > "$2-$3/VERSION"
|
||||
|
||||
echo "[mkpkg] Cleaning $2-$3 ..."
|
||||
rm -rf "$2-$3/.git"
|
||||
fi
|
||||
}
|
||||
|
||||
package_sources() {
|
||||
# package_sources source_dir
|
||||
if [ -d "$1" ] ; then
|
||||
echo "[mkpkg] Packing $1.tar.xz ..."
|
||||
if [ ! -f "$1.tar.xz" ] ; then
|
||||
tar cvJf "$1.tar.xz" "$1"
|
||||
fi
|
||||
rm -rf "$1"
|
||||
fi
|
||||
}
|
||||
|
||||
# kodi
|
||||
git_clone $GIT_REPO $BRANCH $DEST_DIR.git
|
||||
|
||||
# kodi-platform
|
||||
REPO=$(cat $DEST_DIR.git/project/cmake/addons/depends/common/kodi-platform/kodi-platform.txt | awk '{print $2}')
|
||||
GIT_HASH=$(cat $DEST_DIR.git/project/cmake/addons/depends/common/kodi-platform/kodi-platform.txt | awk '{print $3}')
|
||||
if [ ! -e kodi-platform-$GIT_HASH.tar.xz ] ; then
|
||||
git_clone $REPO $BRANCH_FOR_ADDONS kodi-platform.git $GIT_HASH
|
||||
copy_sources kodi-platform.git kodi-platform $GIT_HASH
|
||||
package_sources kodi-platform-$GIT_HASH
|
||||
else
|
||||
echo "[mkpkg] kodi-platform-$GIT_HASH.tar.xz already exists ..."
|
||||
fi
|
||||
|
||||
# addons
|
||||
for addon in $DEST_DIR.git/project/cmake/addons/addons/*.* ; do
|
||||
PVR_ADDON=$(basename $addon)
|
||||
REPO=$(cat $DEST_DIR.git/project/cmake/addons/addons/$PVR_ADDON/$PVR_ADDON.txt | awk '{print $2}')
|
||||
GIT_HASH=$(cat $DEST_DIR.git/project/cmake/addons/addons/$PVR_ADDON/$PVR_ADDON.txt | awk '{print $3}')
|
||||
if [ ! -e $PVR_ADDON-$GIT_HASH.tar.xz ] ; then
|
||||
git_clone $REPO $BRANCH_FOR_ADDONS $PVR_ADDON.git $GIT_HASH
|
||||
copy_sources $PVR_ADDON.git $PVR_ADDON $GIT_HASH
|
||||
package_sources $PVR_ADDON-$GIT_HASH
|
||||
else
|
||||
echo "[mkpkg] $PVR_ADDON-$GIT_HASH.tar.xz already exists ..."
|
||||
fi
|
||||
done
|
||||
|
||||
cd $DEST_DIR.git
|
||||
GIT_HASH=`git log -n1 --format=%h`
|
||||
VERSION_MAJOR=$(grep ^VERSION_MAJOR version.txt | cut -d" " -f2)
|
||||
VERSION_MINOR=$(grep ^VERSION_MINOR version.txt | cut -d" " -f2)
|
||||
VERSION_TAG=$(grep ^VERSION_TAG version.txt | cut -d" " -f2 | tr A-Z a-z)
|
||||
PKG_VERSION="$VERSION_MAJOR.$VERSION_MINOR-$VERSION_TAG-$GIT_HASH"
|
||||
# hack: empty version tag on release builds:
|
||||
if [ "$VERSION_TAG" = "version_tag" ] ; then
|
||||
PKG_VERSION="$VERSION_MAJOR.$VERSION_MINOR-$GIT_HASH"
|
||||
fi
|
||||
echo $PKG_VERSION
|
||||
cd ..
|
||||
|
||||
copy_sources $PKG_NAME-$BRANCH.git $PKG_NAME $PKG_VERSION
|
||||
|
||||
echo "[mkpkg] Seperating skin.confluence ..."
|
||||
rm -rf $PKG_NAME-theme-Confluence-$PKG_VERSION
|
||||
mv $PKG_NAME-$PKG_VERSION/addons/skin.confluence $PKG_NAME-theme-Confluence-$PKG_VERSION
|
||||
|
||||
package_sources $PKG_NAME-$PKG_VERSION
|
||||
package_sources $PKG_NAME-theme-Confluence-$PKG_VERSION
|
||||
@ -22,99 +22,46 @@
|
||||
PKG_NAME="kodi"
|
||||
PKG_VERSION=""
|
||||
BRANCH="Isengard"
|
||||
BRANCH_FOR_ADDONS="master"
|
||||
GIT_REPO="git://github.com/xbmc/xbmc.git"
|
||||
DEST_DIR="$PKG_NAME-$BRANCH"
|
||||
|
||||
git_clone() {
|
||||
# git_clone https://repo.url branch ./target_dir [githash]
|
||||
echo "[mkpkg] Checking out $1 ..."
|
||||
if [ ! -d "$3" ]; then
|
||||
git clone "$1" -b $2 "$3"
|
||||
else
|
||||
if [ -d "$3" ] ; then
|
||||
cd "$3"
|
||||
git checkout $2 >/dev/null 2>/dev/null
|
||||
git pull
|
||||
if [ ! -z "$4" ] ; then
|
||||
git branch -D $4 >/dev/null 2>/dev/null
|
||||
git checkout $4 -b $4 >/dev/null 2>/dev/null
|
||||
fi
|
||||
cd ..
|
||||
fi
|
||||
echo "getting sources..."
|
||||
if [ ! -d $DEST_DIR.git ]; then
|
||||
git clone $GIT_REPO -b $BRANCH $DEST_DIR.git
|
||||
fi
|
||||
}
|
||||
|
||||
copy_sources() {
|
||||
# copy_sources source_dir package_name package_version
|
||||
if [ -d "$1" ] ; then
|
||||
echo "[mkpkg] Copying sources: $2-$3" ...
|
||||
rm -rf "$2-$3"
|
||||
cp -R "$1" "$2-$3"
|
||||
echo "$GIT_HASH" > "$2-$3/VERSION"
|
||||
cd $DEST_DIR.git
|
||||
git pull
|
||||
|
||||
echo "[mkpkg] Cleaning $2-$3 ..."
|
||||
rm -rf "$2-$3/.git"
|
||||
echo "getting version..."
|
||||
GIT_HASH=`git log -n1 --format=%h`
|
||||
VERSION_MAJOR=$(grep ^VERSION_MAJOR version.txt | cut -d" " -f2)
|
||||
VERSION_MINOR=$(grep ^VERSION_MINOR version.txt | cut -d" " -f2)
|
||||
VERSION_TAG=$(grep ^VERSION_TAG version.txt | cut -d" " -f2 | tr A-Z a-z)
|
||||
PKG_VERSION="$VERSION_MAJOR.$VERSION_MINOR-$VERSION_TAG-$GIT_HASH"
|
||||
# hack: empty version tag on release builds:
|
||||
if [ "$VERSION_TAG" = "version_tag" ] ; then
|
||||
PKG_VERSION="$VERSION_MAJOR.$VERSION_MINOR-$GIT_HASH"
|
||||
fi
|
||||
}
|
||||
echo $PKG_VERSION
|
||||
cd ..
|
||||
|
||||
package_sources() {
|
||||
# package_sources source_dir
|
||||
if [ -d "$1" ] ; then
|
||||
echo "[mkpkg] Packing $1.tar.xz ..."
|
||||
if [ ! -f "$1.tar.xz" ] ; then
|
||||
tar cvJf "$1.tar.xz" "$1"
|
||||
fi
|
||||
rm -rf "$1"
|
||||
fi
|
||||
}
|
||||
echo "copying sources..."
|
||||
rm -rf $PKG_NAME-$PKG_VERSION
|
||||
cp -R $DEST_DIR.git $PKG_NAME-$PKG_VERSION
|
||||
echo "$GIT_HASH" > $PKG_NAME-$PKG_VERSION/VERSION
|
||||
|
||||
# kodi
|
||||
git_clone $GIT_REPO $BRANCH $DEST_DIR.git
|
||||
echo "cleaning sources..."
|
||||
rm -rf $PKG_NAME-$PKG_VERSION/.git
|
||||
|
||||
# kodi-platform
|
||||
REPO=$(cat $DEST_DIR.git/project/cmake/addons/depends/common/kodi-platform/kodi-platform.txt | awk '{print $2}')
|
||||
GIT_HASH=$(cat $DEST_DIR.git/project/cmake/addons/depends/common/kodi-platform/kodi-platform.txt | awk '{print $3}')
|
||||
if [ ! -e kodi-platform-$GIT_HASH.tar.xz ] ; then
|
||||
git_clone $REPO $BRANCH_FOR_ADDONS kodi-platform.git $GIT_HASH
|
||||
copy_sources kodi-platform.git kodi-platform $GIT_HASH
|
||||
package_sources kodi-platform-$GIT_HASH
|
||||
else
|
||||
echo "[mkpkg] kodi-platform-$GIT_HASH.tar.xz already exists ..."
|
||||
fi
|
||||
echo "seperating theme..."
|
||||
rm -rf $PKG_NAME-theme-Confluence-$PKG_VERSION
|
||||
mv $PKG_NAME-$PKG_VERSION/addons/skin.confluence $PKG_NAME-theme-Confluence-$PKG_VERSION
|
||||
|
||||
# addons
|
||||
for addon in $DEST_DIR.git/project/cmake/addons/addons/*.* ; do
|
||||
PVR_ADDON=$(basename $addon)
|
||||
REPO=$(cat $DEST_DIR.git/project/cmake/addons/addons/$PVR_ADDON/$PVR_ADDON.txt | awk '{print $2}')
|
||||
GIT_HASH=$(cat $DEST_DIR.git/project/cmake/addons/addons/$PVR_ADDON/$PVR_ADDON.txt | awk '{print $3}')
|
||||
if [ ! -e $PVR_ADDON-$GIT_HASH.tar.xz ] ; then
|
||||
git_clone $REPO $BRANCH_FOR_ADDONS $PVR_ADDON.git $GIT_HASH
|
||||
copy_sources $PVR_ADDON.git $PVR_ADDON $GIT_HASH
|
||||
package_sources $PVR_ADDON-$GIT_HASH
|
||||
else
|
||||
echo "[mkpkg] $PVR_ADDON-$GIT_HASH.tar.xz already exists ..."
|
||||
fi
|
||||
done
|
||||
echo "packing sources..."
|
||||
tar cvJf $PKG_NAME-$PKG_VERSION.tar.xz $PKG_NAME-$PKG_VERSION
|
||||
tar cvJf $PKG_NAME-theme-Confluence-$PKG_VERSION.tar.xz $PKG_NAME-theme-Confluence-$PKG_VERSION
|
||||
|
||||
cd $DEST_DIR.git
|
||||
GIT_HASH=`git log -n1 --format=%h`
|
||||
VERSION_MAJOR=$(grep ^VERSION_MAJOR version.txt | cut -d" " -f2)
|
||||
VERSION_MINOR=$(grep ^VERSION_MINOR version.txt | cut -d" " -f2)
|
||||
VERSION_TAG=$(grep ^VERSION_TAG version.txt | cut -d" " -f2 | tr A-Z a-z)
|
||||
PKG_VERSION="$VERSION_MAJOR.$VERSION_MINOR-$VERSION_TAG-$GIT_HASH"
|
||||
# hack: empty version tag on release builds:
|
||||
if [ "$VERSION_TAG" = "version_tag" ] ; then
|
||||
PKG_VERSION="$VERSION_MAJOR.$VERSION_MINOR-$GIT_HASH"
|
||||
fi
|
||||
echo $PKG_VERSION
|
||||
cd ..
|
||||
|
||||
copy_sources $PKG_NAME-$BRANCH.git $PKG_NAME $PKG_VERSION
|
||||
|
||||
echo "[mkpkg] Seperating skin.confluence ..."
|
||||
rm -rf $PKG_NAME-theme-Confluence-$PKG_VERSION
|
||||
mv $PKG_NAME-$PKG_VERSION/addons/skin.confluence $PKG_NAME-theme-Confluence-$PKG_VERSION
|
||||
|
||||
package_sources $PKG_NAME-$PKG_VERSION
|
||||
package_sources $PKG_NAME-theme-Confluence-$PKG_VERSION
|
||||
echo "remove temporary sourcedir..."
|
||||
rm -rf $PKG_NAME-$PKG_VERSION
|
||||
rm -rf $PKG_NAME-theme-Confluence-$PKG_VERSION
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
|
||||
echo "getting sources..."
|
||||
if [ ! -d linux-amlogic.git ]; then
|
||||
git clone https://github.com/codesnake/linux-amlogic linux-amlogic.git
|
||||
git clone https://github.com/codesnake/linux linux-amlogic.git
|
||||
fi
|
||||
|
||||
cd linux-amlogic.git
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user