Control: tags 1019790 + patch

Dear maintainer,

I've managed to build eviacam using wxwidgets3.2 with a couple of minor
changes (patch attached).

However I can't test my patched build because eviacam doesn't start
(I'm guessing it doesn't like my webcam for some reason) - starting it I
get:

$ eviacam
[ERROR:0@0.016] global ./modules/core/src/persistence.cpp (505) open Can't open 
file: '/usr/share/eviacam/haarcascade_frontalface_default.xml' in read mode
[ERROR:0@0.017] global ./modules/core/src/persistence.cpp (505) open Can't open 
file: '/usr/share/opencv/haarcascades/haarcascade_frontalface_default.xml' in 
read mode
[ERROR:0@0.017] global ./modules/core/src/persistence.cpp (505) open Can't open 
file: '/usr/share/OpenCV/haarcascades/haarcascade_frontalface_default.xml' in 
read mode
[libwebcam] Invalid V4L2 control type encountered: ctrl_id = 0x00980001, name = 
'User Controls', type = 6
[libwebcam] Invalid or unsupported V4L2 control encountered: ctrl_id = 
0x00980001, name = 'User Controls'
[libwebcam] Invalid V4L2 control type encountered: ctrl_id = 0x009A0001, name = 
'Camera Controls', type = 6
[libwebcam] Invalid or unsupported V4L2 control encountered: ctrl_id = 
0x009A0001, name = 'Camera Controls'

(eviacam:184091): Gtk-CRITICAL **: 10:24:53.628: gtk_box_gadget_distribute: 
assertion 'size >= 0' failed in GtkScrollbar
[ WARN:0@3.768] global ./modules/videoio/src/videoio_c.cpp (15) 
cvCreateCameraCapture cvCreateCameraCapture doesn't support legacy API anymore.
$

I also get the same error for the version already in unstable.

Please can you test with my patch, and upload if it works.

Cheers,
    Olly
diff -Nru eviacam-2.1.4/debian/changelog eviacam-2.1.4/debian/changelog
--- eviacam-2.1.4/debian/changelog	2020-02-12 02:09:11.000000000 +1300
+++ eviacam-2.1.4/debian/changelog	2022-11-09 10:14:08.000000000 +1300
@@ -1,3 +1,11 @@
+eviacam (2.1.4-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * debian/control: Update to build with wxwidgets-3.2 (new patch
+    wx3.2-compat.patch) (Closes: #1019790)
+
+ -- Olly Betts <o...@survex.com>  Wed, 09 Nov 2022 10:14:08 +1300
+
 eviacam (2.1.4-2) unstable; urgency=medium
 
   * Team upload
diff -Nru eviacam-2.1.4/debian/control eviacam-2.1.4/debian/control
--- eviacam-2.1.4/debian/control	2020-02-12 02:09:11.000000000 +1300
+++ eviacam-2.1.4/debian/control	2022-11-09 10:05:50.000000000 +1300
@@ -7,7 +7,7 @@
                libopencv-dev (>= 2.0),
                libpng-dev,
                libv4l-dev,
-               libwxgtk3.0-gtk3-dev,
+               libwxgtk3.2-dev,
                libgtk-3-dev,
                libxext-dev,
                libxtst-dev,
diff -Nru eviacam-2.1.4/debian/patches/series eviacam-2.1.4/debian/patches/series
--- eviacam-2.1.4/debian/patches/series	2020-02-12 02:09:11.000000000 +1300
+++ eviacam-2.1.4/debian/patches/series	2022-11-09 10:14:08.000000000 +1300
@@ -1 +1,2 @@
 new-opencv.patch
+wx3.2-compat.patch
diff -Nru eviacam-2.1.4/debian/patches/wx3.2-compat.patch eviacam-2.1.4/debian/patches/wx3.2-compat.patch
--- eviacam-2.1.4/debian/patches/wx3.2-compat.patch	1970-01-01 12:00:00.000000000 +1200
+++ eviacam-2.1.4/debian/patches/wx3.2-compat.patch	2022-11-09 10:14:08.000000000 +1300
@@ -0,0 +1,29 @@
+Description: Fixes for compatibility with wxWidgets 3.2
+Author: Olly Betts <o...@survex.com>
+Bug-Debian: https://bugs.debian.org/1019790
+Forwarded: no
+Last-Update: 2022-11-08
+
+--- a/src/wviacam.cpp
++++ b/src/wviacam.cpp
+@@ -598,7 +598,8 @@
+ 		case (wxLANGUAGE_SPANISH_GUATEMALA):
+ 		case (wxLANGUAGE_SPANISH_HONDURAS):
+ 		case (wxLANGUAGE_SPANISH_MEXICAN):
+-		case (wxLANGUAGE_SPANISH_MODERN):
++		// Same value as wxLANGUAGE_SPANISH in wx3.2:
++		// case (wxLANGUAGE_SPANISH_MODERN):
+ 		case (wxLANGUAGE_SPANISH_NICARAGUA):
+ 		case (wxLANGUAGE_SPANISH_PANAMA):
+ 		case (wxLANGUAGE_SPANISH_PARAGUAY):
+--- a/src/viacamcontroller.cpp
++++ b/src/viacamcontroller.cpp
+@@ -230,7 +230,7 @@
+ 
+ 			wxSingleChoiceDialog choiceDlg(
+ 				NULL, _("Choose the camera to use"), _T("Enable Viacam"), strArray, 
+-				(char**)NULL, wxDEFAULT_DIALOG_STYLE | wxOK | wxCANCEL | wxCENTRE);
++				(void**)NULL, wxDEFAULT_DIALOG_STYLE | wxOK | wxCANCEL | wxCENTRE);
+ 
+ 			if (choiceDlg.ShowModal ()!= wxID_OK) return NULL;
+ 

Reply via email to