From 79ed932dbe13168da59ebccb0bff12fe68b1510d Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Thu, 26 Sep 2019 13:11:40 -0500 Subject: [PATCH 1/4] crypto++: update to 820. --- common/shlibs | 2 +- srcpkgs/crypto++/patches/arm-native.patch | 26 ------------------- .../crypto++/patches/musl-soname-links.patch | 10 ------- srcpkgs/crypto++/template | 10 ++++--- 4 files changed, 8 insertions(+), 40 deletions(-) delete mode 100644 srcpkgs/crypto++/patches/arm-native.patch delete mode 100644 srcpkgs/crypto++/patches/musl-soname-links.patch diff --git a/common/shlibs b/common/shlibs index b362b34f155..b2ee025bc00 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1312,7 +1312,7 @@ libkworkspace5.so.5 kworkspace-5.14.5_2 libdb-5.3.so libdb-5.3.21_1 libdb_cxx-5.3.so libdb-cxx-5.3.21_1 libcares.so.2 c-ares-1.10.0_1 -libcryptopp.so.5.6 crypto++-565_1 +libcryptopp.so.8 crypto++-820_1 libphonon.so.4 phonon-4.6.0_1 libphononexperimental.so.4 phonon-4.6.0_1 libdbusmenu-glib.so.4 libdbusmenu-glib-12.10.2_1 diff --git a/srcpkgs/crypto++/patches/arm-native.patch b/srcpkgs/crypto++/patches/arm-native.patch deleted file mode 100644 index ff7678735d3..00000000000 --- a/srcpkgs/crypto++/patches/arm-native.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- GNUmakefile.orig -+++ GNUmakefile -@@ -125,23 +125,6 @@ - endif - endif - --# Guard use of -march=native --ifeq ($(GCC42_OR_LATER)$(IS_NETBSD),10) -- CXXFLAGS += -march=native --else ifneq ($(CLANG_COMPILER)$(INTEL_COMPILER),00) -- CXXFLAGS += -march=native --else -- # GCC 3.3 and "unknown option -march=" -- # Ubuntu GCC 4.1 compiler crash with -march=native -- # NetBSD GCC 4.8 compiler and "bad value (native) for -march= switch" -- # Sun compiler is handled below -- ifeq ($(SUN_COMPILER)$(IS_X64),01) -- CXXFLAGS += -m64 -- else ifeq ($(SUN_COMPILER)$(IS_X86),01) -- CXXFLAGS += -m32 -- endif # X86/X32/X64 --endif -- - # Aligned access required for -O3 and above due to vectorization - UNALIGNED_ACCESS := $(shell $(EGREP) -c "^[[:space:]]*//[[:space:]]*\#[[:space:]]*define[[:space:]]*CRYPTOPP_NO_UNALIGNED_DATA_ACCESS" config.h) - ifneq ($(UNALIGNED_ACCESS),0) diff --git a/srcpkgs/crypto++/patches/musl-soname-links.patch b/srcpkgs/crypto++/patches/musl-soname-links.patch deleted file mode 100644 index 34f3b4fbfe6..00000000000 --- a/srcpkgs/crypto++/patches/musl-soname-links.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- GNUmakefile.orig 2017-09-22 10:27:03.000000000 +0000 -+++ GNUmakefile 2017-09-22 10:34:42.897537258 +0000 -@@ -581,6 +581,7 @@ - -$(CHMOD) 0755 $(DESTDIR)$(LIBDIR)/libcryptopp.so$(SOLIB_VERSION_SUFFIX) - ifeq ($(HAS_SOLIB_VERSION),1) - -$(LN) -sf libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(DESTDIR)$(LIBDIR)/libcryptopp.so -+ -$(LN) -sf libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(DESTDIR)$(LIBDIR)/libcryptopp.so$(SOLIB_COMPAT_SUFFIX) - $(LDCONF) $(DESTDIR)$(LIBDIR) - endif - endif diff --git a/srcpkgs/crypto++/template b/srcpkgs/crypto++/template index bce3e38a963..1eb82ebbfc6 100644 --- a/srcpkgs/crypto++/template +++ b/srcpkgs/crypto++/template @@ -1,7 +1,7 @@ # Template build file for 'crypto++'. pkgname=crypto++ -version=565 -revision=3 +version=820 +revision=1 create_wrksrc=yes build_style=gnu-makefile make_build_target="libcryptopp.so libcryptopp.a" @@ -11,10 +11,14 @@ maintainer="Orphaned " homepage="http://www.cryptopp.com/" license="Boost Software License 1.0, Public domain" distfiles="http://www.cryptopp.com/cryptopp${version}.zip" -checksum=a75ef486fe3128008bbb201efee3dcdcffbe791120952910883b26337ec32c34 +checksum=03f0e2242e11b9d19b28d0ec5a3fa8ed5cc7b27640e6bed365744f593e858058 CXXFLAGS="-DNDEBUG -fPIC" +if [ "$XBPS_CROSS" ]; then + make_build_args="-f GNUmakefile-cross" +fi + post_extract() { sed -i -e 's/^CXXFLAGS/#CXXFLAGS/' GNUmakefile } From 090188d20a93eaa2953549f291f4ff71a0bbce20 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Thu, 26 Sep 2019 13:11:40 -0500 Subject: [PATCH 2/4] MEGAsdk: rebuild for crypto++ --- srcpkgs/MEGAsdk/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/MEGAsdk/template b/srcpkgs/MEGAsdk/template index 864b70a7adc..52aa7573279 100644 --- a/srcpkgs/MEGAsdk/template +++ b/srcpkgs/MEGAsdk/template @@ -1,7 +1,7 @@ # Template file for 'MEGAsdk' pkgname=MEGAsdk version=3.6.2a -revision=1 +revision=2 wrksrc="sdk-${version}" build_style=gnu-configure configure_args="--enable-chat --disable-examples $(vopt_with libuv)" From c397ef3f5e0b13c31dc7d12c8315f3be5a0ac9c5 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Thu, 26 Sep 2019 13:11:40 -0500 Subject: [PATCH 3/4] clementine: rebuild for crypto++ --- srcpkgs/clementine/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template index 1a58a07c556..74c67b8a687 100644 --- a/srcpkgs/clementine/template +++ b/srcpkgs/clementine/template @@ -1,7 +1,7 @@ # Template file for 'clementine' pkgname=clementine version=1.3.1 -revision=19 +revision=20 _commit=75f18dab23f0842713a4200a7e362efd51b12e31 wrksrc="Clementine-${_commit}" build_style=cmake From f293c3a71716ff88ae8979ceb087f3c96a965d50 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Thu, 26 Sep 2019 13:11:41 -0500 Subject: [PATCH 4/4] codecrypt: rebuild for crypto++ --- srcpkgs/codecrypt/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/codecrypt/template b/srcpkgs/codecrypt/template index 697c9672d6a..398289bf2c5 100644 --- a/srcpkgs/codecrypt/template +++ b/srcpkgs/codecrypt/template @@ -1,7 +1,7 @@ # Template file for 'codecrypt' pkgname=codecrypt version=1.8 -revision=2 +revision=3 build_style=gnu-configure hostmakedepends="automake libtool pkg-config" makedepends="crypto++-devel fftw-devel gmp-devel"