[patch] add space in opus checking

[sl1pkn07]

Code Select Expand


-- Checking for OPUS
-- *****************
-- Found opus/opus.h
-- Found opus library
-- Found opus_decoder_init in /usr/lib64/libopus.so
-- Found LIBOPUS
-- Compiler Flags: /usr/include
-- Linker Flags  : /usr/lib64/libopus.so
-- Checking for ALSA
-- *****************
-- Looking for snd_seq_create_simple_port in asound
-- Looking for snd_seq_create_simple_port in asound - found


Code Select Expand


diff --git a/cmake/admCheckOpus.cmake b/cmake/admCheckOpus.cmake
index 8fd8051..a425072 100644
--- a/cmake/admCheckOpus.cmake
+++ b/cmake/admCheckOpus.cmake
@@ -18,6 +18,12 @@ MACRO(checkOpusDec)
                 ELSE (OPUS)
                   MESSAGE("${MSG_DISABLE_OPTION}")
                 ENDIF (OPUS)
+
+ SET(OPUS_CHECKED 1)
+
+ MESSAGE("")
+
ENDIF (NOT OPUS_CHECKED)
+
APPEND_SUMMARY_LIST("Audio Decoder" "Opus" "${LIBOPUS_FOUND}")
ENDMACRO(checkOpusDec)


Code Select Expand


-- Checking for OPUS
-- *****************
-- Found opus/opus.h
-- Found opus library
-- Found opus_decoder_init in /usr/lib64/libopus.so
-- Found LIBOPUS
-- Compiler Flags: /usr/include
-- Linker Flags  : /usr/lib64/libopus.so

-- Checking for ALSA


[eumagga0x2a]

patch complains

Code Select Expand

patch --dry-run -p1 < ../../build-opus-checked-by-sl1pkn07.patch
checking file cmake/admCheckOpus.cmake
Hunk #1 FAILED at 18 (different line endings).
1 out of 1 hunk FAILED


when copypasting from the browser. I attach your patch as a file for convenience.

[sl1pkn07]

try add --binary

[eumagga0x2a]

"--binary" seems to be not convincing enough for patch, unfortunately. Still the same error.

[sl1pkn07]

Then wait my back to home xd

[eumagga0x2a]

It feels like there is some misunderstanding. I applied the content of your patch to make/admCheckOpus.cmake manually and generated the "build-opus-checked-by-sl1pkn07.patch" patch attached to http://avidemux.org/smif/index.php/topic,17073.msg76536.html#msg76536. This file is a ready-to-use version of your patch without alterations to the content but with line endings to patch's liking.

[sl1pkn07]

my patches is generated by 'git diff > patch.patch'. i think the problem is with my text editor (kate). don't like the windows/dos EOL