From 18a230a54cca124a8502d525ba9231c36dd76a0e Mon Sep 17 00:00:00 2001
From: oparviai
Date: Sun, 20 Sep 2015 07:38:32 +0000
Subject: [PATCH] - Fix in GNU package management issues. - version 1.9.2
---
README.html | 6 +++++-
configure.ac | 6 +++++-
include/SoundTouch.h | 4 ++--
source/SoundTouch/Makefile.am | 14 ++++++++------
source/SoundTouchDLL/SoundTouchDLL.rc | 10 +++++-----
5 files changed, 25 insertions(+), 15 deletions(-)
diff --git a/README.html b/README.html
index bc28d84..14add2c 100644
--- a/README.html
+++ b/README.html
@@ -13,7 +13,7 @@
-SoundTouch audio processing library v1.9.1
+SoundTouch audio processing library v1.9.2
SoundTouch library Copyright © Olli Parviainen 2001-2015
1. Introduction
@@ -567,6 +567,10 @@ this corresponds to lowering the pitch by -0.318 semitones:
5. Change History
5.1. SoundTouch library Change History
+ 1.9.2:
+
+ - Fix in GNU package configuration
+
1.9.1:
- Improved SoundTouch::flush() function so that it returns precisely the desired amount of samples for exact output duration control
diff --git a/configure.ac b/configure.ac
index 94f8bd5..14fbbf4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,7 +19,11 @@ dnl this program; if not, write to the Free Software Foundation, Inc., 59 Temple
dnl Place - Suite 330, Boston, MA 02111-1307, USA
# Process this file with autoconf to produce a configure script.
-AC_INIT(SoundTouch, 1.9.0, [http://www.surina.net/soundtouch])
+AC_INIT([SoundTouch], [1.9.2], [http://www.surina.net/soundtouch])
+dnl Default to libSoundTouch.so.$LIB_SONAME.0.0
+LIB_SONAME=1
+AC_SUBST(LIB_SONAME)
+
AC_CONFIG_AUX_DIR(config)
AC_CONFIG_MACRO_DIR([config/m4])
AM_CONFIG_HEADER([config.h include/soundtouch_config.h])
diff --git a/include/SoundTouch.h b/include/SoundTouch.h
index a37776a..cdf5af2 100644
--- a/include/SoundTouch.h
+++ b/include/SoundTouch.h
@@ -79,10 +79,10 @@ namespace soundtouch
{
/// Soundtouch library version string
-#define SOUNDTOUCH_VERSION "1.9.1"
+#define SOUNDTOUCH_VERSION "1.9.2"
/// SoundTouch library version id
-#define SOUNDTOUCH_VERSION_ID (10901)
+#define SOUNDTOUCH_VERSION_ID (10902)
//
// Available setting IDs for the 'setSetting' & 'get_setting' functions:
diff --git a/source/SoundTouch/Makefile.am b/source/SoundTouch/Makefile.am
index 7aff51c..5caa758 100644
--- a/source/SoundTouch/Makefile.am
+++ b/source/SoundTouch/Makefile.am
@@ -62,12 +62,14 @@ endif
# Let the user disable optimizations if he wishes to.
if !X86_OPTIMIZATIONS
libSoundTouchMMX_la_CXXFLAGS = $(AM_CXXFLAGS)
-libSoundTouchSSE_la_CXXFLAGS = $(AM_CXXFLAGS)
-endif
-
-
-# other linking flags to add
-# noinst_LTLIBRARIES = libSoundTouchOpt.la
+libSoundTouchSSE_la_CXXFLAGS = $(AM_CXXFLAGS)
+endif
+
+# Modify the default 0.0.0 to LIB_SONAME.0.0
+libSoundTouch_la_LDFLAGS=-version-info @LIB_SONAME@
+
+# other linking flags to add
+# noinst_LTLIBRARIES = libSoundTouchOpt.la
# libSoundTouch_la_LIBADD = libSoundTouchOpt.la
# libSoundTouchOpt_la_SOURCES = mmx_optimized.cpp sse_optimized.cpp
# libSoundTouchOpt_la_CXXFLAGS = -O3 -msse -fcheck-new -I../../include
diff --git a/source/SoundTouchDLL/SoundTouchDLL.rc b/source/SoundTouchDLL/SoundTouchDLL.rc
index 239e5a1..cf9d7cb 100644
--- a/source/SoundTouchDLL/SoundTouchDLL.rc
+++ b/source/SoundTouchDLL/SoundTouchDLL.rc
@@ -65,8 +65,8 @@ LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,8,0,9
- PRODUCTVERSION 1,8,0,9
+ FILEVERSION 1,9,2,0
+ PRODUCTVERSION 1,9,2,0
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -83,12 +83,12 @@ BEGIN
BEGIN
VALUE "Comments", "SoundTouch Library licensed for 3rd party applications subject to LGPL license v2.1. Visit http://www.surina.net/soundtouch for more information about the SoundTouch library."
VALUE "FileDescription", "SoundTouch Dynamic Link Library"
- VALUE "FileVersion", "1, 8, 0, 9"
+ VALUE "FileVersion", "1, 9, 2, 0"
VALUE "InternalName", "SoundTouch"
- VALUE "LegalCopyright", "Copyright (C) Olli Parviainen 1999-2014"
+ VALUE "LegalCopyright", "Copyright (C) Olli Parviainen 1999-2015"
VALUE "OriginalFilename", "SoundTouch.dll"
VALUE "ProductName", " SoundTouch Dynamic Link Library"
- VALUE "ProductVersion", "1, 8, 0, 9"
+ VALUE "ProductVersion", "1, 9, 2, 0"
END
END
BLOCK "VarFileInfo"