Skip to content

Commit

Permalink
Merge branch '5.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
Mr-Dave committed Feb 4, 2025
2 parents aa285e1 + cfc9246 commit d488dc7
Show file tree
Hide file tree
Showing 127 changed files with 64,196 additions and 81,990 deletions.
6 changes: 5 additions & 1 deletion .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,8 @@ contact_links:
about: Please ask and answer questions here.
- name: Motion Enhancements
url: https://github.com/Motion-Project/motion/discussions
about: Please use the discussions page and tag as an enhancement request.
<<<<<<< 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
28 changes: 28 additions & 0 deletions .github/ISSUE_TEMPLATE/issue.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,15 @@ body:
- 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
validations:
required: true
- type: dropdown
Expand All @@ -53,7 +59,11 @@ body:
options:
- ARM-32bit
- ARM-64bit
<<<<<<< HEAD
- x86
=======
- x86/x64
>>>>>>> 5.0
- Other
validations:
required: true
Expand All @@ -80,6 +90,7 @@ body:
- type: dropdown
id: camtype
attributes:
<<<<<<< HEAD
label: Camera type(s) being used?
multiple: true
options:
Expand All @@ -89,6 +100,18 @@ body:
- PI cam via MMAL
- Network camera with RTSP
- Network camera with HTTP
=======
label: Camera/Sound type(s) being used?
multiple: true
options:
- v4l2 camera
- PI cam via libcamerify
- PI camera via libcam
- Network camera with RTSP
- Network camera with HTTP
- Sound via ALSA
- Sound via PulseAudio
>>>>>>> 5.0
- Other
validations:
required: true
Expand All @@ -103,8 +126,13 @@ 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
render: shell
validations:
required: true
Expand Down
97 changes: 97 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
name: CI

on:
push:
paths-ignore:
- .github/ISSUE_TEMPLATE/**
- doc/**
- man/**
- '**/LICENCE'
- '**/.gitignore'
- '**.md'
pull_request:
paths-ignore:
- .github/ISSUE_TEMPLATE/**
- doc/**
- man/**
- '**/LICENCE'
- '**/.gitignore'
- '**.md'
workflow_dispatch:

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
build:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
cxx: [g++, clang++]
libc: [glibc, musl]
include:
- cxx: g++
cc: gcc
- cxx: clang++
cc: clang
- libc: glibc
shell: bash
- libc: musl
shell: alpine.sh {0}

defaults:
run:
shell: ${{ matrix.shell }}

steps:
- name: Set up Ubuntu
if: matrix.libc == 'glibc'
run: |
sudo apt-get update
sudo apt-get install -y autopoint pkgconf gettext libcamera-dev libopencv-dev libavcodec-dev libavdevice-dev libavformat-dev libavutil-dev libswscale-dev libwebp-dev libmicrohttpd-dev libmariadb-dev libasound2-dev libpulse-dev libfftw3-dev
- name: Set up Alpine
if: matrix.libc == 'musl'
uses: jirutka/setup-alpine@master
with:
branch: edge
packages: >
build-base
clang
file
autoconf
automake
gettext-dev
libtool
libzip-dev
jpeg-dev
v4l-utils-libs
libcamera-dev
opencv-dev
ffmpeg-dev
libmicrohttpd-dev
sqlite-dev
mariadb-dev
alsa-lib-dev
pulseaudio-dev
fftw-dev
- name: Checkout source
uses: actions/checkout@main

- name: Configure build
run: |
autoreconf -fiv
./configure CC=${{ matrix.cc }} CXX=${{ matrix.cxx }}
- name: Build target
run: |
${{ matrix.CXX }} --version
make -j $(($(nproc)+1))
- name: Run artifact
run: |
file ./src/motion
./src/motion -h || true
17 changes: 17 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +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
Expand All @@ -20,12 +26,20 @@ 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
Expand All @@ -35,9 +49,12 @@ src/Makefile.in
src/.deps/
src/Makefile
src/Makefile.in
<<<<<<< HEAD
src/raspicam/*.o
src/raspicam/.dirstamp
src/raspicam/.deps/
=======
>>>>>>> 5.0
*.log
.depend

Expand Down
56 changes: 6 additions & 50 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,58 +1,14 @@
# How to contribute

Issues on the github site are intended to discuss code problems, crashes and application enhancements. If you are having an issue with the setup,
configuration or use of Motion, we have the following additional resources which are better suited to meet these needs.
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)
* IRC: [#motion](ircs://irc.libera.chat:6697/motion) on Libera Chat
=======
## Questions submitted as issues
>>>>>>> 5.0
It is very important to use these resources for non-code issues since it engages a much wider audience who may have experience resolving
the particular issue you are trying to resolve.
Questions that are submitted as a github issue will be transferred to the discussions section.

## Submitting Problems

Before submitting a issue, please make sure that you are using either the latest release as posted
[here](https://github.com/Motion-Project/motion/releases) or that you have built the latest source code
from the github master branch.

If the issue still remains with the current version, please validate that the issue has not already been reported
by searching through the issue log.

Next, we must be provided the following in order to replicate and ultimately resolve the issue:

* A complete Motion log for a single run from startup to shutdown at the INF/7 log level.
* The expected versus actual result

The preferred method of providing the log file is by posting it on [gist](https://gist.github.com/). Only provide
the link to the gist file within the issue. The full configuration will be printed out to the log at the INF/7 level
with the most common, sensitive information (URLs, usernames/passwords, etc) masked. It is recommended that you
double check before posting the log file.
For more information please read [privacy wiki article](https://github.com/Motion-Project/motion/wiki/Privacy)

Note that the developers do not use any front-end application to use Motion and we need the actual logs from the Motion
application rather than logs from the front-end application.


## Submitting an Enhancement Request

Motion has a extremely large number of configuration options. With so many options, it is important to include a description
of how/why the enhancement will be used. It is possible that the existing options can be configured to address the need.
(Which could then lead to a different enhancement than originally contemplated of making those options easier to use or documented
better.)


## Submitting changes

Generally, it is best to first submit a issue on the particular enhancement prior to a pull request. This allows the particular
item to be discussed and determine how it would fit into the application.

As pull requests are prepared, in addition to the actual code, please also consider:

* Changes needed to the Motion_Guide.html which is our user guide.
* Changes to the motion.1 file which is the manual
* Changes to the configuration templates of motion.conf, camera1.conf, etc.


Thanks,
Motion-Project Team.
Loading

0 comments on commit d488dc7

Please sign in to comment.