Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Adélie Package Tree
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Adélie Linux
Adélie Package Tree
Commits
a9eea039
Verified
Commit
a9eea039
authored
5 years ago
by
Anna Wilcox
Browse files
Options
Downloads
Patches
Plain Diff
user/opencv: unmaintained bump to 4.1.0 (Adopt me today)
parent
f7996561
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
user/opencv/APKBUILD
+9
-13
9 additions, 13 deletions
user/opencv/APKBUILD
user/opencv/cmake-license.patch
+12
-0
12 additions, 0 deletions
user/opencv/cmake-license.patch
with
21 additions
and
13 deletions
user/opencv/APKBUILD
+
9
−
13
View file @
a9eea039
# Contributor: Carlo Landmeter <clandmeter@gmail.com>
# Maintainer:
pkgname
=
opencv
pkgver
=
4.
0.1
pkgver
=
4.
1.0
pkgrel
=
0
pkgdesc
=
"Computer vision and machine learning software library"
url
=
"https://opencv.org"
...
...
@@ -13,7 +13,9 @@ makedepends="cmake doxygen ffmpeg-dev gst-plugins-base-dev gtk+2.0-dev
gtk+3.0-dev jasper-dev libdc1394-dev libgomp libgphoto2-dev
libjpeg-turbo-dev libpng-dev libwebp-dev tiff-dev v4l-utils-dev"
subpackages
=
"
$pkgname
-dev
$pkgname
-libs"
source
=
"opencv-
$pkgver
.tar.gz::https://github.com/opencv/opencv/archive/
$pkgver
.tar.gz"
source
=
"opencv-
$pkgver
.tar.gz::https://github.com/opencv/opencv/archive/
$pkgver
.tar.gz
cmake-license.patch
"
prepare
()
{
default_prepare
...
...
@@ -31,7 +33,6 @@ prepare() {
}
build
()
{
cd
"
$builddir
"
/build
if
[
"
$CARCH
"
!=
"x86_64"
]
;
then
local
_sse
=
"-DENABLE_SSE=OFF -DENABLE_SSE2=OFF"
fi
...
...
@@ -48,18 +49,13 @@ build() {
-DWITH_OPENEXR
=
OFF
\
-DWITH_IPP
=
OFF
\
$_sse
\
..
make
}
check
()
{
cd
"
$builddir
"
/build
CTEST_OUTPUT_ON_FAILURE
=
TRUE ctest
-Bbuild
make
-C
build
}
package
()
{
cd
"
$builddir
"
/build
make
DESTDIR
=
"
$pkgdir
"
install
make
DESTDIR
=
"
$pkgdir
"
-C
build
install
}
sha512sums
=
"d74dd325029a67676dd2c7fdbecb2b14cb531441b2a1b74fc1ebe6db096ea87c12801c8b997ebbe280fbd401311c0220133a0c29911b0dae82cb93453be0b2b0 opencv-4.0.1.tar.gz"
sha512sums
=
"492168c1260cd30449393c4b266d75202e751493a8f1e184af6c085d8f4a38800ee954d84fe8c36fcceb690b1ebb5e511b68c05901f64be79a0915f3f8a46dc0 opencv-4.1.0.tar.gz
ffa6930086051c545a44d28b8e428de7faaeecf961cdee6eef007b2b01db7e5897c6f184b1059df9763c1bcd90f88b9ead710dc13b51a608f21d683f55f39bd6 cmake-license.patch"
This diff is collapsed.
Click to expand it.
user/opencv/cmake-license.patch
0 → 100644
+
12
−
0
View file @
a9eea039
We remove the 3rdparty dir in build, and we don't need the OpenCL license.
--- opencv-4.1.0/cmake/OpenCVDetectOpenCL.cmake.old 2019-04-07 17:09:10.000000000 +0000
+++ opencv-4.1.0/cmake/OpenCVDetectOpenCL.cmake 2019-07-20 20:21:37.467680107 +0000
@@ -5,7 +5,6 @@
else()
set(OPENCL_LIBRARY "" CACHE STRING "OpenCL library")
set(OPENCL_INCLUDE_DIR "${OpenCV_SOURCE_DIR}/3rdparty/include/opencl/1.2" CACHE PATH "OpenCL include directory")
- ocv_install_3rdparty_licenses(opencl-headers "${OpenCV_SOURCE_DIR}/3rdparty/include/opencl/LICENSE.txt")
endif()
mark_as_advanced(OPENCL_INCLUDE_DIR OPENCL_LIBRARY)
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment