pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/audio/gsm gsm: updated to 1.0.18



details:   https://anonhg.NetBSD.org/pkgsrc/rev/394bb07a4421
branches:  trunk
changeset: 335206:394bb07a4421
user:      adam <adam%pkgsrc.org@localhost>
date:      Sat Jun 15 08:41:30 2019 +0000

description:
gsm: updated to 1.0.18

1.0.18:
Remove the MacOS "quarantine" files that I didn't know I'd shipped.
Remove some trailing spaces.
Bump up the patchlevel in inc/gsm.h (I'd forgotten that in release 17.)

1.0.17:
New email addresses in the README.
Avoid left-shifting signed integers.
Don't print longwords using %d or %ld, cast them to (long) first.
Don't compare longwords as longs in addtest, we only care for the
        lower 32 bits. (The math works, but the test failed.)

1.0.16:
New email addresses in the manual pages (patch 16)
Removed a stray .orig file (in patch 15)

diffstat:

 audio/gsm/Makefile                   |   17 +-
 audio/gsm/distinfo                   |   15 +-
 audio/gsm/patches/patch-Makefile     |  207 +++++++++++++++++++++++++++++++++++
 audio/gsm/patches/patch-aa           |   35 -----
 audio/gsm/patches/patch-ab           |  207 -----------------------------------
 audio/gsm/patches/patch-ac           |   12 --
 audio/gsm/patches/patch-inc_config.h |   37 ++++++
 7 files changed, 259 insertions(+), 271 deletions(-)

diffs (truncated from 571 to 300 lines):

diff -r fffb309c8ac9 -r 394bb07a4421 audio/gsm/Makefile
--- a/audio/gsm/Makefile        Sat Jun 15 08:21:32 2019 +0000
+++ b/audio/gsm/Makefile        Sat Jun 15 08:41:30 2019 +0000
@@ -1,21 +1,20 @@
-# $NetBSD: Makefile,v 1.35 2017/08/16 20:45:31 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.36 2019/06/15 08:41:30 adam Exp $
 
-DISTNAME=      gsm-1.0.13
+DISTNAME=      gsm-1.0.18
 CATEGORIES=    audio
-MASTER_SITES=  http://user.cs.tu-berlin.de/~jutta/gsm/
+MASTER_SITES=  http://www.quut.com/gsm/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-#HOMEPAGE=     http://kbs.cs.tu-berlin.de/~jutta/toast.html
+HOMEPAGE=      http://www.quut.com/gsm/
 COMMENT=       Audio converter and library for converting u-law to gsm encoding
 LICENSE=       mit
 
-WRKSRC=                ${WRKDIR}/gsm-1.0-pl13
+WRKSRC=                ${WRKDIR}/gsm-1.0-pl18
 USE_LIBTOOL=   yes
+NO_CONFIGURE=  yes
+MAKE_ENV+=     ROOT=${WRKSRC}
+INSTALL_ENV+=  INSTALL_ROOT=${DESTDIR}${PREFIX}
 
-NO_CONFIGURE=  yes
-MAKE_ENV+=     ROOT=${WRKSRC:Q}
-INSTALL_ENV+=  INSTALL_ROOT=${DESTDIR:Q}${PREFIX:Q}
 INSTALLATION_DIRS=     bin include/gsm lib ${PKGMANDIR}/man1 ${PKGMANDIR}/man3
 
 post-install:
diff -r fffb309c8ac9 -r 394bb07a4421 audio/gsm/distinfo
--- a/audio/gsm/distinfo        Sat Jun 15 08:21:32 2019 +0000
+++ b/audio/gsm/distinfo        Sat Jun 15 08:41:30 2019 +0000
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.11 2018/01/17 12:03:01 wiz Exp $
+$NetBSD: distinfo,v 1.12 2019/06/15 08:41:30 adam Exp $
 
-SHA1 (gsm-1.0.13.tar.gz) = 668b0a180039a50d379b3d5a22e78da4b1d90afc
-RMD160 (gsm-1.0.13.tar.gz) = e44f70d481328038b3b16a25cc99b7855113db61
-SHA512 (gsm-1.0.13.tar.gz) = 0d0cf9e1e81e64cd84f588c1e4f0cb74b849d45e41fdebf860f63588084c73c7c5198bfe73a6c976bda5735ee516661d3db00afbb5cc5886a7ee3a7b31d673aa
-Size (gsm-1.0.13.tar.gz) = 65318 bytes
-SHA1 (patch-aa) = e50ac3bba1c8a6ccd54d6d035232eca739d3f9fa
-SHA1 (patch-ab) = 453b639aa7dc8196a16a750453c9d1cfd7b652a8
-SHA1 (patch-ac) = 60d0f6cb6b119fdaf8dd23fbadf7cb6a64c95a4e
+SHA1 (gsm-1.0.18.tar.gz) = d36580154ea21c1baa6772193365f31d496624b6
+RMD160 (gsm-1.0.18.tar.gz) = e268a667257aa42d5ddbb76c9a8b519f0a7cdb2d
+SHA512 (gsm-1.0.18.tar.gz) = c5b597f68d4a270e1d588f480dcde66fda8302564c687d753f2bd4fc41d246109243e567568da61eddce170f5232d869984743ddf1eea7696d673014a1a453b7
+Size (gsm-1.0.18.tar.gz) = 64549 bytes
+SHA1 (patch-Makefile) = 4e989df8ea5b9eded47fb8a6cd2f8bb4a1dca30f
+SHA1 (patch-inc_config.h) = b70b380be682bd8a1c8f5e98177776572cacf186
diff -r fffb309c8ac9 -r 394bb07a4421 audio/gsm/patches/patch-Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/gsm/patches/patch-Makefile  Sat Jun 15 08:41:30 2019 +0000
@@ -0,0 +1,207 @@
+$NetBSD: patch-Makefile,v 1.1 2019/06/15 08:41:30 adam Exp $
+
+Do not overwrite compiler flags.
+Use proper installation tools and paths.
+
+--- Makefile.orig      2018-05-06 02:07:28.000000000 +0000
++++ Makefile
+@@ -43,7 +43,6 @@ WAV49        = -DWAV49
+ # CC          = /usr/lang/acc
+ # CCFLAGS     = -c -O
+ 
+-CC            = gcc -ansi -pedantic
+ CCFLAGS       = -c -O2 -DNeedFunctionPrototypes=1 -Wall -Wno-comment
+ 
+ LD            = $(CC)
+@@ -71,7 +70,6 @@ LD           = $(CC)
+ # Leave INSTALL_ROOT empty (or just don't execute "make install") to
+ # not install gsm and toast outside of this directory.
+ 
+-INSTALL_ROOT  =
+ 
+ # Where do you want to install the gsm library, header file, and manpages?
+ #
+@@ -80,8 +78,8 @@ INSTALL_ROOT =
+ 
+ GSM_INSTALL_ROOT = $(INSTALL_ROOT)
+ GSM_INSTALL_LIB = $(GSM_INSTALL_ROOT)/lib
+-GSM_INSTALL_INC = $(GSM_INSTALL_ROOT)/inc
+-GSM_INSTALL_MAN = $(GSM_INSTALL_ROOT)/man/man3
++GSM_INSTALL_INC = $(GSM_INSTALL_ROOT)/include
++GSM_INSTALL_MAN = $(GSM_INSTALL_ROOT)/${PKGMANDIR}/man3
+ 
+ 
+ # Where do you want to install the toast binaries and their manpage?
+@@ -91,13 +89,14 @@ GSM_INSTALL_MAN = $(GSM_INSTALL_ROOT)/ma
+ 
+ TOAST_INSTALL_ROOT      = $(INSTALL_ROOT)
+ TOAST_INSTALL_BIN = $(TOAST_INSTALL_ROOT)/bin
+-TOAST_INSTALL_MAN = $(TOAST_INSTALL_ROOT)/man/man1
++TOAST_INSTALL_MAN = $(TOAST_INSTALL_ROOT)/${PKGMANDIR}/man1
+ 
+ #  Other tools
+ 
+ SHELL         = /bin/sh
+-LN            = ln
++LN            = ln -s
+ BASENAME      = basename
++DIRNAME               = dirname
+ AR            = ar
+ ARFLAGS               = cr
+ RMFLAGS               =
+@@ -114,7 +113,6 @@ RANLIB             = ranlib
+ 
+ # Local Directories
+ 
+-ROOT  = .
+ ADDTST        = $(ROOT)/add-test
+ TST   = $(ROOT)/tst
+ MAN   = $(ROOT)/man
+@@ -129,7 +127,7 @@ INC        = $(ROOT)/inc
+ # DEBUG       = -DNDEBUG
+ ######### Remove -DNDEBUG to enable assertions.
+ 
+-CFLAGS        = $(CCFLAGS) $(SASR) $(DEBUG) $(MULHACK) $(FAST) $(LTP_CUT) \
++CFLAGS        += $(CCFLAGS) $(SASR) $(DEBUG) $(MULHACK) $(FAST) $(LTP_CUT) \
+       $(WAV49) $(CCINC) -I$(INC)
+ ######### It's $(CC) $(CFLAGS)
+ 
+@@ -139,7 +137,7 @@ LFLAGS     = $(LDFLAGS) $(LDINC)
+ 
+ # Targets
+ 
+-LIBGSM        = $(LIB)/libgsm.a
++LIBGSM        = $(LIB)/libgsm.la
+ 
+ TOAST = $(BIN)/toast
+ UNTOAST       = $(BIN)/untoast
+@@ -257,7 +255,7 @@ STUFF =    ChangeLog                       \
+ # Install targets
+ 
+ GSM_INSTALL_TARGETS = \
+-              $(GSM_INSTALL_LIB)/libgsm.a             \
++              $(GSM_INSTALL_LIB)/libgsm.la            \
+               $(GSM_INSTALL_INC)/gsm.h                \
+               $(GSM_INSTALL_MAN)/gsm.3                \
+               $(GSM_INSTALL_MAN)/gsm_explode.3        \
+@@ -273,10 +271,15 @@ TOAST_INSTALL_TARGETS =  \
+ 
+ # Default rules
+ 
++.SUFFIXES:    .o .lo
++
+ .c.o:
+               $(CC) $(CFLAGS) $?
+               @-mv `$(BASENAME) $@` $@ > /dev/null 2>&1
+ 
++.c.lo:
++              cd `${DIRNAME} $@` && ${LIBTOOL} --mode=compile ${CC} ${CFLAGS} $?
++
+ # Target rules
+ 
+ all:          $(LIBGSM) $(TOAST) $(TCAT) $(UNTOAST)
+@@ -299,16 +302,20 @@ install: toastinstall gsminstall
+ 
+ # The basic API: libgsm
+ 
+-$(LIBGSM):    $(LIB) $(GSM_OBJECTS)
++$(LIBGSM):    $(LIB) $(GSM_OBJECTS:.o=.lo)
+               -rm $(RMFLAGS) $(LIBGSM)
+-              $(AR) $(ARFLAGS) $(LIBGSM) $(GSM_OBJECTS)
+-              $(RANLIB) $(LIBGSM)
++              cd $(LIB) && \
++                      $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o `$(BASENAME) $@` \
++                              $(GSM_OBJECTS:.o=.lo) \
++                              -rpath $(PREFIX)/lib -version-info 1:12
+ 
+ 
+ # Toast, Untoast and Tcat -- the compress-like frontends to gsm.
+ 
+ $(TOAST):     $(BIN) $(TOAST_OBJECTS) $(LIBGSM)
+-              $(LD) $(LFLAGS) -o $(TOAST) $(TOAST_OBJECTS) $(LIBGSM) $(LDLIB)
++              cd $(BIN) && \
++                      $(LIBTOOL) --mode=link $(LD) $(LFLAGS) -o `$(BASENAME) $@` \
++                              $(TOAST_OBJECTS) $(LIBGSM) $(LDLIB)
+ 
+ $(UNTOAST):   $(BIN) $(TOAST)
+               -rm $(RMFLAGS) $(UNTOAST)
+@@ -332,12 +339,12 @@ $(LIB):
+ 
+ gsminstall:
+               -if [ x"$(GSM_INSTALL_ROOT)" != x ] ; then      \
+-                      make $(GSM_INSTALL_TARGETS) ;   \
++                      $(MAKE) $(GSM_INSTALL_TARGETS) ;        \
+               fi
+ 
+ toastinstall:
+               -if [ x"$(TOAST_INSTALL_ROOT)" != x ]; then     \
+-                      make $(TOAST_INSTALL_TARGETS);  \
++                      $(MAKE) $(TOAST_INSTALL_TARGETS);       \
+               fi
+ 
+ gsmuninstall:
+@@ -351,52 +358,34 @@ toastuninstall:
+               fi
+ 
+ $(TOAST_INSTALL_BIN)/toast:   $(TOAST)
+-              -rm $@
+-              cp $(TOAST) $@
+-              chmod 755 $@
++              ${LIBTOOL} --mode=install ${BSD_INSTALL_PROGRAM} $? $(TOAST_INSTALL_BIN)
+ 
+ $(TOAST_INSTALL_BIN)/untoast: $(TOAST_INSTALL_BIN)/toast
+-              -rm $@
+-              ln $? $@
++              ${LN} -f toast $@
+ 
+ $(TOAST_INSTALL_BIN)/tcat:    $(TOAST_INSTALL_BIN)/toast
+-              -rm $@
+-              ln $? $@
++              ${LN} -f toast $@
+ 
+ $(TOAST_INSTALL_MAN)/toast.1: $(MAN)/toast.1
+-              -rm $@
+-              cp $? $@
+-              chmod 444 $@
++              ${BSD_INSTALL_MAN} $? $(TOAST_INSTALL_MAN)
+ 
+ $(GSM_INSTALL_MAN)/gsm.3:     $(MAN)/gsm.3
+-              -rm $@
+-              cp $? $@
+-              chmod 444 $@
++              ${BSD_INSTALL_MAN} $? $(GSM_INSTALL_MAN)
+ 
+ $(GSM_INSTALL_MAN)/gsm_option.3:      $(MAN)/gsm_option.3
+-              -rm $@
+-              cp $? $@
+-              chmod 444 $@
++              ${BSD_INSTALL_MAN} $? $(GSM_INSTALL_MAN)
+ 
+ $(GSM_INSTALL_MAN)/gsm_explode.3:     $(MAN)/gsm_explode.3
+-              -rm $@
+-              cp $? $@
+-              chmod 444 $@
++              ${BSD_INSTALL_MAN} $? $(GSM_INSTALL_MAN)
+ 
+ $(GSM_INSTALL_MAN)/gsm_print.3:       $(MAN)/gsm_print.3
+-              -rm $@
+-              cp $? $@
+-              chmod 444 $@
++              ${BSD_INSTALL_MAN} $? $(GSM_INSTALL_MAN)
+ 
+ $(GSM_INSTALL_INC)/gsm.h:     $(INC)/gsm.h
+-              -rm $@
+-              cp $? $@
+-              chmod 444 $@
+-
+-$(GSM_INSTALL_LIB)/libgsm.a:  $(LIBGSM)
+-              -rm $@
+-              cp $? $@
+-              chmod 444 $@
++              ${BSD_INSTALL_DATA} $? $(GSM_INSTALL_INC)
++
++$(GSM_INSTALL_LIB)/libgsm.la: $(LIBGSM)
++              ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} $? $(GSM_INSTALL_LIB)
+ 
+ 
+ # Distribution
diff -r fffb309c8ac9 -r 394bb07a4421 audio/gsm/patches/patch-aa
--- a/audio/gsm/patches/patch-aa        Sat Jun 15 08:21:32 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2009/02/03 06:09:09 obache Exp $
-
---- inc/config.h.orig  2006-04-26 19:14:26.000000000 +0000
-+++ inc/config.h
-@@ -10,7 +10,10 @@
- #define       CONFIG_H
- 
- /*efine       SIGHANDLER_T    int             /* signal handlers are void     */
--/*efine HAS_SYSV_SIGNAL       1               /* sigs not blocked/reset?      */
-+
-+#if defined(__INTERIX)
-+#define HAS_SYSV_SIGNAL       1               /* sigs not blocked/reset?      */
-+#endif
- 
- #define       HAS_STDLIB_H    1               /* /usr/include/stdlib.h        */
- #define       HAS_LIMITS_H    1               /* /usr/include/limits.h        */
-@@ -28,10 +31,17 @@
- /*efine       HAS_STRINGS_H   1               /* /usr/include/strings.h       */
- 
- #define       HAS_UNISTD_H    1               /* /usr/include/unistd.h        */
-+
-+#if defined(__INTERIX)
- #define       HAS_UTIME       1               /* POSIX utime(path, times)     */
--/*efine       HAS_UTIMES      1               /* use utimes() syscall instead */
-+#else
-+#define       HAS_UTIMES      1               /* use utimes() syscall instead */
-+#endif
- #define       HAS_UTIME_H     1               /* UTIME header file            */
-+
-+#if defined(__INTERIX)
- #define       HAS_UTIMBUF     1               /* struct utimbuf               */
-+#endif



Home | Main Index | Thread Index | Old Index