lxde/sidplay-libs
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid obsolete %patchN macro #1

Merged
michals merged 1 commits from michals/sidplay-libs:main into main 2026-02-24 12:29:22 +01:00
Conversation 1 Commits 1 Files Changed 4 +32 -31
4 changed files with 32 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib_name_so.diff
View File

@@ -1,5 +1,5 @@
--- ./libsidplay/unix/libsidplay2.pc.in.orig 2015-05-16 16:34:21.382523693 +0300
+++ ./libsidplay/unix/libsidplay2.pc.in 2015-05-16 16:34:35.796013456 +0300
--- a/libsidplay/unix/libsidplay2.pc.in.orig 2015-05-16 16:34:21.382523693 +0300
+++ b/libsidplay/unix/libsidplay2.pc.in 2015-05-16 16:34:35.796013456 +0300
@@ -7,5 +7,5 @@
Name: @PACKAGE@
Description: C64 cycle exact stereo sidplayer library.
@@ -7,8 +7,8 @@
-Libs: ${libdir}/libsidplay2.la
+Libs: ${libdir}/libsidplay2.so
Cflags: -DHAVE_UNIX -I${includedir}
--- ./libsidutils/unix/libsidutils.pc.in.orig 2015-05-16 16:34:26.711335053 +0300
+++ ./libsidutils/unix/libsidutils.pc.in 2015-05-16 16:34:44.303712283 +0300
--- a/libsidutils/unix/libsidutils.pc.in.orig 2015-05-16 16:34:26.711335053 +0300
+++ b/libsidutils/unix/libsidutils.pc.in 2015-05-16 16:34:44.303712283 +0300
@@ -6,5 +6,5 @@
Name: @PACKAGE@
Description: Utils for supporting the libsidplay2 library.

44
sidplay-libs-2.1.1.diff
View File

@@ -1,5 +1,5 @@
--- builders/hardsid-builder/include/sidplay/builders/hardsid.h
+++ builders/hardsid-builder/include/sidplay/builders/hardsid.h
--- a/builders/hardsid-builder/include/sidplay/builders/hardsid.h
+++ b/builders/hardsid-builder/include/sidplay/builders/hardsid.h
@@ -36,6 +36,7 @@
#define _hardsid_h_
@@ -8,8 +8,8 @@
#include "sidplay/sidbuilder.h"
--- builders/hardsid-builder/src/hardsid-builder.cpp
+++ builders/hardsid-builder/src/hardsid-builder.cpp
--- a/builders/hardsid-builder/src/hardsid-builder.cpp
+++ b/builders/hardsid-builder/src/hardsid-builder.cpp
@@ -376,6 +376,7 @@
m_count = index;
}
@@ -18,16 +18,16 @@
}
#endif // HAVE_MSWINDOWS
--- builders/resid-builder/Makefile.am
+++ builders/resid-builder/Makefile.am
--- a/builders/resid-builder/Makefile.am
+++ b/builders/resid-builder/Makefile.am
@@ -1,4 +1,5 @@
+ACLOCAL_AMFLAGS = -I unix
AUTOMAKE_OPTIONS = foreign
SUBDIRS = unix include src
--- builders/resid-builder/include/sidplay/builders/resid.h
+++ builders/resid-builder/include/sidplay/builders/resid.h
--- a/builders/resid-builder/include/sidplay/builders/resid.h
+++ b/builders/resid-builder/include/sidplay/builders/resid.h
@@ -23,6 +23,7 @@
*/
@@ -36,16 +36,16 @@
#include <sidplay/sidbuilder.h>
#include <sidplay/event.h>
--- libsidplay/Makefile.am
+++ libsidplay/Makefile.am
--- a/libsidplay/Makefile.am
+++ b/libsidplay/Makefile.am
@@ -1,4 +1,5 @@
+ACLOCAL_AMFLAGS = -I unix
AUTOMAKE_OPTIONS = foreign
SUBDIRS = unix include src
--- libsidplay/include/sidplay/SmartPtr.h
+++ libsidplay/include/sidplay/SmartPtr.h
--- a/libsidplay/include/sidplay/SmartPtr.h
+++ b/libsidplay/include/sidplay/SmartPtr.h
@@ -211,16 +211,16 @@
{
if ( bufferLen >= 1 )
@@ -70,8 +70,8 @@
}
}
};
--- libsidplay/include/sidplay/sidendian.h
+++ libsidplay/include/sidplay/sidendian.h
--- a/libsidplay/include/sidplay/sidendian.h
+++ b/libsidplay/include/sidplay/sidendian.h
@@ -141,7 +141,7 @@
// Convert high-byte and low-byte to 16-bit word.
inline uint_least16_t endian_16 (uint8_t hi, uint8_t lo)
@@ -81,8 +81,8 @@
endian_16lo8 (word, lo);
endian_16hi8 (word, hi);
return word;
--- libsidplay/unix/my_macros.m4
+++ libsidplay/unix/my_macros.m4
--- a/libsidplay/unix/my_macros.m4
+++ b/libsidplay/unix/my_macros.m4
@@ -80,8 +80,8 @@
AC_CACHE_VAL(test_cv_have_ios_binary,
[
@@ -116,16 +116,16 @@
[char* buf = new(nothrow) char[1024];],
[test_cv_have_exceptions=yes],
[test_cv_have_exceptions=no]
--- libsidutils/Makefile.am
+++ libsidutils/Makefile.am
--- a/libsidutils/Makefile.am
+++ b/libsidutils/Makefile.am
@@ -1,4 +1,5 @@
+ACLOCAL_AMFLAGS = -I unix
AUTOMAKE_OPTIONS = foreign
SUBDIRS = unix include src
--- libsidutils/include/sidplay/utils/SidUsage.h
+++ libsidutils/include/sidplay/utils/SidUsage.h
--- a/libsidutils/include/sidplay/utils/SidUsage.h
+++ b/libsidutils/include/sidplay/utils/SidUsage.h
@@ -33,7 +33,7 @@
uint_least16_t length; // usage scan length
@@ -135,8 +135,8 @@
{
*((sid_usage_t *) this) = usage;
return *this;
--- resid/Makefile.am
+++ resid/Makefile.am
--- a/resid/Makefile.am
+++ b/resid/Makefile.am
@@ -3,17 +3,17 @@
resid_headers=siddefs.h sid.h voice.h wave.h envelope.h filter.h extfilt.h pot.h spline.h
resid_sources=sid.cc voice.cc wave.cc envelope.cc filter.cc extfilt.cc pot.cc version.cc $(noinst_DATA:.dat=.cc)

5
sidplay-libs.changes
View File

@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Feb 18 19:41:09 UTC 2026 - Michal Suchanek <msuchanek@suse.de>
- Avoid obsolete %%patchN macro
-------------------------------------------------------------------
Tue Jan 10 18:58:29 UTC 2017 - olaf@aepfle.de

6
sidplay-libs.spec
View File

@@ -147,11 +147,7 @@ Authors:
Michael Schwendt <sidplay@geocities.com>
%prep
%setup -q
%patch0
%patch1
%patch2 -p1
%patch3 -p1
%autosetup -p1
%build
export CXXFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE"