[arch-commits] Commit in lirc/trunk (7 files)
Date: Thursday, January 15, 2015 @ 22:08:01
Author: lfleischer
Revision: 229097
Prepare lirc 0.9.2
Added:
lirc/trunk/0001-make_rel_symlink.py-Fix-Python-3-compatibility.patch
lirc/trunk/lirc.install
(from rev 229059, lirc/trunk/lirc-utils.install)
Modified:
lirc/trunk/PKGBUILD
Deleted:
lirc/trunk/lirc-0.9.1a-fix-segfaults.patch
lirc/trunk/lirc-utils.install
lirc/trunk/lirc.install
lirc/trunk/wpc8769l-build-fix.patch
---+
0001-make_rel_symlink.py-Fix-Python-3-compatibility.patch | 36
PKGBUILD | 92 ++--
lirc-0.9.1a-fix-segfaults.patch | 79 --
lirc-utils.install| 13 -
lirc.install | 27 +--
wpc8769l-build-fix.patch | 90 ---
6 files changed, 70 insertions(+), 267 deletions(-)
Added: 0001-make_rel_symlink.py-Fix-Python-3-compatibility.patch
===
--- 0001-make_rel_symlink.py-Fix-Python-3-compatibility.patch
(rev 0)
+++ 0001-make_rel_symlink.py-Fix-Python-3-compatibility.patch 2015-01-15
21:08:01 UTC (rev 229097)
@@ -0,0 +1,36 @@
+From 2628ddc723eb8c9209c3d34bed4752fdfbe88115 Mon Sep 17 00:00:00 2001
+From: Lukas Fleischer archli...@cryptocrack.de
+Date: Thu, 15 Jan 2015 21:39:11 +0100
+Subject: [PATCH] make_rel_symlink.py: Fix Python 3 compatibility
+
+---
+ tools/make_rel_symlink.py | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/tools/make_rel_symlink.py b/tools/make_rel_symlink.py
+index 5c89305..ff0403a 100755
+--- a/tools/make_rel_symlink.py
b/tools/make_rel_symlink.py
+@@ -32,16 +32,16 @@ if sys.argv[1] == -p:
+ sys.argv = sys.argv[ 1:]
+
+ if len( sys.argv ) != 3:
+-print USAGE
++print(USAGE)
+ sys.exit( 1 )
+
+ if os.path.isdir( sys.argv[2] ):
+-print Removing link target dir: + sys.argv[2]
++print(Removing link target dir: + sys.argv[2])
+ shutil.rmtree( sys.argv[2])
+
+ link_path = relative_ln_s( sys.argv[1], sys.argv[2] )
+ if just_print:
+-print link_path
++print(link_path)
+ else:
+ os.chdir( os.path.dirname( sys.argv[2]))
+ target = os.path.basename( sys.argv[2])
+--
+2.2.2
+
Modified: PKGBUILD
===
--- PKGBUILD2015-01-15 20:56:23 UTC (rev 229096)
+++ PKGBUILD2015-01-15 21:08:01 UTC (rev 229097)
@@ -1,28 +1,29 @@
-# $Id$
-# Maintainer: Paul Mattal p...@archlinux.org
+# Maintainer: Lukas Fleischer archlinux at cryptocrack dot de
+# Contributor: Paul Mattal p...@archlinux.org
-pkgbase=lirc
-pkgname=('lirc' 'lirc-utils')
-_pkgver=0.9.1a
+pkgname=lirc
+_pkgver=0.9.2
[[ $_pkgver =~ [a-z]$ ]] pkgver=${_pkgver:0:-1}.${_pkgver: -1} ||
pkgver=$_pkgver
-pkgrel=12
+pkgrel=1
epoch=1
-_extramodules=extramodules-3.18-ARCH
+pkgdesc=Linux Infrared Remote Control utils
arch=('i686' 'x86_64')
url=http://www.lirc.org/;
license=('GPL')
-# NOTICE: Don't forget to bump version in depends in package_lirc()!
-makedepends=('help2man' 'linux=3.18' 'linux3.19' 'linux-headers=3.18'
'linux-headers3.19' 'alsa-lib' 'libx11' 'libftdi-compat' 'libirman' 'python2')
-options=('!makeflags' '!strip')
-source=(http://prdownloads.sourceforge.net/${pkgbase}/${pkgbase}-${_pkgver}.tar.bz2;
-wpc8769l-build-fix.patch
-lirc-0.9.1a-fix-segfaults.patch
+depends=('alsa-lib' 'libx11' 'libftdi-compat' 'libirman')
+makedepends=('help2man' 'alsa-lib' 'libx11' 'libftdi-compat' 'libirman'
'python')
+optdepends=('python: pronto2lirc utility')
+provides=('lirc-utils')
+replaces=('lirc-utils')
+backup=('etc/lirc/lirc_options.conf' 'etc/lirc/lircd.conf'
'etc/lirc/lircmd.conf')
+install=lirc.install
+source=(http://prdownloads.sourceforge.net/${pkgname}/${pkgname}-${_pkgver}.tar.bz2;
+0001-make_rel_symlink.py-Fix-Python-3-compatibility.patch
lirc.logrotate
irexec.service
lirc.tmpfiles)
-md5sums=('1f1fac162ed309dd50f307e96a292957'
- '9ec33169b3407f74264062d7679dd269'
- 'cd00acf480e82a0bf050032732d0d733'
+md5sums=('3afc84e79c0839823cc20e7a710dd06d'
+ 'bef13bd33bafcba828ec8175652474bc'
'3deb02604b37811d41816e9b4385fcc3'
'32df3b9bc859565d6acf5f0e5b747083'
'febf25c154a7d36f01159e84f26c2d9a')
@@ -29,61 +30,18 @@
prepare() {
cd ${srcdir}/lirc-${_pkgver}
-
- patch -Np1 -i ${srcdir}/wpc8769l-build-fix.patch
- patch -Np1 -i ${srcdir}/lirc-0.9.1a-fix-segfaults.patch
-
- sed -i '/AC_PATH_XTRA/d' configure.ac
- sed -e 's/@X_CFLAGS@//g' \
- -e 's/@X_LIBS@//g' \
- -e 's/@X_PRE_LIBS@//g' \
- -e 's/@X_EXTRA_LIBS@//g' -i Makefile.am tools/Makefile.am
-
- libtoolize
- autoreconf
+ patch -p1 -i ../0001-make_rel_symlink.py-Fix-Python-3-compatibility.patch
}
build()
[arch-commits] Commit in lirc/trunk (7 files)
Date: Monday, August 4, 2014 @ 15:26:43
Author: lfleischer
Revision: 219289
Prepare lirc-1:0.9.1-1
Added:
lirc/trunk/wpc8769l-build-fix.patch
Modified:
lirc/trunk/PKGBUILD
Deleted:
lirc/trunk/kernel-2.6.39.patch
lirc/trunk/linux-3.8.patch
lirc/trunk/lirc_atiusb-kfifo.patch
lirc/trunk/lirc_wpc8769l.patch
lirc/trunk/lircd-handle-large-config.patch
-+
PKGBUILD| 52 -
kernel-2.6.39.patch | 54 --
linux-3.8.patch | 80 -
lirc_atiusb-kfifo.patch | 31 -
lirc_wpc8769l.patch | 88 -
lircd-handle-large-config.patch | 39
wpc8769l-build-fix.patch| 90 ++
7 files changed, 110 insertions(+), 324 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-08-04 12:08:14 UTC (rev 219288)
+++ PKGBUILD2014-08-04 13:26:43 UTC (rev 219289)
@@ -3,8 +3,8 @@
pkgbase=lirc
pkgname=('lirc' 'lirc-utils')
-pkgver=0.9.0
-pkgrel=76
+pkgver=0.9.1
+pkgrel=1
epoch=1
_extramodules=extramodules-3.16-ARCH
arch=('i686' 'x86_64')
@@ -13,23 +13,15 @@
### NOTICE don't forget to bump version in depends in package_lirc
makedepends=('help2man' 'linux=3.16' 'linux3.17' 'linux-headers=3.16'
'linux-headers3.17' 'alsa-lib' 'libx11' 'libftdi-compat' 'libirman' 'python2')
options=('!makeflags' '!strip')
-source=(http://prdownloads.sourceforge.net/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2
-lirc_wpc8769l.patch
-lircd-handle-large-config.patch
-lirc_atiusb-kfifo.patch
-kernel-2.6.39.patch
-linux-3.8.patch
+source=(http://prdownloads.sourceforge.net/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2;
+ wpc8769l-build-fix.patch
lirc.logrotate
lirc.service
lircm.service
irexec.service
lirc.tmpfiles)
-md5sums=('b232aef26f23fe33ea8305d276637086'
- '1cce37e18e3f6f46044abab29016d18f'
- 'b70cc9640505205446ec47b7d4779f38'
- '1f8b104a2365d9f93404b143f499059b'
- '087a7d102e1c96bf1179f38db2b0b237'
- '9ee196bd03ea44af5a752fb0cc6ca96a'
+md5sums=('3b78c3cc872d5e2fa78b796c2efd46db'
+ '9ec33169b3407f74264062d7679dd269'
'3deb02604b37811d41816e9b4385fcc3'
'a9ab637e7207472e61e55a2fa75dc555'
'1847b9997685bc3ad2cf11bea4590a92'
@@ -38,17 +30,11 @@
prepare() {
cd ${srcdir}/lirc-${pkgver}
- patch -Np1 -i ${srcdir}/lirc_wpc8769l.patch
- patch -Np1 -i ${srcdir}/lircd-handle-large-config.patch
- patch -Np1 -i ${srcdir}/lirc_atiusb-kfifo.patch
- patch -Np1 -i ${srcdir}/kernel-2.6.39.patch
- patch -Np1 -i ${srcdir}/linux-3.8.patch
- # use fixed instead of Courier w/xmode2, should be more prevalent on linux
boxen
- sed -i -e 's|char.*font1_name.*Courier.*$|char
font1_name[]=-misc-fixed-*-r-*-*-12-*-*-*-*-*-iso8859-1;|g' tools/xmode2.c
+ patch -Np1 -i ${srcdir}/wpc8769l-build-fix.patch
- # use /dev/lirc0 by default instead of /dev/lirc
- sed -i -e 's|#define DEV_LIRClirc|#define DEV_LIRC lirc0|'
config.h.in
+ # Do not use upstream systemd units yet.
+ sed -i 's/\(SUBDIRS.*\) $(SYSTEMD_DIR)/\1/' Makefile.am
sed -i '/AC_PATH_XTRA/d' configure.ac
sed -e 's/@X_CFLAGS@//g' \
@@ -56,19 +42,17 @@
-e 's/@X_PRE_LIBS@//g' \
-e 's/@X_EXTRA_LIBS@//g' -i Makefile.am tools/Makefile.am
- # fix for new automake #33497
- sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADER/' configure.ac
libtoolize
autoreconf
}
build() {
+ cd ${srcdir}/lirc-${pkgver}
_kernver=$(cat /usr/lib/modules/${_extramodules}/version)
- cd ${srcdir}/lirc-${pkgver}
PYTHON=python2 ./configure --enable-sandboxed --prefix=/usr \
- --with-driver=all --with-kerneldir=/usr/lib/modules/${_kernver}/build/ \
- --with-moduledir=/usr/lib/modules/${_kernver}/kernel/drivers/misc \
+ --with-driver=all --with-kerneldir=/usr/lib/modules/${_kernver}/build/
\
+ --with-moduledir=/usr/lib/modules/${_kernver}/kernel/drivers/misc \
--sbindir=/usr/bin --with-transmitter
# Remove drivers already in kernel
@@ -100,14 +84,18 @@
depends=('alsa-lib' 'libx11' 'libftdi-compat' 'libirman')
optdepends=('python2: pronto2lirc utility')
options=('strip')
+ backup=('etc/lirc/lirc_options.conf' 'etc/lirc/lircd.conf'
'etc/lirc/lircmd.conf')
install=lirc-utils.install
cd ${srcdir}/lirc-${pkgver}
+
make DESTDIR=${pkgdir} install
- install -D -m644 ${srcdir}/lirc.service
${pkgdir}/usr/lib/systemd/system/lirc.service
- install -D -m644 ${srcdir}/lircm.service
${pkgdir}/usr/lib/systemd/system/lircm.service
- install -D -m644 ${srcdir}/irexec.service
${pkgdir}/usr/lib/systemd/system/irexec.service
- install -D -m644 ${srcdir}/lirc.tmpfiles
${pkgdir}/usr/lib/tmpfiles.d/lirc.conf
+
+
