--- src/drivers/main.cpp.orig	2024-08-20 23:31:51 UTC

+++ src/drivers/main.cpp

@@ -181,7 +181,7 @@ static const MDFNSetting DriverSettings[] =

   { "nothrottle", MDFNSF_NOFLAGS, gettext_noop("Disable speed throttling when sound is disabled."), NULL, MDFNST_BOOL, "0"},

   { "autosave", MDFNSF_NOFLAGS, gettext_noop("Automatically load/save state on game load/close."), gettext_noop("Automatically save and load save states when a game is closed or loaded, respectively."), MDFNST_BOOL, "0"},

   { "sound.driver", MDFNSF_NOFLAGS, gettext_noop("Select sound driver."), gettext_noop("The following choices are possible, sorted by preference, high to low, when \"default\" driver is used, but dependent on being compiled in."), MDFNST_ENUM, "default", NULL, NULL, NULL, NULL, SDriver_List },

-  { "sound.device", MDFNSF_NOFLAGS, gettext_noop("Select sound output device."), gettext_noop("When using ALSA sound output under Linux, the \"sound.device\" setting \"default\" is Mednafen's default, IE \"hw:0\", not ALSA's \"default\". If you want to use ALSA's \"default\", use \"sexyal-literal-default\"."), MDFNST_STRING, "default", NULL, NULL },

+  { "sound.device", MDFNSF_NOFLAGS, gettext_noop("Select sound output device."), gettext_noop("When using ALSA sound output under Linux, the \"sound.device\" setting \"default\" is Mednafen's default, IE \"hw:0\", not ALSA's \"default\". If you want to use ALSA's \"default\", use \"sexyal-literal-default\"."), MDFNST_STRING, "sexyal-literal-default", NULL, NULL },

   { "sound.volume", MDFNSF_NOFLAGS, gettext_noop("Sound volume level, in percent."), gettext_noop("Setting this volume control higher than the default of \"100\" may severely distort the sound."), MDFNST_UINT, "100", "0", "150" },

   { "sound", MDFNSF_NOFLAGS, gettext_noop("Enable sound output."), NULL, MDFNST_BOOL, "1" },

   { "sound.period_time", MDFNSF_NOFLAGS, gettext_noop("Desired period size in microseconds(μs)."), gettext_noop("Currently only affects OSS, ALSA, WASAPI(exclusive mode), and SDL output.  A value of 0 defers to the default in the driver code in SexyAL.\n\nNote: This is not the \"sound buffer size\" setting, that would be \"\5sound.buffer_time\"."), MDFNST_UINT,  "0", "0", "100000" },

--- configure.ac.orig	2024-08-19 17:50:17 UTC

+++ configure.ac

@@ -238,7 +238,6 @@ SS_EXTRA_FLAGS=""

 # Begin ss flags

 #

 SS_EXTRA_FLAGS=""

-AX_APPEND_COMPILE_FLAGS([-mtune=haswell], SS_EXTRA_FLAGS)

 AC_SUBST(SS_EXTRA_FLAGS)

 #

 # End ss flags

@@ -626,12 +625,12 @@ if test x$with_external_tremor = xyes; then

 	[],

 	[with_external_tremor=no])

 if test x$with_external_tremor = xyes; then

-	AC_CHECK_LIB([vorbisidec], [ov_read], [], AC_MSG_ERROR([*** libvorbisidec not found!]))

-	AC_CHECK_HEADER([tremor/ivorbisfile.h], [], AC_MSG_ERROR([*** libvorbisidec not found!]))

+	AC_CHECK_LIB([vorbisfile], [ov_read], [], AC_MSG_ERROR([*** libvorbisfile not found!]))

+	AC_CHECK_HEADER([vorbis/vorbisfile.h], [], AC_MSG_ERROR([*** libvorbisfile not found!]))

 	AC_DEFINE([HAVE_EXTERNAL_TREMOR], [1], [Define if we are compiling and linking with external tremor.])

 	AM_CONDITIONAL(HAVE_EXTERNAL_TREMOR, true)

-	AC_SUBST([TREMOR_LIBS], ["-lvorbisidec"])

+	AC_SUBST([TREMOR_LIBS], ["-lvorbisfile"])

 fi

 #

--- src/cdrom/CDAFReader_Vorbis.cpp.orig	2024-04-05 02:27:32 UTC

+++ src/cdrom/CDAFReader_Vorbis.cpp

@@ -24,7 +24,7 @@

 #include "CDAFReader_Vorbis.h"

 #ifdef HAVE_EXTERNAL_TREMOR

- #include <tremor/ivorbisfile.h>

+ #include <vorbis/vorbisfile.h>

 #else

  #include <mednafen/tremor/ivorbisfile.h>

 #endif

@@ -143,7 +143,7 @@ uint64 CDAFReader_Vorbis::Read_(int16 *buffer, uint64 

  while(toread > 0)

  {

-  long didread = ov_read(&ovfile, (char*)tw_buf, toread, &cursection);

+  long didread = ov_read(&ovfile, (char*)tw_buf, toread, 0, 2, 1, &cursection);

   if(didread == 0)

    break;

%%PORTDOCS%%%%DOCSDIR%%/ChangeLog

%%PORTDOCS%%%%DOCSDIR%%/Documentation/apple2.html

%%PORTDOCS%%%%DOCSDIR%%/Documentation/apple2.php

%%PORTDOCS%%%%DOCSDIR%%/Documentation/bwolf0.png

%%PORTDOCS%%%%DOCSDIR%%/Documentation/bwolf1.png

%%PORTDOCS%%%%DOCSDIR%%/Documentation/cdplay.html

%%PORTDOCS%%%%DOCSDIR%%/Documentation/cdplay.php

%%PORTDOCS%%%%DOCSDIR%%/Documentation/cheat.html

%%PORTDOCS%%%%DOCSDIR%%/Documentation/cheats.txt

%%PORTDOCS%%%%DOCSDIR%%/Documentation/debugger.html

%%PORTDOCS%%%%DOCSDIR%%/Documentation/docgen.inc

%%PORTDOCS%%%%DOCSDIR%%/Documentation/fname_format.txt

%%PORTDOCS%%%%DOCSDIR%%/Documentation/gb.html

%%PORTDOCS%%%%DOCSDIR%%/Documentation/gb.php

%%PORTDOCS%%%%DOCSDIR%%/Documentation/gba.html

%%PORTDOCS%%%%DOCSDIR%%/Documentation/gba.php

%%PORTDOCS%%%%DOCSDIR%%/Documentation/generate.sh

%%PORTDOCS%%%%DOCSDIR%%/Documentation/gg.html

%%PORTDOCS%%%%DOCSDIR%%/Documentation/gg.php

%%PORTDOCS%%%%DOCSDIR%%/Documentation/headerbg.png

%%PORTDOCS%%%%DOCSDIR%%/Documentation/lynx.html

%%PORTDOCS%%%%DOCSDIR%%/Documentation/lynx.php

%%PORTDOCS%%%%DOCSDIR%%/Documentation/md.html

%%PORTDOCS%%%%DOCSDIR%%/Documentation/md.php

%%PORTDOCS%%%%DOCSDIR%%/Documentation/mednafen.css

%%PORTDOCS%%%%DOCSDIR%%/Documentation/mednafen.html

%%PORTDOCS%%%%DOCSDIR%%/Documentation/mednafen.php

%%PORTDOCS%%%%DOCSDIR%%/Documentation/mednafen.png

%%PORTDOCS%%%%DOCSDIR%%/Documentation/modules.def

%%PORTDOCS%%%%DOCSDIR%%/Documentation/nes.html

%%PORTDOCS%%%%DOCSDIR%%/Documentation/nes.php

%%PORTDOCS%%%%DOCSDIR%%/Documentation/netplay.html

%%PORTDOCS%%%%DOCSDIR%%/Documentation/netplay.php

%%PORTDOCS%%%%DOCSDIR%%/Documentation/ngp.html

%%PORTDOCS%%%%DOCSDIR%%/Documentation/ngp.php

%%PORTDOCS%%%%DOCSDIR%%/Documentation/pce.html

%%PORTDOCS%%%%DOCSDIR%%/Documentation/pce.php

%%PORTDOCS%%%%DOCSDIR%%/Documentation/pce_fast.html

%%PORTDOCS%%%%DOCSDIR%%/Documentation/pce_fast.php

%%PORTDOCS%%%%DOCSDIR%%/Documentation/pcfx.html

%%PORTDOCS%%%%DOCSDIR%%/Documentation/pcfx.php

%%PORTDOCS%%%%DOCSDIR%%/Documentation/psx.html

%%PORTDOCS%%%%DOCSDIR%%/Documentation/psx.php

%%PORTDOCS%%%%DOCSDIR%%/Documentation/sapphire0.png

%%PORTDOCS%%%%DOCSDIR%%/Documentation/sapphire1.png

%%PORTDOCS%%%%DOCSDIR%%/Documentation/sasplay.html

%%PORTDOCS%%%%DOCSDIR%%/Documentation/sasplay.php

%%PORTDOCS%%%%DOCSDIR%%/Documentation/settings.def

%%PORTDOCS%%%%DOCSDIR%%/Documentation/sms.html

%%PORTDOCS%%%%DOCSDIR%%/Documentation/sms.php

%%PORTDOCS%%%%DOCSDIR%%/Documentation/snes.html

%%PORTDOCS%%%%DOCSDIR%%/Documentation/snes.php

%%PORTDOCS%%%%DOCSDIR%%/Documentation/snes_faust.html

%%PORTDOCS%%%%DOCSDIR%%/Documentation/snes_faust.php

%%PORTDOCS%%%%DOCSDIR%%/Documentation/ss.html

%%PORTDOCS%%%%DOCSDIR%%/Documentation/ss.php

%%PORTDOCS%%%%DOCSDIR%%/Documentation/ssfplay.html

%%PORTDOCS%%%%DOCSDIR%%/Documentation/ssfplay.php

%%PORTDOCS%%%%DOCSDIR%%/Documentation/vb.html

%%PORTDOCS%%%%DOCSDIR%%/Documentation/vb.php

%%PORTDOCS%%%%DOCSDIR%%/Documentation/wswan.html

%%PORTDOCS%%%%DOCSDIR%%/Documentation/wswan.php

%%PORTDOCS%%%%DOCSDIR%%/README