From fdb5c129b9639af6caeb9d8bb8a710c233f31281 Mon Sep 17 00:00:00 2001
From: Mitchel Sellers <msellers@iowacomputergurus.com>
Date: Thu, 15 May 2025 16:25:31 -0500
Subject: [PATCH 1/5] Attempting multi-merged

---
 src/FileOnQ.Imaging.Heif.Encoders/encoder.h        |  2 +-
 src/FileOnQ.Imaging.Heif.Encoders/encoders_api.cpp |  2 +-
 src/FileOnQ.Imaging.Heif.Encoders/encoders_api.h   |  2 +-
 src/FileOnQ.Imaging.Heif/Build/libde265.targets    | 12 ++++++++----
 src/FileOnQ.Imaging.Heif/Build/libheif.targets     |  4 ++--
 5 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/FileOnQ.Imaging.Heif.Encoders/encoder.h b/src/FileOnQ.Imaging.Heif.Encoders/encoder.h
index 7bf94ad..b2f123f 100644
--- a/src/FileOnQ.Imaging.Heif.Encoders/encoder.h
+++ b/src/FileOnQ.Imaging.Heif.Encoders/encoder.h
@@ -29,7 +29,7 @@
 #include <string>
 #include <memory>
 
-#include <libheif/heif.h>
+#include <libheif/api/libheif/heif.h>
 
 
 class Encoder
diff --git a/src/FileOnQ.Imaging.Heif.Encoders/encoders_api.cpp b/src/FileOnQ.Imaging.Heif.Encoders/encoders_api.cpp
index d236861..d1c287c 100644
--- a/src/FileOnQ.Imaging.Heif.Encoders/encoders_api.cpp
+++ b/src/FileOnQ.Imaging.Heif.Encoders/encoders_api.cpp
@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <iostream>
-#include <libheif/heif.h>
+#include <libheif/api/libheif/heif.h>
 
 #include "encoders_api.h"
 #include "encoder.h"
diff --git a/src/FileOnQ.Imaging.Heif.Encoders/encoders_api.h b/src/FileOnQ.Imaging.Heif.Encoders/encoders_api.h
index 05e4ea8..6143271 100644
--- a/src/FileOnQ.Imaging.Heif.Encoders/encoders_api.h
+++ b/src/FileOnQ.Imaging.Heif.Encoders/encoders_api.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <iostream>
-#include <libheif/heif.h>
+#include <libheif/api/libheif/heif.h>
 
 #include "encoder_jpeg.h"
 
diff --git a/src/FileOnQ.Imaging.Heif/Build/libde265.targets b/src/FileOnQ.Imaging.Heif/Build/libde265.targets
index 665f164..3b4cd4e 100644
--- a/src/FileOnQ.Imaging.Heif/Build/libde265.targets
+++ b/src/FileOnQ.Imaging.Heif/Build/libde265.targets
@@ -3,20 +3,24 @@
 
 	<Target Name="libde265-clone-x86" Condition="!Exists('$(ThirdPartyDir)/libde265-x86/README.md')">
 		<Exec Command="git clone https://github.com/strukturag/libde265.git libde265-x86" WorkingDirectory="$(ThirdPartyDir)" />
-		<Exec Command="git checkout v1.0.8" WorkingDirectory="$(ThirdPartyDir)/libde265-x86" />
+		<Exec Command="git checkout v1.0.15" WorkingDirectory="$(ThirdPartyDir)/libde265-x86" />
 	</Target>
 
 	<Target Name="libde265-clone-x64" Condition="!Exists('$(ThirdPartyDir)/libde265-x64/README.md')">
 		<Exec Command="git clone https://github.com/strukturag/libde265.git libde265-x64" WorkingDirectory="$(ThirdPartyDir)" />
-		<Exec Command="git checkout v1.0.8" WorkingDirectory="$(ThirdPartyDir)/libde265-x64" />
+		<Exec Command="git checkout v1.0.15" WorkingDirectory="$(ThirdPartyDir)/libde265-x64" />
 	</Target>
 
 	<Target Name="libde265" DependsOnTargets="libde265-clone-x64;libde265-clone-x86" Condition="!Exists('runtimes/win-x64/native/libde265.dll') and !Exists('runtimes/win-x86/native/libde265.dll')">
 		<Exec Command="libde265.bat x86 $(Configuration)" WorkingDirectory="$(ThirdPartyDir)/../build" />
-		<Exec Command="libde265.bat x64 $(Configuration)" WorkingDirectory="$(ThirdPartyDir)/../build" />
-
 		<Copy SourceFiles="$(ThirdPartyDir)/libde265-x86/libde265/libde265.dll" DestinationFolder="runtimes/win-x86/native" />
+		<Copy SourceFiles="$(ThirdPartyDir)/libde265-x86/libde265/de265.lib" DestinationFiles="$(ThirdPartyDir)/libde265-x86/libde265/libde265.lib" />
+		<Copy SourceFiles="$(ThirdPartyDir)/libde265-x86/libde265/de265.exp" DestinationFiles="$(ThirdPartyDir)/libde265-x86/libde265/libde265.exp" />
+
+		<Exec Command="libde265.bat x64 $(Configuration)" WorkingDirectory="$(ThirdPartyDir)/../build" />
 		<Copy SourceFiles="$(ThirdPartyDir)/libde265-x64/libde265/libde265.dll" DestinationFolder="runtimes/win-x64/native" />
+		<Copy SourceFiles="$(ThirdPartyDir)/libde265-x64/libde265/de265.lib" DestinationFiles="$(ThirdPartyDir)/libde265-x64/libde265/libde265.lib" />
+		<Copy SourceFiles="$(ThirdPartyDir)/libde265-x64/libde265/de265.exp" DestinationFiles="$(ThirdPartyDir)/libde265-x64/libde265/libde265.exp" />
 	</Target>
 
 	<Target Name="libde265-clean" BeforeTargets="Clean">
diff --git a/src/FileOnQ.Imaging.Heif/Build/libheif.targets b/src/FileOnQ.Imaging.Heif/Build/libheif.targets
index 8ead888..c096a91 100644
--- a/src/FileOnQ.Imaging.Heif/Build/libheif.targets
+++ b/src/FileOnQ.Imaging.Heif/Build/libheif.targets
@@ -28,12 +28,12 @@
 
 	<Target Name="LibHeif-Clone-x86" Condition="!Exists('$(ThirdPartyDir)/libheif-x86/README.md')">
 		<Exec Command="git clone https://github.com/strukturag/libheif.git libheif-x86" WorkingDirectory="$(ThirdPartyDir)" />
-		<Exec Command="git checkout v1.12.0" WorkingDirectory="$(ThirdPartyDir)/libheif-x86" />
+		<Exec Command="git checkout v1.18.0" WorkingDirectory="$(ThirdPartyDir)/libheif-x86" />
 	</Target>
 
 	<Target Name="LibHeif-Clone-x64" Condition="!Exists('$(ThirdPartyDir)/libheif-x64/README.md')">
 		<Exec Command="git clone https://github.com/strukturag/libheif.git libheif-x64" WorkingDirectory="$(ThirdPartyDir)" />
-		<Exec Command="git checkout v1.12.0" WorkingDirectory="$(ThirdPartyDir)/libheif-x64" />
+		<Exec Command="git checkout v1.18.0" WorkingDirectory="$(ThirdPartyDir)/libheif-x64" />
 	</Target>
 
 	<Target Name="LibHeif-Clean" BeforeTargets="Clean" >

From 897a375113edd3fe8d4b4f7f58c97571d7690fc7 Mon Sep 17 00:00:00 2001
From: Mitchel Sellers <msellers@iowacomputergurus.com>
Date: Fri, 16 May 2025 09:16:09 -0500
Subject: [PATCH 2/5] Attempted build fix

---
 src/FileOnQ.Imaging.Heif/Build/libheif.targets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/FileOnQ.Imaging.Heif/Build/libheif.targets b/src/FileOnQ.Imaging.Heif/Build/libheif.targets
index c096a91..00ae271 100644
--- a/src/FileOnQ.Imaging.Heif/Build/libheif.targets
+++ b/src/FileOnQ.Imaging.Heif/Build/libheif.targets
@@ -28,12 +28,12 @@
 
 	<Target Name="LibHeif-Clone-x86" Condition="!Exists('$(ThirdPartyDir)/libheif-x86/README.md')">
 		<Exec Command="git clone https://github.com/strukturag/libheif.git libheif-x86" WorkingDirectory="$(ThirdPartyDir)" />
-		<Exec Command="git checkout v1.18.0" WorkingDirectory="$(ThirdPartyDir)/libheif-x86" />
+		<Exec Command="git checkout v1.19.8" WorkingDirectory="$(ThirdPartyDir)/libheif-x86" />
 	</Target>
 
 	<Target Name="LibHeif-Clone-x64" Condition="!Exists('$(ThirdPartyDir)/libheif-x64/README.md')">
 		<Exec Command="git clone https://github.com/strukturag/libheif.git libheif-x64" WorkingDirectory="$(ThirdPartyDir)" />
-		<Exec Command="git checkout v1.18.0" WorkingDirectory="$(ThirdPartyDir)/libheif-x64" />
+		<Exec Command="git checkout v1.19.8" WorkingDirectory="$(ThirdPartyDir)/libheif-x64" />
 	</Target>
 
 	<Target Name="LibHeif-Clean" BeforeTargets="Clean" >

From a2e2dd9987c65889f6f490e05a124a236f8b22ef Mon Sep 17 00:00:00 2001
From: Mitchel Sellers <msellers@iowacomputergurus.com>
Date: Fri, 16 May 2025 09:33:54 -0500
Subject: [PATCH 3/5] Trying 1.19.0

---
 src/FileOnQ.Imaging.Heif/Build/libheif.targets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/FileOnQ.Imaging.Heif/Build/libheif.targets b/src/FileOnQ.Imaging.Heif/Build/libheif.targets
index 00ae271..4c5b0ad 100644
--- a/src/FileOnQ.Imaging.Heif/Build/libheif.targets
+++ b/src/FileOnQ.Imaging.Heif/Build/libheif.targets
@@ -28,12 +28,12 @@
 
 	<Target Name="LibHeif-Clone-x86" Condition="!Exists('$(ThirdPartyDir)/libheif-x86/README.md')">
 		<Exec Command="git clone https://github.com/strukturag/libheif.git libheif-x86" WorkingDirectory="$(ThirdPartyDir)" />
-		<Exec Command="git checkout v1.19.8" WorkingDirectory="$(ThirdPartyDir)/libheif-x86" />
+		<Exec Command="git checkout v1.19.0" WorkingDirectory="$(ThirdPartyDir)/libheif-x86" />
 	</Target>
 
 	<Target Name="LibHeif-Clone-x64" Condition="!Exists('$(ThirdPartyDir)/libheif-x64/README.md')">
 		<Exec Command="git clone https://github.com/strukturag/libheif.git libheif-x64" WorkingDirectory="$(ThirdPartyDir)" />
-		<Exec Command="git checkout v1.19.8" WorkingDirectory="$(ThirdPartyDir)/libheif-x64" />
+		<Exec Command="git checkout v1.19.0" WorkingDirectory="$(ThirdPartyDir)/libheif-x64" />
 	</Target>
 
 	<Target Name="LibHeif-Clean" BeforeTargets="Clean" >

From e6a5af1524ddb2e715263f3f7b2d376a9b73bb6f Mon Sep 17 00:00:00 2001
From: Mitchel Sellers <msellers@Iowacomputergurus.com>
Date: Sat, 17 May 2025 08:06:04 -0500
Subject: [PATCH 4/5] Updated other child dependencies

---
 src/FileOnQ.Imaging.Heif/Build/dav1d.targets         | 4 ++--
 src/FileOnQ.Imaging.Heif/Build/libjpeg-turbo.targets | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/FileOnQ.Imaging.Heif/Build/dav1d.targets b/src/FileOnQ.Imaging.Heif/Build/dav1d.targets
index ffb2bef..0e41c2b 100644
--- a/src/FileOnQ.Imaging.Heif/Build/dav1d.targets
+++ b/src/FileOnQ.Imaging.Heif/Build/dav1d.targets
@@ -3,12 +3,12 @@
 
 	<Target Name="dav1d-clone-x86" Condition="!Exists('$(ThirdPartyDir)/dav1d-x86/README.md')">
 		<Exec Command="git clone https://code.videolan.org/videolan/dav1d.git dav1d-x86" WorkingDirectory="$(ThirdPartyDir)" />
-		<Exec Command="git checkout 0.8.2" WorkingDirectory="$(ThirdPartyDir)/dav1d-x86" />
+		<Exec Command="git checkout 1.5.1" WorkingDirectory="$(ThirdPartyDir)/dav1d-x86" />
 	</Target>
 
 	<Target Name="dav1d-clone-x64" Condition="!Exists('$(ThirdPartyDir)/dav1d-x64/README.md')">
 		<Exec Command="git clone https://code.videolan.org/videolan/dav1d.git dav1d-x64" WorkingDirectory="$(ThirdPartyDir)" />
-		<Exec Command="git checkout 0.8.2" WorkingDirectory="$(ThirdPartyDir)/dav1d-x64" />
+		<Exec Command="git checkout 1.5.1" WorkingDirectory="$(ThirdPartyDir)/dav1d-x64" />
 	</Target>
 
 	<Target Name="dav1d" DependsOnTargets="dav1d-clone-x64;dav1d-clone-x86" Condition="!Exists('runtimes/win-x64/native/dav1d.dll') and !Exists('runtimes/win-x86/native/dav1d.dll')">
diff --git a/src/FileOnQ.Imaging.Heif/Build/libjpeg-turbo.targets b/src/FileOnQ.Imaging.Heif/Build/libjpeg-turbo.targets
index 5eb17b1..f7b8486 100644
--- a/src/FileOnQ.Imaging.Heif/Build/libjpeg-turbo.targets
+++ b/src/FileOnQ.Imaging.Heif/Build/libjpeg-turbo.targets
@@ -3,12 +3,12 @@
 
 	<Target Name="libjpeg-turbo-clone-x86" Condition="!Exists('$(ThirdPartyDir)/libjpeg-turbo-x86/README.md')">
 		<Exec Command="git clone https://github.com/libjpeg-turbo/libjpeg-turbo.git libjpeg-turbo-x86" WorkingDirectory="$(ThirdPartyDir)" />
-		<Exec Command="git checkout 2.1.1" WorkingDirectory="$(ThirdPartyDir)/libjpeg-turbo-x86" />
+		<Exec Command="git checkout 3.1.0" WorkingDirectory="$(ThirdPartyDir)/libjpeg-turbo-x86" />
 	</Target>
 
 	<Target Name="libjpeg-turbo-clone-x64" Condition="!Exists('$(ThirdPartyDir)/libjpeg-turbo-x64/README.md')">
 		<Exec Command="git clone https://github.com/libjpeg-turbo/libjpeg-turbo.git libjpeg-turbo-x64" WorkingDirectory="$(ThirdPartyDir)" />
-		<Exec Command="git checkout 2.1.1" WorkingDirectory="$(ThirdPartyDir)/libjpeg-turbo-x64" />
+		<Exec Command="git checkout 3.1.0" WorkingDirectory="$(ThirdPartyDir)/libjpeg-turbo-x64" />
 	</Target>
 
 	<Target Name="libjpeg-turbo" DependsOnTargets="libjpeg-turbo-clone-x64;libjpeg-turbo-clone-x86" Condition="!Exists('runtimes/win-x64/native/jpeg62.dll') and !Exists('runtimes/win-x86/native/jpeg62.dll')">

From fabcb17efef6cf533c88e2960987430e44e9b3a2 Mon Sep 17 00:00:00 2001
From: Mitchel Sellers <msellers@Iowacomputergurus.com>
Date: Sat, 17 May 2025 08:36:44 -0500
Subject: [PATCH 5/5] Trying something?

---
 src/FileOnQ.Imaging.Heif.Encoders/encoder_jpeg.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/FileOnQ.Imaging.Heif.Encoders/encoder_jpeg.h b/src/FileOnQ.Imaging.Heif.Encoders/encoder_jpeg.h
index 03b96f7..0b095ec 100644
--- a/src/FileOnQ.Imaging.Heif.Encoders/encoder_jpeg.h
+++ b/src/FileOnQ.Imaging.Heif.Encoders/encoder_jpeg.h
@@ -30,7 +30,7 @@
 #include <cstddef>
 #include <cstdio>
 
-#include <jpeglib.h>
+#include <libjpeg-turbo/jpeglib.h>
 
 #include <string>