5 files changed, 11 insertions, 96 deletions
diff --git a/user/ilmbase/APKBUILD b/user/ilmbase/APKBUILD
deleted file mode 100644
index d09071080..000000000
--- a/user/ilmbase/APKBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
-# Maintainer: 
-pkgname=ilmbase
-pkgver=2.2.1
-pkgrel=0
-pkgdesc="Base libraries from ILM for OpenEXR"
-url="http://www.openexr.com"
-arch="all"
-license="BSD-3-Clause"
-makedepends="bash linux-headers"
-subpackages="$pkgname-dev"
-source="https://download.savannah.nongnu.org/releases/openexr/$pkgname-$pkgver.tar.gz"
-
-build() {
-	cd "$builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--localstatedir=/var
-	make
-}
-
-check() {
-	[ "$CARCH" != x86 ] || return 0
-	cd "$builddir"
-	make check
-}
-package() {
-	make DESTDIR="$pkgdir" \
-		-C "$builddir" install
-}
-
-sha512sums="a08ddd9069b34a93612445a445a2ddf80c0e22349bcf221a3cc6e9f5575180b08a8b597009dacabf072360e7162e15964988bc79e8ec82cf3da6507148a75320  ilmbase-2.2.1.tar.gz"
diff --git a/user/imagemagick/APKBUILD b/user/imagemagick/APKBUILD
index 1d230567b..021b389de 100644
--- a/user/imagemagick/APKBUILD
+++ b/user/imagemagick/APKBUILD
@@ -5,15 +5,15 @@ pkgname=imagemagick
 pkgver=7.0.8.7
 _abiver=7
 _pkgver=${pkgver%.*}-${pkgver##*.}
-pkgrel=0
+pkgrel=1
 pkgdesc="A collection of tools and libraries for many image formats"
 url="http://www.imagemagick.org/"
 arch="all"
 license="Apache-2.0"
 options="libtool !check"  # needs actual helvetica font
 makedepends="zlib-dev libpng-dev libjpeg-turbo-dev freetype-dev fontconfig-dev
-	perl-dev libwebp-dev libtool tiff-dev lcms2-dev fftw-dev openexr-dev
-	libwebp-dev libxml2-dev librsvg-dev"
+	perl-dev libwebp-dev libtool tiff-dev lcms2-dev fftw-dev libwebp-dev
+	libxml2-dev librsvg-dev"
 checkdepends="freetype fontconfig lcms2 graphviz"
 subpackages="$pkgname-doc $pkgname-dev $pkgname-c++:_cxx $pkgname-libs"
 source="http://www.imagemagick.org/download/releases/ImageMagick-$_pkgver.tar.xz"
diff --git a/user/krita/APKBUILD b/user/krita/APKBUILD
index 83a0756b0..93dc3c60a 100644
--- a/user/krita/APKBUILD
+++ b/user/krita/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=krita
 pkgver=4.1.1
-pkgrel=0
+pkgrel=1
 pkgdesc="Digital painting program by KDE"
 url="https://krita.org/"
 arch="all"
@@ -11,11 +11,10 @@ license="GPL-2.0+"
 depends=""
 makedepends="cmake extra-cmake-modules qt5-qtbase-dev karchive-dev kconfig-dev
 	kwidgetsaddons-dev kcompletion-dev kcoreaddons-dev kguiaddons-dev
-	ki18n-dev kitemmodels-dev kitemviews-dev kwindowsystem-dev kio-dev
+	ki18n-dev kitemmodels-dev kitemviews-dev kwindowsystem-dev zlib-dev
 	qt5-qtsvg-dev qt5-qtmultimedia-dev kcrash-dev libice-dev libx11-dev
-	libxcb-dev zlib-dev libpng-dev boost-dev tiff-dev libjpeg-turbo-dev
-	fftw-dev eigen-dev exiv2-dev lcms2-dev openexr-dev poppler-qt5-dev
-	gsl-dev libxi-dev"
+	libxcb-dev fftw-dev libpng-dev boost-dev tiff-dev libjpeg-turbo-dev
+	kio-dev eigen-dev exiv2-dev lcms2-dev poppler-qt5-dev gsl-dev libxi-dev"
 subpackages="$pkgname-lang"
 source="https://download.kde.org/stable/krita/$pkgver/krita-$pkgver.tar.gz"
 
diff --git a/user/opencv/APKBUILD b/user/opencv/APKBUILD
index b77d414a9..7d403770e 100644
--- a/user/opencv/APKBUILD
+++ b/user/opencv/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer:
 pkgname=opencv
 pkgver=3.4.1
-pkgrel=0
+pkgrel=1
 pkgdesc="Computer vision and machine learning software library"
 url="https://opencv.org"
 arch="all"
@@ -11,8 +11,7 @@ license="BSD-3-Clause"
 depends=""
 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 openexr-dev tiff-dev
-	v4l-utils-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"
 
@@ -44,7 +43,8 @@ build() {
 		-DCMAKE_C_FLAGS="$CFLAGS" \
 		-DENABLE_PRECOMPILED_HEADERS=OFF \
 		-DWITH_OPENMP=ON \
-		-WITH_OPENCL=ON \
+		-DWITH_OPENCL=ON \
+		-DWITH_OPENEXR=OFF \
 		-DWITH_IPP=OFF \
 		$_sse \
 		..
diff --git a/user/openexr/APKBUILD b/user/openexr/APKBUILD
deleted file mode 100644
index 9ed94b688..000000000
--- a/user/openexr/APKBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
-# Maintainer: 
-pkgname=openexr
-pkgver=2.2.1
-pkgrel=1
-pkgdesc="High-dynamic-range image file format and library"
-url="http://www.openexr.com/"
-arch="all"
-options="!check"  # fails during TestSharedFrameBuffer:
-# channels RGBA, compression 8, writing reading comparing
-# Assertion failed: relError < .1 (compareDwa.cpp: compareDwa: 122)
-license="BSD-3-Clause"
-depends=""
-makedepends="ilmbase-dev zlib-dev"
-subpackages="$pkgname-doc $pkgname-dev $pkgname-tools"
-source="https://download.savannah.nongnu.org/releases/openexr/${pkgname}-${pkgver}.tar.gz"
-
-build() {
-	cd "$builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--localstatedir=/var \
-		--disable-static
-	make
-}
-
-check() {
-	cd "$builddir"
-	make check
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-}
-
-tools() {
-	pkgdesc="Tools for OpenEXR, a high-dynamic-range image file format"
-	cd "$builddir"
-	mkdir -p "$subpkgdir"/usr/
-	mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
-}
-
-sha512sums="192100c6ac47534f3a93c55327d2ab90b07a8265156855086b326184328c257dcde12991b3f3f1831e2df4226fe884adcfe481c2f02a157c715aee665e89a480  openexr-2.2.1.tar.gz"