DOSBox ECE (for Windows & Linux)

Developer's Forum, for discussion of bugs, code, and other developmental aspects of DOSBox.

Re: DOSBox ECE (for Windows & Linux)

Postby Charles D. Ward » 2019-10-20 @ 05:32

Thanks for your reply krcroft

I tried applying the patch, and got the following output:

Code: Select all
$ zcat dosbox_r4267-cdda_audio_updates-rev13_2.patch.gz | patch -p1
patching file configure.ac
Hunk #1 FAILED at 1.
Hunk #2 FAILED at 514.
Hunk #3 FAILED at 619.
3 out of 3 hunks FAILED -- saving rejects to file configure.ac.rej
patching file Makefile.am
Reversed (or previously applied) patch detected!  Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file Makefile.am.rej
patching file src/dos/cdrom.h
Reversed (or previously applied) patch detected!  Assume -R? [n]
Apply anyway? [n]
Skipping patch.
6 out of 6 hunks ignored -- saving rejects to file src/dos/cdrom.h.rej
patching file src/dos/cdrom_image.cpp
Reversed (or previously applied) patch detected!  Assume -R? [n]
Apply anyway? [n]
Skipping patch.
24 out of 24 hunks ignored -- saving rejects to file src/dos/cdrom_image.cpp.rej
patching file src/dos/drive_iso.cpp
The next patch would create the file src/libs/decoders/archive.h,
which already exists!  Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored
The next patch would create the file src/libs/decoders/audio_convert.c,
which already exists!  Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored
The next patch would create the file src/libs/decoders/docs/copying.txt,
which already exists!  Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored
The next patch would create the file src/libs/decoders/docs/credits.txt,
which already exists!  Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored
The next patch would create the file src/libs/decoders/docs/license.txt,
which already exists!  Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored
The next patch would create the file src/libs/decoders/dr_flac.h,
which already exists!  Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored
The next patch would create the file src/libs/decoders/dr_mp3.h,
which already exists!  Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored
patching file src/libs/decoders/dr_wav.h
The next patch would create the file src/libs/decoders/flac.c,
which already exists!  Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored
The next patch would create the file src/libs/decoders/internal/Makefile,
which already exists!  Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored
The next patch would create the file src/libs/decoders/Makefile.am,
which already exists!  Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored
The next patch would create the file src/libs/decoders/mp3.cpp,
which already exists!  Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored
The next patch would create the file src/libs/decoders/mp3_seek_table.cpp,
which already exists!  Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored
The next patch would create the file src/libs/decoders/mp3_seek_table.h,
which already exists!  Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored
The next patch would create the file src/libs/decoders/opus.c,
which already exists!  Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored
The next patch would create the file src/libs/decoders/SDL_sound.c,
which already exists!  Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored
The next patch would create the file src/libs/decoders/SDL_sound.h,
which already exists!  Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored
The next patch would create the file src/libs/decoders/SDL_sound_internal.h,
which already exists!  Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored
The next patch would create the file src/libs/decoders/stb.h,
which already exists!  Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored
The next patch would create the file src/libs/decoders/stb_vorbis.h,
which already exists!  Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored
The next patch would create the file src/libs/decoders/stb_vorbis_test.c,
which already exists!  Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored
patching file src/libs/decoders/vorbis.c
The next patch would create the file src/libs/decoders/wav.c,
which already exists!  Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored
The next patch would create the file src/libs/decoders/xxh3.h,
which already exists!  Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored
The next patch would create the file src/libs/decoders/xxhash.c,
which already exists!  Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored
The next patch would create the file src/libs/decoders/xxhash.h,
which already exists!  Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored
patching file src/libs/Makefile.am
Reversed (or previously applied) patch detected!  Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file src/libs/Makefile.am.rej
patching file src/Makefile.am
Reversed (or previously applied) patch detected!  Assume -R? [n]
Apply anyway? [n]
Skipping patch.
2 out of 2 hunks ignored -- saving rejects to file src/Makefile.am.rej
The next patch would create the file VERSION,
which already exists!  Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored


I'm running make now,waiting for the result :)

Edit: this is the result:

Code: Select all
In file included from flac.c:46:0:
dr_flac.h: In function ‘drflac_read_pcm_frames_s16__decode_left_side__sse2’:
dr_flac.h:8243:60: warning: implicit declaration of function ‘drflac__mm_packs_interleaved_epi32’ [-Wimplicit-function-declaration]
         _mm_storeu_si128((__m128i*)(pOutputSamples + i*8), drflac__mm_packs_interleaved_epi32(left, right));
                                                            ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
dr_flac.h:8243:60: error: incompatible type for argument 2 of ‘_mm_storeu_si128’
In file included from dr_flac.h:1052:0,
                 from flac.c:46:
/usr/lib/gcc/x86_64-linux-gnu/6/include/emmintrin.h:714:1: note: expected ‘__m128i {aka __vector(2) long long int}’ but argument is of type ‘int’
 _mm_storeu_si128 (__m128i *__P, __m128i __B)
 ^~~~~~~~~~~~~~~~
In file included from flac.c:46:0:
dr_flac.h: In function ‘drflac_read_pcm_frames_s16__decode_right_side__sse2’:
dr_flac.h:8378:60: error: incompatible type for argument 2 of ‘_mm_storeu_si128’
         _mm_storeu_si128((__m128i*)(pOutputSamples + i*8), drflac__mm_packs_interleaved_epi32(left, right));
                                                            ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from dr_flac.h:1052:0,
                 from flac.c:46:
/usr/lib/gcc/x86_64-linux-gnu/6/include/emmintrin.h:714:1: note: expected ‘__m128i {aka __vector(2) long long int}’ but argument is of type ‘int’
 _mm_storeu_si128 (__m128i *__P, __m128i __B)
 ^~~~~~~~~~~~~~~~
In file included from flac.c:46:0:
dr_flac.h: In function ‘drflac_read_pcm_frames_s16__decode_mid_side__sse2’:
dr_flac.h:8593:64: error: incompatible type for argument 2 of ‘_mm_storeu_si128’
             _mm_storeu_si128((__m128i*)(pOutputSamples + i*8), drflac__mm_packs_interleaved_epi32(left, right));
                                                                ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from dr_flac.h:1052:0,
                 from flac.c:46:
/usr/lib/gcc/x86_64-linux-gnu/6/include/emmintrin.h:714:1: note: expected ‘__m128i {aka __vector(2) long long int}’ but argument is of type ‘int’
 _mm_storeu_si128 (__m128i *__P, __m128i __B)
 ^~~~~~~~~~~~~~~~
In file included from flac.c:46:0:
dr_flac.h:8629:64: error: incompatible type for argument 2 of ‘_mm_storeu_si128’
             _mm_storeu_si128((__m128i*)(pOutputSamples + i*8), drflac__mm_packs_interleaved_epi32(left, right));
                                                                ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from dr_flac.h:1052:0,
                 from flac.c:46:
/usr/lib/gcc/x86_64-linux-gnu/6/include/emmintrin.h:714:1: note: expected ‘__m128i {aka __vector(2) long long int}’ but argument is of type ‘int’
 _mm_storeu_si128 (__m128i *__P, __m128i __B)
 ^~~~~~~~~~~~~~~~
In file included from flac.c:46:0:
dr_flac.h: In function ‘drflac_read_pcm_frames_s16__decode_independent_stereo__sse2’:
dr_flac.h:8738:60: error: incompatible type for argument 2 of ‘_mm_storeu_si128’
         _mm_storeu_si128((__m128i*)(pOutputSamples + i*8), drflac__mm_packs_interleaved_epi32(left, right));
                                                            ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from dr_flac.h:1052:0,
                 from flac.c:46:
/usr/lib/gcc/x86_64-linux-gnu/6/include/emmintrin.h:714:1: note: expected ‘__m128i {aka __vector(2) long long int}’ but argument is of type ‘int’
 _mm_storeu_si128 (__m128i *__P, __m128i __B)
 ^~~~~~~~~~~~~~~~
Makefile:455: recipe for target 'libdecoders_a-flac.o' failed
make[4]: *** [libdecoders_a-flac.o] Error 1
make[4]: Leaving directory '/mnt/data/Linux Software/DOSBox ECE r4259 (Linux source)/src/libs/decoders'
Makefile:332: recipe for target 'all-recursive' failed
make[3]: *** [all-recursive] Error 1
make[3]: Leaving directory '/mnt/data/Linux Software/DOSBox ECE r4259 (Linux source)/src/libs'
Makefile:444: recipe for target 'all-recursive' failed
make[2]: *** [all-recursive] Error 1
make[2]: Leaving directory '/mnt/data/Linux Software/DOSBox ECE r4259 (Linux source)/src'
Makefile:396: recipe for target 'all-recursive' failed
make[1]: *** [all-recursive] Error 1
make[1]: Leaving directory '/mnt/data/Linux Software/DOSBox ECE r4259 (Linux source)'
Makefile:337: recipe for target 'all' failed
make: *** [all] Error 2
Charles D. Ward
Newbie
 
Posts: 8
Joined: 2019-8-17 @ 19:42

Re: DOSBox ECE (for Windows & Linux)

Postby krcroft » 2019-10-20 @ 06:15

It will apply to vanilla DOSBox SVN 4267 (not ECE).. so it'll get you one patch toward the full set applied in the making of ECE. I'm not sure of the state of the other patches ( in terms of applying clean to current SVN)
Last edited by krcroft on 2019-10-21 @ 00:06, edited 1 time in total.
User avatar
krcroft
Member
 
Posts: 404
Joined: 2017-4-29 @ 15:07
Location: Ogden's Retreat

Re: DOSBox ECE (for Windows & Linux)

Postby Charles D. Ward » 2019-10-20 @ 07:11

I understand, hope Yesterplay80 eventually patches ECE sourcecode then :)
Charles D. Ward
Newbie
 
Posts: 8
Joined: 2019-8-17 @ 19:42

Re: DOSBox ECE (for Windows & Linux)

Postby Charles D. Ward » 2019-10-20 @ 23:57

Made a fresh install of MX Linux 19 RC1 (64 bit)

Spent some time trying to run the DosBox ECE binary, it would complain about the following missing libs:

Code: Select all
libasound.so.2   

libGL.so.1     

libpulse-simple.so.0 

libSDL_net-1.2.so.0

libfluidsynth.so.1 

libjack.so.0   

libreadline.so.7     

libX11.so.6

libglib-2.0.so.0   

libpng12.so.0

libSDL-1.2.so.0 
     
libz.so.1


After a bit of gooling, realized I needed the following packages in order to get these libs:

Code: Select all
libsdl-net1.2

libpng12-0

libfluidsynth1

libasound2

libz1

libx11-dev

libgl1-mesa-glx

libglib2.0

libjack0

libpulse0

libreadline7


I think it is not necessary to download all these packages if you already have the libs, so I made a .tar.gz file and attached it to this post

Just decompress the "lib" folder on the DosBox ECE binary folder, and then run dosbox with the following command:

Code: Select all
LD_LIBRARY_PATH=./lib ./dosbox
Attachments
DosBox-ECE[r4259]_libs.tar.gz
(2.44 MiB) Downloaded 27 times
Charles D. Ward
Newbie
 
Posts: 8
Joined: 2019-8-17 @ 19:42

Re: DOSBox ECE (for Windows & Linux)

Postby Charles D. Ward » 2019-10-21 @ 01:08

Latest source code (r4274) gives a different compiling error than r4259:

Code: Select all
In file included from glide.cpp:23:
../../include/glide.h:64:10: fatal error: sdk2_glide.h: No such file or directory
 #include <sdk2_glide.h>
          ^~~~~~~~~~~~~~
compilation terminated.
make[4]: *** [Makefile:467: glide.o] Error 1
make[4]: Leaving directory '/mnt/data/Linux Software/ECE/src/hardware'
make[3]: *** [Makefile:487: all-recursive] Error 1
make[3]: Leaving directory '/mnt/data/Linux Software/ECE/src/hardware'
make[2]: *** [Makefile:451: all-recursive] Error 1
make[2]: Leaving directory '/mnt/data/Linux Software/ECE/src'
make[1]: *** [Makefile:396: all-recursive] Error 1
make[1]: Leaving directory '/mnt/data/Linux Software/ECE'
make: *** [Makefile:337: all] Error 2
Charles D. Ward
Newbie
 
Posts: 8
Joined: 2019-8-17 @ 19:42

Re: DOSBox ECE (for Windows & Linux)

Postby Yesterplay80 » 2019-10-21 @ 06:56

krcroft wrote:Charles, this was a known issue reported by Yesterplay80 that was fixed ( viewtopic.php?f=41&t=62203&start=100#p791744), but now that you've flagged it we see the update is not in the current ECE sources; maybe Yesterplay80 can generate an updated source pack for you :-)

I just double chcked: I'm using version 13.2 of your patch, I downloaded and compared it with the file I'm uisng and it 99% identical, the missing 1% are the changed folder names and the omitted name changes to DOSBox GIT your patch adds. So that shouldn't be the problem. Though so far I can only speak for the Windows version, since I can't get ECE compiled under Linux because of a problem with the 3Dfx patch atm.

UPDATE: It might be possible, tough, that the Linux version actually still used an older version of your patch, because it is also based on an older SVN. I couldn't get it compiled any more since the latest changes to the 3Dfx patch, so I probably didn't bother checking other patches. However. Today, I got the Linux version compiled again, please give the new source code a try, Charles. It contains all recent patches for sure now! :)

Charles D. Ward wrote:Latest source code (r4274) gives a different compiling error than r4259:

Code: Select all
In file included from glide.cpp:23:
../../include/glide.h:64:10: fatal error: sdk2_glide.h: No such file or directory
 #include <sdk2_glide.h>

You need to have the header files from OpenGlide in your include directory: https://sourceforge.net/projects/openglide/
I added them to the ECE source files, too.
My full-featured DOSBox SVN builds (without debugger) for Windows: Vanilla DOSBox and DOSBox ECE (Enhanced Community Edition)
User avatar
Yesterplay80
Member
 
Posts: 450
Joined: 2016-2-23 @ 11:02
Location: Germany

Re: DOSBox ECE (for Windows & Linux)

Postby Deffnator » 2019-10-21 @ 22:38

Its possible to play with CRT Shaders or inject it with something like Reshade OpenGL?, pixel perfection is a meme and Retroarch NEC Xm29 shader + Lottes spoiled me a bit.
Deffnator
Newbie
 
Posts: 64
Joined: 2018-9-05 @ 01:03

Re: DOSBox ECE (for Windows & Linux)

Postby realnc » 2019-10-21 @ 23:25

Deffnator wrote:Its possible to play with CRT Shaders or inject it with something like Reshade OpenGL?, pixel perfection is a meme and Retroarch NEC Xm29 shader + Lottes spoiled me a bit.

RetroArch now has a DOSBox-SVN core. I've been using it for a while now :)
User avatar
realnc
Member
 
Posts: 439
Joined: 2010-10-13 @ 11:02

Re: DOSBox ECE (for Windows & Linux)

Postby Deffnator » 2019-10-22 @ 03:49

Retroarch hates Flightsticks and hotas
Deffnator
Newbie
 
Posts: 64
Joined: 2018-9-05 @ 01:03

Re: DOSBox ECE (for Windows & Linux)

Postby fr500 » 2019-10-22 @ 03:54

I still have a few plans to improve input on my core (though that means developing for RA itself and I'm not fond of doing that anymore)
I'll look into supporting more controllers soon after I finish the new core options code path and improving the disk mounting interface.
fr500
Newbie
 
Posts: 25
Joined: 2018-7-10 @ 22:49

Re: DOSBox ECE (for Windows & Linux)

Postby Yesterplay80 » 2019-10-22 @ 08:51

Deffnator wrote:Its possible to play with CRT Shaders or inject it with something like Reshade OpenGL?, pixel perfection is a meme and Retroarch NEC Xm29 shader + Lottes spoiled me a bit.

If you use one of the OpenGL output modes, you can use Reshade with DOSBox ECE, yes: viewtopic.php?f=32&t=52414&start=400#p690441
My full-featured DOSBox SVN builds (without debugger) for Windows: Vanilla DOSBox and DOSBox ECE (Enhanced Community Edition)
User avatar
Yesterplay80
Member
 
Posts: 450
Joined: 2016-2-23 @ 11:02
Location: Germany

Re: DOSBox ECE (for Windows & Linux)

Postby Srandista » 2019-10-22 @ 08:52

Kisai put updated MUNT patch into MT-32 forum, maybe it's worth to look into.

viewtopic.php?p=795640#p795640
My overkill "retro" PC - ASRock 4CoreDual-VSTA, Pentium E6500K, 512MB/4GB RAM, Radeon 9500@9700 (Softmod), ESS Solo-1 + Dreamblaster X2, 80GB IDE HDD, Win 98/XP
User avatar
Srandista
Member
 
Posts: 482
Joined: 2017-4-07 @ 17:14
Location: Czech Republic

Re: DOSBox ECE (for Windows & Linux)

Postby willow » 2019-10-25 @ 08:22

I don't know if it's possible but dsobox daum incoporated a patch to increase memory size of graphic cards until 8 Mo instead of 2mo by default in dosbox and dosbox ece.
it's neccessary for some dos games that support 1600x1200 with more than 256 colors like pro pinball.

Is it possible to integrate this patch in dosbox ece? I don't know the name of this patch.
willow
Member
 
Posts: 136
Joined: 2012-1-07 @ 22:37

Re: DOSBox ECE (for Windows & Linux)

Postby pantercat » 2019-10-26 @ 09:02

Hi, just to confirm "DOSBox ECE r4275 (Linux source).7z" compiles cleanly in a Debian system and I'm playing games with no issues so far. Thank you very much for your time maintaining a Linux build too :)
pantercat
Newbie
 
Posts: 44
Joined: 2018-9-06 @ 17:22

Re: DOSBox ECE (for Windows & Linux)

Postby Yesterplay80 » 2019-10-27 @ 23:45

willow wrote:I don't know if it's possible but dsobox daum incoporated a patch to increase memory size of graphic cards until 8 Mo instead of 2mo by default in dosbox and dosbox ece.

ECE sets 4 MB of video memory by default. Increasing the memory to 8 MB results in graphical problems under Windows 3.11.

pantercat wrote:Hi, just to confirm "DOSBox ECE r4275 (Linux source).7z" compiles cleanly in a Debian system and I'm playing games with no issues so far. Thank you very much for your time maintaining a Linux build too :)

You're welcome! :-D
My full-featured DOSBox SVN builds (without debugger) for Windows: Vanilla DOSBox and DOSBox ECE (Enhanced Community Edition)
User avatar
Yesterplay80
Member
 
Posts: 450
Joined: 2016-2-23 @ 11:02
Location: Germany

Re: DOSBox ECE (for Windows & Linux)

Postby Scandy » 2019-10-29 @ 12:05

Excuse me, surely it has already been asked but it's not easy to search in 40 pages of thread ;) There's a way to build and run DOSBOX ECE on Raspberry Pi 4?
My main goal is to play DOS titles on Raspberry while maintaining the correct aspect ratio without artifacts, and I heard that DOSBOX "vanilla" has some problems with it.
Thank you|
User avatar
Scandy
Newbie
 
Posts: 59
Joined: 2016-1-29 @ 17:06

Re: DOSBox ECE (for Windows & Linux)

Postby gdjacobs » 2019-10-29 @ 14:35

Scandy wrote:Excuse me, surely it has already been asked but it's not easy to search in 40 pages of thread ;) There's a way to build and run DOSBOX ECE on Raspberry Pi 4?
My main goal is to play DOS titles on Raspberry while maintaining the correct aspect ratio without artifacts, and I heard that DOSBOX "vanilla" has some problems with it.
Thank you|

Several ways. I usually use the build tools patch from the Debian source package.
User avatar
gdjacobs
l33t++
 
Posts: 6698
Joined: 2015-11-03 @ 05:51
Location: The Great White North

Re: DOSBox ECE (for Windows & Linux)

Postby Scandy » 2019-10-29 @ 15:47

Cool!!!

Actually I'm using DOSBOX on a real CRT monitor with a VGA666 and a Raspberry Pi 3. RPi 3 VGA output is set to 640x400, DOSBox is set to normal2x with NO aspect ratio, and I use the CRT trimmers to set the correct aspect ratio: https://twitter.com/alescandy/status/11 ... 4656625664

Sadly VGA666 has some issues with Raspberry Pi 4, so I'm wondering if I can switch to a LCD monitor, nevertheless correct aspect ratio is fundamental to me. Are you using only a patch applied to vanilla DOSBox, or do you install DOSBox ECE?
User avatar
Scandy
Newbie
 
Posts: 59
Joined: 2016-1-29 @ 17:06

Re: DOSBox ECE (for Windows & Linux)

Postby gdjacobs » 2019-10-29 @ 19:35

Usually Vanilla DOSBox with NukedOPL applied.
User avatar
gdjacobs
l33t++
 
Posts: 6698
Joined: 2015-11-03 @ 05:51
Location: The Great White North

Re: DOSBox ECE (for Windows & Linux)

Postby Scandy » 2019-10-29 @ 20:25

So no specific patch for correct aspect ratio?
User avatar
Scandy
Newbie
 
Posts: 59
Joined: 2016-1-29 @ 17:06

PreviousNext

Return to DOSBox Development

Who is online

Users browsing this forum: No registered users and 3 guests