Attachment #227702 for bug #258107




# Created by: Marc van Woerkom <3d@FreeBSD.org>

PORTNAME=	audacity
DISTVERSIONPREFIX=	Audacity-
DISTVERSION=	3.0.4
PORTREVISION=	1
CATEGORIES=	audio
MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/Audacity-${PORTVERSION}/

MAINTAINER=	xxjack12xx@gmail.com
COMMENT=	GUI editor for digital audio waveforms

LICENSE=	GPLv2+
LICENSE_FILE=	${WRKSRC}/LICENSE.txt

BUILD_DEPENDS=	conan:sysutils/conan

USES=		cmake compiler:c++14-lang cpe desktop-file-utils gettext \
		gnome libtool python:build pkgconfig shared-mime-info

LIB_DEPENDS=	libasound.so:audio/alsa-lib \
		libcurl.so:ftp/curl \
		libexpat.so:textproc/expat2 \
		libportaudio.so:audio/portaudio \
		libsndfile.so:audio/libsndfile \
		libsoxr.so:audio/libsoxr \
		libsqlite3.so:databases/sqlite3 \
		libuuid.so:misc/e2fsprogs-libuuid

USE_GITHUB=	yes
		gnome libtool python:build pkgconfig shared-mime-info tar:xz
USE_GNOME=	cairo gtk30
USE_WX=		3.1+
WX_COMPS=	wx

PORTDOCS=	README.txt

CMAKE_ARGS=	-Daudacity_lib_preference:STRING=system \
		-Daudacity_use_curl:STRING=system \
		-Daudacity_use_expat:STRING=system \
		-Daudacity_use_midi:STRING=local \
		-Daudacity_use_nyquist:STRING=local \
		-Daudacity_use_sndfile:STRING=system \
		-Daudacity_use_portsmf:STRING=local \
		-Daudacity_use_portmixer:STRING=local \
		-Daudacity_use_portaudio:STRING=system \
		-Daudacity_use_soxr:STRING=system \
		-Daudacity_use_sndfile:STRING=system \
		-Daudacity_use_sqlite:STRING=system \
		-Daudacity_use_wxwidgets:STRING=system \
		-Daudacity_use_zlib:STRING=system
CMAKE_ON=	audacity_obey_system_dependencies
CMAKE_OFF=	audacity_use_pa_alsa audacity_use_pch

OPTIONS_DEFINE=		DEBUG DOCS FFMPEG FLAC ID3TAG LADSPA LAME LV2 MAD \
			OGG SBSMS SOUNDTOUCH TWOLAME VAMP \
			VORBIS VST
OPTIONS_DEFAULT=	FFMPEG FLAC ID3TAG LV2 MAD OGG SBSMS \
			SOUNDTOUCH TWOLAME VAMP VORBIS VST
OPTIONS_EXCLUDE_i386=	SBSMS

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
MIDI_DESC=		MIDI support
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

LADSPA_CMAKE_BOOL=	audacity_use_ladspa
LADSPA_RUN_DEPENDS=	listplugins:audio/ladspa

LAME_CMAKE_ON=		-Daudacity_use_libmp3lame:STRING=system
LAME_CMAKE_OFF=		-Daudacity_use_lame:STRING=local
LAME_BUILD_DEPENDS=	${LOCALBASE}/include/lame/lame.h:audio/lame
LAME_CPPFLAGS=		-I${LOCALBASE}/include/lame
LAME_LDFLAGS=		-L${LOCALBASE}/lib

			libsratom-0.so:audio/sratom \
			libsuil-0.so:audio/suil

MAD_CMAKE_ON=		-Daudacity_use_mad:STRING=system \
			-Daudacity_use_libmad:STRING=system
MAD_CMAKE_OFF=		-Daudacity_use_mad:STRING=off \
			-Daudacity_use_libmad:STRING=off
MAD_LIB_DEPENDS=	libmad.so:audio/libmad

MIDI_CMAKE_ON=		-Daudacity_use_midi:STRING=local
MIDI_CMAKE_OFF=		-Daudacity_use_midi:STRING=off

# TODO: fix NLS support properly
PLIST_SUB+=		NLS=""


post-install:
	@cd ${STAGEDIR}${PREFIX} && ${STRIP_CMD} \
		bin/${PORTNAME} \
		lib/${PORTNAME}/modules/mod-script-pipe.so
	@${RM} ${STAGEDIR}${DOCSDIR}/LICENSE.txt
	# delete empty directories: https://github.com/audacity/audacity/issues/808
	@${FIND} ${STAGEDIR} -type d -empty -delete

Lines 1-3 Link Here

(-)audacity-new/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1619066304	1	TIMESTAMP = 1630907952
2	SHA256 (audacity-minsrc-3.0.2.tar.xz) = 728d6459931da006ed45a31e63b7fe6ca47a2547459a2aff3bf0880cef85c296	2	SHA256 (audacity-audacity-Audacity-3.0.4_GH0.tar.gz) = 20594c8a208e08c6cc1f74f78908025f8a968a3830ec353c5d0029486f887c1b
3	SIZE (audacity-minsrc-3.0.2.tar.xz) = 13330160	3	SIZE (audacity-audacity-Audacity-3.0.4_GH0.tar.gz) = 63068376




--- cmake-proxies/CMakeLists.txt.orig	2021-08-18 10:21:37 UTC
+++ cmake-proxies/CMakeLists.txt
@@ -87,6 +87,7 @@ add_conan_lib(
    REQUIRED
    INTERFACE_NAME libmp3lame::libmp3lame
    PKG_CONFIG "lame >= 3.100"
+   ALLOW_FIND_PACKAGE
 )
 
 add_conan_lib(
@@ -105,24 +106,23 @@ add_conan_lib(
    PKG_CONFIG "mad >= 0.15.1b"
 )
 
-if( CMAKE_SYSTEM_NAME MATCHES "Darwin" )
-   set( curl_ssl "darwinssl" )
-elseif( CMAKE_SYSTEM_NAME MATCHES "Windows" )
-   set( curl_ssl "schannel")
-else()
-   set ( curl_ssl "openssl" )
-endif ()
-
-add_conan_lib(
-   ThreadPool
-   threadpool/20140926
-   REQUIRED
-   ALWAYS_ALLOW_CONAN_FALLBACK
-)
-
 if( ${_OPT}has_networking )
+   if( CMAKE_SYSTEM_NAME MATCHES "Darwin" )
+      set( curl_ssl "darwinssl" )
+   elseif( CMAKE_SYSTEM_NAME MATCHES "Windows" )
+      set( curl_ssl "schannel")
+   else()
+      set ( curl_ssl "openssl" )
+   endif ()
 
    add_conan_lib(
+      ThreadPool
+      threadpool/20140926
+      REQUIRED
+      ALWAYS_ALLOW_CONAN_FALLBACK
+   )
+
+   add_conan_lib(
       CURL
       libcurl/7.75.0
       REQUIRED
@@ -148,11 +148,13 @@ if( NOT CMAKE_SYSTEM_NAME MATCHES "Darwin|Windows")
    )
 endif()
 
-add_conan_lib(
-   RapidJSON
-   rapidjson/1.1.0
-   REQUIRED
-)
+if( ${_OPT}has_sentry_reporting )
+   add_conan_lib(
+      RapidJSON
+      rapidjson/1.1.0
+      REQUIRED
+   )
+endif()
 
 set_conan_vars_to_parent()
 
@@ -161,7 +163,7 @@ set_conan_vars_to_parent()
 #       directory          option      symbol      req   chk   version
 addlib( libsndfile         sndfile     SNDFILE     YES   YES   "sndfile >= 1.0.28" )
 addlib( libsoxr            soxr        SOXR        YES   YES   "soxr >= 0.1.1" )
-addlib( portaudio-v19      portaudio   PORTAUDIO   YES   YES   "" )




--- cmake-proxies/cmake-modules/AudacityDependencies.cmake.orig	2021-08-27 22:30:37 UTC
+++ cmake-proxies/cmake-modules/AudacityDependencies.cmake
@@ -1,11 +1,14 @@
 # Load Conan
-include( conan )
 
-conan_add_remote(NAME audacity
-    URL https://artifactory.audacityteam.org/artifactory/api/conan/conan-local
-    VERIFY_SSL True
-)
+if( ${_OPT}conan_enabled )
+    include( conan )
 
+    conan_add_remote(NAME audacity
+        URL https://artifactory.audacityteam.org/artifactory/api/conan/conan-local
+        VERIFY_SSL True
+    )
+endif()
+
 set( CONAN_BUILD_REQUIRES )
 set( CONAN_REQUIRES )
 set( CONAN_PACKAGE_OPTIONS )
@@ -13,24 +16,30 @@ set( CONAN_ONLY_DEBUG_RELEASE )
 set( CONAN_CONFIG_OPTIONS )
 set( CONAN_RESOLVE_LIST )
 
-# Add a Conan dependency
-# Example usage:
-# add_conan_lib( 
-#   wxWdidget 
-#   wxwidgets/3.1.3-audacity
-#   OPTION_NAME wxwidgets
-#   SYMBOL WXWIDGET
-#   REQUIRED 
-#   ALWAYS_ALLOW_CONAN_FALLBACK
-#   PKG_CONFIG "wxwidgets >= 3.1.3"
-#   FIND_PACKAGE_OPTIONS COMPONENTS adv base core html qa xml
-#   INTERFACE_NAME wxwidgets::wxwidgets
-#   HAS_ONLY_DEBUG_RELEASE
-#   CONAN_OPTIONS 
-#        wxwidgets:shared=True
-# )
+#[[
+Add a Conan dependency
 
+Example usage:
 
+add_conan_lib( 
+  wxWdidget 
+  wxwidgets/3.1.3-audacity
+  OPTION_NAME wxwidgets
+  SYMBOL WXWIDGET
+  REQUIRED 
+  ALWAYS_ALLOW_CONAN_FALLBACK
+  PKG_CONFIG "wxwidgets >= 3.1.3"
+  FIND_PACKAGE_OPTIONS COMPONENTS adv base core html qa xml
+  INTERFACE_NAME wxwidgets::wxwidgets
+  HAS_ONLY_DEBUG_RELEASE
+  CONAN_OPTIONS 
+       wxwidgets:shared=True
+)
+
+PKG_CONFIG accepts a list of possible package configurations. 
+add_conan_lib will iterate over it one by one until the library is found.
+]]
+
 function (add_conan_lib package conan_package_name )
     # Extract the list of packages from the function args
     list( SUBLIST ARGV 2 -1 options )
@@ -54,6 +63,8 @@ function (add_conan_lib package conan_package_name )
             set( list_mode on )
             set( allow_find_package on )
             set( current_var "find_package_options" )
+        elseif ( opt STREQUAL "ALLOW_FIND_PACKAGE" )
+            set ( allow_find_package on )
         elseif ( opt STREQUAL "CONAN_OPTIONS" )
             set( list_mode on )
             set( current_var "conan_package_options" )
@@ -93,14 +104,23 @@ function (add_conan_lib package conan_package_name )
 
     set( option_desc "local" )
 
-    if( pkg_config_options OR allow_find_package )
+    if( pkg_config_options OR allow_find_package OR NOT ${_OPT}conan_enabled )
         set( sysopt "system" )
         string( PREPEND option_desc "system (if available), " )
-        set( default "${${_OPT}lib_preference}" )
+
+        if( ${_OPT}conan_enabled )
+            set( default "${${_OPT}lib_preference}" )
+        else()
+            set( default "system" )
+        endif()
     else()
         set( default "local" )
     endif()
 
+    if( ${_OPT}conan_enabled )
+        set( localopt "local" )
+    endif()
+
     if( NOT required )
         set( reqopt "off" )
         string( APPEND option_desc ", off" )
@@ -109,7 +129,7 @@ function (add_conan_lib package conan_package_name )
     cmd_option( ${option_name}
                 "Use ${option_name_base} library [${option_desc}]"
                 "${default}"
-                STRINGS ${sysopt} "local" ${reqopt}
+                STRINGS ${sysopt} ${localopt} ${reqopt}
     )
     
     # Early bail out
@@ -129,26 +149,28 @@ function (add_conan_lib package conan_package_name )
         return()
     endif()
 
-    if( ${option_name} STREQUAL "system" )
+    if( ${option_name} STREQUAL "system" OR NOT ${_OPT}conan_enabled )
         if( pkg_config_options )
-            pkg_check_modules( PKG_${package} ${pkg_config_options} )
+            foreach(variant ${pkg_config_options})
+                pkg_check_modules( PKG_${package} ${variant} )
 
-            if( PKG_${package}_FOUND )
-                message( STATUS "Using '${package}' system library" )
-    
-                # Create the target interface library
-                add_library( ${interface_name} INTERFACE IMPORTED GLOBAL)
+                if( PKG_${package}_FOUND )
+                    message( STATUS "Using '${package}' system library" )
         
-                # Retrieve the package information
-                get_package_interface( PKG_${package} )
-        
-                # And add it to our target
-                target_include_directories( ${interface_name} INTERFACE ${INCLUDES} )
-                target_link_libraries( ${interface_name} INTERFACE ${LIBRARIES} )
+                    # Create the target interface library
+                    add_library( ${interface_name} INTERFACE IMPORTED GLOBAL)
+            
+                    # Retrieve the package information
+                    get_package_interface( PKG_${package} )
+            
+                    # And add it to our target
+                    target_include_directories( ${interface_name} INTERFACE ${INCLUDES} )
+                    target_link_libraries( ${interface_name} INTERFACE ${LIBRARIES} )
 
-                message(STATUS "Added inteface ${interface_name} ${INCLUDES} ${LIBRARIES}")
-                return()
-            endif()
+                    message(STATUS "Added inteface ${interface_name} ${INCLUDES} ${LIBRARIES}")
+                    return()
+                endif()
+            endforeach()
         endif()
 
         if( allow_find_package )
@@ -160,7 +182,7 @@ function (add_conan_lib package conan_package_name )
             endif()
         endif()
 
-        if( system_only )
+        if( system_only OR NOT ${_OPT}conan_enabled )
             message( FATAL_ERROR "Failed to find the system package ${package}" )
         else()
             set( ${option_name} "local" )
@@ -237,34 +259,36 @@ function ( _conan_install build_type )
 endfunction()
 
 macro( resolve_conan_dependencies )
-    message(STATUS 
-    "Executing Conan: \
-        REQUIRES ${CONAN_REQUIRES}
-        GENERATORS cmake_find_package_multi
-        BUILD_REQUIRES ${CONAN_BUILD_REQUIRES}
-        ${CONAN_CONFIG_OPTIONS}
-        OPTIONS ${CONAN_PACKAGE_OPTIONS}
-    ")
+    if( ${_OPT}conan_enabled )
+        message(STATUS 
+        "Executing Conan: \
+            REQUIRES ${CONAN_REQUIRES}
+            GENERATORS cmake_find_package_multi
+            BUILD_REQUIRES ${CONAN_BUILD_REQUIRES}
+            ${CONAN_CONFIG_OPTIONS}
+            OPTIONS ${CONAN_PACKAGE_OPTIONS}
+        ")
 
-    if(MSVC OR XCODE)
-        foreach(TYPE ${CMAKE_CONFIGURATION_TYPES})
-            _conan_install(${TYPE})
-        endforeach()
-    else()
-        _conan_install(${CMAKE_BUILD_TYPE})
-    endif()
+        if(MSVC OR XCODE)
+            foreach(TYPE ${CMAKE_CONFIGURATION_TYPES})
+                _conan_install(${TYPE})
+            endforeach()
+        else()
+            _conan_install(${CMAKE_BUILD_TYPE})
+        endif()
 
-    list( REMOVE_DUPLICATES CONAN_REQUIRES )
+        list( REMOVE_DUPLICATES CONAN_REQUIRES )
 
-    foreach( package ${CONAN_RESOLVE_LIST} )
-        message(STATUS "Resolving Conan library ${package}")
+        foreach( package ${CONAN_RESOLVE_LIST} )
+            message(STATUS "Resolving Conan library ${package}")
 
-        find_package(${package} CONFIG)
+            find_package(${package} CONFIG)
 
-        if (NOT ${package}_FOUND)
-            message( FATAL_ERROR "Failed to find the conan package ${package}" )
-        endif()
-    endforeach()
+            if (NOT ${package}_FOUND)
+                message( FATAL_ERROR "Failed to find the conan package ${package}" )
+            endif()
+        endforeach()
+    endif()
 
     file(GLOB dependency_helpers "${AUDACITY_MODULE_PATH}/dependencies/*.cmake")
 




--- cmake-proxies/cmake-modules/Findlibmp3lame.cmake.orig	2021-08-27 22:30:58 UTC
+++ cmake-proxies/cmake-modules/Findlibmp3lame.cmake
@@ -0,0 +1,29 @@
+#[[
+A module to look for libmp3lame
+]]
+
+if( NOT libmp3lame_FOUND )
+   find_path( libmp3lame_INCLUDE_DIR lame/lame.h )
+   find_library( libmp3lame_LIBRARIES NAMES mp3lame )
+
+   if( libmp3lame_INCLUDE_DIR AND libmp3lame_LIBRARIES )
+      set( libmp3lame_FOUND Yes )
+   endif()
+
+   if( libmp3lame_FOUND )
+      if( NOT libmp3lame_FIND_QUIETLY )
+         message( STATUS "Found lame: \n\tlibmp3lame_INCLUDE_DIR: ${libmp3lame_INCLUDE_DIR}\n\tlibmp3lame_LIBRARIES: ${libmp3lame_LIBRARIES}" )
+      endif()
+
+      if( NOT TARGET libmp3lame::libmp3lame )
+         add_library( libmp3lame::libmp3lame INTERFACE IMPORTED GLOBAL)
+
+         target_include_directories( libmp3lame::libmp3lame INTERFACE ${libmp3lame_INCLUDE_DIR} )
+         target_link_libraries( libmp3lame::libmp3lame INTERFACE ${libmp3lame_LIBRARIES} )
+      endif()
+   else()
+      if( libmp3lame_FIND_REQUIRED )
+         message( FATAL_ERROR "Could not find libmp3lame")
+      endif()
+   endif()
+endif()




--- cmake-proxies/cmake-modules/dependencies/wxwidgets.cmake.orig	2021-08-27 06:00:39 UTC
+++ cmake-proxies/cmake-modules/dependencies/wxwidgets.cmake
@@ -1,4 +1,10 @@
-if( ${_OPT}use_wxwidgets STREQUAL "system" ) 
+if( ${_OPT}use_wxwidgets STREQUAL "system" OR NOT ${_OPT}conan_enabled )
+    # DV: find_package will be scoped, as FindwxWidgets.cmake is rather outdated.
+    # Still - let's perform the sanity check first.
+    if( NOT wxWidgets_FOUND )
+        find_package( wxWidgets REQUIRED COMPONENTS adv base core html qa xml net )
+    endif()
+
     if( NOT TARGET wxwidgets::wxwidgets )
         add_library( wxwidgets::wxwidgets INTERFACE IMPORTED GLOBAL)
     endif()




--- cmake-proxies/wxWidgets/CMakeLists.txt.orig	2020-08-05 16:32:53 UTC
+++ cmake-proxies/wxWidgets/CMakeLists.txt
@@ -237,17 +237,6 @@ file(
       "^#define +wxVERSION_STRING +"
 )
 
-string( REGEX MATCHALL "\".+(Audacity).+\"" ours "${output}")
-if( NOT ours )
-   message( FATAL_ERROR
-      "\n########################################################################\n"
-      "Audacity version 3.0.0 or higher requires use of a customized version of "
-      "wxWidgets.  For details:\n"
-      "  https://wiki.audacityteam.org/wiki/Building_for_Distros\n"
-      "########################################################################\n"
-   )
-endif()
-
 target_include_directories( ${TARGET} INTERFACE ${INCLUDES} )
 target_compile_definitions( ${TARGET} INTERFACE ${DEFINES} )
 target_compile_options( ${TARGET} INTERFACE ${COPTS} )

Lines 1-11 Link Here

(-)audacity-new/files/patch-src_AboutDialog.cpp (-11 lines)
1	--- src/AboutDialog.cpp.orig 2020-06-28 06:25:54 UTC
2	+++ src/AboutDialog.cpp
3	@@ -63,7 +63,7 @@ hold information about one contributor to Audacity.
4	// RevisionIdent.h may contain #defines like these ones:
5	//#define REV_LONG "28864acb238cb3ca71dda190a2d93242591dd80e"
6	//#define REV_TIME "Sun Apr 12 12:40:22 2015 +0100"
7	-#include <RevisionIdent.h>
8	+//#include <RevisionIdent.h>
9
10	#ifndef REV_TIME
11	#define REV_TIME "unknown date and time"

Lines 1-11 Link Here

(-)audacity-new/files/patch-src_widgets_Grid.cpp (-11 lines)
1	--- src/widgets/Grid.cpp.orig 2021-02-04 18:52:51 UTC
2	+++ src/widgets/Grid.cpp
3	@@ -572,7 +572,7 @@ void Grid::OnKeyDown(wxKeyEvent &event)
4	{
5	wxTextDataObject *data = safenew wxTextDataObject(GetCellValue(crow, ccol));
6	wxClipboard::Get()->SetData(data);
7	- SetCellValue(crow, ccol, {});
8	+ SetCellValue(crow, ccol, "");
9	return;
10	}
11	break;

Lines 1-9 Link Here

(-)audacity-new/pkg-plist (-2 / +6 lines)
1	bin/audacity	1	bin/audacity
		2	lib/audacity/lib-string-utils.so
		3	lib/audacity/lib-strings.so
		4	lib/audacity/lib-utility.so
		5	lib/audacity/lib-uuid.so
		6	lib/audacity/modules/mod-script-pipe.so
2	man/man1/audacity.1.gz	7	man/man1/audacity.1.gz
3	share/appdata/audacity.appdata.xml
4	share/applications/audacity.desktop	8	share/applications/audacity.desktop
5	%%DATADIR%%/EQDefaultCurves.xml	9	%%DATADIR%%/EQDefaultCurves.xml
6	%%DATADIR%%/modules/mod-script-pipe.so
7	%%DATADIR%%/nyquist/aud-do-support.lsp	10	%%DATADIR%%/nyquist/aud-do-support.lsp
8	%%DATADIR%%/nyquist/dspprims.lsp	11	%%DATADIR%%/nyquist/dspprims.lsp
9	%%DATADIR%%/nyquist/envelopes.lsp	12	%%DATADIR%%/nyquist/envelopes.lsp
Lines 141-146 Link Here
141	%%NLS%%share/locale/vi/LC_MESSAGES/audacity.mo	144	%%NLS%%share/locale/vi/LC_MESSAGES/audacity.mo
142	%%NLS%%share/locale/zh_CN/LC_MESSAGES/audacity.mo	145	%%NLS%%share/locale/zh_CN/LC_MESSAGES/audacity.mo
143	%%NLS%%share/locale/zh_TW/LC_MESSAGES/audacity.mo	146	%%NLS%%share/locale/zh_TW/LC_MESSAGES/audacity.mo
		147	share/metainfo/audacity.appdata.xml
144	share/mime/packages/audacity.xml	148	share/mime/packages/audacity.xml
145	share/pixmaps/audacity.xpm	149	share/pixmaps/audacity.xpm
146	share/pixmaps/audacity16.xpm	150	share/pixmaps/audacity16.xpm

Return to bug 258107

Lines 1-11 Link Here

(-)audacity-new/Makefile (-23 / +30 lines)
1	# Created by: Marc van Woerkom <3d@FreeBSD.org>	1	# Created by: Marc van Woerkom <3d@FreeBSD.org>
2		2
3	PORTNAME= audacity	3	PORTNAME= audacity
4	DISTVERSIONPREFIX= minsrc-	4	DISTVERSIONPREFIX= Audacity-
5	DISTVERSION= 3.0.2	5	DISTVERSION= 3.0.4
6	PORTREVISION= 1
7	CATEGORIES= audio	6	CATEGORIES= audio
8	MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/Audacity-${PORTVERSION}/
9		7
10	MAINTAINER= xxjack12xx@gmail.com	8	MAINTAINER= xxjack12xx@gmail.com
11	COMMENT= GUI editor for digital audio waveforms	9	COMMENT= GUI editor for digital audio waveforms
Lines 13-27 Link Here
13	LICENSE= GPLv2+	11	LICENSE= GPLv2+
14	LICENSE_FILE= ${WRKSRC}/LICENSE.txt	12	LICENSE_FILE= ${WRKSRC}/LICENSE.txt
15		13
		14	BUILD_DEPENDS= conan:sysutils/conan
		15
		16	USES= cmake compiler:c++14-lang cpe desktop-file-utils gettext \
		17	gnome libtool python:build pkgconfig shared-mime-info
		18
16	LIB_DEPENDS= libasound.so:audio/alsa-lib \	19	LIB_DEPENDS= libasound.so:audio/alsa-lib \
		20	libcurl.so:ftp/curl \
17	libexpat.so:textproc/expat2 \	21	libexpat.so:textproc/expat2 \
18	libportaudio.so:audio/portaudio \	22	libportaudio.so:audio/portaudio \
19	libsndfile.so:audio/libsndfile \	23	libsndfile.so:audio/libsndfile \
20	libsoxr.so:audio/libsoxr \	24	libsoxr.so:audio/libsoxr \
21	libsqlite3.so:databases/sqlite3	25	libsqlite3.so:databases/sqlite3 \
		26	libuuid.so:misc/e2fsprogs-libuuid
22		27
23	USES= cmake compiler:c++14-lang cpe desktop-file-utils gettext \	28	USE_GITHUB= yes
24	gnome libtool python:build pkgconfig shared-mime-info tar:xz
25	USE_GNOME= cairo gtk30	29	USE_GNOME= cairo gtk30
26	USE_WX= 3.1+	30	USE_WX= 3.1+
27	WX_COMPS= wx	31	WX_COMPS= wx
Lines 29-54 Link Here
29	PORTDOCS= README.txt	33	PORTDOCS= README.txt
30		34
31	CMAKE_ARGS= -Daudacity_lib_preference:STRING=system \	35	CMAKE_ARGS= -Daudacity_lib_preference:STRING=system \
		36	-Daudacity_use_curl:STRING=system \
32	-Daudacity_use_expat:STRING=system \	37	-Daudacity_use_expat:STRING=system \
33	-Daudacity_use_wxwidgets:STRING=system \	38	-Daudacity_use_midi:STRING=local \
34	-Daudacity_use_soxr:STRING=system \	39	-Daudacity_use_nyquist:STRING=local \
35	-Daudacity_use_sndfile:STRING=system \
36	-Daudacity_use_portsmf:STRING=local \	40	-Daudacity_use_portsmf:STRING=local \
37	-Daudacity_use_portmixer:STRING=local \	41	-Daudacity_use_portmixer:STRING=local \
38	-Daudacity_use_portaudio:STRING=system	42	-Daudacity_use_portaudio:STRING=system \
39	CMAKE_OFF= audacity_use_pch	43	-Daudacity_use_soxr:STRING=system \
		44	-Daudacity_use_sndfile:STRING=system \
		45	-Daudacity_use_sqlite:STRING=system \
		46	-Daudacity_use_wxwidgets:STRING=system \
		47	-Daudacity_use_zlib:STRING=system
		48	CMAKE_ON= audacity_obey_system_dependencies
		49	CMAKE_OFF= audacity_use_pa_alsa audacity_use_pch
40		50
41	OPTIONS_DEFINE= DEBUG DOCS FFMPEG FLAC ID3TAG LADSPA LAME LV2 MAD \	51	OPTIONS_DEFINE= DEBUG DOCS FFMPEG FLAC ID3TAG LADSPA LAME LV2 MAD \
42	MIDI OGG SBSMS SOUNDTOUCH TWOLAME VAMP \	52	OGG SBSMS SOUNDTOUCH TWOLAME VAMP \
43	VORBIS VST	53	VORBIS VST
44	OPTIONS_DEFAULT= FFMPEG FLAC ID3TAG LV2 MAD MIDI OGG SBSMS \	54	OPTIONS_DEFAULT= FFMPEG FLAC ID3TAG LV2 MAD OGG SBSMS \
45	SOUNDTOUCH TWOLAME VAMP VORBIS VST	55	SOUNDTOUCH TWOLAME VAMP VORBIS VST
46	OPTIONS_EXCLUDE_i386= SBSMS	56	OPTIONS_EXCLUDE_i386= SBSMS
47		57
48	LAME_DESC= Use lame for import and export support	58	LAME_DESC= Use lame for import and export support
49	LV2_DESC= Add LV2 plug-in support	59	LV2_DESC= Add LV2 plug-in support
50	MAD_DESC= Use libmad for mp2/3 decoding support	60	MAD_DESC= Use libmad for mp2/3 decoding support
51	MIDI_DESC= MIDI support
52	SBSMS_DESC= Use libsbsms for pitch and tempo changing	61	SBSMS_DESC= Use libsbsms for pitch and tempo changing
53	SOUNDTOUCH_DESC= Use libSoundTouch for pitch and tempo changing	62	SOUNDTOUCH_DESC= Use libSoundTouch for pitch and tempo changing
54	TWOLAME_DESC= Use libtwolame for MP2 export support	63	TWOLAME_DESC= Use libtwolame for MP2 export support
Lines 76-83 Link Here
76	LADSPA_CMAKE_BOOL= audacity_use_ladspa	85	LADSPA_CMAKE_BOOL= audacity_use_ladspa
77	LADSPA_RUN_DEPENDS= listplugins:audio/ladspa	86	LADSPA_RUN_DEPENDS= listplugins:audio/ladspa
78		87
79	LAME_CMAKE_ON= -Daudacity_use_lame:STRING=system	88	LAME_CMAKE_ON= -Daudacity_use_libmp3lame:STRING=system
80	LAME_CMAKE_OFF= -Daudacity_use_lame:STRING=local
81	LAME_BUILD_DEPENDS= ${LOCALBASE}/include/lame/lame.h:audio/lame	89	LAME_BUILD_DEPENDS= ${LOCALBASE}/include/lame/lame.h:audio/lame
82	LAME_CPPFLAGS= -I${LOCALBASE}/include/lame	90	LAME_CPPFLAGS= -I${LOCALBASE}/include/lame
83	LAME_LDFLAGS= -L${LOCALBASE}/lib	91	LAME_LDFLAGS= -L${LOCALBASE}/lib
Lines 91-103 Link Here
91	libsratom-0.so:audio/sratom \	99	libsratom-0.so:audio/sratom \
92	libsuil-0.so:audio/suil	100	libsuil-0.so:audio/suil
93		101
94	MAD_CMAKE_ON= -Daudacity_use_mad:STRING=system	102	MAD_CMAKE_ON= -Daudacity_use_mad:STRING=system \
95	MAD_CMAKE_OFF= -Daudacity_use_mad:STRING=off	103	-Daudacity_use_libmad:STRING=system
		104	MAD_CMAKE_OFF= -Daudacity_use_mad:STRING=off \
		105	-Daudacity_use_libmad:STRING=off
96	MAD_LIB_DEPENDS= libmad.so:audio/libmad	106	MAD_LIB_DEPENDS= libmad.so:audio/libmad
97		107
98	MIDI_CMAKE_ON= -Daudacity_use_midi:STRING=local
99	MIDI_CMAKE_OFF= -Daudacity_use_midi:STRING=off
100
101	# TODO: fix NLS support properly	108	# TODO: fix NLS support properly
102	PLIST_SUB+= NLS=""	109	PLIST_SUB+= NLS=""
103		110
Lines 138-144 Link Here
138	post-install:	145	post-install:
139	@cd ${STAGEDIR}${PREFIX} && ${STRIP_CMD} \	146	@cd ${STAGEDIR}${PREFIX} && ${STRIP_CMD} \
140	bin/${PORTNAME} \	147	bin/${PORTNAME} \
141	share/audacity/modules/mod-script-pipe.so	148	lib/${PORTNAME}/modules/mod-script-pipe.so
142	@${RM} ${STAGEDIR}${DOCSDIR}/LICENSE.txt	149	@${RM} ${STAGEDIR}${DOCSDIR}/LICENSE.txt
143	# delete empty directories: https://github.com/audacity/audacity/issues/808	150	# delete empty directories: https://github.com/audacity/audacity/issues/808
144	@${FIND} ${STAGEDIR} -type d -empty -delete	151	@${FIND} ${STAGEDIR} -type d -empty -delete

Lines 1-7 Link Here

(-)audacity-new/files/patch-cmake-proxies_CMakeLists.txt (-3 / +69 lines)
1	--- cmake-proxies/CMakeLists.txt.orig 2021-02-04 18:52:51 UTC	1	--- cmake-proxies/CMakeLists.txt.orig 2021-08-18 10:21:37 UTC
2	+++ cmake-proxies/CMakeLists.txt	2	+++ cmake-proxies/CMakeLists.txt
3	@@ -132,7 +132,7 @@ addlib( expat expat EXPAT YES	3	@@ -87,6 +87,7 @@ add_conan_lib(
4	addlib( lame lame LAME YES YES "lame >= 3.100" )	4	REQUIRED
		5	INTERFACE_NAME libmp3lame::libmp3lame
		6	PKG_CONFIG "lame >= 3.100"
		7	+ ALLOW_FIND_PACKAGE
		8	)
		9
		10	add_conan_lib(
		11	@@ -105,24 +106,23 @@ add_conan_lib(
		12	PKG_CONFIG "mad >= 0.15.1b"
		13	)
		14
		15	-if( CMAKE_SYSTEM_NAME MATCHES "Darwin" )
		16	- set( curl_ssl "darwinssl" )
		17	-elseif( CMAKE_SYSTEM_NAME MATCHES "Windows" )
		18	- set( curl_ssl "schannel")
		19	-else()
		20	- set ( curl_ssl "openssl" )
		21	-endif ()
		22	-
		23	-add_conan_lib(
		24	- ThreadPool
		25	- threadpool/20140926
		26	- REQUIRED
		27	- ALWAYS_ALLOW_CONAN_FALLBACK
		28	-)
		29	-
		30	if( ${_OPT}has_networking )
		31	+ if( CMAKE_SYSTEM_NAME MATCHES "Darwin" )
		32	+ set( curl_ssl "darwinssl" )
		33	+ elseif( CMAKE_SYSTEM_NAME MATCHES "Windows" )
		34	+ set( curl_ssl "schannel")
		35	+ else()
		36	+ set ( curl_ssl "openssl" )
		37	+ endif ()
		38
		39	add_conan_lib(
		40	+ ThreadPool
		41	+ threadpool/20140926
		42	+ REQUIRED
		43	+ ALWAYS_ALLOW_CONAN_FALLBACK
		44	+ )
		45	+
		46	+ add_conan_lib(
		47	CURL
		48	libcurl/7.75.0
		49	REQUIRED
		50	@@ -148,11 +148,13 @@ if( NOT CMAKE_SYSTEM_NAME MATCHES "Darwin\|Windows")
		51	)
		52	endif()
		53
		54	-add_conan_lib(
		55	- RapidJSON
		56	- rapidjson/1.1.0
		57	- REQUIRED
		58	-)
		59	+if( ${_OPT}has_sentry_reporting )
		60	+ add_conan_lib(
		61	+ RapidJSON
		62	+ rapidjson/1.1.0
		63	+ REQUIRED
		64	+ )
		65	+endif()
		66
		67	set_conan_vars_to_parent()
		68
69	@@ -161,7 +163,7 @@ set_conan_vars_to_parent()
70	# directory option symbol req chk version
5	addlib( libsndfile sndfile SNDFILE YES YES "sndfile >= 1.0.28" )	71	addlib( libsndfile sndfile SNDFILE YES YES "sndfile >= 1.0.28" )
6	addlib( libsoxr soxr SOXR YES YES "soxr >= 0.1.1" )	72	addlib( libsoxr soxr SOXR YES YES "soxr >= 0.1.1" )
7	-addlib( portaudio-v19 portaudio PORTAUDIO YES YES "" )	73	-addlib( portaudio-v19 portaudio PORTAUDIO YES YES "" )

Line 0 Link Here

(-)audacity-new/files/patch-cmake-proxies_cmake-modules_AudacityDependencies.cmake (+227 lines)
		1	--- cmake-proxies/cmake-modules/AudacityDependencies.cmake.orig 2021-08-27 22:30:37 UTC
		2	+++ cmake-proxies/cmake-modules/AudacityDependencies.cmake
		3	@@ -1,11 +1,14 @@
		4	# Load Conan
		5	-include( conan )
		6
		7	-conan_add_remote(NAME audacity
		8	- URL https://artifactory.audacityteam.org/artifactory/api/conan/conan-local
		9	- VERIFY_SSL True
		10	-)
		11	+if( ${_OPT}conan_enabled )
		12	+ include( conan )
		13
		14	+ conan_add_remote(NAME audacity
		15	+ URL https://artifactory.audacityteam.org/artifactory/api/conan/conan-local
		16	+ VERIFY_SSL True
		17	+ )
		18	+endif()
		19	+
		20	set( CONAN_BUILD_REQUIRES )
		21	set( CONAN_REQUIRES )
		22	set( CONAN_PACKAGE_OPTIONS )
		23	@@ -13,24 +16,30 @@ set( CONAN_ONLY_DEBUG_RELEASE )
		24	set( CONAN_CONFIG_OPTIONS )
		25	set( CONAN_RESOLVE_LIST )
		26
		27	-# Add a Conan dependency
		28	-# Example usage:
		29	-# add_conan_lib(
		30	-# wxWdidget
		31	-# wxwidgets/3.1.3-audacity
		32	-# OPTION_NAME wxwidgets
		33	-# SYMBOL WXWIDGET
		34	-# REQUIRED
		35	-# ALWAYS_ALLOW_CONAN_FALLBACK
		36	-# PKG_CONFIG "wxwidgets >= 3.1.3"
		37	-# FIND_PACKAGE_OPTIONS COMPONENTS adv base core html qa xml
		38	-# INTERFACE_NAME wxwidgets::wxwidgets
		39	-# HAS_ONLY_DEBUG_RELEASE
		40	-# CONAN_OPTIONS
		41	-# wxwidgets:shared=True
		42	-# )
		43	+#[[
		44	+Add a Conan dependency
		45
		46	+Example usage:
		47
		48	+add_conan_lib(
		49	+ wxWdidget
		50	+ wxwidgets/3.1.3-audacity
		51	+ OPTION_NAME wxwidgets
		52	+ SYMBOL WXWIDGET
		53	+ REQUIRED
		54	+ ALWAYS_ALLOW_CONAN_FALLBACK
		55	+ PKG_CONFIG "wxwidgets >= 3.1.3"
		56	+ FIND_PACKAGE_OPTIONS COMPONENTS adv base core html qa xml
		57	+ INTERFACE_NAME wxwidgets::wxwidgets
		58	+ HAS_ONLY_DEBUG_RELEASE
		59	+ CONAN_OPTIONS
		60	+ wxwidgets:shared=True
		61	+)
		62	+
		63	+PKG_CONFIG accepts a list of possible package configurations.
		64	+add_conan_lib will iterate over it one by one until the library is found.
65	+]]
66	+
67	function (add_conan_lib package conan_package_name )
68	# Extract the list of packages from the function args
69	list( SUBLIST ARGV 2 -1 options )
70	@@ -54,6 +63,8 @@ function (add_conan_lib package conan_package_name )
71	set( list_mode on )
72	set( allow_find_package on )
73	set( current_var "find_package_options" )
74	+ elseif ( opt STREQUAL "ALLOW_FIND_PACKAGE" )
75	+ set ( allow_find_package on )
76	elseif ( opt STREQUAL "CONAN_OPTIONS" )
77	set( list_mode on )
78	set( current_var "conan_package_options" )
79	@@ -93,14 +104,23 @@ function (add_conan_lib package conan_package_name )
80
81	set( option_desc "local" )
82
83	- if( pkg_config_options OR allow_find_package )
84	+ if( pkg_config_options OR allow_find_package OR NOT ${_OPT}conan_enabled )
85	set( sysopt "system" )
86	string( PREPEND option_desc "system (if available), " )
87	- set( default "${${_OPT}lib_preference}" )
88	+
89	+ if( ${_OPT}conan_enabled )
90	+ set( default "${${_OPT}lib_preference}" )
91	+ else()
92	+ set( default "system" )
93	+ endif()
94	else()
95	set( default "local" )
96	endif()
97
98	+ if( ${_OPT}conan_enabled )
99	+ set( localopt "local" )
100	+ endif()
101	+
102	if( NOT required )
103	set( reqopt "off" )
104	string( APPEND option_desc ", off" )
105	@@ -109,7 +129,7 @@ function (add_conan_lib package conan_package_name )
106	cmd_option( ${option_name}
107	"Use ${option_name_base} library [${option_desc}]"
108	"${default}"
109	- STRINGS ${sysopt} "local" ${reqopt}
110	+ STRINGS ${sysopt} ${localopt} ${reqopt}
111	)
112
113	# Early bail out
114	@@ -129,26 +149,28 @@ function (add_conan_lib package conan_package_name )
115	return()
116	endif()
117
118	- if( ${option_name} STREQUAL "system" )
119	+ if( ${option_name} STREQUAL "system" OR NOT ${_OPT}conan_enabled )
120	if( pkg_config_options )
121	- pkg_check_modules( PKG_${package} ${pkg_config_options} )
122	+ foreach(variant ${pkg_config_options})
123	+ pkg_check_modules( PKG_${package} ${variant} )
124
125	- if( PKG_${package}_FOUND )
126	- message( STATUS "Using '${package}' system library" )
127	-
128	- # Create the target interface library
129	- add_library( ${interface_name} INTERFACE IMPORTED GLOBAL)
130	+ if( PKG_${package}_FOUND )
131	+ message( STATUS "Using '${package}' system library" )
132
133	- # Retrieve the package information
134	- get_package_interface( PKG_${package} )
135	-
136	- # And add it to our target
137	- target_include_directories( ${interface_name} INTERFACE ${INCLUDES} )
138	- target_link_libraries( ${interface_name} INTERFACE ${LIBRARIES} )
139	+ # Create the target interface library
140	+ add_library( ${interface_name} INTERFACE IMPORTED GLOBAL)
141	+
142	+ # Retrieve the package information
143	+ get_package_interface( PKG_${package} )
144	+
145	+ # And add it to our target
146	+ target_include_directories( ${interface_name} INTERFACE ${INCLUDES} )
147	+ target_link_libraries( ${interface_name} INTERFACE ${LIBRARIES} )
148
149	- message(STATUS "Added inteface ${interface_name} ${INCLUDES} ${LIBRARIES}")
150	- return()
151	- endif()
152	+ message(STATUS "Added inteface ${interface_name} ${INCLUDES} ${LIBRARIES}")
153	+ return()
154	+ endif()
155	+ endforeach()
156	endif()
157
158	if( allow_find_package )
159	@@ -160,7 +182,7 @@ function (add_conan_lib package conan_package_name )
160	endif()
161	endif()
162
163	- if( system_only )
164	+ if( system_only OR NOT ${_OPT}conan_enabled )
165	message( FATAL_ERROR "Failed to find the system package ${package}" )
166	else()
167	set( ${option_name} "local" )
168	@@ -237,34 +259,36 @@ function ( _conan_install build_type )
169	endfunction()
170
171	macro( resolve_conan_dependencies )
172	- message(STATUS
173	- "Executing Conan: \
174	- REQUIRES ${CONAN_REQUIRES}
175	- GENERATORS cmake_find_package_multi
176	- BUILD_REQUIRES ${CONAN_BUILD_REQUIRES}
177	- ${CONAN_CONFIG_OPTIONS}
178	- OPTIONS ${CONAN_PACKAGE_OPTIONS}
179	- ")
180	+ if( ${_OPT}conan_enabled )
181	+ message(STATUS
182	+ "Executing Conan: \
183	+ REQUIRES ${CONAN_REQUIRES}
184	+ GENERATORS cmake_find_package_multi
185	+ BUILD_REQUIRES ${CONAN_BUILD_REQUIRES}
186	+ ${CONAN_CONFIG_OPTIONS}
187	+ OPTIONS ${CONAN_PACKAGE_OPTIONS}
188	+ ")
189
190	- if(MSVC OR XCODE)
191	- foreach(TYPE ${CMAKE_CONFIGURATION_TYPES})
192	- _conan_install(${TYPE})
193	- endforeach()
194	- else()
195	- _conan_install(${CMAKE_BUILD_TYPE})
196	- endif()
197	+ if(MSVC OR XCODE)
198	+ foreach(TYPE ${CMAKE_CONFIGURATION_TYPES})
199	+ _conan_install(${TYPE})
200	+ endforeach()
201	+ else()
202	+ _conan_install(${CMAKE_BUILD_TYPE})
203	+ endif()
204
205	- list( REMOVE_DUPLICATES CONAN_REQUIRES )
206	+ list( REMOVE_DUPLICATES CONAN_REQUIRES )
207
208	- foreach( package ${CONAN_RESOLVE_LIST} )
209	- message(STATUS "Resolving Conan library ${package}")
210	+ foreach( package ${CONAN_RESOLVE_LIST} )
211	+ message(STATUS "Resolving Conan library ${package}")
212
213	- find_package(${package} CONFIG)
214	+ find_package(${package} CONFIG)
215
216	- if (NOT ${package}_FOUND)
217	- message( FATAL_ERROR "Failed to find the conan package ${package}" )
218	- endif()
219	- endforeach()
220	+ if (NOT ${package}_FOUND)
221	+ message( FATAL_ERROR "Failed to find the conan package ${package}" )
222	+ endif()
223	+ endforeach()
224	+ endif()
225
226	file(GLOB dependency_helpers "${AUDACITY_MODULE_PATH}/dependencies/*.cmake")
227

Line 0 Link Here

(-)audacity-new/files/patch-cmake-proxies_cmake-modules_Findlibmp3lame.cmake (+32 lines)
	1	--- cmake-proxies/cmake-modules/Findlibmp3lame.cmake.orig 2021-08-27 22:30:58 UTC
	2	+++ cmake-proxies/cmake-modules/Findlibmp3lame.cmake
	3	@@ -0,0 +1,29 @@
	4	+#[[
	5	+A module to look for libmp3lame
	6	+]]
	7	+
	8	+if( NOT libmp3lame_FOUND )
	9	+ find_path( libmp3lame_INCLUDE_DIR lame/lame.h )
	10	+ find_library( libmp3lame_LIBRARIES NAMES mp3lame )
	11	+
	12	+ if( libmp3lame_INCLUDE_DIR AND libmp3lame_LIBRARIES )
	13	+ set( libmp3lame_FOUND Yes )
	14	+ endif()
	15	+
	16	+ if( libmp3lame_FOUND )
	17	+ if( NOT libmp3lame_FIND_QUIETLY )
	18	+ message( STATUS "Found lame: \n\tlibmp3lame_INCLUDE_DIR: ${libmp3lame_INCLUDE_DIR}\n\tlibmp3lame_LIBRARIES: ${libmp3lame_LIBRARIES}" )
	19	+ endif()
	20	+
	21	+ if( NOT TARGET libmp3lame::libmp3lame )
	22	+ add_library( libmp3lame::libmp3lame INTERFACE IMPORTED GLOBAL)
	23	+
	24	+ target_include_directories( libmp3lame::libmp3lame INTERFACE ${libmp3lame_INCLUDE_DIR} )
	25	+ target_link_libraries( libmp3lame::libmp3lame INTERFACE ${libmp3lame_LIBRARIES} )
	26	+ endif()
	27	+ else()
	28	+ if( libmp3lame_FIND_REQUIRED )
	29	+ message( FATAL_ERROR "Could not find libmp3lame")
	30	+ endif()
	31	+ endif()
	32	+endif()

Line 0 Link Here

(-)audacity-new/files/patch-cmake-proxies_cmake-modules_dependencies_wxwidgets.cmake (+14 lines)
	1	--- cmake-proxies/cmake-modules/dependencies/wxwidgets.cmake.orig 2021-08-27 06:00:39 UTC
	2	+++ cmake-proxies/cmake-modules/dependencies/wxwidgets.cmake
	3	@@ -1,4 +1,10 @@
	4	-if( ${_OPT}use_wxwidgets STREQUAL "system" )
	5	+if( ${_OPT}use_wxwidgets STREQUAL "system" OR NOT ${_OPT}conan_enabled )
	6	+ # DV: find_package will be scoped, as FindwxWidgets.cmake is rather outdated.
	7	+ # Still - let's perform the sanity check first.
	8	+ if( NOT wxWidgets_FOUND )
	9	+ find_package( wxWidgets REQUIRED COMPONENTS adv base core html qa xml net )
	10	+ endif()
	11	+
	12	if( NOT TARGET wxwidgets::wxwidgets )
	13	add_library( wxwidgets::wxwidgets INTERFACE IMPORTED GLOBAL)
	14	endif()

Lines 1-20 Link Here

(-)audacity-new/files/patch-cmake-proxies_wxWidgets_CMakeLists.txt (-20 lines)
1	--- cmake-proxies/wxWidgets/CMakeLists.txt.orig 2020-08-05 16:32:53 UTC
2	+++ cmake-proxies/wxWidgets/CMakeLists.txt
3	@@ -237,17 +237,6 @@ file(
4	"^#define +wxVERSION_STRING +"
5	)
6
7	-string( REGEX MATCHALL "\".+(Audacity).+\"" ours "${output}")
8	-if( NOT ours )
9	- message( FATAL_ERROR
10	- "\n########################################################################\n"
11	- "Audacity version 3.0.0 or higher requires use of a customized version of "
12	- "wxWidgets. For details:\n"
13	- " https://wiki.audacityteam.org/wiki/Building_for_Distros\n"
14	- "########################################################################\n"
15	- )
16	-endif()
17	-
18	target_include_directories( ${TARGET} INTERFACE ${INCLUDES} )
19	target_compile_definitions( ${TARGET} INTERFACE ${DEFINES} )
20	target_compile_options( ${TARGET} INTERFACE ${COPTS} )