GNU bug report logs - #51338
OpenShot 2.6.1 update

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 51338 in the body.
You can then email your comments to 51338 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Leo Famulari <leo <at> famulari.name>
To: guix-patches <at> gnu.org
Subject: OpenShot 2.6.1 update
Date: Fri, 22 Oct 2021 15:16:10 -0400

These patches update OpenShot to 2.6.1.

Message #8 received at 51338 <at> debbugs.gnu.org (full text, mbox):

From: Leo Famulari <leo <at> famulari.name>
To: 51338 <at> debbugs.gnu.org
Subject: [PATCH 1/4] gnu: libopenshot-audio: Update to 0.2.2.
Date: Fri, 22 Oct 2021 15:17:13 -0400

* gnu/packages/audio.scm (libopenshot-audio): Update to 0.2.2.
---
 gnu/packages/audio.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index faf106fc68..e71dedb0ba 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -4698,7 +4698,7 @@ (define-public libfdk
 (define-public libopenshot-audio
   (package
     (name "libopenshot-audio")
-    (version "0.2.0")
+    (version "0.2.2")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -4707,7 +4707,7 @@ (define-public libopenshot-audio
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "13if0m5mvlqly8gmbhschzb9papkgp3yqivklhb949dhy16m8zgf"))))
+                "03dygh85riljk7dpn5a5a0d22a2kz45fs13gzwqgnbzzr1k17p2y"))))
     (build-system cmake-build-system)
     (inputs
      `(("alsa-lib" ,alsa-lib)
-- 
2.33.1

Message #11 received at 51338 <at> debbugs.gnu.org (full text, mbox):

From: Leo Famulari <leo <at> famulari.name>
To: 51338 <at> debbugs.gnu.org
Subject: [PATCH 2/4] gnu: libopenshot: Update to 0.2.7.
Date: Fri, 22 Oct 2021 15:17:14 -0400

* gnu/packages/video.scm (libopenshot): Update to 0.2.7.
[origin]: Adjust snippet to upstream changes.
[inputs]: Add alsa-lib and zlib.
[propagated-inputs]: Replace ffmpeg-4.3 with ffmpeg.
---
 gnu/packages/video.scm | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index d2a2a08ee3..168c16492a 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -4589,7 +4589,7 @@ (define-public vidstab
 (define-public libopenshot
   (package
     (name "libopenshot")
-    (version "0.2.5")
+    (version "0.2.7")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -4598,11 +4598,11 @@ (define-public libopenshot
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1mxjkgjmjzgf628y3rscc6rqf55hxgjpmvwxlncfk1216i5xskwp"))
+                "0i9bsn8gklm1mvj60l3d3xrxdgy8svpxjfqcwsr308j5zjn30pv8"))
               (modules '((guix build utils)))
               (snippet '(begin
                           ;; Allow overriding of the python installation dir
-                          (substitute* "src/bindings/python/CMakeLists.txt"
+                          (substitute* "bindings/python/CMakeLists.txt"
                             (("(SET\\(PYTHON_MODULE_PATH.*)\\)" _ set)
                              (string-append set " CACHE PATH "
                                             "\"Python bindings directory\")")))
@@ -4614,11 +4614,12 @@ (define-public libopenshot
        ("python" ,python)
        ("swig" ,swig)
        ("unittest++" ,unittest-cpp)))
+    (inputs
+     `(("alsa-lib" ,alsa-lib)
+       ("zlib" ,zlib)))
     (propagated-inputs                  ;all referenced in installed headers
      `(("cppzmq" ,cppzmq)
-       ;; libopenshot doesn't yet build with ffmpeg 4.4 (see:
-       ;; https://github.com/OpenShot/libopenshot/issues/676).
-       ("ffmpeg" ,ffmpeg-4.3)
+       ("ffmpeg" ,ffmpeg)
        ("imagemagick" ,imagemagick)
        ("jsoncpp" ,jsoncpp)
        ("libopenshot-audio" ,libopenshot-audio)
-- 
2.33.1

Message #14 received at 51338 <at> debbugs.gnu.org (full text, mbox):

From: Leo Famulari <leo <at> famulari.name>
To: 51338 <at> debbugs.gnu.org
Subject: [PATCH 4/4] gnu: Remove FFmpeg 4.3.
Date: Fri, 22 Oct 2021 15:17:16 -0400

* gnu/packages/video.scm (ffmpeg-4.3): Remove variable.
---
 gnu/packages/video.scm | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 6587ac41f3..18d19266e2 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -1699,17 +1699,6 @@ (define-public ffmpeg
 audio/video codec library.")
     (license license:gpl2+)))
 
-(define-public ffmpeg-4.3
-  (package/inherit ffmpeg
-    (version "4.3.2")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://ffmpeg.org/releases/ffmpeg-"
-                                  version ".tar.xz"))
-              (sha256
-               (base32
-                "1nyd9jlcy0pqnwzi29a7sg50hq37vb0g3f9l16y3q8yh3m7ydr26"))))))
-
 (define-public ffmpeg-3.4
   (package
     (inherit ffmpeg)
-- 
2.33.1

Message #17 received at 51338 <at> debbugs.gnu.org (full text, mbox):

From: Leo Famulari <leo <at> famulari.name>
To: 51338 <at> debbugs.gnu.org
Subject: [PATCH 3/4] gnu: OpenShot: Update to 2.6.1.
Date: Fri, 22 Oct 2021 15:17:15 -0400

* gnu/packages/video.scm (openshot): Update to 2.6.1.
[arguments]: Add a 'fix-symbolic-link' phase to work around a broken symlink.
---
 gnu/packages/video.scm | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 168c16492a..6587ac41f3 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -4654,7 +4654,7 @@ (define-public libopenshot
 (define-public openshot
   (package
     (name "openshot")
-    (version "2.5.1")
+    (version "2.6.1")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -4663,7 +4663,7 @@ (define-public openshot
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0qc5i0ay6j2wab1whl41sjb71cj02pg6y79drf7asrprq8b2rmfq"))
+                "0pa8iwl217503bjlqg2zlrw5lxyq5hvxrf5apxrh3843hj1w1myv"))
        (modules '((guix build utils)))
        (snippet
         '(begin
@@ -4699,6 +4699,12 @@ (define-public openshot
                           (("fonts") "share/fonts/truetype")
                           (("[A-Za-z_-]+.ttf") "DejaVuSans.ttf")))
                       #t))
+                  ;; https://github.com/OpenShot/openshot-qt/issues/4502
+                  (add-before 'ensure-no-mtimes-pre-1980 'fix-symbolic-link
+                    (lambda _
+                      (delete-file "images/Humanity/actions/custom/razor_line_with_razor.png")
+                      (symlink "../../../../src/timeline/media/images/razor_line_with_razor.png"
+                               "images/Humanity/actions/custom/razor_line_with_razor.png")))
                   (add-before 'install 'set-tmp-home
                     (lambda _
                       ;; src/classes/info.py "needs" to create several
-- 
2.33.1

Message #20 received at 51338 <at> debbugs.gnu.org (full text, mbox):

From: Efraim Flashner <efraim <at> flashner.co.il>
To: Leo Famulari <leo <at> famulari.name>
Cc: 51338 <at> debbugs.gnu.org
Subject: Re: [bug#51338] OpenShot 2.6.1 update
Date: Mon, 25 Oct 2021 14:47:26 +0300

[Message part 1 (text/plain, inline)]

On Fri, Oct 22, 2021 at 03:16:10PM -0400, Leo Famulari wrote:
> These patches update OpenShot to 2.6.1.

I haven't tested it but it looks good.

-- 
Efraim Flashner   <efraim <at> flashner.co.il>   רנשלפ םירפא
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[signature.asc (application/pgp-signature, inline)]

Message #23 received at 51338 <at> debbugs.gnu.org (full text, mbox):

From: Efraim Flashner <efraim <at> flashner.co.il>
To: Leo Famulari <leo <at> famulari.name>, 51338 <at> debbugs.gnu.org
Subject: Re: [bug#51338] OpenShot 2.6.1 update
Date: Mon, 1 Nov 2021 12:08:23 +0200

[Message part 1 (text/plain, inline)]

On Mon, Oct 25, 2021 at 02:47:26PM +0300, Efraim Flashner wrote:
> On Fri, Oct 22, 2021 at 03:16:10PM -0400, Leo Famulari wrote:
> > These patches update OpenShot to 2.6.1.
> 
> I haven't tested it but it looks good.
> 

Tested out the patches, it all looks good to me. Tested using
enlightenment/wayland, all the icons are still there.

You can also change the 'check phase for openshot to use the #:tests?
flag.


-- 
Efraim Flashner   <efraim <at> flashner.co.il>   רנשלפ םירפא
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[signature.asc (application/pgp-signature, inline)]

Message #28 received at 51338-done <at> debbugs.gnu.org (full text, mbox):

From: Leo Famulari <leo <at> famulari.name>
To: Efraim Flashner <efraim <at> flashner.co.il>, 51338-done <at> debbugs.gnu.org
Subject: Re: [bug#51338] OpenShot 2.6.1 update
Date: Mon, 1 Nov 2021 10:10:10 -0400

[Message part 1 (text/plain, inline)]

On Mon, Nov 01, 2021 at 12:08:23PM +0200, Efraim Flashner wrote:
> On Mon, Oct 25, 2021 at 02:47:26PM +0300, Efraim Flashner wrote:
> > On Fri, Oct 22, 2021 at 03:16:10PM -0400, Leo Famulari wrote:
> > > These patches update OpenShot to 2.6.1.
> > 
> > I haven't tested it but it looks good.
> > 
> 
> Tested out the patches, it all looks good to me. Tested using
> enlightenment/wayland, all the icons are still there.
> 
> You can also change the 'check phase for openshot to use the #:tests?
> flag.

Thanks for your review! Pushed as 80c0505f166101bbe6d55b8f2314d1a18227b3ee

[signature.asc (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.