[arch-commits] Commit in plex-home-theater/trunk (3 files)

[Maxime Gauduin]

    Date: Monday, September 15, 2014 @ 17:52:42
  Author: alucryd
Revision: 119021

upgpkg: plex-home-theater 1.2.2-2

Added:
  plex-home-theater/trunk/plex-ffmpeg-compat.patch
Modified:
  plex-home-theater/trunk/PKGBUILD
  plex-home-theater/trunk/plexhometheater.sh

--------------------------+
 PKGBUILD                 |   31 ++++++++++++++++++++-----------
 plex-ffmpeg-compat.patch |   29 +++++++++++++++++++++++++++++
 plexhometheater.sh       |    5 +++--
 3 files changed, 52 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-09-15 11:22:01 UTC (rev 119020)
+++ PKGBUILD	2014-09-15 15:52:42 UTC (rev 119021)
@@ -4,27 +4,34 @@
 
 pkgname=plex-home-theater
 pkgver=1.2.2
-pkgrel=1
+pkgrel=2
 pkgdesc='Plex Home Theater'
 arch=('i686' 'x86_64')
 url='http://www.plexapp.com/'
 license=('GPL2')
-depends=('boost-libs' 'curl' 'fontconfig' 'glew' 'lame' 'libass' 'libcdio'
-         'libjpeg-turbo' 'libmad' 'libmicrohttpd' 'libmodplug' 'libmpeg2'
-         'libsamplerate' 'libssh' 'libusb-compat' 'libva' 'libvdpau'
-         'libxrandr' 'lzo' 'mesa' 'rtmpdump' 'sdl_image' 'sdl_mixer'
+depends=('boost-libs' 'curl' 'ffmpeg-compat' 'glew' 'libcdio' 'libmad'
+         'libmicrohttpd' 'libmpeg2' 'libsamplerate' 'libssh' 'libusb-compat'
+         'libvdpau' 'libxrandr' 'lzo' 'mesa' 'sdl_image' 'sdl_mixer'
          'smbclient' 'taglib' 'tinyxml' 'yajl')
-makedepends=('boost' 'cmake' 'doxygen' 'ftgl' 'java-environment' 'libcec'
-             'libplist' 'libshairport' 'nasm' 'swig' 'unzip' 'zip')
+makedepends=('boost' 'cmake' 'doxygen' 'java-environment' 'libcec' 'libplist'
+             'libshairport' 'nasm' 'swig' 'unzip' 'zip')
 optdepends=('libplist: AirPlay support'
             'libshairport: AirPlay support'
             '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-ffmpeg-compat.patch'
         'plexhometheater.sh')
 sha256sums=('5df5b2bfb5d02566c151e93be6a7217ca72b9e7800e6216dabf1759d920f3d2f'
-            'c551d8f50342dcfede5a11e1bae2c18b25d44b89a5a29863e5809d45ef365702')
+            '5b370e4dec6998130df46ad6bd5ca6258e3a040dd6c6cc4085c335dc3d6050bd'
+            'dc6bd394c07a2ececbb2f8c53cb54afd5d78f7c00a0b34acab3e71217da085fb')
 
+prepare() {
+  cd plex-home-theater-public-pht-v${pkgver}
+
+  patch -Np1 -i ../plex-ffmpeg-compat.patch
+}
+
 build() {
   cd plex-home-theater-public-pht-v${pkgver}
 
@@ -33,11 +40,11 @@
   fi
   mkdir build && cd build
 
-  cmake .. -DCMAKE_INSTALL_PREFIX='/opt/plexhometheater' \
+  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='TRUE' \
+           -DPYTHON_EXEC='/usr/bin/python2' -DUSE_INTERNAL_FFMPEG='FALSE' \
            -DCREATE_BUNDLE='FALSE'
   make
 }
@@ -46,7 +53,9 @@
   cd plex-home-theater-public-pht-v${pkgver}/build
 
   make DESTDIR="${pkgdir}" install
-  install -dm 755 "${pkgdir}"/usr/{bin,share/{applications,pixmaps}}
+  install -dm 755 "${pkgdir}"/usr/{lib/plexhometheater,share/{applications,pixmaps}}
+  mv "${pkgdir}"/usr/bin/{system,xbmc-xrandr} "${pkgdir}"/usr/lib/plexhometheater/
+  mv "${pkgdir}"/usr/share/XBMC "${pkgdir}"/usr/share/plexhometheater
   install -m 755 "${srcdir}"/plexhometheater.sh "${pkgdir}"/usr/bin/
   install -m 644 ../plex/Resources/plexhometheater.desktop "${pkgdir}"/usr/share/applications/
   install -m 644 ../plex/Resources/plex-icon-256.png "${pkgdir}"/usr/share/pixmaps/plexhometheater.png

Added: plex-ffmpeg-compat.patch
===================================================================
--- plex-ffmpeg-compat.patch	                        (rev 0)
+++ plex-ffmpeg-compat.patch	2014-09-15 15:52:42 UTC (rev 119021)
@@ -0,0 +1,29 @@
+diff -rupN plex-home-theater.orig/plex/CMakeModules/FindFFmpeg.cmake plex-home-theater/plex/CMakeModules/FindFFmpeg.cmake
+--- plex-home-theater.orig/plex/CMakeModules/FindFFmpeg.cmake	2014-09-15 11:46:21.751638700 +0200
++++ plex-home-theater/plex/CMakeModules/FindFFmpeg.cmake	2014-09-15 11:43:25.678039000 +0200
+@@ -41,7 +41,7 @@ MACRO(FFMPEG_FIND varname shortname head
+         /opt/csw/include # Blastwave
+         /opt/include
+         /usr/freeware/include
+-        PATH_SUFFIXES ffmpeg
++        PATH_SUFFIXES ffmpeg-compat
+         DOC "Location of FFMPEG Headers"
+     )
+ 
+@@ -62,7 +62,7 @@ MACRO(FFMPEG_FIND varname shortname head
+             /opt/csw/include # Blastwave
+             /opt/include
+             /usr/freeware/include
+-            PATH_SUFFIXES ffmpeg
++            PATH_SUFFIXES ffmpeg-compat
+             DOC "Location of FFMPEG Headers"
+         )
+     ENDIF(NOT FFMPEG_${varname}_INCLUDE_DIRS)
+@@ -85,6 +85,7 @@ MACRO(FFMPEG_FIND varname shortname head
+         /opt/csw/lib
+         /opt/lib
+         /usr/freeware/lib64
++        PATH_SUFFIXES ffmpeg-compat
+         DOC "Location of FFMPEG Libraries"
+     )
+ 


Property changes on: plex-home-theater/trunk/plex-ffmpeg-compat.patch
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Modified: plexhometheater.sh
===================================================================
--- plexhometheater.sh	2014-09-15 11:22:01 UTC (rev 119020)
+++ plexhometheater.sh	2014-09-15 15:52:42 UTC (rev 119021)
@@ -1,4 +1,5 @@
 #!/bin/sh
 
-export XBMC_HOME=/opt/plexhometheater/share/XBMC
-exec /opt/plexhometheater/bin/plexhometheater
+export XBMC_BIN_HOME='/usr/lib/plexhometheater'
+export XBMC_HOME='/usr/share/plexhometheater'
+exec plexhometheater