[bug#40445] gnu: gsm: Update to 1.0.19.

[bug#40445] gnu: gsm: Update to 1.0.19.

[Raghav Gururajan]

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



[-- Attachment #2: update-gsm.patch --]
[-- Type: application/octet-stream, Size: 1896 bytes --]

From 62dfeb5d801762ce5824d03e15470ed3ed6ce2c2 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Sun, 5 Apr 2020 03:04:32 -0400
Subject: [PATCH] gnu: gsm: Update to 1.0.19.

* gnu/packages/audio.scm (gsm): Update to 1.0.19.
---
 gnu/packages/audio.scm | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 6d29184592..e8d48f49d0 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -3343,7 +3343,7 @@ code, used in @code{libtoxcore}.")
 (define-public gsm
   (package
     (name "gsm")
-    (version "1.0.18")
+    (version "1.0.19")
     (source
      (origin
        (method url-fetch)
@@ -3352,18 +3352,22 @@ code, used in @code{libtoxcore}.")
                        "-" version ".tar.gz"))
        (sha256
         (base32
-         "041amvpz8cvxykl3pwqldrzxligmmzcg8ncdnxbg32rlqf3q1xh4"))))
+         "1xkha9ss5g5qnfaybi8il0mcvp8knwg9plgh8404vh58d0pna0s9"))))
     (build-system gnu-build-system)
     (arguments
      `(#:test-target "tst"
-       #:make-flags '("INSTALL_ROOT=%output"
-                      "CCFLAGS=-fPIC \
--c -O2 -DNeedFunctionPrototypes=1 -Wall -Wno-comment") ;default options
+       #:make-flags
+       (list
+        ;; Added -fPIC with other default options.
+        "CCFLAGS=-fPIC -c -O2 -DNeedFunctionPrototypes=1 -Wall -Wno-comment")
        #:phases
        (modify-phases %standard-phases
          (add-before 'install 'pre-install
            (lambda _
              (let ((out (assoc-ref %outputs "out")))
+               (substitute* "Makefile"
+                 (("INSTALL_ROOT\t=")
+                  (string-append "INSTALL_ROOT\t=\t" out)))
                (mkdir-p (string-append out "/inc"))
                (mkdir-p (string-append out "/man"))
                (mkdir-p (string-append out "/man/man1"))
-- 
2.26.0

[bug#40445] gnu: gsm: Update to 1.0.19.

[Mathieu Othacehe]

Hello Raghav,

> +       #:make-flags
> +       (list
> +        ;; Added -fPIC with other default options.
> +        "CCFLAGS=-fPIC -c -O2 -DNeedFunctionPrototypes=1 -Wall -Wno-comment")

I wonder if we need all those options, the package seems to build fine
without them. Could you have a look?

Thanks,

Mathieu

[bug#40445] gnu: gsm: Update to 1.0.19.

[Raghav Gururajan]

Hi Mathieu!

>> + #:make-flags
>> + (list
>> + ;; Added -fPIC with other default options.
>> + "CCFLAGS=-fPIC -c -O2 -DNeedFunctionPrototypes=1 -Wall -Wno-comment")
> 
> I wonder if we need all those options, the package seems to build fine
> without them. Could you have a look?

Yes, Maxim and I, updated these options, to use libgsm in mediastreamer, as a part of linphone packaging. :-)

Btw, currently the gsm package is in unusable state, after the commit "74c7f367daa554cedeb5f02a00d1cd02acf1584b".

Regards,
RG.

[bug#40445] gnu: gsm: Update to 1.0.19.

[Mathieu Othacehe]

> Yes, Maxim and I, updated these options, to use libgsm in mediastreamer, as a part of linphone packaging. :-)

Ok, I see. Maybe it would be preferable to find a way to add "-fPIC" to
CCFLAGS without having to repeat all the other options that are already
present in the Makefile:

--8<---------------cut here---------------start------------->8---
CCFLAGS 	= -c -O2 -DNeedFunctionPrototypes=1 -Wall -Wno-comment
--8<---------------cut here---------------end--------------->8---

Adding a new 'add-fpic-ccflag' phase could be an option?

Thanks,

Mathieu

[bug#40445] gnu: gsm: Update to 1.0.19.

[Raghav Gururajan]

Hi Mathieu!

> Ok, I see. Maybe it would be preferable to find a way to add "-fPIC" to
> CCFLAGS without having to repeat all the other options that are already
> present in the Makefile:
> 
> --8<---------------cut here---------------start------------->8---
> CCFLAGS = -c -O2 -DNeedFunctionPrototypes=1 -Wall -Wno-comment
> --8<---------------cut here---------------end--------------->8---
> 
> Adding a new 'add-fpic-ccflag' phase could be an option?

We can do that too. But this seems simple and less messy :-)

Regards,
RG.

[bug#40445] gnu: gsm: Update to 1.0.19.

[Raghav Gururajan]

Hi Mathieu!

>> Ok, I see. Maybe it would be preferable to find a way to add "-fPIC" to
>> CCFLAGS without having to repeat all the other options that are already
>> present in the Makefile:
>> 
>> --8<---------------cut here---------------start------------->8---
>> CCFLAGS = -c -O2 -DNeedFunctionPrototypes=1 -Wall -Wno-comment
>> --8<---------------cut here---------------end--------------->8---
>> 
>> Adding a new 'add-fpic-ccflag' phase could be an option?
> 
> We can do that too. But this seems simple and less messy :-)

Also, I believe, the make-flag just overwrites that line in the source.

Regards,
RG.

[bug#40445] gnu: gsm: Update to 1.0.19.

[Mathieu Othacehe]

>> We can do that too. But this seems simple and less messy :-)
>
> Also, I believe, the make-flag just overwrites that line in the source.

Yes that's what it does. But if in a future release this package updates
its CCFLAGS list in the Makefile, we will have to update our own package
definition accordingly. That's why adding 'CCFLAGS += -fPIC' somewhere
seems safer to me.

Mathieu

[bug#40445] gnu: gsm: Update to 1.0.19.

[Raghav Gururajan]

> Yes that's what it does. But if in a future release this package updates
> its CCFLAGS list in the Makefile, we will have to update our own package
> definition accordingly. That's why adding 'CCFLAGS += -fPIC' somewhere
> seems safer to me.

Ah, gotcha! Hmm, I don't know how to do that through. I'll have to look into code base for examples.

Regards,
RG.

[bug#40445] gnu: gsm: Update to 1.0.19.

[Raghav Gururajan]

>> Yes that's what it does. But if in a future release this package updates
>> its CCFLAGS list in the Makefile, we will have to update our own package
>> definition accordingly. That's why adding 'CCFLAGS += -fPIC' somewhere
>> seems safer to me.
> 
> Ah, gotcha! Hmm, I don't know how to do that through. I'll have to look into code base for
> examples.

No I also think that its a double-edged sword. 'CCFLAGS += -fPIC' also has to be changed/removed, if new release adds "-fPIC"?

Regards,
RG.

[bug#40445] gnu: gsm: Update to 1.0.19.

[Raghav Gururajan]

>>> Yes that's what it does. But if in a future release this package updates
>>> its CCFLAGS list in the Makefile, we will have to update our own package
>>> definition accordingly. That's why adding 'CCFLAGS += -fPIC' somewhere
>>> seems safer to me.
>> 
>> Ah, gotcha! Hmm, I don't know how to do that through. I'll have to look into code base for
>> examples.
> 
> No I also think that its a double-edged sword. 'CCFLAGS += -fPIC' also has to be changed/removed,
> if new release adds "-fPIC"?

* Now

[bug#40445] gnu: gsm: Update to 1.0.19.

[maxim.cournoyer]

Hello,

"Raghav Gururajan" <raghavgururajan@disroot.org> writes:

> Hi Mathieu!
>
>>> + #:make-flags
>>> + (list
>>> + ;; Added -fPIC with other default options.
>>> + "CCFLAGS=-fPIC -c -O2 -DNeedFunctionPrototypes=1 -Wall -Wno-comment")
>> 
>> I wonder if we need all those options, the package seems to build fine
>> without them. Could you have a look?
>
> Yes, Maxim and I, updated these options, to use libgsm in mediastreamer, as a part of linphone packaging. :-)
>
> Btw, currently the gsm package is in unusable state, after the commit "74c7f367daa554cedeb5f02a00d1cd02acf1584b".
>
> Regards,
> RG.

Ooops.  Sorry about that.  I meant:

-       #:make-flags '("INSTALL_ROOT=%output"
-                      "CCFLAGS=-fPIC \
+       #:make-flags (list (string-append "INSTALL_ROOT=" %output)
+                          "CCFLAGS=-fPIC \

But I'll take into accounts comments from Mathieu, which make sense.

Maxim

bug#40445: gnu: gsm: Update to 1.0.19.

[maxim.cournoyer]

Hi all,

maxim.cournoyer@gmail.com writes:

> Hello,
>
> "Raghav Gururajan" <raghavgururajan@disroot.org> writes:
>
>> Hi Mathieu!
>>
>>>> + #:make-flags
>>>> + (list
>>>> + ;; Added -fPIC with other default options.
>>>> + "CCFLAGS=-fPIC -c -O2 -DNeedFunctionPrototypes=1 -Wall -Wno-comment")
>>> 
>>> I wonder if we need all those options, the package seems to build fine
>>> without them. Could you have a look?
>>
>> Yes, Maxim and I, updated these options, to use libgsm in mediastreamer, as a part of linphone packaging. :-)
>>
>> Btw, currently the gsm package is in unusable state, after the commit "74c7f367daa554cedeb5f02a00d1cd02acf1584b".
>>
>> Regards,
>> RG.
>
> Ooops.  Sorry about that.  I meant:
>
> -       #:make-flags '("INSTALL_ROOT=%output"
> -                      "CCFLAGS=-fPIC \
> +       #:make-flags (list (string-append "INSTALL_ROOT=" %output)
> +                          "CCFLAGS=-fPIC \
>
> But I'll take into accounts comments from Mathieu, which make sense.
>
> Maxim

I've fixed the breakage I caused with commit
5b05f8e9654ea722270c45c0fd0eead369bc0daf, and committed the update to
gsm 1.0.19 from Raghav on top as
5e16e4401f854d39f5fbebaf247750e554bd4a09.

Closing.

Thanks for the ideas!

Maxim