c1a5c0d2e4
* add libyuv * * add checksum for patch * remove unused build arguments * generate a pkgconfig file * oops: fix missing prefix for pkgconfig file * make this package git sourced * move pkgconfig file to a source file * update patches for latest git version * switch to a github mirror as googlesource.com times out
37 lines
1018 B
Diff
37 lines
1018 B
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index ed4948f0..228ac830 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -35,12 +35,12 @@ ADD_EXECUTABLE ( yuvconvert ${ly_base_dir}/util/yuvconvert.cc )
|
|
TARGET_LINK_LIBRARIES ( yuvconvert ${ly_lib_static} )
|
|
|
|
|
|
-INCLUDE ( FindJPEG )
|
|
-if (JPEG_FOUND)
|
|
- include_directories( ${JPEG_INCLUDE_DIR} )
|
|
- target_link_libraries( yuvconvert ${JPEG_LIBRARY} )
|
|
- add_definitions( -DHAVE_JPEG )
|
|
-endif()
|
|
+#INCLUDE ( FindJPEG )
|
|
+#if (JPEG_FOUND)
|
|
+# include_directories( ${JPEG_INCLUDE_DIR} )
|
|
+# target_link_libraries( yuvconvert ${JPEG_LIBRARY} )
|
|
+# add_definitions( -DHAVE_JPEG )
|
|
+#endif()
|
|
|
|
if(TEST)
|
|
find_library(GTEST_LIBRARY gtest)
|
|
diff --git a/source/mjpeg_decoder.cc b/source/mjpeg_decoder.cc
|
|
index eaf25301..21cde70a 100644
|
|
--- a/source/mjpeg_decoder.cc
|
|
+++ b/source/mjpeg_decoder.cc
|
|
@@ -25,7 +25,7 @@
|
|
#endif
|
|
|
|
#endif
|
|
-struct FILE; // For jpeglib.h.
|
|
+//struct FILE; // For jpeglib.h.
|
|
|
|
// C++ build requires extern C for jpeg internals.
|
|
#ifdef __cplusplus
|