Skip to content

Commit

Permalink
update v4.1.2
Browse files Browse the repository at this point in the history
  • Loading branch information
EmixamPP committed Aug 11, 2022
1 parent 9a6f341 commit a1f73f6
Show file tree
Hide file tree
Showing 7 changed files with 35 additions and 29 deletions.
24 changes: 11 additions & 13 deletions AUR/git/PKGBUILD
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# Maintainer: Maxime Dirksen <[email protected]>
# Co-Maintener: supdrewin <supdrewin@outlook.com>
# Co-Maintener: supdrewin <supdrewin at outlook dot com>
# Co-Maintainer: Fabio 'Lolix' Loli <[email protected]>
# Contributor: Nikolay Bryskin <[email protected]>
# Co-Maintainer: Nikolay Bryskin <[email protected]>

pkgname=linux-enable-ir-emitter-git
pkgver=4.0.0.r7.g294ac8d
pkgver=4.1.2.r3.ga6d606f
pkgrel=1
pkgdesc="Enables infrared cameras that are not directly enabled out-of-the box"
url="https://github.com/EmixamPP/linux-enable-ir-emitter"
Expand All @@ -19,22 +19,20 @@ depends=(python opencv fmt)

install=linux-enable-ir-emitter.install

source=("git+https://github.com/EmixamPP/linux-enable-ir-emitter#branch=dev")
source=("${pkgname}::git+${url}.git")
sha256sums=('SKIP')

name=${pkgname/-git}

pkgver() {
cd "${srcdir}/${name}"
cd "${srcdir}/${pkgname}"
git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
}

build() {
make -C "${srcdir}/linux-enable-ir-emitter/sources/driver/"
make -C "${srcdir}/${pkgname}/sources/driver/"
}

package() {
cd "${srcdir}/${name}"
cd "${srcdir}/${pkgname}"

install -Dm 644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}"

Expand All @@ -46,13 +44,13 @@ package() {

# executable
install -d "${pkgdir}"/usr/bin/
chmod 755 "${pkgdir}"/usr/lib/linux-enable-ir-emitter/linux-enable-ir-emitter.py
chmod +x "${pkgdir}"/usr/lib/linux-enable-ir-emitter/linux-enable-ir-emitter.py
ln -fs /usr/lib/linux-enable-ir-emitter/linux-enable-ir-emitter.py \
"${pkgdir}"/usr/bin/linux-enable-ir-emitter
"${pkgdir}"/usr/bin/linux-enable-ir-emitter

# auto complete for bash
install -Dm 644 sources/autocomplete/${name} -t "${pkgdir}"/usr/share/bash-completion/completions/
install -Dm 644 sources/autocomplete/${pkgname/-git/} -t "${pkgdir}"/usr/share/bash-completion/completions/

# drivers folder
mkdir -p "${pkgdir}"/etc/${name}/
mkdir -p "${pkgdir}"/etc/${pkgname}/
}
14 changes: 6 additions & 8 deletions AUR/release/PKGBUILD
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# Maintainer: Maxime Dirksen <[email protected]>
# Co-Maintener: Supdrewin <supdrewin@outlook.com>
# Co-Maintener: Supdrewin <supdrewin at outlook dot com>
# Co-Maintainer: Andrey Kolchenko <[email protected]>
# Co-Maintainer: Rui ZHAO <[email protected]>
# Contributor: Antoine Bertin <[email protected]>

pkgname=linux-enable-ir-emitter
pkgver=4.1.2
pkgver=4.1.4
pkgrel=1
epoch=1
pkgdesc="Enables infrared cameras that are not directly enabled out-of-the box."
Expand All @@ -20,17 +20,15 @@ depends=(python opencv fmt)

install=linux-enable-ir-emitter.install

source=("https://github.com/EmixamPP/linux-enable-ir-emitter/archive/refs/tags/${pkgver}.tar.gz")
sha256sums=('SKIP')

name=${pkgname}-${pkgver}
source=("${url}/archive/refs/tags/${pkgver}.tar.gz")
sha256sums=('skip')

build() {
make -C "${srcdir}/${name}/sources/driver/"
make -C "${srcdir}/${pkgname}-${pkgver}/sources/driver/"
}

package() {
cd "${srcdir}/${name}"
cd "${srcdir}/${pkgname}-${pkgver}"

install -Dm 644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}"

Expand Down
5 changes: 4 additions & 1 deletion COPR/linux-enable-ir-emitter.spec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
%global debug_package %{nil}

Name: linux-enable-ir-emitter
Version: 4.1.2
Version: 4.1.4
Release: 1%{?dist}
Summary: Enables infrared cameras that are not directly enabled out-of-the box
URL: https://github.com/EmixamPP/%{name}
Expand Down Expand Up @@ -89,6 +89,9 @@ if [ "$1" -eq 0 ]; then
fi

%changelog
* Thu Aug 11 2022 Maxime Dirksen <[email protected]> - 4.1.4-1
- Force V4l2 backend in opencv
- Improvement of driver generation
* Mon Jul 4 2022 Maxime Dirksen <[email protected]> - 4.1.2-1
- Asynchronous camera triggering
- Fix camera triggering issue
Expand Down
7 changes: 7 additions & 0 deletions PPA/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
linux-enable-ir-emitter (4.1.4) kinetic; urgency=medium

* Force V4l2 backend in opencv
* Improvement of driver generation

-- Maxime Dirksen <[email protected]> Thu, 11 Aug 2022 12:00:00 +0200

linux-enable-ir-emitter (4.1.2) jammy; urgency=medium

* Asynchronous camera triggering
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Provides support for infrared cameras that are not directly enabled out-of-the b
This software was created to use [Howdy](https://github.com/boltgolt/howdy), a Windows Hello for linux.

## Installation
### For Fedora distro based (.rpm) :
### For Fedora/openSUSE/Magia/CentOS distro based (.rpm) :
Page link : [COPR package](https://copr.fedorainfracloud.org/coprs/emixampp/linux-enable-ir-emitter/).
``` shell
sudo dnf copr enable emixampp/linux-enable-ir-emitter
Expand All @@ -22,16 +22,16 @@ cd linux-enable-ir-emitter
makepkg -csi
```

### For Debian distro based (.deb) :
Page link : [PPA package](https://launchpad.net/~emixampp/+archive/ubuntu/linux-enable-ir-emitter).
### For Ubuntu/Debian distro based (.deb) :
Page link : [PPA package](https://launchpad.net/~emixampp/+archive/ubuntu/linux-enable-ir-emitter). Looking for maintainers or contributors.
``` shell
sudo add-apt-repository ppa:emixampp/linux-enable-ir-emitter
sudo apt update
sudo apt install linux-enable-ir-emitter
```

### For other distro :
The following dependencies are needed (see [wiki](https://github.com/EmixamPP/linux-enable-ir-emitter/wiki/Issues#requirements) for further specification) : python3, opencv (C++)
The following dependencies are needed (see [wiki](https://github.com/EmixamPP/linux-enable-ir-emitter/wiki/Issues#requirements) for further specification) : python, opencv (C++)
``` shell
git clone https://github.com/EmixamPP/linux-enable-ir-emitter.git
cd linux-enable-ir-emitter
Expand All @@ -47,7 +47,7 @@ You can easily uninstall the software by executing `sudo bash installer.sh unins

If you like the project, do not hesitate to star the repository to support me, thank you !

Please consult the [wiki](https://github.com/EmixamPP/linux-enable-ir-emitter/wiki) before open an issue.
*Please consult the [wiki](https://github.com/EmixamPP/linux-enable-ir-emitter/wiki) before opening an issue.*

The software supports the configuration of multiple devices, execute the configure command and specify each time which device to configure.

Expand Down
2 changes: 1 addition & 1 deletion sources/globals.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

SAVE_DRIVER_FOLDER_PATH = "/etc/linux-enable-ir-emitter/"

LOCAL_PATH = path = os.path.dirname(os.path.abspath(__file__))
LOCAL_PATH = os.path.dirname(os.path.abspath(__file__))
UVC_DIR_PATH = LOCAL_PATH + "/driver/"
EXECUTE_DRIVER_PATH = UVC_DIR_PATH + "execute-driver"
DRIVER_GENERATOR_PATH = UVC_DIR_PATH + "driver-generator"
Expand Down
2 changes: 1 addition & 1 deletion sources/linux-enable-ir-emitter.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
parser.add_argument(
"-V", "--version",
action="version",
version="%(prog)s 4.2.1\nDevelopped by Maxime Dirksen - EmixamPP\nMIT License",
version="%(prog)s 4.1.4\nDevelopped by Maxime Dirksen - EmixamPP\nMIT License",
help="show version information and exit"
)
parser.add_argument(
Expand Down

0 comments on commit a1f73f6

Please sign in to comment.