Skip to content

Commit 95d6118

Browse files
authored
Merge branch 'aravis-0-8' into wip/gst-aravissrc-switch-test
2 parents 22b8ce9 + c76032d commit 95d6118

249 files changed

Lines changed: 1748 additions & 1346 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/aravis-linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
run: meson test -C build/ -v
3131
- name: Valgrind
3232
run: meson test -C build/ -v --setup=valgrind
33-
- uses: actions/upload-artifact@v3
33+
- uses: actions/upload-artifact@v4
3434
if: failure()
3535
with:
3636
name: Linux_Meson_Testlog

.github/workflows/aravis-macos.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
CC: gcc
3434
- name: Tests
3535
run: meson test -C build/ -v
36-
- uses: actions/upload-artifact@v3
36+
- uses: actions/upload-artifact@v4
3737
if: failure()
3838
with:
3939
name: MacOS_Meson_Testlog

.github/workflows/aravis-mingw.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
- name: meson test
5757
run: |
5858
meson test -C ./build
59-
- uses: actions/upload-artifact@v3
59+
- uses: actions/upload-artifact@v4
6060
if: failure()
6161
with:
6262
name: ${{matrix.sys}}_Meson_Testlog

.github/workflows/aravis-msvc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ jobs:
7878
.\build\activate_run.ps1
7979
meson test -C .\build
8080
- name: logs
81-
uses: actions/upload-artifact@v3
81+
uses: actions/upload-artifact@v4
8282
if: failure()
8383
with:
8484
name: msvc_${{ matrix.version }}_${{ matrix.arch }}_${{ matrix.build_type_meson }}_Meson_Testlog

CITATION.cff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ url: 'https://aravisproject.github.io/aravis/'
1515
abstract: >-
1616
Aravis is a GObject based library for the control and the
1717
video stream acquisition of digital cameras.
18-
license: LGPL-2.1+
18+
license: LGPL-2.1-or-later

NEWS.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
Stable release 0.8.34
2+
=====================
3+
4+
* gigevision: allow to select discovery interface (Yuto)
5+
* genicam: fix unaligned memory access (Matwey)
6+
* gigevision: fix uninitialized memory access (Emmanuel)
7+
* build: add missing include (Emmanuel)
8+
19
Stable release 0.8.33
210
=====================
311

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ simple video viewer.
2121
<img src="viewer/data/aravis-video.png"/>
2222
</p>
2323

24-
Aravis is released under the LGPL v2+.
24+
Aravis is released under [LGPL-2.1-or-later](https://spdx.org/licenses/LGPL-2.1-or-later.html).
2525

2626
### Documentation
2727

docs/reference/aravis/porting-0.8.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ check for errors at each function call. A convenient way to deal with this issue
2020
is the following construction:
2121

2222
```c
23-
GError **error = NULL;
23+
GError *error = NULL;
2424

2525
if (!error) arv_camera_... (..., &error);
2626
if (!error) arv_camera_... (..., &error);

gst/gstaravis.c

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,26 @@
1-
/*
1+
/* Aravis - Digital camera library
2+
*
23
* Copyright © 2006 Eric Jonas <jonas@mit.edu>
34
* Copyright © 2006 Antoine Tremblay <hexa00@gmail.com>
45
* Copyright © 2010 United States Government, Joshua M. Doe <joshua.doe@us.army.mil>
5-
* Copyright © 2010-2019 Emmanuel Pacaud <emmanuel.pacaud@free.fr>
6+
* Copyright © 2009-2025 Emmanuel Pacaud <emmanuel.pacaud@free.fr>
7+
*
8+
* SPDX-License-Identifier: LGPL-2.1-or-later
69
*
710
* This library is free software; you can redistribute it and/or
8-
* modify it under the terms of the GNU Library General Public
11+
* modify it under the terms of the GNU Lesser General Public
912
* License as published by the Free Software Foundation; either
10-
* version 2 of the License, or (at your option) any later version.
13+
* version 2.1 of the License, or (at your option) any later version.
1114
*
1215
* This library is distributed in the hope that it will be useful,
1316
* but WITHOUT ANY WARRANTY; without even the implied warranty of
1417
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15-
* Library General Public License for more details.
18+
* Lesser General Public License for more details.
19+
*
20+
* You should have received a copy of the GNU Lesser General Public
21+
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
1622
*
17-
* You should have received a copy of the GNU Library General Public
18-
* License along with this library; if not, write to the
19-
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
20-
* Boston, MA 02110-1301, USA.
23+
* Author: Emmanuel Pacaud <emmanuel.pacaud@free.fr>
2124
*/
2225

2326
/**

gst/gstaravis.h

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,26 @@
1-
/*
1+
/* Aravis - Digital camera library
2+
*
23
* Copyright © 2006 Eric Jonas <jonas@mit.edu>
34
* Copyright © 2006 Antoine Tremblay <hexa00@gmail.com>
45
* Copyright © 2010 United States Government, Joshua M. Doe <joshua.doe@us.army.mil>
5-
* Copyright © 2010-2019 Emmanuel Pacaud <emmanuel.pacaud@free.fr>
6+
* Copyright © 2009-2025 Emmanuel Pacaud <emmanuel.pacaud@free.fr>
7+
*
8+
* SPDX-License-Identifier: LGPL-2.1-or-later
69
*
710
* This library is free software; you can redistribute it and/or
8-
* modify it under the terms of the GNU Library General Public
11+
* modify it under the terms of the GNU Lesser General Public
912
* License as published by the Free Software Foundation; either
10-
* version 2 of the License, or (at your option) any later version.
13+
* version 2.1 of the License, or (at your option) any later version.
1114
*
1215
* This library is distributed in the hope that it will be useful,
1316
* but WITHOUT ANY WARRANTY; without even the implied warranty of
1417
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15-
* Library General Public License for more details.
18+
* Lesser General Public License for more details.
19+
*
20+
* You should have received a copy of the GNU Lesser General Public
21+
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
1622
*
17-
* You should have received a copy of the GNU Library General Public
18-
* License along with this library; if not, write to the
19-
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
20-
* Boston, MA 02110-1301, USA.
23+
* Author: Emmanuel Pacaud <emmanuel.pacaud@free.fr>
2124
*/
2225

2326
#ifndef ARV_GST_H

0 commit comments

Comments
 (0)