From owner-svn-ports-head@freebsd.org Fri Nov 13 11:09:01 2020 Return-Path: Delivered-To: svn-ports-head@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 A7A082D7565; Fri, 13 Nov 2020 11:09:01 +0000 (UTC) (envelope-from adridg@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 4CXbM14PZWz3mXX; Fri, 13 Nov 2020 11:09:01 +0000 (UTC) (envelope-from adridg@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 85D04173A2; Fri, 13 Nov 2020 11:09:01 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0ADB91aB040280; Fri, 13 Nov 2020 11:09:01 GMT (envelope-from adridg@FreeBSD.org) Received: (from adridg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0ADB90d4040277; Fri, 13 Nov 2020 11:09:00 GMT (envelope-from adridg@FreeBSD.org) Message-Id: <202011131109.0ADB90d4040277@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adridg set sender to adridg@FreeBSD.org using -f From: Adriaan de Groot Date: Fri, 13 Nov 2020 11:09:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r555012 - in head/audio/praat: . files X-SVN-Group: ports-head X-SVN-Commit-Author: adridg X-SVN-Commit-Paths: in head/audio/praat: . files X-SVN-Commit-Revision: 555012 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Nov 2020 11:09:01 -0000 Author: adridg Date: Fri Nov 13 11:09:00 2020 New Revision: 555012 URL: https://svnweb.freebsd.org/changeset/ports/555012 Log: Update audio/praat to latest upstream - One git patch can be removed (since git caught up with it) - Praat has switched to using GTK3, so chase that - .. since it doesn't have a sensible configure phase, hard-code a -lX11 into our makefile.defs, since the gtk3 libs don't pull that in, but the praat code does use XInternAtom directly. The release notes are, as always, at https://www.fon.hum.uva.nl/praat/manual/What_s_new_.html but the relevant change really only is "switch to GTK3". Deleted: head/audio/praat/files/patch-git-dcaf03d1f0d6d12689f604347d169bfc732af69a.diff Modified: head/audio/praat/Makefile head/audio/praat/distinfo head/audio/praat/files/makefile.defs.freebsd.alsa Modified: head/audio/praat/Makefile ============================================================================== --- head/audio/praat/Makefile Fri Nov 13 10:14:39 2020 (r555011) +++ head/audio/praat/Makefile Fri Nov 13 11:09:00 2020 (r555012) @@ -2,7 +2,7 @@ PORTNAME= praat DISTVERSIONPREFIX= v -DISTVERSION= 6.1.28 +DISTVERSION= 6.1.31 CATEGORIES= audio science MAINTAINER= adridg@FreeBSD.org @@ -16,8 +16,9 @@ LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libasound.so:audio/alsa-lib USES= compiler:c++11-lang dos2unix gnome iconv pkgconfig -USE_GNOME= cairo gdkpixbuf2 gtk20 +USE_GNOME= cairo gdkpixbuf2 gtk30 USE_GITHUB= yes +USE_XORG= x11 DOS2UNIX_REGEX= .*Makefile PLIST_FILES= bin/praat man/man1/praat.1.gz Modified: head/audio/praat/distinfo ============================================================================== --- head/audio/praat/distinfo Fri Nov 13 10:14:39 2020 (r555011) +++ head/audio/praat/distinfo Fri Nov 13 11:09:00 2020 (r555012) @@ -1,3 +1,3 @@ -TIMESTAMP = 1603738888 -SHA256 (praat-praat-v6.1.28_GH0.tar.gz) = c5d2d03d37584f5b94d30cd4df7974eec1a8225dd558ef9790f9ff32ba35bcfc -SIZE (praat-praat-v6.1.28_GH0.tar.gz) = 32235134 +TIMESTAMP = 1605223479 +SHA256 (praat-praat-v6.1.31_GH0.tar.gz) = aa2ce29b8b7228d6e39449565e976e6ed3e5670fe7a078662593aea3b0017229 +SIZE (praat-praat-v6.1.31_GH0.tar.gz) = 32235642 Modified: head/audio/praat/files/makefile.defs.freebsd.alsa ============================================================================== --- head/audio/praat/files/makefile.defs.freebsd.alsa Fri Nov 13 10:14:39 2020 (r555011) +++ head/audio/praat/files/makefile.defs.freebsd.alsa Fri Nov 13 11:09:00 2020 (r555012) @@ -9,7 +9,7 @@ CC ?= gcc CXX ?= g++ # -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 +COMMONFLAGS = -DUNIX -Dlinux -DALSA -D_FILE_OFFSET_BITS=64 `pkg-config --cflags gtk+-3.0` -Wreturn-type -Wunused -Wunused-parameter -Wuninitialized -O1 -g1 -pthread CFLAGS = -DHAVE_SYS_SOUNDCARD_H -std=gnu99 $(COMMONFLAGS) -Werror=implicit @@ -19,7 +19,7 @@ LINK ?= $(CXX) EXECUTABLE = praat -LIBS = `pkg-config --libs gtk+-2.0` -L%%LOCALBASE%%/lib -lasound -lm -lpthread -ltinfow +LIBS = `pkg-config --libs gtk+-3.0` -L%%LOCALBASE%%/lib -lasound -lm -lpthread -ltinfow -lX11 AR = ar RANLIB = ls