Prepare for release

joncampbell123 · Aug 11, 2023 · 611fd86 · 611fd86
1 parent eec598a
commit 611fd86
Show file tree

Hide file tree

Showing 23 changed files with 85 additions and 44 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,4 +1,4 @@
-Next
+2023.08.11
   - Fix stuck Ins key problems by fixing a typo in src/ints/bios_keyboard.cpp.
     The code is supposed to clear the "Ins key down" flag, but instead cleared
     all bits EXCEPT "Ins key down" (joncampbell123).

diff --git a/configure.ac b/configure.ac
@@ -1,5 +1,5 @@
 dnl Init.
-AC_INIT(dosbox-x,2023.05.01,[https://github.com/joncampbell123/dosbox-x/issues],[],[https://dosbox-x.com])
+AC_INIT(dosbox-x,2023.08.11,[https://github.com/joncampbell123/dosbox-x/issues],[],[https://dosbox-x.com])
 AC_PREREQ(2.60)
 AC_CONFIG_SRCDIR(README.md)
 

diff --git a/contrib/linux/com.dosbox_x.DOSBox-X.metainfo.xml.in b/contrib/linux/com.dosbox_x.DOSBox-X.metainfo.xml.in
@@ -10,7 +10,7 @@
     <category>Emulation</category>
   </categories>
   <releases>
-          <release version="@PACKAGE_VERSION@" date="2023-5-1"/>
+          <release version="@PACKAGE_VERSION@" date="2023-8-11"/>
   </releases>
   <screenshots>
 	  <screenshot type="default">

diff --git a/contrib/translations/de/de_DE.lng b/contrib/translations/de/de_DE.lng
@@ -1,6 +1,6 @@
 :DOSBOX-X:LANGUAGE:German
 :DOSBOX-X:CODEPAGE:858
-:DOSBOX-X:VERSION:2023.05.01
+:DOSBOX-X:VERSION:2023.08.11
 :DOSBOX-X:REMARK:
 :PROGRAM_BOOT_IMAGE_MOUNTED
 Disketten-Image(s) bereits eingehangen.

diff --git a/contrib/translations/de/de_pc98.lng b/contrib/translations/de/de_pc98.lng
@@ -1,6 +1,6 @@
 :DOSBOX-X:LANGUAGE:German
 :DOSBOX-X:CODEPAGE:858
-:DOSBOX-X:VERSION:2023.05.01
+:DOSBOX-X:VERSION:2023.08.11
 :DOSBOX-X:REMARK:
 :PROGRAM_BOOT_IMAGE_MOUNTED
 Disketten-Image(s) bereits eingehangen.

diff --git a/contrib/translations/en/en_US.lng b/contrib/translations/en/en_US.lng
@@ -1,6 +1,6 @@
 :DOSBOX-X:LANGUAGE:English (United States)
 :DOSBOX-X:CODEPAGE:437
-:DOSBOX-X:VERSION:2023.05.01
+:DOSBOX-X:VERSION:2023.08.11
 :DOSBOX-X:REMARK:
 :AUTOEXEC_CONFIGFILE_HELP
 Lines in this section will be run at startup.

diff --git a/contrib/translations/es/es_ES.lng b/contrib/translations/es/es_ES.lng
@@ -1,6 +1,6 @@
 :DOSBOX-X:LANGUAGE:Spanish (Spain)
 :DOSBOX-X:CODEPAGE:858
-:DOSBOX-X:VERSION:2023.05.01
+:DOSBOX-X:VERSION:2023.08.11
 :DOSBOX-X:REMARK:
 :AUTOEXEC_CONFIGFILE_HELP
 Las líneas de esta sección se iniciarán al inicio.

diff --git a/contrib/translations/fr/fr_FR.lng b/contrib/translations/fr/fr_FR.lng
@@ -1,6 +1,6 @@
 :DOSBOX-X:LANGUAGE:French (France)
 :DOSBOX-X:CODEPAGE:859
-:DOSBOX-X:VERSION:2023.05.01
+:DOSBOX-X:VERSION:2023.08.11
 :DOSBOX-X:REMARK:
 :AUTOEXEC_CONFIGFILE_HELP
 Les lignes de cette section seront exécutées au démarrage.

diff --git a/contrib/translations/ja/ja_JP.lng b/contrib/translations/ja/ja_JP.lng
@@ -1,6 +1,6 @@
 :DOSBOX-X:LANGUAGE:Japanese
 :DOSBOX-X:CODEPAGE:932
-:DOSBOX-X:VERSION:2023.05.01
+:DOSBOX-X:VERSION:2023.08.11
 :DOSBOX-X:REMARK:PC-98, JEGA, DOS/V エミュレーション、または とコード ページ 932 の日本語フォントを使用して、日本語の表示と印刷を直接サポートします
 :AUTOEXEC_CONFIGFILE_HELP
 このセクションに記載の行は起動時に実行されます。

diff --git a/contrib/translations/ko/ko_KR.lng b/contrib/translations/ko/ko_KR.lng
@@ -1,6 +1,6 @@
 :DOSBOX-X:LANGUAGE:Korean
 :DOSBOX-X:CODEPAGE:949
-:DOSBOX-X:VERSION:2023.05.01
+:DOSBOX-X:VERSION:2023.08.11
 :DOSBOX-X:REMARK:DOS/V 에뮬레이션 또는 코드 페이지 949의 한국어 글꼴을 사용하여 한국어 표시 및 인쇄를 직접 지원합니다.
 :AUTOEXEC_CONFIGFILE_HELP
 이 섹션에 나열된 줄은 시작할 때 실행됩니다.

diff --git a/contrib/translations/nl/nl_NL.lng b/contrib/translations/nl/nl_NL.lng
@@ -1,6 +1,6 @@
 :DOSBOX-X:LANGUAGE:Nederlands (Nederland)
 :DOSBOX-X:CODEPAGE:858
-:DOSBOX-X:VERSION:2023.05.01
+:DOSBOX-X:VERSION:2023.08.11
 :DOSBOX-X:REMARK:
 :AUTOEXEC_CONFIGFILE_HELP
 Lijnen in dit gedeelte worden uitgevoerd bij opstarten.

diff --git a/contrib/translations/pt/pt_BR.lng b/contrib/translations/pt/pt_BR.lng
@@ -1,6 +1,6 @@
 :DOSBOX-X:LANGUAGE:Portuguese (Brazil)
 :DOSBOX-X:CODEPAGE:860
-:DOSBOX-X:VERSION:2023.05.01
+:DOSBOX-X:VERSION:2023.08.11
 :DOSBOX-X:REMARK:
 :AUTOEXEC_CONFIGFILE_HELP
 As linhas nesta seção serão sempre executadas ao se iniciar o DOSBox-X.

diff --git a/contrib/translations/tr/tr_TR.lng b/contrib/translations/tr/tr_TR.lng
@@ -1,6 +1,6 @@
 :DOSBOX-X:LANGUAGE:Turkish (Turkey)
 :DOSBOX-X:CODEPAGE:857
-:DOSBOX-X:VERSION:2023.05.01
+:DOSBOX-X:VERSION:2023.08.11
 :DOSBOX-X:REMARK:
 :AUTOEXEC_CONFIGFILE_HELP
 Lines in this section will be run at startup.

diff --git a/contrib/translations/zh/zh_CN.lng b/contrib/translations/zh/zh_CN.lng
@@ -1,6 +1,6 @@
 :DOSBOX-X:LANGUAGE:Simplified Chinese
 :DOSBOX-X:CODEPAGE:936
-:DOSBOX-X:VERSION:2023.05.01
+:DOSBOX-X:VERSION:2023.08.11
 :DOSBOX-X:REMARK:建议将国家和代码页设为 86,936 并搭配中文字体; 或使用 chs 或 cn 中文 DOS/V 模式以直接支持中文显示和打印
 :AUTOEXEC_CONFIGFILE_HELP
 Lines in this section will be run at startup.

diff --git a/contrib/translations/zh/zh_TW.lng b/contrib/translations/zh/zh_TW.lng
@@ -1,6 +1,6 @@
 :DOSBOX-X:LANGUAGE:Traditional Chinese
 :DOSBOX-X:CODEPAGE:950
-:DOSBOX-X:VERSION:2023.05.01
+:DOSBOX-X:VERSION:2023.08.11
 :DOSBOX-X:REMARK:建議將國家和字碼頁設為 886,950 並搭配中文字型; 或使用 cht 或 tw 中文 DOS/V 模式以直接支援中文顯示和列印
 :AUTOEXEC_CONFIGFILE_HELP
 段落中的指令行會在啟動時執行.

diff --git a/contrib/windows/installer/DOSBox-X-installer.iss b/contrib/windows/installer/DOSBox-X-installer.iss
@@ -1,5 +1,5 @@
 #define MyAppName "DOSBox-X"
-#define MyAppVersion "2023.05.01"
+#define MyAppVersion "2023.08.11"
 #define MyAppBit "(32/64bit for Windows)"
 #define MyAppPublisher "joncampbell123 [DOSBox-X Team]"
 #define MyAppURL "https://dosbox-x.com/"

diff --git a/contrib/windows/installer/DOSBox-X-setup.iss b/contrib/windows/installer/DOSBox-X-setup.iss
@@ -1,5 +1,5 @@
 #define MyAppName "DOSBox-X"
-#define MyAppVersion "2023.05.01"
+#define MyAppVersion "2023.08.11"
 #define MyAppBit "(32-bit)"
 #define MyAppPublisher "joncampbell123 [DOSBox-X Team]"
 #define MyAppURL "https://dosbox-x.com/"

diff --git a/contrib/windows/installer/DOSBox-X-setupXP.iss b/contrib/windows/installer/DOSBox-X-setupXP.iss
@@ -1,5 +1,5 @@
 #define MyAppName "DOSBox-X"
-#define MyAppVersion "2023.05.01"
+#define MyAppVersion "2023.08.11"
 #define MyAppBit "(32/64bit for XP)"
 #define MyAppPublisher "joncampbell123 [DOSBox-X Team]"
 #define MyAppURL "https://dosbox-x.com/"

diff --git a/contrib/windows/installer/dosbox-x.reference.setup.conf b/contrib/windows/installer/dosbox-x.reference.setup.conf
@@ -1,4 +1,4 @@
-# This is the configuration file for DOSBox-X 2023.05.01. (Please use the latest version of DOSBox-X)
+# This is the configuration file for DOSBox-X 2023.08.11. (Please use the latest version of DOSBox-X)
 # Lines starting with a # are comment lines and are ignored by DOSBox-X.
 # They are used to (briefly) document the effect of each option.
 # To write out ALL options, use command 'config -all' with -wc or -writeconf options.
@@ -1468,7 +1468,7 @@ mpu401                  = intelligent
 mpubase                 = 0
 mididevice              = default
 midiconfig              = 
-samplerate              = 44100
+samplerate              = 48000
 mpuirq                  = -1
 mt32.romdir             = 
 mt32.model              = auto
@@ -1649,7 +1649,7 @@ sbmixer                                          = true
 oplmode                                          = auto
 #DOSBOX-X-ADV:adlib force timer overflow on detect             = false
 oplemu                                           = default
-oplrate                                          = 44100
+oplrate                                          = 48000
 oplport                                          = 
 retrowave_bus                                    = serial
 #DOSBOX-X-ADV:retrowave_spi_cs                                 = 0,6
@@ -1739,7 +1739,7 @@ gus                                = false
 #DOSBOX-X-ADV:clear dma tc irq if excess polling = false
 #DOSBOX-X-ADV:force master irq enable            = false
 #DOSBOX-X-ADV:gus panning table                  = default
-gusrate                            = 44100
+gusrate                            = 48000
 #DOSBOX-X-ADV:gus fixed render rate              = false
 gusmemsize                         = -1
 gus master volume                  = 0.00
@@ -1763,6 +1763,24 @@ samplerate = 22050
 sidbase    = 280
 quality    = 0
 
+[imfc]
+#DOSBOX-X-ADV:#        imfc: Enable the IBM Music Feature Card (disabled by default).
+#DOSBOX-X-ADV:#   imfc_base: The IO base address of the IBM Music Feature Card (2A20 by default).
+#DOSBOX-X-ADV:#                Possible values: 2a20, 2a30.
+#DOSBOX-X-ADV:#    imfc_irq: The IRQ number of the IBM Music Feature Card (3 by default).
+#DOSBOX-X-ADV:#                Possible values: 2, 3, 4, 5, 6, 7.
+#DOSBOX-X-ADV:# imfc_filter: Filter for the IBM Music Feature Card output:
+#DOSBOX-X-ADV:#                  on:        Filter the output (default).
+#DOSBOX-X-ADV:#                  off:       Don't filter the output.
+#DOSBOX-X-ADV-SEE:#
+#DOSBOX-X-ADV-SEE:# Advanced options (see full configuration reference file [dosbox-x.reference.full.conf] for more details):
+#DOSBOX-X-ADV-SEE:# -> imfc; imfc_base; imfc_irq; imfc_filter
+#DOSBOX-X-ADV-SEE:#
+#DOSBOX-X-ADV:imfc        = false
+#DOSBOX-X-ADV:imfc_base   = 2a20
+#DOSBOX-X-ADV:imfc_irq    = 3
+#DOSBOX-X-ADV:imfc_filter = on
+
 [speaker]
 #                              pcspeaker: Enable PC-Speaker emulation.
 #DOSBOX-X-ADV:# pcspeaker clock gate enable at startup: Start system with the clock gate (bit 0 of port 61h) on. Needed for some games that use the PC speaker for timing on IBM compatible systems.
@@ -1791,7 +1809,7 @@ pcspeaker                              = true
 #DOSBOX-X-ADV:initial frequency                      = -1
 pcrate                                 = 65536
 tandy                                  = auto
-tandyrate                              = 44100
+tandyrate                              = 48000
 disney                                 = false
 ps1audio                               = off
 ps1audiorate                           = 22050
@@ -2401,14 +2419,15 @@ ipx = false
 #            If you have multiple DOSBox-Xes running on the same network,
 #            this has to be changed for each. AC:DE:48 is an address range reserved for
 #            private use, so modify the last three number blocks, e.g. AC:DE:48:88:99:AB.
+#            Default setting is 'random' which randomly choses a MAC address.
 # backend: The backend (either pcap or slirp is supported) used for the NE2000 Ethernet emulation.
 #            If set to "auto", then "slirp" is selected when available, otherwise "pcap" is selected when available.
 #            NE2000 Ethernet emulation will be disabled if no backend is available (or the specified backend if unavailable).
-#            Possible values: pcap, slirp, auto, none.
+#            Possible values: pcap, slirp, nothing, auto, none.
 ne2000  = false
 nicbase = 300
 nicirq  = 3
-macaddr = AC:DE:48:88:99:AA
+macaddr = random
 backend = auto
 
 [ethernet, pcap]

diff --git a/dosbox-x.reference.conf b/dosbox-x.reference.conf
@@ -1,4 +1,4 @@
-# This is the configuration file for DOSBox-X 2023.05.01. (Please use the latest version of DOSBox-X)
+# This is the configuration file for DOSBox-X 2023.08.11. (Please use the latest version of DOSBox-X)
 # Lines starting with a # are comment lines and are ignored by DOSBox-X.
 # They are used to (briefly) document the effect of each option.
 # To write out ALL options, use command 'config -all' with -wc or -writeconf options.
@@ -638,7 +638,7 @@ mpu401          = intelligent
 mpubase         = 0
 mididevice      = default
 midiconfig      = 
-samplerate      = 44100
+samplerate      = 48000
 mpuirq          = -1
 mt32.romdir     = 
 mt32.model      = auto
@@ -698,7 +698,7 @@ enable speaker               = false
 sbmixer                      = true
 oplmode                      = auto
 oplemu                       = default
-oplrate                      = 44100
+oplrate                      = 48000
 oplport                      = 
 retrowave_bus                = serial
 retrowave_port               = 
@@ -733,7 +733,7 @@ blaster environment variable = true
 # -> autoamp; unmask dma; ignore channel count while active; pic unmask irq; startup initialized; dma enable on dma control polling; clear dma tc irq if excess polling; force master irq enable; gus panning table; gus fixed render rate; irq hack
 #
 gus               = false
-gusrate           = 44100
+gusrate           = 48000
 gusmemsize        = -1
 gus master volume = 0.00
 gusbase           = 240
@@ -755,6 +755,12 @@ samplerate = 22050
 sidbase    = 280
 quality    = 0
 
+[imfc]
+#
+# Advanced options (see full configuration reference file [dosbox-x.reference.full.conf] for more details):
+# -> imfc; imfc_base; imfc_irq; imfc_filter
+#
+
 [speaker]
 #    pcspeaker: Enable PC-Speaker emulation.
 #       pcrate: Sample rate of the PC-Speaker sound generation.
@@ -775,7 +781,7 @@ quality    = 0
 pcspeaker    = true
 pcrate       = 65536
 tandy        = auto
-tandyrate    = 44100
+tandyrate    = 48000
 disney       = false
 ps1audio     = off
 ps1audiorate = 22050
@@ -1164,14 +1170,15 @@ ipx = false
 #            If you have multiple DOSBox-Xes running on the same network,
 #            this has to be changed for each. AC:DE:48 is an address range reserved for
 #            private use, so modify the last three number blocks, e.g. AC:DE:48:88:99:AB.
+#            Default setting is 'random' which randomly choses a MAC address.
 # backend: The backend (either pcap or slirp is supported) used for the NE2000 Ethernet emulation.
 #            If set to "auto", then "slirp" is selected when available, otherwise "pcap" is selected when available.
 #            NE2000 Ethernet emulation will be disabled if no backend is available (or the specified backend if unavailable).
-#            Possible values: pcap, slirp, auto, none.
+#            Possible values: pcap, slirp, nothing, auto, none.
 ne2000  = false
 nicbase = 300
 nicirq  = 3
-macaddr = AC:DE:48:88:99:AA
+macaddr = random
 backend = auto
 
 [ethernet, pcap]

diff --git a/dosbox-x.reference.full.conf b/dosbox-x.reference.full.conf
@@ -1,4 +1,4 @@
-# This is the configuration file for DOSBox-X 2023.05.01. (Please use the latest version of DOSBox-X)
+# This is the configuration file for DOSBox-X 2023.08.11. (Please use the latest version of DOSBox-X)
 # Lines starting with a # are comment lines and are ignored by DOSBox-X.
 # They are used to (briefly) document the effect of each option.
 # To write out ALL options, use command 'config -all' with -wc or -writeconf options.
@@ -1428,7 +1428,7 @@ mpu401                  = intelligent
 mpubase                 = 0
 mididevice              = default
 midiconfig              = 
-samplerate              = 44100
+samplerate              = 48000
 mpuirq                  = -1
 mt32.romdir             = 
 mt32.model              = auto
@@ -1605,7 +1605,7 @@ sbmixer                                          = true
 oplmode                                          = auto
 adlib force timer overflow on detect             = false
 oplemu                                           = default
-oplrate                                          = 44100
+oplrate                                          = 48000
 oplport                                          = 
 retrowave_bus                                    = serial
 retrowave_spi_cs                                 = 0,6
@@ -1691,7 +1691,7 @@ dma enable on dma control polling  = false
 clear dma tc irq if excess polling = false
 force master irq enable            = false
 gus panning table                  = default
-gusrate                            = 44100
+gusrate                            = 48000
 gus fixed render rate              = false
 gusmemsize                         = -1
 gus master volume                  = 0.00
@@ -1715,6 +1715,20 @@ samplerate = 22050
 sidbase    = 280
 quality    = 0
 
+[imfc]
+#        imfc: Enable the IBM Music Feature Card (disabled by default).
+#   imfc_base: The IO base address of the IBM Music Feature Card (2A20 by default).
+#                Possible values: 2a20, 2a30.
+#    imfc_irq: The IRQ number of the IBM Music Feature Card (3 by default).
+#                Possible values: 2, 3, 4, 5, 6, 7.
+# imfc_filter: Filter for the IBM Music Feature Card output:
+#                  on:        Filter the output (default).
+#                  off:       Don't filter the output.
+imfc        = false
+imfc_base   = 2a20
+imfc_irq    = 3
+imfc_filter = on
+
 [speaker]
 #                              pcspeaker: Enable PC-Speaker emulation.
 # pcspeaker clock gate enable at startup: Start system with the clock gate (bit 0 of port 61h) on. Needed for some games that use the PC speaker for timing on IBM compatible systems.
@@ -1739,7 +1753,7 @@ pcspeaker clock gate enable at startup = false
 initial frequency                      = -1
 pcrate                                 = 65536
 tandy                                  = auto
-tandyrate                              = 44100
+tandyrate                              = 48000
 disney                                 = false
 ps1audio                               = off
 ps1audiorate                           = 22050
@@ -2341,14 +2355,15 @@ ipx = false
 #            If you have multiple DOSBox-Xes running on the same network,
 #            this has to be changed for each. AC:DE:48 is an address range reserved for
 #            private use, so modify the last three number blocks, e.g. AC:DE:48:88:99:AB.
+#            Default setting is 'random' which randomly choses a MAC address.
 # backend: The backend (either pcap or slirp is supported) used for the NE2000 Ethernet emulation.
 #            If set to "auto", then "slirp" is selected when available, otherwise "pcap" is selected when available.
 #            NE2000 Ethernet emulation will be disabled if no backend is available (or the specified backend if unavailable).
-#            Possible values: pcap, slirp, auto, none.
+#            Possible values: pcap, slirp, nothing, auto, none.
 ne2000  = false
 nicbase = 300
 nicirq  = 3
-macaddr = AC:DE:48:88:99:AA
+macaddr = random
 backend = auto
 
 [ethernet, pcap]

diff --git a/include/build_timestamp.h b/include/build_timestamp.h
@@ -1,4 +1,4 @@
 /*auto-generated*/
-#define UPDATED_STR "May 1, 2023 7:32:10am"
-#define GIT_COMMIT_HASH "d4e2dc8"
+#define UPDATED_STR "Aug 11, 2023 1:18:20pm"
+#define GIT_COMMIT_HASH "eec598a"
 #define COPYRIGHT_END_YEAR "2023"
diff --git a/vs/config_package.h b/vs/config_package.h
@@ -1,8 +1,8 @@
 #define PACKAGE "dosbox-x"
 #define PACKAGE_BUGREPORT "https://github.com/joncampbell123/dosbox-x/issues"
 #define PACKAGE_NAME "dosbox-x"
-#define PACKAGE_STRING "dosbox-x 2023.05.01"
+#define PACKAGE_STRING "dosbox-x 2023.08.11"
 #define PACKAGE_TARNAME "dosbox-x"
 #define PACKAGE_URL "https://dosbox-x.com"
-#define PACKAGE_VERSION "2023.05.01"
-#define VERSION "2023.05.01"
+#define PACKAGE_VERSION "2023.08.11"
+#define VERSION "2023.08.11"