Reinforce fmt9 include paths

3 files changed, 24 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3f565faac15f..cf3952cc1f8b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = luxcorerender
 	pkgdesc = Physically correct, unbiased rendering engine.
 	pkgver = 2.6
-	pkgrel = 9
-	epoch = 2
+	pkgrel = 10
+	epoch = 1
 	url = https://www.luxcorerender.org/
 	arch = x86_64
 	license = Apache
@@ -60,7 +60,7 @@ pkgbase = luxcorerender
 	sha256sums = 6c34263d955440cb200ddb6f51711fca9b5548ca9ccf133cc924f87298f4dce0
 	sha256sums = 069ca9caef3b7c85ffc4a55de79122488b1b513135b0536b24772c483c8d0cab
 	sha256sums = b8b3d9d4432198e34a281f24c0ffedb4a9f69ce8ee36c30125b83b4a6c6358f6
-	sha256sums = 754b12d61f18a6408d9c4c7814b5402bbe3ed709cad5ddc29ad9cf1ca5a04067
+	sha256sums = e4ad9b7a0b77e0ca00136159f8f7c8e5940d26918421f18114ad5657fbf32359
 	b2sums = ead966b0df7bb72ac9aa2aefb1e5f2dd020156a8e66f67aeff75d29606072ea7b147ddc4d6effea687baf4653e670bd3ad93fc9c7b0e7cac340cb1d5976adb14
 	b2sums = 1a1f4de4f70564216a99f1a27c6321c85187eaea80d9a2a47c66be07fa4a1d825eeef526167aaeb89e4bd67a376a56728af95ee00ee8c1bcc7556afce5f126b0
 	b2sums = 56fa362f1a79e735377b85b1a5303d0761b0b022b9b4a6063af8aee19643bcef0663105cefd969e746ace5cf7e13f3d0da2b7fc696ba0b500f2c21bb57f1bddb
@@ -75,6 +75,6 @@ pkgbase = luxcorerender
 	b2sums = 19a81a9c442272e7d0123bc99b93be8cafab1a84a7a9bbb58e92e5a6624277e85b33c41183e739ebb8898aa886d477854c9075457a4da9266a5a8a0b26387ae0
 	b2sums = 1d434b3eb400af3b4db9ad1fd3f40d8cfcae6d7adcb0912f3fb243f5f824f1df72b6ccd044fc22d7ca5b7476e58ce3ffce0eadbe5d9e8f5a07ab9fcecc85b776
 	b2sums = 34176c1fd0e8e22daab5a986b67a6732170376a618a2e59cf0a3b6ca33c6f1407f61c8a1c92f00cdce1bee850ade295d8092691191d4c2c7cbc05016c4c791d6
-	b2sums = 0397e8edfc21b6498022bda0545fad6c98eba8dcdc0f6f45c920156f27634f7c66dc9ad57f49d48e69d8818065627ddd3cf33259f3a83c576eb16a9304610f3b
+	b2sums = 084628e44473a2ddb5fdcffb5ddab5dabf02aee46de01a3a0f22f0ffab958be3980494078a7b4b2fcd2168a4d048de13ac14cecd26dda97ff00037e41ca50c11
 
 pkgname = luxcorerender
diff --git a/0014-fmt9.patch b/0014-fmt9.patch
index 7713c6cae58e..77815a814f9a 100644
--- a/0014-fmt9.patch
+++ b/0014-fmt9.patch
@@ -1,4 +1,4 @@
-From 63f1a46b601f5f10fddcda9ce5ed44092352c147 Mon Sep 17 00:00:00 2001
+From df8c3049c6b7cd822d21a18d295a8c653e153c03 Mon Sep 17 00:00:00 2001
 From: howetuft <howetuft@gmail.com>
 Date: Wed, 16 Aug 2023 20:05:05 +0200
 Subject: [PATCH 14/14] fmt9
@@ -9,8 +9,9 @@ Subject: [PATCH 14/14] fmt9
  samples/luxcoredemo/CMakeLists.txt                | 2 +-
  samples/luxcorescenedemo/CMakeLists.txt           | 2 +-
  samples/luxcoreui/CMakeLists.txt                  | 2 +-
+ src/luxcore/CMakeLists.txt                        | 2 +-
  tests/luxcoreimplserializationdemo/CMakeLists.txt | 2 +-
- 6 files changed, 8 insertions(+), 5 deletions(-)
+ 7 files changed, 9 insertions(+), 6 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
 index c0da2b5d5..f0067dc1a 100644
@@ -76,6 +77,19 @@ index c06be0fb6..b6ff48570 100644
  
  if(APPLE)
  
+diff --git a/src/luxcore/CMakeLists.txt b/src/luxcore/CMakeLists.txt
+index 4a3fa76e9..f3bb5f3f4 100644
+--- a/src/luxcore/CMakeLists.txt
++++ b/src/luxcore/CMakeLists.txt
+@@ -182,7 +182,7 @@ if(APPLE)
+ 	target_link_libraries(pyluxcore -Wl,-undefined -Wl,dynamic_lookup slg-core slg-film slg-kernels luxrays bcd opensubdiv openvdb opencolorio expat ${BLOSC_LIBRARY} ${EMBREE_LIBRARY} ${OIDN_LIBRARY} ${TBB_LIBRARY} ${TIFF_LIBRARIES} ${TIFF_LIBRARIES} ${OPENEXR_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES})
+     SET_TARGET_PROPERTIES(pyluxcore PROPERTIES XCODE_ATTRIBUTE_DEPLOYMENT_POSTPROCESSING NO) # exclude pylux from strip, not possible
+ else()
+-        target_link_libraries(pyluxcore PRIVATE slg-core slg-film slg-kernels luxrays bcd opensubdiv ${OpenVDB_LIBRARIES} opencolorio ${BLOSC_LIBRARY} ${EMBREE_LIBRARY} ${OIDN_LIBRARY} ${TBB_LIBRARY} ${TIFF_LIBRARIES} ${TIFF_LIBRARIES} ${OPENEXR_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES})
++        target_link_libraries(pyluxcore PRIVATE slg-core slg-film slg-kernels luxrays bcd opensubdiv ${OpenVDB_LIBRARIES} opencolorio ${BLOSC_LIBRARY} ${EMBREE_LIBRARY} ${OIDN_LIBRARY} ${TBB_LIBRARY} ${TIFF_LIBRARIES} ${TIFF_LIBRARIES} ${OPENEXR_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES} fmt::fmt)
+ endif()
+ 
+ set_target_properties(pyluxcore PROPERTIES PREFIX "")
 diff --git a/tests/luxcoreimplserializationdemo/CMakeLists.txt b/tests/luxcoreimplserializationdemo/CMakeLists.txt
 index 276851016..39de31bbf 100644
 --- a/tests/luxcoreimplserializationdemo/CMakeLists.txt
diff --git a/PKGBUILD b/PKGBUILD
index 0f6147814bc6..91645ae3b22a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -22,8 +22,8 @@ pkgver=2.6
 #_rel="rc1"
 [ -n "${_rel}" ] && _pkgver=${pkgver}${_rel} && pkgver+=".${_rel}" || _pkgver=${pkgver}
 _name=LuxCore-${pkgname}_v${_pkgver}
-pkgrel=9
-epoch=2
+pkgrel=10
+epoch=1
 pkgdesc="Physically correct, unbiased rendering engine."
 arch=('x86_64')
 url="https://www.luxcorerender.org/"
@@ -63,7 +63,7 @@ sha256sums=('b844989b8229bf02f3c8aa6845be6a587aa5ae55a45861591119ad0e1a195867'
             '6c34263d955440cb200ddb6f51711fca9b5548ca9ccf133cc924f87298f4dce0'
             '069ca9caef3b7c85ffc4a55de79122488b1b513135b0536b24772c483c8d0cab'
             'b8b3d9d4432198e34a281f24c0ffedb4a9f69ce8ee36c30125b83b4a6c6358f6'
-            '754b12d61f18a6408d9c4c7814b5402bbe3ed709cad5ddc29ad9cf1ca5a04067')
+            'e4ad9b7a0b77e0ca00136159f8f7c8e5940d26918421f18114ad5657fbf32359')
 b2sums=('ead966b0df7bb72ac9aa2aefb1e5f2dd020156a8e66f67aeff75d29606072ea7b147ddc4d6effea687baf4653e670bd3ad93fc9c7b0e7cac340cb1d5976adb14'
         '1a1f4de4f70564216a99f1a27c6321c85187eaea80d9a2a47c66be07fa4a1d825eeef526167aaeb89e4bd67a376a56728af95ee00ee8c1bcc7556afce5f126b0'
         '56fa362f1a79e735377b85b1a5303d0761b0b022b9b4a6063af8aee19643bcef0663105cefd969e746ace5cf7e13f3d0da2b7fc696ba0b500f2c21bb57f1bddb'
@@ -78,7 +78,7 @@ b2sums=('ead966b0df7bb72ac9aa2aefb1e5f2dd020156a8e66f67aeff75d29606072ea7b147ddc
         '19a81a9c442272e7d0123bc99b93be8cafab1a84a7a9bbb58e92e5a6624277e85b33c41183e739ebb8898aa886d477854c9075457a4da9266a5a8a0b26387ae0'
         '1d434b3eb400af3b4db9ad1fd3f40d8cfcae6d7adcb0912f3fb243f5f824f1df72b6ccd044fc22d7ca5b7476e58ce3ffce0eadbe5d9e8f5a07ab9fcecc85b776'
         '34176c1fd0e8e22daab5a986b67a6732170376a618a2e59cf0a3b6ca33c6f1407f61c8a1c92f00cdce1bee850ade295d8092691191d4c2c7cbc05016c4c791d6'
-        '0397e8edfc21b6498022bda0545fad6c98eba8dcdc0f6f45c920156f27634f7c66dc9ad57f49d48e69d8818065627ddd3cf33259f3a83c576eb16a9304610f3b')
+        '084628e44473a2ddb5fdcffb5ddab5dabf02aee46de01a3a0f22f0ffab958be3980494078a7b4b2fcd2168a4d048de13ac14cecd26dda97ff00037e41ca50c11')
 
 prepare() {
   for patch in "${srcdir}"/*.patch; do