mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-31 14:37:59 +00:00
Merge branch 'master' into openelec-pvr
Conflicts: packages/mediacenter/xbmc-theme-Confluence/meta packages/mediacenter/xbmc/meta packages/mediacenter/xbmc/patches/xbmc-70537d2-001-add_support_to_specify_GIT_REV-0.1.patch packages/mediacenter/xbmc/patches/xbmc-70537d2-013-reenable_lcd_config_settings-0.1.patch packages/mediacenter/xbmc/patches/xbmc-70537d2-303-fix_libdvd_xFLAGS-0.1.patch packages/mediacenter/xbmc/patches/xbmc-70537d2-311-fix_rsxs_build-0.1.patch packages/mediacenter/xbmc/patches/xbmc-70537d2-351-increase_YV12_buffers-0.1.patch packages/mediacenter/xbmc/patches/xbmc-70537d2-353-limit_glxSwapBuffers_going_to_far_ahead-0.1.patch packages/mediacenter/xbmc/patches/xbmc-70537d2-354-vaapi_increase_number_of_video_surface_allocated-0.1.patch packages/mediacenter/xbmc/patches/xbmc-70537d2-402-enable_yasm_in_ffmpeg-0.1.patch packages/mediacenter/xbmc/patches/xbmc-70537d2-404-add_lame_check-0.6.patch packages/mediacenter/xbmc/patches/xbmc-70537d2-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch packages/mediacenter/xbmc/patches/xbmc-70537d2-452-change_lcd_content-0.1.patch packages/mediacenter/xbmc/patches/xbmc-70537d2-453-add_openelec.tv_RSS_news-0.1.patch packages/mediacenter/xbmc/patches/xbmc-70537d2-453-ps3_remote_be_more_quiet-0.1.patch packages/mediacenter/xbmc/patches/xbmc-70537d2-454-disable_backslash-0.1.patch packages/mediacenter/xbmc/patches/xbmc-70537d2-462-add_remote_irtrans_mediacenter-0.1.patch packages/mediacenter/xbmc/patches/xbmc-70537d2-463-add_remote_devinput-0.1.patch packages/mediacenter/xbmc/patches/xbmc-70537d2-464-add_eject_keymapping_for_lirc-0.1.patch packages/mediacenter/xbmc/patches/xbmc-79cceb5-001-add_support_to_specify_GIT_REV-0.1.patch packages/mediacenter/xbmc/patches/xbmc-79cceb5-013-reenable_lcd_config_settings-0.1.patch packages/mediacenter/xbmc/patches/xbmc-79cceb5-303-fix_libdvd_xFLAGS-0.1.patch packages/mediacenter/xbmc/patches/xbmc-79cceb5-311-fix_rsxs_build-0.1.patch packages/mediacenter/xbmc/patches/xbmc-79cceb5-351-increase_YV12_buffers-0.1.patch packages/mediacenter/xbmc/patches/xbmc-79cceb5-353-limit_glxSwapBuffers_going_to_far_ahead-0.1.patch packages/mediacenter/xbmc/patches/xbmc-79cceb5-354-vaapi_increase_number_of_video_surface_allocated-0.1.patch packages/mediacenter/xbmc/patches/xbmc-79cceb5-402-enable_yasm_in_ffmpeg-0.1.patch packages/mediacenter/xbmc/patches/xbmc-79cceb5-404-add_lame_check-0.6.patch packages/mediacenter/xbmc/patches/xbmc-79cceb5-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch packages/mediacenter/xbmc/patches/xbmc-79cceb5-452-change_lcd_content-0.1.patch packages/mediacenter/xbmc/patches/xbmc-79cceb5-453-add_openelec.tv_RSS_news-0.1.patch packages/mediacenter/xbmc/patches/xbmc-79cceb5-453-ps3_remote_be_more_quiet-0.1.patch packages/mediacenter/xbmc/patches/xbmc-79cceb5-454-disable_backslash-0.1.patch packages/mediacenter/xbmc/patches/xbmc-79cceb5-462-add_remote_irtrans_mediacenter-0.1.patch packages/mediacenter/xbmc/patches/xbmc-79cceb5-463-add_remote_devinput-0.1.patch packages/mediacenter/xbmc/patches/xbmc-79cceb5-464-add_eject_keymapping_for_lirc-0.1.patch packages/mediacenter/xbmc/patches/xbmc-bee1ab5-001-add_support_to_specify_GIT_REV-0.1.patch packages/mediacenter/xbmc/patches/xbmc-bee1ab5-013-reenable_lcd_config_settings-0.1.patch packages/mediacenter/xbmc/patches/xbmc-bee1ab5-303-fix_libdvd_xFLAGS-0.1.patch packages/mediacenter/xbmc/patches/xbmc-bee1ab5-311-fix_rsxs_build-0.1.patch packages/mediacenter/xbmc/patches/xbmc-bee1ab5-351-increase_YV12_buffers-0.1.patch packages/mediacenter/xbmc/patches/xbmc-bee1ab5-353-limit_glxSwapBuffers_going_to_far_ahead-0.1.patch packages/mediacenter/xbmc/patches/xbmc-bee1ab5-354-vaapi_increase_number_of_video_surface_allocated-0.1.patch packages/mediacenter/xbmc/patches/xbmc-bee1ab5-402-enable_yasm_in_ffmpeg-0.1.patch packages/mediacenter/xbmc/patches/xbmc-bee1ab5-404-add_lame_check-0.6.patch packages/mediacenter/xbmc/patches/xbmc-bee1ab5-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch packages/mediacenter/xbmc/patches/xbmc-bee1ab5-452-change_lcd_content-0.1.patch packages/mediacenter/xbmc/patches/xbmc-bee1ab5-453-add_openelec.tv_RSS_news-0.1.patch packages/mediacenter/xbmc/patches/xbmc-bee1ab5-453-ps3_remote_be_more_quiet-0.1.patch packages/mediacenter/xbmc/patches/xbmc-bee1ab5-454-disable_backslash-0.1.patch packages/mediacenter/xbmc/patches/xbmc-bee1ab5-462-add_remote_irtrans_mediacenter-0.1.patch packages/mediacenter/xbmc/patches/xbmc-bee1ab5-463-add_remote_devinput-0.1.patch packages/mediacenter/xbmc/patches/xbmc-bee1ab5-464-add_eject_keymapping_for_lirc-0.1.patch projects/ATV/options projects/Fusion/options projects/Generic/options projects/Generic_OSS/options projects/ION/options projects/Intel/options projects/Ultra/options
This commit is contained in:
Gujs
commit
b66cb0970a
@ -14,3 +14,4 @@ Added functions:
|
||||
|
||||
Removed functions:
|
||||
- remove netmount.conf (XBMC includes native NFS/AFP/CIFS/SSH support)
|
||||
|
||||
|
||||
29
packages/addons/multimedia/xbmc-addon-xvdr/addon
Executable file
29
packages/addons/multimedia/xbmc-addon-xvdr/addon
Executable file
@ -0,0 +1,29 @@
|
||||
#!/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
|
||||
|
||||
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID
|
||||
cp -PR $PKG_BUILD/addons/pvr.vdr.xvdr/resources $ADDON_BUILD/$PKG_ADDON_ID
|
||||
cp -P $PKG_BUILD/addons/pvr.vdr.xvdr/addon.xml $ADDON_BUILD/$PKG_ADDON_ID
|
||||
cp -P $PKG_BUILD/addons/pvr.vdr.xvdr/icon.png $ADDON_BUILD/$PKG_ADDON_ID
|
||||
cp -P $PKG_BUILD/addons/pvr.vdr.xvdr/XBMC_VDR_xvdr.pvr $ADDON_BUILD/$PKG_ADDON_ID
|
||||
38
packages/addons/multimedia/xbmc-addon-xvdr/build
Executable file
38
packages/addons/multimedia/xbmc-addon-xvdr/build
Executable file
@ -0,0 +1,38 @@
|
||||
#!/bin/sh
|
||||
|
||||
################################################################################
|
||||
# This file is part of OpenELEC - http://www.openelec.tv
|
||||
# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
|
||||
#
|
||||
# This Program is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation; either version 2, or (at your option)
|
||||
# any later version.
|
||||
#
|
||||
# This Program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with OpenELEC.tv; see the file COPYING. If not, write to
|
||||
# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
# http://www.gnu.org/copyleft/gpl.html
|
||||
################################################################################
|
||||
|
||||
. config/options $1
|
||||
|
||||
cd $PKG_BUILD
|
||||
|
||||
# some fixes for autoreconf
|
||||
touch NEWS AUTHORS ChangeLog
|
||||
do_autoreconf
|
||||
|
||||
CXXFLAGS="-DZLIB_INTERNAL=1" \
|
||||
./configure --host=$TARGET_NAME \
|
||||
--build=$HOST_NAME \
|
||||
--prefix=/usr \
|
||||
--disable-static \
|
||||
--enable-shared
|
||||
|
||||
make
|
||||
2
packages/addons/multimedia/xbmc-addon-xvdr/changelog.txt
Normal file
2
packages/addons/multimedia/xbmc-addon-xvdr/changelog.txt
Normal file
@ -0,0 +1,2 @@
|
||||
1.0.0
|
||||
- initial import of xbmc-addon-xvdr-9822a8a
|
||||
BIN
packages/addons/multimedia/xbmc-addon-xvdr/icon/icon.png
Normal file
BIN
packages/addons/multimedia/xbmc-addon-xvdr/icon/icon.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 26 KiB |
29
packages/addons/multimedia/xbmc-addon-xvdr/install
Executable file
29
packages/addons/multimedia/xbmc-addon-xvdr/install
Executable file
@ -0,0 +1,29 @@
|
||||
#!/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
|
||||
|
||||
mkdir -p $INSTALL/usr/share/xbmc/addons/pvr.vdr.xvdr
|
||||
cp -PRf $PKG_BUILD/addons/pvr.vdr.xvdr/resources $INSTALL/usr/share/xbmc/addons/pvr.vdr.xvdr
|
||||
cp -Pf $PKG_BUILD/addons/pvr.vdr.xvdr/addon.xml $INSTALL/usr/share/xbmc/addons/pvr.vdr.xvdr
|
||||
# cp -Pf $PKG_BUILD/addons/pvr.vdr.xvdr/icon.png $INSTALL/usr/share/xbmc/addons/pvr.vdr.xvdr
|
||||
cp -Pf $PKG_BUILD/addons/pvr.vdr.xvdr/XBMC_VDR_xvdr.pvr $INSTALL/usr/share/xbmc/addons/pvr.vdr.xvdr
|
||||
37
packages/addons/multimedia/xbmc-addon-xvdr/meta
Normal file
37
packages/addons/multimedia/xbmc-addon-xvdr/meta
Normal file
@ -0,0 +1,37 @@
|
||||
################################################################################
|
||||
# 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="xbmc-addon-xvdr"
|
||||
PKG_VERSION="9822a8a"
|
||||
PKG_REV="0"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="https://github.com/pipelka/xbmc-addon-xvdr"
|
||||
PKG_URL="http://dl.dropbox.com/u/240579/xbmc-addon-xvdr/xbmc-addon-xvdr-$PKG_VERSION.tar.gz"
|
||||
PKG_DEPENDS="zlib"
|
||||
PKG_BUILD_DEPENDS="toolchain zlib"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="multimedia/pvr"
|
||||
PKG_SHORTDESC="XVDR addon for XBMC"
|
||||
PKG_LONGDESC="This addon allows XBMC PVR to connect to the VDR server."
|
||||
PKG_IS_ADDON="yes"
|
||||
PKG_ADDON_TYPE="xbmc.python.script"
|
||||
|
||||
PKG_AUTORECONF="no"
|
||||
23
packages/addons/multimedia/xbmc-addon-xvdr/source/default.py
Normal file
23
packages/addons/multimedia/xbmc-addon-xvdr/source/default.py
Normal file
@ -0,0 +1,23 @@
|
||||
################################################################################
|
||||
# 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
|
||||
################################################################################
|
||||
|
||||
import os
|
||||
import sys
|
||||
import xbmcaddon
|
||||
@ -22,5 +22,9 @@
|
||||
|
||||
. config/options $1
|
||||
|
||||
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID
|
||||
cp -PR $PKG_DIR/config/settings.xml* $ADDON_BUILD/$PKG_ADDON_ID/settings-default.xml
|
||||
cp -PR $PKG_DIR/config/xmltv-config* $ADDON_BUILD/$PKG_ADDON_ID/xmltv-config
|
||||
|
||||
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
|
||||
cp -P $PKG_BUILD/build.Linux/tvheadend $ADDON_BUILD/$PKG_ADDON_ID/bin
|
||||
|
||||
@ -1,3 +1,12 @@
|
||||
1.0.2
|
||||
- add (CH) GA Weissenstein default muxes
|
||||
|
||||
1.0.1
|
||||
- add XMLTV tv_file_grab support
|
||||
- add XMLTV configuration support
|
||||
- add teletext support patch
|
||||
- add fix memory leak patch
|
||||
|
||||
1.0.0
|
||||
- prepare for OpenELEC-1.0 release
|
||||
|
||||
|
||||
@ -0,0 +1,4 @@
|
||||
<settings>
|
||||
<setting id="XMLTV_LOCATION" value="" />
|
||||
<setting id="XMLTV_TYPE" value="NONE" />
|
||||
</settings>
|
||||
@ -0,0 +1,14 @@
|
||||
{
|
||||
"grabbers": [
|
||||
{
|
||||
"path": "/storage/.xbmc/addons/service.multimedia.hts-tvheadend/bin/tv_grab_file",
|
||||
"description": "tv_grag_file is a simple grabber that just read the ~/.xmltv/tv_grab_file.xmltv file",
|
||||
"version": "0.1\n",
|
||||
"mtime": 1318774706,
|
||||
"capabilities": 1
|
||||
}
|
||||
],
|
||||
"grab-interval": 12,
|
||||
"grab-enabled": 1,
|
||||
"current-grabber": "/storage/.xbmc/addons/service.multimedia.hts-tvheadend/bin/tv_grab_file"
|
||||
}
|
||||
@ -20,7 +20,7 @@
|
||||
|
||||
PKG_NAME="hts-tvheadend"
|
||||
PKG_VERSION="c88a646"
|
||||
PKG_REV="0"
|
||||
PKG_REV="2"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://www.lonelycoder.com/hts/tvheadend_overview.html"
|
||||
|
||||
@ -0,0 +1,55 @@
|
||||
diff -Naur hts-tvheadend-c88a646/src/linuxtv_muxes.h hts-tvheadend-c88a646.patch/src/linuxtv_muxes.h
|
||||
--- hts-tvheadend-c88a646/src/linuxtv_muxes.h 2011-09-26 20:18:12.000000000 +0200
|
||||
+++ hts-tvheadend-c88a646.patch/src/linuxtv_muxes.h 2011-10-18 13:40:37.768853992 +0200
|
||||
@@ -12001,6 +12001,39 @@
|
||||
{ .freq = 573000000, .symrate = 5217000, .fec = 0, .constellation = 5},
|
||||
};
|
||||
|
||||
+static const struct mux muxes_DVBC_ch_GA_Weissenstein[] = {
|
||||
+ { .freq = 450000000, .symrate = 6900000, .fec = 0, .constellation = 5},
|
||||
+ { .freq = 506000000, .symrate = 6900000, .fec = 0, .constellation = 5},
|
||||
+ { .freq = 514000000, .symrate = 6900000, .fec = 0, .constellation = 5},
|
||||
+ { .freq = 522000000, .symrate = 6900000, .fec = 0, .constellation = 5},
|
||||
+ { .freq = 530000000, .symrate = 6900000, .fec = 0, .constellation = 5},
|
||||
+ { .freq = 538000000, .symrate = 6900000, .fec = 0, .constellation = 5},
|
||||
+ { .freq = 554000000, .symrate = 6900000, .fec = 0, .constellation = 5},
|
||||
+ { .freq = 562000000, .symrate = 6900000, .fec = 0, .constellation = 5},
|
||||
+ { .freq = 570000000, .symrate = 6900000, .fec = 0, .constellation = 5},
|
||||
+ { .freq = 578000000, .symrate = 6900000, .fec = 0, .constellation = 5},
|
||||
+ { .freq = 586000000, .symrate = 6900000, .fec = 0, .constellation = 5},
|
||||
+ { .freq = 594000000, .symrate = 6900000, .fec = 0, .constellation = 5},
|
||||
+ { .freq = 602000000, .symrate = 6900000, .fec = 0, .constellation = 5},
|
||||
+ { .freq = 610000000, .symrate = 6900000, .fec = 0, .constellation = 5},
|
||||
+ { .freq = 618000000, .symrate = 6900000, .fec = 0, .constellation = 5},
|
||||
+ { .freq = 626000000, .symrate = 6900000, .fec = 0, .constellation = 5},
|
||||
+ { .freq = 634000000, .symrate = 6900000, .fec = 0, .constellation = 5},
|
||||
+ { .freq = 642000000, .symrate = 6900000, .fec = 0, .constellation = 5},
|
||||
+ { .freq = 650000000, .symrate = 6900000, .fec = 0, .constellation = 5},
|
||||
+ { .freq = 658000000, .symrate = 6900000, .fec = 0, .constellation = 5},
|
||||
+ { .freq = 666000000, .symrate = 6900000, .fec = 0, .constellation = 5},
|
||||
+ { .freq = 674000000, .symrate = 6900000, .fec = 0, .constellation = 5},
|
||||
+ { .freq = 682000000, .symrate = 6900000, .fec = 0, .constellation = 5},
|
||||
+ { .freq = 690000000, .symrate = 6900000, .fec = 0, .constellation = 5},
|
||||
+ { .freq = 698000000, .symrate = 6900000, .fec = 0, .constellation = 3},
|
||||
+ { .freq = 698000000, .symrate = 6900000, .fec = 0, .constellation = 5},
|
||||
+ { .freq = 706000000, .symrate = 6900000, .fec = 0, .constellation = 5},
|
||||
+ { .freq = 714000000, .symrate = 6900000, .fec = 0, .constellation = 5},
|
||||
+ { .freq = 722000000, .symrate = 6900000, .fec = 0, .constellation = 5},
|
||||
+ { .freq = 730000000, .symrate = 6900000, .fec = 0, .constellation = 5},
|
||||
+};
|
||||
+
|
||||
static const struct mux muxes_DVBC_ch_Rega_Sense[] = {
|
||||
{ .freq = 434000000, .symrate = 6900000, .fec = 0, .constellation = 3},
|
||||
{ .freq = 714000000, .symrate = 6900000, .fec = 0, .constellation = 3},
|
||||
@@ -12881,6 +12914,11 @@
|
||||
|
||||
static const struct network networks_DVBC_ch[] = {
|
||||
{
|
||||
+ .name = "GA-Weissenstein",
|
||||
+ .muxes = muxes_DVBC_ch_GA_Weissenstein,
|
||||
+ .nmuxes = sizeof(muxes_DVBC_ch_GA_Weissenstein) / sizeof(struct mux),
|
||||
+ },
|
||||
+ {
|
||||
.name = "Rega-Sense",
|
||||
.muxes = muxes_DVBC_ch_Rega_Sense,
|
||||
.nmuxes = sizeof(muxes_DVBC_ch_Rega_Sense) / sizeof(struct mux),
|
||||
@ -0,0 +1,112 @@
|
||||
From 3b407aa2053b1db3316873acd05c64319676eb34 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Jernej=20Fija=C4=8Dko?= <jernej@jernej-ThinkCentre-M91p.(none)>
|
||||
Date: Fri, 30 Sep 2011 12:56:01 +0200
|
||||
Subject: [PATCH] Deliver raw teletext to clients that are able to display it (e.g. XBMC)
|
||||
|
||||
---
|
||||
src/parsers.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||
src/tsdemux.c | 7 +++----
|
||||
2 files changed, 58 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/src/parsers.c b/src/parsers.c
|
||||
index 9b7337d..68c7996 100644
|
||||
--- a/src/parsers.c
|
||||
+++ b/src/parsers.c
|
||||
@@ -102,6 +102,9 @@ static void parse_aac(service_t *t, elementary_stream_t *st, const uint8_t *data
|
||||
static void parse_subtitles(service_t *t, elementary_stream_t *st,
|
||||
const uint8_t *data, int len, int start);
|
||||
|
||||
+static void parse_teletext(service_t *t, elementary_stream_t *st,
|
||||
+ const uint8_t *data, int len, int start);
|
||||
+
|
||||
static int parse_mpa(service_t *t, elementary_stream_t *st, size_t len,
|
||||
uint32_t next_startcode, int sc_offset);
|
||||
|
||||
@@ -158,6 +161,10 @@ parse_mpeg_ts(service_t *t, elementary_stream_t *st, const uint8_t *data,
|
||||
parse_aac(t, st, data, len, start);
|
||||
break;
|
||||
|
||||
+ case SCT_TELETEXT:
|
||||
+ parse_teletext(t, st, data, len, start);
|
||||
+ break;
|
||||
+
|
||||
default:
|
||||
break;
|
||||
}
|
||||
@@ -1232,6 +1239,54 @@ parse_subtitles(service_t *t, elementary_stream_t *st, const uint8_t *data,
|
||||
}
|
||||
}
|
||||
|
||||
+/**
|
||||
+ * Teletext parser
|
||||
+ */
|
||||
+static void
|
||||
+parse_teletext(service_t *t, elementary_stream_t *st, const uint8_t *data,
|
||||
+ int len, int start)
|
||||
+{
|
||||
+ th_pkt_t *pkt;
|
||||
+ int psize, hlen;
|
||||
+ const uint8_t *buf;
|
||||
+ const uint8_t *d;
|
||||
+ if(start) {
|
||||
+ st->es_parser_state = 1;
|
||||
+ st->es_buf.sb_err = 0;
|
||||
+ st->es_parser_ptr = 0;
|
||||
+ sbuf_reset(&st->es_buf);
|
||||
+ }
|
||||
+
|
||||
+ if(st->es_parser_state == 0)
|
||||
+ return;
|
||||
+
|
||||
+ sbuf_append(&st->es_buf, data, len);
|
||||
+
|
||||
+ if(st->es_buf.sb_ptr < 6)
|
||||
+ return;
|
||||
+ d = st->es_buf.sb_data;
|
||||
+
|
||||
+ psize = d[4] << 8 | d[5];
|
||||
+
|
||||
+ if(st->es_buf.sb_ptr != psize + 6)
|
||||
+ return;
|
||||
+
|
||||
+ st->es_parser_state = 0;
|
||||
+
|
||||
+ hlen = parse_pes_header(t, st, d + 6, st->es_buf.sb_ptr - 6);
|
||||
+ if(hlen < 0)
|
||||
+ return;
|
||||
+
|
||||
+ psize -= hlen;
|
||||
+ buf = d + 6 + hlen;
|
||||
+
|
||||
+ if(psize >= 46) {
|
||||
+
|
||||
+ pkt = pkt_alloc(buf, psize, st->es_curpts, st->es_curdts);
|
||||
+ pkt->pkt_commercial = t->s_tt_commercial_advice;
|
||||
+ parser_deliver(t, st, pkt);
|
||||
+ }
|
||||
+}
|
||||
|
||||
/**
|
||||
*
|
||||
diff --git a/src/tsdemux.c b/src/tsdemux.c
|
||||
index 897fe1d..5fdaf8b 100644
|
||||
--- a/src/tsdemux.c
|
||||
+++ b/src/tsdemux.c
|
||||
@@ -110,11 +110,10 @@ ts_recv_packet0(service_t *t, elementary_stream_t *st, const uint8_t *tsb)
|
||||
got_section, st);
|
||||
break;
|
||||
|
||||
- case SCT_TELETEXT:
|
||||
- teletext_input(t, st, tsb);
|
||||
- break;
|
||||
-
|
||||
default:
|
||||
+ if(st->es_type == SCT_TELETEXT)
|
||||
+ teletext_input(t, st, tsb);
|
||||
+
|
||||
if(off > 188)
|
||||
break;
|
||||
|
||||
--
|
||||
1.7.3.1
|
||||
|
||||
@ -0,0 +1,26 @@
|
||||
From 60e5a1014c52e926fb7dbb12392f60a473e44d2c Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Jernej=20Fija=C4=8Dko?= <jernej@jernej-ThinkCentre-M91p.(none)>
|
||||
Date: Fri, 30 Sep 2011 13:23:46 +0200
|
||||
Subject: [PATCH] Fix memory leak in queue size protection
|
||||
|
||||
---
|
||||
src/htsp.c | 3 +++
|
||||
1 files changed, 3 insertions(+), 0 deletions(-)
|
||||
|
||||
diff --git a/src/htsp.c b/src/htsp.c
|
||||
index 8bb803b..f786a88 100644
|
||||
--- a/src/htsp.c
|
||||
+++ b/src/htsp.c
|
||||
@@ -1508,6 +1508,9 @@ htsp_stream_deliver(htsp_subscription_t *hs, th_pkt_t *pkt)
|
||||
|
||||
hs->hs_dropstats[pkt->pkt_frametype]++;
|
||||
|
||||
+ // destroy the already created htsmsg to avoid memory leaks
|
||||
+ htsmsg_destroy(m);
|
||||
+
|
||||
/* Queue size protection */
|
||||
pkt_ref_dec(pkt);
|
||||
return;
|
||||
--
|
||||
1.7.3.1
|
||||
|
||||
58
packages/addons/service/multimedia/hts-tvheadend/source/bin/tv_grab_file
Executable file
58
packages/addons/service/multimedia/hts-tvheadend/source/bin/tv_grab_file
Executable file
@ -0,0 +1,58 @@
|
||||
#!/bin/sh
|
||||
|
||||
ADDON_HOME="$HOME/.xbmc/userdata/addon_data/service.multimedia.hts-tvheadend"
|
||||
ADDON_SETTINGS="$ADDON_HOME/settings.xml"
|
||||
XMLTV_TYPE=`grep XMLTV_TYPE $ADDON_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
|
||||
XMLTV_LOCATION=`grep XMLTV_LOCATION $ADDON_SETTINGS | awk '{print $3 }' | sed -e "s,value=,," -e "s,\",,g"`
|
||||
|
||||
dflag=
|
||||
vflag=
|
||||
cflag=
|
||||
|
||||
if [[ $# -lt 1 ]]; then
|
||||
if [ "$XMLTV_TYPE" = "FILE" ]; then
|
||||
cat "$XMLTV_LOCATION"
|
||||
exit 0
|
||||
elif [ "$XMLTV_TYPE" = "WEB" ]; then
|
||||
wget -qO - "$XMLTV_LOCATION"
|
||||
exit 0
|
||||
fi
|
||||
fi
|
||||
|
||||
for arg; do
|
||||
delim=""
|
||||
case "$arg" in
|
||||
#translate --gnu-long-options to -g (short options)
|
||||
--description) args="${args}-d ";;
|
||||
--version) args="${args}-v ";;
|
||||
--capabilities) args="${args}-c ";;
|
||||
#pass through anything else
|
||||
*) [[ "${arg:0:1}" == "-" ]] || delim="\""
|
||||
args="${args}${delim}${arg}${delim} ";;
|
||||
esac
|
||||
done
|
||||
|
||||
#Reset the positional parameters to the short options
|
||||
eval set -- $args
|
||||
|
||||
while getopts "dvc" option; do
|
||||
case $option in
|
||||
d) dflag=1;;
|
||||
v) vflag=1;;
|
||||
c) cflag=1;;
|
||||
\?) printf "unknown option: -%s\n" $OPTARG
|
||||
printf "Usage: %s: [--description] [--version] [--capabilities] \n" $(basename $0)
|
||||
exit 2
|
||||
;;
|
||||
esac >&2
|
||||
done
|
||||
|
||||
if [ "$dflag" ]; then
|
||||
printf "tv_grab_file is a simple grabber that just read the local or web XMLTV formated file\n"
|
||||
fi
|
||||
if [ "$vflag" ]; then
|
||||
printf "0.1\n"
|
||||
fi
|
||||
if [ "$cflag" ]; then
|
||||
printf "baseline\n"
|
||||
fi
|
||||
@ -23,10 +23,27 @@
|
||||
ADDON_DIR="$HOME/.xbmc/addons/service.multimedia.hts-tvheadend"
|
||||
ADDON_HOME="$HOME/.xbmc/userdata/addon_data/service.multimedia.hts-tvheadend"
|
||||
LOG_FILE="$ADDON_HOME/service.log"
|
||||
ADDON_SETTINGS="$ADDON_HOME/settings.xml"
|
||||
XMLTV_FILE="$ADDON_DIR/bin/tv_grab_file"
|
||||
XMLTV_SETTINGS_DIR="$ADDON_HOME/xmltv"
|
||||
XMLTV_SETTINGS_FILE="$XMLTV_SETTINGS_DIR/config"
|
||||
|
||||
if [ ! -f "$ADDON_SETTINGS" ]; then
|
||||
cp $ADDON_DIR/settings-default.xml $ADDON_SETTINGS
|
||||
fi
|
||||
|
||||
if [ ! -f "$XMLTV_SETTINGS_FILE" ]; then
|
||||
mkdir -p $XMLTV_SETTINGS_DIR
|
||||
cp $ADDON_DIR/xmltv-config $XMLTV_SETTINGS_FILE
|
||||
fi
|
||||
|
||||
if [ ! -f "$XMLTV_FILE" ]; then
|
||||
chmod +x $XMLTV_FILE
|
||||
fi
|
||||
|
||||
TVHEADEND_ARG="-f -C -s -u root -g root -c $ADDON_HOME"
|
||||
|
||||
mkdir -p $ADDON_HOME
|
||||
if [ ! $(pidof tvheadend) ];then
|
||||
tvheadend $TVHEADEND_ARG &>$LOG_FILE
|
||||
fi
|
||||
fi
|
||||
|
||||
@ -0,0 +1,10 @@
|
||||
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
|
||||
<strings>
|
||||
|
||||
<!-- SABnzbd-Suite -->
|
||||
<string id="1000">XMLTV</string>
|
||||
<string id="1011">XMLTV configuration</string>
|
||||
<string id="1011">XMLTV source type</string>
|
||||
<string id="1012">XMLTV location</string>
|
||||
|
||||
</strings>
|
||||
@ -0,0 +1,11 @@
|
||||
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
|
||||
<settings>
|
||||
|
||||
<!-- HTS TVHEADEND -->
|
||||
<category label="1000">
|
||||
<setting label="1010" type="lsep"/>
|
||||
<setting type="sep" />
|
||||
<setting id="XMLTV_TYPE" type="labelenum" label="1011" values="NONE|FILE|WEB" sort="yes" default="NONE"/>
|
||||
<setting id="XMLTV_LOCATION" type="text" label="1012" default="" enable="!eq(-1,1)"/>
|
||||
</category>
|
||||
</settings>
|
||||
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="pulseaudio"
|
||||
PKG_VERSION="1.0"
|
||||
PKG_VERSION="1.1"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="libcec"
|
||||
PKG_VERSION="8f084f0"
|
||||
PKG_VERSION="cb91287"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="libtool"
|
||||
PKG_VERSION="2.4"
|
||||
PKG_VERSION="2.4.2"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="dvb-firmware"
|
||||
PKG_VERSION="0.0.13"
|
||||
PKG_VERSION="0.0.15"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="Free-to-use"
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="linux"
|
||||
PKG_VERSION="3.1-rc9"
|
||||
PKG_VERSION="3.1-rc10"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
||||
@ -36,6 +36,16 @@ fi
|
||||
# hack: make addon-bins executable
|
||||
chmod +x /storage/.xbmc/addons/*/bin/* > /dev/null 2>&1
|
||||
|
||||
# hack to support user installed fonts
|
||||
SUBFONTS="/storage/.xbmc/userdata/fonts"
|
||||
if [ -d "$SUBFONTS" ]; then
|
||||
files=$(ls $SUBFONTS/*.[tT][tT][fF] 2>/dev/null | wc -l)
|
||||
if [ "$files" = "0" ]; then
|
||||
cp /usr/share/xbmc/media/Fonts/*.[tT][tT][fF] $SUBFONTS/
|
||||
fi
|
||||
mount --bind $SUBFONTS /usr/share/xbmc/media/Fonts/
|
||||
fi
|
||||
|
||||
# starting autostart script (will be removed later again, dont use it!!!)
|
||||
AUTOSTART="/storage/.config/autostart.sh"
|
||||
if [ -f $AUTOSTART ]; then
|
||||
|
||||
@ -0,0 +1,15 @@
|
||||
diff -Naur xbmc-10.1-Dharma/xbmc/FileSystem/FileCurl.cpp xbmc-10.1-Dharma.patch/xbmc/FileSystem/FileCurl.cpp
|
||||
--- xbmc-10.1-Dharma/xbmc/filesystem/FileCurl.cpp 2011-03-08 02:49:14.000000000 +0100
|
||||
+++ xbmc-10.1-Dharma.patch/xbmc/filesystem/FileCurl.cpp 2011-10-17 19:21:04.180783870 +0200
|
||||
@@ -803,9 +803,9 @@
|
||||
// Detect whether we are "online" or not! Very simple and dirty!
|
||||
bool CFileCurl::IsInternet(bool checkDNS /* = true */)
|
||||
{
|
||||
- CStdString strURL = "http://www.google.com";
|
||||
+ CStdString strURL = "http://www.openelec.tv";
|
||||
if (!checkDNS)
|
||||
- strURL = "http://74.125.19.103"; // www.google.com ip
|
||||
+ strURL = "http://212.101.13.10"; // www.openelec.tv ip
|
||||
|
||||
bool found = Exists(strURL);
|
||||
Close();
|
||||
@ -24,7 +24,7 @@
|
||||
|
||||
case "$1" in
|
||||
thaw|resume)
|
||||
xbmc-send --host=127.0.0.1 -a "ReloadSkin()"
|
||||
xbmc-send --host=127.0.0.1 -a "ReloadSkin()" &
|
||||
;;
|
||||
*) exit $NA
|
||||
;;
|
||||
@ -23,4 +23,4 @@
|
||||
. config/options $1
|
||||
|
||||
mkdir -p $INSTALL/usr/lib
|
||||
cp $PKG_BUILD/lib/.libs/*.so* $INSTALL/usr/lib
|
||||
cp -P $PKG_BUILD/lib/.libs/*.so* $INSTALL/usr/lib
|
||||
|
||||
@ -34,17 +34,17 @@ mkdir -p $INSTALL/etc/dbus-1/system.d
|
||||
cp $PKG_BUILD/src/bluetooth.conf $INSTALL/etc/dbus-1/system.d
|
||||
|
||||
mkdir -p $INSTALL/lib/udev
|
||||
cp $PKG_BUILD/scripts/bluetooth_serial $INSTALL/lib/udev
|
||||
chmod +x $INSTALL/lib/udev/bluetooth_serial
|
||||
# not needed: cp $PKG_BUILD/scripts/bluetooth_serial $INSTALL/lib/udev
|
||||
# not needed: chmod +x $INSTALL/lib/udev/bluetooth_serial
|
||||
cp $PKG_BUILD/tools/hid2hci $INSTALL/lib/udev
|
||||
|
||||
mkdir -p $INSTALL/lib/udev/rules.d
|
||||
cp $PKG_BUILD/scripts/97-bluetooth.rules $INSTALL/lib/udev/rules.d
|
||||
cp $PKG_BUILD/scripts/97-bluetooth-hid2hci.rules $INSTALL/lib/udev/rules.d
|
||||
cp $PKG_BUILD/scripts/97-bluetooth-serial.rules $INSTALL/lib/udev/rules.d
|
||||
# todo: cp $PKG_BUILD/scripts/97-bluetooth-hid2hci.rules $INSTALL/lib/udev/rules.d
|
||||
# not needed: cp $PKG_BUILD/scripts/97-bluetooth-serial.rules $INSTALL/lib/udev/rules.d
|
||||
|
||||
mkdir -p $INSTALL/usr/lib
|
||||
cp $PKG_BUILD/lib/.libs/libbluetooth.so* $INSTALL/usr/lib
|
||||
cp -P $PKG_BUILD/lib/.libs/libbluetooth.so* $INSTALL/usr/lib
|
||||
|
||||
mkdir -p $INSTALL/usr/lib/alsa
|
||||
cp $PKG_BUILD/audio/.libs/*.so $INSTALL/usr/lib/alsa
|
||||
|
||||
@ -1,18 +0,0 @@
|
||||
diff -Naur wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service wpa_supplicant-0.7.3.patch/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service
|
||||
--- wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service 2010-09-07 17:43:39.000000000 +0200
|
||||
+++ wpa_supplicant-0.7.3.patch/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service 2011-04-08 19:04:10.740611827 +0200
|
||||
@@ -1,4 +1,4 @@
|
||||
[D-BUS Service]
|
||||
Name=fi.epitest.hostap.WPASupplicant
|
||||
-Exec=/sbin/wpa_supplicant -u
|
||||
+Exec=/sbin/wpa_supplicant -u -dd -t -f /var/log/wpa_supplicant.log
|
||||
User=root
|
||||
diff -Naur wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service wpa_supplicant-0.7.3.patch/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service
|
||||
--- wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service 2010-09-07 17:43:39.000000000 +0200
|
||||
+++ wpa_supplicant-0.7.3.patch/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service 2011-04-08 19:04:18.365451110 +0200
|
||||
@@ -1,4 +1,4 @@
|
||||
[D-BUS Service]
|
||||
Name=fi.w1.wpa_supplicant1
|
||||
-Exec=/sbin/wpa_supplicant -u
|
||||
+Exec=/sbin/wpa_supplicant -u -dd -t -f /var/log/wpa_supplicant.log
|
||||
User=root
|
||||
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="freetype"
|
||||
PKG_VERSION="2.4.6"
|
||||
PKG_VERSION="2.4.7"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
||||
@ -37,5 +37,3 @@ cd $PKG_BUILD
|
||||
make
|
||||
|
||||
$MAKEINSTALL
|
||||
|
||||
python -Wi -t $PYTHON_LIBDIR/compileall.py .
|
||||
|
||||
@ -29,25 +29,20 @@ mkdir -p $INSTALL/usr/lib
|
||||
|
||||
mkdir -p $PYTHON_LIB_DIR/site-packages
|
||||
cp $PKG_BUILD/pygtk.py $PYTHON_LIB_DIR/site-packages
|
||||
cp $PKG_BUILD/pygtk.pyc $PYTHON_LIB_DIR/site-packages
|
||||
echo "gtk-2.0" > $PYTHON_LIB_DIR/site-packages/pygtk.pth
|
||||
|
||||
mkdir -p $PYTHON_LIB_DIR/site-packages/gtk-2.0
|
||||
cp $PKG_BUILD/dsextras.py $PYTHON_LIB_DIR/site-packages/gtk-2.0
|
||||
cp $PKG_BUILD/dsextras.pyc $PYTHON_LIB_DIR/site-packages/gtk-2.0
|
||||
|
||||
mkdir -p $PYTHON_LIB_DIR/site-packages/gtk-2.0/gobject
|
||||
cp $PKG_BUILD/gobject/.libs/*.so $PYTHON_LIB_DIR/site-packages/gtk-2.0/gobject
|
||||
cp $PKG_BUILD/gobject/*.py $PYTHON_LIB_DIR/site-packages/gtk-2.0/gobject
|
||||
cp $PKG_BUILD/gobject/*.pyc $PYTHON_LIB_DIR/site-packages/gtk-2.0/gobject
|
||||
|
||||
mkdir -p $PYTHON_LIB_DIR/site-packages/gtk-2.0/glib
|
||||
cp $PKG_BUILD/glib/.libs/_glib.so $PYTHON_LIB_DIR/site-packages/gtk-2.0/glib
|
||||
cp $PKG_BUILD/glib/*.py $PYTHON_LIB_DIR/site-packages/gtk-2.0/glib
|
||||
cp $PKG_BUILD/glib/*.pyc $PYTHON_LIB_DIR/site-packages/gtk-2.0/glib
|
||||
|
||||
mkdir -p $PYTHON_LIB_DIR/site-packages/gtk-2.0/gio
|
||||
cp $PKG_BUILD/gio/.libs/_gio.so $PYTHON_LIB_DIR/site-packages/gtk-2.0/gio
|
||||
cp $PKG_BUILD/gio/.libs/unix.so $PYTHON_LIB_DIR/site-packages/gtk-2.0/gio
|
||||
cp $PKG_BUILD/gio/*.py $PYTHON_LIB_DIR/site-packages/gtk-2.0/gio
|
||||
cp $PKG_BUILD/gio/*.pyc $PYTHON_LIB_DIR/site-packages/gtk-2.0/gio
|
||||
|
||||
@ -35,5 +35,3 @@ cd $PKG_BUILD
|
||||
make
|
||||
|
||||
$MAKEINSTALL
|
||||
|
||||
python -Wi -t $PYTHON_LIBDIR/compileall.py .
|
||||
|
||||
@ -27,10 +27,10 @@ PYTHON_LIB_DIR=`ls -d $INSTALL/usr/lib/python*`
|
||||
mkdir -p $PYTHON_LIB_DIR/site-packages
|
||||
cp -P $PKG_BUILD/_dbus_bindings/.libs/*.so $PYTHON_LIB_DIR/site-packages
|
||||
cp -P $PKG_BUILD/_dbus_glib_bindings/.libs/*.so $PYTHON_LIB_DIR/site-packages
|
||||
cp $PKG_BUILD/*.pyc $PYTHON_LIB_DIR/site-packages
|
||||
cp $PKG_BUILD/*.py $PYTHON_LIB_DIR/site-packages
|
||||
|
||||
mkdir -p $PYTHON_LIB_DIR/site-packages/dbus
|
||||
cp $PKG_BUILD/dbus/*.pyc $PYTHON_LIB_DIR/site-packages/dbus
|
||||
cp $PKG_BUILD/dbus/*.py $PYTHON_LIB_DIR/site-packages/dbus
|
||||
|
||||
mkdir -p $PYTHON_LIB_DIR/site-packages/dbus/mainloop
|
||||
cp $PKG_BUILD/dbus/mainloop/*.pyc $PYTHON_LIB_DIR/site-packages/dbus/mainloop
|
||||
cp $PKG_BUILD/dbus/mainloop/*.py $PYTHON_LIB_DIR/site-packages/dbus/mainloop
|
||||
|
||||
38
packages/sysutils/busybox/profile.d/systemid.conf
Normal file
38
packages/sysutils/busybox/profile.d/systemid.conf
Normal file
@ -0,0 +1,38 @@
|
||||
################################################################################
|
||||
# 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
|
||||
################################################################################
|
||||
# Attempts to generate a unique system ID based on one local MAC address
|
||||
# SystemID SHOULD be the same between upgrades/reinstalls
|
||||
# MAC is hashed so that it cant be reversed making it anonymous
|
||||
# Used to help with global usage statistics
|
||||
################################################################################
|
||||
|
||||
SYSTEMID="00000000000000000000000000000000"
|
||||
|
||||
if [ -e "/sys/class/net/eth0/address" ]; then
|
||||
MAC_ADRESS=`cat /sys/class/net/eth0/address`
|
||||
elif [ -e "/sys/class/net/wlan0/address" ]; then
|
||||
MAC_ADRESS=`cat /sys/class/net/wlan0/address`
|
||||
fi
|
||||
|
||||
if [ -n "$MAC_ADRESS" ]; then
|
||||
SYSTEMID=`/bin/echo $MAC_ADRESS | /usr/bin/md5sum | /usr/bin/cut -f1 -d" "`
|
||||
fi
|
||||
|
||||
export SYSTEMID
|
||||
@ -1 +1 @@
|
||||
SUSPEND_MODULES="xhci-hcd jme anysee"
|
||||
SUSPEND_MODULES="xhci-hcd jme anysee rtl8192se"
|
||||
|
||||
@ -43,7 +43,9 @@ fi
|
||||
download () {
|
||||
case "$DL_METHOD" in
|
||||
wget)
|
||||
wget -c $1 -P $TMP_DIR > /dev/null 2>&1
|
||||
wget -U "$THIS_DISTRIBUTION ($THIS_ARCH): $THIS_VERSION" \
|
||||
-c ${1}?sysid=$SYSTEMID \
|
||||
-O $2 > /dev/null 2>&1
|
||||
;;
|
||||
scp)
|
||||
scp $SCP_ARG "$1" $TMP_DIR
|
||||
@ -69,7 +71,7 @@ if [ ! -f /var/lock/update.lock ]; then
|
||||
|
||||
# get infofile with the latest released version
|
||||
rm -rf $TMP_DIR/latest
|
||||
download "$UPDATEURL/latest"
|
||||
download "$UPDATEURL/latest" "$TMP_DIR/latest"
|
||||
|
||||
NEW_IMAGE="`cat $TMP_DIR/latest |grep "$THIS_DISTRIBUTION-$THIS_ARCH"`"
|
||||
NEW_VERSION="`echo "$NEW_IMAGE" | cut -d "-" -f5 | tr -d "r"`"
|
||||
@ -79,7 +81,7 @@ if [ ! -f /var/lock/update.lock ]; then
|
||||
# compare installed version with latest released version
|
||||
THIS_VERSION="`echo "$THIS_VERSION" | cut -d "-" -f3 | tr -d "r"`"
|
||||
|
||||
if [ -Z $NEW_VERSION ]; then
|
||||
if [ -z $NEW_VERSION ]; then
|
||||
NEW_VERSION="$THIS_VERSION"
|
||||
fi
|
||||
|
||||
@ -100,7 +102,7 @@ if [ ! -f /var/lock/update.lock ]; then
|
||||
|
||||
# downloading the new version
|
||||
rm -rf $TMP_DIR/$NEW_IMAGE.tar.bz2
|
||||
download "$UPDATEURL/$NEW_IMAGE.tar.bz2"
|
||||
download "$UPDATEURL/$NEW_IMAGE.tar.bz2" "$TMP_DIR/$NEW_IMAGE.tar.bz2"
|
||||
|
||||
# extract the image
|
||||
rm -rf $TMP_DIR/$NEW_IMAGE
|
||||
|
||||
@ -43,7 +43,9 @@ fi
|
||||
download () {
|
||||
case "$DL_METHOD" in
|
||||
wget)
|
||||
wget -c $1 -P $TMP_DIR > /dev/null 2>&1
|
||||
wget -U "$THIS_DISTRIBUTION ($THIS_ARCH): $THIS_VERSION" \
|
||||
-c ${1}?sysid=$SYSTEMID \
|
||||
-O $2 > /dev/null 2>&1
|
||||
;;
|
||||
scp)
|
||||
scp $SCP_ARG "$1" $TMP_DIR
|
||||
@ -72,7 +74,7 @@ if [ ! -f /var/lock/update.lock ]; then
|
||||
|
||||
# get infofile with the latest released version
|
||||
rm -rf $TMP_DIR/latest
|
||||
download "$UPDATEURL/latest"
|
||||
download "$UPDATEURL/latest" "$TMP_DIR/latest"
|
||||
|
||||
NEW_IMAGE="`cat $TMP_DIR/latest |grep "$THIS_DISTRIBUTION-$THIS_ARCH"`"
|
||||
NEW_VERSION="`echo "$NEW_IMAGE" | cut -d "-" -f3`"
|
||||
@ -116,7 +118,7 @@ if [ ! -f /var/lock/update.lock ]; then
|
||||
|
||||
# downloading the new version
|
||||
rm -rf $TMP_DIR/$NEW_IMAGE.tar.bz2
|
||||
download "$UPDATEURL/$NEW_IMAGE.tar.bz2"
|
||||
download "$UPDATEURL/$NEW_IMAGE.tar.bz2" "$TMP_DIR/$NEW_IMAGE.tar.bz2"
|
||||
|
||||
# extract the image
|
||||
rm -rf $TMP_DIR/$NEW_IMAGE
|
||||
|
||||
@ -53,7 +53,8 @@ if [ -f $PKG_DIR/addon ]; then
|
||||
$PKG_DIR/addon $@ >&$VERBOSE_OUT
|
||||
|
||||
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID
|
||||
cp config/addon/addon.xml $ADDON_BUILD/$PKG_ADDON_ID
|
||||
if [ ! -f $ADDON_BUILD/$PKG_ADDON_ID/addon.xml ]; then
|
||||
cp config/addon/addon.xml $ADDON_BUILD/$PKG_ADDON_ID
|
||||
$SED -e "s|@PKG_ADDON_ID@|$PKG_ADDON_ID|g" \
|
||||
-e "s|@PKG_NAME@|$PKG_NAME|g" \
|
||||
-e "s|@ADDON_VERSION@|$OS_VERSION.$PKG_REV|g" \
|
||||
@ -63,12 +64,12 @@ if [ -f $PKG_DIR/addon ]; then
|
||||
-e "s|@OS_VERSION@|$OS_VERSION|g" \
|
||||
-e "s|@PKG_LONGDESC@|$PKG_LONGDESC|g" \
|
||||
-i $ADDON_BUILD/$PKG_ADDON_ID/addon.xml
|
||||
fi
|
||||
|
||||
if [ -f $PKG_DIR/source/default.py ]; then
|
||||
cp -R $PKG_DIR/source/* $ADDON_BUILD/$PKG_ADDON_ID
|
||||
else
|
||||
echo "*** ERROR: you need at least $PKG_DIR/source/default.py so your addon can work ***"
|
||||
exit 1
|
||||
echo "*** WARNING: you *maybe* need at least $PKG_DIR/source/default.py so your addon can work ***"
|
||||
fi
|
||||
|
||||
if [ -f $PKG_DIR/icon/icon.png ]; then
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user