package/opencv: bump version to 2.4.13.3
PATCH 1/1 package/opencv: bump version to 2.4.13.3
Removed patches applied upstream:
0002-avoid-sysctl_h.patch
https://github.com/opencv/opencv/commit/61936eb1a43e732e4bc1c75b63e6cab85c6f9e94
0004-fix-static-linking.patch
https://github.com/opencv/opencv/commit/70489b1e2232ead1701519e35d151670b74c3f70
In-source-builds are not allowed anymore:
https://github.com/opencv/opencv/commit/777a0080cbdb98761853519b3f45136727a855c2
Re-numbered remaining patches.
---
...xt-Do-not-add-libdl-to-LINKER_LIBS-for-s.patch} | 0
package/opencv/0002-avoid-sysctl_h.patch | 61 ----------------------
package/opencv/0004-fix-static-linking.patch | 45 ----------------
package/opencv/opencv.hash | 2 +-
package/opencv/opencv.mk | 3 +-
5 files changed, 3 insertions(+), 108 deletions(-)
rename package/opencv/{0003-CMakeLists.txt-Do-not-add-libdl-to-LINKER_LIBS-for-s.patch => 0002-CMakeLists.txt-Do-not-add-libdl-to-LINKER_LIBS-for-s.patch} (100%)
delete mode 100644 package/opencv/0002-avoid-sysctl_h.patch
delete mode 100644 package/opencv/0004-fix-static-linking.patchpackage/opencv/0002-CMakeLists.txt-Do-not-add-libdl-to-LINKER_LIBS-for-s.patch renamed from package/opencv/0003-CMakeLists.txt-Do-not-add-libdl-to-LINKER_LIBS-for-s.patch +0 -0
package/opencv/0002-avoid-sysctl_h.patch deleted +0 -61
61 lines not on this page · raw message
package/opencv/0004-fix-static-linking.patch deleted +0 -45
45 lines not on this page · raw message
package/opencv/opencv.hash +1 -1
@@ -1,2 +1,2 @@ # Locally calculated -sha256 4b00c110e6c54943cbbb7cf0d35c5bc148133ab2095ee4aaa0ac0a4f67c58080 opencv-2.4.13.2.tar.gz +sha256 fb4769d0119c35426c3754b7fb079b407911e863958db53bdec83c7794582e41 opencv-2.4.13.3.tar.gz
package/opencv/opencv.mk +2 -1
@@ -4,11 +4,12 @@ # ################################################################################ -OPENCV_VERSION = 2.4.13.2 +OPENCV_VERSION = 2.4.13.3 OPENCV_SITE = $(call github,itseez,opencv,$(OPENCV_VERSION)) OPENCV_INSTALL_STAGING = YES OPENCV_LICENSE = BSD-3-Clause OPENCV_LICENSE_FILES = LICENSE +OPENCV_SUPPORTS_IN_SOURCE_BUILD = NO # OpenCV component options OPENCV_CONF_OPTS += \
Signature · 1 line
2.11.0
Thomas Petazzoni
AppliedPATCH 1/1 package/opencv: bump version to 2.4.13.3
Hello,
Quoted 14 lines · Bernd Kuhls
Removed patches applied upstream:
0002-avoid-sysctl_h.patch
https://github.com/opencv/opencv/commit/61936eb1a43e732e4bc1c75b63e6cab85c6f9e940004-fix-static-linking.patch
https://github.com/opencv/opencv/commit/70489b1e2232ead1701519e35d151670b74c3f70In-source-builds are not allowed anymore:
https://github.com/opencv/opencv/commit/777a0080cbdb98761853519b3f45136727a855c2Re-numbered remaining patches.
Signed-off-by Bernd Kuhls <[email protected]>
Quoted 10 lines
---
...xt-Do-not-add-libdl-to-LINKER_LIBS-for-s.patch} | 0
package/opencv/0002-avoid-sysctl_h.patch | 61 ----------------------
package/opencv/0004-fix-static-linking.patch | 45 ----------------
package/opencv/opencv.hash | 2 +-
package/opencv/opencv.mk | 3 +-
5 files changed, 3 insertions(+), 108 deletions(-)
rename package/opencv/{0003-CMakeLists.txt-Do-not-add-libdl-to-LINKER_LIBS-for-s.patch => 0002-CMakeLists.txt-Do-not-add-libdl-to-LINKER_LIBS-for-s.patch} (100%)
delete mode 100644 package/opencv/0002-avoid-sysctl_h.patch
delete mode 100644 package/opencv/0004-fix-static-linking.patchApplied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH 1/1 package/opencv: bump version to 2.4.13.3
Hello,
Quoted 1 line · Thomas Petazzoni
Applied to master, thanks.
In fact, no: it doesn't apply. The patch 0004 that you are removing doesn't exist here.
Best regards,
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com