Hi Stuart,
On Sep 13 09:39:07, s...@spacehopper.org wrote:
> .orig isn't really a problem for ports, you can just set PATCH_ORIG if it's
> getting in the way. I didn't bother before with this before because it's
> only one file and they don't usually last more than a release or two
> upstream.
>
> With the COMMENT change, please also change PKG/DESCR to match, and since
> we're touching the line anyway, also fix capitalisation of GSM.
thanks for reviewing - tweaked diff below,
Jan
> On 13 September 2016 07:07:49 Jan Stary <h...@stare.cz> wrote:
>
> >The diff below updates audio/gsm to 1.0.15,
> >promptly released last night.
> >
> >There is no change to the gsm code itself,
> >just a stale *.orig file was removed from the tarball.
> >That's a minor change, but imho important enough
> >- having a missplaced *.orig in the source
> >confuses 'make update-patches'.
> >
> >While there, tweak the COMMENT - it's not "u-law to gsm",
> >toast(1) converts linear PCM.
> >
> >The yesterday patch to pledge gsm is orthogonal to this
> >and can be applied after this, saving a REVISION bump.
> >
> > Jan
> >
> >>> > Thanks for letting me know, I had no idea (neither about
> >>> > the file's existence nor of .orig's significance in OpenBSD)!
> >>> > Looks like that .orig file just got included by accident.
> >>> > I've removed the file and cut a new patchlevel without it.
> >>>
> >>> > > Dear authors of GSM,
> >>> > >
> >>> > > it seems that gsm-1.0.14.tar.gz contains
> >>> > > an erronerous inc/gsm.h.orig - I suppose
> >>> > > that it's a relict of patching the source
> >>> > > at some point, but the *.orig should probably
> >>> > > not be part of the tarball.
> >>> > >
> >>> > > This confuses e.g. the OpenBSD ports system
> >>> > > where having an *.orig in the extractedd source
> >>> > > means the port maintainer has patched the file.
Index: Makefile
===================================================================
RCS file: /cvs/ports/audio/gsm/Makefile,v
retrieving revision 1.44
diff -u -p -r1.44 Makefile
--- Makefile 10 Mar 2016 23:05:53 -0000 1.44
+++ Makefile 13 Sep 2016 11:14:08 -0000
@@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.44 2016/03/10 23:05:53 naddy Exp $
-COMMENT= u-law to gsm encoding audio converter and library
+COMMENT= GSM audio codec library and converter
-DISTNAME= gsm-1.0.14
-WRKDIST= ${WRKDIR}/gsm-1.0-pl14
+DISTNAME= gsm-1.0.15
+WRKDIST= ${WRKDIR}/gsm-1.0-pl15
SHARED_LIBS= gsm 1.0
Index: distinfo
===================================================================
RCS file: /cvs/ports/audio/gsm/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo 16 Mar 2015 09:43:29 -0000 1.6
+++ distinfo 13 Sep 2016 11:14:08 -0000
@@ -1,2 +1,2 @@
-SHA256 (gsm-1.0.14.tar.gz) = WBShajCzwCaHGzc5gS3EoqhCmTMRgsmH2hwhLJPpNSw=
-SIZE (gsm-1.0.14.tar.gz) = 62372
+SHA256 (gsm-1.0.15.tar.gz) = 5foXEFeJR/kulI6DEww8gnGcOAozQJm3NNBdNOdlXy8=
+SIZE (gsm-1.0.15.tar.gz) = 64902
Index: pkg/DESCR
===================================================================
RCS file: /cvs/ports/audio/gsm/pkg/DESCR,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 DESCR
--- pkg/DESCR 5 Dec 1997 02:07:59 -0000 1.1.1.1
+++ pkg/DESCR 13 Sep 2016 11:14:08 -0000
@@ -1,2 +1,2 @@
-gsm is a conversion package and library for converting u-law audio to
-gsm encoding (which is much more efficient) and back again.
+gsm is a conversion package and library for converting audio
+to GSM encoding (which is much more efficient) and back again.
