View | Details | Raw Unified | Return to bug 193547 | Differences between
and this patch

Collapse All | Expand All

(-)multimedia/plexhometheater/Makefile (-8 / +17 lines)
Lines 1-8 Link Here
1
# $FreeBSD$
1
# $FreeBSD$
2
2
3
PORTNAME=	plexhometheater
3
PORTNAME=	plexhometheater
4
PORTVERSION=	1.2.1
4
PORTVERSION=	1.2.2
5
PORTREVISION=	4
6
CATEGORIES=	multimedia
5
CATEGORIES=	multimedia
7
6
8
MAINTAINER=	woodsb02@gmail.com
7
MAINTAINER=	woodsb02@gmail.com
Lines 40-46 Link Here
40
		libmad.so:${PORTSDIR}/audio/libmad \
39
		libmad.so:${PORTSDIR}/audio/libmad \
41
		libmicrohttpd.so:${PORTSDIR}/www/libmicrohttpd \
40
		libmicrohttpd.so:${PORTSDIR}/www/libmicrohttpd \
42
		libmodplug.so:${PORTSDIR}/audio/libmodplug \
41
		libmodplug.so:${PORTSDIR}/audio/libmodplug \
43
		libmp3lame.so:${PORTSDIR}/audio/lame \
44
		libmpeg2.so:${PORTSDIR}/multimedia/libmpeg2 \
42
		libmpeg2.so:${PORTSDIR}/multimedia/libmpeg2 \
45
		libpcre.so:${PORTSDIR}/devel/pcre \
43
		libpcre.so:${PORTSDIR}/devel/pcre \
46
		libplist.so:${PORTSDIR}/devel/libplist \
44
		libplist.so:${PORTSDIR}/devel/libplist \
Lines 67-74 Link Here
67
USE_GITHUB=	yes
65
USE_GITHUB=	yes
68
GH_ACCOUNT=	plexinc
66
GH_ACCOUNT=	plexinc
69
GH_PROJECT=	plex-home-theater-public
67
GH_PROJECT=	plex-home-theater-public
70
GH_COMMIT=	bdd03dd
68
GH_COMMIT=	2d6426d
71
GH_TAGNAME=	pht-v1.2.1
69
GH_TAGNAME=	pht-v1.2.2
72
70
73
USES=		cmake:outsource iconv pkgconfig python:2
71
USES=		cmake:outsource iconv pkgconfig python:2
74
CMAKE_ARGS+=	-DENABLE_AUTOUPDATE:BOOL=false
72
CMAKE_ARGS+=	-DENABLE_AUTOUPDATE:BOOL=false
Lines 77-92 Link Here
77
CMAKE_ARGS+=	-DUSE_INTERNAL_FFMPEG:BOOL=true
75
CMAKE_ARGS+=	-DUSE_INTERNAL_FFMPEG:BOOL=true
78
CMAKE_ARGS+=	-DCREATE_BUNDLE:BOOL=false
76
CMAKE_ARGS+=	-DCREATE_BUNDLE:BOOL=false
79
CMAKE_ARGS+=	-DCMAKE_PREFIX_PATH=${LOCALBASE}
77
CMAKE_ARGS+=	-DCMAKE_PREFIX_PATH=${LOCALBASE}
78
CFLAGS+=	-isystem${LOCALBASE}/include
80
LDFLAGS+=	-L${LOCALBASE}/lib
79
LDFLAGS+=	-L${LOCALBASE}/lib
81
USE_XORG=	xt xmu xtst xrandr
80
USE_XORG=	xt xmu xtst xrandr
82
USE_GL=		glu
81
USE_GL=		glu
83
USE_SDL=	image sdl mixer
82
USE_SDL=	image sdl mixer
84
USE_JAVA=	yes
85
JAVA_BUILD=	jre
86
INSTALLS_ICONS=	yes
83
INSTALLS_ICONS=	yes
87
ONLY_FOR_ARCHS=	i386 amd64
84
ONLY_FOR_ARCHS=	i386 amd64
88
85
89
SUB_FILES=	${PORTNAME}.sh
86
SUB_FILES=	${PORTNAME}.sh pkg-message
90
87
91
DESKTOP_ENTRIES="Plex Home Theater" \
88
DESKTOP_ENTRIES="Plex Home Theater" \
92
		"${COMMENT}" \
89
		"${COMMENT}" \
Lines 117-122 Link Here
117
PLIST_SUB+=	ARCH="x86_64"
114
PLIST_SUB+=	ARCH="x86_64"
118
.endif
115
.endif
119
116
117
.if ${OSVERSION} < 900033
118
BUILD_DEPENDS+= ${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils
119
MAKE_ENV=       COMPILER_PATH=${LOCALBASE}/bin
120
.endif
121
122
post-patch:
123
	@${REINPLACE_CMD} 's/[[:<:]]ARCH[[:>:]]/FFMPEG_ARCH/' \
124
		${WRKSRC}/lib/ffmpeg/Makefile \
125
		${WRKSRC}/lib/ffmpeg/common.mak \
126
		${WRKSRC}/lib/ffmpeg/configure \
127
		${WRKSRC}/lib/ffmpeg/libavcodec/Makefile
128
120
post-install:
129
post-install:
121
	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh ${STAGEDIR}${PREFIX}/bin
130
	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh ${STAGEDIR}${PREFIX}/bin
122
131
(-)multimedia/plexhometheater/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (plexhometheater-1.2.1.tar.gz) = d880f9dc2c893036cab0c21dfbd855c91751f97b06437c7d6e23726b089715d0
1
SHA256 (plexhometheater-1.2.2.tar.gz) = e49b5f226d29fb91e7aef42b4f5ed2b2afc2edfbc70cdfa49181eaada1c8c095
2
SIZE (plexhometheater-1.2.1.tar.gz) = 91374075
2
SIZE (plexhometheater-1.2.2.tar.gz) = 91373872
(-)multimedia/plexhometheater/files/patch-CMakeLists.txt (+9 lines)
Lines 18-20 Link Here
18
         install(DIRECTORY /usr/lib/python${PYTHON_VERSION} DESTINATION ${LIBPATH}/lib/ COMPONENT RUNTIME
18
         install(DIRECTORY /usr/lib/python${PYTHON_VERSION} DESTINATION ${LIBPATH}/lib/ COMPONENT RUNTIME
19
           PATTERN python${PYTHON_VERSION}/test EXCLUDE
19
           PATTERN python${PYTHON_VERSION}/test EXCLUDE
20
           REGEX .*\\.pyc$ EXCLUDE
20
           REGEX .*\\.pyc$ EXCLUDE
21
@@ -161,7 +161,7 @@
22
 if(XRANDR_FOUND)
23
   add_executable(xbmc-xrandr xbmc-xrandr.c)
24
   target_link_libraries(xbmc-xrandr ${CONFIG_LIBRARY_XRANDR} ${CONFIG_LIBRARY_X11} -lm)
25
-  install(TARGETS xbmc-xrandr DESTINATION ${BINPATH})
26
+  install(TARGETS xbmc-xrandr DESTINATION ${LIBPATH})
27
 endif()
28
   
29
 include(CPackConfig)
(-)multimedia/plexhometheater/files/patch-lib__ffmpeg__CMakeLists.txt (-1 / +1 lines)
Lines 11-17 Link Here
11
 
11
 
12
-if(NOT TARGET_RPI)
12
-if(NOT TARGET_RPI)
13
+if(TARGET_FREEBSD)
13
+if(TARGET_FREEBSD)
14
+  set(CONFIG_FLAGS --target-os=${OS} --cc=clang --cxx=clang++ --extra-cflags=-I${CMAKE_PREFIX_PATH}/include --extra-ldflags=-L${CMAKE_PREFIX_PATH}/lib --disable-altivec --disable-amd3dnow --disable-avisynth --disable-crystalhd --disable-debug --disable-decoder=mpeg_xvmc --disable-devices --disable-doc --disable-dxva2 --disable-encoders --disable-extra-warnings --disable-ffmpeg --disable-ffplay --disable-ffprobe --disable-ffserver --disable-frei0r --disable-gray --disable-hardcoded-tables --disable-indevs --disable-iwmmxt --disable-libdc1394 --disable-libdirac --disable-libfaac --disable-libfreetype --disable-libgsm --disable-libmp3lame --disable-libnut --disable-libopencore-amrnb --disable-libopencore-amrwb --disable-libopencv --disable-libopenjpeg --disable-librtmp --disable-libschroedinger --disable-libspeex --disable-libtheora --disable-libvo-aacenc --disable-libvo-amrwbenc --disable-libvorbis --disable-libvpx --disable-libx264 --disable-libxavs --disable-libxvid --disable-memalign-hack --disable-mlib --disable-mmi --disable-muxers --disable-nonfree --disable-outdevs --disable-small --disable-sram --disable-static --disable-symver --disable-vda --disable-version3 --disable-vis --disable-w32threads --disable-x11grab --enable-aandct --enable-asm --enable-avcodec --enable-avdevice --enable-avfilter --enable-avformat --enable-bsfs --enable-bzlib --enable-dct --enable-demuxers --enable-fastdiv --enable-fft --enable-filters --enable-golomb --enable-gpl --enable-huffman --enable-hwaccels --enable-libvorbis --enable-logging --enable-lpc --enable-mdct --enable-muxer=adts --enable-muxer=ogg --enable-muxer=spdif --enable-network --enable-optimizations --enable-parsers --enable-pic --enable-postproc --enable-protocol=http --enable-pthreads --enable-rdft --enable-runtime-cpudetect --enable-shared --enable-stripping --enable-swscale --enable-swscale-alpha --enable-vaapi --enable-vdpau --enable-yasm --enable-zlib --host-libs=-lm)
14
+  set(CONFIG_FLAGS --target-os=${OS} --cc=${CMAKE_C_COMPILER} --cxx=${CMAKE_CXX_COMPILER} --extra-cflags=-I${CMAKE_PREFIX_PATH}/include --extra-ldflags=-L${CMAKE_PREFIX_PATH}/lib --disable-altivec --disable-amd3dnow --disable-avisynth --disable-crystalhd --disable-debug --disable-decoder=mpeg_xvmc --disable-devices --disable-doc --disable-dxva2 --disable-encoders --disable-extra-warnings --disable-ffmpeg --disable-ffplay --disable-ffprobe --disable-ffserver --disable-frei0r --disable-gray --disable-hardcoded-tables --disable-indevs --disable-iwmmxt --disable-libdc1394 --disable-libdirac --disable-libfaac --disable-libfreetype --disable-libgsm --disable-libmp3lame --disable-libnut --disable-libopencore-amrnb --disable-libopencore-amrwb --disable-libopencv --disable-libopenjpeg --disable-librtmp --disable-libschroedinger --disable-libspeex --disable-libtheora --disable-libvo-aacenc --disable-libvo-amrwbenc --disable-libvorbis --disable-libvpx --disable-libx264 --disable-libxavs --disable-libxvid --disable-memalign-hack --disable-mlib --disable-mmi --disable-muxers --disable-nonfree --disable-outdevs --disable-small --disable-sram --disable-static --disable-symver --disable-vda --disable-version3 --disable-vis --disable-w32threads --disable-x11grab --enable-aandct --enable-asm --enable-avcodec --enable-avdevice --enable-avfilter --enable-avformat --enable-bsfs --enable-bzlib --enable-dct --enable-demuxers --enable-fastdiv --enable-fft --enable-filters --enable-golomb --enable-gpl --enable-huffman --enable-hwaccels --enable-libvorbis --enable-logging --enable-lpc --enable-mdct --enable-muxer=adts --enable-muxer=ogg --enable-muxer=spdif --enable-network --enable-optimizations --enable-parsers --enable-pic --enable-postproc --enable-protocol=http --enable-pthreads --enable-rdft --enable-runtime-cpudetect --enable-shared --enable-stripping --enable-swscale --enable-swscale-alpha --enable-vaapi --enable-vdpau --enable-yasm --enable-zlib --host-libs=-lm)
15
+elseif(NOT TARGET_RPI)
15
+elseif(NOT TARGET_RPI)
16
   set(CONFIG_FLAGS --target-os=${OS} --sysroot="${CMAKE_PREFIX_PATH}" --sysinclude="${CMAKE_PREFIX_PATH}/usr/include" --disable-altivec --disable-amd3dnow --disable-avisynth --disable-crystalhd --disable-debug --disable-decoder=mpeg_xvmc --disable-devices --disable-doc --disable-dxva2 --disable-encoders --disable-extra-warnings --disable-ffmpeg --disable-ffplay --disable-ffprobe --disable-ffserver --disable-frei0r --disable-gray --disable-hardcoded-tables --disable-indevs --disable-iwmmxt --disable-libdc1394 --disable-libdirac --disable-libfaac --disable-libfreetype --disable-libgsm --disable-libmp3lame --disable-libnut --disable-libopencore-amrnb --disable-libopencore-amrwb --disable-libopencv --disable-libopenjpeg --disable-librtmp --disable-libschroedinger --disable-libspeex --disable-libtheora --disable-libvo-aacenc --disable-libvo-amrwbenc --disable-libvorbis --disable-libvpx --disable-libx264 --disable-libxavs --disable-libxvid --disable-memalign-hack --disable-mlib --disable-mmi --disable-muxers --disable-nonfree --disable-outdevs --disable-small --disable-sram --disable-static --disable-symver --disable-vda --disable-version3 --disable-vis --disable-w32threads --disable-x11grab --enable-aandct --enable-asm --enable-avcodec --enable-avdevice --enable-avfilter --enable-avformat --enable-bsfs --enable-bzlib --enable-dct --enable-demuxers --enable-fastdiv --enable-fft --enable-filters --enable-golomb --enable-gpl --enable-huffman --enable-hwaccels --enable-libvorbis --enable-logging --enable-lpc --enable-mdct --enable-muxer=adts --enable-muxer=ogg --enable-muxer=spdif --enable-network --enable-optimizations --enable-parsers --enable-pic --enable-postproc --enable-protocol=http --enable-pthreads --enable-rdft --enable-runtime-cpudetect --enable-shared --enable-stripping --enable-swscale --enable-swscale-alpha --enable-vaapi --enable-vdpau --enable-yasm --enable-zlib --host-libs=-lm)
16
   set(CONFIG_FLAGS --target-os=${OS} --sysroot="${CMAKE_PREFIX_PATH}" --sysinclude="${CMAKE_PREFIX_PATH}/usr/include" --disable-altivec --disable-amd3dnow --disable-avisynth --disable-crystalhd --disable-debug --disable-decoder=mpeg_xvmc --disable-devices --disable-doc --disable-dxva2 --disable-encoders --disable-extra-warnings --disable-ffmpeg --disable-ffplay --disable-ffprobe --disable-ffserver --disable-frei0r --disable-gray --disable-hardcoded-tables --disable-indevs --disable-iwmmxt --disable-libdc1394 --disable-libdirac --disable-libfaac --disable-libfreetype --disable-libgsm --disable-libmp3lame --disable-libnut --disable-libopencore-amrnb --disable-libopencore-amrwb --disable-libopencv --disable-libopenjpeg --disable-librtmp --disable-libschroedinger --disable-libspeex --disable-libtheora --disable-libvo-aacenc --disable-libvo-amrwbenc --disable-libvorbis --disable-libvpx --disable-libx264 --disable-libxavs --disable-libxvid --disable-memalign-hack --disable-mlib --disable-mmi --disable-muxers --disable-nonfree --disable-outdevs --disable-small --disable-sram --disable-static --disable-symver --disable-vda --disable-version3 --disable-vis --disable-w32threads --disable-x11grab --enable-aandct --enable-asm --enable-avcodec --enable-avdevice --enable-avfilter --enable-avformat --enable-bsfs --enable-bzlib --enable-dct --enable-demuxers --enable-fastdiv --enable-fft --enable-filters --enable-golomb --enable-gpl --enable-huffman --enable-hwaccels --enable-libvorbis --enable-logging --enable-lpc --enable-mdct --enable-muxer=adts --enable-muxer=ogg --enable-muxer=spdif --enable-network --enable-optimizations --enable-parsers --enable-pic --enable-postproc --enable-protocol=http --enable-pthreads --enable-rdft --enable-runtime-cpudetect --enable-shared --enable-stripping --enable-swscale --enable-swscale-alpha --enable-vaapi --enable-vdpau --enable-yasm --enable-zlib --host-libs=-lm)
17
 else()
17
 else()
(-)multimedia/plexhometheater/files/patch-xbmc__cdrip__CMakeLists.txt (+10 lines)
Line 0 Link Here
1
--- xbmc/cdrip/CMakeLists.txt.orig	2014-09-13 10:49:51.253607190 +0800
2
+++ xbmc/cdrip/CMakeLists.txt	2014-09-13 10:53:30.657607851 +0800
3
@@ -1,5 +1,7 @@
4
 find_all_sources(. cdrip_SRCS)
5
 list(REMOVE_ITEM cdrip_SRCS ./EncoderFFmpeg.cpp)
6
 list(REMOVE_ITEM cdrip_SRCS ./EncoderFFmpeg.h)
7
+list(REMOVE_ITEM cdrip_SRCS ./EncoderLame.cpp)
8
+list(REMOVE_ITEM cdrip_SRCS ./EncoderLame.h)
9
 list(REMOVE_ITEM cdrip_SRCS ./CDDARipper.cpp)
10
 add_sources(${cdrip_SRCS})
(-)multimedia/plexhometheater/files/patch-xbmc__cdrip__EncoderFFmpeg.cpp (-16 lines)
Lines 1-16 Link Here
1
--- xbmc/cdrip/EncoderFFmpeg.cpp.orig 2013-02-06 19:11:19.000000000 +0100
2
+++ xbmc/cdrip/EncoderFFmpeg.cpp 2013-02-06 19:11:45.000000000 +0100
3
@@ -77,7 +77,13 @@
4
   }
5
6
   m_Format     = m_dllAvFormat.avformat_alloc_context();
7
+#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53,1,0)
8
   m_Format->pb = m_dllAvFormat.avio_alloc_context(m_BCBuffer, sizeof(m_BCBuffer), AVIO_FLAG_READ, this,  NULL, MuxerReadPacket, NULL);
9
+#elif LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53,0,0)
10
+  m_Format->pb = m_dllAvFormat.avio_alloc_context(m_BCBuffer, sizeof(m_BCBuffer), AVIO_RDONLY, this,  NULL, MuxerReadPacket, NULL);
11
+#else
12
+  m_Format->pb = m_dllAvFormat.avio_alloc_context(m_BCBuffer, sizeof(m_BCBuffer), URL_RDONLY, this,  NULL, MuxerReadPacket, NULL);
13
+#endif
14
   if (!m_Format->pb)
15
   {
16
     m_dllAvUtil.av_freep(&m_Format);
(-)multimedia/plexhometheater/files/pkg-message.in (+5 lines)
Line 0 Link Here
1
2
To run plexhometheater from the command line, be sure to
3
use the %%PREFIX%%/bin/plexhometheater.sh shell script
4
rather than the %%PREFIX%%/bin/plexhometheater binary directly.
5
(-)multimedia/plexhometheater/files/plexhometheater.sh.in (+1 lines)
Lines 1-4 Link Here
1
#!/bin/sh
1
#!/bin/sh
2
2
3
export XBMC_HOME=%%PREFIX%%/share/plexhometheater
3
export XBMC_HOME=%%PREFIX%%/share/plexhometheater
4
export XBMC_BIN_HOME=%%PREFIX%%/lib/plexhometheater
4
exec %%PREFIX%%/bin/plexhometheater
5
exec %%PREFIX%%/bin/plexhometheater
(-)multimedia/plexhometheater/pkg-plist (-1 / +2 lines)
Lines 1-6 Link Here
1
bin/plexhometheater
1
bin/plexhometheater
2
bin/plexhometheater.sh
2
bin/plexhometheater.sh
3
bin/xbmc-xrandr
4
lib/plexhometheater/system/ImageLib-%%ARCH%%-freebsd.so
3
lib/plexhometheater/system/ImageLib-%%ARCH%%-freebsd.so
5
lib/plexhometheater/system/libcpluff-%%ARCH%%-freebsd.so
4
lib/plexhometheater/system/libcpluff-%%ARCH%%-freebsd.so
6
lib/plexhometheater/system/players/dvdplayer/avcodec-53-%%ARCH%%-freebsd.so
5
lib/plexhometheater/system/players/dvdplayer/avcodec-53-%%ARCH%%-freebsd.so
Lines 10-15 Link Here
10
lib/plexhometheater/system/players/dvdplayer/postproc-52-%%ARCH%%-freebsd.so
9
lib/plexhometheater/system/players/dvdplayer/postproc-52-%%ARCH%%-freebsd.so
11
lib/plexhometheater/system/players/dvdplayer/swresample-0-%%ARCH%%-freebsd.so
10
lib/plexhometheater/system/players/dvdplayer/swresample-0-%%ARCH%%-freebsd.so
12
lib/plexhometheater/system/players/dvdplayer/swscale-2-%%ARCH%%-freebsd.so
11
lib/plexhometheater/system/players/dvdplayer/swscale-2-%%ARCH%%-freebsd.so
12
lib/plexhometheater/xbmc-xrandr
13
share/applications/plexhometheatersh.desktop
13
%%DATADIR%%/Credits.html
14
%%DATADIR%%/Credits.html
14
%%DATADIR%%/addons/repository.pvr-android.xbmc.org/addon.xml
15
%%DATADIR%%/addons/repository.pvr-android.xbmc.org/addon.xml
15
%%DATADIR%%/addons/repository.pvr-android.xbmc.org/icon.png
16
%%DATADIR%%/addons/repository.pvr-android.xbmc.org/icon.png

Return to bug 193547