diff options
| author | Mikhail Teterin <mi@FreeBSD.org> | 2020-09-07 15:22:52 +0000 |
|---|---|---|
| committer | Mikhail Teterin <mi@FreeBSD.org> | 2020-09-07 15:22:52 +0000 |
| commit | 477566849f797da0aedb7851b85763f47b0a26e8 (patch) | |
| tree | 6f1c554039a69770cce08096b945d365d2ce6146 /graphics/libfpx | |
| parent | f32e42fb8caba49655c76fc594bfb0ed42566b9f (diff) | |
| download | ports-477566849f797da0aedb7851b85763f47b0a26e8.tar.gz ports-477566849f797da0aedb7851b85763f47b0a26e8.zip | |
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
Notes
Notes:
svn path=/head/; revision=547897
Diffstat (limited to 'graphics/libfpx')
| -rw-r--r-- | graphics/libfpx/files/patch-warnings | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/graphics/libfpx/files/patch-warnings b/graphics/libfpx/files/patch-warnings index a9de525cd133..30a022bd5b09 100644 --- a/graphics/libfpx/files/patch-warnings +++ b/graphics/libfpx/files/patch-warnings @@ -3,8 +3,6 @@ from LLVM10. I admit, that the original author's intent escapes 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; |