Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 21 Dec 2022 00:03:51 GMT
From:      Brooks Davis <brooks@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: e5fd12d9aa35 - main - audio/logitechmediaserver: make usable out of the box
Message-ID:  <202212210003.2BL03plm080045@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by brooks:

URL: https://cgit.FreeBSD.org/ports/commit/?id=e5fd12d9aa3554339b1bc10884d3ead7fed166c4

commit e5fd12d9aa3554339b1bc10884d3ead7fed166c4
Author:     Brooks Davis <brooks@FreeBSD.org>
AuthorDate: 2022-12-21 00:03:27 +0000
Commit:     Brooks Davis <brooks@FreeBSD.org>
CommitDate: 2022-12-21 00:03:27 +0000

    audio/logitechmediaserver: make usable out of the box
    
    Install slimserv.pl and scanner.pl with the executable bit set.  The
    former is required for the rc script to work.
    
    Use @sample to install convert.conf and types.conf in
    ${PREFIX}/share/logitechmediaserver. Without these the server is
    unable to convert music to send to the players and find music files
    respectively.
---
 audio/logitechmediaserver/Makefile  | 5 ++++-
 audio/logitechmediaserver/pkg-plist | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/audio/logitechmediaserver/Makefile b/audio/logitechmediaserver/Makefile
index e1edc4e7a36e..65a321101fd1 100644
--- a/audio/logitechmediaserver/Makefile
+++ b/audio/logitechmediaserver/Makefile
@@ -1,6 +1,7 @@
 
 PORTNAME=	logitechmediaserver
 DISTVERSION=	8.2.0.g2021.11.13
+PORTREVISION=	1
 CATEGORIES=	audio
 
 MAINTAINER=	ports@FreeBSD.org
@@ -74,7 +75,7 @@ SUB_LIST=	PERL=${PERL} \
 # Defaults support playback of relativly unrestricted formats on SB2 or
 # SB3 devices and wired SB1 devices.
 OPTIONS_DEFINE=	APE FAAD FLAC LAME SOX TEST DOCS
-OPTIONS_DEFAULT=APE FAAD FLAX SOX TEST
+OPTIONS_DEFAULT=APE FAAD FLAC SOX TEST
 SOX_DESC=	Support OGG Vorbis input via SoX (SliMP3 and SB1)
 APE_RUN_DEPENDS=	mac:audio/mac
 FAAD_RUN_DEPENDS=	faad:audio/faad
@@ -116,6 +117,8 @@ do-build:
 
 do-install:
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/${SLIMDIR})
+	chmod +x ${STAGEDIR}${PREFIX}/${SLIMDIR}/scanner.pl \
+	    ${STAGEDIR}${PREFIX}/${SLIMDIR}/slimserver.pl
 	(cd ${WRKSRC_vendor}/CPAN/build && \
 		${COPYTREE_SHARE} arch ${STAGEDIR}${PREFIX}/${SLIMDIR}/CPAN)
 	(cd ${WRKSRC_vendor}/CPAN/build/${PERL_VER}/lib/perl5 && \
diff --git a/audio/logitechmediaserver/pkg-plist b/audio/logitechmediaserver/pkg-plist
index 4a6d02bb456d..3b1b31fb4ac5 100644
--- a/audio/logitechmediaserver/pkg-plist
+++ b/audio/logitechmediaserver/pkg-plist
@@ -2609,7 +2609,7 @@ etc/newsyslog.conf.d/logitechmediaserver.conf
 %%SLIMDIR%%/Slim/Web/XMLBrowser.pm
 %%SLIMDIR%%/Slim/bootstrap.pm
 %%SLIMDIR%%/cleanup.pl
-%%SLIMDIR%%/convert.conf.sample
+@sample %%SLIMDIR%%/convert.conf.sample %%SLIMDIR%%/convert.conf
 %%SLIMDIR%%/custom-convert.conf
 %%SLIMDIR%%/gdresize.pl
 %%SLIMDIR%%/gdresized.pl
@@ -2645,7 +2645,7 @@ etc/newsyslog.conf.d/logitechmediaserver.conf
 %%SLIMDIR%%/slimserver.pl
 %%SLIMDIR%%/strings.txt
 %%SLIMDIR%%/t/00_smoketest.sh
-%%SLIMDIR%%/types.conf.sample
+@sample %%SLIMDIR%%/types.conf.sample %%SLIMDIR%%/types.conf
 @dir %%SLIMDIR%%/Bin
 @dir %%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/auto/Audio/Cuefile/Parser
 @dir %%SLIMDIR%%/CPAN/arch/%%PERL_VER%%/%%ARCHNAME%%/auto/Data/Dump



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202212210003.2BL03plm080045>