Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

This file was deleted.

4 changes: 2 additions & 2 deletions package/cmake/cmake.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions package/libglog/libglog.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion package/libmikmod/libmikmod.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -20,3 +20,4 @@ endef
LIBMIKMOD_POST_INSTALL_TARGET_HOOKS += LIBMIKMOD_REMOVE_LIBMIKMOD_CONFIG

$(eval $(autotools-package))

4 changes: 2 additions & 2 deletions package/libpng/libpng.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
From 7228c645d6950a9fc4a64f6a13d6633c3baa209b Mon Sep 17 00:00:00 2001
From: Jens Nyberg <jens.nyberg@gmail.com>
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

47 changes: 47 additions & 0 deletions package/ncurses/ncurses-gcc5fix.patch
Original file line number Diff line number Diff line change
@@ -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" <dickey@invisible-island.net>
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 <<EOF
+s/ / /g
+s/^ //
+s/ $//
+s/P_NCURSES_BOOL/NCURSES_BOOL/g
+EOF
+
+# A patch discussed here:
+# https://gcc.gnu.org/ml/gcc-patches/2014-06/msg02185.html
+# introduces spurious #line markers. Work around that by ignoring the system's
+# attempt to define "bool" and using our own symbol here.
+sed -e 's/bool/P_NCURSES_BOOL/g' $TMP > $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 \
2 changes: 1 addition & 1 deletion package/xinetd/xinetd.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down