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
This commit is contained in:
commit
74dab944f2
102
licenses/OFL1_1.txt
Normal file
102
licenses/OFL1_1.txt
Normal file
@ -0,0 +1,102 @@
|
||||
Digitized data copyright (c) 2010 Google Corporation
|
||||
with Reserved Font Arimo, Tinos and Cousine.
|
||||
Copyright (c) 2012 Red Hat, Inc.
|
||||
with Reserved Font Name Liberation.
|
||||
|
||||
This Font Software is licensed under the SIL Open Font License,
|
||||
Version 1.1.
|
||||
|
||||
This license is copied below, and is also available with a FAQ at:
|
||||
http://scripts.sil.org/OFL
|
||||
|
||||
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
|
||||
|
||||
PREAMBLE The goals of the Open Font License (OFL) are to stimulate
|
||||
worldwide development of collaborative font projects, to support the font
|
||||
creation efforts of academic and linguistic communities, and to provide
|
||||
a free and open framework in which fonts may be shared and improved in
|
||||
partnership with others.
|
||||
|
||||
The OFL allows the licensed fonts to be used, studied, modified and
|
||||
redistributed freely as long as they are not sold by themselves.
|
||||
The fonts, including any derivative works, can be bundled, embedded,
|
||||
redistributed and/or sold with any software provided that any reserved
|
||||
names are not used by derivative works. The fonts and derivatives,
|
||||
however, cannot be released under any other type of license. The
|
||||
requirement for fonts to remain under this license does not apply to
|
||||
any document created using the fonts or their derivatives.
|
||||
|
||||
|
||||
|
||||
DEFINITIONS
|
||||
"Font Software" refers to the set of files released by the Copyright
|
||||
Holder(s) under this license and clearly marked as such.
|
||||
This may include source files, build scripts and documentation.
|
||||
|
||||
"Reserved Font Name" refers to any names specified as such after the
|
||||
copyright statement(s).
|
||||
|
||||
"Original Version" refers to the collection of Font Software components
|
||||
as distributed by the Copyright Holder(s).
|
||||
|
||||
"Modified Version" refers to any derivative made by adding to, deleting,
|
||||
or substituting ? in part or in whole ?
|
||||
any of the components of the Original Version, by changing formats or
|
||||
by porting the Font Software to a new environment.
|
||||
|
||||
"Author" refers to any designer, engineer, programmer, technical writer
|
||||
or other person who contributed to the Font Software.
|
||||
|
||||
|
||||
PERMISSION & CONDITIONS
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a
|
||||
copy of the Font Software, to use, study, copy, merge, embed, modify,
|
||||
redistribute, and sell modified and unmodified copies of the Font
|
||||
Software, subject to the following conditions:
|
||||
|
||||
1) Neither the Font Software nor any of its individual components,in
|
||||
Original or Modified Versions, may be sold by itself.
|
||||
|
||||
2) Original or Modified Versions of the Font Software may be bundled,
|
||||
redistributed and/or sold with any software, provided that each copy
|
||||
contains the above copyright notice and this license. These can be
|
||||
included either as stand-alone text files, human-readable headers or
|
||||
in the appropriate machine-readable metadata fields within text or
|
||||
binary files as long as those fields can be easily viewed by the user.
|
||||
|
||||
3) No Modified Version of the Font Software may use the Reserved Font
|
||||
Name(s) unless explicit written permission is granted by the
|
||||
corresponding Copyright Holder. This restriction only applies to the
|
||||
primary font name as presented to the users.
|
||||
|
||||
4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
|
||||
Software shall not be used to promote, endorse or advertise any
|
||||
Modified Version, except to acknowledge the contribution(s) of the
|
||||
Copyright Holder(s) and the Author(s) or with their explicit written
|
||||
permission.
|
||||
|
||||
5) The Font Software, modified or unmodified, in part or in whole, must
|
||||
be distributed entirely under this license, and must not be distributed
|
||||
under any other license. The requirement for fonts to remain under
|
||||
this license does not apply to any document created using the Font
|
||||
Software.
|
||||
|
||||
|
||||
|
||||
TERMINATION
|
||||
This license becomes null and void if any of the above conditions are not met.
|
||||
|
||||
|
||||
|
||||
DISCLAIMER
|
||||
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
|
||||
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
|
||||
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
|
||||
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
||||
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
|
||||
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER
|
||||
DEALINGS IN THE FONT SOFTWARE.
|
||||
|
@ -54,7 +54,6 @@ glib_cv_va_val_copy='no' \
|
||||
--disable-selinux \
|
||||
--disable-fam \
|
||||
--enable-xattr \
|
||||
--enable-regex \
|
||||
--disable-gtk-doc \
|
||||
--disable-man \
|
||||
--disable-dtrace \
|
||||
|
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="glib"
|
||||
PKG_VERSION="2.32.3"
|
||||
PKG_VERSION="2.32.4"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="LGPL"
|
||||
|
24
packages/graphics/Mesa/patches/Mesa-8.0.4-9b3ac17.patch
Normal file
24
packages/graphics/Mesa/patches/Mesa-8.0.4-9b3ac17.patch
Normal file
@ -0,0 +1,24 @@
|
||||
diff -Naur Mesa-8.0.4-old/src/mesa/drivers/dri/intel/intel_screen.c Mesa-8.0.4-new/src/mesa/drivers/dri/intel/intel_screen.c
|
||||
--- Mesa-8.0.4-old/src/mesa/drivers/dri/intel/intel_screen.c 2012-03-22 10:10:16.000000000 -0700
|
||||
+++ Mesa-8.0.4-new/src/mesa/drivers/dri/intel/intel_screen.c 2012-07-16 12:27:37.000000000 -0700
|
||||
@@ -118,13 +118,15 @@
|
||||
if (intel == NULL)
|
||||
return;
|
||||
|
||||
- if (intel->gen < 4)
|
||||
- INTEL_FIREVERTICES(intel);
|
||||
+ if (intel != NULL) {
|
||||
+ if (intel->gen < 4)
|
||||
+ INTEL_FIREVERTICES(intel);
|
||||
|
||||
- intel->need_throttle = true;
|
||||
+ intel->need_throttle = true;
|
||||
|
||||
- if (intel->batch.used)
|
||||
- intel_batchbuffer_flush(intel);
|
||||
+ if (intel->batch.used)
|
||||
+ intel_batchbuffer_flush(intel);
|
||||
+ }
|
||||
}
|
||||
|
||||
static const struct __DRI2flushExtensionRec intelFlushExtension = {
|
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="glew"
|
||||
PKG_VERSION="1.7.0"
|
||||
PKG_VERSION="1.8.0"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="BSD"
|
||||
|
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="libpng"
|
||||
PKG_VERSION="1.5.11"
|
||||
PKG_VERSION="1.5.12"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="OSS"
|
||||
|
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="ethtool"
|
||||
PKG_VERSION="3.4.1"
|
||||
PKG_VERSION="3.4.2"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="dbus"
|
||||
PKG_VERSION="1.6.2"
|
||||
PKG_VERSION="1.6.4"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="automake"
|
||||
PKG_VERSION="1.12.1"
|
||||
PKG_VERSION="1.12.2"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="bison"
|
||||
PKG_VERSION="2.5.1"
|
||||
PKG_VERSION="2.6"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -22,8 +22,8 @@
|
||||
|
||||
. config/options $1
|
||||
|
||||
export GLIB_CFLAGS="-I$ROOT/$TOOLCHAIN/include/glib-2.0 -I$ROOT/$TOOLCHAIN/lib/glib-2.0/include"
|
||||
export GLIB_LIBS="-L$ROOT/$TOOLCHAIN/lib -lglib-2.0"
|
||||
# export GLIB_CFLAGS="-I$ROOT/$TOOLCHAIN/include/glib-2.0 -I$ROOT/$TOOLCHAIN/lib/glib-2.0/include"
|
||||
# export GLIB_LIBS="-L$ROOT/$TOOLCHAIN/lib -lglib-2.0"
|
||||
|
||||
setup_toolchain host
|
||||
|
||||
@ -32,6 +32,8 @@ cd $PKG_BUILD
|
||||
--build=$HOST_NAME \
|
||||
--enable-shared \
|
||||
--disable-static \
|
||||
--disable-silent-rules \
|
||||
--with-internal-glib \
|
||||
--with-gnu-ld
|
||||
|
||||
make
|
||||
|
@ -19,14 +19,14 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="pkg-config"
|
||||
PKG_VERSION="0.26"
|
||||
PKG_VERSION="0.27"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://www.freedesktop.org/software/pkgconfig/"
|
||||
PKG_URL="http://pkgconfig.freedesktop.org/releases/$PKG_NAME-$PKG_VERSION.tar.gz"
|
||||
PKG_DEPENDS=""
|
||||
PKG_BUILD_DEPENDS="ccache glib-host"
|
||||
PKG_BUILD_DEPENDS="ccache"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="toolchain/devel"
|
||||
PKG_SHORTDESC="pkg-config: A library configuration management system"
|
||||
|
@ -19,10 +19,10 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="liberation-fonts-ttf"
|
||||
PKG_VERSION="1.07.2"
|
||||
PKG_VERSION="2.00.0"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_LICENSE="OFL1_1"
|
||||
PKG_SITE="https://www.redhat.com/promo/fonts/"
|
||||
PKG_URL="https://fedorahosted.org/releases/l/i/liberation-fonts/$PKG_NAME-$PKG_VERSION.tar.gz"
|
||||
PKG_DEPENDS=""
|
||||
|
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="fontconfig"
|
||||
PKG_VERSION="2.9.0"
|
||||
PKG_VERSION="2.10.0"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="OSS"
|
||||
|
@ -0,0 +1,12 @@
|
||||
diff -Naur fontconfig-2.10.0-old/fontconfig.pc.in fontconfig-2.10.0-new/fontconfig.pc.in
|
||||
--- fontconfig-2.10.0-old/fontconfig.pc.in 2012-05-31 19:26:10.000000000 -0700
|
||||
+++ fontconfig-2.10.0-new/fontconfig.pc.in 2012-07-19 08:27:33.000000000 -0700
|
||||
@@ -5,7 +5,7 @@
|
||||
sysconfdir=@sysconfdir@
|
||||
localstatedir=@localstatedir@
|
||||
PACKAGE=@PACKAGE@
|
||||
-confdir=@confdir@
|
||||
+confdir=@baseconfigdir@
|
||||
cachedir=@fc_cachedir@
|
||||
|
||||
Name: Fontconfig
|
Loading…
x
Reference in New Issue
Block a user