lirc: update to 0.10.1

4 files changed, 57 insertions, 37 deletions

diff --git a/abs/core/lirc/PKGBUILD b/abs/core/lirc/PKGBUILD
index c9b70c1..2734220 100644
--- a/abs/core/lirc/PKGBUILD
+++ b/abs/core/lirc/PKGBUILD
@@ -1,48 +1,55 @@
-# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
+# Maintainer: Lukas Fleischer <lfleischer@archlinux.org>
 # Contributor: Paul Mattal <paul@archlinux.org>
 
 pkgname=lirc
-_pkgver=0.9.2a
+_pkgver=0.10.1
 [[ $_pkgver =~ [a-z]$ ]] && pkgver="${_pkgver:0:-1}.${_pkgver: -1}" || pkgver="$_pkgver"
-pkgrel=2
+pkgrel=1
 epoch=1
-pkgdesc="Linux Infrared Remote Control utils"
-arch=('i686' 'x86_64')
+pkgdesc="Linux Infrared Remote Control utilities"
+arch=('x86_64')
 url="http://www.lirc.org/"
 license=('GPL')
-depends=('alsa-lib' 'libx11' 'libftdi-compat' 'libirman' 'iguanair')
-makedepends=('help2man' 'alsa-lib' 'libx11' 'libftdi-compat' 'libirman' 'python2')
-#optdepends=('python: for lirc-setup, irdb-get and pronto2lirc')
+depends=('alsa-lib' 'iguanair' 'libx11' 'libftdi' 'libusb-compat')
+makedepends=('help2man' 'alsa-lib' 'libx11' 'libxslt' 'python' 'python-setuptools')
+optdepends=('python: for lirc-setup, irdb-get and pronto2lirc')
 provides=('lirc-utils')
 conflicts=('lirc-utils')
 replaces=('lirc-utils')
-#backup=('etc/lirc/lirc_options.conf' 'etc/lirc/lircd.conf' 'etc/lirc/lircmd.conf')
-install=lirc.install
+backup=('etc/lirc/lirc_options.conf' 'etc/lirc/lircd.conf' 'etc/lirc/lircmd.conf')
 source=("http://prdownloads.sourceforge.net/${pkgname}/${pkgname}-${_pkgver}.tar.bz2"
+        lirc-0.10-build-fix.patch
         lirc.logrotate
         lirc.tmpfiles)
-md5sums=('639a14ed0b3b34ae227a047b952ea368'
-         '3deb02604b37811d41816e9b4385fcc3'
-         'febf25c154a7d36f01159e84f26c2d9a')
+sha1sums=('9d6f6d18ac566a96ef4ca1d6909a4e8bc517d48a'
+          '952ce902c94d822b0113d8e74bc6fda6a551ad7e'
+          '4342b004eb53d51fcbb9af2cf136bb4990874608'
+          '5cd3f206e6e60632d9bea2ce9d22dbe5283eb129')
 
-build() {
+prepare() {
   cd "${srcdir}/lirc-${_pkgver}"
 
-  # don't user python3
-  sed -i 's:#!/usr/bin/env python3:#!/usr/bin/env python:' ./tools/make_rel_symlink.py
+  patch -p1 -i ../lirc-0.10-build-fix.patch
+
+  autoreconf -fi
+  automake -ac
+}
+
+build() {
+  cd "${srcdir}/lirc-${_pkgver}"
 
-  ./configure --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc --localstatedir=/var \
-	  --with-transmitter --enable-sandboxed 
+  HAVE_UINPUT=1 ./configure --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc --localstatedir=/var
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
   make
 }
 
 package() {
   cd "${srcdir}/lirc-${_pkgver}"
 
-  make DESTDIR="${pkgdir}" install
+  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/,}
+  rmdir "${pkgdir}"/var/{run/lirc/,run/}
 }
diff --git a/abs/core/lirc/__changelog b/abs/core/lirc/__changelog
index 5d3d026..fa92350 100644
--- a/abs/core/lirc/__changelog
+++ b/abs/core/lirc/__changelog
@@ -1,5 +1 @@
 PKGBUILD: add 'iguanair' to depends
-PKGBUILD: change dep python to python2
-PKGBUILD: comment out optdepends
-PKGBUILD: add sed to not use python3
-lirc.install: comment out service message
diff --git a/abs/core/lirc/lirc-0.10-build-fix.patch b/abs/core/lirc/lirc-0.10-build-fix.patch
new file mode 100644
index 0000000..41353db
--- /dev/null
+++ b/abs/core/lirc/lirc-0.10-build-fix.patch
@@ -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 \
diff --git a/abs/core/lirc/lirc.install b/abs/core/lirc/lirc.install
deleted file mode 100644
index cc5d931..0000000
--- a/abs/core/lirc/lirc.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-	systemd-tmpfiles --create lirc.conf
-}
-
-post_upgrade() {
-	post_install
-
-#	if [[ "$(vercmp $2 1:0.9.1-1)" -lt 0 ]]; then
-#		echo ':: lirc.service and lircm.service have been replaced'
-#		echo '   by the upstream unit files lircd.service and'
-#		echo '   lircmd.service.'
-#	fi
-}