From 6abde622bfce763b4936e323c5ef8aaf2f2e0a69 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 30 Sep 2011 19:09:29 +0200 Subject: [PATCH] shairport: remove package Signed-off-by: Stephan Raue --- packages/3rdparty/multimedia/shairport/build | 36 ---------- packages/3rdparty/multimedia/shairport/meta | 35 ---------- .../shairport-346db95-ao_select-0.1.patch | 66 ------------------- 3 files changed, 137 deletions(-) delete mode 100755 packages/3rdparty/multimedia/shairport/build delete mode 100755 packages/3rdparty/multimedia/shairport/meta delete mode 100755 packages/3rdparty/multimedia/shairport/patches/shairport-346db95-ao_select-0.1.patch diff --git a/packages/3rdparty/multimedia/shairport/build b/packages/3rdparty/multimedia/shairport/build deleted file mode 100755 index 2e6df72fee..0000000000 --- a/packages/3rdparty/multimedia/shairport/build +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh - -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -. config/options $1 - -cd $PKG_BUILD - -# fix me :( -LIBAO_DIR=../libao-1.1.0 - -# large buffer -sed -i 's|#define BUFFER_FRAMES 320|#define BUFFER_FRAMES 1024|g' hairtunes.h -sed -i 's|read = ab_read + 10;|read = ab_read + 50;|g' hairtunes.c - -CFLAGS="-O2 -Wall -I$LIBAO_DIR/include" \ -LDFLAGS="-lm -lpthread -L$LIBAO_DIR/src/.libs -lao -lssl" \ -make diff --git a/packages/3rdparty/multimedia/shairport/meta b/packages/3rdparty/multimedia/shairport/meta deleted file mode 100755 index 2bf3666181..0000000000 --- a/packages/3rdparty/multimedia/shairport/meta +++ /dev/null @@ -1,35 +0,0 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv) -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -PKG_NAME="shairport" -PKG_VERSION="346db95" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="GPL" -PKG_SITE="https://github.com/Andywebs/shairport" -PKG_URL="http://dl.dropbox.com/u/8224157/OpenELEC-Ultra/addons/${PKG_NAME}-${PKG_VERSION}.tar.xz" -PKG_DEPENDS="" -PKG_BUILD_DEPENDS="toolchain" -PKG_PRIORITY="optional" -PKG_SECTION="network" -PKG_SHORTDESC="shairport: emulates AirPort Express" -PKG_LONGDESC="ShairPort emulates an AirPort Express for the purpose of streaming music from iTunes and compatible iPods." -PKG_IS_ADDON="no" -PKG_AUTORECONF="no" diff --git a/packages/3rdparty/multimedia/shairport/patches/shairport-346db95-ao_select-0.1.patch b/packages/3rdparty/multimedia/shairport/patches/shairport-346db95-ao_select-0.1.patch deleted file mode 100755 index a9fc7614ab..0000000000 --- a/packages/3rdparty/multimedia/shairport/patches/shairport-346db95-ao_select-0.1.patch +++ /dev/null @@ -1,66 +0,0 @@ -diff -uNr shairport_orig/Makefile shairport/Makefile ---- shairport_orig/Makefile 2011-08-09 23:07:40.000000000 +0200 -+++ shairport/Makefile 2011-08-15 20:02:36.000000000 +0200 -@@ -1,5 +1,5 @@ --CFLAGS:=-O2 -Wall $(shell pkg-config --cflags openssl ao) --LDFLAGS:=-lm -lpthread $(shell pkg-config --libs openssl ao) -+CFLAGS?=-O2 -Wall $(shell pkg-config --cflags openssl ao) -+LDFLAGS?=-lm -lpthread $(shell pkg-config --libs openssl ao) - OBJS=socketlib.o shairport.o alac.o hairtunes.o - all: hairtunes shairport - -diff -uNr shairport_orig/shairport.c shairport/shairport.c ---- shairport_orig/shairport.c 2011-08-09 23:07:40.000000000 +0200 -+++ shairport/shairport.c 2011-08-09 11:37:52.000000000 +0200 -@@ -51,6 +51,9 @@ - #define HEADER_LOG_LEVEL LOG_DEBUG - #define AVAHI_LOG_LEVEL LOG_DEBUG - -+char tAoDeviceName[56] = ""; -+char tAoDriver[56] = ""; -+ - int main(int argc, char **argv) - { - char tHWID[HWID_SIZE] = {0,51,52,53,54,55}; -@@ -129,6 +132,14 @@ - { - kCurrentLogLevel = LOG_DEBUG_VV; - } -+ else if(!strncmp(arg, "--ao_driver=", 12)) -+ { -+ strncpy(tAoDriver, arg+12, 55); -+ } -+ else if(!strncmp(arg, "--ao_devicename=", 16)) -+ { -+ strncpy(tAoDeviceName, arg+16, 55); -+ } - else if(!strcmp(arg, "-h") || !strcmp(arg, "--help")) - { - slog(LOG_INFO, "ShairPort version 0.05 C port - Airport Express emulator\n"); -@@ -140,6 +151,8 @@ - slog(LOG_INFO, " -d Daemon mode\n"); - slog(LOG_INFO, " -q, --quiet Supresses all output.\n"); - slog(LOG_INFO, " -v,-v2,-v3,-vv Various debugging levels\n"); -+ slog(LOG_INFO, " --ao_driver=driver Sets the ao driver (optional)\n"); -+ slog(LOG_INFO, " --ao_devicename=devicename Sets the ao device name (optional)\n"); - slog(LOG_INFO, "\n"); - return 0; - } -@@ -731,8 +744,6 @@ - slog(LOG_DEBUG_V, "Got %d for CPort and %d for TPort\n", tControlport, tTimingport); - char *tRtp = NULL; - char *tPipe = NULL; -- char *tAoDriver = NULL; -- char *tAoDeviceName = NULL; - char *tAoDeviceId = NULL; - - // ************************************************* -@@ -758,7 +769,7 @@ - } - cleanupBuffers(pConn); - hairtunes_init(tKeys->aeskey, tKeys->aesiv, tKeys->fmt, tControlport, tTimingport, -- tDataport, tRtp, tPipe, tAoDriver, tAoDeviceName, tAoDeviceId); -+ tDataport, tRtp, tPipe, tAoDriver[0]!='\0'?tAoDriver:NULL, tAoDeviceName[0]!='\0'?tAoDeviceName:NULL, tAoDeviceId); - - // Quit when finished. - slog(LOG_DEBUG, "Returned from hairtunes init....returning -1, should close out this whole side of the fork\n");