Bug 284374 - multimedia/{,lib}openshot, audio/libopenshot-audio: Update 3.2.1 → 3.3.0, 0.3.3 → 0.4.0, 0.3.3 → 0.4.0
Summary: multimedia/{,lib}openshot, audio/libopenshot-audio: Update 3.2.1 → 3.3.0, 0.3...
Status: New
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Some People
Assignee: Vladimir Druzenko
URL: https://www.openshot.org/blog/2024/12...
Keywords:
Depends on:
Blocks:
 
Reported: 2025-01-26 22:56 UTC by Vladimir Druzenko
Modified: 2025-02-06 17:10 UTC (History)
1 user (show)

See Also:
bugzilla: maintainer-feedback? (tatsuki_makino)


Attachments
v1 (76.63 KB, patch)
2025-01-26 22:56 UTC, Vladimir Druzenko
vvd: maintainer-approval?
Details | Diff
patch for multimedia/openshot, audio/libopenshot-audio and multimedia/libopenshot (96.47 KB, patch)
2025-02-06 05:51 UTC, Tatsuki Makino
tatsuki_makino: maintainer-approval+
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Vladimir Druzenko freebsd_committer freebsd_triage 2025-01-26 22:56:41 UTC
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
Comment 1 Vladimir Druzenko freebsd_committer freebsd_triage 2025-01-26 23:09:58 UTC
Check if this patch is correct:
audio/libopenshot-audio/files/patch-JuceLibraryCode_modules_juce__audio__devices_native_juce__JackAudio__linux.cpp
Comment 2 Vladimir Druzenko freebsd_committer freebsd_triage 2025-02-03 18:54:14 UTC
ping
Comment 3 Tatsuki Makino 2025-02-06 05:51:36 UTC
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.
Comment 4 Vladimir Druzenko freebsd_committer freebsd_triage 2025-02-06 16:57:35 UTC
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?
Comment 5 Vladimir Druzenko freebsd_committer freebsd_triage 2025-02-06 17:05:09 UTC
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.
Comment 6 Vladimir Druzenko freebsd_committer freebsd_triage 2025-02-06 17:10:28 UTC
-        auto cpuData = call ("lscpu");
+        auto cpuData = String {};

Maybe: auto cpuData = call ("sysctl -n hw.model"); ?