Bug 268317 - multimedia/openshot: update to 3.0.0
Summary: multimedia/openshot: update to 3.0.0
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: Nuno Teixeira
URL: https://www.openshot.org/blog/2022/12...
Keywords:
Depends on:
Blocks:
 
Reported: 2022-12-11 18:21 UTC by Vladimir Druzenko
Modified: 2022-12-30 22:39 UTC (History)
4 users (show)

See Also:
tatsuki_makino: maintainer-feedback+


Attachments
update to 3.0.0 (190.64 KB, patch)
2022-12-11 19:59 UTC, Vladimir Druzenko
vvd: maintainer-approval?
Details | Diff
patch for multimedia/openshot, multimedia/libopenshot and audio/libopenshot-audio (207.89 KB, patch)
2022-12-12 12:13 UTC, Tatsuki Makino
no flags 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 2022-12-11 18:21:10 UTC
OpenShot 3.0 Released | Stability, Performance & Usability
Written by Jonathan on Dec. 10, 2022 in Releases.

Highlights & Features:
    Free & Open-Source Video Editor
    More than 1000 improvements & fixes
    Improved stability & memory usage
    Enhanced real-time video playback performance
    Timeline & usability improvements (snapping, keyframes, waveforms, default folders, and more)
    Ability to export multiple clips and videos at the same time
    Improved User-Guide / Documentation / Help Manual
    Updated Language Translations & Translation System
    Expanded video formats supported
    Support for Blender 3.3
    4K display | monitor support (High DPI)
Comment 1 Graham Perrin freebsd_committer freebsd_triage 2022-12-11 19:32:31 UTC
Gentle hint: 

> … Please do not submit problem reports that simply state that a 
> newer version of an application is available. …

<https://docs.freebsd.org/en/articles/problem-reports/#pr-when>
Comment 2 Vladimir Druzenko freebsd_committer freebsd_triage 2022-12-11 19:59:52 UTC
Created attachment 238715 [details]
update to 3.0.0

Tested on 13.1-p5 and64: check-plist, install, run.

Patch was in progress and PR created for get information maybe maintainer already start work on it.
Comment 3 Graham Perrin freebsd_committer freebsd_triage 2022-12-11 23:40:20 UTC
(In reply to VVD from comment #2)

Thank you. 

----

Triage: the 'patch' keyword is deprecated. Please see <https://bugs.freebsd.org/bugzilla/> (changes, to the right) and <https://bugs.freebsd.org/bugzilla/describekeywords.cgi>.
Comment 4 Tatsuki Makino 2022-12-12 00:27:19 UTC
Here comes the current maintainer :)

(In reply to VVD from comment #2)

Thanks for making the patch.
Since this is mostly a GUI front end, the next few updates are also needed at the same time.
This is a quote:
Port                                            | Current version | New version
------------------------------------------------+-----------------+------------
audio/libopenshot-audio                         | 0.2.2           | v0.3.0
------------------------------------------------+-----------------+------------
multimedia/libopenshot                          | 0.2.7           | v0.3.0
------------------------------------------------+-----------------+------------
multimedia/openshot                             | 2.6.1           | v3.0.0
------------------------------------------------+-----------------+------------

So, please wait a moment.
Comment 5 Vladimir Druzenko freebsd_committer freebsd_triage 2022-12-12 11:07:35 UTC
(In reply to Tatsuki Makino from comment #4)
My patch have update for all 3 ports.
Comment 6 Tatsuki Makino 2022-12-12 12:13:39 UTC
Created attachment 238725 [details]
patch for multimedia/openshot, multimedia/libopenshot and audio/libopenshot-audio

(In reply to VVD from comment #5)
I checked carefully and everything was in :)

However, I have made a new one.
Because, the fuzz and OFFSET of the patch were not removed.
The source was checked for changes to ensure that the patch had not been applied to a misaligned position.
Makefile variables got messed up again :)
Condition if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") has been removed.
Will this be more usable in other *BSDs?

This is tested only that the poudriere bulk -t succeeds.
Comment 7 Vladimir Druzenko freebsd_committer freebsd_triage 2022-12-12 12:26:29 UTC
(In reply to Tatsuki Makino from comment #6)
Is plus sign work here?
LICENSE_FILE_LGPL3+ =	${WRKSRC}/LICENSES/LGPL-3.0-or-later.txt


Old version have different values for USES: "compiler:gcc-c++11-lib" and "compiler:c++11-lang".
New version have same value "compiler:c++14-lang" for both.
So we can remove else in this if:
===================================
.if !exists(/usr/include/omp.h)
USES+=		compiler:c++14-lang
USE_GCC=	yes
.else
USES+=		compiler:c++14-lang
.endif
-----------------------------------
USES+=		compiler:c++14-lang
.if !exists(/usr/include/omp.h)
USE_GCC=	yes
.endif
===================================
Comment 8 Tatsuki Makino 2022-12-12 12:53:27 UTC
(In reply to VVD from comment #7)
As you can see in Mk/bsd.licenses.db.mk, this is how they get around the plus sign :)

> New version have same value "compiler:c++14-lang" for both.

CMakeLists.txt requires C++14, since there is no gcc-c++14-*.
It is so because I might revert to gcc-c++11-lib, but I don't have an environment where I can check for that.
Comment 9 Vladimir Druzenko freebsd_committer freebsd_triage 2022-12-16 12:46:20 UTC
Are you waiting for me to test your patch?
Comment 10 Tatsuki Makino 2022-12-22 00:07:44 UTC
Regarding attachment 238725 [details] of comment #6, there seems to be no problem running the build by this.
It was tested with 12.4-STABLE amd64.
For all 3 ports, it is desirable that they be committed at the same time.

By the way, are everyone able to use hardware accelerators? :)
Comment 11 Nuno Teixeira freebsd_committer freebsd_triage 2022-12-25 17:07:18 UTC
Will commit with RUN_DEPENDS=    ${PYTHON_PKGNAMEPREFIX}libopenshot>=0.3.0:multimedia/libopenshot@${PY_FLAVOR}

to avoid using old 0.2.7 by any chance.

libopenshot:
---
Part of the OpenShot Video Editor v3.0.0 Release
Bumping version to 0.3.0, SO 23 (minimum libopenshot-audio dependency to 0.3.0)
(...)
---
Comment 12 Tatsuki Makino 2022-12-26 04:31:40 UTC
(In reply to Nuno Teixeira from comment #11)

I forgot to fix part of it.
Since there is a variable in ${WRKSRC}/src/classes/info.py related to the minimum version constraint, it is a good idea to make that change.
May I leave the fix to you?
Comment 13 commit-hook freebsd_committer freebsd_triage 2022-12-26 05:27:10 UTC
A commit in branch main references this bug:

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

commit 6622ce688cfd04db96ab934b7808f6774c6cec97
Author:     VVD <vvd@unislabs.com>
AuthorDate: 2022-12-25 16:38:21 +0000
Commit:     Nuno Teixeira <eduardo@FreeBSD.org>
CommitDate: 2022-12-26 05:25:48 +0000

    multimedia/libopenshot: Update to 0.3.0

    ChangeLog:      https://github.com/OpenShot/libopenshot/releases/tag/v0.3.0
    PR:             268317

 multimedia/libopenshot/Makefile                    | 37 ++++++++++------------
 multimedia/libopenshot/distinfo                    |  6 ++--
 .../libopenshot/files/patch-CMakeLists.txt (new)   | 29 +++++++++++++++++
 .../libopenshot/files/patch-src_CMakeLists.txt     | 16 ++++------
 .../libopenshot/files/patch-src_FFmpegReader.cpp   |  8 ++---
 .../libopenshot/files/patch-src_FFmpegWriter.cpp   | 16 +++++-----
 multimedia/libopenshot/pkg-plist                   | 18 +++--------
 7 files changed, 72 insertions(+), 58 deletions(-)
Comment 14 commit-hook freebsd_committer freebsd_triage 2022-12-26 05:27:12 UTC
A commit in branch main references this bug:

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

commit 8d6f4615f7bf470857eba99d8128e93b5c0ff573
Author:     VVD <vvd@unislabs.com>
AuthorDate: 2022-12-25 14:48:59 +0000
Commit:     Nuno Teixeira <eduardo@FreeBSD.org>
CommitDate: 2022-12-26 05:25:47 +0000

    audio/libopenshot-audio: Update to 0.3.0

    ChangeLog: https://github.com/OpenShot/libopenshot-audio/releases/tag/v0.3.0

    PR:             268317

 audio/libopenshot-audio/Makefile                   | 17 +++------
 audio/libopenshot-audio/distinfo                   |  6 +--
 audio/libopenshot-audio/files/patch-CMakeLists.txt | 43 ++++++++++------------
 audio/libopenshot-audio/pkg-plist                  |  4 +-
 4 files changed, 30 insertions(+), 40 deletions(-)
Comment 15 commit-hook freebsd_committer freebsd_triage 2022-12-26 05:27:13 UTC
A commit in branch main references this bug:

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

commit 82f46e4dcd11bf61045e0ef51c9fd343318ade2a
Author:     VVD <vvd@unislabs.com>
AuthorDate: 2022-12-26 05:22:06 +0000
Commit:     Nuno Teixeira <eduardo@FreeBSD.org>
CommitDate: 2022-12-26 05:25:48 +0000

    multimedia/openshot: Update to 3.0.0

    OpenShot 3.0 Released | Stability, Performance & Usability
    Written by Jonathan on Dec. 10, 2022 in Releases.

    Highlights & Features:
     - Free & Open-Source Video Editor
     - More than 1000 improvements & fixes
     - Improved stability & memory usage
     - Enhanced real-time video playback performance
     - Timeline & usability improvements (snapping, keyframes, waveforms,
       default folders, and more)
     - Ability to export multiple clips and videos at the same time
     - Improved User-Guide / Documentation / Help Manual
     - Updated Language Translations & Translation System
     - Expanded video formats supported
     - Support for Blender 3.3
     - 4K display | monitor support (High DPI)

    ChangeLog:
    https://www.openshot.org/blog/2022/12/10/new_openshot_release_300/

    PR:             268317

 multimedia/openshot/Makefile                       |    8 +-
 multimedia/openshot/distinfo                       |    6 +-
 .../openshot/files/patch-src_classes_info.py       |    4 +-
 .../openshot/files/patch-src_classes_metrics.py    |    4 +-
 multimedia/openshot/files/patch-src_launch.py      |    4 +-
 .../files/patch-src_settings___default.settings    |    8 +-
 .../files/patch-src_windows_preferences.py         |   14 +-
 multimedia/openshot/pkg-plist                      | 1494 +++++++++++++++++++-
 8 files changed, 1496 insertions(+), 46 deletions(-)
Comment 16 Nuno Teixeira freebsd_committer freebsd_triage 2022-12-26 05:29:33 UTC
(In reply to Tatsuki Makino from comment #12)

Done.
Comment 17 Nuno Teixeira freebsd_committer freebsd_triage 2022-12-26 05:29:49 UTC
Committed, thanks!
Comment 18 Tatsuki Makino 2022-12-26 05:54:57 UTC
(In reply to Nuno Teixeira from comment #16)

Thank you very much.
Comment 19 Nuno Teixeira freebsd_committer freebsd_triage 2022-12-28 12:09:29 UTC
I've received some feedback about c++14-lang + USE_GCC:

---
>  .if !exists(/usr/include/omp.h)
> -USES+=		compiler:gcc-c++11-lib
> +USES+=		compiler:c++14-lang
> +USE_GCC=	yes
>  .else
> -USES+=		compiler:c++11-lang
> +USES+=		compiler:c++14-lang
>  .endif

This sets 
  USES+=               compiler:c++14-lang
in both the if-arm and the else-arm. 

Why not set this unconditionally then?

And combining compiler:c++14-lang and USE_GCC=yes is odd; I don't think 
that really works.

Are you sure this entire block is still necessary at all? Where would it
make a difference?

Gerald
--- 
https://lists.freebsd.org/archives/dev-commits-ports-all/2022-December/047739.html

Should we use sugestion from #c7:

===================================
.if !exists(/usr/include/omp.h)
USES+=		compiler:c++14-lang
USE_GCC=	yes
.else
USES+=		compiler:c++14-lang
.endif
-----------------------------------
USES+=		compiler:c++14-lang
.if !exists(/usr/include/omp.h)
USE_GCC=	yes
.endif
===================================
?

Cheers
Comment 20 Nuno Teixeira freebsd_committer freebsd_triage 2022-12-28 13:39:53 UTC
(In reply to Nuno Teixeira from comment #19)
(updating multimedia/libopenshot)

If OpenMP is still necessary, then the best way would be:
.if !exists(/usr/include/omp.h)
USES+=  compiler:gcc-c++11-lib
Comment 21 Tatsuki Makino 2022-12-28 23:19:10 UTC
I am not sure what I know about that either :)
However, I touched to change there to 14 because there is a set(CMAKE_CXX_STANDARD 14) in ${WRKSRC}/CMakeLists.txt.

The arch that needs that conditional branch seems to be powerpc, but I have no way to find out how to make it normal.
https://cgit.freebsd.org/ports/commit/?id=b02f812b43870dc615b6fc713121a2e745ed4293

Would it be better to write compiler:c++14-lang in USES= at the above, and then set USE_GCC=yes in the conditional branch of !exists(/usr/include/omp.h)?
Comment 22 Nuno Teixeira freebsd_committer freebsd_triage 2022-12-29 00:05:09 UTC
(In reply to Tatsuki Makino from comment #21)

For what I understand it there used to be a USES=compiler:openmp that solves this kind of problem on archs that don't have it.

pkubaj@ fixed it on that commit so I think this PR could be closed
Comment 23 Nuno Teixeira freebsd_committer freebsd_triage 2022-12-29 00:19:09 UTC
(In reply to Nuno Teixeira from comment #22)
(...)

Sorry, I got confused, that commit is from 2022/04.
Comment 24 Tatsuki Makino 2022-12-29 04:12:21 UTC
(In reply to Nuno Teixeira from comment #22)

I think USES=compiler:openmp has been erased by VVD-san (bug 252379), so it is no longer available.

To begin with, it seems that COMPILER is becoming something that does not even know what it is supposed to do :) , but in this case, doing the following seems to be the right thing to do.
And the minimum version of the compiler doesn't change with the USES=compiler:c++14-lang restrictions. And that's always yes for USE_GCC.

.if !exists(/usr/include/omp.h)
USES+=		gcc-c++11-lib
.else
USES+=		compiler:c++14-lang
.endif
Comment 25 Nuno Teixeira freebsd_committer freebsd_triage 2022-12-29 08:51:36 UTC
(In reply to Tatsuki Makino from comment #24)

pkubaj@ recomendation is:

---
.if !exists(/usr/include/omp.h)
USES+=  compiler:gcc-c++11-lib
.endif
---

You could set whatever compiler in USES avoiding using .else here.
Comment 26 Vladimir Druzenko freebsd_committer freebsd_triage 2022-12-29 09:53:48 UTC
(In reply to Tatsuki Makino from comment #24)
No. Check description. It was broken: OPENMP forces USE_GCC => build error.
Remove USE_GCC fixed build.
There is other PR: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=247753
Comment 27 Nuno Teixeira freebsd_committer freebsd_triage 2022-12-29 13:21:40 UTC
(In reply to Nuno Teixeira from comment #25)

> ---
> .if !exists(/usr/include/omp.h)
> USES+=  compiler:gcc-c++11-lib
> .endif
> ---

> You could set whatever compiler in USES avoiding using .else here.

I'm wrong because it will append one compiler to the other.

Correct way will be:

---
.if !exists(/usr/include/omp.h)
USES+= gcc-c++11-lib
.else
USES+= compiler:c++14-lang
.endif
---

Ready to commit.
Comment 28 Tatsuki Makino 2022-12-29 20:59:02 UTC
(In reply to Nuno Teixeira from comment #27)

May I have you commit to it?
Once it is committed, wait for complaints from poudriere or those who have an environment that requires it :)


(In reply to VVD from comment #26)

What was the problem with that part of openmp?
Was that the reason that linking by llvm and linking by gcc cannot be mixed?
Comment 29 Vladimir Druzenko freebsd_committer freebsd_triage 2022-12-29 23:46:16 UTC
(In reply to Tatsuki Makino from comment #28)
I don't know what is the root cause.
Just found a build error and a way to fix it.
Comment 30 Nuno Teixeira freebsd_committer freebsd_triage 2022-12-30 09:28:56 UTC
Forgot to link conversation on dev-commits-ports-all:
https://lists.freebsd.org/archives/dev-commits-ports-all/2022-December/047742.html

Let's commit it like sugested, if a problem appears then we reopen this PR.
Comment 31 Nuno Teixeira freebsd_committer freebsd_triage 2022-12-30 09:30:23 UTC
(In reply to Nuno Teixeira from comment #30)
(...)

I will bump PORTREVISION to have results faster.
Comment 32 commit-hook freebsd_committer freebsd_triage 2022-12-30 16:25:38 UTC
A commit in branch main references this bug:

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

commit 0d8b545a1dd7610871ead3379243dbef2b569016
Author:     Nuno Teixeira <eduardo@FreeBSD.org>
AuthorDate: 2022-12-30 16:22:42 +0000
Commit:     Nuno Teixeira <eduardo@FreeBSD.org>
CommitDate: 2022-12-30 16:24:48 +0000

    multimedia/libopenshot: Fix check for omp.h on all architectures

    PR:             268317
    Reported by:    pkubaj

 multimedia/libopenshot/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Comment 33 Nuno Teixeira freebsd_committer freebsd_triage 2022-12-30 16:46:17 UTC
Committed, thanks!
Comment 34 Tatsuki Makino 2022-12-30 20:57:48 UTC
(In reply to Nuno Teixeira from comment #33)

I am very sorry about this.
This is completely due to the fact that what I wrote is wrong.
The following corrections are still needed.

-USES+=		gcc-c++11-lib
+USES+=		compiler:gcc-c++11-lib
Comment 35 commit-hook freebsd_committer freebsd_triage 2022-12-30 22:28:32 UTC
A commit in branch main references this bug:

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

commit 1a39b2a730ab71e8b6883421daa95a4b8eadcf08
Author:     Nuno Teixeira <eduardo@FreeBSD.org>
AuthorDate: 2022-12-30 22:25:54 +0000
Commit:     Nuno Teixeira <eduardo@FreeBSD.org>
CommitDate: 2022-12-30 22:25:54 +0000

    multimedia/libopenshot: Fix typo on USES= compiler

    PR:             268317
    Reported by:    tatsuki_makino@hotmail.com

 multimedia/libopenshot/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Comment 36 Nuno Teixeira freebsd_committer freebsd_triage 2022-12-30 22:29:42 UTC
(In reply to Tatsuki Makino from comment #34)

Fixed. Thanks!
Comment 37 Tatsuki Makino 2022-12-30 22:39:12 UTC
(In reply to Nuno Teixeira from comment #36)

Thank you very much again.