PR#2: Update to new upstream version 2.1.2 - rpms/soundtouch

rpms / soundtouch

#2 Update to new upstream version 2.1.2

Merged 2 years ago by sergiomb. Opened 2 years ago by uklotzde.

rpms/ uklotzde/soundtouch v2.1.2 into rawhide

Update to new upstream version 2.1.2

Uwe Klotz • 2 years ago

5e66054

.gitignore

file modified

		`@@ -3,3 +3,4 @@`
		`/soundtouch-2.0.0.tar.gz`
		`/soundtouch-2.1.0.tar.gz`
		`/soundtouch-2.1.1.tar.gz`
		`+ /soundtouch-2.1.2.tar.gz`

soundtouch.spec

file modified

+6 -2

		`@@ -1,6 +1,6 @@`
		`Name: soundtouch`
		`- Version: 2.1.1`
		`- Release: 7%{?dist}`
		`+ Version: 2.1.2`
		`+ Release: 1%{?dist}`
		`Summary: Audio Processing library for changing Tempo, Pitch and Playback Rates`
		`License: LGPLv2+`
		`URL: http://www.surina.net/soundtouch/`
		`@@ -89,6 +89,10 @@`


		`%changelog`
		`+ * Sun Aug 29 2021 Uwe Klotz <uwe.klotz@gmail.com> - 2.1.2-1`
		`+ - Update to new upstream version 2.1.2`
		`+ Bump version to 2.1.2 to correct incorrect version info in configure.ac`
		`+`
		`* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.1-7`
		`- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild`

sources

file modified

+1 -1

		`@@ -1,1 +1,1 @@`
		`- SHA512 (soundtouch-2.1.1.tar.gz) = 6c55b6d87f97a306ffac0baebe6f778e40c3fd423ee7336d230ecdd4694d7aa7aca7dab883ec74ab360f7c37a1dd405ac94c767d83744eb0723282a82b405a1f`
		`+ SHA512 (soundtouch-2.1.2.tar.gz) = 7c2f864ae7576952a35c4492ebf41fb0188aab85040e07baa8da422555257becbc364efffddf0b84b9f17fdcdad48d980e4355e13b5ce425a62b69de63d1810f`

uklotzde commented 2 years ago

SoundTouch 2.1.1 reports the wrong version number to pkg-config. This has been fixed in version 2.1.2 that does not introduce any other changes.

This fix should be backported because applications are affected: https://github.com/mixxxdj/mixxx/pull/4209

Please note that I was not allowed to upload the new sources with fedpkg new-sources so the CI build is expected to fail.

Pull-Request has been merged by sergiomb

2 years ago

sergiomb commented 2 years ago

should we update F34 and F33 ?

sergiomb commented 2 years ago

I going build 2.30 for rawhide and F35 ... and update F34 and f33 with this 2.1.2

uklotzde commented 2 years ago

Thanks for the quick merge. Upgrading to 2.3.0 starting with F35 would be nice.

Please note that 2.3.0 comes with a new CMake build system that requires substantial changes in the .spec file. These changes were required by switching the build system of Tenacity to CMake like we did before for Mixxx. If any issues occur during the migration we should submit patches upstream instead of introducing new workarounds in the .spec file. Maybe we could get rid of some legacy hacks.

sergiomb commented 2 years ago

@uklotzde soundtouch was update to 2.3.0 on rawhide and now use cmake
as build system , is not a soname bump , because we still provide
libSoundTouch.so.2 let me know works well

Thank you

Edited 2 years ago by sergiomb

uklotzde commented 2 years ago

Wow, that was a quick update and the .spec file looks so much cleaner now.

After building and installing 2.3.0 on F34 I can confirm that it works flawlessly as a seamless replacement for 2.1.x. Should then be safe for F35 onwards.

Shall we submit the soname.patch upstream?

uklotzde commented 2 years ago

Builds with 2.3.0-1 fail due to a missing #include in STTypes.h:

In file included from /usr/include/soundtouch/BPMDetect.h:54,
                 from ../src/analyzer/plugins/analyzersoundtouchbeats.cpp:3:
/usr/include/soundtouch/STTypes.h:53:14: fatal error: soundtouch_config.h: No such file or directory
   53 |     #include "soundtouch_config.h"
      |              ^~~~~~~~~~~~~~~~~~~~~
compilation terminated.

uklotzde commented 2 years ago

Upstream PR for the soname.patch:

https://gitlab.com/soundtouch/soundtouch/-/merge_requests/15

sergiomb commented 2 years ago

Builds with 2.3.0-1 fail due to a missing #include in STTypes.h:

In file included from /usr/include/soundtouch/BPMDetect.h:54, from ../src/analyzer/plugins/analyzersoundtouchbeats.cpp:3: /usr/include/soundtouch/STTypes.h:53:14: fatal error: soundtouch_config.h: No such file or directory 53 | #include "soundtouch_config.h" | ^~~~~~~~~~~~~~~~~~~~~ compilation terminated.

#if (defined(__GNUC__) && !defined(ANDROID) && !defined(CMAKE))
// In GCC, include soundtouch_config.h made by config scritps.
// Skip this in Android compilation that uses GCC but without configure scripts.
#include "soundtouch_config.h"
#endif

how / where we define CMAKE ?

uklotzde commented 2 years ago

This has to be resolved upstream:

Be: I think the CMAKE compile definition should be renamed to SOUNDTOUCH_CMAKE, made public, and added to the pkgconfig

sergiomb commented 2 years ago

This has to be resolved upstream:

Be: I think the CMAKE compile definition should be renamed to SOUNDTOUCH_CMAKE, made public, and added to the pkgconfig

but, IMO, we need fix this before push it to F35

sergiomb commented 2 years ago

in 2.3.0-2 - I rollback to use autotools , until we got a better cmake solution