mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-28 13:16:41 +00:00
Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-settings
This commit is contained in:
Stephan Raue
commit
4920f7a735
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="linux"
|
||||
PKG_VERSION="3.7.3"
|
||||
PKG_VERSION="3.7.4"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="samba"
|
||||
PKG_VERSION="3.6.10"
|
||||
PKG_VERSION="3.6.11"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
||||
@ -1,26 +0,0 @@
|
||||
#!/bin/sh
|
||||
################################################################################
|
||||
# This file is part of OpenELEC - http://www.openelec.tv
|
||||
# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
|
||||
# Copyright (C) 2010-2011 Roman Weber (roman@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
|
||||
################################################################################
|
||||
|
||||
|
||||
for i in `ls samba-$1-*.patch`; do
|
||||
mv $i `echo $i | sed "s,$1,$2,g"`
|
||||
done
|
||||
@ -28,7 +28,7 @@ cd $PKG_BUILD
|
||||
--prefix=/usr \
|
||||
--sysconfdir=/etc \
|
||||
--localstatedir=/var \
|
||||
--disable-static \
|
||||
--enable-static \
|
||||
--enable-shared \
|
||||
--disable-openssl \
|
||||
--with-gnu-ld
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="nettle"
|
||||
PKG_VERSION="2.5"
|
||||
PKG_VERSION="2.6"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
||||
@ -0,0 +1,12 @@
|
||||
diff -Naur xf86-video-dove-0.3.4/configure.ac xf86-video-dove-0.3.4.patch/configure.ac
|
||||
--- xf86-video-dove-0.3.4/configure.ac 2011-03-07 18:52:09.000000000 +0100
|
||||
+++ xf86-video-dove-0.3.4.patch/configure.ac 2013-01-22 13:30:57.420372292 +0100
|
||||
@@ -27,7 +27,7 @@
|
||||
xf86-video-mrvl)
|
||||
|
||||
AC_CONFIG_SRCDIR([Makefile.am])
|
||||
-AM_CONFIG_HEADER([config.h])
|
||||
+AC_CONFIG_HEADERS([config.h])
|
||||
AC_CONFIG_AUX_DIR(.)
|
||||
|
||||
AM_INIT_AUTOMAKE([dist-bzip2])
|
||||
@ -24,11 +24,9 @@
|
||||
|
||||
export CC_FOR_BUILD="$HOST_CC"
|
||||
export CPPFLAGS_FOR_BUILD="$HOST_CPPFLAGS"
|
||||
export CFLAGS_FOR_BUILD="$HOST_CFLAGS -I$SYSROOT_PREFIX/usr/include"
|
||||
export CFLAGS_FOR_BUILD="$HOST_CFLAGS"
|
||||
export LDFLAGS_FOR_BUILD="$HOST_LDFLAGS"
|
||||
|
||||
export PKG_CONFIG="$PKG_CONFIG --define-variable=prefix=$SYSROOT_PREFIX/usr"
|
||||
|
||||
cd $PKG_BUILD
|
||||
|
||||
./configure --host=$TARGET_NAME \
|
||||
|
||||
@ -26,7 +26,7 @@ PKG_LICENSE="OSS"
|
||||
PKG_SITE="http://www.x.org/"
|
||||
PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2"
|
||||
PKG_DEPENDS="libXau libxcb"
|
||||
PKG_BUILD_DEPENDS="toolchain util-macros xextproto xcmiscproto bigreqsproto kbproto inputproto xtrans libXau libxcb util-macros"
|
||||
PKG_BUILD_DEPENDS="toolchain xproto-host xproto util-macros xextproto xcmiscproto bigreqsproto kbproto inputproto xtrans libXau libxcb util-macros"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="x11/lib"
|
||||
PKG_SHORTDESC="libx11: The X11 library"
|
||||
|
||||
@ -0,0 +1,20 @@
|
||||
diff -Naur libX11-1.5.0-old/configure.ac libX11-1.5.0-new/configure.ac
|
||||
--- libX11-1.5.0-old/configure.ac 2012-06-01 23:37:17.000000000 -0700
|
||||
+++ libX11-1.5.0-new/configure.ac 2012-06-02 09:13:08.000000000 -0700
|
||||
@@ -35,6 +35,7 @@
|
||||
|
||||
# Required when PKG_CHECK_MODULES called within an if statement
|
||||
PKG_PROG_PKG_CONFIG
|
||||
+m4_pattern_allow([^PKG_CONFIG_SYSROOT_DIR$])
|
||||
|
||||
if test x"$CC_FOR_BUILD" = x; then
|
||||
if test x"$cross_compiling" = xyes; then
|
||||
@@ -306,7 +307,7 @@
|
||||
# Find keysymdef.h
|
||||
#
|
||||
AC_MSG_CHECKING([keysym definitions])
|
||||
-KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11
|
||||
+KEYSYMDEFDIR=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=includedir xproto`/X11
|
||||
FILES="keysymdef.h XF86keysym.h Sunkeysym.h DECkeysym.h HPkeysym.h"
|
||||
for i in $FILES; do
|
||||
if test -f "$KEYSYMDEFDIR/$i"; then
|
||||
Loading…
x
Reference in New Issue
Block a user