public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/ocp] f43: Update to 3.4.1
@ 2026-08-15 16:00 Charles R. Anderson
0 siblings, 0 replies; only message in thread
From: Charles R. Anderson @ 2026-08-15 16:00 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/ocp
Branch : f43
Commit : ba3afcfb056a56a677a43ec735c735d0d59237a7
Author : Charles R. Anderson <cra@alum.wpi.edu>
Date : 2026-08-14T23:20:19-04:00
Stats : +104/-98 in 4 file(s)
URL : https://src.fedoraproject.org/rpms/ocp/c/ba3afcfb056a56a677a43ec735c735d0d59237a7?branch=f43
Log:
Update to 3.4.1
---
diff --git a/ocp-3.3.1-rompaths.patch b/ocp-3.3.1-rompaths.patch
deleted file mode 100644
index e59fe1d..0000000
--- a/ocp-3.3.1-rompaths.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-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-3.4.1-rompaths.patch b/ocp-3.4.1-rompaths.patch
new file mode 100644
index 0000000..02f2ca3
--- /dev/null
+++ b/ocp-3.4.1-rompaths.patch
@@ -0,0 +1,76 @@
+diff -up ocp-3.4.1/boot/pmain.c.rompaths ocp-3.4.1/boot/pmain.c
+--- ocp-3.4.1/boot/pmain.c.rompaths 2026-08-07 09:48:03.000000000 -0400
++++ ocp-3.4.1/boot/pmain.c 2026-08-14 23:08:30.428984475 -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 == '/')
+@@ -1089,6 +1089,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)
+ {
+ fprintf(stderr, "ocp.ini update (3.3.0) add [sndh]\n");
+ cfSetProfileString ("sndh", "stereomodel", "empiric");
+diff -up ocp-3.4.1/ocp.ini.in.rompaths ocp-3.4.1/ocp.ini.in
+--- ocp-3.4.1/ocp.ini.in.rompaths 2026-08-07 09:48:03.000000000 -0400
++++ ocp-3.4.1/ocp.ini.in 2026-08-14 23:07:57.148221511 -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.4.1/playsid/sidconfig.c.rompaths ocp-3.4.1/playsid/sidconfig.c
+--- ocp-3.4.1/playsid/sidconfig.c.rompaths 2026-08-07 09:48:04.000000000 -0400
++++ ocp-3.4.1/playsid/sidconfig.c 2026-08-14 23:07:57.148663923 -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.spec b/ocp.spec
index e0a5b9b..aa9210a 100644
--- a/ocp.spec
+++ b/ocp.spec
@@ -3,13 +3,13 @@
%global _lto_cflags %nil
#global snapshot 0
-%global commit 6c9e482994ab674c8785e9d90c5373f0a9132006
-%global commitdate 20260524
-%global gittag v3.3.1
+%global commit e3173207868c39d44e73a37ff404b69dc12213ae
+%global commitdate 20260807
+%global gittag v3.4.1
%global shortcommit %(c=%{commit}; echo ${c:0:7})
Name: ocp
-Version: 3.3.1%{?snapshot:^%{commitdate}git%{shortcommit}}
+Version: 3.4.1%{?snapshot:^%{commitdate}git%{shortcommit}}
Release: 1%{?dist}
Summary: Open Cubic Player for MOD/S3M/XM/IT/MIDI music files
@@ -29,7 +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
-Patch1: ocp-3.3.1-rompaths.patch
+Patch1: ocp-3.4.1-rompaths.patch
Patch2: ocp-3.1.1-timidity-config-file.patch
BuildRequires: alsa-lib-devel
@@ -70,31 +70,31 @@ Recommends: soundfont2-default
# Bundled code
-# ocp-3.3.1/playtimidity/timidity-git/configure.ac:AC_INIT([TiMidity++],[2.15.0],[timidity-talk@lists.sourceforge.net],[TiMidity++])
+# ocp-3.4.1/playtimidity/timidity-git/configure.ac:AC_INIT([TiMidity++],[2.15.0],[timidity-talk@lists.sourceforge.net],[TiMidity++])
Provides: bundled(timidity++) = 2.15.0
-# ocp-3.3.1/playopl/adplug-git/configure.ac:AC_INIT([adplug], [2.4.1-beta])
+# ocp-3.4.1/playopl/adplug-git/configure.ac:AC_INIT([adplug], [2.4.1-beta])
Provides: bundled(adplug) = 2.4.1-beta
-# ocp-3.3.1/playopl/libbinio-git/configure.ac:AC_INIT([binio],[1.5],[dn.tlp@gmx.net],[libbinio])
+# ocp-3.4.1/playopl/libbinio-git/configure.ac:AC_INIT([binio],[1.5],[dn.tlp@gmx.net],[libbinio])
Provides: bundled(libbinio) = 1.5
-# 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/])
+# ocp-3.4.1/playsid/libresidfp-git/configure.ac:m4_define([lib_major], [1])
+# ocp-3.4.1/playsid/libresidfp-git/configure.ac:m4_define([lib_minor], [2])
+# ocp-3.4.1/playsid/libresidfp-git/configure.ac:m4_define([lib_level], [0a])
+# ocp-3.4.1/playsid/libresidfp-git/configure.ac:m4_define([lib_version], [lib_major.lib_minor.lib_level])
+# ocp-3.4.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
+Provides: bundled(reSIDfp) = 1.2.0a
-# 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.4.1/playsid/libsidplayfp-git/configure.ac:m4_define([lib_major], [3])
+# ocp-3.4.1/playsid/libsidplayfp-git/configure.ac:m4_define([lib_minor], [1])
+# ocp-3.4.1/playsid/libsidplayfp-git/configure.ac:m4_define([lib_level], [0a])
+# ocp-3.4.1/playsid/libsidplayfp-git/configure.ac:m4_define([lib_version], [lib_major.lib_minor.lib_level])
+# ocp-3.4.1/playsid/libsidplayfp-git/configure.ac:AC_INIT([libsidplayfp],[lib_version],[],[],[https://github.com/libsidplayfp/libsidplayfp/])
+Provides: bundled(libsidplayfp) = 3.1.0a
-# 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])
+# ocp-3.4.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
@@ -282,6 +282,12 @@ rm -f %{buildroot}%{_pkgdocdir}/COPYING
%changelog
+* Fri Aug 7 2026 Charles R. Anderson <cra@alum.wpi.edu> - 3.4.1-1
+- Update to 3.4.1
+
+* Tue Aug 4 2026 Charles R. Anderson <cra@alum.wpi.edu> - 3.4.0-1
+- Update to 3.4.0
+
* Fri Jul 17 2026 Charles R. Anderson <cra@alum.wpi.edu> - 3.3.1-1
- Update to 3.3.1
- Use SDL3
diff --git a/sources b/sources
index 8cffb60..100e3c7 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (ocp-3.3.1.tar.bz2) = 743ff05414b78d9e5ad2f3da676bc27a5d4df2f16a3cf444fa6ce2b5d9e7d5ef43a942f4e6ecb8047889709af033eebadba9d0ee340a2c700c269802ae286833
+SHA512 (ocp-3.4.1.tar.bz2) = 21cc80f2661966eb0a1b98c2ce0d074e84aaf9b00148c6ed7dd491067abe5de798634d546535acdefe5407f49725ba72f4c3b88a1ae733aed4ffeec14899637f
SHA512 (opencp25ani1.zip) = 60a214561551db4543edbbec9d3b10e3489edc311cd800183007bc16e59ee59b7e5dafacec78732b2963ad2fcde717b3c9d91eee9c46ad7f846388f8eb119e10
SHA512 (opencp25image1.zip) = 705bd7818ac1edd15555ca0c3b2375eff68e72bbb36940c55dc23e908915b8117ee4e53fe297c24a06861b3238026958c77d820a6921962e778a712130245423
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-08-15 16:00 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-08-15 16:00 [rpms/ocp] f43: Update to 3.4.1 Charles R. Anderson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox