pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

audacity: updated to 3.7.8



Module Name:	pkgsrc-wip
Committed By:	Adam Ciarciński <adam%defguard.net@localhost>
Pushed By:	adam
Date:		Wed Jul 8 14:20:27 2026 +0200
Changeset:	71aaeca9f859e605593e1fc87a99af21fb1dae3a

Modified Files:
	audacity/Makefile
	audacity/PLIST
	audacity/distinfo
	audacity/patches/patch-src_CMakeLists.txt
Added Files:
	audacity/PLIST.Darwin
	audacity/patches/patch-help_CMakeLists.txt
	audacity/patches/patch-images_CMakeLists.txt
	audacity/patches/patch-locale_CMakeLists.txt
	audacity/patches/patch-nyquist_CMakeLists.txt
	audacity/patches/patch-plug-ins_CMakeLists.txt
Removed Files:
	audacity/TODO

Log Message:
audacity: updated to 3.7.8

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=71aaeca9f859e605593e1fc87a99af21fb1dae3a

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 audacity/Makefile                              | 23 +++++++++-----
 audacity/PLIST                                 |  4 +--
 audacity/PLIST.Darwin                          |  2 ++
 audacity/TODO                                  |  1 -
 audacity/distinfo                              | 13 +++++---
 audacity/patches/patch-help_CMakeLists.txt     | 17 +++++++++++
 audacity/patches/patch-images_CMakeLists.txt   | 18 +++++++++++
 audacity/patches/patch-locale_CMakeLists.txt   | 42 ++++++++++++++++++++++++++
 audacity/patches/patch-nyquist_CMakeLists.txt  | 15 +++++++++
 audacity/patches/patch-plug-ins_CMakeLists.txt | 15 +++++++++
 audacity/patches/patch-src_CMakeLists.txt      | 21 ++++++++++---
 11 files changed, 152 insertions(+), 19 deletions(-)

diffs:
diff --git a/audacity/Makefile b/audacity/Makefile
index b6f0c7a8a2..273698c934 100644
--- a/audacity/Makefile
+++ b/audacity/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD$
-
-DISTNAME=	audacity-sources-3.7.7
+ 
+DISTNAME=	audacity-sources-3.7.8
 PKGNAME=	${DISTNAME:S/-sources//}
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_GITHUB:=audacity/}
@@ -14,10 +14,12 @@ LICENSE=	gnu-gpl-v2 AND gnu-gpl-v3 # AND Creative Commons-Attribution 3.0 Unport
 
 TOOL_DEPENDS+=	nasm-[0-9]*:../../devel/nasm
 
+USE_CXX_FEATURES=	c++17
 USE_LANGUAGES=		c c++
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		pkg-config
 
+CMAKE_CONFIGURE_ARGS+=	-DCMAKE_BUILD_TYPE=Release
 CMAKE_CONFIGURE_ARGS+=	-Daudacity_conan_enabled=OFF
 #CMAKE_CONFIGURE_ARGS+=	-Daudacity_use_zlib=system
 CMAKE_CONFIGURE_ARGS+=	-Daudacity_lib_preference=system
@@ -47,12 +49,16 @@ PKGCONFIG_OVERRIDE+=	lib-src/soundtouch/soundtouch.pc.in
 PKGCONFIG_OVERRIDE+=	lib-src/twolame/twolame.pc.in
 
 # runs image-compiler during build which wants to find lib-theme.so
-MAKE_ENV+=	LD_LIBRARY_PATH=${WRKSRC}/${CMAKE_BUILD_DIR}/Debug/lib
+MAKE_ENV+=	LD_LIBRARY_PATH=${WRKSRC}/${CMAKE_BUILD_DIR}/Release/lib
 # for Darwin
-MAKE_ENV+=	DYLD_LIBRARY_PATH=${WRKSRC}/${CMAKE_BUILD_DIR}/Debug/lib
+MAKE_ENV+=	DYLD_LIBRARY_PATH=${WRKSRC}/${CMAKE_BUILD_DIR}/Release/lib
 
-.include "../../devel/cmake/build.mk"
-.include "../../lang/python/tool.mk"
+PLIST_VARS+=	desktop
+
+.include "../../mk/bsd.prefs.mk"
+.if ${OPSYS} != "Darwin"
+PLIST.desktop=	yes
+.endif
 
 .include "../../audio/flac/buildlink3.mk"
 .include "../../audio/lame/buildlink3.mk"
@@ -71,13 +77,16 @@ MAKE_ENV+=	DYLD_LIBRARY_PATH=${WRKSRC}/${CMAKE_BUILD_DIR}/Debug/lib
 .include "../../audio/vamp-plugin-sdk/buildlink3.mk"
 .include "../../audio/wavpack/buildlink3.mk"
 .include "../../databases/sqlite3/buildlink3.mk"
+.include "../../devel/cmake/build.mk"
 .include "../../devel/libuuid/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
-.include "../../mk/jpeg.buildlink3.mk"
+.include "../../lang/python/tool.mk"
 .include "../../multimedia/libogg/buildlink3.mk"
+.include "../../multimedia/ffmpeg8/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../textproc/rapidjson/buildlink3.mk"
 .include "../../wip/portmidi/buildlink3.mk"
 .include "../../x11/wxGTK32/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audacity/PLIST b/audacity/PLIST
index 716e028680..ba1bf8afa2 100644
--- a/audacity/PLIST
+++ b/audacity/PLIST
@@ -85,8 +85,8 @@ lib/modules/mod-pcm.so
 lib/modules/mod-script-pipe.so
 lib/modules/mod-wavpack.so
 man/man1/audacity.1
-share/applications/audacity.desktop
-share/audacity/EffectsMenuDefaults.xml
+${PLIST.desktop}share/applications/audacity.desktop
+${PLIST.desktop}share/audacity/EffectsMenuDefaults.xml
 share/audacity/nyquist/aud-do-support.lsp
 share/audacity/nyquist/dspprims.lsp
 share/audacity/nyquist/envelopes.lsp
diff --git a/audacity/PLIST.Darwin b/audacity/PLIST.Darwin
new file mode 100644
index 0000000000..16805166d0
--- /dev/null
+++ b/audacity/PLIST.Darwin
@@ -0,0 +1,2 @@
+@comment $NetBSD$
+lib/lib-audio-unit.so
diff --git a/audacity/TODO b/audacity/TODO
deleted file mode 100644
index 8a86fe2b3a..0000000000
--- a/audacity/TODO
+++ /dev/null
@@ -1 +0,0 @@
-Adjust PLIST for Darwin.
diff --git a/audacity/distinfo b/audacity/distinfo
index 713715ebf5..7398ef991d 100644
--- a/audacity/distinfo
+++ b/audacity/distinfo
@@ -1,13 +1,18 @@
 $NetBSD$
 
-BLAKE2s (audacity-sources-3.7.7.tar.gz) = f82f482134b26b043f4200d86cc4bd37024fadd9fb6bf48198f3409aaea35dc1
-SHA512 (audacity-sources-3.7.7.tar.gz) = 6871b2d6508c2fcf7e20f2d2d2a003cc62768c9ff09c8d5a96fc1971b0c1f3f2f1b2d48f71ee0b1da1a6ea6a9b8d930bca9a64c8003c67cb46b22c3e21af90f4
-Size (audacity-sources-3.7.7.tar.gz) = 64575292 bytes
+BLAKE2s (audacity-sources-3.7.8.tar.gz) = cc391a18efadadf9180f24227d48832b4b92ad0e20f7f5b8bce182f47617033a
+SHA512 (audacity-sources-3.7.8.tar.gz) = 7b0ef1d393ae20b734f04c5b796b5f85240a89cd84cf1f8ab39b1fbfb1fe6da183833469fe89b96e85efea866a7cb83c7bfe3bb7256d2024ff3b83a69af96e8c
+Size (audacity-sources-3.7.8.tar.gz) = 67556613 bytes
 SHA1 (patch-CMakeLists.txt) = 7bdc2406ca9356742ed775c60aac8a748a90ecbf
 SHA1 (patch-cmake-proxies_cmake-modules_AudacityFunctions.cmake) = be6fc260ab5c192dbbd743428a7880d4a253b9fb
 SHA1 (patch-cmake-proxies_cmake-modules_dependencies_rapidjson.cmake) = 905782babb8da1e1493af6856ce2394db51a930c
+SHA1 (patch-help_CMakeLists.txt) = f848ccad94ac45687502ae1e815738a3d02e9110
+SHA1 (patch-images_CMakeLists.txt) = 20fe208f2d67f2cd8f422e94e764bd7c6b29afba
 SHA1 (patch-lib-src_libnyquist_nyquist_xlisp_xlisp.h) = 1974b5a294503ebc03e9690e0182d81258853117
 SHA1 (patch-libraries_lib-basic-ui_BasicUI.cpp) = 31683629ac042af74d301a69d282743923a69266
 SHA1 (patch-libraries_lib-nyquist-effects_NyquistBase.cpp) = 0cb6e15e077360256e55a425be896dd5edfd9009
 SHA1 (patch-libraries_lib-wx-wrappers_CMakeLists.txt) = 361afeca9be2c67df1bac65e552f15edcb4ca363
-SHA1 (patch-src_CMakeLists.txt) = 7c70022c467ccca9bab7d33fc863e2408b9a3479
+SHA1 (patch-locale_CMakeLists.txt) = a1e5084661aa2ce179a071e9df38dcae30257c43
+SHA1 (patch-nyquist_CMakeLists.txt) = cb738fa4c2af9d018277e9c403bdf809ef504440
+SHA1 (patch-plug-ins_CMakeLists.txt) = eb1803359cdaaef8ab6fb1e4771ef7cb25b8b0ee
+SHA1 (patch-src_CMakeLists.txt) = 5d28e790bbb3443c8447b88b2aeadad218d95672
diff --git a/audacity/patches/patch-help_CMakeLists.txt b/audacity/patches/patch-help_CMakeLists.txt
new file mode 100644
index 0000000000..1401b15a6c
--- /dev/null
+++ b/audacity/patches/patch-help_CMakeLists.txt
@@ -0,0 +1,17 @@
+$NetBSD$
+
+--- help/CMakeLists.txt.orig	2026-07-05 11:27:46.887282476 +0000
++++ help/CMakeLists.txt
+@@ -56,7 +56,6 @@ if( ${_OPT}package_manual )
+    endif()
+ endif()
+ 
+-if( NOT CMAKE_SYSTEM_NAME MATCHES "Darwin" )
+    if( NOT "${CMAKE_GENERATOR}" MATCHES "Visual Studio*")
+       install( DIRECTORY "${dst}" OPTIONAL
+                DESTINATION "${_DATADIR}/audacity/help" )
+@@ -65,4 +64,3 @@ if( NOT CMAKE_SYSTEM_NAME MATCHES "Darwi
+       install( FILES "${_SRCDIR}/audacity.appdata.xml"
+                DESTINATION "${_DATADIR}/metainfo" )
+    endif()
+-endif()
diff --git a/audacity/patches/patch-images_CMakeLists.txt b/audacity/patches/patch-images_CMakeLists.txt
new file mode 100644
index 0000000000..a5bc004c4b
--- /dev/null
+++ b/audacity/patches/patch-images_CMakeLists.txt
@@ -0,0 +1,18 @@
+$NetBSD$
+
+--- images/CMakeLists.txt.orig	2026-07-05 11:26:54.036816176 +0000
++++ images/CMakeLists.txt
+@@ -15,7 +15,6 @@ set( PIXMAPS
+    ${_SRCDIR}/icons/48x48/audacity.xpm
+ )
+ 
+-if( NOT CMAKE_SYSTEM_NAME MATCHES "Darwin" )
+    if( NOT "${CMAKE_GENERATOR}" MATCHES "Visual Studio*")
+       install( FILES "${_SRCDIR}/audacity.svg"
+                DESTINATION "${_DATADIR}/icons/hicolor/scalable/apps" )
+@@ -25,5 +24,4 @@ if( NOT CMAKE_SYSTEM_NAME MATCHES "Darwi
+       install( FILES ${PIXMAPS}
+                DESTINATION "${_DATADIR}/pixmaps" )
+    endif()
+-endif()
+ 
diff --git a/audacity/patches/patch-locale_CMakeLists.txt b/audacity/patches/patch-locale_CMakeLists.txt
new file mode 100644
index 0000000000..cb42551220
--- /dev/null
+++ b/audacity/patches/patch-locale_CMakeLists.txt
@@ -0,0 +1,42 @@
+$NetBSD$
+
+--- locale/CMakeLists.txt.orig	2026-07-05 11:24:32.425945951 +0000
++++ locale/CMakeLists.txt
+@@ -27,7 +27,7 @@ if( NOT DEFINED msgfmt )
+    return()
+ endif()
+ 
+-if( CMAKE_SYSTEM_NAME MATCHES "Darwin" )
++if(FALSE)
+    set( locale "${_DEST}/Resources" )
+ elseif( CMAKE_SYSTEM_NAME MATCHES "Windows" )
+    set( locale "${_DEST}/Languages" )
+@@ -39,7 +39,7 @@ set( OUTPUTS )
+ foreach( source ${SOURCES} )
+    get_filename_component( lang "${source}" NAME_WE )
+ 
+-   if( CMAKE_SYSTEM_NAME MATCHES "Darwin" )
++   if(FALSE)
+       set( dst "${locale}/${lang}.lproj" )
+    elseif( CMAKE_SYSTEM_NAME MATCHES "Windows" )
+       set( dst "${locale}/${lang}" )
+@@ -64,7 +64,7 @@ foreach( source ${SOURCES} )
+    # Always make sure there's an empty English folder.  Otherwise, some menu
+    # items will be translated to the next language listed in System
+    # Preferences/Language & Text
+-   if( CMAKE_SYSTEM_NAME MATCHES "Darwin" )
++   if(FALSE)
+       add_custom_command(
+          COMMAND
+             ${CMAKE_COMMAND} -E make_directory "${_DEST}/Resources/en.lproj"
+@@ -79,10 +79,8 @@ endforeach()
+ 
+ add_custom_target( "${TARGET}" ALL DEPENDS ${OUTPUTS} SOURCES "${SOURCES}" )
+ 
+-if( NOT CMAKE_SYSTEM_NAME MATCHES "Darwin" )
+    if( NOT "${CMAKE_GENERATOR}" MATCHES "Visual Studio*")
+       install( DIRECTORY ${locale}/
+                TYPE LOCALE )
+    endif()
+-endif()
+ 
diff --git a/audacity/patches/patch-nyquist_CMakeLists.txt b/audacity/patches/patch-nyquist_CMakeLists.txt
new file mode 100644
index 0000000000..7dc0ce1cba
--- /dev/null
+++ b/audacity/patches/patch-nyquist_CMakeLists.txt
@@ -0,0 +1,15 @@
+$NetBSD$
+
+--- nyquist/CMakeLists.txt.orig	2026-07-05 11:23:48.194942278 +0000
++++ nyquist/CMakeLists.txt
+@@ -82,10 +82,8 @@ endforeach()
+ 
+ add_custom_target( ${TARGET} ALL DEPENDS ${OUTPUTS} SOURCES ${SOURCES} )
+ 
+-if( NOT CMAKE_SYSTEM_NAME MATCHES "Darwin" )
+    if( NOT "${CMAKE_GENERATOR}" MATCHES "Visual Studio*")
+       install( DIRECTORY "${_DEST}/${TARGET}"
+                DESTINATION "${_PKGDATA}" )
+    endif()
+-endif()
+ 
diff --git a/audacity/patches/patch-plug-ins_CMakeLists.txt b/audacity/patches/patch-plug-ins_CMakeLists.txt
new file mode 100644
index 0000000000..7ab17e4722
--- /dev/null
+++ b/audacity/patches/patch-plug-ins_CMakeLists.txt
@@ -0,0 +1,15 @@
+$NetBSD$
+
+--- plug-ins/CMakeLists.txt.orig	2026-07-05 11:26:07.900905135 +0000
++++ plug-ins/CMakeLists.txt
+@@ -57,10 +57,8 @@ endforeach()
+ 
+ add_custom_target( ${TARGET} ALL DEPENDS ${OUTPUTS} SOURCES ${SOURCES} )
+ 
+-if( NOT CMAKE_SYSTEM_NAME MATCHES "Darwin" )
+    if( NOT "${CMAKE_GENERATOR}" MATCHES "Visual Studio*")
+       install( DIRECTORY "${_DEST}/${TARGET}"
+                DESTINATION "${_PKGDATA}" )
+    endif()
+-endif()
+ 
diff --git a/audacity/patches/patch-src_CMakeLists.txt b/audacity/patches/patch-src_CMakeLists.txt
index 0576823411..c0d33b072b 100644
--- a/audacity/patches/patch-src_CMakeLists.txt
+++ b/audacity/patches/patch-src_CMakeLists.txt
@@ -2,13 +2,13 @@ $NetBSD$
 
 On Darwin, don't build application bundle.
 
---- src/CMakeLists.txt.orig	2025-12-11 15:41:59.000000000 +0000
+--- src/CMakeLists.txt.orig	2026-06-11 09:17:07.000000000 +0000
 +++ src/CMakeLists.txt
 @@ -1079,6 +1079,7 @@ if( CMAKE_SYSTEM_NAME MATCHES "Windows"
        POST_BUILD
     )
  elseif( CMAKE_SYSTEM_NAME MATCHES "Darwin" )
-+if(FALSE)
++  if(FALSE)
     # Bug 2400 workaround
     #
     # Replaces the SDK version in the built executable with 10.13 to
@@ -16,7 +16,7 @@ On Darwin, don't build application bundle.
           RESOURCE "${MAC_RESOURCES};${RESOURCES}"
     )
     set_target_property_all( ${TARGET} RUNTIME_OUTPUT_DIRECTORY "${_DESTDIR}" )
-+endif()
++  endif()
  
     # These sources must be compiled as Objective C++ and excluded
     # from precompiled header usage
@@ -24,7 +24,7 @@ On Darwin, don't build application bundle.
        POST_BUILD
     )
  
-+if(FALSE)
++  if(FALSE)
     fix_bundle( ${TARGET} )
  
     # Because the wrapper is copied into the bundle, we need to
@@ -32,7 +32,7 @@ On Darwin, don't build application bundle.
           POST_BUILD
        )
     endif()
-+endif()
++  endif()
  else()
     set_target_properties(
        ${TARGET}
@@ -45,3 +45,14 @@ On Darwin, don't build application bundle.
        install( TARGETS ${TARGET}
                 DESTINATION "."
                 RESOURCE DESTINATION "${_APPDIR}/Resources" )
+@@ -1429,8 +1433,10 @@ else()
+                USE_SOURCE_PERMISSIONS
+                FILES_MATCHING PATTERN "*.so*" )
+ 
++   if(NOT APPLE)
+       install( FILES "${_INTDIR}/audacity.desktop"
+                DESTINATION "${_DATADIR}/applications" )
++   endif()
+ 
+       if(${_OPT}has_url_schemes_support)
+          install( FILES "${_INTDIR}/audacity-url-handler.desktop"


Home | Main Index | Thread Index | Old Index