From owner-svn-ports-all@freebsd.org Fri Apr 24 19:22:05 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4EC202C0108; Fri, 24 Apr 2020 19:22:05 +0000 (UTC) (envelope-from jwb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4983vd0Zspz41lT; Fri, 24 Apr 2020 19:22:05 +0000 (UTC) (envelope-from jwb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id F1E8F23059; Fri, 24 Apr 2020 19:22:04 +0000 (UTC) (envelope-from jwb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 03OJM4ro016228; Fri, 24 Apr 2020 19:22:04 GMT (envelope-from jwb@FreeBSD.org) Received: (from jwb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 03OJM3ek016223; Fri, 24 Apr 2020 19:22:03 GMT (envelope-from jwb@FreeBSD.org) Message-Id: <202004241922.03OJM3ek016223@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jwb set sender to jwb@FreeBSD.org using -f From: "Jason W. Bacon" Date: Fri, 24 Apr 2020 19:22:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r532890 - in head/audio/praat: . files X-SVN-Group: ports-head X-SVN-Commit-Author: jwb X-SVN-Commit-Paths: in head/audio/praat: . files X-SVN-Commit-Revision: 532890 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Apr 2020 19:22:05 -0000 Author: jwb Date: Fri Apr 24 19:22:03 2020 New Revision: 532890 URL: https://svnweb.freebsd.org/changeset/ports/532890 Log: audio/praat: Upgrade to 6.1.13 Clean up patches Switch from OSS to ALSA (upstream default) Left in and documented patches to ease switch to OSS or JACK in case of runtime issues Releasing maintainership as I no longer work with any praat users Reported by: portscout Deleted: head/audio/praat/files/patch-sys_melder.h head/audio/praat/files/patch-sys_melder__alloc.cpp head/audio/praat/files/patch-sys_melder__files.cpp head/audio/praat/files/patch-sys_melder__strings.cpp Modified: head/audio/praat/Makefile head/audio/praat/distinfo head/audio/praat/files/makefile.defs.freebsd.alsa head/audio/praat/files/patch-external_portaudio_Makefile head/audio/praat/files/patch-external_portaudio_pa__unix__hostapis.c Modified: head/audio/praat/Makefile ============================================================================== --- head/audio/praat/Makefile Fri Apr 24 18:50:13 2020 (r532889) +++ head/audio/praat/Makefile Fri Apr 24 19:22:03 2020 (r532890) @@ -1,28 +1,49 @@ # $FreeBSD$ -PORTNAME= praat -PORTVERSION= 5.4.08 +PORTNAME= praat DISTVERSIONPREFIX= v -PORTREVISION= 4 -CATEGORIES= audio science +DISTVERSION= 6.1.13 +CATEGORIES= audio science -MAINTAINER= jwb@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Phonetics by Computer LICENSE= GPLv2 +LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ + libfreetype.so:print/freetype2 \ + libjack.so:audio/jack \ + libasound.so:audio/alsa-lib + USES= compiler:c++11-lang dos2unix gnome iconv pkgconfig +USE_GNOME= cairo gdkpixbuf2 gtk20 USE_GITHUB= yes + DOS2UNIX_REGEX= .*Makefile -USE_GNOME= gtk20 -MAKEFILE= makefile PLIST_FILES= bin/praat man/man1/praat.1.gz +HARDCPPFLAGS= ${WRKSRC}/EEG/Makefile \ + ${WRKSRC}/FFNet/Makefile \ + ${WRKSRC}/LPC/Makefile \ + ${WRKSRC}/artsynth/Makefile \ + ${WRKSRC}/dwsys/Makefile \ + ${WRKSRC}/dwtools/Makefile \ + ${WRKSRC}/external/clapack/blas/Makefile \ + ${WRKSRC}/external/clapack/lapack/Makefile \ + ${WRKSRC}/external/espeak/Makefile \ + ${WRKSRC}/external/flac/Makefile \ + ${WRKSRC}/external/gsl/Makefile \ + ${WRKSRC}/external/mp3/Makefile \ + ${WRKSRC}/fon/Makefile \ + ${WRKSRC}/gram/Makefile \ + ${WRKSRC}/kar/Makefile \ + ${WRKSRC}/main/Makefile \ + ${WRKSRC}/melder/Makefile \ + ${WRKSRC}/stat/Makefile \ + ${WRKSRC}/sys/Makefile + post-patch: - @${FIND} ${WRKSRC} -name Makefile -exec \ - ${REINPLACE_CMD} -e 's|^CFLAGS =|CFLAGS +=|' {} \; - @${FIND} ${WRKSRC} -name Makefile -exec \ - ${REINPLACE_CMD} -e 's|^CPPFLAGS =|CPPFLAGS +=|' {} \; + @${REINPLACE_CMD} -e 's|^CPPFLAGS =|CPPFLAGS +=|' ${HARDCPPFLAGS} @${CP} ${FILESDIR}/makefile.defs.freebsd.alsa \ ${WRKSRC}/makefile.defs @${REINPLACE_CMD} -e 's|%%WRKSRC%%|${WRKSRC}|g' \ @@ -31,8 +52,7 @@ post-patch: @${REINPLACE_CMD} -e 's| log2| NUMlog2|g' \ -e 's|feof (f)|feof (f.get_ptr())|g' \ -e 's|ferror (f)|ferror (f.get_ptr())|g' \ - ${WRKSRC}/dwtools/Sound_extensions.cpp \ - ${WRKSRC}/fon/Sound_files.cpp + ${WRKSRC}/dwtools/Sound_extensions.cpp do-install: ${INSTALL_PROGRAM} ${WRKSRC}/praat ${STAGEDIR}${PREFIX}/bin Modified: head/audio/praat/distinfo ============================================================================== --- head/audio/praat/distinfo Fri Apr 24 18:50:13 2020 (r532889) +++ head/audio/praat/distinfo Fri Apr 24 19:22:03 2020 (r532890) @@ -1,2 +1,3 @@ -SHA256 (praat-praat-v5.4.08_GH0.tar.gz) = 820f6c6e43a46c565778c2494fef6de3b0c5100e78ae5e2979194619c332e165 -SIZE (praat-praat-v5.4.08_GH0.tar.gz) = 6973960 +TIMESTAMP = 1587744774 +SHA256 (praat-praat-v6.1.13_GH0.tar.gz) = 986988da02091bd9fa011fcf7118a453c6b39b95bebaf44fc18b5a9bd134ec82 +SIZE (praat-praat-v6.1.13_GH0.tar.gz) = 30971542 Modified: head/audio/praat/files/makefile.defs.freebsd.alsa ============================================================================== --- head/audio/praat/files/makefile.defs.freebsd.alsa Fri Apr 24 18:50:13 2020 (r532889) +++ head/audio/praat/files/makefile.defs.freebsd.alsa Fri Apr 24 19:22:03 2020 (r532890) @@ -2,24 +2,31 @@ # File: makefile.defs.linux.alsa # System: Linux -# Paul Boersma, 26 October 2013 +# Paul Boersma, 23 March 2020 +# J Bacon, 24 April 2020 CC ?= gcc - CXX ?= g++ -CFLAGS = -std=gnu99 -DUNIX -Dlinux -DHAVE_SYS_SOUNDCARD_H `pkg-config --cflags gtk+-2.0` -Werror=implicit -Wreturn-type -Wunused -Wunused-parameter -Wuninitialized -O1 -g1 +# -DALSA or -DJACK: Use ALSA or Jack audio in pa_unix_hostapis.c +COMMONFLAGS = -DUNIX -Dlinux -DALSA -D_FILE_OFFSET_BITS=64 `pkg-config --cflags gtk+-2.0` -Wreturn-type -Wunused -Wunused-parameter -Wuninitialized -O1 -g1 -pthread -CXXFLAGS = -std=gnu++11 -Wshadow -DUNIX -Dlinux -DHAVE_SYS_SOUNDCARD_H `pkg-config --cflags gtk+-2.0` -Werror=implicit -Wreturn-type -Wunused -Wunused-parameter -Wuninitialized -O1 -g1 -I%%WRKSRC%%/sys -I%%WRKSRC%%/dwsys -I%%WRKSRC%%/num -I%%WRKSRC%%/stat -I%%WRKSRC%%/kar -I%%WRKSRC%%/dwtools -I%%WRKSRC%%/fon -I%%WRKSRC%%/LPC -I%%WRKSRC%%/EEG -I%%WRKSRC%%/external/espeak -I%%WRKSRC%%/external/flac -I%%WRKSRC%%/external/mp3 -I%%WRKSRC%%/external/gsl -I%%LOCALBASE%%/include -I%%LOCALBASE%%/include/unicode +CFLAGS = -DHAVE_SYS_SOUNDCARD_H -std=gnu99 $(COMMONFLAGS) -Werror=implicit +CXXFLAGS = -std=c++17 $(COMMONFLAGS) -Wshadow -DHAVE_SYS_SOUNDCARD_H -Werror=implicit -I%%WRKSRC%%/sys -I%%WRKSRC%%/dwsys -I%%WRKSRC%%/num -I%%WRKSRC%%/stat -I%%WRKSRC%%/kar -I%%WRKSRC%%/dwtools -I%%WRKSRC%%/fon -I%%WRKSRC%%/LPC -I%%WRKSRC%%/EEG -I%%WRKSRC%%/melder -I%%WRKSRC%%/external/espeak -I%%WRKSRC%%/external/flac -I%%WRKSRC%%/external/mp3 -I%%WRKSRC%%/external/gsl -I%%WRKSRC%%/external/clapack -I%%LOCALBASE%%/include -I%%LOCALBASE%%/include/unicode + LINK ?= $(CXX) EXECUTABLE = praat -LIBS = `pkg-config --libs gtk+-2.0` -L%%LOCALBASE%%/lib -lm -lpthread -ltinfow +LIBS = `pkg-config --libs gtk+-2.0` -L%%LOCALBASE%%/lib -lasound -lm -lpthread -ltinfow AR = ar RANLIB = ls ICON = MAIN_ICON = -PA_BACKEND = pa_unix_oss.o + +# Replace pa_linux_alsa.o in portaudio/Makefile. +# Does not seem necessary anymore. If not, the portaudio patches can probably +# be removed as well. +# PA_BACKEND = pa_unix_oss.o Modified: head/audio/praat/files/patch-external_portaudio_Makefile ============================================================================== --- head/audio/praat/files/patch-external_portaudio_Makefile Fri Apr 24 18:50:13 2020 (r532889) +++ head/audio/praat/files/patch-external_portaudio_Makefile Fri Apr 24 19:22:03 2020 (r532890) @@ -1,13 +1,14 @@ ---- external/portaudio/Makefile.orig 2016-07-26 15:41:19 UTC +--- external/portaudio/Makefile.orig 2019-11-27 13:52:21 UTC +++ external/portaudio/Makefile -@@ -3,8 +3,9 @@ +@@ -3,8 +3,10 @@ include ../../makefile.defs +PA_BACKEND ?= pa_linux_alsa.o ++ OBJECTS = \ -- pa_unix_hostapis.o pa_unix_util.o pa_linux_alsa.o \ -+ pa_unix_hostapis.o pa_unix_util.o $(PA_BACKEND) \ +- pa_unix_hostapis.o pa_unix_util.o pa_linux_alsa.o pa_jack.o pa_ringbuffer.o \ ++ pa_unix_hostapis.o pa_unix_util.o $(PA_BACKEND) pa_jack.o pa_ringbuffer.o \ pa_win_hostapis.o pa_win_util.o pa_win_wmme.o pa_win_waveformat.o \ pa_front.o pa_debugprint.o pa_cpuload.o \ pa_allocation.o pa_process.o pa_converters.o pa_dither.o \ Modified: head/audio/praat/files/patch-external_portaudio_pa__unix__hostapis.c ============================================================================== --- head/audio/praat/files/patch-external_portaudio_pa__unix__hostapis.c Fri Apr 24 18:50:13 2020 (r532889) +++ head/audio/praat/files/patch-external_portaudio_pa__unix__hostapis.c Fri Apr 24 19:22:03 2020 (r532890) @@ -1,9 +1,9 @@ ---- external/portaudio/pa_unix_hostapis.c.orig 2015-05-20 01:47:31 UTC +--- external/portaudio/pa_unix_hostapis.c.orig 2019-11-26 11:48:46 UTC +++ external/portaudio/pa_unix_hostapis.c -@@ -60,6 +60,8 @@ PaUtilHostApiInitializer *paHostApiIniti - { - #if defined (linux) && defined (ALSA) - PaAlsa_Initialize, // ppgb +@@ -64,6 +64,8 @@ PaUtilHostApiInitializer *paHostApiInitializers[] = + #elif defined (JACK) + PaJack_Initialize, + #endif + #else + PaOSS_Initialize, #endif