Bug 193547 - Upgrade multimedia/plexhometheater to v1.2.2
Summary: Upgrade multimedia/plexhometheater to v1.2.2
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: Adam Weinberger
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2014-09-11 00:56 UTC by Ben Woods
Modified: 2014-09-13 17:02 UTC (History)
1 user (show)

See Also:


Attachments
Upgrade multimedia/plexhometheater to v1.2.2 (1.42 KB, patch)
2014-09-11 00:56 UTC, Ben Woods
no flags Details | Diff
Upgrade multimedia/plexhometheater to v1.2.2 (1.75 KB, patch)
2014-09-11 01:05 UTC, Ben Woods
no flags Details | Diff
Combined fixes for PRs 193547, 193188, 193189, 193190 and 193282 (13.93 KB, patch)
2014-09-13 03:47 UTC, Ben Woods
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Ben Woods freebsd_committer freebsd_triage 2014-09-11 00:56:59 UTC
Created attachment 147204 [details]
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 (which is restricted) and adds a pkg-message to explain how to run plexhometheater from the command line when the package is installed.
Comment 1 Ben Woods freebsd_committer freebsd_triage 2014-09-11 01:05:59 UTC
Created attachment 147205 [details]
Upgrade multimedia/plexhometheater to v1.2.2

Try again: accidentally left out the pkg-message. Included this time.
Comment 2 Adam Weinberger freebsd_committer freebsd_triage 2014-09-11 14:50:14 UTC
Aside from the fact that this patch contained dos-style line endings, pkg-message is one giant line without line breaks, it had some other issues:

pkg-message needs to be moved to files/pkg-message.in
Then add
SUB_FILES=     pkg-message.in

Removing the dependency on lame isn't the way to go. Yes lame is RESTRICTED which means it will prevent binary packages, but you've removed that choice from users. Better to add a LAME option, and either default it to off or add

.if !defined(PACKAGE_BUILDING) && !defined(BATCH)
OPTIONS_DEFAULT=    LAME
.endif

PHT does not build without lame simply by removing the dependency. Do you need to tell cmake not to build against it?

When you re-submit the patch, can you please do it in one giant patch that incorporates all the other patches from 193188, 193189, 193190, and 193282?

This is from 10.1-PRERELEASE amd64:

--- xbmc/CMakeFiles/xbmc.dir/cdrip/EncoderLame.cpp.o ---
/usr/local/bin/cmake -E cmake_progress_report /wrkdirs/usr/ports/multimedia/plexhometheater/work/.build/CMakeFiles
cd /wrkdirs/usr/ports/multimedia/plexhometheater/work/.build/xbmc && /usr/local/libexec/ccache/c++   -DENABLE_DVDINPUTSTREAM_STACK -DHAVE_CONFIG_H -DPLEX_BUILD_TAG=\"freebsd-x86_64-freebsd\" -DPLEX_TARGET_NAME=\"plexhometheater\" -DTARGET_FREEBSD -DTARGET_POSIX -DUSE_INTERNAL_FFMPEG -D_FILE_DEFINED -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LINUX -D_REENTRANT -D__PLEX__ -D__PLEX__XBMC__ -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -O2 -pipe -isystem/usr/local/include -DLIBICONV_PLUG -fno-strict-aliasing  -DLIBICONV_PLUG -pipe -fcolor-diagnostics -pipe -Wno-parentheses-equality -Wno-self-assign-field -fPIC -DPIC -O2 -pipe -isystem/usr/local/include -DLIBICONV_PLUG -fno-strict-aliasing  -DLIBICONV_PLUG -g -Os -I/usr/local/include/freetype2 -I/usr/local/include/SDL -I/usr/local/include -I/usr/local/include/lzo -I/usr/local/include/fribidi -I/usr/local/include/dbus-1.0 -I/wrkdirs/usr/ports/multimedia/plexhometheater/work/.build -I/wrkdirs/usr/ports/multimedia/plexhometheater/work/.build/xbmc -I/wrkdirs/usr/ports/multimedia/plexhometheater/work/plexinc-plex-home-theater-public-2d6426d/plex/Third-Party/gtest/include -I/wrkdirs/usr/ports/multimedia/plexhometheater/work/plexinc-plex-home-theater-public-2d6426d/plex/Third-Party/gmock/include -I/include -I/include/libcec -I/include/freetype2 -I/include/python2.6 -I/include/python2.7 -I/wrkdirs/usr/ports/multimedia/plexhometheater/work/plexinc-plex-home-theater-public-2d6426d/xbmc -I/wrkdirs/usr/ports/multimedia/plexhometheater/work/plexinc-plex-home-theater-public-2d6426d/xbmc/linux -I/wrkdirs/usr/ports/multimedia/plexhometheater/work/plexinc-plex-home-theater-public-2d6426d/plex -I/wrkdirs/usr/ports/multimedia/plexhometheater/work/plexinc-plex-home-theater-public-2d6426d/plex/Utility -I/wrkdirs/usr/ports/multimedia/plexhometheater/work/plexinc-plex-home-theater-public-2d6426d/plex/Owned -I/wrkdirs/usr/ports/multimedia/plexhometheater/work/plexinc-plex-home-theater-public-2d6426d/xbmc/utils -I/wrkdirs/usr/ports/multimedia/plexhometheater/work/plexinc-plex-home-theater-public-2d6426d -I/wrkdirs/usr/ports/multimedia/plexhometheater/work/plexinc-plex-home-theater-public-2d6426d/xbmc/cores/dvdplayer -I/wrkdirs/usr/ports/multimedia/plexhometheater/work/plexinc-plex-home-theater-public-2d6426d/xbmc/settings -I/wrkdirs/usr/ports/multimedia/plexhometheater/work/plexinc-plex-home-theater-public-2d6426d/lib -I/wrkdirs/usr/ports/multimedia/plexhometheater/work/.build/lib/cpluff/cpluff-prefix/src/cpluff/libcpluff -I/wrkdirs/usr/ports/multimedia/plexhometheater/work/plexinc-plex-home-theater-public-2d6426d/tools/darwin/depends/libcrystalhd -I/wrkdirs/usr/ports/multimedia/plexhometheater/work/plexinc-plex-home-theater-public-2d6426d/xbmc/cores/AudioEngine -I/wrkdirs/usr/ports/multimedia/plexhometheater/work/plexinc-plex-home-theater-public-2d6426d/lib/libUPnP/Platinum/Source/Platinum -I/wrkdirs/usr/ports/multimedia/plexhometheater/work/plexinc-plex-home-theater-public-2d6426d/lib/libUPnP/Platinum/Source/Core -I/wrkdirs/usr/ports/multimedia/plexhometheater/work/plexinc-plex-home-theater-public-2d6426d/lib/libUPnP/Platinum/Source/Extras -I/wrkdirs/usr/ports/multimedia/plexhometheater/work/plexinc-plex-home-theater-public-2d6426d/lib/libUPnP/Platinum/Source/Devices/MediaConnect -I/wrkdirs/usr/ports/multimedia/plexhometheater/work/plexinc-plex-home-theater-public-2d6426d/lib/libUPnP/Platinum/Source/Devices/MediaRenderer -I/wrkdirs/usr/ports/multimedia/plexhometheater/work/plexinc-plex-home-theater-public-2d6426d/lib/libUPnP/Platinum/Source/Devices/MediaServer -I/wrkdirs/usr/ports/multimedia/plexhometheater/work/plexinc-plex-home-theater-public-2d6426d/lib/libUPnP/Neptune/Source/Core -I/wrkdirs/usr/ports/multimedia/plexhometheater/work/plexinc-plex-home-theater-public-2d6426d/lib/libUPnP/Neptune/Source/System/Posix -I/wrkdirs/usr/ports/multimedia/plexhometheater/work/plexinc-plex-home-theater-public-2d6426d/lib/ffmpeg -I/wrkdirs/usr/ports/multimedia/plexhometheater/work/.build/lib/ffmpeg/ffmpeg/src/ffmpeg-build -o CMakeFiles/xbmc.dir/cdrip/EncoderLame.cpp.o -c /wrkdirs/usr/ports/multimedia/plexhometheater/work/plexinc-plex-home-theater-public-2d6426d/xbmc/cdrip/EncoderLame.cpp
In file included from /wrkdirs/usr/ports/multimedia/plexhometheater/work/plexinc-plex-home-theater-public-2d6426d/xbmc/cdrip/EncoderLame.cpp:21:
In file included from /wrkdirs/usr/ports/multimedia/plexhometheater/work/plexinc-plex-home-theater-public-2d6426d/xbmc/cdrip/EncoderLame.h:25:
/wrkdirs/usr/ports/multimedia/plexhometheater/work/plexinc-plex-home-theater-public-2d6426d/xbmc/cdrip/DllLameenc.h:27:10: ^[[0;1;31mfatal error: 'lame/lame.h' file not found
#include "lame/lame.h"
Comment 3 Ben Woods freebsd_committer freebsd_triage 2014-09-13 03:47:17 UTC
Created attachment 147263 [details]
Combined fixes for PRs 193547, 193188, 193189, 193190 and 193282

Have now attached a new patch which addresses the concerns highlighted by adamw above, and also combines the patches for the following PRs into one patch:
PRs: 193547, 193188, 193189, 193190 and 193282

In addition, this patch removes dependencies on lame and java as neither are actually used by plexhometheater.
Comment 4 Ben Woods freebsd_committer freebsd_triage 2014-09-13 04:19:06 UTC
That patch is best applied with "svn patch ..."
Comment 5 Ben Woods freebsd_committer freebsd_triage 2014-09-13 05:25:21 UTC
Successful redports build logs here: https://redports.org/buildarchive/20140913042103-92663/
Comment 6 Adam Weinberger freebsd_committer freebsd_triage 2014-09-13 17:02:36 UTC
Wow, awesome work, Ben!

I only made three small changes:

The .desktop file shouldn't be listed in pkg-plist. You can see the error message it produced in redports. It's a warning there, but a fatal error when building in QA-mode.

Please run portlint, as it'd help you catch the spaces after tabs (they appeared in the new binutils section).

And lastly, I added ${OPSYS} = "FreeBSD" to that binutils section. This is poorly documented here but it's part of being a good neighbour with DragonflyBSD.

Again, excellent work here.