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

[Maxime Gauduin]

    Date: Sunday, March 8, 2015 @ 20:41:25
  Author: alucryd
Revision: 128954

upgpkg: plex-home-theater 1.3.6.441-1

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

------------------------+
 PKGBUILD               |   31 ++++++++++----------------
 plex-lirc-socket.patch |   56 -----------------------------------------------
 2 files changed, 13 insertions(+), 74 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-03-08 19:35:26 UTC (rev 128953)
+++ PKGBUILD	2015-03-08 19:41:25 UTC (rev 128954)
@@ -3,9 +3,9 @@
 # Contributor: Daniel Wallace <daniel.wallace at gatech.edu>
 
 pkgname=plex-home-theater
-_pkgver=1.3.5.431-7966a4df
+_pkgver=1.3.6.441-309e72d1
 pkgver=${_pkgver%-*}
-pkgrel=2
+pkgrel=1
 pkgdesc='Plex Home Theater'
 arch=('i686' 'x86_64')
 url='http://www.plexapp.com/'
@@ -20,31 +20,24 @@
             'libshairport: AirPlay support'
             'libcec: Pulse-Eight USB-CEC adapter support'
             'pulseaudio: PulseAudio support')
-#source=("https://github.com/plexinc/plex-home-theater-public/archive/v${_pkgver}.tar.gz"
-source=("git+https://github.com/plexinc/plex-home-theater-public.git#commit=${_pkgver##*-}"
+source=("https://github.com/plexinc/plex-home-theater-public/archive/v${_pkgver}.tar.gz"
         'plex-ffmpeg-compat.patch'
         'plex-libcec-2.2.0.patch'
-        'plex-lirc-socket.patch'
         'plexhometheater.sh')
-#sha256sums=('f119d11e13ce2ea8a31805a5ea91b65d95f0fc9370d49d8da51bda1e028b564c'
-sha256sums=('SKIP'
+sha256sums=('b92ed31c38e9aff4b5a84a9ef5ced6cd4740c2ee91da48299c076254aa2d56b3'
             '5b370e4dec6998130df46ad6bd5ca6258e3a040dd6c6cc4085c335dc3d6050bd'
             '13032e8da35b0abdd22109f9ee34c63e43e0f9863fe81d4fa503c05ede23a212'
-            '630070125ad5239163d89fed5bf7f83abf4a411ac3e24aa2e41f99c5c3c8fb7f'
             'dc6bd394c07a2ececbb2f8c53cb54afd5d78f7c00a0b34acab3e71217da085fb')
 
 prepare() {
-  #cd plex-home-theater-public-${_pkgver}
-  cd plex-home-theater-public
+  cd plex-home-theater-public-${_pkgver}
 
   patch -Np1 -i ../plex-libcec-2.2.0.patch
-  patch -Np1 -i ../plex-lirc-socket.patch
   patch -Np1 -i ../plex-ffmpeg-compat.patch
 }
 
 build() {
-  #cd plex-home-theater-public-${_pkgver}
-  cd plex-home-theater-public
+  cd plex-home-theater-public-${_pkgver}
 
   if [[ -d build ]]; then
     rm -rf build
@@ -54,15 +47,17 @@
   cmake .. -DCMAKE_INSTALL_PREFIX='/usr' \
            -DCMAKE_C_FLAGS="$CMAKE_C_FLAGS -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include" \
            -DCMAKE_CXX_FLAGS="$CMAKE_CXX_FLAGS -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include" \
-           -DENABLE_{AUTOUPDATE,DUMP_SYMBOLS}='FALSE' -DENABLE_PYTHON='TRUE' \
-           -DPYTHON_EXEC='/usr/bin/python2' -DUSE_INTERNAL_FFMPEG='FALSE' \
-           -DCREATE_BUNDLE='FALSE'
+           -DCREATE_BUNDLE='FALSE' \
+           -DDUMP_SYMBOLS='FALSE' \
+           -DENABLE_AUTOUPDATE='FALSE' \
+           -DENABLE_PYTHON='TRUE' \
+           -DPYTHON_EXEC='/usr/bin/python2' \
+           -DUSE_INTERNAL_FFMPEG='FALSE'
   make
 }
 
 package() {
-  #cd plex-home-theater-public-${_pkgver}/build
-  cd plex-home-theater-public/build
+  cd plex-home-theater-public-${_pkgver}/build
 
   make DESTDIR="${pkgdir}" install
   install -dm 755 "${pkgdir}"/usr/{lib/plexhometheater,share/{applications,pixmaps}}

Deleted: plex-lirc-socket.patch
===================================================================
--- plex-lirc-socket.patch	2015-03-08 19:35:26 UTC (rev 128953)
+++ plex-lirc-socket.patch	2015-03-08 19:41:25 UTC (rev 128954)
@@ -1,56 +0,0 @@
-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
-