Index: head/multimedia/plexhometheater/Makefile =================================================================== --- head/multimedia/plexhometheater/Makefile (revision 430876) +++ head/multimedia/plexhometheater/Makefile (revision 430877) @@ -1,140 +1,139 @@ # Created by: Ben Woods # $FreeBSD$ PORTNAME= plexhometheater PORTVERSION= 1.4.1 DISTVERSIONPREFIX=v DISTVERSIONSUFFIX=.469-47a90f01 PORTREVISION= 6 CATEGORIES= multimedia MAINTAINER= woodsb02@FreeBSD.org COMMENT= Media center frontend to multimedia/plexmediaserver LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/LICENSE.GPL BUILD_DEPENDS= enca:converters/enca \ gawk:lang/gawk \ gperf:devel/gperf \ cmake:devel/cmake \ zip:archivers/zip \ nasm:devel/nasm \ gtk-update-icon-cache:x11-toolkits/gtk20 \ swig2.0:devel/swig20 - LIB_DEPENDS= libass.so:multimedia/libass \ libavahi-client.so:net/avahi-app \ libboost_thread.so:devel/boost-libs \ libcdio.so:sysutils/libcdio \ libcurl.so:ftp/curl \ libdbus-1.so:devel/dbus \ libenca.so:converters/enca \ libFLAC.so:audio/flac \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libfribidi.so:converters/fribidi \ libhal.so:sysutils/hal \ libjasper.so:graphics/jasper \ liblzo2.so:archivers/lzo2 \ libmad.so:audio/libmad \ libmicrohttpd.so:www/libmicrohttpd \ libmodplug.so:audio/libmodplug \ libmpeg2.so:multimedia/libmpeg2 \ libpcre.so:devel/pcre \ libplist.so:devel/libplist \ libpng.so:graphics/png \ librtmp.so:multimedia/librtmp \ libsamplerate.so:audio/libsamplerate \ libshairport.so:audio/libshairport \ libsqlite3.so:databases/sqlite3 \ libtag.so:audio/taglib \ libtiff.so:graphics/tiff \ libtinyxml.so:textproc/tinyxml \ libva.so:multimedia/libva \ libvdpau.so:multimedia/libvdpau \ libvorbis.so:audio/libvorbis \ libxslt.so:textproc/libxslt \ libyajl.so:devel/yajl - RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \ glxinfo:graphics/mesa-demos \ ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow \ xdpyinfo:x11/xdpyinfo BROKEN= Fails to build against libsamplerate-0.1.9 USE_GITHUB= yes GH_ACCOUNT= plexinc GH_PROJECT= plex-home-theater-public BUNDLE_LIBS= yes USES= cmake:outsource execinfo gmake iconv:wchar_t jpeg pkgconfig python:2 CMAKE_ARGS+= -DENABLE_AUTOUPDATE:BOOL=false CMAKE_ARGS+= -DENABLE_DUMP_SYMBOLS:BOOL=false CMAKE_ARGS+= -DENABLE_PYTHON:BOOL=false CMAKE_ARGS+= -DUSE_INTERNAL_FFMPEG:BOOL=true CMAKE_ARGS+= -DCREATE_BUNDLE:BOOL=false CMAKE_ARGS+= -DCMAKE_PREFIX_PATH=${LOCALBASE} CFLAGS+= -isystem${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib USE_XORG= xt xmu xtst xrandr USE_GL= glu glew USE_SDL= image sdl mixer INSTALLS_ICONS= yes ONLY_FOR_ARCHS= i386 amd64 PLEX_ARCH_i386= x86 PLEX_ARCH_amd64=x86_64 SUB_FILES= ${PORTNAME}.sh pkg-message PLIST_SUB= ARCH=${PLEX_ARCH_${ARCH}} DESKTOP_ENTRIES="Plex Home Theater" \ "${COMMENT}" \ "${DATADIR}/media/plex-icon-120.png" \ "plexhometheater.sh" \ "AudioVideo;Video;" \ true OPTIONS_SUB= yes OPTIONS_DEFINE= CEC LIRC PULSEAUDIO CEC_DESC= Control plexhometheater over HDMI with TV remote OPTIONS_DEFAULT= CEC LIRC CEC_BUILD_DEPENDS= libcec>=3.0.0:multimedia/libcec CEC_LIB_DEPENDS= libcec.so:multimedia/libcec CEC_CMAKE_OFF= -DCMAKE_DISABLE_FIND_PACKAGE_CEC:BOOL=true LIRC_RUN_DEPENDS= lircd:comms/lirc PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_CMAKE_OFF= -DCMAKE_DISABLE_FIND_PACKAGE_PulseAudio:BOOL=true .include post-patch: @${REINPLACE_CMD} 's/[[:<:]]ARCH[[:>:]]/FFMPEG_ARCH/' \ ${WRKSRC}/lib/ffmpeg/Makefile \ ${WRKSRC}/lib/ffmpeg/common.mak \ ${WRKSRC}/lib/ffmpeg/configure \ ${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 .if ${OPSYS} == "FreeBSD" && ${OSVERSION} < 1000024 @${REINPLACE_CMD} 's/__builtin_bswap/__bswap/g' \ ${WRKSRC}/plex/Third-Party/hash-library/crc32.cpp \ ${WRKSRC}/plex/Third-Party/hash-library/keccak.cpp \ ${WRKSRC}/plex/Third-Party/hash-library/md5.cpp \ ${WRKSRC}/plex/Third-Party/hash-library/sha1.cpp \ ${WRKSRC}/plex/Third-Party/hash-library/sha256.cpp \ ${WRKSRC}/plex/Third-Party/hash-library/sha3.cpp .endif post-install: ${RM} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/*.so ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh ${STAGEDIR}${PREFIX}/bin .include Index: head/multimedia/plexhometheater/files/patch-xbmc__cores__AudioEngine__Engines__SoftAE__SoftAE.cpp =================================================================== --- head/multimedia/plexhometheater/files/patch-xbmc__cores__AudioEngine__Engines__SoftAE__SoftAE.cpp (revision 430876) +++ head/multimedia/plexhometheater/files/patch-xbmc__cores__AudioEngine__Engines__SoftAE__SoftAE.cpp (nonexistent) @@ -1,13 +0,0 @@ -diff --git xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.cpp xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.cpp -index bd01a67..49edfee 100644 ---- xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.cpp -+++ xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.cpp -@@ -303,7 +303,7 @@ void CSoftAE::InternalOpenSink() - - /* perform basic sanity checks on the format returned by the sink */ - ASSERT(newFormat.m_channelLayout.Count() > 0); -- ASSERT(newFormat.m_dataFormat <= AE_FMT_FLOAT); -+ ASSERT(newFormat.m_dataFormat <= AE_FMT_MAX); - ASSERT(newFormat.m_frames > 0); - ASSERT(newFormat.m_frameSamples > 0); - ASSERT(newFormat.m_frameSize == (CAEUtil::DataFormatToBits(newFormat.m_dataFormat) >> 3) * newFormat.m_channelLayout.Count()); Property changes on: head/multimedia/plexhometheater/files/patch-xbmc__cores__AudioEngine__Engines__SoftAE__SoftAE.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/multimedia/plexhometheater/files/patch-xbmc__threads__platform__pthreads__ThreadImpl.cpp =================================================================== --- head/multimedia/plexhometheater/files/patch-xbmc__threads__platform__pthreads__ThreadImpl.cpp (revision 430876) +++ head/multimedia/plexhometheater/files/patch-xbmc__threads__platform__pthreads__ThreadImpl.cpp (nonexistent) @@ -1,28 +0,0 @@ ---- xbmc/threads/platform/pthreads/ThreadImpl.cpp.orig 2013-05-13 11:32:04.000000000 +0200 -+++ xbmc/threads/platform/pthreads/ThreadImpl.cpp 2013-05-13 11:47:27.000000000 +0200 -@@ -29,12 +29,8 @@ - #include - #ifdef __FreeBSD__ - #include --#if __FreeBSD_version < 900031 --#include --#else - #include - #endif --#endif - - #include - -@@ -59,11 +55,7 @@ - void CThread::SetThreadInfo() - { - #ifdef __FreeBSD__ --#if __FreeBSD_version < 900031 -- long lwpid; -- thr_self(&lwpid); -- m_ThreadOpaque.LwpId = lwpid; --#else -+#if __FreeBSD_version > 900030 - m_ThreadOpaque.LwpId = pthread_getthreadid_np(); - #endif - #elif defined(TARGET_ANDROID) Property changes on: head/multimedia/plexhometheater/files/patch-xbmc__threads__platform__pthreads__ThreadImpl.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/multimedia/plexhometheater/files/patch-xbmc__visualizations__XBMCProjectM__libprojectM__PresetLoader.hpp =================================================================== --- head/multimedia/plexhometheater/files/patch-xbmc__visualizations__XBMCProjectM__libprojectM__PresetLoader.hpp (revision 430876) +++ head/multimedia/plexhometheater/files/patch-xbmc__visualizations__XBMCProjectM__libprojectM__PresetLoader.hpp (nonexistent) @@ -1,11 +0,0 @@ ---- xbmc/visualizations/XBMCProjectM/libprojectM/PresetLoader.hpp.orig 2013-07-04 15:52:54.000000000 +0200 -+++ xbmc/visualizations/XBMCProjectM/libprojectM/PresetLoader.hpp 2013-07-04 15:53:28.000000000 +0200 -@@ -29,7 +29,7 @@ - static const std::string MILKDROP_FILE_EXTENSION; - - /** Initializes the preset loader with the target directory specified */ -- PresetLoader(std::string dirname); -+ PresetLoader(std::string dirname = std::string()); - - /** Destructor will remove all alllocated presets */ - ~PresetLoader(); Property changes on: head/multimedia/plexhometheater/files/patch-xbmc__visualizations__XBMCProjectM__libprojectM__PresetLoader.hpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/multimedia/plexhometheater/files/patch-plex__CMakeModules__PlatformConfigFREEBSD.cmake =================================================================== --- head/multimedia/plexhometheater/files/patch-plex__CMakeModules__PlatformConfigFREEBSD.cmake (revision 430876) +++ head/multimedia/plexhometheater/files/patch-plex__CMakeModules__PlatformConfigFREEBSD.cmake (nonexistent) @@ -1,147 +0,0 @@ ---- plex/CMakeModules/PlatformConfigFREEBSD.cmake.orig 2014-06-18 10:24:35.922455079 +0000 -+++ plex/CMakeModules/PlatformConfigFREEBSD.cmake 2014-06-18 13:58:08.739586540 +0000 -@@ -0,0 +1,144 @@ -+# vim: setlocal syntax=cmake: -+ -+######################### Compiler CFLAGS -+set(EXTRA_CFLAGS "-fPIC -DPIC") -+ -+######################### CHECK LIBRARIES / FRAMEWORKS -+option(USE_INTERNAL_FFMPEG "" ON) -+ -+set(LINK_PKG -+ Freetype -+ SDL -+ SDL_image -+ SDL_mixer -+ OpenGL -+ ZLIB -+ JPEG -+ X11 -+ SQLite3 -+ PCRE -+ Lzo2 -+ FriBiDi -+ Fontconfig -+ Samplerate -+ YAJL -+ microhttpd -+ Crypto -+ TinyXML -+ GLEW -+ Iconv -+ Avahi -+ Xrandr -+ LibRt -+ FLAC -+ DBUS -+ Execinfo -+) -+ -+if(NOT USE_INTERNAL_FFMPEG) -+ list(APPEND LINK_PKG FFmpeg) -+else() -+ set(FFMPEG_INCLUDE_DIRS ${PROJECT_SOURCE_DIR}/lib/ffmpeg ${CMAKE_BINARY_DIR}/lib/ffmpeg/ffmpeg/src/ffmpeg-build) -+endif() -+ -+if(ENABLE_PYTHON) -+ list(APPEND LINK_PKG Python) -+endif(ENABLE_PYTHON) -+ -+foreach(l ${LINK_PKG}) -+ plex_find_package(${l} 1 1) -+endforeach() -+ -+find_package(Boost COMPONENTS thread system REQUIRED) -+if(Boost_FOUND) -+ include_directories(${Boost_INCLUDE_DIRS}) -+ list(APPEND CONFIG_PLEX_LINK_LIBRARIES ${Boost_LIBRARIES}) -+ set(HAVE_BOOST 1) -+endif() -+ -+### install libs -+set(INSTALL_LIB -+ CURL -+ PNG -+ TIFF -+ Vorbis -+ LibMad -+ Mpeg2 -+ Ass -+ RTMP -+ PLIST -+ ShairPort -+ VAAPI -+ VDPAU -+) -+ -+foreach(l ${INSTALL_LIB}) -+ plex_find_package(${l} 1 0) -+endforeach() -+ -+plex_find_package(CEC 0 0) -+ -+plex_find_package(Threads 1 0) -+if(CMAKE_USE_PTHREADS_INIT) -+ message(STATUS "Using pthreads: ${CMAKE_THREAD_LIBS_INIT}") -+ list(APPEND CONFIG_PLEX_LINK_LIBRARIES ${CMAKE_THREAD_LIBS_INIT}) -+ set(HAVE_LIBPTHREAD 1) -+endif() -+ -+plex_find_package(PulseAudio 0 1) -+if(HAVE_LIBPULSEAUDIO) -+ set(HAVE_LIBPULSE 1) -+endif() -+ -+plex_find_package(LibUSB 0 1) -+ -+if(ENABLE_DVD_DRIVE) -+ plex_find_package(CDIO 1 1) -+endif(ENABLE_DVD_DRIVE) -+ -+if(NOT LIBUSB_FOUND) -+ message(WARNING "No USB support") -+endif() -+ -+if(VAAPI_FOUND) -+ list(APPEND CONFIG_PLEX_LINK_LIBRARIES ${VAAPI_LIBRARIES}) -+ include_directories(${VAAPI_INCLUDE_DIR}) -+ set(HAVE_LIBVA 1) -+endif() -+ -+plex_get_soname(CURL_SONAME ${CURL_LIBRARY}) -+ -+list(APPEND CONFIG_INTERNAL_LIBS lib_dllsymbols) -+ -+#### -+if(DEFINED X11_FOUND) -+ set(HAVE_X11 1) -+endif() -+ -+if(DEFINED OPENGL_FOUND) -+ set(HAVE_LIBGL 1) -+endif() -+ -+#### default lircdevice -+set(LIRC_DEVICE "/var/run/lirc/lircd") -+ -+#### on freebsd we want to use a "easy" name -+set(EXECUTABLE_NAME "plexhometheater") -+ -+if(${CMAKE_HOST_SYSTEM_PROCESSOR} STREQUAL "amd64") -+ set(ARCH "x86_64-freebsd") -+else() -+ set(ARCH "x86-freebsd") -+endif() -+ -+set(LIBPATH lib/plexhometheater) -+set(BINPATH bin) -+set(RESOURCEPATH share/plexhometheater) -+ -+set(PLEX_LINK_WRAPPED "-Wl,--unresolved-symbols=ignore-all -Wl,-wrap,_IO_getc -Wl,-wrap,_IO_getc_unlocked -Wl,-wrap,_IO_putc -Wl,-wrap,__fgets_chk -Wl,-wrap,__fprintf_chk -Wl,-wrap,__fread_chk -Wl,-wrap,__fxstat64 -Wl,-wrap,__lxstat64 -Wl,-wrap,__printf_chk -Wl,-wrap,__read_chk -Wl,-wrap,__vfprintf_chk -Wl,-wrap,__xstat64 -Wl,-wrap,_stat -Wl,-wrap,calloc -Wl,-wrap,clearerr -Wl,-wrap,close -Wl,-wrap,closedir -Wl,-wrap,dlopen -Wl,-wrap,fclose -Wl,-wrap,fdopen -Wl,-wrap,feof -Wl,-wrap,ferror -Wl,-wrap,fflush -Wl,-wrap,fgetc -Wl,-wrap,fgetpos -Wl,-wrap,fgetpos64 -Wl,-wrap,fgets -Wl,-wrap,fileno -Wl,-wrap,flockfile -Wl,-wrap,fopen -Wl,-wrap,fopen64 -Wl,-wrap,fprintf -Wl,-wrap,fputc -Wl,-wrap,fputs -Wl,-wrap,fread -Wl,-wrap,free -Wl,-wrap,freopen -Wl,-wrap,fseek -Wl,-wrap,fseeko64 -Wl,-wrap,fsetpos -Wl,-wrap,fsetpos64 -Wl,-wrap,fstat -Wl,-wrap,ftell -Wl,-wrap,ftello64 -Wl,-wrap,ftrylockfile -Wl,-wrap,funlockfile -Wl,-wrap,fwrite -Wl,-wrap,getc -Wl,-wrap,getc_unlocked -Wl,-wrap,getmntent -Wl,-wrap,ioctl -Wl,-wrap,lseek -Wl,-wrap,lseek64 -Wl,-wrap,malloc -Wl,-wrap,open -Wl,-wrap,open64 -Wl,-wrap,opendir -Wl,-wrap,popen -Wl,-wrap,printf -Wl,-wrap,read -Wl,-wrap,readdir -Wl,-wrap,readdir64 -Wl,-wrap,realloc -Wl,-wrap,rewind -Wl,-wrap,rewinddir -Wl,-wrap,setvbuf -Wl,-wrap,ungetc -Wl,-wrap,vfprintf -Wl,-wrap,write") -+ -+set(PLEX_LINK_WHOLEARCHIVE -Wl,--whole-archive) -+set(PLEX_LINK_NOWHOLEARCHIVE -Wl,--no-whole-archive) -+ -+############ Add our definitions -+add_definitions(-DTARGET_FREEBSD) Property changes on: head/multimedia/plexhometheater/files/patch-plex__CMakeModules__PlatformConfigFREEBSD.cmake ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/multimedia/plexhometheater/files/patch-xbmc__freebsd__CMakeLists.txt =================================================================== --- head/multimedia/plexhometheater/files/patch-xbmc__freebsd__CMakeLists.txt (revision 430876) +++ head/multimedia/plexhometheater/files/patch-xbmc__freebsd__CMakeLists.txt (nonexistent) @@ -1,6 +0,0 @@ ---- xbmc/freebsd/CMakeLists.txt.orig 2014-08-05 20:18:02.009525912 +0800 -+++ xbmc/freebsd/CMakeLists.txt 2014-08-05 20:18:40.357527987 +0800 -@@ -0,0 +1,3 @@ -+find_all_sources(. freebsd_SRCS) -+ -+add_sources(${freebsd_SRCS}) Property changes on: head/multimedia/plexhometheater/files/patch-xbmc__freebsd__CMakeLists.txt ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/multimedia/plexhometheater/files/patch-xbmc__cores__dvdplayer__DVDCodecs__Video__VAAPI.cpp =================================================================== --- head/multimedia/plexhometheater/files/patch-xbmc__cores__dvdplayer__DVDCodecs__Video__VAAPI.cpp (revision 430876) +++ head/multimedia/plexhometheater/files/patch-xbmc__cores__dvdplayer__DVDCodecs__Video__VAAPI.cpp (nonexistent) @@ -1,11 +0,0 @@ ---- xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp.orig 2013-10-19 23:07:02.530131780 +0200 -+++ xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp 2013-10-19 23:06:38.499626784 +0200 -@@ -74,7 +74,7 @@ - - static CDisplayPtr GetGlobalDisplay() - { -- static weak_ptr display_global; -+ static boost::weak_ptr display_global; - - CDisplayPtr display(display_global.lock()); - if(display) Property changes on: head/multimedia/plexhometheater/files/patch-xbmc__cores__dvdplayer__DVDCodecs__Video__VAAPI.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/multimedia/plexhometheater/files/patch-clang =================================================================== --- head/multimedia/plexhometheater/files/patch-clang (revision 430876) +++ head/multimedia/plexhometheater/files/patch-clang (revision 430877) @@ -1,131 +1,121 @@ -diff --git xbmc/screensavers/rsxs-0.9/lib/argp-fmtstream.h xbmc/screensavers/rsxs-0.9/lib/argp-fmtstream.h -index e045a72..ff4f575 100644 ---- xbmc/screensavers/rsxs-0.9/lib/argp-fmtstream.h -+++ xbmc/screensavers/rsxs-0.9/lib/argp-fmtstream.h -@@ -198,8 +198,12 @@ extern int __argp_fmtstream_ensure (argp_fmtstream_t __fs, size_t __amount); - #endif - - #ifndef ARGP_FS_EI -+#ifdef __clang__ -+#define ARGP_FS_EI extern inline __attribute__ ((__gnu_inline__)) -+#else - #define ARGP_FS_EI extern inline - #endif -+#endif - - ARGP_FS_EI size_t - __argp_fmtstream_write (argp_fmtstream_t __fs, - -diff --git lib/cpluff/libcpluff/cpluff.c lib/cpluff/libcpluff/cpluff.c -index a7e8725..0f5bb90 100644 ---- lib/cpluff/libcpluff/cpluff.c +--- lib/cpluff/libcpluff/cpluff.c.orig 2015-05-11 07:54:22 UTC +++ lib/cpluff/libcpluff/cpluff.c -@@ -77,6 +77,7 @@ CP_C_API const char *cp_get_host_type(void) { +@@ -77,6 +77,7 @@ CP_C_API const char *cp_get_host_type(vo return CP_HOST; } +#if defined(CP_THREADS) || !defined(NDEBUG) CP_HIDDEN void cpi_lock_framework(void) { #if defined(CP_THREADS) cpi_lock_mutex(framework_mutex); -@@ -93,6 +94,7 @@ CP_HIDDEN void cpi_unlock_framework(void) { +@@ -93,6 +94,7 @@ CP_HIDDEN void cpi_unlock_framework(void framework_locked--; #endif } +#endif static void reset(void) { #ifdef CP_THREADS -diff --git lib/cpluff/libcpluff/logging.c lib/cpluff/libcpluff/logging.c -index 928f0b4..f0f873d 100644 ---- lib/cpluff/libcpluff/logging.c +--- lib/cpluff/libcpluff/logging.c.orig 2015-05-11 07:54:22 UTC +++ lib/cpluff/libcpluff/logging.c -@@ -129,10 +129,12 @@ CP_C_API cp_status_t cp_register_logger(cp_context_t *context, cp_logger_func_t +@@ -129,10 +129,12 @@ CP_C_API cp_status_t cp_register_logger( // Report error if (status == CP_ERR_RESOURCE) { cpi_error(context, N_("Logger could not be registered due to insufficient memory.")); +#if defined(CP_THREADS) || !defined(NDEBUG) } else if (cpi_is_logged(context, CP_LOG_DEBUG)) { char owner[64]; /* TRANSLATORS: %s is the context owner */ cpi_debugf(context, N_("%s registered a logger."), cpi_context_owner(context, owner, sizeof(owner))); +#endif } cpi_unlock_context(context); -@@ -166,11 +168,13 @@ CP_C_API void cp_unregister_logger(cp_context_t *context, cp_logger_func_t logge +@@ -166,11 +168,13 @@ CP_C_API void cp_unregister_logger(cp_co free(lh); update_logging_limits(context); } +#if defined(CP_THREADS) || !defined(NDEBUG) if (cpi_is_logged(context, CP_LOG_DEBUG)) { char owner[64]; /* TRANSLATORS: %s is the context owner */ cpi_debugf(context, N_("%s unregistered a logger."), cpi_context_owner(context, owner, sizeof(owner))); } +#endif cpi_unlock_context(context); } -diff --git lib/cpluff/libcpluff/pinfo.c lib/cpluff/libcpluff/pinfo.c -index cfbf049..f7b4a4b 100644 ---- lib/cpluff/libcpluff/pinfo.c +--- lib/cpluff/libcpluff/pinfo.c.orig 2015-05-11 07:54:22 UTC +++ lib/cpluff/libcpluff/pinfo.c -@@ -569,10 +569,12 @@ CP_C_API cp_status_t cp_register_plistener(cp_context_t *context, cp_plugin_list +@@ -569,10 +569,12 @@ CP_C_API cp_status_t cp_register_plisten // Report error or success if (status != CP_OK) { cpi_error(context, _("A plug-in listener could not be registered due to insufficient memory.")); +#if defined(CP_THREADS) || !defined(NDEBUG) } else if (cpi_is_logged(context, CP_LOG_DEBUG)) { char owner[64]; /* TRANSLATORS: %s is the context owner */ cpi_debugf(context, N_("%s registered a plug-in listener."), cpi_context_owner(context, owner, sizeof(owner))); +#endif } cpi_unlock_context(context); -@@ -591,10 +593,12 @@ CP_C_API void cp_unregister_plistener(cp_context_t *context, cp_plugin_listener_ +@@ -591,11 +593,13 @@ CP_C_API void cp_unregister_plistener(cp if (node != NULL) { process_unregister_plistener(context->env->plugin_listeners, node, NULL); } +#if defined(CP_THREADS) || !defined(NDEBUG) if (cpi_is_logged(context, CP_LOG_DEBUG)) { char owner[64]; /* TRANSLATORS: %s is the context owner */ cpi_debugf(context, N_("%s unregistered a plug-in listener."), cpi_context_owner(context, owner, sizeof(owner))); } +#endif cpi_unlock_context(context); } -diff --git lib/cpluff/libcpluff/psymbol.c lib/cpluff/libcpluff/psymbol.c -index 632b087..fdc15af 100644 ---- lib/cpluff/libcpluff/psymbol.c + +--- lib/cpluff/libcpluff/psymbol.c.orig 2015-05-11 07:54:22 UTC +++ lib/cpluff/libcpluff/psymbol.c -@@ -248,11 +248,13 @@ CP_C_API void * cp_resolve_symbol(cp_context_t *context, const char *id, const c +@@ -248,11 +248,13 @@ CP_C_API void * cp_resolve_symbol(cp_con symbol_info->usage_count++; provider_info->usage_count++; +#if defined(CP_THREADS) || !defined(NDEBUG) if (cpi_is_logged(context, CP_LOG_DEBUG)) { char owner[64]; /* TRANSLATORS: First %s is the context owner */ cpi_debugf(context, "%s resolved symbol %s defined by plug-in %s.", cpi_context_owner(context, owner, sizeof(owner)), name, id); } +#endif } while (0); // Clean up -@@ -314,11 +316,13 @@ CP_C_API void cp_release_symbol(cp_context_t *context, const void *ptr) { +@@ -314,11 +316,13 @@ CP_C_API void cp_release_symbol(cp_conte if (symbol_info->usage_count == 0) { hash_delete_free(context->resolved_symbols, node); free(symbol_info); +#if defined(CP_THREADS) || !defined(NDEBUG) if (cpi_is_logged(context, CP_LOG_DEBUG)) { char owner[64]; /* TRANSLATORS: First %s is the context owner */ cpi_debugf(context, _("%s released the symbol at address %p defined by plug-in %s."), cpi_context_owner(context, owner, sizeof(owner)), ptr, provider_info->plugin->plugin->identifier); } +#endif } // Check if the symbol providing plug-in is not being used anymore +--- xbmc/screensavers/rsxs-0.9/lib/argp-fmtstream.h.orig 2015-05-11 07:54:22 UTC ++++ xbmc/screensavers/rsxs-0.9/lib/argp-fmtstream.h +@@ -198,8 +198,12 @@ extern int __argp_fmtstream_ensure (argp + #endif + + #ifndef ARGP_FS_EI ++#ifdef __clang__ ++#define ARGP_FS_EI extern inline __attribute__ ((__gnu_inline__)) ++#else + #define ARGP_FS_EI extern inline + #endif ++#endif + + ARGP_FS_EI size_t + __argp_fmtstream_write (argp_fmtstream_t __fs, Index: head/multimedia/plexhometheater/files/patch-plex_CMakeModules_PlatformConfigFREEBSD.cmake =================================================================== --- head/multimedia/plexhometheater/files/patch-plex_CMakeModules_PlatformConfigFREEBSD.cmake (nonexistent) +++ head/multimedia/plexhometheater/files/patch-plex_CMakeModules_PlatformConfigFREEBSD.cmake (revision 430877) @@ -0,0 +1,147 @@ +--- plex/CMakeModules/PlatformConfigFREEBSD.cmake.orig 2017-01-08 15:03:09 UTC ++++ plex/CMakeModules/PlatformConfigFREEBSD.cmake +@@ -0,0 +1,144 @@ ++# vim: setlocal syntax=cmake: ++ ++######################### Compiler CFLAGS ++set(EXTRA_CFLAGS "-fPIC -DPIC") ++ ++######################### CHECK LIBRARIES / FRAMEWORKS ++option(USE_INTERNAL_FFMPEG "" ON) ++ ++set(LINK_PKG ++ Freetype ++ SDL ++ SDL_image ++ SDL_mixer ++ OpenGL ++ ZLIB ++ JPEG ++ X11 ++ SQLite3 ++ PCRE ++ Lzo2 ++ FriBiDi ++ Fontconfig ++ Samplerate ++ YAJL ++ microhttpd ++ Crypto ++ TinyXML ++ GLEW ++ Iconv ++ Avahi ++ Xrandr ++ LibRt ++ FLAC ++ DBUS ++ Execinfo ++) ++ ++if(NOT USE_INTERNAL_FFMPEG) ++ list(APPEND LINK_PKG FFmpeg) ++else() ++ set(FFMPEG_INCLUDE_DIRS ${PROJECT_SOURCE_DIR}/lib/ffmpeg ${CMAKE_BINARY_DIR}/lib/ffmpeg/ffmpeg/src/ffmpeg-build) ++endif() ++ ++if(ENABLE_PYTHON) ++ list(APPEND LINK_PKG Python) ++endif(ENABLE_PYTHON) ++ ++foreach(l ${LINK_PKG}) ++ plex_find_package(${l} 1 1) ++endforeach() ++ ++find_package(Boost COMPONENTS thread system REQUIRED) ++if(Boost_FOUND) ++ include_directories(${Boost_INCLUDE_DIRS}) ++ list(APPEND CONFIG_PLEX_LINK_LIBRARIES ${Boost_LIBRARIES}) ++ set(HAVE_BOOST 1) ++endif() ++ ++### install libs ++set(INSTALL_LIB ++ CURL ++ PNG ++ TIFF ++ Vorbis ++ LibMad ++ Mpeg2 ++ Ass ++ RTMP ++ PLIST ++ ShairPort ++ VAAPI ++ VDPAU ++) ++ ++foreach(l ${INSTALL_LIB}) ++ plex_find_package(${l} 1 0) ++endforeach() ++ ++plex_find_package(CEC 0 0) ++ ++plex_find_package(Threads 1 0) ++if(CMAKE_USE_PTHREADS_INIT) ++ message(STATUS "Using pthreads: ${CMAKE_THREAD_LIBS_INIT}") ++ list(APPEND CONFIG_PLEX_LINK_LIBRARIES ${CMAKE_THREAD_LIBS_INIT}) ++ set(HAVE_LIBPTHREAD 1) ++endif() ++ ++plex_find_package(PulseAudio 0 1) ++if(HAVE_LIBPULSEAUDIO) ++ set(HAVE_LIBPULSE 1) ++endif() ++ ++plex_find_package(LibUSB 0 1) ++ ++if(ENABLE_DVD_DRIVE) ++ plex_find_package(CDIO 1 1) ++endif(ENABLE_DVD_DRIVE) ++ ++if(NOT LIBUSB_FOUND) ++ message(WARNING "No USB support") ++endif() ++ ++if(VAAPI_FOUND) ++ list(APPEND CONFIG_PLEX_LINK_LIBRARIES ${VAAPI_LIBRARIES}) ++ include_directories(${VAAPI_INCLUDE_DIR}) ++ set(HAVE_LIBVA 1) ++endif() ++ ++plex_get_soname(CURL_SONAME ${CURL_LIBRARY}) ++ ++list(APPEND CONFIG_INTERNAL_LIBS lib_dllsymbols) ++ ++#### ++if(DEFINED X11_FOUND) ++ set(HAVE_X11 1) ++endif() ++ ++if(DEFINED OPENGL_FOUND) ++ set(HAVE_LIBGL 1) ++endif() ++ ++#### default lircdevice ++set(LIRC_DEVICE "/var/run/lirc/lircd") ++ ++#### on freebsd we want to use a "easy" name ++set(EXECUTABLE_NAME "plexhometheater") ++ ++if(${CMAKE_HOST_SYSTEM_PROCESSOR} STREQUAL "amd64") ++ set(ARCH "x86_64-freebsd") ++else() ++ set(ARCH "x86-freebsd") ++endif() ++ ++set(LIBPATH lib/plexhometheater) ++set(BINPATH bin) ++set(RESOURCEPATH share/plexhometheater) ++ ++set(PLEX_LINK_WRAPPED "-Wl,--unresolved-symbols=ignore-all -Wl,-wrap,_IO_getc -Wl,-wrap,_IO_getc_unlocked -Wl,-wrap,_IO_putc -Wl,-wrap,__fgets_chk -Wl,-wrap,__fprintf_chk -Wl,-wrap,__fread_chk -Wl,-wrap,__fxstat64 -Wl,-wrap,__lxstat64 -Wl,-wrap,__printf_chk -Wl,-wrap,__read_chk -Wl,-wrap,__vfprintf_chk -Wl,-wrap,__xstat64 -Wl,-wrap,_stat -Wl,-wrap,calloc -Wl,-wrap,clearerr -Wl,-wrap,close -Wl,-wrap,closedir -Wl,-wrap,dlopen -Wl,-wrap,fclose -Wl,-wrap,fdopen -Wl,-wrap,feof -Wl,-wrap,ferror -Wl,-wrap,fflush -Wl,-wrap,fgetc -Wl,-wrap,fgetpos -Wl,-wrap,fgetpos64 -Wl,-wrap,fgets -Wl,-wrap,fileno -Wl,-wrap,flockfile -Wl,-wrap,fopen -Wl,-wrap,fopen64 -Wl,-wrap,fprintf -Wl,-wrap,fputc -Wl,-wrap,fputs -Wl,-wrap,fread -Wl,-wrap,free -Wl,-wrap,freopen -Wl,-wrap,fseek -Wl,-wrap,fseeko64 -Wl,-wrap,fsetpos -Wl,-wrap,fsetpos64 -Wl,-wrap,fstat -Wl,-wrap,ftell -Wl,-wrap,ftello64 -Wl,-wrap,ftrylockfile -Wl,-wrap,funlockfile -Wl,-wrap,fwrite -Wl,-wrap,getc -Wl,-wrap,getc_unlocked -Wl,-wrap,getmntent -Wl,-wrap,ioctl -Wl,-wrap,lseek -Wl,-wrap,lseek64 -Wl,-wrap,malloc -Wl,-wrap,open -Wl,-wrap,open64 -Wl,-wrap,opendir -Wl,-wrap,popen -Wl,-wrap,printf -Wl,-wrap,read -Wl,-wrap,readdir -Wl,-wrap,readdir64 -Wl,-wrap,realloc -Wl,-wrap,rewind -Wl,-wrap,rewinddir -Wl,-wrap,setvbuf -Wl,-wrap,ungetc -Wl,-wrap,vfprintf -Wl,-wrap,write") ++ ++set(PLEX_LINK_WHOLEARCHIVE -Wl,--whole-archive) ++set(PLEX_LINK_NOWHOLEARCHIVE -Wl,--no-whole-archive) ++ ++############ Add our definitions ++add_definitions(-DTARGET_FREEBSD) Property changes on: head/multimedia/plexhometheater/files/patch-plex_CMakeModules_PlatformConfigFREEBSD.cmake ___________________________________________________________________ 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: head/multimedia/plexhometheater/files/patch-xbmc_cores_AudioEngine_Engines_SoftAE_SoftAE.cpp =================================================================== --- head/multimedia/plexhometheater/files/patch-xbmc_cores_AudioEngine_Engines_SoftAE_SoftAE.cpp (nonexistent) +++ head/multimedia/plexhometheater/files/patch-xbmc_cores_AudioEngine_Engines_SoftAE_SoftAE.cpp (revision 430877) @@ -0,0 +1,11 @@ +--- xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.cpp.orig 2015-05-11 07:54:22 UTC ++++ xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.cpp +@@ -328,7 +328,7 @@ void CSoftAE::InternalOpenSink() + + /* perform basic sanity checks on the format returned by the sink */ + ASSERT(newFormat.m_channelLayout.Count() > 0); +- ASSERT(newFormat.m_dataFormat <= AE_FMT_FLOAT); ++ ASSERT(newFormat.m_dataFormat <= AE_FMT_MAX); + ASSERT(newFormat.m_frames > 0); + ASSERT(newFormat.m_frameSamples > 0); + ASSERT(newFormat.m_frameSize == (CAEUtil::DataFormatToBits(newFormat.m_dataFormat) >> 3) * newFormat.m_channelLayout.Count()); Property changes on: head/multimedia/plexhometheater/files/patch-xbmc_cores_AudioEngine_Engines_SoftAE_SoftAE.cpp ___________________________________________________________________ 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: head/multimedia/plexhometheater/files/patch-xbmc_cores_dvdplayer_DVDCodecs_Video_VAAPI.cpp =================================================================== --- head/multimedia/plexhometheater/files/patch-xbmc_cores_dvdplayer_DVDCodecs_Video_VAAPI.cpp (nonexistent) +++ head/multimedia/plexhometheater/files/patch-xbmc_cores_dvdplayer_DVDCodecs_Video_VAAPI.cpp (revision 430877) @@ -0,0 +1,11 @@ +--- xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp.orig 2015-05-11 07:54:22 UTC ++++ xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp +@@ -74,7 +74,7 @@ static inline VASurfaceID GetSurfaceID(A + + static CDisplayPtr GetGlobalDisplay() + { +- static weak_ptr display_global; ++ static boost::weak_ptr display_global; + + CDisplayPtr display(display_global.lock()); + if(display) Property changes on: head/multimedia/plexhometheater/files/patch-xbmc_cores_dvdplayer_DVDCodecs_Video_VAAPI.cpp ___________________________________________________________________ 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: head/multimedia/plexhometheater/files/patch-xbmc_freebsd_CMakeLists.txt =================================================================== --- head/multimedia/plexhometheater/files/patch-xbmc_freebsd_CMakeLists.txt (nonexistent) +++ head/multimedia/plexhometheater/files/patch-xbmc_freebsd_CMakeLists.txt (revision 430877) @@ -0,0 +1,6 @@ +--- xbmc/freebsd/CMakeLists.txt.orig 2017-01-08 15:03:09 UTC ++++ xbmc/freebsd/CMakeLists.txt +@@ -0,0 +1,3 @@ ++find_all_sources(. freebsd_SRCS) ++ ++add_sources(${freebsd_SRCS}) Property changes on: head/multimedia/plexhometheater/files/patch-xbmc_freebsd_CMakeLists.txt ___________________________________________________________________ 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: head/multimedia/plexhometheater/files/patch-xbmc_threads_platform_pthreads_ThreadImpl.cpp =================================================================== --- head/multimedia/plexhometheater/files/patch-xbmc_threads_platform_pthreads_ThreadImpl.cpp (nonexistent) +++ head/multimedia/plexhometheater/files/patch-xbmc_threads_platform_pthreads_ThreadImpl.cpp (revision 430877) @@ -0,0 +1,28 @@ +--- xbmc/threads/platform/pthreads/ThreadImpl.cpp.orig 2015-05-11 07:54:22 UTC ++++ xbmc/threads/platform/pthreads/ThreadImpl.cpp +@@ -29,12 +29,8 @@ + #include + #ifdef __FreeBSD__ + #include +-#if __FreeBSD_version < 900031 +-#include +-#else + #include + #endif +-#endif + + #include + +@@ -59,11 +55,7 @@ void CThread::TermHandler() { } + void CThread::SetThreadInfo() + { + #ifdef __FreeBSD__ +-#if __FreeBSD_version < 900031 +- long lwpid; +- thr_self(&lwpid); +- m_ThreadOpaque.LwpId = lwpid; +-#else ++#if __FreeBSD_version > 900030 + m_ThreadOpaque.LwpId = pthread_getthreadid_np(); + #endif + #elif defined(TARGET_ANDROID) Property changes on: head/multimedia/plexhometheater/files/patch-xbmc_threads_platform_pthreads_ThreadImpl.cpp ___________________________________________________________________ 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: head/multimedia/plexhometheater/files/patch-xbmc_visualizations_XBMCProjectM_libprojectM_PresetLoader.hpp =================================================================== --- head/multimedia/plexhometheater/files/patch-xbmc_visualizations_XBMCProjectM_libprojectM_PresetLoader.hpp (nonexistent) +++ head/multimedia/plexhometheater/files/patch-xbmc_visualizations_XBMCProjectM_libprojectM_PresetLoader.hpp (revision 430877) @@ -0,0 +1,11 @@ +--- xbmc/visualizations/XBMCProjectM/libprojectM/PresetLoader.hpp.orig 2015-05-11 07:54:22 UTC ++++ xbmc/visualizations/XBMCProjectM/libprojectM/PresetLoader.hpp +@@ -29,7 +29,7 @@ class PresetLoader { + static const std::string MILKDROP_FILE_EXTENSION; + + /** Initializes the preset loader with the target directory specified */ +- PresetLoader(std::string dirname); ++ PresetLoader(std::string dirname = std::string()); + + /** Destructor will remove all alllocated presets */ + ~PresetLoader(); Property changes on: head/multimedia/plexhometheater/files/patch-xbmc_visualizations_XBMCProjectM_libprojectM_PresetLoader.hpp ___________________________________________________________________ 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