Comment on attachment 250534 [details]
add support FFMPEG 7

This is where the patch overlaps with the patch required for the port to FreeBSD, but all patches were applied successfully with only a line number offset occurring.
So there is no problem to commit this attachment 250534 [details] as is.

With this change, even if ffmpeg is 6.1.1, it will start using the new specifications equivalent to 7.0.
And when I used this in combination with ffmpeg-6.1.1_5,1, I had no problems.

With the result, I will omit my testing in combination with ffmpeg-7.
I want to finish the build of chromium first :) And qt5-webengine needs to be rebuilt along with ffmpeg-7 :)

Comment 2 Daniel Engberg 2024-05-09 06:24:07 UTC

I'd suggest that we wait a bit and backport from upstream once it's committed as they seem to be on the ball already

Comment 3 Vladimir Druzenko 2024-05-09 06:50:42 UTC

(In reply to Daniel Engberg from comment #2)
Probably upstream will make new release soon:
https://github.com/OpenShot/libopenshot/issues/953#issuecomment-2101930660

Comment 4 Li-Wen Hsu 2024-05-10 03:51:20 UTC

Submitter is committer.

Created attachment 250580 [details]
experimental patch for the next release of openshot related

(In reply to Vladimir Druzenko from comment #3)

This will be the change that will be made for the next release.
I'll back it up here :)
I will continue to follow the release version, but this should be used to confirm that it works.
It seems that all libx264 needs to be rewritten to libx264rgb, perhaps due to the video format that is expanded once inside openshot.
A post-patch target is added to convert them all at once.

Comment 6 Vladimir Druzenko 2024-05-11 11:11:03 UTC

(In reply to Tatsuki Makino from comment #5)
I think we can wait new release from upstream with ffmpeg 7 support.

Periodic reminder e-mails are sent to me, so I toggle this switch to conserve resources.
Is it right to switch to + ? :)

Comment 8 Vladimir Druzenko 2024-05-26 22:05:08 UTC

(In reply to Tatsuki Makino from comment #7)
What emails you get?
Update to ffmpeg 7 isn't committed yet. I think it's something else.

(In reply to Vladimir Druzenko from comment #8)

To use an example of something that is in a place where everyone can reach it, it would be something like this email.
https: //lists.freebsd.org /archives/freebsd-ports-bugs/2024-May/055029.html

It seems that when a report is created with the origin of the port for which someone like me who is helping from the outside is the maintainer in the summary, a flag asking for maintainer-feedback is automatically added.
If we leave it unattended, we receive such an email at 6:00+0900 on Monday (21:00 on Sunday if UTC?).
I have already received 3 of it :)

Comment 10 Vladimir Druzenko 2024-05-27 00:48:40 UTC

(In reply to Tatsuki Makino from comment #9)
Oh. I have same email every week too. You can just ignore it. :-D

About patches from upstream check this comment: https://github.com/OpenShot/libopenshot/issues/953#issuecomment-2131234669
> This fixes build, but the are many test failures when compiled against ffmpeg 7, such as
>
> 92/188 Test  #92: FrameMapper:resample_audio_48000_to_41000 ......................***Failed    0.84 sec
> [SWR @ 0x5582654a9a80] Input channel layout "" is invalid or unsupported.
> [SWR @ 0x5582654a9a80] Context has not been initialized
> Filters: "resample_audio_48000_to_41000"

Comment 11 Vladimir Druzenko 2024-06-25 14:44:48 UTC

OpenShot 3.2.0 Released
Compatibility with FFMPEG 7.0 improved

https://www.openshot.org/blog/2024/06/24/new_openshot_release_320/

Created attachment 251737 [details]
patch for audio/libopenshot-audio

audio/libopenshot-audio: Update to 0.3.3

JACK library is dynamically loaded, so it was unlinked.
Accordingly, JACK_LIB_DEPENDS was split into JACK_BUILD_DEPENDS and JACK_RUN_DEPENDS.

Created attachment 251738 [details]
patch for multimedia/libopenshot

multimedia/libopenshot: Update to 0.3.3

RUBY_LIB_DEPENDS was added to resolve stage-qa issues.
More patches have been made to restrict logger sockets to localhost.

Created attachment 251739 [details]
patch for multimedia/openshot

multimedia/openshot: Update to 3.2.0

All libx264 strings passed to ffmpeg options, such as presets, are replaced with libx264rgb.
Added a patch that causes the logger socket to bind with the address of localhost.
It has not been tested to work with ffmpeg 7 because qt5-websocket requires that the version of ffmpeg's library exactly match.

(In reply to Vladimir Druzenko from comment #11)

That's all :)

(In reply to Tatsuki Makino from comment #14)

It wasn't qt5-websockets, it was qt5-webengine :)

Comment 16 Vladimir Druzenko 2024-06-28 12:22:50 UTC

What do you think about add "PLIST_SUB=VERSION=${DISTVERSION}" to all Makefiles and replace in pkg-plist 3.2.0 and 0.3.3 with %%VERSION%% ?

Comment 17 Vladimir Druzenko 2024-06-28 12:40:56 UTC

====> Running Q/A tests (stage-qa)
====> Checking for pkg-plist issues (check-plist)
===> Parsing plist
===> Checking for items in STAGEDIR missing from pkg-plist
Error: Orphaned: %%PYTHON_SITELIBDIR%%/openshot_qt/windows/views/__pycache__/menu%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
Error: Orphaned: %%PYTHON_SITELIBDIR%%/openshot_qt/windows/views/__pycache__/menu%%PYTHON_EXT_SUFFIX%%.pyc
===> Checking for items in pkg-plist which are not in STAGEDIR
===> Error: Plist issues found.
*** Error code 1

Build without DOCS on live system 14.1 amd64.
Testing in poudriere 13.3 amd64: "Building 166 packages" - wait several hours…

Comment 18 Vladimir Druzenko 2024-06-28 21:14:56 UTC

(In reply to Vladimir Druzenko from comment #17)
Same error in poudriere.

Comment 19 Vladimir Druzenko 2024-06-28 21:19:35 UTC

(In reply to Vladimir Druzenko from comment #18)
Forgot - it's my mistake.

Build fine now!

Last question left about "PLIST_SUB=VERSION=${DISTVERSION}" before commit.

(In reply to Vladimir Druzenko from comment #19)

It seems that it is no longer subversion, so we don't need to worry about it too much :)

Symbolic link versions are incremented with each release.
libopenshot and libopenshot-audio may be able to eliminate pkg-plist differences altogether by adding it.
However, if a development commit between releases is used, DISTVERSION will need to be DISTVERSION:C/-.*// because the version will be in the W.X.Y-Z format.
When the development version of openshot is used, it will contain the strings defined in the CmakeLists.txt.
This is actually when v2.5.1-891-gd014ca48 was used, the directory was named openshot_qt-2.5.1.dev3-py%%PYTHON_VER%%.egg-info.

Well, for this reason, I would like to postpone it this time and plan to do it next time, but what do you think?

Comment 21 Vladimir Druzenko 2024-06-29 10:58:14 UTC

(In reply to Tatsuki Makino from comment #20)
IMHO, use this "PLIST_SUB=VERSION=${DISTVERSION:C/-.*//}" only when it is really necessary.
And now we can easily get by: "PLIST_SUB=VERSION=${DISTVERSION}". Most releases of openshot ports have versions like "X.Y.Z".
But you are maintainer and the last word is yours.

Comment 22 Vladimir Druzenko 2024-07-01 14:22:07 UTC

What do you think?
Can I commit?

Comment 23 Vladimir Druzenko 2024-07-02 14:06:19 UTC

The issue under discussion does not affect either the build of the port or the work of the software. I'll now commit with "PLIST_SUB=VERSION=${DISTVERSION}", and if you tell me to change it, I'll do it right away.

Comment 24 commit-hook 2024-07-02 14:26:00 UTC

A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=1b19835568632e748b08ff006d76e1a90963c1b7

commit 1b19835568632e748b08ff006d76e1a90963c1b7
Author:     Tatsuki Makino <tatsuki_makino@hotmail.com>
AuthorDate: 2024-07-02 14:16:24 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2024-07-02 14:16:24 +0000

    multimedia/libopenshot: update 0.3.2 → 0.3.3

    Changelog:
    https://github.com/OpenShot/libopenshot/releases/tag/v0.3.3

    PR:     278857

 multimedia/libopenshot/Makefile                    |   7 +-
 multimedia/libopenshot/distinfo                    |   6 +-
 multimedia/libopenshot/files/patch-CMakeLists.txt  |  10 +-
 .../libopenshot/files/patch-src_FFmpegWriter.cpp   |   4 +-
 .../files/patch-src_KeyFrame.cpp (gone)            | 309 ---------------------
 .../libopenshot/files/patch-src_KeyFrame.h (gone)  |  31 ---
 .../files/patch-src_ZmqLogger.cpp (new)            |  20 ++
 multimedia/libopenshot/pkg-plist                   |   4 +-
 8 files changed, 36 insertions(+), 355 deletions(-)

Comment 25 commit-hook 2024-07-02 14:26:01 UTC

A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=ec1b5f9d4f61bf61723f6e28a90f8ee86075e7e8

commit ec1b5f9d4f61bf61723f6e28a90f8ee86075e7e8
Author:     Tatsuki Makino <tatsuki_makino@hotmail.com>
AuthorDate: 2024-07-02 14:17:46 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2024-07-02 14:17:46 +0000

    multimedia/openshot: update 3.1.1 → 3.2.0

    Release notes:
    https://www.openshot.org/blog/2024/06/24/new_openshot_release_320/
    Compatibility with FFMPEG 7.0 improved: build without errors, but there is
    an issue in the upstream bug-tracker related to the work of the software:
    https://github.com/OpenShot/libopenshot/issues/953#issuecomment-2131234669

    PR:     278857

 multimedia/openshot/Makefile                       |  10 +-
 multimedia/openshot/distinfo                       |   6 +-
 multimedia/openshot/files/patch-MANIFEST.in        |   5 +-
 .../patch-src_classes_logger__libopenshot.py (new) |  11 ++
 .../files/patch-src_settings___default.settings    |   6 +-
 .../files/patch-src_windows_preferences.py         |   4 +-
 multimedia/openshot/pkg-plist                      | 132 ++++++++++++++-------
 7 files changed, 119 insertions(+), 55 deletions(-)

Comment 26 commit-hook 2024-07-02 14:26:02 UTC

A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=1859977166a9cbe2bca8226d69df8668a1ee8f83

commit 1859977166a9cbe2bca8226d69df8668a1ee8f83
Author:     Tatsuki Makino <tatsuki_makino@hotmail.com>
AuthorDate: 2024-07-02 14:14:02 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2024-07-02 14:14:02 +0000

    audio/libopenshot-audio: update 0.3.2 → 0.3.3

    Changelog:
    https://github.com/OpenShot/libopenshot-audio/releases/tag/v0.3.3

    PR:     278857

 audio/libopenshot-audio/Makefile                   |  8 ++++----
 audio/libopenshot-audio/distinfo                   |  6 +++---
 audio/libopenshot-audio/files/patch-CMakeLists.txt | 15 ++++++++-------
 audio/libopenshot-audio/pkg-plist                  |  2 +-
 4 files changed, 16 insertions(+), 15 deletions(-)