[arch-commits] Commit in plex-home-theater/trunk (PKGBUILD plex-lirc-socket.patch)

[Maxime Gauduin]

    Date: Thursday, October 30, 2014 @ 10:31:11
  Author: alucryd
Revision: 121596

FS#42610: plex-home-theater 1.2.2-4

Added:
  plex-home-theater/trunk/plex-lirc-socket.patch
Modified:
  plex-home-theater/trunk/PKGBUILD

------------------------+
 PKGBUILD               |    7 ++++-
 plex-lirc-socket.patch |   56 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 61 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-10-30 07:35:23 UTC (rev 121595)
+++ PKGBUILD	2014-10-30 09:31:11 UTC (rev 121596)
@@ -1,10 +1,10 @@
 # $Id$
-# Maintainer: Maxime Gauduin <alucryd at gmail.com>
+# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
 # Contributor: Daniel Wallace <daniel.wallace at gatech.edu>
 
 pkgname=plex-home-theater
 pkgver=1.2.2
-pkgrel=3
+pkgrel=4
 pkgdesc='Plex Home Theater'
 arch=('i686' 'x86_64')
 url='http://www.plexapp.com/'
@@ -20,9 +20,11 @@
             'libcec: Pulse-Eight USB-CEC adapter support'
             'pulseaudio: PulseAudio support')
 source=("https://github.com/plexinc/plex-home-theater-public/archive/pht-v${pkgver}.tar.gz"
+        'plex-lirc-socket.patch'
         'plex-ffmpeg-compat.patch'
         'plexhometheater.sh')
 sha256sums=('5df5b2bfb5d02566c151e93be6a7217ca72b9e7800e6216dabf1759d920f3d2f'
+            '630070125ad5239163d89fed5bf7f83abf4a411ac3e24aa2e41f99c5c3c8fb7f'
             '5b370e4dec6998130df46ad6bd5ca6258e3a040dd6c6cc4085c335dc3d6050bd'
             'dc6bd394c07a2ececbb2f8c53cb54afd5d78f7c00a0b34acab3e71217da085fb')
 
@@ -29,6 +31,7 @@
 prepare() {
   cd plex-home-theater-public-pht-v${pkgver}
 
+  patch -Np1 -i ../plex-lirc-socket.patch
   patch -Np1 -i ../plex-ffmpeg-compat.patch
 }
 

Added: plex-lirc-socket.patch
===================================================================
--- plex-lirc-socket.patch	                        (rev 0)
+++ plex-lirc-socket.patch	2014-10-30 09:31:11 UTC (rev 121596)
@@ -0,0 +1,56 @@
+From c20e1deb62521acaca945fe6af780cdfb477610b Mon Sep 17 00:00:00 2001
+From: Maxime Gauduin <alucryd at gmail.com>
+Date: Thu, 30 Oct 2014 09:43:48 +0100
+Subject: [PATCH] Fix lirc socket path
+
+---
+ configure.in                                | 4 ++--
+ plex/CMakeModules/PlatformConfigLINUX.cmake | 2 +-
+ plex/CMakeModules/PlatformConfigRPI.cmake   | 2 +-
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 002245a..85ad398 100644
+--- a/configure.in
++++ b/configure.in
+@@ -452,9 +452,9 @@ AC_ARG_ENABLE([texturepacker],
+ 
+ AC_ARG_WITH([lirc-device],
+   [AS_HELP_STRING([--with-lirc-device=file],
+-  [specify the default LIRC device (default is /dev/lircd)])],
++  [specify the default LIRC device (default is /var/run/lirc/lircd)])],
+   [lirc_device=$withval],
+-  [lirc_device=/dev/lircd])
++  [lirc_device=/var/run/lirc/lircd])
+ AC_DEFINE_UNQUOTED([LIRC_DEVICE], ["$lirc_device"], [Default LIRC device])
+ 
+ AC_ARG_ENABLE([udev],
+diff --git a/plex/CMakeModules/PlatformConfigLINUX.cmake b/plex/CMakeModules/PlatformConfigLINUX.cmake
+index 078fafb..3afa5c1 100644
+--- a/plex/CMakeModules/PlatformConfigLINUX.cmake
++++ b/plex/CMakeModules/PlatformConfigLINUX.cmake
+@@ -126,7 +126,7 @@ if(DEFINED OPENGL_FOUND)
+ endif()
+ 
+ #### default lircdevice
+-set(LIRC_DEVICE "/dev/lircd")
++set(LIRC_DEVICE "/var/run/lirc/lircd")
+ 
+ #### on linux we want to use a "easy" name
+ set(EXECUTABLE_NAME "plexhometheater")
+diff --git a/plex/CMakeModules/PlatformConfigRPI.cmake b/plex/CMakeModules/PlatformConfigRPI.cmake
+index 82aa751..367cdc9 100644
+--- a/plex/CMakeModules/PlatformConfigRPI.cmake
++++ b/plex/CMakeModules/PlatformConfigRPI.cmake
+@@ -103,7 +103,7 @@ list(APPEND CONFIG_INTERNAL_LIBS lib_dllsymbols)
+ 
+ 
+ #### default lircdevice
+-set(LIRC_DEVICE "/dev/lircd")
++set(LIRC_DEVICE "/var/run/lirc/lircd")
+ 
+ #### on linux we want to use a "easy" name
+ set(EXECUTABLE_NAME "plexhometheater")
+-- 
+2.1.3
+