Commit Graph

73 Commits

Author SHA1 Message Date
Isaac Connor 113f4b2bfe add libx264-142 for jessie 2017-03-24 18:00:18 -04:00
Isaac Connor feb9d55613 fix syntax 2017-03-20 13:52:10 -04:00
Isaac Connor d5312ce21f fix libswscale for 1604 2017-03-13 15:37:55 -04:00
Isaac Connor 1cbcd3612f add libswscale4 2017-03-13 14:28:13 -04:00
Isaac Connor e04cc1be05 add mp4 and x264 to ubuntu1204 and remove duplicated mp4.x264 lines from ubuntu1604. 2017-03-11 10:41:39 -05:00
Isaac Connor d1ed472db0 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2017-01-05 10:09:11 -05:00
Isaac Connor 708f52beda Merge branch 'disk_space_in_events' into storageareas 2016-12-13 13:36:18 -05:00
Andrew Bauer e72a76fe33 Update control 2016-12-12 12:09:47 -06:00
Isaac Connor 859d361373 turn off libswresample 2016-11-27 17:06:12 -05:00
Isaac Connor 921205216d turn off libswresample 2016-11-27 17:00:16 -05:00
Isaac Connor 2df6cd17fa add libswresample to build depends 2016-11-11 22:30:35 -05:00
Isaac Connor a6c77f08d2 use generic libboost-dev 2016-10-02 15:22:52 -04:00
Isaac Connor bf013cd88e remove libswsresample 2016-09-30 11:58:55 -04:00
Isaac Connor b3fd156c11 add boost to build depends 2016-05-25 20:01:42 -04:00
Isaac Connor f1012f60ec add libswresample to build depends 2016-09-29 12:31:02 -04:00
Isaac Connor a03d2a393f add ffmpeg as an option to libav-tools 2016-09-20 13:22:49 -04:00
Isaac Connor 824d7c5b43 Merge ../ZoneMinder.Steve into packetqueue 2016-08-31 11:58:22 -04:00
Steve Gilvarry 3543c37f5e Add libx264-dev and libmp4v2-dev to build requires to save hassle of
ensuring they are installed before build.
2016-07-31 08:24:52 +10:00
Isaac Connor e62ea454ba Merge branch 'master' into storageareas 2016-05-17 10:48:52 -04:00
Isaac Connor 09e4aca0be add libdata-uuid-perl to debian/ubuntu dependencies 2016-05-17 09:26:36 -04:00
Isaac Connor b88861e145 add back ffmpeg libs 2016-05-09 19:42:14 -04:00
Isaac Connor beebe74e7b Merge branch 'merge_db_connects' into storageareas 2016-05-09 12:26:17 -04:00
Steve Gilvarry d7f7a0f074 Rename ubuntu1504, which is unsupported, to ubuntu 1604. Fix control file
to current libav packages and php virtual packages. Update debian build
script to use new folder for any non-trusty build.
2016-05-01 13:46:09 +10:00