Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 13 Apr 2015 18:47:49 +0000 (UTC)
From:      Adam Weinberger <adamw@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r383947 - in head/multimedia/plexhometheater: . files
Message-ID:  <201504131847.t3DIlnWe048365@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: adamw
Date: Mon Apr 13 18:47:49 2015
New Revision: 383947
URL: https://svnweb.freebsd.org/changeset/ports/383947

Log:
  Update to 1.3.6.
  
  PR:		194416
  Submitted by:	Ben Woods (maintainer)

Deleted:
  head/multimedia/plexhometheater/files/patch-CMakeLists.txt
  head/multimedia/plexhometheater/files/patch-lib__CMakeLists.txt
  head/multimedia/plexhometheater/files/patch-lib__cpluff__CMakeLists.txt
  head/multimedia/plexhometheater/files/patch-lib__cximage-6.0__CMakeLists.txt
  head/multimedia/plexhometheater/files/patch-lib__ffmpeg__CMakeLists.txt
  head/multimedia/plexhometheater/files/patch-lib__libdvd__libdvdcss__CMakeLists.txt
  head/multimedia/plexhometheater/files/patch-lib__libdvd__libdvdnav__CMakeLists.txt
  head/multimedia/plexhometheater/files/patch-plex__CMakeLists.txt
  head/multimedia/plexhometheater/files/patch-plex__CMakeModules__CMakeConfig.cmake
  head/multimedia/plexhometheater/files/patch-plex__CMakeModules__CPackConfig.cmake
  head/multimedia/plexhometheater/files/patch-plex__CMakeModules__FindExecinfo.cmake
  head/multimedia/plexhometheater/files/patch-plex__CMakeModules__PlatformConfigPOSIX.cmake
  head/multimedia/plexhometheater/files/patch-plex__Network__CMakeLists.txt
  head/multimedia/plexhometheater/files/patch-plex__Network__NetworkInterfaceBSD.cpp
  head/multimedia/plexhometheater/files/patch-plex__config.h.in
  head/multimedia/plexhometheater/files/patch-xbmc__CMakeLists.txt
  head/multimedia/plexhometheater/files/patch-xbmc__cdrip__CMakeLists.txt
  head/multimedia/plexhometheater/files/patch-xbmc__cores__AudioEngine__Sinks__CMakeLists.txt
  head/multimedia/plexhometheater/files/patch-xbmc__cores__DllLoader__CMakeLists.txt
  head/multimedia/plexhometheater/files/patch-xbmc__cores__dvdplayer__DVDCodecs__Video__CMakeLists.txt
  head/multimedia/plexhometheater/files/patch-xbmc__input__CMakeLists.txt
  head/multimedia/plexhometheater/files/patch-xbmc__linux__CMakeLists.txt
  head/multimedia/plexhometheater/files/patch-xbmc__storage__CMakeLists.txt
  head/multimedia/plexhometheater/files/patch-xbmc__visualizations__XBMCProjectM__CMakeLists.txt
  head/multimedia/plexhometheater/files/patch-xbmc__windowing__CMakeLists.txt
Modified:
  head/multimedia/plexhometheater/Makefile
  head/multimedia/plexhometheater/distinfo
  head/multimedia/plexhometheater/files/patch-libcec22
  head/multimedia/plexhometheater/files/patch-plex__CMakeModules__PlatformConfigFREEBSD.cmake
  head/multimedia/plexhometheater/pkg-plist

Modified: head/multimedia/plexhometheater/Makefile
==============================================================================
--- head/multimedia/plexhometheater/Makefile	Mon Apr 13 18:17:01 2015	(r383946)
+++ head/multimedia/plexhometheater/Makefile	Mon Apr 13 18:47:49 2015	(r383947)
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	plexhometheater
-PORTVERSION=	1.2.2
-PORTREVISION=	7
+PORTVERSION=	1.3.6
 CATEGORIES=	multimedia
 
 MAINTAINER=	woodsb02@gmail.com
@@ -14,7 +13,6 @@ BUILD_DEPENDS=	enca:${PORTSDIR}/converte
 		gawk:${PORTSDIR}/lang/gawk \
 		gperf:${PORTSDIR}/devel/gperf \
 		cmake:${PORTSDIR}/devel/cmake \
-		gmake:${PORTSDIR}/devel/gmake \
 		zip:${PORTSDIR}/archivers/zip \
 		unzip:${PORTSDIR}/archivers/unzip \
 		nasm:${PORTSDIR}/devel/nasm \
@@ -55,8 +53,7 @@ LIB_DEPENDS=	libass.so:${PORTSDIR}/multi
 		libvdpau.so:${PORTSDIR}/multimedia/libvdpau \
 		libvorbis.so:${PORTSDIR}/audio/libvorbis \
 		libxslt.so:${PORTSDIR}/textproc/libxslt \
-		libyajl.so:${PORTSDIR}/devel/yajl \
-		libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+		libyajl.so:${PORTSDIR}/devel/yajl
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
 		glxinfo:${PORTSDIR}/graphics/mesa-demos \
@@ -66,11 +63,9 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqli
 USE_GITHUB=	yes
 GH_ACCOUNT=	plexinc
 GH_PROJECT=	plex-home-theater-public
-GH_COMMIT=	2d6426d
-GH_TAGNAME=	pht-v1.2.2
 BUNDLE_LIBS=	yes
 
-USES=		cmake:outsource iconv:wchar_t pkgconfig python:2
+USES=		cmake:outsource execinfo gmake iconv:wchar_t pkgconfig python:2
 CMAKE_ARGS+=	-DENABLE_AUTOUPDATE:BOOL=false
 CMAKE_ARGS+=	-DENABLE_DUMP_SYMBOLS:BOOL=false
 CMAKE_ARGS+=	-DENABLE_PYTHON:BOOL=false
@@ -85,6 +80,10 @@ USE_SDL=	image sdl mixer
 INSTALLS_ICONS=	yes
 ONLY_FOR_ARCHS=	i386 amd64
 
+DISTVERSIONPREFIX=v
+DISTVERSIONSUFFIX=.441-309e72d1
+WRKSRC=		${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME_EXTRACT}
+
 SUB_FILES=	${PORTNAME}.sh pkg-message
 
 DESKTOP_ENTRIES="Plex Home Theater" \
@@ -118,7 +117,7 @@ PLIST_SUB+=	ARCH="x86_64"
 .endif
 
 .if ${OPSYS} == "FreeBSD" && ${OSVERSION} < 900033
-BUILD_DEPENDS+=	${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils
+USE_BINUTILS=	yes
 MAKE_ENV=	COMPILER_PATH=${LOCALBASE}/bin
 .endif
 
@@ -130,8 +129,11 @@ post-patch:
 		${WRKSRC}/lib/ffmpeg/libavcodec/Makefile
 	@${REINPLACE_CMD} 's/iconv_open/libiconv_open/' \
 		${WRKSRC}/plex/CMakeModules/FindIconv.cmake
+	@${REINPLACE_CMD} 's/COMMAND\ make/COMMAND\ gmake/g' \
+		${WRKSRC}/lib/ffmpeg/CMakeLists.txt
 
 post-install:
+	${RM} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/*.so
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.post.mk>

Modified: head/multimedia/plexhometheater/distinfo
==============================================================================
--- head/multimedia/plexhometheater/distinfo	Mon Apr 13 18:17:01 2015	(r383946)
+++ head/multimedia/plexhometheater/distinfo	Mon Apr 13 18:47:49 2015	(r383947)
@@ -1,2 +1,2 @@
-SHA256 (plexhometheater-1.2.2.tar.gz) = e49b5f226d29fb91e7aef42b4f5ed2b2afc2edfbc70cdfa49181eaada1c8c095
-SIZE (plexhometheater-1.2.2.tar.gz) = 91373872
+SHA256 (plexhometheater-v1.3.6.441-309e72d1_GH0.tar.gz) = b92ed31c38e9aff4b5a84a9ef5ced6cd4740c2ee91da48299c076254aa2d56b3
+SIZE (plexhometheater-v1.3.6.441-309e72d1_GH0.tar.gz) = 92441328

Modified: head/multimedia/plexhometheater/files/patch-libcec22
==============================================================================
--- head/multimedia/plexhometheater/files/patch-libcec22	Mon Apr 13 18:17:01 2015	(r383946)
+++ head/multimedia/plexhometheater/files/patch-libcec22	Mon Apr 13 18:47:49 2015	(r383947)
@@ -1,8 +1,8 @@
 Origin: https://github.com/xbmc/xbmc/pull/5610
 
---- system/peripherals.xml.orig	2014-08-25 20:29:00.000000000 +0800
-+++ system/peripherals.xml	2014-12-31 07:15:34.972922137 +0800
-@@ -28,7 +28,7 @@
+--- plex/Resources/system/peripherals.xml.orig	2015-04-09 12:51:14 UTC
++++ plex/Resources/system/peripherals.xml
+@@ -30,7 +30,7 @@
      <setting key="device_type" type="int" value="1" configurable="0" />
      <setting key="wake_devices_advanced" type="string" value="" configurable="0" />
      <setting key="standby_devices_advanced" type="string" value="" configurable="0" />

Modified: head/multimedia/plexhometheater/files/patch-plex__CMakeModules__PlatformConfigFREEBSD.cmake
==============================================================================
--- head/multimedia/plexhometheater/files/patch-plex__CMakeModules__PlatformConfigFREEBSD.cmake	Mon Apr 13 18:17:01 2015	(r383946)
+++ head/multimedia/plexhometheater/files/patch-plex__CMakeModules__PlatformConfigFREEBSD.cmake	Mon Apr 13 18:47:49 2015	(r383947)
@@ -123,7 +123,7 @@
 +endif()
 +
 +#### default lircdevice
-+set(LIRC_DEVICE "/dev/lircd")
++set(LIRC_DEVICE "/var/run/lirc/lircd")
 +
 +#### on freebsd we want to use a "easy" name
 +set(EXECUTABLE_NAME "plexhometheater")

Modified: head/multimedia/plexhometheater/pkg-plist
==============================================================================
--- head/multimedia/plexhometheater/pkg-plist	Mon Apr 13 18:17:01 2015	(r383946)
+++ head/multimedia/plexhometheater/pkg-plist	Mon Apr 13 18:47:49 2015	(r383947)
@@ -1,5 +1,6 @@
 bin/plexhometheater
 bin/plexhometheater.sh
+bin/xbmc-xrandr
 lib/plexhometheater/system/ImageLib-%%ARCH%%-freebsd.so
 lib/plexhometheater/system/libcpluff-%%ARCH%%-freebsd.so
 lib/plexhometheater/system/players/dvdplayer/avcodec-53-%%ARCH%%-freebsd.so
@@ -9,7 +10,6 @@ lib/plexhometheater/system/players/dvdpl
 lib/plexhometheater/system/players/dvdplayer/postproc-52-%%ARCH%%-freebsd.so
 lib/plexhometheater/system/players/dvdplayer/swresample-0-%%ARCH%%-freebsd.so
 lib/plexhometheater/system/players/dvdplayer/swscale-2-%%ARCH%%-freebsd.so
-lib/plexhometheater/xbmc-xrandr
 %%DATADIR%%/Credits.html
 %%DATADIR%%/addons/repository.pvr-android.xbmc.org/addon.xml
 %%DATADIR%%/addons/repository.pvr-android.xbmc.org/icon.png
@@ -107,6 +107,7 @@ lib/plexhometheater/xbmc-xrandr
 %%DATADIR%%/addons/skin.plex/720p/DialogPeripheralSettings.xml
 %%DATADIR%%/addons/skin.plex/720p/DialogPictureInfo.xml
 %%DATADIR%%/addons/skin.plex/720p/DialogPlexExtras.xml
+%%DATADIR%%/addons/skin.plex/720p/DialogPlexUserSelect.xml
 %%DATADIR%%/addons/skin.plex/720p/DialogPluginSettings.xml
 %%DATADIR%%/addons/skin.plex/720p/DialogProgress.xml
 %%DATADIR%%/addons/skin.plex/720p/DialogRating.xml
@@ -140,17 +141,18 @@ lib/plexhometheater/xbmc-xrandr
 %%DATADIR%%/addons/skin.plex/720p/MyMusicSongs.xml
 %%DATADIR%%/addons/skin.plex/720p/MyPics.xml
 %%DATADIR%%/addons/skin.plex/720p/MyPlexLogin.xml
-%%DATADIR%%/addons/skin.plex/720p/MyPlexLoginStartup.xml
 %%DATADIR%%/addons/skin.plex/720p/MyPrograms.xml
 %%DATADIR%%/addons/skin.plex/720p/MySharedContent.xml
 %%DATADIR%%/addons/skin.plex/720p/MyVideoNav.xml
 %%DATADIR%%/addons/skin.plex/720p/MyVideoPlaylist.xml
 %%DATADIR%%/addons/skin.plex/720p/NowPlaying.xml
 %%DATADIR%%/addons/skin.plex/720p/PlayerControls.xml
+%%DATADIR%%/addons/skin.plex/720p/PlexPlayListSelection.xml
 %%DATADIR%%/addons/skin.plex/720p/PlexPlayQueue.xml
 %%DATADIR%%/addons/skin.plex/720p/PlexPreplayVideo.xml
 %%DATADIR%%/addons/skin.plex/720p/PlexSearch.xml
 %%DATADIR%%/addons/skin.plex/720p/PlexStartupHelper.xml
+%%DATADIR%%/addons/skin.plex/720p/PlexUserSelect.xml
 %%DATADIR%%/addons/skin.plex/720p/Pointer.xml
 %%DATADIR%%/addons/skin.plex/720p/ProfileSettings.xml
 %%DATADIR%%/addons/skin.plex/720p/Settings.xml
@@ -178,11 +180,12 @@ lib/plexhometheater/xbmc-xrandr
 %%DATADIR%%/addons/skin.plex/720p/ViewsMusic.xml
 %%DATADIR%%/addons/skin.plex/720p/ViewsOSD.xml
 %%DATADIR%%/addons/skin.plex/720p/ViewsPhoto.xml
-%%DATADIR%%/addons/skin.plex/720p/ViewsPlayQueue.xml
+%%DATADIR%%/addons/skin.plex/720p/ViewsPlayListSelection.xml
 %%DATADIR%%/addons/skin.plex/720p/ViewsPreplay.xml
 %%DATADIR%%/addons/skin.plex/720p/ViewsSearch.xml
 %%DATADIR%%/addons/skin.plex/720p/ViewsSettings.xml
 %%DATADIR%%/addons/skin.plex/720p/ViewsSharedContent.xml
+%%DATADIR%%/addons/skin.plex/720p/ViewsUserSwitchLogin.xml
 %%DATADIR%%/addons/skin.plex/720p/VisualisationPresetList.xml
 %%DATADIR%%/addons/skin.plex/Colors/Defaults.xml
 %%DATADIR%%/addons/skin.plex/Media/Textures.xbt
@@ -689,6 +692,7 @@ lib/plexhometheater/xbmc-xrandr
 %%DATADIR%%/system/Lircmap.xml
 %%DATADIR%%/system/X10-Lola-IRSSmap.xml
 %%DATADIR%%/system/asound.conf
+%%DATADIR%%/system/cacert.pem
 %%DATADIR%%/system/colors.xml
 %%DATADIR%%/system/keymaps/appcommand.xml
 %%DATADIR%%/system/keymaps/gamepad.xml
@@ -793,6 +797,7 @@ lib/plexhometheater/xbmc-xrandr
 %%DATADIR%%/system/players/dvdplayer/etc/fonts/conf.d/90-synthetic.conf
 %%DATADIR%%/system/players/dvdplayer/etc/fonts/fonts.conf
 %%DATADIR%%/system/players/dvdplayer/etc/fonts/fonts.dtd
+%%DATADIR%%/system/plexca.pem
 %%DATADIR%%/system/shaders/convolution-4x4.glsl
 %%DATADIR%%/system/shaders/convolution-4x4_d3d.fx
 %%DATADIR%%/system/shaders/convolution-6x6.glsl



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504131847.t3DIlnWe048365>