From 56bd759df1d0c750a065b8c845e93d5dfa6b549d Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Sat, 8 Aug 2015 13:49:04 -0700 Subject: proj/gentoo: Initial commit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson X-Thanks: Alec Warner - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring - wrote much python to improve cvs2svn X-Thanks: Rich Freeman - validation scripts X-Thanks: Patrick Lauer - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed --- media-sound/squeezeslave/Manifest | 2 + .../squeezeslave-1.1_p350-tremor-headers.patch | 22 ++++ .../files/squeezeslave-1.1_p381-ffmpeg2.patch | 133 +++++++++++++++++++++ .../squeezeslave/files/squeezeslave.confd-r1 | 13 ++ .../squeezeslave/files/squeezeslave.initd-r1 | 14 +++ media-sound/squeezeslave/metadata.xml | 14 +++ .../squeezeslave/squeezeslave-1.1_p365.ebuild | 52 ++++++++ .../squeezeslave/squeezeslave-1.1_p381.ebuild | 53 ++++++++ 8 files changed, 303 insertions(+) create mode 100644 media-sound/squeezeslave/Manifest create mode 100644 media-sound/squeezeslave/files/squeezeslave-1.1_p350-tremor-headers.patch create mode 100644 media-sound/squeezeslave/files/squeezeslave-1.1_p381-ffmpeg2.patch create mode 100644 media-sound/squeezeslave/files/squeezeslave.confd-r1 create mode 100644 media-sound/squeezeslave/files/squeezeslave.initd-r1 create mode 100644 media-sound/squeezeslave/metadata.xml create mode 100644 media-sound/squeezeslave/squeezeslave-1.1_p365.ebuild create mode 100644 media-sound/squeezeslave/squeezeslave-1.1_p381.ebuild (limited to 'media-sound/squeezeslave') diff --git a/media-sound/squeezeslave/Manifest b/media-sound/squeezeslave/Manifest new file mode 100644 index 00000000000..9b7f06dee5e --- /dev/null +++ b/media-sound/squeezeslave/Manifest @@ -0,0 +1,2 @@ +DIST squeezeslave-1.1_p365.tar.xz 122364 SHA256 504099547c449fd865226f84f9e9e9cd0636c0f50659f605cd518addc7b5f4ec SHA512 409ef279b5fe0157e79ccab49cf4bb4fc3c6df6c864175a0160cba1c0be5b1960ee462e60b04df16b627023e4a87dff6ab3928a65aa686d7dc6192496e4e5503 WHIRLPOOL fb440cd1a6748aa7d9dbfaa39292de2ccd211513002e2025de563767faf096e81dc9e75799985921a3785571e7d0954f859f68dafa880b592c7cd3439c8675c4 +DIST squeezeslave-1.1_p381.tar.xz 123164 SHA256 8f898bb7949c2352f9fccc7b396630a6b7a49d80b439ec8792f33f149d6f95c0 SHA512 3c58d5ec814270740db9303b031e83a038b15b518c219f6e73ada1ebf7c5faa2da356a80303a266244bb08b703153d9f5a001377c467e5204256f97b139ca1bb WHIRLPOOL 900656118ed45defb3f4275840c8c061864a122ab74001c425339e988cea0adb8991228ac74fc3d609db14411c80e12e1bafebcb616b5196f619ea5dac8d0708 diff --git a/media-sound/squeezeslave/files/squeezeslave-1.1_p350-tremor-headers.patch b/media-sound/squeezeslave/files/squeezeslave-1.1_p350-tremor-headers.patch new file mode 100644 index 00000000000..b8d9a1cb1e2 --- /dev/null +++ b/media-sound/squeezeslave/files/squeezeslave-1.1_p350-tremor-headers.patch @@ -0,0 +1,22 @@ +--- squeezeslave-1.1_p350/src/slimaudio/slimaudio_decoder_vorbis.c ++++ squeezeslave-1.1_p350/src/slimaudio/slimaudio_decoder_vorbis.c +@@ -27,7 +27,7 @@ + #define OV_EXCLUDE_STATIC_CALLBACKS + + #ifdef TREMOR_DECODER +-#include ++#include + #else + #include + #endif /* TREMOR_DECODER */ +--- squeezeslave-1.1_p350/src/slimaudio/slimaudio.h ++++ squeezeslave-1.1_p350/src/slimaudio/slimaudio.h +@@ -36,7 +36,7 @@ + #define OV_EXCLUDE_STATIC_CALLBACKS + + #ifdef TREMOR_DECODER +-#include ++#include + #else + #include + #endif /* TREMOR_DECODER */ diff --git a/media-sound/squeezeslave/files/squeezeslave-1.1_p381-ffmpeg2.patch b/media-sound/squeezeslave/files/squeezeslave-1.1_p381-ffmpeg2.patch new file mode 100644 index 00000000000..d72aa04533d --- /dev/null +++ b/media-sound/squeezeslave/files/squeezeslave-1.1_p381-ffmpeg2.patch @@ -0,0 +1,133 @@ +Index: squeezeslave-1.1_p381/src/slimaudio/slimaudio_decoder.c +=================================================================== +--- squeezeslave-1.1_p381.orig/src/slimaudio/slimaudio_decoder.c ++++ squeezeslave-1.1_p381/src/slimaudio/slimaudio_decoder.c +@@ -69,7 +69,6 @@ void av_lib_setup (void) + av_register_all(); + DEBUGF("decoder_thread: av_register_all\n"); + +- avcodec_init(); + avcodec_register_all(); + DEBUGF("decoder_thread: avcodec_register_all\n"); + +Index: squeezeslave-1.1_p381/src/slimaudio/slimaudio_decoder_aac.c +=================================================================== +--- squeezeslave-1.1_p381.orig/src/slimaudio/slimaudio_decoder_aac.c ++++ squeezeslave-1.1_p381/src/slimaudio/slimaudio_decoder_aac.c +@@ -47,6 +47,11 @@ + + #define AUDIO_INBUF_SIZE (AUDIO_CHUNK_SIZE*2) + ++#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE ++#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio ++#endif ++ ++ + int slimaudio_decoder_aac_init(slimaudio_t *audio) + { + av_lib_setup(); +@@ -164,7 +169,7 @@ int slimaudio_decoder_aac_process(slimau + } + else + { +- AVIOCtx->is_streamed = 1; ++ AVIOCtx->seekable = 0; + } + + AVInputFormat* pAVInputFormat = av_find_input_format(streamformat); +@@ -199,7 +204,7 @@ int slimaudio_decoder_aac_process(slimau + } + else + { +- iRC = av_find_stream_info(pFormatCtx); ++ iRC = avformat_find_stream_info(pFormatCtx, NULL); + if ( iRC < 0 ) + { + DEBUGF("aac: find stream info failed:%d\n", iRC); +@@ -236,7 +241,7 @@ int slimaudio_decoder_aac_process(slimau + } + + /* Open codec */ +- iRC = avcodec_open(pCodecCtx, pCodec); ++ iRC = avcodec_open2(pCodecCtx, pCodec, NULL); + if ( iRC < 0) + { + DEBUGF("aac: could not open codec:%d\n", iRC); +@@ -274,7 +279,7 @@ int slimaudio_decoder_aac_process(slimau + eos=true; + } + +- if ( url_ferror(pFormatCtx->pb) ) ++ if ( pFormatCtx->pb && pFormatCtx->pb->error ) + { + DEBUGF("aac: url_ferror\n"); + #if 0 +@@ -312,7 +317,7 @@ int slimaudio_decoder_aac_process(slimau + + /* Close the stream */ + DEBUGF ("aac: av_close_input_stream\n"); +- av_close_input_stream(pFormatCtx); ++ avformat_close_input(&pFormatCtx); + + return 0; + } +Index: squeezeslave-1.1_p381/src/slimaudio/slimaudio_decoder_wma.c +=================================================================== +--- squeezeslave-1.1_p381.orig/src/slimaudio/slimaudio_decoder_wma.c ++++ squeezeslave-1.1_p381/src/slimaudio/slimaudio_decoder_wma.c +@@ -47,6 +47,10 @@ + + #define AUDIO_INBUF_SIZE (AUDIO_CHUNK_SIZE*2) + ++#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE ++#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio ++#endif ++ + int slimaudio_decoder_wma_init(slimaudio_t *audio) + { + av_lib_setup(); +@@ -159,7 +163,7 @@ int slimaudio_decoder_wma_process(slimau + } + else + { +- AVIOCtx->is_streamed = 1; ++ AVIOCtx->seekable = 1; + } + + AVInputFormat* pAVInputFormat = av_find_input_format(streamformat); +@@ -194,7 +198,7 @@ int slimaudio_decoder_wma_process(slimau + } + else + { +- iRC = av_find_stream_info(pFormatCtx); ++ iRC = avformat_find_stream_info(pFormatCtx,NULL); + if ( iRC < 0 ) + { + DEBUGF("wma: find stream info failed:%d\n", iRC); +@@ -231,7 +235,7 @@ int slimaudio_decoder_wma_process(slimau + } + + /* Open codec */ +- iRC = avcodec_open(pCodecCtx, pCodec); ++ iRC = avcodec_open2(pCodecCtx, pCodec, NULL); + if ( iRC < 0) + { + DEBUGF("wma: could not open codec:%d\n", iRC); +@@ -270,7 +274,7 @@ int slimaudio_decoder_wma_process(slimau + eos=true; + } + +- if ( url_ferror(pFormatCtx->pb) ) ++ if ( pFormatCtx->pb && pFormatCtx->pb->error ) + { + DEBUGF("wma: url_ferror\n"); + #if 0 +@@ -308,7 +312,7 @@ int slimaudio_decoder_wma_process(slimau + + /* Close the stream */ + DEBUGF ("wma: av_close_input_stream\n"); +- av_close_input_stream(pFormatCtx); ++ avformat_close_input(&pFormatCtx); + + return 0; + } diff --git a/media-sound/squeezeslave/files/squeezeslave.confd-r1 b/media-sound/squeezeslave/files/squeezeslave.confd-r1 new file mode 100644 index 00000000000..540aea95f65 --- /dev/null +++ b/media-sound/squeezeslave/files/squeezeslave.confd-r1 @@ -0,0 +1,13 @@ +# /etc/conf.d/squeezeslave: config file for /etc/init.d/squeezeslave + +# Log file for squeezeslave +SS_LOG="/var/log/squeezeslave.log" + +# MAC address associated with this instance +SS_MAC="00:00:00:00:00:01" + +# IP address of machine running logitechmediaserver +LMS_HOST="127.0.0.1" + +# Other squeezeslave options +SS_OPTS="" diff --git a/media-sound/squeezeslave/files/squeezeslave.initd-r1 b/media-sound/squeezeslave/files/squeezeslave.initd-r1 new file mode 100644 index 00000000000..1d764fb4c4d --- /dev/null +++ b/media-sound/squeezeslave/files/squeezeslave.initd-r1 @@ -0,0 +1,14 @@ +#!/sbin/runscript +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +command="/usr/bin/${SVCNAME}" +command_args="--daemonize ${SS_LOG} --mac ${SS_MAC} --retry ${LMS_HOST} ${SS_OPTS}" +pidfile="/var/run/${SVCNAME}.pid" +start_stop_daemon_args="--background --quiet --make-pidfile" + +depend() { + need net + use logitechmediaserver +} diff --git a/media-sound/squeezeslave/metadata.xml b/media-sound/squeezeslave/metadata.xml new file mode 100644 index 00000000000..749da791f33 --- /dev/null +++ b/media-sound/squeezeslave/metadata.xml @@ -0,0 +1,14 @@ + + + + + radhermit@gentoo.org + Tim Harder + + + Enable a text-based display + Use a fixed-point version of the Ogg Vorbis decoder (media-libs/tremor) + Enable support for streaming Windows Media Audio + Pairs surround sound speakers into stereo zones (requires 5.1 setup or better) + + diff --git a/media-sound/squeezeslave/squeezeslave-1.1_p365.ebuild b/media-sound/squeezeslave/squeezeslave-1.1_p365.ebuild new file mode 100644 index 00000000000..e2d46477a76 --- /dev/null +++ b/media-sound/squeezeslave/squeezeslave-1.1_p365.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="4" + +inherit eutils toolchain-funcs + +DESCRIPTION="A lightweight streaming audio player for Logitech Media Server" +HOMEPAGE="http://squeezeslave.googlecode.com" +SRC_URI="http://dev.gentoo.org/~radhermit/dist/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="aac +alsa display tremor wma zones" + +RDEPEND="media-libs/libmad + media-libs/flac + tremor? ( media-libs/tremor ) + !tremor? ( media-libs/libvorbis ) + media-libs/libogg + media-libs/portaudio[alsa?] + aac? ( virtual/ffmpeg ) + wma? ( virtual/ffmpeg ) + display? ( app-misc/lirc )" +DEPEND="${RDEPEND} + app-arch/xz-utils + virtual/pkgconfig" + +src_prepare() { + epatch "${FILESDIR}"/${PN}-1.1_p350-tremor-headers.patch +} + +src_compile() { + tc-export CC AR RANLIB + + local myconf + for i in aac display tremor wma zones ; do + use $i && myconf+=" $i=1" + done + + emake ${myconf} +} + +src_install() { + dobin bin/${PN} + dodoc ChangeLog TODO + + newconfd "${FILESDIR}"/${PN}.confd-r1 ${PN} + newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN} +} diff --git a/media-sound/squeezeslave/squeezeslave-1.1_p381.ebuild b/media-sound/squeezeslave/squeezeslave-1.1_p381.ebuild new file mode 100644 index 00000000000..a120d88e870 --- /dev/null +++ b/media-sound/squeezeslave/squeezeslave-1.1_p381.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +inherit eutils toolchain-funcs + +DESCRIPTION="A lightweight streaming audio player for Logitech Media Server" +HOMEPAGE="http://squeezeslave.googlecode.com" +SRC_URI="http://dev.gentoo.org/~radhermit/dist/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="aac +alsa display tremor wma zones" + +RDEPEND="media-libs/libmad + media-libs/flac + tremor? ( media-libs/tremor ) + !tremor? ( media-libs/libvorbis ) + media-libs/libogg + media-libs/portaudio[alsa?] + aac? ( virtual/ffmpeg ) + wma? ( virtual/ffmpeg ) + display? ( app-misc/lirc )" +DEPEND="${RDEPEND} + app-arch/xz-utils + virtual/pkgconfig" + +src_prepare() { + epatch "${FILESDIR}"/${PN}-1.1_p350-tremor-headers.patch + epatch "${FILESDIR}"/${PN}-1.1_p381-ffmpeg2.patch +} + +src_compile() { + tc-export CC AR RANLIB + + local myconf + for i in aac display tremor wma zones ; do + use $i && myconf+=" $i=1" + done + + emake ${myconf} +} + +src_install() { + dobin bin/${PN} + dodoc ChangeLog TODO + + newconfd "${FILESDIR}"/${PN}.confd-r1 ${PN} + newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN} +} -- cgit v1.2.1