Attachment #218613 for bug #250206

View | Details | Raw Unified | Return to bug 250206
Collapse All | Expand All





PORTNAME=	ardour6
PORTVERSION=	6.3.0
PORTREVISION=	2
CATEGORIES=	audio
MASTER_SITES=	https://github.com/beerml/ardour_releases/raw/master/
# The original master side points to the latest release only:

		libcurl.so:ftp/curl \
		libogg.so:audio/libogg \
		libFLAC.so:audio/flac \
		libSoundTouch.so:audio/soundtouch \
		libwebsockets.so:net/libwebsockets

USES=		compiler:c++11-lang desktop-file-utils gettext gnome \

.include <bsd.port.pre.mk>

.if ${ARCH} == "i386"
# only support for i686 or better
WITH_ARCH_FLAGS=	--arch='-msse -mfpmath=sse -march=i686 -DARCH_X86' --dist-target=i686
.elif ${ARCH} == "amd64"
WITH_ARCH_FLAGS=	--arch='-msse -mfpmath=sse -DARCH_X86' --dist-target=x86_64
.elif ${ARCH:Mpowerpc*}
LLD_UNSAFE=	yes
.endif




--- wscript.orig	2020-07-08 18:34:29 UTC
+++ wscript
@@ -502,7 +502,7 @@ int main() { return 0; }''',
         c_flags.append("-Qunused-arguments")
         cxx_flags.append("-Qunused-arguments")
 
-    if (re.search ("(i[0-9]86|x86_64|AMD64)", cpu) != None) and conf.env['build_target'] != 'none':
+    if (re.search ("(i[0-9]86|x86_64|amd64|AMD64)", cpu) != None) and conf.env['build_target'] != 'none':
 
         #
         # ARCH_X86 means anything in the x86 family from i386 to x86_64
@@ -534,6 +534,13 @@ int main() { return 0; }''',
                 compiler_flags.append ("-march=i586")
             elif cpu == "i686":
                 compiler_flags.append ("-march=i686")
+
+        else :
+            # and cpu == 'amd64' :
+            # this is 20yo tech and present in all 64bit cpus
+            build_host_supports_sse = True
+            compiler_flags.append ("-mmmx")
+            compiler_flags.append ("-m3dnow")
 
         if not is_clang and ((conf.env['build_target'] == 'i686') or (conf.env['build_target'] == 'x86_64')) and build_host_supports_sse:
             compiler_flags.extend ([ flags_dict['sse'], flags_dict['fpmath-sse'], flags_dict['xmmintrinsics'] ])

Return to bug 250206

Lines 3-9 Link Here

(-)audio/ardour6/Makefile (-3 / +5 lines)
3		3
4	PORTNAME= ardour6	4	PORTNAME= ardour6
5	PORTVERSION= 6.3.0	5	PORTVERSION= 6.3.0
6	PORTREVISION= 1	6	PORTREVISION= 2
7	CATEGORIES= audio	7	CATEGORIES= audio
8	MASTER_SITES= https://github.com/beerml/ardour_releases/raw/master/	8	MASTER_SITES= https://github.com/beerml/ardour_releases/raw/master/
9	# The original master side points to the latest release only:	9	# The original master side points to the latest release only:
Lines 41-46 Link Here
41	libcurl.so:ftp/curl \	41	libcurl.so:ftp/curl \
42	libogg.so:audio/libogg \	42	libogg.so:audio/libogg \
43	libFLAC.so:audio/flac \	43	libFLAC.so:audio/flac \
		44	libSoundTouch.so:audio/soundtouch \
44	libwebsockets.so:net/libwebsockets	45	libwebsockets.so:net/libwebsockets
45		46
46	USES= compiler:c++11-lang desktop-file-utils gettext gnome \	47	USES= compiler:c++11-lang desktop-file-utils gettext gnome \
Lines 105-113 Link Here
105	.include <bsd.port.pre.mk>	106	.include <bsd.port.pre.mk>
106		107
107	.if ${ARCH} == "i386"	108	.if ${ARCH} == "i386"
108	WITH_ARCH_FLAGS= --arch='-msse -mfpmath=sse' --dist-target=i386	109	# only support for i686 or better
		110	WITH_ARCH_FLAGS= --arch='-msse -mfpmath=sse -march=i686 -DARCH_X86' --dist-target=i686
109	.elif ${ARCH} == "amd64"	111	.elif ${ARCH} == "amd64"
110	WITH_ARCH_FLAGS= --arch='-msse -mfpmath=sse' --dist-target=x86_64	112	WITH_ARCH_FLAGS= --arch='-msse -mfpmath=sse -DARCH_X86' --dist-target=x86_64
111	.elif ${ARCH:Mpowerpc*}	113	.elif ${ARCH:Mpowerpc*}
112	LLD_UNSAFE= yes	114	LLD_UNSAFE= yes
113	.endif	115	.endif

Lines 1-25 Link Here

(-)audio/ardour6/files/patch-wscript (-25 lines)
1	--- wscript.orig 2020-07-08 18:34:29 UTC
2	+++ wscript
3	@@ -502,7 +502,7 @@ int main() { return 0; }''',
4	c_flags.append("-Qunused-arguments")
5	cxx_flags.append("-Qunused-arguments")
6
7	- if (re.search ("(i[0-9]86\|x86_64\|AMD64)", cpu) != None) and conf.env['build_target'] != 'none':
8	+ if (re.search ("(i[0-9]86\|x86_64\|amd64\|AMD64)", cpu) != None) and conf.env['build_target'] != 'none':
9
10	#
11	# ARCH_X86 means anything in the x86 family from i386 to x86_64
12	@@ -534,6 +534,13 @@ int main() { return 0; }''',
13	compiler_flags.append ("-march=i586")
14	elif cpu == "i686":
15	compiler_flags.append ("-march=i686")
16	+
17	+ else :
18	+ # and cpu == 'amd64' :
19	+ # this is 20yo tech and present in all 64bit cpus
20	+ build_host_supports_sse = True
21	+ compiler_flags.append ("-mmmx")
22	+ compiler_flags.append ("-m3dnow")
23
24	if not is_clang and ((conf.env['build_target'] == 'i686') or (conf.env['build_target'] == 'x86_64')) and build_host_supports_sse:
25	compiler_flags.extend ([ flags_dict['sse'], flags_dict['fpmath-sse'], flags_dict['xmmintrinsics'] ])