summaryrefslogtreecommitdiff
path: root/meta-openembedded/meta-oe/recipes-support
diff options
context:
space:
mode:
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-support')
-rw-r--r--meta-openembedded/meta-oe/recipes-support/asio/asio_1.16.1.bb (renamed from meta-openembedded/meta-oe/recipes-support/asio/asio_1.12.2.bb)7
-rw-r--r--meta-openembedded/meta-oe/recipes-support/libgit2/libgit2_1.0.1.bb (renamed from meta-openembedded/meta-oe/recipes-support/libgit2/libgit2_1.0.0.bb)2
-rw-r--r--meta-openembedded/meta-oe/recipes-support/opencv/opencv/0001-Make-ts-module-external.patch42
-rw-r--r--meta-openembedded/meta-oe/recipes-support/opencv/opencv/0002-Make-opencv-ts-create-share-library-intead-of-static.patch24
-rw-r--r--meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.3.0.bb2
-rw-r--r--meta-openembedded/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb4
-rw-r--r--meta-openembedded/meta-oe/recipes-support/sass/libsass_git.bb (renamed from meta-openembedded/meta-oe/recipes-support/sass/libsass_3.6.3.bb)3
7 files changed, 52 insertions, 32 deletions
diff --git a/meta-openembedded/meta-oe/recipes-support/asio/asio_1.12.2.bb b/meta-openembedded/meta-oe/recipes-support/asio/asio_1.16.1.bb
index 35f875fdc..f381d12fb 100644
--- a/meta-openembedded/meta-oe/recipes-support/asio/asio_1.12.2.bb
+++ b/meta-openembedded/meta-oe/recipes-support/asio/asio_1.16.1.bb
@@ -1,3 +1,4 @@
+SUMMARY = "Asio is C++ library for network and low-level I/O programming"
DESCRIPTION = "Asio is a cross-platform C++ library for network and low-level \
I/O programming that provides developers with a consistent asynchronous \
model using a modern C++ approach."
@@ -14,10 +15,10 @@ inherit autotools
ALLOW_EMPTY_${PN} = "1"
-LIC_FILES_CHKSUM = "file://COPYING;md5=3e73f311a3af69e6df275e8c3b1c09b5"
+LIC_FILES_CHKSUM = "file://COPYING;md5=de86c8210a433f72bd3cc98e797a6084"
-SRC_URI[md5sum] = "312e53385e2daad10f08d57f91ad3431"
-SRC_URI[sha256sum] = "4e27dcb37456ba707570334b91f4798721111ed67b69915685eac141895779aa"
+SRC_URI[md5sum] = "569f4b082c652ae8a8ad94fb470016f9"
+SRC_URI[sha256sum] = "e271db76dbbcda9835ed1c9c94deb2ba3f4589c3ebcaa71d99ac694b8d62638c"
SRC_URI = "${SOURCEFORGE_MIRROR}/asio/${BP}.tar.bz2"
diff --git a/meta-openembedded/meta-oe/recipes-support/libgit2/libgit2_1.0.0.bb b/meta-openembedded/meta-oe/recipes-support/libgit2/libgit2_1.0.1.bb
index 74343683f..363ed4d65 100644
--- a/meta-openembedded/meta-oe/recipes-support/libgit2/libgit2_1.0.0.bb
+++ b/meta-openembedded/meta-oe/recipes-support/libgit2/libgit2_1.0.1.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5b002a195fb7ea2d8d583f07eaff3a8e"
DEPENDS = "curl openssl zlib libssh2 libgcrypt libpcre2"
SRC_URI = "git://github.com/libgit2/libgit2.git;branch=maint/v1.0"
-SRCREV = "7d3c7057f0e774aecd6fc4ef8333e69e5c4873e0"
+SRCREV = "0ced29612dacb67eefe0c562a5c1d3aab21cce96"
S = "${WORKDIR}/git"
diff --git a/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0001-Make-ts-module-external.patch b/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0001-Make-ts-module-external.patch
new file mode 100644
index 000000000..d56b8ae67
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0001-Make-ts-module-external.patch
@@ -0,0 +1,42 @@
+From 11bbf909e08594628bd757d989ae34cf1bfe200b Mon Sep 17 00:00:00 2001
+From: Mingli Yu <mingli.yu@windriver.com>
+Date: Thu, 18 Jun 2020 05:51:38 +0000
+Subject: [PATCH] Make ts module external
+
+Make ts module external
+
+Reference: https://github.com/qbonnard/opencv/commit/6b229c5834cb9a0930425e762a6c7b03244d7abb
+
+Upstream-Status: Submitted [https://github.com/opencv/opencv/issues/8408]
+
+Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
+---
+ modules/ts/CMakeLists.txt | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/modules/ts/CMakeLists.txt b/modules/ts/CMakeLists.txt
+index f95bed0793..66f315bcca 100644
+--- a/modules/ts/CMakeLists.txt
++++ b/modules/ts/CMakeLists.txt
+@@ -4,9 +4,6 @@ if(NOT BUILD_opencv_ts AND NOT BUILD_TESTS AND NOT BUILD_PERF_TESTS)
+ ocv_module_disable(ts)
+ endif()
+
+-set(OPENCV_MODULE_TYPE STATIC)
+-set(OPENCV_MODULE_IS_PART_OF_WORLD FALSE)
+-
+ if(WINRT)
+ # WINRT doesn't have access to environment variables
+ # so adding corresponding macros during CMake run
+@@ -16,7 +13,7 @@ endif()
+
+ ocv_warnings_disable(CMAKE_CXX_FLAGS -Wundef)
+
+-ocv_add_module(ts INTERNAL opencv_core opencv_imgproc opencv_imgcodecs opencv_videoio opencv_highgui)
++ocv_add_module(ts opencv_core opencv_imgproc opencv_imgcodecs opencv_videoio opencv_highgui)
+
+ ocv_glob_module_sources()
+ ocv_module_include_directories()
+--
+2.24.1
+
diff --git a/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0002-Make-opencv-ts-create-share-library-intead-of-static.patch b/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0002-Make-opencv-ts-create-share-library-intead-of-static.patch
deleted file mode 100644
index 20d54d407..000000000
--- a/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0002-Make-opencv-ts-create-share-library-intead-of-static.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 78e2fc167fd27ab17175dcfd6eccf6f74bd5e1c7 Mon Sep 17 00:00:00 2001
-From: Bian Naimeng <biannm@cn.fujitsu.com>
-Date: Wed, 19 Apr 2017 03:11:37 +0900
-Subject: [PATCH] Make opencv-ts create share library intead of static.
-
-Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com>
-
----
- modules/ts/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/modules/ts/CMakeLists.txt b/modules/ts/CMakeLists.txt
-index f95bed0793..ee67858df8 100644
---- a/modules/ts/CMakeLists.txt
-+++ b/modules/ts/CMakeLists.txt
-@@ -4,7 +4,7 @@ if(NOT BUILD_opencv_ts AND NOT BUILD_TESTS AND NOT BUILD_PERF_TESTS)
- ocv_module_disable(ts)
- endif()
-
--set(OPENCV_MODULE_TYPE STATIC)
-+#set(OPENCV_MODULE_TYPE STATIC)
- set(OPENCV_MODULE_IS_PART_OF_WORLD FALSE)
-
- if(WINRT)
diff --git a/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.3.0.bb b/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.3.0.bb
index 2587b189c..7927ce25f 100644
--- a/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.3.0.bb
+++ b/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.3.0.bb
@@ -44,11 +44,11 @@ SRC_URI = "git://github.com/opencv/opencv.git;name=opencv \
git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_vgg_20160317;destsuffix=vgg;name=vgg \
git://github.com/opencv/opencv_3rdparty.git;branch=contrib_face_alignment_20170818;destsuffix=face;name=face \
file://0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch \
- file://0002-Make-opencv-ts-create-share-library-intead-of-static.patch \
file://0003-To-fix-errors-as-following.patch \
file://0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch \
file://0001-Dont-use-isystem.patch \
file://download.patch \
+ file://0001-Make-ts-module-external.patch \
"
PV = "4.3.0"
diff --git a/meta-openembedded/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb b/meta-openembedded/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb
index efe95b101..dcadede0e 100644
--- a/meta-openembedded/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb
+++ b/meta-openembedded/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb
@@ -20,8 +20,8 @@ RDEPENDS_${PN} = "rsync \
perl-module-overloading \
"
-SRCREV = "27209563f924a22f510698ea225f53ea52f07cb4"
-PV = "1.4.2+git${SRCPV}"
+SRCREV = "a9e29850fc33c503c289e245c7bad350eed746d9"
+PV = "1.4.3+git${SRCPV}"
SRC_URI = "git://github.com/DrHyde/${BPN};branch=master;protocol=git \
file://configure-fix-cmd_rsync.patch \
diff --git a/meta-openembedded/meta-oe/recipes-support/sass/libsass_3.6.3.bb b/meta-openembedded/meta-oe/recipes-support/sass/libsass_git.bb
index d893be223..9cba3a890 100644
--- a/meta-openembedded/meta-oe/recipes-support/sass/libsass_3.6.3.bb
+++ b/meta-openembedded/meta-oe/recipes-support/sass/libsass_git.bb
@@ -6,7 +6,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8f34396ca205f5e119ee77aae91fa27d"
inherit autotools
SRC_URI = "git://github.com/sass/libsass.git;branch=master"
-SRCREV = "e1c16e09b4a953757a15149deaaf28a3fd81dc97"
+SRCREV = "8d312a1c91bb7dd22883ebdfc829003f75a82396"
+PV = "3.6.4"
S = "${WORKDIR}/git"