Attachment 211963 Details for Bug 244422 – Correct portname and distname so version is a datestamp

[patch] Correct portname and distname so version is a datestamp

audacity-devel.txt (text/plain), 26.79 KB, created by Jack on 2020-02-26 21:16:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jack

Created: 2020-02-26 21:16:27 UTC

Size: 26.79 KB

patch

obsolete

>Index: audio/audacity-devel/Makefile
>===================================================================
>--- audio/audacity-devel/Makefile	(nonexistent)
>+++ audio/audacity-devel/Makefile	(working copy)
>@@ -0,0 +1,151 @@
>+# Created by: Marc van Woerkom <3d@FreeBSD.org>
>+# $FreeBSD$
>+
>+PORTNAME=	audacity
>+DISTNAME=	audacity-devel
>+PORTVERSION=	20200226
>+DISTVERSION=	ec00a73
>+CATEGORIES=	audio
>+
>+COMMENT=	GUI editor for digital audio waveforms
>+
>+MAINTAINER=	xxjack12xx@gmail.com
>+
>+LICENSE=	GPLv2+
>+LICENSE_FILE=	${WRKSRC}/LICENSE.txt
>+USES=		autoreconf compiler:c++11-lib cpe desktop-file-utils dos2unix \
>+		gettext-tools gmake gnome iconv libtool localbase pkgconfig \
>+		shared-mime-info
>+
>+BUILD_DEPENDS=	autogen:devel/autogen \
>+		bash:shells/bash \
>+		cmake:devel/cmake
>+LIB_DEPENDS=	libasound.so:audio/alsa-lib \
>+		libexpat.so:textproc/expat2 \
>+		libportaudio.so:audio/portaudio \
>+		libsndfile.so:audio/libsndfile \
>+		libsoxr.so:audio/libsoxr
>+
>+CONFLICTS_INSTALL=	audacity-2.[0-9]*
>+
>+GNU_CONFIGURE=		yes
>+NLS_USES=		gettext-runtime
>+NLS_CONFIGURE_ENABLE=	nls
>+NLS_CONFIGURE_WITH=	libintl-prefix="${LOCALBASE}"
>+OPTIONS_SUB=		yes
>+USE_WX=			3.1+
>+WX_COMPS=		wx
>+INSTALLS_ICONS=		yes
>+PORTDOCS=		README.txt
>+DOS2UNIX_GLOB=		*.c* *.h Makefile.*
>+USE_GITHUB=		yes
>+
>+OPTIONS_DEFINE=		DEBUG DOCS DYNLOAD FFMPEG FLAC ID3TAG LADSPA LAME LV2 \
>+			MAD MOD_NYQ_BENCH MOD_SCRIPT_PIPE NLS SBSMS SOUNDTOUCH \
>+			SSE TWOLAME VAMP VORBIS VST
>+OPTIONS_DEFAULT=	FLAC ID3TAG LADSPA MAD SBSMS SOUNDTOUCH TWOLAME VAMP \
>+			VORBIS VST
>+
>+OPTIONS_DEFAULT_amd64=	SSE
>+OPTIONS_DEFAULT_i386=	${MACHINE_CPU:tu:MSSE}
>+
>+DYNLOAD_DESC=		Enable dynamic loading of lame and FFmpeg
>+LAME_DESC=		Use lame for import and export support
>+LV2_DESC=		Add LV2 plug-in support
>+MAD_DESC=		Use libmad for mp2/3 decoding support
>+MOD_SCRIPT_PIPE_DESC=	mod-script-pipe scripting support
>+MOD_NYQ_BENCH_DESC=	Enable Nyquist Workbench
>+SBSMS_DESC=		Use libsbsms for pitch and tempo changing
>+SOUNDTOUCH_DESC=	Use libSoundTouch for pitch and tempo changing
>+TWOLAME_DESC=		Use libtwolame for MP2 export support
>+VAMP_DESC=		Vamp plug-in support
>+VST_DESC=		VST plug-in support
>+
>+CONFIGURE_ENV+=	WX_CONFIG="${WX_CONFIG}"
>+
>+CONFIGURE_ARGS+=	${ICONV_CONFIGURE_ARG} \
>+			--disable-option-checking \
>+			--enable-unicode \
>+			--with-expat=system \
>+			--with-lib-preference="local" \
>+			--with-libsndfile=system \
>+			--with-libsoxr=system \
>+			--with-midi \
>+			--with-portaudio=system \
>+			--with-portmixer=yes \
>+			--with-widgetextra
>+
>+CONFIGURE_SHELL?=	${LOCALBASE}/bin/bash
>+
>+DEBUG_CONFIGURE_WITH=	debug
>+
>+DOCS_BUILD_DEPENDS=	docbook-to-man:textproc/docbook-to-man \
>+			docbook2man:textproc/docbook-utils
>+
>+DYNLOAD_BUILD_DEPENDS=		${LOCALBASE}/include/lame/lame.h:audio/lame \
>+				${LOCALBASE}/libdata/pkgconfig/libavcodec.pc:multimedia/ffmpeg
>+DYNLOAD_CONFIGURE_ENABLE=	dynamic-loading
>+# for audio/lame
>+DYNLOAD_CPPFLAGS=		-I${LOCALBASE}/include
>+# for audio/lame
>+DYNLOAD_LDFLAGS=		-L${LOCALBASE}/lib
>+
>+FFMPEG_CONFIGURE_WITH=	ffmpeg=system
>+FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
>+
>+FLAC_CONFIGURE_WITH=	libflac=system
>+FLAC_LIB_DEPENDS=	libFLAC.so:audio/flac
>+
>+ID3TAG_CONFIGURE_WITH=	libid3tag=system
>+ID3TAG_LIB_DEPENDS=	libid3tag.so:audio/libid3tag
>+
>+LADSPA_CONFIGURE_ENABLE=	ladspa
>+LADSPA_RUN_DEPENDS=		listplugins:audio/ladspa
>+
>+LAME_CONFIGURE_ON=	--with-lame=system
>+# --without-lame is broken
>+LAME_CONFIGURE_OFF=	--with-lame
>+LAME_CPPFLAGS=		-I${LOCALBASE}/include
>+LAME_LDFLAGS=		-L${LOCALBASE}/lib
>+LAME_LIB_DEPENDS=	libmp3lame.so:audio/lame
>+
>+LV2_CONFIGURE_WITH=	lv2=system
>+LV2_LIB_DEPENDS=	liblilv-0.so:audio/lilv \
>+			libsuil-0.so:audio/suil
>+
>+MAD_CONFIGURE_WITH=	libmad=system
>+MAD_LIB_DEPENDS=	libmad.so:audio/libmad
>+
>+MOD_SCRIPT_PIPE_CONFIGURE_WITH=	mod-script-pipe
>+MOD_SCRIPT_PIPE_USES=		python:3.6+
>+MOD_NYQ_BENCH_CONFIGURE_WITH=	mod-nyq-bench
>+MOD_NYQ_BENCH_USES=		python:3.6+
>+
>+SBSMS_CONFIGURE_WITH=	sbsms
>+
>+SOUNDTOUCH_CONFIGURE_WITH=	soundtouch=system
>+SOUNDTOUCH_LIB_DEPENDS=		libSoundTouch.so:audio/soundtouch
>+
>+SSE_CONFIGURE_ENABLE=	sse
>+
>+TWOLAME_CONFIGURE_WITH=	libtwolame=system
>+TWOLAME_LIB_DEPENDS=	libtwolame.so:audio/twolame
>+
>+VAMP_CONFIGURE_WITH=	libvamp=system
>+VAMP_LIB_DEPENDS=	libvamp-hostsdk.so:audio/vamp-plugin-sdk
>+
>+VORBIS_CONFIGURE_WITH=	libvorbis=system
>+VORBIS_LIB_DEPENDS=	libogg.so:audio/libogg \
>+			libvorbis.so:audio/libvorbis
>+
>+VST_CONFIGURE_ENABLE=	vst
>+
>+post-install:
>+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
>+	@${RM} ${STAGEDIR}${DOCSDIR}/LICENSE.txt
>+
>+post-install-DOCS-on:
>+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>+	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
>+
>+.include <bsd.port.mk>
>
>Property changes on: audio/audacity-devel/Makefile
>___________________________________________________________________
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:keywords
>## -0,0 +1 ##
>+FreeBSD=%H
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: audio/audacity-devel/distinfo
>===================================================================
>--- audio/audacity-devel/distinfo	(nonexistent)
>+++ audio/audacity-devel/distinfo	(working copy)
>@@ -0,0 +1,3 @@
>+TIMESTAMP = 1582751644
>+SHA256 (audacity-audacity-ec00a73_GH0.tar.gz) = dd0658672fbf79e2bfaae951d26432b624b1d145e68d29130ac02ee2c7e653d6
>+SIZE (audacity-audacity-ec00a73_GH0.tar.gz) = 63336417
>
>Property changes on: audio/audacity-devel/distinfo
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: audio/audacity-devel/files/patch-configure.ac
>===================================================================
>--- audio/audacity-devel/files/patch-configure.ac	(nonexistent)
>+++ audio/audacity-devel/files/patch-configure.ac	(working copy)
>@@ -0,0 +1,39 @@
>+--- configure.ac.orig	2019-02-24 08:28:05 UTC
>++++ configure.ac
>+@@ -200,14 +200,6 @@ if test x$enable_universal_binary = xyes; then
>+    esac
>+ fi
>+ 
>+-dnl Check if $CXX is clang by evaluating the version string because
>+-dnl $ax_cv_cxx_compiler_vendor seems not to work (it is either "gnu" or just empty).
>+-dnl If $CXX is clang (string is found), grep returns 0 and the if is executed.
>+-dnl Use /dev/null to suppress grep output to shell.
>+-if ($CXX --version | grep 'clang version' > /dev/null); then
>+-    LDFLAGS="${LDFLAGS} -latomic"
>+-fi
>+-
>+ if test x$enable_sse = xyes; then
>+ 
>+    if test "${ax_cv_cxx_compiler_vendor}" = "gnu"; then
>+@@ -239,20 +231,7 @@ dnl check if alloca.h exists. If it does, we need to i
>+ 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 "${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])
>+-    if test x$gcc_ok = xno; then
>+-        AC_MSG_ERROR([Audacity requires at least GCC 4.9])
>+-    fi
>+-
>+-    CXXFLAGS="${CXXFLAGS} --std=gnu++11"
>+-else
>+-    CXXFLAGS="${CXXFLAGS} --std=c++11"
>+-fi
>++CXXFLAGS="${CXXFLAGS} --std=c++11"
>+ 
>+ dnl --------------------------------------------------------------------------
>+ dnl We would like warnings enabled on the builds, but different compilers need
>
>Property changes on: audio/audacity-devel/files/patch-configure.ac
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: audio/audacity-devel/files/patch-lib-src_FileDialog_Makefile.am
>===================================================================
>--- audio/audacity-devel/files/patch-lib-src_FileDialog_Makefile.am	(nonexistent)
>+++ audio/audacity-devel/files/patch-lib-src_FileDialog_Makefile.am	(working copy)
>@@ -0,0 +1,52 @@
>+--- lib-src/FileDialog/Makefile.am.orig	2018-10-01 14:07:33 UTC
>++++ lib-src/FileDialog/Makefile.am
>+@@ -2,5 +2,7 @@
>+ ACLOCAL_AMFLAGS = -I m4
>+ 
>++SUBDIRS=	$(GTK_SUBDIR) $(MAC_SUBDIR) $(WINDOWS_SUBDIR)
>++DIST_SUBDIRS=	gtk mac win
>+ lib_LTLIBRARIES = libFileDialog.la
>+ 
>+ libFileDialog_la_LIBTOOLFLAGS = --tag=CXX
>+@@ -11,22 +13,32 @@ libFileDialog_la_LIBADD = $(WX_LIBS)
>+ libFileDialog_la_SOURCES = FileDialog.cpp FileDialog.h
>+ 
>+ if GTK
>+-libFileDialog_la_CPPFLAGS += $(GTK_CFLAGS)
>+-libFileDialog_la_LIBADD += $(GTK_LIBS)
>++GTK_SUBDIR=	gtk
>++libFileDialog_la_LIBADD += \
>++	gtk/libFileDialog.la \
>++	$(NULL)
>+ libFileDialog_la_SOURCES += \
>+-	gtk/FileDialogPrivate.cpp \
>+ 	gtk/FileDialogPrivate.h \
>+ 	$(NULL)
>+ endif
>+ 
>+ if MAC
>+-libFileDialog_la_SOURCES += mac/FileDialogPrivate.mm \
>+-									 mac/FileDialogPrivate.h \
>+-									 $(NULL)
>++MAC_SUBDIR=	mac
>++libFileDialog_la_LIBADD+= \
>++	mac/libFileDialog.la \
>++	$(NULL)
>++libFileDialog_la_SOURCES += \
>++	mac/FileDialogPrivate.h \
>++	$(NULL)
>++#nodist_EXTRA_libFileDialog_la_SOURCES = dummy.mm
>+ endif
>+ 
>+ if WINDOWS
>+-libFileDialog_la_SOURCES += win/FileDialogPrivate.cpp \
>+-									 win/FileDialogPrivate.h \
>+-									 $(NULL)
>++WINDOWS_SUBDIR=	win
>++libFileDialog_la_LIBADD+= \
>++	win/libFileDialog.la \
>++	$(NULL)
>++libFileDialog_la_SOURCES += \
>++	win/FileDialogPrivate.h \
>++	$(NULL)
>+ endif
>
>Property changes on: audio/audacity-devel/files/patch-lib-src_FileDialog_Makefile.am
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: audio/audacity-devel/files/patch-lib-src_FileDialog_configure.ac
>===================================================================
>--- audio/audacity-devel/files/patch-lib-src_FileDialog_configure.ac	(nonexistent)
>+++ audio/audacity-devel/files/patch-lib-src_FileDialog_configure.ac	(working copy)
>@@ -0,0 +1,11 @@
>+--- lib-src/FileDialog/configure.ac.orig	2018-09-20 14:35:07 UTC
>++++ lib-src/FileDialog/configure.ac
>+@@ -132,7 +132,7 @@ AM_CONDITIONAL([WINDOWS], test "$IMPLEMENTATION" = "wi
>+ 
>+ echo "Implementation to use: $IMPLEMENTATION"
>+ 
>+-AC_CONFIG_FILES([Makefile])
>++AC_CONFIG_FILES([Makefile gtk/Makefile mac/Makefile win/Makefile])
>+ 
>+ #
>+ # Write it all out
>
>Property changes on: audio/audacity-devel/files/patch-lib-src_FileDialog_configure.ac
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: audio/audacity-devel/files/patch-lib-src_FileDialog_gtk_Makefile.am
>===================================================================
>--- audio/audacity-devel/files/patch-lib-src_FileDialog_gtk_Makefile.am	(nonexistent)
>+++ audio/audacity-devel/files/patch-lib-src_FileDialog_gtk_Makefile.am	(working copy)
>@@ -0,0 +1,15 @@
>+--- lib-src/FileDialog/gtk/Makefile.am.orig	2016-07-26 13:34:07 UTC
>++++ lib-src/FileDialog/gtk/Makefile.am
>+@@ -0,0 +1,12 @@
>++ACLOCAL_AMFLAGS=	-I m4
>++noinst_LTLIBRARIES=	libFileDialog.la
>++libFileDialog_la_CPPFLAGS= \
>++	$(WX_CXXFLAGS) -Wno-deprecated-declarations \
>++	$(GTK_CFLAGS)
>++libFileDialog_la_LIBADD= \
>++	$(WX_LIBS) \
>++	$(GTK_LIBS)
>++libFileDialog_la_SOURCES= \
>++	FileDialogPrivate.cpp \
>++	FileDialogPrivate.h \
>++	$(NULL)
>
>Property changes on: audio/audacity-devel/files/patch-lib-src_FileDialog_gtk_Makefile.am
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: audio/audacity-devel/files/patch-lib-src_FileDialog_mac_Makefile.am
>===================================================================
>--- audio/audacity-devel/files/patch-lib-src_FileDialog_mac_Makefile.am	(nonexistent)
>+++ audio/audacity-devel/files/patch-lib-src_FileDialog_mac_Makefile.am	(working copy)
>@@ -0,0 +1,13 @@
>+--- lib-src/FileDialog/mac/Makefile.am.orig	2016-07-26 13:34:07 UTC
>++++ lib-src/FileDialog/mac/Makefile.am
>+@@ -0,0 +1,10 @@
>++ACLOCAL_AMFLAGS=	-I m4
>++noinst_LTLIBRARIES=	libFileDialog.la
>++libFileDialog_la_CPPFLAGS= \
>++	$(WX_CXXFLAGS) -Wno-deprecated-declarations
>++libFileDialog_la_LIBADD= \
>++	$(WX_LIBS)
>++libFileDialog_la_SOURCES= \
>++	FileDialogPrivate.mm \
>++	FileDialogPrivate.h \
>++	$(NULL)
>
>Property changes on: audio/audacity-devel/files/patch-lib-src_FileDialog_mac_Makefile.am
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: audio/audacity-devel/files/patch-lib-src_FileDialog_win_Makefile.am
>===================================================================
>--- audio/audacity-devel/files/patch-lib-src_FileDialog_win_Makefile.am	(nonexistent)
>+++ audio/audacity-devel/files/patch-lib-src_FileDialog_win_Makefile.am	(working copy)
>@@ -0,0 +1,13 @@
>+--- lib-src/FileDialog/win/Makefile.am.orig	2016-07-26 13:34:07 UTC
>++++ lib-src/FileDialog/win/Makefile.am
>+@@ -0,0 +1,10 @@
>++ACLOCAL_AMFLAGS=	-I m4
>++noinst_LTLIBRARIES=	libFileDialog.la
>++libFileDialog_la_CPPFLAGS= \
>++	$(WX_CXXFLAGS) -Wno-deprecated-declarations
>++libFileDialog_la_LIBADD= \
>++	$(WX_LIBS)
>++libFileDialog_la_SOURCES= \
>++	FileDialogPrivate.cpp \
>++	FileDialogPrivate.h \
>++	$(NULL)
>
>Property changes on: audio/audacity-devel/files/patch-lib-src_FileDialog_win_Makefile.am
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: audio/audacity-devel/files/patch-lib-src_libnyquist_nyquist_cmt_cext.h
>===================================================================
>--- audio/audacity-devel/files/patch-lib-src_libnyquist_nyquist_cmt_cext.h	(nonexistent)
>+++ audio/audacity-devel/files/patch-lib-src_libnyquist_nyquist_cmt_cext.h	(working copy)
>@@ -0,0 +1,11 @@
>+--- lib-src/libnyquist/nyquist/cmt/cext.h.orig	2018-10-01 14:07:33 UTC
>++++ lib-src/libnyquist/nyquist/cmt/cext.h
>+@@ -58,7 +58,7 @@ EXIT(n)  -- calls exit(n) after shutting down/dealloca
>+ #include <malloc.h>
>+ #endif
>+ 
>+-#if NEED_ULONG
>++#if NEED_ULONG || __FreeBSD__
>+ typedef unsigned long ulong;
>+ #endif
>+ 
>
>Property changes on: audio/audacity-devel/files/patch-lib-src_libnyquist_nyquist_cmt_cext.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: audio/audacity-devel/files/patch-lib-src_libnyquist_nyquist_nyqstk_include_FileRead.h
>===================================================================
>--- audio/audacity-devel/files/patch-lib-src_libnyquist_nyquist_nyqstk_include_FileRead.h	(nonexistent)
>+++ audio/audacity-devel/files/patch-lib-src_libnyquist_nyquist_nyqstk_include_FileRead.h	(working copy)
>@@ -0,0 +1,10 @@
>+--- lib-src/libnyquist/nyquist/nyqstk/include/FileRead.h.orig	2016-07-26 13:34:06 UTC
>++++ lib-src/libnyquist/nyquist/nyqstk/include/FileRead.h
>+@@ -33,6 +33,7 @@
>+ #define STK_FILEREAD_H
>+ 
>+ #include "Stk.h"
>++#include <stdio.h>
>+ 
>+ namespace Nyq
>+ {
>
>Property changes on: audio/audacity-devel/files/patch-lib-src_libnyquist_nyquist_nyqstk_include_FileRead.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: audio/audacity-devel/files/patch-lib-src_libnyquist_nyquist_xlisp_xlisp.h
>===================================================================
>--- audio/audacity-devel/files/patch-lib-src_libnyquist_nyquist_xlisp_xlisp.h	(nonexistent)
>+++ audio/audacity-devel/files/patch-lib-src_libnyquist_nyquist_xlisp_xlisp.h	(working copy)
>@@ -0,0 +1,18 @@
>+--- lib-src/libnyquist/nyquist/xlisp/xlisp.h.orig	2016-07-26 13:34:06 UTC
>++++ lib-src/libnyquist/nyquist/xlisp/xlisp.h
>+@@ -160,6 +160,15 @@ extern long ptrtoabs();
>+ #endif
>+ #endif
>+ 
>++/* FreeBSD */
>++#ifdef __FreeBSD__
>++#if __BYTE_ORDER == __LITTLE_ENDIAN
>++#define XL_LITTLE_ENDIAN
>++#else
>++#define XL_BIG_ENDIAN
>++#endif
>++#endif
>++
>+ /* Apple CC */
>+ #ifdef __APPLE__
>+ #define NNODES 2000
>
>Property changes on: audio/audacity-devel/files/patch-lib-src_libnyquist_nyquist_xlisp_xlisp.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: audio/audacity-devel/files/patch-lib-src_portmidi_porttime_ptlinux.c
>===================================================================
>--- audio/audacity-devel/files/patch-lib-src_portmidi_porttime_ptlinux.c	(nonexistent)
>+++ audio/audacity-devel/files/patch-lib-src_portmidi_porttime_ptlinux.c	(working copy)
>@@ -0,0 +1,42 @@
>+--- lib-src/portmidi/porttime/ptlinux.c.orig	2018-10-01 14:07:33 UTC
>++++ lib-src/portmidi/porttime/ptlinux.c
>+@@ -31,14 +31,13 @@ CHANGE LOG
>+ #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 @@ static void *Pt_CallbackProc(void *p)
>+ 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 @@ int Pt_Started()
>+ 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;
>+ }
>+ 
>
>Property changes on: audio/audacity-devel/files/patch-lib-src_portmidi_porttime_ptlinux.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: audio/audacity-devel/files/patch-src_AudioIO.cpp
>===================================================================
>--- audio/audacity-devel/files/patch-src_AudioIO.cpp	(nonexistent)
>+++ audio/audacity-devel/files/patch-src_AudioIO.cpp	(working copy)
>@@ -0,0 +1,34 @@
>+--- src/AudioIO.cpp.orig	2018-10-01 14:07:33 UTC
>++++ src/AudioIO.cpp
>+@@ -480,7 +480,6 @@ TimeTrack and AudioIOListener and whether the playback
>+    #define ROUND(x) (int) ((x)+0.5)
>+    //#include <string.h>
>+ //   #include "../lib-src/portmidi/pm_common/portmidi.h"
>+-   #include "../lib-src/portaudio-v19/src/common/pa_util.h"
>+    #include "NoteTrack.h"
>+ #endif
>+ 
>+@@ -793,13 +797,22 @@ struct AudioIO::ScrubState (private)
>+ // return the system time as a double
>+ static double streamStartTime = 0; // bias system time to small number
>+ 
>++// PaUtil_GetTime is an internal PortAudio function.  Unfortunately
>++// it's used twice in AudioIO.cpp.  It's a simple function so just
>++// provide the implementation here.
>++static double PaUtil_GetTime(void) {
>++   struct timespec tp;
>++   clock_gettime(CLOCK_REALTIME, &tp);
>++   return (double)(tp.tv_sec + tp.tv_nsec * 1e-9);
>++}
>++
>+ static double SystemTime(bool usingAlsa)
>+ {
>+ #ifdef __WXGTK__
>+    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;
>+    }
>
>Property changes on: audio/audacity-devel/files/patch-src_AudioIO.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: audio/audacity-devel/files/patch-src_FFmpeg.h
>===================================================================
>--- audio/audacity-devel/files/patch-src_FFmpeg.h	(nonexistent)
>+++ audio/audacity-devel/files/patch-src_FFmpeg.h	(working copy)
>@@ -0,0 +1,29 @@
>+--- src/FFmpeg.h.orig	2018-10-01 14:07:33 UTC
>++++ src/FFmpeg.h
>+@@ -667,7 +667,7 @@ extern "C" {
>+    FFMPEG_FUNCTION_WITH_RETURN(
>+       AVOutputFormat*,
>+       av_oformat_next,
>+-      (AVOutputFormat *f),
>++      (const AVOutputFormat *f),
>+       (f)
>+    );
>+ #endif
>+@@ -748,7 +748,7 @@ extern "C" {
>+    FFMPEG_FUNCTION_WITH_RETURN(
>+       int,
>+       av_fifo_size,
>+-      (AVFifoBuffer *f),
>++      (const AVFifoBuffer *f),
>+       (f)
>+    );
>+ #endif
>+@@ -810,7 +810,7 @@ extern "C" {
>+    FFMPEG_FUNCTION_WITH_RETURN(
>+       AVDictionaryEntry *,
>+       av_dict_get,
>+-      (AVDictionary *m, const char *key, const AVDictionaryEntry *prev, int flags),
>++      (const AVDictionary *m, const char *key, const AVDictionaryEntry *prev, int flags),
>+       (m, key, prev, flags)
>+    );
>+ #endif
>
>Property changes on: audio/audacity-devel/files/patch-src_FFmpeg.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: audio/audacity-devel/files/patch-src_Makefile.am
>===================================================================
>--- audio/audacity-devel/files/patch-src_Makefile.am	(nonexistent)
>+++ audio/audacity-devel/files/patch-src_Makefile.am	(working copy)
>@@ -0,0 +1,12 @@
>+--- src/Makefile.am.orig	2016-07-26 13:34:06 UTC
>++++ src/Makefile.am
>+@@ -79,8 +79,7 @@ audacity_CPPFLAGS = \
>+ #  /usr/local/include/wx-2.8/wx/buffer.h:289:9: note: in expansion of macro 'wxCHECK_RET'
>+ #           wxCHECK_RET( m_bufdata->m_data, wxT("invalid wxMemoryBuffer") );
>+ #           ^
>+-audacity_CXXFLAGS = \
>+-   -Wno-unused-local-typedefs
>++audacity_CXXFLAGS =
>+ 
>+ audacity_LDFLAGS = -rdynamic
>+ audacity_LDADD = \
>
>Property changes on: audio/audacity-devel/files/patch-src_Makefile.am
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: audio/audacity-devel/pkg-descr
>===================================================================
>--- audio/audacity-devel/pkg-descr	(nonexistent)
>+++ audio/audacity-devel/pkg-descr	(working copy)
>@@ -0,0 +1,11 @@
>+Audacity is a program that lets you manipulate digital audio
>+waveforms. In addition to letting you record sounds directly from
>+within the program, it imports many sound file formats, including
>+WAV, AIFF, AU, IRCAM, MP3, and Ogg Vorbis. It supports all
>+common editing operations such as Cut, Copy, and Paste, plus it will
>+mix tracks and let you apply plug-in effects to any part of a sound. It
>+also has a built-in amplitude envelope editor, a customizable
>+spectrogram mode and a frequency analysis window for audio
>+analysis applications.
>+
>+WWW: https://www.audacityteam.org/
>
>Property changes on: audio/audacity-devel/pkg-descr
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: audio/audacity-devel/pkg-plist
>===================================================================
>--- audio/audacity-devel/pkg-plist	(nonexistent)
>+++ audio/audacity-devel/pkg-plist	(working copy)
>@@ -0,0 +1,37 @@
>+bin/audacity
>+man/man1/audacity.1.gz
>+share/appdata/audacity.appdata.xml
>+share/applications/audacity.desktop
>+%%DATADIR%%/EQDefaultCurves.xml
>+%%DATADIR%%/include/audacity/ComponentInterface.h
>+%%DATADIR%%/include/audacity/ConfigInterface.h
>+%%DATADIR%%/include/audacity/EffectAutomationParameters.h
>+%%DATADIR%%/include/audacity/EffectInterface.h
>+%%DATADIR%%/include/audacity/ImporterInterface.h
>+%%DATADIR%%/include/audacity/ModuleInterface.h
>+%%DATADIR%%/include/audacity/PluginInterface.h
>+%%DATADIR%%/include/audacity/Types.h
>+%%DATADIR%%/nyquist/aud-do-support.lsp
>+%%DATADIR%%/nyquist/dspprims.lsp
>+%%DATADIR%%/nyquist/envelopes.lsp
>+%%DATADIR%%/nyquist/equalizer.lsp
>+%%DATADIR%%/nyquist/evalenv.lsp
>+%%DATADIR%%/nyquist/fileio.lsp
>+%%DATADIR%%/nyquist/init.lsp
>+%%DATADIR%%/nyquist/misc.lsp
>+%%DATADIR%%/nyquist/nyinit-dbg.lsp
>+%%DATADIR%%/nyquist/nyinit.lsp
>+%%DATADIR%%/nyquist/nyqmisc.lsp
>+%%DATADIR%%/nyquist/nyquist-plot.txt
>+%%PORTDOCS%%%%DOCSDIR%%/README.txt
>+share/icons/hicolor/16x16/apps/audacity.png
>+share/icons/hicolor/22x22/apps/audacity.png
>+share/icons/hicolor/24x24/apps/audacity.png
>+share/icons/hicolor/32x32/apps/audacity.png
>+share/icons/hicolor/48x48/apps/audacity.png
>+share/icons/hicolor/scalable/apps/audacity.svg
>+share/mime/packages/audacity.xml
>+share/pixmaps/audacity.xpm
>+share/pixmaps/audacity16.xpm
>+share/pixmaps/audacity32.xpm
>+share/pixmaps/gnome-mime-application-x-audacity-project.xpm
>
>Property changes on: audio/audacity-devel/pkg-plist
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Flags:

xxjack12xx: maintainer-approval+

Actions: View | Diff

Attachments on bug 244422: 211942 | 211947 | 211963 | 211965