Merge branch 'master' of git://projects.parabola.nu/abslibre/abslibre

3 files changed, 21 insertions, 19 deletions

diff --git a/libre/opencv/PKGBUILD b/libre/opencv/PKGBUILD
index 221542d5f..b1de0b31e 100644
--- a/libre/opencv/PKGBUILD
+++ b/libre/opencv/PKGBUILD
@@ -7,14 +7,14 @@
 
 pkgbase=opencv
 pkgname=opencv
-pkgver=3.3.1
-pkgrel=1.parabola1
+pkgver=3.4.0
+pkgrel=2.parabola1
 pkgdesc="Free Computer Vision Library, without nonfree SIFT and SURF algorithms, nonfree Milky icons and lena images"
 arch=('i686' 'x86_64' 'armv7h')
 license=('BSD')
 url="http://opencv.org/"
-depends=('intel-tbb' 'openexr' 'xine-lib' 'libdc1394' 'gtkglext')
-makedepends=('cmake' 'python-numpy' 'python2-numpy' 'mesa' 'eigen' 'hdf5')
+depends=('intel-tbb' 'openexr' 'xine-lib' 'libdc1394' 'gtkglext' 'cblas' 'lapack' 'libgphoto2')
+makedepends=('cmake' 'python-numpy' 'python2-numpy' 'mesa' 'eigen' 'hdf5' 'lapacke')
 optdepends=('opencv-samples'
             'hdf5: support for HDF5 format'
             'opencl-icd-loader: For coding with OpenCL'
@@ -23,9 +23,9 @@ optdepends=('opencv-samples'
 mksource=("$pkgbase-$pkgver.zip::https://github.com/opencv/opencv/archive/$pkgver.zip"
           "opencv_contrib-$pkgver.tar.gz::https://github.com/opencv/opencv_contrib/archive/$pkgver.tar.gz")
 source=("https://repo.parabola.nu/other/${pkgname}-libre/${pkgname}-libre-${pkgver}.zip")
-mksha256sums=('e59412c7e0d398113b1e454d600fcdff54cd77100a84483ac0d82bbf52496932'
-              '6f3ce148dc6e147496f0dbec1c99e917e13bf138f5a8ccfc3765f5c2372bd331')
-sha256sums=('9bf24efc68c82d211fdaff7ed9b007b1a49353d7e092658b51285d4a1d7f3b56')
+mksha256sums=('ae8a9f468b7ee3822a62d20d356c69f2b32330a231e738ac2914f332766611b7'
+              '699ab3eee7922fbd3e8f98c68e6d16a1d453b20ef364e76172e56466dc9c16cd')
+sha256sums=('624ac197cff564c4cae1cfdcc3a6a08e3b35511e9733c2552a9abd8621685fcd')
 
 _cmakeopts=('-D WITH_OPENCL=ON'
             '-D WITH_OPENGL=ON'
@@ -40,6 +40,7 @@ _cmakeopts=('-D WITH_OPENCL=ON'
             '-D INSTALL_PYTHON_EXAMPLES=ON'
             '-D CMAKE_BUILD_TYPE=Release'
             '-D CMAKE_INSTALL_PREFIX=/usr'
+            '-D CMAKE_INSTALL_LIBDIR=lib'
             '-D CMAKE_SKIP_RPATH=ON'
             '-D WITH_IPP=OFF'
             #'-D INSTALL_CREATE_DISTRIB=ON'
@@ -47,10 +48,8 @@ _cmakeopts=('-D WITH_OPENCL=ON'
 
 # SSE only available from Pentium 3 onwards (i686 is way older)
 # SSE only available x86 hardware and ARM uses NEON
-[[ "$CARCH" = 'i686' || "$CARCH" = 'armv7h' ]] && \
-  _cmakeopts+=('-D ENABLE_SSE=OFF'
-               '-D ENABLE_SSE2=OFF'
-               '-D ENABLE_SSE3=OFF')
+[[ "$CARCH" = 'i686' ]] && _cmakeopts+=('-D CPU_BASELINE_DISABLE=SSE2')
+[[ "$CARCH" = 'x86_64' ]] && _cmakeopts+=('-D CPU_BASELINE_DISABLE=SSE3 -D CPU_BASELINE_REQUIRE=SSE2')
 
 mksource() {
   cd "$srcdir/opencv_contrib-$pkgver"
@@ -78,10 +77,13 @@ build() {
   mkdir -p build
 
   cd build
+  # cmake's FindLAPACK doesn't add cblas to LAPACK_LIBRARIES, so we need to specify them manually
   cmake ${_cmakeopts[@]} \
     -DOPENCV_EXTRA_MODULES_PATH="$srcdir/opencv_contrib-$pkgver/modules" \
+    -DLAPACK_LIBRARIES="/usr/lib/liblapack.so;/usr/lib/libblas.so;/usr/lib/libcblas.so" \
+    -DLAPACK_CBLAS_H="/usr/include/cblas.h" \
+    -DLAPACK_LAPACKE_H="/usr/include/lapacke.h" \
     ../$pkgname-$pkgver
-
   make
 }
 
@@ -89,7 +91,6 @@ package_opencv() {
   options=('staticlibs')
 
   cd build
-
   make DESTDIR="$pkgdir" install
 
   # install license file
diff --git a/libre/openttd/PKGBUILD b/libre/openttd/PKGBUILD
index b68a4bc7c..cbb4d097d 100644
--- a/libre/openttd/PKGBUILD
+++ b/libre/openttd/PKGBUILD
@@ -1,9 +1,10 @@
 # $Id: PKGBUILD 184972 2016-08-03 10:06:19Z lcarlier $
 # Maintainer (Arch): Vesa Kaihlavirta <vegai@iki.fi>
-# Maintainer: André Silva <emulatorman@hyperbola.info>
+# Maintainer (Hyperbola): André Silva <emulatorman@hyperbola.info>
+# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
 
 pkgname=openttd
-pkgver=1.7.0
+pkgver=1.7.1
 pkgrel=2.parabola1
 pkgdesc='An engine for running Transport Tycoon Deluxe, without nonfree openttd-opensfx recommendation'
 arch=('i686' 'x86_64' 'armv7h')
@@ -12,7 +13,7 @@ license=('GPL')
 depends=('libpng' 'sdl' 'icu' 'fontconfig' 'lzo' 'hicolor-icon-theme' 'desktop-file-utils' 'xz')
 optdepends=('openttd-opengfx: free graphics') 
 source=("http://binaries.openttd.org/releases/${pkgver}/${pkgname}-${pkgver}-source.tar.xz")
-sha256sums=('df9307f42a45ac57dff23fe5cfb9bdb2a3d676456e7c771de173de060c2a99e0')
+sha256sums=('61190952a98d494d3fd62e395dd6c359609914d0ba8fe80eaeb585b7d62a1b36')
 
 build() {
   cd ${pkgname}-${pkgver} 
diff --git a/libre/your-freedom/PKGBUILD b/libre/your-freedom/PKGBUILD
index 4f4ebbf4c..507e31905 100644
--- a/libre/your-freedom/PKGBUILD
+++ b/libre/your-freedom/PKGBUILD
@@ -4,8 +4,8 @@ pkgname=your-freedom
 pkgdesc="This package conflicts with every nonfree package known to date to ensure your system is free."
 license=('GPL3')
 url="https://git.parabola.nu/blacklist.git"
-pkgver=20171221.1
-_gitver=17c2c251d2c6ae38913aaec0393b7c0ec098539a
+pkgver=20171228
+_gitver=3e3b31e301262c4a55c2b4065c16c382bb14cb10
 pkgrel=1
 
 arch=('any')
@@ -14,7 +14,7 @@ install=${pkgname}.install
 
 makedepends=(librelib)
 source=(blacklist-${_gitver}.txt::https://git.parabola.nu/blacklist.git/plain/blacklist.txt?id=${_gitver})
-sha512sums=('b85a62c9527f5d01d53ab78a4ed6ac5f3c0c258b86059bf87c97cafccb9302ae05b7438ec643d2b0fc6bbd04d8f6b190f959c5d96e360f396355ffe04bcead43')
+sha512sums=('a6a4ba534996b17000d5553cf09a3ccee01db42646b3f35cd67a5c4939beaa9ca8407f5acff114d83593043bed94c16669476a0501ef4479f296971de44607a6')
 
 package() {
 	cd "$srcdir"