Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 19 Jul 2020 08:45:03 +0000 (UTC)
From:      Piotr Kubaj <pkubaj@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org
Subject:   svn commit: r542545 - in branches/2020Q3/audio/audacity: . files
Message-ID:  <202007190845.06J8j3jb011552@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pkubaj
Date: Sun Jul 19 08:45:03 2020
New Revision: 542545
URL: https://svnweb.freebsd.org/changeset/ports/542545

Log:
  MFH: r542544
  
  audio/audacity: fix build on non-x86
  
  Disable MMX/SSE/SSE2 on non-x86.
  
  Include cstring in allegro.h to make memcpy() available.
  
  PR:		248076
  Approved by:	xxjack12xx@gmail.com (maintainer)
  
  Approved by:	portmgr (fix build blanket)

Added:
  branches/2020Q3/audio/audacity/files/patch-lib-src_portsmf_allegro.h
     - copied unchanged from r542544, head/audio/audacity/files/patch-lib-src_portsmf_allegro.h
Modified:
  branches/2020Q3/audio/audacity/Makefile
Directory Properties:
  branches/2020Q3/   (props changed)

Modified: branches/2020Q3/audio/audacity/Makefile
==============================================================================
--- branches/2020Q3/audio/audacity/Makefile	Sun Jul 19 08:43:50 2020	(r542544)
+++ branches/2020Q3/audio/audacity/Makefile	Sun Jul 19 08:45:03 2020	(r542545)
@@ -126,6 +126,14 @@ VORBIS_LIB_DEPENDS=	libogg.so:audio/libogg \
 
 VST_CMAKE_BOOL=		audacity_use_vst
 
+.include <bsd.port.options.mk>
+
+.if ${ARCH} != amd64 && ${ARCH} != i386
+CMAKE_ARGS+=	-DHAVE_MMX:BOOL=OFF \
+		-DHAVE_SSE:BOOL=OFF \
+		-DHAVE_SSE2:BOOL=OFF
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's,Python2,Python${PYTHON_MAJOR_VER}, ; \
 		/CMAKE_CXX_STANDARD/s,14,11,' ${WRKSRC}/CMakeLists.txt

Copied: branches/2020Q3/audio/audacity/files/patch-lib-src_portsmf_allegro.h (from r542544, head/audio/audacity/files/patch-lib-src_portsmf_allegro.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2020Q3/audio/audacity/files/patch-lib-src_portsmf_allegro.h	Sun Jul 19 08:45:03 2020	(r542545, copy of r542544, head/audio/audacity/files/patch-lib-src_portsmf_allegro.h)
@@ -0,0 +1,10 @@
+--- lib-src/portsmf/allegro.h.orig	2020-07-18 17:54:26 UTC
++++ lib-src/portsmf/allegro.h
+@@ -51,6 +51,7 @@
+ #include <assert.h>
+ #include <istream>
+ #include <ostream>
++#include <cstring>
+ 
+ #define ALG_EPS 0.000001 // epsilon
+ #define ALG_DEFAULT_BPM 100.0 // default tempo



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202007190845.06J8j3jb011552>