Date: Sunday, October 16, 2022 @ 17:12:35
Author: arojas
Revision: 458255
archrelease: copy trunk to extra-x86_64
Added:
lirc/repos/extra-x86_64/PKGBUILD
(from rev 458254, lirc/trunk/PKGBUILD)
lirc/repos/extra-x86_64/lirc-0.10-build-fix.patch
(from rev 458254, lirc/trunk/lirc-0.10-build-fix.patch)
lirc/repos/extra-x86_64/lirc.logrotate
(from rev 458254, lirc/trunk/lirc.logrotate)
lirc/repos/extra-x86_64/lirc.tmpfiles
(from rev 458254, lirc/trunk/lirc.tmpfiles)
lirc/repos/extra-x86_64/python-yaml-6.patch
(from rev 458254, lirc/trunk/python-yaml-6.patch)
Deleted:
lirc/repos/extra-x86_64/PKGBUILD
lirc/repos/extra-x86_64/lirc-0.10-build-fix.patch
lirc/repos/extra-x86_64/lirc.logrotate
lirc/repos/extra-x86_64/lirc.tmpfiles
lirc/repos/extra-x86_64/python-yaml-6.patch
---------------------------+
PKGBUILD | 120 ++++++++++++++-------------------
lirc-0.10-build-fix.patch | 60 ++++++++--------
lirc.logrotate | 10 +-
lirc.tmpfiles | 2
python-yaml-6.patch | 156 ++++++++++++++++++++++----------------------
5 files changed, 167 insertions(+), 181 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-10-16 17:12:19 UTC (rev 458254)
+++ PKGBUILD 2022-10-16 17:12:35 UTC (rev 458255)
@@ -1,67 +0,0 @@
-# Maintainer: Lukas Fleischer <lfleisc...@archlinux.org>
-# Contributor: Paul Mattal <p...@archlinux.org>
-
-pkgname=lirc
-_pkgver=0.10.1
-[[ $_pkgver =~ [a-z]$ ]] && pkgver="${_pkgver:0:-1}.${_pkgver: -1}" ||
pkgver="$_pkgver"
-pkgrel=12
-epoch=1
-pkgdesc="Linux Infrared Remote Control utilities"
-arch=('x86_64')
-url="https://www.lirc.org/";
-license=('GPL')
-depends=('alsa-lib' 'libx11' 'libftdi' 'libusb-compat')
-makedepends=('help2man' 'alsa-lib' 'libx11' 'libxslt' 'python'
'python-setuptools'
- 'python-yaml' 'systemd')
-optdepends=('python: for lirc-setup, irdb-get and pronto2lirc'
- 'python-gobject: for lirc-setup and irdb-get'
- 'python-yaml: for lirc-setup and irdb-get')
-provides=('lirc-utils')
-conflicts=('lirc-utils')
-replaces=('lirc-utils')
-backup=('etc/lirc/lirc_options.conf' 'etc/lirc/lircd.conf'
'etc/lirc/lircmd.conf')
-source=("https://prdownloads.sourceforge.net/${pkgname}/${pkgname}-${_pkgver}.tar.bz2";
- lirc-0.10-build-fix.patch
- lirc.logrotate
- lirc.tmpfiles
- python-yaml-6.patch)
-sha1sums=('9d6f6d18ac566a96ef4ca1d6909a4e8bc517d48a'
- '952ce902c94d822b0113d8e74bc6fda6a551ad7e'
- '4342b004eb53d51fcbb9af2cf136bb4990874608'
- '5cd3f206e6e60632d9bea2ce9d22dbe5283eb129'
- '3d6d40bba363051ae36c09709dc5a41166cf2d51')
-
-prepare() {
- cd "${srcdir}/lirc-${_pkgver}"
-
- patch -p1 -i ../lirc-0.10-build-fix.patch
- patch -p1 -i ../python-yaml-6.patch # Fix build with python-yaml 6
-
- autoreconf -fi
- automake -ac
-}
-
-build() {
- cd "${srcdir}/lirc-${_pkgver}"
-
- ./configure \
- --prefix=/usr \
- --sbindir=/usr/bin \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --enable-devinput \
- --enable-uinput
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
- make
-}
-
-package() {
- cd "${srcdir}/lirc-${_pkgver}"
-
- make DESTDIR="${pkgdir}" -j1 install
-
- install -Dm644 "${srcdir}"/lirc.tmpfiles
"${pkgdir}"/usr/lib/tmpfiles.d/lirc.conf
- install -Dm644 "${srcdir}"/lirc.logrotate "${pkgdir}"/etc/logrotate.d/lirc
-
- rmdir "${pkgdir}"/var/{run/lirc/,run/}
-}
Copied: lirc/repos/extra-x86_64/PKGBUILD (from rev 458254, lirc/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-10-16 17:12:35 UTC (rev 458255)
@@ -0,0 +1,53 @@
+# Maintainer: Lukas Fleischer <lfleisc...@archlinux.org>
+# Contributor: Paul Mattal <p...@archlinux.org>
+
+pkgname=lirc
+_pkgver=0.10.2
+[[ $_pkgver =~ [a-z]$ ]] && pkgver="${_pkgver:0:-1}.${_pkgver: -1}" ||
pkgver="$_pkgver"
+pkgrel=1
+epoch=1
+pkgdesc="Linux Infrared Remote Control utilities"
+arch=('x86_64')
+url="https://www.lirc.org/";
+license=('GPL')
+depends=('alsa-lib' 'libx11' 'libftdi' 'libusb-compat')
+makedepends=('help2man' 'alsa-lib' 'libx11' 'libxslt' 'python'
'python-setuptools'
+ 'python-yaml' 'systemd')
+optdepends=('python: for lirc-setup, irdb-get and pronto2lirc'
+ 'python-gobject: for lirc-setup and irdb-get'
+ 'python-yaml: for lirc-setup and irdb-get')
+provides=('lirc-utils')
+conflicts=('lirc-utils')
+replaces=('lirc-utils')
+backup=('etc/lirc/lirc_options.conf' 'etc/lirc/lircd.conf'
'etc/lirc/lircmd.conf')
+source=("https://prdownloads.sourceforge.net/${pkgname}/${pkgname}-${_pkgver}.tar.bz2";
+ lirc.logrotate
+ lirc.tmpfiles)
+sha1sums=('02092890205891b6de5a699294485a1eedba46c5'
+ '4342b004eb53d51fcbb9af2cf136bb4990874608'
+ '5cd3f206e6e60632d9bea2ce9d22dbe5283eb129')
+
+build() {
+ cd lirc-${_pkgver}
+
+ ./configure \
+ --prefix=/usr \
+ --sbindir=/usr/bin \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --enable-devinput \
+ --enable-uinput
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+ make
+}
+
+package() {
+ cd lirc-${_pkgver}
+
+ make DESTDIR="${pkgdir}" install
+
+ install -Dm644 "${srcdir}"/lirc.tmpfiles
"${pkgdir}"/usr/lib/tmpfiles.d/lirc.conf
+ install -Dm644 "${srcdir}"/lirc.logrotate "${pkgdir}"/etc/logrotate.d/lirc
+
+ rmdir "${pkgdir}"/var/{run/lirc/,run/}
+}
Deleted: lirc-0.10-build-fix.patch
===================================================================
--- lirc-0.10-build-fix.patch 2022-10-16 17:12:19 UTC (rev 458254)
+++ lirc-0.10-build-fix.patch 2022-10-16 17:12:35 UTC (rev 458255)
@@ -1,30 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 58347d8..8c7fca2 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -77,15 +77,10 @@ AC_TYPE_UINT64_T
-
- dnl AC_TYPE_GETGROUPS seems broken on recent MacOS, so:
- AC_MSG_CHECKING([Figure out if getgrouplist() needs gid_t or int])
--oldcflags="$CFLAGS"
--export CFLAGS=-Werror
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
- #include <unistd.h>
--#include <grp.h>
-- ]], [[
--gid_t groups[32]; int ngroups; const char* user = "root";
--getgrouplist(user, 1, groups, &ngroups);
-- ]])],[
-+int getgroups(int gidsetsize, gid_t grouplist[]);
-+ ]], [[ ]])],[
- AC_MSG_RESULT(gid_t)
- AC_DEFINE(GETGROUPS_T,[gid_t])
- ],[
-@@ -93,7 +88,6 @@ getgrouplist(user, 1, groups, &ngroups);
- AC_DEFINE(GETGROUPS_T,[int])
- ]
- )
--export CFLAGS="$oldcflags"
-
- dnl Checks for library functions.
- AC_CHECK_FUNCS(gethostname gettimeofday mkfifo select socket strdup \
Copied: lirc/repos/extra-x86_64/lirc-0.10-build-fix.patch (from rev 458254,
lirc/trunk/lirc-0.10-build-fix.patch)
===================================================================
--- lirc-0.10-build-fix.patch (rev 0)
+++ lirc-0.10-build-fix.patch 2022-10-16 17:12:35 UTC (rev 458255)
@@ -0,0 +1,30 @@
+diff --git a/configure.ac b/configure.ac
+index 58347d8..8c7fca2 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -77,15 +77,10 @@ AC_TYPE_UINT64_T
+
+ dnl AC_TYPE_GETGROUPS seems broken on recent MacOS, so:
+ AC_MSG_CHECKING([Figure out if getgrouplist() needs gid_t or int])
+-oldcflags="$CFLAGS"
+-export CFLAGS=-Werror
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+ #include <unistd.h>
+-#include <grp.h>
+- ]], [[
+-gid_t groups[32]; int ngroups; const char* user = "root";
+-getgrouplist(user, 1, groups, &ngroups);
+- ]])],[
++int getgroups(int gidsetsize, gid_t grouplist[]);
++ ]], [[ ]])],[
+ AC_MSG_RESULT(gid_t)
+ AC_DEFINE(GETGROUPS_T,[gid_t])
+ ],[
+@@ -93,7 +88,6 @@ getgrouplist(user, 1, groups, &ngroups);
+ AC_DEFINE(GETGROUPS_T,[int])
+ ]
+ )
+-export CFLAGS="$oldcflags"
+
+ dnl Checks for library functions.
+ AC_CHECK_FUNCS(gethostname gettimeofday mkfifo select socket strdup \
Deleted: lirc.logrotate
===================================================================
--- lirc.logrotate 2022-10-16 17:12:19 UTC (rev 458254)
+++ lirc.logrotate 2022-10-16 17:12:35 UTC (rev 458255)
@@ -1,5 +0,0 @@
-/var/log/lircd {
- missingok
- notifempty
- delaycompress
-}
Copied: lirc/repos/extra-x86_64/lirc.logrotate (from rev 458254,
lirc/trunk/lirc.logrotate)
===================================================================
--- lirc.logrotate (rev 0)
+++ lirc.logrotate 2022-10-16 17:12:35 UTC (rev 458255)
@@ -0,0 +1,5 @@
+/var/log/lircd {
+ missingok
+ notifempty
+ delaycompress
+}
Deleted: lirc.tmpfiles
===================================================================
--- lirc.tmpfiles 2022-10-16 17:12:19 UTC (rev 458254)
+++ lirc.tmpfiles 2022-10-16 17:12:35 UTC (rev 458255)
@@ -1 +0,0 @@
-d /run/lirc 0755 root root -
Copied: lirc/repos/extra-x86_64/lirc.tmpfiles (from rev 458254,
lirc/trunk/lirc.tmpfiles)
===================================================================
--- lirc.tmpfiles (rev 0)
+++ lirc.tmpfiles 2022-10-16 17:12:35 UTC (rev 458255)
@@ -0,0 +1 @@
+d /run/lirc 0755 root root -
Deleted: python-yaml-6.patch
===================================================================
--- python-yaml-6.patch 2022-10-16 17:12:19 UTC (rev 458254)
+++ python-yaml-6.patch 2022-10-16 17:12:35 UTC (rev 458255)
@@ -1,78 +0,0 @@
-From bb6a390633f32942ac10f9b7b7fc01dfbd395a48 Mon Sep 17 00:00:00 2001
-From: Alec Leamas <leamas.a...@nowhere.net>
-Date: Fri, 21 Jan 2022 14:00:54 +0100
-Subject: [PATCH] database.py: Handle new PyYAML interface.
-
----
- python-pkg/lirc/database.py | 12 ++++++++----
- tools/check_configs.py | 4 ++++
- 2 files changed, 12 insertions(+), 4 deletions(-)
-
-diff --git a/python-pkg/lirc/database.py b/python-pkg/lirc/database.py
-index d464c2ab..d1f42c64 100644
---- a/python-pkg/lirc/database.py
-+++ b/python-pkg/lirc/database.py
-@@ -44,6 +44,10 @@ import sys
-
- try:
- import yaml
-+ try:
-+ from yaml import CLoader as Loader, CDumper as Dumper
-+ except ImportError:
-+ from yaml import Loader, Dumper
- except ImportError:
- _YAML_MSG = '''
- "Cannot import the yaml library. Please install the python3
-@@ -66,7 +70,7 @@ def _load_kerneldrivers(configdir):
- '''
-
- with open(os.path.join(configdir, "kernel-drivers.yaml")) as f:
-- cf = yaml.load(f.read())
-+ cf = yaml.load(f.read(), Loader = Loader)
- drivers = cf['drivers'].copy()
- for driver in cf['drivers']:
- if driver == 'default':
-@@ -132,14 +136,14 @@ class Database(object):
- yamlpath = configdir
- db = {}
- with open(os.path.join(yamlpath, "confs_by_driver.yaml")) as f:
-- cf = yaml.load(f.read())
-+ cf = yaml.load(f.read(), Loader = Loader)
- db['lircd_by_driver'] = cf['lircd_by_driver'].copy()
- db['lircmd_by_driver'] = cf['lircmd_by_driver'].copy()
-
- db['kernel-drivers'] = _load_kerneldrivers(configdir)
- db['drivers'] = db['kernel-drivers'].copy()
- with open(os.path.join(yamlpath, "drivers.yaml")) as f:
-- cf = yaml.load(f.read())
-+ cf = yaml.load(f.read(), Loader = Loader)
- db['drivers'].update(cf['drivers'].copy())
- for key, d in db['drivers'].items():
- d['id'] = key
-@@ -158,7 +162,7 @@ class Database(object):
- configs = {}
- for path in glob.glob(configdir + '/*.conf'):
- with open(path) as f:
-- cf = yaml.load(f.read())
-+ cf = yaml.load(f.read(), Loader = Loader)
- configs[cf['config']['id']] = cf['config']
- db['configs'] = configs
- self.db = db
-diff --git a/tools/check_configs.py b/tools/check_configs.py
-index 1e0d831b..5e458de7 100755
---- a/tools/check_configs.py
-+++ b/tools/check_configs.py
-@@ -4,6 +4,10 @@
-
- import glob
- import yaml
-+try:
-+ from yaml import CLoader as Loader, CDumper as Dumper
-+except ImportError:
-+ from yaml import Loader, Dumper
-
- def main():
- configs = {}
---
-2.34.1
-
Copied: lirc/repos/extra-x86_64/python-yaml-6.patch (from rev 458254,
lirc/trunk/python-yaml-6.patch)
===================================================================
--- python-yaml-6.patch (rev 0)
+++ python-yaml-6.patch 2022-10-16 17:12:35 UTC (rev 458255)
@@ -0,0 +1,78 @@
+From bb6a390633f32942ac10f9b7b7fc01dfbd395a48 Mon Sep 17 00:00:00 2001
+From: Alec Leamas <leamas.a...@nowhere.net>
+Date: Fri, 21 Jan 2022 14:00:54 +0100
+Subject: [PATCH] database.py: Handle new PyYAML interface.
+
+---
+ python-pkg/lirc/database.py | 12 ++++++++----
+ tools/check_configs.py | 4 ++++
+ 2 files changed, 12 insertions(+), 4 deletions(-)
+
+diff --git a/python-pkg/lirc/database.py b/python-pkg/lirc/database.py
+index d464c2ab..d1f42c64 100644
+--- a/python-pkg/lirc/database.py
++++ b/python-pkg/lirc/database.py
+@@ -44,6 +44,10 @@ import sys
+
+ try:
+ import yaml
++ try:
++ from yaml import CLoader as Loader, CDumper as Dumper
++ except ImportError:
++ from yaml import Loader, Dumper
+ except ImportError:
+ _YAML_MSG = '''
+ "Cannot import the yaml library. Please install the python3
+@@ -66,7 +70,7 @@ def _load_kerneldrivers(configdir):
+ '''
+
+ with open(os.path.join(configdir, "kernel-drivers.yaml")) as f:
+- cf = yaml.load(f.read())
++ cf = yaml.load(f.read(), Loader = Loader)
+ drivers = cf['drivers'].copy()
+ for driver in cf['drivers']:
+ if driver == 'default':
+@@ -132,14 +136,14 @@ class Database(object):
+ yamlpath = configdir
+ db = {}
+ with open(os.path.join(yamlpath, "confs_by_driver.yaml")) as f:
+- cf = yaml.load(f.read())
++ cf = yaml.load(f.read(), Loader = Loader)
+ db['lircd_by_driver'] = cf['lircd_by_driver'].copy()
+ db['lircmd_by_driver'] = cf['lircmd_by_driver'].copy()
+
+ db['kernel-drivers'] = _load_kerneldrivers(configdir)
+ db['drivers'] = db['kernel-drivers'].copy()
+ with open(os.path.join(yamlpath, "drivers.yaml")) as f:
+- cf = yaml.load(f.read())
++ cf = yaml.load(f.read(), Loader = Loader)
+ db['drivers'].update(cf['drivers'].copy())
+ for key, d in db['drivers'].items():
+ d['id'] = key
+@@ -158,7 +162,7 @@ class Database(object):
+ configs = {}
+ for path in glob.glob(configdir + '/*.conf'):
+ with open(path) as f:
+- cf = yaml.load(f.read())
++ cf = yaml.load(f.read(), Loader = Loader)
+ configs[cf['config']['id']] = cf['config']
+ db['configs'] = configs
+ self.db = db
+diff --git a/tools/check_configs.py b/tools/check_configs.py
+index 1e0d831b..5e458de7 100755
+--- a/tools/check_configs.py
++++ b/tools/check_configs.py
+@@ -4,6 +4,10 @@
+
+ import glob
+ import yaml
++try:
++ from yaml import CLoader as Loader, CDumper as Dumper
++except ImportError:
++ from yaml import Loader, Dumper
+
+ def main():
+ configs = {}
+--
+2.34.1
+
