Reply 780 of 1571, by Charles D. Ward
Thanks for your reply krcroft
I tried applying the patch, and got the following output:
$ zcat dosbox_r4267-cdda_audio_updates-rev13_2.patch.gz | patch -p1patching file configure.acHunk #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.rejpatching file Makefile.amReversed (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.rejpatching file src/dos/cdrom.hReversed (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.rejpatching file src/dos/cdrom_image.cppReversed (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.rejpatching file src/dos/drive_iso.cppThe 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 ignoredThe 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 ignoredThe 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 ignoredThe 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 ignoredThe 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 ignoredThe 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 ignoredThe 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 ignoredpatching file src/libs/decoders/dr_wav.hThe 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 ignoredThe 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 ignoredThe 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 ignoredThe 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 ignoredThe 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 ignoredThe 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 ignoredThe 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 ignoredThe 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 ignoredThe 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 ignoredThe 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 ignoredThe 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 ignoredThe 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 ignoredThe 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 ignoredpatching file src/libs/decoders/vorbis.cThe 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 ignoredThe 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 ignoredThe 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 ignoredThe 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 ignoredpatching file src/libs/Makefile.amReversed (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.rejpatching file src/Makefile.amReversed (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.rejThe 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:
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' failedmake[4]: *** [libdecoders_a-flac.o] Error 1make[4]: Leaving directory '/mnt/data/Linux Software/DOSBox ECE r4259 (Linux source)/src/libs/decoders'Makefile:332: recipe for target 'all-recursive' failedmake[3]: *** [all-recursive] Error 1make[3]: Leaving directory '/mnt/data/Linux Software/DOSBox ECE r4259 (Linux source)/src/libs'Makefile:444: recipe for target 'all-recursive' failedmake[2]: *** [all-recursive] Error 1make[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 1make[1]: Leaving directory '/mnt/data/Linux Software/DOSBox ECE r4259 (Linux source)'Makefile:337: recipe for target 'all' failedmake: *** [all] Error 2