Prepare v0.2.106

Changelog

@@ -1,3 +1,33 @@
+Version 0.2.106
+===============
+Highlights are support for libgme, newer version of libancient, unifont files can now be bundled using --with-unifont-relative and beta support for Windows.
+
+ * [IT] Increase the number of max-samples to match openMPT (it can export files with more samples that original tracker and Schism supports)
+ * [devpdisk] Reported time during playback was random
+ * [adplug] Add support for SudoMakers RetroWave OPL3 Express, please configure it in setup:/adplugconfig.dev
+ * [adplug] Make channel tracker aware of AM/FM modes so it more correctly can display visualization
+ * [adplug] Left/Right OPL3 logic was incorrect in the register-tracker
+ * [mingw] Initial support (BETA) for mingw, enables Windows support
+ * [libancient] Add more fingerprints for compression formats that v2.1.0 can decompress
+ * [Linux CDROM] Fix deadlock
+ * [configure] cleanup --bindir --libdir and --datadir, and new syntax to override post ocp suffixes: ./configure LIBDIROCP=/usr/lib/ocp DATADIROCP=/usr/data/ocp
+ * [configure] removed --with-dir-suffix
+ * [CDROM *.CUE] REM didn't work as expected
+ * [CDROM *.CUE] files didn't work if containing INDEX 00 (pregap)
+ * [CDROM *.CUE] BINARY keyword should be little endian, but there are tools that produce big-endian files without marking them correctly. So we need to detect the endian used.
+ * [CDROM *.CUE] files didn't include pregaps in the track table
+ * [CDROM *.TOC] files didn't split the logic for pregap and offset into the raw file
+ * [musicbrainz] Increase the buffersize, some data retrivals failed
+ * [global MIME database] Add adplug fileformats
+ * [global MIME database] Add Game Music Emulator fileformats
+ * [SDL2] if entering fullscreen while in graphical effect mode, it could not be exited without visiting a textmode resolution.
+ * [SDL2] Use SDL_OpenAudioDevice(), else the expected audio format between SDL2 and OCP might not be what we expect causing random noise to be played.
+ * [X11] non-Shm usage could fail to successfully create butter on window resize
+ * [X11] If background picture is loaded in GUI modes, it was not repainted on window-resize
+ * [unifont] Allow for unifont ttf/otf files to be placed in the datadir by using ./configure --with-unifont-relative (you still need to copy the files in)
+ * [*.VGZ] Silently convert them to *.VGM
+ * [GME] Add support for Game Music Emulator library (libgme) for playback of various retro console systems
+
 Version 0.2.105
 ===============
 

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for ocp 0.2.105.
+# Generated by GNU Autoconf 2.71 for ocp 0.2.106.
 #
 # Report bugs to <[email protected]>.
 #
@@ -611,8 +611,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='ocp'
 PACKAGE_TARNAME='ocp'
-PACKAGE_VERSION='0.2.105'
-PACKAGE_STRING='ocp 0.2.105'
+PACKAGE_VERSION='0.2.106'
+PACKAGE_STRING='ocp 0.2.106'
 PACKAGE_BUGREPORT='[email protected]'
 PACKAGE_URL=''
 
@@ -1495,7 +1495,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures ocp 0.2.105 to adapt to many kinds of systems.
+\`configure' configures ocp 0.2.106 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1561,7 +1561,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of ocp 0.2.105:";;
+     short | recursive ) echo "Configuration of ocp 0.2.106:";;
    esac
   cat <<\_ACEOF
 
@@ -1796,7 +1796,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-ocp configure 0.2.105
+ocp configure 0.2.106
 generated by GNU Autoconf 2.71
 
 Copyright (C) 2021 Free Software Foundation, Inc.
@@ -2682,7 +2682,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by ocp $as_me 0.2.105, which was
+It was created by ocp $as_me 0.2.106, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   $ $0$ac_configure_args_raw
@@ -3655,14 +3655,14 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 cat >>confdefs.h <<_ACEOF
-#define DLLVERSION `printf 0x%04x%02x%02x 0 2 105`
+#define DLLVERSION `printf 0x%04x%02x%02x 0 2 106`
 _ACEOF
 
 MAJOR_VERSION=0
 
 MINOR_VERSION=2
 
-PATCH_VERSION=105
+PATCH_VERSION=106
 
 
 
@@ -18392,7 +18392,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by ocp $as_me 0.2.105, which was
+This file was extended by ocp $as_me 0.2.106, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -18456,7 +18456,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
-ocp config.status 0.2.105
+ocp config.status 0.2.106
 configured by $0, generated by GNU Autoconf 2.71,
   with options \\"\$ac_cs_config\\"
 

configure.ac

@@ -1,6 +1,6 @@
 m4_define([MAJOR_VERSION], [0])
 m4_define([MINOR_VERSION], [2])
-m4_define([PATCH_VERSION], [105])
+m4_define([PATCH_VERSION], [106])
 AC_INIT([ocp],[MAJOR_VERSION.MINOR_VERSION.PATCH_VERSION],[[email protected]])
 AC_DEFINE_UNQUOTED(DLLVERSION, `printf 0x%04x%02x%02x MAJOR_VERSION MINOR_VERSION PATCH_VERSION`)
 AC_SUBST([MAJOR_VERSION], [MAJOR_VERSION])

ocp.spec

@@ -1,13 +1,7 @@
 # rpm spec file for RedHat / Fedora linux
 
 %define name ocp
-%define version 0.2.105
-
-# Default to _with_libmad if neither _with_libmad or _without_libmad is defined
-%{!?_with_libmad: %{!?_without_libmad: %define _with_libmad --with-libmad}}
-
-# Error if both _with_libmad and _without_libmad is defined
-%{?_with_libmad: %{?_without_libmad: %{error: both _with_libmad and _without_libmad}}}
+%define version 0.2.106
 
 Name: %{name}
 Version: %{version}
@@ -24,56 +18,56 @@ License: GPL-2, Creative Commons Attribution 3.0
 # The extra data provided is Creative Commons Attribute 3.0
 
 %if 0%{?suse_version}
-BuildRequires: ncurses-devel zlib-devel bzip2-devel libSDL2-devel libogg-devel libvorbis-devel gcc >= 3.0-0 gcc-c++ >= 3.0-0 flac-devel desktop-file-utils hicolor-icon-theme unzip texinfo update-desktop-files libjpeg62-turbo-devel libpng16-devel xa libdiscid-devel cjson-devel alsa-devel libfreetype2-devel gnu-unifont-bitmap-fonts ancient
+BuildRequires: ncurses-devel zlib-devel bzip2-devel libmad-devel libSDL2-devel libogg-devel libvorbis-devel gcc >= 3.0-0 gcc-c++ >= 3.0-0 flac-devel desktop-file-utils hicolor-icon-theme unzip texinfo update-desktop-files libjpeg62-turbo-devel libpng16-devel xa libdiscid-devel cjson-devel alsa-devel libfreetype2-devel gnu-unifont-bitmap-fonts libgme-devel ancient-devel
 %else
 %if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version}
-BuildRequires: ncurses-devel zlib-devel bzip2-devel SDL2-devel libogg-devel libvorbis-devel gcc >= 3.0-0 gcc-c++ >= 3.0-0 flac-devel desktop-file-utils hicolor-icon-theme unzip texinfo libjpeg-turbo-devel libpng-devel xa libdiscid-devel cjson-devel alsa-lib-devel libfreetype-devel unifont-fonts ancient
+BuildRequires: ncurses-devel zlib-devel bzip2-devel libmad-devel SDL2-devel libogg-devel libvorbis-devel gcc >= 3.0-0 gcc-c++ >= 3.0-0 flac-devel desktop-file-utils hicolor-icon-theme unzip texinfo libjpeg-turbo-devel libpng-devel xa libdiscid-devel cjson-devel alsa-lib-devel libfreetype-devel unifont-fonts ancient-devel game-music-emulator-devel
 %else
-BuildRequires: ncurses-devel zlib-devel bzip2-devel libSDL2-devel libogg-devel libvorbis-devel gcc >= 3.0-0 gcc-c++ >= 3.0-0 flac-devel desktop-file-utils hicolor-icon-theme unzip texinfo libjpeg-turbo-devel libpng-devel xa libdiscid-devel cjson-devel alsa-lib-devel libfreetype-devel unifont-fonts ancient
+BuildRequires: ncurses-devel zlib-devel bzip2-devel libmad-devel libSDL2-devel libogg-devel libvorbis-devel gcc >= 3.0-0 gcc-c++ >= 3.0-0 flac-devel desktop-file-utils hicolor-icon-theme unzip texinfo libjpeg-turbo-devel libpng-devel xa libdiscid-devel cjson-devel alsa-lib-devel libfreetype-devel unifont-fonts ancient-devel libgme-devel
 %endif
 %endif
 
-# Include libmad if given
-%{?_with_libmad:BuildRequires: libmad-devel}
-
 %description
 Open Cubic Player is a music player ported from DOS. Provides a nice text-based
 frontend, with some few optional features in graphical. Plays modules, sids,
 wave and mp3
 
 %changelog
- Changes from version 0.2.103 to 0.2.105:
-
- * Update libsidplayfp
- * Update adplug
-   * Latest version of the upstream version
-     * Adds support for *.PIS and *.MTR
-   * Reimplemented the OPL2/3 status viewer
-   * Buffer for compositing tracker data for music that supports this, was not
-     cleared between pattern loads. Causing visual data to be accumulated.
-   * OCP now supports multiple of the emulator implementations
-   * Default emulator to use has been changed
-   * Configuration dialog added into setup:
- * Elapsed time is now based on played samples and not counting seconds passed
- * Screen resizing should be more consistent on remembering settings
- * Add support for 3-bytes-per-pixel in SDL 1.x
- * Files that are detected as valid for libancient but fails decompression,
-   OCP failed to reset the filehandler read-position back to 0.
- * Track viewer had some excessive CPU usage
- * Analyzer viewer has the scale gain range increased, and the current gain is
-   visible in the header.
- * Quick help documentation has been updated, with special focus on the keyboard
-   shortcuts.
- * Avoid crash if attempting to access graphical viewer moder when running in
-   curses (text only).
+ Changes from version 0.2.105 to 0.2.106:
+
+ * [IT] Increase the number of max-samples to match openMPT (it can export files with more samples that original tracker and Schism supports)
+ * [devpdisk] Reported time during playback was random
+ * [adplug] Add support for SudoMakers RetroWave OPL3 Express, please configure it in setup:/adplugconfig.dev
+ * [adplug] Make channel tracker aware of AM/FM modes so it more correctly can display visualization
+ * [adplug] Left/Right OPL3 logic was incorrect in the register-tracker
+ * [mingw] Initial support (BETA) for mingw, enables Windows support
+ * [libancient] Add more fingerprints for compression formats that v2.1.0 can decompress
+ * [Linux CDROM] Fix deadlock
+ * [configure] cleanup --bindir --libdir and --datadir, and new syntax to override post ocp suffixes: ./configure LIBDIROCP=/usr/lib/ocp DATADIROCP=/usr/data/ocp
+ * [configure] removed --with-dir-suffix
+ * [CDROM *.CUE] REM didn't work as expected
+ * [CDROM *.CUE] files didn't work if containing INDEX 00 (pregap)
+ * [CDROM *.CUE] BINARY keyword should be little endian, but there are tools that produce big-endian files without marking them correctly. So we need to detect the endian used.
+ * [CDROM *.CUE] files didn't include pregaps in the track table
+ * [CDROM *.TOC] files didn't split the logic for pregap and offset into the raw file
+ * [musicbrainz] Increase the buffersize, some data retrivals failed
+ * [global MIME database] Add adplug fileformats
+ * [global MIME database] Add Game Music Emulator fileformats
+ * [SDL2] if entering fullscreen while in graphical effect mode, it could not be exited without visiting a textmode resolution.
+ * [SDL2] Use SDL_OpenAudioDevice(), else the expected audio format between SDL2 and OCP might not be what we expect causing random noise to be played.
+ * [X11] non-Shm usage could fail to successfully create butter on window resize
+ * [X11] If background picture is loaded in GUI modes, it was not repainted on window-resize
+ * [unifont] Allow for unifont ttf/otf files to be placed in the datadir by using ./configure --with-unifont-relative (you still need to copy the files in)
+ * [*.VGZ] Silently convert them to *.VGM
+ * [GME] Add support for Game Music Emulator library (libgme) for playback of various retro console systems
 
 %prep
 %setup -q -n %{name}-%{version}
 unzip $RPM_SOURCE_DIR/opencp25image1.zip
 unzip -o $RPM_SOURCE_DIR/opencp25ani1.zip
 
 %build
-CFLAGS=$RPM_OPT_FLAGS CXXFLAGS=$RPM_OPT_FLAGS ./configure --prefix=%{_prefix} --exec_prefix=%{_exec_prefix} --infodir=%{_infodir} --sysconfdir=/etc %{?_with_libmad} %{?_without_libmad}
+CFLAGS=$RPM_OPT_FLAGS CXXFLAGS=$RPM_OPT_FLAGS ./configure --prefix=%{_prefix} --exec_prefix=%{_exec_prefix} --infodir=%{_infodir} --sysconfdir=/etc
 make
 
 %post
@@ -97,17 +91,14 @@ make DESTDIR=%{buildroot} install
 %if 0%{?suse_version}
  %suse_update_desktop_file -n -r cubic.org-opencubicplayer AudioVideo Player
 %endif
-mkdir -p %{buildroot}%{_prefix}/share/ocp-%{version}/data
-cp CP* %{buildroot}%{_prefix}/share/ocp-%{version}/data
-rm -f %{buildroot}/%{_infodir}/dir
 
 %clean
 rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
-%config %{_prefix}/share/ocp-%{version}/etc/ocp.ini
-%{_exec_prefix}/lib/ocp-%{version}
+%config %{_prefix}/share/ocp/etc/ocp.ini
+%{_exec_prefix}/lib/ocp
 %{_prefix}/bin/ocp
 %{_prefix}/bin/ocp-curses
 %{_prefix}/bin/ocp-sdl2
@@ -123,13 +114,7 @@ rm -rf %{buildroot}
 %{_prefix}/share/icons/hicolor/scalable/apps/opencubicplayer.svg
 %{_prefix}/share/applications/cubic.org-opencubicplayer.desktop
 
-%dir %{_prefix}/share/ocp-%{version}
-#%dir %{_prefix}/share/ocp-%{version}/data
-%dir %{_prefix}/share/ocp-%{version}/etc
-%{_prefix}/share/ocp-%{version}/data
-#data/ocp.hlp
-#data/CP*.TAG
-#data/CP*.DAT
+%dir %{_prefix}/share/ocp
 
-%docdir %{_prefix}/share/doc/ocp-%{version}
-%{_prefix}/share/doc/ocp-%{version}
+%docdir %{_prefix}/share/doc/ocp
+%{_prefix}/share/doc/ocp