[arch-commits] Commit in performous/trunk (PKGBUILD performous-opencv4.patch)

[Antonio Rojas]

    Date: Tuesday, November 20, 2018 @ 21:00:37
  Author: arojas
Revision: 409223

opencv 4.0 rebuild

Added:
  performous/trunk/performous-opencv4.patch
Modified:
  performous/trunk/PKGBUILD

--------------------------+
 PKGBUILD                 |    9 ++++++---
 performous-opencv4.patch |   41 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-11-20 20:57:04 UTC (rev 409222)
+++ PKGBUILD	2018-11-20 21:00:37 UTC (rev 409223)
@@ -3,7 +3,7 @@
 
 pkgname=performous
 pkgver=1.1
-pkgrel=17
+pkgrel=18
 pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"'
 arch=('x86_64')
 url="http://performous.org/"
@@ -13,15 +13,18 @@
 optdepends=('performous-freesongs: free songs for performous')
 source=($pkgname-$pkgver.tar.gz::https://github.com/performous/${pkgname}/archive/${pkgver}.tar.gz
         boost-1.67.patch
-        performous-libswresample.patch)
+        performous-libswresample.patch
+        performous-opencv4.patch)
 sha512sums=('6659aa03960e68d7af65b072e179e42b122d2a39d25229c6daf765146379a115a52e51c1dc2bc69081ea17fe7a22f1d7007b7cf9e09bc32d134c3ad8e3444dd1'
             'dde4ac66d92a5a269237abb27fc5140bf87fd07b1d1e333d0e47c13b05a66b08347883380a575f0635c871236519710e791d99d3bd06700dd48341f5e50fd8b1'
-            'f85b9a5c1b1bf0f1f5df7fb13945856cbca19bc5e49e3bb6f3cff302110b08275e97496ec70f23a8e9c77246b92ddde826520000888d6a4c2e888a8bae311f17')
+            'f85b9a5c1b1bf0f1f5df7fb13945856cbca19bc5e49e3bb6f3cff302110b08275e97496ec70f23a8e9c77246b92ddde826520000888d6a4c2e888a8bae311f17'
+            '854d969de951a5f380ddd1523b3d66639ef19b16af161466dfef3c697280c95884a3e34258dc86bb7eef1143ca24de44ae2dfccb5ce76fd333784b62f0762f56')
 
 prepare() {
   cd performous-${pkgver}
   patch -Np1 -i ../boost-1.67.patch
   patch -Np1 -i ../performous-libswresample.patch
+  patch -p1 -i ../performous-opencv4.patch # Fix build with openCV 4
 }
 
 build() {

Added: performous-opencv4.patch
===================================================================
--- performous-opencv4.patch	                        (rev 0)
+++ performous-opencv4.patch	2018-11-20 21:00:37 UTC (rev 409223)
@@ -0,0 +1,41 @@
+--- performous-1.1/game/webcam.cc.orig	2018-11-20 20:50:27.857909212 +0000
++++ performous-1.1/game/webcam.cc	2018-11-20 20:51:55.798134386 +0000
+@@ -7,6 +7,7 @@
+ 
+ #ifdef USE_OPENCV
+ #include <opencv2/opencv.hpp>
++#include <opencv2/videoio.hpp>
+ 
+ #else
+ // Dummy classes
+@@ -31,21 +32,21 @@
+ 			throw std::runtime_error("Could not initialize webcam capturing!");
+ 	}
+ 	// Try to get at least VGA resolution
+-	if (m_capture->get(CV_CAP_PROP_FRAME_WIDTH) < 640
+-	  || m_capture->get(CV_CAP_PROP_FRAME_HEIGHT) < 480) {
+-		m_capture->set(CV_CAP_PROP_FRAME_WIDTH, 640);
+-		m_capture->set(CV_CAP_PROP_FRAME_HEIGHT, 480);
++	if (m_capture->get(cv::CAP_PROP_FRAME_WIDTH) < 640
++	  || m_capture->get(cv::CAP_PROP_FRAME_HEIGHT) < 480) {
++		m_capture->set(cv::CAP_PROP_FRAME_WIDTH, 640);
++		m_capture->set(cv::CAP_PROP_FRAME_HEIGHT, 480);
+ 	}
+ 	// Print actual values
+ 	std::cout << "Webcam frame properties: "
+-	  << m_capture->get(CV_CAP_PROP_FRAME_WIDTH) << "x"
+-	  << m_capture->get(CV_CAP_PROP_FRAME_HEIGHT) << std::endl;
++	  << m_capture->get(cv::CAP_PROP_FRAME_WIDTH) << "x"
++	  << m_capture->get(cv::CAP_PROP_FRAME_HEIGHT) << std::endl;
+ 
+ 	// Initialize the video writer
+ 	#ifdef SAVE_WEBCAM_VIDEO
+-	float fps = m_capture->get(CV_CAP_PROP_FPS);
+-	int framew = m_capture->get(CV_CAP_PROP_FRAME_WIDTH);
+-	int frameh = m_capture->get(CV_CAP_PROP_FRAME_HEIGHT);
++	float fps = m_capture->get(cv::CAP_PROP_FPS);
++	int framew = m_capture->get(cv::CAP_PROP_FRAME_WIDTH);
++	int frameh = m_capture->get(cv::CAP_PROP_FRAME_HEIGHT);
+ 	int codec = CV_FOURCC('P','I','M','1'); // MPEG-1
+ 	std::string out_file = (getHomeDir() / "performous-webcam_out.mpg").string();
+ 	m_writer.reset(new cv::VideoWriter(out_file.c_str(), codec, fps > 0 ? fps : 30.0f, cvSize(framew,frameh)));