mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-24 11:16:51 +00:00
Merge branch 'openelec-next' of github.com:OpenELEC/OpenELEC.tv into openelec-eden
This commit is contained in:
commit
6853905ee3
79
config/graphic
Normal file
79
config/graphic
Normal file
@ -0,0 +1,79 @@
|
||||
get_graphicdrivers() {
|
||||
if [ "$GRAPHIC_DRIVERS" = "all" ]; then
|
||||
GRAPHIC_DRIVERS="i915 i965 r200 r300 r600 fglrx nvidia vmware"
|
||||
fi
|
||||
|
||||
for drv in $GRAPHIC_DRIVERS; do
|
||||
if [ "$drv" = "fglrx" ]; then
|
||||
DRI_DRIVERS="$DRI_DRIVERS"
|
||||
GALLIUM_DRIVERS="$GALLIUM_DRIVERS"
|
||||
XORG_DRIVERS="$XORG_DRIVERS fglrx"
|
||||
COMPOSITE_SUPPORT="yes"
|
||||
XINERAMA_SUPPORT="yes"
|
||||
# LLVM_SUPPORT="yes"
|
||||
fi
|
||||
|
||||
if [ "$drv" = "i915" ]; then
|
||||
DRI_DRIVERS="$DRI_DRIVERS,i915"
|
||||
# GALLIUM_DRIVERS="$GALLIUM_DRIVERS,i915"
|
||||
XORG_DRIVERS="$XORG_DRIVERS intel"
|
||||
# LLVM_SUPPORT="yes"
|
||||
fi
|
||||
|
||||
if [ "$drv" = "i965" ]; then
|
||||
DRI_DRIVERS="$DRI_DRIVERS,i965"
|
||||
# GALLIUM_DRIVERS="$GALLIUM_DRIVERS,i965"
|
||||
XORG_DRIVERS="$XORG_DRIVERS intel"
|
||||
# LLVM_SUPPORT="yes"
|
||||
fi
|
||||
|
||||
if [ "$drv" = "nouveau" ]; then
|
||||
# DRI_DRIVERS="$DRI_DRIVERS,nouveau"
|
||||
GALLIUM_DRIVERS="$GALLIUM_DRIVERS,nouveau"
|
||||
XORG_DRIVERS="$XORG_DRIVERS nouveau"
|
||||
LLVM_SUPPORT="yes"
|
||||
fi
|
||||
|
||||
if [ "$drv" = "nvidia" ]; then
|
||||
DRI_DRIVERS="$DRI_DRIVERS"
|
||||
GALLIUM_DRIVERS="$GALLIUM_DRIVERS"
|
||||
XORG_DRIVERS="$XORG_DRIVERS nvidia"
|
||||
XINERAMA_SUPPORT="yes"
|
||||
# LLVM_SUPPORT="yes"
|
||||
fi
|
||||
|
||||
if [ "$drv" = "omapfb" ]; then
|
||||
DRI_DRIVERS="$DRI_DRIVERS,swrast"
|
||||
# GALLIUM_DRIVERS="$GALLIUM_DRIVERS,swrast"
|
||||
XORG_DRIVERS="$XORG_DRIVERS ompafb"
|
||||
# LLVM_SUPPORT="yes"
|
||||
fi
|
||||
|
||||
if [ "$drv" = "r200" ]; then
|
||||
DRI_DRIVERS="$DRI_DRIVERS,r200"
|
||||
# GALLIUM_DRIVERS="$GALLIUM_DRIVERS,r200"
|
||||
XORG_DRIVERS="$XORG_DRIVERS ati"
|
||||
# LLVM_SUPPORT="yes"
|
||||
fi
|
||||
|
||||
if [ "$drv" = "r300" ]; then
|
||||
# DRI_DRIVERS="$DRI_DRIVERS,r300"
|
||||
GALLIUM_DRIVERS="$GALLIUM_DRIVERS,r300"
|
||||
XORG_DRIVERS="$XORG_DRIVERS ati"
|
||||
LLVM_SUPPORT="yes"
|
||||
fi
|
||||
|
||||
if [ "$drv" = "r600" ]; then
|
||||
# DRI_DRIVERS="$DRI_DRIVERS,r600"
|
||||
GALLIUM_DRIVERS="$GALLIUM_DRIVERS,r600"
|
||||
XORG_DRIVERS="$XORG_DRIVERS ati"
|
||||
LLVM_SUPPORT="yes"
|
||||
fi
|
||||
|
||||
if [ "$drv" = "vmware" ]; then
|
||||
XINERAMA_SUPPORT="yes"
|
||||
# LLVM_SUPPORT="yes"
|
||||
fi
|
||||
|
||||
done
|
||||
}
|
@ -75,84 +75,5 @@ fi
|
||||
. $HOME/.openelec/$PROJECT/options
|
||||
fi
|
||||
|
||||
get_graphicdrivers() {
|
||||
if [ "$GRAPHIC_DRIVERS" = "all" ]; then
|
||||
GRAPHIC_DRIVERS="i915 i965 r200 r300 r600 nvidia vmware"
|
||||
fi
|
||||
|
||||
for drv in $GRAPHIC_DRIVERS; do
|
||||
if [ "$drv" = "fglrx" ]; then
|
||||
DRI_DRIVERS="$DRI_DRIVERS"
|
||||
GALLIUM_DRIVERS="$GALLIUM_DRIVERS"
|
||||
XORG_DRIVERS="$XORG_DRIVERS fglrx"
|
||||
COMPOSITE_SUPPORT="yes"
|
||||
XINERAMA_SUPPORT="yes"
|
||||
# LLVM_SUPPORT="yes"
|
||||
fi
|
||||
|
||||
if [ "$drv" = "i915" ]; then
|
||||
DRI_DRIVERS="$DRI_DRIVERS,i915"
|
||||
# GALLIUM_DRIVERS="$GALLIUM_DRIVERS,i915"
|
||||
XORG_DRIVERS="$XORG_DRIVERS intel"
|
||||
# LLVM_SUPPORT="yes"
|
||||
fi
|
||||
|
||||
if [ "$drv" = "i965" ]; then
|
||||
DRI_DRIVERS="$DRI_DRIVERS,i965"
|
||||
# GALLIUM_DRIVERS="$GALLIUM_DRIVERS,i965"
|
||||
XORG_DRIVERS="$XORG_DRIVERS intel"
|
||||
# LLVM_SUPPORT="yes"
|
||||
fi
|
||||
|
||||
if [ "$drv" = "nouveau" ]; then
|
||||
# DRI_DRIVERS="$DRI_DRIVERS,nouveau"
|
||||
GALLIUM_DRIVERS="$GALLIUM_DRIVERS,nouveau"
|
||||
XORG_DRIVERS="$XORG_DRIVERS nouveau"
|
||||
# LLVM_SUPPORT="yes"
|
||||
fi
|
||||
|
||||
if [ "$drv" = "nvidia" ]; then
|
||||
DRI_DRIVERS="$DRI_DRIVERS"
|
||||
GALLIUM_DRIVERS="$GALLIUM_DRIVERS"
|
||||
XORG_DRIVERS="$XORG_DRIVERS nvidia"
|
||||
XINERAMA_SUPPORT="yes"
|
||||
# LLVM_SUPPORT="yes"
|
||||
fi
|
||||
|
||||
if [ "$drv" = "omapfb" ]; then
|
||||
DRI_DRIVERS="$DRI_DRIVERS,swrast"
|
||||
# GALLIUM_DRIVERS="$GALLIUM_DRIVERS,swrast"
|
||||
XORG_DRIVERS="$XORG_DRIVERS ompafb"
|
||||
# LLVM_SUPPORT="yes"
|
||||
fi
|
||||
|
||||
if [ "$drv" = "r200" ]; then
|
||||
DRI_DRIVERS="$DRI_DRIVERS,r200"
|
||||
# GALLIUM_DRIVERS="$GALLIUM_DRIVERS,r200"
|
||||
XORG_DRIVERS="$XORG_DRIVERS ati"
|
||||
# LLVM_SUPPORT="yes"
|
||||
fi
|
||||
|
||||
if [ "$drv" = "r300" ]; then
|
||||
# DRI_DRIVERS="$DRI_DRIVERS,r300"
|
||||
GALLIUM_DRIVERS="$GALLIUM_DRIVERS,r300"
|
||||
XORG_DRIVERS="$XORG_DRIVERS ati"
|
||||
# LLVM_SUPPORT="yes"
|
||||
fi
|
||||
|
||||
if [ "$drv" = "r600" ]; then
|
||||
# DRI_DRIVERS="$DRI_DRIVERS,r600"
|
||||
GALLIUM_DRIVERS="$GALLIUM_DRIVERS,r600"
|
||||
XORG_DRIVERS="$XORG_DRIVERS ati"
|
||||
# LLVM_SUPPORT="yes"
|
||||
fi
|
||||
|
||||
if [ "$drv" = "vmware" ]; then
|
||||
XINERAMA_SUPPORT="yes"
|
||||
# LLVM_SUPPORT="yes"
|
||||
fi
|
||||
|
||||
done
|
||||
}
|
||||
|
||||
. config/graphic
|
||||
. config/path $1
|
||||
|
3
create_tar.sh
Executable file
3
create_tar.sh
Executable file
@ -0,0 +1,3 @@
|
||||
#!/bin/sh
|
||||
|
||||
git archive --format=tar --prefix=OpenELEC-source-$1/ tags/$1 | bzip2 > OpenELEC-source-$1.tar.bz2
|
@ -31,6 +31,9 @@ get_graphicdrivers
|
||||
|
||||
if [ "$LLVM_SUPPORT" = "yes" ]; then
|
||||
export LLVM_CONFIG="$SYSROOT_PREFIX/usr/bin/llvm-config"
|
||||
MESA_GALLIUM_LLVM="--enable-gallium-llvm"
|
||||
else
|
||||
MESA_GALLIUM_LLVM="--disable-gallium-llvm"
|
||||
fi
|
||||
|
||||
cd $PKG_BUILD
|
||||
@ -60,6 +63,7 @@ DRI_DRIVER_SEARCH_DIR="$XORG_PATH_DRI" \
|
||||
--disable-glw \
|
||||
--disable-motif \
|
||||
--with-gallium-drivers="$GALLIUM_DRIVERS" \
|
||||
$MESA_GALLIUM_LLVM \
|
||||
--with-driver="dri" \
|
||||
--with-dri-drivers="$DRI_DRIVERS" \
|
||||
--with-xorg-driver-dir="$XORG_PATH_DRIVERS" \
|
||||
|
@ -40,5 +40,6 @@ get_graphicdrivers
|
||||
|
||||
if [ "$LLVM_SUPPORT" = "yes" ]; then
|
||||
PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS llvm"
|
||||
PKG_DEPENDS="$PKG_DEPENDS llvm"
|
||||
# actually we dont need llvm installed because its linked statically
|
||||
# PKG_DEPENDS="$PKG_DEPENDS llvm"
|
||||
fi
|
||||
|
@ -19,12 +19,12 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="wlan-firmware"
|
||||
PKG_VERSION="0.0.4"
|
||||
PKG_VERSION="0.0.5"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="Free-to-use"
|
||||
PKG_SITE="https://github.com/OpenELEC/wlan-firmware"
|
||||
PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
|
||||
PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
|
||||
PKG_DEPENDS=""
|
||||
PKG_BUILD_DEPENDS="toolchain"
|
||||
PKG_PRIORITY="optional"
|
||||
|
@ -38,7 +38,7 @@ am_cv_func_iconv=yes \
|
||||
--enable-lib \
|
||||
--enable-util \
|
||||
--disable-example \
|
||||
--disable-mtab \
|
||||
--enable-mtab \
|
||||
--disable-rpath \
|
||||
--with-gnu-ld \
|
||||
|
||||
|
@ -29,7 +29,6 @@ cd $PKG_BUILD
|
||||
--enable-shared \
|
||||
--disable-static \
|
||||
--disable-dependency-tracking \
|
||||
--with-fuse=external \
|
||||
--disable-library \
|
||||
--enable-posix-acls \
|
||||
--enable-mtab \
|
||||
|
@ -50,6 +50,7 @@ LDFLAGS="$LDFLAGS -I$SYSROOT_PREFIX/usr/include/glib-2.0" \
|
||||
--disable-keymap \
|
||||
--disable-floppy \
|
||||
--disable-edd \
|
||||
--disable-action_modeswitch \
|
||||
--without-selinux \
|
||||
--without-systemdsystemunitdir \
|
||||
--with-firmware-path=/lib/firmware \
|
||||
|
@ -19,15 +19,14 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="udev"
|
||||
PKG_VERSION="d971228"
|
||||
PKG_VERSION="171"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://ftp.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
|
||||
#PKG_URL="http://www.eu.kernel.org/pub/linux/utils/kernel/hotplug/$PKG_NAME-$PKG_VERSION.tar.bz2"
|
||||
PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
|
||||
PKG_URL="http://www.eu.kernel.org/pub/linux/utils/kernel/hotplug/$PKG_NAME-$PKG_VERSION.tar.bz2"
|
||||
PKG_DEPENDS="glib pciutils usbutils libusb-compat"
|
||||
PKG_BUILD_DEPENDS="toolchain glib gtk-doc pciutils usbutils libusb-compat"
|
||||
PKG_BUILD_DEPENDS="toolchain glib pciutils usbutils libusb-compat"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="system"
|
||||
PKG_SHORTDESC="udev: A Userspace Implementation for dynamic /dev nodes"
|
||||
|
@ -1,25 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
################################################################################
|
||||
# This file is part of OpenELEC - http://www.openelec.tv
|
||||
# Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
# http://www.gnu.org/copyleft/gpl.html
|
||||
################################################################################
|
||||
|
||||
. config/options $1
|
||||
|
||||
cp $SYSROOT_PREFIX/usr/share/gtk-doc/gtk-doc.make $PKG_BUILD
|
@ -19,12 +19,12 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="upower"
|
||||
PKG_VERSION="0.9.11"
|
||||
PKG_VERSION="0.9.12"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://upower.freedesktop.org/"
|
||||
PKG_URL="http://upower.freedesktop.org/releases/$PKG_NAME-$PKG_VERSION.tar.bz2"
|
||||
PKG_URL="http://upower.freedesktop.org/releases/$PKG_NAME-$PKG_VERSION.tar.xz"
|
||||
PKG_DEPENDS="udev glib dbus dbus-glib polkit pm-utils"
|
||||
PKG_BUILD_DEPENDS="toolchain udev glib dbus dbus-glib gobject-introspection polkit"
|
||||
PKG_PRIORITY="optional"
|
||||
|
@ -25,5 +25,3 @@
|
||||
cd $PKG_BUILD
|
||||
mkdir -p $SYSROOT_PREFIX/usr/share/aclocal
|
||||
cp gtk-doc.m4 $SYSROOT_PREFIX/usr/share/aclocal
|
||||
mkdir -p $SYSROOT_PREFIX/usr/share/gtk-doc
|
||||
cp gtk-doc.make $SYSROOT_PREFIX/usr/share/gtk-doc
|
||||
|
@ -1,6 +1,6 @@
|
||||
#
|
||||
# Automatically generated make config: don't edit
|
||||
# Linux/i386 3.0.0-rc4 Kernel Configuration
|
||||
# Linux/i386 3.0.0-rc5 Kernel Configuration
|
||||
#
|
||||
# CONFIG_64BIT is not set
|
||||
CONFIG_X86_32=y
|
||||
@ -2053,7 +2053,8 @@ CONFIG_DRM_KMS_HELPER=y
|
||||
CONFIG_DRM_TTM=y
|
||||
# CONFIG_DRM_TDFX is not set
|
||||
# CONFIG_DRM_R128 is not set
|
||||
# CONFIG_DRM_RADEON is not set
|
||||
CONFIG_DRM_RADEON=y
|
||||
CONFIG_DRM_RADEON_KMS=y
|
||||
# CONFIG_DRM_I810 is not set
|
||||
CONFIG_DRM_I915=y
|
||||
CONFIG_DRM_I915_KMS=y
|
||||
@ -2904,7 +2905,6 @@ CONFIG_CIFS_STATS2=y
|
||||
# CONFIG_CIFS_XATTR is not set
|
||||
# CONFIG_CIFS_DEBUG2 is not set
|
||||
# CONFIG_CIFS_DFS_UPCALL is not set
|
||||
# CONFIG_CIFS_NFSD_EXPORT is not set
|
||||
# CONFIG_NCP_FS is not set
|
||||
# CONFIG_CODA_FS is not set
|
||||
# CONFIG_AFS_FS is not set
|
||||
|
@ -166,7 +166,7 @@
|
||||
# Graphic drivers to use (all / i915,i965,r200,r300,r600,radeon,nvidia,nouveau,vmware)
|
||||
# Space separated list is supported,
|
||||
# e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 nvidia nouveau"
|
||||
GRAPHIC_DRIVERS="i915 i965 r200 fglrx nvidia vmware"
|
||||
GRAPHIC_DRIVERS="i915 i965 r200 r300 fglrx nvidia vmware"
|
||||
|
||||
# use libdrm-master (latest git) instead latest released version
|
||||
LIBDRM_MASTER="no"
|
||||
|
@ -1,43 +0,0 @@
|
||||
#!/bin/sh
|
||||
################################################################################
|
||||
# This file is part of OpenELEC - http://www.openelec.tv
|
||||
# Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
# http://www.gnu.org/copyleft/gpl.html
|
||||
################################################################################
|
||||
|
||||
echo "getting sources..."
|
||||
if [ ! -d udev.git ]; then
|
||||
git clone git://git.kernel.org/pub/scm/linux/hotplug/udev.git udev.git
|
||||
fi
|
||||
|
||||
cd udev.git
|
||||
git pull
|
||||
GIT_REV=`git log -n1 --format=%h`
|
||||
cd ..
|
||||
|
||||
echo "copying sources..."
|
||||
rm -rf udev-$GIT_REV
|
||||
cp -R udev.git udev-$GIT_REV
|
||||
|
||||
echo "cleaning sources..."
|
||||
rm -rf udev-$GIT_REV/.git
|
||||
|
||||
echo "packing sources..."
|
||||
tar cvJf udev-$GIT_REV.tar.xz udev-$GIT_REV
|
||||
|
||||
echo "remove temporary sourcedir..."
|
||||
rm -rf udev-$GIT_REV
|
Loading…
x
Reference in New Issue
Block a user