Created attachment 257018 [details] v1 Changelogs: multimedia/openshot: https://github.com/OpenShot/openshot-qt/releases/tag/v3.3.0 multimedia/libopenshot: https://github.com/OpenShot/libopenshot/releases/tag/v0.4.0 audio/libopenshot-audio: https://github.com/OpenShot/libopenshot-audio/releases/tag/v0.4.0 Tested build in poudriere and live system 14.2 amd64. Tested run on 14.2 amd64. Renamed patches: audio/libopenshot-audio/files/patch-JuceLibraryCode_modules_juce__audio__devices_native_juce__linux__JackAudio.cpp -> audio/libopenshot-audio/files/patch-JuceLibraryCode_modules_juce__audio__devices_native_juce__JackAudio__linux.cpp audio/libopenshot-audio/files/patch-JuceLibraryCode_modules_juce__core_native_juce__linux__Files.cpp -> audio/libopenshot-audio/files/patch-JuceLibraryCode_modules_juce__core_native_juce__Files__linux.cpp audio/libopenshot-audio/files/patch-JuceLibraryCode_modules_juce__core_native_juce__linux__Network.cpp -> audio/libopenshot-audio/files/patch-JuceLibraryCode_modules_juce__core_native_juce__Network__linux.cpp
Check if this patch is correct: audio/libopenshot-audio/files/patch-JuceLibraryCode_modules_juce__audio__devices_native_juce__JackAudio__linux.cpp
ping
Created attachment 257283 [details] patch for multimedia/openshot, audio/libopenshot-audio and multimedia/libopenshot Since they are mutually related, I want them to be committed in one go. audio/libopenshot-audio JUCE version has been increased from 5 to 7. MIDI seems to be unnecessary, so I made it unavailable in the patch. It seems to be related to when alsa-seq-server(audio/alsa-seq-server) is running. Since the singleton instance is destroyed by a different thread than the one that created it, it is detected on the libopenshot side. The method of dealing with it is unknown :) Dexed(audio/dexed) may have the same issue, but it might just be a problem with how libopenshot uses threads. multimedia/openshot Since the conditions for acquiring video with the libx264 codec could not be found, it was rewritten to libx264rgb, but the problem seems to have been fixed, so the patch has been abolished. Files related to setuptools are rewritten in a flat-layout style by the patch. This suppresses repeated warning logs. It seems that the copying of files in the configure phase has also been reduced.
I have 2 patches more: files/patch-JuceLibraryCode_modules_juce__audio__devices_audio__io_juce__AudioIODeviceType.cpp: --- JuceLibraryCode/modules/juce_audio_devices/audio_io/juce_AudioIODeviceType.cpp.orig 2024-12-21 22:21:33 UTC +++ JuceLibraryCode/modules/juce_audio_devices/audio_io/juce_AudioIODeviceType.cpp @@ -100,7 +100,7 @@ void AudioIODeviceType::callDeviceChangeListeners() AudioIODeviceType* AudioIODeviceType::createAudioIODeviceType_JACK() { return nullptr; } #endif -#if JUCE_LINUX && JUCE_BELA +#if (JUCE_LINUX || JUCE_BSD) && JUCE_BELA AudioIODeviceType* AudioIODeviceType::createAudioIODeviceType_Bela() { return new BelaAudioIODeviceType(); } #else AudioIODeviceType* AudioIODeviceType::createAudioIODeviceType_Bela() { return nullptr; } [root@phobos /usr/ports/audio/libopenshot-audio]# la files/patch-JuceLibraryCode_modules_juce__audio__devices_juce__audio__devices.cpp 1045666 -rw-r--r-- 1 root wheel - 498 25 янв. 15:34:56 2025 files/patch-JuceLibraryCode_modules_juce__audio__devices_juce__audio__devices.cpp files/patch-JuceLibraryCode_modules_juce__audio__devices_juce__audio__devices.cpp: --- JuceLibraryCode/modules/juce_audio_devices/juce_audio_devices.cpp.orig 2024-12-21 22:21:33 UTC +++ JuceLibraryCode/modules/juce_audio_devices/juce_audio_devices.cpp @@ -177,7 +177,7 @@ #include "native/juce_JackAudio_linux.cpp" #endif - #if (JUCE_LINUX && JUCE_BELA) + #if ((JUCE_LINUX || JUCE_BSD) && JUCE_BELA) /* Got an include error here? If so, you've either not got the bela headers installed, or you've not got your paths set up correctly to find its header files. Are you sure they are not needed?
AFAIU. patch files/patch-JuceLibraryCode_modules_juce__core_native_juce__SharedCode__posix.h not needed: + #if JUCE_BSD + using cpu_set_t = cpuset_t; + #endif Build without it fine.
- auto cpuData = call ("lscpu"); + auto cpuData = String {}; Maybe: auto cpuData = call ("sysctl -n hw.model"); ?
Created attachment 257342 [details] patch for multimedia/openshot, audio/libopenshot-audio and multimedia/libopenshot (In reply to Vladimir Druzenko from comment #4) It seems that Bela refers to https: //bela.io/ It seems that something still does not exist to make /dev/dsp look like Bela. So we don't need to enable its condition. (In reply to Vladimir Druzenko from comment #5) This is a redundant part after 13.1(?)-RELEASE. I used 12.4 to check to get it up and running, so I needed it to build. There were other necessary parts, which were removed, but only there the removal was forgotten. Therefore, a new patch has been prepared that removes everything. (In reply to Vladimir Druzenko from comment #6) lscpu exists as a port in sysutils/lscpu. The execution result contains content that cannot be replaced by the base command. This part is probably not reached, so lscpu is not installed and the execution of the process is removed. The replacement with kenv is to suppress access to non-existent file paths. It seems that roughly the same values apply, but I do not know if that is valid for all architectures :)
(In reply to Tatsuki Makino from comment #7) I know about lscpu (use it), and if its output is not parsed, but simply displayed somewhere, then sysctl -n hw.model can easily replace it. In any case, you know more about this software than I do, so I'll commit your patch. :-)
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=feff524119d21a59f0a63fb97cbabee04efb309a commit feff524119d21a59f0a63fb97cbabee04efb309a Author: Tatsuki Makino <tatsuki_makino@hotmail.com> AuthorDate: 2025-02-10 13:03:17 +0000 Commit: Vladimir Druzenko <vvd@FreeBSD.org> CommitDate: 2025-02-10 13:03:17 +0000 audio/libopenshot-audio: Update 0.3.3 → 0.4.0 Update as part of update multimedia/openshot 3.2.1 → 3.3.0. Changelog: https://github.com/OpenShot/libopenshot-audio/releases/tag/v0.4.0 PR: 284374 audio/libopenshot-audio/Makefile | 7 +- audio/libopenshot-audio/distinfo | 6 +- audio/libopenshot-audio/files/patch-CMakeLists.txt | 37 +-- ...es_audio__io_juce__AudioIODeviceType.cpp (gone) | 21 -- ..._audio__devices_juce__audio__devices.cpp (gone) | 20 -- ...io__devices_midi__io_juce__MidiDevices.h (gone) | 20 -- ...devices_native_juce__JackAudio__linux.cpp (new) | 30 +++ ...dio__devices_native_juce__Midi__linux.cpp (new) | 11 + ...evices_native_juce__linux__JackAudio.cpp (gone) | 104 -------- ..._modules_juce__core_files_juce__File.cpp (gone) | 20 -- ...ryCode_modules_juce__core_juce__core.cpp (gone) | 29 -- ...__core_native_juce__BasicNativeHeaders.h (gone) | 12 - ..._juce__core_native_juce__Files__linux.cpp (new) | 55 ++++ ...les_juce__core_native_juce__Network__linux.cpp} | 4 +- ..._core_native_juce__SystemStats__linux.cpp (new) | 38 +++ ...juce__core_native_juce__linux__Files.cpp (gone) | 50 ---- ...core_native_juce__linux__SystemStats.cpp (gone) | 16 -- ...e__core_native_juce__posix__SharedCode.h (gone) | 51 ---- ...s_juce__core_system_juce__PlatformDefs.h (gone) | 11 - ...juce__core_system_juce__StandardHeader.h (gone) | 11 - ...ce__core_text_juce__CharPointer__ASCII.h (gone) | 11 - ...dules_juce__core_threads_juce__Process.h (gone) | 11 - ...app__properties_juce__PropertiesFile.cpp (gone) | 11 - ...de_modules_juce__events_juce__events.cpp (gone) | 20 -- ...Code_modules_juce__events_juce__events.h (gone) | 11 - audio/libopenshot-audio/pkg-plist | 291 +++++++++++++++------ 26 files changed, 369 insertions(+), 539 deletions(-)
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=03559cbfc26cfc7f81cfb86acf025b77f11282ed commit 03559cbfc26cfc7f81cfb86acf025b77f11282ed Author: Tatsuki Makino <tatsuki_makino@hotmail.com> AuthorDate: 2025-02-10 13:07:18 +0000 Commit: Vladimir Druzenko <vvd@FreeBSD.org> CommitDate: 2025-02-10 13:07:18 +0000 multimedia/libopenshot: Update 0.3.3 → 0.4.0 Update as part of update multimedia/openshot 3.2.1 → 3.3.0. Changelog: https://github.com/OpenShot/libopenshot/releases/tag/v0.4.0 PR: 284374 multimedia/libopenshot/Makefile | 4 +--- multimedia/libopenshot/distinfo | 6 +++--- multimedia/libopenshot/files/patch-CMakeLists.txt | 13 ++----------- multimedia/libopenshot/files/patch-src_CMakeLists.txt | 6 ++++-- .../libopenshot/files/patch-src_Qt_AudioPlaybackThread.cpp | 6 +++--- multimedia/libopenshot/pkg-plist | 2 +- 6 files changed, 14 insertions(+), 23 deletions(-)
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=0104b89d13613704b93380ec604f1553e5420dd3 commit 0104b89d13613704b93380ec604f1553e5420dd3 Author: Tatsuki Makino <tatsuki_makino@hotmail.com> AuthorDate: 2025-02-10 13:09:54 +0000 Commit: Vladimir Druzenko <vvd@FreeBSD.org> CommitDate: 2025-02-10 13:09:54 +0000 multimedia/openshot: Update 3.2.1 → 3.3.0 News: https://www.openshot.org/blog/2024/12/22/new_openshot_release_330/ Changelog: https://github.com/OpenShot/openshot-qt/releases/tag/v3.3.0 PR: 284374 multimedia/openshot/Makefile | 6 +- multimedia/openshot/distinfo | 6 +- multimedia/openshot/files/patch-MANIFEST.in | 23 ++++-- multimedia/openshot/files/patch-doc_conf.py (new) | 10 +++ multimedia/openshot/files/patch-setup.py | 81 ++++++++++++++++++++-- .../files/patch-src_settings___default.settings | 6 +- .../files/patch-src_windows_preferences.py | 4 +- multimedia/openshot/pkg-plist | 17 +++++ 8 files changed, 132 insertions(+), 21 deletions(-)
Thanks! I hope I didn't mess up anything with the patches. But I can say one thing for sure - what I committed builds and runs. :-D
(In reply to commit-hook from comment #9) There are unnecessary patches included here and it is damaged.
(In reply to Tatsuki Makino from comment #13) Please indicate which patches you are talking about.
Created attachment 257426 [details] patch to remove the parts that were committed but not included in my attachment 257342 [details]
2 patches - ok, will remove and commit. Sort plist - ok. But TIMESTAMPS in distinfo (probably from your previous patch) and diff metainformation in patches - there is no point in changing now.
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=14ec6f3f0dc1450253e03a1632e6b15179a684f8 commit 14ec6f3f0dc1450253e03a1632e6b15179a684f8 Author: Tatsuki Makino <tatsuki_makino@hotmail.com> AuthorDate: 2025-02-11 22:49:24 +0000 Commit: Vladimir Druzenko <vvd@FreeBSD.org> CommitDate: 2025-02-11 23:00:05 +0000 audio/libopenshot-audio: Remove old unnecessary patches PR: 284374 Fixes: feff524119d2 (Update 0.3.3 → 0.4.0) audio/libopenshot-audio/Makefile | 1 + ...evices_native_juce__JackAudio__linux.cpp (gone) | 30 ---------------------- ...ce__core_native_juce__Network__linux.cpp (gone) | 25 ------------------ 3 files changed, 1 insertion(+), 55 deletions(-)
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=5da608e30db63dc2284dca8f2aa80bb20fa95554 commit 5da608e30db63dc2284dca8f2aa80bb20fa95554 Author: Tatsuki Makino <tatsuki_makino@hotmail.com> AuthorDate: 2025-02-11 22:46:00 +0000 Commit: Vladimir Druzenko <vvd@FreeBSD.org> CommitDate: 2025-02-11 23:00:05 +0000 multimedia/openshot: Sort plist PR: 284374 multimedia/openshot/pkg-plist | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
Committed, thanks. And sorry for missed patches. :-(