fix: Resolve compiler warnings on OS X and consolidate CGo settings. (#…

…194)
discord · Oct 12, 2024 · 37dccac · 37dccac
1 parent 95a20d8
commit 37dccac
Show file tree

Hide file tree

Showing 29 changed files with 30 additions and 47 deletions.
diff --git a/avcodec.cpp b/avcodec.cpp
@@ -413,7 +413,7 @@ static int avcodec_decoder_copy_frame(const avcodec_decoder d, opencv_mat mat, A
             NULL, NULL, NULL);
 
         // Configure colorspace
-        int colorspace = SWS_CS_ITU709;
+        int colorspace;
         switch (frame->colorspace) {
             case AVCOL_SPC_BT2020_NCL:
             case AVCOL_SPC_BT2020_CL:
@@ -428,6 +428,9 @@ static int avcodec_decoder_copy_frame(const avcodec_decoder d, opencv_mat mat, A
             case AVCOL_SPC_SMPTE240M:
                 colorspace = SWS_CS_SMPTE240M;
                 break;
+            default:
+                colorspace = SWS_CS_ITU709;
+                break;
         }
         const int* inv_table = sws_getCoefficients(colorspace);
 

diff --git a/avcodec.go b/avcodec.go
@@ -1,14 +1,5 @@
 package lilliput
 
-// #cgo CFLAGS: -msse -msse2 -msse3 -msse4.1 -msse4.2 -mavx
-// #cgo darwin CFLAGS: -I${SRCDIR}/deps/osx/include
-// #cgo linux CFLAGS: -I${SRCDIR}/deps/linux/include
-// #cgo CXXFLAGS: -std=c++11
-// #cgo darwin CXXFLAGS: -I${SRCDIR}/deps/osx/include
-// #cgo linux CXXFLAGS: -I${SRCDIR}/deps/linux/include
-// #cgo LDFLAGS: -lswscale -lavformat -lavcodec -lavfilter -lavutil -lbz2 -lz
-// #cgo darwin LDFLAGS: -L${SRCDIR}/deps/osx/lib
-// #cgo linux LDFLAGS: -L${SRCDIR}/deps/linux/lib
 // #include "avcodec.hpp"
 import "C"
 

diff --git a/cgo.go b/cgo.go
@@ -0,0 +1,17 @@
+package lilliput
+
+/*
+#cgo darwin CFLAGS: -I${SRCDIR}/deps/osx/include
+#cgo linux CFLAGS: -msse -msse2 -msse3 -msse4.1 -msse4.2 -mavx -I${SRCDIR}/deps/linux/include
+#cgo CXXFLAGS: -std=c++11
+#cgo darwin CXXFLAGS: -I${SRCDIR}/deps/osx/include
+#cgo linux CXXFLAGS: -I${SRCDIR}/deps/linux/include
+#cgo darwin LDFLAGS: -L${SRCDIR}/deps/osx/lib -lavcodec -lavfilter -lavformat -lavutil -lbz2 -lgif -ljpeg -lopencv_core -lopencv_imgcodecs -lopencv_imgproc -lpng -lsharpyuv -lswscale -lwebp -lwebpmux -lz -framework CoreFoundation -framework CoreMedia -framework CoreVideo -framework VideoToolbox
+#cgo linux LDFLAGS: -L${SRCDIR}/deps/linux/lib -L${SRCDIR}/deps/linux/share/OpenCV/3rdparty/lib -lswscale -lavformat -lavcodec -lavfilter -lavutil -lbz2 -lz -lopencv_core -lopencv_imgcodecs -lopencv_imgproc -ljpeg -lpng -lwebp -lz -lgif -lopencv_core -lopencv_imgcodecs -lopencv_imgproc -ljpeg -lpng -lwebp -lsharpyuv -lz -lopencv_core -lopencv_imgcodecs -lopencv_imgproc -ljpeg -lpng -lwebp -lz -lopencv_core -lopencv_imgproc -lwebp -lwebpmux -lippicv
+void dummy() {}
+*/
+import "C"
+
+func init() {
+	C.dummy()
+}
diff --git a/deps/build-deps-osx.sh b/deps/build-deps-osx.sh
@@ -60,7 +60,15 @@ tar -xzf $SRCDIR/libjpeg-turbo-2.1.4.tar.gz -C $BASEDIR/libjpeg-turbo --strip-co
 cd $BASEDIR/libjpeg-turbo
 mkdir -p $BUILDDIR/libjpeg-turbo
 cd $BUILDDIR/libjpeg-turbo
-cmake $BASEDIR/libjpeg-turbo -DENABLE_STATIC=1 -DENABLE_SHARED=0 -DWITH_JPEG8=1 -DCMAKE_INSTALL_PREFIX=$PREFIX -DCMAKE_OSX_ARCHITECTURES=arm64
+cmake $BASEDIR/libjpeg-turbo \
+    -DENABLE_STATIC=1 \
+    -DENABLE_SHARED=0 \
+    -DWITH_JPEG8=1 \
+    -DCMAKE_INSTALL_PREFIX=$PREFIX \
+    -DCMAKE_OSX_ARCHITECTURES=arm64 \
+    -DCMAKE_OSX_DEPLOYMENT_TARGET=14.0 \
+    -DCMAKE_C_FLAGS="-mmacosx-version-min=14.0" \
+    -DCMAKE_CXX_FLAGS="-mmacosx-version-min=14.0"
 make
 make install
 

diff --git a/deps/osx/lib/libavcodec.a b/deps/osx/lib/libavcodec.a
diff --git a/deps/osx/lib/libavdevice.a b/deps/osx/lib/libavdevice.a
diff --git a/deps/osx/lib/libavfilter.a b/deps/osx/lib/libavfilter.a
diff --git a/deps/osx/lib/libavformat.a b/deps/osx/lib/libavformat.a
diff --git a/deps/osx/lib/libavutil.a b/deps/osx/lib/libavutil.a
diff --git a/deps/osx/lib/libbz2.a b/deps/osx/lib/libbz2.a
diff --git a/deps/osx/lib/libgif.a b/deps/osx/lib/libgif.a
diff --git a/deps/osx/lib/libjpeg.a b/deps/osx/lib/libjpeg.a
diff --git a/deps/osx/lib/libopencv_core.a b/deps/osx/lib/libopencv_core.a
diff --git a/deps/osx/lib/libopencv_imgcodecs.a b/deps/osx/lib/libopencv_imgcodecs.a
diff --git a/deps/osx/lib/libopencv_imgproc.a b/deps/osx/lib/libopencv_imgproc.a
diff --git a/deps/osx/lib/libpng.a b/deps/osx/lib/libpng.a
diff --git a/deps/osx/lib/libpng16.a b/deps/osx/lib/libpng16.a
diff --git a/deps/osx/lib/libsharpyuv.a b/deps/osx/lib/libsharpyuv.a
diff --git a/deps/osx/lib/libswresample.a b/deps/osx/lib/libswresample.a
diff --git a/deps/osx/lib/libswscale.a b/deps/osx/lib/libswscale.a
diff --git a/deps/osx/lib/libturbojpeg.a b/deps/osx/lib/libturbojpeg.a
diff --git a/deps/osx/lib/libwebp.a b/deps/osx/lib/libwebp.a
diff --git a/deps/osx/lib/libwebpdemux.a b/deps/osx/lib/libwebpdemux.a
diff --git a/deps/osx/lib/libwebpmux.a b/deps/osx/lib/libwebpmux.a
diff --git a/deps/osx/lib/libz.a b/deps/osx/lib/libz.a
diff --git a/giflib.go b/giflib.go
@@ -1,14 +1,5 @@
 package lilliput
 
-// #cgo CFLAGS: -msse -msse2 -msse3 -msse4.1 -msse4.2 -mavx
-// #cgo darwin CFLAGS: -I${SRCDIR}/deps/osx/include
-// #cgo linux CFLAGS: -I${SRCDIR}/deps/linux/include
-// #cgo CXXFLAGS: -std=c++11
-// #cgo darwin CXXFLAGS: -I${SRCDIR}/deps/osx/include
-// #cgo linux CXXFLAGS: -I${SRCDIR}/deps/linux/include
-// #cgo LDFLAGS:  -lopencv_core -lopencv_imgcodecs -lopencv_imgproc -ljpeg -lpng -lwebp -lz -lgif
-// #cgo darwin LDFLAGS: -L${SRCDIR}/deps/osx/lib -L${SRCDIR}/deps/osx/share/OpenCV/3rdparty/lib
-// #cgo linux LDFLAGS: -lippicv -L${SRCDIR}/deps/linux/lib
 // #include "giflib.hpp"
 import "C"
 

diff --git a/opencv.go b/opencv.go
@@ -1,14 +1,5 @@
 package lilliput
 
-// #cgo CFLAGS: -msse -msse2 -msse3 -msse4.1 -msse4.2 -mavx
-// #cgo darwin CFLAGS: -I${SRCDIR}/deps/osx/include
-// #cgo linux CFLAGS: -I${SRCDIR}/deps/linux/include
-// #cgo CXXFLAGS: -std=c++11
-// #cgo darwin CXXFLAGS: -I${SRCDIR}/deps/osx/include
-// #cgo linux CXXFLAGS: -I${SRCDIR}/deps/linux/include
-// #cgo LDFLAGS:  -lopencv_core -lopencv_imgcodecs -lopencv_imgproc -ljpeg -lpng -lwebp -lsharpyuv -lz
-// #cgo darwin LDFLAGS: -L${SRCDIR}/deps/osx/lib -L${SRCDIR}/deps/osx/share/OpenCV/3rdparty/lib -framework VideoToolbox -framework CoreVideo -framework CoreMedia -framework CoreFoundation
-// #cgo linux LDFLAGS: -lippicv -L${SRCDIR}/deps/linux/lib
 // #include "opencv.hpp"
 import "C"
 

diff --git a/thumbhash.go b/thumbhash.go
@@ -1,14 +1,5 @@
 package lilliput
 
-// #cgo CFLAGS: -msse -msse2 -msse3 -msse4.1 -msse4.2 -mavx
-// #cgo darwin CFLAGS: -I${SRCDIR}/deps/osx/include
-// #cgo linux CFLAGS: -I${SRCDIR}/deps/linux/include
-// #cgo CXXFLAGS: -std=c++11
-// #cgo darwin CXXFLAGS: -I${SRCDIR}/deps/osx/include
-// #cgo linux CXXFLAGS: -I${SRCDIR}/deps/linux/include
-// #cgo LDFLAGS:  -lopencv_core -lopencv_imgcodecs -lopencv_imgproc -ljpeg -lpng -lwebp -lz
-// #cgo darwin LDFLAGS: -L${SRCDIR}/deps/osx/lib -L${SRCDIR}/deps/osx/share/OpenCV/3rdparty/lib
-// #cgo linux LDFLAGS: -lippicv -L${SRCDIR}/deps/linux/lib
 // #include "thumbhash.hpp"
 import "C"
 

diff --git a/webp.go b/webp.go
@@ -1,14 +1,5 @@
 package lilliput
 
-// #cgo CFLAGS: -msse -msse2 -msse3 -msse4.1 -msse4.2 -mavx
-// #cgo darwin CFLAGS: -I${SRCDIR}/deps/osx/include
-// #cgo linux CFLAGS: -I${SRCDIR}/deps/linux/include
-// #cgo CXXFLAGS: -std=c++11
-// #cgo darwin CXXFLAGS: -I${SRCDIR}/deps/osx/include
-// #cgo linux CXXFLAGS: -I${SRCDIR}/deps/linux/include
-// #cgo LDFLAGS:  -lopencv_core -lopencv_imgproc -lwebp -lwebpmux
-// #cgo darwin LDFLAGS: -L${SRCDIR}/deps/osx/lib -L${SRCDIR}/deps/osx/share/OpenCV/3rdparty/lib
-// #cgo linux LDFLAGS: -L${SRCDIR}/deps/linux/lib
 // #include "webp.hpp"
 import "C"