git: 4a9eb2b55c70 - main - multimedia/x265: include <sys/types.h> before <md5.h>
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 18 Dec 2023 16:31:56 UTC
The branch main has been updated by mi:
URL: https://cgit.FreeBSD.org/ports/commit/?id=4a9eb2b55c70f3057a82966c77542484ab434373
commit 4a9eb2b55c70f3057a82966c77542484ab434373
Author: Mikhail Teterin <mi@FreeBSD.org>
AuthorDate: 2023-12-18 16:28:44 +0000
Commit: Mikhail Teterin <mi@FreeBSD.org>
CommitDate: 2023-12-18 16:31:48 +0000
multimedia/x265: include <sys/types.h> before <md5.h>
Though it worked on some releases, where another header quietly
drags-in the types.h, it was broken on FreeBSD-12.x.
Suggested by: John Hein
PR: 274526
---
multimedia/x265/files/patch-md5 | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/multimedia/x265/files/patch-md5 b/multimedia/x265/files/patch-md5
index 7bc99e1423a3..0c7837b8f9ec 100644
--- a/multimedia/x265/files/patch-md5
+++ b/multimedia/x265/files/patch-md5
@@ -1,15 +1,16 @@
--- source/common/picyuv.h 2023-06-27 10:11:49.000000000 -0400
+++ source/common/picyuv.h 2023-10-22 21:14:09.423270000 -0400
-@@ -26,5 +26,5 @@
+@@ -26,5 +26,6 @@
#include "common.h"
-#include "md5.h"
++#include <sys/types.h>
+#include <md5.h>
#include "x265.h"
struct x265_picyuv {};
--- source/encoder/frameencoder.h 2023-06-27 10:11:49.000000000 -0400
+++ source/encoder/frameencoder.h 2023-10-22 21:14:52.414503000 -0400
-@@ -31,5 +31,4 @@
+@@ -31,5 +31,4 @@
#include "frame.h"
#include "picyuv.h"
-#include "md5.h"
@@ -17,16 +18,17 @@
#include "analysis.h"
--- source/encoder/sei.h 2023-06-27 10:11:49.000000000 -0400
+++ source/encoder/sei.h 2023-10-22 21:15:50.862452000 -0400
-@@ -29,5 +29,5 @@
+@@ -29,5 +29,6 @@
#include "slice.h"
#include "nal.h"
-#include "md5.h"
++#include <sys/types.h>
+#include <md5.h>
namespace X265_NS {
--- source/encoder/frameencoder.cpp 2023-06-27 10:11:49.000000000 -0400
+++ source/encoder/frameencoder.cpp 2023-10-22 21:27:55.363979000 -0400
-@@ -426,5 +426,5 @@
+@@ -426,5 +426,5 @@
m_seiReconPictureDigest.m_method = SEIDecodedPictureHash::MD5;
for (int i = 0; i < planes; i++)
- MD5Final(&m_seiReconPictureDigest.m_state[i], m_seiReconPictureDigest.m_digest[i]);
@@ -35,7 +37,7 @@
}
--- source/CMakeLists.txt 2023-06-27 10:11:49.000000000 -0400
+++ source/CMakeLists.txt 2023-10-22 21:54:36.900303000 -0400
-@@ -96,4 +96,5 @@
+@@ -96,4 +96,5 @@
if(UNIX)
list(APPEND PLATFORM_LIBS pthread)
+ list(APPEND PLATFORM_LIBS md)
@@ -43,7 +45,7 @@
if(LIBRT)
--- source/common/CMakeLists.txt 2023-06-27 10:11:49.000000000 -0400
+++ source/common/CMakeLists.txt 2023-10-22 21:21:56.177834000 -0400
-@@ -156,5 +156,4 @@
+@@ -156,5 +156,4 @@
threadpool.cpp threadpool.h
wavefront.h wavefront.cpp
- md5.cpp md5.h