[bug#71810] [PATCH 1/3] gnu: smplayer: Update to 22.2.0

unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed

* [bug#71810] [PATCH 1/3] gnu: smplayer: Update to 22.2.0
@ 2024-06-27 21:58 attila.lendvai
  2024-06-27 21:58 ` [bug#71811] [PATCH 2/3] gnu: smplayer: Update to 22.7.0 attila.lendvai
  2024-07-13 15:59 ` [bug#71810] [PATCH v2 1/3] gnu: smplayer: Update to 22.2.0 attila.lendvai
  0 siblings, 2 replies; 7+ messages in thread
From: attila.lendvai @ 2024-06-27 21:58 UTC (permalink / raw)
  To: 71810; +Cc: Attila Lendvai

From: Attila Lendvai <attila@lendvai.name>

* gnu/packages/video.scm (smplayer) [origin]: Build from the git repo.
[arguments]: Remove LRELEASE kludge.

Change-Id: Iff065784a2b2ef677807e4194ca04ce2ec501fef
---

the rationale for sending three patches is that if someone
wants to experiment with different versions, then they can
easily grab them from the git history.

and i had to go step-by-step anyway to find out what version
broke, and what was the difference, so i recorded the steps.

 gnu/packages/video.scm | 29 ++++++++---------------------
 1 file changed, 8 insertions(+), 21 deletions(-)

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 77cdfe9078c..731403f5291 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -2711,15 +2711,15 @@ (define-public mpv
 (define-public smplayer
   (package
     (name "smplayer")
-    (version "21.10.0")
+    (version "22.2.0")
     (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "mirror://sourceforge/smplayer/SMPlayer/" version
-                    "/smplayer-" version ".tar.bz2"))
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/smplayer-dev/smplayer")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
               (sha256
-               (base32
-                "12nvcl0cfix1xay9hfi7856vg4lpv8y5b0a22212bsjbvl5g22rc"))))
+               (base32 "0mcvpm86n9l0nwavnaa1n2jfalgrzdfh92sdjnwx1iga89m4k55s"))))
     (build-system qt-build-system)
     (native-inputs
      (list qttools-5))
@@ -2728,23 +2728,10 @@ (define-public smplayer
     (arguments
      (list #:tests? #false              ; no tests
            #:make-flags #~(list (string-append "PREFIX=" #$output)
-                                (string-append "CC=" #+(cc-for-target))
-                                ;; A KLUDGE to turn off invoking lrelease on the
-                                ;; project for now, because it fails consistently
-                                ;; with "WARNING: Could not find qmake spec
-                                ;; 'default'". See below.
-                                "LRELEASE=true")
+                                (string-append "CC=" #+(cc-for-target)))
            #:phases
            #~(modify-phases %standard-phases
                (delete 'configure)
-               ;; Due to the above, we must run lrelease separately on each .ts file
-               ;; (as opposed to running `lrelease-pro smplayer.pro` for the entire
-               ;; project, as the Makefile does normally without the above kludge).
-               (add-after 'build 'compile-ts-files
-                 (lambda _
-                   (for-each (lambda (file)
-                               (invoke "lrelease" file))
-                             (find-files "./" "\\.ts$"))))
                (add-after 'install 'wrap-executable
                  (lambda* (#:key inputs outputs #:allow-other-keys)
                    (let* ((out (assoc-ref outputs "out"))

base-commit: 78d946b01162fbe986c6768800e8cfd6e70e67e5
-- 
2.45.1





^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [bug#71811] [PATCH 2/3] gnu: smplayer: Update to 22.7.0
  2024-06-27 21:58 [bug#71810] [PATCH 1/3] gnu: smplayer: Update to 22.2.0 attila.lendvai
@ 2024-06-27 21:58 ` attila.lendvai
  2024-06-27 22:25   ` bug#71811: " Attila Lendvai
  2024-07-13 15:59 ` [bug#71810] [PATCH v2 1/3] gnu: smplayer: Update to 22.2.0 attila.lendvai
  1 sibling, 1 reply; 7+ messages in thread
From: attila.lendvai @ 2024-06-27 21:58 UTC (permalink / raw)
  To: 71811; +Cc: Attila Lendvai

From: Attila Lendvai <attila@lendvai.name>

Change-Id: Iec24da98806b87f482b280036e61e40e9d66cb5e
---
 gnu/packages/video.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 731403f5291..1f29731ee06 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -2711,7 +2711,7 @@ (define-public mpv
 (define-public smplayer
   (package
     (name "smplayer")
-    (version "22.2.0")
+    (version "22.7.0")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -2719,7 +2719,7 @@ (define-public smplayer
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
-               (base32 "0mcvpm86n9l0nwavnaa1n2jfalgrzdfh92sdjnwx1iga89m4k55s"))))
+               (base32 "0qs9vz440bdvnyghi7f4frsan7n9xiy3afw9lhmf5m8xxa37325c"))))
     (build-system qt-build-system)
     (native-inputs
      (list qttools-5))
-- 
2.45.1





^ permalink raw reply related	[flat|nested] 7+ messages in thread

* bug#71811: [PATCH 2/3] gnu: smplayer: Update to 22.7.0
  2024-06-27 21:58 ` [bug#71811] [PATCH 2/3] gnu: smplayer: Update to 22.7.0 attila.lendvai
@ 2024-06-27 22:25   ` Attila Lendvai
  0 siblings, 0 replies; 7+ messages in thread
From: Attila Lendvai @ 2024-06-27 22:25 UTC (permalink / raw)
  To: 71811-done; +Cc: attila.lendvai


accidental send, closing it.

<#secure method=pgpmime mode=sign>
-- 
• attila lendvai
• PGP: 963F 5D5F 45C7 DFCD 0A39
--
“The penalty for laughing in a courtroom is six months in jail; if it were not for this penalty, the jury would never hear the evidence.”
	— H.L. Mencken (1880–1956)




^ permalink raw reply	[flat|nested] 7+ messages in thread

* [bug#71810] [PATCH v2 1/3] gnu: smplayer: Update to 22.2.0.
  2024-06-27 21:58 [bug#71810] [PATCH 1/3] gnu: smplayer: Update to 22.2.0 attila.lendvai
  2024-06-27 21:58 ` [bug#71811] [PATCH 2/3] gnu: smplayer: Update to 22.7.0 attila.lendvai
@ 2024-07-13 15:59 ` attila.lendvai
  2024-07-13 15:59   ` [bug#71810] [PATCH v2 2/3] gnu: smplayer: Update to 22.7.0 attila.lendvai
  2024-07-13 15:59   ` [bug#71810] [PATCH v2 3/3] gnu: smplayer: Update to 23.12.0 attila.lendvai
  1 sibling, 2 replies; 7+ messages in thread
From: attila.lendvai @ 2024-07-13 15:59 UTC (permalink / raw)
  To: 71810; +Cc: Attila Lendvai

From: Attila Lendvai <attila@lendvai.name>

* gnu/packages/video.scm (smplayer) [origin]: Build from the git repo.
[arguments]: Remove LRELEASE kludge.

Change-Id: Iff065784a2b2ef677807e4194ca04ce2ec501fef
---

v2 adds missing dots at the end of the 3 commit headers.

 gnu/packages/video.scm | 29 ++++++++---------------------
 1 file changed, 8 insertions(+), 21 deletions(-)

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 382ad0ba59d..c9c3f1b1d30 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -2711,15 +2711,15 @@ (define-public mpv
 (define-public smplayer
   (package
     (name "smplayer")
-    (version "21.10.0")
+    (version "22.2.0")
     (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "mirror://sourceforge/smplayer/SMPlayer/" version
-                    "/smplayer-" version ".tar.bz2"))
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/smplayer-dev/smplayer")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
               (sha256
-               (base32
-                "12nvcl0cfix1xay9hfi7856vg4lpv8y5b0a22212bsjbvl5g22rc"))))
+               (base32 "0mcvpm86n9l0nwavnaa1n2jfalgrzdfh92sdjnwx1iga89m4k55s"))))
     (build-system qt-build-system)
     (native-inputs
      (list qttools-5))
@@ -2728,23 +2728,10 @@ (define-public smplayer
     (arguments
      (list #:tests? #false              ; no tests
            #:make-flags #~(list (string-append "PREFIX=" #$output)
-                                (string-append "CC=" #+(cc-for-target))
-                                ;; A KLUDGE to turn off invoking lrelease on the
-                                ;; project for now, because it fails consistently
-                                ;; with "WARNING: Could not find qmake spec
-                                ;; 'default'". See below.
-                                "LRELEASE=true")
+                                (string-append "CC=" #+(cc-for-target)))
            #:phases
            #~(modify-phases %standard-phases
                (delete 'configure)
-               ;; Due to the above, we must run lrelease separately on each .ts file
-               ;; (as opposed to running `lrelease-pro smplayer.pro` for the entire
-               ;; project, as the Makefile does normally without the above kludge).
-               (add-after 'build 'compile-ts-files
-                 (lambda _
-                   (for-each (lambda (file)
-                               (invoke "lrelease" file))
-                             (find-files "./" "\\.ts$"))))
                (add-after 'install 'wrap-executable
                  (lambda* (#:key inputs outputs #:allow-other-keys)
                    (let* ((out (assoc-ref outputs "out"))

base-commit: 71694363f6cc79e44955acbd9f7ca108e658caca
-- 
2.45.1





^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [bug#71810] [PATCH v2 2/3] gnu: smplayer: Update to 22.7.0.
  2024-07-13 15:59 ` [bug#71810] [PATCH v2 1/3] gnu: smplayer: Update to 22.2.0 attila.lendvai
@ 2024-07-13 15:59   ` attila.lendvai
  2024-07-13 15:59   ` [bug#71810] [PATCH v2 3/3] gnu: smplayer: Update to 23.12.0 attila.lendvai
  1 sibling, 0 replies; 7+ messages in thread
From: attila.lendvai @ 2024-07-13 15:59 UTC (permalink / raw)
  To: 71810; +Cc: Attila Lendvai

From: Attila Lendvai <attila@lendvai.name>

Change-Id: Iec24da98806b87f482b280036e61e40e9d66cb5e
---
 gnu/packages/video.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index c9c3f1b1d30..2d1424fb8ec 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -2711,7 +2711,7 @@ (define-public mpv
 (define-public smplayer
   (package
     (name "smplayer")
-    (version "22.2.0")
+    (version "22.7.0")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -2719,7 +2719,7 @@ (define-public smplayer
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
-               (base32 "0mcvpm86n9l0nwavnaa1n2jfalgrzdfh92sdjnwx1iga89m4k55s"))))
+               (base32 "0qs9vz440bdvnyghi7f4frsan7n9xiy3afw9lhmf5m8xxa37325c"))))
     (build-system qt-build-system)
     (native-inputs
      (list qttools-5))
-- 
2.45.1





^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [bug#71810] [PATCH v2 3/3] gnu: smplayer: Update to 23.12.0.
  2024-07-13 15:59 ` [bug#71810] [PATCH v2 1/3] gnu: smplayer: Update to 22.2.0 attila.lendvai
  2024-07-13 15:59   ` [bug#71810] [PATCH v2 2/3] gnu: smplayer: Update to 22.7.0 attila.lendvai
@ 2024-07-13 15:59   ` attila.lendvai
       [not found]     ` <8734oahixe.fsf@qq.com>
  1 sibling, 1 reply; 7+ messages in thread
From: attila.lendvai @ 2024-07-13 15:59 UTC (permalink / raw)
  To: 71810; +Cc: Attila Lendvai

From: Attila Lendvai <attila@lendvai.name>

* gnu/packages/video.scm (smplayer) [inputs]: Add qtdeclarative-5.

Change-Id: I6b727f6fe368bd70bf9fc3d61f7c0b5efe56c3a1
---
 gnu/packages/video.scm | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 2d1424fb8ec..1fa4ab15ff5 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -2711,7 +2711,7 @@ (define-public mpv
 (define-public smplayer
   (package
     (name "smplayer")
-    (version "22.7.0")
+    (version "23.12.0")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -2719,12 +2719,16 @@ (define-public smplayer
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
-               (base32 "0qs9vz440bdvnyghi7f4frsan7n9xiy3afw9lhmf5m8xxa37325c"))))
+               (base32 "0yrm57rib910h9m4avhg6mkmkzy9xjb3f185c5zr6jls100az8h1"))))
     (build-system qt-build-system)
     (native-inputs
      (list qttools-5))
     (inputs
-     (list bash-minimal qtbase-5 zlib mpv))
+     (list bash-minimal
+           qtbase-5
+           qtdeclarative-5
+           zlib
+           mpv))
     (arguments
      (list #:tests? #false              ; no tests
            #:make-flags #~(list (string-append "PREFIX=" #$output)
-- 
2.45.1





^ permalink raw reply related	[flat|nested] 7+ messages in thread

[parent not found: <8734oahixe.fsf@qq.com>]

* bug#71810: [PATCH v2 3/3] gnu: smplayer: Update to 23.12.0.
       [not found]     ` <8734oahixe.fsf@qq.com>
@ 2024-07-15 13:41       ` Z572 via Guix-patches via
  0 siblings, 0 replies; 7+ messages in thread
From: Z572 via Guix-patches via @ 2024-07-15 13:41 UTC (permalink / raw)
  To: attila.lendvai; +Cc: 71810-done, Attila Lendvai

[-- Attachment #1: Type: text/plain, Size: 1802 bytes --]

attila.lendvai@gmail.com writes:

> From: Attila Lendvai <attila@lendvai.name>
>
> * gnu/packages/video.scm (smplayer) [inputs]: Add qtdeclarative-5.
>
> Change-Id: I6b727f6fe368bd70bf9fc3d61f7c0b5efe56c3a1
> ---
>  gnu/packages/video.scm | 10 +++++++---
>  1 file changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
> index 2d1424fb8ec..1fa4ab15ff5 100644
> --- a/gnu/packages/video.scm
> +++ b/gnu/packages/video.scm
> @@ -2711,7 +2711,7 @@ (define-public mpv
>  (define-public smplayer
>    (package
>      (name "smplayer")
> -    (version "22.7.0")
> +    (version "23.12.0")
>      (source (origin
>                (method git-fetch)
>                (uri (git-reference
> @@ -2719,12 +2719,16 @@ (define-public smplayer
>                      (commit (string-append "v" version))))
>                (file-name (git-file-name name version))
>                (sha256
> -               (base32 "0qs9vz440bdvnyghi7f4frsan7n9xiy3afw9lhmf5m8xxa37325c"))))
> +               (base32 "0yrm57rib910h9m4avhg6mkmkzy9xjb3f185c5zr6jls100az8h1"))))
>      (build-system qt-build-system)
>      (native-inputs
>       (list qttools-5))
>      (inputs
> -     (list bash-minimal qtbase-5 zlib mpv))
> +     (list bash-minimal
> +           qtbase-5
> +           qtdeclarative-5
> +           zlib
> +           mpv))
>      (arguments
>       (list #:tests? #false              ; no tests
>             #:make-flags #~(list (string-append "PREFIX=" #$output)

push, see

https://git.savannah.gnu.org/cgit/guix.git/commit/?id=8c86eaeac6a20edad6c3c938df3815a6bcb86270
https://git.savannah.gnu.org/cgit/guix.git/commit/?id=7e703ae7506251952b775e645785b095c183f8e8
https://git.savannah.gnu.org/cgit/guix.git/commit/?id=3689faac5c10249f052c979b527cba26054170d8

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2024-07-15 13:57 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-06-27 21:58 [bug#71810] [PATCH 1/3] gnu: smplayer: Update to 22.2.0 attila.lendvai
2024-06-27 21:58 ` [bug#71811] [PATCH 2/3] gnu: smplayer: Update to 22.7.0 attila.lendvai
2024-06-27 22:25   ` bug#71811: " Attila Lendvai
2024-07-13 15:59 ` [bug#71810] [PATCH v2 1/3] gnu: smplayer: Update to 22.2.0 attila.lendvai
2024-07-13 15:59   ` [bug#71810] [PATCH v2 2/3] gnu: smplayer: Update to 22.7.0 attila.lendvai
2024-07-13 15:59   ` [bug#71810] [PATCH v2 3/3] gnu: smplayer: Update to 23.12.0 attila.lendvai
     [not found]     ` <8734oahixe.fsf@qq.com>
2024-07-15 13:41       ` bug#71810: " Z572 via Guix-patches via

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).