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

10 files changed, 358 insertions, 133 deletions

diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index 3916be539..0e7d3ff5a 100644
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -9,7 +9,7 @@
 
 pkgbase=linux-libre-lts     # Build kernel with -lts localname
 _pkgbasever=3.14-gnu
-_pkgver=3.14.43-gnu
+_pkgver=3.14.44-gnu
 
 _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname
 _replacesoldkernels=('kernel26%' 'kernel26-libre%') # '%' gets replaced with _kernelname
@@ -43,7 +43,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li
         '3.14.26-8475f027b4-loongson-community.patch')
 sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b'
             'SKIP'
-            '1c8d7336a4176e3a96de49688cb268cc5e7a44063d32a2597a339094f3f7cc16'
+            '684af3ce9116a1e3f099c1fe4a85b13105777637def19db0c0100cbf9952a0cd'
             'SKIP'
             'b4cc9c49948fc1d571c27ddeddd93b5b499ccc17fb06fa75bfe41ecddfbc12e4'
             '3fa8ce26aea9b5e596ccfc842baa3f2a8be8ef4a62bc13d75e8da2bafd89141c'
@@ -57,7 +57,7 @@ sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b'
             '52dec83a8805a8642d74d764494acda863e0aa23e3d249e80d4b457e20a3fd29'
             '65d58f63215ee3c5f9c4fc6bce36fc5311a6c7dbdbe1ad29de40647b47ff9c0d'
             'cf2e7a2d00787f754028e7459688c2755a406e632ce48b60952fa4ff7ed6f4b7'
-            '470d6d019d288dce02b4a9758a34ea71d41715663a19a164749212a470a131e7'
+            '9c89039a0f876888fda3be6f574bca5a120e3587d8342747bbc0723b0b4cde7a'
             '7c2d1e257acce0ea6f260f3acf18e30e21c12a9a6b3d7d1d4097dafd287388e2')
 validpgpkeys=(
               '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva
diff --git a/libre/linux-libre-lts/gcc5_buildfixes.diff b/libre/linux-libre-lts/gcc5_buildfixes.diff
index f29d60674..e8a85b055 100644
--- a/libre/linux-libre-lts/gcc5_buildfixes.diff
+++ b/libre/linux-libre-lts/gcc5_buildfixes.diff
@@ -1,69 +1,3 @@
-From 9493c2422cae272d6f1f567cbb424195defe4176 Mon Sep 17 00:00:00 2001
-From: Chen Gang <gang.chen.5i5j@gmail.com>
-Date: Sat, 1 Nov 2014 19:46:12 +0800
-Subject: qla2xxx: remove redundant declaration in 'qla_gbl.h'
-
-Remove 2 redundant extern inline functions: qla8044_set_qsnt_ready() and
-qla8044_need_reset_handler(). At present, within upstream next kernel
-source code, they are only used within "drivers/scsi/qla2xxx/qla_nx2.c".
-
-The related error and warnings (with allmodconfig under tile):
-
-    CC [M]  drivers/scsi/qla2xxx/qla_nx2.o
-  drivers/scsi/qla2xxx/qla_nx2.c:1633:1: error: static declaration of 'qla8044_need_reset_handler' follows non-static declaration
-   qla8044_need_reset_handler(struct scsi_qla_host *vha)
-   ^
-  In file included from drivers/scsi/qla2xxx/qla_def.h:3706:0,
-                   from drivers/scsi/qla2xxx/qla_nx2.c:11:
-  drivers/scsi/qla2xxx/qla_gbl.h:756:20: note: previous declaration of 'qla8044_need_reset_handler' was here
-   extern inline void qla8044_need_reset_handler(struct scsi_qla_host *vha);
-                      ^
-  drivers/scsi/qla2xxx/qla_gbl.h:756:20: warning: inline function 'qla8044_need_reset_handler' declared but never defined
-  make[3]: *** [drivers/scsi/qla2xxx/qla_nx2.o] Error 1
-  make[2]: *** [drivers/scsi/qla2xxx] Error 2
-  make[1]: *** [drivers/scsi] Error 2
-  make: *** [drivers] Error 2
-
-    CC [M]  drivers/scsi/qla2xxx/qla_tmpl.o
-  In file included from drivers/scsi/qla2xxx/qla_def.h:3706:0,
-                   from drivers/scsi/qla2xxx/qla_tmpl.c:7:
-  drivers/scsi/qla2xxx/qla_gbl.h:755:20: warning: inline function 'qla8044_set_qsnt_ready' declared but never defined
-   extern inline void qla8044_set_qsnt_ready(struct scsi_qla_host *vha);
-                    ^
-
-Signed-off-by: Chen Gang <gang.chen.5i5j@gmail.com>
-Acked-by: Saurav Kashyap <saurav.kashyap@qlogic.com>
-Signed-off-by: Christoph Hellwig <hch@lst.de>
-
-diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h
-index b1865a7..7686bfe 100644
---- a/drivers/scsi/qla2xxx/qla_gbl.h
-+++ b/drivers/scsi/qla2xxx/qla_gbl.h
-@@ -752,8 +752,6 @@ extern void qla8044_set_idc_dontreset(struct scsi_qla_host *ha);
- extern int qla8044_rd_direct(struct scsi_qla_host *vha, const uint32_t crb_reg);
- extern void qla8044_wr_direct(struct scsi_qla_host *vha,
- 			      const uint32_t crb_reg, const uint32_t value);
--extern inline void qla8044_set_qsnt_ready(struct scsi_qla_host *vha);
--extern inline void qla8044_need_reset_handler(struct scsi_qla_host *vha);
- extern int qla8044_device_state_handler(struct scsi_qla_host *vha);
- extern void qla8044_clear_qsnt_ready(struct scsi_qla_host *vha);
- extern void qla8044_clear_drv_active(struct qla_hw_data *);
-diff --git a/drivers/scsi/qla2xxx/qla_nx2.c b/drivers/scsi/qla2xxx/qla_nx2.c
-index 24a8528..ed4d6b6 100644
---- a/drivers/scsi/qla2xxx/qla_nx2.c
-+++ b/drivers/scsi/qla2xxx/qla_nx2.c
-@@ -238,7 +238,7 @@ qla8044_rmw_crb_reg(struct scsi_qla_host *vha,
- 	return;
- }
- 
--inline void
-+static inline void
- qla8044_set_qsnt_ready(struct scsi_qla_host *vha)
- {
- 	uint32_t qsnt_state;
--- 
-cgit v0.10.2
-
 diff --git a/lib/mpi/mpi-inline.h b/lib/mpi/mpi-inline.h
 index e2b3985..c245ea3 100644
 --- a/lib/mpi/mpi-inline.h
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 51c10d7c1..24b6802a9 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -9,7 +9,7 @@
 
 pkgbase=linux-libre         # Build stock "" kernel
 _pkgbasever=4.0-gnu
-_pkgver=4.0.4-gnu
+_pkgver=4.0.5-gnu
 
 _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname
 _replacesoldkernels=('kernel26%' 'kernel26-libre%') # '%' gets replaced with _kernelname
@@ -18,7 +18,7 @@ _replacesoldmodules=('linux-libre%-kmod-alx') # '%' gets replaced with _kernelna
 _srcname=linux-${_pkgbasever%-*}
 _archpkgver=${_pkgver%-*}
 pkgver=${_pkgver//-/_}
-pkgrel=2
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -33,13 +33,12 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li
         # standard config files for mkinitcpio ramdisk
         'linux.preset'
         'logo_linux_'{clut224.ppm,vga16.ppm,mono.pbm}
-        'md-raid0-fix-restore-to-sector-variable-in-raid0_mak.patch'
         'change-default-console-loglevel.patch'
         # loongson-community patch: http://linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/
         '4.0.2-ae91f13af5-loongson-community.patch')
 sha256sums=('0e2dd5be12c1f82ab3d03b89cbe3f1a20e14332ec42c102efb226a6283fdd38a'
             'SKIP'
-            'e447de9a53c5aefd25f0474f3304ab87076b88353badaae20dcbd85712e85e61'
+            '5ac82d1955fee5abccda157ef2399b34d4fd1c2310a33d19c09ca5953b308172'
             'SKIP'
             '5fa50ffbe7b6e82c70d1d15947c34caa0b484ecd264f01149f40b910e7c8f394'
             '33f68753bc12456e601492f870f7e04cd116f36b81630d9bad954093d72bc57a'
@@ -48,7 +47,6 @@ sha256sums=('0e2dd5be12c1f82ab3d03b89cbe3f1a20e14332ec42c102efb226a6283fdd38a'
             'bfd4a7f61febe63c880534dcb7c31c5b932dde6acf991810b41a939a93535494'
             '6de8a8319271809ffdb072b68d53d155eef12438e6d04ff06a5a4db82c34fa8a'
             '13bd7a8d9ed6b6bc971e4cd162262c5a20448a83796af39ce394d827b0e5de74'
-            'bc83293e64653d60793708a0e277741f57c018f5ea3551a8aff3a220df917ceb'
             '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99'
             '13e141279af2bc17decfc041e015710daac9a6cd1c9b4e871a76cb8f916b9e22')
 validpgpkeys=(
@@ -80,9 +78,6 @@ prepare() {
   # add latest fixes from stable queue, if needed
   # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git
 
-  # https://bugzilla.kernel.org/show_bug.cgi?id=98501
-  patch -Np1 -i "${srcdir}/md-raid0-fix-restore-to-sector-variable-in-raid0_mak.patch"
-
   # set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param)
   # remove this when a Kconfig knob is made available by upstream
   # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
diff --git a/libre/linux-libre/md-raid0-fix-restore-to-sector-variable-in-raid0_mak.patch b/libre/linux-libre/md-raid0-fix-restore-to-sector-variable-in-raid0_mak.patch
deleted file mode 100644
index 9f09102dc..000000000
--- a/libre/linux-libre/md-raid0-fix-restore-to-sector-variable-in-raid0_mak.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From a81157768a00e8cf8a7b43b5ea5cac931262374f Mon Sep 17 00:00:00 2001
-From: Eric Work <work.eric@gmail.com>
-Date: Mon, 18 May 2015 23:26:23 -0700
-Subject: [PATCH] md/raid0: fix restore to sector variable in
- raid0_make_request
-
-The variable "sector" in "raid0_make_request()" was improperly updated
-by a call to "sector_div()" which modifies its first argument in place.
-Commit 47d68979cc968535cb87f3e5f2e6a3533ea48fbd restored this variable
-after the call for later re-use.  Unfortunetly the restore was done after
-the referenced variable "bio" was advanced.  This lead to the original
-value and the restored value being different.  Here we move this line to
-the proper place.
-
-One observed side effect of this bug was discarding a file though
-unlinking would cause an unrelated file's contents to be discarded.
-
-Signed-off-by: NeilBrown <neilb@suse.de>
-Fixes: 47d68979cc96 ("md/raid0: fix bug with chunksize not a power of 2.")
-Cc: stable@vger.kernel.org (any that received above backport)
-URL: https://bugzilla.kernel.org/show_bug.cgi?id=98501
----
- drivers/md/raid0.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/md/raid0.c b/drivers/md/raid0.c
-index 6a68ef5..efb654e 100644
---- a/drivers/md/raid0.c
-+++ b/drivers/md/raid0.c
-@@ -524,6 +524,9 @@ static void raid0_make_request(struct mddev *mddev, struct bio *bio)
- 			 ? (sector & (chunk_sects-1))
- 			 : sector_div(sector, chunk_sects));
- 
-+		/* Restore due to sector_div */
-+		sector = bio->bi_iter.bi_sector;
-+
- 		if (sectors < bio_sectors(bio)) {
- 			split = bio_split(bio, sectors, GFP_NOIO, fs_bio_set);
- 			bio_chain(split, bio);
-@@ -531,7 +534,6 @@ static void raid0_make_request(struct mddev *mddev, struct bio *bio)
- 			split = bio;
- 		}
- 
--		sector = bio->bi_iter.bi_sector;
- 		zone = find_zone(mddev->private, &sector);
- 		tmp_dev = map_sector(mddev, zone, sector, &sector);
- 		split->bi_bdev = tmp_dev->bdev;
--- 
-2.4.1
-
diff --git a/libre/mesa-libcl/PKGBUILD b/libre/mesa-libcl/PKGBUILD
index 73a6b94c9..23ae29172 100644
--- a/libre/mesa-libcl/PKGBUILD
+++ b/libre/mesa-libcl/PKGBUILD
@@ -4,7 +4,7 @@
 pkgbase=mesa
 _pkgname=libcl
 pkgname=$pkgbase-$_pkgname
-pkgver=10.5.6
+pkgver=10.5.7
 pkgrel=1
 pkgdesc='Mesa 3-D OpenCL library and ICD loader'
 arch=('i686' 'x86_64' 'mips64el')
@@ -18,7 +18,7 @@ provides=("$_pkgname")
 conflicts=("$_pkgname" "$_pkgname-libre" 'opencl-nvidia' 'opencl-nvidia-304xx')
 replaces=("$_pkgname" "$_pkgname-libre" 'opencl-nvidia' 'opencl-nvidia-304xx')
 source=(ftp://ftp.freedesktop.org/pub/$pkgbase/$pkgver/$pkgbase-$pkgver.tar.xz{,.sig})
-sha512sums=('691a757755a76a85ac0877617bad7491037dda9445fc36499e9fc32d0fbfb3d3cdf8666bc45596a4d8e0b6fea40860e86e5e2ef1adc041b23cb5990aceaf4903'
+sha512sums=('0ccd9c3700d4c12a6625ad2a5ca46c721135fc3ef9650a6571f210f9f203d44c327e76604e3627edede2a561f88e2fabcf47a339bbd7c106a9c6408ed25a446c'
             'SKIP')
 validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D') # Emil Velikov <emil.l.velikov@gmail.com>
 
diff --git a/libre/opencv/PKGBUILD b/libre/opencv/PKGBUILD
new file mode 100644
index 000000000..d6d7a707b
--- /dev/null
+++ b/libre/opencv/PKGBUILD
@@ -0,0 +1,129 @@
+# $Id$
+# Maintainer (Arch): Ray Rashif <schiv@archlinux.org>
+# Contributor (Arch): Tobias Powalowski <tpowa@archlinux.org>
+# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
+
+pkgbase=opencv
+pkgname=('opencv' 'opencv-samples')
+pkgver=2.4.10
+pkgrel=3.parabola1
+pkgdesc="Open Source Computer Vision Library, without nonfree and 3rdparty modules and Milky icons"
+arch=('i686' 'x86_64')
+license=('BSD')
+url="http://opencv.org/"
+depends=('intel-tbb' 'openexr' 'xine-lib' 'libdc1394' 'gtkglext')
+makedepends=('cmake' 'python2-numpy' 'mesa' 'eigen2')
+optdepends=('opencv-samples'
+            'eigen2'
+            'libcl: For coding with OpenCL'
+            'python2-numpy: Python 2.x interface')
+mksource=("http://downloads.sourceforge.net/opencvlibrary/$pkgname-$pkgver.zip")
+source=("https://repo.parabola.nu/other/${pkgname}-libre/${pkgname}-${pkgver}.zip"
+        'pkgconfig.patch'
+        'fsh.patch'
+        'x86_asmfix.patch')
+mkmd5sums=('ec63952d3a3dff965d5fdde765926821')
+md5sums=('1cf568ec12de8a3f786cd2d851b0f001'
+         'c7cea48ed7d4f729ebdb9673bac41bd3'
+         'c597598d142dd34d0eb4af7d6e9779d8'
+         'b937d3589a62666f17f6dc93e0109717')
+
+_cmakeopts=('-D WITH_OPENCL=ON'
+            '-D WITH_OPENGL=ON'
+            '-D WITH_TBB=ON'
+            '-D WITH_XINE=ON'
+            '-D WITH_GSTREAMER=OFF'
+            '-D BUILD_WITH_DEBUG_INFO=OFF'
+            '-D BUILD_TESTS=OFF'
+            '-D BUILD_PERF_TESTS=OFF'
+            '-D BUILD_EXAMPLES=ON'
+            '-D INSTALL_C_EXAMPLES=ON'
+            '-D INSTALL_PYTHON_EXAMPLES=ON'
+            '-D CMAKE_BUILD_TYPE=Release'
+            '-D CMAKE_INSTALL_PREFIX=/usr'
+            '-D CMAKE_SKIP_RPATH=ON')
+
+# SSE only available from Pentium 3 onwards (i686 is way older)
+[[ "$CARCH" = 'i686' ]] && \
+  _cmakeopts+=('-D ENABLE_SSE=OFF'
+               '-D ENABLE_SSE2=OFF'
+               '-D ENABLE_SSE3=OFF')
+
+# all x64 CPUs support SSE2 but not SSE3
+[[ "$CARCH" = 'x86_64' ]] && _cmakeopts+=('-D ENABLE_SSE3=OFF')
+
+mksource() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ rm -rv 3rdparty
+ rm -rv modules/nonfree
+ rm -rv modules/highgui/src/files_Qt/Milky
+}
+
+prepare() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  msg2 "Applying backported fix for x86 ASM breakage"
+  # see https://github.com/Itseez/opencv/pull/3331
+  patch -Np1 -i "$srcdir/x86_asmfix.patch"
+
+  msg2 "Fixing broken pkg-config (downstream)"
+  # see https://bugs.archlinux.org/task/32430
+  # and http://code.opencv.org/issues/1925
+  patch -Np1 -i "$srcdir/pkgconfig.patch"
+
+  # TODO: this is mostly upstream frei0r; they hardcode the path
+  #msg2 "Hack-fixing folder naming inconsistency (downstream)"
+  # see http://code.opencv.org/issues/2512
+  # and https://bugs.archlinux.org/task/32342
+  #patch -Np1 -i "$srcdir/fsh.patch"
+
+  # no longer including docs, see https://bugs.archlinux.org/task/34185
+  # python2 compatibility for generating (html) docs
+  #sed -i 's/sphinx-build/sphinx-build2/' cmake/OpenCVDetectPython.cmake
+}
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  cmake ${_cmakeopts[@]} .
+
+  make
+}
+
+package_opencv() {
+  options=('staticlibs')
+
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
+
+  # install license file
+  install -Dm644 "$srcdir/$pkgname-$pkgver/LICENSE" \
+    "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+
+  cd "$pkgdir/usr/share"
+
+  # separate samples package; also be -R friendly
+  if [[ -d OpenCV/samples ]]; then
+    mv OpenCV/samples "$srcdir/$pkgname-samples"
+    mv OpenCV $pkgname # otherwise folder naming is inconsistent
+  elif [[ ! -d OpenCV ]]; then
+    warning "Directory naming issue; samples package may not be built!"
+  fi
+}
+
+package_opencv-samples() {
+  pkgdesc+=" (samples)"
+  depends=("opencv=$pkgver") # sample codes change with lib/API
+  unset optdepends
+
+  mkdir -p "$pkgdir/usr/share/opencv"
+  cp -r "$srcdir/opencv-samples" "$pkgdir/usr/share/opencv/samples"
+
+  # install license file
+  install -Dm644 "$srcdir/opencv-$pkgver/LICENSE" \
+    "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/libre/opencv/fsh.patch b/libre/opencv/fsh.patch
new file mode 100644
index 000000000..650d46a70
--- /dev/null
+++ b/libre/opencv/fsh.patch
@@ -0,0 +1,136 @@
+diff -baur opencv-2.4.7.orig/cmake/OpenCVGenPkgconfig.cmake opencv-2.4.7/cmake/OpenCVGenPkgconfig.cmake
+--- opencv-2.4.7.orig/cmake/OpenCVGenPkgconfig.cmake	2013-11-12 20:31:27.253763202 +0000
++++ opencv-2.4.7/cmake/OpenCVGenPkgconfig.cmake	2013-11-12 20:31:54.923577113 +0000
+@@ -46,7 +46,7 @@
+ 
+   #need better solution....
+   if(libpath MATCHES "3rdparty")
+-    set(installDir "share/OpenCV/3rdparty/${OPENCV_LIB_INSTALL_PATH}")
++    set(installDir "share/opencv/3rdparty/${OPENCV_LIB_INSTALL_PATH}")
+   else()
+     set(installDir "${OPENCV_LIB_INSTALL_PATH}")
+   endif()
+diff -baur opencv-2.4.7.orig/cmake/OpenCVModule.cmake opencv-2.4.7/cmake/OpenCVModule.cmake
+--- opencv-2.4.7.orig/cmake/OpenCVModule.cmake	2013-11-12 20:31:27.253763202 +0000
++++ opencv-2.4.7/cmake/OpenCVModule.cmake	2013-11-12 20:35:37.805415871 +0000
+@@ -807,7 +807,7 @@
+   if(INSTALL_C_EXAMPLES AND NOT WIN32 AND EXISTS "${samples_path}")
+     file(GLOB sample_files "${samples_path}/*")
+     install(FILES ${sample_files}
+-            DESTINATION share/OpenCV/samples/${module_id}
++            DESTINATION share/opencv/samples/${module_id}
+             PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
+   endif()
+ endfunction()
+diff -baur opencv-2.4.7.orig/CMakeLists.txt opencv-2.4.7/CMakeLists.txt
+--- opencv-2.4.7.orig/CMakeLists.txt	2013-11-12 20:31:27.437095684 +0000
++++ opencv-2.4.7/CMakeLists.txt	2013-11-12 20:40:21.160171499 +0000
+@@ -243,9 +243,9 @@
+ if(ANDROID OR WIN32)
+   set(OPENCV_DOC_INSTALL_PATH doc)
+ elseif(INSTALL_TO_MANGLED_PATHS)
+-  set(OPENCV_DOC_INSTALL_PATH share/OpenCV-${OPENCV_VERSION}/doc)
++  set(OPENCV_DOC_INSTALL_PATH share/doc/opencv-${OPENCV_VERSION})
+ else()
+-  set(OPENCV_DOC_INSTALL_PATH share/OpenCV/doc)
++  set(OPENCV_DOC_INSTALL_PATH share/doc/opencv)
+ endif()
+ 
+ if(WIN32)
+@@ -282,7 +282,7 @@
+     set(OPENCV_3P_LIB_INSTALL_PATH  "${OpenCV_INSTALL_BINARIES_PREFIX}staticlib${LIB_SUFFIX}")
+   else()
+     set(OPENCV_LIB_INSTALL_PATH     lib${LIB_SUFFIX})
+-    set(OPENCV_3P_LIB_INSTALL_PATH  share/OpenCV/3rdparty/${OPENCV_LIB_INSTALL_PATH})
++    set(OPENCV_3P_LIB_INSTALL_PATH  share/opencv/3rdparty/${OPENCV_LIB_INSTALL_PATH})
+   endif()
+   set(OPENCV_INCLUDE_INSTALL_PATH "include")
+ 
+@@ -290,7 +290,7 @@
+   if(LIB_SUFFIX AND NOT SIZEOF_VOID_P_BITS EQUAL LIB_SUFFIX)
+     set(OPENCV_CONFIG_INSTALL_PATH lib${LIB_SUFFIX}/cmake/opencv)
+   else()
+-    set(OPENCV_CONFIG_INSTALL_PATH share/OpenCV)
++    set(OPENCV_CONFIG_INSTALL_PATH share/opencv)
+   endif()
+ endif()
+ 
+diff -baur opencv-2.4.7.orig/data/CMakeLists.txt opencv-2.4.7/data/CMakeLists.txt
+--- opencv-2.4.7.orig/data/CMakeLists.txt	2013-11-12 20:31:27.280430213 +0000
++++ opencv-2.4.7/data/CMakeLists.txt	2013-11-12 20:31:54.923577113 +0000
+@@ -5,6 +5,6 @@
+   install(FILES ${HAAR_CASCADES} DESTINATION sdk/etc/haarcascades COMPONENT main)
+   install(FILES ${LBP_CASCADES}  DESTINATION sdk/etc/lbpcascades  COMPONENT main)
+ elseif(NOT WIN32)
+-  install(FILES ${HAAR_CASCADES} DESTINATION share/OpenCV/haarcascades COMPONENT main)
+-  install(FILES ${LBP_CASCADES}  DESTINATION share/OpenCV/lbpcascades  COMPONENT main)
++  install(FILES ${HAAR_CASCADES} DESTINATION share/opencv/haarcascades COMPONENT main)
++  install(FILES ${LBP_CASCADES}  DESTINATION share/opencv/lbpcascades  COMPONENT main)
+ endif()
+diff -baur opencv-2.4.7.orig/modules/java/CMakeLists.txt opencv-2.4.7/modules/java/CMakeLists.txt
+--- opencv-2.4.7.orig/modules/java/CMakeLists.txt	2013-11-12 20:31:27.360429532 +0000
++++ opencv-2.4.7/modules/java/CMakeLists.txt	2013-11-12 20:36:41.984985273 +0000
+@@ -279,7 +279,7 @@
+   if(WIN32)
+     set(JAR_INSTALL_DIR java)
+   else(WIN32)
+-    set(JAR_INSTALL_DIR share/OpenCV/java)
++    set(JAR_INSTALL_DIR share/opencv/java)
+   endif(WIN32)
+   install(FILES ${JAR_FILE} DESTINATION ${JAR_INSTALL_DIR} COMPONENT main)
+ endif(ANDROID)
+diff -baur opencv-2.4.7.orig/samples/c/CMakeLists.txt opencv-2.4.7/samples/c/CMakeLists.txt
+--- opencv-2.4.7.orig/samples/c/CMakeLists.txt	2013-11-12 20:31:27.433762373 +0000
++++ opencv-2.4.7/samples/c/CMakeLists.txt	2013-11-12 20:31:54.923577113 +0000
+@@ -54,6 +54,6 @@
+ if (INSTALL_C_EXAMPLES AND NOT WIN32)
+   file(GLOB C_SAMPLES *.c *.cpp *.jpg *.png *.data makefile.* build_all.sh *.dsp *.cmd )
+   install(FILES ${C_SAMPLES}
+-          DESTINATION share/OpenCV/samples/c
++          DESTINATION share/opencv/samples/c
+           PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
+ endif ()
+diff -baur opencv-2.4.7.orig/samples/cpp/CMakeLists.txt opencv-2.4.7/samples/cpp/CMakeLists.txt
+--- opencv-2.4.7.orig/samples/cpp/CMakeLists.txt	2013-11-12 20:31:27.417095818 +0000
++++ opencv-2.4.7/samples/cpp/CMakeLists.txt	2013-11-12 20:31:55.110242982 +0000
+@@ -83,6 +83,6 @@
+ if (INSTALL_C_EXAMPLES AND NOT WIN32)
+   file(GLOB C_SAMPLES *.c *.cpp *.jpg *.png *.data makefile.* build_all.sh *.dsp *.cmd )
+   install(FILES ${C_SAMPLES}
+-          DESTINATION share/OpenCV/samples/cpp
++          DESTINATION share/opencv/samples/cpp
+           PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
+ endif()
+diff -baur opencv-2.4.7.orig/samples/gpu/CMakeLists.txt opencv-2.4.7/samples/gpu/CMakeLists.txt
+--- opencv-2.4.7.orig/samples/gpu/CMakeLists.txt	2013-11-12 20:31:27.407095885 +0000
++++ opencv-2.4.7/samples/gpu/CMakeLists.txt	2013-11-12 20:31:55.110242982 +0000
+@@ -83,6 +83,6 @@
+ if (INSTALL_C_EXAMPLES AND NOT WIN32)
+   file(GLOB install_list *.c *.cpp *.jpg *.png *.data makefile.* build_all.sh *.dsp *.cmd )
+   install(FILES ${install_list}
+-          DESTINATION share/OpenCV/samples/${project}
++          DESTINATION share/opencv/samples/${project}
+           PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
+ endif()
+diff -baur opencv-2.4.7.orig/samples/gpu/performance/CMakeLists.txt opencv-2.4.7/samples/gpu/performance/CMakeLists.txt
+--- opencv-2.4.7.orig/samples/gpu/performance/CMakeLists.txt	2013-11-12 20:31:27.407095885 +0000
++++ opencv-2.4.7/samples/gpu/performance/CMakeLists.txt	2013-11-12 20:31:55.110242982 +0000
+@@ -29,6 +29,6 @@
+ if(INSTALL_C_EXAMPLES AND NOT WIN32)
+   file(GLOB GPU_FILES performance/*.cpp performance/*.h)
+   install(FILES ${GPU_FILES}
+-          DESTINATION share/OpenCV/samples/gpu/performance
++          DESTINATION share/opencv/samples/gpu/performance
+           PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
+ endif()
+diff -baur opencv-2.4.7.orig/samples/ocl/CMakeLists.txt opencv-2.4.7/samples/ocl/CMakeLists.txt
+--- opencv-2.4.7.orig/samples/ocl/CMakeLists.txt	2013-11-12 20:31:27.397095952 +0000
++++ opencv-2.4.7/samples/ocl/CMakeLists.txt	2013-11-12 20:39:29.227200043 +0000
+@@ -54,6 +54,6 @@
+ if (INSTALL_C_EXAMPLES AND NOT WIN32)
+   file(GLOB install_list *.c *.cpp *.jpg *.png *.data makefile.* build_all.sh *.dsp *.cmd )
+   install(FILES ${install_list}
+-          DESTINATION share/OpenCV/samples/${project}
++          DESTINATION share/opencv/samples/${project}
+           PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
+ endif()
diff --git a/libre/opencv/pkgconfig.patch b/libre/opencv/pkgconfig.patch
new file mode 100644
index 000000000..5626eb6e0
--- /dev/null
+++ b/libre/opencv/pkgconfig.patch
@@ -0,0 +1,35 @@
+diff -baur opencv-2.4.7.orig/cmake/OpenCVGenPkgconfig.cmake opencv-2.4.7/cmake/OpenCVGenPkgconfig.cmake
+--- opencv-2.4.7.orig/cmake/OpenCVGenPkgconfig.cmake	2013-11-12 20:31:27.253763202 +0000
++++ opencv-2.4.7/cmake/OpenCVGenPkgconfig.cmake	2013-11-12 20:41:48.936262732 +0000
+@@ -10,7 +10,7 @@
+ # -------------------------------------------------------------------------------------------
+ set(prefix      "${CMAKE_INSTALL_PREFIX}")
+ set(exec_prefix "\${prefix}")
+-set(libdir      "") #TODO: need link paths for OpenCV_EXTRA_COMPONENTS
++set(libdir      "\${prefix}/${OPENCV_LIB_INSTALL_PATH}")
+ set(includedir  "\${prefix}/${OPENCV_INCLUDE_INSTALL_PATH}")
+ 
+ if(CMAKE_BUILD_TYPE MATCHES "Release")
+@@ -35,10 +35,11 @@
+ ocv_list_reverse(OpenCV_EXTRA_COMPONENTS)
+ 
+ #build the list of components
+-set(OpenCV_LIB_COMPONENTS_ "")
++set(OpenCV_LIB_COMPONENTS_ "-L\${libdir}")
+ foreach(CVLib ${OpenCV_LIB_COMPONENTS})
+   get_target_property(libpath ${CVLib} LOCATION_${CMAKE_BUILD_TYPE})
+   get_filename_component(libname "${libpath}" NAME)
++  get_filename_component(lname "${libpath}" NAME_WE)
+ 
+   if(INSTALL_TO_MANGLED_PATHS)
+     set(libname "${libname}.${OPENCV_VERSION}")
+@@ -51,7 +52,8 @@
+     set(installDir "${OPENCV_LIB_INSTALL_PATH}")
+   endif()
+ 
+-  set(OpenCV_LIB_COMPONENTS_ "${OpenCV_LIB_COMPONENTS_} \${exec_prefix}/${installDir}/${libname}")
++  string(REPLACE "libopencv" "-lopencv" lname "${lname}")
++  set(OpenCV_LIB_COMPONENTS_ "${OpenCV_LIB_COMPONENTS_} ${lname}")
+ endforeach()
+ 
+ # add extra dependencies required for OpenCV
diff --git a/libre/opencv/x86_asmfix.patch b/libre/opencv/x86_asmfix.patch
new file mode 100644
index 000000000..789f65f9c
--- /dev/null
+++ b/libre/opencv/x86_asmfix.patch
@@ -0,0 +1,46 @@
+From ea50be0529c248961e1b66293f8a9e4b807294a6 Mon Sep 17 00:00:00 2001
+From: Samuel Martin <s.martin49@gmail.com>
+Date: Sun, 12 Oct 2014 10:17:23 +0200
+Subject: [PATCH] core: fix x86 PIC code compilation
+
+This bug was triggered by Buildroot autobuilders [1,2], causing this
+kind of failures [3,4]:
+
+  [ 14%] Building CXX object modules/core/CMakeFiles/opencv_core.dir/src/system.cpp.o
+  /home/test/autobuild/instance-0/output/build/opencv-2.4.10/modules/core/src/system.cpp: In function '(static initializers for /home/test/autobuild/instance-0/output/build/opencv-2.4.10/modules/core/src/system.cpp)':
+  /home/test/autobuild/instance-0/output/build/opencv-2.4.10/modules/core/src/system.cpp:280:10: error: inconsistent operand constraints in an 'asm'
+  make[3]: *** [modules/core/CMakeFiles/opencv_core.dir/src/system.cpp.o] Error 1
+
+[1] http://buildroot.org/
+[2] http://autobuild.buildroot.org/
+[3] http://autobuild.buildroot.org/?reason=opencv-2.4.10
+[4] http://autobuild.buildroot.org/results/483/4838285b25d6293a5cf0bb9eadd5040a7c75d766/build-end.log
+
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
+---
+ modules/core/src/system.cpp | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/modules/core/src/system.cpp b/modules/core/src/system.cpp
+index 5a970d5..e9ffdc7 100644
+--- a/modules/core/src/system.cpp
++++ b/modules/core/src/system.cpp
+@@ -267,14 +267,17 @@ struct HWFeatures
+          : "cc"
+         );
+         #else
++        // We need to preserve ebx since we are compiling PIC code.
++        // This means we cannot use "=b" for the 2nd output register.
+         asm volatile
+         (
+          "pushl %%ebx\n\t"
+          "movl $7,%%eax\n\t"
+          "movl $0,%%ecx\n\t"
+          "cpuid\n\t"
++         "movl %%ebx,%1\n\t"
+          "popl %%ebx\n\t"
+-         : "=a"(cpuid_data[0]), "=b"(cpuid_data[1]), "=c"(cpuid_data[2]), "=d"(cpuid_data[3])
++         : "=a"(cpuid_data[0]), "=r"(cpuid_data[1]), "=c"(cpuid_data[2]), "=d"(cpuid_data[3])
+          :
+          : "cc"
+         );
diff --git a/libre/povray/PKGBUILD b/libre/povray/PKGBUILD
index 0bcc2e65c..b15bcc3c2 100644
--- a/libre/povray/PKGBUILD
+++ b/libre/povray/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 131935 2015-04-22 10:18:29Z arodseth $
+# $Id: PKGBUILD 134935 2015-06-07 09:24:14Z arodseth $
 # Maintainer (Arch): Alexander Rødseth <rodseth@gmail.com>
 # Contributor (Arch): Tom Newsom <Jeepster@gmx.co.uk>
 # Contributor (Arch): tobias <tobias@archlinux.org>
@@ -10,7 +10,7 @@
 _pkgname=povray-libre
 pkgname=povray
 pkgver=3.7
-pkgrel=7.parabola1
+pkgrel=8.parabola1
 epoch=1
 pkgdesc='Script based raytracer for creating 3D graphics, without nonfree documentation'
 arch=('x86_64' 'i686' 'mips64el')
@@ -25,8 +25,8 @@ backup=("etc/povray/$pkgver/povray.conf"
 mksource=("$pkgname-$pkgver.zip::https://github.com/POV-Ray/$pkgname/archive/$pkgver-stable.zip")
 source=("https://repo.parabola.nu/other/$_pkgname/$_pkgname-$pkgver.tar.xz"
         'povray3.7.0_rc3-user-conf.patch')
-mksha256sums=('1261d963327a4b04c09d56bbd7436d0062e6bf8363674e3fb4e240beefb5b5cb')
-sha256sums=('ba2a867b8593689067143b23ebdccb8f8f46487244802d24d873517287b924f1'
+mksha256sums=('f30ab643ad694f32b916f183c3783e24cb4cc073bf58f2869dbffc02b603c968')
+sha256sums=('13be30ed28d47b3796de55263d0fca74edcbe990b08059c589dcc72540a179a7'
             '95b04ec4973e6e8a80fc83df2e3caff0b4d6699c4154144f3017d42cab7236e0')
 
 mksource() {