From b5e7badb9790c9cd50f9f5f0144107ae548f8fa1 Mon Sep 17 00:00:00 2001 From: "MARINA\\jpmug" Date: Tue, 6 Feb 2024 02:40:10 -0500 Subject: [PATCH 01/11] New package - mingw-w64-efxc2. an improved version of fxc2 compiler from myself. --- mingw-w64-efxc2/PKGBUILD | 51 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 mingw-w64-efxc2/PKGBUILD diff --git a/mingw-w64-efxc2/PKGBUILD b/mingw-w64-efxc2/PKGBUILD new file mode 100644 index 0000000000..71bdef8f0c --- /dev/null +++ b/mingw-w64-efxc2/PKGBUILD @@ -0,0 +1,51 @@ +# Maintainer: J. Peter Mugaas + +_realname=efxc2 +pkgbase=mingw-w64-${_realname} +pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") +pkgver=0.0.0.8 +pkgrel=1 +pkgdesc="Enhanced version of fxc2 (mingw-w64)" +arch=('any') +mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') +url="https://github.com/JPeterMugaas/efxc2" +license=('spdx:MPL-2.0') +makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" + "${MINGW_PACKAGE_PREFIX}-ninja" + "${MINGW_PACKAGE_PREFIX}-cc" + 'git') +_commit='09299c2' +source=("${_realname}"::"git+https://github.com/JPeterMugaas/efxc2.git") +sha256sums=('SKIP') + +prepare() { + cd "${srcdir}/${_realname}" +} + +build() { + mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}" + + declare -a extra_config + if check_option "debug" "n"; then + extra_config+=("-DCMAKE_BUILD_TYPE=Release") + else + extra_config+=("-DCMAKE_BUILD_TYPE=Debug") + fi + + MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ + "${MINGW_PREFIX}"/bin/cmake.exe \ + -GNinja \ + -DCMAKE_INSTALL_PREFIX="${MINGW_PREFIX}" \ + "${extra_config[@]}" \ + ../${_realname} + + "${MINGW_PREFIX}"/bin/cmake.exe --build . +} + +package() { + cd "${srcdir}/build-${MSYSTEM}" + + DESTDIR="${pkgdir}" "${MINGW_PREFIX}"/bin/cmake.exe --install . + + install -Dm644 "${srcdir}/${_realname}/license_MPL_2_0.txt" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE" +} From d8e3d93a21f00637731e43693123f5d1e75adc81 Mon Sep 17 00:00:00 2001 From: "MARINA\\jpmug" Date: Wed, 21 Feb 2024 19:37:51 -0500 Subject: [PATCH 02/11] Update to package. 1) Based on latest release version of efxc2. 2. Added testing. --- mingw-w64-efxc2/PKGBUILD | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/mingw-w64-efxc2/PKGBUILD b/mingw-w64-efxc2/PKGBUILD index 71bdef8f0c..7138c71fd9 100644 --- a/mingw-w64-efxc2/PKGBUILD +++ b/mingw-w64-efxc2/PKGBUILD @@ -3,7 +3,7 @@ _realname=efxc2 pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") -pkgver=0.0.0.8 +pkgver=0.0.1.43 pkgrel=1 pkgdesc="Enhanced version of fxc2 (mingw-w64)" arch=('any') @@ -12,15 +12,9 @@ url="https://github.com/JPeterMugaas/efxc2" license=('spdx:MPL-2.0') makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-ninja" - "${MINGW_PACKAGE_PREFIX}-cc" - 'git') -_commit='09299c2' -source=("${_realname}"::"git+https://github.com/JPeterMugaas/efxc2.git") -sha256sums=('SKIP') - -prepare() { - cd "${srcdir}/${_realname}" -} + "${MINGW_PACKAGE_PREFIX}-cc") +source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/JPeterMugaas/efxc2/archive/refs/tags/${pkgver}.tar.gz") +sha256sums=('c2315537e12bbc3702666ac3f3d0b76f2f9475fe12ba5807039fe7c5bd206ca9') build() { mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}" @@ -37,15 +31,21 @@ build() { -GNinja \ -DCMAKE_INSTALL_PREFIX="${MINGW_PREFIX}" \ "${extra_config[@]}" \ - ../${_realname} + ../${_realname}-${pkgver} "${MINGW_PREFIX}"/bin/cmake.exe --build . } +check() { + cd "${srcdir}/build-${MSYSTEM}" + + "${MINGW_PREFIX}"/bin/cmake.exe --build . --target test +} + package() { cd "${srcdir}/build-${MSYSTEM}" DESTDIR="${pkgdir}" "${MINGW_PREFIX}"/bin/cmake.exe --install . - install -Dm644 "${srcdir}/${_realname}/license_MPL_2_0.txt" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE" + install -Dm644 "${srcdir}/${_realname}-${pkgver}/license_MPL_2_0.txt" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE" } From 87a072ddea4975e0efa500af34a8f8a7add775d4 Mon Sep 17 00:00:00 2001 From: "MARINA\\jpmug" Date: Wed, 21 Feb 2024 20:44:13 -0500 Subject: [PATCH 03/11] mingw-w64-directxtk - new package that shows what efxc2 can do that fxc2 could not do. --- mingw-w64-directxtk/PKGBUILD | 57 ++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 mingw-w64-directxtk/PKGBUILD diff --git a/mingw-w64-directxtk/PKGBUILD b/mingw-w64-directxtk/PKGBUILD new file mode 100644 index 0000000000..511f8b382b --- /dev/null +++ b/mingw-w64-directxtk/PKGBUILD @@ -0,0 +1,57 @@ +# Maintainer: J. Peter Mugaas + +_realname=directxtk +_rn=DirectXTK +pkgbase=mingw-w64-${_realname} +pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") +pkgver=1.8.7 +_tag=dec2023 +pkgrel=1 +pkgdesc="DirectX Tool Kit for DirectX 11 (mingw-w64)" +arch=('any') +mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') +url='http://go.microsoft.com/fwlink/?LinkId=248929' +license=('MIT') +makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" + "${MINGW_PACKAGE_PREFIX}-ninja" + "${MINGW_PACKAGE_PREFIX}-cc" + "${MINGW_PACKAGE_PREFIX}-directxmath" + "${MINGW_PACKAGE_PREFIX}-efxc2") +source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/microsoft/DirectXTK/archive/refs/tags/${_tag}.tar.gz") +sha256sums=('c53e6a4cd49bc7ae9520df69639eb43a66520336005e4c35ced448d3e752d1ee') + +build() { + cd "${srcdir}/${_rn}-${_tag}" + mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}" + + declare -a extra_config + if check_option "debug" "n"; then + extra_config+=("-DCMAKE_BUILD_TYPE=Release") + else + extra_config+=("-DCMAKE_BUILD_TYPE=Debug") + fi + + MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ + "${MINGW_PREFIX}"/bin/cmake.exe \ + -GNinja \ + -DCMAKE_INSTALL_PREFIX="${MINGW_PREFIX}" \ + "${extra_config[@]}" \ + -DBUILD_TOOLS=OFF \ + ../${_rn}-${_tag} + + "${MINGW_PREFIX}"/bin/cmake.exe --build . +} + +check() { + cd "${srcdir}/build-${MSYSTEM}" + + "${MINGW_PREFIX}"/bin/cmake.exe --build . --target test +} + +package() { + cd "${srcdir}/build-${MSYSTEM}" + + DESTDIR="${pkgdir}" "${MINGW_PREFIX}"/bin/cmake.exe --install . + + install -Dm644 "${srcdir}/${_realname}-${_tag}/LICENSE" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE" +} From d586f476e44ea90d18f52f2793a31e7bb4e26235 Mon Sep 17 00:00:00 2001 From: "MARINA\\jpmug" Date: Fri, 23 Feb 2024 16:07:49 -0500 Subject: [PATCH 04/11] Update directxtk to latest version. Enable BUILD_TOOLS since that CMakeLists.txt bug was fixed. --- mingw-w64-directxtk/PKGBUILD | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mingw-w64-directxtk/PKGBUILD b/mingw-w64-directxtk/PKGBUILD index 511f8b382b..e63dcd04e3 100644 --- a/mingw-w64-directxtk/PKGBUILD +++ b/mingw-w64-directxtk/PKGBUILD @@ -4,8 +4,8 @@ _realname=directxtk _rn=DirectXTK pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") -pkgver=1.8.7 -_tag=dec2023 +pkgver=1.8.8 +_tag=feb2024 pkgrel=1 pkgdesc="DirectX Tool Kit for DirectX 11 (mingw-w64)" arch=('any') @@ -18,7 +18,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-directxmath" "${MINGW_PACKAGE_PREFIX}-efxc2") source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/microsoft/DirectXTK/archive/refs/tags/${_tag}.tar.gz") -sha256sums=('c53e6a4cd49bc7ae9520df69639eb43a66520336005e4c35ced448d3e752d1ee') +sha256sums=('56503762c355c2c3a439aa675e6277ec49703f94ed6311817e7b16c4b901282b') build() { cd "${srcdir}/${_rn}-${_tag}" @@ -36,7 +36,7 @@ build() { -GNinja \ -DCMAKE_INSTALL_PREFIX="${MINGW_PREFIX}" \ "${extra_config[@]}" \ - -DBUILD_TOOLS=OFF \ + -DBUILD_TOOLS=ON \ ../${_rn}-${_tag} "${MINGW_PREFIX}"/bin/cmake.exe --build . From 5d59c9ef50636395404ee36b27ceb6431c6bd032 Mon Sep 17 00:00:00 2001 From: "MARINA\\jpmug" Date: Fri, 1 Mar 2024 01:38:31 -0500 Subject: [PATCH 05/11] mingw-w64-directxtex -enable OpenEXR and DX11 support. --- mingw-w64-directxtex/PKGBUILD | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/mingw-w64-directxtex/PKGBUILD b/mingw-w64-directxtex/PKGBUILD index 969930e054..662482cec8 100644 --- a/mingw-w64-directxtex/PKGBUILD +++ b/mingw-w64-directxtex/PKGBUILD @@ -4,8 +4,8 @@ _realname=directxtex pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") # Version from CMakeLists.txt -pkgver=2.0.1 -_tag=oct2023 +pkgver=2.0.3 +_tag=feb2024 pkgrel=1 pkgdesc="DirectXTex texture processing library (mingw-w64)" arch=('any') @@ -16,12 +16,14 @@ msys2_references=( url='http://go.microsoft.com/fwlink/?LinkId=248926' license=('spdx:MIT') depends=("${MINGW_PACKAGE_PREFIX}-directx-headers" - "${MINGW_PACKAGE_PREFIX}-directxmath") + "${MINGW_PACKAGE_PREFIX}-directxmath" + "${MINGW_PACKAGE_PREFIX}-openexr") makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-cmake" - "${MINGW_PACKAGE_PREFIX}-ninja") + "${MINGW_PACKAGE_PREFIX}-ninja" + "${MINGW_PACKAGE_PREFIX}-efxc2") source=("${_realname}-${_tag}.tar.gz"::"https://github.com/microsoft/DirectXTex/archive/$_tag.tar.gz") -sha256sums=('b6afc911c8444ab4bede9685509421baf343f920f2a48eae7179748f23647d6a') +sha256sums=('cb21e7bbb8f552da4ada89fa1f7225e6283ebcd69e4501653b75ade1768cc6a6') build() { mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}" @@ -38,11 +40,11 @@ build() { "${MINGW_PREFIX}"/bin/cmake.exe \ -GNinja \ -DCMAKE_INSTALL_PREFIX="${MINGW_PREFIX}" \ - -DBUILD_DX11=OFF \ + -DBUILD_DX11=ON \ -DBUILD_DX12=ON \ -DBUILD_TOOLS=ON \ + -DENABLE_OPENEXR_SUPPORT=ON \ "${extra_config[@]}" \ - -DBUILD_SHARED_LIBS=ON \ ../${_realname}-${_tag} "${MINGW_PREFIX}"/bin/cmake.exe --build . From 761cfbed45b0be62e4f758eb187a630f20774549 Mon Sep 17 00:00:00 2001 From: "MARINA\\jpmug" Date: Fri, 1 Mar 2024 01:50:21 -0500 Subject: [PATCH 06/11] mingw-w64-directxtex - remove 32-bit toolchains/ --- mingw-w64-directxtex/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mingw-w64-directxtex/PKGBUILD b/mingw-w64-directxtex/PKGBUILD index 662482cec8..27a7ff55cd 100644 --- a/mingw-w64-directxtex/PKGBUILD +++ b/mingw-w64-directxtex/PKGBUILD @@ -9,7 +9,7 @@ _tag=feb2024 pkgrel=1 pkgdesc="DirectXTex texture processing library (mingw-w64)" arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32') +mingw_arch=('mingw64' 'ucrt64' 'clang64') msys2_references=( 'aur: mingw-w64-directxtex' ) From f1a8e303d4884a7d75c0302c28cca12ff3c6aca6 Mon Sep 17 00:00:00 2001 From: "MARINA\\jpmug" Date: Mon, 4 Mar 2024 19:54:19 -0500 Subject: [PATCH 07/11] mingw-w64-efxc2 - update to latest release. --- mingw-w64-efxc2/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mingw-w64-efxc2/PKGBUILD b/mingw-w64-efxc2/PKGBUILD index 7138c71fd9..3e5aaf30a8 100644 --- a/mingw-w64-efxc2/PKGBUILD +++ b/mingw-w64-efxc2/PKGBUILD @@ -3,7 +3,7 @@ _realname=efxc2 pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") -pkgver=0.0.1.43 +pkgver=0.0.2.49 pkgrel=1 pkgdesc="Enhanced version of fxc2 (mingw-w64)" arch=('any') @@ -14,7 +14,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-ninja" "${MINGW_PACKAGE_PREFIX}-cc") source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/JPeterMugaas/efxc2/archive/refs/tags/${pkgver}.tar.gz") -sha256sums=('c2315537e12bbc3702666ac3f3d0b76f2f9475fe12ba5807039fe7c5bd206ca9') +sha256sums=('20b430c16693d1185aa9e5751243d081ed8a9021802e00370c740ba7d6d8f892') build() { mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}" From bc29b99013f4cf348811d94b5056215c4fa3f27c Mon Sep 17 00:00:00 2001 From: "MARINA\\jpmug" Date: Wed, 6 Mar 2024 16:19:16 -0500 Subject: [PATCH 08/11] mingw-w64-directxtex - March 2024 release --- mingw-w64-directxtex/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mingw-w64-directxtex/PKGBUILD b/mingw-w64-directxtex/PKGBUILD index 27a7ff55cd..88c13cd3d7 100644 --- a/mingw-w64-directxtex/PKGBUILD +++ b/mingw-w64-directxtex/PKGBUILD @@ -5,7 +5,7 @@ pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") # Version from CMakeLists.txt pkgver=2.0.3 -_tag=feb2024 +_tag=mar2024 pkgrel=1 pkgdesc="DirectXTex texture processing library (mingw-w64)" arch=('any') @@ -23,7 +23,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-ninja" "${MINGW_PACKAGE_PREFIX}-efxc2") source=("${_realname}-${_tag}.tar.gz"::"https://github.com/microsoft/DirectXTex/archive/$_tag.tar.gz") -sha256sums=('cb21e7bbb8f552da4ada89fa1f7225e6283ebcd69e4501653b75ade1768cc6a6') +sha256sums=('1a887a8e4b9a5ba6eff2f1b3ce31a8c3c269318a268d2278ce50b2461eb214c5') build() { mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}" From 3fa40875e7e7b459e1879dfff0b3d5c13b586ab3 Mon Sep 17 00:00:00 2001 From: "MARINA\\jpmug" Date: Sun, 10 Mar 2024 22:17:40 -0400 Subject: [PATCH 09/11] mingw-w64-efxc2 - update to latest release. --- mingw-w64-efxc2/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mingw-w64-efxc2/PKGBUILD b/mingw-w64-efxc2/PKGBUILD index 3e5aaf30a8..f5033bc525 100644 --- a/mingw-w64-efxc2/PKGBUILD +++ b/mingw-w64-efxc2/PKGBUILD @@ -3,7 +3,7 @@ _realname=efxc2 pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") -pkgver=0.0.2.49 +pkgver=0.0.3.67 pkgrel=1 pkgdesc="Enhanced version of fxc2 (mingw-w64)" arch=('any') @@ -14,7 +14,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-ninja" "${MINGW_PACKAGE_PREFIX}-cc") source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/JPeterMugaas/efxc2/archive/refs/tags/${pkgver}.tar.gz") -sha256sums=('20b430c16693d1185aa9e5751243d081ed8a9021802e00370c740ba7d6d8f892') +sha256sums=('56a98c87e7e4926ac938806d20de806692ebc1bd153783a4e296c34ebd23b6b8') build() { mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}" From 6a0a5f14ae325ed10ce771c4dbbc96dea6886ae2 Mon Sep 17 00:00:00 2001 From: "MARINA\\jpmug" Date: Sun, 17 Mar 2024 02:06:23 -0400 Subject: [PATCH 10/11] mingw-w64-efxc2 - update to latest release. --- mingw-w64-efxc2/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mingw-w64-efxc2/PKGBUILD b/mingw-w64-efxc2/PKGBUILD index f5033bc525..337764e5ba 100644 --- a/mingw-w64-efxc2/PKGBUILD +++ b/mingw-w64-efxc2/PKGBUILD @@ -3,7 +3,7 @@ _realname=efxc2 pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") -pkgver=0.0.3.67 +pkgver=0.0.4.84 pkgrel=1 pkgdesc="Enhanced version of fxc2 (mingw-w64)" arch=('any') @@ -14,7 +14,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-ninja" "${MINGW_PACKAGE_PREFIX}-cc") source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/JPeterMugaas/efxc2/archive/refs/tags/${pkgver}.tar.gz") -sha256sums=('56a98c87e7e4926ac938806d20de806692ebc1bd153783a4e296c34ebd23b6b8') +sha256sums=('091a050add885f476359ce3a6b57d8829b2021686ccd51cf3aa416d7c81138cd') build() { mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}" From ee2097619c2b9060bed176dafd29fe4af776d2b4 Mon Sep 17 00:00:00 2001 From: "MARINA\\jpmug" Date: Wed, 27 Mar 2024 03:28:54 -0500 Subject: [PATCH 11/11] mingw-w64-efxc2 - update to latest release. --- mingw-w64-efxc2/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mingw-w64-efxc2/PKGBUILD b/mingw-w64-efxc2/PKGBUILD index 337764e5ba..e67b813c4e 100644 --- a/mingw-w64-efxc2/PKGBUILD +++ b/mingw-w64-efxc2/PKGBUILD @@ -3,7 +3,7 @@ _realname=efxc2 pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") -pkgver=0.0.4.84 +pkgver=0.0.5.100 pkgrel=1 pkgdesc="Enhanced version of fxc2 (mingw-w64)" arch=('any') @@ -14,7 +14,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-ninja" "${MINGW_PACKAGE_PREFIX}-cc") source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/JPeterMugaas/efxc2/archive/refs/tags/${pkgver}.tar.gz") -sha256sums=('091a050add885f476359ce3a6b57d8829b2021686ccd51cf3aa416d7c81138cd') +sha256sums=('69740ea43bbb23715f8bd7f1afe84727ff12cae37a3012e416017d634f8a6cd3') build() { mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"