svn commit: r566549 - in branches/2021Q1: astro/opencpn editors/libreoffice editors/libreoffice/files/powerpc64 editors/libreoffice6 editors/libreoffice6/files editors/libreoffice6/files/powerpc64 ...

Piotr Kubaj pkubaj at FreeBSD.org
Thu Feb 25 18:32:34 UTC 2021 

Author: pkubaj
Date: Thu Feb 25 18:32:27 2021
New Revision: 566549
URL: https://svnweb.freebsd.org/changeset/ports/566549

Log:
  MFH: r560298 r560302 r561371 r562151 r562559 r563142 r563143 r563149 r565356 r565465 r566011 r566182
  
  finance/quickfix: fix build on non-x86
  
  Code uses x86 assembly, but makes it possible to use Boost atomic.
  
  multimedia/zoneminder: enable on powerpc64
  
  net/mpich: fix build on powerpc64
  
  Neither __BYTE_ORDER nor __BIG_ENDIAN are defined:
  In file included from src/mpi/datatype/typerep/dataloop/looputil.c:10:
  ./src/mpi/datatype/typerep/dataloop/looputil.h:57:2: error: This code assumes that __BYTE_ORDER and __BIG_ENDIAN are defined
  #error This code assumes that __BYTE_ORDER and __BIG_ENDIAN are defined
  
  editors/libreoffice: fix build on powerpc64 elfv2
  
  This set of patches is applied only on powerpc* architectures.
  
  Submitted by:	afsilva
  Approved by:	tier 2 blanket
  
  security/openconnect-gui: fix checksum
  
  emulators/riscv-isa-sim: enable on powerpc64
  
  sysutils/linuxfdisk: enable on powerpc64
  
  graphics/openfx-arena: enable on powerpc64
  
  multimedia/arcan: enable LUAJIT on powerpc64
  
  It builds fine with luajit-openresty.
  
  games/libretro-desmume2015: fix build on non-x86 / ARM
  
  JIT is only for x86 and ARM.
  
  astro/opencpn: fix build on powerpc64*
  
  Use GCC unconditionally on powerpc64*:
  In file included from /usr/lib/clang/11.0.1/include/xmmintrin.h:13:
  /usr/lib/clang/11.0.1/include/mmintrin.h:33:5: error: use of undeclared identifier '__builtin_ia32_emms'; did you mean '__builtin_isless'?
      __builtin_ia32_emms();
  
  editors/libreoffice6: backport powerpc* patches to libreoffice6
  
  Approved by:	tier 2 blanket

Added:
  branches/2021Q1/editors/libreoffice/files/powerpc64/
     - copied from r562151, head/editors/libreoffice/files/powerpc64/
  branches/2021Q1/editors/libreoffice6/files/powerpc64/
     - copied from r566182, head/editors/libreoffice6/files/powerpc64/
  branches/2021Q1/games/libretro-desmume2015/files/patch-desmume_src_libretro-common_features_features__cpu.c
     - copied unchanged from r565465, head/games/libretro-desmume2015/files/patch-desmume_src_libretro-common_features_features__cpu.c
Modified:
  branches/2021Q1/astro/opencpn/Makefile
  branches/2021Q1/editors/libreoffice/Makefile
  branches/2021Q1/editors/libreoffice6/Makefile
  branches/2021Q1/editors/libreoffice6/files/patch-powerpc
  branches/2021Q1/emulators/riscv-isa-sim/Makefile
  branches/2021Q1/finance/quickfix/Makefile
  branches/2021Q1/games/libretro-desmume2015/Makefile
  branches/2021Q1/graphics/openfx-arena/Makefile
  branches/2021Q1/multimedia/arcan/Makefile
  branches/2021Q1/multimedia/zoneminder/Makefile
  branches/2021Q1/net/mpich/Makefile
  branches/2021Q1/security/openconnect-gui/distinfo
  branches/2021Q1/sysutils/linuxfdisk/Makefile
Directory Properties:
  branches/2021Q1/   (props changed)

Modified: branches/2021Q1/astro/opencpn/Makefile
==============================================================================
--- branches/2021Q1/astro/opencpn/Makefile	Thu Feb 25 18:32:23 2021	(r566548)
+++ branches/2021Q1/astro/opencpn/Makefile	Thu Feb 25 18:32:27 2021	(r566549)
@@ -17,8 +17,8 @@ LIB_DEPENDS=	libportaudio.so:audio/portaudio \
 		libtinyxml.so:textproc/tinyxml \
 		liblz4.so:archivers/liblz4
 
-USES=		cmake compiler:c++11-lang gettext-tools gl gnome \
-		localbase pkgconfig sqlite xorg
+USES=		cmake gettext-tools gl gnome libarchive localbase pkgconfig \
+		sqlite xorg
 USE_CXXSTD=	c++11
 USE_GITHUB=	yes
 GH_ACCOUNT=	${GH_PROJECT}
@@ -40,8 +40,10 @@ DOCS_CMAKE_OFF=	-DOCPN_BUNDLE_DOCS:STRING="OFF"
 
 .include <bsd.port.options.mk>
 
-.if ${ARCH} == powerpc64
-CMAKE_ARGS+=	-DHAVE_MSSE=OFF -DHAVE_MSSE2=OFF -DHAVE_MSSE3=OFF -DHAVE_MAVX2=OFF -DHAVE_MFPU_NEON=OFF
+.if ${ARCH:Mpowerpc64*}
+USES+=	compiler:gcc-c++11-lib
+.else
+USES+=	compiler:c++11-lang
 .endif
 
 .include <bsd.port.pre.mk>

Modified: branches/2021Q1/editors/libreoffice/Makefile
==============================================================================
--- branches/2021Q1/editors/libreoffice/Makefile	Thu Feb 25 18:32:23 2021	(r566548)
+++ branches/2021Q1/editors/libreoffice/Makefile	Thu Feb 25 18:32:27 2021	(r566549)
@@ -279,6 +279,10 @@ MAKE_ENV+=	verbose=1
 
 .include <bsd.port.pre.mk>
 
+.if ${ARCH:Mpowerpc*}
+EXTRA_PATCHES+=	${FILESDIR}/powerpc64
+.endif
+
 .if ${ARCH} == powerpc || ${ARCH} == powerpcspe || ${ARCH} == powerpc64
 CONFIGURE_ARGS+=	--disable-skia
 .endif

Modified: branches/2021Q1/editors/libreoffice6/Makefile
==============================================================================
--- branches/2021Q1/editors/libreoffice6/Makefile	Thu Feb 25 18:32:23 2021	(r566548)
+++ branches/2021Q1/editors/libreoffice6/Makefile	Thu Feb 25 18:32:27 2021	(r566549)
@@ -288,6 +288,10 @@ MAKE_ENV+=	verbose=1
 WARNING=	"GTK3 visual style is incomplete yet, build at your own risk"
 .endif
 
+.if ${ARCH:Mpowerpc*}
+EXTRA_PATCHES+=	${FILESDIR}/powerpc64
+.endif
+
 .if ${CHOSEN_COMPILER_TYPE} == clang
 CXXFLAGS_WARN=	-Woverloaded-virtual -Wno-unused-parameter -Wno-unused-local-typedefs
 .else

Modified: branches/2021Q1/editors/libreoffice6/files/patch-powerpc
==============================================================================
--- branches/2021Q1/editors/libreoffice6/files/patch-powerpc	Thu Feb 25 18:32:23 2021	(r566548)
+++ branches/2021Q1/editors/libreoffice6/files/patch-powerpc	Thu Feb 25 18:32:27 2021	(r566549)
@@ -1,6 +1,6 @@
 --- configure.ac.orig	2019-08-08 20:00:41.682261000 +0800
 +++ configure.ac	2019-08-08 20:01:10.652575000 +0800
-@@ -4278,6 +4278,16 @@
+@@ -4278,6 +4278,21 @@
          RTL_ARCH=X86_64
          PLATFORMID=freebsd_x86_64
          ;;
@@ -9,6 +9,11 @@
 +        RTL_ARCH=PowerPC_64
 +        PLATFORMID=freebsd_powerpc64
 +        ;;
++    powerpc64le)
++        CPUNAME=POWERPC64
++        RTL_ARCH=PowerPC_64
++        PLATFORMID=freebsd_powerpc64_le
++        ;;
 +    powerpc|powerpcspe)
 +        CPUNAME=POWERPC
 +        RTL_ARCH=PowerPC
@@ -19,7 +24,7 @@
          ;;
 --- configure.orig	2019-08-07 01:54:44.000000000 +0800
 +++ configure	2019-08-08 20:00:26.166619000 +0800
-@@ -12537,6 +12537,16 @@
+@@ -12537,6 +12537,21 @@
           PLATFORMID=freebsd_aarch64
           RTL_ARCH=AARCH64
           ;;
@@ -27,6 +32,11 @@
 +        CPUNAME=POWERPC64
 +        RTL_ARCH=PowerPC_64
 +        PLATFORMID=freebsd_powerpc64
++        ;;
++    powerpc64le)
++        CPUNAME=POWERPC64
++        RTL_ARCH=PowerPC_64
++        PLATFORMID=freebsd_powerpc64_le
 +        ;;
 +    powerpc|powerpcspe)
 +        CPUNAME=POWERPC

Modified: branches/2021Q1/emulators/riscv-isa-sim/Makefile
==============================================================================
--- branches/2021Q1/emulators/riscv-isa-sim/Makefile	Thu Feb 25 18:32:23 2021	(r566548)
+++ branches/2021Q1/emulators/riscv-isa-sim/Makefile	Thu Feb 25 18:32:27 2021	(r566549)
@@ -10,7 +10,7 @@ COMMENT=	Spike, a RISC-V ISA Simulator
 
 LICENSE=	BSD3CLAUSE
 
-ONLY_FOR_ARCHS=	amd64
+ONLY_FOR_ARCHS=	amd64 powerpc64 powerpc64le
 
 USES=	compiler:c++11-lang gmake shebangfix
 

Modified: branches/2021Q1/finance/quickfix/Makefile
==============================================================================
--- branches/2021Q1/finance/quickfix/Makefile	Thu Feb 25 18:32:23 2021	(r566548)
+++ branches/2021Q1/finance/quickfix/Makefile	Thu Feb 25 18:32:27 2021	(r566549)
@@ -11,7 +11,6 @@ COMMENT=	Free FIX Protocol Implementation
 
 LICENSE=	GPLv3+
 
-BROKEN_powerpc64=	fails to configure: unable to find set_terminate in std or global namespace
 BROKEN_i386=	fails to build
 
 BUILD_DEPENDS=	bash:shells/bash
@@ -43,6 +42,14 @@ JAVA_USE=	java=yes
 JAVA_CONFIGURE_WITH=	java
 
 INSTALL_TARGET=install-strip
+
+.include <bsd.port.options.mk>
+
+.if ${ARCH} != amd64 && ${ARCH} != i386
+CXXFLAGS+=	-DENABLE_BOOST_ATOMIC_COUNT
+LIB_DEPENDS+=	libboost_system.so:devel/boost-libs
+USES+=		compiler:c++11-lang localbase
+.endif
 
 post-extract:
 	@${REINPLACE_CMD} -e 's|^make|gmake|' \

Modified: branches/2021Q1/games/libretro-desmume2015/Makefile
==============================================================================
--- branches/2021Q1/games/libretro-desmume2015/Makefile	Thu Feb 25 18:32:23 2021	(r566548)
+++ branches/2021Q1/games/libretro-desmume2015/Makefile	Thu Feb 25 18:32:27 2021	(r566549)
@@ -24,6 +24,12 @@ PLIST_FILES=	lib/libretro/desmume2015_libretro.so
 
 MAKEFILE=	Makefile.freebsd
 
+.include <bsd.port.options.mk>
+
+.if ${ARCH} != aarch64 || ${ARCH} != amd64 || !${ARCH:Marmv*} || ${ARCH} != i386
+MAKE_ENV+=	DESMUME_JIT=0
+.endif
+
 do-install:
 	${MKDIR} ${STAGEDIR}/${PREFIX}/lib/libretro;
 	${INSTALL_LIB} ${WRKSRC}/desmume/desmume2015_libretro.so ${STAGEDIR}/${PREFIX}/lib/libretro;

Copied: branches/2021Q1/games/libretro-desmume2015/files/patch-desmume_src_libretro-common_features_features__cpu.c (from r565465, head/games/libretro-desmume2015/files/patch-desmume_src_libretro-common_features_features__cpu.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2021Q1/games/libretro-desmume2015/files/patch-desmume_src_libretro-common_features_features__cpu.c	Thu Feb 25 18:32:27 2021	(r566549, copy of r565465, head/games/libretro-desmume2015/files/patch-desmume_src_libretro-common_features_features__cpu.c)
@@ -0,0 +1,11 @@
+--- desmume/src/libretro-common/features/features_cpu.c.orig	2021-02-16 18:16:47 UTC
++++ desmume/src/libretro-common/features/features_cpu.c
+@@ -144,7 +144,7 @@ retro_perf_tick_t cpu_features_get_perf_counter(void)
+    tv_sec     = (long)((ularge.QuadPart - epoch) / 10000000L);
+    tv_usec    = (long)(system_time.wMilliseconds * 1000);
+    time_ticks = (1000000 * tv_sec + tv_usec);
+-#elif defined(__linux__) || defined(__QNX__) || defined(__MACH__)
++#elif defined(_POSIX_MONOTONIC_CLOCK) || defined(__QNX__) || defined(ANDROID) || defined(__MACH__) || defined(__PSL1GHT__)
+    struct timespec tv = {0};
+    if (ra_clock_gettime(CLOCK_MONOTONIC, &tv) == 0)
+       time_ticks = (retro_perf_tick_t)tv.tv_sec * 1000000000 +

Modified: branches/2021Q1/graphics/openfx-arena/Makefile
==============================================================================
--- branches/2021Q1/graphics/openfx-arena/Makefile	Thu Feb 25 18:32:23 2021	(r566548)
+++ branches/2021Q1/graphics/openfx-arena/Makefile	Thu Feb 25 18:32:27 2021	(r566549)
@@ -11,7 +11,7 @@ COMMENT=	Extra OpenFX plugins for Natron
 
 LICENSE=	GPLv2
 
-ONLY_FOR_ARCHS=	amd64
+ONLY_FOR_ARCHS=	amd64 powerpc64 powerpc64le
 BUILD_DEPENDS=	opencl>=0:devel/opencl
 LIB_DEPENDS=	libOpenColorIO.so:graphics/opencolorio \
 		libfontconfig.so:x11-fonts/fontconfig \

Modified: branches/2021Q1/multimedia/arcan/Makefile
==============================================================================
--- branches/2021Q1/multimedia/arcan/Makefile	Thu Feb 25 18:32:23 2021	(r566548)
+++ branches/2021Q1/multimedia/arcan/Makefile	Thu Feb 25 18:32:27 2021	(r566549)
@@ -2,6 +2,7 @@
 
 PORTNAME=	arcan
 DISTVERSION=	0.6.0.1
+PORTREVISION=	1
 CATEGORIES=	multimedia
 
 MAINTAINER=	jbeich at FreeBSD.org
@@ -32,7 +33,6 @@ LDFLAGS_i386=	-Wl,-z,notext
 OPTIONS_DEFINE=	ESPEAK FFMPEG LUAJIT SDL SUID TESSERACT UVC VLC VNC WAYLAND
 OPTIONS_DEFAULT=ESPEAK FFMPEG LUAJIT SDL SUID TESSERACT UVC VLC VNC WAYLAND
 OPTIONS_EXCLUDE_aarch64=	LUAJIT # bug 225342
-OPTIONS_EXCLUDE_powerpc64=	LUAJIT
 OPTIONS_SUB=	yes
 
 ESPEAK_DESC=		Text to speech via eSpeak

Modified: branches/2021Q1/multimedia/zoneminder/Makefile
==============================================================================
--- branches/2021Q1/multimedia/zoneminder/Makefile	Thu Feb 25 18:32:23 2021	(r566548)
+++ branches/2021Q1/multimedia/zoneminder/Makefile	Thu Feb 25 18:32:27 2021	(r566549)
@@ -10,7 +10,7 @@ COMMENT=	Complete security camera solution, fully web 
 
 LICENSE=	GPLv2
 
-ONLY_FOR_ARCHS=	aarch64 amd64 i386
+ONLY_FOR_ARCHS=	aarch64 amd64 i386 powerpc64
 
 ZM_DEPENDS=	p5-DBI>=0:databases/p5-DBI \
 		p5-DBD-mysql>=0:databases/p5-DBD-mysql \

Modified: branches/2021Q1/net/mpich/Makefile
==============================================================================
--- branches/2021Q1/net/mpich/Makefile	Thu Feb 25 18:32:23 2021	(r566548)
+++ branches/2021Q1/net/mpich/Makefile	Thu Feb 25 18:32:27 2021	(r566549)
@@ -58,6 +58,8 @@ CONFIGURE_ARGS=	--enable-fast="" --with-hwloc-prefix=$
 		MPICHLIB_LDFLAGS="${LDFLAGS}" LDFLAGS="" \
 		MPICHLIB_LIBS="${LIBS}" LIBS=""
 
+CFLAGS_powerpc64=	-D__BIG_ENDIAN
+
 .include <bsd.port.options.mk>
 
 .for pm in ${OPTIONS_GROUP_PM}

Modified: branches/2021Q1/security/openconnect-gui/distinfo
==============================================================================
--- branches/2021Q1/security/openconnect-gui/distinfo	Thu Feb 25 18:32:23 2021	(r566548)
+++ branches/2021Q1/security/openconnect-gui/distinfo	Thu Feb 25 18:32:27 2021	(r566549)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1591544711
-SHA256 (openconnect-openconnect-gui-v1.4.1_GH0.tar.gz) = a8d156d056a81be1c895738f0a4299b60fc87b608fcb9676b8f2d5215b7101ae
-SIZE (openconnect-openconnect-gui-v1.4.1_GH0.tar.gz) = 10025784
+TIMESTAMP = 1611572481
+SHA256 (openconnect-openconnect-gui-v1.4.1_GH0.tar.gz) = 5f609e10eafc8885699e503c1dca9d9154d18741cfd09c1222d05b8af448c1d1
+SIZE (openconnect-openconnect-gui-v1.4.1_GH0.tar.gz) = 10026785

Modified: branches/2021Q1/sysutils/linuxfdisk/Makefile
==============================================================================
--- branches/2021Q1/sysutils/linuxfdisk/Makefile	Thu Feb 25 18:32:23 2021	(r566548)
+++ branches/2021Q1/sysutils/linuxfdisk/Makefile	Thu Feb 25 18:32:27 2021	(r566549)
@@ -14,7 +14,7 @@ COMMENT=	Fdisk, a partition tables manipulator, from u
 
 WRKSRC=		${WRKDIR}/util-linux-${PORTVERSION}/fdisk
 USES=		tar:bzip2
-ONLY_FOR_ARCHS=	i386 amd64
+ONLY_FOR_ARCHS=	i386 amd64 powerpc64 powerpc64le
 
 pre-patch:
 	@${CP} ${FILESDIR}/linuxfdisk-Makefile ${WRKSRC}/Makefile

More information about the svn-ports-all mailing list