diff options
author | obache <obache> | 2009-02-03 06:09:09 +0000 |
---|---|---|
committer | obache <obache> | 2009-02-03 06:09:09 +0000 |
commit | 0631f46a6e18492538021bc2599b9d6e65808740 (patch) | |
tree | 58f4f1e0f86620483e2fb6558f56b250f554ae63 | |
parent | 7dbe0d719ee80f2fa77bc3c08f1b0f5f7a11567b (diff) | |
download | pkgsrc-0631f46a6e18492538021bc2599b9d6e65808740.tar.gz |
Update gsm to 1.0.12 a.k.a 1.0-pl12.
Bump ABI_DEPENDS because reentrant fix changed struct gsm_state.
(It is defined in gsm/private.h, but used by other packages directly).
Fri Jun 2 06:27:56 2006 Jutta Degener (jutta@pobox.com)
* Release 1.0 Patchlevel 12
src/code.c: removed modifiable static storage that made the library
non-reentrant. (Thanks to Paul Gibbs for pointing out the bug.)
Sat Mar 18 11:48:28 2006 Jutta Degener (jutta@pobox.com)
* Release 1.0 Patchlevel 11
src/gsm_implode.c: fix WAV49 implode
move source archive location
-rw-r--r-- | audio/gsm/Makefile | 11 | ||||
-rw-r--r-- | audio/gsm/buildlink3.mk | 4 | ||||
-rw-r--r-- | audio/gsm/distinfo | 14 | ||||
-rw-r--r-- | audio/gsm/patches/patch-aa | 27 | ||||
-rw-r--r-- | audio/gsm/patches/patch-ab | 46 | ||||
-rw-r--r-- | audio/gsm/patches/patch-ac | 7 |
6 files changed, 41 insertions, 68 deletions
diff --git a/audio/gsm/Makefile b/audio/gsm/Makefile index 2820d1f9c6e..5dc585b5c11 100644 --- a/audio/gsm/Makefile +++ b/audio/gsm/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.31 2008/04/04 15:24:20 joerg Exp $ +# $NetBSD: Makefile,v 1.32 2009/02/03 06:09:09 obache Exp $ # -DISTNAME= gsm-1.0.10 -PKGREVISION= 1 +DISTNAME= gsm-1.0.12 CATEGORIES= audio -MASTER_SITES= ftp://ftp.cs.tu-berlin.de/pub/local/kbs/tubmik/gsm/ +MASTER_SITES= http://user.cs.tu-berlin.de/~jutta/gsm/ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://kbs.cs.tu-berlin.de/~jutta/toast.html @@ -12,12 +11,12 @@ COMMENT= Audio converter and library for converting u-law to gsm encoding PKG_DESTDIR_SUPPORT= user-destdir -WRKSRC= ${WRKDIR}/gsm-1.0-pl10 +WRKSRC= ${WRKDIR}/gsm-1.0-pl12 USE_LIBTOOL= yes NO_CONFIGURE= yes MAKE_ENV+= ROOT=${WRKSRC:Q} -INSTALL_ENV+= INSTALL_ROOT=${DESTDIR:Q}${PREFIX:Q} +INSTALL_ENV+= INSTALL_ROOT=${DESTDIR:Q}${PREFIX:Q} INSTALLATION_DIRS= bin include/gsm lib ${PKGMANDIR}/man1 ${PKGMANDIR}/man3 post-install: diff --git a/audio/gsm/buildlink3.mk b/audio/gsm/buildlink3.mk index 2835bce3c75..5b9617ecf33 100644 --- a/audio/gsm/buildlink3.mk +++ b/audio/gsm/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:10:36 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2009/02/03 06:09:09 obache Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GSM_BUILDLINK3_MK:= ${GSM_BUILDLINK3_MK}+ @@ -13,7 +13,7 @@ BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gsm .if !empty(GSM_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.gsm+= gsm>=1.0.10 -BUILDLINK_ABI_DEPENDS.gsm+= gsm>=1.0.10nb1 +BUILDLINK_ABI_DEPENDS.gsm+= gsm>=1.0.12 BUILDLINK_PKGSRCDIR.gsm?= ../../audio/gsm .endif # GSM_BUILDLINK3_MK diff --git a/audio/gsm/distinfo b/audio/gsm/distinfo index fcb0c9344b4..d128d9f7119 100644 --- a/audio/gsm/distinfo +++ b/audio/gsm/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.7 2008/05/20 19:30:01 tnn Exp $ +$NetBSD: distinfo,v 1.8 2009/02/03 06:09:09 obache Exp $ -SHA1 (gsm-1.0.10.tar.gz) = ee47a81f4137bf3ce933dc610cb2293055ce9c02 -RMD160 (gsm-1.0.10.tar.gz) = 334f93ab232c0b5c1b3090ffa551af0ee0455ed0 -Size (gsm-1.0.10.tar.gz) = 65928 bytes -SHA1 (patch-aa) = 2c36148172e64602903e18d93e685d5bd84db5c8 -SHA1 (patch-ab) = e8825be757d33607d071954a2b88128db3af748b -SHA1 (patch-ac) = 9e4e582cfd4f6892531578d9df25a29485e8cf32 +SHA1 (gsm-1.0.12.tar.gz) = 69c22bdda35871d223affdac09115b6abb0932b1 +RMD160 (gsm-1.0.12.tar.gz) = c780aa1405f5029aaacf96183577c6720691dd31 +Size (gsm-1.0.12.tar.gz) = 62156 bytes +SHA1 (patch-aa) = e50ac3bba1c8a6ccd54d6d035232eca739d3f9fa +SHA1 (patch-ab) = b9af8e40884aeac19e7e5b11df27819408465b65 +SHA1 (patch-ac) = 60d0f6cb6b119fdaf8dd23fbadf7cb6a64c95a4e diff --git a/audio/gsm/patches/patch-aa b/audio/gsm/patches/patch-aa index ba4e272ba41..7684c512703 100644 --- a/audio/gsm/patches/patch-aa +++ b/audio/gsm/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.3 2005/10/29 16:20:26 tv Exp $ +$NetBSD: patch-aa,v 1.4 2009/02/03 06:09:09 obache Exp $ ---- inc/config.h.orig 1996-07-02 10:32:27.000000000 -0400 +--- inc/config.h.orig 2006-04-26 19:14:26.000000000 +0000 +++ inc/config.h -@@ -10,12 +10,15 @@ +@@ -10,7 +10,10 @@ #define CONFIG_H /*efine SIGHANDLER_T int /* signal handlers are void */ @@ -13,34 +13,23 @@ $NetBSD: patch-aa,v 1.3 2005/10/29 16:20:26 tv Exp $ +#endif #define HAS_STDLIB_H 1 /* /usr/include/stdlib.h */ --/*efine HAS_LIMITS_H 1 /* /usr/include/limits.h */ -+#define HAS_LIMITS_H 1 /* /usr/include/limits.h */ - #define HAS_FCNTL_H 1 /* /usr/include/fcntl.h */ --/*efine HAS_ERRNO_DECL 1 /* errno.h declares errno */ -+#define HAS_ERRNO_DECL 1 /* errno.h declares errno */ - - #define HAS_FSTAT 1 /* fstat syscall */ - #define HAS_FCHMOD 1 /* fchmod syscall */ -@@ -28,10 +31,19 @@ + #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 */ --#define HAS_UTIME 1 /* POSIX utime(path, times) */ --/*efine HAS_UTIMES 1 /* use utimes() syscall instead */ + +#if defined(__INTERIX) -+#define HAS_UTIME 1 /* POSIX utime(path, times) */ + #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 */ --/*efine HAS_UTIMBUF 1 /* struct utimbuf */ + +#if defined(__INTERIX) -+#define HAS_UTIMBUF 1 /* struct utimbuf */ + #define HAS_UTIMBUF 1 /* struct utimbuf */ +#endif -+ /*efine HAS_UTIMEUSEC 1 /* microseconds in utimbuf? */ #endif /* CONFIG_H */ diff --git a/audio/gsm/patches/patch-ab b/audio/gsm/patches/patch-ab index 40eb2fa7362..df4dce7dc75 100644 --- a/audio/gsm/patches/patch-ab +++ b/audio/gsm/patches/patch-ab @@ -1,24 +1,8 @@ -$NetBSD: patch-ab,v 1.9 2008/05/20 19:30:01 tnn Exp $ +$NetBSD: patch-ab,v 1.10 2009/02/03 06:09:09 obache Exp $ ---- Makefile.orig 1996-07-02 16:36:06.000000000 +0200 +--- Makefile.orig 2006-04-26 19:14:26.000000000 +0000 +++ Makefile -@@ -7,11 +7,13 @@ - SASR = -DSASR - ######### Define SASR if >> is a signed arithmetic shift (-1 >> 1 == -1) - --MULHACK = -DUSE_FLOAT_MUL -+#MULHACK = -DUSE_FLOAT_MUL -+MULHACK = - ######### Define this if your host multiplies floats faster than integers, - ######### e.g. on a SPARCstation. - --FAST = -DFAST -+#FAST = -DFAST -+FAST = - ######### Define together with USE_FLOAT_MUL to enable the GSM library's - ######### approximation option for incorrect, but good-enough results. - -@@ -43,7 +45,7 @@ WAV49 = +@@ -43,7 +43,7 @@ WAV49 = -DWAV49 # CC = /usr/lang/acc # CCFLAGS = -c -O @@ -27,7 +11,7 @@ $NetBSD: patch-ab,v 1.9 2008/05/20 19:30:01 tnn Exp $ CCFLAGS = -c -O2 -DNeedFunctionPrototypes=1 LD = $(CC) -@@ -71,7 +73,7 @@ LD = $(CC) +@@ -71,7 +71,7 @@ LD = $(CC) # Leave INSTALL_ROOT empty (or just don't execute "make install") to # not install gsm and toast outside of this directory. @@ -36,7 +20,7 @@ $NetBSD: patch-ab,v 1.9 2008/05/20 19:30:01 tnn Exp $ # Where do you want to install the gsm library, header file, and manpages? # -@@ -80,8 +82,8 @@ INSTALL_ROOT = +@@ -80,8 +80,8 @@ INSTALL_ROOT = GSM_INSTALL_ROOT = $(INSTALL_ROOT) GSM_INSTALL_LIB = $(GSM_INSTALL_ROOT)/lib @@ -47,7 +31,7 @@ $NetBSD: patch-ab,v 1.9 2008/05/20 19:30:01 tnn Exp $ # Where do you want to install the toast binaries and their manpage? -@@ -91,13 +93,14 @@ GSM_INSTALL_MAN = $(GSM_INSTALL_ROOT)/ma +@@ -91,13 +91,14 @@ GSM_INSTALL_MAN = $(GSM_INSTALL_ROOT)/ma TOAST_INSTALL_ROOT = $(INSTALL_ROOT) TOAST_INSTALL_BIN = $(TOAST_INSTALL_ROOT)/bin @@ -64,7 +48,7 @@ $NetBSD: patch-ab,v 1.9 2008/05/20 19:30:01 tnn Exp $ AR = ar ARFLAGS = cr RMFLAGS = -@@ -114,7 +117,7 @@ RANLIB = ranlib +@@ -114,7 +115,7 @@ RANLIB = ranlib # Local Directories @@ -73,7 +57,7 @@ $NetBSD: patch-ab,v 1.9 2008/05/20 19:30:01 tnn Exp $ ADDTST = $(ROOT)/add-test TST = $(ROOT)/tst MAN = $(ROOT)/man -@@ -129,7 +132,7 @@ INC = $(ROOT)/inc +@@ -129,7 +130,7 @@ INC = $(ROOT)/inc # DEBUG = -DNDEBUG ######### Remove -DNDEBUG to enable assertions. @@ -82,7 +66,7 @@ $NetBSD: patch-ab,v 1.9 2008/05/20 19:30:01 tnn Exp $ $(WAV49) $(CCINC) -I$(INC) ######### It's $(CC) $(CFLAGS) -@@ -139,7 +142,7 @@ LFLAGS = $(LDFLAGS) $(LDINC) +@@ -139,7 +140,7 @@ LFLAGS = $(LDFLAGS) $(LDINC) # Targets @@ -91,7 +75,7 @@ $NetBSD: patch-ab,v 1.9 2008/05/20 19:30:01 tnn Exp $ TOAST = $(BIN)/toast UNTOAST = $(BIN)/untoast -@@ -257,7 +260,7 @@ STUFF = ChangeLog \ +@@ -257,7 +258,7 @@ STUFF = ChangeLog \ # Install targets GSM_INSTALL_TARGETS = \ @@ -100,7 +84,7 @@ $NetBSD: patch-ab,v 1.9 2008/05/20 19:30:01 tnn Exp $ $(GSM_INSTALL_INC)/gsm.h \ $(GSM_INSTALL_MAN)/gsm.3 \ $(GSM_INSTALL_MAN)/gsm_explode.3 \ -@@ -273,10 +276,15 @@ TOAST_INSTALL_TARGETS = \ +@@ -273,10 +274,15 @@ TOAST_INSTALL_TARGETS = \ # Default rules @@ -116,7 +100,7 @@ $NetBSD: patch-ab,v 1.9 2008/05/20 19:30:01 tnn Exp $ # Target rules all: $(LIBGSM) $(TOAST) $(TCAT) $(UNTOAST) -@@ -299,16 +307,20 @@ install: toastinstall gsminstall +@@ -299,16 +305,20 @@ install: toastinstall gsminstall # The basic API: libgsm @@ -128,7 +112,7 @@ $NetBSD: patch-ab,v 1.9 2008/05/20 19:30:01 tnn Exp $ + cd $(LIB) && \ + $(LIBTOOL) --mode=link $(CC) -o `$(BASENAME) $@` \ + $(GSM_OBJECTS:.o=.lo) \ -+ -rpath $(PREFIX)/lib -version-info 1:10 ++ -rpath $(PREFIX)/lib -version-info 1:12 # Toast, Untoast and Tcat -- the compress-like frontends to gsm. @@ -141,7 +125,7 @@ $NetBSD: patch-ab,v 1.9 2008/05/20 19:30:01 tnn Exp $ $(UNTOAST): $(BIN) $(TOAST) -rm $(RMFLAGS) $(UNTOAST) -@@ -332,12 +344,12 @@ $(LIB): +@@ -332,12 +342,12 @@ $(LIB): gsminstall: -if [ x"$(GSM_INSTALL_ROOT)" != x ] ; then \ @@ -156,7 +140,7 @@ $NetBSD: patch-ab,v 1.9 2008/05/20 19:30:01 tnn Exp $ fi gsmuninstall: -@@ -351,52 +363,34 @@ toastuninstall: +@@ -351,52 +361,34 @@ toastuninstall: fi $(TOAST_INSTALL_BIN)/toast: $(TOAST) diff --git a/audio/gsm/patches/patch-ac b/audio/gsm/patches/patch-ac index 02c66f4b82c..900cf1b4f33 100644 --- a/audio/gsm/patches/patch-ac +++ b/audio/gsm/patches/patch-ac @@ -1,6 +1,7 @@ -$NetBSD: patch-ac,v 1.1 1998/12/31 05:51:01 garbled Exp $ ---- src/code.c.orig Mon Dec 28 11:04:16 1998 -+++ src/code.c Mon Dec 28 11:04:46 1998 +$NetBSD: patch-ac,v 1.2 2009/02/03 06:09:09 obache Exp $ + +--- src/code.c.orig 2006-04-26 19:16:50.000000000 +0000 ++++ src/code.c @@ -11,6 +11,7 @@ #ifdef HAS_STDLIB_H |