From owner-svn-ports-all@FreeBSD.ORG Sat Sep 13 16:58:33 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 538EF7EA; Sat, 13 Sep 2014 16:58:33 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3D5B2E7B; Sat, 13 Sep 2014 16:58:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8DGwX29023418; Sat, 13 Sep 2014 16:58:33 GMT (envelope-from adamw@FreeBSD.org) Received: (from adamw@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8DGwVn4023408; Sat, 13 Sep 2014 16:58:31 GMT (envelope-from adamw@FreeBSD.org) Message-Id: <201409131658.s8DGwVn4023408@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: adamw set sender to adamw@FreeBSD.org using -f From: Adam Weinberger Date: Sat, 13 Sep 2014 16:58:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r368121 - in head/multimedia/plexhometheater: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Sep 2014 16:58:33 -0000 Author: adamw Date: Sat Sep 13 16:58:31 2014 New Revision: 368121 URL: http://svnweb.freebsd.org/changeset/ports/368121 QAT: https://qat.redports.org/buildarchive/r368121/ Log: Upgrade multimedia/plexhometheater to v1.2.2 The attached patch upgrades multimedia/plexhometheater to v1.2.2. In addition, it removes the LIBDEPENDS on audio/lame and java as neither are actually used by plexhometheater, and adds a pkg-message to explain how to run plexhometheater from the command line when the package is installed. --- Plexhometheater is unable to play videos, with some of the following error messages appearing in the logs depending on the codec of the video being played. ERROR: Unable to load /usr/local/lib/plexhometheater/system/players/dvdplayer/avcodec-53-x86-freebsd.so, reason: /usr/local/bin/system/players/dvdplayer/avcodec-53-x86_64-freebsd.so: Undefined symbol "ff_h264dsp_init_x86" ERROR: Unable to load /usr/local/lib/plexhometheater/system/players/dvdplayer/avcodec-53-x86-freebsd.so, reason: /usr/local/bin/system/players/dvdplayer/avcodec-53-x86_64-freebsd.so: Undefined symbol "ff_mlp_init_x86" This is similar to PR181964 filed previously for multimedia/gstreamer-ffmpeg https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=181964 This issue is caused as during port build some variables not defined in MAKE_ENV/MAKE_ARGS are leaked to do-build target via .MAKEFLAGS rule in bsd.port.mk. According to make(1) man page variable assignments in MAKEFLAGS are treated as those on command line which means they override assignments in Makefiles. Unfortunately, this breaks building arch-specific code for libavcodec as $(ARCH) in config.mak is no longer honored. Fix: Rename the variable from ARCH to FFMPEG_ARCH, as is done in multimedia/ffmpeg. --- Add binutils as builddep on FreeBSD8 and use cmake compiler in ffmpeg configure --- Plexhometheater will fail to build from ports if ffmpeg is already installed on the system (via ports or package). --- Plexhometheater crashes at launch with: ERROR: Unable to create application. Exiting Segmentation fault (core dumped) FROM LOGS: ERROR: Unable to load /usr/local/bin/system/libcpluff-x86_64-freebsd.so, reason: Cannot open "/usr/local/bin/system/libcpluff-x86_64-freebsd.so PR: 193547, 193282, 193190, 193189, 193188 Submitted by: Ben Woods (maintainer) Added: head/multimedia/plexhometheater/files/patch-xbmc__cdrip__CMakeLists.txt (contents, props changed) head/multimedia/plexhometheater/files/pkg-message.in (contents, props changed) Deleted: head/multimedia/plexhometheater/files/patch-xbmc__cdrip__EncoderFFmpeg.cpp Modified: head/multimedia/plexhometheater/Makefile head/multimedia/plexhometheater/distinfo head/multimedia/plexhometheater/files/patch-CMakeLists.txt head/multimedia/plexhometheater/files/patch-lib__ffmpeg__CMakeLists.txt head/multimedia/plexhometheater/files/plexhometheater.sh.in head/multimedia/plexhometheater/pkg-plist Modified: head/multimedia/plexhometheater/Makefile ============================================================================== --- head/multimedia/plexhometheater/Makefile Sat Sep 13 16:47:09 2014 (r368120) +++ head/multimedia/plexhometheater/Makefile Sat Sep 13 16:58:31 2014 (r368121) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= plexhometheater -PORTVERSION= 1.2.1 -PORTREVISION= 4 +PORTVERSION= 1.2.2 CATEGORIES= multimedia MAINTAINER= woodsb02@gmail.com @@ -40,7 +39,6 @@ LIB_DEPENDS= libass.so:${PORTSDIR}/multi libmad.so:${PORTSDIR}/audio/libmad \ libmicrohttpd.so:${PORTSDIR}/www/libmicrohttpd \ libmodplug.so:${PORTSDIR}/audio/libmodplug \ - libmp3lame.so:${PORTSDIR}/audio/lame \ libmpeg2.so:${PORTSDIR}/multimedia/libmpeg2 \ libpcre.so:${PORTSDIR}/devel/pcre \ libplist.so:${PORTSDIR}/devel/libplist \ @@ -67,8 +65,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqli USE_GITHUB= yes GH_ACCOUNT= plexinc GH_PROJECT= plex-home-theater-public -GH_COMMIT= bdd03dd -GH_TAGNAME= pht-v1.2.1 +GH_COMMIT= 2d6426d +GH_TAGNAME= pht-v1.2.2 USES= cmake:outsource iconv pkgconfig python:2 CMAKE_ARGS+= -DENABLE_AUTOUPDATE:BOOL=false @@ -77,16 +75,15 @@ 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 USE_SDL= image sdl mixer -USE_JAVA= yes -JAVA_BUILD= jre INSTALLS_ICONS= yes ONLY_FOR_ARCHS= i386 amd64 -SUB_FILES= ${PORTNAME}.sh +SUB_FILES= ${PORTNAME}.sh pkg-message DESKTOP_ENTRIES="Plex Home Theater" \ "${COMMENT}" \ @@ -117,6 +114,18 @@ PLIST_SUB+= ARCH="x86" PLIST_SUB+= ARCH="x86_64" .endif +.if ${OPSYS} == "FreeBSD" && ${OSVERSION} < 900033 +BUILD_DEPENDS+= ${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils +MAKE_ENV= COMPILER_PATH=${LOCALBASE}/bin +.endif + +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 + post-install: ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh ${STAGEDIR}${PREFIX}/bin Modified: head/multimedia/plexhometheater/distinfo ============================================================================== --- head/multimedia/plexhometheater/distinfo Sat Sep 13 16:47:09 2014 (r368120) +++ head/multimedia/plexhometheater/distinfo Sat Sep 13 16:58:31 2014 (r368121) @@ -1,2 +1,2 @@ -SHA256 (plexhometheater-1.2.1.tar.gz) = d880f9dc2c893036cab0c21dfbd855c91751f97b06437c7d6e23726b089715d0 -SIZE (plexhometheater-1.2.1.tar.gz) = 91374075 +SHA256 (plexhometheater-1.2.2.tar.gz) = e49b5f226d29fb91e7aef42b4f5ed2b2afc2edfbc70cdfa49181eaada1c8c095 +SIZE (plexhometheater-1.2.2.tar.gz) = 91373872 Modified: head/multimedia/plexhometheater/files/patch-CMakeLists.txt ============================================================================== --- head/multimedia/plexhometheater/files/patch-CMakeLists.txt Sat Sep 13 16:47:09 2014 (r368120) +++ head/multimedia/plexhometheater/files/patch-CMakeLists.txt Sat Sep 13 16:58:31 2014 (r368121) @@ -18,3 +18,12 @@ 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) Modified: head/multimedia/plexhometheater/files/patch-lib__ffmpeg__CMakeLists.txt ============================================================================== --- head/multimedia/plexhometheater/files/patch-lib__ffmpeg__CMakeLists.txt Sat Sep 13 16:47:09 2014 (r368120) +++ head/multimedia/plexhometheater/files/patch-lib__ffmpeg__CMakeLists.txt Sat Sep 13 16:58:31 2014 (r368121) @@ -11,7 +11,7 @@ -if(NOT TARGET_RPI) +if(TARGET_FREEBSD) -+ 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-memal ign-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) ++ 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 --dis able-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() Added: head/multimedia/plexhometheater/files/patch-xbmc__cdrip__CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/plexhometheater/files/patch-xbmc__cdrip__CMakeLists.txt Sat Sep 13 16:58:31 2014 (r368121) @@ -0,0 +1,10 @@ +--- 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}) Added: head/multimedia/plexhometheater/files/pkg-message.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/plexhometheater/files/pkg-message.in Sat Sep 13 16:58:31 2014 (r368121) @@ -0,0 +1,10 @@ + +To run plexhometheater from the command line, be sure to +use the %%PREFIX%%/bin/plexhometheater.sh shell script +rather than the %%PREFIX%%/bin/plexhometheater binary directly. + +To run plexhometheater from the command line, run + + %%PREFIX%%/bin/plexhometheater.sh + +rather than the %%PREFIX%%/bin/plexhometheater binary. Modified: head/multimedia/plexhometheater/files/plexhometheater.sh.in ============================================================================== --- head/multimedia/plexhometheater/files/plexhometheater.sh.in Sat Sep 13 16:47:09 2014 (r368120) +++ head/multimedia/plexhometheater/files/plexhometheater.sh.in Sat Sep 13 16:58:31 2014 (r368121) @@ -1,4 +1,5 @@ #!/bin/sh export XBMC_HOME=%%PREFIX%%/share/plexhometheater +export XBMC_BIN_HOME=%%PREFIX%%/lib/plexhometheater exec %%PREFIX%%/bin/plexhometheater Modified: head/multimedia/plexhometheater/pkg-plist ============================================================================== --- head/multimedia/plexhometheater/pkg-plist Sat Sep 13 16:47:09 2014 (r368120) +++ head/multimedia/plexhometheater/pkg-plist Sat Sep 13 16:58:31 2014 (r368121) @@ -1,6 +1,5 @@ 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 @@ -10,6 +9,7 @@ lib/plexhometheater/system/players/dvdpl lib/plexhometheater/system/players/dvdplayer/postproc-52-%%ARCH%%-freebsd.so lib/plexhometheater/system/players/dvdplayer/swresample-0-%%ARCH%%-freebsd.so lib/plexhometheater/system/players/dvdplayer/swscale-2-%%ARCH%%-freebsd.so +lib/plexhometheater/xbmc-xrandr %%DATADIR%%/Credits.html %%DATADIR%%/addons/repository.pvr-android.xbmc.org/addon.xml %%DATADIR%%/addons/repository.pvr-android.xbmc.org/icon.png