Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libxcam for openSUSE:Factory checked in at 2022-07-05 12:09:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libxcam (Old) and /work/SRC/openSUSE:Factory/.libxcam.new.1548 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libxcam" Tue Jul 5 12:09:09 2022 rev:9 rq:986694 version:1.5.0 Changes: -------- --- /work/SRC/openSUSE:Factory/libxcam/libxcam.changes 2022-04-30 00:46:41.983011855 +0200 +++ /work/SRC/openSUSE:Factory/.libxcam.new.1548/libxcam.changes 2022-07-05 12:09:43.496577822 +0200 @@ -1,0 +2,13 @@ +Mon Jul 4 14:35:03 UTC 2022 - Dominique Leuenberger <[email protected]> + +- Re-generated patches based on upstream commits (osc service ra + download_files): + M 0001-New_features_camera_tunning_and_fixes.patch + M 0001-gl-stitch_support_EGL_initialize_by_GBM.patch + +------------------------------------------------------------------- +Mon Jun 27 21:49:08 UTC 2022 - Antoine Belvire <[email protected]> + +- Add libxcam-1.5.0-gcc-12.patch: Fix build with gcc 12 (gh#intel/libxcam#801). + +------------------------------------------------------------------- New: ---- libxcam-1.5.0-gcc-12.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libxcam.spec ++++++ --- /var/tmp/diff_new_pack.I56WJm/_old 2022-07-05 12:09:44.820579723 +0200 +++ /var/tmp/diff_new_pack.I56WJm/_new 2022-07-05 12:09:44.824579728 +0200 @@ -34,6 +34,8 @@ Patch2: https://github.com/intel/libxcam/commit/ea99d89082c2473c2e22c848bff4f9f537af3fde.patch#/0001-pkg_config_check_opencv_module_version.patch # PATCH-FIX-UPSTREAM Fix ODR violation Patch3: 0001-Fix-multiple-definitions-of-XCam-ShaderID-ODR-violat.patch +# PATCH-FIX-UPSTREAM Fix build with GCC 12 +Patch4: https://github.com/intel/libxcam/pull/802/commits/d13b69e6332277a4a59cd736439e17851fe8be74.patch#/libxcam-1.5.0-gcc-12.patch BuildRequires: Mesa-libGLESv3-devel BuildRequires: autoconf BuildRequires: automake ++++++ 0001-New_features_camera_tunning_and_fixes.patch ++++++ --- /var/tmp/diff_new_pack.I56WJm/_old 2022-07-05 12:09:44.864579786 +0200 +++ /var/tmp/diff_new_pack.I56WJm/_new 2022-07-05 12:09:44.868579792 +0200 @@ -24,7 +24,7 @@ create mode 100644 tests/camera_calibration_insta.json diff --git a/configure.ac b/configure.ac -index 0319a700..0161e947 100644 +index 0319a700a..0161e947d 100644 --- a/configure.ac +++ b/configure.ac @@ -29,7 +29,7 @@ AC_SUBST(XCAM_LT_LDFLAGS) @@ -54,7 +54,7 @@ XCAM_DEFINE_MACOR(ENABLE_DVS_CL_PATH, $ENABLE_DVS_CL_PATH, enable dvs cl path) XCAM_DEFINE_MACOR(ENABLE_CAPI, $ENABLE_CAPI, enable capi) diff --git a/m4/xcam-utils.m4 b/m4/xcam-utils.m4 -index aefaf907..a93c45c6 100644 +index aefaf9077..a93c45c6b 100644 --- a/m4/xcam-utils.m4 +++ b/m4/xcam-utils.m4 @@ -55,7 +55,7 @@ AC_DEFUN([XCAM_CHECK_DOXYGEN], @@ -76,7 +76,7 @@ # XCAM_CHECK_OCV_VIDEOSTAB([$1:value], [$2:if-found], [$3:if-not-found]) diff --git a/modules/gles/gl_stitcher.cpp b/modules/gles/gl_stitcher.cpp -index 1cdf46ad..22ac110a 100644 +index 1cdf46ad7..22ac110ae 100644 --- a/modules/gles/gl_stitcher.cpp +++ b/modules/gles/gl_stitcher.cpp @@ -746,15 +746,19 @@ StitcherImpl::create_feature_match (SmartPtr<FeatureMatch> &matcher) @@ -100,7 +100,7 @@ XCAM_ASSERT (matcher.ptr ()); diff --git a/modules/ocv/cv_capi_feature_match.cpp b/modules/ocv/cv_capi_feature_match.cpp -index d478f3c0..e24416b7 100644 +index d478f3c0f..e24416b7a 100644 --- a/modules/ocv/cv_capi_feature_match.cpp +++ b/modules/ocv/cv_capi_feature_match.cpp @@ -22,6 +22,7 @@ @@ -117,7 +117,7 @@ } +#endif diff --git a/modules/ocv/cv_capi_feature_match.h b/modules/ocv/cv_capi_feature_match.h -index f1f87948..26c60629 100644 +index f1f87948f..26c60629f 100644 --- a/modules/ocv/cv_capi_feature_match.h +++ b/modules/ocv/cv_capi_feature_match.h @@ -31,6 +31,7 @@ @@ -134,7 +134,7 @@ #endif // CV_CAPI_FEATURE_MATCH_H +#endif diff --git a/modules/soft/Makefile.am b/modules/soft/Makefile.am -index 9c4fbdb9..fa398221 100644 +index 9c4fbdb9e..fa3982210 100644 --- a/modules/soft/Makefile.am +++ b/modules/soft/Makefile.am @@ -31,7 +31,7 @@ xcam_soft_sources = \ @@ -147,7 +147,7 @@ libxcam_soft_la_SOURCES = \ $(xcam_soft_sources) \ diff --git a/modules/soft/soft_stitcher.cpp b/modules/soft/soft_stitcher.cpp -index 35081216..dde33d19 100644 +index 350812163..dde33d199 100644 --- a/modules/soft/soft_stitcher.cpp +++ b/modules/soft/soft_stitcher.cpp @@ -470,8 +470,10 @@ StitcherImpl::init_feature_match (uint32_t idx) @@ -162,7 +162,7 @@ XCAM_LOG_ERROR ("unsupported FeatureMatchMode: %d", fm_mode); XCAM_ASSERT (false); diff --git a/modules/vulkan/vk_stitcher.cpp b/modules/vulkan/vk_stitcher.cpp -index 06ec8a77..9e12fd7c 100644 +index 06ec8a772..9e12fd7c1 100644 --- a/modules/vulkan/vk_stitcher.cpp +++ b/modules/vulkan/vk_stitcher.cpp @@ -423,15 +423,19 @@ StitcherImpl::init_feature_matchers () @@ -187,7 +187,7 @@ diff --git a/tests/camera_calibration_insta.json b/tests/camera_calibration_insta.json new file mode 100644 -index 00000000..9d7fae84 +index 000000000..9d7fae848 --- /dev/null +++ b/tests/camera_calibration_insta.json @@ -0,0 +1,115 @@ @@ -307,7 +307,7 @@ + } +} diff --git a/tests/test-surround-view.cpp b/tests/test-surround-view.cpp -index 1e7297df..2fff0a3e 100644 +index 1e7297df0..2fff0a3e4 100644 --- a/tests/test-surround-view.cpp +++ b/tests/test-surround-view.cpp @@ -528,7 +528,7 @@ static void usage(const char* arg0) @@ -347,7 +347,7 @@ soft_stitch_info (cam_model, scopic_mode) : gl_stitch_info (cam_model, scopic_mode); diff --git a/tests/test_sv_params.h b/tests/test_sv_params.h -index 7610aa1b..25e70534 100644 +index 7610aa1bf..25e70534b 100644 --- a/tests/test_sv_params.h +++ b/tests/test_sv_params.h @@ -30,6 +30,7 @@ enum CamModel { @@ -543,7 +543,7 @@ switch (scopic_mode) { case ScopicStereoLeft: { diff --git a/xcore/interface/stitcher.cpp b/xcore/interface/stitcher.cpp -index 0f79a9cc..40f1cc28 100644 +index 0f79a9ccd..40f1cc28c 100644 --- a/xcore/interface/stitcher.cpp +++ b/xcore/interface/stitcher.cpp @@ -336,7 +336,7 @@ Stitcher::estimate_round_slices () ++++++ 0001-gl-stitch_support_EGL_initialize_by_GBM.patch ++++++ --- /var/tmp/diff_new_pack.I56WJm/_old 2022-07-05 12:09:44.884579815 +0200 +++ /var/tmp/diff_new_pack.I56WJm/_new 2022-07-05 12:09:44.888579820 +0200 @@ -13,7 +13,7 @@ 5 files changed, 83 insertions(+), 9 deletions(-) diff --git a/configure.ac b/configure.ac -index 0e80aab9..0319a700 100644 +index 0e80aab99..0319a700a 100644 --- a/configure.ac +++ b/configure.ac @@ -73,6 +73,7 @@ XCAM_ARG_ENABLE(json, --enable-json, enable_json, no, enable camera calibration @@ -33,7 +33,7 @@ XCAM_DEFINE_MACOR(ENABLE_AVX512, $ENABLE_AVX512, have avx instruction) XCAM_DEFINE_MACOR(ENABLE_RENDER, $ENABLE_RENDER, enable texture render) diff --git a/modules/gles/Makefile.am b/modules/gles/Makefile.am -index 2c6acd43..5bc05904 100644 +index 2c6acd439..5bc05904d 100644 --- a/modules/gles/Makefile.am +++ b/modules/gles/Makefile.am @@ -17,6 +17,10 @@ if HAVE_OPENCV @@ -48,7 +48,7 @@ gles_std.cpp \ gl_buffer.cpp \ diff --git a/modules/gles/egl/egl_base.cpp b/modules/gles/egl/egl_base.cpp -index 694ac54b..835e0c52 100644 +index 694ac54b5..835e0c52f 100644 --- a/modules/gles/egl/egl_base.cpp +++ b/modules/gles/egl/egl_base.cpp @@ -26,6 +26,10 @@ EGLBase::EGLBase () @@ -124,7 +124,7 @@ EGLBase::get_display (NativeDisplayType native_display, EGLDisplay &display) { diff --git a/modules/gles/egl/egl_base.h b/modules/gles/egl/egl_base.h -index baa9a10c..152aa53c 100644 +index baa9a10c4..152aa53c3 100644 --- a/modules/gles/egl/egl_base.h +++ b/modules/gles/egl/egl_base.h @@ -23,6 +23,11 @@ @@ -162,7 +162,7 @@ } diff --git a/tests/test-surround-view.cpp b/tests/test-surround-view.cpp -index cf378525..8bd0ae13 100644 +index cf3785259..8bd0ae13a 100644 --- a/tests/test-surround-view.cpp +++ b/tests/test-surround-view.cpp @@ -526,6 +526,7 @@ int main (int argc, char *argv[]) ++++++ libxcam-1.5.0-gcc-12.patch ++++++ >From d13b69e6332277a4a59cd736439e17851fe8be74 Mon Sep 17 00:00:00 2001 From: Naveen Saini <[email protected]> Date: Wed, 18 May 2022 15:41:24 +0800 Subject: [PATCH] fake_v4l2_device.h: fix narrowing warning Use uint32_t instead of int for IOCTLs commands. Warning log: | ../../../git/xcore/fake_v4l2_device.h: In member function 'virtual int XCam::FakeV4l2Device::io_control(int, void*)': | ../../../git/xcore/fake_v4l2_device.h:42:14: error: narrowing conversion of '3225441794' from 'long unsigned int' to 'int' [-Wnarrowing] | 42 | case VIDIOC_ENUM_FMT: | | ^~~~~~~~~~~~~~~ | make[4]: *** [Makefile:685: libgstxcamsrc_la-gstxcamsrc.lo] Error 1 Signed-off-by: Naveen Saini <[email protected]> --- xcore/base/xcam_common.h | 2 +- xcore/fake_v4l2_device.h | 2 +- xcore/v4l2_device.cpp | 2 +- xcore/v4l2_device.h | 2 +- xcore/xcam_common.cpp | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/xcore/base/xcam_common.h b/xcore/base/xcam_common.h index 1f16e1ea3..4aa6cb9a6 100644 --- a/xcore/base/xcam_common.h +++ b/xcore/base/xcam_common.h @@ -75,7 +75,7 @@ void xcam_free (void *ptr); * return, 0 successfully * else, check errno */ -int xcam_device_ioctl (int fd, int cmd, void *arg); +int xcam_device_ioctl (int fd, uint32_t cmd, void *arg); const char *xcam_fourcc_to_string (uint32_t fourcc); void xcam_set_log (const char* file_name); diff --git a/xcore/fake_v4l2_device.h b/xcore/fake_v4l2_device.h index f679c19ce..e29787d21 100644 --- a/xcore/fake_v4l2_device.h +++ b/xcore/fake_v4l2_device.h @@ -33,7 +33,7 @@ class FakeV4l2Device : V4l2Device ("/dev/null") {} - int io_control (int cmd, void *arg) + int io_control (uint32_t cmd, void *arg) { XCAM_UNUSED (arg); diff --git a/xcore/v4l2_device.cpp b/xcore/v4l2_device.cpp index 395461e70..66a8ac67b 100644 --- a/xcore/v4l2_device.cpp +++ b/xcore/v4l2_device.cpp @@ -185,7 +185,7 @@ V4l2Device::close () } int -V4l2Device::io_control (int cmd, void *arg) +V4l2Device::io_control (uint32_t cmd, void *arg) { if (_fd <= 0) diff --git a/xcore/v4l2_device.h b/xcore/v4l2_device.h index b4ad7ade3..2551a92da 100644 --- a/xcore/v4l2_device.h +++ b/xcore/v4l2_device.h @@ -104,7 +104,7 @@ class V4l2Device { XCamReturn queue_buffer (SmartPtr<V4l2Buffer> &buf); // use as less as possible - virtual int io_control (int cmd, void *arg); + virtual int io_control (uint32_t cmd, void *arg); protected: diff --git a/xcore/xcam_common.cpp b/xcore/xcam_common.cpp index 848884df9..d4d5093f5 100644 --- a/xcore/xcam_common.cpp +++ b/xcore/xcam_common.cpp @@ -53,7 +53,7 @@ void xcam_free(void *ptr) free (ptr); } -int xcam_device_ioctl (int fd, int cmd, void *arg) +int xcam_device_ioctl (int fd, uint32_t cmd, void *arg) { int ret = 0; int tried_time = 0;
