[arch-commits] Commit in lirc/repos (26 files)

Lukas Fleischer lfleischer at archlinux.org
Sat Jan 14 13:45:57 UTC 2017


    Date: Saturday, January 14, 2017 @ 13:45:57
  Author: lfleischer
Revision: 286362

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  lirc/repos/extra-i686/0005-lib-curl_poll.h-Ensure-build-on-unconfiguredclients.patch
    (from rev 286361, lirc/trunk/0005-lib-curl_poll.h-Ensure-build-on-unconfiguredclients.patch)
  lirc/repos/extra-i686/0006-lirc.pc-Fix-bad-library-specification-236.patch
    (from rev 286361, lirc/trunk/0006-lirc.pc-Fix-bad-library-specification-236.patch)
  lirc/repos/extra-i686/0007-Build-Use-HAVE_UINPUT-1-to-force-building-uinput-cod.patch
    (from rev 286361, lirc/trunk/0007-Build-Use-HAVE_UINPUT-1-to-force-building-uinput-cod.patch)
  lirc/repos/extra-i686/PKGBUILD
    (from rev 286361, lirc/trunk/PKGBUILD)
  lirc/repos/extra-i686/lirc.logrotate
    (from rev 286361, lirc/trunk/lirc.logrotate)
  lirc/repos/extra-i686/lirc.tmpfiles
    (from rev 286361, lirc/trunk/lirc.tmpfiles)
  lirc/repos/extra-x86_64/0005-lib-curl_poll.h-Ensure-build-on-unconfiguredclients.patch
    (from rev 286361, lirc/trunk/0005-lib-curl_poll.h-Ensure-build-on-unconfiguredclients.patch)
  lirc/repos/extra-x86_64/0006-lirc.pc-Fix-bad-library-specification-236.patch
    (from rev 286361, lirc/trunk/0006-lirc.pc-Fix-bad-library-specification-236.patch)
  lirc/repos/extra-x86_64/0007-Build-Use-HAVE_UINPUT-1-to-force-building-uinput-cod.patch
    (from rev 286361, lirc/trunk/0007-Build-Use-HAVE_UINPUT-1-to-force-building-uinput-cod.patch)
  lirc/repos/extra-x86_64/PKGBUILD
    (from rev 286361, lirc/trunk/PKGBUILD)
  lirc/repos/extra-x86_64/lirc.logrotate
    (from rev 286361, lirc/trunk/lirc.logrotate)
  lirc/repos/extra-x86_64/lirc.tmpfiles
    (from rev 286361, lirc/trunk/lirc.tmpfiles)
Deleted:
  lirc/repos/extra-i686/0005-lib-curl_poll.h-Ensure-build-on-unconfiguredclients.patch
  lirc/repos/extra-i686/0006-lirc.pc-Fix-bad-library-specification-236.patch
  lirc/repos/extra-i686/0007-Build-Use-HAVE_UINPUT-1-to-force-building-uinput-cod.patch
  lirc/repos/extra-i686/PKGBUILD
  lirc/repos/extra-i686/lirc.install
  lirc/repos/extra-i686/lirc.logrotate
  lirc/repos/extra-i686/lirc.tmpfiles
  lirc/repos/extra-x86_64/0005-lib-curl_poll.h-Ensure-build-on-unconfiguredclients.patch
  lirc/repos/extra-x86_64/0006-lirc.pc-Fix-bad-library-specification-236.patch
  lirc/repos/extra-x86_64/0007-Build-Use-HAVE_UINPUT-1-to-force-building-uinput-cod.patch
  lirc/repos/extra-x86_64/PKGBUILD
  lirc/repos/extra-x86_64/lirc.install
  lirc/repos/extra-x86_64/lirc.logrotate
  lirc/repos/extra-x86_64/lirc.tmpfiles

------------------------------------------------------------------------------+
 /0005-lib-curl_poll.h-Ensure-build-on-unconfiguredclients.patch              |   70 +++++
 /0006-lirc.pc-Fix-bad-library-specification-236.patch                        |   46 +++
 /0007-Build-Use-HAVE_UINPUT-1-to-force-building-uinput-cod.patch             |   76 ++++++
 /PKGBUILD                                                                    |  126 ++++++++++
 /lirc.logrotate                                                              |   10 
 /lirc.tmpfiles                                                               |    2 
 extra-i686/0005-lib-curl_poll.h-Ensure-build-on-unconfiguredclients.patch    |   35 --
 extra-i686/0006-lirc.pc-Fix-bad-library-specification-236.patch              |   23 -
 extra-i686/0007-Build-Use-HAVE_UINPUT-1-to-force-building-uinput-cod.patch   |   38 ---
 extra-i686/PKGBUILD                                                          |   65 -----
 extra-i686/lirc.install                                                      |   13 -
 extra-i686/lirc.logrotate                                                    |    5 
 extra-i686/lirc.tmpfiles                                                     |    1 
 extra-x86_64/0005-lib-curl_poll.h-Ensure-build-on-unconfiguredclients.patch  |   35 --
 extra-x86_64/0006-lirc.pc-Fix-bad-library-specification-236.patch            |   23 -
 extra-x86_64/0007-Build-Use-HAVE_UINPUT-1-to-force-building-uinput-cod.patch |   38 ---
 extra-x86_64/PKGBUILD                                                        |   65 -----
 extra-x86_64/lirc.install                                                    |   13 -
 extra-x86_64/lirc.logrotate                                                  |    5 
 extra-x86_64/lirc.tmpfiles                                                   |    1 
 20 files changed, 330 insertions(+), 360 deletions(-)

Deleted: extra-i686/0005-lib-curl_poll.h-Ensure-build-on-unconfiguredclients.patch
===================================================================
--- extra-i686/0005-lib-curl_poll.h-Ensure-build-on-unconfiguredclients.patch	2017-01-14 13:45:45 UTC (rev 286361)
+++ extra-i686/0005-lib-curl_poll.h-Ensure-build-on-unconfiguredclients.patch	2017-01-14 13:45:57 UTC (rev 286362)
@@ -1,35 +0,0 @@
-From 33c40d127877179e0cba2f6595816377bb6bcda1 Mon Sep 17 00:00:00 2001
-From: Alec Leamas <leamas.alec at gmail.com>
-Date: Tue, 25 Oct 2016 10:28:14 +0200
-Subject: [PATCH 05/10] lib: curl_poll.h: Ensure build on unconfiguredclients.
-
----
- lib/curl_poll.h | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/lib/curl_poll.h b/lib/curl_poll.h
-index 6144c42..af25381 100644
---- a/lib/curl_poll.h
-+++ b/lib/curl_poll.h
-@@ -21,7 +21,9 @@
-  * KIND, either express or implied.
-  *
-  ***************************************************************************/
-+#ifdef HAVE_CONFIG_H
- #include "config.h"
-+#endif
- 
- #ifdef __cplusplus
- extern "C" {
-@@ -29,7 +31,7 @@ extern "C" {
- 
- #ifdef HAVE_SYS_POLL_H
- #include <sys/poll.h>
--#elif defined(HAVE_POLL_H)
-+#else
- #include <poll.h>
- #endif
- 
--- 
-2.5.5
-

Copied: lirc/repos/extra-i686/0005-lib-curl_poll.h-Ensure-build-on-unconfiguredclients.patch (from rev 286361, lirc/trunk/0005-lib-curl_poll.h-Ensure-build-on-unconfiguredclients.patch)
===================================================================
--- extra-i686/0005-lib-curl_poll.h-Ensure-build-on-unconfiguredclients.patch	                        (rev 0)
+++ extra-i686/0005-lib-curl_poll.h-Ensure-build-on-unconfiguredclients.patch	2017-01-14 13:45:57 UTC (rev 286362)
@@ -0,0 +1,35 @@
+From 33c40d127877179e0cba2f6595816377bb6bcda1 Mon Sep 17 00:00:00 2001
+From: Alec Leamas <leamas.alec at gmail.com>
+Date: Tue, 25 Oct 2016 10:28:14 +0200
+Subject: [PATCH 05/10] lib: curl_poll.h: Ensure build on unconfiguredclients.
+
+---
+ lib/curl_poll.h | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/lib/curl_poll.h b/lib/curl_poll.h
+index 6144c42..af25381 100644
+--- a/lib/curl_poll.h
++++ b/lib/curl_poll.h
+@@ -21,7 +21,9 @@
+  * KIND, either express or implied.
+  *
+  ***************************************************************************/
++#ifdef HAVE_CONFIG_H
+ #include "config.h"
++#endif
+ 
+ #ifdef __cplusplus
+ extern "C" {
+@@ -29,7 +31,7 @@ extern "C" {
+ 
+ #ifdef HAVE_SYS_POLL_H
+ #include <sys/poll.h>
+-#elif defined(HAVE_POLL_H)
++#else
+ #include <poll.h>
+ #endif
+ 
+-- 
+2.5.5
+

Deleted: extra-i686/0006-lirc.pc-Fix-bad-library-specification-236.patch
===================================================================
--- extra-i686/0006-lirc.pc-Fix-bad-library-specification-236.patch	2017-01-14 13:45:45 UTC (rev 286361)
+++ extra-i686/0006-lirc.pc-Fix-bad-library-specification-236.patch	2017-01-14 13:45:57 UTC (rev 286362)
@@ -1,23 +0,0 @@
-From 916a48ffcb9f1c259a0fc778a2de1be729423092 Mon Sep 17 00:00:00 2001
-From: Alec Leamas <leamas.alec at gmail.com>
-Date: Tue, 25 Oct 2016 21:29:27 +0200
-Subject: [PATCH 06/10] lirc.pc: Fix bad library specification (#236).
-
----
- lirc.pc.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lirc.pc.in b/lirc.pc.in
-index 802f00e..5ed7c1c 100644
---- a/lirc.pc.in
-+++ b/lirc.pc.in
-@@ -10,5 +10,5 @@ includedir=@includedir@
- pkgdatadir=@datadir@/lirc
- plugindir=${libdir}/lirc/plugins
- 
--Libs: -L${libdir} -llirc
-+Libs: -L${libdir} -llirc_client
- Cflags: -I${includedir}
--- 
-2.5.5
-

Copied: lirc/repos/extra-i686/0006-lirc.pc-Fix-bad-library-specification-236.patch (from rev 286361, lirc/trunk/0006-lirc.pc-Fix-bad-library-specification-236.patch)
===================================================================
--- extra-i686/0006-lirc.pc-Fix-bad-library-specification-236.patch	                        (rev 0)
+++ extra-i686/0006-lirc.pc-Fix-bad-library-specification-236.patch	2017-01-14 13:45:57 UTC (rev 286362)
@@ -0,0 +1,23 @@
+From 916a48ffcb9f1c259a0fc778a2de1be729423092 Mon Sep 17 00:00:00 2001
+From: Alec Leamas <leamas.alec at gmail.com>
+Date: Tue, 25 Oct 2016 21:29:27 +0200
+Subject: [PATCH 06/10] lirc.pc: Fix bad library specification (#236).
+
+---
+ lirc.pc.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lirc.pc.in b/lirc.pc.in
+index 802f00e..5ed7c1c 100644
+--- a/lirc.pc.in
++++ b/lirc.pc.in
+@@ -10,5 +10,5 @@ includedir=@includedir@
+ pkgdatadir=@datadir@/lirc
+ plugindir=${libdir}/lirc/plugins
+ 
+-Libs: -L${libdir} -llirc
++Libs: -L${libdir} -llirc_client
+ Cflags: -I${includedir}
+-- 
+2.5.5
+

Deleted: extra-i686/0007-Build-Use-HAVE_UINPUT-1-to-force-building-uinput-cod.patch
===================================================================
--- extra-i686/0007-Build-Use-HAVE_UINPUT-1-to-force-building-uinput-cod.patch	2017-01-14 13:45:45 UTC (rev 286361)
+++ extra-i686/0007-Build-Use-HAVE_UINPUT-1-to-force-building-uinput-cod.patch	2017-01-14 13:45:57 UTC (rev 286362)
@@ -1,38 +0,0 @@
-From 0463f56357d1dd223a4d2882dbc460a0a7a7e9ad Mon Sep 17 00:00:00 2001
-From: Alec Leamas <leamas.alec at gmail.com>
-Date: Sat, 29 Oct 2016 11:06:50 +0200
-Subject: [PATCH 07/10] Build: Use HAVE_UINPUT=1 to force building uinput code
- (#238).
-
----
- configure.ac | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index cde9813..08e2c8e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -33,7 +33,7 @@ if test x$XSLTPROC != "xyes"; then
-     AC_MSG_ERROR([
-       xsltproc is required to build. It usually comes with libxml])
- fi
--AM_CONDITIONAL(HAVE_UINPUT, test -e /dev/uinput)
-+AM_CONDITIONAL(HAVE_UINPUT, test -n "$HAVE_UINPUT" -o -e /dev/uinput)
- AC_CHECK_PROG([MAN2HTML],[man2html],[yes],[no])
- AM_CONDITIONAL(HAVE_MAN2HTML, test x$MAN2HTML = xyes)
- AC_CHECK_PROG([DOXYGEN],[doxygen],[yes],[no])
-@@ -446,6 +446,11 @@ AM_CONDITIONAL(NEED_PYTHON3, [test "x$enable_python3_fix" = "xyes"])
- AC_ARG_VAR(HAVE_WORKING_POLL,[
- 	   On cross-compile: Target has a working poll(2) implementation])
- 
-+AC_ARG_VAR(HAVE_UINPUT,[
-+  If not-empty, assume uinput is available despite missing /dev/uinput
-+])
-+
-+
- suffix=$(echo "$VERSION" | sed 's/.*-//')
- AM_CONDITIONAL(DEVEL, [test x$suffix = xdevel])
- 
--- 
-2.5.5
-

Copied: lirc/repos/extra-i686/0007-Build-Use-HAVE_UINPUT-1-to-force-building-uinput-cod.patch (from rev 286361, lirc/trunk/0007-Build-Use-HAVE_UINPUT-1-to-force-building-uinput-cod.patch)
===================================================================
--- extra-i686/0007-Build-Use-HAVE_UINPUT-1-to-force-building-uinput-cod.patch	                        (rev 0)
+++ extra-i686/0007-Build-Use-HAVE_UINPUT-1-to-force-building-uinput-cod.patch	2017-01-14 13:45:57 UTC (rev 286362)
@@ -0,0 +1,38 @@
+From 0463f56357d1dd223a4d2882dbc460a0a7a7e9ad Mon Sep 17 00:00:00 2001
+From: Alec Leamas <leamas.alec at gmail.com>
+Date: Sat, 29 Oct 2016 11:06:50 +0200
+Subject: [PATCH 07/10] Build: Use HAVE_UINPUT=1 to force building uinput code
+ (#238).
+
+---
+ configure.ac | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index cde9813..08e2c8e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -33,7 +33,7 @@ if test x$XSLTPROC != "xyes"; then
+     AC_MSG_ERROR([
+       xsltproc is required to build. It usually comes with libxml])
+ fi
+-AM_CONDITIONAL(HAVE_UINPUT, test -e /dev/uinput)
++AM_CONDITIONAL(HAVE_UINPUT, test -n "$HAVE_UINPUT" -o -e /dev/uinput)
+ AC_CHECK_PROG([MAN2HTML],[man2html],[yes],[no])
+ AM_CONDITIONAL(HAVE_MAN2HTML, test x$MAN2HTML = xyes)
+ AC_CHECK_PROG([DOXYGEN],[doxygen],[yes],[no])
+@@ -446,6 +446,11 @@ AM_CONDITIONAL(NEED_PYTHON3, [test "x$enable_python3_fix" = "xyes"])
+ AC_ARG_VAR(HAVE_WORKING_POLL,[
+ 	   On cross-compile: Target has a working poll(2) implementation])
+ 
++AC_ARG_VAR(HAVE_UINPUT,[
++  If not-empty, assume uinput is available despite missing /dev/uinput
++])
++
++
+ suffix=$(echo "$VERSION" | sed 's/.*-//')
+ AM_CONDITIONAL(DEVEL, [test x$suffix = xdevel])
+ 
+-- 
+2.5.5
+

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2017-01-14 13:45:45 UTC (rev 286361)
+++ extra-i686/PKGBUILD	2017-01-14 13:45:57 UTC (rev 286362)
@@ -1,65 +0,0 @@
-# $Id$
-# Maintainer: Lukas Fleischer <lfleischer at archlinux.org>
-# Contributor: Paul Mattal <paul at archlinux.org>
-
-pkgname=lirc
-_pkgver=0.9.4c
-[[ $_pkgver =~ [a-z]$ ]] && pkgver="${_pkgver:0:-1}.${_pkgver: -1}" || pkgver="$_pkgver"
-pkgrel=3
-epoch=1
-pkgdesc="Linux Infrared Remote Control utilities"
-arch=('i686' 'x86_64')
-url="http://www.lirc.org/"
-license=('GPL')
-depends=('alsa-lib' 'libx11' 'libftdi' 'libusb-compat')
-makedepends=('help2man' 'alsa-lib' 'libx11' 'libxslt' 'python')
-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
-source=("http://prdownloads.sourceforge.net/${pkgname}/${pkgname}-${_pkgver}.tar.bz2"
-        0005-lib-curl_poll.h-Ensure-build-on-unconfiguredclients.patch
-        0006-lirc.pc-Fix-bad-library-specification-236.patch
-        0007-Build-Use-HAVE_UINPUT-1-to-force-building-uinput-cod.patch
-        lirc.logrotate
-        lirc.tmpfiles)
-sha1sums=('e6a04fa7447b2c3bc5bac7658fa2cc377ae133ed'
-          '1f8e8f206c7f2b8275c8a55d15e1520ec35602ac'
-          '03ddd50f59ce9c44b51a5855a0673cb15ded5fa4'
-          '0b4d5dfdc940a0233e6f81a07d910a6c84732577'
-          '4342b004eb53d51fcbb9af2cf136bb4990874608'
-          '5cd3f206e6e60632d9bea2ce9d22dbe5283eb129')
-
-prepare() {
-  cd "${srcdir}/lirc-${_pkgver}"
-
-  # Downstream build problems
-  patch -Np1 -i ../0005-lib-curl_poll.h-Ensure-build-on-unconfiguredclients.patch
-  patch -Np1 -i ../0006-lirc.pc-Fix-bad-library-specification-236.patch
-
-  # devtools chroots have no /dev/uinput
-  patch -Np1 -i ../0007-Build-Use-HAVE_UINPUT-1-to-force-building-uinput-cod.patch
-
-  autoreconf -fi
-}
-
-build() {
-  cd "${srcdir}/lirc-${_pkgver}"
-
-  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}" -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-i686/PKGBUILD (from rev 286361, lirc/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2017-01-14 13:45:57 UTC (rev 286362)
@@ -0,0 +1,63 @@
+# Maintainer: Lukas Fleischer <lfleischer at archlinux.org>
+# Contributor: Paul Mattal <paul at archlinux.org>
+
+pkgname=lirc
+_pkgver=0.9.4c
+[[ $_pkgver =~ [a-z]$ ]] && pkgver="${_pkgver:0:-1}.${_pkgver: -1}" || pkgver="$_pkgver"
+pkgrel=4
+epoch=1
+pkgdesc="Linux Infrared Remote Control utilities"
+arch=('i686' 'x86_64')
+url="http://www.lirc.org/"
+license=('GPL')
+depends=('alsa-lib' 'libx11' 'libftdi' 'libusb-compat')
+makedepends=('help2man' 'alsa-lib' 'libx11' 'libxslt' 'python')
+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')
+source=("http://prdownloads.sourceforge.net/${pkgname}/${pkgname}-${_pkgver}.tar.bz2"
+        0005-lib-curl_poll.h-Ensure-build-on-unconfiguredclients.patch
+        0006-lirc.pc-Fix-bad-library-specification-236.patch
+        0007-Build-Use-HAVE_UINPUT-1-to-force-building-uinput-cod.patch
+        lirc.logrotate
+        lirc.tmpfiles)
+sha1sums=('e6a04fa7447b2c3bc5bac7658fa2cc377ae133ed'
+          '1f8e8f206c7f2b8275c8a55d15e1520ec35602ac'
+          '03ddd50f59ce9c44b51a5855a0673cb15ded5fa4'
+          '0b4d5dfdc940a0233e6f81a07d910a6c84732577'
+          '4342b004eb53d51fcbb9af2cf136bb4990874608'
+          '5cd3f206e6e60632d9bea2ce9d22dbe5283eb129')
+
+prepare() {
+  cd "${srcdir}/lirc-${_pkgver}"
+
+  # Downstream build problems
+  patch -Np1 -i ../0005-lib-curl_poll.h-Ensure-build-on-unconfiguredclients.patch
+  patch -Np1 -i ../0006-lirc.pc-Fix-bad-library-specification-236.patch
+
+  # devtools chroots have no /dev/uinput
+  patch -Np1 -i ../0007-Build-Use-HAVE_UINPUT-1-to-force-building-uinput-cod.patch
+
+  autoreconf -fi
+}
+
+build() {
+  cd "${srcdir}/lirc-${_pkgver}"
+
+  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}" -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/}
+}

Deleted: extra-i686/lirc.install
===================================================================
--- extra-i686/lirc.install	2017-01-14 13:45:45 UTC (rev 286361)
+++ extra-i686/lirc.install	2017-01-14 13:45:57 UTC (rev 286362)
@@ -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
-}

Deleted: extra-i686/lirc.logrotate
===================================================================
--- extra-i686/lirc.logrotate	2017-01-14 13:45:45 UTC (rev 286361)
+++ extra-i686/lirc.logrotate	2017-01-14 13:45:57 UTC (rev 286362)
@@ -1,5 +0,0 @@
-/var/log/lircd {
-   missingok
-   notifempty
-   delaycompress
-}

Copied: lirc/repos/extra-i686/lirc.logrotate (from rev 286361, lirc/trunk/lirc.logrotate)
===================================================================
--- extra-i686/lirc.logrotate	                        (rev 0)
+++ extra-i686/lirc.logrotate	2017-01-14 13:45:57 UTC (rev 286362)
@@ -0,0 +1,5 @@
+/var/log/lircd {
+   missingok
+   notifempty
+   delaycompress
+}

Deleted: extra-i686/lirc.tmpfiles
===================================================================
--- extra-i686/lirc.tmpfiles	2017-01-14 13:45:45 UTC (rev 286361)
+++ extra-i686/lirc.tmpfiles	2017-01-14 13:45:57 UTC (rev 286362)
@@ -1 +0,0 @@
-d /run/lirc 0755 root root -

Copied: lirc/repos/extra-i686/lirc.tmpfiles (from rev 286361, lirc/trunk/lirc.tmpfiles)
===================================================================
--- extra-i686/lirc.tmpfiles	                        (rev 0)
+++ extra-i686/lirc.tmpfiles	2017-01-14 13:45:57 UTC (rev 286362)
@@ -0,0 +1 @@
+d /run/lirc 0755 root root -

Deleted: extra-x86_64/0005-lib-curl_poll.h-Ensure-build-on-unconfiguredclients.patch
===================================================================
--- extra-x86_64/0005-lib-curl_poll.h-Ensure-build-on-unconfiguredclients.patch	2017-01-14 13:45:45 UTC (rev 286361)
+++ extra-x86_64/0005-lib-curl_poll.h-Ensure-build-on-unconfiguredclients.patch	2017-01-14 13:45:57 UTC (rev 286362)
@@ -1,35 +0,0 @@
-From 33c40d127877179e0cba2f6595816377bb6bcda1 Mon Sep 17 00:00:00 2001
-From: Alec Leamas <leamas.alec at gmail.com>
-Date: Tue, 25 Oct 2016 10:28:14 +0200
-Subject: [PATCH 05/10] lib: curl_poll.h: Ensure build on unconfiguredclients.
-
----
- lib/curl_poll.h | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/lib/curl_poll.h b/lib/curl_poll.h
-index 6144c42..af25381 100644
---- a/lib/curl_poll.h
-+++ b/lib/curl_poll.h
-@@ -21,7 +21,9 @@
-  * KIND, either express or implied.
-  *
-  ***************************************************************************/
-+#ifdef HAVE_CONFIG_H
- #include "config.h"
-+#endif
- 
- #ifdef __cplusplus
- extern "C" {
-@@ -29,7 +31,7 @@ extern "C" {
- 
- #ifdef HAVE_SYS_POLL_H
- #include <sys/poll.h>
--#elif defined(HAVE_POLL_H)
-+#else
- #include <poll.h>
- #endif
- 
--- 
-2.5.5
-

Copied: lirc/repos/extra-x86_64/0005-lib-curl_poll.h-Ensure-build-on-unconfiguredclients.patch (from rev 286361, lirc/trunk/0005-lib-curl_poll.h-Ensure-build-on-unconfiguredclients.patch)
===================================================================
--- extra-x86_64/0005-lib-curl_poll.h-Ensure-build-on-unconfiguredclients.patch	                        (rev 0)
+++ extra-x86_64/0005-lib-curl_poll.h-Ensure-build-on-unconfiguredclients.patch	2017-01-14 13:45:57 UTC (rev 286362)
@@ -0,0 +1,35 @@
+From 33c40d127877179e0cba2f6595816377bb6bcda1 Mon Sep 17 00:00:00 2001
+From: Alec Leamas <leamas.alec at gmail.com>
+Date: Tue, 25 Oct 2016 10:28:14 +0200
+Subject: [PATCH 05/10] lib: curl_poll.h: Ensure build on unconfiguredclients.
+
+---
+ lib/curl_poll.h | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/lib/curl_poll.h b/lib/curl_poll.h
+index 6144c42..af25381 100644
+--- a/lib/curl_poll.h
++++ b/lib/curl_poll.h
+@@ -21,7 +21,9 @@
+  * KIND, either express or implied.
+  *
+  ***************************************************************************/
++#ifdef HAVE_CONFIG_H
+ #include "config.h"
++#endif
+ 
+ #ifdef __cplusplus
+ extern "C" {
+@@ -29,7 +31,7 @@ extern "C" {
+ 
+ #ifdef HAVE_SYS_POLL_H
+ #include <sys/poll.h>
+-#elif defined(HAVE_POLL_H)
++#else
+ #include <poll.h>
+ #endif
+ 
+-- 
+2.5.5
+

Deleted: extra-x86_64/0006-lirc.pc-Fix-bad-library-specification-236.patch
===================================================================
--- extra-x86_64/0006-lirc.pc-Fix-bad-library-specification-236.patch	2017-01-14 13:45:45 UTC (rev 286361)
+++ extra-x86_64/0006-lirc.pc-Fix-bad-library-specification-236.patch	2017-01-14 13:45:57 UTC (rev 286362)
@@ -1,23 +0,0 @@
-From 916a48ffcb9f1c259a0fc778a2de1be729423092 Mon Sep 17 00:00:00 2001
-From: Alec Leamas <leamas.alec at gmail.com>
-Date: Tue, 25 Oct 2016 21:29:27 +0200
-Subject: [PATCH 06/10] lirc.pc: Fix bad library specification (#236).
-
----
- lirc.pc.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lirc.pc.in b/lirc.pc.in
-index 802f00e..5ed7c1c 100644
---- a/lirc.pc.in
-+++ b/lirc.pc.in
-@@ -10,5 +10,5 @@ includedir=@includedir@
- pkgdatadir=@datadir@/lirc
- plugindir=${libdir}/lirc/plugins
- 
--Libs: -L${libdir} -llirc
-+Libs: -L${libdir} -llirc_client
- Cflags: -I${includedir}
--- 
-2.5.5
-

Copied: lirc/repos/extra-x86_64/0006-lirc.pc-Fix-bad-library-specification-236.patch (from rev 286361, lirc/trunk/0006-lirc.pc-Fix-bad-library-specification-236.patch)
===================================================================
--- extra-x86_64/0006-lirc.pc-Fix-bad-library-specification-236.patch	                        (rev 0)
+++ extra-x86_64/0006-lirc.pc-Fix-bad-library-specification-236.patch	2017-01-14 13:45:57 UTC (rev 286362)
@@ -0,0 +1,23 @@
+From 916a48ffcb9f1c259a0fc778a2de1be729423092 Mon Sep 17 00:00:00 2001
+From: Alec Leamas <leamas.alec at gmail.com>
+Date: Tue, 25 Oct 2016 21:29:27 +0200
+Subject: [PATCH 06/10] lirc.pc: Fix bad library specification (#236).
+
+---
+ lirc.pc.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lirc.pc.in b/lirc.pc.in
+index 802f00e..5ed7c1c 100644
+--- a/lirc.pc.in
++++ b/lirc.pc.in
+@@ -10,5 +10,5 @@ includedir=@includedir@
+ pkgdatadir=@datadir@/lirc
+ plugindir=${libdir}/lirc/plugins
+ 
+-Libs: -L${libdir} -llirc
++Libs: -L${libdir} -llirc_client
+ Cflags: -I${includedir}
+-- 
+2.5.5
+

Deleted: extra-x86_64/0007-Build-Use-HAVE_UINPUT-1-to-force-building-uinput-cod.patch
===================================================================
--- extra-x86_64/0007-Build-Use-HAVE_UINPUT-1-to-force-building-uinput-cod.patch	2017-01-14 13:45:45 UTC (rev 286361)
+++ extra-x86_64/0007-Build-Use-HAVE_UINPUT-1-to-force-building-uinput-cod.patch	2017-01-14 13:45:57 UTC (rev 286362)
@@ -1,38 +0,0 @@
-From 0463f56357d1dd223a4d2882dbc460a0a7a7e9ad Mon Sep 17 00:00:00 2001
-From: Alec Leamas <leamas.alec at gmail.com>
-Date: Sat, 29 Oct 2016 11:06:50 +0200
-Subject: [PATCH 07/10] Build: Use HAVE_UINPUT=1 to force building uinput code
- (#238).
-
----
- configure.ac | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index cde9813..08e2c8e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -33,7 +33,7 @@ if test x$XSLTPROC != "xyes"; then
-     AC_MSG_ERROR([
-       xsltproc is required to build. It usually comes with libxml])
- fi
--AM_CONDITIONAL(HAVE_UINPUT, test -e /dev/uinput)
-+AM_CONDITIONAL(HAVE_UINPUT, test -n "$HAVE_UINPUT" -o -e /dev/uinput)
- AC_CHECK_PROG([MAN2HTML],[man2html],[yes],[no])
- AM_CONDITIONAL(HAVE_MAN2HTML, test x$MAN2HTML = xyes)
- AC_CHECK_PROG([DOXYGEN],[doxygen],[yes],[no])
-@@ -446,6 +446,11 @@ AM_CONDITIONAL(NEED_PYTHON3, [test "x$enable_python3_fix" = "xyes"])
- AC_ARG_VAR(HAVE_WORKING_POLL,[
- 	   On cross-compile: Target has a working poll(2) implementation])
- 
-+AC_ARG_VAR(HAVE_UINPUT,[
-+  If not-empty, assume uinput is available despite missing /dev/uinput
-+])
-+
-+
- suffix=$(echo "$VERSION" | sed 's/.*-//')
- AM_CONDITIONAL(DEVEL, [test x$suffix = xdevel])
- 
--- 
-2.5.5
-

Copied: lirc/repos/extra-x86_64/0007-Build-Use-HAVE_UINPUT-1-to-force-building-uinput-cod.patch (from rev 286361, lirc/trunk/0007-Build-Use-HAVE_UINPUT-1-to-force-building-uinput-cod.patch)
===================================================================
--- extra-x86_64/0007-Build-Use-HAVE_UINPUT-1-to-force-building-uinput-cod.patch	                        (rev 0)
+++ extra-x86_64/0007-Build-Use-HAVE_UINPUT-1-to-force-building-uinput-cod.patch	2017-01-14 13:45:57 UTC (rev 286362)
@@ -0,0 +1,38 @@
+From 0463f56357d1dd223a4d2882dbc460a0a7a7e9ad Mon Sep 17 00:00:00 2001
+From: Alec Leamas <leamas.alec at gmail.com>
+Date: Sat, 29 Oct 2016 11:06:50 +0200
+Subject: [PATCH 07/10] Build: Use HAVE_UINPUT=1 to force building uinput code
+ (#238).
+
+---
+ configure.ac | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index cde9813..08e2c8e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -33,7 +33,7 @@ if test x$XSLTPROC != "xyes"; then
+     AC_MSG_ERROR([
+       xsltproc is required to build. It usually comes with libxml])
+ fi
+-AM_CONDITIONAL(HAVE_UINPUT, test -e /dev/uinput)
++AM_CONDITIONAL(HAVE_UINPUT, test -n "$HAVE_UINPUT" -o -e /dev/uinput)
+ AC_CHECK_PROG([MAN2HTML],[man2html],[yes],[no])
+ AM_CONDITIONAL(HAVE_MAN2HTML, test x$MAN2HTML = xyes)
+ AC_CHECK_PROG([DOXYGEN],[doxygen],[yes],[no])
+@@ -446,6 +446,11 @@ AM_CONDITIONAL(NEED_PYTHON3, [test "x$enable_python3_fix" = "xyes"])
+ AC_ARG_VAR(HAVE_WORKING_POLL,[
+ 	   On cross-compile: Target has a working poll(2) implementation])
+ 
++AC_ARG_VAR(HAVE_UINPUT,[
++  If not-empty, assume uinput is available despite missing /dev/uinput
++])
++
++
+ suffix=$(echo "$VERSION" | sed 's/.*-//')
+ AM_CONDITIONAL(DEVEL, [test x$suffix = xdevel])
+ 
+-- 
+2.5.5
+

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2017-01-14 13:45:45 UTC (rev 286361)
+++ extra-x86_64/PKGBUILD	2017-01-14 13:45:57 UTC (rev 286362)
@@ -1,65 +0,0 @@
-# $Id$
-# Maintainer: Lukas Fleischer <lfleischer at archlinux.org>
-# Contributor: Paul Mattal <paul at archlinux.org>
-
-pkgname=lirc
-_pkgver=0.9.4c
-[[ $_pkgver =~ [a-z]$ ]] && pkgver="${_pkgver:0:-1}.${_pkgver: -1}" || pkgver="$_pkgver"
-pkgrel=3
-epoch=1
-pkgdesc="Linux Infrared Remote Control utilities"
-arch=('i686' 'x86_64')
-url="http://www.lirc.org/"
-license=('GPL')
-depends=('alsa-lib' 'libx11' 'libftdi' 'libusb-compat')
-makedepends=('help2man' 'alsa-lib' 'libx11' 'libxslt' 'python')
-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
-source=("http://prdownloads.sourceforge.net/${pkgname}/${pkgname}-${_pkgver}.tar.bz2"
-        0005-lib-curl_poll.h-Ensure-build-on-unconfiguredclients.patch
-        0006-lirc.pc-Fix-bad-library-specification-236.patch
-        0007-Build-Use-HAVE_UINPUT-1-to-force-building-uinput-cod.patch
-        lirc.logrotate
-        lirc.tmpfiles)
-sha1sums=('e6a04fa7447b2c3bc5bac7658fa2cc377ae133ed'
-          '1f8e8f206c7f2b8275c8a55d15e1520ec35602ac'
-          '03ddd50f59ce9c44b51a5855a0673cb15ded5fa4'
-          '0b4d5dfdc940a0233e6f81a07d910a6c84732577'
-          '4342b004eb53d51fcbb9af2cf136bb4990874608'
-          '5cd3f206e6e60632d9bea2ce9d22dbe5283eb129')
-
-prepare() {
-  cd "${srcdir}/lirc-${_pkgver}"
-
-  # Downstream build problems
-  patch -Np1 -i ../0005-lib-curl_poll.h-Ensure-build-on-unconfiguredclients.patch
-  patch -Np1 -i ../0006-lirc.pc-Fix-bad-library-specification-236.patch
-
-  # devtools chroots have no /dev/uinput
-  patch -Np1 -i ../0007-Build-Use-HAVE_UINPUT-1-to-force-building-uinput-cod.patch
-
-  autoreconf -fi
-}
-
-build() {
-  cd "${srcdir}/lirc-${_pkgver}"
-
-  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}" -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 286361, lirc/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2017-01-14 13:45:57 UTC (rev 286362)
@@ -0,0 +1,63 @@
+# Maintainer: Lukas Fleischer <lfleischer at archlinux.org>
+# Contributor: Paul Mattal <paul at archlinux.org>
+
+pkgname=lirc
+_pkgver=0.9.4c
+[[ $_pkgver =~ [a-z]$ ]] && pkgver="${_pkgver:0:-1}.${_pkgver: -1}" || pkgver="$_pkgver"
+pkgrel=4
+epoch=1
+pkgdesc="Linux Infrared Remote Control utilities"
+arch=('i686' 'x86_64')
+url="http://www.lirc.org/"
+license=('GPL')
+depends=('alsa-lib' 'libx11' 'libftdi' 'libusb-compat')
+makedepends=('help2man' 'alsa-lib' 'libx11' 'libxslt' 'python')
+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')
+source=("http://prdownloads.sourceforge.net/${pkgname}/${pkgname}-${_pkgver}.tar.bz2"
+        0005-lib-curl_poll.h-Ensure-build-on-unconfiguredclients.patch
+        0006-lirc.pc-Fix-bad-library-specification-236.patch
+        0007-Build-Use-HAVE_UINPUT-1-to-force-building-uinput-cod.patch
+        lirc.logrotate
+        lirc.tmpfiles)
+sha1sums=('e6a04fa7447b2c3bc5bac7658fa2cc377ae133ed'
+          '1f8e8f206c7f2b8275c8a55d15e1520ec35602ac'
+          '03ddd50f59ce9c44b51a5855a0673cb15ded5fa4'
+          '0b4d5dfdc940a0233e6f81a07d910a6c84732577'
+          '4342b004eb53d51fcbb9af2cf136bb4990874608'
+          '5cd3f206e6e60632d9bea2ce9d22dbe5283eb129')
+
+prepare() {
+  cd "${srcdir}/lirc-${_pkgver}"
+
+  # Downstream build problems
+  patch -Np1 -i ../0005-lib-curl_poll.h-Ensure-build-on-unconfiguredclients.patch
+  patch -Np1 -i ../0006-lirc.pc-Fix-bad-library-specification-236.patch
+
+  # devtools chroots have no /dev/uinput
+  patch -Np1 -i ../0007-Build-Use-HAVE_UINPUT-1-to-force-building-uinput-cod.patch
+
+  autoreconf -fi
+}
+
+build() {
+  cd "${srcdir}/lirc-${_pkgver}"
+
+  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}" -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/}
+}

Deleted: extra-x86_64/lirc.install
===================================================================
--- extra-x86_64/lirc.install	2017-01-14 13:45:45 UTC (rev 286361)
+++ extra-x86_64/lirc.install	2017-01-14 13:45:57 UTC (rev 286362)
@@ -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
-}

Deleted: extra-x86_64/lirc.logrotate
===================================================================
--- extra-x86_64/lirc.logrotate	2017-01-14 13:45:45 UTC (rev 286361)
+++ extra-x86_64/lirc.logrotate	2017-01-14 13:45:57 UTC (rev 286362)
@@ -1,5 +0,0 @@
-/var/log/lircd {
-   missingok
-   notifempty
-   delaycompress
-}

Copied: lirc/repos/extra-x86_64/lirc.logrotate (from rev 286361, lirc/trunk/lirc.logrotate)
===================================================================
--- extra-x86_64/lirc.logrotate	                        (rev 0)
+++ extra-x86_64/lirc.logrotate	2017-01-14 13:45:57 UTC (rev 286362)
@@ -0,0 +1,5 @@
+/var/log/lircd {
+   missingok
+   notifempty
+   delaycompress
+}

Deleted: extra-x86_64/lirc.tmpfiles
===================================================================
--- extra-x86_64/lirc.tmpfiles	2017-01-14 13:45:45 UTC (rev 286361)
+++ extra-x86_64/lirc.tmpfiles	2017-01-14 13:45:57 UTC (rev 286362)
@@ -1 +0,0 @@
-d /run/lirc 0755 root root -

Copied: lirc/repos/extra-x86_64/lirc.tmpfiles (from rev 286361, lirc/trunk/lirc.tmpfiles)
===================================================================
--- extra-x86_64/lirc.tmpfiles	                        (rev 0)
+++ extra-x86_64/lirc.tmpfiles	2017-01-14 13:45:57 UTC (rev 286362)
@@ -0,0 +1 @@
+d /run/lirc 0755 root root -



More information about the arch-commits mailing list