]> git.ipfire.org Git - thirdparty/tvheadend.git/commitdiff
Silcence x265 warnings (#1368)
authorFlole998 <Flole998@users.noreply.github.com>
Tue, 27 Oct 2020 01:20:50 +0000 (02:20 +0100)
committerGitHub <noreply@github.com>
Tue, 27 Oct 2020 01:20:50 +0000 (02:20 +0100)
* Add patch

* Add patch to Makefile

Makefile.ffmpeg
support/patches/libx265-silence.patch [new file with mode: 0644]

index 5f2803ed5776342871ad3bb78ea3f2e24ccc027b..d2a3e50568dcba835a3faa929a8ecdf12f84493f 100644 (file)
@@ -67,6 +67,7 @@ LIBX265_DIFFS  = libx265.pie.diff
 else
 LIBX265_DIFFS  = libx265.pic.diff
 endif
+LIBX265_DIFFS  += libx265-silence.patch
 
 LIBVPX_VER     = 1.9.0
 LIBVPX         = libvpx-$(LIBVPX_VER)
diff --git a/support/patches/libx265-silence.patch b/support/patches/libx265-silence.patch
new file mode 100644 (file)
index 0000000..7b8ce81
--- /dev/null
@@ -0,0 +1,12 @@
+diff -urN ../x265_3.4/source/CMakeLists.old ./source/CMakeLists.txt
+--- ../x265_3.4/source/CMakeLists.old       2020-10-27 02:13:31.846580515 +0100
++++ ./source/CMakeLists.txt       2020-10-27 02:14:30.919996545 +0100
+@@ -557,7 +557,7 @@
+             list(APPEND ASM_OBJS ${ASM}.${SUFFIX})
+             add_custom_command(
+                 OUTPUT ${ASM}.${SUFFIX}
+-                COMMAND ${NASM_EXECUTABLE} ARGS ${NASM_FLAGS} ${ASM_SRC} -o ${ASM}.${SUFFIX}
++                COMMAND ${NASM_EXECUTABLE} ARGS -w-macro-params-legacy ${NASM_FLAGS} ${ASM_SRC} -o ${ASM}.${SUFFIX}
+                 DEPENDS ${ASM_SRC})
+         endforeach()
+     endif()