FreeBSD Bugzilla – Attachment 155542 Details for
Bug 199416
[MAINTAINER] multimedia/plexhometheater: Update to 1.3.6
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch to update multimedia/plexhometheater to 1.3.6
plexhometheater.patch (text/plain), 48.62 KB, created by
Ben Woods
on 2015-04-13 14:53:18 UTC
(
hide
)
Description:
Patch to update multimedia/plexhometheater to 1.3.6
Filename:
MIME Type:
Creator:
Ben Woods
Created:
2015-04-13 14:53:18 UTC
Size:
48.62 KB
patch
obsolete
>Index: multimedia/plexhometheater/Makefile >=================================================================== >--- multimedia/plexhometheater/Makefile (revision 383908) >+++ multimedia/plexhometheater/Makefile (working copy) >@@ -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 @@ > 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 @@ > 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 @@ > 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 @@ > 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 @@ > .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 @@ > ${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> >Index: multimedia/plexhometheater/distinfo >=================================================================== >--- multimedia/plexhometheater/distinfo (revision 383908) >+++ multimedia/plexhometheater/distinfo (working copy) >@@ -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 >Index: multimedia/plexhometheater/files/patch-CMakeLists.txt >=================================================================== >--- multimedia/plexhometheater/files/patch-CMakeLists.txt (revision 383908) >+++ multimedia/plexhometheater/files/patch-CMakeLists.txt (working copy) >@@ -1,29 +0,0 @@ >---- ./CMakeLists.txt.orig 2014-06-02 09:52:10.024707343 +0800 >-+++ ./CMakeLists.txt 2014-06-02 09:54:01.569705023 +0800 >-@@ -120,7 +120,7 @@ >- >- if(ENABLE_PYTHON) >- if(EXTERNAL_PYTHON_HOME) >-- if(TARGET_LINUX OR TARGET_OSX OR TARGET_RPI) >-+ if(TARGET_LINUX OR TARGET_OSX OR TARGET_RPI OR TARGET_FREEBSD) >- install(DIRECTORY ${EXTERNAL_PYTHON_HOME}/lib/python${PYTHON_VERSION} DESTINATION ${LIBPATH}/lib/ COMPONENT RUNTIME >- PATTERN python${PYTHON_VERSION}/test EXCLUDE >- REGEX .*\\.pyc$ EXCLUDE >-@@ -129,7 +129,7 @@ >- install(FILES ${PYTHON_INCLUDE_DIRS}/pyconfig.h DESTINATION "${LIBPATH}/include/python${PYTHON_VERSION}" COMPONENT RUNTIME) >- endif() >- elseif() >-- if(TARGET_LINUX OR TARGET_OSX) >-+ if(TARGET_LINUX OR TARGET_OSX OR TARGET_FREEBSD) >- install(DIRECTORY /usr/lib/python${PYTHON_VERSION} DESTINATION ${LIBPATH}/lib/ COMPONENT RUNTIME >- PATTERN python${PYTHON_VERSION}/test EXCLUDE >- REGEX .*\\.pyc$ EXCLUDE >-@@ -161,7 +161,7 @@ >- if(XRANDR_FOUND) >- add_executable(xbmc-xrandr xbmc-xrandr.c) >- target_link_libraries(xbmc-xrandr ${CONFIG_LIBRARY_XRANDR} ${CONFIG_LIBRARY_X11} -lm) >-- install(TARGETS xbmc-xrandr DESTINATION ${BINPATH}) >-+ install(TARGETS xbmc-xrandr DESTINATION ${LIBPATH}) >- endif() >- >- include(CPackConfig) >Index: multimedia/plexhometheater/files/patch-bsdendian >=================================================================== >--- multimedia/plexhometheater/files/patch-bsdendian (revision 0) >+++ multimedia/plexhometheater/files/patch-bsdendian (working copy) >@@ -0,0 +1,66 @@ >+--- plex/Third-Party/hash-library/crc32.cpp.orig 2015-04-09 11:13:01 UTC >++++ plex/Third-Party/hash-library/crc32.cpp >+@@ -8,7 +8,7 @@ >+ >+ // big endian architectures need #define __BYTE_ORDER __BIG_ENDIAN >+ #ifndef _MSC_VER >+-#ifdef __APPLE__ >++#if defined( __APPLE__ ) || defined( __FreeBSD__ ) || defined( __OpenBSD__ ) || defined( __NetBSD__ ) >+ #include <machine/endian.h> >+ #else >+ #include <endian.h> >+--- plex/Third-Party/hash-library/keccak.cpp.orig 2015-04-09 11:33:51 UTC >++++ plex/Third-Party/hash-library/keccak.cpp >+@@ -8,7 +8,7 @@ >+ >+ // big endian architectures need #define __BYTE_ORDER __BIG_ENDIAN >+ #ifndef _MSC_VER >+-#ifdef __APPLE__ >++#if defined( __APPLE__ ) || defined( __FreeBSD__ ) || defined( __OpenBSD__ ) || defined( __NetBSD__ ) >+ #include <machine/endian.h> >+ #else >+ #include <endian.h> >+--- plex/Third-Party/hash-library/md5.cpp.orig 2015-04-09 11:33:58 UTC >++++ plex/Third-Party/hash-library/md5.cpp >+@@ -7,7 +7,7 @@ >+ #include "md5.h" >+ >+ #ifndef _MSC_VER >+-#ifdef __APPLE__ >++#if defined( __APPLE__ ) || defined( __FreeBSD__ ) || defined( __OpenBSD__ ) || defined( __NetBSD__ ) >+ #include <machine/endian.h> >+ #else >+ #include <endian.h> >+--- plex/Third-Party/hash-library/sha1.cpp.orig 2015-04-09 11:34:06 UTC >++++ plex/Third-Party/hash-library/sha1.cpp >+@@ -8,7 +8,7 @@ >+ >+ // big endian architectures need #define __BYTE_ORDER __BIG_ENDIAN >+ #ifndef _MSC_VER >+-#ifdef __APPLE__ >++#if defined( __APPLE__ ) || defined( __FreeBSD__ ) || defined( __OpenBSD__ ) || defined( __NetBSD__ ) >+ #include <machine/endian.h> >+ #else >+ #include <endian.h> >+--- plex/Third-Party/hash-library/sha256.cpp.orig 2015-04-09 11:34:13 UTC >++++ plex/Third-Party/hash-library/sha256.cpp >+@@ -8,7 +8,7 @@ >+ >+ // big endian architectures need #define __BYTE_ORDER __BIG_ENDIAN >+ #ifndef _MSC_VER >+-#ifdef __APPLE__ >++#if defined( __APPLE__ ) || defined( __FreeBSD__ ) || defined( __OpenBSD__ ) || defined( __NetBSD__ ) >+ #include <machine/endian.h> >+ #else >+ #include <endian.h> >+--- plex/Third-Party/hash-library/sha3.cpp.orig 2015-04-09 11:34:21 UTC >++++ plex/Third-Party/hash-library/sha3.cpp >+@@ -8,7 +8,7 @@ >+ >+ // big endian architectures need #define __BYTE_ORDER __BIG_ENDIAN >+ #ifndef _MSC_VER >+-#ifdef __APPLE__ >++#if defined( __APPLE__ ) || defined( __FreeBSD__ ) || defined( __OpenBSD__ ) || defined( __NetBSD__ ) >+ #include <machine/endian.h> >+ #else >+ #include <endian.h> > >Property changes on: multimedia/plexhometheater/files/patch-bsdendian >___________________________________________________________________ >Added: fbsd:nokeywords >## -0,0 +1 ## >+yes >\ No newline at end of property >Added: svn:eol-style >## -0,0 +1 ## >+native >\ No newline at end of property >Added: svn:mime-type >## -0,0 +1 ## >+text/plain >\ No newline at end of property >Index: multimedia/plexhometheater/files/patch-lib__CMakeLists.txt >=================================================================== >--- multimedia/plexhometheater/files/patch-lib__CMakeLists.txt (revision 383908) >+++ multimedia/plexhometheater/files/patch-lib__CMakeLists.txt (working copy) >@@ -1,11 +0,0 @@ >---- lib/CMakeLists.txt.orig 2014-08-03 10:18:46.000000000 +0800 >-+++ lib/CMakeLists.txt 2014-08-03 10:19:05.000000000 +0800 >-@@ -6,7 +6,7 @@ >- add_subdirectory(libdvd) >- endif() >- >--if(TARGET_COMMON_LINUX) >-+if(TARGET_COMMON_LINUX OR TARGET_FREEBSD) >- add_subdirectory(xbmc-dll-symbols) >- endif() >- >Index: multimedia/plexhometheater/files/patch-lib__cpluff__CMakeLists.txt >=================================================================== >--- multimedia/plexhometheater/files/patch-lib__cpluff__CMakeLists.txt (revision 383908) >+++ multimedia/plexhometheater/files/patch-lib__cpluff__CMakeLists.txt (working copy) >@@ -1,12 +0,0 @@ >---- lib/cpluff/CMakeLists.txt.orig 2014-08-09 08:23:29.709738677 +0800 >-+++ lib/cpluff/CMakeLists.txt 2014-08-09 08:24:08.439733715 +0800 >-@@ -92,6 +92,9 @@ >- if(TARGET_COMMON_DARWIN) >- add_library(cpluff-${ARCH} MODULE ${libcpluff_srcs}) >- install(TARGETS cpluff-${ARCH} DESTINATION ${RESOURCEPATH}/system COMPONENT RUNTIME) >-+ elseif(TARGET_FREEBSD) >-+ add_library(cpluff-${ARCH} SHARED ${libcpluff_srcs}) >-+ install(TARGETS cpluff-${ARCH} DESTINATION ${LIBPATH}/system COMPONENT RUNTIME) >- elseif(TARGET_POSIX) >- add_library(cpluff-${ARCH} SHARED ${libcpluff_srcs}) >- install(TARGETS cpluff-${ARCH} DESTINATION ${BINPATH}/system COMPONENT RUNTIME) >Index: multimedia/plexhometheater/files/patch-lib__cximage-6.0__CMakeLists.txt >=================================================================== >--- multimedia/plexhometheater/files/patch-lib__cximage-6.0__CMakeLists.txt (revision 383908) >+++ multimedia/plexhometheater/files/patch-lib__cximage-6.0__CMakeLists.txt (working copy) >@@ -1,11 +0,0 @@ >---- lib/cximage-6.0/CMakeLists.txt.orig 2014-08-07 20:04:16.149525420 +0800 >-+++ lib/cximage-6.0/CMakeLists.txt 2014-08-07 20:04:55.041525414 +0800 >-@@ -106,6 +106,8 @@ >- install(TARGETS ImageLib-${ARCH} DESTINATION ${RESOURCEPATH}/system COMPONENT RUNTIME) >- elseif(TARGET_COMMON_LINUX) >- install(TARGETS ImageLib-${ARCH} DESTINATION ${BINPATH}/system COMPONENT RUNTIME) >-+elseif(TARGET_FREEBSD) >-+ install(TARGETS ImageLib-${ARCH} DESTINATION ${LIBPATH}/system COMPONENT RUNTIME) >- elseif(TARGET_WIN32) >- install(TARGETS ImageLib RUNTIME DESTINATION ${RESOURCEPATH}/system LIBRARY DESTINATION ${RESOURCEPATH}/system COMPONENT RUNTIME) >- endif(TARGET_COMMON_DARWIN) >Index: multimedia/plexhometheater/files/patch-lib__ffmpeg__CMakeLists.txt >=================================================================== >--- multimedia/plexhometheater/files/patch-lib__ffmpeg__CMakeLists.txt (revision 383908) >+++ multimedia/plexhometheater/files/patch-lib__ffmpeg__CMakeLists.txt (working copy) >@@ -1,61 +0,0 @@ >---- lib/ffmpeg/CMakeLists.txt.orig 2014-07-31 22:37:29.000000000 +0800 >-+++ lib/ffmpeg/CMakeLists.txt 2014-08-19 07:23:32.639850332 +0800 >-@@ -4,10 +4,14 @@ >- set(OS linux) >- elseif(TARGET_DARWIN) >- set(OS darwin) >-+elseif(TARGET_FREEBSD) >-+ set(OS freebsd) >- endif() >- >- >--if(NOT TARGET_RPI) >-+if(TARGET_FREEBSD) >-+ 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) >-+elseif(NOT TARGET_RPI) >- 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) >- else() >- set(CONFIG_FLAGS --target-os=${OS} --disable-muxers --disable-encoders --disable-devices --disable-doc --disable-ffplay --disable-ffmpeg --disable-ffprobe --disable-ffserver --disable-vda --disable-crystalhd --disable-decoder=mpeg_xvmc --disable-debug --disable-amd3dnow --disable-libvorbis --enable-gpl --enable-postproc --enable-shared --disable-static --enable-pthreads --enable-muxer=spdif --enable-muxer=adts --enable-encoder=ac3 --enable-encoder=aac --enable-protocol=http --enable-runtime-cpudetect) >-@@ -24,18 +28,19 @@ >- URL . >- PREFIX ffmpeg >- CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=<INSTALL_DIR> ${CONFIG_FLAGS} >-- BUILD_COMMAND make -j 4 >-- INSTALL_COMMAND make install >-+ BUILD_COMMAND gmake -j 4 >-+ INSTALL_COMMAND gmake install >- ) >- >--#define DLL_PATH_LIBAVCODEC "special://xbmcbin/system/players/dvdplayer/avcodec-53-x86_64-linux.so" >--#define DLL_PATH_LIBAVFORMAT "special://xbmcbin/system/players/dvdplayer/avformat-53-x86_64-linux.so" >--#define DLL_PATH_LIBAVUTIL "special://xbmcbin/system/players/dvdplayer/avutil-51-x86_64-linux.so" >--#define DLL_PATH_LIBPOSTPROC "special://xbmcbin/system/players/dvdplayer/postproc-52-x86_64-linux.so" >--#define DLL_PATH_LIBSWSCALE "special://xbmcbin/system/players/dvdplayer/swscale-2-x86_64-linux.so" >--#define DLL_PATH_LIBAVFILTER "special://xbmcbin/system/players/dvdplayer/avfilter-2-x86_64-linux.so" >--#define DLL_PATH_LIBSWRESAMPLE "special://xbmcbin/system/players/dvdplayer/swresample-0-x86_64-linux.so" >-+#define DLL_PATH_LIBAVCODEC "special://xbmcbin/system/players/dvdplayer/avcodec-53-${ARCH}.so" >-+#define DLL_PATH_LIBAVFORMAT "special://xbmcbin/system/players/dvdplayer/avformat-53-${ARCH}.so" >-+#define DLL_PATH_LIBAVUTIL "special://xbmcbin/system/players/dvdplayer/avutil-51-${ARCH}.so" >-+#define DLL_PATH_LIBPOSTPROC "special://xbmcbin/system/players/dvdplayer/postproc-52-${ARCH}.so" >-+#define DLL_PATH_LIBSWSCALE "special://xbmcbin/system/players/dvdplayer/swscale-2-${ARCH}.so" >-+#define DLL_PATH_LIBAVFILTER "special://xbmcbin/system/players/dvdplayer/avfilter-2-${ARCH}.so" >-+#define DLL_PATH_LIBSWRESAMPLE "special://xbmcbin/system/players/dvdplayer/swresample-0-${ARCH}.so" >- >-+if(TARGET_COMMON_LINUX) >- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ffmpeg/lib/libavcodec.so.53.61.100 DESTINATION ${BINPATH}/system/players/dvdplayer RENAME avcodec-53-${ARCH}.so) >- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ffmpeg/lib/libavformat.so.53.32.100 DESTINATION ${BINPATH}/system/players/dvdplayer RENAME avformat-53-${ARCH}.so) >- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ffmpeg/lib/libavutil.so.51.35.100 DESTINATION ${BINPATH}/system/players/dvdplayer RENAME avutil-51-${ARCH}.so) >-@@ -43,4 +48,12 @@ >- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ffmpeg/lib/libswscale.so.2.1.100 DESTINATION ${BINPATH}/system/players/dvdplayer RENAME swscale-2-${ARCH}.so) >- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ffmpeg/lib/libavfilter.so.2.61.100 DESTINATION ${BINPATH}/system/players/dvdplayer RENAME avfilter-2-${ARCH}.so) >- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ffmpeg/lib/libswresample.so.0.6.100 DESTINATION ${BINPATH}/system/players/dvdplayer RENAME swresample-0-${ARCH}.so) >-- >-+elseif(TARGET_FREEBSD) >-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ffmpeg/lib/libavcodec.so.53.61.100 DESTINATION ${LIBPATH}/system/players/dvdplayer RENAME avcodec-53-${ARCH}.so) >-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ffmpeg/lib/libavformat.so.53.32.100 DESTINATION ${LIBPATH}/system/players/dvdplayer RENAME avformat-53-${ARCH}.so) >-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ffmpeg/lib/libavutil.so.51.35.100 DESTINATION ${LIBPATH}/system/players/dvdplayer RENAME avutil-51-${ARCH}.so) >-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ffmpeg/lib/libpostproc.so.52.0.100 DESTINATION ${LIBPATH}/system/players/dvdplayer RENAME postproc-52-${ARCH}.so) >-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ffmpeg/lib/libswscale.so.2.1.100 DESTINATION ${LIBPATH}/system/players/dvdplayer RENAME swscale-2-${ARCH}.so) >-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ffmpeg/lib/libavfilter.so.2.61.100 DESTINATION ${LIBPATH}/system/players/dvdplayer RENAME avfilter-2-${ARCH}.so) >-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ffmpeg/lib/libswresample.so.0.6.100 DESTINATION ${LIBPATH}/system/players/dvdplayer RENAME swresample-0-${ARCH}.so) >-+endif() >Index: multimedia/plexhometheater/files/patch-lib__libdvd__libdvdcss__CMakeLists.txt >=================================================================== >--- multimedia/plexhometheater/files/patch-lib__libdvd__libdvdcss__CMakeLists.txt (revision 383908) >+++ multimedia/plexhometheater/files/patch-lib__libdvd__libdvdcss__CMakeLists.txt (working copy) >@@ -1,11 +0,0 @@ >---- lib/libdvd/libdvdcss/CMakeLists.txt.orig 2014-08-07 20:16:17.879526000 +0800 >-+++ lib/libdvd/libdvdcss/CMakeLists.txt 2014-08-07 20:17:08.252521581 +0800 >-@@ -35,6 +35,8 @@ >- install(TARGETS dvdcss-${ARCH} DESTINATION ${RESOURCEPATH}/system/players/dvdplayer COMPONENT RUNTIME) >- elseif(TARGET_COMMON_LINUX) >- install(TARGETS dvdcss-${ARCH} DESTINATION ${BINPATH}/system/players/dvdplayer COMPONENT RUNTIME) >-+ elseif(TARGET_FREEBSD) >-+ install(TARGETS dvdcss-${ARCH} DESTINATION ${LIBPATH}/system/players/dvdplayer COMPONENT RUNTIME) >- elseif(TARGET_WIN32) >- install(TARGETS dvdcss RUNTIME DESTINATION ${RESOURCEPATH}/system/players/dvdplayer LIBRARY DESTINATION ${RESOURCEPATH}/system COMPONENT RUNTIME) >- endif(TARGET_COMMON_DARWIN) >Index: multimedia/plexhometheater/files/patch-lib__libdvd__libdvdnav__CMakeLists.txt >=================================================================== >--- multimedia/plexhometheater/files/patch-lib__libdvd__libdvdnav__CMakeLists.txt (revision 383908) >+++ multimedia/plexhometheater/files/patch-lib__libdvd__libdvdnav__CMakeLists.txt (working copy) >@@ -1,11 +0,0 @@ >---- lib/libdvd/libdvdnav/CMakeLists.txt.orig 2014-08-07 20:17:15.005520678 +0800 >-+++ lib/libdvd/libdvdnav/CMakeLists.txt 2014-08-07 20:17:42.827523919 +0800 >-@@ -23,6 +23,8 @@ >- install(TARGETS dvdnav-${ARCH} DESTINATION ${RESOURCEPATH}/system/players/dvdplayer COMPONENT RUNTIME) >- elseif(TARGET_COMMON_LINUX) >- install(TARGETS dvdnav-${ARCH} DESTINATION ${BINPATH}/system/players/dvdplayer COMPONENT RUNTIME) >-+elseif(TARGET_FREEBSD) >-+ install(TARGETS dvdnav-${ARCH} DESTINATION ${LIBPATH}/system/players/dvdplayer COMPONENT RUNTIME) >- elseif(TARGET_WIN32) >- install(TARGETS dvdnav RUNTIME DESTINATION ${RESOURCEPATH}/system/players/dvdplayer LIBRARY DESTINATION ${RESOURCEPATH}/system COMPONENT RUNTIME) >- endif(TARGET_COMMON_DARWIN) >Index: multimedia/plexhometheater/files/patch-libcec22 >=================================================================== >--- multimedia/plexhometheater/files/patch-libcec22 (revision 383908) >+++ multimedia/plexhometheater/files/patch-libcec22 (working copy) >@@ -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" /> >Index: multimedia/plexhometheater/files/patch-plex__CMakeLists.txt >=================================================================== >--- multimedia/plexhometheater/files/patch-plex__CMakeLists.txt (revision 383908) >+++ multimedia/plexhometheater/files/patch-plex__CMakeLists.txt (working copy) >@@ -1,14 +0,0 @@ >---- plex/CMakeLists.txt.orig 2014-10-13 19:20:46.040746153 +0800 >-+++ plex/CMakeLists.txt 2014-10-13 19:25:28.488722667 +0800 >-@@ -152,6 +152,11 @@ >- set_target_properties(${PLEX_TARGET_NAME} PROPERTIES OUTPUT_NAME ${EXECUTABLE_NAME}) >- set_target_properties(${PLEX_TARGET_NAME} PROPERTIES PDB_NAME "Plex Home Theater") >- >-+if(TARGET_POSIX) >-+ # Allow shared libraries to call plexhometheater functions >-+ set_target_properties(${PLEX_TARGET_NAME} PROPERTIES ENABLE_EXPORTS 1) >-+endif(TARGET_POSIX) >-+ >- if(ENABLE_DUMP_SYMBOLS) >- message(STATUS "Generating breakpad symbols") >- GENERATE_BREAKPAD_SYMBOLS(${PLEX_TARGET_NAME}) >Index: multimedia/plexhometheater/files/patch-plex__CMakeModules__CMakeConfig.cmake >=================================================================== >--- multimedia/plexhometheater/files/patch-plex__CMakeModules__CMakeConfig.cmake (revision 383908) >+++ multimedia/plexhometheater/files/patch-plex__CMakeModules__CMakeConfig.cmake (working copy) >@@ -1,30 +0,0 @@ >---- ./plex/CMakeModules/CMakeConfig.cmake.orig 2014-06-02 09:15:38.258729436 +0800 >-+++ ./plex/CMakeModules/CMakeConfig.cmake 2014-06-02 09:38:39.849710021 +0800 >-@@ -31,7 +31,7 @@ >- elseif(WIN32) >- set(TARGET_PLATFORM "WIN32") >- elseif(UNIX) >-- set(TARGET_PLATFORM "LINUX") >-+ set(TARGET_PLATFORM ${CMAKE_SYSTEM_NAME}) >- endif() >- endif() >- >-@@ -47,6 +47,9 @@ >- set(TARGET_COMMON_LINUX 1 CACHE BOOL "Common Linux platforms") >- set(TARGET_LINUX 1 CACHE BOOL "Target is Linux") >- set(TARGET_POSIX 1 CACHE BOOL "POSIX platform") >-+elseif(${TARGET_PLATFORM} STREQUAL "FREEBSD") >-+ set(TARGET_FREEBSD 1 CACHE BOOL "Target is FreeBSD") >-+ set(TARGET_POSIX 1 CACHE BOOL "POSIX platform") >- elseif(${TARGET_PLATFORM} STREQUAL "RPI") >- set(TARGET_RPI 1 CACHE BOOL "Target in RaspberryPI") >- set(TARGET_COMMON_LINUX 1 CACHE BOOL "Common Linux platforms") >-@@ -76,6 +79,8 @@ >- set(BUILD_TAG "macosx-${OSX_ARCH}") >- elseif(TARGET_WIN32) >- set(BUILD_TAG "windows-x86") >-+elseif(TARGET_FREEBSD) >-+ set(BUILD_TAG "freebsd-${ARCH}") >- elseif(TARGET_LINUX) >- if(DEFINED ENV{ARCH} AND DEFINED ENV{PROJECT}) >- set(BUILD_TAG "$ENV{PROJECT}-$ENV{ARCH}") >Index: multimedia/plexhometheater/files/patch-plex__CMakeModules__CPackConfig.cmake >=================================================================== >--- multimedia/plexhometheater/files/patch-plex__CMakeModules__CPackConfig.cmake (revision 383908) >+++ multimedia/plexhometheater/files/patch-plex__CMakeModules__CPackConfig.cmake (working copy) >@@ -1,11 +0,0 @@ >---- ./plex/CMakeModules/CPackConfig.cmake.orig 2014-06-02 12:09:53.558706631 +0800 >-+++ ./plex/CMakeModules/CPackConfig.cmake 2014-05-23 21:04:41.000000000 +0800 >-@@ -45,7 +45,7 @@ >- if(TARGET_OSX) >- set(CPACK_GENERATOR "ZIP") >- set(CPACK_INCLUDE_TOPLEVEL_DIRECTORY 0) >--elseif(TARGET_COMMON_LINUX) >-+elseif(TARGET_COMMON_LINUX OR TARGET_FREEBSD) >- set(CPACK_GENERATOR "TBZ2") >- elseif(TARGET_WIN32) >- set(CPACK_GENERATOR "NSIS;ZIP") >Index: multimedia/plexhometheater/files/patch-plex__CMakeModules__FindExecinfo.cmake >=================================================================== >--- multimedia/plexhometheater/files/patch-plex__CMakeModules__FindExecinfo.cmake (revision 383908) >+++ multimedia/plexhometheater/files/patch-plex__CMakeModules__FindExecinfo.cmake (working copy) >@@ -1,40 +0,0 @@ >---- plex/CMakeModules/FindExecinfo.cmake.orig 2014-06-18 13:48:49.013626678 +0000 >-+++ plex/CMakeModules/FindExecinfo.cmake 2014-06-18 13:53:45.058602542 +0000 >-@@ -0,0 +1,37 @@ >-+# -*- cmake -*- >-+ >-+# - Find execinfo >-+# Find the execinfo includes and library >-+# The problem with this library is that it is built-in in the Linux glib, >-+# while on systems like FreeBSD, it is installed separately and thus needs to be linked to. >-+# Therefore, we search for the header to see if the it's available in the first place. >-+# If it is available, we try to locate the library to figure out whether it is built-in or not. >-+ >-+if(EXECINFO_INCLUDE_DIR) >-+ # Already in cache, be silent >-+ set(EXECINFO_FIND_QUIETLY TRUE) >-+endif(EXECINFO_INCLUDE_DIR) >-+ >-+find_package(PkgConfig) >-+if (PKG_CONFIG_FOUND) >-+ pkg_check_modules(_EXECINFO libexecinfo) >-+endif (PKG_CONFIG_FOUND) >-+ >-+Find_Path(EXECINFO_INCLUDE_DIR >-+ NAMES execinfo.h >-+ PATHS /usr/include usr/local/include >-+ HINTS ${_EXECINFO_INCLUDEDIR} >-+) >-+ >-+Find_Library(EXECINFO_LIBRARY >-+ NAMES execinfo >-+ PATHS /usr/lib usr/local/lib >-+ HINTS ${_EXECINFO_LIBDIR} >-+) >-+ >-+include(FindPackageHandleStandardArgs) >-+find_package_handle_standard_args(EXECINFO DEFAULT_MSG EXECINFO_LIBRARY EXECINFO_INCLUDE_DIR) >-+ >-+IF(EXECINFO_LIBRARY AND EXECINFO_INCLUDE_DIR) >-+ plex_get_soname(EXECINFO_SONAME ${EXECINFO_LIBRARY}) >-+ENDIF() >Index: multimedia/plexhometheater/files/patch-plex__CMakeModules__PlatformConfigFREEBSD.cmake >=================================================================== >--- multimedia/plexhometheater/files/patch-plex__CMakeModules__PlatformConfigFREEBSD.cmake (revision 383908) >+++ multimedia/plexhometheater/files/patch-plex__CMakeModules__PlatformConfigFREEBSD.cmake (working copy) >@@ -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") >Index: multimedia/plexhometheater/files/patch-plex__CMakeModules__PlatformConfigPOSIX.cmake >=================================================================== >--- multimedia/plexhometheater/files/patch-plex__CMakeModules__PlatformConfigPOSIX.cmake (revision 383908) >+++ multimedia/plexhometheater/files/patch-plex__CMakeModules__PlatformConfigPOSIX.cmake (working copy) >@@ -1,16 +0,0 @@ >---- plex/CMakeModules/PlatformConfigPOSIX.cmake.orig 2014-05-23 21:04:41.000000000 +0800 >-+++ plex/CMakeModules/PlatformConfigPOSIX.cmake 2014-06-02 15:53:40.122706444 +0800 >-@@ -38,7 +38,12 @@ >- endif(TARGET_RPI) >- >- ############ Check for pthread_setname -> HAVE_PTHREAD_SETNAME_NP >--set(HAVE_PTHREAD_SETNAME_NP 1) >-+if(TARGET_FREEBSD) >-+ set(HAVE_PTHREAD_SET_NAME_NP 1) >-+else() >-+ set(HAVE_PTHREAD_SETNAME_NP 1) >-+endif() >-+ >- if(NOT TARGET_RPI) >- set(HAS_SDL_JOYSTICK 1) >- endif() >Index: multimedia/plexhometheater/files/patch-plex__Network__CMakeLists.txt >=================================================================== >--- multimedia/plexhometheater/files/patch-plex__Network__CMakeLists.txt (revision 383908) >+++ multimedia/plexhometheater/files/patch-plex__Network__CMakeLists.txt (working copy) >@@ -1,11 +0,0 @@ >---- plex/Network/CMakeLists.txt.orig 2014-05-23 21:04:41.000000000 +0800 >-+++ plex/Network/CMakeLists.txt 2014-06-03 21:55:44.441297028 +0800 >-@@ -1,6 +1,8 @@ >- set(net_SRCS NetworkInterface.cpp NetworkInterface.h NetworkServiceAdvertiser.h NetworkServiceAdvertiserPMS.h NetworkServiceBase.h NetworkServiceBrowser.h NetworkService.h PlexNetworkServiceAdvertiser.h) >- if(TARGET_COMMON_LINUX) >- list(APPEND net_SRCS NetworkInterfaceLinux.cpp) >-+elseif(TARGET_FREEBSD) >-+ list(APPEND net_SRCS NetworkInterfaceBSD.cpp) >- else(TARGET_COMMON_LINUX) >- list(APPEND net_SRCS NetworkInterfaceWin32.cpp) >- endif(TARGET_COMMON_LINUX) >Index: multimedia/plexhometheater/files/patch-plex__Network__NetworkInterfaceBSD.cpp >=================================================================== >--- multimedia/plexhometheater/files/patch-plex__Network__NetworkInterfaceBSD.cpp (revision 383908) >+++ multimedia/plexhometheater/files/patch-plex__Network__NetworkInterfaceBSD.cpp (working copy) >@@ -1,174 +0,0 @@ >---- plex/Network/NetworkInterfaceBSD.cpp.orig 2014-06-03 21:57:00.010307063 +0800 >-+++ plex/Network/NetworkInterfaceBSD.cpp 2014-06-11 17:21:16.027299183 +0800 >-@@ -0,0 +1,171 @@ >-+/* >-+ * Written and (c) 2014 by Ben Woods >-+ * Licensed under the two-clause (new) BSD license. >-+ * Some code copied from Matthias Andree's try-rtsock.c: >-+ * http://people.freebsd.org/~mandree/try-rtsock.c >-+ */ >-+ >-+#ifdef __FreeBSD__ >-+#include <netinet/in.h> >-+ >-+#include <sys/socket.h> >-+#include <sys/select.h> >-+#include <net/if.h> >-+#include <net/route.h> >-+ >-+// only for decoding AF_LINK addresses: >-+#include <net/if_dl.h> >-+ >-+#include <netdb.h> >-+ >-+#include <string.h> >-+ >-+#include <boost/asio.hpp> >-+#include <boost/thread.hpp> >-+ >-+#include "NetworkInterface.h" >-+ >-+using namespace boost; >-+ >-+/////////////////////////////////////////////////////////////////////////////////////////////////// >-+// Message agnostic receive buffer >-+union u { >-+ char buf[1024]; >-+ struct if_msghdr ifm; >-+ struct ifa_msghdr ifam; >-+ struct if_announcemsghdr ifann; >-+}; >-+ >-+/////////////////////////////////////////////////////////////////////////////////////////////////// >-+static void PrintRouteMsg(const union u *buff, size_t len) >-+{ >-+ dprintf("NetworkInterface: PF_ROUTE socket received message. Version %d, Type %#x, Len %d.", buff->ifm.ifm_version, buff->ifm.ifm_type, buff->ifm.ifm_msglen); >-+ >-+ switch (buff->ifm.ifm_type) >-+ { >-+ case RTM_NEWADDR: >-+ case RTM_DELADDR: >-+ dprintf("NetworkInterface: ##%s## - Addrmask %#x, Flags %#x, Index %hu, Metric %d", >-+ buff->ifm.ifm_type == RTM_NEWADDR ? " NEW ADDRESS " : " DELETE ADDR ", >-+ buff->ifam.ifam_addrs, >-+ buff->ifam.ifam_flags, >-+ buff->ifam.ifam_index, >-+ buff->ifam.ifam_metric); >-+ break; >-+ >-+ case RTM_IFINFO: >-+ dprintf(" INFO - Addrmask %#x, Index %hu, Flags %#x:", >-+ buff->ifm.ifm_addrs, buff->ifm.ifm_index, buff->ifm.ifm_flags); >-+ switch (buff->ifm.ifm_flags) >-+ { >-+ case IFF_UP: dprintf("UP"); break; >-+ case IFF_BROADCAST: dprintf("bcast_valid"); break; >-+ case IFF_LOOPBACK: dprintf("loopback"); break; >-+ case IFF_POINTOPOINT: dprintf("P2P"); break; >-+ case IFF_DRV_RUNNING: dprintf("running"); break; >-+ case IFF_NOARP: dprintf("noARP"); break; >-+ case IFF_PROMISC: dprintf("promisc"); break; >-+ case IFF_DYING: dprintf("dying"); break; >-+ case IFF_RENAMING: dprintf("renaming"); break; >-+ } >-+ >-+ case RTM_IFANNOUNCE: >-+ dprintf(" ANNOUNCE iface %.*s index %hu", >-+ IFNAMSIZ, buff->ifann.ifan_name, buff->ifann.ifan_index); >-+ switch(buff->ifann.ifan_what) >-+ { >-+ case IFAN_ARRIVAL: dprintf(" ARRIVED"); break; >-+ case IFAN_DEPARTURE: dprintf(" DEPARTED"); break; >-+ default: dprintf("Unknown action %hu", buff->ifann.ifan_what); >-+ } >-+ break; >-+ } >-+} >-+ >-+/////////////////////////////////////////////////////////////////////////////////////////////////// >-+void NetworkChanged() >-+{ >-+ dprintf("Network change."); >-+ NetworkInterface::NotifyOfNetworkChange(); >-+} >-+ >-+/////////////////////////////////////////////////////////////////////////////////////////////////// >-+void RunWatchingForChanges() >-+{ >-+ dprintf("NetworkInterface: Watching for changes on the interfaces."); >-+ >-+ // Create the socket that's going to watch for interface changes, and make it non-blocking. >-+ int sock = socket(PF_ROUTE, SOCK_RAW, AF_UNSPEC); /* AF_UNSPEC: all addr families */ >-+ if (sock == -1) >-+ eprintf("Error creating PF_ROUTE socket: %d", errno); >-+ >-+ // Add socket to null initialised file descriptor set >-+ fd_set fds; >-+ FD_ZERO(&fds); >-+ FD_SET(sock, &fds); >-+ >-+ // Now sit in a loop waiting for messages. >-+ int ret1; >-+ while ((ret1 = select(sock+1, &fds, 0, 0, 0)), 1) >-+ { >-+ if (ret1 == -1) >-+ { >-+ eprintf("NetworkInterface: PF_ROUTE socket select error (%d).", errno); >-+ continue; >-+ } >-+ >-+ // Message waiting >-+ if (ret1 > 0 && FD_ISSET(sock, &fds)) >-+ { >-+ // Setup message agnostic receive buffer >-+ union u buff; >-+ buff.ifm.ifm_msglen = 4; >-+ >-+ // Receive messages into buffer >-+ int ret2 = recv(sock, &buff, sizeof(buff), 0); >-+ if (ret2 == -1) >-+ { >-+ eprintf("NetworkInterface: PF_ROUTE socket receive error (%d).", errno); >-+ continue; >-+ } >-+ >-+ // Read through messages and determine if any indicate that any interface records should be rebuilt. >-+ if (ret2 < 4 || ret2 < buff.ifm.ifm_msglen) >-+ { >-+ eprintf("NetworkInterface: PF_ROUTE socket short read (have %d want %hu), skipping.", ret2, buff.ifm.ifm_msglen); >-+ continue; >-+ } >-+ >-+ if (buff.ifm.ifm_version != RTM_VERSION) >-+ { >-+ eprintf("NetworkInterface: PF_ROUTE socket unknown message version %d, skipping.", buff.ifm.ifm_version); >-+ continue; >-+ } >-+ >-+ // Dump the message. >-+ PrintRouteMsg(&buff, ret2); >-+ >-+ // See if something notable changed. >-+ if (buff.ifm.ifm_type == RTM_IFINFO || buff.ifm.ifm_type == RTM_IFANNOUNCE || >-+ buff.ifm.ifm_type == RTM_DELADDR || buff.ifm.ifm_type == RTM_NEWADDR) >-+ { >-+ // Notify about it. >-+ NetworkChanged(); >-+ } >-+ } >-+ } >-+} >-+ >-+/////////////////////////////////////////////////////////////////////////////////////////////////// >-+void NetworkInterface::WatchForChanges() >-+{ >-+ // Start the thread. >-+ dprintf("NetworkInterface: Starting watch thread."); >-+ thread t = thread(boost::bind(&RunWatchingForChanges)); >-+ t.detach(); >-+ >-+ // Start with a change, because otherwise we're in steady state. >-+ NetworkChanged(); >-+} >-+ >-+#endif >Index: multimedia/plexhometheater/files/patch-plex__config.h.in >=================================================================== >--- multimedia/plexhometheater/files/patch-plex__config.h.in (revision 383908) >+++ multimedia/plexhometheater/files/patch-plex__config.h.in (working copy) >@@ -1,10 +0,0 @@ >---- plex/config.h.in.orig 2014-05-23 13:04:41.000000000 +0000 >-+++ plex/config.h.in 2014-06-18 14:26:03.855461867 +0000 >-@@ -173,6 +173,7 @@ >- #cmakedefine HAVE_LIBPYTHON2_6 @HAVE_LIBPYTHON2_6@ >- #cmakedefine HAS_PYTHON @HAS_PYTHON@ >- #cmakedefine HAVE_PTHREAD_SETNAME_NP @HAVE_PTHREAD_SETNAME_NP@ >-+#cmakedefine HAVE_PTHREAD_SET_NAME_NP @HAVE_PTHREAD_SET_NAME_NP@ >- >- /* LIBSHAIRPORT */ >- #cmakedefine HAVE_STRUCT_AUDIOOUTPUT_AO_SET_METADATA @HAVE_STRUCT_AUDIOOUTPUT_AO_SET_METADATA@ >Index: multimedia/plexhometheater/files/patch-xbmc__CMakeLists.txt >=================================================================== >--- multimedia/plexhometheater/files/patch-xbmc__CMakeLists.txt (revision 383908) >+++ multimedia/plexhometheater/files/patch-xbmc__CMakeLists.txt (working copy) >@@ -1,13 +0,0 @@ >---- xbmc/CMakeLists.txt.orig 2014-08-05 20:17:14.627532749 +0800 >-+++ xbmc/CMakeLists.txt 2014-08-05 20:17:45.319521746 +0800 >-@@ -10,6 +10,10 @@ >- list(APPEND subdirs linux) >- endif(TARGET_POSIX) >- >-+if(TARGET_FREEBSD) >-+ list(APPEND subdirs freebsd) >-+endif(TARGET_FREEBSD) >-+ >- if(TARGET_WIN32) >- list(APPEND subdirs win32) >- endif(TARGET_WIN32) >Index: multimedia/plexhometheater/files/patch-xbmc__cdrip__CMakeLists.txt >=================================================================== >--- multimedia/plexhometheater/files/patch-xbmc__cdrip__CMakeLists.txt (revision 383908) >+++ multimedia/plexhometheater/files/patch-xbmc__cdrip__CMakeLists.txt (working copy) >@@ -1,10 +0,0 @@ >---- xbmc/cdrip/CMakeLists.txt.orig 2014-09-13 10:49:51.253607190 +0800 >-+++ xbmc/cdrip/CMakeLists.txt 2014-09-13 10:53:30.657607851 +0800 >-@@ -1,5 +1,7 @@ >- find_all_sources(. cdrip_SRCS) >- list(REMOVE_ITEM cdrip_SRCS ./EncoderFFmpeg.cpp) >- list(REMOVE_ITEM cdrip_SRCS ./EncoderFFmpeg.h) >-+list(REMOVE_ITEM cdrip_SRCS ./EncoderLame.cpp) >-+list(REMOVE_ITEM cdrip_SRCS ./EncoderLame.h) >- list(REMOVE_ITEM cdrip_SRCS ./CDDARipper.cpp) >- add_sources(${cdrip_SRCS}) >Index: multimedia/plexhometheater/files/patch-xbmc__cores__AudioEngine__Sinks__CMakeLists.txt >=================================================================== >--- multimedia/plexhometheater/files/patch-xbmc__cores__AudioEngine__Sinks__CMakeLists.txt (revision 383908) >+++ multimedia/plexhometheater/files/patch-xbmc__cores__AudioEngine__Sinks__CMakeLists.txt (working copy) >@@ -1,13 +0,0 @@ >---- ./xbmc/cores/AudioEngine/Sinks/CMakeLists.txt.orig 2014-06-02 10:54:42.814711159 +0800 >-+++ ./xbmc/cores/AudioEngine/Sinks/CMakeLists.txt 2014-06-02 10:55:26.844707184 +0800 >-@@ -8,8 +8,8 @@ >- set(ae_SRCS ${ae_SRCS} AESinkWASAPI.cpp AESinkWASAPI.h AESinkDirectSound.cpp AESinkDirectSound.h) >- endif(TARGET_WIN32) >- >--if(TARGET_COMMON_LINUX) >-+if(TARGET_COMMON_LINUX OR TARGET_FREEBSD) >- set(ae_SRCS ${ae_SRCS} AESinkOSS.cpp AESinkOSS.h) >--endif(TARGET_COMMON_LINUX) >-+endif(TARGET_COMMON_LINUX OR TARGET_FREEBSD) >- >- add_sources(${ae_SRCS}) >Index: multimedia/plexhometheater/files/patch-xbmc__cores__DllLoader__CMakeLists.txt >=================================================================== >--- multimedia/plexhometheater/files/patch-xbmc__cores__DllLoader__CMakeLists.txt (revision 383908) >+++ multimedia/plexhometheater/files/patch-xbmc__cores__DllLoader__CMakeLists.txt (working copy) >@@ -1,18 +0,0 @@ >---- xbmc/cores/DllLoader/CMakeLists.txt.orig 2014-07-31 22:37:29.000000000 +0800 >-+++ xbmc/cores/DllLoader/CMakeLists.txt 2014-08-05 19:51:50.258522209 +0800 >-@@ -4,10 +4,15 @@ >- list(REMOVE_ITEM dllloader_SRCS ./DllLoader-linux.cpp) >- if(UNIX) >- list(REMOVE_ITEM dllloader_SRCS ./Win32DllLoader.cpp) >-+ list(REMOVE_ITEM dllloader_SRCS ./Win32DllLoader.h) >- else() >- list(REMOVE_ITEM dllloader_SRCS ./DllLoader-linux.cpp) >- list(REMOVE_ITEM dllloader_SRCS ./ldt_keeper.c) >- list(REMOVE_ITEM dllloader_SRCS ./mmap_anon.c) >- list(REMOVE_ITEM dllloader_SRCS ./SoLoader.cpp) >- endif() >-+if(TARGET_FREEBSD) >-+ list(REMOVE_ITEM dllloader_SRCS ./ldt_keeper.c) >-+ list(REMOVE_ITEM dllloader_SRCS ./ldt_keeper.h) >-+endif() >- add_sources(${dllloader_SRCS}) >Index: multimedia/plexhometheater/files/patch-xbmc__cores__dvdplayer__DVDCodecs__Video__CMakeLists.txt >=================================================================== >--- multimedia/plexhometheater/files/patch-xbmc__cores__dvdplayer__DVDCodecs__Video__CMakeLists.txt (revision 383908) >+++ multimedia/plexhometheater/files/patch-xbmc__cores__dvdplayer__DVDCodecs__Video__CMakeLists.txt (working copy) >@@ -1,15 +0,0 @@ >---- ./xbmc/cores/dvdplayer/DVDCodecs/Video/CMakeLists.txt.orig 2014-06-02 09:54:40.766706418 +0800 >-+++ ./xbmc/cores/dvdplayer/DVDCodecs/Video/CMakeLists.txt 2014-06-02 09:59:13.577706588 +0800 >-@@ -8,9 +8,9 @@ >- list(REMOVE_ITEM video_SRCS ./DXVA.cpp) >- endif() >- >--if (NOT TARGET_LINUX) >-+if (NOT TARGET_LINUX AND NOT TARGET_FREEBSD) >- list(REMOVE_ITEM video_SRCS ./VDPAU.cpp) >- list(REMOVE_ITEM video_SRCS ./VAAPI.cpp) >- endif() >- >--add_sources(${video_SRCS}) >-\ No newline at end of file >-+add_sources(${video_SRCS}) >Index: multimedia/plexhometheater/files/patch-xbmc__input__CMakeLists.txt >=================================================================== >--- multimedia/plexhometheater/files/patch-xbmc__input__CMakeLists.txt (revision 383908) >+++ multimedia/plexhometheater/files/patch-xbmc__input__CMakeLists.txt (working copy) >@@ -1,14 +0,0 @@ >---- xbmc/input/CMakeLists.txt.orig 2014-05-23 21:04:41.000000000 +0800 >-+++ xbmc/input/CMakeLists.txt 2014-06-03 21:05:10.893292928 +0800 >-@@ -1,8 +1,8 @@ >--if(TARGET_COMMON_LINUX) >-+if(TARGET_COMMON_LINUX OR TARGET_FREEBSD) >- add_subdirectory(linux) >--elseif(TARGET_WIN32) >-+elseif(TARGET_WIN32 OR TARGET_FREEBSD) >- add_subdirectory(windows) >--endif(TARGET_COMMON_LINUX) >-+endif(TARGET_COMMON_LINUX OR TARGET_FREEBSD) >- >- find_all_sources(. input_SRCS) >- if(TARGET_WIN32) >Index: multimedia/plexhometheater/files/patch-xbmc__linux__CMakeLists.txt >=================================================================== >--- multimedia/plexhometheater/files/patch-xbmc__linux__CMakeLists.txt (revision 383908) >+++ multimedia/plexhometheater/files/patch-xbmc__linux__CMakeLists.txt (working copy) >@@ -1,15 +0,0 @@ >---- xbmc/linux/CMakeLists.txt.orig 2014-08-12 19:59:38.122858031 +0800 >-+++ xbmc/linux/CMakeLists.txt 2014-08-12 20:01:44.139854604 +0800 >-@@ -1,10 +1,10 @@ >- find_all_sources(. linux_SRCS) >--if(NOT TARGET_COMMON_LINUX) >-+if(NOT TARGET_COMMON_LINUX AND NOT TARGET_FREEBSD) >- list(REMOVE_ITEM linux_SRCS ./DBusMessage.cpp) >- list(REMOVE_ITEM linux_SRCS ./DBusReserve.cpp) >- list(REMOVE_ITEM linux_SRCS ./DBusUtil.cpp) >- list(REMOVE_ITEM linux_SRCS ./HALManager.cpp) >--endif(NOT TARGET_COMMON_LINUX) >-+endif(NOT TARGET_COMMON_LINUX AND NOT TARGET_FREEBSD) >- >- if(NOT TARGET_RPI) >- list(REMOVE_ITEM linux_SRCS ./OMXClock.cpp ./OMXCore.cpp ./RBP.cpp) >Index: multimedia/plexhometheater/files/patch-xbmc__storage__CMakeLists.txt >=================================================================== >--- multimedia/plexhometheater/files/patch-xbmc__storage__CMakeLists.txt (revision 383908) >+++ multimedia/plexhometheater/files/patch-xbmc__storage__CMakeLists.txt (working copy) >@@ -1,11 +0,0 @@ >---- ./xbmc/storage/CMakeLists.txt.orig 2014-06-02 11:58:10.561704806 +0800 >-+++ ./xbmc/storage/CMakeLists.txt 2014-06-02 11:58:35.933705320 +0800 >-@@ -1,7 +1,7 @@ >- find_all_sources(. storage_SRCS) >- if(TARGET_COMMON_DARWIN) >- find_all_sources(osx storage_os_SRCS) >--elseif(TARGET_COMMON_LINUX) >-+elseif(TARGET_COMMON_LINUX OR TARGET_FREEBSD) >- find_all_sources(linux storage_os_SRCS) >- elseif(TARGET_WIN32) >- find_all_sources(windows storage_os_SRCS) >Index: multimedia/plexhometheater/files/patch-xbmc__visualizations__XBMCProjectM__CMakeLists.txt >=================================================================== >--- multimedia/plexhometheater/files/patch-xbmc__visualizations__XBMCProjectM__CMakeLists.txt (revision 383908) >+++ multimedia/plexhometheater/files/patch-xbmc__visualizations__XBMCProjectM__CMakeLists.txt (working copy) >@@ -1,19 +0,0 @@ >---- xbmc/visualizations/XBMCProjectM/CMakeLists.txt.orig 2014-08-03 22:38:59.515545987 +0800 >-+++ xbmc/visualizations/XBMCProjectM/CMakeLists.txt 2014-08-03 22:41:07.814522967 +0800 >-@@ -41,13 +41,13 @@ >- ADD_DEFINITIONS(-DMACOS -DSTBI_NO_DDS) >- elseif(TARGET_WIN32) >- ADD_DEFINITIONS(-DWIN32 -DSTBI_NO_DDS) >--else(TARGET_COMMON_LINUX) >-+else(TARGET_COMMON_DARWIN) >- ADD_DEFINITIONS(-DLINUX -DSTBI_NO_DDS) >- endif(TARGET_COMMON_DARWIN) >- >--if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "GNU") >-+if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") >- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-format -Wno-parentheses-equality -Wno-enum-conversion -Wno-deprecated-writable-strings") >--endif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "GNU") >-+endif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") >- >- set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${PLEX_LINK_WRAPPED}") >- find_program(ZIP zip) >Index: multimedia/plexhometheater/files/patch-xbmc__windowing__CMakeLists.txt >=================================================================== >--- multimedia/plexhometheater/files/patch-xbmc__windowing__CMakeLists.txt (revision 383908) >+++ multimedia/plexhometheater/files/patch-xbmc__windowing__CMakeLists.txt (working copy) >@@ -1,11 +0,0 @@ >---- ./xbmc/windowing/CMakeLists.txt.orig 2014-06-02 11:45:27.908705610 +0800 >-+++ ./xbmc/windowing/CMakeLists.txt 2014-06-02 11:46:11.557706164 +0800 >-@@ -11,6 +11,8 @@ >- else() >- find_all_sources(X11 windowing_os_SRCS) >- endif() >-+elseif(TARGET_FREEBSD) >-+ find_all_sources(X11 windowing_os_SRCS) >- elseif(TARGET_WIN32) >- find_all_sources(windows windowing_os_SRCS) >- list(REMOVE_ITEM windowing_os_SRCS windows/WinSystemWin32GL.cpp) >Index: multimedia/plexhometheater/pkg-plist >=================================================================== >--- multimedia/plexhometheater/pkg-plist (revision 383908) >+++ multimedia/plexhometheater/pkg-plist (working copy) >@@ -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/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 @@ > %%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,7 +141,6 @@ > %%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 >@@ -147,10 +147,12 @@ > %%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 @@ > %%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 @@ > %%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 @@ > %%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
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 199416
: 155542 |
155543