Attachment 147263 Details for Bug 193547 – Combined fixes for PRs 193547, 193188, 193189, 193190 and 193282

[patch] Combined fixes for PRs 193547, 193188, 193189, 193190 and 193282

super.patch (text/plain), 13.93 KB, created by Ben Woods on 2014-09-13 03:47:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ben Woods

Created: 2014-09-13 03:47:17 UTC

Size: 13.93 KB

patch

obsolete

>Index: multimedia/plexhometheater/Makefile
>===================================================================
>--- multimedia/plexhometheater/Makefile	(revision 368074)
>+++ multimedia/plexhometheater/Makefile	(working copy)
>@@ -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 @@
> 		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 @@
> 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+=	-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_64"
> .endif
> 
>+.if ${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
> 
>Index: multimedia/plexhometheater/distinfo
>===================================================================
>--- multimedia/plexhometheater/distinfo	(revision 368074)
>+++ multimedia/plexhometheater/distinfo	(working copy)
>@@ -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
>Index: multimedia/plexhometheater/files/patch-CMakeLists.txt
>===================================================================
>--- multimedia/plexhometheater/files/patch-CMakeLists.txt	(revision 368074)
>+++ multimedia/plexhometheater/files/patch-CMakeLists.txt	(working copy)
>@@ -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)
>Index: multimedia/plexhometheater/files/patch-lib__ffmpeg__CMakeLists.txt
>===================================================================
>--- multimedia/plexhometheater/files/patch-lib__ffmpeg__CMakeLists.txt	(revision 368074)
>+++ multimedia/plexhometheater/files/patch-lib__ffmpeg__CMakeLists.txt	(working copy)
>@@ -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-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)
>++  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()
>Index: multimedia/plexhometheater/files/patch-xbmc__cdrip__CMakeLists.txt
>===================================================================
>--- multimedia/plexhometheater/files/patch-xbmc__cdrip__CMakeLists.txt	(revision 0)
>+++ multimedia/plexhometheater/files/patch-xbmc__cdrip__CMakeLists.txt	(working copy)
>@@ -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})
>
>Property changes on: multimedia/plexhometheater/files/patch-xbmc__cdrip__CMakeLists.txt
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>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
>Index: multimedia/plexhometheater/files/patch-xbmc__cdrip__EncoderFFmpeg.cpp
>===================================================================
>--- multimedia/plexhometheater/files/patch-xbmc__cdrip__EncoderFFmpeg.cpp	(revision 368074)
>+++ multimedia/plexhometheater/files/patch-xbmc__cdrip__EncoderFFmpeg.cpp	(working copy)
>@@ -1,16 +0,0 @@
>---- xbmc/cdrip/EncoderFFmpeg.cpp.orig 2013-02-06 19:11:19.000000000 +0100
>-+++ xbmc/cdrip/EncoderFFmpeg.cpp 2013-02-06 19:11:45.000000000 +0100
>-@@ -77,7 +77,13 @@
>-   }
>-
>-   m_Format     = m_dllAvFormat.avformat_alloc_context();
>-+#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53,1,0)
>-   m_Format->pb = m_dllAvFormat.avio_alloc_context(m_BCBuffer, sizeof(m_BCBuffer), AVIO_FLAG_READ, this,  NULL, MuxerReadPacket, NULL);
>-+#elif LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53,0,0)
>-+  m_Format->pb = m_dllAvFormat.avio_alloc_context(m_BCBuffer, sizeof(m_BCBuffer), AVIO_RDONLY, this,  NULL, MuxerReadPacket, NULL);
>-+#else
>-+  m_Format->pb = m_dllAvFormat.avio_alloc_context(m_BCBuffer, sizeof(m_BCBuffer), URL_RDONLY, this,  NULL, MuxerReadPacket, NULL);
>-+#endif
>-   if (!m_Format->pb)
>-   {
>-     m_dllAvUtil.av_freep(&m_Format);
>Index: multimedia/plexhometheater/files/pkg-message.in
>===================================================================
>--- multimedia/plexhometheater/files/pkg-message.in	(revision 0)
>+++ multimedia/plexhometheater/files/pkg-message.in	(working copy)
>@@ -0,0 +1,5 @@
>+
>+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.
>+
>
>Property changes on: multimedia/plexhometheater/files/pkg-message.in
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>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
>Index: multimedia/plexhometheater/files/plexhometheater.sh.in
>===================================================================
>--- multimedia/plexhometheater/files/plexhometheater.sh.in	(revision 368074)
>+++ multimedia/plexhometheater/files/plexhometheater.sh.in	(working copy)
>@@ -1,4 +1,5 @@
> #!/bin/sh
> 
> export XBMC_HOME=%%PREFIX%%/share/plexhometheater
>+export XBMC_BIN_HOME=%%PREFIX%%/lib/plexhometheater
> exec %%PREFIX%%/bin/plexhometheater
>Index: multimedia/plexhometheater/pkg-plist
>===================================================================
>--- multimedia/plexhometheater/pkg-plist	(revision 368074)
>+++ multimedia/plexhometheater/pkg-plist	(working copy)
>@@ -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,8 @@
> 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
>+share/applications/plexhometheatersh.desktop
> %%DATADIR%%/Credits.html
> %%DATADIR%%/addons/repository.pvr-android.xbmc.org/addon.xml
> %%DATADIR%%/addons/repository.pvr-android.xbmc.org/icon.png

Actions: View | Diff

Attachments on bug 193547: 147204 | 147205 | 147263