mirror of
https://github.com/archr-linux/Arch-R.git
synced 2026-03-31 14:41:55 -07:00
Merge branch 'openelec-eden' of github.com:OpenELEC/OpenELEC.tv into openelec-pvr
This commit is contained in:
Stephan Raue
16
CHANGELOG
16
CHANGELOG
@@ -0,0 +1,16 @@
|
||||
OpenELEC (Version 2.0)
|
||||
|
||||
Changelog OpenELEC-1.0 to OpenELEC-2.0
|
||||
|
||||
Package updates:
|
||||
- update XBMC to XBMC-11.0 (Eden)
|
||||
- update eglibc to eglibc-2.14
|
||||
|
||||
Added functions:
|
||||
- PXE netboot support
|
||||
- Airplay support
|
||||
- Airtunes support
|
||||
- CEC support
|
||||
|
||||
Removed functions:
|
||||
- remove netmount.conf (XBMC includes native NFS/AFP/CIFS/SSH support)
|
||||
|
||||
@@ -115,22 +115,44 @@ add_group() {
|
||||
}
|
||||
|
||||
do_autoreconf() {
|
||||
if [ -e $ROOT/$TOOLCHAIN/bin/autoreconf ] &&
|
||||
[ -e $ROOT/$TOOLCHAIN/bin/autoconf ] &&
|
||||
[ -e $ROOT/$TOOLCHAIN/bin/automake ] &&
|
||||
[ -e $ROOT/$TOOLCHAIN/bin/libtoolize ] &&
|
||||
[ -e $ROOT/$TOOLCHAIN/bin/intltoolize ]; then
|
||||
export LIBTOOL=$ROOT/$TOOLCHAIN/bin/libtool
|
||||
export LIBTOOLIZE=$ROOT/$TOOLCHAIN/bin/libtoolize
|
||||
export AUTOMAKE=$ROOT/$TOOLCHAIN/bin/automake
|
||||
export ACLOCAL_DIR=$SYSROOT_PREFIX/usr/share/aclocal
|
||||
export ACLOCAL="$ROOT/$TOOLCHAIN/bin/aclocal -I $ACLOCAL_DIR"
|
||||
export AUTOCONF=$ROOT/$TOOLCHAIN/bin/autoconf
|
||||
export AUTOHEADER=$ROOT/$TOOLCHAIN/bin/autoheader
|
||||
export AUTORECONF="$ROOT/$TOOLCHAIN/bin/autoreconf -v -f -i -I $ACLOCAL_DIR"
|
||||
export ACLOCAL_DIR=$SYSROOT_PREFIX/usr/share/aclocal
|
||||
|
||||
mkdir -p $ACLOCAL_DIR
|
||||
autoreconf --force --install -I $ACLOCAL_DIR $@
|
||||
if [ -e $ROOT/$TOOLCHAIN/bin/autoconf ]; then
|
||||
export AUTOCONF=$ROOT/$TOOLCHAIN/bin/autoconf
|
||||
fi
|
||||
|
||||
if [ -e $ROOT/$TOOLCHAIN/bin/automake ]; then
|
||||
export AUTOMAKE=$ROOT/$TOOLCHAIN/bin/automake
|
||||
fi
|
||||
|
||||
if [ -e $ROOT/$TOOLCHAIN/bin/autopoint ]; then
|
||||
export AUTOPOINT=$ROOT/$TOOLCHAIN/bin/autopoint
|
||||
fi
|
||||
|
||||
if [ -e $ROOT/$TOOLCHAIN/bin/libtoolize ]; then
|
||||
export LIBTOOLIZE=$ROOT/$TOOLCHAIN/bin/libtoolize
|
||||
fi
|
||||
|
||||
if [ -e $ROOT/$TOOLCHAIN/bin/intltoolize ]; then
|
||||
export INTLTOOLIZE=$ROOT/$TOOLCHAIN/bin/intltoolize
|
||||
fi
|
||||
|
||||
if [ -e $ROOT/$TOOLCHAIN/bin/aclocal ]; then
|
||||
export ACLOCAL="$ROOT/$TOOLCHAIN/bin/aclocal -I $ACLOCAL_DIR"
|
||||
fi
|
||||
|
||||
if [ -e $ROOT/$TOOLCHAIN/bin/autoheader ]; then
|
||||
export AUTOHEADER=$ROOT/$TOOLCHAIN/bin/autoheader
|
||||
fi
|
||||
|
||||
if [ -e $ROOT/$TOOLCHAIN/bin/libtool ]; then
|
||||
export LIBTOOL=$ROOT/$TOOLCHAIN/bin/libtool
|
||||
fi
|
||||
|
||||
if [ -e $ROOT/$TOOLCHAIN/bin/autoreconf -a -e $INTLTOOLIZE ]; then
|
||||
mkdir -p $ACLOCAL_DIR
|
||||
export AUTORECONF="$ROOT/$TOOLCHAIN/bin/autoreconf --verbose --force --install -I $ACLOCAL_DIR"
|
||||
$AUTORECONF $@
|
||||
fi
|
||||
}
|
||||
|
||||
|
||||
@@ -38,6 +38,7 @@ fi
|
||||
|
||||
if [ "$LTO_SUPPORT" = yes ];then
|
||||
GCC_OPTIM="$GCC_OPTIM -flto"
|
||||
LD_OPTIM="$LD_OPTIM -flto"
|
||||
fi
|
||||
|
||||
if [ "$GOLD_SUPPORT" = yes ];then
|
||||
@@ -57,7 +58,7 @@ fi
|
||||
TARGET_CPPFLAGS=
|
||||
TARGET_CFLAGS="$TARGET_CFLAGS -Wall -pipe $GCC_OPTIM $PROJECT_CFLAGS"
|
||||
TARGET_CXXFLAGS="$TARGET_CFLAGS"
|
||||
TARGET_LDFLAGS="$TARGET_LDFLAGS $GCC_OPTIM $LD_OPTIM"
|
||||
TARGET_LDFLAGS="$TARGET_LDFLAGS $LD_OPTIM $GCC_OPTIM"
|
||||
TARGET_LIBDIR="$SYSROOT_PREFIX/lib $SYSROOT_PREFIX/usr/lib"
|
||||
TARGET_INCDIR="$SYSROOT_PREFIX/include $SYSROOT_PREFIX/usr/include"
|
||||
|
||||
|
||||
@@ -20,7 +20,7 @@ PROJECT_DIR="$ROOT/projects"
|
||||
OPENELEC_VERSION=`cat VERSION`
|
||||
|
||||
if [ "$OPENELEC_VERSION" = "devel" ]; then
|
||||
OS_VERSION="0.99"
|
||||
OS_VERSION="1.0"
|
||||
else
|
||||
OS_MAJOR_VERSION=`echo "$OPENELEC_VERSION" | cut -f1 -d "."`
|
||||
OS_MINOR_VERSION=`echo "$OPENELEC_VERSION" | cut -f2 -d "."`
|
||||
|
||||
@@ -1,114 +1,169 @@
|
||||
@ECHO OFF
|
||||
TITLE OpenELEC USB Installer
|
||||
mode con:cols=67 lines=17
|
||||
COLOR 17
|
||||
SET DRIVE=
|
||||
|
||||
:checkPrivileges
|
||||
mkdir "%windir%\OEAdminCheck"
|
||||
if '%errorlevel%' == '0' (
|
||||
rmdir "%windir%\OEAdminCheck" & goto gotPrivileges
|
||||
) else ( goto getPrivileges )
|
||||
|
||||
:getPrivileges
|
||||
CLS
|
||||
ECHO.
|
||||
ECHO OpenELEC.tv USB Installer
|
||||
ECHO.
|
||||
ECHO OpenELEC.tv USB Installer
|
||||
ECHO.
|
||||
ECHO.
|
||||
ECHO ******************************************************
|
||||
ECHO.
|
||||
ECHO This will wipe any data off your chosen drive
|
||||
ECHO Please read the instructions and use very carefully...
|
||||
ECHO *****************************************************************
|
||||
ECHO.
|
||||
ECHO Administrator Rights are required for USB Stick creation
|
||||
ECHO Invoking UAC for Privilege Escalation
|
||||
ECHO.
|
||||
ECHO *****************************************************************
|
||||
ECHO.
|
||||
ECHO ******************************************************
|
||||
ECHO.
|
||||
ECHO.
|
||||
ECHO. Are you running this USB Wizard for the first time
|
||||
ECHO. on Windows 7 or Windows Vista? [Y/N]
|
||||
ECHO.
|
||||
ECHO.
|
||||
|
||||
SET /P OS= --
|
||||
IF "%OS%"=="n" GOTO INSTALL
|
||||
IF "%OS%"=="N" GOTO INSTALL
|
||||
ECHO Set UAC = CreateObject^("Shell.Application"^) > "%temp%\OEgetPrivileges.vbs"
|
||||
ECHO UAC.ShellExecute %0, "", "", "runas", 1 >> "%temp%\OEgetPrivileges.vbs"
|
||||
"%temp%\OEgetPrivileges.vbs"
|
||||
exit /B
|
||||
|
||||
:NOTES
|
||||
CLS
|
||||
ECHO.
|
||||
ECHO ******************************************************
|
||||
ECHO.
|
||||
ECHO.
|
||||
ECHO Due to UAC in Windows 7 / Windows Vista we need to run
|
||||
ECHO syslinux.exe as 'Administrator'
|
||||
ECHO.
|
||||
ECHO After pressing any key the folder containing syslinux.exe
|
||||
ECHO will pop up automatically.
|
||||
ECHO.
|
||||
ECHO 1. Right click on syslinux.exe
|
||||
ECHO 2. Click on 'Properties'
|
||||
ECHO 3. Change to the 'Compatibility' tab
|
||||
ECHO 4. Check the 'Run this program as an administrator' checkbox
|
||||
ECHO.
|
||||
ECHO.
|
||||
ECHO.
|
||||
ECHO ******************************************************
|
||||
ECHO.
|
||||
ECHO Press any key to open the syslinux directory
|
||||
ECHO.
|
||||
pause >NUL
|
||||
explorer "%CD%\3rdparty\syslinux\win32"
|
||||
ECHO When finished changing the administrator rights,
|
||||
ECHO please press any key to continue with the installation
|
||||
pause >NUL
|
||||
GOTO :INSTALL
|
||||
:gotPrivileges
|
||||
if exist "%temp%\OEgetPrivileges.vbs" ( del "%temp%\OEgetPrivileges.vbs" )
|
||||
pushd "%CD%"
|
||||
CD /D "%~dp0"
|
||||
|
||||
:INSTALL
|
||||
:HashCheck
|
||||
3rdparty\md5sum\md5sum.exe -c "%CD%\target\SYSTEM.md5"
|
||||
IF ERRORLEVEL 1 GOTO BADMD5
|
||||
IF ERRORLEVEL 1 GOTO BadMD5
|
||||
3rdparty\md5sum\md5sum.exe -c "%CD%\target\KERNEL.md5"
|
||||
IF ERRORLEVEL 1 GOTO BADMD5
|
||||
IF ERRORLEVEL 1 GOTO BadMD5
|
||||
|
||||
:InstallOE
|
||||
CLS
|
||||
ECHO.
|
||||
ECHO OpenELEC.tv USB Installer
|
||||
ECHO.
|
||||
ECHO OpenELEC.tv USB Installer
|
||||
ECHO.
|
||||
ECHO.
|
||||
ECHO ******************************************************
|
||||
ECHO.
|
||||
ECHO This will wipe any data off your chosen drive
|
||||
ECHO Please read the instructions and use very carefully...
|
||||
ECHO *****************************************************************
|
||||
ECHO.
|
||||
ECHO ******************************************************
|
||||
ECHO This WILL wipe ALL data off the selected drive
|
||||
ECHO Please use carefully...
|
||||
ECHO.
|
||||
ECHO *****************************************************************
|
||||
ECHO.
|
||||
ECHO.
|
||||
|
||||
:SelectDrive
|
||||
ECHO Enter USB Drive letter
|
||||
ECHO eg. d:
|
||||
ECHO.
|
||||
|
||||
SET /P DRIVE= --
|
||||
if %DRIVE%!==! goto INSTALL
|
||||
format %DRIVE% /V:OPENELEC /Q /FS:FAT32
|
||||
3rdparty\syslinux\win32\syslinux.exe -f -m -a %DRIVE%
|
||||
ECHO Copying necessary files to %DRIVE%
|
||||
copy target\* %DRIVE%
|
||||
copy Autorun.inf %DRIVE%
|
||||
copy CHANGELOG %DRIVE%
|
||||
copy INSTALL %DRIVE%
|
||||
copy README %DRIVE%
|
||||
copy RELEASE %DRIVE%
|
||||
copy openelec.ico %DRIVE%
|
||||
FOR /F "tokens=5" %%G IN ('vol %DRIVE% ^|find "-"') DO SET DRIVEUUID=%%G
|
||||
echo DEFAULT linux > %DRIVE%\syslinux.cfg
|
||||
echo PROMPT 0 >> %DRIVE%\syslinux.cfg
|
||||
echo. >> %DRIVE%\syslinux.cfg
|
||||
echo LABEL linux >> %DRIVE%\syslinux.cfg
|
||||
echo KERNEL /KERNEL >> %DRIVE%\syslinux.cfg
|
||||
echo APPEND boot=LABEL=OPENELEC installer quiet >> %DRIVE%\syslinux.cfg
|
||||
GOTO END
|
||||
IF NOT DEFINED DRIVE goto InvalidDrive
|
||||
if %DRIVE%==c: goto InvalidDrive
|
||||
if %DRIVE%==C: goto InvalidDrive
|
||||
|
||||
:BADMD5
|
||||
CLS
|
||||
ECHO.
|
||||
ECHO.
|
||||
ECHO ***** OpenELEC.tv failed md5 check - Installation will quit *****
|
||||
ECHO OpenELEC.tv USB Installer
|
||||
ECHO.
|
||||
ECHO.
|
||||
ECHO *****************************************************************
|
||||
ECHO.
|
||||
ECHO Installing OpenELEC to %DRIVE%
|
||||
ECHO Please wait approximately 20 seconds...
|
||||
ECHO.
|
||||
ECHO *****************************************************************
|
||||
ECHO.
|
||||
ECHO.
|
||||
ECHO.
|
||||
ECHO Your original download was probably corrupt.
|
||||
ECHO Please visit www.openelec.tv and get another copy
|
||||
ECHO.
|
||||
ECHO.
|
||||
|
||||
ECHO. | >NUL format %DRIVE% /V:OPENELEC /Q /FS:FAT32 /X
|
||||
IF ERRORLEVEL 1 goto InvalidDrive
|
||||
>NUL 3rdparty\syslinux\win32\syslinux.exe -f -m -a %DRIVE%
|
||||
>NUL copy target\* %DRIVE%
|
||||
>NUL copy Autorun.inf %DRIVE%
|
||||
>NUL copy CHANGELOG %DRIVE%
|
||||
>NUL copy INSTALL %DRIVE%
|
||||
>NUL copy README %DRIVE%
|
||||
>NUL copy RELEASE %DRIVE%
|
||||
>NUL copy openelec.ico %DRIVE%
|
||||
FOR /F "tokens=5" %%G IN ('vol %DRIVE% ^|find "-"') DO SET DRIVEUUID=%%G
|
||||
ECHO DEFAULT linux > %DRIVE%\syslinux.cfg
|
||||
ECHO PROMPT 0 >> %DRIVE%\syslinux.cfg
|
||||
ECHO. >> %DRIVE%\syslinux.cfg
|
||||
ECHO LABEL linux >> %DRIVE%\syslinux.cfg
|
||||
ECHO KERNEL /KERNEL >> %DRIVE%\syslinux.cfg
|
||||
ECHO APPEND boot=LABEL=OPENELEC installer quiet >> %DRIVE%\syslinux.cfg
|
||||
GOTO END
|
||||
|
||||
:InvalidDrive
|
||||
CLS
|
||||
ECHO.
|
||||
ECHO.
|
||||
ECHO OpenELEC.tv USB Installer
|
||||
ECHO.
|
||||
ECHO.
|
||||
ECHO *****************************************************************
|
||||
ECHO.
|
||||
ECHO Invalid Drive Selected...
|
||||
ECHO Please confirm the drive letter of your USB stick
|
||||
ECHO.
|
||||
ECHO *****************************************************************
|
||||
ECHO.
|
||||
ECHO.
|
||||
GOTO SelectDrive
|
||||
|
||||
:BadMD5
|
||||
CLS
|
||||
ECHO.
|
||||
ECHO.
|
||||
ECHO OpenELEC.tv USB Installer
|
||||
ECHO.
|
||||
ECHO.
|
||||
ECHO *****************************************************************
|
||||
ECHO.
|
||||
ECHO OpenELEC.tv failed md5 check - Installation will now quit
|
||||
ECHO.
|
||||
ECHO Your original download is probably corrupt
|
||||
ECHO Please visit www.openelec.tv and download another copy
|
||||
ECHO.
|
||||
ECHO *****************************************************************
|
||||
ECHO.
|
||||
ECHO.
|
||||
ECHO.
|
||||
PAUSE
|
||||
EXIT
|
||||
|
||||
:END
|
||||
CLS
|
||||
ECHO.
|
||||
ECHO.
|
||||
ECHO OpenELEC.tv USB Installer
|
||||
ECHO.
|
||||
ECHO.
|
||||
ECHO *****************************************************************
|
||||
ECHO.
|
||||
ECHO The OpenELEC USB Installer has been successfully copied to %DRIVE%
|
||||
ECHO Please boot your HTPC off this USB stick
|
||||
ECHO.
|
||||
ECHO *****************************************************************
|
||||
ECHO.
|
||||
ECHO.
|
||||
ECHO.
|
||||
ECHO.
|
||||
|
||||
SET DRIVE=
|
||||
SET OS=
|
||||
SET DRIVEUUID=
|
||||
SET DRIVEUUID=
|
||||
PAUSE
|
||||
|
||||
35
packages/3rdparty/multimedia/airplayer/meta
vendored
35
packages/3rdparty/multimedia/airplayer/meta
vendored
@@ -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="airplayer"
|
||||
PKG_VERSION="7776e54"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="https://github.com/PascalW/Airplayer"
|
||||
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="Airplayer: script to make media playing software Airplay-compatible."
|
||||
PKG_LONGDESC="Airplayer is a script to make media playing software Airplay-compatible. Airplayer features pluggable backends, making it possible to support different media players."
|
||||
PKG_IS_ADDON="no"
|
||||
PKG_AUTORECONF="no"
|
||||
@@ -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
|
||||
|
||||
export PYTHONXCPREFIX="$SYSROOT_PREFIX/usr"
|
||||
export LDFLAGS="$LDFLAGS -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
|
||||
|
||||
cd $PKG_BUILD
|
||||
|
||||
python setup.py build --cross-compile
|
||||
python setup.py install -O1 --skip-build --prefix /usr --root .install
|
||||
|
||||
find .install -name "*.py" -exec rm -rf "{}" ";"
|
||||
find .install -name "*.pyo" -exec rm -rf "{}" ";"
|
||||
|
||||
rm -rf .install/usr/bin
|
||||
35
packages/3rdparty/multimedia/pybonjour/meta
vendored
35
packages/3rdparty/multimedia/pybonjour/meta
vendored
@@ -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="pybonjour"
|
||||
PKG_VERSION="1.1.1"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://pybonjour.googlecode.com/"
|
||||
PKG_URL="http://pybonjour.googlecode.com/files/${PKG_NAME}-${PKG_VERSION}.tar.gz"
|
||||
PKG_DEPENDS=""
|
||||
PKG_BUILD_DEPENDS="Python"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="service/multimedia"
|
||||
PKG_SHORTDESC="pybonjour: A Zeroconf mDNS/DNS-SD responder"
|
||||
PKG_LONGDESC="Pybonjour is a framework for Multicast DNS Service Discovery (mDNS/DNS-SD a.k.a. Zeroconf) on Linux. It allows programs to publish and discover services running on a local network with no specific configuration. For example, you can plug into a network and instantly find printers to print to, files to look at, and people to talk to."
|
||||
PKG_IS_ADDON="no"
|
||||
PKG_AUTORECONF="no"
|
||||
@@ -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");
|
||||
36
packages/3rdparty/multimedia/simplejson-ap/build
vendored
36
packages/3rdparty/multimedia/simplejson-ap/build
vendored
@@ -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
|
||||
|
||||
export PYTHONXCPREFIX="$SYSROOT_PREFIX/usr"
|
||||
export LDFLAGS="$LDFLAGS -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
|
||||
|
||||
cd $PKG_BUILD
|
||||
|
||||
python setup.py build --cross-compile
|
||||
python setup.py install -O1 --skip-build --prefix /usr --root .install
|
||||
|
||||
find .install -name "*.py" -exec rm -rf "{}" ";"
|
||||
find .install -name "*.pyo" -exec rm -rf "{}" ";"
|
||||
|
||||
rm -rf .install/usr/bin
|
||||
@@ -28,9 +28,6 @@ export LDFLAGS="$LDFLAGS -L$SYSROOT_PREFIX/usr/lib -L$SYSROOT_PREFIX/lib"
|
||||
cd $PKG_BUILD
|
||||
|
||||
python setup.py build --cross-compile
|
||||
python setup.py install -O1 --skip-build --prefix /usr --root .install
|
||||
|
||||
find .install -name "*.py" -exec rm -rf "{}" ";"
|
||||
find .install -name "*.pyo" -exec rm -rf "{}" ";"
|
||||
python setup.py install -O0 --no-compile --prefix /usr --root .install
|
||||
|
||||
rm -rf .install/usr/bin
|
||||
@@ -22,5 +22,4 @@
|
||||
|
||||
. config/options $1
|
||||
|
||||
mkdir -p $INSTALL/sbin
|
||||
cp $PKG_BUILD/mount.cifs $INSTALL/sbin
|
||||
cp -PR $PKG_BUILD/.install/* $INSTALL
|
||||
@@ -1,7 +1,6 @@
|
||||
################################################################################
|
||||
# This file is part of OpenELEC - http://www.openelec.tv
|
||||
# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
|
||||
# Copyright (C) 2010-2011 Roman Weber (roman@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
|
||||
@@ -19,19 +18,19 @@
|
||||
# http://www.gnu.org/copyleft/gpl.html
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="netstatus"
|
||||
PKG_VERSION="1"
|
||||
PKG_NAME="pycurl"
|
||||
PKG_VERSION="7.19.0"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://wiki.meego.com/D-Bus/Overview#D-Bus_GLib"
|
||||
PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
|
||||
PKG_DEPENDS="dbus glib dbus-glib"
|
||||
PKG_BUILD_DEPENDS="toolchain dbus glib dbus-glib"
|
||||
PKG_LICENSE="GPL-2"
|
||||
PKG_SITE="http://pycurl.sourceforge.net/"
|
||||
PKG_URL="http://pycurl.sourceforge.net/download/$PKG_NAME-$PKG_VERSION.tar.gz"
|
||||
PKG_DEPENDS="Python distribute curl"
|
||||
PKG_BUILD_DEPENDS="toolchain Python distribute distutilscross curl"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="network"
|
||||
PKG_SHORTDESC="netstatus: asmall utility to know if we are online or not"
|
||||
PKG_LONGDESC="netstatus is a small utility to know if we are online or not"
|
||||
PKG_SECTION="python/web"
|
||||
PKG_SHORTDESC="pycurl: a Python interface to libcurl"
|
||||
PKG_LONGDESC="PycURL is a Python interface to libcurl. PycURL can be used to fetch objects identified by a URL from a Python program, similar to the urllib Python module. PycURL is mature, very fast, and supports a lot of features."
|
||||
PKG_IS_ADDON="no"
|
||||
|
||||
PKG_AUTORECONF="no"
|
||||
24
packages/3rdparty/web/pycurl/patches/pycurl-7.19.0-fix-do_curl_reset-refcount.patch
vendored
Normal file
24
packages/3rdparty/web/pycurl/patches/pycurl-7.19.0-fix-do_curl_reset-refcount.patch
vendored
Normal file
@@ -0,0 +1,24 @@
|
||||
--- a/src/pycurl.c
|
||||
+++ a/src/pycurl.c
|
||||
@@ -1452,6 +1452,7 @@ do_curl_reset(CurlObject *self)
|
||||
}
|
||||
}
|
||||
|
||||
+ Py_INCREF(Py_None);
|
||||
return Py_None;
|
||||
}
|
||||
|
||||
--- a/tests/test_internals.py
|
||||
+++ a/tests/test_internals.py
|
||||
@@ -245,6 +245,11 @@ if 1 and gc:
|
||||
if opts.verbose >= 1:
|
||||
print "Tracked objects:", len(gc.get_objects())
|
||||
|
||||
+if 1:
|
||||
+ # Ensure that the refcounting error in "reset" is fixed:
|
||||
+ for i in xrange(100000):
|
||||
+ c = Curl()
|
||||
+ c.reset()
|
||||
|
||||
# /***********************************************************************
|
||||
# // done
|
||||
12
packages/3rdparty/web/pycurl/patches/pycurl-7.19.0-no-static-libs.patch
vendored
Normal file
12
packages/3rdparty/web/pycurl/patches/pycurl-7.19.0-no-static-libs.patch
vendored
Normal file
@@ -0,0 +1,12 @@
|
||||
--- pycurl/setup.py~ 2008-04-22 17:00:45.000000000 +0300
|
||||
+++ pycurl/setup.py 2008-07-03 21:53:36.000000000 +0300
|
||||
@@ -97,8 +97,7 @@
|
||||
else:
|
||||
extra_compile_args.append(e)
|
||||
libs = split_quoted(
|
||||
- os.popen("'%s' --libs" % CURL_CONFIG).read()+\
|
||||
- os.popen("'%s' --static-libs" % CURL_CONFIG).read())
|
||||
+ os.popen("'%s' --libs" % CURL_CONFIG).read())
|
||||
for e in libs:
|
||||
if e[:2] == "-l":
|
||||
libraries.append(e[2:])
|
||||
14
packages/3rdparty/web/pycurl/patches/pycurl-7.19.0-setuptools-0.1.patch
vendored
Normal file
14
packages/3rdparty/web/pycurl/patches/pycurl-7.19.0-setuptools-0.1.patch
vendored
Normal file
@@ -0,0 +1,14 @@
|
||||
diff -Naur pycurl-7.19.0/setup.py pycurl-7.19.0.patch/setup.py
|
||||
--- pycurl-7.19.0/setup.py 2008-09-09 19:40:34.000000000 +0200
|
||||
+++ pycurl-7.19.0.patch/setup.py 2011-09-29 02:07:22.584412664 +0200
|
||||
@@ -11,8 +11,8 @@
|
||||
|
||||
import glob, os, re, sys, string
|
||||
import distutils
|
||||
-from distutils.core import setup
|
||||
-from distutils.extension import Extension
|
||||
+from setuptools import setup
|
||||
+from setuptools import Extension
|
||||
from distutils.util import split_quoted
|
||||
from distutils.version import LooseVersion
|
||||
|
||||
@@ -1,3 +1,6 @@
|
||||
0.99.3
|
||||
- update to makemkv-1.6.15
|
||||
|
||||
0.99.2
|
||||
- change icon
|
||||
|
||||
|
||||
@@ -19,8 +19,8 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="makemkv"
|
||||
PKG_VERSION="1.6.10"
|
||||
PKG_REV="2"
|
||||
PKG_VERSION="1.6.15"
|
||||
PKG_REV="3"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="OSS"
|
||||
PKG_SITE="http://www.makemkv.com/forum2/viewforum.php?f=3"
|
||||
|
||||
@@ -22,15 +22,11 @@
|
||||
|
||||
. config/options $1
|
||||
|
||||
cd $PKG_BUILD
|
||||
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
|
||||
cp $BUILD/unrar/unrar $ADDON_BUILD/$PKG_ADDON_ID/bin
|
||||
|
||||
# fix me :(
|
||||
LIBAO_DIR=../libao-1.1.0
|
||||
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/pylib
|
||||
cp -R $BUILD/pycurl*/.install/usr/lib/python*/site-packages/* $ADDON_BUILD/$PKG_ADDON_ID/pylib
|
||||
|
||||
# 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
|
||||
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/pyload
|
||||
cp -PR $PKG_BUILD/* $ADDON_BUILD/$PKG_ADDON_ID/pyload
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user