Date: Tue, 25 Jul 2017 14:43:31 +0000 (UTC) From: Richard Gallamore <ultima@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r446588 - in head/audio/logitechmediaserver: . files Message-ID: <201707251443.v6PEhVdS030533@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ultima Date: Tue Jul 25 14:43:31 2017 New Revision: 446588 URL: https://svnweb.freebsd.org/changeset/ports/446588 Log: * Updated to 7.9.1 * Fixed build on clang 4.0 * Sorted Makefile, ONLY_FOR_ARCHS comes before *_DEPENDS and after LICENSE section (13.1.5)[1], Uses should start the USES section followed by USE_x(13.1.7)[1] - fully support spotty plugin for Spotify support [1] https://www.freebsd.org/doc/en/books/porters-handbook/porting-samplem.html#porting-samplem-order PR: 220781 Submitted by: Mark Dixon <mark@tranquillussoftware.co.uk> (maintainer) Reviewed by: matthew (mentor) Approved by: matthew (mentor) Differential Revision: https://reviews.freebsd.org/D11612 Modified: head/audio/logitechmediaserver/Makefile head/audio/logitechmediaserver/distinfo head/audio/logitechmediaserver/files/vendorpatch-CPAN_buildme.sh head/audio/logitechmediaserver/pkg-plist Modified: head/audio/logitechmediaserver/Makefile ============================================================================== --- head/audio/logitechmediaserver/Makefile Tue Jul 25 14:40:20 2017 (r446587) +++ head/audio/logitechmediaserver/Makefile Tue Jul 25 14:43:31 2017 (r446588) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= logitechmediaserver -PORTVERSION= 7.9.0.g2016.09.30 -PORTREVISION= 2 +PORTVERSION= 7.9.1.g2017.07.11 CATEGORIES= audio MAINTAINER= mark@tranquillussoftware.co.uk @@ -13,21 +12,18 @@ LICENSE_NAME= Slim Devices License LICENSE_FILE= ${WRKSRC}/License.txt LICENSE_PERMS= no-dist-mirror no-dist-sell no-pkg-mirror no-pkg-sell +ONLY_FOR_ARCHS= amd64 i386 + BUILD_DEPENDS= nasm:devel/nasm \ bash:shells/bash \ rsync:net/rsync LIB_DEPENDS= libgd.so:graphics/gd -USE_GITHUB= yes -GH_TUPLE= Logitech:slimserver:c835a1f \ - Logitech:slimserver-vendor:14cc392:vendor - -RESTRICTED= Contains non-redistributable firmware, documentation, and images - -USERS= ${SLIMUSER} -GROUPS= ${SLIMGROUP} USES= gettext-runtime gmake perl5 shebangfix -EXTRA_PATCHES= ${FILESDIR}/vendorpatch-CPAN_buildme.sh +USE_GITHUB= yes +GH_TUPLE= Logitech:slimserver:762b5cb \ + Logitech:slimserver-vendor:1463b00:vendor +USE_RC_SUBR= logitechmediaserver SHEBANG_FILES= Bin/darwin/check-update.pl \ Bin/dbish \ CPAN/Log/Log4perl/Layout/PatternLayout/Multiline.pm \ @@ -47,7 +43,6 @@ OPTIONS_DEFINE= APE FAAD FLAC LAME SHORTEN SOX TEST DO OPTIONS_DEFAULT=APE FAAD FLAX SOX TEST SHORTEN_DESC= Support Shorten input SOX_DESC= Support OGG Vorbis input via SoX (SliMP3 and SB1) - APE_RUN_DEPENDS= mac:audio/mac FAAD_RUN_DEPENDS= faad:audio/faad FLAC_RUN_DEPENDS= flac:audio/flac @@ -56,7 +51,11 @@ SHORTEN_RUN_DEPENDS= shorten:audio/shorten SOX_RUN_DEPENDS= sox:audio/sox TEST_VARS_OFF= CONTRIB_FLAGS=-t -USE_RC_SUBR= logitechmediaserver +RESTRICTED= Contains non-redistributable firmware, documentation, and images +USERS= ${SLIMUSER} +GROUPS= ${SLIMGROUP} +EXTRA_PATCHES= ${FILESDIR}/vendorpatch-CPAN_buildme.sh + DOCFILES= Changelog*.html Installation.txt License*.txt CONFFILES= convert.conf types.conf @@ -85,8 +84,6 @@ SLIMGROUP?= ${SLIMUSER} .include <bsd.port.pre.mk> -ONLY_FOR_ARCHS= i386 amd64 - .if ${ARCH} == "i386" ARCHNAME= i386-freebsd-thread-multi-64int PLIST_SUB+= I386_ONLY="" @@ -103,7 +100,6 @@ PLIST_SUB+= AMD64_ONLY="@comment " do-build: cd ${WRKSRC_vendor}/CPAN && ./buildme.sh ${CONTRIB_FLAGS} - cd ${WRKSRC}/CPAN/arch && ${CP} -R 5.22 5.24 do-install: (cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/${SLIMDIR}) @@ -113,7 +109,7 @@ do-install: ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/${SLIMDIR}/CPAN/arch/${PERL_VER}/) (cd ${STAGEDIR}${PREFIX}/${SLIMDIR} && \ ${FIND} . -name \*.orig -delete -o -name \*.bak -delete -o -name \*.packlist -delete && \ - ${FIND} ./CPAN/arch/ -d 1 ! -name ${PERL_VER} -print0 | ${XARGS} -0 ${RM} -r -- && \ + ${FIND} ./CPAN/arch/ ! -path './CPAN/arch/${PERL_VER}*' -delete && \ ${RM} -r -- Bin/* && \ ${RM} -- ${CONFFILES} ${DOCFILES}) (cd ${STAGEDIR}${PREFIX}/${SLIMDIR}/CPAN/arch/${PERL_VER} && \ Modified: head/audio/logitechmediaserver/distinfo ============================================================================== --- head/audio/logitechmediaserver/distinfo Tue Jul 25 14:40:20 2017 (r446587) +++ head/audio/logitechmediaserver/distinfo Tue Jul 25 14:43:31 2017 (r446588) @@ -1,5 +1,5 @@ -TIMESTAMP = 1475588350 -SHA256 (Logitech-slimserver-7.9.0.g2016.09.30-c835a1f_GH0.tar.gz) = 01f392f7a6f2c86926e6f86fa99b78d00fe47b8c90893f2c3b5fcc03f1144035 -SIZE (Logitech-slimserver-7.9.0.g2016.09.30-c835a1f_GH0.tar.gz) = 187923230 -SHA256 (Logitech-slimserver-vendor-14cc392_GH0.tar.gz) = 4256458c6c77c06eb2616b1afed851f422f5bf26f2a0c2631339ed3b14d3e385 -SIZE (Logitech-slimserver-vendor-14cc392_GH0.tar.gz) = 115661507 +TIMESTAMP = 1499890365 +SHA256 (Logitech-slimserver-7.9.1.g2017.07.11-762b5cb_GH0.tar.gz) = 7172ce75baf9f66d691e15974d38adc7ec62430e49355c12fc0d36a133f6c3e0 +SIZE (Logitech-slimserver-7.9.1.g2017.07.11-762b5cb_GH0.tar.gz) = 204891529 +SHA256 (Logitech-slimserver-vendor-1463b00_GH0.tar.gz) = 101524a0472c5976ca8696e34013efcc18ed4943b9c6838136e24c9f28a9bce6 +SIZE (Logitech-slimserver-vendor-1463b00_GH0.tar.gz) = 115661641 Modified: head/audio/logitechmediaserver/files/vendorpatch-CPAN_buildme.sh ============================================================================== --- head/audio/logitechmediaserver/files/vendorpatch-CPAN_buildme.sh Tue Jul 25 14:40:20 2017 (r446587) +++ head/audio/logitechmediaserver/files/vendorpatch-CPAN_buildme.sh Tue Jul 25 14:43:31 2017 (r446588) @@ -1,5 +1,5 @@ ---- ../slimserver-vendor-14cc392/CPAN/buildme.sh.orig 2016-08-12 21:27:39.000000000 +0800 -+++ ../slimserver-vendor-14cc392/CPAN/buildme.sh 2016-11-13 13:08:08.765866000 +0800 +--- ../slimserver-vendor-1463b00/CPAN/buildme.sh.orig 2017-06-07 14:29:20.000000000 +0100 ++++ ../slimserver-vendor-1463b00/CPAN/buildme.sh 2017-07-12 21:44:11.808290000 +0100 @@ -92,7 +92,7 @@ exit fi @@ -9,64 +9,27 @@ which $i > /dev/null if [ $? -ne 0 ] ; then echo "$i not found - please install it" -@@ -309,6 +309,19 @@ - PERL_ARCH=$BUILD/arch/5.22 - fi - -+# Path to Perl 5.24 -+if [ -x "/usr/bin/perl5.24.1" ]; then -+ PERL_524=/usr/bin/perl5.24.1 -+fi -+ -+if [ $PERL_524 ]; then -+ echo "Building with Perl 5.24 at $PERL_524" -+ PERL_BIN=$PERL_524 -+ # Install dir for 5.24 -+ PERL_BASE=$BUILD/5.24 -+ PERL_ARCH=$BUILD/arch/5.24 -+fi -+ - # try to use default perl version - if [ "$PERL_BIN" = "" ]; then - PERL_BIN=`which perl` -@@ -339,6 +352,9 @@ - "5.22") - PERL_522=$PERL_BIN - ;; -+ "5.24") -+ PERL_524=$PERL_BIN -+ ;; - *) - echo "Failed to find supported Perl version for '$PERL_BIN'" - exit -@@ -504,7 +520,7 @@ - ;; - - Class::XSAccessor) -- if [ "$PERL_516" -o "$PERL_518" -o "$PERL_520" -o "$PERL_522" ]; then -+ if [ "$PERL_516" -o "$PERL_518" -o "$PERL_520" -o "$PERL_522" -o "$PERL_524" ]; then - build_module Class-XSAccessor-1.18 - cp -pR $PERL_BASE/lib/perl5/$ARCH/Class $PERL_ARCH/ - else -@@ -520,7 +536,7 @@ - ;; - - DBI) -- if [ "$PERL_518" -o "$PERL_520" -o "$PERL_522" ]; then -+ if [ "$PERL_518" -o "$PERL_520" -o "$PERL_522" -o "$PERL_524" ]; then - build_module DBI-1.628 - cp -p $PERL_BASE/lib/perl5/$ARCH/DBI.pm $PERL_ARCH/ - cp -pR $PERL_BASE/lib/perl5/$ARCH/DBI $PERL_ARCH/ -@@ -530,7 +546,7 @@ - ;; - - DBD::SQLite) -- if [ "$PERL_518" -o "$PERL_520" -o "$PERL_522" ]; then -+ if [ "$PERL_518" -o "$PERL_520" -o "$PERL_522" -o "$PERL_524" ]; then - build_module DBI-1.628 "" 0 - else - build_module DBI-1.616 "" 0 -@@ -552,7 +568,7 @@ +@@ -556,6 +556,19 @@ + # because it takes so damn long on slow platforms + if [ ! -f build/lib/libicudata_s.a ]; then + tar_wrapper zxvf icu4c-4_6-src.tgz ++ patch << END ++--- icu/source/i18n/uspoof.cpp.orig 2017-07-12 21:35:34.014645000 +0100 +++++ icu/source/i18n/uspoof.cpp 2017-07-12 21:33:44.790884000 +0100 ++@@ -366,7 +366,7 @@ ++ // u_strToUTF8() in preflight mode is an easy way to do it. ++ U_ASSERT(position16 <= len16); ++ u_strToUTF8(NULL, 0, position, text16, position16, status); ++- if (position > 0) { +++ if (position != NULL && *position > 0) { ++ // position is the required buffer length from u_strToUTF8, which includes ++ // space for a terminating NULL, which we don't want, hence the -1. ++ *position -= 1; ++END + cd icu/source + if [ "$OS" = 'Darwin' ]; then + ICUFLAGS="$FLAGS $OSX_ARCH $OSX_FLAGS -DU_USING_ICU_NAMESPACE=0 -DU_CHARSET_IS_UTF8=1" # faster code for native UTF-8 systems +@@ -568,7 +581,7 @@ ICUOS="FreeBSD" fi CFLAGS="$ICUFLAGS" CXXFLAGS="$ICUFLAGS" LDFLAGS="$FLAGS $OSX_ARCH $OSX_FLAGS" \ @@ -75,34 +38,7 @@ $MAKE if [ $? != 0 ]; then echo "make failed" -@@ -616,7 +632,7 @@ - rm -rf DBD-SQLite-1.34_01 - else - cd .. -- if [ "$PERL_516" -o "$PERL_518" -o "$PERL_520" -o "$PERL_522" ]; then -+ if [ "$PERL_516" -o "$PERL_518" -o "$PERL_520" -o "$PERL_522" -o "$PERL_524" ]; then - build_module DBD-SQLite-1.34_01 "" 0 - fi - build_module DBD-SQLite-1.34_01 -@@ -698,7 +714,7 @@ - JSON::XS) - build_module common-sense-2.0 - -- if [ "$PERL_518" -o "$PERL_520" -o "$PERL_522" ]; then -+ if [ "$PERL_518" -o "$PERL_520" -o "$PERL_522" -o "$PERL_524" ]; then - build_module JSON-XS-2.34 - cp -pR $PERL_BASE/lib/perl5/$ARCH/JSON $PERL_ARCH/ - else -@@ -728,7 +744,7 @@ - ;; - - YAML::LibYAML) -- if [ "$PERL_516" -o "$PERL_518" -o "$PERL_520" -o "$PERL_522" ]; then -+ if [ "$PERL_516" -o "$PERL_518" -o "$PERL_520" -o "$PERL_522" -o "$PERL_524" ]; then - build_module YAML-LibYAML-0.35 "" 0 - else - build_module YAML-LibYAML-0.35 -@@ -1223,6 +1239,9 @@ +@@ -1239,6 +1252,9 @@ if [ "$ARCH" = "amd64-freebsd" -o "$ARCH" = "amd64-freebsd-thread-multi" ]; then FFOPTS="$FFOPTS --arch=x86" fi @@ -112,12 +48,3 @@ if [ "$OS" = "Darwin" ]; then SAVED_FLAGS=$FLAGS -@@ -1387,7 +1406,7 @@ - - # create our directory structure - # rsync is used to avoid copying non-binary modules or other extra stuff --if [ "$PERL_512" -o "$PERL_514" -o "$PERL_516" -o "$PERL_518" -o "$PERL_520" -o "$PERL_522" ]; then -+if [ "$PERL_512" -o "$PERL_514" -o "$PERL_516" -o "$PERL_518" -o "$PERL_520" -o "$PERL_522" -o "$PERL_524" ]; then - # Check for Perl using use64bitint and add -64int - ARCH=`$PERL_BIN -MConfig -le 'print $Config{archname}' | sed 's/gnu-//' | sed 's/^i[3456]86-/i386-/' | sed 's/armv.*?-/arm-/' ` - fi Modified: head/audio/logitechmediaserver/pkg-plist ============================================================================== --- head/audio/logitechmediaserver/pkg-plist Tue Jul 25 14:40:20 2017 (r446587) +++ head/audio/logitechmediaserver/pkg-plist Tue Jul 25 14:43:31 2017 (r446588) @@ -340,6 +340,8 @@ etc/newsyslog.conf.d/logitechmediaserver.conf %%SLIMDIR%%/CPAN/Net/HTTP/Methods.pm %%SLIMDIR%%/CPAN/Net/HTTP/NB.pm %%SLIMDIR%%/CPAN/Net/HTTPS.pm +%%SLIMDIR%%/CPAN/Net/IPv4Addr.pm +%%SLIMDIR%%/CPAN/Net/Ifconfig/Wrapper.pm %%SLIMDIR%%/CPAN/Net/UPnP.pm %%SLIMDIR%%/CPAN/Net/UPnP/AV/Container.pm %%SLIMDIR%%/CPAN/Net/UPnP/AV/Content.pm @@ -353,7 +355,6 @@ etc/newsyslog.conf.d/logitechmediaserver.conf %%SLIMDIR%%/CPAN/Net/UPnP/HTTPResponse.pm %%SLIMDIR%%/CPAN/Net/UPnP/QueryResponse.pm %%SLIMDIR%%/CPAN/Net/UPnP/Service.pm -%%SLIMDIR%%/CPAN/Network/IPv4Addr.pm %%SLIMDIR%%/CPAN/PAR.pm %%SLIMDIR%%/CPAN/PAR/Dist.pm %%SLIMDIR%%/CPAN/PAR/Heavy.pm @@ -780,6 +781,7 @@ etc/newsyslog.conf.d/logitechmediaserver.conf %%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/ExtUtils/CBuilder/Platform/dec_osf.pm %%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/ExtUtils/CBuilder/Platform/os2.pm %%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/HTML/Tagset.pm +%%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/Image/Scale.pm %%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/JSON/XS.pm %%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/JSON/XS/Boolean.pm %%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/Module/Build.pm @@ -1922,6 +1924,7 @@ etc/newsyslog.conf.d/logitechmediaserver.conf %%SLIMDIR%%/Slim/Player/ProtocolHandlers.pm %%SLIMDIR%%/Slim/Player/Protocols/File.pm %%SLIMDIR%%/Slim/Player/Protocols/HTTP.pm +%%SLIMDIR%%/Slim/Player/Protocols/HTTPS.pm %%SLIMDIR%%/Slim/Player/Protocols/LocalFile.pm %%SLIMDIR%%/Slim/Player/Protocols/MMS.pm %%SLIMDIR%%/Slim/Player/Protocols/SqueezePlayDirect.pm @@ -2038,7 +2041,6 @@ etc/newsyslog.conf.d/logitechmediaserver.conf %%SLIMDIR%%/Slim/Plugin/Favorites/Playlist.pm %%SLIMDIR%%/Slim/Plugin/Favorites/Plugin.pm %%SLIMDIR%%/Slim/Plugin/Favorites/Settings.pm -%%SLIMDIR%%/Slim/Plugin/Favorites/SqueezeNetwork.pm %%SLIMDIR%%/Slim/Plugin/Favorites/install.xml %%SLIMDIR%%/Slim/Plugin/Favorites/strings.txt %%SLIMDIR%%/Slim/Plugin/Flickr/HTML/EN/plugins/Flickr/html/images/icon.png
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201707251443.v6PEhVdS030533>