[med-svn] [Git][med-team/libsitplus][master] 2 commits: Try to fix some build issues

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / libsitplus


Commits:
54f81184 by Andreas Tille at 2019-01-25T22:41:04Z
Try to fix some build issues

- - - - -
01a66abc by Andreas Tille at 2019-01-25T22:42:55Z
Give up now

- - - - -


5 changed files:

- debian/changelog
- debian/control
- + debian/patches/gcc-8.fix
- + debian/patches/remove_deprecated_definitions.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -2,4 +2,14 @@ libsitplus (1.1.0-1) UNRELEASED; urgency=medium
 
   * Initial packaging (Closes: #???)
 
+  Status: When seeing this 
+
+      /build/libsitplus-1.1.0/src/widgets_base/containerpanel.cpp: In member function 'void widgets_base::ContainerPanel::OnSize(wxSizeEvent&)':
+      /build/libsitplus-1.1.0/src/widgets_base/containerpanel.cpp:174:12: error: 'OnSize' is not a member of 'wxPanel'
+        wxPanel::OnSize(event);
+                 ^~~~~~
+
+  I finally gave up since it is to hard to port obviously unmaintained code
+
+
  -- Andreas Tille <tille at debian.org>  Fri, 25 Jan 2019 10:03:53 +0100


=====================================
debian/control
=====================================
@@ -19,7 +19,11 @@ Build-Depends: debhelper (>= 12~),
                libbluetooth-dev,
                libsdl1.2-dev,
                libv4l-dev,
-               libportmidi-dev
+               libportmidi-dev,
+               libxtst-dev,
+               libsdl-gfx1.2-dev,
+               libsdl-image1.2-dev,
+               asciidoc
 Standards-Version: 4.3.0
 Vcs-Browser: https://salsa.debian.org/med-team/libsitplus
 Vcs-Git: https://salsa.debian.org/med-team/libsitplus.git


=====================================
debian/patches/gcc-8.fix
=====================================
@@ -0,0 +1,11 @@
+--- a/src/core/configurationimpl.h
++++ b/src/core/configurationimpl.h
+@@ -145,7 +145,7 @@ public:
+ #ifdef WIN32
+ 		return (config_lookup_int (&m_config, epath.c_str(), i)== CONFIG_TRUE);
+ #else
+-		long tmp;
++		int tmp; /* no idey why this was defined as long before - long conflicts with function definition */
+ 		int retval= config_lookup_int (&m_config, epath.c_str(), &tmp);
+ 		if (retval!= CONFIG_TRUE) return false;
+ 		*i= (int) tmp;


=====================================
debian/patches/remove_deprecated_definitions.patch
=====================================
@@ -0,0 +1,11 @@
+--- a/src/libwebcam/libwebcam.c
++++ b/src/libwebcam/libwebcam.c
+@@ -1754,8 +1754,6 @@ static CControlId get_control_id_from_v4
+ 		case V4L2_CID_GAIN:					return CC_GAIN;
+ 		case V4L2_CID_HFLIP:				break;	// not supported by libwebcam
+ 		case V4L2_CID_VFLIP:				break;	// not supported by libwebcam
+-		case V4L2_CID_HCENTER:				break;	// deprecated
+-		case V4L2_CID_VCENTER:				break;	// deprecated
+ #ifdef V4L2_CID_POWER_LINE_FREQUENCY
+ 		case V4L2_CID_POWER_LINE_FREQUENCY:		return CC_POWER_LINE_FREQUENCY;
+ #endif


=====================================
debian/patches/series
=====================================
@@ -1,2 +1,4 @@
 cmake_libpoco.patch
 no_opencv_legacy_any_more.patch
+remove_deprecated_definitions.patch
+gcc-8.fix



View it on GitLab: https://salsa.debian.org/med-team/libsitplus/compare/6a2948f8af5a0e9a4427fbd03db49612fee48118...01a66abce328c265a862efb507cc2a3d68c5e165

-- 
View it on GitLab: https://salsa.debian.org/med-team/libsitplus/compare/6a2948f8af5a0e9a4427fbd03db49612fee48118...01a66abce328c265a862efb507cc2a3d68c5e165
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20190125/4e2b1241/attachment-0001.html>