search

ZoneMinder / zoneminder

ZoneMinder is a free, open source Closed-circuit television software application developed for Linux which supports IP, USB and Analog cameras.
http://www.zoneminder.com/
GNU General Public License v2.0
5.16k stars 1.23k forks source link

1.26 Beta does not install SkyIPCam7xx.pm Control Script #38

Closed knight-of-ni closed 11 years ago

knight-of-ni commented 11 years ago

The file SkyIPCam7xx.pm is contained in the source tree, and the database contains the correct reference to this PTZ control. However, the actual file is not copied over during install time. See below for a patch that resolves the issue.

UPDATE: I also found a typo in the skyip database record. The SkyIPCam7xx protocol was misspelled SKyIPCam7xx.pm. My eyes hurt after finding that one. :-) I updated the patch below to account for this.

PS: I apologize for not using the proper github method to submit this. Learning how to edit my own fork and then submit changes is something on my to-do list. I've read a lot about it, but I'm a slow learner.

--- scripts/Makefile.am 2013-08-13 11:40:03.000000000 -0500
+++ scripts/Makefile.am.skyip   2013-08-14 18:56:29.919038259 -0500
@@ -59,6 +59,7 @@
    ZoneMinder/lib/ZoneMinder/Control/Visca.pm \
    ZoneMinder/lib/ZoneMinder/Control/Ncs370.pm \
    ZoneMinder/lib/ZoneMinder/Control/mjpgStreamer.pm \
+   ZoneMinder/lib/ZoneMinder/Control/SkyIPCam7xx.pm \
    ZoneMinder/lib/ZoneMinder/Trigger/Channel.pm \
    ZoneMinder/lib/ZoneMinder/Trigger/Channel/Handle.pm \
    ZoneMinder/lib/ZoneMinder/Trigger/Channel/Spawning.pm \
--- scripts/ZoneMinder/Makefile.PL  2013-08-13 11:40:03.000000000 -0500
+++ scripts/ZoneMinder/Makefile.PL.skyip    2013-08-14 19:18:33.839396021 -0500
@@ -25,6 +25,7 @@
        'lib/ZoneMinder/Control/Visca.pm' => '$(INST_LIBDIR)/ZoneMinder/Control/Visca.pm',
        'lib/ZoneMinder/Control/Ncs370.pm' => '$(INST_LIBDIR)/ZoneMinder/Control/Ncs370.pm',
        'lib/ZoneMinder/Control/mjpgStreamer.pm' => '$(INST_LIBDIR)/ZoneMinder/Control/mjpgStreamer.pm',
+       'lib/ZoneMinder/Control/SkyIPCam7xx.pm' => '$(INST_LIBDIR)/ZoneMinder/Control/SkyIPCam7xx.pm',
        'lib/ZoneMinder/Trigger/Channel.pm' => '$(INST_LIBDIR)/ZoneMinder/Trigger/Channel.pm',
        'lib/ZoneMinder/Trigger/Channel/Handle.pm' => '$(INST_LIBDIR)/ZoneMinder/Trigger/Channel/Handle.pm',
        'lib/ZoneMinder/Trigger/Channel/Spawning.pm' => '$(INST_LIBDIR)/ZoneMinder/Trigger/Channel/Spawning.pm',
--- db/zm_create.sql.in 2013-08-13 11:40:03.000000000 -0500
+++ db/zm_create.sql.in.typo    2013-08-14 19:52:36.771715499 -0500
@@ -536,7 +536,7 @@
 INSERT INTO Controls VALUES (4,'Axis API v2','Remote','AxisV2',0,0,0,1,0,0,1,0,0,9999,10,2500,0,NULL,NULL,1,1,0,1,0,0,9999,10,2500,0,NULL,NULL,1,1,0,1,0,0,9999,10,2500,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,12,1,1,1,1,1,0,1,0,1,-360,360,1,90,0,NULL,NULL,0,NULL,1,-360,360,1,90,0,NULL,NULL,0,NULL,0,0);
 insert into Controls values (5,'Panasonic IP','Remote','PanasonicIP',0,0,0,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,8,1,1,1,0,1,0,0,1,1,NULL,NULL,NULL,NULL,0,NULL,NULL,0,NULL,1,NULL,NULL,NULL,NULL,0,NULL,NULL,0,NULL,0,0);
 insert into Controls values (6,'Neu-Fusion NCS370','Remote','Ncs370',0,0,0,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,24,1,0,1,1,0,0,0,1,1,NULL,NULL,NULL,NULL,0,NULL,NULL,0,NULL,1,NULL,NULL,NULL,NULL,0,NULL,NULL,0,NULL,0,0); 
-insert into Controls values (7,'AirLink SkyIPCam 7xx','Remote','SKyIPCam7xx',0,0,1,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,8,1,1,1,0,1,0,1,0,1,NULL,NULL,NULL,NULL,0,NULL,NULL,0,NULL,1,NULL,NULL,NULL,NULL,0,NULL,NULL,0,NULL,0,0); 
+insert into Controls values (7,'AirLink SkyIPCam 7xx','Remote','SkyIPCam7xx',0,0,1,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,8,1,1,1,0,1,0,1,0,1,NULL,NULL,NULL,NULL,0,NULL,NULL,0,NULL,1,NULL,NULL,NULL,NULL,0,NULL,NULL,0,NULL,0,0); 
 insert into Controls values (8,'Pelco-D','Ffmpeg','PelcoD',1,1,0,1,1,0,0,1,NULL,NULL,NULL,NULL,1,0,3,1,1,0,0,1,NULL,NULL,NULL,NULL,0,NULL,NULL,1,1,0,1,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,1,0,1,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,20,1,1,1,1,0,0,0,1,1,NULL,NULL,NULL,NULL,1,0,63,1,254,1,NULL,NULL,NULL,NULL,1,0,63,1,254,0,0);
 insert into Controls values (9,'Pelco-P','Ffmpeg','PelcoP',1,1,0,1,1,0,0,1,NULL,NULL,NULL,NULL,1,0,3,1,1,0,0,1,NULL,NULL,NULL,NULL,0,NULL,NULL,1,1,0,1,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,1,0,1,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,20,1,1,1,1,0,0,0,1,1,NULL,NULL,NULL,NULL,1,0,63,1,254,1,NULL,NULL,NULL,NULL,1,0,63,1,254,0,0);
kylejohnson commented 11 years ago

Thanks for reporting this.

connortechnology commented 11 years ago

Sorry all, my fault for not including that line when I put this file in the tree.

Also, no apologies neccessary... I'm barely learning this stuff too.

On 13-08-14 08:37 PM, Andy wrote:

The file SkyIPCam7xx.pm is contained in the source tree, and the database contains the correct reference to this PTZ control. However, the actual file is not copied over during install time. See below for a patch that resolves the issue.

PS: I apologize for not using the proper github method to submit this. Learning how to edit my own fork and then submit changes is something on my to-do list. I've read a lot about it, but I'm a slow learner.

|--- scripts/Makefile.am 2013-08-13 11:40:03.000000000 -0500 +++ scripts/Makefile.am.skyip 2013-08-14 18:56:29.919038259 -0500 @@ -59,6 +59,7 @@ ZoneMinder/lib/ZoneMinder/Control/Visca.pm \ ZoneMinder/lib/ZoneMinder/Control/Ncs370.pm \ ZoneMinder/lib/ZoneMinder/Control/mjpgStreamer.pm \

  • ZoneMinder/lib/ZoneMinder/Control/SkyIPCam7xx.pm \ ZoneMinder/lib/ZoneMinder/Trigger/Channel.pm \ ZoneMinder/lib/ZoneMinder/Trigger/Channel/Handle.pm \ ZoneMinder/lib/ZoneMinder/Trigger/Channel/Spawning.pm \ --- scripts/ZoneMinder/Makefile.PL 2013-08-13 11:40:03.000000000 -0500 +++ scripts/ZoneMinder/Makefile.PL.skyip 2013-08-14 19:18:33.839396021 -0500 @@ -25,6 +25,7 @@ 'lib/ZoneMinder/Control/Visca.pm' => '$(INST_LIBDIR)/ZoneMinder/Control/Visca.pm', 'lib/ZoneMinder/Control/Ncs370.pm' => '$(INST_LIBDIR)/ZoneMinder/Control/Ncs370.pm', 'lib/ZoneMinder/Control/mjpgStreamer.pm' => '$(INST_LIBDIR)/ZoneMinder/Control/mjpgStreamer.pm',
  • 'lib/ZoneMinder/Control/SkyIPCam7xx.pm' => '$(INST_LIBDIR)/ZoneMinder/Control/SkyIPCam7xx.pm', 'lib/ZoneMinder/Trigger/Channel.pm' => '$(INST_LIBDIR)/ZoneMinder/Trigger/Channel.pm', 'lib/ZoneMinder/Trigger/Channel/Handle.pm' => '$(INST_LIBDIR)/ZoneMinder/Trigger/Channel/Handle.pm', 'lib/ZoneMinder/Trigger/Channel/Spawning.pm' => '$(INST_LIBDIR)/ZoneMinder/Trigger/Channel/Spawning.pm', |

— Reply to this email directly or view it on GitHub https://github.com/ZoneMinder/ZoneMinder/issues/38.

kylejohnson commented 11 years ago

No worries. :+1: