diff --git a/AUR/git/PKGBUILD b/AUR/git/PKGBUILD index 9122e34a..7be18faa 100644 --- a/AUR/git/PKGBUILD +++ b/AUR/git/PKGBUILD @@ -1,10 +1,10 @@ # Maintainer: Maxime Dirksen -# Co-Maintener: supdrewin +# Co-Maintener: supdrewin # Co-Maintainer: Fabio 'Lolix' Loli -# Contributor: Nikolay Bryskin +# Co-Maintainer: Nikolay Bryskin 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" @@ -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}" @@ -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}/ } diff --git a/AUR/release/PKGBUILD b/AUR/release/PKGBUILD index 5b901a16..09316696 100644 --- a/AUR/release/PKGBUILD +++ b/AUR/release/PKGBUILD @@ -1,11 +1,11 @@ # Maintainer: Maxime Dirksen -# Co-Maintener: Supdrewin +# Co-Maintener: Supdrewin # Co-Maintainer: Andrey Kolchenko # Co-Maintainer: Rui ZHAO # Contributor: Antoine Bertin 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." @@ -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}" diff --git a/COPR/linux-enable-ir-emitter.spec b/COPR/linux-enable-ir-emitter.spec index 88560432..81fd5e3c 100644 --- a/COPR/linux-enable-ir-emitter.spec +++ b/COPR/linux-enable-ir-emitter.spec @@ -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} @@ -89,6 +89,9 @@ if [ "$1" -eq 0 ]; then fi %changelog +* Thu Aug 11 2022 Maxime Dirksen - 4.1.4-1 +- Force V4l2 backend in opencv +- Improvement of driver generation * Mon Jul 4 2022 Maxime Dirksen - 4.1.2-1 - Asynchronous camera triggering - Fix camera triggering issue diff --git a/PPA/changelog b/PPA/changelog index c80f1017..575b96ce 100644 --- a/PPA/changelog +++ b/PPA/changelog @@ -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 Thu, 11 Aug 2022 12:00:00 +0200 + linux-enable-ir-emitter (4.1.2) jammy; urgency=medium * Asynchronous camera triggering diff --git a/README.md b/README.md index 04130364..d1d3acad 100644 --- a/README.md +++ b/README.md @@ -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 @@ -22,8 +22,8 @@ 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 @@ -31,7 +31,7 @@ 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 @@ -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. diff --git a/sources/globals.py b/sources/globals.py index e10c61f9..e1d23d95 100644 --- a/sources/globals.py +++ b/sources/globals.py @@ -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" diff --git a/sources/linux-enable-ir-emitter.py b/sources/linux-enable-ir-emitter.py index b3e5adef..e31f36fd 100755 --- a/sources/linux-enable-ir-emitter.py +++ b/sources/linux-enable-ir-emitter.py @@ -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(