diff options
Diffstat (limited to 'source/l/opencv')
-rw-r--r-- | source/l/opencv/0004-Add-missing-header-for-LIBAVCODEC_VERSION_INT.patch | 20 | ||||
-rwxr-xr-x | source/l/opencv/opencv.SlackBuild | 6 |
2 files changed, 2 insertions, 24 deletions
diff --git a/source/l/opencv/0004-Add-missing-header-for-LIBAVCODEC_VERSION_INT.patch b/source/l/opencv/0004-Add-missing-header-for-LIBAVCODEC_VERSION_INT.patch deleted file mode 100644 index eb0d193ad..000000000 --- a/source/l/opencv/0004-Add-missing-header-for-LIBAVCODEC_VERSION_INT.patch +++ /dev/null @@ -1,20 +0,0 @@ -From: Jochen Sprickerhof <jspricke@debian.org> -Date: Mon, 8 Aug 2022 21:10:13 +0200 -Subject: Add missing header for LIBAVCODEC_VERSION_INT - ---- - modules/videoio/src/ffmpeg_codecs.hpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/modules/videoio/src/ffmpeg_codecs.hpp b/modules/videoio/src/ffmpeg_codecs.hpp -index 61788e0..faad259 100644 ---- a/modules/videoio/src/ffmpeg_codecs.hpp -+++ b/modules/videoio/src/ffmpeg_codecs.hpp -@@ -60,6 +60,7 @@ extern "C" { - #include <errno.h> - #endif - -+#include <libavcodec/version.h> - #include <libavformat/avformat.h> - - #ifdef __cplusplus diff --git a/source/l/opencv/opencv.SlackBuild b/source/l/opencv/opencv.SlackBuild index 04fea2dd0..01b969bba 100755 --- a/source/l/opencv/opencv.SlackBuild +++ b/source/l/opencv/opencv.SlackBuild @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 2015, 2017, 2019 Eric Hameleers, Eindhoven, NL -# Copyright 2020 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2020, 2023 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=opencv VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -88,8 +88,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ -zcat $CWD/0004-Add-missing-header-for-LIBAVCODEC_VERSION_INT.patch.gz | patch -p1 --verbose || exit 1 - # Configure, build, and install: mkdir cmake-build cd cmake-build |