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
9ac0aa3a9f
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="pvr.mythtv"
|
||||
PKG_VERSION="ca45d7a"
|
||||
PKG_VERSION="4cf2958"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="kodi-theme-Confluence"
|
||||
PKG_VERSION="15.0-rc1-45f5f09"
|
||||
PKG_VERSION="15.0-rc1-9ff25f8"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="kodi"
|
||||
PKG_VERSION="15.0-rc1-45f5f09"
|
||||
PKG_VERSION="15.0-rc1-9ff25f8"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
||||
@ -0,0 +1,37 @@
|
||||
From 7b3c2014209018b13f96af28bc8406f1633924a4 Mon Sep 17 00:00:00 2001
|
||||
From: Stefan Saraev <stefan@saraev.ca>
|
||||
Date: Sun, 29 Mar 2015 21:37:21 +0300
|
||||
Subject: [PATCH] add some symbol keys to english qwerty layout
|
||||
|
||||
now, it should be easier (less clicks) to type in email
|
||||
addresses and urls
|
||||
---
|
||||
system/keyboardlayouts/english.xml | 8 ++++----
|
||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/system/keyboardlayouts/english.xml b/system/keyboardlayouts/english.xml
|
||||
index eb4ca62..71ab1a9 100644
|
||||
--- a/system/keyboardlayouts/english.xml
|
||||
+++ b/system/keyboardlayouts/english.xml
|
||||
@@ -8,14 +8,14 @@ Default font lacks support for all characters
|
||||
<keyboard>
|
||||
<row>1234567890</row>
|
||||
<row>qwertyuiop</row>
|
||||
- <row>asdfghjkl</row>
|
||||
- <row>zxcvbnm</row>
|
||||
+ <row>asdfghjkl:</row>
|
||||
+ <row>zxcvbnm./@</row>
|
||||
</keyboard>
|
||||
<keyboard modifiers="shift">
|
||||
<row>1234567890</row>
|
||||
<row>QWERTYUIOP</row>
|
||||
- <row>ASDFGHJKL</row>
|
||||
- <row>ZXCVBNM</row>
|
||||
+ <row>ASDFGHJKL:</row>
|
||||
+ <row>ZXCVBNM./@</row>
|
||||
</keyboard>
|
||||
<keyboard modifiers="symbol,shift+symbol">
|
||||
<row>)!@#$%^&*(</row>
|
||||
--
|
||||
2.1.4
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
diff -Naur plymouth-lite-0.6.0/ply-frame-buffer.c plymouth-lite-0.6.0.patch/ply-frame-buffer.c
|
||||
--- plymouth-lite-0.6.0/ply-frame-buffer.c 2012-05-02 22:29:21.505665089 +0200
|
||||
+++ plymouth-lite-0.6.0.patch/ply-frame-buffer.c 2012-05-04 01:40:24.000000000 +0200
|
||||
@@ -149,6 +149,58 @@
|
||||
--- plymouth-lite-0.6.0/ply-frame-buffer.c 2015-07-02 01:04:37.625076373 +0100
|
||||
+++ plymouth-lite-0.6.0.patch/ply-frame-buffer.c 2015-07-02 01:04:42.973076293 +0100
|
||||
@@ -184,6 +184,58 @@
|
||||
}
|
||||
}
|
||||
|
||||
@ -16,11 +15,11 @@ diff -Naur plymouth-lite-0.6.0/ply-frame-buffer.c plymouth-lite-0.6.0.patch/ply-
|
||||
+ x2 = x1 + buffer->area_to_flush.width;
|
||||
+ y2 = y1 + buffer->area_to_flush.height;
|
||||
+
|
||||
+ dst = &buffer->map_address[(y1 * buffer->row_stride + x1) * 4];
|
||||
+ src = (char *) &buffer->shadow_buffer[y1 * buffer->area.width + x1];
|
||||
+
|
||||
+ for (y = y1; y < y2; y++)
|
||||
+ {
|
||||
+ dst = &buffer->map_address[(y * buffer->row_stride + x1) * 4];
|
||||
+ src = (char *) &buffer->shadow_buffer[y * buffer->area.width + x1];
|
||||
+
|
||||
+ for (x = x1; x < x2; x++)
|
||||
+ {
|
||||
+ dst[0] = src[2];
|
||||
@ -44,11 +43,11 @@ diff -Naur plymouth-lite-0.6.0/ply-frame-buffer.c plymouth-lite-0.6.0.patch/ply-
|
||||
+ x2 = x1 + buffer->area_to_flush.width;
|
||||
+ y2 = y1 + buffer->area_to_flush.height;
|
||||
+
|
||||
+ dst = (unsigned short *)&buffer->map_address[(y1 * buffer->row_stride + x1) * 2];
|
||||
+ src = (unsigned char *) &buffer->shadow_buffer[y1 * buffer->area.width + x1];
|
||||
+
|
||||
+ for (y = y1; y < y2; y++)
|
||||
+ {
|
||||
+ dst = (unsigned short *)&buffer->map_address[(y * buffer->row_stride + x1) * 2];
|
||||
+ src = (unsigned char *) &buffer->shadow_buffer[y * buffer->area.width + x1];
|
||||
+
|
||||
+ for (x = x1; x < x2; x++)
|
||||
+ {
|
||||
+ *dst++ = (src[0]>>3) << 0 | (src[1]>>2) << 5 | (src[2]>>3) << 11;
|
||||
@ -60,29 +59,19 @@ diff -Naur plymouth-lite-0.6.0/ply-frame-buffer.c plymouth-lite-0.6.0.patch/ply-
|
||||
static const char const *p_visual(int visual)
|
||||
{
|
||||
static const char const *visuals[] =
|
||||
@@ -260,11 +312,26 @@
|
||||
buffer->dither_green = 0;
|
||||
buffer->dither_blue = 0;
|
||||
|
||||
+printf("%d,%d,%d,%d,%d,%d,%d\n", buffer->bytes_per_pixel,
|
||||
+ buffer->red_bit_position, buffer->bits_for_red,
|
||||
+ buffer->green_bit_position, buffer->bits_for_green,
|
||||
+ buffer->blue_bit_position, buffer->bits_for_blue);
|
||||
+
|
||||
if (buffer->bytes_per_pixel == 4 &&
|
||||
buffer->red_bit_position == 16 && buffer->bits_for_red == 8 &&
|
||||
@@ -300,6 +352,16 @@
|
||||
buffer->green_bit_position == 8 && buffer->bits_for_green == 8 &&
|
||||
buffer->blue_bit_position == 0 && buffer->bits_for_blue == 8)
|
||||
buffer->flush = flush_xrgb32;
|
||||
+ else if (buffer->bytes_per_pixel == 4 &&
|
||||
+ buffer->red_bit_position == 0 && buffer->bits_for_red == 8 &&
|
||||
+ buffer->green_bit_position == 8 && buffer->bits_for_green == 8 &&
|
||||
+ buffer->blue_bit_position == 16 && buffer->bits_for_blue == 8)
|
||||
+ buffer->red_bit_position == 0 && buffer->bits_for_red == 8 &&
|
||||
+ buffer->green_bit_position == 8 && buffer->bits_for_green == 8 &&
|
||||
+ buffer->blue_bit_position == 16 && buffer->bits_for_blue == 8)
|
||||
+ buffer->flush = flush_xbgr32;
|
||||
+ else if (buffer->bytes_per_pixel == 2 &&
|
||||
+ buffer->red_bit_position == 11 && buffer->bits_for_red == 5 &&
|
||||
+ buffer->green_bit_position == 5 && buffer->bits_for_green == 6 &&
|
||||
+ buffer->blue_bit_position == 0 && buffer->bits_for_blue == 5)
|
||||
+ buffer->red_bit_position == 11 && buffer->bits_for_red == 5 &&
|
||||
+ buffer->green_bit_position == 5 && buffer->bits_for_green == 6 &&
|
||||
+ buffer->blue_bit_position == 0 && buffer->bits_for_blue == 5)
|
||||
+ buffer->flush = flush_rgb16;
|
||||
else
|
||||
buffer->flush = flush_generic;
|
||||
|
||||
116
tools/mkpkg/mkpkg_kodi-Isengard
Executable file
116
tools/mkpkg/mkpkg_kodi-Isengard
Executable file
@ -0,0 +1,116 @@
|
||||
#!/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="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
|
||||
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 9ff25f8
|
||||
|
||||
# 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"
|
||||
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
|
||||
Loading…
x
Reference in New Issue
Block a user