Merge remote-tracking branch 'upstream/master' into openelec-3.2

This commit is contained in:
Stefan Saraev 2013-08-15 21:59:02 +03:00
commit 7ed4ac14d8
108 changed files with 302 additions and 5479 deletions

View File

@ -52,12 +52,14 @@ get_graphicdrivers() {
DRI_DRIVERS="$DRI_DRIVERS,i915"
# GALLIUM_DRIVERS="$GALLIUM_DRIVERS,i915"
XORG_DRIVERS="$XORG_DRIVERS intel"
COMPOSITE_SUPPORT="yes"
# LLVM_SUPPORT="yes"
fi
if [ "$drv" = "i965" ]; then
DRI_DRIVERS="$DRI_DRIVERS,i965"
XORG_DRIVERS="$XORG_DRIVERS intel"
COMPOSITE_SUPPORT="yes"
fi
if [ "$drv" = "nouveau" ]; then

View File

@ -1,3 +1,6 @@
3.1.5
get tuner id with command 'hdhomerun_config discover' and
set number of tuners manually
3.1.4
get tuner id from /var/log/messages
3.1.3

View File

@ -20,13 +20,13 @@
PKG_NAME="hdhomerun"
PKG_VERSION="3.2"
PKG_REV="4"
PKG_REV="5"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.silicondust.com/products/hdhomerun/dvbt/"
PKG_URL=""
PKG_DEPENDS=""
PKG_BUILD_DEPENDS="toolchain"
PKG_BUILD_DEPENDS=""
PKG_PRIORITY="optional"
PKG_SECTION="driver/dvb"
PKG_SHORTDESC="A linux DVB driver for the HDHomeRun (http://www.silicondust.com)."

View File

@ -63,39 +63,46 @@ if [ -z "$(pidof userhdhomerun)" ]; then
cp $HDHR_ADDON_HOME/dvbhdhomerun.conf $DVBHDHOMERUN_CONF_TMP
# get tuner serial numbers
SERIALS=$(cat /var/config/hdhomerun-addon.conf | sed -n 's|^ATTACHED_TUNER_\(.*\)_\(.*\)_DVBMODE=.*|\1-\2|gp' | sort | uniq)
SERIALS=$(cat /var/config/hdhomerun-addon.conf | sed -n 's|^ATTACHED_TUNER_\(.*\)_DVBMODE=.*|\1|gp' | sort | uniq)
. /var/config/hdhomerun-addon.conf
for SERIAL in $SERIALS; do
SERIAL_VAR=$(echo $SERIAL | sed 's|-|_|')
DVBMODE=$(eval echo \$ATTACHED_TUNER_${SERIAL_VAR}_DVBMODE)
FULLNAME=$(eval echo \$ATTACHED_TUNER_${SERIAL_VAR}_FULLNAME)
DISABLE=$(eval echo \$ATTACHED_TUNER_${SERIAL_VAR}_DISABLE)
for SERIAL_UNIQ in $SERIALS; do
DVBMODE=$(eval echo \$ATTACHED_TUNER_${SERIAL_UNIQ}_DVBMODE)
FULLNAME=$(eval echo \$ATTACHED_TUNER_${SERIAL_UNIQ}_FULLNAME)
DISABLE=$(eval echo \$ATTACHED_TUNER_${SERIAL_UNIQ}_DISABLE)
NUMBERS=$(eval echo \$ATTACHED_TUNER_${SERIAL_UNIQ}_NUMBERS)
[ "$DVBMODE" = "auto" ] && DVBMODE=""
NUMBERS=$(( $NUMBERS -1 ))
NUMBERS=$(( $NUMBERS *1 ))
# remove setttings for this tuner
awk -v val="[$SERIAL]" '$0 == val {flag=1; next} /^tuner_type=|^use_full_name=|^disable=|^#|^$/{if (flag==1) next} /.*/{flag=0; print}' $DVBHDHOMERUN_CONF_TMP >${DVBHDHOMERUN_CONF_TMP}-types
mv ${DVBHDHOMERUN_CONF_TMP}-types $DVBHDHOMERUN_CONF_TMP
echo "" >>$DVBHDHOMERUN_CONF_TMP
# remove empty lines at the end of file
sed -i -e ':a' -e '/^\n*$/{$d;N;};/\n$/ba' $DVBHDHOMERUN_CONF_TMP
for i in $(seq 0 $NUMBERS); do
SERIAL="$SERIAL_UNIQ-$i"
ADDNEW=true
if [ -n "$DVBMODE" ]; then
[ $ADDNEW = true ] && ADDNEW=false && echo "[$SERIAL]" >>$DVBHDHOMERUN_CONF_TMP
echo "tuner_type=$DVBMODE" >>$DVBHDHOMERUN_CONF_TMP
fi
if [ "$FULLNAME" = "true" ]; then
[ $ADDNEW = true ] && ADDNEW=false && echo "[$SERIAL]" >>$DVBHDHOMERUN_CONF_TMP
echo "use_full_name=true" >>$DVBHDHOMERUN_CONF_TMP
fi
if [ "$DISABLE" = "true" ]; then
[ $ADDNEW = true ] && ADDNEW=false && echo "[$SERIAL]" >>$DVBHDHOMERUN_CONF_TMP
echo "disable=true" >>$DVBHDHOMERUN_CONF_TMP
fi
[ "$DVBMODE" = "auto" ] && DVBMODE=""
echo "" >>$DVBHDHOMERUN_CONF_TMP
# remove setttings for this tuner
awk -v val="[$SERIAL]" '$0 == val {flag=1; next} /^tuner_type=|^use_full_name=|^disable=|^#|^$/{if (flag==1) next} /.*/{flag=0; print}' $DVBHDHOMERUN_CONF_TMP >${DVBHDHOMERUN_CONF_TMP}-types
mv ${DVBHDHOMERUN_CONF_TMP}-types $DVBHDHOMERUN_CONF_TMP
echo "" >>$DVBHDHOMERUN_CONF_TMP
# remove empty lines at the end of file
sed -i -e ':a' -e '/^\n*$/{$d;N;};/\n$/ba' $DVBHDHOMERUN_CONF_TMP
ADDNEW=true
if [ -n "$DVBMODE" ]; then
[ $ADDNEW = true ] && ADDNEW=false && echo "[$SERIAL]" >>$DVBHDHOMERUN_CONF_TMP
echo "tuner_type=$DVBMODE" >>$DVBHDHOMERUN_CONF_TMP
fi
if [ "$FULLNAME" = "true" ]; then
[ $ADDNEW = true ] && ADDNEW=false && echo "[$SERIAL]" >>$DVBHDHOMERUN_CONF_TMP
echo "use_full_name=true" >>$DVBHDHOMERUN_CONF_TMP
fi
if [ "$DISABLE" = "true" ]; then
[ $ADDNEW = true ] && ADDNEW=false && echo "[$SERIAL]" >>$DVBHDHOMERUN_CONF_TMP
echo "disable=true" >>$DVBHDHOMERUN_CONF_TMP
fi
echo "" >>$DVBHDHOMERUN_CONF_TMP
done
done
# remove logging from libhdhomerun library

View File

@ -27,10 +27,8 @@ __cwd__ = __settings__.getAddonInfo('path')
__resources_lib__ = xbmc.translatePath(os.path.join(__cwd__, 'resources', 'lib'))
__settings_xml__ = xbmc.translatePath(os.path.join(__cwd__, 'resources', 'settings.xml'))
__hdhomerun_log__ = '/var/log/dvbhdhomerun.log'
if __name__ == "__main__" and len(sys.argv) == 2 and sys.argv[1] == 'refresh_tuners':
sys.path.append(__resources_lib__)
from functions import refresh_hdhomerun_tuners
refresh_hdhomerun_tuners(__settings_xml__, __hdhomerun_log__)
refresh_hdhomerun_tuners(__settings_xml__)
__settings__.openSettings()

View File

@ -11,5 +11,6 @@
<string id="9005">Enable modifying settings</string>
<string id="9010">Refresh tuners... (press me)</string>
<string id="9020"> use full name</string>
<string id="9025"> number of tuners</string>
<string id="9030"> disabled</string>
</strings>

View File

@ -46,25 +46,28 @@ def settings_restore(settings_xml):
######################################################################################################
# get hdhomerun supported devices on a system (only name like 101ADD2B-0)
def get_devices_hdhomerun(hdhomerun_log):
def get_devices_hdhomerun():
tuners = []
try:
for line in open('/var/log/messages', 'r'):
if line.find('HDHomeRun'):
line = line.strip()
#Jul 17 19:22:46 user user.info kernel: [ 10.587811] HDHomeRun HDHomeRun.0: DVB: registering adapter 0 frontend 0 (HDHomeRun DVB-C 12345678-0)...
match = re.search(r'.*\[.+\] HDHomeRun .+ registering adapter .+ \(HDHomeRun .+ (.+)\).+', line)
p = os.popen("hdhomerun_config discover", "r")
while 1:
line = p.readline()
if not line:
break
else:
str = line.strip()
match = re.search(r'hdhomerun device (.+) found at .+', line)
if match:
name = match.group(1)
tuners.append(name)
print name
tuners.append(name)
except IOError:
print 'Error reading hdhomerun log file /var/log/messages'
print 'Error getting hdhomerun tuners info'
return tuners
"""
root ~ # grep HDHomeRun /var/log/messages
Jul 17 19:22:46 user user.info kernel: [ 10.587811] HDHomeRun HDHomeRun.0: DVB: registering adapter 0 frontend 0 (HDHomeRun DVB-C 12345678-0)...
Jul 17 19:22:46 user user.info kernel: [ 10.588602] HDHomeRun HDHomeRun.1: DVB: registering adapter 1 frontend 0 (HDHomeRun DVB-C 12345678-1)...
openelec:~ # hdhomerun_config discover
hdhomerun device 12345678 found at 192.168.0.3
"""
######################################################################################################
@ -154,11 +157,13 @@ def remove_old_tuners(xmldoc):
# add new hdhomerun tuners
def add_hdhomerun(xmldoc, node_cat, tuners):
for ix, tuner in enumerate(tuners):
tuner_var = tuner.replace('-', '_')
#tuner_var = tuner.replace('-', '_')
tuner_var = tuner
print tuner
node1 = xmldoc.createElement("setting")
node1.setAttribute("id", 'ATTACHED_TUNER_' + tuner_var + '_DVBMODE')
node1.setAttribute("label", tuner)
node1.setAttribute("label", "tuner serial " + tuner_var)
node1.setAttribute("type", 'labelenum')
node1.setAttribute("default", 'auto')
node1.setAttribute("values", 'auto|ATSC|DVB-C|DVB-T')
@ -172,12 +177,20 @@ def add_hdhomerun(xmldoc, node_cat, tuners):
node_cat.appendChild(node2)
node3 = xmldoc.createElement("setting")
node3.setAttribute("id", 'ATTACHED_TUNER_' + tuner_var + '_DISABLE')
node3.setAttribute("label", '9030')
node3.setAttribute("type", 'bool')
node3.setAttribute("default", 'false')
node3.setAttribute("id", 'ATTACHED_TUNER_' + tuner_var + '_NUMBERS')
node3.setAttribute("label", '9025')
node3.setAttribute("type", 'labelenum')
node3.setAttribute("default", '2')
node3.setAttribute("values", '1|2|3|4|5|6|7|8')
node_cat.appendChild(node3)
node4 = xmldoc.createElement("setting")
node4.setAttribute("id", 'ATTACHED_TUNER_' + tuner_var + '_DISABLE')
node4.setAttribute("label", '9030')
node4.setAttribute("type", 'bool')
node4.setAttribute("default", 'false')
node_cat.appendChild(node4)
# for tuner
######################################################################################################
@ -249,9 +262,9 @@ def save_settings(settings_xml, xmldoc):
######################################################################################################
# refresh hdhomerun tuners in settings.xml file
def refresh_hdhomerun_tuners(settings_xml, hdhomerun_log):
def refresh_hdhomerun_tuners(settings_xml):
settings_backup(settings_xml)
tuners = get_devices_hdhomerun(hdhomerun_log)
tuners = get_devices_hdhomerun()
xmldoc = parse_settings(settings_xml)
if xmldoc == None:
print 'No hdhomerun tuners found'

View File

@ -57,6 +57,8 @@ if [ -d $HOME/.xbmc/userdata/addon_data/service.multimedia.hts-tvheadend ] ; the
fi
##
mkdir -p $ADDON_HOME
if [ ! -f "$ADDON_SETTINGS" ]; then
if [ -f $ADDON_DIR/settings-default.xml ]; then
cp $ADDON_DIR/settings-default.xml $ADDON_SETTINGS
@ -112,7 +114,6 @@ mkdir -p /var/config
. /var/config/tvheadend.conf
mkdir -p $ADDON_HOME
if [ ! "$(pidof $ADDON_BIN)" ]; then
# start userspace DVB driver/addon
for driver_dvb in $(find /storage/.xbmc/addons/driver.dvb.*/bin/userspace-driver.sh -type f 2>/dev/null); do

View File

@ -35,10 +35,6 @@ PKG_LONGDESC="ALSA (Advanced Linux Sound Architecture) is the next generation Li
PKG_IS_ADDON="no"
PKG_AUTORECONF="yes"
if [ "$PULSEAUDIO_SUPPORT" = yes ]; then
PKG_DEPENDS="$PKG_DEPENDS alsa-plugins"
fi
# package specific configure options
PKG_CONFIGURE_OPTS_TARGET="--with-plugindir=/usr/lib/alsa \
--disable-python \

View File

@ -1,11 +0,0 @@
# samplerate plugin configuration
# $Id: samplerate.conf,v 1.2 2008/03/09 15:50:49 lkundrak Exp $
pcm.my_rate {
type rate
slave.pcm "hw"
converter "samplerate"
hint {
description "External rate converter"
}
}

View File

@ -1,11 +0,0 @@
# samplerate plugin configuration
# $Id$
pcm.my_rate {
type rate
slave.pcm "hw"
converter "speexrate"
hint {
description "Rate Converter Plugin Using Speex Resampler"
}
}

View File

@ -1,10 +0,0 @@
# upmix plugin configuration
# $Id: upmix.conf,v 1.2 2008/03/09 15:50:49 lkundrak Exp $
pcm.upmix51 {
type upmix
slave.pcm "surround51"
hint {
description "Upmixer channel expander"
}
}

View File

@ -1,18 +0,0 @@
# vdownmix plugin configuration
# $Id$
pcm.!surround51 {
type vdownmix
slave.pcm "default"
hint {
description "Downmixer to stereo from surround51"
}
}
pcm.!surround40 {
type vdownmix
slave.pcm "default"
hint {
description "Downmixer to stereo from surround40"
}
}

View File

@ -1,56 +0,0 @@
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2012 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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
# http://www.gnu.org/copyleft/gpl.html
################################################################################
PKG_NAME="alsa-plugins"
PKG_VERSION="1.0.27"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.alsa-project.org/"
PKG_URL="ftp://ftp.alsa-project.org/pub/plugins/$PKG_NAME-$PKG_VERSION.tar.bz2"
PKG_DEPENDS="speex"
PKG_BUILD_DEPENDS_TARGET="toolchain speex libsamplerate"
PKG_PRIORITY="optional"
PKG_SECTION="audio"
PKG_SHORTDESC="alsa-plugins: Advanced Linux Sound Architecture Plugins"
PKG_LONGDESC="ALSA (Advanced Linux Sound Architecture) is the next generation Linux Sound API. It provides much finer (->better) access to the sound hardware, has a unbeatable mixer API and supports stuff like multi channel hardware, digital outs and ins, uninterleaved sound data access, and an oss emulation layer (for the old applications). It is the prefered API for professional sound apps under Linux."
PKG_IS_ADDON="no"
PKG_AUTORECONF="yes"
# package specific configure options
PKG_CONFIGURE_OPTS_TARGET="--with-plugindir=/usr/lib/alsa \
--disable-jack \
--enable-samplerate \
--disable-avcodec \
--with-speex=lib"
if [ "$PULSEAUDIO_SUPPORT" = yes ]; then
PKG_DEPENDS="$PKG_DEPENDS pulseaudio"
PKG_BUILD_DEPENDS_TARGET="$PKG_BUILD_DEPENDS_TARGET pulseaudio"
PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --enable-pulseaudio"
else
PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --disable-pulseaudio"
fi
post_makeinstall_target() {
mkdir -p $INSTALL/usr/share/alsa/pcm
cp -R $PKG_DIR/config/*.conf $INSTALL/usr/share/alsa/pcm
}

View File

@ -1,50 +0,0 @@
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2012 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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
# http://www.gnu.org/copyleft/gpl.html
################################################################################
PKG_NAME="libsndfile"
PKG_VERSION="1.0.25"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="LGPL"
PKG_SITE="http://www.mega-nerd.com/libsndfile/"
PKG_URL="http://www.mega-nerd.com/$PKG_NAME/files/$PKG_NAME-$PKG_VERSION.tar.gz"
PKG_DEPENDS="alsa-lib flac libvorbis libogg"
PKG_BUILD_DEPENDS_TARGET="toolchain alsa-lib flac libvorbis libogg"
PKG_PRIORITY="optional"
PKG_SECTION="audio"
PKG_SHORTDESC="libsndfile: A library for accessing various audio file formats"
PKG_LONGDESC="libsndfile is a C library for reading and writing sound files such as AIFF, AU, WAV, and others through one standard interface. It can currently read/write 8, 16, 24 and 32-bit PCM files as well as 32 and 64-bit floating point WAV files and a number of compressed formats. It compiles and runs on *nix, MacOS, and Win32."
PKG_IS_ADDON="no"
PKG_AUTORECONF="yes"
# package specific configure options
PKG_CONFIGURE_OPTS_TARGET="--disable-silent-rules \
--disable-sqlite \
--enable-alsa \
--enable-external-libs \
--disable-experimental \
--disable-test-coverage \
--enable-largefile \
--with-gnu-ld"
post_makeinstall_target() {
rm -rf $INSTALL/usr/bin
}

View File

@ -1,25 +0,0 @@
diff -Naur libsndfile-1.0.25-old/configure.ac libsndfile-1.0.25-new/configure.ac
--- libsndfile-1.0.25-old/configure.ac 2011-07-13 01:59:57.000000000 -0700
+++ libsndfile-1.0.25-new/configure.ac 2011-07-13 17:04:14.000000000 -0700
@@ -18,9 +18,6 @@
AM_INIT_AUTOMAKE($PACKAGE_NAME,$PACKAGE_VERSION)
AM_SILENT_RULES([yes])
-dnl Add parameters for aclocal
-AC_SUBST(ACLOCAL_AMFLAGS, "-I M4")
-
AC_LANG([C])
AC_PROG_CC
diff -Naur libsndfile-1.0.25-old/Makefile.am libsndfile-1.0.25-new/Makefile.am
--- libsndfile-1.0.25-old/Makefile.am 2011-07-07 02:47:24.000000000 -0700
+++ libsndfile-1.0.25-new/Makefile.am 2011-07-13 17:04:14.000000000 -0700
@@ -2,6 +2,8 @@
DISTCHECK_CONFIGURE_FLAGS = --enable-gcc-werror
+ACLOCAL_AMFLAGS = -I M4
+
if BUILD_OCTAVE_MOD
octave_dir = Octave
endif

View File

@ -1,13 +0,0 @@
#
# Place your global alsa-lib configuration here...
#
@hooks [
{
func load
files [
"/etc/alsa/pulse-default.conf"
]
errors false
}
]

View File

@ -1,154 +0,0 @@
#!/usr/bin/pulseaudio -nF
#
# This file is part of PulseAudio.
#
# PulseAudio is free software; you can redistribute it and/or modify it
# under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# PulseAudio 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 Lesser General Public License
# along with PulseAudio; if not, write to the Free Software Foundation,
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
# This startup script is used only if PulseAudio is started per-user
# (i.e. not in system mode)
.nofail
### Load something into the sample cache
#load-sample-lazy x11-bell /usr/share/sounds/gtk-events/activate.wav
#load-sample-lazy pulse-hotplug /usr/share/sounds/startup3.wav
#load-sample-lazy pulse-coldplug /usr/share/sounds/startup3.wav
#load-sample-lazy pulse-access /usr/share/sounds/generic.wav
.fail
### Automatically restore the volume of streams and devices
load-module module-device-restore
load-module module-stream-restore
load-module module-card-restore
### Automatically augment property information from .desktop files
### stored in /usr/share/application
load-module module-augment-properties
### Load audio drivers statically
### (it's probably better to not load these drivers manually, but instead
### use module-udev-detect -- see below -- for doing this automatically)
#load-module module-alsa-sink device=hw:1,7
#load-module module-alsa-sink
#load-module module-alsa-source device=hw:1,0
#load-module module-alsa-source device=hw:1,7
#load-module module-null-sink
#load-module module-pipe-sink
### Automatically load driver modules depending on the hardware available
.ifexists module-udev-detect.so
load-module module-udev-detect
.else
### Use the static hardware detection module (for systems that lack udev/hal support)
load-module module-detect
.endif
### Automatically connect sink and source if JACK server is present
.ifexists module-jackdbus-detect.so
load-module module-jackdbus-detect
.endif
### Load several protocols
.ifexists module-esound-protocol-unix.so
load-module module-esound-protocol-unix
.endif
load-module module-native-protocol-unix
### Network access (may be configured with paprefs, so leave this commented
### here if you plan to use paprefs)
#load-module module-esound-protocol-tcp
#load-module module-native-protocol-tcp
#load-module module-zeroconf-publish
### Load the RTP receiver module (also configured via paprefs, see above)
#load-module module-rtp-recv
### Load the RTP sender module (also configured via paprefs, see above)
#load-module module-null-sink sink_name=rtp format=s16be channels=2 rate=44100 sink_properties="device.description='RTP Multicast Sink'"
#load-module module-rtp-send source=rtp.monitor
### Load additional modules from GConf settings. This can be configured with the paprefs tool.
### Please keep in mind that the modules configured by paprefs might conflict with manually
### loaded modules.
.ifexists module-gconf.so
.nofail
load-module module-gconf
.fail
.endif
### Automatically restore the default sink/source when changed by the user
### during runtime
### NOTE: This should be loaded as early as possible so that subsequent modules
### that look up the default sink/source get the right value
load-module module-default-device-restore
### Automatically move streams to the default sink if the sink they are
### connected to dies, similar for sources
load-module module-rescue-streams
### Make sure we always have a sink around, even if it is a null sink.
load-module module-always-sink
### Honour intended role device property
load-module module-intended-roles
### Automatically suspend sinks/sources that become idle for too long
load-module module-suspend-on-idle
### If autoexit on idle is enabled we want to make sure we only quit
### when no local session needs us anymore.
.ifexists module-console-kit.so
load-module module-console-kit
.endif
### Enable positioned event sounds
load-module module-position-event-sounds
### Cork music streams when a phone stream is active
load-module module-cork-music-on-phone
### Modules to allow autoloading of filters (such as echo cancellation)
### on demand. module-filter-heuristics tries to determine what filters
### make sense, and module-filter-apply does the heavy-lifting of
### loading modules and rerouting streams.
load-module module-filter-heuristics
load-module module-filter-apply
### Load DBus protocol
.ifexists module-dbus-protocol.so
load-module module-dbus-protocol
.endif
# X11 modules should not be started from default.pa so that one daemon
# can be shared by multiple sessions.
### Load X11 bell module
#load-module module-x11-bell sample=bell-windowing-system
### Register ourselves in the X11 session manager
load-module module-x11-xsmp
### Publish connection data in the X11 root window
.ifexists module-x11-publish.so
.nofail
load-module module-x11-publish
.fail
.endif
### Make some devices default
#set-default-sink output
#set-default-source input

View File

@ -1,35 +0,0 @@
# PulseAudio plugin configuration
# $Id$
# Let's create a virtual device "pulse" for mixer and PCM
pcm.pulse {
type pulse
hint {
description "PulseAudio Sound Server"
}
}
ctl.pulse {
type pulse
hint {
description "PulseAudio Sound Server"
}
}
# Let's make it the default!
pcm.!default {
type pulse
hint {
description "Default"
}
}
ctl.!default {
type pulse
hint {
description "Default"
}
}

View File

@ -1,62 +0,0 @@
#!/usr/bin/pulseaudio -nF
#
# This file is part of PulseAudio.
#
# PulseAudio is free software; you can redistribute it and/or modify it
# under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# PulseAudio 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 Lesser General Public License
# along with PulseAudio; if not, write to the Free Software Foundation,
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
# This startup script is used only if PulseAudio is started in system
# mode.
### Automatically load driver modules depending on the hardware available
.ifexists module-udev-detect.so
load-module module-udev-detect
.else
### Use the static hardware detection module (for systems that lack udev/hal support)
load-module module-detect
.endif
### Load several protocols
.ifexists module-esound-protocol-unix.so
load-module module-esound-protocol-unix
.endif
load-module module-native-protocol-unix
### Automatically restore the volume of streams and devices
load-module module-stream-restore
load-module module-device-restore
### Automatically restore the default sink/source when changed by the user
### during runtime
### NOTE: This should be loaded as early as possible so that subsequent modules
### that look up the default sink/source get the right value
load-module module-default-device-restore
.ifexists module-dbus-protocol.so
### If you want to allow TCP connections, set access to "remote" or "local,remote".
load-module module-dbus-protocol access=local
.endif
### Automatically move streams to the default sink if the sink they are
### connected to dies, similar for sources
load-module module-rescue-streams
### Make sure we always have a sink around, even if it is a null sink.
load-module module-always-sink
### Automatically suspend sinks/sources that become idle for too long
load-module module-suspend-on-idle
### Enable positioned event sounds
load-module module-position-event-sounds

View File

@ -1,30 +0,0 @@
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2012 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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
# http://www.gnu.org/copyleft/gpl.html
################################################################################
# start PulseAudio daemon
#
# runlevels: openelec, textmode
progress "starting PulseAudio daemon"
pulseaudio --system --daemonize \
--log-target=file:/var/log/pulseaudio.log \
--log-level=debug >/dev/null 2>&1
export SDL_AUDIODRIVER=pulse

View File

@ -1,109 +0,0 @@
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2012 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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
# http://www.gnu.org/copyleft/gpl.html
################################################################################
PKG_NAME="pulseaudio"
PKG_VERSION="2.1"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://pulseaudio.org/"
PKG_URL="http://freedesktop.org/software/pulseaudio/releases/$PKG_NAME-$PKG_VERSION.tar.xz"
PKG_DEPENDS="libtool json-c alsa-lib libsndfile libsamplerate speex dbus systemd openssl"
PKG_BUILD_DEPENDS_TARGET="toolchain libtool json-c alsa-lib libsndfile libsamplerate speex dbus systemd openssl libcap"
PKG_PRIORITY="optional"
PKG_SECTION="audio"
PKG_SHORTDESC="pulseaudio: Yet another sound server for Unix"
PKG_LONGDESC="PulseAudio is a sound server for Linux and other Unix-like operating systems. It is intended to be an improved drop-in replacement for the Enlightened Sound Daemon (esound or esd). In addition to the features esound provides, PulseAudio has an extensible plugin architecture, support for more than one sink per source, better low-latency behavior, the ability to be embedded into other software, a completely asynchronous C API, a simple command line interface for reconfiguring the daemon while running, flexible and implicit sample type conversion and resampling, and a "Zero-Copy" architecture."
PKG_IS_ADDON="no"
PKG_AUTORECONF="yes"
# package specific configure options
PKG_CONFIGURE_OPTS_TARGET="--disable-silent-rules \
--disable-nls \
--enable-largefile \
--disable-rpath \
--disable-x11 \
--enable-samplerate \
--disable-oss-output \
--disable-oss-wrapper \
--disable-coreaudio-output \
--enable-alsa \
--disable-esound \
--disable-solaris \
--disable-waveout \
--disable-glib2 \
--disable-gtk2 \
--disable-gconf \
--disable-jack \
--disable-asyncns \
--disable-tcpwrap \
--disable-lirc \
--enable-dbus \
--disable-hal \
--disable-bluez \
--enable-udev \
--disable-hal-compat \
--enable-ipv6 \
--enable-openssl \
--disable-orc \
--disable-manpages \
--disable-per-user-esound-socket \
--disable-legacy-runtime-dir \
--disable-legacy-database-entry-format \
--with-system-user=root \
--with-system-group=root \
--with-access-group=root \
--with-module-dir=/usr/lib/pulse"
if [ "$AVAHI_DAEMON" = yes ]; then
PKG_DEPENDS="$PKG_DEPENDS avahi"
PKG_BUILD_DEPENDS_TARGET="$PKG_BUILD_DEPENDS_TARGET avahi"
PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --enable-avahi"
else
PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --disable-avahi"
fi
pre_configure_target() {
# pulseaudio fails to build with LTO support
strip_lto
}
pre_make_target() {
MAKEFLAGS=-j1
}
post_makeinstall_target() {
# add_user pulse x 499 498 "PulseAudio System Daemon" "/var/run/pulse" "/bin/sh"
# add_group pulse 498
# add_group pulse-access 497
sed -e 's%user="pulse"%user="root"%g' -i $INSTALL/etc/dbus-1/system.d/pulseaudio-system.conf
mkdir -p $INSTALL/etc
cp $PKG_DIR/config/asound.conf $INSTALL/etc
mkdir -p $INSTALL/etc/alsa
cp $PKG_DIR/config/pulse-default.conf $INSTALL/etc/alsa
rm -rf $INSTALL/usr/bin/esdcompat
rm -rf $INSTALL/usr/lib/cmake
rm -rf $INSTALL/usr/share/vala
}

View File

@ -1,47 +0,0 @@
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2012 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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
# http://www.gnu.org/copyleft/gpl.html
################################################################################
PKG_NAME="speex"
PKG_VERSION="1.2rc1"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="BSD"
PKG_SITE="http://www.speex.org"
PKG_URL="http://downloads.xiph.org/releases/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.gz"
PKG_DEPENDS="libogg"
PKG_BUILD_DEPENDS_TARGET="toolchain libogg"
PKG_PRIORITY="optional"
PKG_SECTION="audio"
PKG_SHORTDESC="speex: A free Audio Codec optimized for speech"
PKG_LONGDESC="Speex is a patent-free compression format designed especially for speech. It is specialized for voice communications at low bit-rates in the 2-45 kbps range. Possible applications include Voice over IP (VoIP), Internet audio streaming, audio books, and archiving of speech data (e.g. voice mail)."
PKG_IS_ADDON="no"
PKG_AUTORECONF="yes"
# package specific configure options
PKG_CONFIGURE_OPTS_TARGET="--with-ogg=$SYSROOT_PREFIX/usr \
--enable-fixed-point \
--disable-oggtest \
--disable-float-api \
--disable-vbr"
post_makeinstall_target() {
rm -rf $INSTALL/usr/bin
}

View File

@ -1,24 +0,0 @@
diff -Naur speex-1.2rc1/libspeex/Makefile.am speex-1.2rc1.patch/libspeex/Makefile.am
--- speex-1.2rc1/libspeex/Makefile.am 2008-06-04 09:31:35.000000000 +0200
+++ speex-1.2rc1.patch/libspeex/Makefile.am 2009-03-10 20:40:51.000000000 +0100
@@ -4,7 +4,7 @@
EXTRA_DIST=echo_diagnostic.m
-INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) @OGG_CFLAGS@ @FFT_CFLAGS@
+INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir)
lib_LTLIBRARIES = libspeex.la libspeexdsp.la
diff -Naur speex-1.2rc1/libspeex/Makefile.in speex-1.2rc1.patch/libspeex/Makefile.in
--- speex-1.2rc1/libspeex/Makefile.in 2008-07-21 04:17:19.000000000 +0200
+++ speex-1.2rc1.patch/libspeex/Makefile.in 2009-03-10 20:41:25.000000000 +0100
@@ -277,7 +277,7 @@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
EXTRA_DIST = echo_diagnostic.m
-INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) @OGG_CFLAGS@ @FFT_CFLAGS@
+INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir)
lib_LTLIBRARIES = libspeex.la libspeexdsp.la
# Sources for compilation in the library

View File

@ -1,12 +0,0 @@
diff -Naur speex-1.2rc1/Makefile.in speex-1.2rc1a/Makefile.in
--- speex-1.2rc1/Makefile.in 2008-07-21 04:17:19.000000000 +0200
+++ speex-1.2rc1a/Makefile.in 2010-05-18 14:31:25.229200674 +0200
@@ -213,7 +213,7 @@
EXTRA_DIST = Speex.spec Speex.spec.in Speex.kdevelop speex.m4 speex.pc.in README.blackfin README.symbian README.TI-DSP
#Fools KDevelop into including all files
-SUBDIRS = libspeex include @src@ doc win32 symbian ti
+SUBDIRS = libspeex include doc win32 symbian ti
DIST_SUBDIRS = libspeex include src doc win32 symbian ti
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive

View File

@ -1,12 +0,0 @@
diff -Naur speex-1.2rc1/configure.ac speex-1.2rc1.patch/configure.ac
--- speex-1.2rc1/configure.ac 2008-07-21 04:17:08.000000000 +0200
+++ speex-1.2rc1.patch/configure.ac 2013-02-01 16:50:06.747570221 +0100
@@ -2,7 +2,7 @@
AC_INIT(libspeex/speex.c)
-AM_CONFIG_HEADER([config.h])
+AC_CONFIG_HEADERS([config.h])
SPEEX_MAJOR_VERSION=1
SPEEX_MINOR_VERSION=1

View File

@ -25,6 +25,10 @@
# boost fails building with LTO support
strip_lto
CFLAGS="$CFLAGS -fPIC"
CXXFLAGS="$CXXFLAGS -fPIC"
LDFLAGS="$LDFLAGS -fPIC"
cd $PKG_BUILD
sh bootstrap.sh \
--prefix=/usr \
@ -40,5 +44,7 @@ $ROOT/$TOOLCHAIN/bin/bjam -d2 --toolset=gcc link=static \
--with-thread \
--with-iostreams \
--with-system \
--with-serialization \
--with-filesystem \
--with-regex -sICU_PATH="$SYSROOT_PREFIX/usr" \
install

View File

@ -1,39 +0,0 @@
#!/bin/sh
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2012 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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
# http://www.gnu.org/copyleft/gpl.html
################################################################################
. config/options $1
cd $PKG_BUILD
ac_cv_func_malloc_0_nonnull=yes \
ac_cv_func_realloc_0_nonnull=yes \
./configure --host=$TARGET_NAME \
--build=$HOST_NAME \
--prefix=/usr \
--exec-prefix=/usr \
--sysconfdir=/etc \
--datadir=/usr/share \
--enable-shared \
--disable-static \
make
$MAKEINSTALL

View File

@ -1,27 +0,0 @@
#!/bin/sh
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2012 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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
# http://www.gnu.org/copyleft/gpl.html
################################################################################
. config/options $1
mkdir -p $INSTALL/usr/lib
cp -P $PKG_BUILD/.libs/libjson*.so* $INSTALL/usr/lib

View File

@ -1,36 +0,0 @@
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2012 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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
# http://www.gnu.org/copyleft/gpl.html
################################################################################
PKG_NAME="json-c"
PKG_VERSION="0.9"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="MIT"
PKG_SITE="http://oss.metaparadigm.com/json-c/"
PKG_URL="http://oss.metaparadigm.com/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.gz"
PKG_DEPENDS=""
PKG_BUILD_DEPENDS="toolchain"
PKG_PRIORITY="optional"
PKG_SECTION="devel"
PKG_SHORTDESC="json-c: A JSON implementation in C"
PKG_LONGDESC="JSON-C implements a reference counting object model that allows you to easily construct JSON objects in C, output them as JSON formatted strings and parse JSON formatted strings back into the C representation of JSON objects."
PKG_IS_ADDON="no"
PKG_AUTORECONF="yes"

View File

@ -1,12 +0,0 @@
diff -Naur json-c-0.9/configure.in json-c-0.9.patch/configure.in
--- json-c-0.9/configure.in 2009-01-06 23:55:33.000000000 +0100
+++ json-c-0.9.patch/configure.in 2013-02-01 16:45:09.890830041 +0100
@@ -10,7 +10,7 @@
# Checks for libraries.
# Checks for header files.
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS(config.h)
AC_HEADER_STDC
AC_CHECK_HEADERS(fcntl.h limits.h strings.h syslog.h unistd.h [sys/param.h] stdarg.h)

View File

@ -1,28 +0,0 @@
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2012 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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
# http://www.gnu.org/copyleft/gpl.html
################################################################################
#
# set vll dir and run vcfiled service
#
# runlevels: openelec
progress "run vcfiled service"
/usr/sbin/vcfiled

View File

@ -27,6 +27,6 @@
# stub function
wait_for_xorg () {
echo 0 > /sys/class/vtconsole/vtcon1/bind
fbset -g 1 1 1 1 32
echo 0 > /sys/class/vtconsole/vtcon1/bind
# fbset -g 1 1 1 1 32
}

View File

@ -129,11 +129,7 @@
# Display fatal error message
# $1:action which caused error, $2:message
echo "*** Error in $BOOT_STEP: $1: $2 ***"
if [ -z "$DEBUG" ]; then
halt
else
debug_shell
fi
debug_shell
}
break_after() {

View File

@ -29,13 +29,9 @@ cd $BUILD/${PKG_NAME}-${PKG_VERSION}/linux-tbs-drivers
LDFLAGS="" make DIR=$(kernel_path) prepare
find . -iname *.c | xargs sed -i -e "s|__devinit||"
find . -iname *.h | xargs sed -i -e "s|__devinit||"
find . -iname *.c | xargs sed -i -e "s|__devexit||"
find . -iname *.h | xargs sed -i -e "s|__devexit||"
for cfg in CONFIG_VIDEO_SH_MOBILE_CEU CONFIG_VIDEO_SH_MOBILE_CSI2 ; do
sed -i -e "s|^$cfg=.*$|# $cfg is not set|" v4l/.config
done
# TODO: removee me after 3 or 4 tbs driver versions
#for cfg in CONFIG_VIDEO_SH_MOBILE_CEU CONFIG_VIDEO_SH_MOBILE_CSI2 ; do
# sed -i -e "s|^$cfg=.*$|# $cfg is not set|" v4l/.config
#done
LDFLAGS="" make DIR=$(kernel_path)

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="tbs-linux-drivers"
PKG_VERSION="130506"
PKG_VERSION="130802"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -1,312 +0,0 @@
diff -urN tbs/linux-tbs-drivers.org/linux/drivers/media/common/saa716x/saa716x_i2c.c tbs/linux-tbs-drivers/linux/drivers/media/common/saa716x/saa716x_i2c.c
--- tbs/linux-tbs-drivers.org/linux/drivers/media/common/saa716x/saa716x_i2c.c 2013-03-18 20:40:05.000000000 +0100
+++ tbs/linux-tbs-drivers/linux/drivers/media/common/saa716x/saa716x_i2c.c 2013-07-09 15:36:44.271340994 +0200
@@ -569,7 +569,7 @@
saa716x_i2c_hwdeinit(i2c, SAA716x_I2C_BUS(i));
dprintk(SAA716x_DEBUG, 1, "Removing adapter (%d) %s", i, adapter->name);
- err = i2c_del_adapter(adapter);
+ //err = i2c_del_adapter(adapter);
if (err < 0) {
dprintk(SAA716x_ERROR, 1, "Adapter (%d) %s remove failed", i, adapter->name);
goto exit;
diff -urN tbs/linux-tbs-drivers.org/linux/drivers/media/dvb/mantis/mantis_i2c.c tbs/linux-tbs-drivers/linux/drivers/media/dvb/mantis/mantis_i2c.c
--- tbs/linux-tbs-drivers.org/linux/drivers/media/dvb/mantis/mantis_i2c.c 2013-03-18 20:40:05.000000000 +0100
+++ tbs/linux-tbs-drivers/linux/drivers/media/dvb/mantis/mantis_i2c.c 2013-07-09 15:35:32.375339760 +0200
@@ -217,11 +217,7 @@
.functionality = mantis_i2c_func,
};
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0)
-int __devinit mantis_i2c_init(struct mantis_pci *mantis)
-#else
int mantis_i2c_init(struct mantis_pci *mantis)
-#endif
{
u32 intstat, intmask;
struct i2c_adapter *i2c_adapter = &mantis->adapter;
@@ -265,6 +261,8 @@
mmwrite((intmask & ~MANTIS_INT_I2CDONE), MANTIS_INT_MASK);
dprintk(MANTIS_DEBUG, 1, "Removing I2C adapter");
- return i2c_del_adapter(&mantis->adapter);
+ i2c_del_adapter(&mantis->adapter);
+
+ return 0;
}
EXPORT_SYMBOL_GPL(mantis_i2c_exit);
diff -urN tbs/linux-tbs-drivers.org/linux/drivers/media/dvb/ttpci/av7110_ir.c tbs/linux-tbs-drivers/linux/drivers/media/dvb/ttpci/av7110_ir.c
--- tbs/linux-tbs-drivers.org/linux/drivers/media/dvb/ttpci/av7110_ir.c 2013-03-18 20:40:05.000000000 +0100
+++ tbs/linux-tbs-drivers/linux/drivers/media/dvb/ttpci/av7110_ir.c 2013-07-09 15:34:31.631338719 +0200
@@ -324,11 +324,7 @@
}
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0)
-int __devinit av7110_ir_init(struct av7110 *av7110)
-#else
int av7110_ir_init(struct av7110 *av7110)
-#endif
{
struct input_dev *input_dev;
static struct proc_dir_entry *e;
@@ -379,7 +375,7 @@
if (av_cnt == 1) {
e = proc_create("av7110_ir", S_IWUSR, NULL, &av7110_ir_proc_fops);
if (e)
- e->size = 4 + 256 * sizeof(u16);
+ proc_set_size(e, 4 + 256 * sizeof(u16));
}
tasklet_init(&av7110->ir.ir_tasklet, av7110_emit_key, (unsigned long) &av7110->ir);
@@ -389,11 +385,7 @@
}
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0)
-void __devexit av7110_ir_exit(struct av7110 *av7110)
-#else
void av7110_ir_exit(struct av7110 *av7110)
-#endif
{
int i;
diff -urN tbs/linux-tbs-drivers.org/linux/drivers/media/video/bt8xx/bttv-input.c tbs/linux-tbs-drivers/linux/drivers/media/video/bt8xx/bttv-input.c
--- tbs/linux-tbs-drivers.org/linux/drivers/media/video/bt8xx/bttv-input.c 2013-03-18 20:40:05.000000000 +0100
+++ tbs/linux-tbs-drivers/linux/drivers/media/video/bt8xx/bttv-input.c 2013-07-09 15:33:30.527337668 +0200
@@ -18,6 +18,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
#include <linux/module.h>
#include <linux/init.h>
#include <linux/delay.h>
@@ -36,9 +38,10 @@
module_param(ir_rc5_remote_gap, int, 0644);
#undef dprintk
-#define dprintk(arg...) do { \
- if (ir_debug >= 1) \
- printk(arg); \
+#define dprintk(fmt, ...) \
+do { \
+ if (ir_debug >= 1) \
+ pr_info(fmt, ##__VA_ARGS__); \
} while (0)
#define DEVNAME "bttv-input"
@@ -62,7 +65,7 @@
/* extract data */
data = ir_extract_bits(gpio, ir->mask_keycode);
- dprintk(KERN_INFO DEVNAME ": irq gpio=0x%x code=%d | %s%s%s\n",
+ dprintk("irq gpio=0x%x code=%d | %s%s%s\n",
gpio, data,
ir->polling ? "poll" : "irq",
(gpio & ir->mask_keydown) ? " down" : "",
@@ -96,7 +99,7 @@
keyup = (gpio & ir->mask_keyup) ? 1 << 31 : 0;
if ((ir->last_gpio & 0x7f) != data) {
- dprintk(KERN_INFO DEVNAME ": gpio=0x%x code=%d | %s\n",
+ dprintk("gpio=0x%x code=%d | %s\n",
gpio, data,
(gpio & ir->mask_keyup) ? " up" : "up/down");
@@ -107,7 +110,7 @@
if ((ir->last_gpio & 1 << 31) == keyup)
return;
- dprintk(KERN_INFO DEVNAME ":(cnt) gpio=0x%x code=%d | %s\n",
+ dprintk("(cnt) gpio=0x%x code=%d | %s\n",
gpio, data,
(gpio & ir->mask_keyup) ? " up" : "down");
@@ -177,13 +180,12 @@
rc5 |= 1;
break;
case 3:
- dprintk(KERN_INFO DEVNAME ":rc5_decode(%x) bad code\n",
+ dprintk("rc5_decode(%x) bad code\n",
org_code);
return 0;
}
}
- dprintk(KERN_INFO DEVNAME ":"
- "code=%x, rc5=%x, start=%x, toggle=%x, address=%x, "
+ dprintk("code=%x, rc5=%x, start=%x, toggle=%x, address=%x, "
"instr=%x\n", rc5, org_code, RC5_START(rc5),
RC5_TOGGLE(rc5), RC5_ADDR(rc5), RC5_INSTR(rc5));
return rc5;
@@ -212,20 +214,20 @@
/* Allow some timer jitter (RC5 is ~24ms anyway so this is ok) */
if (gap < 28000) {
- dprintk(KERN_INFO DEVNAME ": spurious timer_end\n");
+ dprintk("spurious timer_end\n");
return;
}
if (ir->last_bit < 20) {
/* ignore spurious codes (caused by light/other remotes) */
- dprintk(KERN_INFO DEVNAME ": short code: %x\n", ir->code);
+ dprintk("short code: %x\n", ir->code);
} else {
ir->code = (ir->code << ir->shift_by) | 1;
rc5 = bttv_rc5_decode(ir->code);
/* two start bits? */
if (RC5_START(rc5) != ir->start) {
- printk(KERN_INFO DEVNAME ":"
+ pr_info(DEVNAME ":"
" rc5 start bits invalid: %u\n", RC5_START(rc5));
/* right address? */
@@ -235,8 +237,7 @@
/* Good code */
rc_keydown(ir->dev, instr, toggle);
- dprintk(KERN_INFO DEVNAME ":"
- " instruction %x, toggle %x\n",
+ dprintk("instruction %x, toggle %x\n",
instr, toggle);
}
}
@@ -265,7 +266,7 @@
tv.tv_usec - ir->base_time.tv_usec;
}
- dprintk(KERN_INFO DEVNAME ": RC5 IRQ: gap %d us for %s\n",
+ dprintk("RC5 IRQ: gap %d us for %s\n",
gap, (gpio & 0x20) ? "mark" : "space");
/* remote IRQ? */
@@ -340,14 +341,14 @@
/* poll IR chip */
if (1 != i2c_master_recv(ir->c, &b, 1)) {
- dprintk(KERN_INFO DEVNAME ": read error\n");
+ dprintk("read error\n");
return -EIO;
}
/* ignore 0xaa */
if (b==0xaa)
return 0;
- dprintk(KERN_INFO DEVNAME ": key %02x\n", b);
+ dprintk("key %02x\n", b);
/*
* NOTE:
@@ -367,17 +368,14 @@
}
/* Instantiate the I2C IR receiver device, if present */
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0)
-void __devinit init_bttv_i2c_ir(struct bttv *btv)
-#else
void init_bttv_i2c_ir(struct bttv *btv)
-#endif
{
const unsigned short addr_list[] = {
0x1a, 0x18, 0x64, 0x30, 0x71,
I2C_CLIENT_END
};
struct i2c_board_info info;
+ struct i2c_client *i2c_dev;
if (0 != btv->i2c_rc)
return;
@@ -393,7 +391,12 @@
btv->init_data.ir_codes = RC_MAP_PV951;
info.addr = 0x4b;
break;
- default:
+ }
+
+ if (btv->init_data.name) {
+ info.platform_data = &btv->init_data;
+ i2c_dev = i2c_new_device(&btv->c.i2c_adap, &info);
+ } else {
/*
* The external IR receiver is at i2c address 0x34 (0x35 for
* reads). Future Hauppauge cards will have an internal
@@ -402,33 +405,14 @@
* internal.
* That's why we probe 0x1a (~0x34) first. CB
*/
-
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,35)
- i2c_new_probed_device(&btv->c.i2c_adap, &info, addr_list);
-#else
- i2c_new_probed_device(&btv->c.i2c_adap, &info, addr_list, NULL);
-#endif
-
- return;
+ i2c_dev = i2c_new_probed_device(&btv->c.i2c_adap, &info, addr_list, NULL);
}
+ if (NULL == i2c_dev)
+ return;
- if (btv->init_data.name)
- info.platform_data = &btv->init_data;
- i2c_new_device(&btv->c.i2c_adap, &info);
-
- return;
-}
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0)
-int __devexit fini_bttv_i2c(struct bttv *btv)
-#else
-int fini_bttv_i2c(struct bttv *btv)
+#if defined(CONFIG_MODULES) && defined(MODULE)
+ request_module("ir-kbd-i2c");
#endif
-{
- if (0 != btv->i2c_rc)
- return 0;
-
- return i2c_del_adapter(&btv->c.i2c_adap);
}
int bttv_input_init(struct bttv *btv)
@@ -530,7 +514,7 @@
break;
}
if (NULL == ir_codes) {
- dprintk(KERN_INFO "Ooops: IR config error [card=%d]\n", btv->c.type);
+ dprintk("Ooops: IR config error [card=%d]\n", btv->c.type);
err = -ENODEV;
goto err_out_free;
}
diff -urN tbs/linux-tbs-drivers.org/linux/drivers/media/video/zoran/zoran_procfs.c tbs/linux-tbs-drivers/linux/drivers/media/video/zoran/zoran_procfs.c
--- tbs/linux-tbs-drivers.org/linux/drivers/media/video/zoran/zoran_procfs.c 2010-07-03 23:22:08.000000000 +0200
+++ tbs/linux-tbs-drivers/linux/drivers/media/video/zoran/zoran_procfs.c 2013-07-09 15:37:31.083341796 +0200
@@ -130,14 +130,14 @@
static int zoran_open(struct inode *inode, struct file *file)
{
- struct zoran *data = PDE(inode)->data;
+ struct zoran *data = PDE_DATA(inode);
return single_open(file, zoran_show, data);
}
static ssize_t zoran_write(struct file *file, const char __user *buffer,
size_t count, loff_t *ppos)
{
- struct zoran *zr = PDE(file->f_path.dentry->d_inode)->data;
+ struct zoran *zr = PDE_DATA(file_inode(file));
char *string, *sp;
char *line, *ldelim, *varname, *svar, *tdelim;
@@ -201,7 +201,7 @@
dprintk(2,
KERN_INFO
"%s: procfs entry /proc/%s allocated. data=%p\n",
- ZR_DEVNAME(zr), name, zr->zoran_proc->data);
+ ZR_DEVNAME(zr), name, zr);
} else {
dprintk(1, KERN_ERR "%s: Unable to initialise /proc/%s\n",
ZR_DEVNAME(zr), name);

View File

@ -2,5 +2,3 @@
#
# This file contains the names of kernel modules that should be loaded
# at boot time, one per line. Lines beginning with "#" are ignored.
coretemp

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="service.openelec.settings"
PKG_VERSION="0.2.1"
PKG_VERSION="0.2.6"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="prop."

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="xbmc-theme-Confluence"
PKG_VERSION="12.2-a603ef9"
PKG_VERSION="12.2-41ba7b9"
if [ "$XBMC" = "master" ]; then
PKG_VERSION="13.alpha-df91888"
elif [ "$XBMC" = "xbmc-aml" ]; then

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="xbmc"
PKG_VERSION="12.2-a603ef9"
PKG_VERSION="12.2-41ba7b9"
if [ "$XBMC" = "master" ]; then
PKG_VERSION="13.alpha-df91888"
elif [ "$XBMC" = "xbmc-aml" ]; then
@ -104,15 +104,6 @@ else
XBMC_ALSA="--disable-alsa"
fi
if [ "$PULSEAUDIO_SUPPORT" = yes ]; then
# for PulseAudio support
PKG_BUILD_DEPENDS_TARGET="$PKG_BUILD_DEPENDS_TARGET pulseaudio"
PKG_DEPENDS="$PKG_DEPENDS pulseaudio"
XBMC_PULSEAUDIO="--enable-pulse"
else
XBMC_PULSEAUDIO="--disable-pulse"
fi
if [ "$CEC_SUPPORT" = yes ]; then
# for CEC support
PKG_BUILD_DEPENDS_TARGET="$PKG_BUILD_DEPENDS_TARGET libcec"
@ -384,7 +375,7 @@ PKG_CONFIGURE_OPTS_TARGET="gl_cv_func_gettimeofday_clobber=no \
$XBMC_XORG \
--disable-ccache \
$XBMC_ALSA \
$XBMC_PULSEAUDIO \
--disable-pulse \
--enable-rtmp \
$XBMC_SAMBA \
$XBMC_NFS \

View File

@ -40,12 +40,6 @@ else
SDL_OPENGL="--disable-video-opengl"
fi
if [ "$PULSEAUDIO_SUPPORT" = yes ]; then
SDL_PULSEAUDIO="--enable-pulseaudio --enable-pulseaudio-shared"
else
SDL_PULSEAUDIO="--disable-pulseaudio --disable-pulseaudio-shared"
fi
cd $PKG_BUILD
rm -f acinclude/alsa.m4
@ -82,7 +76,8 @@ mkdir -p .build-target && cd .build-target
--disable-esd \
--disable-esdtest \
--disable-esd-shared \
$SDL_PULSEAUDIO \
--disable-pulseaudio \
--disable-pulseaudio-shared \
--disable-arts \
--disable-arts-shared \
--disable-nas \

View File

@ -45,7 +45,3 @@ if [ "$OPENGL" = "Mesa" ]; then
PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS Mesa glu"
fi
if [ "$PULSEAUDIO_SUPPORT" = yes ]; then
PKG_DEPENDS="$PKG_DEPENDS pulseaudio"
PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS pulseaudio"
fi

View File

@ -47,3 +47,16 @@ if [ "$VDPAU" = yes ]; then
PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libvdpau"
PKG_DEPENDS="$PKG_DEPENDS libvdpau"
fi
if [ "$XVBA" = yes ]; then
get_graphicdrivers
for drv in $GRAPHIC_DRIVERS; do
if [ "$drv" = "fglrx" ]; then
PKG_DEPENDS="$PKG_DEPENDS xf86-video-fglrx"
PKG_BUILD_DEPENDS_TARGET="$PKG_BUILD_DEPENDS_TARGET xf86-video-fglrx"
elif [ "$drv" = "fglrx-legacy" ]; then
PKG_DEPENDS="$PKG_DEPENDS xf86-video-fglrx-legacy"
PKG_BUILD_DEPENDS_TARGET="$PKG_BUILD_DEPENDS_TARGET xf86-video-fglrx-legacy"
fi
done
fi

View File

@ -0,0 +1,75 @@
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2012 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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
# http://www.gnu.org/copyleft/gpl.html
################################################################################
PKG_NAME="libXVBA"
PKG_VERSION="13.8"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://amd.com"
PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
PKG_DEPENDS="libX11"
PKG_BUILD_DEPENDS="toolchain libX11 dri2proto libXext"
PKG_PRIORITY="optional"
PKG_SECTION="multimedia"
PKG_SHORTDESC="libXVBA: a Video Decode library for AMD"
PKG_LONGDESC="libXVBA is a Video Decode library for AMD."
PKG_IS_ADDON="no"
PKG_AUTORECONF="no"
if [ "$TARGET_ARCH" = i386 ]; then
LIBXVBA_FGLRX_ARCH=x86
LIBXVBA_LIBDIR=lib
elif [ "$TARGET_ARCH" = x86_64 ]; then
LIBXVBA_FGLRX_ARCH=x86_64
LIBXVBA_LIBDIR=lib64
fi
LIBXVBA_INSTALL_DIR="/usr/lib/fglrx/"
make_target() {
: # nothing to make
}
makeinstall_target() {
mkdir -p $SYSROOT_PREFIX/usr/include/amd
cp include/amdxvba.h $SYSROOT_PREFIX/usr/include/amd
mkdir -p $SYSROOT_PREFIX/usr/lib
cp arch/$LIBXVBA_FGLRX_ARCH/usr/X11R6/*/libXvBAW.so* $SYSROOT_PREFIX/usr/lib
ln -sf libXvBAW.so.1.0 $SYSROOT_PREFIX/usr/lib/libXvBAW.so.1
ln -sf libXvBAW.so.1 $SYSROOT_PREFIX/usr/lib/libXvBAW.so
}
post_makeinstall_target() {
mkdir -p $INSTALL/$LIBXVBA_INSTALL_DIR/lib
cp arch/$LIBXVBA_FGLRX_ARCH/usr/X11R6/$LIBXVBA_LIBDIR/libAMDXvBA.cap $INSTALL/$LIBXVBA_INSTALL_DIR/lib
cp arch/$LIBXVBA_FGLRX_ARCH/usr/X11R6/$LIBXVBA_LIBDIR/libAMDXvBA.so* $INSTALL/$LIBXVBA_INSTALL_DIR/lib/libAMDXvBA.so.1
cp arch/$LIBXVBA_FGLRX_ARCH/usr/X11R6/$LIBXVBA_LIBDIR/libXvBAW.so* $INSTALL/$LIBXVBA_INSTALL_DIR/lib/libXvBAW.so.1
(
cd $INSTALL/$LIBXVBA_INSTALL_DIR/
for lib in `find lib -type f`; do
mkdir -p $INSTALL/usr/`dirname $lib`
ln -sf /var/run/fglrx/$lib $INSTALL/usr/$lib
done
)
}

View File

@ -19,7 +19,7 @@
################################################################################
PKG_NAME="bluez"
PKG_VERSION="5.7"
PKG_VERSION="5.8"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"

View File

@ -38,8 +38,8 @@ PKG_AUTORECONF="yes"
PKG_CONFIGURE_OPTS_TARGET="export ac_cv_have_abstract_sockets=yes \
--libexecdir=/usr/lib/dbus \
--enable-verbose-mode \
--enable-asserts \
--disable-verbose-mode \
--disable-asserts \
--enable-checks \
--disable-tests \
--disable-ansi \
@ -56,9 +56,9 @@ PKG_CONFIGURE_OPTS_TARGET="export ac_cv_have_abstract_sockets=yes \
--without-x \
--with-dbus-user=dbus"
PKG_CONFIGURE_OPTS_HOST="--enable-verbose-mode \
--enable-asserts \
--enable-checks \
PKG_CONFIGURE_OPTS_HOST="--disable-verbose-mode \
--disable-asserts \
--disable-checks \
--disable-tests \
--disable-xml-docs \
--disable-doxygen-docs"

View File

@ -47,7 +47,7 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-docs \
--without-x \
--without-icu \
--without-procps \
--with-kernel-release=$ISCSI_KERNEL_VER \
--with-kernel-release=$OPENVMTOOLS_KERNEL_VER \
--with-linuxdir=$(ls -d $ROOT/$BUILD/linux-*)"
PKG_MAKE_OPTS_TARGET="CFLAGS+=-DG_DISABLE_DEPRECATED"

View File

@ -1,34 +0,0 @@
#!/bin/sh
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2012 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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
# http://www.gnu.org/copyleft/gpl.html
################################################################################
. config/options $1
cd $PKG_BUILD
./configure --host=$TARGET_NAME \
--build=$HOST_NAME \
--prefix=/usr \
--sbindir=/usr/sbin \
--exec-prefix=/usr \
--localstatedir=/var \
--sysconfdir=/etc \
make

View File

@ -1,26 +0,0 @@
#!/bin/sh
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2012 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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
# http://www.gnu.org/copyleft/gpl.html
################################################################################
. config/options $1
mkdir -p $INSTALL/usr/bin
cp $PKG_BUILD/src/atvclient $INSTALL/usr/bin

View File

@ -26,11 +26,11 @@ PKG_LICENSE="GPL"
PKG_SITE="http://github.com/Evinyatar/atvclient/wiki"
PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
PKG_DEPENDS="libusb-compat"
PKG_BUILD_DEPENDS="toolchain libusb-compat"
PKG_BUILD_DEPENDS_TARGET="toolchain libusb-compat"
PKG_PRIORITY="optional"
PKG_SECTION="system/remote"
PKG_SHORTDESC="atvclient: a background application for Linux that reads input from the AppleTVs internal infra-red receiver"
PKG_LONGDESC="atvclient is a background application for Linux that reads input from the AppleTVs internal infra-red receiver and submits it to XBMC in a way very similar to how XBMCHelper does this under the native AppleTV OS. It implements most of the functionality the ATV OS HID driver supports, including pairing and control of the status LED."
PKG_IS_ADDON="no"
PKG_IS_ADDON="no"
PKG_AUTORECONF="yes"

View File

@ -1,30 +0,0 @@
#!/bin/sh
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2012 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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
# http://www.gnu.org/copyleft/gpl.html
################################################################################
. config/options $1
setup_toolchain host
cd $PKG_BUILD
make CC="$HOST_CC" CFLAGS="$HOST_CFLAGS"
make TOPDIR="./.install" install

View File

@ -1,29 +0,0 @@
#!/bin/sh
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2012 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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
# http://www.gnu.org/copyleft/gpl.html
################################################################################
. config/options $1
mkdir -p $INSTALL/usr/share/zoneinfo
cp -R $PKG_BUILD/.install/etc/zoneinfo/* $INSTALL/usr/share/zoneinfo
mkdir -p $INSTALL/etc
ln -sf /var/run/localtime $INSTALL/etc/localtime

View File

@ -26,11 +26,31 @@ PKG_LICENSE="Public Domain"
PKG_SITE="ftp://elsie.nci.nih.gov/pub/"
PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
PKG_DEPENDS=""
PKG_BUILD_DEPENDS="toolchain"
PKG_BUILD_DEPENDS_TARGET="toolchain"
PKG_PRIORITY="optional"
PKG_SECTION="system"
PKG_SHORTDESC="timezone-data"
PKG_LONGDESC="timezone-data"
PKG_IS_ADDON="no"
PKG_IS_ADDON="no"
PKG_AUTORECONF="no"
make_target() {
setup_toolchain host
make CC="$HOST_CC" CFLAGS="$HOST_CFLAGS"
}
makeinstall_target() {
make TOPDIR="./.install_pkg" install
}
post_makeinstall_target() {
mkdir -p $INSTALL/usr/share/zoneinfo
mv $INSTALL/etc/zoneinfo/* $INSTALL/usr/share/zoneinfo
rm -rf $INSTALL/man
rm -rf $INSTALL/etc
mkdir -p $INSTALL/etc
ln -sf /var/run/localtime $INSTALL/etc/localtime
}

View File

@ -1,33 +0,0 @@
#!/bin/sh
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2012 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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
# http://www.gnu.org/copyleft/gpl.html
################################################################################
. config/options $1
mkdir -p $INSTALL/usr/bin
cp $PKG_DIR/scripts/installer $INSTALL/usr/bin
mkdir -p $INSTALL/etc
if [ -f $PROJECT_DIR/$PROJECT/installer/installer.conf ]; then
cp $PROJECT_DIR/$PROJECT/installer/installer.conf $INSTALL/etc
else
cp $PKG_DIR/config/installer.conf $INSTALL/etc
fi

View File

@ -19,22 +19,43 @@
################################################################################
PKG_NAME="installer"
PKG_VERSION=""
PKG_VERSION="1"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.openelec.tv/"
PKG_URL=""
PKG_DEPENDS="busybox dialog parted e2fsprogs syslinux"
PKG_BUILD_DEPENDS="toolchain"
PKG_BUILD_DEPENDS_TARGET="toolchain"
PKG_PRIORITY="optional"
PKG_SECTION="tools"
PKG_SHORTDESC="installer: OpenELEC.tv Install manager"
PKG_LONGDESC="OpenELEC.tv Install manager to install the system on any disk"
PKG_IS_ADDON="no"
PKG_IS_ADDON="no"
PKG_AUTORECONF="no"
if [ "$TARGET_ARCH" = "i386" -o "$TARGET_ARCH" = "x86_64" ]; then
PKG_DEPENDS="$PKG_DEPENDS flashrom"
fi
pre_build_target() {
mkdir -p $ROOT/$BUILD/$PKG_NAME-$PKG_VERSION
PKG_BUILD="$ROOT/$BUILD/$PKG_NAME-$PKG_VERSION"
}
make_target() {
: # nothing to make here
}
makeinstall_target() {
mkdir -p $INSTALL/usr/bin
cp $PKG_DIR/scripts/installer $INSTALL/usr/bin
mkdir -p $INSTALL/etc
if [ -f $PROJECT_DIR/$PROJECT/installer/installer.conf ]; then
cp $PROJECT_DIR/$PROJECT/installer/installer.conf $INSTALL/etc
else
cp $PKG_DIR/config/installer.conf $INSTALL/etc
fi
}

View File

@ -752,6 +752,7 @@ do_poweroff() {
[ "$BETA" = "yes" ] && msg_warning_beta
while true; do
clear
menu_main
done

@ -1 +1 @@
Subproject commit ff051d8de5a8cc1cc378653df36e0a17ac95a9c1
Subproject commit 3f2135d24d9c65513e387156164aef95958e298d

View File

@ -101,20 +101,21 @@ cd $ROOT/$PKG_BUILD
mkdir -p $INSTALL_DIR/lib/xorg/modules/linux
cp -P $BASEDIR/usr/X11R6/$LIBDIR/modules/linux/*.so $INSTALL_DIR/lib/xorg/modules/linux
if [ "$XVBA" = yes ]; then
cp arch/$FGLRX_ARCH/usr/X11R6/$LIBDIR/libAMDXvBA.cap $INSTALL_DIR/lib
cp arch/$FGLRX_ARCH/usr/X11R6/$LIBDIR/libAMDXvBA.so* $INSTALL_DIR/lib/libAMDXvBA.so.1
cp arch/$FGLRX_ARCH/usr/X11R6/$LIBDIR/libXvBAW.so* $INSTALL_DIR/lib/libXvBAW.so.1
# disabled until we can expect non broken drivers from AMD:
# if [ "$XVBA" = yes ]; then
# cp arch/$FGLRX_ARCH/usr/X11R6/$LIBDIR/libAMDXvBA.cap $INSTALL_DIR/lib
# cp arch/$FGLRX_ARCH/usr/X11R6/$LIBDIR/libAMDXvBA.so* $INSTALL_DIR/lib/libAMDXvBA.so.1
# cp arch/$FGLRX_ARCH/usr/X11R6/$LIBDIR/libXvBAW.so* $INSTALL_DIR/lib/libXvBAW.so.1
# install needed files for toolchain
mkdir -p $SYSROOT_PREFIX/usr/include/amd
cp $PKG_DIR/source/amdxvba.h $SYSROOT_PREFIX/usr/include/amd
# # install needed files for toolchain
# mkdir -p $SYSROOT_PREFIX/usr/include/amd
# cp $PKG_DIR/source/amdxvba.h $SYSROOT_PREFIX/usr/include/amd
mkdir -p $SYSROOT_PREFIX/usr/lib
cp arch/$FGLRX_ARCH/usr/X11R6/*/libXvBAW.so* $SYSROOT_PREFIX/usr/lib
ln -sf libXvBAW.so.1.0 $SYSROOT_PREFIX/usr/lib/libXvBAW.so.1
ln -sf libXvBAW.so.1 $SYSROOT_PREFIX/usr/lib/libXvBAW.so
fi
# mkdir -p $SYSROOT_PREFIX/usr/lib
# cp arch/$FGLRX_ARCH/usr/X11R6/*/libXvBAW.so* $SYSROOT_PREFIX/usr/lib
# ln -sf libXvBAW.so.1.0 $SYSROOT_PREFIX/usr/lib/libXvBAW.so.1
# ln -sf libXvBAW.so.1 $SYSROOT_PREFIX/usr/lib/libXvBAW.so
# fi
(
cd $INSTALL_DIR/

View File

@ -35,3 +35,9 @@ PKG_LONGDESC="These binary drivers provide optimized hardware acceleration of Op
PKG_IS_ADDON="no"
PKG_AUTORECONF="no"
if [ "$XVBA" = yes ]; then
# hack around broken AMD drivers
PKG_DEPENDS="libXVBA"
PKG_BUILD_DEPENDS="toolchain libXVBA"
fi

View File

@ -25,8 +25,8 @@ PKG_ARCH="i386 x86_64"
PKG_LICENSE="OSS"
PKG_SITE="http://intellinuxgraphics.org/"
PKG_URL="http://xorg.freedesktop.org/archive/individual/driver/$PKG_NAME-$PKG_VERSION.tar.bz2"
PKG_DEPENDS="systemd intel-gpu-tools"
PKG_BUILD_DEPENDS_TARGET="toolchain util-macros fontsproto systemd xorg-server"
PKG_DEPENDS="libXcomposite systemd intel-gpu-tools"
PKG_BUILD_DEPENDS_TARGET="toolchain libXcomposite util-macros fontsproto systemd xorg-server"
PKG_PRIORITY="optional"
PKG_SECTION="x11/driver"
PKG_SHORTDESC="xf86-video-intel: The Xorg driver for Intel video chips"

View File

@ -1,41 +0,0 @@
#!/bin/sh
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2012 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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
# http://www.gnu.org/copyleft/gpl.html
################################################################################
. config/options $1
LDFLAGS="$LDFLAGS -fwhole-program"
cd $PKG_BUILD
./configure --host=$TARGET_NAME \
--build=$HOST_NAME \
--prefix=/usr \
--sysconfdir=/etc \
--localstatedir=/var \
--x-includes=$SYSROOT_PREFIX/usr/include \
--x-libraries=$SYSROOT_PREFIX/usr/lib \
--disable-debug \
--disable-history \
--with-xterm=rxvt \
--with-xft \
--with-x
make

View File

@ -1,29 +0,0 @@
#!/bin/sh
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2012 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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
# http://www.gnu.org/copyleft/gpl.html
################################################################################
. config/options $1
mkdir -p $INSTALL/usr/bin
cp $PKG_BUILD/src/ratpoison $INSTALL/usr/bin
mkdir -p $INSTALL/etc
cp $PKG_DIR/config/ratpoisonrc $INSTALL/etc

View File

@ -19,18 +19,38 @@
################################################################################
PKG_NAME="ratpoison"
PKG_VERSION="1.4.5"
PKG_VERSION="1.4.6"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.nongnu.org/ratpoison"
PKG_URL="http://mirror.lihnidos.org/GNU/savannah/ratpoison/$PKG_NAME-$PKG_VERSION.tar.gz"
PKG_URL="http://download.savannah.nongnu.org/releases/ratpoison/$PKG_NAME-$PKG_VERSION.tar.xz"
PKG_DEPENDS="libXft libX11 libXext libXtst libXinerama liberation-fonts-ttf"
PKG_BUILD_DEPENDS="toolchain util-macros libXft libICE libX11 libXext libXtst libXinerama"
PKG_BUILD_DEPENDS_TARGET="toolchain util-macros libXft libICE libX11 libXext libXtst libXinerama"
PKG_PRIORITY="optional"
PKG_SECTION="x11/other"
PKG_SHORTDESC="ratpoison: A window manager that lets you say good-bye to the rodent"
PKG_LONGDESC="Ratpoison is a simple window manager with no large library dependencies, no fancy graphics, no window decorations, and no rodent dependence. It is largely modeled after GNU Screen, which has done wonders in the virtual terminal market. All interaction with the window manager is done through keystrokes. Ratpoison has a prefix map to minimize the key clobbering that cripples EMACS and other quality pieces of software. All windows are maximized and kept maximized to avoid wasting precious screen space."
PKG_IS_ADDON="no"
PKG_IS_ADDON="no"
PKG_AUTORECONF="yes"
PKG_CONFIGURE_OPTS_TARGET="--x-includes=$SYSROOT_PREFIX/usr/include \
--x-libraries=$SYSROOT_PREFIX/usr/lib \
--disable-debug \
--disable-history \
--with-xterm=rxvt \
--with-xft \
--with-x"
pre_configure_target() {
LDFLAGS="$LDFLAGS -fwhole-program"
}
post_makeinstall_target() {
rm -rf $INSTALL/usr/bin/rpws
rm -rf $INSTALL/usr/share
mkdir -p $INSTALL/etc
cp $PKG_DIR/config/ratpoisonrc $INSTALL/etc
}

View File

@ -1,12 +0,0 @@
diff -Naur ratpoison-1.4.5-old/configure.in ratpoison-1.4.5-new/configure.in
--- ratpoison-1.4.5-old/configure.in 2009-07-12 14:01:04.000000000 -0700
+++ ratpoison-1.4.5-new/configure.in 2013-01-03 19:26:12.000000000 -0800
@@ -24,7 +24,7 @@
AM_MAINTAINER_MODE
-AM_CONFIG_HEADER(src/config.h)
+AC_CONFIG_HEADERS(src/config.h)
dnl by default turn off debugging
AC_MSG_CHECKING(whether to enable debugging)

View File

@ -1,12 +0,0 @@
diff -Naur ratpoison-1.4.5-old/configure.in ratpoison-1.4.5-new/configure.in
--- ratpoison-1.4.5-old/configure.in 2009-07-12 14:01:04.000000000 -0700
+++ ratpoison-1.4.5-new/configure.in 2009-07-14 19:56:24.000000000 -0700
@@ -146,7 +146,7 @@
dnl Checks for typedefs, structures, and compiler characteristics.
dnl Checks for library functions.
-AC_CHECK_FUNCS(getopt getopt_long setsid setpgid setpgrp putenv vsnprintf usleep)
+AC_CHECK_FUNCS(getline getopt getopt_long setsid setpgid setpgrp putenv vsnprintf usleep)
AC_TYPE_SIGNAL

View File

@ -1,35 +0,0 @@
diff -Naur ratpoison-1.4.5-old/src/actions.c ratpoison-1.4.5-new/src/actions.c
--- ratpoison-1.4.5-old/src/actions.c 2009-07-14 19:56:16.000000000 -0700
+++ ratpoison-1.4.5-new/src/actions.c 2009-07-14 19:56:56.000000000 -0700
@@ -1882,6 +1882,8 @@
{
int ret = -1;
+ if (!strcasecmp (data, "static") || !strcasecmp (data, "static") || !strcmp (data, "10"))
+ ret = StaticGravity;
if (!strcasecmp (data, "northwest") || !strcasecmp (data, "nw") || !strcmp (data, "7"))
ret = NorthWestGravity;
if (!strcasecmp (data, "north") || !strcasecmp (data, "n") || !strcmp (data, "8"))
diff -Naur ratpoison-1.4.5-old/src/manage.c ratpoison-1.4.5-new/src/manage.c
--- ratpoison-1.4.5-old/src/manage.c 2009-07-14 19:56:16.000000000 -0700
+++ ratpoison-1.4.5-new/src/manage.c 2009-07-14 19:56:56.000000000 -0700
@@ -541,6 +541,9 @@
case SouthEastGravity:
win->x = frame->x + frame->width - win->width - win->border;
break;
+ case StaticGravity:
+ win->x = frame->x + win->x;
+ break;
}
/* Y coord. */
@@ -561,6 +564,9 @@
case SouthWestGravity:
win->y = frame->y + frame->height - win->height - win->border;
break;
+ case StaticGravity:
+ win->y = frame->y + win->y;
+ break;
}
}

View File

@ -1855,7 +1855,7 @@ CONFIG_SENSORS_FAM15H_POWER=m
# CONFIG_SENSORS_GL518SM is not set
# CONFIG_SENSORS_GL520SM is not set
# CONFIG_SENSORS_HIH6130 is not set
CONFIG_SENSORS_CORETEMP=m
CONFIG_SENSORS_CORETEMP=y
CONFIG_SENSORS_IT87=m
# CONFIG_SENSORS_JC42 is not set
# CONFIG_SENSORS_LINEAGE is not set

View File

@ -143,9 +143,6 @@
# build and install ALSA Audio support (yes / no)
ALSA_SUPPORT="yes"
# build and install PulseAudio support (yes / no)
PULSEAUDIO_SUPPORT="no"
# build and install with non-free support
# (RAR compression support in XBMC) (yes / no)
NONFREE_SUPPORT="yes"

View File

@ -8,8 +8,6 @@ Section "Device"
Option "ModeValidation" "NoVesaModes, NoXServerModes"
Option "HWCursor" "false"
Option "RegistryDwords" "RMDisableRenderToSysmem=1"
# To put Xorg in debug mode change "false" to "true" in the line below:
Option "ModeDebug" "false"
# To use a local /storage/.config/edid.bin file uncomment the 4 lines below:
# Option "ConnectedMonitor" "DFP-0"
# Option "CustomEDID" "DFP-0:/storage/.config/edid.bin"
@ -17,6 +15,9 @@ Section "Device"
# Option "UseEDID" "true"
EndSection
# To put Xorg in debug mode "touch /storage/.config/debug.xorg" .. if you set
# "ModeDebug" "true" in xorg.conf IT WILL NOT WORK!
Section "Screen"
Identifier "screen"
Device "nvidia"
@ -26,7 +27,7 @@ Section "Screen"
Option "TVStandard" "HD1080i"
# If Component video does not fill the screen uncomment the line below:
# Option "TVOverscan" "0.8" # use values from 0.0 (min) to 1.0 (max)
Option "MetaModes" "DFP: 1920x1080; DFP: nvidia-auto-select; TV: 1280x720; TV: nvidia-auto-select"
Option "MetaModes" "DFP: nvidia-auto-select; TV: 1280x720; TV: nvidia-auto-select"
SubSection "Display"
Depth 24
EndSubSection

View File

@ -143,9 +143,6 @@
# build and install ALSA Audio support (yes / no)
ALSA_SUPPORT="yes"
# build and install PulseAudio support (yes / no)
PULSEAUDIO_SUPPORT="no"
# build and install with non-free support
# (RAR compression support in XBMC) (yes / no)
NONFREE_SUPPORT="yes"

View File

@ -143,9 +143,6 @@
# build and install ALSA Audio support (yes / no)
ALSA_SUPPORT="yes"
# build and install PulseAudio support (yes / no)
PULSEAUDIO_SUPPORT="no"
# build and install with non-free support
# (RAR compression support in XBMC) (yes / no)
NONFREE_SUPPORT="yes"

View File

@ -1880,7 +1880,7 @@ CONFIG_SENSORS_FAM15H_POWER=m
# CONFIG_SENSORS_GL518SM is not set
# CONFIG_SENSORS_GL520SM is not set
# CONFIG_SENSORS_HIH6130 is not set
CONFIG_SENSORS_CORETEMP=m
CONFIG_SENSORS_CORETEMP=y
CONFIG_SENSORS_IT87=m
# CONFIG_SENSORS_JC42 is not set
# CONFIG_SENSORS_LINEAGE is not set

View File

@ -1856,7 +1856,7 @@ CONFIG_SENSORS_FAM15H_POWER=m
# CONFIG_SENSORS_GL518SM is not set
# CONFIG_SENSORS_GL520SM is not set
# CONFIG_SENSORS_HIH6130 is not set
CONFIG_SENSORS_CORETEMP=m
CONFIG_SENSORS_CORETEMP=y
CONFIG_SENSORS_IT87=m
# CONFIG_SENSORS_JC42 is not set
# CONFIG_SENSORS_LINEAGE is not set

View File

@ -143,9 +143,6 @@
# build and install ALSA Audio support (yes / no)
ALSA_SUPPORT="yes"
# build and install PulseAudio support (yes / no)
PULSEAUDIO_SUPPORT="no"
# build and install with non-free support
# (RAR compression support in XBMC) (yes / no)
NONFREE_SUPPORT="yes"

View File

@ -1878,7 +1878,7 @@ CONFIG_SENSORS_FAM15H_POWER=m
# CONFIG_SENSORS_GL518SM is not set
# CONFIG_SENSORS_GL520SM is not set
# CONFIG_SENSORS_HIH6130 is not set
CONFIG_SENSORS_CORETEMP=m
CONFIG_SENSORS_CORETEMP=y
CONFIG_SENSORS_IT87=m
# CONFIG_SENSORS_JC42 is not set
# CONFIG_SENSORS_LINEAGE is not set

View File

@ -143,9 +143,6 @@
# build and install ALSA Audio support (yes / no)
ALSA_SUPPORT="yes"
# build and install PulseAudio support (yes / no)
PULSEAUDIO_SUPPORT="no"
# build and install with non-free support
# (RAR compression support in XBMC) (yes / no)
NONFREE_SUPPORT="yes"

View File

@ -1808,7 +1808,7 @@ CONFIG_HWMON_VID=y
# CONFIG_SENSORS_GL518SM is not set
# CONFIG_SENSORS_GL520SM is not set
# CONFIG_SENSORS_HIH6130 is not set
CONFIG_SENSORS_CORETEMP=m
CONFIG_SENSORS_CORETEMP=y
# CONFIG_SENSORS_IT87 is not set
# CONFIG_SENSORS_JC42 is not set
# CONFIG_SENSORS_LINEAGE is not set

View File

@ -1752,7 +1752,7 @@ CONFIG_HWMON_VID=y
# CONFIG_SENSORS_GL518SM is not set
# CONFIG_SENSORS_GL520SM is not set
# CONFIG_SENSORS_HIH6130 is not set
CONFIG_SENSORS_CORETEMP=m
CONFIG_SENSORS_CORETEMP=y
# CONFIG_SENSORS_IT87 is not set
# CONFIG_SENSORS_JC42 is not set
# CONFIG_SENSORS_LINEAGE is not set

View File

@ -143,9 +143,6 @@
# build and install ALSA Audio support (yes / no)
ALSA_SUPPORT="yes"
# build and install PulseAudio support (yes / no)
PULSEAUDIO_SUPPORT="no"
# build and install with non-free support
# (RAR compression support in XBMC) (yes / no)
NONFREE_SUPPORT="yes"

View File

@ -1826,7 +1826,7 @@ CONFIG_HWMON_VID=y
# CONFIG_SENSORS_GL518SM is not set
# CONFIG_SENSORS_GL520SM is not set
# CONFIG_SENSORS_HIH6130 is not set
CONFIG_SENSORS_CORETEMP=m
CONFIG_SENSORS_CORETEMP=y
# CONFIG_SENSORS_IT87 is not set
# CONFIG_SENSORS_JC42 is not set
# CONFIG_SENSORS_LINEAGE is not set

View File

@ -1783,7 +1783,7 @@ CONFIG_HWMON_VID=y
# CONFIG_SENSORS_GL518SM is not set
# CONFIG_SENSORS_GL520SM is not set
# CONFIG_SENSORS_HIH6130 is not set
CONFIG_SENSORS_CORETEMP=m
CONFIG_SENSORS_CORETEMP=y
# CONFIG_SENSORS_IT87 is not set
# CONFIG_SENSORS_JC42 is not set
# CONFIG_SENSORS_LINEAGE is not set

View File

@ -143,9 +143,6 @@
# build and install ALSA Audio support (yes / no)
ALSA_SUPPORT="yes"
# build and install PulseAudio support (yes / no)
PULSEAUDIO_SUPPORT="no"
# build and install with non-free support
# (RAR compression support in XBMC) (yes / no)
NONFREE_SUPPORT="yes"

View File

@ -1063,7 +1063,7 @@ CONFIG_INPUT_MISC=y
# CONFIG_INPUT_POWERMATE is not set
# CONFIG_INPUT_YEALINK is not set
# CONFIG_INPUT_CM109 is not set
CONFIG_INPUT_UINPUT=m
CONFIG_INPUT_UINPUT=y
# CONFIG_INPUT_PCF8574 is not set
# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
# CONFIG_INPUT_ADXL34X is not set

View File

@ -143,9 +143,6 @@
# build and install ALSA Audio support (yes / no)
ALSA_SUPPORT="no"
# build and install PulseAudio support (yes / no)
PULSEAUDIO_SUPPORT="no"
# build and install with non-free support
# (RAR compression support in XBMC) (yes / no)
NONFREE_SUPPORT="yes"

File diff suppressed because it is too large Load Diff

View File

@ -1,351 +0,0 @@
# Name of the Distro to build (full name, without special charcters)
DISTRONAME="OpenELEC"
if [ "$XBMC" = "master" ]; then
DISTRONAME="${DISTRONAME}_Gotham"
fi
# Welcome Message for e.g. SSH Server (up to 5 Lines)
GREETING0="##############################################"
GREETING1="# OpenELEC - The living room PC for everyone #"
GREETING2="# ...... visit http://www.openelec.tv ...... #"
GREETING3="##############################################"
GREETING4=""
# Hostname for target system (openelec)
HOSTNAME="openelec"
# Root password to integrate in the target system
ROOT_PASSWORD="openelec"
# User to integrate in the target system
USER_NAME="openelec"
# User group to integrate in the target system
USER_GROUP="openelec"
# User password to integrate in the target system
USER_PASSWORD="openelec"
# The TARGET_CPU variable controls which processor should be targeted for
# generated code.
case $TARGET_ARCH in
i386)
# (AMD CPUs) k8 k8-sse3 opteron opteron-sse3 athlon64 athlon64-sse3
# athlon-fx athlon-mp athlon-xp athlon-4
# athlon-tbird athlon k6-3 k6-2 k6 geode
# (Intel CPUs) atom core2 nocona prescott pentium4[m] pentium3[m]
# pentium-m pentium2 pentiumpro pentium-mmx pentium
# i686 i586 i486 i386
# (VIA CPUs) c3 c3-2
#
TARGET_CPU="atom"
;;
x86_64)
# (AMD CPUs) k8 k8-sse3 opteron opteron-sse3 athlon64 athlon64-sse3
# athlon-fx amdfam10 barcelona
# (Intel CPUs) atom core2 nocona
#
TARGET_CPU="atom"
;;
arm)
# TARGET_CPU:
# arm2 arm250 arm3 arm6 arm60 arm600 arm610 arm620 arm7 arm7m arm7d
# arm7dm arm7di arm7dmi arm70 arm700 arm700i arm710 arm710c
# arm7100 arm720 arm7500 arm7500fe arm7tdmi arm7tdmi-s arm710t
# arm720t arm740t strongarm strongarm110 strongarm1100
# strongarm1110 arm8 arm810 arm9 arm9e arm920 arm920t arm922t
# arm946e-s arm966e-s arm968e-s arm926ej-s arm940t arm9tdmi
# arm10tdmi arm1020t arm1026ej-s arm10e arm1020e arm1022e
# arm1136j-s arm1136jf-s mpcore mpcorenovfp arm1156t2-s
# arm1176jz-s arm1176jzf-s cortex-a8 cortex-a9 cortex-r4
# cortex-r4f cortex-m3 cortex-m1 xscale iwmmxt iwmmxt2 ep9312.
#
TARGET_CPU="cortex-a9"
# TARGET_FLOAT:
# Specifies which floating-point ABI to use. Permissible values are:
# soft softfp hard
TARGET_FLOAT="softfp"
# TARGET_FPU:
# This specifies what floating point hardware (or hardware emulation) is
# available on the target. Permissible names are:
# fpa fpe2 fpe3 maverick vfp vfpv3 vfpv3-fp16 vfpv3-d16 vfpv3-d16-fp16
# vfpv3xd vfpv3xd-fp16 neon neon-fp16 vfpv4 vfpv4-d16 fpv4-sp-d16
# neon-vfpv4.
TARGET_FPU="neon"
;;
esac
# Build optimizations (size/normal/speed)
OPTIMIZATIONS="size"
# Project CFLAGS
PROJECT_CFLAGS="-mfpmath=sse -msse2 -mssse3 -mmovbe"
# LTO (Link Time Optimization) support
LTO_SUPPORT="yes"
# GOLD (Google Linker) support
GOLD_SUPPORT="yes"
# Bootloader to use (syslinux / u-boot / atv-bootloader)
BOOTLOADER="syslinux"
# u-boot version to use (default / aml / cubox)
UBOOT_VERSION="default"
# Configuration for u-boot
UBOOT_CONFIG=""
# Target Configfile for u-boot
UBOOT_CONFIGFILE=""
# install Berryboot support tools
BERRYBOOT_TOOLS="no"
# Kernel to use. values can be:
# default: default mainline kernel
# ti-omap4: Ti's OMAP4 kernel
LINUX="default"
# use linux-next (latest rc) instead latest released version
LINUX_NEXT="no"
# SquashFS compression method (gzip / lzo / xz)
SQUASHFS_COMPRESSION="gzip"
# Mediacenter to use (xbmc / no)
MEDIACENTER="xbmc"
# Skins to install (Confluence)
# Space separated list is supported,
# e.g. SKINS="Confluence"
SKINS="Confluence"
# Default Skin (Confluence)
SKIN_DEFAULT="Confluence"
# install extra subtitle Fonts for XBMC (yes / no)
XBMC_EXTRA_FONTS="yes"
# build and install 'RSXS' Screensaver (yes / no)
XBMC_SCR_RSXS="yes"
# build and install 'ProjectM' Visualization (yes / no)
XBMC_VIS_PROJECTM="yes"
# build and install 'GOOM' Visualization (yes / no)
XBMC_VIS_GOOM="yes"
# build and install ALSA Audio support (yes / no)
ALSA_SUPPORT="yes"
# build and install PulseAudio support (yes / no)
PULSEAUDIO_SUPPORT="no"
# build and install with non-free support
# (RAR compression support in XBMC) (yes / no)
NONFREE_SUPPORT="yes"
# build and install with DVDCSS support
# (DVD decryption support in XBMC) (yes / no)
DVDCSS_SUPPORT="yes"
# build and install with LAME cdrip encoder support
ENCODER_LAME="yes"
# build and install with VORBIS cdrip encoder support
ENCODER_VORBIS="yes"
# build and install with BluRay support (yes / no)
BLURAY_SUPPORT="yes"
# additional drivers to install:
# for a list of additinoal drivers see packages/linux-drivers
# Space separated list is supported,
# e.g. ADDITIONAL_DRIVERS="DRIVER1 DRIVER2"
ADDITIONAL_DRIVERS="RTL8192CU RTL8188EU dvbhdhomerun"
# build with network support (yes / no)
NETWORK="yes"
# build and install bluetooth support (yes / no)
BLUETOOTH_SUPPORT="yes"
# build and install with XBMC webfrontend (yes / no)
WEBSERVER="yes"
# build and install Avahi (Zeroconf) daemon (yes / no)
AVAHI_DAEMON="yes"
# build with UPnP support (yes / no)
UPNP_SUPPORT="yes"
# build with MySQL support (yes / no)
MYSQL_SUPPORT="yes"
# build xbmc with sshlib support (yes / no)
SSHLIB_SUPPORT="yes"
# build xbmc with optical drive support (yes / no)
OPTICAL_DRIVE_SUPPORT="yes"
# build with AirPlay support (stream videos from iDevices to XBMC) (yes / no)
AIRPLAY_SUPPORT="yes"
# build with AirTunes support (stream music from iDevices to XBMC) (yes / no)
AIRTUNES_SUPPORT="yes"
# build and install with NFS mount support in XBMC (yes / no)
NFS_SUPPORT="yes"
# build with afpfs-ng support (mounting AFP shares with XBMC) (yes / no)
AFP_SUPPORT="yes"
# build and install Samba Client support (yes / no)
SAMBA_SUPPORT="yes"
# build and install Samba Server (yes / no)
SAMBA_SERVER="yes"
# build and install SFTP Server (yes / no)
SFTP_SERVER="yes"
# build and install PPP support (yes / no)
PPTP_SUPPORT="yes"
# build and install OpenVPN support (yes / no)
OPENVPN_SUPPORT="yes"
# build and install diskmounter service (udisks)
# this service provide auto mounting support for external drives
# in the mediacenter also automount internally drives at boottime (yes / no)
UDISKS="yes"
# build and install powermanagement support (upower) (yes / no)
UPOWER="yes"
# build and install exFAT fuse support (yes / no)
EXFAT="yes"
# build and install NTFS-3G fuse support (yes / no)
NTFS3G="yes"
# build and install hfs filesystem utilities (yes / no)
HFSTOOLS="yes"
# OpenGL(X) implementation to use (no / Mesa)
OPENGL="Mesa"
# OpenGL-ES implementation to use (no)
OPENGLES="no"
# Windowmanager to use (ratpoison / none)
WINDOWMANAGER="ratpoison"
# Displayserver to use (xorg-server / no)
DISPLAYSERVER="xorg-server"
# Xorg Graphic drivers to use (all / i915,i965,r200,r300,r600,fglrx,nvidia,nouveau,vmware)
# Space separated list is supported,
# e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeon nvidia nouveau"
GRAPHIC_DRIVERS="nvidia"
# XBMC Player implementation to use (default / bcm2835-driver / libamlplayer-m3)
XBMCPLAYER_DRIVER="default"
# Use VDPAU video acceleration (needs nVidia driver and a supported card)
VDPAU="yes"
# Use VAAPI video acceleration (needs intel i965 driver and a supported card)
VAAPI="no"
# Use XVBA video acceleration (needs AMD fglrx driver and a supported card)
XVBA="no"
# Use Broadcom CrystalHD Decoder Card for video acceleration
# (needs Kernelsupport for Broadcom Decoder Card and a supported card)
CRYSTALHD="no"
# build and install remote support (yes / no)
REMOTE_SUPPORT="yes"
# build and install ATV IR remote support (yes / no)
ATVCLIENT_SUPPORT="no"
# build and install IRServer IR/LCD support (yes / no)
IRSERVER_SUPPORT="no"
# build and install Joystick support (yes / no)
JOYSTICK_SUPPORT="yes"
# build and install CEC adapter support (yes / no)
CEC_SUPPORT="yes"
# build and install iSCSI support - iscsistart (yes / no)
ISCSI_SUPPORT="yes"
# LCD driver to Use - Possible drivers are ( Comma seperated:
# bayrad,CFontz,CFontz633,CFontzPacket,curses,CwLnx,dm140,
# ea65,EyeboxOne,g15,glcdlib,glk,hd44780,i2500vfd,
# icp_a106,imon,imonlcd,IOWarrior,irman,irtrans,
# joy,lb216,lcdm001,lcterm,lirc,lis,MD8800,mdm166a,
# ms6931,mtc_s16209x,MtxOrb,mx5000,NoritakeVFD,
# picolcd,pyramid,sed1330,sed1520,serialPOS,
# serialVFD,shuttleVFD,sli,stv5730,SureElec,svga,vlsys_m428
# 'all' compiles all drivers;
# 'all,!xxx,!yyy' de-selects previously selected drivers
# "none" for disable LCD support
LCD_DRIVER="none"
# Modules to install in initramfs for early boot
INITRAMFS_MODULES="uvesafb xhci-hcd"
# additional Firmware to use (dvb-firmware, misc-firmware, wlan-firmware)
# Space separated list is supported,
# e.g. FIRMWARE="dvb-firmware misc-firmware wlan-firmware"
FIRMWARE="misc-firmware wlan-firmware dvb-firmware"
# build with lm_sensors hardware monitoring support (yes / no)
SENSOR_SUPPORT="yes"
# build with swap support (yes / no)
SWAP_SUPPORT="no"
# swapfile size if SWAP_SUPPORT=yes in MB
SWAPFILESIZE="256"
# build with installer (yes / no)
INSTALLER_SUPPORT="yes"
# Testpackages for development (yes / no)
TESTING="no"
# OEM packages for OEM's (yes / no)
OEM_SUPPORT="no"
# build and install nano text editor (yes / no)
NANO_EDITOR="yes"
# cron support (yes / no)
CRON_SUPPORT="yes"
# Perf support in development builds (yes / no)
PERF_SUPPORT="yes"
# Coreboot support (yes / no)
COREBOOT="no"
# Distribution Specific source location
DISTRO_MIRROR="http://sources.openelec.tv/mirror"
DISTRO_SRC="http://sources.openelec.tv/$OPENELEC_VERSION"
# Addon Server Url
ADDON_SERVER_URL="http://addons.openelec.tv"
# set the addon dirs
ADDON_PATH="$ADDON_VERSION/$PROJECT/$TARGET_ARCH"
ADDON_URL="$ADDON_SERVER_URL/$ADDON_PATH"

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 MiB

Some files were not shown because too many files have changed in this diff Show More