diff --git a/package/cmake/cmake-0001-FindQt4-do-not-prepend-CMake-root-path-when-searchin.patch b/package/cmake/cmake-0001-FindQt4-do-not-prepend-CMake-root-path-when-searchin.patch deleted file mode 100644 index 8ab5a2318b..0000000000 --- a/package/cmake/cmake-0001-FindQt4-do-not-prepend-CMake-root-path-when-searchin.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 02a18089402de70188f2cf7b33fcb6edf7506871 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sun, 29 Dec 2013 13:35:18 +0100 -Subject: [PATCH] FindQt4: do not prepend CMake root path when searching the - mkspecs directory - -When searching for the mkspecs directory, FindQT4 uses the find_path() -function, but it doesn't pass the NO_CMAKE_FIND_ROOT_PATH, which means -that all paths are interpreted relatively to the CMAKE_FIND_ROOT_PATH. - -However, both the ${qt_mkspecs_dirs} and ${qt_cross_paths} variable -that are passed as hints are already absolute paths, and do not need -to be prepended by the CMAKE_FIND_ROOT_PATH. - -Due to this problem, FindQT4 was unable to find qconfig.pri, and -QT_MKSPECS_DIR was left defined to "NOTFOUND". - -Signed-off-by: Thomas Petazzoni ---- - Modules/FindQt4.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake -index 28b8454..0b8ce92 100644 ---- a/Modules/FindQt4.cmake -+++ b/Modules/FindQt4.cmake -@@ -760,7 +760,7 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION) - endforeach() - set(QT_MKSPECS_DIR NOTFOUND) - find_path(QT_MKSPECS_DIR NAMES qconfig.pri -- HINTS ${qt_cross_paths} ${qt_mkspecs_dirs} -+ HINTS ${qt_cross_paths} ${qt_mkspecs_dirs} NO_CMAKE_FIND_ROOT_PATH - DOC "The location of the Qt mkspecs containing qconfig.pri") - endif() - --- -1.8.3.2 - diff --git a/package/cmake/cmake.mk b/package/cmake/cmake.mk index ee49e80ead..67f5cecccd 100644 --- a/package/cmake/cmake.mk +++ b/package/cmake/cmake.mk @@ -4,8 +4,8 @@ # ################################################################################ -CMAKE_VERSION_MAJOR = 2.8 -CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).12.2 +CMAKE_VERSION_MAJOR = 3.1 +CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).0-rc1 CMAKE_SITE = http://www.cmake.org/files/v$(CMAKE_VERSION_MAJOR)/ CMAKE_LICENSE = BSD-3c CMAKE_LICENSE_FILES = Copyright.txt diff --git a/package/libglog/libglog.mk b/package/libglog/libglog.mk index e7a2043343..cfc2874b05 100644 --- a/package/libglog/libglog.mk +++ b/package/libglog/libglog.mk @@ -4,9 +4,9 @@ # ################################################################################ -LIBGLOG_VERSION = 0.3.3 -LIBGLOG_SITE = http://google-glog.googlecode.com/files/ -LIBGLOG_SOURCE = glog-${LIBGLOG_VERSION}.tar.gz +LIBGLOG_VERSION = 0.3.5 +LIBGLOG_SITE = https://github.com/google/glog/archive/ +LIBGLOG_SOURCE = v${LIBGLOG_VERSION}.tar.gz LIBGLOG_LICENSE = BSD-3c LIBGLOG_LICENSE_FILES = COPYING LIBGLOG_INSTALL_STAGING = YES diff --git a/package/libmikmod/libmikmod.mk b/package/libmikmod/libmikmod.mk index 63deaff386..c2e678eb90 100644 --- a/package/libmikmod/libmikmod.mk +++ b/package/libmikmod/libmikmod.mk @@ -3,7 +3,7 @@ # libmikmod # ############################################################# -LIBMIKMOD_VERSION:=3.3.6 +LIBMIKMOD_VERSION:=3.3.11.1 LIBMIKMOD_SITE:=http://sourceforge.net/projects/mikmod/files/libmikmod/$(LIBMIKMOD_VERSION) LIBMIKMOD_CONF_OPT = --localstatedir=/var \ @@ -20,3 +20,4 @@ endef LIBMIKMOD_POST_INSTALL_TARGET_HOOKS += LIBMIKMOD_REMOVE_LIBMIKMOD_CONFIG $(eval $(autotools-package)) + diff --git a/package/libpng/libpng.mk b/package/libpng/libpng.mk index be5cd2faab..cb3d370c40 100644 --- a/package/libpng/libpng.mk +++ b/package/libpng/libpng.mk @@ -4,10 +4,10 @@ # ################################################################################ -LIBPNG_VERSION = 1.4.13 +LIBPNG_VERSION = 1.4.11 LIBPNG_SERIES = 14 LIBPNG_SOURCE = libpng-$(LIBPNG_VERSION).tar.bz2 -LIBPNG_SITE = http://downloads.sourceforge.net/project/libpng/libpng${LIBPNG_SERIES}/$(LIBPNG_VERSION) +LIBPNG_SITE = http://downloads.sourceforge.net/project/libpng/libpng${LIBPNG_SERIES}/older-releases/$(LIBPNG_VERSION) LIBPNG_LICENSE = libpng license LIBPNG_LICENSE_FILES = LICENSE LIBPNG_INSTALL_STAGING = YES diff --git a/package/mesa3d-etna_viv/mesa3d-etna_viv-master-002-uclibc-should-not-use-__progname.patch b/package/mesa3d-etna_viv/mesa3d-etna_viv-master-002-uclibc-should-not-use-__progname.patch new file mode 100644 index 0000000000..9f75f84a96 --- /dev/null +++ b/package/mesa3d-etna_viv/mesa3d-etna_viv-master-002-uclibc-should-not-use-__progname.patch @@ -0,0 +1,38 @@ +From 7228c645d6950a9fc4a64f6a13d6633c3baa209b Mon Sep 17 00:00:00 2001 +From: Jens Nyberg +Date: Sun, 21 Feb 2016 16:02:20 +0100 +Subject: [PATCH] uclibc should not use __progname + +--- + src/mesa/drivers/dri/common/xmlconfig.c | 8 +++----- + 1 file changed, 3 insertions(+), 5 deletions(-) + +diff --git a/src/mesa/drivers/dri/common/xmlconfig.c b/src/mesa/drivers/dri/common/xmlconfig.c +index ce37647..bc7ea02 100644 +--- a/src/mesa/drivers/dri/common/xmlconfig.c ++++ b/src/mesa/drivers/dri/common/xmlconfig.c +@@ -39,7 +39,7 @@ + + #undef GET_PROGRAM_NAME + +-#if (defined(__GNU_LIBRARY__) || defined(__GLIBC__)) && !defined(__UCLIBC__) ++#if (defined(__GNU_LIBRARY__) || defined(__GLIBC__)) + # if !defined(__GLIBC__) || (__GLIBC__ < 2) + /* These aren't declared in any libc5 header */ + extern char *program_invocation_name, *program_invocation_short_name; +@@ -86,10 +86,8 @@ static const char *__getProgramName () { + #endif + + #if !defined(GET_PROGRAM_NAME) +-# if defined(__OpenBSD__) || defined(NetBSD) || defined(__UCLIBC__) || defined(ANDROID) +-/* This is a hack. It's said to work on OpenBSD, NetBSD and GNU. +- * Rogelio M.Serrano Jr. reported it's also working with UCLIBC. It's +- * used as a last resort, if there is no documented facility available. */ ++# if defined(__OpenBSD__) || defined(NetBSD) || defined(ANDROID) ++/* This is a hack. It's said to work on OpenBSD, NetBSD and GNU. */ + static const char *__getProgramName () { + extern const char *__progname; + char * arg = strrchr(__progname, '/'); +-- +2.7.1 + diff --git a/package/ncurses/ncurses-gcc5fix.patch b/package/ncurses/ncurses-gcc5fix.patch new file mode 100644 index 0000000000..0d45015dc9 --- /dev/null +++ b/package/ncurses/ncurses-gcc5fix.patch @@ -0,0 +1,47 @@ +from https://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/sys-libs/ncurses/files/ncurses-5.9-gcc-5.patch?revision=1.1 +https://bugs.gentoo.org/545114 + +extracted from the upstream change (which had many unrelated commits in one) + +From 97bb4678dc03e753290b39bbff30ba2825df9517 Mon Sep 17 00:00:00 2001 +From: "Thomas E. Dickey" +Date: Sun, 7 Dec 2014 03:10:09 +0000 +Subject: [PATCH] ncurses 5.9 - patch 20141206 + ++ modify MKlib_gen.sh to work around change in development version of + gcc introduced here: + https://gcc.gnu.org/ml/gcc-patches/2014-06/msg02185.html + https://gcc.gnu.org/ml/gcc-patches/2014-07/msg00236.html + (reports by Marcus Shawcroft, Maohui Lei). + +diff --git a/ncurses/base/MKlib_gen.sh b/ncurses/base/MKlib_gen.sh +index d8cc3c9..b91398c 100755 +--- a/ncurses/base/MKlib_gen.sh ++++ b/ncurses/base/MKlib_gen.sh +@@ -474,11 +474,22 @@ sed -n -f $ED1 \ + -e 's/gen_$//' \ + -e 's/ / /g' >>$TMP + ++cat >$ED1 < $ED2 ++cat $ED2 >$TMP ++ + $preprocessor $TMP 2>/dev/null \ +-| sed \ +- -e 's/ / /g' \ +- -e 's/^ //' \ +- -e 's/_Bool/NCURSES_BOOL/g' \ ++| sed -f $ED1 \ + | $AWK -f $AW2 \ + | sed -f $ED3 \ + | sed \ diff --git a/package/xinetd/xinetd.mk b/package/xinetd/xinetd.mk index 34a449f907..3662586dff 100644 --- a/package/xinetd/xinetd.mk +++ b/package/xinetd/xinetd.mk @@ -5,7 +5,7 @@ ################################################################################ XINETD_VERSION = 2.3.15 -XINETD_SITE = http://www.xinetd.org +XINETD_SITE = ftp://anduin.linuxfromscratch.org/BLFS/xinetd/ XINETD_LICENSE = xinetd license XINETD_LICENSE_FILES = COPYRIGHT