OBS User unknown 2008-01-29 00:41:13 +00:00 committed by Git OBS Bridge
parent 397c35f965
commit 9fb7cb4d16
6 changed files with 174 additions and 138 deletions

View File

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

3
gsm-1.0.12.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:311ba68a843a9ed74094e7f3039305ae566f55a3bbf52fe5f8f1d6f83c990b87
size 57074

View File

@ -1,5 +1,5 @@
--- libgsm-1.0.10.orig/Makefile --- gsm-1.0-pl12/Makefile
+++ libgsm-1.0.10/Makefile +++ gsm-1.0-pl12/Makefile
@@ -96,7 +96,7 @@ @@ -96,7 +96,7 @@
# Other tools # Other tools
@ -31,9 +31,9 @@
# The basic API: libgsm # The basic API: libgsm
+$(LIBGSMSO): $(LIB) $(GSM_OBJECTS) +$(LIBGSMSO): $(LIB) $(GSM_OBJECTS)
+ $(LD) -o $@.1.0.10 -shared -Xlinker -soname -Xlinker libgsm.so.1 $(GSM_OBJECTS) -lc + $(LD) -o $@.1.0.12 -shared -Xlinker -soname -Xlinker libgsm.so.1 $(GSM_OBJECTS) -lc
+ ln -fs libgsm.so.1.0.10 lib/libgsm.so.1 + ln -fs libgsm.so.1.0.12 lib/libgsm.so.1
+ ln -fs libgsm.so.1.0.10 lib/libgsm.so + ln -fs libgsm.so.1.0.12 lib/libgsm.so
+ +
$(LIBGSM): $(LIB) $(GSM_OBJECTS) $(LIBGSM): $(LIB) $(GSM_OBJECTS)
-rm $(RMFLAGS) $(LIBGSM) -rm $(RMFLAGS) $(LIBGSM)
@ -62,14 +62,33 @@
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.10 \ + $(LIBGSMSO) $(LIB)/libgsm.so.1.0.12 \
+ $(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
--- libgsm-1.0.10.orig/inc/gsm.h --- gsm-1.0-pl12/inc/config.h
+++ libgsm-1.0.10/inc/gsm.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 @@ @@ -54,6 +54,10 @@
#define GSM_OPT_FRAME_INDEX 5 #define GSM_OPT_FRAME_INDEX 5
#define GSM_OPT_FRAME_CHAIN 6 #define GSM_OPT_FRAME_CHAIN 6
@ -92,49 +111,8 @@
#undef GSM_P #undef GSM_P
#endif /* GSM_H */ #endif /* GSM_H */
--- libgsm-1.0.10.orig/inc/config.h --- gsm-1.0-pl12/inc/toast.h
+++ libgsm-1.0.10/inc/config.h +++ gsm-1.0-pl12/inc/toast.h
@@ -9,29 +9,29 @@
#ifndef CONFIG_H
#define CONFIG_H
-/*efine SIGHANDLER_T int /* signal handlers are void */
-/*efine HAS_SYSV_SIGNAL 1 /* sigs not blocked/reset? */
+/*efine SIGHANDLER_T int -* signal handlers are void */
+/*efine HAS_SYSV_SIGNAL 1 -* sigs not blocked/reset? */
#define HAS_STDLIB_H 1 /* /usr/include/stdlib.h */
-/*efine HAS_LIMITS_H 1 /* /usr/include/limits.h */
+#define HAS_STDIO_H 1 /* /usr/include/stdio.h */
+/*efine 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_FSTAT 1 /* fstat syscall */
#define HAS_FCHMOD 1 /* fchmod syscall */
#define HAS_CHMOD 1 /* chmod syscall */
#define HAS_FCHOWN 1 /* fchown syscall */
#define HAS_CHOWN 1 /* chown syscall */
-/*efine HAS__FSETMODE 1 /* _fsetmode -- set file mode */
+/*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 */
+/*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 */
+/*efine HAS_UTIMES 1 -* use utimes() syscall instead */
#define HAS_UTIME_H 1 /* UTIME header file */
-/*efine HAS_UTIMBUF 1 /* struct utimbuf */
-/*efine HAS_UTIMEUSEC 1 /* microseconds in utimbuf? */
+/*efine HAS_UTIMBUF 1 -* struct utimbuf */
+/*efine HAS_UTIMEUSEC 1 -* microseconds in utimbuf? */
#endif /* CONFIG_H */
--- libgsm-1.0.10.orig/inc/toast.h
+++ libgsm-1.0.10/inc/toast.h
@@ -16,11 +16,12 @@ @@ -16,11 +16,12 @@
#include <stdio.h> #include <stdio.h>
@ -161,8 +139,8 @@
#include "gsm.h" #include "gsm.h"
#ifndef S_ISREG #ifndef S_ISREG
--- libgsm-1.0.10.orig/src/code.c --- gsm-1.0-pl12/src/code.c
+++ libgsm-1.0.10/src/code.c +++ gsm-1.0-pl12/src/code.c
@@ -9,8 +9,8 @@ @@ -9,8 +9,8 @@
#include "config.h" #include "config.h"
@ -174,8 +152,8 @@
#else #else
# include "proto.h" # include "proto.h"
extern char * memcpy P((char *, char *, int)); extern char * memcpy P((char *, char *, int));
--- libgsm-1.0.10.orig/src/debug.c --- gsm-1.0-pl12/src/debug.c
+++ libgsm-1.0.10/src/debug.c +++ gsm-1.0-pl12/src/debug.c
@@ -49,7 +49,7 @@ @@ -49,7 +49,7 @@
fprintf( stderr, "%s [%d .. %d]: ", name, from, to ); fprintf( stderr, "%s [%d .. %d]: ", name, from, to );
while (from <= to) { while (from <= to) {
@ -202,8 +180,8 @@
} }
#endif #endif
--- libgsm-1.0.10.orig/src/toast.c --- gsm-1.0-pl12/src/toast.c
+++ libgsm-1.0.10/src/toast.c +++ gsm-1.0-pl12/src/toast.c
@@ -251,8 +251,8 @@ @@ -251,8 +251,8 @@
{ {
char * s; char * s;

View File

@ -1,13 +0,0 @@
--- Makefile
+++ Makefile
@@ -22,8 +22,8 @@
######### both integer and floating point multiplications.
######### This flag is still in the experimental stage.
-#WAV49 = -DWAV49
-WAV49 =
+WAV49 = -DWAV49
+#WAV49 =
######### Define to enable the GSM library's option to pack GSM frames
######### in the style used by the WAV #49 format. If you want to write
######### a tool that produces .WAV files which contain GSM-encoded data,

View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Mon Jan 28 13:38:37 CET 2008 - sbrabec@suse.cz
- Updated to version 1.0.12:
* removed modifiable static storage that made the library
non-reentrant.
* fix WAV49 implode move source archive location
- Split package according to shared library packaging policy.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Aug 8 15:22:05 CEST 2006 - sbrabec@suse.cz Tue Aug 8 15:22:05 CEST 2006 - sbrabec@suse.cz

View File

@ -1,7 +1,7 @@
# #
# spec file for package libgsm (Version 1.0.10) # spec file for package libgsm (Version 1.0.12)
# #
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine # This file and all modifications and additions to the pristine
# package are under the same license as the package itself. # package are under the same license as the package itself.
# #
@ -12,22 +12,19 @@
Name: libgsm Name: libgsm
%define _name gsm %define _name gsm
Version: 1.0.10 Version: 1.0.12
Release: 12 Release: 1
%define _version 1.0-pl10 %define _version 1.0-pl12
%define __version 1.0.10-13
Group: Productivity/Multimedia/Sound/Editors and Convertors Group: Productivity/Multimedia/Sound/Editors and Convertors
License: BSD, Other License(s), see package License: BSD 3-Clause
Summary: GSM 06.10 Lossy Speech Compressor Library and Utilities Summary: GSM 06.10 Lossy Speech Compressor Library and Utilities
# Found at http://www.dmn.tzi.org/software/gsm/ Source: %{_name}-%{version}.tar.bz2
Source: %{_name}-%{version}.tar.gz Url: http://kbs.cs.tu-berlin.de/~jutta/toast.html
# This is a Debian patch file with debian chunks removed. # This is a Debian patch file with debian chunks removed.
Patch: %{name}_%{__version}.patch Patch: %{name}-%{version}.patch
Patch1: libgsm-paths.patch Patch1: libgsm-paths.patch
Patch2: libgsm-include.patch Patch2: libgsm-include.patch
Patch3: libgsm-strict-aliasing.patch Patch3: libgsm-strict-aliasing.patch
Patch4: libgsm-options.patch
Autoreqprov: on
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description %description
@ -35,59 +32,116 @@ Contains libraries and binaries for a GSM speech compressor. libgsm
contains a standard implementation of the European GSM 06.10 contains a standard implementation of the European GSM 06.10
provisional standard for full-rate speech transcoding, prI-ETS 300 036, provisional standard for full-rate speech transcoding, prI-ETS 300 036,
which uses RPE/LTP (residual pulse excitation/long term prediction) which uses RPE/LTP (residual pulse excitation/long term prediction)
coding at 13 kbit/s. coding at 13 kbit/s. GSM 06.10 compresses frames of 160 13-bit samples
(8 kHz sampling rate, which is a frame rate of 50 Hz) into 260 bits.
GSM 06.10 compresses frames of 160 13-bit samples (8 kHz sampling rate, For compatibility with typical UNIX applications, our implementation
which is a frame rate of 50 Hz) into 260 bits. For compatibility with turns frames of 160 16-bit linear samples into 33-byte frames (1650
typical UNIX applications, our implementation turns frames of 160 Bytes/s). The quality of the algorithm is good enough for reliable
16-bit linear samples into 33-byte frames (1650 Bytes/s). The quality speaker recognition. Even music often survives transcoding in
of the algorithm is good enough for reliable speaker recognition. Even recognizable form (given the bandwidth limitations of 8 kHz sampling
music often survives transcoding in recognizable form (given the rate). The interfaces offered are a front-end modeled after compress(1)
bandwidth limitations of 8 kHz sampling rate). and a library API. Compression and decompression run faster than
real-time on most SPARC stations. The implementation has been verified
The interfaces offered are a front-end modelled after compress(1) and a against the ETSI standard test patterns.
library API. Compression and decompression run faster than realtime on
most SPARCstations. The implementation has been verified against the
ETSI standard test patterns.
Authors:
--------
Jutta Degener <jutta@pobox.com>
Carsten Bormann
%package -n libgsm1
Group: Productivity/Multimedia/Sound/Editors and Convertors
Summary: GSM 06.10 Lossy Speech Compressor Library and Utilities
%description -n libgsm1
Contains libraries and binaries for a GSM speech compressor. libgsm
contains a standard implementation of the European GSM 06.10
provisional standard for full-rate speech transcoding, prI-ETS 300 036,
which uses RPE/LTP (residual pulse excitation/long term prediction)
coding at 13 kbit/s. GSM 06.10 compresses frames of 160 13-bit samples
(8 kHz sampling rate, which is a frame rate of 50 Hz) into 260 bits.
For compatibility with typical UNIX applications, our implementation
turns frames of 160 16-bit linear samples into 33-byte frames (1650
Bytes/s). The quality of the algorithm is good enough for reliable
speaker recognition. Even music often survives transcoding in
recognizable form (given the bandwidth limitations of 8 kHz sampling
rate). The interfaces offered are a front-end modeled after compress(1)
and a library API. Compression and decompression run faster than
real-time on most SPARC stations. The implementation has been verified
against the ETSI standard test patterns.
Authors:
--------
Jutta Degener <jutta@pobox.com>
Carsten Bormann
%package utils
Group: Productivity/Multimedia/Sound/Editors and Convertors
Summary: GSM 06.10 Lossy Speech Compressor Library and Utilities
%description utils
Contains libraries and binaries for a GSM speech compressor. libgsm
contains a standard implementation of the European GSM 06.10
provisional standard for full-rate speech transcoding, prI-ETS 300 036,
which uses RPE/LTP (residual pulse excitation/long term prediction)
coding at 13 kbit/s. GSM 06.10 compresses frames of 160 13-bit samples
(8 kHz sampling rate, which is a frame rate of 50 Hz) into 260 bits.
For compatibility with typical UNIX applications, our implementation
turns frames of 160 16-bit linear samples into 33-byte frames (1650
Bytes/s). The quality of the algorithm is good enough for reliable
speaker recognition. Even music often survives transcoding in
recognizable form (given the bandwidth limitations of 8 kHz sampling
rate). The interfaces offered are a front-end modeled after compress(1)
and a library API. Compression and decompression run faster than
real-time on most SPARC stations. The implementation has been verified
against the ETSI standard test patterns.
Authors:
--------
Jutta Degener <jutta@pobox.com>
Carsten Bormann
%package devel %package devel
Group: Productivity/Multimedia/Sound/Editors and Convertors Group: Productivity/Multimedia/Sound/Editors and Convertors
Summary: GSM 06.10 Lossy Speech Compressor Library and Utilities Summary: GSM 06.10 Lossy Speech Compressor Library and Utilities
Requires: %{name} = %{version} Requires: libgsm1 = %{version}
%description devel %description devel
Contains libraries and binaries for a GSM speech compressor. libgsm Contains libraries and binaries for a GSM speech compressor. libgsm
contains a standard implementation of the European GSM 06.10 contains a standard implementation of the European GSM 06.10
provisional standard for full-rate speech transcoding, prI-ETS 300 036, provisional standard for full-rate speech transcoding, prI-ETS 300 036,
which uses RPE/LTP (residual pulse excitation/long term prediction) which uses RPE/LTP (residual pulse excitation/long term prediction)
coding at 13 kbit/s. coding at 13 kbit/s. GSM 06.10 compresses frames of 160 13-bit samples
(8 kHz sampling rate, which is a frame rate of 50 Hz) into 260 bits.
GSM 06.10 compresses frames of 160 13-bit samples (8 kHz sampling rate, For compatibility with typical UNIX applications, our implementation
i.e. a frame rate of 50 Hz) into 260 bits; for compatibility with turns frames of 160 16-bit linear samples into 33-byte frames (1650
typical UNIX applications, our implementation turns frames of 160 Bytes/s). The quality of the algorithm is good enough for reliable
16-bit linear samples into 33-byte frames (1650 Bytes/s). The quality speaker recognition. Even music often survives transcoding in
of the algorithm is good enough for reliable speaker recognition; even recognizable form (given the bandwidth limitations of 8 kHz sampling
music often survives transcoding in recognizable form (given the rate). The interfaces offered are a front-end modeled after compress(1)
bandwidth limitations of 8 kHz sampling rate). and a library API. Compression and decompression run faster than
real-time on most SPARC stations. The implementation has been verified
The interfaces offered are a front end modelled after compress(1), and against the ETSI standard test patterns.
a library API. Compression and decompression run faster than realtime
on most SPARCstations. The implementation has been verified against
the ETSI standard test patterns.
Authors:
--------
Jutta Degener <jutta@pobox.com>
Carsten Bormann
%prep %prep
%setup -n %{_name}-%{_version} %setup -n %{_name}-%{_version}
%patch -p1 %patch -p1
%patch1 %patch1
%patch2 %patch2
%patch3 %patch3
%patch4
# ChangeLog.orig is not allowed by filelist check.
cp -a ChangeLog.orig ChangeLog_orig
%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
@ -98,38 +152,46 @@ cp lib/libgsm.a.save lib/libgsm.a
touch lib/libgsm.a touch lib/libgsm.a
%install %install
mkdir -p $RPM_BUILD_ROOT/usr/{include/gsm,%{_lib},bin,share/man/man{1,3}} mkdir -p $RPM_BUILD_ROOT%{_prefix}/{include/gsm,%{_lib},bin,share/man/man{1,3}}
make INSTALL_ROOT=$RPM_BUILD_ROOT/usr GSM_INSTALL_LIB=$RPM_BUILD_ROOT/usr/%{_lib} install make INSTALL_ROOT=$RPM_BUILD_ROOT%{_prefix} GSM_INSTALL_LIB=$RPM_BUILD_ROOT%{_libdir} install
cp -d lib/libgsm.so* $RPM_BUILD_ROOT/usr/%{_lib} cp -d lib/libgsm.so* $RPM_BUILD_ROOT%{_libdir}
( cd $RPM_BUILD_ROOT/usr/%{_lib} ; ln -sf libgsm.so.1 libgsm.so ) ( cd $RPM_BUILD_ROOT%{_libdir} ; ln -sf libgsm.so.1 libgsm.so )
cp inc/{private.h,proto.h,unproto.h} $RPM_BUILD_ROOT/usr/include/gsm/ cp inc/{private.h,proto.h,unproto.h} $RPM_BUILD_ROOT%{_includedir}/gsm/
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
%post %post -n libgsm1 -p /sbin/ldconfig
%run_ldconfig
%postun %postun -n libgsm1 -p /sbin/ldconfig
%run_ldconfig
%files %files utils
%defattr (-, root, root) %defattr (-, root, root)
%doc COPYRIGHT ChangeLog ChangeLog_orig MACHINES README %{_bindir}/*
/usr/%{_lib}/*.so.* %doc %{_mandir}/man1/*.*
/usr/bin/*
%doc /usr/share/man/man?/*.* %files -n libgsm1
%defattr (-, root, root)
%doc COPYRIGHT ChangeLog MACHINES README
%{_libdir}/*.so.*
%files devel %files devel
%defattr (-, root, root) %defattr (-, root, root)
/usr/%{_lib}/*.so %{_libdir}/*.so
/usr/%{_lib}/*.*a %{_libdir}/*.*a
/usr/include/gsm %doc %{_mandir}/man3/*.*
%{_includedir}/gsm
%changelog -n libgsm %changelog
* Tue Aug 08 2006 - sbrabec@suse.cz * Mon Jan 28 2008 sbrabec@suse.cz
- Updated to version 1.0.12:
* removed modifiable static storage that made the library
non-reentrant.
* fix WAV49 implode move source archive location
- Split package according to shared library packaging policy.
* Tue Aug 08 2006 sbrabec@suse.cz
- Compile with WAV-style framing support. - Compile with WAV-style framing support.
* Wed Jan 25 2006 - mls@suse.de * Wed Jan 25 2006 mls@suse.de
- converted neededforbuild to BuildRequires - converted neededforbuild to BuildRequires
* Mon Jan 09 2006 - sbrabec@suse.cz * Mon Jan 09 2006 sbrabec@suse.cz
- New SuSE package, version 1.0.10. - New SuSE package, version 1.0.10.