svn commit: r463291 - in head/audio/audacity: . files
Yuri Victorovich
yuri at FreeBSD.org
Thu Mar 1 10:22:48 UTC 2018
Author: yuri
Date: Thu Mar 1 10:22:46 2018
New Revision: 463291
URL: https://svnweb.freebsd.org/changeset/ports/463291
Log:
audio/audacity: Update to 2.2.2
Release notes:
http://wiki.audacityteam.org/wiki/Release_Notes_2.2.2
Port changes:
* Added to LIB_DEPENDS
* Removed ALSA option
* Corrected LV2 option, added option dependencies
* Use system libsoxr
* Updated WWW
* A lot of patch changes
PR: 226136
Submitted by: xxjack12xx at gmail.com (maintainer)
Approved by: tcberner (mentor, implicit)
Added:
head/audio/audacity/files/patch-lib-src_portmidi_porttime_ptlinux.c (contents, props changed)
head/audio/audacity/files/patch-src_AudioIO.cpp (contents, props changed)
head/audio/audacity/files/patch-src_MemoryX.h (contents, props changed)
Deleted:
head/audio/audacity/files/patch-lib-src_libmad_configure.ac
head/audio/audacity/files/patch-lib-src_portmixer_configure.ac
head/audio/audacity/files/patch-lib-src_portmixer_src_px__linux__alsa.c
head/audio/audacity/files/patch-src_Audacity.h
head/audio/audacity/files/patch-src_BatchCommands.cpp
Modified:
head/audio/audacity/Makefile
head/audio/audacity/distinfo
head/audio/audacity/files/patch-configure.ac
head/audio/audacity/files/patch-include_audacity_Types.h
head/audio/audacity/pkg-descr
head/audio/audacity/pkg-plist
Modified: head/audio/audacity/Makefile
==============================================================================
--- head/audio/audacity/Makefile Thu Mar 1 09:33:02 2018 (r463290)
+++ head/audio/audacity/Makefile Thu Mar 1 10:22:46 2018 (r463291)
@@ -2,9 +2,8 @@
# $FreeBSD$
PORTNAME= audacity
-PORTVERSION= 2.1.3
+PORTVERSION= 2.2.2
DISTVERSIONPREFIX= Audacity-
-PORTREVISION= 3
CATEGORIES= audio
MAINTAINER= xxjack12xx at gmail.com
@@ -13,17 +12,19 @@ COMMENT= GUI editor for digital audio waveforms
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
+BROKEN_aarch64= fails to configure: checking whether C++ compiler accepts -msse... no
+BROKEN_powerpc64= fails to build
+
BUILD_DEPENDS= autogen:devel/autogen \
bash:shells/bash \
cmake:devel/cmake
-LIB_DEPENDS= libexpat.so:textproc/expat2 \
+LIB_DEPENDS= libasound.so:audio/alsa-lib \
+ libexpat.so:textproc/expat2 \
+ libsoxr.so:audio/libsoxr \
libsndfile.so:audio/libsndfile
-BROKEN_aarch64= fails to configure: checking whether C++ compiler accepts -msse... no
-BROKEN_powerpc64= fails to build
-
-GNU_CONFIGURE= yes
USES= autoreconf compiler:c++11-lib cpe desktop-file-utils gettext-tools gmake iconv libtool pkgconfig shared-mime-info shebangfix dos2unix localbase
+GNU_CONFIGURE= yes
NLS_USES= gettext-runtime
NLS_CONFIGURE_ENABLE= nls
NLS_CONFIGURE_WITH= libintl-prefix="${LOCALBASE}"
@@ -36,7 +37,7 @@ DOS2UNIX_GLOB= Makefile.* *.c* *.h
SHEBANG_FILES= lib-src/lv2/build
USE_GITHUB= yes
-OPTIONS_DEFINE= NLS DEBUG DOCS ALSA DYNLOAD FFMPEG FLAC ID3TAG LADSPA LAME LV2 \
+OPTIONS_DEFINE= NLS DEBUG DOCS DYNLOAD FFMPEG FLAC ID3TAG LADSPA LAME LV2 \
MAD SBSMS SOUNDTOUCH TWOLAME VAMP VORBIS VST
OPTIONS_DEFAULT= FLAC ID3TAG LADSPA MAD \
SBSMS SOUNDTOUCH TWOLAME VAMP VORBIS VST
@@ -65,7 +66,7 @@ CONFIGURE_ARGS+= --disable-option-checking \
--with-lib-preference="local" \
--with-expat=system \
--with-libsndfile=system \
- --with-libsoxr \
+ --with-libsoxr=system \
--with-midi \
--with-portaudio \
--with-portmixer=yes \
@@ -78,13 +79,6 @@ DEBUG_CONFIGURE_WITH= debug
DOCS_BUILD_DEPENDS= docbook-to-man:textproc/docbook-to-man \
docbook2man:textproc/docbook-utils
-ALSA_CONFIGURE_OFF= --disable-alsa
-ALSA_CONFIGURE_WITH= alsa
-ALSA_CFLAGS= -I${LOCALBASE}/include
-ALSA_CXXFLAGS= -I${LOCALBASE}/include
-ALSA_LDFLAGS= -L${LOCALBASE}/lib
-ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib
-
DYNLOAD_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/libavcodec.pc:multimedia/ffmpeg
DYNLOAD_BUILD_DEPENDS= ${LOCALBASE}/include/lame/lame.h:audio/lame
DYNLOAD_CONFIGURE_ENABLE= dynamic-loading
@@ -114,7 +108,9 @@ LAME_CPPFLAGS= -I${LOCALBASE}/include
LAME_LDFLAGS= -L${LOCALBASE}/lib
LAME_LIB_DEPENDS= libmp3lame.so:audio/lame
-LV2_CONFIGURE_WITH= lv2
+LV2_CONFIGURE_WITH= lv2=system
+LV2_LIB_DEPENDS= liblilv-0.so:audio/lilv \
+ libsuil-0.so:audio/suil
SBSMS_CONFIGURE_WITH= sbsms
Modified: head/audio/audacity/distinfo
==============================================================================
--- head/audio/audacity/distinfo Thu Mar 1 09:33:02 2018 (r463290)
+++ head/audio/audacity/distinfo Thu Mar 1 10:22:46 2018 (r463291)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1496739477
-SHA256 (audacity-audacity-Audacity-2.1.3_GH0.tar.gz) = cb30870b93c7f6f90b2ec70807ab6dcd9c3a3a29015478ae7b19af46d63bbd86
-SIZE (audacity-audacity-Audacity-2.1.3_GH0.tar.gz) = 24106855
+TIMESTAMP = 1519297034
+SHA256 (audacity-audacity-Audacity-2.2.2_GH0.tar.gz) = 759e8efd5e4ff6cc2fdd31b36bc631307330c1a6e2d3426e3f1d46ebcf8907a3
+SIZE (audacity-audacity-Audacity-2.2.2_GH0.tar.gz) = 25947462
Modified: head/audio/audacity/files/patch-configure.ac
==============================================================================
--- head/audio/audacity/files/patch-configure.ac Thu Mar 1 09:33:02 2018 (r463290)
+++ head/audio/audacity/files/patch-configure.ac Thu Mar 1 10:22:46 2018 (r463291)
@@ -1,12 +1,12 @@
---- configure.ac.orig 2016-01-08 22:05:48 UTC
+--- configure.ac.orig 2016-01-08 22:05:48 UTC
+++ configure.ac
-@@ -235,20 +236,7 @@
+@@ -235,20 +235,7 @@
dnl Solaris builds, by defining HAVE_ALLOCA_H
AC_CHECK_HEADERS_ONCE(alloca.h)
-
-dnl Enable C++ 11 support. Use gnu++11 on GCC since wxWidgets uses extensions
--if test "${ax_cv_c_compiler_vendor}" = "gnu"; then
+-if "${CXX}" -v 2>&1 | grep -q '^gcc version'; then
-
- dnl GCC < 4.9 has known bugs (#1397) and can't be used
- AX_GCC_VERSION_ATLEAST(4,9,0,[gcc_ok=yes], [gcc_ok=no])
Modified: head/audio/audacity/files/patch-include_audacity_Types.h
==============================================================================
--- head/audio/audacity/files/patch-include_audacity_Types.h Thu Mar 1 09:33:02 2018 (r463290)
+++ head/audio/audacity/files/patch-include_audacity_Types.h Thu Mar 1 10:22:46 2018 (r463291)
@@ -1,10 +1,10 @@
---- include/audacity/Types.h.orig 2017-03-13 21:02:21 UTC
+--- include/audacity/Types.h.orig 2017-03-13 21:02:21 UTC
+++ include/audacity/Types.h
-@@ -70,7 +70,7 @@ public:
- sampleCount ( int v ) : value { v } {}
- sampleCount ( unsigned v ) : value { v } {}
+@@ -72,7 +72,7 @@
sampleCount ( long v ) : value { v } {}
-- sampleCount ( unsigned long v ) : value { v } {}
+
+ // unsigned long is 64 bit on some platforms. Let it narrow.
+- sampleCount ( unsigned long v ) : value ( v ) {}
+ sampleCount ( unsigned long v ) : value { static_cast<type>(v) } {}
// Beware implicit conversions from floating point values!
Added: head/audio/audacity/files/patch-lib-src_portmidi_porttime_ptlinux.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/audio/audacity/files/patch-lib-src_portmidi_porttime_ptlinux.c Thu Mar 1 10:22:46 2018 (r463291)
@@ -0,0 +1,42 @@
+--- lib-src/portmidi/porttime/ptlinux.c.orig 2018-02-22 17:57:15.438232000 -0800
++++ lib-src/portmidi/porttime/ptlinux.c 2018-02-22 19:12:15.820418000 -0800
+@@ -31,14 +31,13 @@
+ #include "porttime.h"
+ #include "sys/time.h"
+ #include "sys/resource.h"
+-#include "sys/timeb.h"
+ #include "pthread.h"
+
+ #define TRUE 1
+ #define FALSE 0
+
+ static int time_started_flag = FALSE;
+-static struct timeb time_offset = {0, 0, 0, 0};
++static struct timeval time_offset = {0};
+ static pthread_t pt_thread_pid;
+ static int pt_thread_created = FALSE;
+
+@@ -79,7 +78,7 @@
+ PtError Pt_Start(int resolution, PtCallback *callback, void *userData)
+ {
+ if (time_started_flag) return ptNoError;
+- ftime(&time_offset); /* need this set before process runs */
++ gettimeofday(&time_offset, 0);
+ if (callback) {
+ int res;
+ pt_callback_parameters *parms = (pt_callback_parameters *)
+@@ -121,10 +120,10 @@
+ PtTimestamp Pt_Time()
+ {
+ long seconds, milliseconds;
+- struct timeb now;
+- ftime(&now);
+- seconds = now.time - time_offset.time;
+- milliseconds = now.millitm - time_offset.millitm;
++ struct timeval now;
++ gettimeofday(&now, 0);
++ seconds = now.tv_sec - time_offset.tv_sec;
++ milliseconds = (now.tv_usec / 1000) - (time_offset.tv_usec / 1000);
+ return seconds * 1000 + milliseconds;
+ }
+
Added: head/audio/audacity/files/patch-src_AudioIO.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/audio/audacity/files/patch-src_AudioIO.cpp Thu Mar 1 10:22:46 2018 (r463291)
@@ -0,0 +1,11 @@
+--- src/AudioIO.cpp.orig 2018-02-22 14:12:03.835431000 -0800
++++ src/AudioIO.cpp 2018-02-22 14:01:49.487127000 -0800
+@@ -985,7 +985,7 @@
+ if (usingAlsa) {
+ struct timespec now;
+ // CLOCK_MONOTONIC_RAW is unaffected by NTP or adj-time
+- clock_gettime(CLOCK_MONOTONIC_RAW, &now);
++ clock_gettime(CLOCK_REALTIME, &now);
+ //return now.tv_sec + now.tv_nsec * 0.000000001;
+ return (now.tv_sec + now.tv_nsec * 0.000000001) - streamStartTime;
+ }
Added: head/audio/audacity/files/patch-src_MemoryX.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/audio/audacity/files/patch-src_MemoryX.h Thu Mar 1 10:22:46 2018 (r463291)
@@ -0,0 +1,19 @@
+--- src/MemoryX.h.orig 2018-02-22 14:12:04.240599000 -0800
++++ src/MemoryX.h 2018-02-22 14:01:53.685861000 -0800
+@@ -1,6 +1,7 @@
+ #ifndef __AUDACITY_MEMORY_X_H__
+ #define __AUDACITY_MEMORY_X_H__
+
++#include <stdlib.h>
+ // C++ standard header <memory> with a few extensions
+ #include <memory>
+ #ifndef safenew
+@@ -1171,7 +1172,7 @@
+ namespace tr1
+ {
+ #endif
+- template<typename T> struct hash;
++ //template<typename T> struct hash;
+ template<> struct hash< wxString > {
+ size_t operator () (const wxString &str) const // noexcept
+ {
Modified: head/audio/audacity/pkg-descr
==============================================================================
--- head/audio/audacity/pkg-descr Thu Mar 1 09:33:02 2018 (r463290)
+++ head/audio/audacity/pkg-descr Thu Mar 1 10:22:46 2018 (r463291)
@@ -8,4 +8,4 @@ also has a built-in amplitude envelope editor, a custo
spectrogram mode and a frequency analysis window for audio
analysis applications.
-WWW: http://audacityteam.org/
+WWW: https://www.audacityteam.org/
Modified: head/audio/audacity/pkg-plist
==============================================================================
--- head/audio/audacity/pkg-plist Thu Mar 1 09:33:02 2018 (r463290)
+++ head/audio/audacity/pkg-plist Thu Mar 1 10:22:46 2018 (r463291)
@@ -100,6 +100,7 @@ share/icons/hicolor/scalable/apps/audacity.svg
%%NLS%%share/locale/el/LC_MESSAGES/audacity.mo
%%NLS%%share/locale/es/LC_MESSAGES/audacity.mo
%%NLS%%share/locale/eu/LC_MESSAGES/audacity.mo
+%%NLS%%share/locale/eu_ES/LC_MESSAGES/audacity.mo
%%NLS%%share/locale/fa/LC_MESSAGES/audacity.mo
%%NLS%%share/locale/fi/LC_MESSAGES/audacity.mo
%%NLS%%share/locale/fr/LC_MESSAGES/audacity.mo
More information about the svn-ports-head
mailing list