public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Michal Schorm <mschorm@redhat.com>
To: git-commits@fedoraproject.org
Subject: [rpms/SAASound] rawhide: Rebase SAASound from 3.2 to 3.5.0
Date: Wed, 15 Jul 2026 17:40:41 GMT	[thread overview]
Message-ID: <178413724194.1.13600770943258670072.rpms-SAASound-67f2d23b90d1@fedoraproject.org> (raw)

            A new commit has been pushed.

            Repo   : rpms/SAASound
            Branch : rawhide
            Commit : 67f2d23b90d146746d11be5571202d688be2be63
            Author : Michal Schorm <mschorm@redhat.com>
            Date   : 2026-07-14T21:49:24+02:00
            Stats  : +72/-64 in 6 file(s)
            URL    : https://src.fedoraproject.org/rpms/SAASound/c/67f2d23b90d146746d11be5571202d688be2be63?branch=rawhide

            Log:
            Rebase SAASound from 3.2 to 3.5.0

Upstream release dates: 3.2 (~2004), 3.5.0 (2025-05-24).

Upstream changes (3.2 -> 3.5.0):
- Build system migrated from autotools to CMake
- Soname scheme changed from 'libSAASound-3.2.so.0' to
  'libSAASound.so.3' (upstream adopted standard soname versioning)
- API remains backward compatible: 'CreateSAASound()' factory and
  'CSAASound' interface unchanged; new methods are additions only
- Bundled minIni config file parser added in 'src/minIni/'
- URL moved from simonowen.com to GitHub

Patch changes:
- Drop 'SAASound-3.2-fixweaksymbol.patch' (autotools-specific weak
  symbol workaround, no longer applicable with CMake)
- Drop 'SAASound-3.2-configure-c99.patch' (autotools configure
  script C99 fix, no longer applicable with CMake)
- Add 'SAASound-3.5.0-gnuinstalldirs.patch': upstream CMakeLists.txt
  hardcodes 'DESTINATION lib'; use 'GNUInstallDirs' for correct
  multilib paths on Fedora

Build changes:
- '%configure' / 'make' replaced by '%cmake' / '%cmake_build' / '%cmake_install'
- Add 'cmake' to BuildRequires, drop 'make'
- Add '%{?_isa}' to devel subpackage Requires
- Use '%license' for LICENCE file
- Explicit soname glob in '%files' instead of wildcard

Reverse dependencies:
 - simcoupe (requires SAASound-devel) - needs a rebuild

Co-Authored-By: Claude AI <noreply@anthropic.com>

---
diff --git a/.gitignore b/.gitignore
index 24471fd..f6a3a77 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SAASound-3.2.tar.gz
+/*.tar.gz

diff --git a/SAASound-3.2-configure-c99.patch b/SAASound-3.2-configure-c99.patch
deleted file mode 100644
index a5a70f7..0000000
--- a/SAASound-3.2-configure-c99.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/configure b/configure
-index 6e68a56..63f42b4 100755
---- a/configure
-+++ b/configure
-@@ -4686,8 +4686,8 @@ main ()
-   for (i = 0; i < 256; i++)
-     if (XOR (islower (i), ISLOWER (i))
-         || toupper (i) != TOUPPER (i))
--      exit(2);
--  exit (0);
-+      return 2;
-+  return 0;
- }
- _ACEOF
- rm -f conftest$ac_exeext
-@@ -8557,8 +8557,8 @@ main ()
-   for (i = 0; i < 256; i++)
-     if (XOR (islower (i), ISLOWER (i))
-         || toupper (i) != TOUPPER (i))
--      exit(2);
--  exit (0);
-+      return 2;
-+  return 0;
- }
- _ACEOF
- rm -f conftest$ac_exeext

diff --git a/SAASound-3.2-fixweaksymbol.patch b/SAASound-3.2-fixweaksymbol.patch
deleted file mode 100644
index c8b9c6f..0000000
--- a/SAASound-3.2-fixweaksymbol.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- SAASound-3.2/src/Makefile.am.orig	2004-03-08 03:25:52.000000000 +0000
-+++ SAASound-3.2/src/Makefile.am	2007-06-11 01:06:54.000000000 +0100
-@@ -9,3 +9,5 @@
- libSAASound_la_LDFLAGS = 	\
-         -release $(LT_RELEASE)	\
- 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-+libSAASound_la_LIBADD = -lstdc++
-+
---- SAASound-3.2/src/Makefile.in~	2008-04-17 14:20:18.000000000 +0200
-+++ SAASound-3.2/src/Makefile.in	2008-04-17 14:20:18.000000000 +0200
-@@ -160,7 +160,7 @@ CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
- LTLIBRARIES = $(lib_LTLIBRARIES)
- 
--libSAASound_la_LIBADD =
-+libSAASound_la_LIBADD = -lstdc++
- am__objects_1 = SAAAmp.lo SAAEnv.lo SAAFreq.lo SAANoise.lo SAAImpl.lo \
- 	SAASndC.lo
- am_libSAASound_la_OBJECTS = $(am__objects_1)

diff --git a/SAASound-3.5.0-gnuinstalldirs.patch b/SAASound-3.5.0-gnuinstalldirs.patch
new file mode 100644
index 0000000..dca5535
--- /dev/null
+++ b/SAASound-3.5.0-gnuinstalldirs.patch
@@ -0,0 +1,39 @@
+Use GNUInstallDirs for proper library install paths on multilib
+systems.
+
+Upstream CMakeLists.txt hardcodes 'DESTINATION lib' for library
+installation, which installs to '/usr/lib' on all architectures.
+On 64-bit Fedora this must be '/usr/lib64'. Adding
+'include(GNUInstallDirs)' and using 'CMAKE_INSTALL_LIBDIR' etc.
+follows CMake best practices and makes the install paths respect
+'%_libdir'.
+--- a/CMakeLists.txt	2026-07-14 20:21:34.748103382 +0200
++++ b/CMakeLists.txt	2026-07-14 20:22:01.221383293 +0200
+@@ -8,6 +8,8 @@ endif ()
+ 
+ project(SAASound)
+ 
++include(GNUInstallDirs)
++
+ if (WIN32)
+   add_definitions(-DUNICODE -D_UNICODE)
+ endif ()
+@@ -97,12 +99,12 @@ configure_file(src/config.h.in ${CMAKE_B
+ target_compile_definitions(SAASound PRIVATE HAVE_CONFIG_H=1)
+ 
+ install(TARGETS SAASound
+-  ARCHIVE DESTINATION lib
+-  LIBRARY DESTINATION lib
+-  RUNTIME DESTINATION bin
+-  FRAMEWORK DESTINATION lib
+-  PUBLIC_HEADER DESTINATION include)
++  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
++  FRAMEWORK DESTINATION ${CMAKE_INSTALL_LIBDIR}
++  PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+ 
+ if (NOT APPLE OR NOT BUILD_FRAMEWORK)
+-  install(FILES ${API_HEADERS} DESTINATION include)
++  install(FILES ${API_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+ endif ()

diff --git a/SAASound.spec b/SAASound.spec
index eddb71a..c0dc66e 100644
--- a/SAASound.spec
+++ b/SAASound.spec
@@ -1,16 +1,21 @@
 Name:           SAASound
-Version:        3.2
-Release:        42%{?dist}
+Version:        3.5.0
+Release:        1%{?dist}
 Summary:        Phillips SAA 1099 sound chip emulator library
 # Automatically converted from old format: BSD - review is highly recommended.
 License:        LicenseRef-Callaway-BSD
-URL:            http://simonowen.com/sam/saasound
-Source0:        http://simonowen.com/sam/saasound/%{name}-%{version}.tar.gz
-Patch0:         SAASound-3.2-fixweaksymbol.patch
-Patch1:         SAASound-3.2-configure-c99.patch
+URL:            https://github.com/stripwax/SAASound
+Source0:        %{url}/archive/%{version}/%{name}-%{version}.tar.gz
+
+# Use GNUInstallDirs for proper lib64 install paths on Fedora
+Patch0:         SAASound-3.5.0-gnuinstalldirs.patch
+
 Provides:       saasound = %{version}-%{release}
+# minIni is a small INI file parser bundled in src/minIni/
+# No standalone Fedora package exists for minIni
+Provides:       bundled(minIni)
 
-BuildRequires: make
+BuildRequires:  cmake
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
 
@@ -20,7 +25,7 @@ Phillips SAA 1099 sound chip emulator library
 
 %package devel
 Summary:        Development files for SAASound
-Requires:       SAASound = %{version}-%{release}
+Requires:       SAASound%{?_isa} = %{version}-%{release}
 Provides:       saasound-devel = %{version}-%{release}
 
 %description devel
@@ -32,30 +37,39 @@ Development files for SAASound
 
 
 %build
-%configure --disable-static
-make %{?_smp_mflags}
+%cmake
+%cmake_build
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-rm $RPM_BUILD_ROOT%{_libdir}/*.la
+%cmake_install
 
 
 %ldconfig_scriptlets
 
 
 %files
-%doc LICENCE README
-%{_libdir}/*.so.*
+%license LICENCE
+%doc README
+%{_libdir}/libSAASound.so.3{,.*}
 
 
 %files devel
-%{_libdir}/*.so
-%{_includedir}/*.h
+%{_libdir}/libSAASound.so
+%{_includedir}/SAASound.h
 
 
 %changelog
+* Tue Jul 14 2026 Michal Schorm <mschorm@redhat.com> - 3.5.0-1
+- Rebase from 3.2 to 3.5.0
+- Build system migrated from autotools to CMake
+- Drop 'SAASound-3.2-fixweaksymbol.patch' (autotools-specific, no longer needed)
+- Drop 'SAASound-3.2-configure-c99.patch' (autotools-specific, no longer needed)
+- Add 'SAASound-3.5.0-gnuinstalldirs.patch' for proper library install paths
+- Library soname changed from 'libSAASound-3.2.so.0' to 'libSAASound.so.3'
+- Use '%license' for LICENCE file
+- URL updated to GitHub repository
+
 * Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 3.2-42
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
 

diff --git a/sources b/sources
index 28d157f..f510107 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6a1e45f3f8958be6cfe88872cec3763f  SAASound-3.2.tar.gz
+SHA512 (SAASound-3.5.0.tar.gz) = 989b3dc43b7194d2dc272636496c425cb945a2af2794092c72e03a210b944d7c4ada0c9b23101b3aee326c5e72461ce8c7caff2d0fec90fcb2f08caf47bac10f

                 reply	other threads:[~2026-07-15 17:40 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=178413724194.1.13600770943258670072.rpms-SAASound-67f2d23b90d1@fedoraproject.org \
    --to=mschorm@redhat.com \
    --cc=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox