summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Harder <radhermit@gentoo.org>2012-11-24 12:30:53 +0000
committerTim Harder <radhermit@gentoo.org>2012-11-24 12:30:53 +0000
commitbd808ccee67c3333977692345df382f5cf9eb57d (patch)
treed8fd0403f249563a5f5daea4f4e0ed19c8aa1046 /media-sound/squeezeslave/files
parentVersion bump. (diff)
downloadgentoo-2-bd808ccee67c3333977692345df382f5cf9eb57d.tar.gz
gentoo-2-bd808ccee67c3333977692345df382f5cf9eb57d.tar.bz2
gentoo-2-bd808ccee67c3333977692345df382f5cf9eb57d.zip
Remove old.
(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)
Diffstat (limited to 'media-sound/squeezeslave/files')
-rw-r--r--media-sound/squeezeslave/files/squeezeslave-1.1_p309-ffmpeg.patch95
-rw-r--r--media-sound/squeezeslave/files/squeezeslave.confd13
-rw-r--r--media-sound/squeezeslave/files/squeezeslave.initd14
3 files changed, 0 insertions, 122 deletions
diff --git a/media-sound/squeezeslave/files/squeezeslave-1.1_p309-ffmpeg.patch b/media-sound/squeezeslave/files/squeezeslave-1.1_p309-ffmpeg.patch
deleted file mode 100644
index 70a88dde4348..000000000000
--- a/media-sound/squeezeslave/files/squeezeslave-1.1_p309-ffmpeg.patch
+++ /dev/null
@@ -1,95 +0,0 @@
---- squeezeslave-1.1_p309/src/slimaudio/slimaudio_decoder_aac.c.orig
-+++ squeezeslave-1.1_p309/src/slimaudio/slimaudio_decoder_aac.c
-@@ -28,6 +28,10 @@
- #include <libavcodec/avcodec.h>
- #include <libavformat/avformat.h>
-
-+#ifndef CODEC_TYPE_AUDIO
-+#define CODEC_TYPE_AUDIO AVMEDIA_TYPE_AUDIO
-+#endif
-+
- #include "slimproto/slimproto.h"
- #include "slimaudio/slimaudio.h"
-
-@@ -96,11 +100,6 @@
- }
-
- int slimaudio_decoder_aac_process(slimaudio_t *audio) {
--// unsigned char data[AUDIO_CHUNK_SIZE];
--// int buffer[AUDIO_CHUNK_SIZE/2];
--// int i;
--
--// unsigned char *ptr = data;
- char streamformat[16];
- int out_size;
- int len = 0;
-@@ -148,18 +147,6 @@
-
- DEBUGF ("aac: play audioStream: %d\n", audioStream);
-
-- AVInputFormat* pAVInputFormat = av_find_input_format(streamformat);
-- if( !pAVInputFormat )
-- {
-- DEBUGF("aac: probe failed\n");
-- return -1;
-- }
-- else
-- {
-- DEBUGF("aac: probe ok name:%s lname:%s\n", pAVInputFormat->name, pAVInputFormat->long_name);
-- pAVInputFormat->flags |= AVFMT_NOFILE;
-- }
--
- inbuf = av_malloc(AUDIO_INBUF_SIZE + FF_INPUT_BUFFER_PADDING_SIZE);
- if ( !inbuf )
- {
-@@ -167,23 +154,35 @@
- return -1;
- }
-
-- ByteIOContext ByteIOCtx;
-+ AVIOContext *AVIOCtx;
-
-- iRC = init_put_byte( &ByteIOCtx, inbuf, AUDIO_CHUNK_SIZE, 0, audio, av_read_data, NULL, NULL ) ;
-- if( iRC < 0)
-+ AVIOCtx = avio_alloc_context(inbuf, AUDIO_CHUNK_SIZE, 0, audio, av_read_data, NULL, NULL);
-+ if ( AVIOCtx == NULL )
- {
-- DEBUGF("aac: init_put_byte failed:%d\n", iRC);
-+ DEBUGF("aac: avio_alloc_context failed.\n");
- return -1;
- }
- else
- {
-- ByteIOCtx.is_streamed = 1;
-+ AVIOCtx->is_streamed = 1;
-+ }
-+
-+ AVInputFormat* pAVInputFormat = av_find_input_format(streamformat);
-+ if( !pAVInputFormat )
-+ {
-+ DEBUGF("aac: probe failed\n");
-+ return -1;
-+ }
-+ else
-+ {
-+ DEBUGF("aac: probe ok name:%s lname:%s\n", pAVInputFormat->name, pAVInputFormat->long_name);
-+ pAVInputFormat->flags |= AVFMT_NOFILE;
- }
-
- AVFormatContext* pFormatCtx;
- AVCodecContext *pCodecCtx;
-
-- iRC = av_open_input_stream(&pFormatCtx, &ByteIOCtx, "", pAVInputFormat, NULL);
-+ iRC = av_open_input_stream(&pFormatCtx, AVIOCtx, "", pAVInputFormat, NULL);
-
- if (iRC < 0)
- {
-@@ -261,7 +260,7 @@
- eos=true;
- }
-
-- if ( url_feof(pFormatCtx->pb) )
-+ if ( pFormatCtx->pb->eof_reached )
- {
- DEBUGF("aac: url_feof\n");
- eos=true;
diff --git a/media-sound/squeezeslave/files/squeezeslave.confd b/media-sound/squeezeslave/files/squeezeslave.confd
deleted file mode 100644
index a5b8d849024f..000000000000
--- a/media-sound/squeezeslave/files/squeezeslave.confd
+++ /dev/null
@@ -1,13 +0,0 @@
-# /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 squeezeboxserver
-SBS_HOST="127.0.0.1"
-
-# Other squeezeslave options
-SS_OPTS=""
diff --git a/media-sound/squeezeslave/files/squeezeslave.initd b/media-sound/squeezeslave/files/squeezeslave.initd
deleted file mode 100644
index efa5c140dbff..000000000000
--- a/media-sound/squeezeslave/files/squeezeslave.initd
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/squeezeslave/files/squeezeslave.initd,v 1.2 2011/12/04 22:18:43 radhermit Exp $
-
-command="/usr/bin/${SVCNAME}"
-command_args="--daemonize ${SS_LOG} --mac ${SS_MAC} --retry ${SBS_HOST} ${SS_OPTS}"
-pidfile="/var/run/${SVCNAME}.pid"
-start_stop_daemon_args="--background --quiet --make-pidfile"
-
-depend() {
- need net
- use squeezeboxserver
-}