public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Charles R. Anderson <cra@alum.wpi.edu>
To: git-commits@fedoraproject.org
Subject: [rpms/ocp] f43: Update to 3.3.1
Date: Sat, 18 Jul 2026 04:16:08 GMT	[thread overview]
Message-ID: <178434816826.1.760322365415357465.rpms-ocp-7f90aca834e1@fedoraproject.org> (raw)

            A new commit has been pushed.

            Repo   : rpms/ocp
            Branch : f43
            Commit : 7f90aca834e1763d34b159a6d70387f996632780
            Author : Charles R. Anderson <cra@alum.wpi.edu>
            Date   : 2026-07-17T23:37:42-04:00
            Stats  : +216/-147 in 9 file(s)
            URL    : https://src.fedoraproject.org/rpms/ocp/c/7f90aca834e1763d34b159a6d70387f996632780?branch=f43

            Log:
            Update to 3.3.1

Use SDL3
Maintain local symlinks to external libsidplayfp ROM paths

---
diff --git a/ocp-0.2.106-ini-optimize.patch b/ocp-0.2.106-ini-optimize.patch
deleted file mode 100644
index 5e2f35a..0000000
--- a/ocp-0.2.106-ini-optimize.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up ocp-0.2.106/ocp.ini.in.optimize ocp-0.2.106/ocp.ini.in
---- ocp-0.2.106/ocp.ini.in.optimize	2023-07-30 18:13:45.000000000 -0400
-+++ ocp-0.2.106/ocp.ini.in	2023-08-05 09:11:31.042860041 -0400
-@@ -27,7 +27,7 @@
- ; you can also add new devices by copying the section and renaming it.
- ; (8 chars only)
- ; note: the first device found in each list will be uses as default
--  playerdevices=devpALSA devpOSS devpCA devpSDL2 devpSDL devpNone devpDisk
-+  playerdevices=devpALSA devpSDL2 devpNone devpDisk
-   wavetabledevices=devwMixF devwMixQ devwMix devwNone
-   mixrate=44100           ; -sr44100
-   mixprocrate=4096000     ; max channels*rate (for slow cpus) (4096000==64*64000)

diff --git a/ocp-0.2.106-ini-rompaths.patch b/ocp-0.2.106-ini-rompaths.patch
deleted file mode 100644
index 8aa0c8a..0000000
--- a/ocp-0.2.106-ini-rompaths.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -up ocp-0.2.106/ocp.ini.in.rompaths ocp-0.2.106/ocp.ini.in
---- ocp-0.2.106/ocp.ini.in.rompaths	2023-07-30 18:13:45.000000000 -0400
-+++ ocp-0.2.106/ocp.ini.in	2023-08-05 09:09:18.608319915 -0400
-@@ -135,9 +135,9 @@
- ; kernal=~/roms/KERNAL.ROM
- ; basic=../BASIC.ROM
- ; chargen=/var/lib/roms/chargen.ROM
--  kernal=KERNAL.ROM
--  basic=BASIC.ROM
--  chargen=CHARGEN.ROM
-+  kernal=/usr/share/vice/C64/kernal
-+  basic=/usr/share/vice/C64/basic
-+  chargen=/usr/share/vice/C64/chargen
- 
- [adplug]
-   emulator=nuked          ; Possible values are ken, nuked, satoh woody and retrowave.

diff --git a/ocp-3.1.0-438a06dd4229471e256bab5b1071d4210c607f37.patch b/ocp-3.1.0-438a06dd4229471e256bab5b1071d4210c607f37.patch
deleted file mode 100644
index fe7a57a..0000000
--- a/ocp-3.1.0-438a06dd4229471e256bab5b1071d4210c607f37.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 438a06dd4229471e256bab5b1071d4210c607f37 Mon Sep 17 00:00:00 2001
-From: Stian Skjelstad <stian.skjelstad@gmail.com>
-Date: Sat, 17 Jan 2026 15:06:20 +0100
-Subject: [PATCH] When MIDI file is stored in memory buffer, manually update
- c->current_filename
-
----
- timidity/readmidi.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/playtimidity/timidity-git/timidity/readmidi.c b/playtimidity/timidity-git/timidity/readmidi.c
-index 9b58e14..08c1c97 100644
---- a/playtimidity/timidity-git/timidity/readmidi.c
-+++ b/playtimidity/timidity-git/timidity/readmidi.c
-@@ -4891,6 +4891,10 @@ struct timidity_file *open_midi_file(struct timiditycontext_t *c, const char *fn
- 	tf = open_file(c, fn, decompress, noise_mode);
-     else
-     {
-+        /* open_file is normally responsible for keeping current_filename up to date, which we now just skipped */
-+        free (c->current_filename);
-+        c->current_filename = strdup (fn);
-+
- 	tf = open_with_mem(c, infop->midi_data, infop->midi_data_size,
- 			   noise_mode);
- 	if(infop->compressed)

diff --git a/ocp-3.1.0-c1a7fc1377dbfc2ef9df0df5d7c87a2562a93342.patch b/ocp-3.1.0-c1a7fc1377dbfc2ef9df0df5d7c87a2562a93342.patch
deleted file mode 100644
index 5653bab..0000000
--- a/ocp-3.1.0-c1a7fc1377dbfc2ef9df0df5d7c87a2562a93342.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From c1a7fc1377dbfc2ef9df0df5d7c87a2562a93342 Mon Sep 17 00:00:00 2001
-From: Stian Skjelstad <stian.skjelstad@gmail.com>
-Date: Sat, 17 Jan 2026 15:04:54 +0100
-Subject: [PATCH] url_unexpand_home_dir() did not work correctly for $HOME did
- not end with a slash
-
----
- libarc/url.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/playtimidity/timidity-git/libarc/url.c b/playtimidity/timidity-git/libarc/url.c
-index c37500c..15175da 100644
---- a/playtimidity/timidity-git/libarc/url.c
-+++ b/playtimidity/timidity-git/libarc/url.c
-@@ -478,7 +478,7 @@ const char *url_unexpand_home_dir(struct timiditycontext_t *c, const char *fname
-         path = malloc (2 + strlen(fname) - dirlen + 1 + 1);
-         if (!path)
-             return fname;
--        sprintf (path, "~/%s", fname + dirlen - 1);
-+        sprintf (path, "~/%s", fname + dirlen + 1);
-         return path;
-     } else {
-         if(strncmp(dir, fname, dirlen) != 0)

diff --git a/ocp-3.1.1-timidity-pat-file-comment.patch b/ocp-3.1.1-timidity-pat-file-comment.patch
deleted file mode 100644
index c4a1fcf..0000000
--- a/ocp-3.1.1-timidity-pat-file-comment.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From df0bd911fc62966a40a1ab793fbdcf6620f57974 Mon Sep 17 00:00:00 2001
-From: Stian Skjelstad <stian.skjelstad@gmail.com>
-Date: Sun, 18 Jan 2026 22:09:19 +0100
-Subject: [PATCH] If loading a .pat file without using the "dir" syntax, make
- the default comment just the file-name and not the entire path provided.
-
----
- timidity/timidity.c | 18 ++++++++++++++++++
- 1 file changed, 18 insertions(+)
-
-diff --git a/playtimidity/timidity-git/timidity/timidity.c b/playtimidity/timidity-git/timidity/timidity.c
-index 65b467a..51e195d 100644
---- a/playtimidity/timidity-git/timidity/timidity.c
-+++ b/playtimidity/timidity-git/timidity/timidity.c
-@@ -1013,6 +1013,24 @@ static int set_gus_patchconf(struct timiditycontext_t *c, char *name, int line,
-     {
- 	tone->instype = 0;
- 	tone->name = safe_strdup(pat);
-+	if ((c->pathlist == &c->defaultpathlist) && (!tone->comment))
-+	{ /* fill in comment with just the filename if the "dir" syntax has not been used, the full path can be overwhelming long and already present in tone->name */
-+	    const char *forward = strrchr (pat, '/');
-+	    const char *backward = strrchr (pat, '\\');
-+	    const char *afterslash = 0;
-+	    if (forward && forward[1])
-+	    {
-+		afterslash = forward + 1;
-+	    }
-+	    if (backward && backward[1])
-+	    {
-+		if ((!afterslash) || (afterslash < (backward + 1)))
-+		{
-+		    afterslash = backward + 1;
-+		}
-+	    }
-+	    tone->comment = safe_strdup(afterslash ? afterslash : pat);
-+	}
-     }
- 
-     for(j = 0; opts[j] != NULL; j++)

diff --git a/ocp-3.3.1-rompaths.patch b/ocp-3.3.1-rompaths.patch
new file mode 100644
index 0000000..e59fe1d
--- /dev/null
+++ b/ocp-3.3.1-rompaths.patch
@@ -0,0 +1,76 @@
+diff -up ocp-3.3.1/boot/pmain.c.rompaths ocp-3.3.1/boot/pmain.c
+--- ocp-3.3.1/boot/pmain.c.rompaths	2026-05-24 15:52:24.000000000 -0400
++++ ocp-3.3.1/boot/pmain.c	2026-06-07 10:04:23.199397288 -0400
+@@ -516,9 +516,9 @@ static int init_modules(int argc, char *
+ 			cfSetProfileString("libsidplayfp", "filtercurve6581", "0.5");
+ 			cfSetProfileString("libsidplayfp", "filtercurve8580", "0.5");
+ 			cfSetProfileBool("libsidplayfp", "digiboost", 0);
+-			cfSetProfileString("libsidplayfp", "kernal", "KERNAL.ROM");
+-			cfSetProfileString("libsidplayfp", "basic", "BASIC.ROM");
+-			cfSetProfileString("libsidplayfp", "chargen", "CHARGEN.ROM");
++			cfSetProfileString("libsidplayfp", "kernal", "/usr/share/ocp/data/KERNAL.ROM");
++			cfSetProfileString("libsidplayfp", "basic", "/usr/share/ocp/data/BASIC.ROM");
++			cfSetProfileString("libsidplayfp", "chargen", "/usr/share/ocp/data/CHARGEN.ROM");
+ 		}
+ 
+ 		if (epoch < 20210118)
+@@ -799,9 +799,9 @@ static int init_modules(int argc, char *
+ 		{
+ 			char *kernal, *basic, *chargen, *iter;
+ 			printf("ocp.ini update (0.2.95) libsidplayfp ROM paths changed into UNIX syntax\n");
+-			kernal  = strdup (cfGetProfileString ("libsidplayfp", "kernal",  "KERNAL.ROM"));
+-			basic   = strdup (cfGetProfileString ("libsidplayfp", "basic",   "BASIC.ROM"));
+-			chargen = strdup (cfGetProfileString ("libsidplayfp", "chargen", "CHARGEN.ROM"));
++			kernal  = strdup (cfGetProfileString ("libsidplayfp", "kernal",  "/usr/share/ocp/data/KERNAL.ROM"));
++			basic   = strdup (cfGetProfileString ("libsidplayfp", "basic",   "/usr/share/ocp/data/BASIC.ROM"));
++			chargen = strdup (cfGetProfileString ("libsidplayfp", "chargen", "/usr/share/ocp/data/CHARGEN.ROM"));
+ 			for (iter = kernal; *iter; iter++)
+ 			{
+ 				if (*iter == '/')
+@@ -1108,6 +1108,14 @@ static int init_modules(int argc, char *
+ 
+ 		if (epoch < 20260419)
+ 		{
++			fprintf(stderr, "Fedora ocp.ini update (3.3.0) libsidplayfp ROM paths\n");
++			cfSetProfileString("libsidplayfp", "kernal", "/usr/share/ocp/data/KERNAL.ROM");
++			cfSetProfileString("libsidplayfp", "basic", "/usr/share/ocp/data/BASIC.ROM");
++			cfSetProfileString("libsidplayfp", "chargen", "/usr/share/ocp/data/CHARGEN.ROM");
++		}
++		
++		if (epoch < 20260419)
++		{
+ 			cfSetProfileInt("version", "epoch", 20260419, 10);
+ 			cfStoreConfig();
+ #ifdef _WIN32
+diff -up ocp-3.3.1/ocp.ini.in.rompaths ocp-3.3.1/ocp.ini.in
+--- ocp-3.3.1/ocp.ini.in.rompaths	2026-05-24 15:52:24.000000000 -0400
++++ ocp-3.3.1/ocp.ini.in	2026-06-07 09:54:32.978753321 -0400
+@@ -141,9 +141,9 @@
+ ; kernal=~/roms/KERNAL.ROM
+ ; basic=../BASIC.ROM
+ ; chargen=/var/lib/roms/chargen.ROM
+-  kernal=KERNAL.ROM
+-  basic=BASIC.ROM
+-  chargen=CHARGEN.ROM
++  kernal=/usr/share/ocp/data/KERNAL.ROM
++  basic=/usr/share/ocp/data/BASIC.ROM
++  chargen=/usr/share/ocp/data/CHARGEN.ROM
+ 
+ [adplug]
+   emulator=nuked          ; Possible values are ken, nuked, satoh woody and retrowave.
+diff -up ocp-3.3.1/playsid/sidconfig.c.rompaths ocp-3.3.1/playsid/sidconfig.c
+--- ocp-3.3.1/playsid/sidconfig.c.rompaths	2026-05-24 15:52:24.000000000 -0400
++++ ocp-3.3.1/playsid/sidconfig.c	2026-06-07 10:08:10.368338775 -0400
+@@ -1056,9 +1056,9 @@ static void sidConfigRun (void **token,
+ 	config_filtercurve8580 = float100x_to_int (API->configAPI->GetProfileString ("libsidplayfp", "filtercurve8580", "0.5"));
+ 	config_combinedwaveforms = CWS_to_int     (API->configAPI->GetProfileString ("libsidplayfp", "combinedwaveforms", "Strong"));
+ 	config_digiboost =                         API->configAPI->GetProfileBool   ("libsidplayfp", "digiboost",       0, 0);
+-	config_kernal = strdup                    (API->configAPI->GetProfileString ("libsidplayfp", "kernal",          "KERNEL.ROM"));
+-	config_basic = strdup                     (API->configAPI->GetProfileString ("libsidplayfp", "basic",           "BASIC.ROM"));
+-	config_chargen = strdup                   (API->configAPI->GetProfileString ("libsidplayfp", "chargen",         "CHARGEN.ROM"));
++	config_kernal = strdup                    (API->configAPI->GetProfileString ("libsidplayfp", "kernal",          "/usr/share/ocp/data/KERNAL.ROM"));
++	config_basic = strdup                     (API->configAPI->GetProfileString ("libsidplayfp", "basic",           "/usr/share/ocp/data/BASIC.ROM"));
++	config_chargen = strdup                   (API->configAPI->GetProfileString ("libsidplayfp", "chargen",         "/usr/share/ocp/data/CHARGEN.ROM"));
+ 
+ 	if (config_filtercurve6581 < 0) config_filtercurve6581 = 0;
+ 	if (config_filtercurve6581 > 100) config_filtercurve6581 = 100;

diff --git a/ocp-bundled-versions.sh b/ocp-bundled-versions.sh
index 73c7c9e..14db8dc 100755
--- a/ocp-bundled-versions.sh
+++ b/ocp-bundled-versions.sh
@@ -14,4 +14,4 @@ if [ ! -e ${tree}/configure.ac ]; then
     exit 1;
 fi
 
-grep -hEr 'AC_INIT\(|lib_major|lib_minor|lib_level' ${tree} | grep -Ev '#|='
+grep -Er 'AC_INIT\(|lib_major|lib_minor|lib_level' ${tree} | grep -Ev '#|='

diff --git a/ocp.spec b/ocp.spec
index 805f942..18c9725 100644
--- a/ocp.spec
+++ b/ocp.spec
@@ -1,11 +1,15 @@
+# LTO miscompiles ocp, causing random internal plugins to be missing:
+# https://github.com/mywave82/opencubicplayer/issues/167
+%global _lto_cflags %nil
+
 #global snapshot 0
-%global commit d9d81d02d47499d0a7c96abb6a92fb152a118a58
-%global commitdate 20260208
-%global gittag v3.1.3
+%global commit 6c9e482994ab674c8785e9d90c5373f0a9132006
+%global commitdate 20260524
+%global gittag v3.3.1
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 
 Name:		ocp
-Version:	3.1.3%{?snapshot:^%{commitdate}git%{shortcommit}}
+Version:	3.3.1%{?snapshot:^%{commitdate}git%{shortcommit}}
 Release:	1%{?dist}
 Summary:	Open Cubic Player for MOD/S3M/XM/IT/MIDI music files
 
@@ -25,8 +29,7 @@ Source1:	ftp://ftp.cubic.org/pub/player/gfx/opencp25image1.zip
 Source2:	ftp://ftp.cubic.org/pub/player/gfx/opencp25ani1.zip
 Source3:	ocp-git-snapshot.sh
 Source4:	ocp-bundled-versions.sh
-Patch0:		ocp-0.2.106-ini-optimize.patch
-Patch1:		ocp-0.2.106-ini-rompaths.patch
+Patch1:		ocp-3.3.1-rompaths.patch
 Patch2:		ocp-3.1.1-timidity-config-file.patch
 
 BuildRequires:	alsa-lib-devel
@@ -51,7 +54,7 @@ BuildRequires:	libXxf86vm-devel
 BuildRequires:	make
 BuildRequires:	ncurses-devel
 BuildRequires:	perl-interpreter
-BuildRequires:	SDL2-devel
+BuildRequires:	SDL3-devel >= 3.2.0
 BuildRequires:	texinfo
 BuildRequires:	unifont-fonts
 BuildRequires:	unzip
@@ -66,26 +69,118 @@ Requires:	unifont-fonts
 Recommends:	soundfont2-default
 
 # Bundled code
-# AC_INIT([TiMidity++],[2.15.0],[timidity-talk@lists.sourceforge.net],[TiMidity++])
+
+# ocp-3.3.1/playtimidity/timidity-git/configure.ac:AC_INIT([TiMidity++],[2.15.0],[timidity-talk@lists.sourceforge.net],[TiMidity++])
 Provides:	bundled(timidity++) = 2.15.0
-# m4_define([lib_major], [3]) m4_define([lib_minor], [0]) m4_define([lib_level], [0a]) m4_define([lib_version], [lib_major.lib_minor.lib_level]) AC_INIT([libsidplayfp],[lib_version],[],[],[https://github.com/libsidplayfp/libsidplayfp/])
-Provides:	bundled(libsidplayfp) = 3.0.0a
-# AC_INIT([adplug], [2.4.1-beta])
+
+# ocp-3.3.1/playopl/adplug-git/configure.ac:AC_INIT([adplug], [2.4.1-beta])
 Provides:	bundled(adplug) = 2.4.1-beta
-# AC_INIT([binio],[1.5],[dn.tlp@gmx.net],[libbinio])
-# const char* residfpII_version_string = "3.1.0";
+
+# ocp-3.3.1/playopl/libbinio-git/configure.ac:AC_INIT([binio],[1.5],[dn.tlp@gmx.net],[libbinio])
 Provides:	bundled(libbinio) = 1.5
-Provides:	bundled(reSIDfp) = 3.1.0
-# AC_INIT([libexsid], [2.1], [], [], [https://github.com/libsidplayfp/exsid-driver])
+
+# ocp-3.3.1/playsid/libresidfp-git/configure.ac:m4_define([lib_major], [1])
+# ocp-3.3.1/playsid/libresidfp-git/configure.ac:m4_define([lib_minor], [0])
+# ocp-3.3.1/playsid/libresidfp-git/configure.ac:m4_define([lib_level], [2])
+# ocp-3.3.1/playsid/libresidfp-git/configure.ac:m4_define([lib_version], [lib_major.lib_minor.lib_level])
+# ocp-3.3.1/playsid/libresidfp-git/configure.ac:AC_INIT([libresidfp],[lib_version],[],[],[https://github.com/libsidplayfp/libresidfp/])
+# But: const char* residfp_version_string = "@PACKAGE_VERISON"; which resolves to just the ocp version.
+Provides:	bundled(reSIDfp) = 1.0.2
+
+# ocp-3.3.1/playsid/libsidplayfp-git/configure.ac:m4_define([lib_major], [3])
+# ocp-3.3.1/playsid/libsidplayfp-git/configure.ac:m4_define([lib_minor], [0])
+# ocp-3.3.1/playsid/libsidplayfp-git/configure.ac:m4_define([lib_level], [0])
+# ocp-3.3.1/playsid/libsidplayfp-git/configure.ac:m4_define([lib_version], [lib_major.lib_minor.lib_level])
+# ocp-3.3.1/playsid/libsidplayfp-git/configure.ac:AC_INIT([libsidplayfp],[lib_version],[],[],[https://github.com/libsidplayfp/libsidplayfp/])
+Provides:	bundled(libsidplayfp) = 3.0.0
+
+# ocp-3.3.1/playsid/libsidplayfp-git/src/builders/exsid-builder/driver/configure.ac:AC_INIT([libexsid], [2.1], [], [], [https://github.com/libsidplayfp/exsid-driver])
 Provides:	bundled(libexsid) = 2.1
 
 %description
 Open Cubic Player is a music file player ported from DOS that supports
-Amiga MOD module formats and many variants, such as MTM, STM, 669,
-S3M, XM, and IT.  It is also able to render MIDI files using sound
-patches and play SID, OGG Vorbis, FLAC, and WAV files.  OCP provides a
-nice text-based interface with several text-based and graphical
-visualizations.
+Amiga-style MOD tracker module formats and many variants, MIDI files,
+various vintage computer system and game music formats, and modern
+digital audio formats. It also has integrated support for modland.com
+to play files directly from that website.  OCP provides a nice text-
+based interface with several text-based and graphical visualizations.
+
+Amiga style modules files with more (Amiga compressed files will be
+decompressed using ancient):
+
+    *.AMS, Velvet Studio and Extreme's Tracker
+    *.DMF, X-Tracker
+    *.IT, Impulse Tracker or use the modern Schism Tracker
+    *.MDL, DigiTrakker, now developed as MilkyTracker
+    *.MOD, ProTracker or use the modern ProTracker Clone
+    *.MTM, MultiTracker Module Editor
+    *.NST, NoiseTracker
+    *.OKT, Oktalyzer
+    *.PTM, PolyTracker
+    *.STM, Scream Tracker 2
+    *.S3M, Scream Tracker 3
+    *.ULT, Ultra Tracker
+    *.WOW, Grave Composer
+    *.XM, FastTracker 2 or use the modern FastTracker 2 Clone
+    *.669, Composer 669
+
+Code from STYMulator to play music from Atari ST (Yamaha YM2149):
+
+    *.YM
+
+Fork of libsidplayfp to play music from C64 (SID 6581/8580):
+
+    *.SID
+    *.RSID
+
+Code from aylet to play music from ZX Spectrum/Amstrad CPC
+(Yamaha YM2149):
+
+    *.AY
+
+Audio Files (both compressed and PCM styled):
+
+    *.WAV
+    *.OGG
+    *.FLAC
+    *.MP2
+    *.MP3
+    *.QOA Quite OK Audio
+
+Audio CDs: Linux support only, using digital read out API
+
+    *.CDA
+
+Fork of TiMidity++ is used to play MIDI:
+
+    *.MID
+
+AdPlug can read a wide range of music formats designed for the
+OPL2/OPL3 Adlib sound chip. Examples:
+
+    *.HSC
+    *.SNG
+    *.D00
+    *.ADL
+    *.VGM
+    *.RAD Reality Adlib Tracker
+
+HivelyTracker tracked music, using code from the original tracker
+repository:
+
+    *.HVL Hively Tracker
+    *.AHX AHX or use the not yet existant modern AHX Clone
+
+Game Music Emulator Support for various retro game consoles:
+
+    *.GBS, GameBoy Sound System
+    *.GYM, Genesis YM2612
+    *.HES, Hudson Entertainment Sound
+    *.KSS, Konami Sound System?
+    *.NSF *.NSFe, Nintendo Sound Format
+    *.SAP, Slight Atari Player
+    *.SPC, Super Nintendo / Super Famicom SPC-700 co-processor
+    *.VGM *.VGZ, Video Game Music
 
 
 %prep
@@ -101,6 +196,7 @@ mv license.txt license-videos.txt
 
 
 %build
+#CFLAGS="$CFLAGS -DDEBUG=1" CPPFLAGS="$CPPFLAGS -DDEBUG=1"
 %configure --with-x11 \
 	   --with-alsa \
 	   --without-coreaudio \
@@ -110,23 +206,18 @@ mv license.txt license-videos.txt
 	   --with-libgme \
 	   --with-flac \
 	   --without-sdl \
-	   --with-sdl2 \
+	   --with-sdl3 \
 	   --with-mad \
 	   --with-libiconv=auto \
 	   --with-timidity-default-path=/etc \
-%if 0%{?fedora} < 38
-	   --with-unifontdir-ttf=/usr/share/fonts/unifont \
-	   --without-unifont-csur-ttf \
-%else
 	   --with-unifont-otf=/usr/share/fonts/unifont/unifont.otf \
 	   --with-unifont-csur-otf=/usr/share/fonts/unifont/unifont_csur.otf \
 	   --with-unifont-upper-otf=/usr/share/fonts/unifont/unifont_upper.otf \
-%endif
 	   --with-dumptools \
 	   --without-update-mime-database \
 	   --without-update-desktop-database \
 	   --docdir=%{_pkgdocdir} \
-#	   --with-debug
+	   #--with-debug
 # Makefiles are not SMP-clean
 %global _smp_mflags -j1
 %make_build
@@ -154,6 +245,11 @@ desktop-file-install --add-category="Midi" \
 # install images and animations
 cp -p CPPIC*.TGA CPANI*.DAT %{buildroot}%{_datadir}/%{name}/data
 
+# create symlinks to externally-provided libsidplayfp ROM files
+ln -s ../../vice/C64/kernal-901227-03.bin %{buildroot}%{_datadir}/%{name}/data/KERNAL.ROM
+ln -s ../../vice/C64/basic-901226-01.bin %{buildroot}%{_datadir}/%{name}/data/BASIC.ROM
+ln -s ../../vice/C64/chargen-901225-01.bin %{buildroot}%{_datadir}/%{name}/data/CHARGEN.ROM
+
 # remove COPYING from buildroot/docdir as it will be installed as a license file below
 rm -f %{buildroot}%{_pkgdocdir}/COPYING
 
@@ -166,7 +262,7 @@ rm -f %{buildroot}%{_pkgdocdir}/COPYING
 %{_libdir}/%{name}
 %{_bindir}/ocp
 %{_bindir}/ocp-curses
-%{_bindir}/ocp-sdl2
+%{_bindir}/ocp-sdl3
 %{_bindir}/ocp-vcsa
 %{_bindir}/ocp-x11
 %{_bindir}/dump*
@@ -186,6 +282,20 @@ rm -f %{buildroot}%{_pkgdocdir}/COPYING
 
 
 %changelog
+* Tue May 26 2026 Charles R. Anderson <cra@alum.wpi.edu> - 3.3.1-1
+- Update to 3.3.1
+- Use SDL3
+- Maintain local symlinks to external libsidplayfp ROM paths
+
+* Fri May 22 2026 Charles R. Anderson <cra@alum.wpi.edu> - 3.3.0-1
+- Update to 3.3.0
+
+* Sun Mar 01 2026 Charles R. Anderson <cra@alum.wpi.edu> - 3.2.0-1
+- Update to 3.2.0
+- Switch from SDL2 to SDL3
+- Remove Fedora < 38 support
+- Update description
+
 * Fri Feb 13 2026 Charles R. Anderson <cra@alum.wpi.edu> - 3.1.3-1
 - Update to 3.1.3
 

diff --git a/sources b/sources
index 71ada8b..28fa8df 100644
--- a/sources
+++ b/sources
@@ -1,3 +1 @@
-SHA512 (opencp25ani1.zip) = 60a214561551db4543edbbec9d3b10e3489edc311cd800183007bc16e59ee59b7e5dafacec78732b2963ad2fcde717b3c9d91eee9c46ad7f846388f8eb119e10
-SHA512 (opencp25image1.zip) = 705bd7818ac1edd15555ca0c3b2375eff68e72bbb36940c55dc23e908915b8117ee4e53fe297c24a06861b3238026958c77d820a6921962e778a712130245423
-SHA512 (ocp-3.1.3.tar.bz2) = 0c5a93772da06b497f5595b24cb4138e92307ba48cd2755caddfc0fa67043a62a227200d56ef4abaeead7cf7cf0724e501b73c73f41a175d715e24eb43c647bd
+SHA512 (ocp-3.3.1.tar.bz2) = 743ff05414b78d9e5ad2f3da676bc27a5d4df2f16a3cf444fa6ce2b5d9e7d5ef43a942f4e6ecb8047889709af033eebadba9d0ee340a2c700c269802ae286833

                 reply	other threads:[~2026-07-18  4:16 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=178434816826.1.760322365415357465.rpms-ocp-7f90aca834e1@fedoraproject.org \
    --to=cra@alum.wpi.edu \
    --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