diff --git a/mingw-w64-frei0r-plugins/0001-Fix-autotools-build-for-opencv4.patch b/mingw-w64-frei0r-plugins/0001-Fix-autotools-build-for-opencv4.patch index 97d8441639..0bb3d096af 100644 --- a/mingw-w64-frei0r-plugins/0001-Fix-autotools-build-for-opencv4.patch +++ b/mingw-w64-frei0r-plugins/0001-Fix-autotools-build-for-opencv4.patch @@ -1,7 +1,7 @@ From 51e83420638d58a2229931614bfc6f71e292980e Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Sun, 29 Nov 2020 20:25:43 -0300 -Subject: [PATCH 1/5] Fix autotools build for opencv4 +Subject: [PATCH 1/4] Fix autotools build for opencv4 The CMake build already works --- @@ -55,5 +55,5 @@ index 0eda1a2..2d8ba6b 100644 endif -- -2.29.2.windows.2 +2.23.0 diff --git a/mingw-w64-frei0r-plugins/0002-fix-autoconf-fails-without-opencv.patch b/mingw-w64-frei0r-plugins/0002-fix-autoconf-fails-without-opencv.patch new file mode 100644 index 0000000000..f6ddc042f9 --- /dev/null +++ b/mingw-w64-frei0r-plugins/0002-fix-autoconf-fails-without-opencv.patch @@ -0,0 +1,37 @@ +From 3d3c4a6acb264d7b46d975b5eba29c5521afcfbd Mon Sep 17 00:00:00 2001 +From: Dan Dennedy +Date: Tue, 1 Dec 2020 22:10:51 -0800 +Subject: [PATCH 2/4] fix autoconf fails without opencv + +Also fixes the OpenCV-based plugins actually building and installing when +OpenCV present. +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 4ddc06e..7c95b9a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -98,9 +98,8 @@ PKG_CHECK_MODULES([OPENCV], [opencv4 >= 4.0.0], + [AC_DEFINE([HAVE_OPENCV], true, [compiled including OpenCV >= 4])], + [PKG_CHECK_MODULES([OPENCV], [opencv > 1.0.0], + [AC_DEFINE([HAVE_OPENCV], true, [compiled including OpenCV < 4]) +- ]) ++ ], [true]) + ]) +-AM_CONDITIONAL([HAVE_OPENCV], [test x$HAVE_OPENCV = xtrue]) + if test ! "x$OPENCV_LIBS" = "x"; then + HAVE_OPENCV=true + AC_DEFINE(OPENCV_DATA_DIR,[${prefix}/share/opencv],opencv data prefix) +@@ -108,6 +107,7 @@ if test ! "x$OPENCV_LIBS" = "x"; then + AC_SUBST([OPENCV_CFLAGS]) + AC_SUBST([OPENCV_LIBS]) + fi ++AM_CONDITIONAL([HAVE_OPENCV], [test x$HAVE_OPENCV = xtrue]) + AC_SUBST(HAVE_OPENCV) + + HAVE_GAVL=false +-- +2.23.0 + diff --git a/mingw-w64-frei0r-plugins/0002-Fix-out-of-source-tree-CXX-build-failures.patch b/mingw-w64-frei0r-plugins/0003-Fix-out-of-source-tree-CXX-build-failures.patch similarity index 91% rename from mingw-w64-frei0r-plugins/0002-Fix-out-of-source-tree-CXX-build-failures.patch rename to mingw-w64-frei0r-plugins/0003-Fix-out-of-source-tree-CXX-build-failures.patch index 4b13c3005c..b42db37fc4 100644 --- a/mingw-w64-frei0r-plugins/0002-Fix-out-of-source-tree-CXX-build-failures.patch +++ b/mingw-w64-frei0r-plugins/0003-Fix-out-of-source-tree-CXX-build-failures.patch @@ -1,7 +1,7 @@ -From b871c7297fd464b55434e47fcffecb1bdfe03ffc Mon Sep 17 00:00:00 2001 +From 4e7e0f40d12ba8febd5fcd9e8e604def8bf56d8d Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Wed, 2 Dec 2020 02:16:16 +0100 -Subject: [PATCH 2/5] Fix out-of-source-tree CXX build failures +Subject: [PATCH 3/4] Fix out-of-source-tree CXX build failures Lack of CXXFLAGS here. I would expect that CPPFLAGS would have made it through but that seems not to be the case. @@ -42,5 +42,5 @@ index 2d8ba6b..db6b531 100644 AM_LIBTOOLFLAGS = --tag=disable-static -- -2.29.2.windows.2 +2.23.0 diff --git a/mingw-w64-frei0r-plugins/0003-Support-MSYS2-mingw-w64.patch b/mingw-w64-frei0r-plugins/0004-Support-MSYS2-mingw-w64.patch similarity index 93% rename from mingw-w64-frei0r-plugins/0003-Support-MSYS2-mingw-w64.patch rename to mingw-w64-frei0r-plugins/0004-Support-MSYS2-mingw-w64.patch index ea25d1af11..0eb40bad15 100644 --- a/mingw-w64-frei0r-plugins/0003-Support-MSYS2-mingw-w64.patch +++ b/mingw-w64-frei0r-plugins/0004-Support-MSYS2-mingw-w64.patch @@ -1,7 +1,7 @@ -From d09679a6633c9c430c4ca0a258717b57b90a6622 Mon Sep 17 00:00:00 2001 +From be4dcc6afaa9d3246004b8c84c4152a981c5de4c Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Wed, 2 Dec 2020 02:15:43 +0100 -Subject: [PATCH 3/5] Support MSYS2/mingw-w64 +Subject: [PATCH 4/4] Support MSYS2/mingw-w64 --- configure.ac | 8 +++++++- @@ -9,7 +9,7 @@ Subject: [PATCH 3/5] Support MSYS2/mingw-w64 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac -index 4ddc06e..c003742 100644 +index 7c95b9a..6e2f9d3 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ AM_INIT_AUTOMAKE([foreign subdir-objects]) @@ -79,5 +79,5 @@ index db6b531..7d397c4 100644 rm -f $(DESTDIR)/$(plugindir)/$$sofile; \ done -- -2.29.2.windows.2 +2.23.0 diff --git a/mingw-w64-frei0r-plugins/PKGBUILD b/mingw-w64-frei0r-plugins/PKGBUILD index 776a0d89e9..4b7899e7fa 100644 --- a/mingw-w64-frei0r-plugins/PKGBUILD +++ b/mingw-w64-frei0r-plugins/PKGBUILD @@ -19,14 +19,16 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" source=("https://files.dyne.org/frei0r/$_realname-$pkgver.tar.gz" "https://files.dyne.org/frei0r/$_realname-$pkgver.tar.gz.asc" "0001-Fix-autotools-build-for-opencv4.patch" - "0002-Fix-out-of-source-tree-CXX-build-failures.patch" - "0003-Support-MSYS2-mingw-w64.patch") + "0002-fix-autoconf-fails-without-opencv.patch" + "0003-Fix-out-of-source-tree-CXX-build-failures.patch" + "0004-Support-MSYS2-mingw-w64.patch") validpgpkeys=('6113D89CA825C5CEDD02C87273B35DA54ACB7D10') # Denis Roio (Jaromil) sha256sums=('1b1ff8f0f9bc23eed724e94e9a7c1d8f0244bfe33424bb4fe68e6460c088523a' 'SKIP' - '24060fc9721348e4261eeba3e4f8e39bbf8695bbff45da06fca566d539a2bf78' - '363ed95d4460045ed1803eab80b052b3cea10b1df34ab85a29975a973066143c' - '0328840c10082380e3a9bcf58e0ae373d45f54fa3cfd7392a58984e1b6c89ba3') + 'da619d7f2fba7f775952092d747b9d129f3108c32ab8025decd2a2138ec29571' + '474655eed3b2a5fe8179162f06c9ce4587854c4e3e15e91daf12b5d8ee0e0f17' + '544823aba78bfb7f1830d8a69697a544d324bba06cb6431a554ceb266efb09b3' + '9405b01f5a2564841fbce8b40cd47539b54f607c8c2e219a6e5fd3a6c5904b6c') # =========================================== # @@ -56,13 +58,18 @@ prepare() { apply_patch_with_msg \ 0001-Fix-autotools-build-for-opencv4.patch + + plain "Autotools OpenCV installation fix (from upstream)" + apply_patch_with_msg \ + 0002-fix-autoconf-fails-without-opencv.patch + plain "General autotools fix (upstreaming .. hopefully)" apply_patch_with_msg \ - 0002-Fix-out-of-source-tree-CXX-build-failures.patch + 0003-Fix-out-of-source-tree-CXX-build-failures.patch plain "MSYS2/mingw-w64 autotools fixes (upstreaming .. hopefully)" apply_patch_with_msg \ - 0003-Support-MSYS2-mingw-w64.patch + 0004-Support-MSYS2-mingw-w64.patch # The 1.7.0 tarball seems to have incorrectly named files: cp AUTHORS.txt AUTHORS