The following commit has been merged in the master branch:
commit 53977a9a9970174e2643b288d731dfeca4387206
Author: Dmitrijs Ledkovs <[email protected]>
Date: Mon Jul 1 11:55:11 2013 +0100
* Remove deprecated V4L2_CID_[HV]CENTER controls.
* Use boost::TIME_UTC_. (Closes: #710645)
* Added missing libs to link, fixing FTBFS on ubuntu.
diff --git a/debian/changelog b/debian/changelog
index ed48b8c..7f3050f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+sitplus (1.0.3-4) UNRELEASED; urgency=low
+
+ * Team upload.
+ * Remove deprecated V4L2_CID_[HV]CENTER controls.
+ * Use boost::TIME_UTC_. (Closes: #710645)
+ * Added missing libs to link, fixing FTBFS on ubuntu.
+
+ -- Dmitrijs Ledkovs <[email protected]> Mon, 01 Jul 2013 11:54:14
+0100
+
sitplus (1.0.3-3) unstable; urgency=low
* debian/patches/sitplus-opencv2.4.patch: Build with recent opencv 2.4
diff --git a/debian/patches/libs_underlinkage.patch
b/debian/patches/libs_underlinkage.patch
new file mode 100644
index 0000000..479f1e3
--- /dev/null
+++ b/debian/patches/libs_underlinkage.patch
@@ -0,0 +1,19 @@
+Index: sitplus-1.0.3/src/sitplus/CMakeLists.txt
+===================================================================
+--- sitplus-1.0.3.orig/src/sitplus/CMakeLists.txt 2012-01-19
13:54:56.000000000 -0500
++++ sitplus-1.0.3/src/sitplus/CMakeLists.txt 2013-04-16 00:28:33.197732288
-0400
+@@ -28,6 +28,7 @@
+ target_link_libraries(sitplus nvwa)
+ target_link_libraries(sitplus testcommon)
+ target_link_libraries(sitplus ${wxWidgets_LIBRARIES})
++target_link_libraries(sitplus X11)
+
+ INSTALL (TARGETS sitplus RUNTIME DESTINATION ${BINDIR})
+
+@@ -37,4 +38,4 @@
+ endif(MSVC)
+ install(FILES
"${wxWidgets_ROOT_DIR}/lib/vc_dll/wxmsw28ud_html_vc_custom.dll" DESTINATION
"${BINDIR}" CONFIGURATIONS Debug)
+ install(FILES
"${wxWidgets_ROOT_DIR}/lib/vc_dll/wxmsw28u_html_vc_custom.dll" DESTINATION
"${BINDIR}" CONFIGURATIONS Release RelWithDebInfo)
+-endif(WIN32)
+\ No newline at end of file
++endif(WIN32)
diff --git a/debian/patches/remove-deprecated-controls.patch
b/debian/patches/remove-deprecated-controls.patch
new file mode 100644
index 0000000..28eda34
--- /dev/null
+++ b/debian/patches/remove-deprecated-controls.patch
@@ -0,0 +1,37 @@
+Description: remove deprecated controls
+ https://linuxtv.org/patch/10794/
+Author: Dmitrijs Ledkovs <[email protected]>
+
+--- a/src/libwebcam/libwebcam.c
++++ b/src/libwebcam/libwebcam.c
+@@ -1754,8 +1754,6 @@
+ 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
+--- a/src/mod_camera/mod_camera.h
++++ b/src/mod_camera/mod_camera.h
+@@ -174,7 +174,7 @@
+ static void sleep_miliseconds( unsigned int ms )
+ {
+ boost::xtime xt;
+- boost::xtime_get(&xt, boost::TIME_UTC);
++ boost::xtime_get(&xt, boost::TIME_UTC_);
+ xt.nsec+= ms * 1000000;
+ boost::thread::sleep(xt);
+ }
+--- a/src/mod_wiimotes/mod_wiimotes.cpp
++++ b/src/mod_wiimotes/mod_wiimotes.cpp
+@@ -40,7 +40,7 @@
+ static void sleep_miliseconds( unsigned int ms )
+ {
+ boost::xtime xt;
+- boost::xtime_get(&xt, boost::TIME_UTC);
++ boost::xtime_get(&xt, boost::TIME_UTC_);
+ xt.nsec+= ms * 1000000;
+ boost::thread::sleep(xt);
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 2ea7ad1..e76c8d2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,5 @@ spelling.diff
as-needed.patch
0001-remove-workaround-for-older-libconfig-versions.patch
sitplus-opencv2.4.patch
+libs_underlinkage.patch
+remove-deprecated-controls.patch
--
Free software framework for ludic-therapeutic activities
_______________________________________________
debian-med-commit mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
