hiscore diff (with no nag/white box removal)

[kmi]

Hi, when applying the patch hi_160 in arch linux i have a lot of errors, how do I can solve the problem?

patch -p0 -E --binary <hi_160.diff

Code: [Select]

patching file src/emu/emu.mak
Hunk #1 FAILED at 46 (different line endings).
Hunk #2 FAILED at 88 (different line endings).
2 out of 2 hunks FAILED -- saving rejects to file src/emu/emu.mak.rej
patching file src/emu/emuopts.c
Hunk #1 FAILED at 52 (different line endings).
Hunk #2 FAILED at 180 (different line endings).
2 out of 2 hunks FAILED -- saving rejects to file src/emu/emuopts.c.rej
patching file src/emu/emuopts.h
Hunk #1 FAILED at 65 (different line endings).
Hunk #2 FAILED at 181 (different line endings).
Hunk #3 FAILED at 236 (different line endings).
Hunk #4 FAILED at 342 (different line endings).
4 out of 4 hunks FAILED -- saving rejects to file src/emu/emuopts.h.rej
patching file src/emu/hiscore.c
patching file src/emu/hiscore.h
patching file src/emu/machine.c
Hunk #1 FAILED at 75 (different line endings).
Hunk #2 FAILED at 115 (different line endings).
Hunk #3 FAILED at 161 (different line endings).
Hunk #4 FAILED at 352 (different line endings).
4 out of 4 hunks FAILED -- saving rejects to file src/emu/machine.c.rej
patching file src/emu/machine.h
Hunk #1 FAILED at 234 (different line endings).
1 out of 1 hunk FAILED -- saving rejects to file src/emu/machine.h.rej
patching file src/emu/mame.c
Hunk #1 FAILED at 79 (different line endings).
1 out of 1 hunk FAILED -- saving rejects to file src/emu/mame.c.rej
patching file src/emu/profiler.c
Hunk #1 FAILED at 156 (different line endings).
1 out of 1 hunk FAILED -- saving rejects to file src/emu/profiler.c.rej
patching file src/emu/profiler.h
Hunk #1 FAILED at 51 (different line endings).
1 out of 1 hunk FAILED -- saving rejects to file src/emu/profiler.h.rej
patching file src/emu/romload.c
Hunk #1 FAILED at 535 (different line endings).
1 out of 1 hunk FAILED -- saving rejects to file src/emu/romload.c.rej
patching file src/emu/ui/ui.c
Hunk #1 FAILED at 335 (different line endings).
Hunk #2 FAILED at 351 (different line endings).
Hunk #3 FAILED at 373 (different line endings).
Hunk #4 FAILED at 398 (different line endings).
4 out of 4 hunks FAILED -- saving rejects to file src/emu/ui/ui.c.rej
patching file src/emu/video.c
Hunk #1 FAILED at 466 (different line endings).
1 out of 1 hunk FAILED -- saving rejects to file src/emu/video.c.rej
patching file src/emu/video.h
Hunk #1 FAILED at 79 (different line endings).
1 out of 1 hunk FAILED -- saving rejects to file src/emu/video.h.rej
patching file src/mame/machine/cps2crpt.c
Hunk #1 FAILED at 111 (different line endings).
Hunk #2 FAILED at 672 (different line endings).
2 out of 2 hunks FAILED -- saving rejects to file src/mame/machine/cps2crpt.c.rej
patching file src/osd/modules/lib/osdobj_common.c
Hunk #1 FAILED at 335 (different line endings).
1 out of 1 hunk FAILED -- saving rejects to file src/osd/modules/lib/osdobj_common.c.rej
patching file src/osd/modules/lib/osdobj_common.h
Hunk #1 FAILED at 153 (different line endings).
1 out of 1 hunk FAILED -- saving rejects to file src/osd/modules/lib/osdobj_common.h.rej
patching file src/osd/osdepend.h
Hunk #1 FAILED at 64 (different line endings).
1 out of 1 hunk FAILED -- saving rejects to file src/osd/osdepend.h.rej
patching file src/osd/osdmini/minimain.c
Hunk #1 FAILED at 164 (different line endings).
1 out of 1 hunk FAILED -- saving rejects to file src/osd/osdmini/minimain.c.rej
patching file src/osd/osdmini/osdmini.h
Hunk #1 FAILED at 33 (different line endings).
1 out of 1 hunk FAILED -- saving rejects to file src/osd/osdmini/osdmini.h.rej
patching file src/osd/sdl/osdsdl.h
Hunk #1 FAILED at 155 (different line endings).
1 out of 1 hunk FAILED -- saving rejects to file src/osd/sdl/osdsdl.h.rej
patching file src/osd/sdl/video.c
Hunk #1 FAILED at 326 (different line endings).
1 out of 1 hunk FAILED -- saving rejects to file src/osd/sdl/video.c.rej
patching file src/osd/sdl/window.c
Hunk #1 FAILED at 1047 (different line endings).
1 out of 1 hunk FAILED -- saving rejects to file src/osd/sdl/window.c.rej
patching file src/osd/windows/video.c
Hunk #1 FAILED at 203 (different line endings).
1 out of 1 hunk FAILED -- saving rejects to file src/osd/windows/video.c.rej
patching file src/osd/windows/window.c
Hunk #1 FAILED at 826 (different line endings).
1 out of 1 hunk FAILED -- saving rejects to file src/osd/windows/window.c.rej
patching file src/osd/windows/window.h
Hunk #1 FAILED at 45 (different line endings).
1 out of 1 hunk FAILED -- saving rejects to file src/osd/windows/window.h.rej
patching file src/osd/windows/winmain.h
Hunk #1 FAILED at 269 (different line endings).
1 out of 1 hunk FAILED -- saving rejects to file src/osd/windows/winmain.h.rej

kmi - this is on account of Unix/Linux having different line endings (as the error says) than DOS/Windows.  You need to install the dos2unix package, and convert the patch before applying it.  Syntax is
dos2unix hi_160.txt
If that doesn't work, do
dos2unix *
in the folder you extracted the Mame source (and copied the patch) to.  Unfortunately, however, as stated above, this patch does not currently work for SDLMAME, which Arch Linux uses.  (I should know; I'm running Manjaro, an Arch derivative.)  Hopefully this problem will be fixed soon.

Ayjanu Thanks, did not know dos2unix, now I could apply the patch without any problem, however with version hi_155 did not have this problem.

[ayjanu]

Hmm...strange.  But yeah, I looked that up a while ago, because I used to have the same problem as you.  In my case, there was never a time where I didn't have the problem.  If I knew C (which I'm hoping to learn at some point), perhaps I could help fix the current state of the patch.  Oh well...

[GalaxianUK]

Hi,

I'm getting the following compile error on Ubuntu 14.10 having patched with 0.160.txt:

src/osd/sdl/video.c: In member function ‘virtual void sdl_osd_interface::update_hi(bool)’:
src/osd/sdl/video.c:346:67: error: ‘class sdl_window_info’ has no member named ‘next’
   for (window = sdl_window_list; window != NULL; window = window->next)
                                                                   ^
src/osd/sdl/video.c:347:12: error: ‘class sdl_window_info’ has no member named ‘video_window_update_hi’
    window->video_window_update_hi(machine());
            ^
makefile:972: recipe for target 'obj/sdl64/osd/sdl/video.o' failed
make: *** [obj/sdl64/osd/sdl/video.o] Error 1

Any pointers would be appreciated.

[kmi]

Hi,

I'm getting the following compile error on Ubuntu 14.10 having patched with 0.160.txt:

src/osd/sdl/video.c: In member function ‘virtual void sdl_osd_interface::update_hi(bool)’:
src/osd/sdl/video.c:346:67: error: ‘class sdl_window_info’ has no member named ‘next’
   for (window = sdl_window_list; window != NULL; window = window->next)
                                                                   ^
src/osd/sdl/video.c:347:12: error: ‘class sdl_window_info’ has no member named ‘video_window_update_hi’
    window->video_window_update_hi(machine());
            ^
makefile:972: recipe for target 'obj/sdl64/osd/sdl/video.o' failed
make: *** [obj/sdl64/osd/sdl/video.o] Error 1

Any pointers would be appreciated.

I have the same compile error on Arch Linux, any solution??

[cugel]

I'm not an expert, but

for (window = sdl_window_list; window != NULL; window = window->next) should be m_next no ? (related to window.h)

src/osd/sdl/video.c:347:12: error: ‘class sdl_window_info’ has no member named ‘video_window_update_hi’

Where is video_window_update_hi ? Nowhere in the code

I wonder how the patch could be works with windows ?

[GalaxianUK]

My understanding is that the patch should work for SDL Mame.

I've installed the tools suggested for Ubuntu 14.04 here: http://forums.bannister.org/ubbthreads.php?ubb=showflat&Number=35138#Post35138

Code:
sudo apt-get install build-essential subversion libsdl1.2-dev libgtk2.0-dev libgconf2-dev libsdl-ttf2.0-dev gcc-4.6 g++-4.6
sudo apt-get install libqt4-*

Should this be updated in 14.10 or is there a bug in the patch?

[MKChamp]

The patch hasn't work for SDL for a couple of versions now. Mainly because since I run on Windows, I can't test.

At any rate, I've made a stab at getting it to compile for SDL. If someone can test the patch attached and post your results, that would be great. If it works, I'll add it to the main page and include it going forward.

Thanks!

[chubsta]

Just tried compiling without the patch and all worked fine, but with the patch applied i get:

Compiling src/osd/modules/font/font_osx.c...
src/osd/sdl/window.c:1103:27: error: unused variable 'primlist' [-Werror,-Wunused-variable]
                        render_primitive_list &primlist = *m_renderer->get_primitives();Compiling src/osd/modules/font/font_none.c...
1 error generated.
make: *** [obj/sdl64/osd/sdl/window.o] Error 1

If i try to compile with NOWERROR i get a warning on the above, then it gets as far as linking mame64 but then throws this:
Linking mame64...
Undefined symbols for architecture x86_64:
  "typeinfo for osd_interface", referenced from:
      typeinfo for osd_common_t in libosd.a(osdobj_common.o)
ld: symbol(s) not found for architecture x86_64
clang: error: linker command failed with exit code 1 (use -v to see invocation)
make: *** [mame64] Error 1

[MKChamp]

The one attached takes care of the first error.

I'm not sure if the second error is due to the patch or the environment you are compiling in. Can someone try to compile with the attached patch?

[chubsta]

yep, can confirm the first error is gone but i still get the final one during the linking which doesn't occur if i just build mame straight from the source with no patch...

I am using 10.10.3 Yosemite, Xcode 6.2 6C131e.

Anyone else having any luck?

[ayjanu]

I'll try to compile it in Manjaro Linux today.  (SDL version.)

[kmi]

I have compiled in Arch Linux with hi_160_2_txt and I have the following error.

Code: [Select]

Traceback (most recent call last):
  File "src/build/makelist.py", line 62, in <module>
    if parse_file(sys.argv[1]) :
  File "src/build/makelist.py", line 42, in parse_file
    drivname += c
TypeError: Can't convert 'int' object to str implicitly
makefile:1016: fallo en las instrucciones para el objetivo 'obj/sdl64/mame/mame/drivlist.c'
make: *** [obj/sdl64/mame/mame/drivlist.c] Error 1


Code: [Select]

Compiling src/osd/sdl/window.c...
src/osd/sdl/window.c: En la función miembro ‘void sdl_window_info::update_hi()’:
src/osd/sdl/window.c:1103:27: error: variable ‘primlist’ sin usar [-Werror=unused-variable]
    render_primitive_list &primlist = *m_renderer->get_primitives();
                           ^
cc1plus: todos los avisos se tratan como errores
makefile:972: fallo en las instrucciones para el objetivo 'obj/sdl64/osd/sdl/window.o'
make: *** [obj/sdl64/osd/sdl/window.o] Error 1


[ayjanu]

Here's the error output from my attempted compile in Manjaro:

Code: [Select]

Linking mame...
obj/sdl/libosd.a(osdobj_common.o):(.rodata._ZTI12osd_common_t[_ZTI12osd_common_t]+0x18): undefined reference to `typeinfo for osd_interface'
collect2: error: ld returned 1 exit status
makefile:948: recipe for target 'mame' failed
make: *** [mame] Error 1
rm obj/sdl/osd/modules/debugger/qt/deviceinformationwindow.moc.c obj/sdl/osd/modules/debugger/qt/mainwindow.moc.c obj/sdl/osd/modules/debugger/qt/windowqt.moc.c obj/sdl/osd/modules/debugger/qt/dasmwindow.moc.c obj/sdl/osd/modules/debugger/qt/logwindow.moc.c obj/sdl/osd/modules/debugger/qt/deviceswindow.moc.c obj/sdl/osd/modules/debugger/qt/debuggerview.moc.c obj/sdl/osd/modules/debugger/qt/memorywindow.moc.c obj/sdl/osd/modules/debugger/qt/breakpointswindow.moc.c
EDIT: Interesting that our error outputs are different, despite Manjaro being a derivative of Arch.  Due to this, I should probably provide some additional details about what dependencies I have listed, and what command I use to build SDLMAME.  It's thanks to information obtained from the PKGBUILD for the sdlume package in the Arch User Repository (which I normally build, plus sdlmame has been moved to the community repository now), that I was able to find the needed dependencies and commands...

For dependencies, the following are listed as required: libxinerama, sdl2_ttf, qt4, flac, portmidi, sqlite, and expat
and the following is listed as optional: ttf-liberation

And the command I use to build:

Code: [Select]

make NOWERROR=1 PYTHON=python2 \
      BUILD_EXPAT=0 BUILD_ZLIB=0 BUILD_FLAC=0 BUILD_JPEGLIB=0 BUILD_MIDILIB=0 \
      BUILD_SQLITE3=0 \
      SUFFIX64=
Perhaps this additional information may prove useful...

[MKChamp]

I appreciate the help on this. I am not set up to compile SDL builds myself to test, so this really helps out. Try the attached patch and cross your fingers....

[chubsta]

well, this sure is odd - compiles fine now with the latest patch but when i run a game there is no video! The game seems to play blind fine, have tried with a few different ones and it is the same...

although i normally run a front-end i have tried just running the executable and it does not bring up the usual mame menu so it is not a problem that just affects games, the issue appears from the first running.

have tried a basic compile again and that is ok, just the patched one has the problem - thanks for your continuing work on this...

[MKChamp]

Thanks for helping me out. This is a joint effort!

Try the attached patch. I hope this is the one....

[kmi]

well, this sure is odd - compiles fine now with the latest patch but when i run a game there is no video! The game seems to play blind fine, have tried with a few different ones and it is the same...

although i normally run a front-end i have tried just running the executable and it does not bring up the usual mame menu so it is not a problem that just affects games, the issue appears from the first running.

have tried a basic compile again and that is ok, just the patched one has the problem - thanks for your continuing work on this...

I have the same problem, compile fine with the hi_160_3.txt but no video signal, the screen goes black.

The terminal returns this.

Code: [Select]

[ArchLinux ~]$ mame
Value 1 not supported for option sound - falling back to auto
[ArchLinux ~]$

[MKChamp]

Yep. Try hi_160_4.

[ayjanu]

I'll also try compiling with the version 4 patch.  Thanks.

Edit *to remove confusion and speculation on my behalf*: Hmm....  I'm getting the same problem as listed above.  It shows as "empty," there's no video, but audio plays, and it loads games...  Also, there's no terminal error output.  The sdlume build I built earlier (the successful attempt) has the same problem; disregard anything I said before, that you may have read in this post.  That was me just having a long day, so I thought it best to remove it before confusion arises...

[kmi]

In Archlinux with hi_160_4.txt I get the same result as hi_160_3.txt

[ayjanu]

Yes, it would seem that you and I are having the same results, kmi.  Perhaps these consistent results can be helpful, at least, in the debugging process...  It is certainly strange.  What could have changed since 0.159, that could be causing these issues?

[nitrogen_widget]

well, this sure is odd - compiles fine now with the latest patch but when i run a game there is no video! The game seems to play blind fine, have tried with a few different ones and it is the same...

although i normally run a front-end i have tried just running the executable and it does not bring up the usual mame menu so it is not a problem that just affects games, the issue appears from the first running.

have tried a basic compile again and that is ok, just the patched one has the problem - thanks for your continuing work on this...

I have the same problem, compile fine with the hi_160_3.txt but no video signal, the screen goes black.

The terminal returns this.

Code: [Select]

[ArchLinux ~]$ mame
Value 1 not supported for option sound - falling back to auto
[ArchLinux ~]$

I get the same also on PCLinuxOS with both 160_3 & 160_4.

[MKChamp]

Ok...I compiled a SDL version (in windows) and believe I've got it sorted out. Someone apply this patch (to a clean build) and let me know how it looks.

Thanks!

[ayjanu]

I'll try it now.  Will edit my post and report back whether it worked or not.

EDIT: I can confirm that it's working here!  Starts up normally, and I'm able to save high scores for games just fine again.  Thank you.  (Now, if I could only get GLSL shaders working, but that's a whole different topic...)

[chubsta]

Not sure what is happening here - compiles fine, no nag screen but i tried with Juno First and Joust and both crash mame after a couple of minutes play - not sure if that is a problem with the patch or just coincidental...

[ayjanu]

@chubsta - both games are working fine for me here.

[kmi]

Thanks MKChamp, hi_160_5.txt is perfect, I could compile without errors on Arch Linux.

[GalaxianUK]

All good here Ubuntu 14.10. Great effort chaps.

[chubsta]

Just tried again and get the same result - running a 2014 iMac latest Yosemite 10.10.3, emulous shows the following:

11:59:20.908: stderr[#0]: Invalid prescale option, reverting to '1'
11:59:21.614: stderr[#0]: Value 1 not supported for option sound - falling back to auto
11:59:23.174: stdout[#0]: FONT NAME default
12:02:27.390: stderr[#0]: mame64(24145,0x7fff79eb7300) malloc: *** error for object 0x7fcbe6713fb0: double free
12:02:27.390: stderr[#0]: *** set a breakpoint in malloc_error_break to debug

no errors with default build of mame...

if anyone else is running mame on a similar system with no problems is there any chance they could compile for me and ill see if that works?

[chubsta]

It would appear the problem revolves around 'multithreading' - with it enabled i get a crash, with it disabled everything is fine - still not sure if it is patch related or whether something else is happening. Can other people try with multithreading enabled and let me know if they suffer the same issues please?

[GalaxianUK]

No crash here with multi-threading enabled (although the frame rate drops)..

[GalaxianUK]

I've noticed that a white edged outline of the nag box (which contains no text) momentarily appears for a split second (not present in windows) just before the game loads. Hardly an issue but may be worth reporting.

[BlackGreen]

Wanted to chime in here with my experience trying to patch with the 0155 diff.

I'm running MAME on a linux box based on slackware 13.37 without SDL2 (VectorLinux), so I don't want to deal with the SDL upgrade stuff quite yet (0156+).  My purpose for upgrading was to get some of the game fixes in later versions from 0148.

I tried running dos2unix on the diff and source files, as well as upgrading my "patch" binary on the linux box.  I was still unable to to patch.  I would always get:

Code: [Select]

patch -p0 < hi_155_2.txt
Hunk #1 FAILED at <line_number> (different line endings).
The only way I could get the patch to work was to make sure to unzip the mame source and download the hiscore diff files directly on my linux box.  I also had to use the --binary option in patch:

Code: [Select]

patch --binary -p0 < hi_155_2.txt

Code: [Select]

patching file src/emu/emu.mak
patching file src/emu/emuopts.c
patching file src/emu/emuopts.h
patching file src/emu/hiscore.c
patching file src/emu/hiscore.h
patching file src/emu/machine.c
patching file src/emu/machine.h
patching file src/emu/mame.c
patching file src/emu/profiler.c
patching file src/emu/profiler.h
patching file src/emu/romload.c
patching file src/emu/ui/ui.c
patching file src/emu/video.c
patching file src/emu/video.h
patching file src/mame/machine/cps2crpt.c
patching file src/osd/osdepend.c
patching file src/osd/osdepend.h
patching file src/osd/sdl/osdsdl.h
patching file src/osd/sdl/video.c
patching file src/osd/sdl/window.c
patching file src/osd/sdl/window.h
patching file src/osd/windows/video.c
patching file src/osd/windows/window.c
patching file src/osd/windows/window.h
patching file src/osd/windows/winmain.h
So, ultimately:
> Make sure to download / unzip on the linux box to avoid CR endings.
> Use the --binary option with patch.

[lamprey]

It would appear the problem revolves around 'multithreading' - with it enabled i get a crash, with it disabled everything is fine - still not sure if it is patch related or whether something else is happening. Can other people try with multithreading enabled and let me know if they suffer the same issues please?

You might try scrolling to the bottom of this thread and see the post by Calamity to see if that helps.

[newoski]

Is it possible to patch HBMAMEUI 0.160 with nonag/white box removal?

Every time I try, I get the following error. Any tips would be really appreciated:


C:\buildtools\src>cmd.exe
Microsoft Windows [Version 6.1.7601]
Copyright (c) 2009 Microsoft Corporation.  All rights reserved.

C:\buildtools\src>patchmame hi_160

C:\buildtools\src>set path=c:\mingw\mingw64-w64\bin

C:\buildtools\src>patch -p0 -E  0<hi_160.diff
can't find file to patch at input line 4
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -Nru old/emu/emu.mak src/emu/emu.mak
|--- old/emu/emu.mak    2015-03-25 08:16:52.000000000 -0500
|+++ src/emu/emu.mak    2015-03-25 11:50:02.000000000 -0500
--------------------------
File to patch:

[chubsta]

also getting this same error on mame 161 on SDLMame...

can't find file to patch at input line 4
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -Nru old/emu/emu.mak src/emu/emu.mak
|--- old/emu/emu.mak   2015-03-25 08:16:52.000000000 -0500
|+++ src/emu/emu.mak   2015-03-25 11:50:02.000000000 -0500
--------------------------
File to patch:

[esmith13]

Impatiently waiting for a 0.161 compatible diff... 

Thanks in advance! 

[MKChamp]

Impatiently waiting for a 0.161 compatible diff... 

Thanks in advance! 

Wait no more :-)

[abelenki]

Wait no more :-)

thanks for the patch!!

[chubsta]

thanks very much!