VOGONS


First post, by BladeFireLight

User metadata
Rank Newbie
Rank
Newbie

I'm having problems patching the current CVS with the hq2x diff file. Does any one have an easy way to do this on an xp system?

or a current 0.63 based win32 build with a hq2x patch would be nice. sence the other CVS build site is off line.

-Blade FireLight

Reply 2 of 6, by BladeFireLight

User metadata
Rank Newbie
Rank
Newbie

Short and to the point.. well I found Cygwin and got it installed..

However the patch failes against the 0.63 sorce.

I get the folowing error:
Hunk #1 FAILED at 230.
1 out of 1 hunk failed -- saving rejects to file /src/dosbox.cpp.rej

That file contains this.

***************
*** 230,240 ****
secprop->Add_int("frameskip",0);
secprop->Add_bool("aspect",false);
secprop->Add_string("scaler","normal2x");
MSG_Add("RENDER_CONFIGFILE_HELP",
"frameskip -- How many frames dosbox skips before drawing one.\n"
"aspect -- Do aspect correction.\n"
"scaler -- Scaler used to enlarge/enhance low resolution modes.\n"
- " Supported are none,normal2x,advmame2x\n"
);

secprop=control->AddSection_prop("cpu",&CPU_Init);
--- 230,246 ----
secprop->Add_int("frameskip",0);
secprop->Add_bool("aspect",false);
secprop->Add_string("scaler","normal2x");
+ secprop->Add_int("hq2x_threshold_adaptive",75);
+ secprop->Add_int("hq2x_threshold",0);
MSG_Add("RENDER_CONFIGFILE_HELP",
"frameskip -- How many frames dosbox skips before drawing one.\n"
"aspect -- Do aspect correction.\n"
"scaler -- Scaler used to enlarge/enhance low resolution modes.\n"
+ " Supported are none,normal2x,advmame2x,hq2x\n"
+ "hq2x_threshold_adaptive -- The adaptive threshold used to detect edges in hq2x\n"
+ " Possible values are 0-100, can be modified with Ctrl+Alt+F5/F6\n"
+ "hq2x_threshold -- The static threshold used to detect edges in hq2x\n"
+ " Possible values are 0-255, can be modified with Ctrl+Alt+F3/F4\n"
);

secprop=control->AddSection_prop("cpu",&CPU_Init);

I would think this fails because the diff was made for 0.61. however I have little understanding of the diff files to be able to manualy make the changes in the right place.
Has any one successfuly murged hq2x with 0.63?

Reply 3 of 6, by Qbix

User metadata
Rank DOSBox Author
Rank
DOSBox Author

i think the line

 -       "          Supported are none,normal2x,advmame2x\n" 

fails as that list is different.
look in the configfile what the correct line should be

Water flows down the stream
How to ask questions the smart way!

Reply 4 of 6, by BladeFireLight

User metadata
Rank Newbie
Rank
Newbie

What a pain!

OK manualy patched that file.

Tried using the oficial instructions for building dosbox. Had the problem listed over at the hq3x thread. got current sorce on automake and autoconf. but they would not build sems MSYS does not have Perl.. ok no problem get copy of Perl.. now it wants C Library's. Grap GNU C lib. but it syas MSYS is not support.

OK start over.

Run Cygwin setup again and get GCC, Perl, try again. ./configure still says cant find libpng. download and make install that plus zlib. Same thing in ./configure. Try Make... no good dies trying to find png.h check file, it seems to be int he right place. copy the contend of cygen's include to the one in dosbox. this time make works and I have a dosbox.exe.. a 10 meg dosbox.exe WTF! replace the 0.63 1 meg file with it and mod the config to have hq2x

Runs fine, > redirect works and hq2x runs as expected.

I'm still lost one one thing..

why is my build so large?

..and is this going to degrade preformance?

Sorry i'm rambling, it's 2am and i'm running off cafeen 😵

-Blade FireLight

Reply 5 of 6, by Qbix

User metadata
Rank DOSBox Author
Rank
DOSBox Author

large build doesn't matter. It's debug info and with gcc has that little to no impact on performance
you can remove it by doing a strip dosbox.exe

Water flows down the stream
How to ask questions the smart way!