svn commit: r547897 - head/graphics/libfpx/files
Mikhail Teterin
mi at FreeBSD.org
Mon Sep 7 15:22:53 UTC 2020
Author: mi
Date: Mon Sep 7 15:22:52 2020
New Revision: 547897
URL: https://svnweb.freebsd.org/changeset/ports/547897
Log:
Remove an unused variable from a header, because it now triggers
the linker on -current into an error about duplicate symbol -- as
two source-files include the same header.
Reported by: pkg-fallout
Sponsored by: United Marsupials
Modified:
head/graphics/libfpx/files/patch-warnings
Modified: head/graphics/libfpx/files/patch-warnings
==============================================================================
--- head/graphics/libfpx/files/patch-warnings Mon Sep 7 15:13:31 2020 (r547896)
+++ head/graphics/libfpx/files/patch-warnings Mon Sep 7 15:22:52 2020 (r547897)
@@ -3,8 +3,6 @@ from LLVM10. I admit, that the original author's inten
me here, so I cannot tell, if we have an actual bug remaining
in this code.
- -mi
-
--- fpx/ptil_fpx.cpp 2013-09-02 11:45:00.000000000 -0400
+++ fpx/ptil_fpx.cpp 2020-03-17 18:11:00.425447000 -0400
@@ -1200,7 +1200,7 @@
@@ -18,3 +16,15 @@ in this code.
+ }
}
+The variable No_JPEG_Header_Flag is unused. But its mere presence may
+cause a "duplicate symbol" error from linker, when it tries to link
+together object files compiled after #include-ing the ejpeg.h header.
+
+--- jpeg/ejpeg.h 2013-09-02 11:45:00.000000000 -0400
++++ jpeg/ejpeg.h 2020-09-07 10:50:07.600375000 -0400
+@@ -31,5 +31,2 @@
+ #define IMG_FORMAT_1111 0x04 /* Four-component non-interleaved image */
+ #define IMG_FORMAT_411 0x05 /* Three-component 4:1:1 image */
+-
+-JPEGEXPORT
+-int No_JPEG_Header_Flag;
More information about the svn-ports-all
mailing list