GitHub/motion
1
0
Fork 0
mirror of https://github.com/Motion-Project/motion.git synced 2026-05-17 12:40:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean merge from 5.0

Browse Source
This commit is contained in:
Mr-Dave
2025-02-04 19:06:18 -07:00
parent d488dc7221
commit 72a1001931
25 changed files with 3489 additions and 5664 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/ISSUE_TEMPLATE/config.yml
-4
View File
@@ -5,8 +5,4 @@ contact_links:
about: Please ask and answer questions here.
- name: Motion Enhancements
url: https://github.com/Motion-Project/motion/discussions
<<<<<<< HEAD
about: Please use the discussions page and tag as an enhancement request.
=======
about: Please use the discussions page and tag as an enhancement request.
>>>>>>> 5.0
.github/ISSUE_TEMPLATE/issue.yml
+8 -40
View File
@@ -22,23 +22,12 @@ body:
label: What is the base version number of Motion being used?
multiple: false
options:
- 4.0.x
- 4.1.x
- 4.2.x
- 4.3.x
- 4.4.x
- 4.5.x
- 4.6.x
- 4.7.x
<<<<<<< HEAD
- 4.8.x
- 4.9.x
- 4.10.x
=======
- 5.0.x
- 5.1.x
- 5.2.x
>>>>>>> 5.0
- 0.0.x
- 0.1.x
- 0.2.x
- 0.3.x
- 0.4.x
- 0.5.x
validations:
required: true
- type: dropdown
@@ -59,11 +48,7 @@ body:
options:
- ARM-32bit
- ARM-64bit
<<<<<<< HEAD
- x86
=======
- x86/x64
>>>>>>> 5.0
- Other
validations:
required: true
@@ -90,17 +75,6 @@ body:
- type: dropdown
id: camtype
attributes:
<<<<<<< HEAD
label: Camera type(s) being used?
multiple: true
options:
- v4l2 USB camera
- v4l2 capture card
- PI cam via libcamerify
- PI cam via MMAL
- Network camera with RTSP
- Network camera with HTTP
=======
label: Camera/Sound type(s) being used?
multiple: true
options:
@@ -111,7 +85,6 @@ body:
- Network camera with HTTP
- Sound via ALSA
- Sound via PulseAudio
>>>>>>> 5.0
- Other
validations:
required: true
@@ -126,13 +99,8 @@ body:
- type: textarea
id: logs
attributes:
<<<<<<< HEAD
label: Motion log output at log_level 8
description: Provide the entire log output from Motion start up to when the issue occurs so we can see the parameters. This will be automatically formatted into code, so no need for backticks.
=======
label: Full Motion log output (at log_level 8)
description: Please copy and paste the full log output. This will be automatically formatted into code, so no need for backticks.
>>>>>>> 5.0
label: Relevant Motion log output (at log_level 8)
description: Please copy and paste the log output. This will be automatically formatted into code, so no need for backticks.
render: shell
validations:
required: true
.gitignore
+1 -20
View File
@@ -3,20 +3,15 @@ Makefile.in
ABOUT-NLS
compile
config.guess
<<<<<<< HEAD
config.h
config.h.in
config.h.in~
=======
config.hpp
config.hpp.in
config.hpp.in~
>>>>>>> 5.0
config.log
config.rpath
config.status
config.sub
configure
configure~
autom4te.cache
aclocal.m4
depcomp
@@ -26,20 +21,12 @@ missing
stamp-h1
#data
<<<<<<< HEAD
data/motion.service
=======
data/motion-dist.service
>>>>>>> 5.0
data/motion-dist.conf
data/camera1-dist.conf
data/camera2-dist.conf
data/camera3-dist.conf
<<<<<<< HEAD
data/camera4-dist.conf
=======
data/sound1-dist.conf
>>>>>>> 5.0
#src
src/*.o
@@ -49,12 +36,6 @@ src/Makefile.in
src/.deps/
src/Makefile
src/Makefile.in
<<<<<<< HEAD
src/raspicam/*.o
src/raspicam/.dirstamp
src/raspicam/.deps/
=======
>>>>>>> 5.0
*.log
.depend
CONTRIBUTING.md
+2 -4
View File
@@ -2,13 +2,11 @@
Issues on the github site are intended to discuss code problems, crashes and application enhancements. The discussions is intended for questions after you have read the guide.
<<<<<<< HEAD
* User guide: [Motion User Guide](https://motion-project.github.io/motion_guide.html)
* User Group List: Please sign-up and send your issue to the list [Motion User](https://lists.sourceforge.net/lists/listinfo/motion-user)
* User Group List: Please sign-up and send your issue to the list [Motion User](https://lists.sourceforge.net/lists/listinfo/motion-user)
* IRC: [#motion](ircs://irc.libera.chat:6697/motion) on Libera Chat
=======
## Questions submitted as issues
>>>>>>> 5.0
Questions that are submitted as a github issue will be transferred to the discussions section.
LICENSE
-321
View File
@@ -1,29 +1,12 @@
GNU GENERAL PUBLIC LICENSE
<<<<<<< HEAD
Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
=======
Version 3, 29 June 2007
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
>>>>>>> 5.0
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
Preamble
<<<<<<< HEAD
The licenses for most software are designed to take away your
freedom to share and change it. By contrast, the GNU General Public
License is intended to guarantee your freedom to share and change free
software--to make sure the software is free for all its users. This
General Public License applies to most of the Free Software
Foundation's software and to any other program whose authors commit to
using it. (Some other Free Software Foundation software is covered by
the GNU Lesser General Public License instead.) You can apply it to
=======
The GNU General Public License is a free, copyleft license for
software and other kinds of works.
@@ -34,45 +17,11 @@ share and change all versions of a program--to make sure it remains free
software for all its users. We, the Free Software Foundation, use the
GNU General Public License for most of our software; it applies also to
any other work released this way by its authors. You can apply it to
>>>>>>> 5.0
your programs, too.
When we speak of free software, we are referring to freedom, not
price. Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for
<<<<<<< HEAD
this service if you wish), that you receive source code or can get it
if you want it, that you can change the software or use pieces of it
in new free programs; and that you know you can do these things.
To protect your rights, we need to make restrictions that forbid
anyone to deny you these rights or to ask you to surrender the rights.
These restrictions translate to certain responsibilities for you if you
distribute copies of the software, or if you modify it.
For example, if you distribute copies of such a program, whether
gratis or for a fee, you must give the recipients all the rights that
you have. You must make sure that they, too, receive or can get the
source code. And you must show them these terms so they know their
rights.
We protect your rights with two steps: (1) copyright the software, and
(2) offer you this license which gives you legal permission to copy,
distribute and/or modify the software.
Also, for each author's protection and ours, we want to make certain
that everyone understands that there is no warranty for this free
software. If the software is modified by someone else and passed on, we
want its recipients to know that what they have is not the original, so
that any problems introduced by others will not reflect on the original
authors' reputations.
Finally, any free program is threatened constantly by software
patents. We wish to avoid the danger that redistributors of a free
program will individually obtain patent licenses, in effect making the
program proprietary. To prevent this, we have made it clear that any
patent must be licensed for everyone's free use or not licensed at all.
=======
them if you wish), that you receive source code or can get it if you
want it, that you can change the software or use pieces of it in new
free programs, and that you know you can do these things.
@@ -115,233 +64,10 @@ software on general-purpose computers, but in those that do, we wish to
avoid the special danger that patents applied to a free program could
make it effectively proprietary. To prevent this, the GPL assures that
patents cannot be used to render the program non-free.
>>>>>>> 5.0
The precise terms and conditions for copying, distribution and
modification follow.
<<<<<<< HEAD
GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. This License applies to any program or other work which contains
a notice placed by the copyright holder saying it may be distributed
under the terms of this General Public License. The "Program", below,
refers to any such program or work, and a "work based on the Program"
means either the Program or any derivative work under copyright law:
that is to say, a work containing the Program or a portion of it,
either verbatim or with modifications and/or translated into another
language. (Hereinafter, translation is included without limitation in
the term "modification".) Each licensee is addressed as "you".
Activities other than copying, distribution and modification are not
covered by this License; they are outside its scope. The act of
running the Program is not restricted, and the output from the Program
is covered only if its contents constitute a work based on the
Program (independent of having been made by running the Program).
Whether that is true depends on what the Program does.
1. You may copy and distribute verbatim copies of the Program's
source code as you receive it, in any medium, provided that you
conspicuously and appropriately publish on each copy an appropriate
copyright notice and disclaimer of warranty; keep intact all the
notices that refer to this License and to the absence of any warranty;
and give any other recipients of the Program a copy of this License
along with the Program.
You may charge a fee for the physical act of transferring a copy, and
you may at your option offer warranty protection in exchange for a fee.
2. You may modify your copy or copies of the Program or any portion
of it, thus forming a work based on the Program, and copy and
distribute such modifications or work under the terms of Section 1
above, provided that you also meet all of these conditions:
a) You must cause the modified files to carry prominent notices
stating that you changed the files and the date of any change.
b) You must cause any work that you distribute or publish, that in
whole or in part contains or is derived from the Program or any
part thereof, to be licensed as a whole at no charge to all third
parties under the terms of this License.
c) If the modified program normally reads commands interactively
when run, you must cause it, when started running for such
interactive use in the most ordinary way, to print or display an
announcement including an appropriate copyright notice and a
notice that there is no warranty (or else, saying that you provide
a warranty) and that users may redistribute the program under
these conditions, and telling the user how to view a copy of this
License. (Exception: if the Program itself is interactive but
does not normally print such an announcement, your work based on
the Program is not required to print an announcement.)
These requirements apply to the modified work as a whole. If
identifiable sections of that work are not derived from the Program,
and can be reasonably considered independent and separate works in
themselves, then this License, and its terms, do not apply to those
sections when you distribute them as separate works. But when you
distribute the same sections as part of a whole which is a work based
on the Program, the distribution of the whole must be on the terms of
this License, whose permissions for other licensees extend to the
entire whole, and thus to each and every part regardless of who wrote it.
Thus, it is not the intent of this section to claim rights or contest
your rights to work written entirely by you; rather, the intent is to
exercise the right to control the distribution of derivative or
collective works based on the Program.
In addition, mere aggregation of another work not based on the Program
with the Program (or with a work based on the Program) on a volume of
a storage or distribution medium does not bring the other work under
the scope of this License.
3. You may copy and distribute the Program (or a work based on it,
under Section 2) in object code or executable form under the terms of
Sections 1 and 2 above provided that you also do one of the following:
a) Accompany it with the complete corresponding machine-readable
source code, which must be distributed under the terms of Sections
1 and 2 above on a medium customarily used for software interchange; or,
b) Accompany it with a written offer, valid for at least three
years, to give any third party, for a charge no more than your
cost of physically performing source distribution, a complete
machine-readable copy of the corresponding source code, to be
distributed under the terms of Sections 1 and 2 above on a medium
customarily used for software interchange; or,
c) Accompany it with the information you received as to the offer
to distribute corresponding source code. (This alternative is
allowed only for noncommercial distribution and only if you
received the program in object code or executable form with such
an offer, in accord with Subsection b above.)
The source code for a work means the preferred form of the work for
making modifications to it. For an executable work, complete source
code means all the source code for all modules it contains, plus any
associated interface definition files, plus the scripts used to
control compilation and installation of the executable. However, as a
special exception, the source code distributed need not include
anything that is normally distributed (in either source or binary
form) with the major components (compiler, kernel, and so on) of the
operating system on which the executable runs, unless that component
itself accompanies the executable.
If distribution of executable or object code is made by offering
access to copy from a designated place, then offering equivalent
access to copy the source code from the same place counts as
distribution of the source code, even though third parties are not
compelled to copy the source along with the object code.
4. You may not copy, modify, sublicense, or distribute the Program
except as expressly provided under this License. Any attempt
otherwise to copy, modify, sublicense or distribute the Program is
void, and will automatically terminate your rights under this License.
However, parties who have received copies, or rights, from you under
this License will not have their licenses terminated so long as such
parties remain in full compliance.
5. You are not required to accept this License, since you have not
signed it. However, nothing else grants you permission to modify or
distribute the Program or its derivative works. These actions are
prohibited by law if you do not accept this License. Therefore, by
modifying or distributing the Program (or any work based on the
Program), you indicate your acceptance of this License to do so, and
all its terms and conditions for copying, distributing or modifying
the Program or works based on it.
6. Each time you redistribute the Program (or any work based on the
Program), the recipient automatically receives a license from the
original licensor to copy, distribute or modify the Program subject to
these terms and conditions. You may not impose any further
restrictions on the recipients' exercise of the rights granted herein.
You are not responsible for enforcing compliance by third parties to
this License.
7. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues),
conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License. If you cannot
distribute so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you
may not distribute the Program at all. For example, if a patent
license would not permit royalty-free redistribution of the Program by
all those who receive copies directly or indirectly through you, then
the only way you could satisfy both it and this License would be to
refrain entirely from distribution of the Program.
If any portion of this section is held invalid or unenforceable under
any particular circumstance, the balance of the section is intended to
apply and the section as a whole is intended to apply in other
circumstances.
It is not the purpose of this section to induce you to infringe any
patents or other property right claims or to contest validity of any
such claims; this section has the sole purpose of protecting the
integrity of the free software distribution system, which is
implemented by public license practices. Many people have made
generous contributions to the wide range of software distributed
through that system in reliance on consistent application of that
system; it is up to the author/donor to decide if he or she is willing
to distribute software through any other system and a licensee cannot
impose that choice.
This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.
8. If the distribution and/or use of the Program is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Program under this License
may add an explicit geographical distribution limitation excluding
those countries, so that distribution is permitted only in or among
countries not thus excluded. In such case, this License incorporates
the limitation as if written in the body of this License.
9. The Free Software Foundation may publish revised and/or new versions
of the General Public License from time to time. Such new versions will
be similar in spirit to the present version, but may differ in detail to
address new problems or concerns.
Each version is given a distinguishing version number. If the Program
specifies a version number of this License which applies to it and "any
later version", you have the option of following the terms and conditions
either of that version or of any later version published by the Free
Software Foundation. If the Program does not specify a version number of
this License, you may choose any version ever published by the Free Software
Foundation.
10. If you wish to incorporate parts of the Program into other free
programs whose distribution conditions are different, write to the author
to ask for permission. For software which is copyrighted by the Free
Software Foundation, write to the Free Software Foundation; we sometimes
make exceptions for this. Our decision will be guided by the two goals
of preserving the free status of all derivatives of our free software and
of promoting the sharing and reuse of software generally.
NO WARRANTY
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
REPAIR OR CORRECTION.
12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.
=======
TERMS AND CONDITIONS
0. Definitions.
@@ -891,7 +617,6 @@ reviewing courts shall apply local law that most closely approximates
an absolute waiver of all civil liability in connection with the
Program, unless a warranty or assumption of liability accompanies a
copy of the Program in return for a fee.
>>>>>>> 5.0
END OF TERMS AND CONDITIONS
@@ -903,25 +628,15 @@ free software which everyone can redistribute and change under these terms.
To do so, attach the following notices to the program. It is safest
to attach them to the start of each source file to most effectively
<<<<<<< HEAD
convey the exclusion of warranty; and each file should have at least
=======
state the exclusion of warranty; and each file should have at least
>>>>>>> 5.0
the "copyright" line and a pointer to where the full notice is found.
<one line to give the program's name and a brief idea of what it does.>
Copyright (C) <year> <name of author>
<<<<<<< HEAD
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
=======
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
>>>>>>> 5.0
(at your option) any later version.
This program is distributed in the hope that it will be useful,
@@ -929,19 +644,6 @@ the "copyright" line and a pointer to where the full notice is found.
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
<<<<<<< HEAD
You should have received a copy of the GNU General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
Also add information on how to contact you by electronic and paper mail.
If the program is interactive, make it output a short notice like this
when it starts in an interactive mode:
Gnomovision version 69, Copyright (C) year name of author
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
=======
You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
@@ -952,32 +654,10 @@ notice like this when it starts in an interactive mode:
<program> Copyright (C) <year> <name of author>
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
>>>>>>> 5.0
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
The hypothetical commands `show w' and `show c' should show the appropriate
<<<<<<< HEAD
parts of the General Public License. Of course, the commands you use may
be called something other than `show w' and `show c'; they could even be
mouse-clicks or menu items--whatever suits your program.
You should also get your employer (if you work as a programmer) or your
school, if any, to sign a "copyright disclaimer" for the program, if
necessary. Here is a sample; alter the names:
Yoyodyne, Inc., hereby disclaims all copyright interest in the program
`Gnomovision' (which makes passes at compilers) written by James Hacker.
<signature of Ty Coon>, 1 April 1989
Ty Coon, President of Vice
This General Public License does not permit incorporating your program into
proprietary programs. If your program is a subroutine library, you may
consider it more useful to permit linking proprietary applications with the
library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License.
=======
parts of the General Public License. Of course, your program's commands
might be different; for a GUI interface, you would use an "about box".
@@ -992,4 +672,3 @@ may consider it more useful to permit linking proprietary applications with
the library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License. But first, please read
<https://www.gnu.org/licenses/why-not-lgpl.html>.
>>>>>>> 5.0
Makefile.am
-59
View File
@@ -1,5 +1,3 @@
<<<<<<< HEAD
=======
#/*
# * This file is part of Motion.
# *
@@ -19,50 +17,29 @@
# */
>>>>>>> 5.0
ACLOCAL_AMFLAGS = -I m4
SUBDIRS = src po
pkgsysconfdir = $(sysconfdir)/@PACKAGE@
<<<<<<< HEAD
dist_pkgsysconf_DATA = \
=======
libstatedir = @localstatedir@/lib/@PACKAGE@
dist_libstate_DATA = \
>>>>>>> 5.0
data/motion-dist.conf \
data/camera1-dist.conf \
data/camera2-dist.conf \
data/camera3-dist.conf \
<<<<<<< HEAD
data/camera4-dist.conf
=======
data/sound1-dist.conf
>>>>>>> 5.0
dist_man_MANS = man/motion.1
dist_doc_DATA = \
<<<<<<< HEAD
doc/mask1.png \
doc/normal.jpg \
doc/outputmotion1.jpg \
doc/outputnormal1.jpg \
doc/motion_guide.html \
doc/motion_stylesheet.css \
doc/CREDITS \
=======
doc/motion_guide.html \
doc/motion_stylesheet.css \
>>>>>>> 5.0
doc/motion_build.html \
doc/motion_config.html
###################################################################
<<<<<<< HEAD
=======
## Clean tilde crumbs and add prefix in config file.
###################################################################
all-local:
@@ -70,47 +47,16 @@ all-local:
@sed -e 's|$${prefix}|$(prefix)|' data/motion-dist.conf > data/motion-dist.conf.tmp && mv -f data/motion-dist.conf.tmp data/motion-dist.conf
###################################################################
>>>>>>> 5.0
## Create pristine directories to match exactly distributed files
###################################################################
cleanall: distclean
@rm -rf autom4te.cache m4
<<<<<<< HEAD
@rm -f config.h.in config.h.in~ aclocal.m4 config.sub ABOUT-NLS missing
=======
@rm -f config.hpp.in config.hpp.in~ aclocal.m4 config.sub ABOUT-NLS missing
>>>>>>> 5.0
@rm -f compile config.guess config.rpath configure depcomp install-sh
@rm -f po/en@boldquot.header po/en@quot.header po/insert-header.sin
@rm -f po/Makevars.template po/quot.sed po/remove-potcdate.sin
@rm -f po/Rules-quot po/stamp-po po/*.gmo po/motion.pot po/boldquot.sed
@rm -f Makefile.in src/Makefile.in po/Makefile.in.in man/Makefile.in
<<<<<<< HEAD
@rm -f data/motion.service data/motion-dist.conf
@rm -f data/camera1-dist.conf data/camera2-dist.conf
@rm -f data/camera3-dist.conf data/camera4-dist.conf
###################################################################
## Clean out the tilde crumb files left by gettext autotool processing
###################################################################
all-local:
@rm -f po/*.po\~
maintainer-check:
./configure --with-prototype-flags && $(MAKE) clean && $(MAKE)
./configure --with-prototype-flags --without-mariadb && $(MAKE) clean && $(MAKE)
./configure --with-prototype-flags --without-ffmpeg && $(MAKE) clean && $(MAKE)
./configure --with-prototype-flags --without-mysql && $(MAKE) clean && $(MAKE)
./configure --with-prototype-flags --without-mariadb && $(MAKE) clean && $(MAKE)
./configure --with-prototype-flags --without-sqlite3 && $(MAKE) clean && $(MAKE)
./configure --with-prototype-flags --without-pgsql && $(MAKE) clean && $(MAKE)
./configure --with-prototype-flags --without-v4l2 && $(MAKE) clean && $(MAKE)
./configure --with-prototype-flags --without-webp && $(MAKE) clean && $(MAKE)
./configure --with-developer-flags \
--without-mysql \
--without-mariadb \
&& $(MAKE) clean && $(MAKE)
=======
@rm -f data/motion-dist.service data/motion-dist.conf
@rm -f data/camera1-dist.conf data/camera2-dist.conf
@rm -f data/camera3-dist.conf data/sound1-dist.conf
@@ -139,15 +85,11 @@ maintainer-check:
--without-mysql \
--without-mariadb \
&& $(MAKE) clean && $(MAKE) -j6
>>>>>>> 5.0
./configure --with-developer-flags \
--without-mysql \
--without-mariadb \
--without-sqlite3 \
--without-pgsql \
<<<<<<< HEAD
&& $(MAKE) clean && $(MAKE)
=======
&& $(MAKE) clean && $(MAKE) -j6
./configure --with-developer-flags \
--without-alsa \
@@ -159,4 +101,3 @@ maintainer-check:
--without-fftw3 \
&& $(MAKE) clean && $(MAKE) -j6
>>>>>>> 5.0
configure.ac
-346
View File
@@ -1,15 +1,8 @@
AC_INIT(motion, esyscmd(['./scripts/version.sh']))
AM_INIT_AUTOMAKE([subdir-objects foreign])
<<<<<<< HEAD
AM_MAINTAINER_MODE([enable])
AC_PROG_CC
AC_PROG_CXX
AC_GNU_SOURCE
=======
CXXFLAGS="$CXXFLAGS -std=c++17"
AC_PROG_CC
AC_PROG_CXX
>>>>>>> 5.0
AC_CONFIG_HEADERS([config.hpp])
AC_CONFIG_SRCDIR([src/motion.cpp])
AC_CANONICAL_HOST
@@ -31,19 +24,11 @@ AC_CHECK_HEADERS(stdio.h stdlib.h sys/time.h sys/wait.h \
)
##############################################################################
<<<<<<< HEAD
### Check pkg-config - Required. Needed to get lib paths/info
##############################################################################
AC_CHECK_PROG([PKGCONFIG],[pkg-config],[yes],[no])
AS_IF([test "${PKGCONFIG}" = "no" ],[
AC_MSG_ERROR([Required package 'pkg-config' not found, please check motion_guide.html and install necessary dependencies.])
=======
### Check pkgconf - Required. Needed to get lib paths/info
##############################################################################
AC_CHECK_PROG([PKGCONFIG],[pkgconf],[yes],[no])
AS_IF([test "${PKGCONFIG}" = "no" ],[
AC_MSG_ERROR([Required package 'pkgconf' not found, please check motion_guide.html and install necessary dependencies.])
>>>>>>> 5.0
]
)
@@ -51,36 +36,21 @@ AS_IF([test "${PKGCONFIG}" = "no" ],[
### Check pthread
##############################################################################
AC_CHECK_HEADERS(pthread.h,,AC_MSG_ERROR([pthread is required.]))
<<<<<<< HEAD
TEMP_CFLAGS="-x c -D_THREAD_SAFE"
=======
CPPFLAGS="${CPPFLAGS} -D_THREAD_SAFE "
>>>>>>> 5.0
LIBS="$LIBS -pthread "
##############################################################################
### Check JPG - Required. Needed for image processing
##############################################################################
<<<<<<< HEAD
AS_IF([pkg-config libjpeg ], [
TEMP_CFLAGS="$TEMP_CFLAGS "`pkg-config --cflags libjpeg`
TEMP_LIBS="$TEMP_LIBS "`pkg-config --libs libjpeg`
=======
AS_IF([pkgconf libjpeg ], [
TEMP_CPPFLAGS="$TEMP_CPPFLAGS "`pkgconf --cflags libjpeg`
TEMP_LIBS="$TEMP_LIBS "`pkgconf --libs libjpeg`
>>>>>>> 5.0
],[
TEMP_LIBS="$TEMP_LIBS -ljpeg"
]
)
<<<<<<< HEAD
HOLD_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $TEMP_CFLAGS"
=======
HOLD_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $TEMP_CPPFLAGS"
>>>>>>> 5.0
AC_CHECK_HEADERS(setjmp.h jerror.h jpeglib.h,[JPGS="yes"],[JPGS="no"])
AC_MSG_CHECKING(jpg libraries)
AC_MSG_RESULT($JPGS)
@@ -88,35 +58,20 @@ AS_IF([test "${JPGS}" != "yes" ], [
AC_MSG_ERROR([Required jpeg headers not found, please check motion_guide.html and install necessary dependencies])
]
)
<<<<<<< HEAD
CFLAGS="$HOLD_CFLAGS"
=======
CPPFLAGS="$HOLD_CPPFLAGS"
>>>>>>> 5.0
##############################################################################
### Check libmicrohttpd - Required. Needed for stream/webcontrol
##############################################################################
<<<<<<< HEAD
AS_IF([pkg-config libmicrohttpd ], [
TEMP_CFLAGS="$TEMP_CFLAGS "`pkg-config --cflags libmicrohttpd`
TEMP_LIBS="$TEMP_LIBS "`pkg-config --libs libmicrohttpd`
=======
AS_IF([pkgconf libmicrohttpd ], [
TEMP_CPPFLAGS="$TEMP_CPPFLAGS "`pkgconf --cflags libmicrohttpd`
TEMP_LIBS="$TEMP_LIBS "`pkgconf --libs libmicrohttpd`
>>>>>>> 5.0
],[
AC_MSG_ERROR([Required package libmicrohttpd-dev not found, please check motion_guide.html and install necessary dependencies])
]
)
<<<<<<< HEAD
HOLD_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $TEMP_CFLAGS"
=======
HOLD_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $TEMP_CPPFLAGS"
>>>>>>> 5.0
AC_CHECK_HEADERS(microhttpd.h,[MHTTP="yes"],[MHTTP="no"])
AC_MSG_CHECKING(libmicrohttpd libraries)
AC_MSG_RESULT($MHTTP)
@@ -124,9 +79,6 @@ AS_IF([test "${MHTTP}" != "yes" ], [
AC_MSG_ERROR([Required package libmicrohttpd-dev not found, please check motion_guide.html and install necessary dependencies])
]
)
<<<<<<< HEAD
CFLAGS="$HOLD_CFLAGS"
=======
CPPFLAGS="$HOLD_CPPFLAGS"
##############################################################################
@@ -149,7 +101,6 @@ AS_IF([test "${ZLIB}" != "yes" ], [
]
)
CPPFLAGS="$HOLD_CPPFLAGS"
>>>>>>> 5.0
##############################################################################
### Check setting/getting thread names
@@ -183,11 +134,7 @@ AC_LINK_IFELSE(
)
##############################################################################
<<<<<<< HEAD
### Check XSI strerror_r. Check for Linux/*BSD/Apple/MUSL variations
=======
### Check XSI strerror_r.
>>>>>>> 5.0
##############################################################################
AC_MSG_CHECKING([for XSI strerror_r])
HOLD_CPPFLAGS="$CPPFLAGS"
@@ -200,11 +147,7 @@ AC_LINK_IFELSE(
char buf[1024];
int ret = strerror_r(ENOMEM, buf, sizeof(buf));
return ret;
<<<<<<< HEAD
}]
=======
}]])
>>>>>>> 5.0
],[
AC_DEFINE([XSI_STRERROR_R], [1], [Define if you have XSI strerror_r function.])
XSI_STRERROR="yes"
@@ -214,48 +157,6 @@ AC_LINK_IFELSE(
AC_MSG_RESULT([no])
]
)
<<<<<<< HEAD
CFLAGS="$HOLD_CFLAGS"
###############################################################################
### BKTR Video System - Optional
###############################################################################
AC_ARG_WITH(bktr,
AS_HELP_STRING([--without-bktr],[Disable bktr devices]),
[BKTR="$withval"],
[BKTR="yes"]
)
AS_IF([test "${BKTR}" = "yes" ], [
AC_CHECK_HEADERS(dev/bktr/ioctl_meteor.h dev/bktr/ioctl_bt848.h,[BKTR="yes"],[BKTR="no"])
AS_IF([test "${BKTR}" = "no" ], [
AC_CHECK_HEADERS(dev/ic/bt8xx.h,[BKTR="yes"],[BKTR="no"])
]
)
AS_IF([test "${BKTR}" = "yes" ], [
AC_DEFINE([HAVE_BKTR], [1], [Define to 1 if BKTR is around])
]
)
]
)
###############################################################################
### V4L2 Video System - Optional
###############################################################################
AC_ARG_WITH(v4l2,
AS_HELP_STRING([--without-v4l2],[Disable V4L2 devices]),
[V4L2="$withval"],
[V4L2="yes"]
)
AS_IF([test "${V4L2}" = "yes" ], [
AC_CHECK_HEADERS(linux/videodev2.h sys/videoio.h,[V4L2="yes";break],[V4L2="no"])
AS_IF([test "${V4L2}" = "yes" ], [
AC_DEFINE([HAVE_V4L2], [1], [Define to 1 if V4L2 is around])
]
)
]
)
=======
CPPFLAGS="$HOLD_CPPFLAGS"
###############################################################################
@@ -275,7 +176,6 @@ AS_IF([test "${V4L2}" = "yes" ], [
]
)
>>>>>>> 5.0
##############################################################################
### Webp Image Format - Optional.
##############################################################################
@@ -283,21 +183,6 @@ AC_ARG_WITH([webp],
AS_HELP_STRING([--with-webp],[Compile with Webp image support]),
[WEBP="$withval"],
[WEBP="yes]"
<<<<<<< HEAD
)
AS_IF([test "${WEBP}" = "yes" ], [
AC_MSG_CHECKING(for webp)
AS_IF([pkg-config libwebpmux ], [
AC_MSG_RESULT(yes)
AC_DEFINE([HAVE_WEBP], [1], [Define to 1 if WEBP is around])
TEMP_CFLAGS="$TEMP_CFLAGS "`pkg-config --cflags libwebpmux libwebp`
TEMP_LIBS="$TEMP_LIBS "`pkg-config --libs libwebpmux libwebp`
],[
AC_MSG_RESULT(no)
]
)
=======
)
WEBP_VER=""
AS_IF([test "${WEBP}" = "yes" ], [
@@ -354,16 +239,11 @@ AS_IF([test "${LIBCAM}" = "no"], [
)
PKG_CONFIG_PATH=$TEMP_PATH
export PKG_CONFIG_PATH
>>>>>>> 5.0
]
)
##############################################################################
<<<<<<< HEAD
### Check for ffmpeg - Optional.
=======
### Check for ffmpeg
>>>>>>> 5.0
##############################################################################
FFMPEG_VER="--"
AC_ARG_WITH([ffmpeg],
@@ -371,18 +251,6 @@ AC_ARG_WITH([ffmpeg],
[FFMPEG=$withval],
[FFMPEG="yes"]
)
<<<<<<< HEAD
AS_IF([test "${FFMPEG}" = "no"], [
AC_MSG_CHECKING(for FFmpeg)
AC_MSG_RESULT(skipped)
],[
AC_MSG_CHECKING(FFmpeg pkg-config path)
TEMP_PATH=$PKG_CONFIG_PATH
AS_IF([test "${FFMPEG}" != "yes"], [
PKG_CONFIG_PATH=${FFMPEG}/lib/pkgconfig:$PKG_CONFIG_PATH
FFMPEG="yes"
=======
FFMPEG_VER=""
AS_IF([test "${FFMPEG}" = "no"], [
AC_MSG_CHECKING(for FFmpeg)
@@ -433,27 +301,11 @@ AS_IF([test "${OPENCV}" = "no"], [
AS_IF([test "${OPENCV}" != "yes"], [
PKG_CONFIG_PATH=${OPENCV}/lib/pkgconfig:$PKG_CONFIG_PATH
OPENCV="yes"
>>>>>>> 5.0
]
)
export PKG_CONFIG_PATH
AC_MSG_RESULT($PKG_CONFIG_PATH)
<<<<<<< HEAD
FFMPEG_DEPS="libavutil libavformat libavcodec libswscale libavdevice"
AC_MSG_CHECKING(for FFmpeg)
AS_IF([pkg-config $FFMPEG_DEPS], [
FFMPEG_VER=`pkg-config --modversion libavformat`
TEMP_CFLAGS="$TEMP_CFLAGS "`pkg-config --cflags $FFMPEG_DEPS`
TEMP_LIBS="$TEMP_LIBS "`pkg-config --libs $FFMPEG_DEPS`
AC_DEFINE([HAVE_FFMPEG], [1], [Define to 1 if FFMPEG is around])
AC_MSG_RESULT(yes)
],[
AC_MSG_RESULT(no)
AC_MSG_ERROR([Required ffmpeg packages 'libavutil-dev libavformat-dev libavcodec-dev libswscale-dev libavdevice-dev' were not found. Please check motion_guide.html and install necessary dependencies or use the '--without-ffmpeg' configuration option.])
]
)
=======
AC_MSG_CHECKING(for OpenCV)
AS_IF([pkgconf opencv], [
TEMP_CPPFLAGS="$TEMP_CPPFLAGS "`pkgconf --cflags opencv`
@@ -474,7 +326,6 @@ AS_IF([test "${OPENCV}" = "no"], [
)
AC_MSG_RESULT([$OPENCV])
>>>>>>> 5.0
PKG_CONFIG_PATH=$TEMP_PATH
export PKG_CONFIG_PATH
]
@@ -488,21 +339,13 @@ AC_ARG_WITH(mariadb,
[MARIADB="$withval"],
[MARIADB="yes"]
)
<<<<<<< HEAD
=======
MARIADB_VER=""
>>>>>>> 5.0
AS_IF([test "${MARIADB}" = "no"], [
AC_MSG_CHECKING(for MariaDB)
AC_MSG_RESULT(skipped)
],[
TEMP_PATH=$PKG_CONFIG_PATH
<<<<<<< HEAD
AC_MSG_CHECKING(MariaDB pkg-config path)
=======
AC_MSG_CHECKING(MariaDB pkgconf path)
>>>>>>> 5.0
AS_IF([test "${MARIADB}" != "yes"], [
PKG_CONFIG_PATH=${MARIADB}/lib/pkgconfig:$PKG_CONFIG_PATH
MARIADB="yes"
@@ -512,16 +355,10 @@ AS_IF([test "${MARIADB}" = "no"], [
AC_MSG_RESULT($PKG_CONFIG_PATH)
AC_MSG_CHECKING(for MariaDB)
<<<<<<< HEAD
AS_IF([pkg-config libmariadb], [
TEMP_CFLAGS="$TEMP_CFLAGS "`pkg-config --cflags libmariadb`
TEMP_LIBS="$TEMP_LIBS "`pkg-config --libs libmariadb`
=======
AS_IF([pkgconf libmariadb], [
MARIADB_VER="("`pkgconf --modversion libmariadb`")"
TEMP_CPPFLAGS="$TEMP_CPPFLAGS "`pkgconf --cflags libmariadb`
TEMP_LIBS="$TEMP_LIBS "`pkgconf --libs libmariadb`
>>>>>>> 5.0
AC_DEFINE([HAVE_MARIADB], [1], [Define to 1 if you have MariaDB support])
],[
MARIADB="no"
@@ -529,15 +366,9 @@ AS_IF([test "${MARIADB}" = "no"], [
)
# Check for the old pkg name for MariaDB
AS_IF([test "${MARIADB}" = "no"], [
<<<<<<< HEAD
AS_IF([pkg-config mariadb], [
TEMP_CFLAGS="$TEMP_CFLAGS "`pkg-config --cflags mariadb`
TEMP_LIBS="$TEMP_LIBS "`pkg-config --libs mariadb`
=======
AS_IF([pkgconf mariadb], [
TEMP_CPPFLAGS="$TEMP_CPPFLAGS "`pkgconf --cflags mariadb`
TEMP_LIBS="$TEMP_LIBS "`pkgconf --libs mariadb`
>>>>>>> 5.0
MARIADB="yes"
AC_DEFINE([HAVE_MARIADB], [1], [Define to 1 if you have MariaDB support])
])
@@ -551,102 +382,6 @@ AS_IF([test "${MARIADB}" = "no"], [
##############################################################################
### Check for MySQL - Optional
<<<<<<< HEAD
##############################################################################
AC_ARG_WITH(mysql,
AS_HELP_STRING([--with-mysql[=DIR]],[Build with MySQL support]),
[MYSQL="$withval"],
[MYSQL="yes"]
)
AS_IF([test "${MYSQL}" = "no"], [
AC_MSG_CHECKING(for MySQL)
AC_MSG_RESULT(skipped)
],[
TEMP_PATH=$PKG_CONFIG_PATH
AC_MSG_CHECKING(MySQL pkg-config path)
AS_IF([test "${MYSQL}" != "yes"], [
PKG_CONFIG_PATH=${MYSQL}/lib/pkgconfig:$PKG_CONFIG_PATH
MYSQL="yes"
]
)
export PKG_CONFIG_PATH
AC_MSG_RESULT($PKG_CONFIG_PATH)
AC_MSG_CHECKING(for MySQL)
AS_IF([pkg-config mysqlclient], [
TEMP_CFLAGS="$TEMP_CFLAGS "`pkg-config --cflags mysqlclient`
TEMP_LIBS="$TEMP_LIBS "`pkg-config --libs mysqlclient`
AC_DEFINE([HAVE_MYSQL], [1], [Define to 1 if you have MySQL support])
],[
MYSQL="no"
]
)
AC_MSG_RESULT([$MYSQL])
PKG_CONFIG_PATH=$TEMP_PATH
export PKG_CONFIG_PATH
]
)
##############################################################################
### Check for PostgreSQL - Optional
##############################################################################
AC_ARG_WITH(pgsql,
AS_HELP_STRING([--with-pgsql[=DIR]],[Build with PostgreSQL support]),
[PGSQL="$withval"],
[PGSQL="yes"]
)
AS_IF([test "${PGSQL}" = "no"], [
AC_MSG_CHECKING(for PostgreSQL)
AC_MSG_RESULT(skipped)
],[
TEMP_PATH=$PKG_CONFIG_PATH
AC_MSG_CHECKING(PostgreSQL pkg-config path)
AS_IF([test "${PGSQL}" != "yes"], [
PKG_CONFIG_PATH=${PGSQL}/lib/pkgconfig:$PKG_CONFIG_PATH
PGSQL="yes"
]
)
export PKG_CONFIG_PATH
AC_MSG_RESULT($PKG_CONFIG_PATH)
AC_MSG_CHECKING(for PostgreSQL)
AS_IF([pkg-config libpq], [
TEMP_CFLAGS="$TEMP_CFLAGS "`pkg-config --cflags libpq`
TEMP_LIBS="$TEMP_LIBS "`pkg-config --libs libpq`
AC_DEFINE([HAVE_PGSQL], [1], [Define to 1 if you have PostgreSQL support])
],[
PGSQL="no"
]
)
AC_MSG_RESULT([$PGSQL])
PKG_CONFIG_PATH=$TEMP_PATH
export PKG_CONFIG_PATH
]
)
##############################################################################
### Check for SQLITE3 - Optional
##############################################################################
AC_ARG_WITH(sqlite3,
AS_HELP_STRING([--without-sqlite3],[Disable sqlite3 support.]),
[SQLITE3="$withval"],
[SQLITE3="yes"]
)
AS_IF([test "${SQLITE3}" = "no"], [
AC_MSG_CHECKING(for sqlite3)
AC_MSG_RESULT(skipping)
],[
AC_CHECK_HEADERS(sqlite3.h, [
TEMP_CFLAGS="$TEMP_CFLAGS "`pkg-config --cflags sqlite3`
TEMP_LIBS="$TEMP_LIBS "`pkg-config --libs sqlite3`
AC_DEFINE([HAVE_SQLITE3], [1], [Define to 1 if you have SQLITE3 support])
],[
SQLITE3="no"
]
)
=======
##############################################################################
AC_ARG_WITH(mysql,
AS_HELP_STRING([--with-mysql[=DIR]],[Build with MySQL support]),
@@ -721,32 +456,12 @@ AS_IF([test "${PGSQLDB}" = "no"], [
AC_MSG_RESULT([$PGSQLDB])
PKG_CONFIG_PATH=$TEMP_PATH
export PKG_CONFIG_PATH
>>>>>>> 5.0
]
)
##############################################################################
### Check for SQLITE3DB
##############################################################################
<<<<<<< HEAD
AC_ARG_WITH([optimizecpu],
AS_HELP_STRING([--without-optimizecpu],
[Exclude autodetecting platform and cpu type. This will disable the compilation of gcc optimizing code by platform and cpu.]),
[OPTIMIZECPU=$withval],
[OPTIMIZECPU=no]
)
AS_IF([test "${OPTIMIZECPU}" = "yes"], [
AS_IF([test -e "/proc/device-tree/model"], [
# explicit test for RPI3 as /proc/cpuinfo reports armv7 even though it is armv8
RPI3=`grep "Raspberry Pi 3 Model" /proc/device-tree/model`
AS_IF([test "x${RPI3}" != "x"], [
TEMP_CFLAGS="$TEMP_CFLAGS -mcpu=cortex-a53 -mfpu=neon-fp-armv8"
]
)
]
)
=======
AC_ARG_WITH([sqlite3],
AS_HELP_STRING([--with-sqlite3[=DIR]],[Build with sqlite3 support]),
[SQLITE3DB=$withval],
@@ -905,7 +620,6 @@ AS_IF([test "${FFTW3}" = "no"], [
AC_MSG_RESULT([$FFTW3])
PKG_CONFIG_PATH=$TEMP_PATH
export PKG_CONFIG_PATH
>>>>>>> 5.0
]
)
@@ -918,31 +632,6 @@ AC_ARG_WITH([developer-flags],
[DEVELOPER_FLAGS=$withval],
[DEVELOPER_FLAGS=no])
<<<<<<< HEAD
AS_IF([test "${DEVELOPER_FLAGS}" = "yes"], [
TEMP_CFLAGS="$TEMP_CFLAGS -W -Werror -Wall -Wextra -Wformat -Wshadow -Wpointer-arith -Wwrite-strings -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Winline -Wredundant-decls -Wno-long-long -ggdb -g3"
]
)
##############################################################################
### Prototype Flags
### mysql and mariadb have upstream prototype errors so remove that check
##############################################################################
AC_ARG_WITH([prototype-flags],
AS_HELP_STRING([--with-prototype-flags],
[Causes practically all of the possible gcc warning flags to be set except missing prototypes.]),
[PROTOTYPE_FLAGS=$withval],
[PROTOTYPE_FLAGS=no])
AS_IF([test "${PROTOTYPE_FLAGS}" = "yes"], [
TEMP_CFLAGS="$TEMP_CFLAGS -W -Werror -Wall -Wextra -Wformat -Wshadow -Wpointer-arith -Wwrite-strings -Waggregate-return -Wnested-externs -Winline -Wredundant-decls -Wno-long-long -ggdb -g3"
]
)
CPPFLAGS="$CPPFLAGS $TEMP_CFLAGS"
AC_SUBST(AM_CFLAGS, "$TEMP_CFLAGS")
LIBS="$LIBS $TEMP_LIBS"
AC_SUBST(AM_LDFLAGS, "$TEMP_LDFLAGS")
=======
AC_ARG_WITH([clang-flags],
AS_HELP_STRING([--with-clang-flags],
[clang warning flags]),
@@ -962,7 +651,6 @@ AS_IF([test "${DEVELOPER_FLAGS}" = "yes"], [
CPPFLAGS="$CPPFLAGS $TEMP_CPPFLAGS"
LIBS="$LIBS $TEMP_LIBS"
LDFLAGS="$TEMP_LDFLAGS"
>>>>>>> 5.0
AC_CONFIG_FILES([
Makefile
@@ -971,21 +659,11 @@ AC_CONFIG_FILES([
data/camera1-dist.conf
data/camera2-dist.conf
data/camera3-dist.conf
<<<<<<< HEAD
data/camera4-dist.conf
data/motion-dist.conf
data/motion.service
])
AC_ARG_VAR([KILL],[the 'kill' program to use to send signals to motion])
AC_PATH_PROG([KILL],[kill],['/bin/kill'])
=======
data/sound1-dist.conf
data/motion-dist.conf
data/motion-dist.service
])
>>>>>>> 5.0
AC_OUTPUT
##############################################################################
@@ -997,35 +675,11 @@ echo " Configure status "
echo " ${PACKAGE_NAME} ${PACKAGE_VERSION}"
echo " **************************"
echo
<<<<<<< HEAD
echo "CFLAGS: $TEMP_CFLAGS $CFLAGS"
echo
echo "LIBS: $LIBS"
echo
echo "LDFLAGS: $TEMP_LDFLAGS $LDFLAGS"
echo
echo
echo "OS : $host_os"
echo "pthread_np : $PTHREAD_NP"
echo "pthread_setname_np : $PTHREAD_SETNAME_NP"
echo "pthread_getname_np : $PTHREAD_GETNAME_NP"
echo "XSI error : $XSI_STRERROR"
echo "webp support : $WEBP"
echo "V4L2 support : $V4L2"
echo "BKTR support : $BKTR"
echo "FFmpeg support : $FFMPEG"
echo "libavformat version : $FFMPEG_VER"
echo "SQLite3 support : $SQLITE3"
echo "MYSQL support : $MYSQL"
echo "PostgreSQL support : $PGSQL"
echo "MariaDB support : $MARIADB"
=======
echo "CPPFLAGS: $CPPFLAGS"
echo
echo "LIBS: $LIBS"
echo
echo "LDFLAGS: $LDFLAGS"
>>>>>>> 5.0
echo
echo
echo "OS : $host_os"
data/motion-dist.conf.in
+107
View File
@@ -0,0 +1,107 @@
; This config file was generated by @PACKAGE_NAME@ @PACKAGE_VERSION@
; Documentation: @prefix@/share/doc/motion/motion_guide.html
;
; This file contains only the basic configuration options to get a
; system working. There are many more options available. Please
; consult the documentation for the complete list of all options.
;
;*************************************************
;***** System
;*************************************************
daemon off
;log_file
log_level 6
log_type ALL
;*************************************************
;***** Camera
;*************************************************
device_name
device_id
;target_dir
;*************************************************
;***** Source
;*************************************************
;v4l2_device /dev/video0
;netcam_url
;*************************************************
;***** Image
;*************************************************
width 640
height 480
framerate 15
;*************************************************
;***** Overlays
;*************************************************
text_right %Y-%m-%d\n%T
;*************************************************
;***** Method
;*************************************************
emulate_motion off
threshold 1500
;*************************************************
;***** Masks
;*************************************************
noise_level 32
despeckle_filter EedDl
;*************************************************
;***** Detection
;*************************************************
minimum_motion_frames 1
event_gap 60
pre_capture 3
post_capture 10
;*************************************************
;***** Scripts
;*************************************************
on_event_start
on_event_end
;*************************************************
;***** Picture
;*************************************************
picture_output off
picture_filename %v-%Y%m%d%H%M%S-%q
;*************************************************
;***** Movie
;*************************************************
movie_output on
movie_max_time 120
movie_quality 45
movie_container mkv
movie_filename %v-%Y%m%d%H%M%S
;*************************************************
;***** Web Control
;*************************************************
webcontrol_port 8080
webcontrol_localhost off
webcontrol_parms 2
;*************************************************
;***** Web Stream
;*************************************************
stream_preview_scale 25
stream_preview_method combined
;*************************************************
; Device config files - One for each device.
;*************************************************
camera @localstatedir@/lib/@PACKAGE_NAME@/camera1.conf
; camera @localstatedir@/lib/@PACKAGE_NAME@/camera2.conf
; camera @localstatedir@/lib/@PACKAGE_NAME@/camera3.conf
; sound @localstatedir@/lib/@PACKAGE_NAME@/sound1.conf
;*************************************************
; Directory to read '.conf' files for devices.
;*************************************************
; config_dir @localstatedir@/lib/@PACKAGE_NAME@/conf.d
data/motion-dist.service.in
+1 -1
View File
@@ -1,7 +1,7 @@
#
# This file is part of Motion.
#
# MotionPLus is free software: you can redistribute it and/or modify
# Motion is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
doc/motion_build.html
+247
View File
@@ -0,0 +1,247 @@
<!DOCTYPE html>
<html lang="en-us">
<head>
<meta charset="UTF-8">
<link href="motion.png" rel="icon" type="image/png">
<title>motion</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" type="text/css" href="motion_stylesheet.css" media="screen">
<script>
function fnc_topnav() {
var x = document.getElementById("id_topnav");
if (x.className === "topnav") {
x.className += " responsive";
} else {
x.className = "topnav";
}
}
function fnc_subnav() {
var x = document.getElementById("id_subnav");
if (x.className === "subnav") {
x.className += " responsive";
} else {
x.className = "subnav";
}
}
</script>
</head>
<body>
<div class="topnav" id="id_topnav">
<img class="logoimg" src="motion.gif">
<a class="topnav-d" href="https://motion-project.github.io/motion_support.html">Support</a>
<a class="topnav-d" href="https://motion-project.github.io/motion_news.html" >News</a>
<a class="topnav-d" href="https://motion-project.github.io/motion_guide.html" >Documentation</a>
<a class="topnav-d" href="https://motion-project.github.io/motion_download.html">Download</a>
<a class="topnav-d" href="https://motion-project.github.io/index.html">Home</a>
<a class="topnav-m" href="https://motion-project.github.io/index.html">Home</a>
<a class="topnav-m" href="https://motion-project.github.io/motion_download.html">Download</a>
<a class="topnav-m" href="https://motion-project.github.io/motion_guide.html" >Documentation</a>
<a class="topnav-m" href="https://motion-project.github.io/motion_news.html" >News</a>
<a class="topnav-m" href="https://motion-project.github.io/motion_support.html">Support</a>
<a href="javascript:void(0);" class="icon" onclick="fnc_topnav()">&#9776;</a>
</div>
<section class="page-header">
<h1>
Installing and Building from Source
</h1>
</section>
<div class="subnav" id="id_subnav">
<div class="dropdown">
<button class="dropbtn">Abbreviated Building</button>
<div class="dropdown-content">
<a href="#Install_Deb"> Install from a deb package</a>
<a href="#Build_Deb"> Building a deb package</a>
<a href="#Building"> Abbreviated Building Guide</a>
</div>
</div>
<div class="dropdown">
<button class="dropbtn">Configure/Make Options</button>
<div class="dropdown-content">
<a href="#Configure_Script"> Configure Script Options </a>
<a href="#Make_Options"> Make Options </a>
</div>
</div>
<a href="javascript:void(0);" class="icon" onclick="fnc_subnav()">menu&#8659;&nbsp&nbsp </a>
</div>
<section class="main-content" style="padding:0.5em 0.1em;height:1000px;font-size: 0.90em;">
<h3><a name="Install_Deb"></a> Installing with a release deb package </h3>
<ul>
motion can also be installed from the release deb files. Download the appropriate
deb from the <a href="https://github.com/Motion-Project/motion/releases">Releases</a> page
and install using <code><strong>dpkg</strong></code>
or <code><strong>gdebi-core</strong></code>.
</ul>
<h3><a name="Build_Deb"></a> Building a deb package </h3>
<ul>
A script has also been written to allow users to create their own deb package
from either a tagged release or the most current master branch of the code. Download the
script by using the following
command. <code><strong>wget https://raw.githubusercontent.com/Motion-Project/motion-packaging/master/buildplus.sh </strong></code>
<p></p>
Review the script and specify the following few optional parameters.
<code><strong> Username, EmailAddress, branch, install, arch</strong></code>. If
the parameters are not provided, the script will create defaults.
<p></p>
<p></p>
Once the script has been run and the deb file is created, install it as described above.
<p></p>
</ul>
<h3><a name="Building"></a> Building Guide </a> </h3>
<ul>
<p></p>
<p></p>
<p></p>
Debian based distros
<ul>
<code><strong>sudo apt install autoconf automake autopoint build-essential pkgconf libtool libzip-dev
libjpeg-dev git libavformat-dev libavcodec-dev libavutil-dev libswscale-dev libavdevice-dev libopencv-dev
libwebp-dev gettext libmicrohttpd-dev libmariadb-dev libcamera-dev libcamera-tools libcamera-v4l2
libasound2-dev libpulse-dev libfftw3-dev </strong></code>
<p></p>
Note: PostgreSQL or Sqlite3 database may also be added
via <code><strong>sudo apt install libpq-dev libsqlite3-dev</strong></code>. If
no database is running on the system, some functionality of motion will not be available.
<p></p>
Once packages are installed, run the following to build motion
<p></p>
<code><strong>cd ~</strong></code>
<br /><code><strong>git clone https://github.com/Motion-Project/motion.git</strong></code>
<br /><code><strong>cd motion</strong></code>
<br /><code><strong>autoreconf -fiv</strong></code>
<br /><code><strong>./configure</strong></code>
<br /><code><strong>make</strong></code>
<br /><code><strong>make install</strong></code>
<p></p>
</ul>
<p></p>
</ul>
<h3><a name="Configure_Script"></a> Additional Configure Options</a> </h3>
<ul>
<p></p>
<p></p>
The following custom configure options can be specified for motion.
<div class="tblconfig">
<table border="1" class="fixed" >
<colgroup>
<col width="200px">
<col width="500px">
<col width="700px">
</colgroup>
<tbody>
<tr>
<td bgcolor="#edf4f9" word-wrap:break-word > Options</td>
<td bgcolor="#edf4f9" word-wrap:break-word > Description </td>
<td bgcolor="#edf4f9" word-wrap:break-word > Editors comment </td>
</tr>
<tr>
<td bgcolor="#edf4f9" word-wrap:break-word > --without-v4l2 </td>
<td bgcolor="#edf4f9" word-wrap:break-word > Exclude v4l2 </td>
<td bgcolor="#edf4f9" word-wrap:break-word > </td>
</tr>
<tr>
<td bgcolor="#edf4f9" word-wrap:break-word > --without-webp </td>
<td bgcolor="#edf4f9" word-wrap:break-word > Compile without webp image support</td>
<td bgcolor="#edf4f9" word-wrap:break-word > </td>
</tr>
<tr>
<td bgcolor="#edf4f9" word-wrap:break-word > --with-libcam=DIR </td>
<td bgcolor="#edf4f9" word-wrap:break-word > Specify the pkgconf dir for libcam</td>
<td bgcolor="#edf4f9" word-wrap:break-word > Use --without-libcam to disable </td>
</tr>
<tr>
<td bgcolor="#edf4f9" word-wrap:break-word > --with-ffmpeg=DIR </td>
<td bgcolor="#edf4f9" word-wrap:break-word > Specify the pkgconf dir for ffmpeg.</td>
<td bgcolor="#edf4f9" word-wrap:break-word > ffmpeg is required </td>
</tr>
<tr>
<td bgcolor="#edf4f9" word-wrap:break-word > --with-opencv=DIR </td>
<td bgcolor="#edf4f9" word-wrap:break-word > Specify the pkgconf dir for opencv.</td>
<td bgcolor="#edf4f9" word-wrap:break-word > Use --without-opencv to disable </td>
</tr>
<tr>
<td bgcolor="#edf4f9" word-wrap:break-word > --with-mariadb=DIR </td>
<td bgcolor="#edf4f9" word-wrap:break-word > Specify the pkgconf DIR for MariaDB </td>
<td bgcolor="#edf4f9" word-wrap:break-word > Use --without-mariadb to disable </td>
</tr>
<tr>
<td bgcolor="#edf4f9" word-wrap:break-word > --with-mysql=DIR </td>
<td bgcolor="#edf4f9" word-wrap:break-word > Specify the pkgconf dir for mysql </td>
<td bgcolor="#edf4f9" word-wrap:break-word > Use --without-mysql to disable </td>
</tr>
<tr>
<td bgcolor="#edf4f9" word-wrap:break-word > --with-pgsql=DIR </td>
<td bgcolor="#edf4f9" word-wrap:break-word > Specify the pkgconf DIR for PostgreSQL </td>
<td bgcolor="#edf4f9" word-wrap:break-word > Use --without-pgsql to disable</td>
</tr>
<tr>
<td bgcolor="#edf4f9" word-wrap:break-word > --with-sqlite3=DIR </td>
<td bgcolor="#edf4f9" word-wrap:break-word > Specify the pkgconf DIR for sqlite3. </td>
<td bgcolor="#edf4f9" word-wrap:break-word > Use --without-sqlite3 to disable </td>
</tr>
<tr>
<td bgcolor="#edf4f9" word-wrap:break-word > --with-pulse=DIR </td>
<td bgcolor="#edf4f9" word-wrap:break-word > Specify the pkgconf DIR for PulseAudio. </td>
<td bgcolor="#edf4f9" word-wrap:break-word > Use --without-pulse to disable </td>
</tr>
<tr>
<td bgcolor="#edf4f9" word-wrap:break-word > --with-alsa=DIR </td>
<td bgcolor="#edf4f9" word-wrap:break-word > Specify the pkgconf DIR for alsa. </td>
<td bgcolor="#edf4f9" word-wrap:break-word > Use --without-alsa to disable </td>
</tr>
<tr>
<td bgcolor="#edf4f9" word-wrap:break-word > --with-fftw3=DIR </td>
<td bgcolor="#edf4f9" word-wrap:break-word > Specify the pkgconf DIR for fftw3. </td>
<td bgcolor="#edf4f9" word-wrap:break-word > Use --without-fftw3 to disable </td>
</tr>
<tr>
<td bgcolor="#edf4f9" word-wrap:break-word > --with-developer-flags </td>
<td bgcolor="#edf4f9" word-wrap:break-word > Add additional warning flags for the compiler. </td>
<td bgcolor="#edf4f9" word-wrap:break-word > </td>
</tr>
</tbody>
</table>
</div>
<p></p>
<p></p>
</ul>
<h3><a name="Make_Options"></a> Additional Make Options </h3>
<ul>
<p></p>
<dl>
<dt> <strong>make cleanall</strong> </dt>
<dd>
This command creates a pristine directory without any of the files generated from
the <code><strong>autoreconf</strong></code> command.
</dd>
</dl>
<p></p>
<p></p>
<dl>
<dt> <strong>make maintainer-check</strong> </dt>
<dd> Executes multiple configure and make using the developer flags for various combinations of the options.</dd>
</dl>
<p></p>
<p></p>
<dl>
<dt> <strong>make maintainer-clang</strong> </dt>
<dd> Compile using clang.</dd>
</dl>
<p></p>
<p></p>
</ul>
</section>
</body>
doc/motion_config.html
+3123
View File
File diff suppressed because it is too large Load Diff
scripts/version.sh
-9
View File
@@ -1,9 +1,5 @@
#!/bin/sh
<<<<<<< HEAD
BASE_VERSION="4.7.0"
=======
BASE_VERSION="5.0.0"
>>>>>>> 5.0
if [ -d .git ]; then
if test "`git diff --name-only`" = "" ; then
GIT_COMMIT="git-"
@@ -18,9 +14,4 @@ else
GIT_COMMIT="gitUNKNOWN"
fi
#printf "$BASE_VERSION"
<<<<<<< HEAD
printf "$BASE_VERSION+$GIT_COMMIT"
=======
printf "$BASE_VERSION"-"$GIT_COMMIT"
>>>>>>> 5.0
src/event.hpp
-60
View File
@@ -1,60 +0,0 @@
/* This file is part of Motion.
*
* Motion is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* Motion is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Motion. If not, see <https://www.gnu.org/licenses/>.
*/
/*
* event.h
* Headers associated with functions in the event.c module.
* Copyright Jeroen Vreeken, 2002
*/
#ifndef _INCLUDE_EVENT_H_
#define _INCLUDE_EVENT_H_
typedef enum {
EVENT_FILECREATE = 1,
EVENT_MOTION,
EVENT_FIRSTMOTION,
EVENT_ENDMOTION,
EVENT_TIMELAPSE,
EVENT_TIMELAPSEEND,
EVENT_STREAM,
EVENT_IMAGE_DETECTED,
EVENT_IMAGEM_DETECTED,
EVENT_IMAGE_SNAPSHOT,
EVENT_IMAGE,
EVENT_IMAGEM,
EVENT_IMAGE_PREVIEW,
EVENT_FILECLOSE,
EVENT_DEBUG,
EVENT_CRITICAL,
EVENT_AREA_DETECTED,
EVENT_CAMERA_LOST,
EVENT_CAMERA_FOUND,
EVENT_FFMPEG_PUT,
EVENT_MOVIE_START,
EVENT_MOVIE_END,
EVENT_LAST
} motion_event;
typedef void(* event_handler)(struct context *cnt, motion_event type, struct image_data *img_data,
char *filename, void *eventdata, struct timeval *tv1);
void event(struct context *cnt, motion_event type, struct image_data *img_data,
char *filename, void *eventdata, struct timeval *tv1);
const char *imageext(struct context *cnt);
#endif /* _INCLUDE_EVENT_H_ */
src/ffmpeg.cpp
-1553
View File
File diff suppressed because it is too large Load Diff
src/ffmpeg.hpp
-109
View File
@@ -1,109 +0,0 @@
/* This file is part of Motion.
*
* Motion is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* Motion is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Motion. If not, see <https://www.gnu.org/licenses/>.
*/
/*
* ffmpeg.h
* Headers associated with functions in the ffmpeg.c module.
*/
#ifndef _INCLUDE_FFMPEG_H_
#define _INCLUDE_FFMPEG_H_
#include <stdio.h>
#include <stdarg.h>
#include <sys/time.h>
#include <stdint.h>
#include "config.hpp"
struct image_data; /* forward declare for functions */
struct rtsp_context;
enum TIMELAPSE_TYPE {
TIMELAPSE_NONE, /* No timelapse, regular processing */
TIMELAPSE_APPEND, /* Use append version of timelapse */
TIMELAPSE_NEW /* Use create new file version of timelapse */
};
/* Enumeration of the user requested codecs that need special handling */
enum USER_CODEC {
USER_CODEC_V4L2M2M, /* Requested codec for movie is h264_v4l2m2m */
USER_CODEC_H264OMX, /* Requested h264_omx */
USER_CODEC_MPEG4OMX, /* Requested mpeg4_omx */
USER_CODEC_DEFAULT /* All other default codecs */
};
#ifdef HAVE_FFMPEG
struct ffmpeg {
AVFormatContext *oc;
AVStream *video_st;
AVCodecContext *ctx_codec;
my_AVCodec *codec;
AVPacket *pkt;
AVFrame *picture; /* contains default image pointers */
AVDictionary *opts;
struct rtsp_context *rtsp_data;
int width;
int height;
enum TIMELAPSE_TYPE tlapse;
int fps;
int bps;
char *filename;
int quality;
const char *codec_name;
int64_t last_pts;
int64_t base_pts;
int test_mode;
int gop_cnt;
struct timeval start_time;
int high_resolution;
int motion_images;
int passthrough;
enum USER_CODEC preferred_codec;
char *nal_info;
int nal_info_len;
};
#else
struct ffmpeg {
struct rtsp_context *rtsp_data;
int width;
int height;
enum TIMELAPSE_TYPE tlapse;
int fps;
int bps;
char *filename;
int quality;
const char *codec_name;
int64_t last_pts;
int64_t base_pts;
int test_mode;
int gop_cnt;
struct timeval start_time;
int high_resolution;
int motion_images;
int passthrough;
};
#endif // HAVE_FFMPEG
void ffmpeg_global_init(void);
void ffmpeg_global_deinit(void);
void ffmpeg_avcodec_log(void *, int, const char *, va_list);
int ffmpeg_open(struct ffmpeg *ffmpeg);
int ffmpeg_put_image(struct ffmpeg *ffmpeg, struct image_data *img_data, const struct timeval *tv1);
void ffmpeg_close(struct ffmpeg *ffmpeg);
void ffmpeg_reset_movie_start_time(struct ffmpeg *ffmpeg, const struct timeval *tv1);
#endif /* _INCLUDE_FFMPEG_H_ */
src/netcam_jpeg.hpp
-30
View File
@@ -1,30 +0,0 @@
/* This file is part of Motion.
*
* Motion is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* Motion is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Motion. If not, see <https://www.gnu.org/licenses/>.
*/
/*
* netcam_jpeg.h
* Headers associated with functions in the netcam_jpeg.c module.
*/
#ifndef _INCLUDE_NETCAM_JPEG_H
#define _INCLUDE_NETCAM_JPEG_H
int netcam_proc_jpeg(struct netcam_context *netcam, struct image_data *img_data);
void netcam_fix_jpeg_header(struct netcam_context *netcam);
void netcam_get_dimensions(struct netcam_context *netcam);
#endif
src/netcam_rtsp.cpp
-2408
View File
File diff suppressed because it is too large Load Diff
src/netcam_rtsp.hpp
-132
View File
@@ -1,132 +0,0 @@
/* This file is part of Motion.
*
* Motion is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* Motion is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Motion. If not, see <https://www.gnu.org/licenses/>.
*/
/*
* netcam_rtsp.h
* Headers associated with functions in the netcam_rtsp.c module.
*/
#ifndef _INCLUDE_NETCAM_RTSP_H
#define _INCLUDE_NETCAM_RTSP_H
struct context;
struct image_data;
enum RTSP_STATUS {
RTSP_CONNECTED, /* The camera is currently connected */
RTSP_READINGIMAGE, /* Motion is reading a image from camera */
RTSP_NOTCONNECTED, /* The camera has never connected */
RTSP_RECONNECTING /* Motion is trying to reconnect to camera */
};
struct imgsize_context {
int width;
int height;
};
#ifdef HAVE_FFMPEG
struct packet_item{
AVPacket *packet;
int64_t idnbr;
int iskey;
int iswritten;
struct timeval timestamp_tv;
};
struct rtsp_context {
AVFormatContext *format_context; /* Main format context for the camera */
AVCodecContext *codec_context; /* Codec being sent from the camera */
AVStream *strm;
AVFrame *frame; /* Reusable frame for images from camera */
AVFrame *swsframe_in; /* Used when resizing image sent from camera */
AVFrame *swsframe_out; /* Used when resizing image sent from camera */
struct SwsContext *swsctx; /* Context for the resizing of the image */
AVPacket *packet_recv; /* The packet that is currently being processed */
AVFormatContext *transfer_format; /* Format context just for transferring to pass-through */
struct packet_item *pktarray; /* Pointer to array of packets for passthru processing */
int pktarray_size; /* The number of packets in array. 1 based */
int pktarray_index; /* The index to the most current packet in array */
int64_t idnbr; /* A ID number to track the packet vs image */
AVDictionary *opts; /* AVOptions when opening the format context */
int swsframe_size; /* The size of the image after resizing */
int video_stream_index; /* Stream index associated with video from camera */
#if (MYFFVER >= 57083)
enum AVHWDeviceType hw_type;
enum AVPixelFormat hw_pix_fmt;
AVBufferRef *hw_device_ctx;
#endif
my_AVCodec *decoder;
enum RTSP_STATUS status; /* Status of whether the camera is connecting, closed, etc*/
struct timeval interruptstarttime; /* The time set before calling the av functions */
struct timeval interruptcurrenttime; /* Time during the interrupt to determine duration since start*/
int interruptduration; /* Seconds permitted before triggering a interrupt */
netcam_buff_ptr img_recv; /* The image buffer that is currently being processed */
netcam_buff_ptr img_latest; /* The most recent image buffer that finished processing */
int interrupted; /* Boolean for whether interrupt has been tripped */
int finish; /* Boolean for whether we are finishing the application */
int high_resolution; /* Boolean for whether this context is the Norm or High */
int handler_finished; /* Boolean for whether the handler is running or not */
int first_image; /* Boolean for whether we have captured the first image */
int passthrough; /* Boolean for whether we are doing pass-through processing */
char *path; /* The connection string to use for the camera */
char *service; /* String specifying the type of camera http, rtsp, v4l2 */
const char *camera_name; /* The name of the camera as provided in the config file */
char cameratype[30]; /* String specifying Normal or High for use in logging */
struct imgsize_context imgsize; /* The image size parameters */
int rtsp_uses_tcp; /* Flag from config for whether to use tcp transport */
int v4l2_palette; /* Palette from config for v4l2 devices */
int reconnect_count; /* Count of the times reconnection is tried*/
int src_fps; /* The fps provided from source*/
int capture_rate; /* The framerate for the capture rate*/
struct timeval frame_prev_tm; /* The time set before calling the av functions */
struct timeval frame_curr_tm; /* Time during the interrupt to determine duration since start*/
struct params_context *parameters; /* User specified parameters for the camera */
struct config *conf; /* Pointer to conf parms of parent cnt*/
char *decoder_nm; /* User requested decoder */
struct context *cnt;
char threadname[16]; /* The thread name*/
int threadnbr; /* The thread number */
pthread_t thread_id; /* thread i.d. for a camera-handling thread (if required). */
pthread_mutex_t mutex; /* mutex used with conditional waits */
pthread_mutex_t mutex_transfer; /* mutex used with transferring stream info for pass-through */
pthread_mutex_t mutex_pktarray; /* mutex used with the packet array */
};
#else /* Do not have FFmpeg */
struct rtsp_context {
int dummy;
pthread_t thread_id;
int handler_finished;
};
#endif /* end HAVE_FFMPEG */
int netcam_rtsp_setup(struct context *cnt);
int netcam_rtsp_next(struct context *cnt, struct image_data *img_data);
void netcam_rtsp_cleanup(struct context *cnt, int init_retry_flag);
#endif /* _INCLUDE_NETCAM_RTSP_H */
src/netcam_wget.hpp
-101
View File
@@ -1,101 +0,0 @@
/* This file is part of Motion.
*
* Motion is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* Motion is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Motion. If not, see <https://www.gnu.org/licenses/>.
*/
/*
* netcam_wget.h
* Headers associated with functions in the netcam_wget.c module.
* Copyright (C) 1995, 1996, 1997, 1998, 2000, 2001, 2002
* Free Software Foundation, Inc.
* Copyright (C) 2004-2005 Christopher Price,
* Angel Carpintero, and other contributing authors.
* Major part of this file is reused code from GNU Wget. It has been
* merged and modified for use in the program Motion which is also
* released under the terms of the GNU General Public License.
*/
#ifndef NETCAM_WGET_H
#define NETCAM_WGET_H
#include "netcam.hpp"
/* Retrieval stream */
struct rbuf
{
char buffer[4096]; /* the input buffer */
char *buffer_pos; /* current position in the buffer */
size_t buffer_left; /* number of bytes left in the buffer:
buffer_left = buffer_end - buffer_pos */
int ret; /* used by RBUF_READCHAR macro */
};
/* Read a character from RBUF. If there is anything in the buffer,
the character is returned from the buffer. Otherwise, refill the
buffer and return the first character.
The return value is the same as with read(2). On buffered read,
the function returns 1.
#### That return value is totally screwed up, and is a direct
result of historical implementation of header code. The macro
should return the character or EOF, and in case of error store it
to rbuf->err or something. */
#define RBUF_READCHAR(netcam, store) \
((netcam)->response->buffer_left ? (--(netcam)->response->buffer_left, \
*((char *) (store)) = *(netcam)->response->buffer_pos++, 1) \
: ((netcam)->response->buffer_pos = (netcam)->response->buffer, \
((((netcam)->response->ret = rbuf_read_bufferful (netcam)) <= 0) \
? (netcam)->response->ret : ((netcam)->response->buffer_left = (netcam->response)->ret - 1, \
*((char *) (store)) = *(netcam)->response->buffer_pos++,1))))
/* Function declarations */
void rbuf_initialize(netcam_context_ptr netcam);
int rbuf_initialized_p(netcam_context_ptr);
void rbuf_uninitialize(netcam_context_ptr);
int rbuf_readchar(netcam_context_ptr, char *);
int rbuf_peek(netcam_context_ptr netcam, char *store);
int rbuf_flush(netcam_context_ptr netcam, char *where, int maxsize);
/* Internal, but used by the macro. */
int rbuf_read_bufferful(netcam_context_ptr);
/* How many bytes it will take to store LEN bytes in base64. */
#define BASE64_LENGTH(len) (4 * (((len) + 2) / 3))
void motion_base64_encode(const char *, char *, int);
char *strdupdelim(const char *, const char *);
int http_process_type(const char *, void *);
enum {
HG_OK,
HG_ERROR,
HG_EOF
};
enum header_get_flags{
HG_NONE = 0,
HG_NO_CONTINUATIONS = 0x2
};
int header_get(netcam_context_ptr netcam, char **hdr, enum header_get_flags flags);
int header_process(const char *header, const char *name
, int (*procfun)(const char *, void *), void *arg);
int header_extract_number(const char *header, void *closure);
int header_strdup(const char *header, void *closure);
int skip_lws(const char *string);
int http_result_code(const char *header);
#endif /* NETCAM_WGET_H */
src/translate.cpp
-81
View File
@@ -1,81 +0,0 @@
/* This file is part of Motion.
*
* Motion is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* Motion is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Motion. If not, see <https://www.gnu.org/licenses/>.
*/
/*
* Translations for Web User control interface.
*
*
*/
#include <locale.h>
#include "motion.hpp"
#include "logger.hpp"
#include "translate.hpp"
int nls_enabled;
/* Testing routine for code development only.
* Does nothing in normal operations and just returns.
*/
void translate_locale_chg(const char *langcd)
{
#ifdef HAVE_GETTEXT
return;
setenv ("LANGUAGE", langcd, 1);
/* Invoke external function to change locale*/
++_nl_msg_cat_cntr;
#else
if (langcd != NULL) {
MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO,"No native language support");
}
#endif
}
void translate_init(struct context *cnt)
{
#ifdef HAVE_GETTEXT
if (cnt->conf.native_language == 1) {
nls_enabled = 1;
setlocale (LC_ALL, "");
bindtextdomain ("motion", LOCALEDIR);
bind_textdomain_codeset ("motion", "UTF-8");
textdomain ("motion");
} else {
nls_enabled = 0;
}
MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO,_("Language: English"));
#else
nls_enabled = 0;
(void)cnt;
#endif
if (nls_enabled == 1) {
translate_locale_chg("es"); /* This is a testing only function call*/
}
}
char* translate_text(const char *msgid)
{
#ifdef HAVE_GETTEXT
if (nls_enabled) {
return (char*)gettext(msgid);
} else {
return (char*)msgid;
}
#else
return (char*)msgid;
#endif
}
src/translate.hpp
-38
View File
@@ -1,38 +0,0 @@
/* This file is part of Motion.
*
* Motion is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* Motion is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Motion. If not, see <https://www.gnu.org/licenses/>.
*/
/*
* translate.h
* Headers associated with functions in the translate.c module.
*/
#ifndef _INCLUDE_TRANSLATE_H_
#define _INCLUDE_TRANSLATE_H_
extern int nls_enabled;
#ifdef HAVE_GETTEXT
#include <libintl.h>
extern int _nl_msg_cat_cntr; /* Required for changing the locale dynamically */
#endif
#define _(STRING) translate_text(STRING)
char* translate_text(const char *msgid);
void translate_init(struct context *cnt);
void translate_locale_chg(const char *langcd);
#endif // _INCLUDE_TRANSLATE_H_
src/video_bktr.hpp
-33
View File
@@ -1,33 +0,0 @@
/* This file is part of Motion.
*
* Motion is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* Motion is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Motion. If not, see <https://www.gnu.org/licenses/>.
*/
/*
* video_bktr.h
* Headers associated with functions in the video_bktr.c module.
* Copyright 2004 by Angel Carpintero (motiondevelop@gmail.com)
*/
#ifndef _INCLUDE_VIDEO_BKTR_H
#define _INCLUDE_VIDEO_BKTR_H
void bktr_mutex_init(void);
void bktr_mutex_destroy(void);
int bktr_start(struct context *cnt);
int bktr_next(struct context *cnt, struct image_data *img_data);
void bktr_cleanup(struct context *cnt);
#endif /* _INCLUDE_VIDEO_FREEBSD_H */
src/webu_status.cpp
-255
View File
@@ -1,255 +0,0 @@
/* This file is part of Motion.
*
* Motion is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* Motion is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Motion. If not, see <https://www.gnu.org/licenses/>.
*/
/*
* webu_status.c
*
* Status reports in JSON format via stream HTTP endpoint.
*
*/
#include <ctype.h>
#include <inttypes.h>
#include "motion.hpp"
#include "webu.hpp"
#include "webu_status.hpp"
/* Conservatively encode characters in an array as a JSON string */
static void webu_json_write_string(struct webui_ctx *webui, const char *str)
{
const char *ptr;
char cur, buf[8];
webu_write(webui, "\"");
for (ptr = str; *ptr != '\0'; ++ptr) {
cur = *ptr;
switch (cur) {
case '\\':
/*FALLTHROUGH*/
case '"':
snprintf(buf, sizeof(buf), "\\%c", cur);
webu_write(webui, buf);
continue;
}
/* TODO: Encode non-ASCII characters correctly as UTF-8 */
if (cur & ~0x7F) {
cur = '?';
}
if (isalnum(cur) || ispunct(cur) || cur == ' ') {
/* Output character literally */
buf[0] = cur;
buf[1] = '\0';
} else {
snprintf(buf, sizeof(buf), "\\u%04x", (uint16_t)cur);
}
webu_write(webui, buf);
}
webu_write(webui, "\"");
}
/* Write time_t as seconds since Unix epoch */
static void webu_json_write_timestamp(struct webui_ctx *webui, time_t ts)
{
char buf[32];
snprintf(buf, sizeof(buf), "%" PRId64, (int64_t)ts);
webu_write(webui, buf);
}
/* Write duration of time between two time_t */
static void webu_json_write_timestamp_elapsed(struct webui_ctx *webui, time_t ts, time_t since)
{
char buf[32];
double elapsed;
elapsed = difftime(since, ts);
snprintf(buf, sizeof(buf), "%" PRId64, (int64_t)elapsed);
webu_write(webui, buf);
}
/* Write time_t as ISO-8601-formatted string */
static void webu_json_write_timestamp_iso8601(struct webui_ctx *webui, time_t ts)
{
char buf[32];
struct tm timestamp_tm;
localtime_r(&ts, &timestamp_tm);
strftime(buf, sizeof(buf), "%FT%T%z", &timestamp_tm);
webu_json_write_string(webui, buf);
}
static void webu_status_write_list(struct webui_ctx *webui, const char *toplevel_key
, void (*callback)(struct webui_ctx *, struct context *))
{
int indx, indx_st;
if (webui->thread_nbr == 0) {
if (webui->cam_threads == 1) {
indx_st = 0;
} else {
indx_st = 1;
}
webu_write(webui, "{\"");
webu_write(webui, toplevel_key);
webu_write(webui, "\": [");
for (indx = indx_st; indx < webui->cam_threads; indx++) {
if (indx > indx_st) {
webu_write(webui, ", ");
}
callback(webui, webui->cntlst[indx]);
}
webu_write(webui, "]}\n");
} else {
callback(webui, webui->cnt);
}
}
static void webu_json_cam_list_single(struct webui_ctx *webui, struct context *cnt)
{
char buf[WEBUI_LEN_RESP];
snprintf(buf, sizeof(buf), "{\"id\": %d, \"name\": ", cnt->camera_id);
webu_write(webui, buf);
if (cnt->conf.camera_name == NULL) {
webu_write(webui, "null");
} else {
webu_json_write_string(webui, cnt->conf.camera_name);
}
webu_write(webui, "}");
}
static void webu_status_list(struct webui_ctx *webui)
{
webu_status_write_list(webui, "cameras", webu_json_cam_list_single);
}
/* Describe a single camera status */
static void webu_json_cam_status_single(struct webui_ctx *webui, struct context *cnt)
{
char buf[WEBUI_LEN_RESP];
const struct {
const char *name;
time_t value;
} timestamps[] = {
{ "lasttime", cnt->last_tv.tv_sec },
{ "eventtime", cnt->event_tv.tv_sec },
{ "connectionlosttime", cnt->lostconnection_tv.tv_sec },
{ NULL, 0 },
}, *cur_timestamp;
snprintf(buf, sizeof(buf), "{\"id\": %d, \"name\": ", cnt->camera_id);
webu_write(webui, buf);
if (cnt->conf.camera_name == NULL) {
webu_write(webui, "null");
} else {
webu_json_write_string(webui, cnt->conf.camera_name);
}
snprintf(buf, sizeof(buf),
", \"image_width\": %d"
", \"image_height\": %d"
", \"fps\": %u"
", \"missing_frame_counter\": %u"
", \"running\": %u"
", \"lost_connection\": %u"
, cnt->imgs.width
, cnt->imgs.height
, cnt->lastrate
, cnt->missing_frame_counter
, cnt->running
, cnt->lost_connection);
webu_write(webui, buf);
webu_write(webui, ", \"currenttime\": ");
webu_json_write_timestamp(webui, cnt->current_tv.tv_sec);
webu_write(webui, ", \"currenttime_iso8601\": ");
webu_json_write_timestamp_iso8601(webui, cnt->current_tv.tv_sec);
for (cur_timestamp = timestamps; cur_timestamp && cur_timestamp->name;
++cur_timestamp) {
snprintf(buf, sizeof(buf), ", \"%s\": ", cur_timestamp->name);
webu_write(webui, buf);
webu_json_write_timestamp(webui, cur_timestamp->value);
snprintf(buf, sizeof(buf), ", \"%s_iso8601\": ", cur_timestamp->name);
webu_write(webui, buf);
if (cur_timestamp->value == (time_t)0) {
webu_write(webui, "null");
} else {
webu_json_write_timestamp_iso8601(webui, cur_timestamp->value);
}
snprintf(buf, sizeof(buf), ", \"%s_elapsed\": ", cur_timestamp->name);
webu_write(webui, buf);
if (cur_timestamp->value == (time_t)0) {
webu_write(webui, "null");
} else {
webu_json_write_timestamp_elapsed(webui, cur_timestamp->value,
cnt->current_tv.tv_sec);
}
}
webu_write(webui, "}\n");
}
static void webu_status_one(struct webui_ctx *webui)
{
webu_status_write_list(webui, "camera_status", webu_json_cam_status_single);
}
static void webu_status_badreq(struct webui_ctx *webui)
{
webu_write(webui, "{ \"error\": \"Server did not understand the request\" }");
}
void webu_status_main(struct webui_ctx *webui)
{
switch (webui->cnct_type) {
case WEBUI_CNCT_STATUS_LIST:
webu_status_list(webui);
break;
case WEBUI_CNCT_STATUS_ONE:
webu_status_one(webui);
break;
default:
webu_status_badreq(webui);
break;
}
}
src/webu_status.hpp
-27
View File
@@ -1,27 +0,0 @@
/* This file is part of Motion.
*
* Motion is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* Motion is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Motion. If not, see <https://www.gnu.org/licenses/>.
*/
/*
* webu_status.h
* Headers associated with functions in the webu_status.c module.
*/
#ifndef _INCLUDE_WEBU_STATUS_H_
#define _INCLUDE_WEBU_STATUS_H_
void webu_status_main(struct webui_ctx *webui);
#endif
src/webu_text.hpp
-33
View File
@@ -1,33 +0,0 @@
/* This file is part of Motion.
*
* Motion is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* Motion is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Motion. If not, see <https://www.gnu.org/licenses/>.
*/
/*
* webu_text.h
* Headers associated with functions in the webu_text.c module.
*/
#ifndef _INCLUDE_WEBU_TEXT_H_
#define _INCLUDE_WEBU_TEXT_H_
void webu_text_badreq(struct webui_ctx *webui);
void webu_text_main(struct webui_ctx *webui);
void webu_text_status(struct webui_ctx *webui);
void webu_text_connection(struct webui_ctx *webui);
void webu_text_list(struct webui_ctx *webui);
void webu_text_get_query(struct webui_ctx *webui);
#endif