Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 26 Oct 2018 06:12:30 +0000 (UTC)
From:      Yuri Victorovich <yuri@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r483007 - in head/audio/speech-denoiser-lv2: . files
Message-ID:  <201810260612.w9Q6CUpG033616@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: yuri
Date: Fri Oct 26 06:12:30 2018
New Revision: 483007
URL: https://svnweb.freebsd.org/changeset/ports/483007

Log:
  audio/speech-denoiser-lv2: Fix build on 12; Fix build on non-Intel architectures
  
  On 12: Remove the unsupported optimization option
  On non-Intel architectures: make SSE options based on the port option on amd64/i386 only
  
  Reported by:	fallout

Added:
  head/audio/speech-denoiser-lv2/files/patch-meson__options.txt   (contents, props changed)
Modified:
  head/audio/speech-denoiser-lv2/Makefile
  head/audio/speech-denoiser-lv2/files/patch-meson.build

Modified: head/audio/speech-denoiser-lv2/Makefile
==============================================================================
--- head/audio/speech-denoiser-lv2/Makefile	Fri Oct 26 05:46:02 2018	(r483006)
+++ head/audio/speech-denoiser-lv2/Makefile	Fri Oct 26 06:12:30 2018	(r483007)
@@ -2,6 +2,7 @@
 
 PORTNAME=	speech-denoiser
 DISTVERSION=	g20181007
+PORTREVISION=	1
 CATEGORIES=	audio
 PKGNAMESUFFIX=	-lv2
 
@@ -22,6 +23,13 @@ GH_TAGNAME=	04cfba9
 PLIST_FILES=	lib/lv2/sdenoise.lv2/manifest.ttl \
 		lib/lv2/sdenoise.lv2/sdenoise.so \
 		lib/lv2/sdenoise.lv2/sdenoise.ttl
+
+OPTIONS_DEFINE_amd64=	SIMD
+OPTIONS_DEFINE_i386=	SIMD
+OPTIONS_DEFAULT_amd64=	SIMD
+OPTIONS_DEFAULT_i386=	SIMD
+
+SIMD_MESON_ON=		-Duse_sse=true
 
 pre-configure:
 	@cd ${WRKSRC} && ${LN} -s _build build

Modified: head/audio/speech-denoiser-lv2/files/patch-meson.build
==============================================================================
--- head/audio/speech-denoiser-lv2/files/patch-meson.build	Fri Oct 26 05:46:02 2018	(r483006)
+++ head/audio/speech-denoiser-lv2/files/patch-meson.build	Fri Oct 26 06:12:30 2018	(r483007)
@@ -9,8 +9,21 @@
  inc_rnnoise = include_directories('rnnoise/include')
  
  #dependencies for speech denoise
-@@ -25,7 +25,7 @@ endif
- cflags = ['-msse','-msse2','-mfpmath=sse','-ffast-math','-fomit-frame-pointer','-fno-finite-math-only']
+@@ -19,13 +19,17 @@ lv2_dep = dependency('lv2', required : t
+ nr_dep = [m_dep,lv2_dep,lib_rnnoise]
+ 
+ #compiler optimization flags
+-if meson.get_compiler('c').get_id() == 'clang'
+-  add_global_arguments('-mrecip', language : 'c')
++#if meson.get_compiler('c').get_id() == 'clang'
++#  add_global_arguments('-mrecip', language : 'c')
++#endif
++if get_option('use_sse')
++  cflags = ['-msse','-msse2','-mfpmath=sse','-ffast-math','-fomit-frame-pointer','-fno-finite-math-only']
++else
++  cflags = ['-ffast-math','-fomit-frame-pointer','-fno-finite-math-only']
+ endif
+-cflags = ['-msse','-msse2','-mfpmath=sse','-ffast-math','-fomit-frame-pointer','-fno-finite-math-only']
  
  #install folder
 -install_folder = 'sdenoise.lv2'

Added: head/audio/speech-denoiser-lv2/files/patch-meson__options.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/audio/speech-denoiser-lv2/files/patch-meson__options.txt	Fri Oct 26 06:12:30 2018	(r483007)
@@ -0,0 +1,4 @@
+--- meson_options.txt.orig	2018-10-26 06:03:32 UTC
++++ meson_options.txt
+@@ -0,0 +1 @@
++option('use_sse', type: 'boolean', value: false, description: 'Use SSE optimization')



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