jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-24 11:16:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #935 from MilhouseVH/packages_after_gcc6_mk2

Browse Source 
Package updates: bump various packages after gcc-6
This commit is contained in:
Lukas Rusak 2016-11-15 16:26:08 -08:00 committed by GitHub
commit 5d65364754
15 changed files with 28 additions and 263 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/audio/taglib/package.mk
View File

@ -17,7 +17,7 @@
################################################################################
PKG_NAME="taglib"
PKG_VERSION="1.9.1"
PKG_VERSION="1.11"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="LGPL"

128
packages/audio/taglib/patches/taglib-01_bytevector.patch
View File

@ -1,128 +0,0 @@
From 4a7d31c87bf41c1de21cb725176d5b34c2a95720 Mon Sep 17 00:00:00 2001
From: Tsuda Kageyu <tsuda.kageyu@gmail.com>
Date: Thu, 14 Nov 2013 14:05:32 +0900
Subject: [PATCH] Rewrote ByteVector::replace() simpler
---
taglib/toolkit/tbytevector.cpp | 77 +++++++++++++++---------------------------
tests/test_bytevector.cpp | 5 +++
2 files changed, 33 insertions(+), 49 deletions(-)
diff --git a/taglib/toolkit/tbytevector.cpp b/taglib/toolkit/tbytevector.cpp
index b658246..566a20f 100644
--- a/taglib/toolkit/tbytevector.cpp
+++ b/taglib/toolkit/tbytevector.cpp
@@ -31,6 +31,7 @@
#include <iostream>
#include <cstdio>
#include <cstring>
+#include <cstddef>
#include <tstring.h>
#include <tdebug.h>
@@ -508,62 +509,40 @@ ByteVector &ByteVector::replace(const ByteVector &pattern, const ByteVector &wit
if(pattern.size() == 0 || pattern.size() > size())
return *this;
- const uint withSize = with.size();
- const uint patternSize = pattern.size();
- int offset = 0;
+ const size_t withSize = with.size();
+ const size_t patternSize = pattern.size();
+ const ptrdiff_t diff = withSize - patternSize;
+
+ size_t offset = 0;
+ while (true)
+ {
+ offset = find(pattern, offset);
+ if(offset == static_cast<size_t>(-1)) // Use npos in taglib2.
+ break;
- if(withSize == patternSize) {
- // I think this case might be common enough to optimize it
detach();
- offset = find(pattern);
- while(offset >= 0) {
- ::memcpy(data() + offset, with.data(), withSize);
- offset = find(pattern, offset + withSize);
- }
- return *this;
- }
- // calculate new size:
- uint newSize = 0;
- for(;;) {
- int next = find(pattern, offset);
- if(next < 0) {
- if(offset == 0)
- // pattern not found, do nothing:
- return *this;
- newSize += size() - offset;
- break;
+ if(diff < 0) {
+ ::memmove(
+ data() + offset + withSize,
+ data() + offset + patternSize,
+ size() - offset - patternSize);
+ resize(size() + diff);
}
- newSize += (next - offset) + withSize;
- offset = next + patternSize;
- }
-
- // new private data of appropriate size:
- ByteVectorPrivate *newData = new ByteVectorPrivate(newSize, 0);
- char *target = DATA(newData);
- const char *source = data();
-
- // copy modified data into new private data:
- offset = 0;
- for(;;) {
- int next = find(pattern, offset);
- if(next < 0) {
- ::memcpy(target, source + offset, size() - offset);
- break;
+ else if(diff > 0) {
+ resize(size() + diff);
+ ::memmove(
+ data() + offset + withSize,
+ data() + offset + patternSize,
+ size() - diff - offset - patternSize);
}
- int chunkSize = next - offset;
- ::memcpy(target, source + offset, chunkSize);
- target += chunkSize;
- ::memcpy(target, with.data(), withSize);
- target += withSize;
- offset += chunkSize + patternSize;
- }
- // replace private data:
- if(d->deref())
- delete d;
+ ::memcpy(data() + offset, with.data(), with.size());
- d = newData;
+ offset += withSize;
+ if(offset > size() - patternSize)
+ break;
+ }
return *this;
}
diff --git a/tests/test_bytevector.cpp b/tests/test_bytevector.cpp
index 9efd23a..eca74f8 100644
--- a/tests/test_bytevector.cpp
+++ b/tests/test_bytevector.cpp
@@ -239,6 +239,11 @@ class TestByteVector : public CppUnit::TestFixture
a.replace(ByteVector("ab"), ByteVector());
CPPUNIT_ASSERT_EQUAL(ByteVector("cdf"), a);
}
+ {
+ ByteVector a("abcdabf");
+ a.replace(ByteVector("bf"), ByteVector("x"));
+ CPPUNIT_ASSERT_EQUAL(ByteVector("abcdax"), a);
+ }
}
};

2
packages/debug/gdb/package.mk
View File

@ -17,7 +17,7 @@
################################################################################
PKG_NAME="gdb"
PKG_VERSION="7.11"
PKG_VERSION="7.11.1"
PKG_REV="2"
PKG_ARCH="any"
PKG_LICENSE="GPL"

2
packages/devel/binutils/package.mk
View File

@ -17,7 +17,7 @@
################################################################################
PKG_NAME="binutils"
PKG_VERSION="2.26"
PKG_VERSION="2.27"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

96
packages/devel/binutils/patches/binutils-2.24-multi_os_directory.patch
View File

@ -1,96 +0,0 @@
diff -Naur binutils-2.21-old/bfd/configure binutils-2.21-new/bfd/configure
--- binutils-2.21-old/bfd/configure 2010-12-08 07:11:15.000000000 -0800
+++ binutils-2.21-new/bfd/configure 2010-12-08 07:12:23.000000000 -0800
@@ -10326,7 +10326,7 @@
# Ok, now we have the path, separated by spaces, we can step through it
# and add multilib dir if necessary.
lt_tmp_lt_search_path_spec=
- lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+ lt_multi_os_dir='../lib'
for lt_sys_path in $lt_search_path_spec; do
if test -d "$lt_sys_path/$lt_multi_os_dir"; then
lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
diff -Naur binutils-2.21-old/binutils/configure binutils-2.21-new/binutils/configure
--- binutils-2.21-old/binutils/configure 2010-12-08 07:11:15.000000000 -0800
+++ binutils-2.21-new/binutils/configure 2010-12-08 07:12:23.000000000 -0800
@@ -10120,7 +10120,7 @@
# Ok, now we have the path, separated by spaces, we can step through it
# and add multilib dir if necessary.
lt_tmp_lt_search_path_spec=
- lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+ lt_multi_os_dir='../lib'
for lt_sys_path in $lt_search_path_spec; do
if test -d "$lt_sys_path/$lt_multi_os_dir"; then
lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
diff -Naur binutils-2.21-old/gas/configure binutils-2.21-new/gas/configure
--- binutils-2.21-old/gas/configure 2010-12-08 07:11:15.000000000 -0800
+++ binutils-2.21-new/gas/configure 2010-12-08 07:12:23.000000000 -0800
@@ -10109,7 +10109,7 @@
# Ok, now we have the path, separated by spaces, we can step through it
# and add multilib dir if necessary.
lt_tmp_lt_search_path_spec=
- lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+ lt_multi_os_dir='../lib'
for lt_sys_path in $lt_search_path_spec; do
if test -d "$lt_sys_path/$lt_multi_os_dir"; then
lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
diff -Naur binutils-2.21-old/gprof/configure binutils-2.21-new/gprof/configure
--- binutils-2.21-old/gprof/configure 2010-12-08 07:11:15.000000000 -0800
+++ binutils-2.21-new/gprof/configure 2010-12-08 07:12:23.000000000 -0800
@@ -10039,7 +10039,7 @@
# Ok, now we have the path, separated by spaces, we can step through it
# and add multilib dir if necessary.
lt_tmp_lt_search_path_spec=
- lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+ lt_multi_os_dir='../lib'
for lt_sys_path in $lt_search_path_spec; do
if test -d "$lt_sys_path/$lt_multi_os_dir"; then
lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
diff -Naur binutils-2.21-old/ld/configure binutils-2.21-new/ld/configure
--- binutils-2.21-old/ld/configure 2010-12-08 07:11:15.000000000 -0800
+++ binutils-2.21-new/ld/configure 2010-12-08 07:12:23.000000000 -0800
@@ -10536,7 +10536,7 @@
# Ok, now we have the path, separated by spaces, we can step through it
# and add multilib dir if necessary.
lt_tmp_lt_search_path_spec=
- lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+ lt_multi_os_dir='../lib'
for lt_sys_path in $lt_search_path_spec; do
if test -d "$lt_sys_path/$lt_multi_os_dir"; then
lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
diff -Naur binutils-2.21-old/libiberty/Makefile.in binutils-2.21-new/libiberty/Makefile.in
--- binutils-2.21-old/libiberty/Makefile.in 2010-12-08 07:11:15.000000000 -0800
+++ binutils-2.21-new/libiberty/Makefile.in 2010-12-08 07:12:23.000000000 -0800
@@ -346,7 +346,7 @@
# multilib-specific flags, it's overridden by FLAGS_TO_PASS from the
# default multilib, so we have to take CFLAGS into account as well,
# since it will be passed the multilib flags.
-MULTIOSDIR = `$(CC) $(CFLAGS) -print-multi-os-directory`
+MULTIOSDIR = '../lib'
install_to_libdir: all
${mkinstalldirs} $(DESTDIR)$(libdir)/$(MULTIOSDIR)
$(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)n
diff -Naur binutils-2.21-old/libtool.m4 binutils-2.21-new/libtool.m4
--- binutils-2.21-old/libtool.m4 2010-12-08 07:11:15.000000000 -0800
+++ binutils-2.21-new/libtool.m4 2010-12-08 07:12:23.000000000 -0800
@@ -2043,7 +2043,7 @@
# Ok, now we have the path, separated by spaces, we can step through it
# and add multilib dir if necessary.
lt_tmp_lt_search_path_spec=
- lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+ lt_multi_os_dir='../lib'
for lt_sys_path in $lt_search_path_spec; do
if test -d "$lt_sys_path/$lt_multi_os_dir"; then
lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
diff -Naur binutils-2.21-old/opcodes/configure binutils-2.21-new/opcodes/configure
--- binutils-2.21-old/opcodes/configure 2010-12-08 07:11:15.000000000 -0800
+++ binutils-2.21-new/opcodes/configure 2010-12-08 07:12:23.000000000 -0800
@@ -10056,7 +10056,7 @@
# Ok, now we have the path, separated by spaces, we can step through it
# and add multilib dir if necessary.
lt_tmp_lt_search_path_spec=
- lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+ lt_multi_os_dir='../lib'
for lt_sys_path in $lt_search_path_spec; do
if test -d "$lt_sys_path/$lt_multi_os_dir"; then
lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"

4
packages/devel/boost/package.mk
View File

@ -17,12 +17,12 @@
################################################################################
PKG_NAME="boost"
PKG_VERSION="1_60_0"
PKG_VERSION="1_61_0"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="OSS"
PKG_SITE="http://www.boost.org/"
PKG_URL="$SOURCEFORGE_SRC/boost/boost/1.60.0/${PKG_NAME}_${PKG_VERSION}.tar.bz2"
PKG_URL="$SOURCEFORGE_SRC/boost/boost/1.61.0/${PKG_NAME}_${PKG_VERSION}.tar.bz2"
PKG_SOURCE_DIR="${PKG_NAME}_${PKG_VERSION}"
PKG_DEPENDS_HOST=""
PKG_DEPENDS_TARGET="toolchain boost:host Python:host zlib bzip2"

2
packages/devel/make/package.mk
View File

@ -17,7 +17,7 @@
################################################################################
PKG_NAME="make"
PKG_VERSION="4.1"
PKG_VERSION="4.2.1"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPLv3"

2
packages/multimedia/libamcodec/package.mk
View File

@ -23,7 +23,7 @@ PKG_LICENSE="other"
PKG_SITE="http://openlinux.amlogic.com"
case $TARGET_ARCH in
arm)
PKG_VERSION="45a1086"
PKG_VERSION="5e23a81"
PKG_URL="https://github.com/codesnake/libamcodec/archive/$PKG_VERSION.tar.gz"
;;
aarch64)

9
packages/multimedia/rtmpdump/package.mk
View File

@ -41,6 +41,7 @@ make_target() {
CC="$CC" \
LD="$LD" \
AR="$AR" \
SHARED=no \
CRYPTO="OPENSSL" \
OPT="" \
XCFLAGS="$CFLAGS" \
@ -57,6 +58,7 @@ makeinstall_target() {
CC="$CC" \
LD="$LD" \
AR="$AR" \
SHARED=no \
CRYPTO="OPENSSL" \
OPT="" \
XCFLAGS="$CFLAGS" \
@ -72,6 +74,7 @@ makeinstall_target() {
CC="$CC" \
LD="$LD" \
AR="$AR" \
SHARED=no \
CRYPTO="OPENSSL" \
OPT="" \
XCFLAGS="$CFLAGS" \
@ -83,7 +86,7 @@ makeinstall_target() {
post_makeinstall_target() {
rm -rf $INSTALL/usr/sbin
# to be removed: hack for "compatibility"
mkdir -p $INSTALL/usr/lib
ln -sf librtmp.so.1 $INSTALL/usr/lib/librtmp.so.0
# # to be removed: hack for "compatibility"
# mkdir -p $INSTALL/usr/lib
# ln -sf librtmp.so.1 $INSTALL/usr/lib/librtmp.so.0
}

4
packages/network/openssh/package.mk
View File

@ -17,12 +17,12 @@
################################################################################
PKG_NAME="openssh"
PKG_VERSION="7.2p2"
PKG_VERSION="7.3p1"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="OSS"
PKG_SITE="http://www.openssh.com/"
PKG_URL="ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/$PKG_NAME-$PKG_VERSION.tar.gz"
PKG_URL="http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/$PKG_NAME-$PKG_VERSION.tar.gz"
PKG_DEPENDS_TARGET="toolchain zlib libressl"
PKG_SECTION="network"
PKG_SHORTDESC="openssh: An open re-implementation of the SSH package"

14
packages/security/libgcrypt/package.mk
View File

@ -17,7 +17,7 @@
################################################################################
PKG_NAME="libgcrypt"
PKG_VERSION="1.6.5"
PKG_VERSION="1.7.3"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPLv2"
@ -31,10 +31,18 @@ PKG_LONGDESC="Libgcrypt is a general purpose cryptographic library based on the
PKG_IS_ADDON="no"
PKG_AUTORECONF="yes"
PKG_CONFIGURE_OPTS_TARGET="ac_cv_sys_symbol_underscore=no \
PKG_CONFIGURE_OPTS_TARGET="CC_FOR_BUILD=$HOST_CC \
ac_cv_sys_symbol_underscore=no \
--enable-asm \
--with-gnu-ld \
--with-libgpg-error-prefix=$SYSROOT_PREFIX/usr"
--with-libgpg-error-prefix=$SYSROOT_PREFIX/usr \
--disable-doc"
pre_configure_target() {
# libgcrypt-1.7.x fails to build with LTO support
# see for example https://bugs.gentoo.org/show_bug.cgi?id=581114
strip_lto
}
post_makeinstall_target() {
sed -e "s:\(['= ]\)\"/usr:\\1\"$SYSROOT_PREFIX/usr:g" -i src/$PKG_NAME-config

14
packages/security/libgcrypt/patches/libgcrypt-disable-docs.patch
View File

@ -1,14 +0,0 @@
diff -Naur libgcrypt-1.6.4/Makefile.am libgcrypt-1.6.4.patch/Makefile.am
--- libgcrypt-1.6.4/Makefile.am 2015-09-07 14:05:57.000000000 +0200
+++ libgcrypt-1.6.4.patch/Makefile.am 2016-01-03 00:00:27.392411468 +0100
@@ -24,8 +24,8 @@
# (A suitable gitlog-to-changelog script can be found in GnuPG master.)
GITLOG_TO_CHANGELOG=gitlog-to-changelog
-DIST_SUBDIRS = m4 compat mpi cipher random src doc tests
-SUBDIRS = compat mpi cipher random src doc tests
+DIST_SUBDIRS = m4 compat mpi cipher random src
+SUBDIRS = compat mpi cipher random src
EXTRA_DIST = autogen.sh autogen.rc README.GIT LICENSES \
ChangeLog-2011 build-aux/ChangeLog-2011 doc/ChangeLog-2011 \

2
packages/sysutils/kmod/package.mk
View File

@ -17,7 +17,7 @@
################################################################################
PKG_NAME="kmod"
PKG_VERSION="22"
PKG_VERSION="23"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

2
packages/sysutils/util-linux/package.mk
View File

@ -17,7 +17,7 @@
################################################################################
PKG_NAME="util-linux"
PKG_VERSION="2.28"
PKG_VERSION="2.28.1"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

8
packages/x11/data/xkeyboard-config/patches/xkeyboard-config-01_autoconf-macrodir.patch.bk
View File

@ -1,8 +0,0 @@
diff -Naur xkeyboard-config-2.10.1/configure.ac xkeyboard-config-2.10.1.patch/configure.ac
--- xkeyboard-config-2.10.1/configure.ac 2013-10-03 23:28:04.000000000 +0200
+++ xkeyboard-config-2.10.1.patch/configure.ac 2013-12-11 01:08:51.903855838 +0100
@@ -1,3 +1,4 @@
+AC_CONFIG_MACRO_DIR([m4])
AC_INIT(xkeyboard-config, 2.10.1)
AC_CONFIG_SRCDIR(rules/base.xml.in)
AM_INIT_AUTOMAKE([foreign dist-bzip2])