pool/libgsm
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 678435 from home:iznogood:branches:multimedia:libs

Browse Source 
- Update to version 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.)
- Changes from version 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).
- Changes from version 1.0.16
  * New email addresses in the manual pages (patch 16).
  * Removed a stray .orig file (in patch 15).
- Rebase libgsm-1.0.13.patch.
- Drop libgsm-strict-aliasing.patch: Applied upstream.
- Drop ancient Obsoletes/Provides.

OBS-URL: https://build.opensuse.org/request/show/678435
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libgsm?expand=0&rev=21
This commit is contained in:
Tomáš Chvátal 2019-02-24 18:27:14 +00:00 committed by Git OBS Bridge
parent e6f1b689fd
commit d9cdbdec52
6 changed files with 47 additions and 206 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gsm-1.0.14.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5814a16a30b3c026871b3739812dc4a2a84299331182c987da1c212c93e9352c
size 62372

3
gsm-1.0.18.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:04f68087c3348bf156b78d59f4d8aff545da7f6e14f33be8f47d33f4efae2a10
size 64549

194
libgsm-1.0.13.patch
View File

@ -1,6 +1,9 @@
--- gsm-1.0-pl12/Makefile From: <jochen@scram.de>
+++ gsm-1.0-pl12/Makefile Subject: New patch generated from libgsm 1.0.10-14 diff.gz
@@ -96,7 +96,7 @@
--- a/Makefile
+++ b/Makefile
@@ -96,7 +96,7 @@ TOAST_INSTALL_MAN = $(TOAST_INSTALL_ROOT
# Other tools # Other tools
SHELL = /bin/sh SHELL = /bin/sh
@ -9,7 +12,7 @@
BASENAME = basename BASENAME = basename
AR = ar AR = ar
ARFLAGS = cr ARFLAGS = cr
@@ -140,6 +140,7 @@ @@ -140,6 +140,7 @@ LFLAGS = $(LDFLAGS) $(LDINC)
# Targets # Targets
LIBGSM = $(LIB)/libgsm.a LIBGSM = $(LIB)/libgsm.a
@ -17,7 +20,7 @@
TOAST = $(BIN)/toast TOAST = $(BIN)/toast
UNTOAST = $(BIN)/untoast UNTOAST = $(BIN)/untoast
@@ -279,7 +280,7 @@ @@ -279,7 +280,7 @@ TOAST_INSTALL_TARGETS = \
# Target rules # Target rules
@ -26,19 +29,19 @@
@-echo $(ROOT): Done. @-echo $(ROOT): Done.
tst: $(TST)/lin2cod $(TST)/cod2lin $(TOAST) $(TST)/test-result tst: $(TST)/lin2cod $(TST)/cod2lin $(TOAST) $(TST)/test-result
@@ -299,6 +300,11 @@ @@ -299,6 +300,11 @@ install: toastinstall gsminstall
# The basic API: libgsm # The basic API: libgsm
+$(LIBGSMSO): $(LIB) $(GSM_OBJECTS) +$(LIBGSMSO): $(LIB) $(GSM_OBJECTS)
+ $(LD) -o $@.1.0.13 -shared -Xlinker -soname -Xlinker libgsm.so.1 $(GSM_OBJECTS) -lc + $(LD) $(LDFLAGS) -o $@.1.0.18 -shared -Xlinker -soname -Xlinker libgsm.so.1 $(GSM_OBJECTS) -lc
+ ln -fs libgsm.so.1.0.13 lib/libgsm.so.1 + ln -fs libgsm.so.1.0.18 lib/libgsm.so.1
+ ln -fs libgsm.so.1.0.13 lib/libgsm.so + ln -fs libgsm.so.1.0.18 lib/libgsm.so
+ +
$(LIBGSM): $(LIB) $(GSM_OBJECTS) $(LIBGSM): $(LIB) $(GSM_OBJECTS)
-rm $(RMFLAGS) $(LIBGSM) -rm $(RMFLAGS) $(LIBGSM)
$(AR) $(ARFLAGS) $(LIBGSM) $(GSM_OBJECTS) $(AR) $(ARFLAGS) $(LIBGSM) $(GSM_OBJECTS)
@@ -308,15 +314,15 @@ @@ -308,15 +314,15 @@ $(LIBGSM): $(LIB) $(GSM_OBJECTS)
# Toast, Untoast and Tcat -- the compress-like frontends to gsm. # Toast, Untoast and Tcat -- the compress-like frontends to gsm.
$(TOAST): $(BIN) $(TOAST_OBJECTS) $(LIBGSM) $(TOAST): $(BIN) $(TOAST_OBJECTS) $(LIBGSM)
@ -57,181 +60,14 @@
# The local bin and lib directories # The local bin and lib directories
@@ -426,7 +432,9 @@ @@ -426,7 +432,9 @@ semi-clean:
clean: semi-clean clean: semi-clean
-rm $(RMFLAGS) $(LIBGSM) $(ADDTST)/add \ -rm $(RMFLAGS) $(LIBGSM) $(ADDTST)/add \
- $(TOAST) $(TCAT) $(UNTOAST) \ - $(TOAST) $(TCAT) $(UNTOAST) \
+ $(LIBGSMSO) $(LIB)/libgsm.so.1.0.13 \ + $(LIBGSMSO) $(LIB)/libgsm.so.1.0.18 \
+ $(LIB)libgsm.so.1 \ + $(LIB)libgsm.so.1 \
+ $(TOAST) $(TCAT) $(UNTOAST) \ + $(TOAST) $(TCAT) $(UNTOAST) \
$(ROOT)/gsm-1.0.tar.Z $(ROOT)/gsm-1.0.tar.Z
--- gsm-1.0-pl12/inc/config.h
+++ gsm-1.0-pl12/inc/config.h
@@ -13,6 +13,7 @@
/*efine HAS_SYSV_SIGNAL 1 /* sigs not blocked/reset? */
#define HAS_STDLIB_H 1 /* /usr/include/stdlib.h */
+#define HAS_STDIO_H 1 /* /usr/include/stdio.h */
#define HAS_LIMITS_H 1 /* /usr/include/limits.h */
#define HAS_FCNTL_H 1 /* /usr/include/fcntl.h */
#define HAS_ERRNO_DECL 1 /* errno.h declares errno */
@@ -25,7 +26,7 @@
/*efine HAS__FSETMODE 1 /* _fsetmode -- set file mode */
#define HAS_STRING_H 1 /* /usr/include/string.h */
-/*efine HAS_STRINGS_H 1 /* /usr/include/strings.h */
+#define 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) */
--- gsm-1.0-pl12/inc/gsm.h
+++ gsm-1.0-pl12/inc/gsm.h
@@ -54,6 +54,10 @@
#define GSM_OPT_FRAME_INDEX 5
#define GSM_OPT_FRAME_CHAIN 6
+#ifdef __cplusplus
+extern "C" {
+#endif
+
extern gsm gsm_create GSM_P((void));
extern void gsm_destroy GSM_P((gsm));
@@ -66,6 +70,10 @@
extern int gsm_explode GSM_P((gsm, gsm_byte *, gsm_signal *));
extern void gsm_implode GSM_P((gsm, gsm_signal *, gsm_byte *));
+#ifdef __cplusplus
+}
+#endif
+
#undef GSM_P
#endif /* GSM_H */
--- gsm-1.0-pl12/inc/toast.h
+++ gsm-1.0-pl12/inc/toast.h
@@ -16,11 +16,12 @@
#include <stdio.h>
#include <ctype.h>
+#include <pthread.h>
#include <signal.h>
#include <errno.h>
-#ifndef HAS_ERRNO_DECL
- extern int errno;
+#ifndef errno
+ extern int errno;
#endif
#ifdef HAS_LIMITS_H
@@ -37,6 +38,10 @@
# endif
#endif
+#ifdef HAS_STDIO_H
+# include <stdio.h>
+#endif
+
#include "gsm.h"
#ifndef S_ISREG
--- gsm-1.0-pl12/src/debug.c
+++ gsm-1.0-pl12/src/debug.c
@@ -49,7 +49,7 @@
fprintf( stderr, "%s [%d .. %d]: ", name, from, to );
while (from <= to) {
- fprintf(stderr, "%d ", ptr[ from ] );
+ fprintf(stderr, "%ld ", ptr[ from ] );
from++;
if (nprinted++ >= 7) {
nprinted = 0;
@@ -63,14 +63,14 @@
char * name,
longword value )
{
- fprintf(stderr, "%s: %d\n", name, (long)value );
+ fprintf(stderr, "%s: %ld\n", name, (long)value );
}
void gsm_debug_word P2( (name, value),
char * name,
word value )
{
- fprintf(stderr, "%s: %d\n", name, (long)value);
+ fprintf(stderr, "%s: %ld\n", name, (long)value);
}
#endif
--- gsm-1.0-pl12/src/toast.c
+++ gsm-1.0-pl12/src/toast.c
@@ -251,8 +251,8 @@
{
char * s;
if (!(s = malloc(len))) {
- fprintf(stderr, "%s: failed to malloc %d bytes -- abort\n",
- progname, len);
+ fprintf(stderr, "%s: failed to malloc %ld bytes -- abort\n",
+ progname, (long) len);
onintr();
exit(1);
}
@@ -270,7 +270,7 @@
maxlen = strlen(name) + 1 + strlen(want) + strlen(cut);
p = strcpy(emalloc(maxlen), name);
- if (s = suffix(p, cut)) strcpy(s, want);
+ if ((s = suffix(p, cut))) strcpy(s, want);
else if (*want && !suffix(p, want)) strcat(p, want);
return p;
@@ -386,7 +386,7 @@
ut[0] = instat.st_atime;
ut[1] = instat.st_mtime;
- (void) utime(outname, ut);
+ (void) utime(outname, (struct utimbuf *)ut);
#endif /* UTIMBUF */
}
@@ -416,7 +416,7 @@
}
if (st->st_nlink > 1 && !f_cat && !f_precious) {
fprintf(stderr,
- "%s: \"%s\" has %s other link%s -- unchanged.\n",
+ "%s: \"%s\" has %d other link%s -- unchanged.\n",
progname,name,st->st_nlink - 1,"s" + (st->st_nlink<=2));
return 0;
}
@@ -585,8 +585,8 @@
if (cc != sizeof(s)) {
if (cc >= 0) fprintf(stderr,
- "%s: incomplete frame (%d byte%s missing) from %s\n",
- progname, sizeof(s) - cc,
+ "%s: incomplete frame (%ld byte%s missing) from %s\n",
+ progname, (long) sizeof(s) - cc,
"s" + (sizeof(s) - cc == 1),
inname ? inname : "stdin" );
gsm_destroy(r);
@@ -624,8 +624,6 @@
static int process P1((name), char * name)
{
- int step = 0;
-
out = (FILE *)0;
in = (FILE *)0;
@@ -779,7 +777,6 @@
case 'h': help(); exit(0);
default:
- usage:
fprintf(stderr,
"Usage: %s [-fcpdhvuaslFC] [files...] (-h for help)\n",
progname);

11
libgsm-strict-aliasing.patch
View File

@ -1,11 +0,0 @@
--- src/toast.c
+++ src/toast.c
@@ -390,7 +390,7 @@
ut[0] = instat.st_atime;
ut[1] = instat.st_mtime;
- (void) utime(outname, (struct utimbuf *)ut);
+ (void) utime(outname, ut);
#endif /* UTIMBUF */
}

23
libgsm.changes
View File

@ -1,3 +1,26 @@
-------------------------------------------------------------------
Sat Feb 23 20:06:39 UTC 2019 - bjorn.lie@gmail.com
- Update to version 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.)
- Changes from version 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).
- Changes from version 1.0.16
* New email addresses in the manual pages (patch 16).
* Removed a stray .orig file (in patch 15).
- Rebase libgsm-1.0.13.patch.
- Drop libgsm-strict-aliasing.patch: Applied upstream.
- Drop ancient Obsoletes/Provides.
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Nov 7 09:23:43 UTC 2015 - jengelh@inai.de Sat Nov 7 09:23:43 UTC 2015 - jengelh@inai.de

19
libgsm.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package libgsm # spec file for package libgsm
# #
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -12,15 +12,15 @@
# license that conforms to the Open Source Definition (Version 1.9) # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative. # published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via https://bugs.opensuse.org/
# #
Name: libgsm Name: libgsm
%define _name gsm %define _name gsm
Version: 1.0.14 Version: 1.0.18
Release: 0 Release: 0
%define _version 1.0-pl14 %define _version 1.0-pl18
Summary: GSM 06.10 Lossy Speech Compressor Library and Utilities Summary: GSM 06.10 Lossy Speech Compressor Library and Utilities
License: ISC License: ISC
Group: Productivity/Multimedia/Sound/Editors and Convertors Group: Productivity/Multimedia/Sound/Editors and Convertors
@ -31,7 +31,6 @@ Url: http://www.quut.com/gsm/
Patch: %{name}-1.0.13.patch Patch: %{name}-1.0.13.patch
Patch1: libgsm-paths.patch Patch1: libgsm-paths.patch
Patch2: libgsm-include.patch Patch2: libgsm-include.patch
Patch3: libgsm-strict-aliasing.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description %description
@ -43,9 +42,6 @@ samples (8 kHz sampling rate) into 260 bits.
%package -n libgsm1 %package -n libgsm1
Summary: GSM 06.10 Lossy Speech Compressor Library and Utilities Summary: GSM 06.10 Lossy Speech Compressor Library and Utilities
Group: Productivity/Multimedia/Sound/Editors and Convertors Group: Productivity/Multimedia/Sound/Editors and Convertors
# Last appeared in OpenSUSE 10.3:
Provides: %{name} = %{version}
Obsoletes: %{name} < %{version}
%description -n libgsm1 %description -n libgsm1
Contains the library for a GSM speech compressor. Contains the library for a GSM speech compressor.
@ -59,8 +55,6 @@ rate) into 260 bits.
%package utils %package utils
Summary: GSM 06.10 Lossy Speech Compressor Library and Utilities Summary: GSM 06.10 Lossy Speech Compressor Library and Utilities
Group: Productivity/Multimedia/Sound/Editors and Convertors Group: Productivity/Multimedia/Sound/Editors and Convertors
# Last appeared in OpenSUSE 10.3:
Provides: %{name}:%{_bindir}/toast
%description utils %description utils
Contains binaries for a GSM speech compressor, verified against the Contains binaries for a GSM speech compressor, verified against the
@ -96,7 +90,6 @@ standard test patterns.
%patch -p1 %patch -p1
%patch1 %patch1
%patch2 %patch2
%patch3
%build %build
make CCFLAGS="-c $RPM_OPT_FLAGS -D_POSIX_SOURCE -D_BSD_SOURCE -DNeedFunctionPrototypes=1" lib/libgsm.a make CCFLAGS="-c $RPM_OPT_FLAGS -D_POSIX_SOURCE -D_BSD_SOURCE -DNeedFunctionPrototypes=1" lib/libgsm.a
@ -115,7 +108,6 @@ cp inc/{private.h,proto.h,unproto.h} $RPM_BUILD_ROOT%{_includedir}/gsm/
%{__rm} -f %{buildroot}%{_libdir}/*.a %{__rm} -f %{buildroot}%{_libdir}/*.a
%post -n libgsm1 -p /sbin/ldconfig %post -n libgsm1 -p /sbin/ldconfig
%postun -n libgsm1 -p /sbin/ldconfig %postun -n libgsm1 -p /sbin/ldconfig
%files utils %files utils
@ -125,7 +117,8 @@ cp inc/{private.h,proto.h,unproto.h} $RPM_BUILD_ROOT%{_includedir}/gsm/
%files -n libgsm1 %files -n libgsm1
%defattr (-, root, root) %defattr (-, root, root)
%doc COPYRIGHT ChangeLog MACHINES README %license COPYRIGHT
%doc ChangeLog MACHINES README
%{_libdir}/*.so.* %{_libdir}/*.so.*
%files devel %files devel