diff options
| author | Christoph Willing <chris.willing@linux.com> | 2019-01-13 20:14:32 +1000 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2019-01-19 07:20:40 +0700 |
| commit | 83dccc86aa0728a51dd1696fd020235819207a37 (patch) | |
| tree | 4eefda365f778a9a218b8e617138248d38fe6d64 /libraries/opencv | |
| parent | 84d344e520ddf04f96b61a7926a18c2e6151d851 (diff) | |
| download | slackbuilds-83dccc86aa0728a51dd1696fd020235819207a37.tar.gz | |
libraries/opencv: Remove unneeded patch
Signed-off-by: Christoph Willing <chris.willing@linux.com>
Diffstat (limited to 'libraries/opencv')
| -rw-r--r-- | libraries/opencv/opencv.SlackBuild | 8 | ||||
| -rw-r--r-- | libraries/opencv/patch_filter_scharr.diff | 13 |
2 files changed, 1 insertions, 20 deletions
diff --git a/libraries/opencv/opencv.SlackBuild b/libraries/opencv/opencv.SlackBuild index 745d8163d5..ed38916595 100644 --- a/libraries/opencv/opencv.SlackBuild +++ b/libraries/opencv/opencv.SlackBuild @@ -27,7 +27,7 @@ PRGNAM=opencv PRGNAM2=opencv_contrib VERSION=${VERSION:-4.0.1} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PY2VERSION=${PY2VERSION:-2.7} @@ -83,12 +83,6 @@ tar xf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION echo "Unpacking $CWD/$PRGNAM2-$VERSION.tar.gz ..." tar xf $CWD/$PRGNAM2-$VERSION.tar.gz - -# Only needed if qt5 has been configured -if [ -d /usr/include/qt5 ]; then - patch -p0 < $CWD/patch_filter_scharr.diff -fi - chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ diff --git a/libraries/opencv/patch_filter_scharr.diff b/libraries/opencv/patch_filter_scharr.diff deleted file mode 100644 index 0f6648a58c..0000000000 --- a/libraries/opencv/patch_filter_scharr.diff +++ /dev/null @@ -1,13 +0,0 @@ ---- opencv_contrib-4.0.0/modules/cvv/src/qtutil/filter/sobelfilterwidget.hpp.orig 2018-11-18 11:36:23.000000000 +1000 -+++ opencv_contrib-4.0.0/modules/cvv/src/qtutil/filter/sobelfilterwidget.hpp 2018-11-28 15:39:14.367000000 +1000 -@@ -11,6 +11,10 @@ - #include "grayfilterwidget.hpp" - #include "channelreorderfilter.hpp" - -+enum SpecialFilter { -+ FILTER_SCHARR = -1 -+}; -+ - namespace cvv - { - namespace qtutil |