From bb8f29b388d3302012ef6c193820d7049f6f96d9 Mon Sep 17 00:00:00 2001 From: termux-pacman-bot Date: Wed, 31 Dec 2025 15:06:18 +0000 Subject: [PATCH] bump(x11/opencv): 4.13.0 Remove upstream patches. backport-PR27691-ffmpeg8-support.patch https://github.com/opencv/opencv/commit/90c444abd387ffa70b2e72a34922903a2f0f4f5a fix-build-with-qt-6.9.patch https://github.com/opencv/opencv/commit/e7728bb27db9732629bb3f7c7c2c33fe3930b31a --- .../backport-PR27691-ffmpeg8-support.patch | 43 ------------------- x11-packages/opencv/build.sh | 7 ++- .../opencv/fix-build-with-qt-6.9.patch | 15 ------- 3 files changed, 3 insertions(+), 62 deletions(-) delete mode 100644 x11-packages/opencv/backport-PR27691-ffmpeg8-support.patch delete mode 100644 x11-packages/opencv/fix-build-with-qt-6.9.patch diff --git a/x11-packages/opencv/backport-PR27691-ffmpeg8-support.patch b/x11-packages/opencv/backport-PR27691-ffmpeg8-support.patch deleted file mode 100644 index c08b88202b..0000000000 --- a/x11-packages/opencv/backport-PR27691-ffmpeg8-support.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 90c444abd387ffa70b2e72a34922903a2f0f4f5a Mon Sep 17 00:00:00 2001 -From: Alexander Smorkalov -Date: Wed, 20 Aug 2025 10:53:51 +0300 -Subject: [PATCH] FFmpeg 8.0 support. - ---- - modules/videoio/src/cap_ffmpeg_impl.hpp | 14 ++++++++++++++ - 1 file changed, 14 insertions(+) - -diff --git a/modules/videoio/src/cap_ffmpeg_impl.hpp b/modules/videoio/src/cap_ffmpeg_impl.hpp -index 489dbe565d3d..5780b4c11361 100644 ---- a/modules/videoio/src/cap_ffmpeg_impl.hpp -+++ b/modules/videoio/src/cap_ffmpeg_impl.hpp -@@ -685,7 +685,10 @@ void CvCapture_FFMPEG::close() - if( video_st ) - { - #ifdef CV_FFMPEG_CODECPAR -+// avcodec_close removed in FFmpeg release 8.0 -+# if (LIBAVCODEC_BUILD < CALC_FFMPEG_VERSION(62, 11, 100)) - avcodec_close( context ); -+# endif - #endif - video_st = NULL; - } -@@ -2005,7 +2008,18 @@ void CvCapture_FFMPEG::get_rotation_angle() - rotation_angle = 0; - #if LIBAVFORMAT_BUILD >= CALC_FFMPEG_VERSION(57, 68, 100) - const uint8_t *data = 0; -+ // av_stream_get_side_data removed in FFmpeg release 8.0 -+# if (LIBAVCODEC_BUILD < CALC_FFMPEG_VERSION(62, 11, 100)) - data = av_stream_get_side_data(video_st, AV_PKT_DATA_DISPLAYMATRIX, NULL); -+# else -+ AVPacketSideData* sd = video_st->codecpar->coded_side_data; -+ int nb_sd = video_st->codecpar->nb_coded_side_data; -+ if (sd && nb_sd > 0) -+ { -+ const AVPacketSideData* mtx = av_packet_side_data_get(sd, nb_sd, AV_PKT_DATA_DISPLAYMATRIX); -+ data = mtx->data; -+ } -+# endif - if (data) - { - rotation_angle = -cvRound(av_display_rotation_get((const int32_t*)data)); diff --git a/x11-packages/opencv/build.sh b/x11-packages/opencv/build.sh index 8e4eb955dc..b49bc2e3c7 100644 --- a/x11-packages/opencv/build.sh +++ b/x11-packages/opencv/build.sh @@ -2,15 +2,14 @@ TERMUX_PKG_HOMEPAGE=https://opencv.org/ TERMUX_PKG_DESCRIPTION="Open Source Computer Vision Library" TERMUX_PKG_LICENSE="Apache-2.0" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION="4.12.0" -TERMUX_PKG_REVISION=6 +TERMUX_PKG_VERSION="4.13.0" TERMUX_PKG_SRCURL=( https://github.com/opencv/opencv/archive/${TERMUX_PKG_VERSION}/opencv-${TERMUX_PKG_VERSION}.tar.gz https://github.com/opencv/opencv_contrib/archive/${TERMUX_PKG_VERSION}/opencv_contrib-${TERMUX_PKG_VERSION}.tar.gz ) TERMUX_PKG_SHA256=( - 44c106d5bb47efec04e531fd93008b3fcd1d27138985c5baf4eafac0e1ec9e9d - 4197722b4c5ed42b476d42e29beb29a52b6b25c34ec7b4d589c3ae5145fee98e + 1d40ca017ea51c533cf9fd5cbde5b5fe7ae248291ddf2af99d4c17cf8e13017d + 1e0077a4fd2960a7d2f4c9e49d6ba7bb891cac2d1be36d7e8e47aa97a9d1039b ) TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_DEPENDS="abseil-cpp, ffmpeg, libc++, libjpeg-turbo, libopenblas, libpng, libprotobuf, libtiff, libwebp, openjpeg, openjpeg-tools, qt6-qtbase, qt6-qt5compat, zlib" diff --git a/x11-packages/opencv/fix-build-with-qt-6.9.patch b/x11-packages/opencv/fix-build-with-qt-6.9.patch deleted file mode 100644 index 0eeabc3449..0000000000 --- a/x11-packages/opencv/fix-build-with-qt-6.9.patch +++ /dev/null @@ -1,15 +0,0 @@ -Patch by badshah400 in https://github.com/opencv/opencv/issues/27223 -to fix: -ninja: error: build.ninja:13215: bad $-escape (literal $ must be written as $$) - ---- a/modules/highgui/CMakeLists.txt -+++ b/modules/highgui/CMakeLists.txt -@@ -125,7 +125,7 @@ elseif(HAVE_QT) - endif() - - foreach(dt_dep ${qt_deps}) -- add_definitions(${Qt${QT_VERSION_MAJOR}${dt_dep}_DEFINITIONS}) -+ link_libraries(${Qt${QT_VERSION_MAJOR}${dt_dep}}) - include_directories(${Qt${QT_VERSION_MAJOR}${dt_dep}_INCLUDE_DIRS}) - list(APPEND HIGHGUI_LIBRARIES ${Qt${QT_VERSION_MAJOR}${dt_dep}_LIBRARIES}) - endforeach()