The package rpms/opencv.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/opencv.git/commit/?id=d1acdb2fa6f....
Change:
+%ifarch %{ix86}
Thanks.
Full change:
============
commit d1acdb2fa6fb94406f59be50f69a77200883ac1a
Author: Srgio M. Basto <sergio(a)serjux.com>
Date: Thu Sep 27 01:04:38 2018 +0100
Update to 3.4.3
diff --git a/.gitignore b/.gitignore
index f0335ae..55a8c0b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,5 @@ OpenCV-2.1.0.tar.bz2
/opencv-clean-3.4.1.tar.gz
/opencv_contrib-clean-3.4.2.tar.gz
/opencv-clean-3.4.2.tar.gz
+/opencv_contrib-clean-3.4.3.tar.gz
+/opencv-clean-3.4.3.tar.gz
diff --git a/4910f16f16a0a0c2b456b14cbc3429c86f96a5f5.patch
b/4910f16f16a0a0c2b456b14cbc3429c86f96a5f5.patch
new file mode 100644
index 0000000..8c109dc
--- /dev/null
+++ b/4910f16f16a0a0c2b456b14cbc3429c86f96a5f5.patch
@@ -0,0 +1,211 @@
+From 4910f16f16a0a0c2b456b14cbc3429c86f96a5f5 Mon Sep 17 00:00:00 2001
+From: Alexander Alekhin <alexander.alekhin(a)intel.com>
+Date: Thu, 9 Aug 2018 19:49:34 +0300
+Subject: [PATCH] core(libva): support YV12 too
+
+Added to CPU path only.
+OpenCL code path still expects NV12 only (according to Intel OpenCL extension)
+---
+ modules/core/src/va_intel.cpp | 175 ++++++++++++++++++++++++++++++++--
+ 1 file changed, 169 insertions(+), 6 deletions(-)
+
+diff --git a/modules/core/src/va_intel.cpp b/modules/core/src/va_intel.cpp
+index 0a2bfd96a36..a3baa4bf0bf 100644
+--- a/modules/core/src/va_intel.cpp
++++ b/modules/core/src/va_intel.cpp
+@@ -324,6 +324,163 @@ static void copy_convert_bgr_to_nv12(const VAImage& image,
const Mat& bgr, unsig
+ dstUV += dstStepUV;
+ }
+ }
++
++
++static void copy_convert_yv12_to_bgr(const VAImage& image, const unsigned char*
buffer, Mat& bgr)
++{
++ const float d1 = 16.0f;
++ const float d2 = 128.0f;
++
++ static const float coeffs[5] =
++ {
++ 1.163999557f,
++ 2.017999649f,
++ -0.390999794f,
++ -0.812999725f,
++ 1.5959997177f
++ };
++
++ CV_CheckEQ(image.format.fourcc, VA_FOURCC_YV12, "Unexpected image
format");
++ CV_CheckEQ(image.num_planes, 3, "");
++
++ const size_t srcOffsetY = image.offsets[0];
++ const size_t srcOffsetV = image.offsets[1];
++ const size_t srcOffsetU = image.offsets[2];
++
++ const size_t srcStepY = image.pitches[0];
++ const size_t srcStepU = image.pitches[1];
++ const size_t srcStepV = image.pitches[2];
++
++ const size_t dstStep = bgr.step;
++
++ const unsigned char* srcY_ = buffer + srcOffsetY;
++ const unsigned char* srcV_ = buffer + srcOffsetV;
++ const unsigned char* srcU_ = buffer + srcOffsetU;
++
++ for (int y = 0; y < bgr.rows; y += 2)
++ {
++ const unsigned char* srcY0 = srcY_ + (srcStepY) * y;
++ const unsigned char* srcY1 = srcY0 + srcStepY;
++
++ const unsigned char* srcV = srcV_ + (srcStepV) * y / 2;
++ const unsigned char* srcU = srcU_ + (srcStepU) * y / 2;
++
++ unsigned char* dst0 = bgr.data + (dstStep) * y;
++ unsigned char* dst1 = dst0 + dstStep;
++
++ for (int x = 0; x < bgr.cols; x += 2)
++ {
++ float Y0 = float(srcY0[x+0]);
++ float Y1 = float(srcY0[x+1]);
++ float Y2 = float(srcY1[x+0]);
++ float Y3 = float(srcY1[x+1]);
++
++ float U = float(srcU[x/2]) - d2;
++ float V = float(srcV[x/2]) - d2;
++
++ Y0 = std::max(0.0f, Y0 - d1) * coeffs[0];
++ Y1 = std::max(0.0f, Y1 - d1) * coeffs[0];
++ Y2 = std::max(0.0f, Y2 - d1) * coeffs[0];
++ Y3 = std::max(0.0f, Y3 - d1) * coeffs[0];
++
++ float ruv = coeffs[4]*V;
++ float guv = coeffs[3]*V + coeffs[2]*U;
++ float buv = coeffs[1]*U;
++
++ dst0[(x+0)*NCHANNELS+0] = saturate_cast<unsigned char>(Y0 + buv);
++ dst0[(x+0)*NCHANNELS+1] = saturate_cast<unsigned char>(Y0 + guv);
++ dst0[(x+0)*NCHANNELS+2] = saturate_cast<unsigned char>(Y0 + ruv);
++
++ dst0[(x+1)*NCHANNELS+0] = saturate_cast<unsigned char>(Y1 + buv);
++ dst0[(x+1)*NCHANNELS+1] = saturate_cast<unsigned char>(Y1 + guv);
++ dst0[(x+1)*NCHANNELS+2] = saturate_cast<unsigned char>(Y1 + ruv);
++
++ dst1[(x+0)*NCHANNELS+0] = saturate_cast<unsigned char>(Y2 + buv);
++ dst1[(x+0)*NCHANNELS+1] = saturate_cast<unsigned char>(Y2 + guv);
++ dst1[(x+0)*NCHANNELS+2] = saturate_cast<unsigned char>(Y2 + ruv);
++
++ dst1[(x+1)*NCHANNELS+0] = saturate_cast<unsigned char>(Y3 + buv);
++ dst1[(x+1)*NCHANNELS+1] = saturate_cast<unsigned char>(Y3 + guv);
++ dst1[(x+1)*NCHANNELS+2] = saturate_cast<unsigned char>(Y3 + ruv);
++ }
++ }
++}
++
++static void copy_convert_bgr_to_yv12(const VAImage& image, const Mat& bgr,
unsigned char* buffer)
++{
++ const float d1 = 16.0f;
++ const float d2 = 128.0f;
++
++ static const float coeffs[8] =
++ {
++ 0.256999969f, 0.50399971f, 0.09799957f, -0.1479988098f,
++ -0.2909994125f, 0.438999176f, -0.3679990768f, -0.0709991455f
++ };
++
++ CV_CheckEQ(image.format.fourcc, VA_FOURCC_YV12, "Unexpected image
format");
++ CV_CheckEQ(image.num_planes, 3, "");
++
++ const size_t dstOffsetY = image.offsets[0];
++ const size_t dstOffsetV = image.offsets[1];
++ const size_t dstOffsetU = image.offsets[2];
++
++ const size_t dstStepY = image.pitches[0];
++ const size_t dstStepU = image.pitches[1];
++ const size_t dstStepV = image.pitches[2];
++
++ unsigned char* dstY_ = buffer + dstOffsetY;
++ unsigned char* dstV_ = buffer + dstOffsetV;
++ unsigned char* dstU_ = buffer + dstOffsetU;
++
++ const size_t srcStep = bgr.step;
++
++ for (int y = 0; y < bgr.rows; y += 2)
++ {
++ unsigned char* dstY0 = dstY_ + (dstStepY) * y;
++ unsigned char* dstY1 = dstY0 + dstStepY;
++
++ unsigned char* dstV = dstV_ + (dstStepV) * y / 2;
++ unsigned char* dstU = dstU_ + (dstStepU) * y / 2;
++
++ const unsigned char* src0 = bgr.data + (srcStep) * y;
++ const unsigned char* src1 = src0 + srcStep;
++
++ for (int x = 0; x < bgr.cols; x += 2)
++ {
++ float B0 = float(src0[(x+0)*NCHANNELS+0]);
++ float G0 = float(src0[(x+0)*NCHANNELS+1]);
++ float R0 = float(src0[(x+0)*NCHANNELS+2]);
++
++ float B1 = float(src0[(x+1)*NCHANNELS+0]);
++ float G1 = float(src0[(x+1)*NCHANNELS+1]);
++ float R1 = float(src0[(x+1)*NCHANNELS+2]);
++
++ float B2 = float(src1[(x+0)*NCHANNELS+0]);
++ float G2 = float(src1[(x+0)*NCHANNELS+1]);
++ float R2 = float(src1[(x+0)*NCHANNELS+2]);
++
++ float B3 = float(src1[(x+1)*NCHANNELS+0]);
++ float G3 = float(src1[(x+1)*NCHANNELS+1]);
++ float R3 = float(src1[(x+1)*NCHANNELS+2]);
++
++ float Y0 = coeffs[0]*R0 + coeffs[1]*G0 + coeffs[2]*B0 + d1;
++ float Y1 = coeffs[0]*R1 + coeffs[1]*G1 + coeffs[2]*B1 + d1;
++ float Y2 = coeffs[0]*R2 + coeffs[1]*G2 + coeffs[2]*B2 + d1;
++ float Y3 = coeffs[0]*R3 + coeffs[1]*G3 + coeffs[2]*B3 + d1;
++
++ float U = coeffs[3]*R0 + coeffs[4]*G0 + coeffs[5]*B0 + d2;
++ float V = coeffs[5]*R0 + coeffs[6]*G0 + coeffs[7]*B0 + d2;
++
++ dstY0[x+0] = saturate_cast<unsigned char>(Y0);
++ dstY0[x+1] = saturate_cast<unsigned char>(Y1);
++ dstY1[x+0] = saturate_cast<unsigned char>(Y2);
++ dstY1[x+1] = saturate_cast<unsigned char>(Y3);
++
++ dstU[x/2] = saturate_cast<unsigned char>(U);
++ dstV[x/2] = saturate_cast<unsigned char>(V);
++ }
++ }
++}
+ #endif // HAVE_VA
+
+ void convertToVASurface(VADisplay display, InputArray src, VASurfaceID surface, Size
size)
+@@ -412,9 +569,12 @@ void convertToVASurface(VADisplay display, InputArray src,
VASurfaceID surface,
+ if (status != VA_STATUS_SUCCESS)
+ CV_Error(cv::Error::StsError, "VA-API: vaMapBuffer failed");
+
+- CV_Assert(image.format.fourcc == VA_FOURCC_NV12);
+-
+- copy_convert_bgr_to_nv12(image, m, buffer);
++ if (image.format.fourcc == VA_FOURCC_NV12)
++ copy_convert_bgr_to_nv12(image, m, buffer);
++ if (image.format.fourcc == VA_FOURCC_YV12)
++ copy_convert_bgr_to_yv12(image, m, buffer);
++ else
++ CV_Check((int)image.format.fourcc, image.format.fourcc == VA_FOURCC_NV12 ||
image.format.fourcc == VA_FOURCC_YV12, "Unexpected image format");
+
+ status = vaUnmapBuffer(display, image.buf);
+ if (status != VA_STATUS_SUCCESS)
+@@ -510,9 +670,12 @@ void convertFromVASurface(VADisplay display, VASurfaceID surface,
Size size, Out
+ if (status != VA_STATUS_SUCCESS)
+ CV_Error(cv::Error::StsError, "VA-API: vaMapBuffer failed");
+
+- CV_Assert(image.format.fourcc == VA_FOURCC_NV12);
+-
+- copy_convert_nv12_to_bgr(image, buffer, m);
++ if (image.format.fourcc == VA_FOURCC_NV12)
++ copy_convert_nv12_to_bgr(image, buffer, m);
++ if (image.format.fourcc == VA_FOURCC_YV12)
++ copy_convert_yv12_to_bgr(image, buffer, m);
++ else
++ CV_Check((int)image.format.fourcc, image.format.fourcc == VA_FOURCC_NV12 ||
image.format.fourcc == VA_FOURCC_YV12, "Unexpected image format");
+
+ status = vaUnmapBuffer(display, image.buf);
+ if (status != VA_STATUS_SUCCESS)
diff --git a/opencv-clean.sh b/opencv-clean.sh
index 4d84ecd..d4d9f71 100755
--- a/opencv-clean.sh
+++ b/opencv-clean.sh
@@ -1,4 +1,4 @@
-export VERSION=3.4.2
+export VERSION=3.4.3
wget -c
https://github.com/opencv/opencv/archive/${VERSION}/opencv-${VERSION}.tar.gz
tar xf opencv-${VERSION}.tar.gz
diff --git a/opencv.spec b/opencv.spec
index f051beb..687a0a7 100644
--- a/opencv.spec
+++ b/opencv.spec
@@ -46,7 +46,7 @@
%global optflags %(echo %{optflags} -Wl,--as-needed )
Name: opencv
-Version: 3.4.2
+Version: 3.4.3
Release: 1%{?dist}
Summary: Collection of algorithms for computer vision
# This is normal three clause BSD.
@@ -62,6 +62,7 @@ Source1: %{name}_contrib-clean-%{version}.tar.gz
# fix/simplify cmake config install location (upstreamable)
#
https://bugzilla.redhat.com/1031312
Patch1: opencv-3.4.1-cmake_paths.patch
+Patch10:
https://github.com/opencv/opencv/commit/4910f16f16a0a0c2b456b14cbc3429c86...
BuildRequires: libtool
BuildRequires: cmake >= 2.6.3
@@ -227,6 +228,9 @@ rm -r 3rdparty/
rm -r modules/dnn/
%patch1 -p1 -b .cmake_paths
+%ifarch %{ix86}
+%patch10 -p1 -R -b .revert_support_YV12_too
+%endif
pushd %{name}_contrib-%{version}
# missing dependecies for dnn_modern module in Fedora (tiny-dnn)
@@ -393,6 +397,9 @@ popd
%{_libdir}/libopencv_xphoto.so.%{abiver}*
%changelog
+* Wed Sep 26 2018 Srgio Basto <sergio(a)serjux.com> - 3.4.3-1
+- Update to 3.4.3
+
* Wed Sep 26 2018 Srgio Basto <sergio(a)serjux.com> - 3.4.2-1
- Update to 3.4.2
diff --git a/sources b/sources
index 3be5b42..9a9a186 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (opencv_contrib-clean-3.4.2.tar.gz) =
4a58b1631d991080adb5b360c57821da27b25d23c533bbff79ff6d3ea95c5643252c1630c6301dc3b7ae6b36ae2f8bdd92e776dddcf896c98c1ca6c5f13b470e
-SHA512 (opencv-clean-3.4.2.tar.gz) =
67356799f6deed200feb018003a12d4c808572c37b2df87d72190f76c4d151ee9454ca08652454c0d3f915a4f6d1fa83ecbb5ed2c080195a7756351a0c29b0c8
+SHA512 (opencv_contrib-clean-3.4.3.tar.gz) =
bc3f47ccc422b8e10be399b9b0293bc578d48ef3faad8a4e540cf1a2424364c99a834ebb250afb8f529442f5486e214a34a01e2eff89c1e409a028e18da11f43
+SHA512 (opencv-clean-3.4.3.tar.gz) =
22a7632bbe3856531c579c464eb76e0e2239d303d7dd3081232005752600941311947ff02e6d0b75c3406ffdac9c7aa0791183404e9f573c999f80bfd563b469