From a936869371683b3929dcaa7573dc10192c24b72b Mon Sep 17 00:00:00 2001 From: cultab Date: Wed, 5 Oct 2022 13:30:24 +0300 Subject: [PATCH 1/2] MEGAsdk: update to v3.9.11d Added a patch to include a missing header file that MEGAcmd expects to exist. --- common/shlibs | 2 +- srcpkgs/MEGAsdk/patches/missing_headers.patch | 11 +++++++++++ srcpkgs/MEGAsdk/template | 11 ++++++++--- 3 files changed, 20 insertions(+), 4 deletions(-) create mode 100644 srcpkgs/MEGAsdk/patches/missing_headers.patch diff --git a/common/shlibs b/common/shlibs index 5d4b0a9899ad..147f2e056606 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3120,7 +3120,7 @@ libvted-3.so.0 libvted-3.7.0_2 libpeasd-3.so.0 libpeasd-3.7.0_2 libgstreamerd-3.so.0 libgstreamerd-3.7.0_2 libgtkdgl-3.so.0 libgtkdgl-3.7.0_2 -libmega.so.30703 MEGAsdk-3.7.3c_2 +libmega.so.30911 MEGAsdk-3.9.11d_1 libopenglrecorder.so.0 libopenglrecorder-0.1.0_1 libgpod.so.4 libgpod-0.8.3_1 libi2c.so.0 i2c-tools-4.0_1 diff --git a/srcpkgs/MEGAsdk/patches/missing_headers.patch b/srcpkgs/MEGAsdk/patches/missing_headers.patch new file mode 100644 index 000000000000..0d66e5f76d47 --- /dev/null +++ b/srcpkgs/MEGAsdk/patches/missing_headers.patch @@ -0,0 +1,11 @@ +diff --color -Naru --show-c-function a/include/Makefile.am b/include/Makefile.am +--- a/include/Makefile.am 2022-06-15 15:24:15.000000000 +0300 ++++ b/include/Makefile.am 2022-10-05 12:13:09.443571788 +0300 +@@ -56,6 +56,7 @@ nobase_libmegainclude_HEADERS = \ + mega/gfx/freeimage.h \ + mega/gfx/GfxProcCG.h \ + mega/raid.h \ ++ mega/heartbeats.h \ + mega/mediafileattribute.h + + if BUILD_MEGAAPI diff --git a/srcpkgs/MEGAsdk/template b/srcpkgs/MEGAsdk/template index e9cbeb70f5db..ef5201531f4a 100644 --- a/srcpkgs/MEGAsdk/template +++ b/srcpkgs/MEGAsdk/template @@ -1,7 +1,7 @@ # Template file for 'MEGAsdk' pkgname=MEGAsdk -version=3.7.3c -revision=2 +version=3.9.11d +revision=1 wrksrc="sdk-${version}" build_style=gnu-configure configure_args="--enable-chat --disable-examples $(vopt_with libuv)" @@ -16,7 +16,7 @@ maintainer="Orphaned " license="BSD-2-Clause" homepage="https://mega.nz" distfiles="https://github.com/meganz/sdk/archive/v${version}.tar.gz" -checksum=0b55c1752d590a0367b9fcddd2465ea574308eb97e065540121f6261807aa111 +checksum=30e82b1ae1e1cc1b0b525dd88546ad12daa331d2e98fd9bbd85f1b936e404582 replaces="libmega>=0" build_options="libuv mediainfo" @@ -26,6 +26,11 @@ case "$XBPS_TARGET_MACHINE" in *) build_options_default="libuv mediainfo";; esac +if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then + makedepends+=" libatomic-devel" + LDFLAGS+="-latomic" +fi + do_check() { : #requires static gtest libs } From f9c8a36d5dd850511330b8165dbf378aabfcbedc Mon Sep 17 00:00:00 2001 From: cultab Date: Wed, 5 Oct 2022 13:33:17 +0300 Subject: [PATCH 2/2] MEGAcmd: update to 1.5.1 --- srcpkgs/MEGAcmd/patches/autotools.patch | 24 +++++++++++++++--------- srcpkgs/MEGAcmd/template | 4 ++-- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/srcpkgs/MEGAcmd/patches/autotools.patch b/srcpkgs/MEGAcmd/patches/autotools.patch index 770cc5a89b3b..9524ad3431d6 100644 --- a/srcpkgs/MEGAcmd/patches/autotools.patch +++ b/srcpkgs/MEGAcmd/patches/autotools.patch @@ -6,7 +6,7 @@ bin_PROGRAMS += $(MEGACMD) -$(MEGACMD): $(top_builddir)/sdk/src/libmega.la +$(MEGACMD): - noinst_HEADERS += src/comunicationsmanager.h src/configurationmanager.h src/megacmd.h src/megacmdlogger.h src/megacmdsandbox.h src/megacmdutils.h src/megacmdcommonutils.h src/listeners.h src/megacmdexecuter.h src/megacmdversion.h src/megacmdplatform.h src/comunicationsmanagerportsockets.h + noinst_HEADERS += src/comunicationsmanager.h src/configurationmanager.h src/megacmd.h src/megacmdlogger.h src/megacmdsandbox.h src/megacmdutils.h src/megacmdcommonutils.h src/listeners.h src/megacmdexecuter.h src/megacmdtransfermanager.h src/megacmdversion.h src/megacmdplatform.h src/comunicationsmanagerportsockets.h -megacmdcompletiondir = $(sysconfdir)/bash_completion.d/ +megacmdcompletiondir = $(datarootdir)/bash-completion/completions megacmdcompletion_DATA = src/client/megacmd_completion.sh @@ -35,7 +35,7 @@ -mega_cmd_LDADD = $(RL_LDFLAGS) $(RL_LIBS) $(TERMCAP_LDFLAGS) $(TERMCAP_LIBS) +mega_cmd_LDADD = $(RL_LDFLAGS) $(RL_LIBS) $(TERMCAP_LDFLAGS) $(TERMCAP_LIBS) $(MEGA_LIBS) - mega_cmd_server_CXXFLAGS = $(LMEGAINC) + mega_cmd_server_CXXFLAGS = $(LMEGAINC) $(DB_CXXFLAGS) if USE_PCRE @@ -41,9 +42,7 @@ mega_cmd_server_CXXFLAGS += -DUSE_PCRE=1 endif @@ -52,8 +52,8 @@ else --mega_cmd_server_LDADD=$(PCRE_LIBS) $(top_builddir)/sdk/src/libmega.la -+mega_cmd_server_LDADD=$(PCRE_LIBS) $(MEGA_LIBS) +-mega_cmd_server_LDADD=$(DB_LDFLAGS) $(DB_LIBS) $(PCRE_LIBS) $(top_builddir)/sdk/src/libmega.la ++mega_cmd_server_LDADD=$(DB_LDFLAGS) $(DB_LIBS) $(PCRE_LIBS) $(MEGA_LIBS) mega_cmd_server_SOURCES += src/comunicationsmanagerfilesockets.cpp -noinst_HEADERS += src/comunicationsmanagerfilesockets.h sdk/include/mega/thread/posixthread.h sdk/include/mega/logging.h @@ -75,23 +75,23 @@ #EXTRA_DIST += autogen.sh --- a/configure.ac +++ b/configure.ac -@@ -18,9 +18,6 @@ +@@ -18,10 +18,6 @@ # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. -m4_include([sdk/m4/ax_check_compile_flag.m4]) -m4_include([sdk/m4/ax_check_link_flag.m4]) -m4_include([sdk/m4/ax_cxx_compile_stdcxx.m4]) +-m4_include([sdk/m4/ax_atomic.m4]) m4_define([megacmd_major_version], [$(cat src/megacmdversion.h | grep "define MEGACMD_MAJOR" | cut -d" " -f 3)]) m4_define([megacmd_minor_version], [$(cat src/megacmdversion.h | grep "define MEGACMD_MINOR" | cut -d" " -f 3)]) -@@ -37,20 +34,18 @@ m4_define([megacmd_lt_age], [0]) +@@ -38,18 +34,18 @@ m4_define([megacmd_lt_age], [0]) AC_INIT([MEGAcmd], m4_esyscmd([ grep define < src/megacmdversion.h | awk '{print $3}' | awk 'BEGIN { RS = "" ; FS = "\n" } {printf $1"."$2"."$3}']), [https://github.com/meganz/megacmd]) --AM_INIT_AUTOMAKE +AM_INIT_AUTOMAKE([1.11 foreign silent-rules]) - ++ AC_PROG_CC AC_CONFIG_FILES(Makefile) AC_OUTPUT @@ -107,7 +107,13 @@ AC_CONFIG_HEADERS([src/megacmdconfig.h]) #this avoids inline definitions of stuff already defined in sdk's config.h (e.g: -DPACKAGE_NAME) LT_INIT([shared disable-static win32-dll]) -@@ -449,7 +444,8 @@ AM_CONDITIONAL([HAVE_PTHREAD], [test "${ +@@ -535,13 +531,11 @@ if test "$HAVE_PTHREAD" = "yes"; then + fi + AM_CONDITIONAL([HAVE_PTHREAD], [test "${HAVE_PTHREAD}" = "yes"]) + +-# Add -latomic to LDFLAGS if needed +-CHECK_ATOMIC() +- #This will simulate compilation of sdk and extract the includes defined for it. Thus we can # take care of the configuration done for the subproject withtout having to recheck here AC_OUTPUT diff --git a/srcpkgs/MEGAcmd/template b/srcpkgs/MEGAcmd/template index ba2108f3aa25..a17851eb7e00 100644 --- a/srcpkgs/MEGAcmd/template +++ b/srcpkgs/MEGAcmd/template @@ -1,6 +1,6 @@ # Template file for 'MEGAcmd' pkgname=MEGAcmd -version=1.4.0 +version=1.5.1 revision=1 wrksrc="${pkgname}-${version}_Linux" build_style=gnu-configure @@ -11,7 +11,7 @@ maintainer="Orphaned " license="BSD-2-Clause, GPL-3.0-or-later" homepage="https://github.com/meganz/MEGAcmd" distfiles="https://github.com/meganz/MEGAcmd/archive/${version}_Linux.tar.gz" -checksum=2a3626a9f1d22303fe2123f984a8ecf3779d6d59ac6c67c1bf43c2423dcb832d +checksum=911197d777c13bf3ff5c38af0b5fce478a3f96f1fecfc9647b38614512f5c1f3 replaces="megacmd>=0" if [ "$CROSS_BUILD" ]; then