godotengine/buildroot
1
0
Fork 0
mirror of https://github.com/godotengine/buildroot.git synced 2026-01-08 02:09:48 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'next'

Browse Source 
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Peter Korsgaard
2017-03-01 17:37:33 +01:00
parent 5573ab4586 9a6c03a390
commit fd89246426
156 changed files with 752 additions and 2704 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
package/Config.in
View File

@@ -222,6 +222,7 @@ menu "Games"
source "package/gnuchess/Config.in"
source "package/lbreakout2/Config.in"
source "package/ltris/Config.in"
source "package/lugaru/Config.in"
source "package/opentyrian/Config.in"
source "package/opentyrian-data/Config.in"
source "package/prboom/Config.in"
@@ -1451,6 +1452,7 @@ menu "Miscellaneous"
source "package/empty/Config.in"
source "package/gnuradio/Config.in"
source "package/googlefontdirectory/Config.in"
source "package/gqrx/Config.in"
source "package/gr-osmosdr/Config.in"
source "package/gsettings-desktop-schemas/Config.in"
source "package/haveged/Config.in"
@@ -1546,6 +1548,7 @@ menu "Networking applications"
source "package/irssi/Config.in"
source "package/iw/Config.in"
source "package/janus-gateway/Config.in"
source "package/keepalived/Config.in"
source "package/kismet/Config.in"
source "package/knock/Config.in"
source "package/leafnode2/Config.in"

4
package/ccache/ccache.hash
View File

@@ -1,2 +1,2 @@
# Verified key https://samba.org/ftp/ccache/ccache-3.3.3.tar.xz.asc - sha256 computed locally
sha256 3b02a745da1cfa9eb438af7147e0fd3545e2f6163de9e5b07da86f58859f04ec ccache-3.3.3.tar.xz
# Verified key https://samba.org/ftp/ccache/ccache-3.3.4.tar.xz.asc - sha256 computed locally
sha256 24f15bf389e38c41548c9c259532187774ec0cb9686c3497bbb75504c8dc404f ccache-3.3.4.tar.xz

4
package/ccache/ccache.mk
View File

@@ -4,8 +4,8 @@
#
################################################################################
CCACHE_VERSION = 3.3.3
CCACHE_SITE = https://samba.org/ftp/ccache
CCACHE_VERSION = 3.3.4
CCACHE_SITE = https://www.samba.org/ftp/ccache
CCACHE_SOURCE = ccache-$(CCACHE_VERSION).tar.xz
CCACHE_LICENSE = GPLv3+, others
CCACHE_LICENSE_FILES = LICENSE.txt GPL-3.0.txt

2
package/cjson/cjson.hash
View File

@@ -1,2 +1,2 @@
# Locally computed:
sha256 1d976ca423d714b7e836cfbc1980b56f49962d0dfe654edb3c2ffa5c713af242 cjson-v1.2.1.tar.gz
sha256 f1c528103844ffb992e17625ac8a3e8ee742021b1c2478e53cee4b085c0f413d cjson-v1.3.0.tar.gz

4
package/cjson/cjson.mk
View File

@@ -4,10 +4,12 @@
#
################################################################################
CJSON_VERSION = v1.2.1
CJSON_VERSION = v1.3.0
CJSON_SITE = $(call github,DaveGamble,cjson,$(CJSON_VERSION))
CJSON_INSTALL_STAGING = YES
CJSON_LICENSE = MIT
CJSON_LICENSE_FILES = LICENSE
CJSON_CONF_OPTS += \
-DENABLE_CJSON_TEST=OFF
$(eval $(cmake-package))

46
package/classpath/0001-fix-gmp-include.patch
View File

@@ -1,46 +0,0 @@
The GMP include is hardcoded to /usr/include causing obvious problems.
From classpath CVS:
http://cvs.savannah.gnu.org/viewvc/classpath/configure.ac?root=classpath&r1=1.245&r2=1.246
[Gustavo: ditch -L or libtool complains loudly]
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
--- a/configure.ac 2010/01/30 01:33:50 1.245
+++ b/configure.ac 2010/05/04 12:29:23 1.246
@@ -752,10 +752,32 @@
dnl __gmpz_mul_si for earlier versions (>= 3.1).
dnl IMPORTANT: if you decide to look for __gmpz_combit, don't forget to
dnl change the name of the corresponding ac_ variable on lines 860...
+ AC_ARG_WITH(gmp, [ --with-gmp=PATH specify prefix directory for the installed GMP package.
+ Equivalent to --with-gmp-include=PATH/include
+ plus --with-gmp-lib=PATH/lib])
+ AC_ARG_WITH(gmp_include, [ --with-gmp-include=PATH specify directory for installed GMP include files])
+ AC_ARG_WITH(gmp_lib, [ --with-gmp-lib=PATH specify directory for the installed GMP library])
+
if test "x${COMPILE_GMP}" = xyes; then
+ AC_MSG_CHECKING([for GMP directories])
+ if test "x$with_gmp" != x; then
+ gmplibs="-lgmp"
+ gmpinc="-I$with_gmp/include"
+ if test "x$with_gmp_include" != x; then
+ gmpinc="-I$with_gmp_include $gmpinc"
+ fi
+ if test "x$with_gmp_lib" != x; then
+ gmplibs="$gmplibs"
+ fi
+ else
+ with_gmp="/usr"
+ gmplibs="-lgmp"
+ gmpinc="-I/usr/include"
+ fi
+ AC_MSG_RESULT([prefix=$with_gmp, libs=$gmplibs, inc=$gmpinc])
AC_CHECK_LIB(gmp, __gmpz_mul_si,
- [GMP_CFLAGS=-I/usr/include
- GMP_LIBS=-lgmp ],
+ [GMP_CFLAGS="$gmpinc"
+ GMP_LIBS="$gmplibs" ],
[GMP_CFLAGS=
GMP_LIBS= ])
AC_SUBST(GMP_CFLAGS)

680
package/classpath/0002-add-config-rpath.patch
View File

@@ -1,680 +0,0 @@
Add config.rpath from upstream CVS to avoid (re)autoconfiguring errors.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
diff -Nura classpath-0.98.orig/config.rpath classpath-0.98/config.rpath
--- classpath-0.98.orig/config.rpath 1969-12-31 21:00:00.000000000 -0300
+++ classpath-0.98/config.rpath 2013-07-10 09:36:51.894281025 -0300
@@ -0,0 +1,672 @@
+#! /bin/sh
+# Output a system dependent set of variables, describing how to set the
+# run time search path of shared libraries in an executable.
+#
+# Copyright 1996-2010 Free Software Foundation, Inc.
+# Taken from GNU libtool, 2001
+# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# The first argument passed to this file is the canonical host specification,
+# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+# or
+# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+# The environment variables CC, GCC, LDFLAGS, LD, with_gnu_ld
+# should be set by the caller.
+#
+# The set of defined variables is at the end of this script.
+
+# Known limitations:
+# - On IRIX 6.5 with CC="cc", the run time search patch must not be longer
+# than 256 bytes, otherwise the compiler driver will dump core. The only
+# known workaround is to choose shorter directory names for the build
+# directory and/or the installation directory.
+
+# All known linkers require a `.a' archive for static linking (except MSVC,
+# which needs '.lib').
+libext=a
+shrext=.so
+
+host="$1"
+host_cpu=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+host_vendor=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+host_os=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+
+# Code taken from libtool.m4's _LT_CC_BASENAME.
+
+for cc_temp in $CC""; do
+ case $cc_temp in
+ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+ \-*) ;;
+ *) break;;
+ esac
+done
+cc_basename=`echo "$cc_temp" | sed -e 's%^.*/%%'`
+
+# Code taken from libtool.m4's _LT_COMPILER_PIC.
+
+wl=
+if test "$GCC" = yes; then
+ wl='-Wl,'
+else
+ case "$host_os" in
+ aix*)
+ wl='-Wl,'
+ ;;
+ darwin*)
+ case $cc_basename in
+ xlc*)
+ wl='-Wl,'
+ ;;
+ esac
+ ;;
+ mingw* | cygwin* | pw32* | os2* | cegcc*)
+ ;;
+ hpux9* | hpux10* | hpux11*)
+ wl='-Wl,'
+ ;;
+ irix5* | irix6* | nonstopux*)
+ wl='-Wl,'
+ ;;
+ newsos6)
+ ;;
+ linux* | k*bsd*-gnu)
+ case $cc_basename in
+ ecc*)
+ wl='-Wl,'
+ ;;
+ icc* | ifort*)
+ wl='-Wl,'
+ ;;
+ lf95*)
+ wl='-Wl,'
+ ;;
+ pgcc | pgf77 | pgf90)
+ wl='-Wl,'
+ ;;
+ ccc*)
+ wl='-Wl,'
+ ;;
+ como)
+ wl='-lopt='
+ ;;
+ *)
+ case `$CC -V 2>&1 | sed 5q` in
+ *Sun\ C*)
+ wl='-Wl,'
+ ;;
+ esac
+ ;;
+ esac
+ ;;
+ osf3* | osf4* | osf5*)
+ wl='-Wl,'
+ ;;
+ rdos*)
+ ;;
+ solaris*)
+ wl='-Wl,'
+ ;;
+ sunos4*)
+ wl='-Qoption ld '
+ ;;
+ sysv4 | sysv4.2uw2* | sysv4.3*)
+ wl='-Wl,'
+ ;;
+ sysv4*MP*)
+ ;;
+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+ wl='-Wl,'
+ ;;
+ unicos*)
+ wl='-Wl,'
+ ;;
+ uts4*)
+ ;;
+ esac
+fi
+
+# Code taken from libtool.m4's _LT_LINKER_SHLIBS.
+
+hardcode_libdir_flag_spec=
+hardcode_libdir_separator=
+hardcode_direct=no
+hardcode_minus_L=no
+
+case "$host_os" in
+ cygwin* | mingw* | pw32* | cegcc*)
+ # FIXME: the MSVC++ port hasn't been tested in a loooong time
+ # When not using gcc, we currently assume that we are using
+ # Microsoft Visual C++.
+ if test "$GCC" != yes; then
+ with_gnu_ld=no
+ fi
+ ;;
+ interix*)
+ # we just hope/assume this is gcc and not c89 (= MSVC++)
+ with_gnu_ld=yes
+ ;;
+ openbsd*)
+ with_gnu_ld=no
+ ;;
+esac
+
+ld_shlibs=yes
+if test "$with_gnu_ld" = yes; then
+ # Set some defaults for GNU ld with shared library support. These
+ # are reset later if shared libraries are not supported. Putting them
+ # here allows them to be overridden if necessary.
+ # Unlike libtool, we use -rpath here, not --rpath, since the documented
+ # option of GNU ld is called -rpath, not --rpath.
+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+ case "$host_os" in
+ aix[3-9]*)
+ # On AIX/PPC, the GNU linker is very broken
+ if test "$host_cpu" != ia64; then
+ ld_shlibs=no
+ fi
+ ;;
+ amigaos*)
+ hardcode_libdir_flag_spec='-L$libdir'
+ hardcode_minus_L=yes
+ # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
+ # that the semantics of dynamic libraries on AmigaOS, at least up
+ # to version 4, is to share data among multiple programs linked
+ # with the same dynamic library. Since this doesn't match the
+ # behavior of shared libraries on other platforms, we cannot use
+ # them.
+ ld_shlibs=no
+ ;;
+ beos*)
+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ :
+ else
+ ld_shlibs=no
+ fi
+ ;;
+ cygwin* | mingw* | pw32* | cegcc*)
+ # hardcode_libdir_flag_spec is actually meaningless, as there is
+ # no search path for DLLs.
+ hardcode_libdir_flag_spec='-L$libdir'
+ if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+ :
+ else
+ ld_shlibs=no
+ fi
+ ;;
+ interix[3-9]*)
+ hardcode_direct=no
+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+ ;;
+ gnu* | linux* | k*bsd*-gnu)
+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ :
+ else
+ ld_shlibs=no
+ fi
+ ;;
+ netbsd*)
+ ;;
+ solaris*)
+ if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
+ ld_shlibs=no
+ elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ :
+ else
+ ld_shlibs=no
+ fi
+ ;;
+ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+ case `$LD -v 2>&1` in
+ *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
+ ld_shlibs=no
+ ;;
+ *)
+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
+ else
+ ld_shlibs=no
+ fi
+ ;;
+ esac
+ ;;
+ sunos4*)
+ hardcode_direct=yes
+ ;;
+ *)
+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ :
+ else
+ ld_shlibs=no
+ fi
+ ;;
+ esac
+ if test "$ld_shlibs" = no; then
+ hardcode_libdir_flag_spec=
+ fi
+else
+ case "$host_os" in
+ aix3*)
+ # Note: this linker hardcodes the directories in LIBPATH if there
+ # are no directories specified by -L.
+ hardcode_minus_L=yes
+ if test "$GCC" = yes; then
+ # Neither direct hardcoding nor static linking is supported with a
+ # broken collect2.
+ hardcode_direct=unsupported
+ fi
+ ;;
+ aix[4-9]*)
+ if test "$host_cpu" = ia64; then
+ # On IA64, the linker does run time linking by default, so we don't
+ # have to do anything special.
+ aix_use_runtimelinking=no
+ else
+ aix_use_runtimelinking=no
+ # Test if we are trying to use run time linking or normal
+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+ # need to do runtime linking.
+ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+ for ld_flag in $LDFLAGS; do
+ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+ aix_use_runtimelinking=yes
+ break
+ fi
+ done
+ ;;
+ esac
+ fi
+ hardcode_direct=yes
+ hardcode_libdir_separator=':'
+ if test "$GCC" = yes; then
+ case $host_os in aix4.[012]|aix4.[012].*)
+ collect2name=`${CC} -print-prog-name=collect2`
+ if test -f "$collect2name" && \
+ strings "$collect2name" | grep resolve_lib_name >/dev/null
+ then
+ # We have reworked collect2
+ :
+ else
+ # We have old collect2
+ hardcode_direct=unsupported
+ hardcode_minus_L=yes
+ hardcode_libdir_flag_spec='-L$libdir'
+ hardcode_libdir_separator=
+ fi
+ ;;
+ esac
+ fi
+ # Begin _LT_AC_SYS_LIBPATH_AIX.
+ echo 'int main () { return 0; }' > conftest.c
+ ${CC} ${LDFLAGS} conftest.c -o conftest
+ aix_libpath=`dump -H conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
+}'`
+ if test -z "$aix_libpath"; then
+ aix_libpath=`dump -HX64 conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
+}'`
+ fi
+ if test -z "$aix_libpath"; then
+ aix_libpath="/usr/lib:/lib"
+ fi
+ rm -f conftest.c conftest
+ # End _LT_AC_SYS_LIBPATH_AIX.
+ if test "$aix_use_runtimelinking" = yes; then
+ hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+ else
+ if test "$host_cpu" = ia64; then
+ hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
+ else
+ hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+ fi
+ fi
+ ;;
+ amigaos*)
+ hardcode_libdir_flag_spec='-L$libdir'
+ hardcode_minus_L=yes
+ # see comment about different semantics on the GNU ld section
+ ld_shlibs=no
+ ;;
+ bsdi[45]*)
+ ;;
+ cygwin* | mingw* | pw32* | cegcc*)
+ # When not using gcc, we currently assume that we are using
+ # Microsoft Visual C++.
+ # hardcode_libdir_flag_spec is actually meaningless, as there is
+ # no search path for DLLs.
+ hardcode_libdir_flag_spec=' '
+ libext=lib
+ ;;
+ darwin* | rhapsody*)
+ hardcode_direct=no
+ if test "$GCC" = yes ; then
+ :
+ else
+ case $cc_basename in
+ xlc*)
+ ;;
+ *)
+ ld_shlibs=no
+ ;;
+ esac
+ fi
+ ;;
+ dgux*)
+ hardcode_libdir_flag_spec='-L$libdir'
+ ;;
+ freebsd1*)
+ ld_shlibs=no
+ ;;
+ freebsd2.2*)
+ hardcode_libdir_flag_spec='-R$libdir'
+ hardcode_direct=yes
+ ;;
+ freebsd2*)
+ hardcode_direct=yes
+ hardcode_minus_L=yes
+ ;;
+ freebsd* | dragonfly*)
+ hardcode_libdir_flag_spec='-R$libdir'
+ hardcode_direct=yes
+ ;;
+ hpux9*)
+ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+ hardcode_libdir_separator=:
+ hardcode_direct=yes
+ # hardcode_minus_L: Not really in the search PATH,
+ # but as the default location of the library.
+ hardcode_minus_L=yes
+ ;;
+ hpux10*)
+ if test "$with_gnu_ld" = no; then
+ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+ hardcode_libdir_separator=:
+ hardcode_direct=yes
+ # hardcode_minus_L: Not really in the search PATH,
+ # but as the default location of the library.
+ hardcode_minus_L=yes
+ fi
+ ;;
+ hpux11*)
+ if test "$with_gnu_ld" = no; then
+ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+ hardcode_libdir_separator=:
+ case $host_cpu in
+ hppa*64*|ia64*)
+ hardcode_direct=no
+ ;;
+ *)
+ hardcode_direct=yes
+ # hardcode_minus_L: Not really in the search PATH,
+ # but as the default location of the library.
+ hardcode_minus_L=yes
+ ;;
+ esac
+ fi
+ ;;
+ irix5* | irix6* | nonstopux*)
+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+ hardcode_libdir_separator=:
+ ;;
+ netbsd*)
+ hardcode_libdir_flag_spec='-R$libdir'
+ hardcode_direct=yes
+ ;;
+ newsos6)
+ hardcode_direct=yes
+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+ hardcode_libdir_separator=:
+ ;;
+ openbsd*)
+ if test -f /usr/libexec/ld.so; then
+ hardcode_direct=yes
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+ else
+ case "$host_os" in
+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+ hardcode_libdir_flag_spec='-R$libdir'
+ ;;
+ *)
+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+ ;;
+ esac
+ fi
+ else
+ ld_shlibs=no
+ fi
+ ;;
+ os2*)
+ hardcode_libdir_flag_spec='-L$libdir'
+ hardcode_minus_L=yes
+ ;;
+ osf3*)
+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+ hardcode_libdir_separator=:
+ ;;
+ osf4* | osf5*)
+ if test "$GCC" = yes; then
+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+ else
+ # Both cc and cxx compiler support -rpath directly
+ hardcode_libdir_flag_spec='-rpath $libdir'
+ fi
+ hardcode_libdir_separator=:
+ ;;
+ solaris*)
+ hardcode_libdir_flag_spec='-R$libdir'
+ ;;
+ sunos4*)
+ hardcode_libdir_flag_spec='-L$libdir'
+ hardcode_direct=yes
+ hardcode_minus_L=yes
+ ;;
+ sysv4)
+ case $host_vendor in
+ sni)
+ hardcode_direct=yes # is this really true???
+ ;;
+ siemens)
+ hardcode_direct=no
+ ;;
+ motorola)
+ hardcode_direct=no #Motorola manual says yes, but my tests say they lie
+ ;;
+ esac
+ ;;
+ sysv4.3*)
+ ;;
+ sysv4*MP*)
+ if test -d /usr/nec; then
+ ld_shlibs=yes
+ fi
+ ;;
+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
+ ;;
+ sysv5* | sco3.2v5* | sco5v6*)
+ hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+ hardcode_libdir_separator=':'
+ ;;
+ uts4*)
+ hardcode_libdir_flag_spec='-L$libdir'
+ ;;
+ *)
+ ld_shlibs=no
+ ;;
+ esac
+fi
+
+# Check dynamic linker characteristics
+# Code taken from libtool.m4's _LT_SYS_DYNAMIC_LINKER.
+# Unlike libtool.m4, here we don't care about _all_ names of the library, but
+# only about the one the linker finds when passed -lNAME. This is the last
+# element of library_names_spec in libtool.m4, or possibly two of them if the
+# linker has special search rules.
+library_names_spec= # the last element of library_names_spec in libtool.m4
+libname_spec='lib$name'
+case "$host_os" in
+ aix3*)
+ library_names_spec='$libname.a'
+ ;;
+ aix[4-9]*)
+ library_names_spec='$libname$shrext'
+ ;;
+ amigaos*)
+ library_names_spec='$libname.a'
+ ;;
+ beos*)
+ library_names_spec='$libname$shrext'
+ ;;
+ bsdi[45]*)
+ library_names_spec='$libname$shrext'
+ ;;
+ cygwin* | mingw* | pw32* | cegcc*)
+ shrext=.dll
+ library_names_spec='$libname.dll.a $libname.lib'
+ ;;
+ darwin* | rhapsody*)
+ shrext=.dylib
+ library_names_spec='$libname$shrext'
+ ;;
+ dgux*)
+ library_names_spec='$libname$shrext'
+ ;;
+ freebsd1*)
+ ;;
+ freebsd* | dragonfly*)
+ case "$host_os" in
+ freebsd[123]*)
+ library_names_spec='$libname$shrext$versuffix' ;;
+ *)
+ library_names_spec='$libname$shrext' ;;
+ esac
+ ;;
+ gnu*)
+ library_names_spec='$libname$shrext'
+ ;;
+ hpux9* | hpux10* | hpux11*)
+ case $host_cpu in
+ ia64*)
+ shrext=.so
+ ;;
+ hppa*64*)
+ shrext=.sl
+ ;;
+ *)
+ shrext=.sl
+ ;;
+ esac
+ library_names_spec='$libname$shrext'
+ ;;
+ interix[3-9]*)
+ library_names_spec='$libname$shrext'
+ ;;
+ irix5* | irix6* | nonstopux*)
+ library_names_spec='$libname$shrext'
+ case "$host_os" in
+ irix5* | nonstopux*)
+ libsuff= shlibsuff=
+ ;;
+ *)
+ case $LD in
+ *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") libsuff= shlibsuff= ;;
+ *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") libsuff=32 shlibsuff=N32 ;;
+ *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") libsuff=64 shlibsuff=64 ;;
+ *) libsuff= shlibsuff= ;;
+ esac
+ ;;
+ esac
+ ;;
+ linux*oldld* | linux*aout* | linux*coff*)
+ ;;
+ linux* | k*bsd*-gnu)
+ library_names_spec='$libname$shrext'
+ ;;
+ knetbsd*-gnu)
+ library_names_spec='$libname$shrext'
+ ;;
+ netbsd*)
+ library_names_spec='$libname$shrext'
+ ;;
+ newsos6)
+ library_names_spec='$libname$shrext'
+ ;;
+ nto-qnx*)
+ library_names_spec='$libname$shrext'
+ ;;
+ openbsd*)
+ library_names_spec='$libname$shrext$versuffix'
+ ;;
+ os2*)
+ libname_spec='$name'
+ shrext=.dll
+ library_names_spec='$libname.a'
+ ;;
+ osf3* | osf4* | osf5*)
+ library_names_spec='$libname$shrext'
+ ;;
+ rdos*)
+ ;;
+ solaris*)
+ library_names_spec='$libname$shrext'
+ ;;
+ sunos4*)
+ library_names_spec='$libname$shrext$versuffix'
+ ;;
+ sysv4 | sysv4.3*)
+ library_names_spec='$libname$shrext'
+ ;;
+ sysv4*MP*)
+ library_names_spec='$libname$shrext'
+ ;;
+ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+ library_names_spec='$libname$shrext'
+ ;;
+ uts4*)
+ library_names_spec='$libname$shrext'
+ ;;
+esac
+
+sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
+escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"`
+shlibext=`echo "$shrext" | sed -e 's,^\.,,'`
+escaped_libname_spec=`echo "X$libname_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
+escaped_library_names_spec=`echo "X$library_names_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
+escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
+
+LC_ALL=C sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <<EOF
+
+# How to pass a linker flag through the compiler.
+wl="$escaped_wl"
+
+# Static library suffix (normally "a").
+libext="$libext"
+
+# Shared library suffix (normally "so").
+shlibext="$shlibext"
+
+# Format of library name prefix.
+libname_spec="$escaped_libname_spec"
+
+# Library names that the linker finds when passed -lNAME.
+library_names_spec="$escaped_library_names_spec"
+
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist.
+hardcode_libdir_flag_spec="$escaped_hardcode_libdir_flag_spec"
+
+# Whether we need a single -rpath flag with a separated argument.
+hardcode_libdir_separator="$hardcode_libdir_separator"
+
+# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the
+# resulting binary.
+hardcode_direct="$hardcode_direct"
+
+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
+# resulting binary.
+hardcode_minus_L="$hardcode_minus_L"
+
+EOF

4
package/classpath/classpath.hash
View File

@@ -1,2 +1,2 @@
# From http://www.gnu.org/software/classpath/announce/20090205.html
sha1 1d6e8d1b3542a35bbd1013c61fab3cfae083decb classpath-0.98.tar.gz
# From https://www.gnu.org/software/classpath/announce/20120307.html
sha256 f929297f8ae9b613a1a167e231566861893260651d913ad9b6c11933895fecc8 classpath-0.99.tar.gz

7
package/classpath/classpath.mk
View File

@@ -4,21 +4,20 @@
#
################################################################################
CLASSPATH_VERSION = 0.98
CLASSPATH_VERSION = 0.99
CLASSPATH_SITE = $(BR2_GNU_MIRROR)/classpath
CLASSPATH_CONF_OPTS = \
--disable-examples \
--disable-plugin \
--disable-rpath \
--disable-Werror \
--disable-gconf-peer \
--disable-tools
--disable-gjdoc \
--enable-tools
# classpath assumes qt runs on top of X11, but we
# don't support qt4 on X11
CLASSPATH_CONF_OPTS += --disable-qt-peer
CLASSPATH_DEPENDENCIES = host-pkgconf
CLASSPATH_AUTORECONF = YES
CLASSPATH_LICENSE = GPLv2+ with exception
CLASSPATH_LICENSE_FILES = COPYING

6
package/crudini/crudini.hash
View File

@@ -1,3 +1,3 @@
# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=0664fa2f9d36e411e839b5394d8c2951, sha256 locally computed
md5 0664fa2f9d36e411e839b5394d8c2951 crudini-0.8.tar.gz
sha256 effdf8feb7efe252af87143c8756bbc69e2679afb6173083d38be02284385e5f crudini-0.8.tar.gz
# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=9b8500c90467f0a61c714fbe852c2a66, sha256 locally computed
md5 9b8500c90467f0a61c714fbe852c2a66 crudini-0.9.tar.gz
sha256 10512a5a2f7b54b42e48a1d00f0c6398947c2ba6c264b9fdef86677f0e949fd3 crudini-0.9.tar.gz

4
package/crudini/crudini.mk
View File

@@ -4,8 +4,8 @@
#
################################################################################
CRUDINI_VERSION = 0.8
CRUDINI_SITE = https://pypi.python.org/packages/23/4a/934b05bbe5af4fd390207c5e935efbae6439809aad65ab0702e236c1b5f5
CRUDINI_VERSION = 0.9
CRUDINI_SITE = https://pypi.python.org/packages/b5/65/5588903472f30fa01ca4951be00c03a317b27bac4cd1e945bd16b2c1b6d3
CRUDINI_SETUP_TYPE = setuptools
CRUDINI_LICENSE = GPLv2
CRUDINI_LICENSE_FILES = COPYING

2
package/docker-containerd/docker-containerd.hash
View File

@@ -1,2 +1,2 @@
# Computed locally
sha256 88e099af66b50abe7f2159f13bdab793fa5199d8d5b9a9ef7a68171abb4359be docker-containerd-v0.2.5.tar.gz
sha256 77ea44af1531d46b22f0444eb506590d1b7e5a9fe891cc6f8e36db5c2aef2d80 docker-containerd-aa8187dbd3b7ad67d8e5e3a15115d3eef43a7ed1.tar.gz

2
package/docker-containerd/docker-containerd.mk
View File

@@ -4,7 +4,7 @@
#
################################################################################
DOCKER_CONTAINERD_VERSION = v0.2.5
DOCKER_CONTAINERD_VERSION = aa8187dbd3b7ad67d8e5e3a15115d3eef43a7ed1
DOCKER_CONTAINERD_SITE = $(call github,docker,containerd,$(DOCKER_CONTAINERD_VERSION))
DOCKER_CONTAINERD_LICENSE = Apache-2.0
DOCKER_CONTAINERD_LICENSE_FILES = LICENSE.code

297
package/docker-engine/0001-Fix-issues-with-tailing-rotated-jsonlog-file.patch
View File

@@ -1,297 +0,0 @@
From 8d6f2e3fe8851b581309da25fc4c32f8be675932 Mon Sep 17 00:00:00 2001
From: Brian Goff <cpuguy83@gmail.com>
Date: Mon, 11 Jul 2016 16:31:42 -0400
Subject: [PATCH] Fix issues with tailing rotated jsonlog file
Fixes a race where the log reader would get events for both an actual
rotation as we from fsnotify (`fsnotify.Rename`).
This issue becomes extremely apparent when rotations are fast, for
example:
```
$ docker run -d --name test --log-opt max-size=1 --log-opt max-file=2
busybox sh -c 'while true; do echo hello; usleep 100000; done'
```
With this change the log reader for jsonlogs can handle rotations that
happen as above.
Instead of listening for both fs events AND rotation events
simultaneously, potentially meaning we see 2 rotations for only a single
rotation due to channel buffering, only listen for fs events (like
`Rename`) and then wait to be notified about rotation by the logger.
This makes sure that we don't see 2 rotations for 1, and that we don't
start trying to read until the logger is actually ready for us to.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
This commit is pending upstream commit fixing broken log tailing. The
original commit can be found in the PR here:
- https://github.com/docker/docker/pull/24514
Signed-off-by: Christian Stewart <christian@paral.in>
---
daemon/logger/jsonfilelog/read.go | 180 +++++++++++++++++++++++++-------------
1 file changed, 119 insertions(+), 61 deletions(-)
diff --git a/daemon/logger/jsonfilelog/read.go b/daemon/logger/jsonfilelog/read.go
index bea83dd..0cb44af 100644
--- a/daemon/logger/jsonfilelog/read.go
+++ b/daemon/logger/jsonfilelog/read.go
@@ -3,11 +3,14 @@ package jsonfilelog
import (
"bytes"
"encoding/json"
+ "errors"
"fmt"
"io"
"os"
"time"
+ "gopkg.in/fsnotify.v1"
+
"github.com/Sirupsen/logrus"
"github.com/docker/docker/daemon/logger"
"github.com/docker/docker/pkg/filenotify"
@@ -44,6 +47,10 @@ func (l *JSONFileLogger) ReadLogs(config logger.ReadConfig) *logger.LogWatcher {
func (l *JSONFileLogger) readLogs(logWatcher *logger.LogWatcher, config logger.ReadConfig) {
defer close(logWatcher.Msg)
+ // lock so the read stream doesn't get corrupted do to rotations or other log data written while we read
+ // This will block writes!!!
+ l.mu.Lock()
+
pth := l.writer.LogPath()
var files []io.ReadSeeker
for i := l.writer.MaxFiles(); i > 1; i-- {
@@ -61,6 +68,7 @@ func (l *JSONFileLogger) readLogs(logWatcher *logger.LogWatcher, config logger.R
latestFile, err := os.Open(pth)
if err != nil {
logWatcher.Err <- err
+ l.mu.Unlock()
return
}
@@ -80,6 +88,7 @@ func (l *JSONFileLogger) readLogs(logWatcher *logger.LogWatcher, config logger.R
if err := latestFile.Close(); err != nil {
logrus.Errorf("Error closing file: %v", err)
}
+ l.mu.Unlock()
return
}
@@ -87,7 +96,6 @@ func (l *JSONFileLogger) readLogs(logWatcher *logger.LogWatcher, config logger.R
latestFile.Seek(0, os.SEEK_END)
}
- l.mu.Lock()
l.readers[logWatcher] = struct{}{}
l.mu.Unlock()
@@ -128,92 +136,142 @@ func tailFile(f io.ReadSeeker, logWatcher *logger.LogWatcher, tail int, since ti
}
}
+func watchFile(name string) (filenotify.FileWatcher, error) {
+ fileWatcher, err := filenotify.New()
+ if err != nil {
+ return nil, err
+ }
+
+ if err := fileWatcher.Add(name); err != nil {
+ logrus.WithField("logger", "json-file").Warnf("falling back to file poller due to error: %v", err)
+ fileWatcher.Close()
+ fileWatcher = filenotify.NewPollingWatcher()
+
+ if err := fileWatcher.Add(name); err != nil {
+ fileWatcher.Close()
+ logrus.Debugf("error watching log file for modifications: %v", err)
+ return nil, err
+ }
+ }
+ return fileWatcher, nil
+}
+
func followLogs(f *os.File, logWatcher *logger.LogWatcher, notifyRotate chan interface{}, since time.Time) {
dec := json.NewDecoder(f)
l := &jsonlog.JSONLog{}
- fileWatcher, err := filenotify.New()
+ name := f.Name()
+ fileWatcher, err := watchFile(name)
if err != nil {
logWatcher.Err <- err
+ return
}
defer func() {
f.Close()
fileWatcher.Close()
}()
- name := f.Name()
- if err := fileWatcher.Add(name); err != nil {
- logrus.WithField("logger", "json-file").Warnf("falling back to file poller due to error: %v", err)
- fileWatcher.Close()
- fileWatcher = filenotify.NewPollingWatcher()
+ var retries int
+ handleRotate := func() error {
+ f.Close()
+ fileWatcher.Remove(name)
+ // retry when the file doesn't exist
+ for retries := 0; retries <= 5; retries++ {
+ f, err = os.Open(name)
+ if err == nil || !os.IsNotExist(err) {
+ break
+ }
+ }
+ if err != nil {
+ return err
+ }
if err := fileWatcher.Add(name); err != nil {
- logrus.Debugf("error watching log file for modifications: %v", err)
- logWatcher.Err <- err
- return
+ return err
}
+ dec = json.NewDecoder(f)
+ return nil
}
- var retries int
- for {
- msg, err := decodeLogLine(dec, l)
- if err != nil {
- if err != io.EOF {
- // try again because this shouldn't happen
- if _, ok := err.(*json.SyntaxError); ok && retries <= maxJSONDecodeRetry {
- dec = json.NewDecoder(f)
- retries++
- continue
+ errRetry := errors.New("retry")
+ errDone := errors.New("done")
+ waitRead := func() error {
+ select {
+ case e := <-fileWatcher.Events():
+ switch e.Op {
+ case fsnotify.Write:
+ dec = json.NewDecoder(f)
+ return nil
+ case fsnotify.Rename, fsnotify.Remove:
+ <-notifyRotate
+ if err := handleRotate(); err != nil {
+ return err
}
-
- // io.ErrUnexpectedEOF is returned from json.Decoder when there is
- // remaining data in the parser's buffer while an io.EOF occurs.
- // If the json logger writes a partial json log entry to the disk
- // while at the same time the decoder tries to decode it, the race condition happens.
- if err == io.ErrUnexpectedEOF && retries <= maxJSONDecodeRetry {
- reader := io.MultiReader(dec.Buffered(), f)
- dec = json.NewDecoder(reader)
- retries++
- continue
+ return nil
+ }
+ return errRetry
+ case err := <-fileWatcher.Errors():
+ logrus.Debug("logger got error watching file: %v", err)
+ // Something happened, let's try and stay alive and create a new watcher
+ if retries <= 5 {
+ fileWatcher, err = watchFile(name)
+ if err != nil {
+ return err
}
-
- return
+ retries++
+ return errRetry
}
+ return err
+ case <-logWatcher.WatchClose():
+ fileWatcher.Remove(name)
+ return errDone
+ }
+ }
- select {
- case <-fileWatcher.Events():
- dec = json.NewDecoder(f)
- continue
- case <-fileWatcher.Errors():
- logWatcher.Err <- err
- return
- case <-logWatcher.WatchClose():
- fileWatcher.Remove(name)
- return
- case <-notifyRotate:
- f.Close()
- fileWatcher.Remove(name)
-
- // retry when the file doesn't exist
- for retries := 0; retries <= 5; retries++ {
- f, err = os.Open(name)
- if err == nil || !os.IsNotExist(err) {
- break
- }
+ handleDecodeErr := func(err error) error {
+ if err == io.EOF {
+ for err := waitRead(); err != nil; {
+ if err == errRetry {
+ // retry the waitRead
+ continue
}
+ return err
+ }
+ return nil
+ }
+ // try again because this shouldn't happen
+ if _, ok := err.(*json.SyntaxError); ok && retries <= maxJSONDecodeRetry {
+ dec = json.NewDecoder(f)
+ retries++
+ return nil
+ }
+ // io.ErrUnexpectedEOF is returned from json.Decoder when there is
+ // remaining data in the parser's buffer while an io.EOF occurs.
+ // If the json logger writes a partial json log entry to the disk
+ // while at the same time the decoder tries to decode it, the race condition happens.
+ if err == io.ErrUnexpectedEOF && retries <= maxJSONDecodeRetry {
+ reader := io.MultiReader(dec.Buffered(), f)
+ dec = json.NewDecoder(reader)
+ retries++
+ return nil
+ }
+ return err
+ }
- if err = fileWatcher.Add(name); err != nil {
- logWatcher.Err <- err
- return
- }
- if err != nil {
- logWatcher.Err <- err
+ // main loop
+ for {
+ msg, err := decodeLogLine(dec, l)
+ if err != nil {
+ if err := handleDecodeErr(err); err != nil {
+ if err == errDone {
return
}
-
- dec = json.NewDecoder(f)
- continue
+ // we got an unrecoverable error, so return
+ logWatcher.Err <- err
+ return
}
+ // ready to try again
+ continue
}
retries = 0 // reset retries since we've succeeded
--
2.7.3

2
package/docker-engine/docker-engine.hash
View File

@@ -1,2 +1,2 @@
# Locally calculated
sha256 0413f3513c2a6842ed9cf837154c8a722e9b34cb36b33430348489baa183707e docker-engine-v1.12.6.tar.gz
sha256 2730e7cc15492de8f1d6f9510c64620fc9004c8afc1410bf3ebac9fc3f9f83c6 docker-engine-v1.13.1.tar.gz

7
package/docker-engine/docker-engine.mk
View File

@@ -4,8 +4,8 @@
#
################################################################################
DOCKER_ENGINE_VERSION = v1.12.6
DOCKER_ENGINE_COMMIT = 78d18021ecba00c00730dec9d56de6896f9e708d
DOCKER_ENGINE_VERSION = v1.13.1
DOCKER_ENGINE_COMMIT = 092cba3727bb9b4a2f0e922cd6c0f93ea270e363
DOCKER_ENGINE_SITE = $(call github,docker,docker,$(DOCKER_ENGINE_VERSION))
DOCKER_ENGINE_LICENSE = Apache-2.0
@@ -66,6 +66,7 @@ DOCKER_ENGINE_BUILD_TAGS += exclude_graphdriver_vfs
endif
define DOCKER_ENGINE_CONFIGURE_CMDS
mkdir -p $(DOCKER_ENGINE_GOPATH)/src/github.com/docker
ln -fs $(@D) $(DOCKER_ENGINE_GOPATH)/src/github.com/docker/docker
cd $(@D) && \
GITCOMMIT="$$(echo $(DOCKER_ENGINE_COMMIT) | head -c7)" \
@@ -100,7 +101,7 @@ define DOCKER_ENGINE_BUILD_CMDS
-o $(@D)/bin/$(target) \
-tags "$(DOCKER_ENGINE_BUILD_TAGS)" \
-ldflags "$(DOCKER_ENGINE_GLDFLAGS)" \
./cmd/$(target)
github.com/docker/docker/cmd/$(target)
)
endef

4
package/e2fsprogs/e2fsprogs.hash
View File

@@ -1,2 +1,2 @@
# From https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.43.3/sha256sums.asc
sha256 744ca4e9a8e6c943601b2744d1ae658e5f37d35b5ea5b1dea86985320bd87f37 e2fsprogs-1.43.3.tar.xz
# From https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.43.4/sha256sums.asc
sha256 54b3f21123a531a6a536b9cdcc21344b0122a72790dbe4dacc98e64db25e4a24 e2fsprogs-1.43.4.tar.xz

2
package/e2fsprogs/e2fsprogs.mk
View File

@@ -4,7 +4,7 @@
#
################################################################################
E2FSPROGS_VERSION = 1.43.3
E2FSPROGS_VERSION = 1.43.4
E2FSPROGS_SOURCE = e2fsprogs-$(E2FSPROGS_VERSION).tar.xz
E2FSPROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/people/tytso/e2fsprogs/v$(E2FSPROGS_VERSION)
E2FSPROGS_LICENSE = GPLv2, BSD-3c (libuuid), MIT-like with advertising clause (libss and libet)

50
package/ebtables/0001-ethernetdb.h-Remove-C-specific-compiler-hint-macro-_.patch Normal file
View File

@@ -0,0 +1,50 @@
From f8079671326e9fd079391d24911a9a8a77f1d6fd Mon Sep 17 00:00:00 2001
From: Felix Janda <felix.janda@posteo.de>
Date: Sat, 16 May 2015 12:31:58 +0200
Subject: [PATCH] ethernetdb.h: Remove C++ specific compiler hint macro _THROW
Fixes compilation with musl libc
Signed-off-by: Felix Janda <felix.janda@posteo.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
Patch status: upstream commit f8079671326e9fd0
include/ethernetdb.h | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/include/ethernetdb.h b/include/ethernetdb.h
index 46d8bfd1b7e5..1683abe01987 100644
--- a/include/ethernetdb.h
+++ b/include/ethernetdb.h
@@ -38,21 +38,20 @@ struct ethertypeent {
/* Open ethertype data base files and mark them as staying open even
after a later search if STAY_OPEN is non-zero. */
-extern void setethertypeent(int __stay_open) __THROW;
+extern void setethertypeent(int __stay_open);
/* Close ethertype data base files and clear `stay open' flag. */
-extern void endethertypeent(void) __THROW;
+extern void endethertypeent(void);
/* Get next entry from ethertype data base file. Open data base if
necessary. */
-extern struct ethertypeent *getethertypeent(void) __THROW;
+extern struct ethertypeent *getethertypeent(void);
/* Return entry from ethertype data base for network with NAME. */
-extern struct ethertypeent *getethertypebyname(__const char *__name)
- __THROW;
+extern struct ethertypeent *getethertypebyname(__const char *__name);
/* Return entry from ethertype data base which number is PROTO. */
-extern struct ethertypeent *getethertypebynumber(int __ethertype) __THROW;
+extern struct ethertypeent *getethertypebynumber(int __ethertype);
#endif /* ethernetdb.h */
--
2.11.0

30
package/ebtables/0002-Fix-musl-compatibility.patch Normal file
View File

@@ -0,0 +1,30 @@
From 138e7efdc8cad6453620c6366e6fa5e786593f7f Mon Sep 17 00:00:00 2001
From: Baruch Siach <baruch@tkos.co.il>
Date: Thu, 16 Feb 2017 14:41:48 +0200
Subject: [PATCH] Fix musl compatibility
Include netinet/ether.h before kernel headers to suppress the conflicting
definition of struct ethhdr.
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
Upstream status: not upstreamable; depends on Buildroot local musl patch
---
include/ebtables_u.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/include/ebtables_u.h b/include/ebtables_u.h
index 35a5bcc54c86..268b1fd599d2 100644
--- a/include/ebtables_u.h
+++ b/include/ebtables_u.h
@@ -24,6 +24,7 @@
#ifndef EBTABLES_U_H
#define EBTABLES_U_H
#include <netinet/in.h>
+#include <netinet/ether.h>
#include <linux/netfilter_bridge/ebtables.h>
#include <linux/netfilter/x_tables.h>
--
2.11.0

2
package/ebtables/Config.in
View File

@@ -1,6 +1,5 @@
config BR2_PACKAGE_EBTABLES
bool "ebtables"
depends on !BR2_TOOLCHAIN_USES_MUSL # mixes userspace and kernel headers
depends on BR2_USE_MMU # fork()
help
Ethernet bridge frame table administration
@@ -8,5 +7,4 @@ config BR2_PACKAGE_EBTABLES
http://ebtables.netfilter.org/
comment "ebtables needs a glibc or uClibc toolchain"
depends on BR2_TOOLCHAIN_USES_MUSL
depends on BR2_USE_MMU

4
package/enlightenment/enlightenment.hash
View File

@@ -1,2 +1,2 @@
# From https://www.enlightenment.org/news/e-0.21.5-release
sha256 f0745a660f70851c4ada9866b2a525185bfc5cd1685aa86e4cdb68f2c1c154bb enlightenment-0.21.5.tar.xz
# From https://www.enlightenment.org/news/e-0.21.6-release
sha256 ed0714b54d692cbcec412bdb169e5360355347ce775d27d6ae0cee25111b563d enlightenment-0.21.6.tar.xz

2
package/enlightenment/enlightenment.mk
View File

@@ -4,7 +4,7 @@
#
################################################################################
ENLIGHTENMENT_VERSION = 0.21.5
ENLIGHTENMENT_VERSION = 0.21.6
ENLIGHTENMENT_SOURCE = enlightenment-$(ENLIGHTENMENT_VERSION).tar.xz
ENLIGHTENMENT_SITE = http://download.enlightenment.org/rel/apps/enlightenment
ENLIGHTENMENT_LICENSE = BSD-2c

2
package/f2fs-tools/f2fs-tools.mk
View File

@@ -4,7 +4,7 @@
#
################################################################################
F2FS_TOOLS_VERSION = v1.6.1
F2FS_TOOLS_VERSION = v1.8.0
F2FS_TOOLS_SITE = http://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git
F2FS_TOOLS_SITE_METHOD = git
F2FS_TOOLS_CONF_ENV = ac_cv_file__git=no

2
package/ffmpeg/ffmpeg.hash
View File

@@ -1,2 +1,2 @@
# Locally calculated
sha256 54ce502aca10b7e6059f19220ea2f68fa0c9c4c4d255ae13e615f08f0c94dcc5 ffmpeg-3.2.3.tar.xz
sha256 6e38ff14f080c98b58cf5967573501b8cb586e3a173b591f3807d8f0660daf7a ffmpeg-3.2.4.tar.xz

7
package/ffmpeg/ffmpeg.mk
View File

@@ -4,7 +4,7 @@
#
################################################################################
FFMPEG_VERSION = 3.2.3
FFMPEG_VERSION = 3.2.4
FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.xz
FFMPEG_SITE = http://ffmpeg.org/releases
FFMPEG_INSTALL_STAGING = YES
@@ -496,4 +496,9 @@ define FFMPEG_CONFIGURE_CMDS
)
endef
define FFMPEG_REMOVE_EXAMPLE_SRC_FILES
rm -rf $(TARGET_DIR)/usr/share/ffmpeg/examples
endef
FFMPEG_POST_INSTALL_TARGET_HOOKS += FFMPEG_REMOVE_EXAMPLE_SRC_FILES
$(eval $(autotools-package))

2
package/file/file.hash
View File

@@ -1,2 +1,2 @@
# Locally calculated
sha256 ea661277cd39bf8f063d3a83ee875432cc3680494169f952787e002bdd3884c0 file-5.29.tar.gz
sha256 694c2432e5240187524c9e7cf1ec6acc77b47a0e19554d34c14773e43dbbf214 file-5.30.tar.gz

2
package/file/file.mk
View File

@@ -4,7 +4,7 @@
#
################################################################################
FILE_VERSION = 5.29
FILE_VERSION = 5.30
FILE_SITE = ftp://ftp.astron.com/pub/file
FILE_DEPENDENCIES = host-file zlib
HOST_FILE_DEPENDENCIES = host-zlib

2
package/fping/fping.hash
View File

@@ -1,2 +1,2 @@
# Locally calculated
sha256 d86f2281bda4653c7049e6ba8fce24ba67edbf9193b7bb1cf6219b0c8ddce4e6 fping-3.12.tar.gz
sha256 2f753094e4df3cdb1d99be1687c0fb7d2f14c0d526ebf03158c8c5519bc78f54 fping-3.16.tar.gz

2
package/fping/fping.mk
View File

@@ -4,7 +4,7 @@
#
################################################################################
FPING_VERSION = 3.12
FPING_VERSION = 3.16
FPING_SITE = http://fping.org/dist
FPING_LICENSE = BSD-like
FPING_LICENSE_FILES = COPYING

4
package/gdk-pixbuf/gdk-pixbuf.hash
View File

@@ -1,2 +1,2 @@
# From http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/2.36/gdk-pixbuf-2.36.4.sha256sum
sha256 0b19901c3eb0596141d2d48ddb9dac79ad1524bdf59366af58ab38fcb9ee7463 gdk-pixbuf-2.36.4.tar.xz
# From http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/2.36/gdk-pixbuf-2.36.5.sha256sum
sha256 7ace06170291a1f21771552768bace072ecdea9bd4a02f7658939b9a314c40fc gdk-pixbuf-2.36.5.tar.xz

11
package/gdk-pixbuf/gdk-pixbuf.mk
View File

@@ -5,7 +5,7 @@
################################################################################
GDK_PIXBUF_VERSION_MAJOR = 2.36
GDK_PIXBUF_VERSION = $(GDK_PIXBUF_VERSION_MAJOR).4
GDK_PIXBUF_VERSION = $(GDK_PIXBUF_VERSION_MAJOR).5
GDK_PIXBUF_SOURCE = gdk-pixbuf-$(GDK_PIXBUF_VERSION).tar.xz
GDK_PIXBUF_SITE = http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/$(GDK_PIXBUF_VERSION_MAJOR)
GDK_PIXBUF_LICENSE = LGPLv2+
@@ -73,5 +73,14 @@ define GDK_PIXBUF_DISABLE_TESTS
endef
GDK_PIXBUF_POST_PATCH_HOOKS += GDK_PIXBUF_DISABLE_TESTS
# Target gdk-pixbuf needs loaders.cache populated to build for the
# thumbnailer. Use the host-built since it matches the target options
# regarding mime types (which is the used information).
define GDK_PIXBUF_COPY_LOADERS_CACHE
cp -f $(HOST_DIR)/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache \
$(@D)/gdk-pixbuf
endef
GDK_PIXBUF_PRE_BUILD_HOOKS += GDK_PIXBUF_COPY_LOADERS_CACHE
$(eval $(autotools-package))
$(eval $(host-autotools-package))

2
package/gflags/gflags.hash
View File

@@ -1,2 +1,2 @@
# Locally computed
sha256 d8331bd0f7367c8afd5fcb5f5e85e96868a00fd24b7276fa5fcee1e5575c2662 gflags-v2.1.2.tar.gz
sha256 466c36c6508a451734e4f4d76825cf9cd9b8716d2b70ef36479ae40f08271f88 gflags-v2.2.0.tar.gz

2
package/gflags/gflags.mk
View File

@@ -4,7 +4,7 @@
#
################################################################################
GFLAGS_VERSION = v2.1.2
GFLAGS_VERSION = v2.2.0
GFLAGS_SITE = $(call github,gflags,gflags,$(GFLAGS_VERSION))
GFLAGS_INSTALL_STAGING = YES
GFLAGS_LICENSE = BSD-3c

2
package/gnuradio/Config.in
View File

@@ -32,7 +32,7 @@ if BR2_PACKAGE_GNURADIO
config BR2_PACKAGE_GNURADIO_AUDIO
bool "gr-audio"
depends on BR2_PACKAGE_ALSA_LIB || BR2_PACKAGE_PORTAUDIO
select BR2_PACKAGE_ALSA_LIB if !BR2_PACKAGE_PORTAUDIO
help
Add audio source/sink to GNU Radio

2
package/gnutls/gnutls.hash
View File

@@ -1,2 +1,2 @@
# Locally calculated after checking pgp signature
sha256 0e97f243ae72b70307d684b84c7fe679385aa7a7a0e37e5be810193dcc17d4ff gnutls-3.5.8.tar.xz
sha256 82b10f0c4ef18f4e64ad8cef5dbaf14be732f5095a41cf366b4ecb4050382951 gnutls-3.5.9.tar.xz

2
package/gnutls/gnutls.mk
View File

@@ -5,7 +5,7 @@
################################################################################
GNUTLS_VERSION_MAJOR = 3.5
GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).8
GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).9
GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.xz
GNUTLS_SITE = ftp://ftp.gnutls.org/gcrypt/gnutls/v$(GNUTLS_VERSION_MAJOR)
GNUTLS_LICENSE = LGPLv2.1+ (core library), GPLv3+ (gnutls-openssl library)

34
package/gqrx/0001-fix_compilation_in_gcc-6.patch Normal file
View File

@@ -0,0 +1,34 @@
From e6baaee4968345a53e977f593362267a91041cff Mon Sep 17 00:00:00 2001
From: Valentin Ochs <a@0au.de>
Date: Fri, 21 Oct 2016 20:12:50 +0200
Subject: [PATCH] Cosmetic & readability changes
Backport patch from
https://github.com/csete/gqrx/commit/e6baaee4968345a53e977f593362267a91041cff
Fix compilation in gcc-6
Signed-off-by: Valentin Ochs <a@0au.de>
Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
---
diff --git a/src/qtgui/plotter.cpp b/src/qtgui/plotter.cpp
index e491632..b877546 100644
--- a/src/qtgui/plotter.cpp
+++ b/src/qtgui/plotter.cpp
@@ -1336,8 +1336,11 @@ void CPlotter::drawOverlay()
#endif
int level = 0;
- for (; level < nLevels && tagEnd[level] > x; level++);
- level %= nLevels;
+ while(level < nLevels && tagEnd[level] > x)
+ level++;
+
+ if(level == nLevels)
+ level = 0;
tagEnd[level] = x + nameWidth + slant - 1;
m_BookmarkTags.append(qMakePair<QRect, qint64>(QRect(x, level * levelHeight, nameWidth + slant, fontHeight), bookmarks[i].frequency));
--
2.10.2

42
package/gqrx/Config.in Normal file
View File

@@ -0,0 +1,42 @@
comment "gqrx needs a toolchain w/ C++, threads, wchar"
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \
!BR2_USE_WCHAR
comment "gqrx needs qt5, gnuradio, fftw's single precision"
depends on !BR2_PACKAGE_GNURADIO || !BR2_PACKAGE_FFTW_PRECISION_SINGLE || \
!BR2_PACKAGE_QT5
config BR2_PACKAGE_GQRX
bool "gqrx"
depends on BR2_PACKAGE_FFTW_PRECISION_SINGLE # gnuradio
depends on BR2_PACKAGE_GNURADIO
depends on BR2_PACKAGE_QT5
depends on BR2_INSTALL_LIBSTDCPP # boost
depends on BR2_TOOLCHAIN_HAS_THREADS # boost
depends on BR2_USE_WCHAR # boost
select BR2_PACKAGE_BOOST
select BR2_PACKAGE_BOOST_PROGRAM_OPTIONS
select BR2_PACKAGE_BOOST_SYSTEM
select BR2_PACKAGE_GNURADIO_ANALOG
select BR2_PACKAGE_GNURADIO_AUDIO
select BR2_PACKAGE_GNURADIO_BLOCKS
select BR2_PACKAGE_GNURADIO_DIGITAL
select BR2_PACKAGE_GNURADIO_FFT
select BR2_PACKAGE_GNURADIO_FILTER
select BR2_PACKAGE_GR_OSMOSDR
select BR2_PACKAGE_QT5BASE_GUI
select BR2_PACKAGE_QT5BASE_WIDGETS
select BR2_PACKAGE_QT5SVG
help
Gqrx is an open source software defined radio (SDR) receiver
implemented using GNU Radio and the Qt GUI
toolkit. Currently it works on Linux and Mac with hardware
supported by gr-osmosdr, including Funcube Dongle, RTL-SDR,
Airspy, HackRF, BladeRF, RFSpace, USRP and SoapySDR.
Gqrx can operate as an AM/FM/SSB receiver with audio output
or as an FFT-only instrument. There are also various hooks
for interacting with external application using network
sockets.
http://gqrx.dk/

2
package/gqrx/gqrx.hash Normal file
View File

@@ -0,0 +1,2 @@
# Locally calculated:
sha256 53d25db8d987a41ccccaf6fd85262bd7770cdfab5539b5901c4558756483c9db gqrx-v2.6.tar.gz

15
package/gqrx/gqrx.mk Normal file
View File

@@ -0,0 +1,15 @@
################################################################################
#
# gqrx
#
################################################################################
GQRX_VERSION = v2.6
GQRX_SITE = $(call github,csete,gqrx,$(GQRX_VERSION))
GQRX_LICENSE = GPLv3+, Apache-2.0
GQRX_LICENSE_FILES = COPYING LICENSE-CTK
GQRX_DEPENDENCIES = boost gnuradio gr-osmosdr qt5base qt5svg
GQRX_CONF_OPTS = -DLINUX_AUDIO_BACKEND=Gr-audio
$(eval $(cmake-package))

2
package/grep/grep.hash
View File

@@ -1,2 +1,2 @@
# Locally calculated after checking signature
sha256 ad4cc44d23074a1c3a8baae8fbafff2a8c60f38a9a6108f985eef6fbee6dcaeb grep-2.27.tar.xz
sha256 e2c81db5056e3e8c5995f0bb5d0d0e1cad1f6f45c3b2fc77b6e81435aed48ab5 grep-3.0.tar.xz

2
package/grep/grep.mk
View File

@@ -4,7 +4,7 @@
#
################################################################################
GREP_VERSION = 2.27
GREP_VERSION = 3.0
GREP_SITE = $(BR2_GNU_MIRROR)/grep
GREP_SOURCE = grep-$(GREP_VERSION).tar.xz
GREP_LICENSE = GPLv3+

1
package/ipset/ipset.mk
View File

@@ -13,5 +13,6 @@ IPSET_CONF_OPTS = --with-kmod=no
IPSET_AUTORECONF = YES
IPSET_LICENSE = GPLv2
IPSET_LICENSE_FILES = COPYING
IPSET_INSTALL_STAGING = YES
$(eval $(autotools-package))

4
package/iptables/Config.in
View File

@@ -9,10 +9,6 @@ if BR2_PACKAGE_IPTABLES
config BR2_PACKAGE_IPTABLES_BPF_NFSYNPROXY
bool "bpfc and nfsynproxy"
# this dependency can be removed when using a musl version
# containing this commit:
# http://git.musl-libc.org/cgit/musl/commit/?id=53f41fb568ae43034c9876cc9bd3961fd6d13671
depends on !BR2_TOOLCHAIN_USES_MUSL
select BR2_PACKAGE_LIBPCAP
help
Build bpf compiler and nfsynproxy configuration tool.

2
package/json-c/json-c.hash
View File

@@ -1,2 +1,2 @@
# Locally calculated
sha256 99304a4a633f1ee281d6a521155a182824dd995139d5ed6ee5c93093c281092b json-c-json-c-0.12-20140410.tar.gz
sha256 989e09b99ded277a0a651cd18b81fcb76885fea08769d7a21b6da39fb8a34816 json-c-json-c-0.12.1-20160607.tar.gz

2
package/json-c/json-c.mk
View File

@@ -4,7 +4,7 @@
#
################################################################################
JSON_C_VERSION = json-c-0.12-20140410
JSON_C_VERSION = json-c-0.12.1-20160607
JSON_C_SITE = $(call github,json-c,json-c,$(JSON_C_VERSION))
JSON_C_INSTALL_STAGING = YES
JSON_C_MAKE = $(MAKE1)

20
package/keepalived/Config.in Normal file
View File

@@ -0,0 +1,20 @@
config BR2_PACKAGE_KEEPALIVED
bool "keepalived"
depends on BR2_USE_MMU
depends on !BR2_STATIC_LIBS # uses libdl
select BR2_PACKAGE_OPENSSL
select BR2_PACKAGE_POPT
help
The main goal of the keepalived project is to add a strong &
robust keepalive facility to the Linux Virtual Server
project. It implements a multilayer TCP/IP stack
checks. Keepalived implements a framework based on three
family checks: Layer3, Layer4 & Layer5. This framework gives
the daemon the ability of checking a LVS server pool
states. Keepalived can be sumarize as a LVS driving daemon.
http://www.keepalived.org/
comment "keepalived needs a toolchain w/ dynamic library"
depends on BR2_USE_MMU
depends on BR2_STATIC_LIBS

3
package/keepalived/keepalived.hash Normal file
View File

@@ -0,0 +1,3 @@
# From http://www.keepalived.org/download.html
md5 744025d57c7f065c42fe925b0283897e keepalived-1.3.2.tar.gz
sha1 449f06dfce07e05c1ebd516d0545182e1416f264 keepalived-1.3.2.tar.gz

32
package/keepalived/keepalived.mk Normal file
View File

@@ -0,0 +1,32 @@
################################################################################
#
# keepalived
#
################################################################################
KEEPALIVED_VERSION = 1.3.2
KEEPALIVED_SITE = http://www.keepalived.org/software
KEEPALIVED_DEPENDENCIES = host-pkgconf openssl popt
KEEPALIVED_LICENSE = GPLv2+
KEEPALIVED_LICENSE_FILES = COPYING
KEEPALIVED_CONF_OPTS += --disable-dbus
ifeq ($(BR2_PACKAGE_LIBNL),y)
KEEPALIVED_DEPENDENCIES += libnfnetlink
endif
ifeq ($(BR2_PACKAGE_IPSET),y)
KEEPALIVED_DEPENDENCIES += ipset
KEEPALIVED_CONF_OPTS += --enable-libipset
else
KEEPALIVED_CONF_OPTS += --disable-libipset
endif
ifeq ($(BR2_PACKAGE_IPTABLES),y)
KEEPALIVED_DEPENDENCIES += iptables
KEEPALIVED_CONF_OPTS += --enable-libiptc
else
KEEPALIVED_CONF_OPTS += --disable-libiptc
endif
$(eval $(autotools-package))

2
package/kmod/kmod.hash
View File

@@ -1,2 +1,2 @@
# From https://www.kernel.org/pub/linux/utils/kernel/kmod/sha256sums.asc
sha256 d303d5519faec9d69e1132f6b37db2579db17a7fb5c1517da0115d03ba168155 kmod-23.tar.xz
sha256 610b8d1df172acc39a4fdf1eaa47a57b04873c82f32152e7a62e29b6ff9cb397 kmod-24.tar.xz

2
package/kmod/kmod.mk
View File

@@ -4,7 +4,7 @@
#
################################################################################
KMOD_VERSION = 23
KMOD_VERSION = 24
KMOD_SOURCE = kmod-$(KMOD_VERSION).tar.xz
KMOD_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/kmod
KMOD_INSTALL_STAGING = YES

125
package/libepoxy/0001-select-platforms-based-on-configuration-results.patch
View File

@@ -1,125 +0,0 @@
From 7eff2bf8e27599c1c94217b2bb1b73d4b7d18e59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Wed, 6 May 2015 10:45:22 +0200
Subject: [PATCH 1/4] select platforms based on configuration results
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Fetched from pull #81 on github for libepoxy:
https://github.com/anholt/libepoxy/pull/81/commits
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
configure.ac | 13 +++++--------
src/dispatch_common.c | 9 ++++++---
src/dispatch_common.h | 9 +++++----
3 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/configure.ac b/configure.ac
index 2d67726..225ab73 100644
--- a/configure.ac
+++ b/configure.ac
@@ -58,6 +58,10 @@ AC_CHECK_HEADER([KHR/khrplatform.h],
# uintptr_t to a void *") by default. Kill that.
XORG_TESTSET_CFLAG(CWARNFLAGS, [-Wno-int-conversion])
+PKG_CHECK_MODULES(X11, [x11], [x11=yes], [x11=no])
+
+AM_CONDITIONAL(HAVE_X11, test x$x11 = xyes)
+
has_znow=yes
case $host_os in
@@ -86,7 +90,7 @@ case $host_os in
;;
*)
build_egl=yes
- build_glx=yes
+ build_glx=$x11
build_wgl=no
# On platforms with dlopen, we load everything dynamically and
# don't link against a specific window system or GL implementation.
@@ -144,13 +148,6 @@ esac
AC_SUBST([VISIBILITY_CFLAGS])
-PKG_CHECK_MODULES(X11, [x11], [x11=yes], [x11=no])
-if test x$x11 = xno -a x$build_glx = xyes; then
- AC_MSG_ERROR([libX11 headers (libx11-dev) required to build with GLX support])
-fi
-
-AM_CONDITIONAL(HAVE_X11, test x$x11 = xyes)
-
PKG_CHECK_MODULES(GL, [gl], [gl=yes], [gl=no])
AC_CONFIG_FILES([
diff --git a/src/dispatch_common.c b/src/dispatch_common.c
index 013027f..163d348 100644
--- a/src/dispatch_common.c
+++ b/src/dispatch_common.c
@@ -656,10 +656,13 @@ epoxy_get_proc_address(const char *name)
#elif defined(__APPLE__)
return epoxy_gl_dlsym(name);
#else
+#if PLATFORM_HAS_GLX
if (epoxy_current_context_is_glx()) {
return glXGetProcAddressARB((const GLubyte *)name);
- } else {
+ } else
+#endif /* PLATFORM_HAS_GLX */
#if PLATFORM_HAS_EGL
+ {
GLenum egl_api = epoxy_egl_get_current_gl_context_api();
switch (egl_api) {
@@ -669,10 +672,10 @@ epoxy_get_proc_address(const char *name)
case EGL_NONE:
break;
}
-#endif
}
+#endif /* PLATFORM_HAS_EGL */
errx(1, "Couldn't find current GLX or EGL context.\n");
-#endif
+#endif /* _WIN32 | __APPLE__*/
}
WRAPPER_VISIBILITY (void)
diff --git a/src/dispatch_common.h b/src/dispatch_common.h
index 676a4d5..2728b45 100644
--- a/src/dispatch_common.h
+++ b/src/dispatch_common.h
@@ -21,12 +21,13 @@
* IN THE SOFTWARE.
*/
+#include <config.h>
#include <stdbool.h>
#ifdef _WIN32
#define PLATFORM_HAS_EGL 0
#define PLATFORM_HAS_GLX 0
-#define PLATFORM_HAS_WGL 1
+#define PLATFORM_HAS_WGL BUILD_WGL
#define EPOXY_IMPORTEXPORT __declspec(dllexport)
#elif defined(__APPLE__)
#define PLATFORM_HAS_EGL 0
@@ -34,13 +35,13 @@
#define PLATFORM_HAS_WGL 0
#define EPOXY_IMPORTEXPORT
#elif defined(ANDROID)
-#define PLATFORM_HAS_EGL 1
+#define PLATFORM_HAS_EGL BUILD_EGL
#define PLATFORM_HAS_GLX 0
#define PLATFORM_HAS_WGL 0
#define EPOXY_IMPORTEXPORT
#else
-#define PLATFORM_HAS_EGL 1
-#define PLATFORM_HAS_GLX 1
+#define PLATFORM_HAS_EGL BUILD_EGL
+#define PLATFORM_HAS_GLX BUILD_GLX
#define PLATFORM_HAS_WGL 0
#define EPOXY_IMPORTEXPORT
#endif

39
package/libepoxy/0002-add-an-option-to-disable-glx-support.patch
View File

@@ -1,39 +0,0 @@
From a9efde0fb2678cd26bdf26d256732d97ded0c595 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Wed, 6 May 2015 11:05:48 +0200
Subject: [PATCH 2/4] add an option to disable glx support
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
this option would help us in yocto to get deterministic build results
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Fetched from pull #81 on github for libepoxy:
https://github.com/anholt/libepoxy/pull/81/commits
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
configure.ac | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 225ab73..d3d947c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -58,7 +58,14 @@ AC_CHECK_HEADER([KHR/khrplatform.h],
# uintptr_t to a void *") by default. Kill that.
XORG_TESTSET_CFLAG(CWARNFLAGS, [-Wno-int-conversion])
-PKG_CHECK_MODULES(X11, [x11], [x11=yes], [x11=no])
+AC_ARG_ENABLE([glx],
+ [AS_HELP_STRING([--disable-glx],
+ [disable if you don't want x11/glx support])],
+ [],
+ [enable_glx=yes]
+ )
+
+PKG_CHECK_MODULES(X11, [x11], [x11=$enable_glx], [x11=no])
AM_CONDITIONAL(HAVE_X11, test x$x11 = xyes)

67
package/libepoxy/0003-make-enable-glx-actually-work-on-osx-and-windows.patch
View File

@@ -1,67 +0,0 @@
From 902ea1eb073187603ec2eda4d2a146bef96592d4 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Mon, 18 Jan 2016 10:08:44 -0800
Subject: [PATCH 3/4] Make --enable-glx actually work on OSX and Windows
Followup for anholt/libepoxy#52
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Fetched from pull #81 on github for libepoxy:
https://github.com/anholt/libepoxy/pull/81/commits
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
configure.ac | 6 +++---
src/dispatch_common.h | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/configure.ac b/configure.ac
index d3d947c..b4c7ede 100644
--- a/configure.ac
+++ b/configure.ac
@@ -61,7 +61,7 @@ XORG_TESTSET_CFLAG(CWARNFLAGS, [-Wno-int-conversion])
AC_ARG_ENABLE([glx],
[AS_HELP_STRING([--disable-glx],
[disable if you don't want x11/glx support])],
- [],
+ [enable_glx=$enableval],
[enable_glx=yes]
)
@@ -74,7 +74,7 @@ has_znow=yes
case $host_os in
mingw*)
build_egl=no
- build_glx=no
+ build_glx=$x11
build_wgl=yes
# On windows, the DLL has to have all of its functions
# resolved at link time, so we have to link directly aginst
@@ -89,7 +89,7 @@ case $host_os in
;;
darwin*)
build_egl=no
- build_glx=no
+ build_glx=$x11
build_wgl=no
build_apple=yes
has_znow=no
diff --git a/src/dispatch_common.h b/src/dispatch_common.h
index 2728b45..c30ce44 100644
--- a/src/dispatch_common.h
+++ b/src/dispatch_common.h
@@ -26,12 +26,12 @@
#ifdef _WIN32
#define PLATFORM_HAS_EGL 0
-#define PLATFORM_HAS_GLX 0
+#define PLATFORM_HAS_GLX BUILD_GLX
#define PLATFORM_HAS_WGL BUILD_WGL
#define EPOXY_IMPORTEXPORT __declspec(dllexport)
#elif defined(__APPLE__)
#define PLATFORM_HAS_EGL 0
-#define PLATFORM_HAS_GLX 0
+#define PLATFORM_HAS_GLX BUILD_GLX
#define PLATFORM_HAS_WGL 0
#define EPOXY_IMPORTEXPORT
#elif defined(ANDROID)

95
package/libepoxy/0004-darwin-use-glx-instead-of-opengl-framework.patch
View File

@@ -1,95 +0,0 @@
From d010922282580a32dfebcda12ee1c307b3ef6005 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Mon, 18 Jan 2016 09:49:55 -0800
Subject: [PATCH 4/4] darwin: Use GLX instead of OpenGL.framework if it is the
current context
Also makes a stab at similar support for Win32
anholt/libepoxy#63
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Fetched from pull #81 on github for libepoxy:
https://github.com/anholt/libepoxy/pull/81/commits
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
src/dispatch_common.c | 29 ++++++++++++++++-------------
1 file changed, 16 insertions(+), 13 deletions(-)
diff --git a/src/dispatch_common.c b/src/dispatch_common.c
index 163d348..cb9f76a 100644
--- a/src/dispatch_common.c
+++ b/src/dispatch_common.c
@@ -482,16 +482,20 @@ epoxy_glx_dlsym(const char *name)
void *
epoxy_gl_dlsym(const char *name)
{
-#ifdef _WIN32
+#if defined(_WIN32) || defined(__APPLE__)
+if (!epoxy_current_context_is_glx()) {
+# if defined(_WIN32)
return do_dlsym(&api.gl_handle, "OPENGL32", name, true);
-#elif defined(__APPLE__)
+# elif defined(__APPLE__)
return do_dlsym(&api.gl_handle,
"/System/Library/Frameworks/OpenGL.framework/Versions/Current/OpenGL",
name, true);
-#else
+# endif
+}
+#endif
+
/* There's no library for desktop GL support independent of GLX. */
return epoxy_glx_dlsym(name);
-#endif
}
void *
@@ -615,7 +619,7 @@ epoxy_get_bootstrap_proc_address(const char *name)
*/
#if PLATFORM_HAS_GLX
if (api.glx_handle && glXGetCurrentContext())
- return epoxy_gl_dlsym(name);
+ return epoxy_glx_dlsym(name);
#endif
/* If epoxy hasn't loaded any API-specific library yet, try to
@@ -644,22 +648,17 @@ epoxy_get_bootstrap_proc_address(const char *name)
}
#endif /* PLATFORM_HAS_EGL */
- /* Fall back to GLX */
+ /* Fall back to the platform default */
return epoxy_gl_dlsym(name);
}
void *
epoxy_get_proc_address(const char *name)
{
-#ifdef _WIN32
- return wglGetProcAddress(name);
-#elif defined(__APPLE__)
- return epoxy_gl_dlsym(name);
-#else
#if PLATFORM_HAS_GLX
if (epoxy_current_context_is_glx()) {
return glXGetProcAddressARB((const GLubyte *)name);
- } else
+ }
#endif /* PLATFORM_HAS_GLX */
#if PLATFORM_HAS_EGL
{
@@ -674,8 +673,12 @@ epoxy_get_proc_address(const char *name)
}
}
#endif /* PLATFORM_HAS_EGL */
+#if defined(_WIN32)
+ return wglGetProcAddress(name);
+#elif defined(__APPLE__)
+ return epoxy_gl_dlsym(name);
+#endif
errx(1, "Couldn't find current GLX or EGL context.\n");
-#endif /* _WIN32 | __APPLE__*/
}
WRAPPER_VISIBILITY (void)

45
package/libepoxy/0005-Forward-egl-cflags-into-epoxy.pc.patch
View File

@@ -1,45 +0,0 @@
From 68e5f1574758240aedfe8653d7aaae62cdb08bf5 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 20 Dec 2015 10:07:06 -0300
Subject: [PATCH] Forward egl cflags into epoxy.pc
When building mesa egl without x11 and gles2 the headers need a
MESA_EGL_NO_X11_HEADERS define, so put them in epoxy.pc as well since
otherwise builds will fail.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
Status: pull request https://github.com/anholt/libepoxy/pull/80
configure.ac | 2 ++
epoxy.pc.in | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index c7cffb2..7b599de 100644
--- a/configure.ac
+++ b/configure.ac
@@ -102,6 +102,8 @@ if test x$build_egl = xyes; then
AC_DEFINE([BUILD_EGL], [1], [build EGL tests])
fi
+AC_SUBST(EGL_CFLAGS)
+
PKG_CHECK_MODULES(GL, [gl], [gl=yes], [gl=no])
if test x$gl = xno; then
build_glx=no
diff --git a/epoxy.pc.in b/epoxy.pc.in
index 8c85a33..f377da5 100644
--- a/epoxy.pc.in
+++ b/epoxy.pc.in
@@ -6,6 +6,6 @@ includedir=@includedir@
Name: epoxy
Description: epoxy GL dispatch Library
Version: @PACKAGE_VERSION@
-Cflags: -I${includedir}
+Cflags: -I${includedir} @EGL_CFLAGS@
Libs: -L${libdir} -lepoxy
Libs.private: @DLOPEN_LIBS@
--
2.4.10

59
package/libepoxy/0006-Make-egl-conditional.patch
View File

@@ -1,59 +0,0 @@
From 5492e81f317e48141b0687ad77252c52c2dfcd6d Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Fri, 5 Feb 2016 19:03:39 -0300
Subject: [PATCH] Make egl conditional
Mesa can be built with GLX and without EGL support, so make this
possible in epoxy as well.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
configure.ac | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index 6e56599..21e3a25 100644
--- a/configure.ac
+++ b/configure.ac
@@ -58,6 +58,13 @@ AC_CHECK_HEADER([KHR/khrplatform.h],
# uintptr_t to a void *") by default. Kill that.
XORG_TESTSET_CFLAG(CWARNFLAGS, [-Wno-int-conversion])
+AC_ARG_ENABLE([egl],
+ [AS_HELP_STRING([--disable-egl],
+ [disable if you don't want egl support])],
+ [enable_egl=$enableval],
+ [enable_egl=yes]
+ )
+
AC_ARG_ENABLE([glx],
[AS_HELP_STRING([--disable-glx],
[disable if you don't want x11/glx support])],
@@ -65,6 +72,7 @@ AC_ARG_ENABLE([glx],
[enable_glx=yes]
)
+PKG_CHECK_MODULES(EGL, [egl], [egl=$enable_egl], [egl=no])
PKG_CHECK_MODULES(X11, [x11], [x11=$enable_glx], [x11=no])
AM_CONDITIONAL(HAVE_X11, test x$x11 = xyes)
@@ -96,7 +104,7 @@ case $host_os in
EPOXY_LINK_LIBS=""
;;
*)
- build_egl=yes
+ build_egl=$egl
build_glx=$x11
build_wgl=no
# On platforms with dlopen, we load everything dynamically and
@@ -109,7 +117,6 @@ AC_SUBST(EPOXY_LINK_LIBS)
AM_CONDITIONAL(BUILD_EGL, test x$build_egl = xyes)
if test x$build_egl = xyes; then
- PKG_CHECK_MODULES(EGL, [egl])
AC_DEFINE([BUILD_EGL], [1], [build EGL tests])
fi
--
2.4.10

4
package/libepoxy/libepoxy.hash
View File

@@ -1,2 +1,2 @@
# Locally calculated
sha256 6700ddedffb827b42c72cce1e0be6fba67b678b19bf256e1b5efd3ea38cc2bb4 libepoxy-v1.3.1.tar.gz
# From ftp://ftp.gnome.org/pub/gnome/sources/libepoxy/1.4/libepoxy-1.4.0.sha256sum
sha256 25a906b14a921bc2b488cfeaa21a00486fe92630e4a9dd346e4ecabeae52ab41 libepoxy-1.4.0.tar.xz

8
package/libepoxy/libepoxy.mk
View File

@@ -4,11 +4,11 @@
#
################################################################################
LIBEPOXY_VERSION = v1.3.1
LIBEPOXY_SITE = $(call github,anholt,libepoxy,$(LIBEPOXY_VERSION))
LIBEPOXY_VERSION_MAJOR = 1.4
LIBEPOXY_VERSION = $(LIBEPOXY_VERSION_MAJOR).0
LIBEPOXY_SITE = http://ftp.gnome.org/pub/gnome/sources/libepoxy/$(LIBEPOXY_VERSION_MAJOR)
LIBEPOXY_SOURCE = libepoxy-$(LIBEPOXY_VERSION).tar.xz
LIBEPOXY_INSTALL_STAGING = YES
# For patches 0001-0006:
LIBEPOXY_AUTORECONF = YES
LIBEPOXY_DEPENDENCIES = host-pkgconf xutil_util-macros
LIBEPOXY_LICENSE = MIT
LIBEPOXY_LICENSE_FILES = COPYING

4
package/libglib2/libglib2.hash
View File

@@ -1,2 +1,2 @@
# https://download.gnome.org/sources/glib/2.50/glib-2.50.2.sha256sum
sha256 be68737c1f268c05493e503b3b654d2b7f43d7d0b8c5556f7e4651b870acfbf5 glib-2.50.2.tar.xz
# https://download.gnome.org/sources/glib/2.50/glib-2.50.3.sha256sum
sha256 82ee94bf4c01459b6b00cb9db0545c2237921e3060c0b74cff13fbc020cfd999 glib-2.50.3.tar.xz

2
package/libglib2/libglib2.mk
View File

@@ -5,7 +5,7 @@
################################################################################
LIBGLIB2_VERSION_MAJOR = 2.50
LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).2
LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).3
LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.xz
LIBGLIB2_SITE = http://ftp.gnome.org/pub/gnome/sources/glib/$(LIBGLIB2_VERSION_MAJOR)
LIBGLIB2_LICENSE = LGPLv2+

4
package/libgtk3/libgtk3.hash
View File

@@ -1,2 +1,2 @@
# From http://ftp.gnome.org/pub/gnome/sources/gtk+/3.22/gtk+-3.22.7.sha256sum
sha256 a3a27564bfb1679ebbc75c37cd2bcd6e727c8bdfbcd3984d29305bf9ee60d432 gtk+-3.22.7.tar.xz
# From http://ftp.gnome.org/pub/gnome/sources/gtk+/3.22/gtk+-3.22.8.sha256sum
sha256 c7254a88df5c17e9609cee9e848c3d0104512707edad4c3b4f256b131f8d3af1 gtk+-3.22.8.tar.xz

2
package/libgtk3/libgtk3.mk
View File

@@ -5,7 +5,7 @@
################################################################################
LIBGTK3_VERSION_MAJOR = 3.22
LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).7
LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).8
LIBGTK3_SOURCE = gtk+-$(LIBGTK3_VERSION).tar.xz
LIBGTK3_SITE = http://ftp.gnome.org/pub/gnome/sources/gtk+/$(LIBGTK3_VERSION_MAJOR)
LIBGTK3_LICENSE = LGPLv2+

4
package/libinput/libinput.hash
View File

@@ -1,2 +1,2 @@
# From https://lists.freedesktop.org/archives/wayland-devel/2017-January/032746.html
sha256 b7534f518d735c643aedca2fb4694683dfddc8d0600cfb628c87a18e65255832 libinput-1.6.0.tar.xz
# From https://lists.freedesktop.org/archives/wayland-devel/2017-February/032940.html
sha256 9d816f13eee63bcca0e9c3bb652c52ab55f39be4d1b90b54e4bfd1dc92ef55a8 libinput-1.6.1.tar.xz

2
package/libinput/libinput.mk
View File

@@ -4,7 +4,7 @@
#
################################################################################
LIBINPUT_VERSION = 1.6.0
LIBINPUT_VERSION = 1.6.1
LIBINPUT_SOURCE = libinput-$(LIBINPUT_VERSION).tar.xz
LIBINPUT_SITE = http://www.freedesktop.org/software/libinput
LIBINPUT_DEPENDENCIES = host-pkgconf libevdev mtdev udev

28
package/libsigsegv/0001-Add-stack-direction-for-the-AArch64-architecture.patch
View File

@@ -1,28 +0,0 @@
From 790e8f620f06834f3fd03c310cbecd1416536987 Mon Sep 17 00:00:00 2001
From: Will Newton <will.newton@linaro.org>
Date: Tue, 28 May 2013 18:31:46 +0100
Subject: [PATCH 2/5] Add stack direction for the AArch64 architecture
On this architecture, the stack grows downward.
Signed-off-by: Will Newton <will.newton@linaro.org>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
m4/stack-direction.m4 | 1 +
1 file changed, 1 insertion(+)
diff --git a/m4/stack-direction.m4 b/m4/stack-direction.m4
index 39c1a28..3f70530 100644
--- a/m4/stack-direction.m4
+++ b/m4/stack-direction.m4
@@ -13,6 +13,7 @@ AC_DEFUN([SV_STACK_DIRECTION],
case "$host_cpu" in
dnl See the #define STACK_GROWS_DOWNWARD in gcc-3.1/gcc/config/*/*.h.
a29k | \
+ aarch64* | \
alpha* | \
arc | \
arm* | strongarm* | xscale* | \
--
2.1.0

26
package/libsigsegv/0002-Add-stack-direction-for-the-Microblaze-architecture.patch
View File

@@ -1,26 +0,0 @@
From f4395ff932758884416753f88f5d98f33ec67479 Mon Sep 17 00:00:00 2001
From: Spenser Gilliland <spenser@gillilanding.com>
Date: Mon, 29 Dec 2014 13:54:54 +0100
Subject: [PATCH 3/5] Add stack direction for the Microblaze architecture
Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
m4/stack-direction.m4 | 1 +
1 file changed, 1 insertion(+)
diff --git a/m4/stack-direction.m4 b/m4/stack-direction.m4
index 3f70530..53f4216 100644
--- a/m4/stack-direction.m4
+++ b/m4/stack-direction.m4
@@ -32,6 +32,7 @@ AC_DEFUN([SV_STACK_DIRECTION],
m68* | \
m88k | \
mcore | \
+ microblaze | \
mips* | \
mmix | \
mn10200 | \
--
2.1.0

29
package/libsigsegv/0003-Add-stack-direction-for-the-Blackfin-architecture.patch
View File

@@ -1,29 +0,0 @@
From 55a707283dbb3b2fdcaaa4e177d050e122cfc2a0 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 29 Dec 2014 13:55:16 +0100
Subject: [PATCH 4/5] Add stack direction for the Blackfin architecture
The stack grows downward on Blackfin, see
https://sourceware.org/binutils/docs/as/Blackfin-Syntax.html: "The
stack grows by decrementing the stack pointer.".
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
m4/stack-direction.m4 | 1 +
1 file changed, 1 insertion(+)
diff --git a/m4/stack-direction.m4 b/m4/stack-direction.m4
index 53f4216..1a97d5a 100644
--- a/m4/stack-direction.m4
+++ b/m4/stack-direction.m4
@@ -18,6 +18,7 @@ AC_DEFUN([SV_STACK_DIRECTION],
arc | \
arm* | strongarm* | xscale* | \
avr | \
+ bfin | \
c1 | c2 | c32 | c34 | c38 | \
clipper | \
cris | \
--
2.1.0

31
package/libsigsegv/0004-Add-stack-direction-for-the-Nios-II-architecture.patch
View File

@@ -1,31 +0,0 @@
From 24bac122bf4ffe437bb4f6ca633ad08f31a23d73 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 29 Dec 2014 13:56:54 +0100
Subject: [PATCH 5/5] Add stack direction for the Nios II architecture
According to Altera Application Binary Interface document for the Nios
II architecture
(http://www.altera.com/literature/hb/nios2/n2cpu_nii51016.pdf):
"The stack grows downward (i.e. towards lower addresses). ".
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
m4/stack-direction.m4 | 1 +
1 file changed, 1 insertion(+)
diff --git a/m4/stack-direction.m4 b/m4/stack-direction.m4
index 1a97d5a..d9c5157 100644
--- a/m4/stack-direction.m4
+++ b/m4/stack-direction.m4
@@ -38,6 +38,7 @@ AC_DEFUN([SV_STACK_DIRECTION],
mmix | \
mn10200 | \
mn10300 | \
+ nios2 | \
ns32k | \
pdp11 | \
pj* | \
--
2.1.0

16
package/libsigsegv/0005-fix-sparc64-stackpointer.patch
View File

@@ -1,16 +0,0 @@
Fix sparc64 build.
Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
diff -Nur libsigsegv-2.10.orig/src/fault-linux-sparc.h libsigsegv-2.10/src/fault-linux-sparc.h
--- libsigsegv-2.10.orig/src/fault-linux-sparc.h 2009-08-01 17:06:49.000000000 +0200
+++ libsigsegv-2.10/src/fault-linux-sparc.h 2015-11-29 11:55:29.000000000 +0100
@@ -27,4 +27,8 @@
(see also <asm/sigcontext.h>)
are quite different types. */
+#if __WORDSIZE == 64
+#define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.mc_gregs[REG_O6]
+#else
#define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.gregs[REG_O6]
+#endif

2
package/libsigsegv/libsigsegv.hash
View File

@@ -1,2 +1,2 @@
# Locally calculated after checking pgp signature
sha256 8460a4a3dd4954c3d96d7a4f5dd5bc4d9b76f5754196aa245287553b26d2199a libsigsegv-2.10.tar.gz
sha256 dd7c2eb2ef6c47189406d562c1dc0f96f2fc808036834d596075d58377e37a18 libsigsegv-2.11.tar.gz

4
package/libsigsegv/libsigsegv.mk
View File

@@ -4,13 +4,11 @@
#
################################################################################
LIBSIGSEGV_VERSION = 2.10
LIBSIGSEGV_VERSION = 2.11
LIBSIGSEGV_SITE = $(BR2_GNU_MIRROR)/libsigsegv
LIBSIGSEGV_INSTALL_STAGING = YES
LIBSIGSEGV_CONF_ENV = sv_cv_fault_posix=yes
LIBSIGSEGV_LICENSE = GPLv2+
LIBSIGSEGV_LICENSE_FILES = COPYING
LIBSIGSEGV_AUTORECONF = YES
$(eval $(autotools-package))

2
package/libva-intel-driver/Config.in
View File

@@ -12,7 +12,7 @@ config BR2_PACKAGE_LIBVA_INTEL_DRIVER
help
VA-API back-end driver for Intel graphics chips
https://01.org/linuxgraphics/community/vaapi
https://01.org/linuxmedia/vaapi
comment "libva intel driver needs a toolchain w/ threads, dynamic library"
depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS

4
package/libva-intel-driver/libva-intel-driver.hash
View File

@@ -1,2 +1,2 @@
# From https://lists.freedesktop.org/archives/libva/2016-November/004731.html
sha1 5100f187afc4e39fce5664b96fe11a38faa9afaa libva-intel-driver-1.7.3.tar.bz2
# Locally computed
sha256 c1f02cbdf0398f096ddc91096fac6ee62267a54955f6d235d73a8ff2ea888118 libva-intel-driver-1.7.3.tar.gz

4
package/libva-intel-driver/libva-intel-driver.mk
View File

@@ -5,8 +5,8 @@
################################################################################
LIBVA_INTEL_DRIVER_VERSION = 1.7.3
LIBVA_INTEL_DRIVER_SOURCE = libva-intel-driver-$(LIBVA_INTEL_DRIVER_VERSION).tar.bz2
LIBVA_INTEL_DRIVER_SITE = http://www.freedesktop.org/software/vaapi/releases/libva-intel-driver
LIBVA_INTEL_DRIVER_SITE = \
$(call github,01org,intel-vaapi-driver,$(LIBVA_INTEL_DRIVER_VERSION))
LIBVA_INTEL_DRIVER_LICENSE = MIT
LIBVA_INTEL_DRIVER_LICENSE_FILES = COPYING
# needed to work around https://bugs.freedesktop.org/show_bug.cgi?id=79478

2
package/libva/Config.in
View File

@@ -12,7 +12,7 @@ config BR2_PACKAGE_LIBVA
IDCT, Motion Compensation etc.) for the prevailing coding standards
today (MPEG-2, MPEG-4 ASP/H.263, MPEG-4 AVC/H.264, and VC-1/VMW3).
http://www.freedesktop.org/wiki/Software/vaapi/
https://01.org/linuxmedia/vaapi
comment "libva needs a toolchain w/ threads, dynamic library"
depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS

4
package/libva/libva.hash
View File

@@ -1,2 +1,2 @@
# From https://lists.freedesktop.org/archives/libva/2016-November/004730.html
sha1 18e46f3d5a0e971eb0ec9fe14bc021e69eb13fb8 libva-1.7.3.tar.bz2
# Locally computed
sha256 f0f816a725007fbf3c7ed816ff71ba420696bec63ff49045e9b23d9b34ac73c8 libva-1.7.3.tar.gz

3
package/libva/libva.mk
View File

@@ -5,8 +5,7 @@
################################################################################
LIBVA_VERSION = 1.7.3
LIBVA_SOURCE = libva-$(LIBVA_VERSION).tar.bz2
LIBVA_SITE = http://www.freedesktop.org/software/vaapi/releases/libva
LIBVA_SITE = $(call github,01org,libva,libva-$(LIBVA_VERSION))
LIBVA_LICENSE = MIT
LIBVA_LICENSE_FILES = COPYING
LIBVA_AUTORECONF = YES

11
package/linux-headers/Config.in.host
View File

@@ -6,7 +6,7 @@ config BR2_PACKAGE_HOST_LINUX_HEADERS
choice
prompt "Kernel Headers"
default BR2_KERNEL_HEADERS_AS_KERNEL if BR2_LINUX_KERNEL
default BR2_KERNEL_HEADERS_4_9
default BR2_KERNEL_HEADERS_4_10
help
Select the kernel version to get headers from.
@@ -67,6 +67,10 @@ choice
bool "Linux 4.9.x kernel headers"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9
config BR2_KERNEL_HEADERS_4_10
bool "Linux 4.10.x kernel headers"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_10
config BR2_KERNEL_HEADERS_VERSION
bool "Manually specified Linux version"
endchoice
@@ -87,6 +91,10 @@ choice
This is used to hide/show some packages that have strict
requirements on the version of kernel headers.
config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_10
bool "4.10.x"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_10
config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9
bool "4.9.x"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9
@@ -225,4 +233,5 @@ config BR2_DEFAULT_KERNEL_HEADERS
default "4.4.52" if BR2_KERNEL_HEADERS_4_4
default "4.8.17" if BR2_KERNEL_HEADERS_4_8
default "4.9.13" if BR2_KERNEL_HEADERS_4_9
default "4.10" if BR2_KERNEL_HEADERS_4_10
default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION

35
package/lugaru/0001-ImageIO-fix-invalid-conversion.patch Normal file
View File

@@ -0,0 +1,35 @@
From 73e56ba8e91b6bae59220e6f25c1b7c15817edb5 Mon Sep 17 00:00:00 2001
From: Romain Naour <romain.naour@gmail.com>
Date: Sun, 12 Feb 2017 21:17:44 +0100
Subject: [PATCH] ImageIO: fix invalid conversion
Fixes:
Source/Utils/ImageIO.cpp:125:27: error: invalid conversion from 'int' to 'boolean' [-fpermissive]
cinfo.quantize_colors = 0;
^
quantize_colors type is bool, so it must be initialized to TRUE or FALSE.
Patch status: upsteam
Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
Source/Utils/ImageIO.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Source/Utils/ImageIO.cpp b/Source/Utils/ImageIO.cpp
index 706c201..c19a63e 100644
--- a/Source/Utils/ImageIO.cpp
+++ b/Source/Utils/ImageIO.cpp
@@ -122,7 +122,7 @@ static bool load_jpg(const char* file_name, ImageRec& tex)
(void)jpeg_read_header(&cinfo, TRUE);
cinfo.out_color_space = JCS_RGB;
- cinfo.quantize_colors = 0;
+ cinfo.quantize_colors = FALSE;
(void)jpeg_calc_output_dimensions(&cinfo);
(void)jpeg_start_decompress(&cinfo);
--
2.9.3

38
package/lugaru/Config.in Normal file
View File

@@ -0,0 +1,38 @@
config BR2_PACKAGE_LUGARU
bool "lugaru"
depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_PACKAGE_HAS_LIBGL # libglu
depends on BR2_PACKAGE_OPENAL_ARCH_SUPPORTS
depends on BR2_PACKAGE_XORG7 # SDL2 OpenGL (GLX)
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11
depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # openal
depends on BR2_USE_MMU # SDL2 OpenGL (GLX)
depends on !BR2_STATIC_LIBS # SDL2
select BR2_PACKAGE_JPEG
select BR2_PACKAGE_LIBGLU # GL/glu.h
select BR2_PACKAGE_LIBPNG
select BR2_PACKAGE_LIBVORBIS
select BR2_PACKAGE_OPENAL
select BR2_PACKAGE_SDL2
select BR2_PACKAGE_SDL2_OPENGL
select BR2_PACKAGE_ZLIB
help
Lugaru (pronounced Loo-GAH-roo) is a cross-platform
third-person action game. The main character, Turner, is an
anthropomorphic rebel bunny rabbit with impressive combat
skills. In his quest to find those responsible for
slaughtering his village, he uncovers a far-reaching
conspiracy involving the corrupt leaders of the rabbit
republic and the starving wolves from a nearby den. Turner
takes it upon himself to fight against their plot and save
his fellow rabbits from slavery.
https://osslugaru.gitlab.io/
comment "lugaru needs X11 and a toolchain w/ C++, OpenGL backend, gcc >= 4.7, NPTL, dynamic library"
depends on BR2_PACKAGE_OPENAL_ARCH_SUPPORTS
depends on BR2_PACKAGE_XORG7
depends on BR2_USE_MMU
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_PACKAGE_HAS_LIBGL || \
!BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \
BR2_STATIC_LIBS

2
package/lugaru/lugaru.hash Normal file
View File

@@ -0,0 +1,2 @@
# Locally calculated
sha256 f3ea477caf78911c69939fbdc163f9f6517c7ef2267e716a0e050be1a166ef97 lugaru-1.2.tar.xz

30
package/lugaru/lugaru.mk Normal file
View File

@@ -0,0 +1,30 @@
################################################################################
#
# lugaru
#
################################################################################
LUGARU_VERSION = 1.2
LUGARU_SITE = https://bitbucket.org/osslugaru/lugaru/downloads
LUGARU_SOURCE = lugaru-$(LUGARU_VERSION).tar.xz
LUGARU_LICENSE = GPLv2+, CC-BY-SA-3.0 (Wolfire and Slib assets), \
CC-BY-SA-4.0 (OSS Lugaru, Jendraz and Philtron R. assets)
LUGARU_LICENSE_FILES = COPYING.txt CONTENT-LICENSE.txt
LUGARU_DEPENDENCIES = host-pkgconf jpeg libgl libglu libpng libvorbis \
openal sdl2 zlib
# Avoid incompatible posix_memalign declaration on x86 and x86_64 with
# musl.
# https://gcc.gnu.org/ml/gcc-patches/2015-05/msg01425.html
ifeq ($(BR2_TOOLCHAIN_USES_MUSL):$(BR2_i386)$(BR2_x86_64),y:y)
define LUGARU_REMOVE_PEDANTIC
$(SED) 's% -pedantic%%' $(@D)/CMakeLists.txt
endef
LUGARU_POST_PATCH_HOOKS += LUGARU_REMOVE_PEDANTIC
endif
LUGARU_CONF_OPTS = -DSYSTEM_INSTALL=ON
$(eval $(cmake-package))

7
package/lxc/lxc.mk
View File

@@ -29,6 +29,13 @@ else
LXC_CONF_OPTS += --disable-seccomp
endif
ifeq ($(BR2_PACKAGE_LIBSELINUX),y)
LXC_CONF_OPTS += --enable-selinux
LXC_DEPENDENCIES += libselinux
else
LXC_CONF_OPTS += --disable-selinux
endif
ifeq ($(BR2_PACKAGE_HAS_LUAINTERPRETER),y)
LXC_CONF_OPTS += --enable-lua
LXC_DEPENDENCIES += luainterpreter

8
package/madplay/madplay.mk
View File

@@ -11,14 +11,6 @@ MADPLAY_LICENSE_FILES = COPYING COPYRIGHT
MADPLAY_LIBTOOL_PATCH = NO
MADPLAY_DEPENDENCIES = libmad libid3tag $(if $(BR2_PACKAGE_GETTEXT),gettext)
# Workaround a bug in uClibc-ng, which exposes madvise() but doesn't
# provide the corresponding MADV_* definitions. Bug reported at
# http://mailman.uclibc-ng.org/pipermail/devel/2016-December/001306.html. madvise()
# is anyway useless on noMMU.
ifeq ($(BR2_USE_MMU),)
MADPLAY_CONF_ENV += ac_cv_func_madvise=no
endif
# Check if ALSA is built, then we should configure after alsa-lib so
# ./configure can find alsa-lib.
ifeq ($(BR2_PACKAGE_MADPLAY_ALSA),y)

2
package/modem-manager/modem-manager.hash
View File

@@ -1,2 +1,2 @@
# Locally computed
sha256 e4544398d9c166f8e13fe7c97149f262ad1fb48af980e0d4f9c34013920c6393 ModemManager-1.6.2.tar.xz
sha256 cdd5b4cb1e4d7643643a28ccbfc4bb354bfa9cb89a77ea160ebdf7926171c668 ModemManager-1.6.4.tar.xz

2
package/modem-manager/modem-manager.mk
View File

@@ -4,7 +4,7 @@
#
################################################################################
MODEM_MANAGER_VERSION = 1.6.2
MODEM_MANAGER_VERSION = 1.6.4
MODEM_MANAGER_SOURCE = ModemManager-$(MODEM_MANAGER_VERSION).tar.xz
MODEM_MANAGER_SITE = http://www.freedesktop.org/software/ModemManager
MODEM_MANAGER_LICENSE = GPLv2+ (programs, plugins), LGPLv2+ (libmm-glib)

2
package/nano/nano.hash
View File

@@ -1,2 +1,2 @@
# Locally calculated after checking pgp signature
sha256 752170643039e2c95a433de357f0c70a8c4c4c561a90a7e7259a63e225b659b9 nano-2.7.4.tar.xz
sha256 a64d24e6bc4fc448376d038f9a755af77f8e748c9051b6f45bf85e783a7e67e4 nano-2.7.5.tar.xz

2
package/nano/nano.mk
View File

@@ -5,7 +5,7 @@
################################################################################
NANO_VERSION_MAJOR = 2.7
NANO_VERSION = $(NANO_VERSION_MAJOR).4
NANO_VERSION = $(NANO_VERSION_MAJOR).5
NANO_SITE = https://www.nano-editor.org/dist/v$(NANO_VERSION_MAJOR)
NANO_SOURCE = nano-$(NANO_VERSION).tar.xz
NANO_LICENSE = GPLv3+

4
package/perl/perl.hash
View File

@@ -3,5 +3,5 @@ md5 af6a84c7c3e2b8b269c105a5db2f6d53 perl-5.2
sha1 5bec25d8821b81a5939ee220997f4c8ab1c13e31 perl-5.24.1.tar.xz
sha256 03a77bac4505c270f1890ece75afc7d4b555090b41aa41ea478747e23b2afb3f perl-5.24.1.tar.xz
# Hashes from: http://github.com/arsv/perl-cross/releases/download/1.1.3/perl-cross-1.1.3.hash
sha256 181b24ff71815fb2c8065e6ea139d106796eee0964aebfd8081f0b7f69e0696d perl-cross-1.1.3.tar.gz
# Hashes from: http://github.com/arsv/perl-cross/releases/download/1.1.4/perl-cross-1.1.4.hash
sha256 c840a327d5464ca271cac40d52e2d199330875527bf1003c28a6e550fb7bcc57 perl-cross-1.1.4.tar.gz

2
package/perl/perl.mk
View File

@@ -13,7 +13,7 @@ PERL_LICENSE = Artistic or GPLv1+
PERL_LICENSE_FILES = Artistic Copying README
PERL_INSTALL_STAGING = YES
PERL_CROSS_VERSION = 1.1.3
PERL_CROSS_VERSION = 1.1.4
# DO NOT refactor with the github helper (the result is not the same)
PERL_CROSS_SITE = https://github.com/arsv/perl-cross/releases/download/$(PERL_CROSS_VERSION)
PERL_CROSS_SOURCE = perl-cross-$(PERL_CROSS_VERSION).tar.gz

2
package/poppler/poppler.hash
View File

@@ -1,2 +1,2 @@
# Locally calculated
sha256 e997c9ad81a8372f2dd03a02b00692b8cc479c220340c8881edaca540f402c1f poppler-0.51.0.tar.xz
sha256 528b661738839f9a25f6e580fcd2d5db007e0a1948580c6489f0062798ca1992 poppler-0.52.0.tar.xz

2
package/poppler/poppler.mk
View File

@@ -4,7 +4,7 @@
#
################################################################################
POPPLER_VERSION = 0.51.0
POPPLER_VERSION = 0.52.0
POPPLER_SOURCE = poppler-$(POPPLER_VERSION).tar.xz
POPPLER_SITE = http://poppler.freedesktop.org
POPPLER_DEPENDENCIES = fontconfig host-pkgconf

2
package/pru-software-support/pru-software-support.hash
View File

@@ -1,2 +1,2 @@
# Locally-calculated hash
sha256 b257535ca9b1641d1a238795f3c7004064c573a91cf4a1fa566e3f7c2360c38f pru-software-support-804b548e69ef9fdf44445f6d0968d81cb8a1e7b4.tar.gz
sha256 1e880d74f9a1d04324e6255cb7a0e3d40f92e08809dc81dc6c714447bac5c335 pru-software-support-v5.1.0.tar.gz

6
package/pru-software-support/pru-software-support.mk
View File

@@ -4,10 +4,10 @@
#
################################################################################
PRU_SOFTWARE_SUPPORT_VERSION = 804b548e69ef9fdf44445f6d0968d81cb8a1e7b4
PRU_SOFTWARE_SUPPORT_SITE = git://git.ti.com/pru-software-support-package/pru-software-support-package.git
PRU_SOFTWARE_SUPPORT_VERSION = v5.1.0
PRU_SOFTWARE_SUPPORT_SITE = https://git.ti.com/pru-software-support-package/pru-software-support-package/archive-tarball/$(PRU_SOFTWARE_SUPPORT_VERSION)?
PRU_SOFTWARE_SUPPORT_LICENSE = BSD-3c, GPLv2, Public Domain
PRU_SOFTWARE_SUPPORT_LICENSE_FILES = PRU-Package-v4.0-Manifest.html
PRU_SOFTWARE_SUPPORT_LICENSE_FILES = PRU-Package-v5.0-Manifest.html
PRU_SOFTWARE_SUPPORT_DEPENDENCIES = host-ti-cgt-pru host-pru-software-support
HOST_PRU_SOFTWARE_SUPPORT_DEPENDENCIES = host-ti-cgt-pru

4
package/python-psutil/python-psutil.hash
View File

@@ -1,3 +1,3 @@
# md5 from https://pypi.python.org/pypi/psutil/json, sha256 locally computed
md5 199a366dba829c88bddaf5b41d19ddc0 psutil-4.3.1.tar.gz
sha256 38f74182fb9e15cafd0cdf0821098a95cc17301807aed25634a18b66537ba51b psutil-4.3.1.tar.gz
md5 3090e32d42761086ae82036cadb95ba3 psutil-5.1.3.tar.gz
sha256 959bd58bdc8152b0a143cb3bd822d4a1b8f7230617b0e3eb2ff6e63812120f2b psutil-5.1.3.tar.gz

4
package/python-psutil/python-psutil.mk
View File

@@ -4,9 +4,9 @@
#
################################################################################
PYTHON_PSUTIL_VERSION = 4.3.1
PYTHON_PSUTIL_VERSION = 5.1.3
PYTHON_PSUTIL_SOURCE = psutil-$(PYTHON_PSUTIL_VERSION).tar.gz
PYTHON_PSUTIL_SITE = https://pypi.python.org/packages/78/cc/f267a1371f229bf16db6a4e604428c3b032b823b83155bd33cef45e49a53
PYTHON_PSUTIL_SITE = https://pypi.python.org/packages/78/0a/aa90434c6337dd50d182a81fe4ae4822c953e166a163d1bf5f06abb1ac0b
PYTHON_PSUTIL_SETUP_TYPE = setuptools
PYTHON_PSUTIL_LICENSE = BSD-3c
PYTHON_PSUTIL_LICENSE_FILES = LICENSE

2
package/qemu/qemu.hash
View File

@@ -1,2 +1,2 @@
# Locally computed, tarball verified with GPG signature
sha256 326e739506ba690daf69fc17bd3913a6c313d9928d743bd8eddb82f403f81e53 qemu-2.7.0.tar.bz2
sha256 dafd5d7f649907b6b617b822692f4c82e60cf29bc0fc58bc2036219b591e5e62 qemu-2.8.0.tar.bz2

2
package/qemu/qemu.mk
View File

@@ -4,7 +4,7 @@
#
################################################################################
QEMU_VERSION = 2.7.0
QEMU_VERSION = 2.8.0
QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.bz2
QEMU_SITE = http://wiki.qemu.org/download
QEMU_LICENSE = GPLv2, LGPLv2.1, MIT, BSD-3c, BSD-2c, Others/BSD-1c

Some files were not shown because too many files have changed in this diff Show More