From 449617bf48438873f424f8dc0e6731c57ee13f65 Mon Sep 17 00:00:00 2001 From: "Sascha Kuehndel (InuSasha)" Date: Sun, 28 Jul 2019 11:37:10 +0200 Subject: [PATCH] bzip2: update to 1.0.8 --- packages/compress/bzip2/package.mk | 8 ++++---- .../compress/bzip2/patches/bzip2-1.0.6-cflags.patch | 12 ------------ .../compress/bzip2/patches/bzip2-1.0.8-cflags.patch | 11 +++++++++++ 3 files changed, 15 insertions(+), 16 deletions(-) delete mode 100644 packages/compress/bzip2/patches/bzip2-1.0.6-cflags.patch create mode 100644 packages/compress/bzip2/patches/bzip2-1.0.8-cflags.patch diff --git a/packages/compress/bzip2/package.mk b/packages/compress/bzip2/package.mk index 9a128383d9..7b7d434230 100644 --- a/packages/compress/bzip2/package.mk +++ b/packages/compress/bzip2/package.mk @@ -3,11 +3,11 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="bzip2" -PKG_VERSION="1.0.6" -PKG_SHA256="a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd" +PKG_VERSION="1.0.8" +PKG_SHA256="ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269" PKG_LICENSE="GPL" -PKG_SITE="http://www.bzip.org" -PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_SITE="https://sourceware.org/bzip2/" +PKG_URL="https://sourceware.org/pub/bzip2/bzip2-${PKG_VERSION}.tar.gz" PKG_DEPENDS_HOST="gcc:host" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="A high-quality bzip2 data compressor." diff --git a/packages/compress/bzip2/patches/bzip2-1.0.6-cflags.patch b/packages/compress/bzip2/patches/bzip2-1.0.6-cflags.patch deleted file mode 100644 index d0ef3c65d9..0000000000 --- a/packages/compress/bzip2/patches/bzip2-1.0.6-cflags.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur bzip2-1.0.6/Makefile-libbz2_so bzip2-1.0.6.patch/Makefile-libbz2_so ---- bzip2-1.0.6/Makefile-libbz2_so 2010-09-11 01:07:52.000000000 +0200 -+++ bzip2-1.0.6.patch/Makefile-libbz2_so 2013-03-31 18:26:33.335234891 +0200 -@@ -35,7 +35,7 @@ - bzlib.o - - all: $(OBJS) -- $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.6 $(OBJS) -+ $(CC) $(CFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.6 $(OBJS) - $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.6 - rm -f libbz2.so.1.0 - ln -s libbz2.so.1.0.6 libbz2.so.1.0 diff --git a/packages/compress/bzip2/patches/bzip2-1.0.8-cflags.patch b/packages/compress/bzip2/patches/bzip2-1.0.8-cflags.patch new file mode 100644 index 0000000000..b46d56c664 --- /dev/null +++ b/packages/compress/bzip2/patches/bzip2-1.0.8-cflags.patch @@ -0,0 +1,11 @@ +--- bzip2-1.0.8/Makefile-libbz2_so.orig 2019-07-28 09:43:16.597589341 +0200 ++++ bzip2-1.0.8/Makefile-libbz2_so 2019-07-28 09:53:41.142160730 +0200 +@@ -35,7 +35,7 @@ + bzlib.o + + all: $(OBJS) +- $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.8 $(OBJS) ++ $(CC) $(CFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.8 $(OBJS) + $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.8 + rm -f libbz2.so.1.0 + ln -s libbz2.so.1.0.8 libbz2.so.1.0