mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-24 11:16:51 +00:00
Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-pvr
Conflicts: packages/mediacenter/xbmc-theme-Confluence/meta packages/mediacenter/xbmc/meta packages/mediacenter/xbmc/patches/xbmc-4c32cde-001-add_support_to_specify_GIT_REV-0.1.patch packages/mediacenter/xbmc/patches/xbmc-4c32cde-013-reenable_lcd_config_settings-0.1.patch packages/mediacenter/xbmc/patches/xbmc-4c32cde-303-fix_libdvd_xFLAGS-0.1.patch packages/mediacenter/xbmc/patches/xbmc-4c32cde-311-fix_rsxs_build-0.1.patch packages/mediacenter/xbmc/patches/xbmc-4c32cde-351-increase_YV12_buffers-0.1.patch packages/mediacenter/xbmc/patches/xbmc-4c32cde-353-limit_glxSwapBuffers_going_to_far_ahead-0.1.patch packages/mediacenter/xbmc/patches/xbmc-4c32cde-354-vaapi_increase_number_of_video_surface_allocated-0.1.patch packages/mediacenter/xbmc/patches/xbmc-4c32cde-402-enable_yasm_in_ffmpeg-0.1.patch packages/mediacenter/xbmc/patches/xbmc-4c32cde-404-add_lame_check-0.6.patch packages/mediacenter/xbmc/patches/xbmc-4c32cde-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch packages/mediacenter/xbmc/patches/xbmc-4c32cde-452-change_lcd_content-0.1.patch packages/mediacenter/xbmc/patches/xbmc-4c32cde-453-add_openelec.tv_RSS_news-0.1.patch packages/mediacenter/xbmc/patches/xbmc-4c32cde-454-disable_backslash-0.1.patch packages/mediacenter/xbmc/patches/xbmc-4c32cde-457-fix_connection_check-0.1.patch packages/mediacenter/xbmc/patches/xbmc-4c32cde-462-add_remote_irtrans_mediacenter-0.1.patch packages/mediacenter/xbmc/patches/xbmc-4c32cde-463-add_remote_devinput-0.1.patch packages/mediacenter/xbmc/patches/xbmc-4c32cde-464-add_eject_keymapping_for_lirc-0.1.patch packages/mediacenter/xbmc/patches/xbmc-99c0b41-001-add_support_to_specify_GIT_REV-0.1.patch packages/mediacenter/xbmc/patches/xbmc-99c0b41-013-reenable_lcd_config_settings-0.1.patch packages/mediacenter/xbmc/patches/xbmc-99c0b41-303-fix_libdvd_xFLAGS-0.1.patch packages/mediacenter/xbmc/patches/xbmc-99c0b41-311-fix_rsxs_build-0.1.patch packages/mediacenter/xbmc/patches/xbmc-99c0b41-351-increase_YV12_buffers-0.1.patch packages/mediacenter/xbmc/patches/xbmc-99c0b41-353-limit_glxSwapBuffers_going_to_far_ahead-0.1.patch packages/mediacenter/xbmc/patches/xbmc-99c0b41-354-vaapi_increase_number_of_video_surface_allocated-0.1.patch packages/mediacenter/xbmc/patches/xbmc-99c0b41-402-enable_yasm_in_ffmpeg-0.1.patch packages/mediacenter/xbmc/patches/xbmc-99c0b41-404-add_lame_check-0.6.patch packages/mediacenter/xbmc/patches/xbmc-99c0b41-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch packages/mediacenter/xbmc/patches/xbmc-99c0b41-452-change_lcd_content-0.1.patch packages/mediacenter/xbmc/patches/xbmc-99c0b41-453-add_openelec.tv_RSS_news-0.1.patch packages/mediacenter/xbmc/patches/xbmc-99c0b41-453-ps3_remote_be_more_quiet-0.1.patch packages/mediacenter/xbmc/patches/xbmc-99c0b41-454-disable_backslash-0.1.patch packages/mediacenter/xbmc/patches/xbmc-99c0b41-457-fix_connection_check-0.1.patch packages/mediacenter/xbmc/patches/xbmc-99c0b41-462-add_remote_irtrans_mediacenter-0.1.patch packages/mediacenter/xbmc/patches/xbmc-99c0b41-463-add_remote_devinput-0.1.patch packages/mediacenter/xbmc/patches/xbmc-99c0b41-464-add_eject_keymapping_for_lirc-0.1.patch packages/mediacenter/xbmc/patches/xbmc-cfa1a05-001-add_support_to_specify_GIT_REV-0.1.patch packages/mediacenter/xbmc/patches/xbmc-cfa1a05-013-reenable_lcd_config_settings-0.1.patch packages/mediacenter/xbmc/patches/xbmc-cfa1a05-303-fix_libdvd_xFLAGS-0.1.patch packages/mediacenter/xbmc/patches/xbmc-cfa1a05-311-fix_rsxs_build-0.1.patch packages/mediacenter/xbmc/patches/xbmc-cfa1a05-351-increase_YV12_buffers-0.1.patch packages/mediacenter/xbmc/patches/xbmc-cfa1a05-353-limit_glxSwapBuffers_going_to_far_ahead-0.1.patch packages/mediacenter/xbmc/patches/xbmc-cfa1a05-354-vaapi_increase_number_of_video_surface_allocated-0.1.patch packages/mediacenter/xbmc/patches/xbmc-cfa1a05-402-enable_yasm_in_ffmpeg-0.1.patch packages/mediacenter/xbmc/patches/xbmc-cfa1a05-404-add_lame_check-0.6.patch packages/mediacenter/xbmc/patches/xbmc-cfa1a05-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch packages/mediacenter/xbmc/patches/xbmc-cfa1a05-452-change_lcd_content-0.1.patch packages/mediacenter/xbmc/patches/xbmc-cfa1a05-453-add_openelec.tv_RSS_news-0.1.patch packages/mediacenter/xbmc/patches/xbmc-cfa1a05-454-disable_backslash-0.1.patch packages/mediacenter/xbmc/patches/xbmc-cfa1a05-457-fix_connection_check-0.1.patch packages/mediacenter/xbmc/patches/xbmc-cfa1a05-462-add_remote_irtrans_mediacenter-0.1.patch packages/mediacenter/xbmc/patches/xbmc-cfa1a05-463-add_remote_devinput-0.1.patch packages/mediacenter/xbmc/patches/xbmc-cfa1a05-464-add_eject_keymapping_for_lirc-0.1.patch
This commit is contained in:
Stephan Raue
commit
c65a8e65db
@ -5,6 +5,8 @@ Changelog OpenELEC-1.0 to OpenELEC-2.0
|
||||
Package updates:
|
||||
- update XBMC to XBMC-11.0 (Eden)
|
||||
- update eglibc to eglibc-2.14
|
||||
- update Python to Python-2.7.2
|
||||
- update gcc to gcc-4.6.2
|
||||
|
||||
Added functions:
|
||||
- PXE netboot support
|
||||
@ -14,4 +16,5 @@ Added functions:
|
||||
|
||||
Removed functions:
|
||||
- remove netmount.conf (XBMC includes native NFS/AFP/CIFS/SSH support)
|
||||
|
||||
- move PS3 controller support in a own addon
|
||||
- move Wii controller support in a own addon
|
||||
|
||||
@ -32,6 +32,14 @@ get_graphicdrivers() {
|
||||
GALLIUM_DRIVERS="$GALLIUM_DRIVERS,nouveau"
|
||||
XORG_DRIVERS="$XORG_DRIVERS nouveau"
|
||||
# LLVM_SUPPORT="yes"
|
||||
if [ "$VDPAU" = yes ]; then
|
||||
MESA_VDPAU_SUPPORT=yes
|
||||
GALLIUM_DRIVERS="$GALLIUM_DRIVERS,swrast"
|
||||
fi
|
||||
# if [ "$VAAPI" = yes ]; then
|
||||
# MESA_VAAPI_SUPPORT=yes
|
||||
# GALLIUM_DRIVERS="$GALLIUM_DRIVERS,swrast"
|
||||
# fi
|
||||
fi
|
||||
|
||||
if [ "$drv" = "nvidia" ]; then
|
||||
@ -61,6 +69,14 @@ get_graphicdrivers() {
|
||||
GALLIUM_DRIVERS="$GALLIUM_DRIVERS,r300"
|
||||
XORG_DRIVERS="$XORG_DRIVERS ati"
|
||||
LLVM_SUPPORT="yes"
|
||||
if [ "$VDPAU" = yes ]; then
|
||||
MESA_VDPAU_SUPPORT=yes
|
||||
GALLIUM_DRIVERS="$GALLIUM_DRIVERS,swrast"
|
||||
fi
|
||||
# if [ "$VAAPI" = yes ]; then
|
||||
# MESA_VAAPI_SUPPORT=yes
|
||||
# GALLIUM_DRIVERS="$GALLIUM_DRIVERS,swrast"
|
||||
# fi
|
||||
fi
|
||||
|
||||
if [ "$drv" = "r600" ]; then
|
||||
@ -68,6 +84,14 @@ get_graphicdrivers() {
|
||||
GALLIUM_DRIVERS="$GALLIUM_DRIVERS,r600"
|
||||
XORG_DRIVERS="$XORG_DRIVERS ati"
|
||||
LLVM_SUPPORT="yes"
|
||||
if [ "$VDPAU" = yes ]; then
|
||||
MESA_VDPAU_SUPPORT=yes
|
||||
GALLIUM_DRIVERS="$GALLIUM_DRIVERS,swrast"
|
||||
fi
|
||||
# if [ "$VAAPI" = yes ]; then
|
||||
# MESA_VAAPI_SUPPORT=yes
|
||||
# GALLIUM_DRIVERS="$GALLIUM_DRIVERS,swrast"
|
||||
# fi
|
||||
fi
|
||||
|
||||
if [ "$drv" = "vmware" ]; then
|
||||
|
||||
@ -20,7 +20,7 @@ PROJECT_DIR="$ROOT/projects"
|
||||
OPENELEC_VERSION=`cat VERSION`
|
||||
|
||||
if [ "$OPENELEC_VERSION" = "devel" ]; then
|
||||
OS_VERSION="1.0"
|
||||
OS_VERSION="1.90"
|
||||
else
|
||||
OS_MAJOR_VERSION=`echo "$OPENELEC_VERSION" | cut -f1 -d "."`
|
||||
OS_MINOR_VERSION=`echo "$OPENELEC_VERSION" | cut -f2 -d "."`
|
||||
|
||||
@ -1,3 +1,6 @@
|
||||
1.90.0
|
||||
- prepare for OpenELEC-1.90 release
|
||||
|
||||
1.0.0
|
||||
- update to evtest-1.29
|
||||
- prepare for OpenELEC-1.0 release
|
||||
|
||||
@ -1,3 +1,6 @@
|
||||
1.90.0
|
||||
- prepare for OpenELEC-1.90 release
|
||||
|
||||
1.0.0
|
||||
- prepare for OpenELEC-1.0 release
|
||||
|
||||
|
||||
10
packages/mediacenter/xbmc/udev.d/98-wiiremote.rules → packages/addons/driver/imon-mce/addon
Normal file → Executable file
10
packages/mediacenter/xbmc/udev.d/98-wiiremote.rules → packages/addons/driver/imon-mce/addon
Normal file → Executable file
@ -1,3 +1,5 @@
|
||||
#!/bin/sh
|
||||
|
||||
################################################################################
|
||||
# This file is part of OpenELEC - http://www.openelec.tv
|
||||
# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
|
||||
@ -18,10 +20,4 @@
|
||||
# http://www.gnu.org/copyleft/gpl.html
|
||||
################################################################################
|
||||
|
||||
# only does something with "bluetooth" subsystem devices.
|
||||
SUBSYSTEM!="bluetooth", GOTO="end"
|
||||
|
||||
# Start Wii Remote support if bluetooth is starting
|
||||
ACTION=="add|remove", RUN+="/lib/udev/wiiremote_helper"
|
||||
|
||||
LABEL="end"
|
||||
. config/options $1
|
||||
2
packages/addons/driver/imon-mce/changelog.txt
Normal file
2
packages/addons/driver/imon-mce/changelog.txt
Normal file
@ -0,0 +1,2 @@
|
||||
1.90.0
|
||||
- initial version imon-mce
|
||||
BIN
packages/addons/driver/imon-mce/icon/icon.png
Normal file
BIN
packages/addons/driver/imon-mce/icon/icon.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 30 KiB |
38
packages/addons/driver/imon-mce/meta
Normal file
38
packages/addons/driver/imon-mce/meta
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
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="imon-mce"
|
||||
PKG_VERSION="1.90"
|
||||
PKG_REV="0"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="OSS"
|
||||
PKG_SITE="http://www.openelec.tv"
|
||||
PKG_URL=""
|
||||
PKG_DEPENDS=""
|
||||
PKG_BUILD_DEPENDS="toolchain"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="driver/remote"
|
||||
PKG_SHORTDESC="imon-mce: a driver to add support for MCE remotes to the imon driver"
|
||||
PKG_LONGDESC="imon-mce is a driver to add support for MCE remotes to the imon driver. To readd imon remote support uninstall or disable this addon again."
|
||||
|
||||
PKG_IS_ADDON="yes"
|
||||
PKG_ADDON_TYPE="xbmc.service"
|
||||
|
||||
PKG_AUTORECONF="no"
|
||||
@ -1,8 +1,8 @@
|
||||
#!/bin/sh
|
||||
|
||||
################################################################################
|
||||
# Copyright (C) 2009-2010 OpenELEC.tv
|
||||
# http://www.openelec.tv
|
||||
# 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
|
||||
@ -20,15 +20,5 @@
|
||||
# http://www.gnu.org/copyleft/gpl.html
|
||||
################################################################################
|
||||
|
||||
case "${ACTION}" in
|
||||
add)
|
||||
if [ -f /usr/bin/xbmc-wiiremote ]; then
|
||||
/usr/bin/xbmc-wiiremote &
|
||||
fi
|
||||
;;
|
||||
remove)
|
||||
killall xbmc-wiiremote
|
||||
;;
|
||||
esac
|
||||
|
||||
exit 0
|
||||
sleep 1 && \
|
||||
ir-keytable -p rc6 -w /etc/rc_keymaps/imon_mce &
|
||||
19
packages/mediacenter/xbmc/scripts/ps3remote_helper → packages/addons/driver/imon-mce/source/default.py
Executable file → Normal file
19
packages/mediacenter/xbmc/scripts/ps3remote_helper → packages/addons/driver/imon-mce/source/default.py
Executable file → Normal file
@ -1,8 +1,6 @@
|
||||
#!/bin/sh
|
||||
|
||||
################################################################################
|
||||
# Copyright (C) 2009-2010 OpenELEC.tv
|
||||
# http://www.openelec.tv
|
||||
# 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
|
||||
@ -20,15 +18,6 @@
|
||||
# http://www.gnu.org/copyleft/gpl.html
|
||||
################################################################################
|
||||
|
||||
case "${ACTION}" in
|
||||
add)
|
||||
if [ -f /usr/bin/xbmc-ps3remote ]; then
|
||||
/usr/bin/xbmc-ps3remote localhost 9777 &
|
||||
fi
|
||||
;;
|
||||
remove)
|
||||
killall xbmc-ps3remote
|
||||
;;
|
||||
esac
|
||||
import xbmc, time, os, subprocess
|
||||
|
||||
exit 0
|
||||
os.system("imon-mce.service")
|
||||
34
packages/addons/driver/xbmc-ps3d/addon
Executable file
34
packages/addons/driver/xbmc-ps3d/addon
Executable file
@ -0,0 +1,34 @@
|
||||
#!/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/pixmaps
|
||||
cp $BUILD/xbmc-*/tools/EventClients/icons/bluetooth.png $ADDON_BUILD/$PKG_ADDON_ID/pixmaps
|
||||
|
||||
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/pylib
|
||||
cp -R $BUILD/PyBluez-*/.install/usr/lib/python*/site-packages/* $ADDON_BUILD/$PKG_ADDON_ID/pylib
|
||||
|
||||
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/pylib/xbmc
|
||||
cp $BUILD/xbmc-*/tools/EventClients/Clients/PS3\ Sixaxis\ Controller/ps3d.py $ADDON_BUILD/$PKG_ADDON_ID/pylib/xbmc
|
||||
cp $BUILD/xbmc-*/tools/EventClients/Clients/PS3\ BD\ Remote/ps3_remote.py $ADDON_BUILD/$PKG_ADDON_ID/pylib/xbmc
|
||||
cp -R $BUILD/xbmc-*/tools/EventClients/lib/python/* $ADDON_BUILD/$PKG_ADDON_ID/pylib/xbmc
|
||||
2
packages/addons/driver/xbmc-ps3d/changelog.txt
Normal file
2
packages/addons/driver/xbmc-ps3d/changelog.txt
Normal file
@ -0,0 +1,2 @@
|
||||
1.90.0
|
||||
- initial version xbmc-ps3d
|
||||
BIN
packages/addons/driver/xbmc-ps3d/icon/icon.png
Normal file
BIN
packages/addons/driver/xbmc-ps3d/icon/icon.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 28 KiB |
38
packages/addons/driver/xbmc-ps3d/meta
Normal file
38
packages/addons/driver/xbmc-ps3d/meta
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
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="xbmc-ps3d"
|
||||
PKG_VERSION="1.90"
|
||||
PKG_REV="0"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="OSS"
|
||||
PKG_SITE="http://www.xbmc.org"
|
||||
PKG_URL=""
|
||||
PKG_DEPENDS="PyBluez"
|
||||
PKG_BUILD_DEPENDS="toolchain xbmc PyBluez"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="driver/remote"
|
||||
PKG_SHORTDESC="xbmc-ps3d: a quick port of brandonj's PS3 remote script to use the event server for sending input events."
|
||||
PKG_LONGDESC="xbmc-ps3d is a quick port of brandonj's PS3 remote script to use the event server for sending input events. This addon also supports the PS3 sixaxis controller."
|
||||
|
||||
PKG_IS_ADDON="yes"
|
||||
PKG_ADDON_TYPE="xbmc.service"
|
||||
|
||||
PKG_AUTORECONF="no"
|
||||
41
packages/addons/driver/xbmc-ps3d/source/bin/ps3d.service
Executable file
41
packages/addons/driver/xbmc-ps3d/source/bin/ps3d.service
Executable file
@ -0,0 +1,41 @@
|
||||
#!/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
|
||||
################################################################################
|
||||
|
||||
# Addon settings
|
||||
ADDON_DIR="$HOME/.xbmc/addons/driver.remote.xbmc-ps3d"
|
||||
ADDON_HOME="$HOME/.xbmc/userdata/addon_data/driver.remote.xbmc-ps3d"
|
||||
PIXMAPS_DIR="$ADDON_DIR/pixmaps"
|
||||
|
||||
export PYTHONPATH="$PYTHONPATH:$ADDON_DIR/pylib"
|
||||
|
||||
################################################################################
|
||||
# setup ps3d
|
||||
################################################################################
|
||||
|
||||
if [ ! -f $ADDON_DIR/pylib/xbmc/defs.py ]; then
|
||||
echo "ICON_PATH=\"$PIXMAPS_DIR\"" > $ADDON_DIR/pylib/xbmc/defs.py
|
||||
fi
|
||||
|
||||
################################################################################
|
||||
# start ps3d
|
||||
################################################################################
|
||||
python $ADDON_DIR/pylib/xbmc/ps3d.py localhost &
|
||||
23
packages/addons/driver/xbmc-ps3d/source/default.py
Normal file
23
packages/addons/driver/xbmc-ps3d/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 xbmc, time, os, subprocess
|
||||
|
||||
os.system("ps3d.service")
|
||||
@ -20,21 +20,10 @@
|
||||
# http://www.gnu.org/copyleft/gpl.html
|
||||
################################################################################
|
||||
|
||||
. /etc/profile
|
||||
. config/options $1
|
||||
|
||||
case "$1" in
|
||||
thaw|resume)
|
||||
(
|
||||
if [ -f /var/config/settings.conf ]; then
|
||||
. /var/config/settings.conf
|
||||
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
|
||||
cp $BUILD/xbmc-*/tools/EventClients/Clients/WiiRemote/WiiUse_WiiRemote $ADDON_BUILD/$PKG_ADDON_ID/bin/wiimote
|
||||
|
||||
if [ "$WAKEUP_MUSICDBUPDATE" = "true" ]; then
|
||||
usleep 5000000
|
||||
xbmc-send --host=127.0.0.1 -a "UpdateLibrary(music)"
|
||||
fi
|
||||
fi
|
||||
)&
|
||||
;;
|
||||
*) exit $NA
|
||||
;;
|
||||
esac
|
||||
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib
|
||||
cp -P $BUILD/wiiuse_v[0-9]*/src/release*/*.so $ADDON_BUILD/$PKG_ADDON_ID/lib
|
||||
11
packages/mediacenter/xbmc/udev.d/98-ps3remote.rules → packages/addons/driver/xbmc-wiimote/build
Normal file → Executable file
11
packages/mediacenter/xbmc/udev.d/98-ps3remote.rules → packages/addons/driver/xbmc-wiimote/build
Normal file → Executable file
@ -1,3 +1,5 @@
|
||||
#!/bin/sh
|
||||
|
||||
################################################################################
|
||||
# This file is part of OpenELEC - http://www.openelec.tv
|
||||
# Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
|
||||
@ -18,10 +20,9 @@
|
||||
# http://www.gnu.org/copyleft/gpl.html
|
||||
################################################################################
|
||||
|
||||
# only does something with "bluetooth" subsystem devices.
|
||||
SUBSYSTEM!="bluetooth", GOTO="end"
|
||||
. config/options $1
|
||||
|
||||
# Start PS3 Remote support if bluetooth is starting
|
||||
ACTION=="add|remove", RUN+="/lib/udev/ps3remote_helper"
|
||||
$SCRIPTS/unpack xbmc
|
||||
|
||||
LABEL="end"
|
||||
cd $BUILD/xbmc-*/tools/EventClients/Clients/WiiRemote
|
||||
$CXX $CFLAGS -lwiiuse WiiUse_WiiRemote.cpp -o WiiUse_WiiRemote
|
||||
2
packages/addons/driver/xbmc-wiimote/changelog.txt
Normal file
2
packages/addons/driver/xbmc-wiimote/changelog.txt
Normal file
@ -0,0 +1,2 @@
|
||||
1.90.0
|
||||
- initial version xbmc-wiimote
|
||||
BIN
packages/addons/driver/xbmc-wiimote/icon/icon.png
Normal file
BIN
packages/addons/driver/xbmc-wiimote/icon/icon.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 28 KiB |
38
packages/addons/driver/xbmc-wiimote/meta
Normal file
38
packages/addons/driver/xbmc-wiimote/meta
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
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="xbmc-wiimote"
|
||||
PKG_VERSION="1.90"
|
||||
PKG_REV="0"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="OSS"
|
||||
PKG_SITE="http://www.xbmc.org"
|
||||
PKG_URL=""
|
||||
PKG_DEPENDS=""
|
||||
PKG_BUILD_DEPENDS="toolchain wiiuse"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="driver/remote"
|
||||
PKG_SHORTDESC="xbmc-wiimote: a driver to support WiiMote Controllers."
|
||||
PKG_LONGDESC="xbmc-wiimote is a driver to support WiiMote Controllers."
|
||||
|
||||
PKG_IS_ADDON="yes"
|
||||
PKG_ADDON_TYPE="xbmc.service"
|
||||
|
||||
PKG_AUTORECONF="no"
|
||||
33
packages/addons/driver/xbmc-wiimote/source/bin/wiimote.service
Executable file
33
packages/addons/driver/xbmc-wiimote/source/bin/wiimote.service
Executable file
@ -0,0 +1,33 @@
|
||||
#!/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
|
||||
################################################################################
|
||||
|
||||
# Addon settings
|
||||
ADDON_DIR="$HOME/.xbmc/addons/driver.remote.xbmc-wiimote"
|
||||
ADDON_HOME="$HOME/.xbmc/userdata/addon_data/driver.remote.xbmc-wiimote"
|
||||
|
||||
|
||||
################################################################################
|
||||
# start ps3d
|
||||
################################################################################
|
||||
chmod +x $ADDON_DIR/lib/*
|
||||
|
||||
LD_LIBRARY_PATH="$ADDON_DIR/lib:$LD_LIBRARY_PATH" wiimote &
|
||||
23
packages/addons/driver/xbmc-wiimote/source/default.py
Normal file
23
packages/addons/driver/xbmc-wiimote/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 xbmc, time, os, subprocess
|
||||
|
||||
os.system("wiimote.service")
|
||||
@ -25,8 +25,8 @@ PKG_ARCH="any"
|
||||
PKG_LICENSE="OSS"
|
||||
PKG_SITE="http://www.glest.org"
|
||||
PKG_URL="$SOURCEFORGE_SRC/megaglest/current_release/$PKG_NAME-$PKG_VERSION.tar.bz2"
|
||||
PKG_DEPENDS="curl xerces-c $LIBJPEG libpng libvorbis libogg SDL openal-soft libX11 Mesa"
|
||||
PKG_BUILD_DEPENDS="toolchain lua curl xerces-c $LIBJPEG libpng libvorbis libogg SDL openal-soft libX11 Mesa"
|
||||
PKG_DEPENDS="curl xerces-c $LIBJPEG libpng libvorbis libogg SDL openal-soft libX11 $MESA"
|
||||
PKG_BUILD_DEPENDS="toolchain lua curl xerces-c $LIBJPEG libpng libvorbis libogg SDL openal-soft libX11 $MESA"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="games"
|
||||
PKG_SHORTDESC="(Game) MegaGlest: a free 3D real-time strategy game"
|
||||
|
||||
@ -25,8 +25,8 @@ PKG_ARCH="any"
|
||||
PKG_LICENSE="OSS"
|
||||
PKG_SITE="http://sauerbraten.org/"
|
||||
PKG_URL="$SOURCEFORGE_SRC/sauerbraten/sauerbraten/2010_07_19/${PKG_NAME}_${PKG_VERSION}_justice_edition_linux.tar.bz2"
|
||||
PKG_DEPENDS="zlib libpng $LIBJPEG libX11 SDL SDL_image SDL_mixer Mesa"
|
||||
PKG_BUILD_DEPENDS="toolchain zlib libpng $LIBJPEG libX11 SDL SDL_image SDL_mixer Mesa"
|
||||
PKG_DEPENDS="zlib libpng $LIBJPEG libX11 SDL SDL_image SDL_mixer $MESA"
|
||||
PKG_BUILD_DEPENDS="toolchain zlib libpng $LIBJPEG libX11 SDL SDL_image SDL_mixer $MESA"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="games"
|
||||
PKG_SHORTDESC="(Game) Cube 2: Sauerbraten"
|
||||
|
||||
@ -1,3 +1,6 @@
|
||||
1.90.0
|
||||
- prepare for OpenELEC-1.90 release
|
||||
|
||||
1.0.0
|
||||
- update to libav-0.7.2
|
||||
- prepare for OpenELEC-1.0 release
|
||||
|
||||
@ -1,3 +1,6 @@
|
||||
1.90.0
|
||||
- prepare for OpenELEC-1.90 release
|
||||
|
||||
1.0.0
|
||||
- prepare for OpenELEC-1.0 release
|
||||
|
||||
|
||||
@ -1,3 +1,6 @@
|
||||
1.90.0
|
||||
- prepare for OpenELEC-1.90 release
|
||||
|
||||
1.0.0
|
||||
- update to rsync-3.0.9
|
||||
- prepare for OpenELEC-1.0 release
|
||||
|
||||
@ -1,3 +1,6 @@
|
||||
1.90.0
|
||||
- prepare for OpenELEC-1.90 release
|
||||
|
||||
1.0.0
|
||||
- update to unrar-4.0.7
|
||||
- update to CouchPotato-4eec8e0
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="SABnzbd-Suite"
|
||||
PKG_VERSION="1.0"
|
||||
PKG_VERSION="1.90"
|
||||
PKG_REV="0"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="OSS"
|
||||
|
||||
@ -1,3 +1,6 @@
|
||||
1.90.0
|
||||
- prepare for OpenELEC-1.90 release
|
||||
|
||||
1.0.0
|
||||
- update to transmission-2.41
|
||||
- prepare for OpenELEC-1.0 release
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
1.0.2
|
||||
1.90.0
|
||||
- add (CH) GA Weissenstein default muxes
|
||||
- prepare for OpenELEC-1.90 release
|
||||
|
||||
1.0.1
|
||||
- add XMLTV tv_file_grab support
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
|
||||
PKG_NAME="hts-tvheadend"
|
||||
PKG_VERSION="c88a646"
|
||||
PKG_REV="2"
|
||||
PKG_REV="0"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://www.lonelycoder.com/hts/tvheadend_overview.html"
|
||||
|
||||
@ -1,3 +1,6 @@
|
||||
1.90.0
|
||||
- prepare for OpenELEC-1.90 release
|
||||
|
||||
1.0.0
|
||||
- update to nano-2.3.1
|
||||
- prepare for OpenELEC-1.0 release
|
||||
|
||||
@ -22,6 +22,9 @@
|
||||
|
||||
. config/options $1
|
||||
|
||||
# alsa-lib fails building with LTO support on gcc-4.6
|
||||
strip_lto
|
||||
|
||||
CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=32 -fPIC -DPIC"
|
||||
|
||||
cd $PKG_BUILD
|
||||
|
||||
@ -25,8 +25,8 @@ PKG_ARCH="any"
|
||||
PKG_LICENSE="OSS"
|
||||
PKG_SITE="http://www.mesa3d.org/"
|
||||
PKG_URL="ftp://ftp.freedesktop.org/pub/mesa/demos/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.bz2"
|
||||
PKG_DEPENDS="libX11 Mesa glew"
|
||||
PKG_BUILD_DEPENDS="toolchain libX11 Mesa glew"
|
||||
PKG_DEPENDS="libX11 $MESA glew"
|
||||
PKG_BUILD_DEPENDS="toolchain libX11 $MESA glew"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="debug"
|
||||
PKG_SHORTDESC="mesa-demos: Mesa 3D demos"
|
||||
|
||||
@ -22,6 +22,9 @@
|
||||
|
||||
. config/options $1
|
||||
|
||||
# pcre fails building with LTO support on gcc-4.6
|
||||
strip_lto
|
||||
|
||||
cd $PKG_BUILD
|
||||
|
||||
mkdir -p m4 && do_autoreconf
|
||||
|
||||
@ -25,8 +25,8 @@ PKG_ARCH="any"
|
||||
PKG_LICENSE="LGPL"
|
||||
PKG_SITE="http://cairographics.org/"
|
||||
PKG_URL="http://cairographics.org/releases/$PKG_NAME-$PKG_VERSION.tar.gz"
|
||||
PKG_DEPENDS="zlib freetype fontconfig libpng pixman libXrender libX11 Mesa"
|
||||
PKG_BUILD_DEPENDS="toolchain zlib freetype fontconfig libpng pixman libXrender libX11 Mesa"
|
||||
PKG_DEPENDS="zlib freetype fontconfig libpng pixman libXrender libX11 $MESA"
|
||||
PKG_BUILD_DEPENDS="toolchain zlib freetype fontconfig libpng pixman libXrender libX11 $MESA"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="graphics"
|
||||
PKG_SHORTDESC="cairo: Multi-platform 2D graphics library"
|
||||
|
||||
@ -25,8 +25,8 @@ PKG_ARCH="any"
|
||||
PKG_LICENSE="BSD"
|
||||
PKG_SITE="http://glew.sourceforge.net/"
|
||||
PKG_URL="$SOURCEFORGE_SRC/glew/glew/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tgz"
|
||||
PKG_DEPENDS="libX11 libXext libXi libXmu Mesa"
|
||||
PKG_BUILD_DEPENDS="toolchain libX11 libXext libXi libXmu Mesa"
|
||||
PKG_DEPENDS="libX11 libXext libXi libXmu $MESA"
|
||||
PKG_BUILD_DEPENDS="toolchain libX11 libXext libXi libXmu $MESA"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="graphics"
|
||||
PKG_SHORTDESC="glew: The OpenGL Extension Wrangler Library"
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="libdrm"
|
||||
PKG_VERSION="2.4.26"
|
||||
PKG_VERSION="2.4.27"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
||||
97
packages/graphics/mesa/build
Executable file
97
packages/graphics/mesa/build
Executable file
@ -0,0 +1,97 @@
|
||||
#!/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
|
||||
|
||||
get_graphicdrivers
|
||||
|
||||
# dont use gold linker because of compiling issues
|
||||
strip_gold
|
||||
|
||||
# Mesa fails to build with LTO optimization
|
||||
strip_lto
|
||||
|
||||
if [ "$LLVM_SUPPORT" = "yes" ]; then
|
||||
export LLVM_CONFIG="$SYSROOT_PREFIX/usr/bin/llvm-config"
|
||||
MESA_GALLIUM_LLVM="--enable-gallium-llvm"
|
||||
else
|
||||
MESA_GALLIUM_LLVM="--disable-gallium-llvm"
|
||||
fi
|
||||
|
||||
if [ "$MESA_VDPAU_SUPPORT" = "yes" ]; then
|
||||
MESA_VDPAU="--enable-vdpau"
|
||||
else
|
||||
MESA_VDPAU="--disable-vdpau"
|
||||
fi
|
||||
|
||||
if [ "$MESA_VAAPI_SUPPORT" = "yes" ]; then
|
||||
MESA_VAAPI="--enable-va"
|
||||
else
|
||||
MESA_VAAPI="--disable-va"
|
||||
fi
|
||||
|
||||
cd $PKG_BUILD
|
||||
|
||||
HOST_CC="$HOST_CC" \
|
||||
HOST_OPT_FLAGS="$HOST_CFLAGS" \
|
||||
X11_INCLUDES= \
|
||||
DRI_DRIVER_INSTALL_DIR="$XORG_PATH_DRI" \
|
||||
DRI_DRIVER_SEARCH_DIR="$XORG_PATH_DRI" \
|
||||
./configure --host=$TARGET_NAME \
|
||||
--build=$HOST_NAME \
|
||||
--prefix=/usr \
|
||||
--sysconfdir=/etc \
|
||||
--localstatedir=/var \
|
||||
--disable-static \
|
||||
--enable-shared \
|
||||
--disable-debug \
|
||||
--enable-texture-float \
|
||||
--disable-selinux \
|
||||
--enable-opengl \
|
||||
--enable-glx-tls \
|
||||
--enable-driglx-direct \
|
||||
--disable-gles1 \
|
||||
--disable-gles2 \
|
||||
--disable-openvg \
|
||||
--disable-xorg \
|
||||
--enable-glu \
|
||||
--disable-osmesa \
|
||||
--disable-d3d1x \
|
||||
--disable-egl \
|
||||
--disable-gbm \
|
||||
--disable-xvmc \
|
||||
$MESA_VDPAU \
|
||||
$MESA_VAAPI \
|
||||
--disable-gallium-egl \
|
||||
--disable-gallium-gbm \
|
||||
--enable-shared-glapi \
|
||||
--enable-xcb \
|
||||
--enable-shared-dricore \
|
||||
--disable-egl \
|
||||
$MESA_GALLIUM_LLVM \
|
||||
--with-gallium-drivers="$GALLIUM_DRIVERS" \
|
||||
--with-dri-drivers="$DRI_DRIVERS" \
|
||||
--with-x \
|
||||
|
||||
make
|
||||
|
||||
$MAKEINSTALL
|
||||
44
packages/graphics/mesa/install
Executable file
44
packages/graphics/mesa/install
Executable file
@ -0,0 +1,44 @@
|
||||
#!/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/lib
|
||||
cp -P $PKG_BUILD/lib/libGL.so.1.2 $INSTALL/usr/lib/libGL_mesa.so.1 # rename for cooperate with nvidia drivers
|
||||
ln -sf libGL.so.1 $INSTALL/usr/lib/libGL.so
|
||||
ln -sf /var/lib/libGL.so $INSTALL/usr/lib/libGL.so.1
|
||||
cp -P $PKG_BUILD/lib/libGLU.so* $INSTALL/usr/lib
|
||||
cp -P $PKG_BUILD/lib/libglapi.so* $INSTALL/usr/lib
|
||||
|
||||
mkdir -p $INSTALL/usr/lib/dri
|
||||
cp -P $PKG_BUILD/lib/libdricore.so $INSTALL/usr/lib/dri
|
||||
cp -P $PKG_BUILD/lib/libglsl.so $INSTALL/usr/lib/dri
|
||||
cp -P $PKG_BUILD/lib/*_dri.so $INSTALL/usr/lib/dri || true
|
||||
cp -P $PKG_BUILD/lib/gallium/*_dri.so $INSTALL/usr/lib/dri || true
|
||||
|
||||
mkdir -p $INSTALL/usr/lib/xorg/modules/drivers
|
||||
cp -P $PKG_BUILD/lib/gallium/*_drv.so $INSTALL/usr/lib/xorg/modules/drivers || true
|
||||
|
||||
if [ "$MESA_VDPAU_SUPPORT" = "yes" ]; then
|
||||
mkdir -p $INSTALL/usr/lib/vdpau
|
||||
cp -P $PKG_BUILD/lib/gallium/libvdpau_*.so* $INSTALL/usr/lib/vdpau
|
||||
fi
|
||||
53
packages/graphics/mesa/meta
Normal file
53
packages/graphics/mesa/meta
Normal file
@ -0,0 +1,53 @@
|
||||
################################################################################
|
||||
# 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="mesa"
|
||||
PKG_VERSION="a1b737d72f1fec1d967255f4f87b5208a857c87f"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="OSS"
|
||||
PKG_SITE="http://www.mesa3d.org/"
|
||||
PKG_URL="http://cgit.freedesktop.org/mesa/mesa/snapshot/$PKG_NAME-$PKG_VERSION.tar.bz2"
|
||||
PKG_DEPENDS="libXdamage libdrm expat libXext libXfixes libXxf86vm libxcb libX11"
|
||||
PKG_BUILD_DEPENDS="toolchain Python makedepend libxml2-host expat glproto dri2proto libdrm libXext libXdamage libXfixes libXxf86vm libxcb libX11"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="graphics"
|
||||
PKG_SHORTDESC="mesa: 3-D graphics library with OpenGL API"
|
||||
PKG_LONGDESC="Mesa is a 3-D graphics library with an API which is very similar to that of OpenGL*. To the extent that Mesa utilizes the OpenGL command syntax or state machine, it is being used with authorization from Silicon Graphics, Inc. However, the author makes no claim that Mesa is in any way a compatible replacement for OpenGL or associated with Silicon Graphics, Inc. Those who want a licensed implementation of OpenGL should contact a licensed vendor. While Mesa is not a licensed OpenGL implementation, it is currently being tested with the OpenGL conformance tests. For the current conformance status see the CONFORM file included in the Mesa distribution."
|
||||
PKG_IS_ADDON="no"
|
||||
|
||||
PKG_AUTORECONF="yes"
|
||||
|
||||
get_graphicdrivers
|
||||
|
||||
if [ "$LLVM_SUPPORT" = "yes" ]; then
|
||||
PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS llvm"
|
||||
PKG_DEPENDS="$PKG_DEPENDS llvm"
|
||||
fi
|
||||
|
||||
if [ "$MESA_VDPAU_SUPPORT" = "yes" ]; then
|
||||
PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libvdpau"
|
||||
PKG_DEPENDS="$PKG_DEPENDS libvdpau"
|
||||
fi
|
||||
|
||||
if [ "$MESA_VAAPI_SUPPORT" = "yes" ]; then
|
||||
PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libva"
|
||||
PKG_DEPENDS="$PKG_DEPENDS libva"
|
||||
fi
|
||||
@ -0,0 +1,12 @@
|
||||
diff -Naur mesa-a1b737d72f1fec1d967255f4f87b5208a857c87f/configure.ac mesa-a1b737d72f1fec1d967255f4f87b5208a857c87f.patch/configure.ac
|
||||
--- mesa-a1b737d72f1fec1d967255f4f87b5208a857c87f/configure.ac 2011-11-01 13:28:47.000000000 +0100
|
||||
+++ mesa-a1b737d72f1fec1d967255f4f87b5208a857c87f.patch/configure.ac 2011-11-01 15:56:10.046619433 +0100
|
||||
@@ -1738,7 +1738,7 @@
|
||||
if test "x$LLVM_CONFIG" != xno; then
|
||||
LLVM_VERSION=`$LLVM_CONFIG --version`
|
||||
LLVM_CFLAGS=`$LLVM_CONFIG --cppflags|sed 's/-DNDEBUG\>//g'`
|
||||
- LLVM_LIBS="`$LLVM_CONFIG --libs`"
|
||||
+ LLVM_LIBS="-lLLVM-$LLVM_VERSION"
|
||||
|
||||
LLVM_LDFLAGS=`$LLVM_CONFIG --ldflags`
|
||||
DEFINES="$DEFINES -D__STDC_CONSTANT_MACROS"
|
||||
@ -30,6 +30,9 @@ else
|
||||
BUSYBOX_CFG_FILE=$ROOT/$PKG_DIR/config/$1.conf
|
||||
fi
|
||||
|
||||
# busybox fails building with LTO support on gcc-4.6
|
||||
strip_lto
|
||||
|
||||
# optimize for size
|
||||
CFLAGS=`echo $CFLAGS | sed -e "s|-Ofast|-Os|"`
|
||||
CFLAGS=`echo $CFLAGS | sed -e "s|-O.|-Os|"`
|
||||
|
||||
@ -25,6 +25,12 @@
|
||||
PYTHON_VERSION=2.7
|
||||
PYTHON_LIB_DIR=$INSTALL/usr/lib/python$PYTHON_VERSION
|
||||
|
||||
EXCLUDE_DIRS="bsddb curses idlelib lib-tk lib2to3 msilib wsgiref"
|
||||
INCLUDE_DIRS="compiler ctypes ctypes/macholib distutils distutils/command email"
|
||||
INCLUDE_DIRS="$INCLUDE_DIRS email/mime encodings hotshot importlib json logging"
|
||||
INCLUDE_DIRS="$INCLUDE_DIRS multiprocessing sqlite3 xml xml/dom xml/etree"
|
||||
INCLUDE_DIRS="$INCLUDE_DIRS xml/parsers xml/sax"
|
||||
|
||||
mkdir -p $INSTALL/usr/bin
|
||||
cp $PKG_BUILD/.objdir-target/python $INSTALL/usr/bin/
|
||||
|
||||
@ -44,80 +50,11 @@ mkdir -p $PYTHON_LIB_DIR/lib-dynload
|
||||
mkdir -p $PYTHON_LIB_DIR/plat-linux2
|
||||
cp $PKG_BUILD/Lib/plat-linux2/* $PYTHON_LIB_DIR/plat-linux2
|
||||
|
||||
mkdir -p $PYTHON_LIB_DIR/json
|
||||
cp $PKG_BUILD/Lib/json/*.py $PYTHON_LIB_DIR/json
|
||||
|
||||
mkdir -p $PYTHON_LIB_DIR/xml
|
||||
cp $PKG_BUILD/Lib/xml/*.py $PYTHON_LIB_DIR/xml
|
||||
|
||||
mkdir -p $PYTHON_LIB_DIR/xml/dom
|
||||
cp $PKG_BUILD/Lib/xml/dom/*.py $PYTHON_LIB_DIR/xml/dom
|
||||
|
||||
mkdir -p $PYTHON_LIB_DIR/xml/parsers
|
||||
cp $PKG_BUILD/Lib/xml/parsers/*.py $PYTHON_LIB_DIR/xml/parsers
|
||||
|
||||
mkdir -p $PYTHON_LIB_DIR/xml/sax
|
||||
cp $PKG_BUILD/Lib/xml/sax/*.py $PYTHON_LIB_DIR/xml/sax
|
||||
|
||||
mkdir -p $PYTHON_LIB_DIR/encodings
|
||||
cp $PKG_BUILD/Lib/encodings/*.py $PYTHON_LIB_DIR/encodings
|
||||
|
||||
mkdir -p $PYTHON_LIB_DIR/logging
|
||||
cp $PKG_BUILD/Lib/logging/*.py $PYTHON_LIB_DIR/logging
|
||||
|
||||
mkdir -p $PYTHON_LIB_DIR/distutils
|
||||
cp $PKG_BUILD/Lib/distutils/*.py $PYTHON_LIB_DIR/distutils
|
||||
|
||||
mkdir -p $PYTHON_LIB_DIR/distutils/command
|
||||
cp $PKG_BUILD/Lib/distutils/command/*.py $PYTHON_LIB_DIR/distutils/command
|
||||
for dirs in $INCLUDE_DIRS; do
|
||||
mkdir -p $PYTHON_LIB_DIR/$dirs
|
||||
cp $PKG_BUILD/Lib/$dirs/*.py $PYTHON_LIB_DIR/$dirs
|
||||
done
|
||||
|
||||
# For future 3rd-parties Python modules
|
||||
mkdir -p $PYTHON_LIB_DIR/site-packages
|
||||
|
||||
### for test ###
|
||||
|
||||
#mkdir -p $PYTHON_LIB_DIR/bsddb
|
||||
# cp $PKG_BUILD/Lib/bsddb/*.py $PYTHON_LIB_DIR/bsddb
|
||||
|
||||
mkdir -p $PYTHON_LIB_DIR/compiler
|
||||
cp $PKG_BUILD/Lib/compiler/*.py $PYTHON_LIB_DIR/compiler
|
||||
|
||||
mkdir -p $PYTHON_LIB_DIR/ctypes
|
||||
cp $PKG_BUILD/Lib/ctypes/*.py $PYTHON_LIB_DIR/ctypes
|
||||
|
||||
mkdir -p $PYTHON_LIB_DIR/ctypes/macholib
|
||||
cp $PKG_BUILD/Lib/ctypes/macholib/*.py $PYTHON_LIB_DIR/ctypes/macholib
|
||||
|
||||
#mkdir -p $PYTHON_LIB_DIR/curses
|
||||
# cp $PKG_BUILD/Lib/curses/*.py $PYTHON_LIB_DIR/curses
|
||||
|
||||
mkdir -p $PYTHON_LIB_DIR/email
|
||||
cp $PKG_BUILD/Lib/email/*.py $PYTHON_LIB_DIR/email
|
||||
|
||||
mkdir -p $PYTHON_LIB_DIR/email/mime
|
||||
cp $PKG_BUILD/Lib/email/mime/*.py $PYTHON_LIB_DIR/email/mime
|
||||
|
||||
mkdir -p $PYTHON_LIB_DIR/hotshot
|
||||
cp $PKG_BUILD/Lib/hotshot/*.py $PYTHON_LIB_DIR/hotshot
|
||||
|
||||
mkdir -p $PYTHON_LIB_DIR/idlelib
|
||||
cp $PKG_BUILD/Lib/idlelib/*.py $PYTHON_LIB_DIR/idlelib
|
||||
|
||||
#mkdir -p $PYTHON_LIB_DIR/lib-tk
|
||||
# cp $PKG_BUILD/Lib/lib-tk/*.py $PYTHON_LIB_DIR/lib-tk
|
||||
|
||||
#mkdir -p $PYTHON_LIB_DIR/msilib
|
||||
# cp $PKG_BUILD/Lib/msilib/*.py $PYTHON_LIB_DIR/msilib
|
||||
|
||||
mkdir -p $PYTHON_LIB_DIR/multiprocessing
|
||||
cp $PKG_BUILD/Lib/multiprocessing/*.py $PYTHON_LIB_DIR/multiprocessing
|
||||
|
||||
# not needed, we have pysqlite2
|
||||
mkdir -p $PYTHON_LIB_DIR/sqlite3
|
||||
cp $PKG_BUILD/Lib/sqlite3/*.py $PYTHON_LIB_DIR/sqlite3
|
||||
|
||||
#mkdir -p $PYTHON_LIB_DIR/wsgiref
|
||||
# cp $PKG_BUILD/Lib/wsgiref/*.py $PYTHON_LIB_DIR/wsgiref
|
||||
|
||||
mkdir -p $PYTHON_LIB_DIR/xml/etree
|
||||
cp $PKG_BUILD/Lib/xml/etree/*.py $PYTHON_LIB_DIR/xml/etree
|
||||
|
||||
@ -0,0 +1,28 @@
|
||||
diff -Naur Python-2.7.2/Makefile.pre.in Python-2.7.2.patch/Makefile.pre.in
|
||||
--- Python-2.7.2/Makefile.pre.in 2011-10-30 11:41:31.642572564 +0100
|
||||
+++ Python-2.7.2.patch/Makefile.pre.in 2011-10-30 11:44:08.289571802 +0100
|
||||
@@ -928,24 +928,6 @@
|
||||
done; \
|
||||
done
|
||||
$(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt
|
||||
- -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
|
||||
- $(HOSTPYTHON) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \
|
||||
- -d $(LIBDEST) -f \
|
||||
- -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
|
||||
- $(DESTDIR)$(LIBDEST)
|
||||
- -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
|
||||
- $(HOSTPYTHON) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \
|
||||
- -d $(LIBDEST) -f \
|
||||
- -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
|
||||
- $(DESTDIR)$(LIBDEST)
|
||||
- -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
|
||||
- $(HOSTPYTHON) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \
|
||||
- -d $(LIBDEST)/site-packages -f \
|
||||
- -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
|
||||
- -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
|
||||
- $(HOSTPYTHON) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \
|
||||
- -d $(LIBDEST)/site-packages -f \
|
||||
- -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
|
||||
-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
|
||||
$(HOSTPYTHON) -Wi -t -c "import lib2to3.pygram, lib2to3.patcomp;lib2to3.patcomp.PatternCompiler()"
|
||||
|
||||
@ -24,9 +24,24 @@
|
||||
|
||||
cd $PKG_BUILD
|
||||
|
||||
[ -z "$OBJDUMP" ] && OBJDUMP=${TARGET_PREFIX}objdump
|
||||
[ -z "$ECHO" ] && ECHO=/bin/echo
|
||||
|
||||
# fix some directives after unpacking
|
||||
sed -i "s|KDIR = .*|KDIR = $(kernel_path)|" Makefile
|
||||
sed -i "s|KSRC = .*|KSRC = \$KDIR|" Makefile
|
||||
sed -i "s|KINS = .*|KINS = \./modules|" Makefile
|
||||
|
||||
make CC=$CC
|
||||
|
||||
# ultraman: Original build module doesn't depends on dvb-usb module
|
||||
# How to fix that? For now let's just modify .modinfo section in kernel module
|
||||
# and depmod will pick up appropriate dependend modules
|
||||
cp dvb-usb-af9035.ko dvb-usb-af9035.ko_orig
|
||||
$OBJDUMP -s -j .modinfo dvb-usb-af9035.ko_orig | awk 'BEGIN{v=0;} /Contents/ {v=1; next;} {if (v==1) print $0;}' >new.modinfo1
|
||||
cat new.modinfo1 | cut -c7-41 | awk '{printf($0);}' | sed 's/ //g;s/../\\\x&/g;' >new.modinfo2
|
||||
$ECHO -ne `cat new.modinfo2` >new.modinfo3
|
||||
cat new.modinfo3 | tr '\000' '\n' | awk '/^depends=/ {next;} {print $0;}' | tr '\n' '\000' >new.modinfo4
|
||||
$ECHO -ne "depends=dvb-usb\0" >>new.modinfo4
|
||||
$OBJCOPY --remove-section=.modinfo --add-section=.modinfo=new.modinfo4 --set-section-flags .modinfo=contents,alloc,load,readonly,data dvb-usb-af9035.ko_orig dvb-usb-af9035.ko
|
||||
rm new.modinfo*
|
||||
|
||||
42
packages/linux-drivers/a867_drv/build
Executable file
42
packages/linux-drivers/a867_drv/build
Executable file
@ -0,0 +1,42 @@
|
||||
#!/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
|
||||
|
||||
[ -z "$OBJDUMP" ] && OBJDUMP=${TARGET_PREFIX}objdump
|
||||
[ -z "$ECHO" ] && ECHO=/bin/echo
|
||||
|
||||
make CC=$CC KSRC=$(kernel_path) KOBJ=$(kernel_path)
|
||||
|
||||
# ultraman: Original build module doesn't depends on dvb-usb module
|
||||
# How to fix that? For now let's just modify .modinfo section in kernel module
|
||||
# and depmod will pick up appropriate dependend modules
|
||||
cp a867.ko a867.ko_orig
|
||||
$OBJDUMP -s -j .modinfo a867.ko_orig | awk 'BEGIN{v=0;} /Contents/ {v=1; next;} {if (v==1) print $0;}' >new.modinfo1
|
||||
cat new.modinfo1 | cut -c7-41 | awk '{printf($0);}' | sed 's/ //g;s/../\\\x&/g;' >new.modinfo2
|
||||
$ECHO -ne `cat new.modinfo2` >new.modinfo3
|
||||
cat new.modinfo3 | tr '\000' '\n' | awk '/^depends=/ {next;} {print $0;}' | tr '\n' '\000' >new.modinfo4
|
||||
$ECHO -ne "depends=dvb-usb\0" >>new.modinfo4
|
||||
$OBJCOPY --remove-section=.modinfo --add-section=.modinfo=new.modinfo4 --set-section-flags .modinfo=contents,alloc,load,readonly,data a867.ko_orig a867.ko
|
||||
rm new.modinfo*
|
||||
@ -20,21 +20,14 @@
|
||||
# http://www.gnu.org/copyleft/gpl.html
|
||||
################################################################################
|
||||
|
||||
. /etc/profile
|
||||
. config/options $1
|
||||
|
||||
case "$1" in
|
||||
thaw|resume)
|
||||
(
|
||||
if [ -f /var/config/settings.conf ]; then
|
||||
. /var/config/settings.conf
|
||||
VER=`ls $BUILD/linux*/modules/lib/modules`
|
||||
|
||||
if [ "$WAKEUP_VIDEODBUPDATE" = "true" ]; then
|
||||
usleep 5000000
|
||||
xbmc-send --host=127.0.0.1 -a "UpdateLibrary(video)"
|
||||
fi
|
||||
fi
|
||||
)&
|
||||
;;
|
||||
*) exit $NA
|
||||
;;
|
||||
esac
|
||||
mkdir -p $INSTALL/lib/modules/$VER/a867
|
||||
cp $PKG_BUILD/a867.ko $INSTALL/lib/modules/$VER/a867/
|
||||
|
||||
$ROOT/$TOOLCHAIN/sbin/depmod -b $INSTALL $VER > /dev/null
|
||||
for i in `ls $INSTALL/lib/modules/*/modules.* | grep -v modules.dep | grep -v modules.alias | grep -v modules.symbols`; do
|
||||
rm -f $i
|
||||
done
|
||||
35
packages/linux-drivers/a867_drv/meta
Normal file
35
packages/linux-drivers/a867_drv/meta
Normal file
@ -0,0 +1,35 @@
|
||||
################################################################################
|
||||
# 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="a867_drv"
|
||||
PKG_VERSION="v1.0.28"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://www.avermedia.com/Product/ProductDetail.aspx?Id=516&tab=APDriver"
|
||||
PKG_URL="http://www.avermedia.com/avertv/Upload/Download/${PKG_NAME}_${PKG_VERSION}.tar.bz2"
|
||||
PKG_DEPENDS=""
|
||||
PKG_BUILD_DEPENDS="toolchain linux busybox-hosttools"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="driver"
|
||||
PKG_SHORTDESC="AVerTV Volar HD Nano A867R driver"
|
||||
PKG_LONGDESC="AVerTV Volar HD Nano A867R driver"
|
||||
PKG_IS_ADDON="no"
|
||||
PKG_AUTORECONF="no"
|
||||
@ -0,0 +1,75 @@
|
||||
diff -Nur a867_drv_v1.0.28/af903x-drv.c a867_drv_v1.0.28_modif//af903x-drv.c
|
||||
--- a867_drv_v1.0.28/af903x-drv.c 2010-11-10 04:46:22.000000000 +0100
|
||||
+++ a867_drv_v1.0.28_modif//af903x-drv.c 2011-07-24 11:41:45.162923006 +0200
|
||||
@@ -1103,8 +1103,8 @@
|
||||
PDC->StreamType = StreamType_DVBT_DATAGRAM;
|
||||
PDC->UsbCtrlTimeOut = 1;
|
||||
|
||||
- init_MUTEX(&PDC->powerLock);
|
||||
- init_MUTEX(&PDC->tunerLock);
|
||||
+ sema_init(&PDC->powerLock,1);
|
||||
+ sema_init(&PDC->tunerLock,1);
|
||||
PDC->power_use_count = 0;
|
||||
|
||||
PDC->idVendor = udev->descriptor.idVendor;
|
||||
@@ -1116,7 +1116,7 @@
|
||||
PDC->fc[0].AVerFlags = 0x00;
|
||||
PDC->fc[1].AVerFlags = 0x00;
|
||||
|
||||
- init_MUTEX(&PDC->regLock);
|
||||
+ sema_init(&PDC->regLock,1);
|
||||
}
|
||||
else {
|
||||
PDC->UsbCtrlTimeOut = 5;
|
||||
diff -Nur a867_drv_v1.0.28/af903x-fe.c a867_drv_v1.0.28_modif//af903x-fe.c
|
||||
--- a867_drv_v1.0.28/af903x-fe.c 2010-11-10 04:46:22.000000000 +0100
|
||||
+++ a867_drv_v1.0.28_modif//af903x-fe.c 2011-07-24 11:43:58.543584444 +0200
|
||||
@@ -1,5 +1,5 @@
|
||||
#include <linux/sched.h>
|
||||
-#include <linux/smp_lock.h>
|
||||
+//#include <linux/smp_lock.h>
|
||||
#include <linux/list.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/version.h>
|
||||
@@ -678,7 +678,7 @@
|
||||
deb_data("- Enter %s Function -\n",__FUNCTION__);
|
||||
if( !state ) return -1;
|
||||
|
||||
- lock_kernel();
|
||||
+ //lock_kernel();
|
||||
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,61)
|
||||
daemonize();
|
||||
sigfillset(¤t->blocked);
|
||||
@@ -689,7 +689,7 @@
|
||||
#endif
|
||||
siginitsetinv(¤t->blocked, sigmask(SIGKILL)|sigmask(SIGINT)|\
|
||||
sigmask(SIGTERM));
|
||||
- unlock_kernel();
|
||||
+ //unlock_kernel();
|
||||
|
||||
while(!state->thread_should_stop && !signal_pending(current)) {
|
||||
|
||||
diff -Nur a867_drv_v1.0.28/af903x.h a867_drv_v1.0.28_modif//af903x.h
|
||||
--- a867_drv_v1.0.28/af903x.h 2010-11-10 04:46:22.000000000 +0100
|
||||
+++ a867_drv_v1.0.28_modif//af903x.h 2011-07-24 11:42:54.563267143 +0200
|
||||
@@ -9,7 +9,7 @@
|
||||
#include <linux/slab.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/kref.h>
|
||||
-#include <linux/smp_lock.h>
|
||||
+//#include <linux/smp_lock.h>
|
||||
#include <linux/usb.h>
|
||||
#include <asm/uaccess.h>
|
||||
#include <dvb-usb.h>
|
||||
diff -Nur a867_drv_v1.0.28/usb2impl.c a867_drv_v1.0.28_modif//usb2impl.c
|
||||
--- a867_drv_v1.0.28/usb2impl.c 2010-11-10 10:27:27.000000000 +0100
|
||||
+++ a867_drv_v1.0.28_modif//usb2impl.c 2011-07-24 11:43:09.915343276 +0200
|
||||
@@ -10,7 +10,7 @@
|
||||
#include <linux/slab.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/kref.h>
|
||||
-#include <linux/smp_lock.h>
|
||||
+//#include <linux/smp_lock.h>
|
||||
#include <linux/usb.h>
|
||||
#include <asm/uaccess.h>
|
||||
#include <linux/device.h>
|
||||
@ -0,0 +1,2 @@
|
||||
http://www.aviolat-chauffage.ch/~xens/wordpress/?p=229
|
||||
http://www.aviolat-chauffage.ch/~xens/files/a867_drv_v1.0.28_BKL_removal.patch.tar.gz
|
||||
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="dvb-firmware"
|
||||
PKG_VERSION="0.0.15"
|
||||
PKG_VERSION="0.0.16"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="Free-to-use"
|
||||
|
||||
@ -54,8 +54,8 @@ make $KERNEL_IMAGE
|
||||
|
||||
( cd tools/power/cpupower
|
||||
|
||||
export CFLAGS="$TARGET_CFLAGS -I$SYSROOT_PREFIX/usr/include"
|
||||
export LDFLAGS="$TARGET_LDFLAGS -L$SYSROOT_PREFIX/lib -L$SYSROOT_PREFIX/usr/lib"
|
||||
export CFLAGS="-I$SYSROOT_PREFIX/usr/include"
|
||||
export LDFLAGS="-L$SYSROOT_PREFIX/lib -L$SYSROOT_PREFIX/usr/lib"
|
||||
|
||||
make CROSS="$TARGET_PREFIX" \
|
||||
V=1 \
|
||||
|
||||
@ -25,17 +25,8 @@
|
||||
<setting id="NET2_PREFIXLEN" value="24" />
|
||||
<setting id="NET2_SECURITY" value="NONE" />
|
||||
<setting id="NET2_SSID" value="" />
|
||||
<setting id="SABNZBD_START" value="false" />
|
||||
<setting id="SAMBA_START" value="true" />
|
||||
<setting id="TRANSMISSION_AUTH" value="false" />
|
||||
<setting id="TRANSMISSION_IP" value="" />
|
||||
<setting id="TRANSMISSION_PWD" value="openelec" />
|
||||
<setting id="TRANSMISSION_START" value="false" />
|
||||
<setting id="TRANSMISSION_USER" value="openelec" />
|
||||
<setting id="TVHEADEND_START" value="false" />
|
||||
<setting id="UPDATE_AUTO" value="manual" />
|
||||
<setting id="WAKEUP_MUSICDBUPDATE" value="false" />
|
||||
<setting id="WAKEUP_VIDEODBUPDATE" value="false" />
|
||||
<setting id="X11_KEYMAP" value="us" />
|
||||
<setting id="X11_KEYMAP2" value="" />
|
||||
</settings>
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
||||
<addon id="os.openelec.settings"
|
||||
name="OpenELEC OS Settings"
|
||||
version="0.0.12"
|
||||
version="0.0.13"
|
||||
provider-name="openelec.tv">
|
||||
<requires>
|
||||
<import addon="os.openelec.tv" version="@OS_VERSION@"/>
|
||||
|
||||
@ -27,7 +27,7 @@ __author__ = "OpenELEC"
|
||||
__url__ = "http://www.openelec.tv"
|
||||
__svn_url__ = ""
|
||||
__credits__ = ""
|
||||
__version__ = "0.0.9"
|
||||
__version__ = "0.0.13"
|
||||
__XBMC_Revision__ = "22240"
|
||||
|
||||
__settings__ = xbmcaddon.Addon(id='os.openelec.settings')
|
||||
|
||||
@ -10,9 +10,6 @@
|
||||
<string id="2021">Systeem update</string>
|
||||
<string id="2050">LCD/VFD Driver</string>
|
||||
<string id="2051">Te gebruiken LCD Driver</string>
|
||||
<string id="2060">Services na slaapstand</string>
|
||||
<string id="2061">Update video database na slaapstand</string>
|
||||
<string id="2062">Update music database na slaapstand</string>
|
||||
|
||||
<!-- Netwerk -->
|
||||
<string id="2100">Netwerk</string>
|
||||
|
||||
@ -10,9 +10,6 @@
|
||||
<string id="2021">System Update</string>
|
||||
<string id="2050">LCD/VFD</string>
|
||||
<string id="2051">LCD Driver to use</string>
|
||||
<string id="2060">Wakeup</string>
|
||||
<string id="2061">Update Video Database on Wakeup</string>
|
||||
<string id="2062">Update Music Database on Wakeup</string>
|
||||
|
||||
<!-- Network -->
|
||||
<string id="2100">Network</string>
|
||||
|
||||
@ -10,9 +10,6 @@
|
||||
<string id="2021">Mise à jour du système</string>
|
||||
<string id="2050">LCD/VFD</string>
|
||||
<string id="2051">Pilote LCD</string>
|
||||
<string id="2060">Retour de veille</string>
|
||||
<string id="2061">Mettre à jour la base Vidéo au retour de veille</string>
|
||||
<string id="2062">Mettre à jour la base Musique au retour de veille</string>
|
||||
|
||||
<!-- Network -->
|
||||
<string id="2100">Réseau</string>
|
||||
|
||||
@ -10,9 +10,6 @@
|
||||
<string id="2021">System Aktualisierung</string>
|
||||
<string id="2050">LCD/VFD</string>
|
||||
<string id="2051">LCD Treiber</string>
|
||||
<string id="2060">Beim Aufwachen</string>
|
||||
<string id="2061">Video-Datenbank automatisch aktualisieren</string>
|
||||
<string id="2062">Musik-Datenbank automatisch aktualisieren</string>
|
||||
|
||||
<!-- Network -->
|
||||
<string id="2100">Netzwerk</string>
|
||||
|
||||
@ -5,14 +5,11 @@
|
||||
<string id="2000">System</string>
|
||||
<string id="2010">Tastatur</string>
|
||||
<string id="2011">Språklayout</string>
|
||||
<string id="2012">Språklayout #2</string>
|
||||
<string id="2012">Språklayout #2</string>
|
||||
<string id="2020">Systemoppdateringer</string>
|
||||
<string id="2021">Systemoppdateringer</string>
|
||||
<string id="2050">LCD/VFD</string>
|
||||
<string id="2051">LCD Driver</string>
|
||||
<string id="2060">Vekke</string>
|
||||
<string id="2061">Oppdater Video Database på vekking</string>
|
||||
<string id="2062">Oppdater Musikk Database på vekking</string>
|
||||
|
||||
<!-- Nettverk -->
|
||||
<string id="2100">Nettverk</string>
|
||||
|
||||
@ -13,10 +13,6 @@
|
||||
<setting label="2050" type="lsep"/>
|
||||
<setting type="sep" />
|
||||
<setting id="LCD_DRIVER" type="labelenum" label="2051" values="none|irtrans|imon|imonlcd|mdm166a" sort="yes" default="none" />
|
||||
<setting label="2060" type="lsep"/>
|
||||
<setting type="sep" />
|
||||
<setting id="WAKEUP_VIDEODBUPDATE" type="bool" label="2061" default="false" />
|
||||
<setting id="WAKEUP_MUSICDBUPDATE" type="bool" label="2062" default="false" />
|
||||
</category>
|
||||
|
||||
<!-- Network -->
|
||||
|
||||
@ -133,7 +133,6 @@ fi
|
||||
# xbmc (ffmpeg) fails to build with LTO optimization
|
||||
strip_lto
|
||||
strip_gold
|
||||
strip_linker_plugin
|
||||
|
||||
# dont use some optimizations because of problems
|
||||
# this fixes problems with faac implementation of ffmpeg
|
||||
@ -145,19 +144,6 @@ fi
|
||||
export PYTHON_SITE_PKG="$SYSROOT_PREFIX/usr/lib/python$PYTHON_VERSION/site-packages"
|
||||
export ac_python_version="$PYTHON_VERSION"
|
||||
|
||||
# this fixes the "stretching picture bug"
|
||||
CFLAGS=`echo $CFLAGS | sed -e "s|-ftree-loop-distribution||"`
|
||||
CFLAGS=`echo $CFLAGS | sed -e "s|-floop-interchange||"`
|
||||
CFLAGS=`echo $CFLAGS | sed -e "s|-floop-strip-mine||"`
|
||||
CFLAGS=`echo $CFLAGS | sed -e "s|-floop-block||"`
|
||||
CFLAGS=`echo $CFLAGS | sed -e "s|-fgraphite-identity||"`
|
||||
|
||||
CXXFLAGS=`echo $CXXFLAGS | sed -e "s|-ftree-loop-distribution||"`
|
||||
CXXFLAGS=`echo $CXXFLAGS | sed -e "s|-floop-interchange||"`
|
||||
CXXFLAGS=`echo $CXXFLAGS | sed -e "s|-floop-strip-mine||"`
|
||||
CXXFLAGS=`echo $CXXFLAGS | sed -e "s|-floop-block||"`
|
||||
CXXFLAGS=`echo $CXXFLAGS | sed -e "s|-fgraphite-identity||"`
|
||||
|
||||
# setup skin dir from default skin
|
||||
SKIN_DIR="skin.`tolower $SKIN_DEFAULT`"
|
||||
|
||||
@ -241,9 +227,3 @@ cd $PKG_BUILD
|
||||
make externals
|
||||
make xbmc.bin
|
||||
make xbmc-xrandr
|
||||
|
||||
if [ "$WIIMOTE_SUPPORT" = yes ]; then
|
||||
(cd tools/EventClients/Clients/WiiRemote;
|
||||
$CXX $CFLAGS -lwiiuse WiiUse_WiiRemote.cpp -o WiiUse_WiiRemote;
|
||||
)
|
||||
fi
|
||||
|
||||
@ -99,21 +99,3 @@ if [ "$XBMC_EXTRA_FONTS" = yes ]; then
|
||||
mkdir -p $INSTALL/usr/share/xbmc/media/Fonts
|
||||
cp $PKG_DIR/fonts/*.ttf $INSTALL/usr/share/xbmc/media/Fonts
|
||||
fi
|
||||
|
||||
if [ "$WIIMOTE_SUPPORT" = yes ]; then
|
||||
mkdir -p $INSTALL/usr/bin
|
||||
cp $PKG_BUILD/tools/EventClients/Clients/WiiRemote/WiiUse_WiiRemote $INSTALL/usr/bin/xbmc-wiiremote
|
||||
mkdir -p $INSTALL/lib/udev
|
||||
cp $PKG_DIR/scripts/wiiremote_helper $INSTALL/lib/udev
|
||||
fi
|
||||
|
||||
if [ "$PS3REMOTE_SUPPORT" = yes ]; then
|
||||
mkdir -p $INSTALL/usr/bin
|
||||
cp $PKG_BUILD/tools/EventClients/Clients/PS3\ BD\ Remote/ps3_remote.py $INSTALL/usr/bin/xbmc-ps3remote
|
||||
mkdir -p $INSTALL/usr/share/pixmaps/xbmc
|
||||
cp $PKG_BUILD/tools/EventClients/icons/bluetooth.png $INSTALL/usr/share/pixmaps/xbmc
|
||||
mkdir -p $PYTHON_LIBDIR/site-packages/xbmc
|
||||
echo 'ICON_PATH="/usr/share/pixmaps/xbmc/"' > $PYTHON_LIBDIR/site-packages/xbmc/defs.py
|
||||
mkdir -p $INSTALL/lib/udev
|
||||
cp $PKG_DIR/scripts/ps3remote_helper $INSTALL/lib/udev
|
||||
fi
|
||||
|
||||
@ -26,8 +26,8 @@ PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://www.xbmc.org"
|
||||
#PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
|
||||
PKG_URL="http://gujs.openelec.tv/sources/$PKG_NAME-$PKG_VERSION.tar.xz"
|
||||
PKG_DEPENDS="boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump Mesa glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmodplug faad2 flac lame libmpeg2 SDL SDL_mixer SDL_image yajl sqlite mysql alsa bc xbmc-addon-settings"
|
||||
PKG_BUILD_DEPENDS="toolchain boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump Mesa glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmodplug faad2 flac lame libmpeg2 SDL SDL_mixer SDL_image yajl sqlite mysql"
|
||||
PKG_DEPENDS="boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump $MESA glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmodplug faad2 flac lame libmpeg2 SDL SDL_mixer SDL_image yajl sqlite mysql alsa bc xbmc-addon-settings"
|
||||
PKG_BUILD_DEPENDS="toolchain boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump $MESA glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmodplug faad2 flac lame libmpeg2 SDL SDL_mixer SDL_image yajl sqlite mysql"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="mediacenter"
|
||||
PKG_SHORTDESC="xbmc: XBMC Mediacenter"
|
||||
@ -118,15 +118,6 @@ if [ "$CRYSTALHD" = yes ]; then
|
||||
PKG_DEPENDS="$PKG_DEPENDS crystalhd"
|
||||
fi
|
||||
|
||||
if [ "$WIIMOTE_SUPPORT" = yes ]; then
|
||||
PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS wiiuse"
|
||||
PKG_DEPENDS="$PKG_DEPENDS wiiuse"
|
||||
fi
|
||||
|
||||
if [ "$PS3REMOTE_SUPPORT" = yes ]; then
|
||||
PKG_DEPENDS="$PKG_DEPENDS PyBluez"
|
||||
fi
|
||||
|
||||
# some python stuff needed for various addons
|
||||
PKG_DEPENDS="$PKG_DEPENDS Imaging"
|
||||
PKG_DEPENDS="$PKG_DEPENDS simplejson"
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,48 @@
|
||||
diff -Naur xbmc-4c32cde/lib/ffmpeg/libavcodec/h264.c xbmc-4c32cde.patch/lib/ffmpeg/libavcodec/h264.c
|
||||
--- xbmc-4c32cde/lib/ffmpeg/libavcodec/h264.c 2011-10-28 15:29:40.000000000 +0200
|
||||
+++ xbmc-4c32cde.patch/lib/ffmpeg/libavcodec/h264.c 2011-10-29 15:18:16.716609657 +0200
|
||||
@@ -1802,7 +1802,7 @@
|
||||
if(h->sps.frame_mbs_only_flag)
|
||||
s->height= 16*s->mb_height - 2*FFMIN(h->sps.crop_bottom, 7);
|
||||
else
|
||||
- s->height= 16*s->mb_height - 4*FFMIN(h->sps.crop_bottom, 7);
|
||||
+ s->height= 16*s->mb_height - 4*FFMIN(h->sps.crop_bottom, 3);
|
||||
|
||||
if (s->context_initialized
|
||||
&& ( s->width != s->avctx->width || s->height != s->avctx->height
|
||||
diff -Naur xbmc-4c32cde/lib/ffmpeg/libavcodec/h264_ps.c xbmc-4c32cde.patch/lib/ffmpeg/libavcodec/h264_ps.c
|
||||
--- xbmc-4c32cde/lib/ffmpeg/libavcodec/h264_ps.c 2011-10-28 15:29:39.000000000 +0200
|
||||
+++ xbmc-4c32cde.patch/lib/ffmpeg/libavcodec/h264_ps.c 2011-10-29 15:18:16.718609683 +0200
|
||||
@@ -374,7 +374,7 @@
|
||||
if(sps->crop_left || sps->crop_top){
|
||||
av_log(h->s.avctx, AV_LOG_ERROR, "insane cropping not completely supported, this could look slightly wrong ...\n");
|
||||
}
|
||||
- if(sps->crop_right >= 8 || sps->crop_bottom >= 8){
|
||||
+ if(sps->crop_right >= 8 || sps->crop_bottom >= (8>> !sps->frame_mbs_only_flag)){
|
||||
av_log(h->s.avctx, AV_LOG_ERROR, "brainfart cropping not supported, this could look slightly wrong ...\n");
|
||||
}
|
||||
}else{
|
||||
diff -Naur xbmc-4c32cde/lib/ffmpeg/libavcodec/mpegvideo.c xbmc-4c32cde.patch/lib/ffmpeg/libavcodec/mpegvideo.c
|
||||
--- xbmc-4c32cde/lib/ffmpeg/libavcodec/mpegvideo.c 2011-10-28 15:29:40.000000000 +0200
|
||||
+++ xbmc-4c32cde.patch/lib/ffmpeg/libavcodec/mpegvideo.c 2011-10-29 15:18:16.719609696 +0200
|
||||
@@ -498,7 +498,7 @@
|
||||
|
||||
if(s->codec_id == CODEC_ID_MPEG2VIDEO && !s->progressive_sequence)
|
||||
s->mb_height = (s->height + 31) / 32 * 2;
|
||||
- else if (s->codec_id != CODEC_ID_H264)
|
||||
+ else
|
||||
s->mb_height = (s->height + 15) / 16;
|
||||
|
||||
if(s->avctx->pix_fmt == PIX_FMT_NONE){
|
||||
diff -Naur xbmc-4c32cde/lib/ffmpeg/libavcodec/utils.c xbmc-4c32cde.patch/lib/ffmpeg/libavcodec/utils.c
|
||||
--- xbmc-4c32cde/lib/ffmpeg/libavcodec/utils.c 2011-10-28 15:29:41.000000000 +0200
|
||||
+++ xbmc-4c32cde.patch/lib/ffmpeg/libavcodec/utils.c 2011-10-29 15:18:16.721609720 +0200
|
||||
@@ -145,7 +145,7 @@
|
||||
case PIX_FMT_YUVA420P:
|
||||
w_align= 16; //FIXME check for non mpeg style codecs and use less alignment
|
||||
h_align= 16;
|
||||
- if(s->codec_id == CODEC_ID_MPEG2VIDEO || s->codec_id == CODEC_ID_MJPEG || s->codec_id == CODEC_ID_AMV || s->codec_id == CODEC_ID_THP || s->codec_id == CODEC_ID_H264)
|
||||
+ if(s->codec_id == CODEC_ID_MPEG2VIDEO || s->codec_id == CODEC_ID_MJPEG || s->codec_id == CODEC_ID_AMV || s->codec_id == CODEC_ID_THP)
|
||||
h_align= 32; // interlaced is rounded up to 2 MBs
|
||||
break;
|
||||
case PIX_FMT_YUV411P:
|
||||
@ -1,20 +1,10 @@
|
||||
From f46d7a99bc2f3bc70f274422ec8d16257e2a97aa Mon Sep 17 00:00:00 2001
|
||||
From: FernetMenta <fernetmenta@online.de>
|
||||
Date: Sat, 13 Aug 2011 16:07:08 +0200
|
||||
Subject: [PATCH] ati: limit glxSwapBuffers going to far ahead
|
||||
|
||||
---
|
||||
xbmc/windowing/X11/WinSystemX11GL.cpp | 23 +++++++++++++++++++++--
|
||||
1 files changed, 21 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/xbmc/windowing/X11/WinSystemX11GL.cpp b/xbmc/windowing/X11/WinSystemX11GL.cpp
|
||||
index 94f369e..870999e 100644
|
||||
--- a/xbmc/windowing/X11/WinSystemX11GL.cpp
|
||||
+++ b/xbmc/windowing/X11/WinSystemX11GL.cpp
|
||||
@@ -43,7 +43,27 @@ CWinSystemX11GL::~CWinSystemX11GL()
|
||||
|
||||
bool CWinSystemX11GL::PresentRenderImpl(const CDirtyRegionList& dirty)
|
||||
diff -Naur xbmc-4c32cde/xbmc/windowing/X11/WinSystemX11GL.cpp xbmc-4c32cde.patch/xbmc/windowing/X11/WinSystemX11GL.cpp
|
||||
--- xbmc-4c32cde/xbmc/windowing/X11/WinSystemX11GL.cpp 2011-10-29 14:43:48.634117918 +0200
|
||||
+++ xbmc-4c32cde.patch/xbmc/windowing/X11/WinSystemX11GL.cpp 2011-10-29 14:45:56.207774711 +0200
|
||||
@@ -45,7 +45,27 @@
|
||||
{
|
||||
CheckDisplayEvents();
|
||||
|
||||
- if(m_iVSyncMode == 3)
|
||||
+ if(m_iVSyncMode == 2)
|
||||
+ {
|
||||
@ -40,7 +30,7 @@ index 94f369e..870999e 100644
|
||||
{
|
||||
glFinish();
|
||||
unsigned int before = 0, after = 0;
|
||||
@@ -236,7 +256,6 @@ bool CWinSystemX11GL::CreateNewWindow(const CStdString& name, bool fullScreen, R
|
||||
@@ -238,7 +258,6 @@
|
||||
else
|
||||
m_glXSwapIntervalMESA = NULL;
|
||||
|
||||
@ -48,6 +38,3 @@ index 94f369e..870999e 100644
|
||||
return true;
|
||||
}
|
||||
|
||||
--
|
||||
1.7.5.4
|
||||
|
||||
|
||||
@ -1,29 +0,0 @@
|
||||
diff -Naur xbmc-pvr-3513480/tools/EventClients/Clients/PS3 BD Remote/ps3_remote.py xbmc-pvr-3513480.patch/tools/EventClients/Clients/PS3 BD Remote/ps3_remote.py
|
||||
--- xbmc-pvr-3513480/tools/EventClients/Clients/PS3 BD Remote/ps3_remote.py 2011-04-25 02:36:33.000000000 +0200
|
||||
+++ xbmc-pvr-3513480.patch/tools/EventClients/Clients/PS3 BD Remote/ps3_remote.py 2011-04-25 05:30:03.870260596 +0200
|
||||
@@ -59,9 +59,6 @@
|
||||
target_connected = False
|
||||
target_address = None
|
||||
while target_connected is False:
|
||||
- xbmc.send_notification("Action Required!",
|
||||
- "Hold Start+Enter on your remote.",
|
||||
- bticon)
|
||||
print "Searching for %s" % target_name
|
||||
print "(Hold Start + Enter on remote to make it discoverable)"
|
||||
time.sleep(2)
|
||||
@@ -72,7 +69,6 @@
|
||||
except Exception, e:
|
||||
print "Error performing bluetooth discovery"
|
||||
print str(e)
|
||||
- xbmc.send_notification("Error", "Unable to find devices.", bticon)
|
||||
time.sleep(5)
|
||||
continue
|
||||
|
||||
@@ -109,7 +105,6 @@
|
||||
print "ERROR - Could Not Connect. Trying again..."
|
||||
time.sleep(2)
|
||||
else:
|
||||
- xbmc.send_notification("Error", "No remotes were found.", bticon)
|
||||
print "Could not find BD Remote Control. Trying again..."
|
||||
time.sleep(2)
|
||||
return (remote,target_address)
|
||||
@ -25,8 +25,8 @@ PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://www.libsdl.org/"
|
||||
PKG_URL="http://www.libsdl.org/release/$PKG_NAME-$PKG_VERSION.tar.gz"
|
||||
PKG_DEPENDS="alsa-lib libX11 libXrandr Mesa"
|
||||
PKG_BUILD_DEPENDS="toolchain yasm alsa-lib libX11 libXrandr Mesa"
|
||||
PKG_DEPENDS="alsa-lib libX11 libXrandr $MESA"
|
||||
PKG_BUILD_DEPENDS="toolchain yasm alsa-lib libX11 libXrandr $MESA"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="multimedia"
|
||||
PKG_SHORTDESC="libsdl: A cross-platform Graphic API"
|
||||
|
||||
@ -25,8 +25,8 @@ PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://www.libsdl.org/"
|
||||
PKG_URL="http://www.libsdl.org/projects/SDL_ttf/release/$PKG_NAME-$PKG_VERSION.tar.gz"
|
||||
PKG_DEPENDS="SDL libICE libX11 freetype Mesa"
|
||||
PKG_BUILD_DEPENDS="toolchain SDL libICE libX11 freetype Mesa"
|
||||
PKG_DEPENDS="SDL libICE libX11 freetype $MESA"
|
||||
PKG_BUILD_DEPENDS="toolchain SDL libICE libX11 freetype $MESA"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="multimedia"
|
||||
PKG_SHORTDESC="libsdl_ttf: A library to use TrueType fonts in SDL applications"
|
||||
|
||||
@ -25,8 +25,8 @@ PKG_ARCH="i386 x86_64"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://freedesktop.org/wiki/Software/vaapi"
|
||||
PKG_URL="http://cgit.freedesktop.org/libva/snapshot/$PKG_NAME-$PKG_VERSION.tar.gz"
|
||||
PKG_DEPENDS="libX11 libXext libXfixes libdrm Mesa"
|
||||
PKG_BUILD_DEPENDS="toolchain libX11 libXext libXfixes libdrm Mesa"
|
||||
PKG_DEPENDS="libX11 libXext libXfixes libdrm $MESA"
|
||||
PKG_BUILD_DEPENDS="toolchain libX11 libXext libXfixes libdrm $MESA"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="multimedia"
|
||||
PKG_SHORTDESC="libva: The main motivation for VAAPI (Video Acceleration API) is to enable hardware accelerated video decode/encode at various entry-points (VLD, IDCT, Motion Compensation etc.) for the prevailing coding standards today (MPEG-2, MPEG-4 ASP/H.263, MPEG-4 AVC/H.264, and VC-1/VMW3)."
|
||||
|
||||
@ -28,7 +28,9 @@ cd $PKG_BUILD
|
||||
--prefix=/usr \
|
||||
--enable-shared \
|
||||
--disable-static \
|
||||
--enable-dri2 \
|
||||
--disable-documentation \
|
||||
--with-module-dir=/usr/lib/vdpau
|
||||
|
||||
make
|
||||
|
||||
|
||||
@ -25,8 +25,8 @@ PKG_ARCH="any"
|
||||
PKG_LICENSE="nonfree"
|
||||
PKG_SITE="http://www.splitted-desktop.com/~gbeauchesne/"
|
||||
PKG_URL="http://www.splitted-desktop.com/~gbeauchesne/xvba-video/$PKG_NAME-$PKG_VERSION.tar.gz"
|
||||
PKG_DEPENDS="libX11 libXext Mesa libva"
|
||||
PKG_BUILD_DEPENDS="toolchain libX11 libXext Mesa libva xf86-video-fglrx"
|
||||
PKG_DEPENDS="libX11 libXext $MESA libva"
|
||||
PKG_BUILD_DEPENDS="toolchain libX11 libXext $MESA libva xf86-video-fglrx"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="multimedia"
|
||||
PKG_SHORTDESC="xvba-video: XvBA backend for VA API"
|
||||
|
||||
@ -44,9 +44,9 @@ ac_cv_func_chroot=no \
|
||||
--disable-dbm \
|
||||
--disable-gdbm \
|
||||
--enable-libdaemon \
|
||||
--disable-python \
|
||||
--enable-python \
|
||||
--disable-pygtk \
|
||||
--disable-python-dbus \
|
||||
--enable-python-dbus \
|
||||
--disable-mono \
|
||||
--disable-monodoc \
|
||||
--enable-autoipd \
|
||||
|
||||
@ -22,6 +22,8 @@
|
||||
|
||||
. config/options $1
|
||||
|
||||
PYTHON_LIB_DIR=`ls -d $INSTALL/usr/lib/python*`
|
||||
|
||||
add_user avahi x 495 495 "avahi-daemon" "/var/run/avahi-daemon" "/bin/sh"
|
||||
add_group avahi 495
|
||||
|
||||
@ -43,7 +45,6 @@ mkdir -p $INSTALL/etc/avahi/services
|
||||
cp $PKG_BUILD/avahi-daemon/sftp-ssh.service $INSTALL/etc/avahi/services
|
||||
fi
|
||||
|
||||
|
||||
mkdir -p $INSTALL/etc/dbus-1/system.d
|
||||
cp $PKG_BUILD/avahi-daemon/avahi-dbus.conf $INSTALL/etc/dbus-1/system.d
|
||||
|
||||
@ -69,6 +70,9 @@ mkdir -p $INSTALL/usr/lib
|
||||
cp -P $PKG_BUILD/avahi-client/.libs/*.so*[.0-9] $INSTALL/usr/lib/
|
||||
cp -P $PKG_BUILD/avahi-compat-libdns_sd/.libs/*.so*[.0-9] $INSTALL/usr/lib/
|
||||
|
||||
mkdir -p $PYTHON_LIB_DIR/site-packages/avahi
|
||||
cp -P $PKG_BUILD/avahi-python/avahi/*.py $PYTHON_LIB_DIR/site-packages/avahi
|
||||
|
||||
mkdir -p $INSTALL/usr/share/avahi
|
||||
cp $PKG_BUILD/service-type-database/service-types $INSTALL/usr/share/avahi
|
||||
cp $PKG_BUILD/avahi-daemon/avahi-service.dtd $INSTALL/usr/share/avahi
|
||||
|
||||
@ -25,8 +25,8 @@ PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://avahi.org/"
|
||||
PKG_URL="http://www.avahi.org/download/$PKG_NAME-$PKG_VERSION.tar.gz"
|
||||
PKG_DEPENDS="expat libdaemon dbus connman"
|
||||
PKG_BUILD_DEPENDS="toolchain expat libdaemon dbus"
|
||||
PKG_DEPENDS="Python expat libdaemon dbus connman dbus-python"
|
||||
PKG_BUILD_DEPENDS="toolchain Python expat libdaemon dbus dbus-python"
|
||||
PKG_PRIORITY="optional"
|
||||
PKG_SECTION="network"
|
||||
PKG_SHORTDESC="avahi: A Zeroconf mDNS/DNS-SD responder"
|
||||
|
||||
66
packages/network/bluez/config/main.conf
Normal file
66
packages/network/bluez/config/main.conf
Normal file
@ -0,0 +1,66 @@
|
||||
[General]
|
||||
|
||||
# List of plugins that should not be loaded on bluetoothd startup
|
||||
DisablePlugins = input
|
||||
|
||||
# Default adaper name
|
||||
# %h - substituted for hostname
|
||||
# %d - substituted for adapter id
|
||||
Name = %h-%d
|
||||
|
||||
# Default device class. Only the major and minor device class bits are
|
||||
# considered.
|
||||
Class = 0x000100
|
||||
|
||||
# How long to stay in discoverable mode before going back to non-discoverable
|
||||
# The value is in seconds. Default is 180, i.e. 3 minutes.
|
||||
# 0 = disable timer, i.e. stay discoverable forever
|
||||
DiscoverableTimeout = 0
|
||||
|
||||
# How long to stay in pairable mode before going back to non-discoverable
|
||||
# The value is in seconds. Default is 0.
|
||||
# 0 = disable timer, i.e. stay pairable forever
|
||||
PairableTimeout = 0
|
||||
|
||||
# Use some other page timeout than the controller default one
|
||||
# which is 16384 (10 seconds).
|
||||
PageTimeout = 8192
|
||||
|
||||
# Discover scheduler interval used in Adapter.DiscoverDevices
|
||||
# The value is in seconds. Defaults is 30.
|
||||
DiscoverSchedulerInterval = 30
|
||||
|
||||
# What value should be assumed for the adapter Powered property when
|
||||
# SetProperty(Powered, ...) hasn't been called yet. Defaults to true
|
||||
InitiallyPowered = true
|
||||
|
||||
# Remember the previously stored Powered state when initializing adapters
|
||||
RememberPowered = true
|
||||
|
||||
# Use vendor, product and version information for DID profile support.
|
||||
# The values are separated by ":" and VID, PID and version.
|
||||
#DeviceID = 1234:5678:abcd
|
||||
|
||||
# Do reverse service discovery for previously unknown devices that connect to
|
||||
# us. This option is really only needed for qualification since the BITE tester
|
||||
# doesn't like us doing reverse SDP for some test cases (though there could in
|
||||
# theory be other useful purposes for this too). Defaults to true.
|
||||
ReverseServiceDiscovery = true
|
||||
|
||||
# Enable name resolving after inquiry. Set it to 'false' if you don't need
|
||||
# remote devices name and want shorter discovery cycle. Defaults to 'true'.
|
||||
NameResolving = true
|
||||
|
||||
# Enable runtime persistency of debug link keys. Default is false which
|
||||
# makes debug link keys valid only for the duration of the connection
|
||||
# that they were created for.
|
||||
DebugKeys = false
|
||||
|
||||
# Enable Low Energy support if the dongle supports. Default is false.
|
||||
# Enable/Disable interleave discovery and attribute server over LE.
|
||||
EnableLE = false
|
||||
|
||||
# Enable the GATT Attribute Server. Default is false, because it is only
|
||||
# useful for testing. Attribute server is not enabled over LE if EnableLE
|
||||
# is false.
|
||||
AttributeServer = false
|
||||
@ -25,7 +25,8 @@
|
||||
PKG_DIR=`find $PACKAGES -type d -name $1`
|
||||
|
||||
mkdir -p $INSTALL/etc/bluetooth
|
||||
cp $PKG_BUILD/src/main.conf $INSTALL/etc/bluetooth
|
||||
# cp $PKG_BUILD/src/main.conf $INSTALL/etc/bluetooth
|
||||
cp $PKG_DIR/config/main.conf $INSTALL/etc/bluetooth
|
||||
cp $PKG_BUILD/tools/rfcomm.conf $INSTALL/etc/bluetooth
|
||||
cp $PKG_BUILD/audio/audio.conf $INSTALL/etc/bluetooth
|
||||
cp $PKG_BUILD/input/input.conf $INSTALL/etc/bluetooth
|
||||
|
||||
@ -25,3 +25,7 @@
|
||||
$SCRIPTS/install connman
|
||||
$SCRIPTS/install ethtool
|
||||
$SCRIPTS/install openssh
|
||||
|
||||
if [ "$BLUETOOTH_SUPPORT" = "yes" ]; then
|
||||
$SCRIPTS/install bluez
|
||||
fi
|
||||
|
||||
@ -28,6 +28,16 @@ else
|
||||
BUSYBOX_CFG_FILE=$ROOT/$PKG_DIR/config/$1.conf
|
||||
fi
|
||||
|
||||
# busybox fails building with LTO support on gcc-4.6
|
||||
strip_lto
|
||||
|
||||
# fails to build with gcc-4.6.1 (ggc bug #49716
|
||||
CFLAGS=`echo $CFLAGS | sed -e "s|-ftree-loop-distribution||"`
|
||||
CFLAGS=`echo $CFLAGS | sed -e "s|-floop-interchange||"`
|
||||
CFLAGS=`echo $CFLAGS | sed -e "s|-floop-strip-mine||"`
|
||||
CFLAGS=`echo $CFLAGS | sed -e "s|-floop-block||"`
|
||||
CFLAGS=`echo $CFLAGS | sed -e "s|-fgraphite-identity||"`
|
||||
|
||||
# optimize for size
|
||||
CFLAGS=`echo $CFLAGS | sed -e "s|-Ofast|-Os|"`
|
||||
CFLAGS=`echo $CFLAGS | sed -e "s|-O.|-Os|"`
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="busybox"
|
||||
PKG_VERSION="1.19.2"
|
||||
PKG_VERSION="1.19.3"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
--- busybox-1.19.2/include/platform.h
|
||||
+++ busybox-1.19.2-android/include/platform.h
|
||||
@@ -433,7 +433,7 @@ typedef unsigned smalluint;
|
||||
# undef HAVE_STPCPY
|
||||
#endif
|
||||
|
||||
-#if defined(ANDROID)
|
||||
+#if defined(ANDROID) || defined(__ANDROID__)
|
||||
# undef HAVE_DPRINTF
|
||||
# undef HAVE_GETLINE
|
||||
# undef HAVE_STPCPY
|
||||
@ -1,19 +0,0 @@
|
||||
--- busybox-1.19.2/applets/applet_tables.c
|
||||
+++ busybox-1.19.2-buildsys/applets/applet_tables.c
|
||||
@@ -80,8 +80,15 @@ int main(int argc, char **argv)
|
||||
|
||||
printf("#define NUM_APPLETS %u\n", NUM_APPLETS);
|
||||
if (NUM_APPLETS == 1) {
|
||||
+ char *dash_to_underscore, *p;
|
||||
printf("#define SINGLE_APPLET_STR \"%s\"\n", applets[0].name);
|
||||
- printf("#define SINGLE_APPLET_MAIN %s_main\n", applets[0].name);
|
||||
+ /* Example: "ether-wake" -> "ether_wake" */
|
||||
+ p = dash_to_underscore = strdup(applets[0].name);
|
||||
+ p--;
|
||||
+ while (*++p)
|
||||
+ if (*p == '-')
|
||||
+ *p = '_';
|
||||
+ printf("#define SINGLE_APPLET_MAIN %s_main\n", dash_to_underscore);
|
||||
}
|
||||
printf("\n");
|
||||
|
||||
@ -1,55 +0,0 @@
|
||||
--- busybox-1.19.2/loginutils/chpasswd.c
|
||||
+++ busybox-1.19.2-chpasswd/loginutils/chpasswd.c
|
||||
@@ -33,9 +33,8 @@ static const char chpasswd_longopts[] AL
|
||||
int chpasswd_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
||||
int chpasswd_main(int argc UNUSED_PARAM, char **argv)
|
||||
{
|
||||
- char *name, *pass;
|
||||
- char salt[sizeof("$N$XXXXXXXX")];
|
||||
- int opt, rc;
|
||||
+ char *name;
|
||||
+ int opt;
|
||||
|
||||
if (getuid() != 0)
|
||||
bb_error_msg_and_die(bb_msg_perm_denied_are_you_root);
|
||||
@@ -45,6 +44,10 @@ int chpasswd_main(int argc UNUSED_PARAM,
|
||||
opt = getopt32(argv, "em");
|
||||
|
||||
while ((name = xmalloc_fgetline(stdin)) != NULL) {
|
||||
+ char *free_me;
|
||||
+ char *pass;
|
||||
+ int rc;
|
||||
+
|
||||
pass = strchr(name, ':');
|
||||
if (!pass)
|
||||
bb_error_msg_and_die("missing new password");
|
||||
@@ -52,7 +55,10 @@ int chpasswd_main(int argc UNUSED_PARAM,
|
||||
|
||||
xuname2uid(name); /* dies if there is no such user */
|
||||
|
||||
+ free_me = NULL;
|
||||
if (!(opt & OPT_ENC)) {
|
||||
+ char salt[sizeof("$N$XXXXXXXX")];
|
||||
+
|
||||
crypt_make_salt(salt, 1);
|
||||
if (opt & OPT_MD5) {
|
||||
salt[0] = '$';
|
||||
@@ -60,7 +66,7 @@ int chpasswd_main(int argc UNUSED_PARAM,
|
||||
salt[2] = '$';
|
||||
crypt_make_salt(salt + 3, 4);
|
||||
}
|
||||
- pass = pw_encrypt(pass, salt, 0);
|
||||
+ free_me = pass = pw_encrypt(pass, salt, 0);
|
||||
}
|
||||
|
||||
/* This is rather complex: if user is not found in /etc/shadow,
|
||||
@@ -81,8 +87,7 @@ int chpasswd_main(int argc UNUSED_PARAM,
|
||||
bb_info_msg("Password for '%s' changed", name);
|
||||
logmode = LOGMODE_STDIO;
|
||||
free(name);
|
||||
- if (!(opt & OPT_ENC))
|
||||
- free(pass);
|
||||
+ free(free_me);
|
||||
}
|
||||
return EXIT_SUCCESS;
|
||||
}
|
||||
@ -1,12 +0,0 @@
|
||||
--- busybox-1.19.2/miscutils/crond.c
|
||||
+++ busybox-1.19.2-crond/miscutils/crond.c
|
||||
@@ -861,7 +861,8 @@ int crond_main(int argc UNUSED_PARAM, ch
|
||||
|
||||
/* "-b after -f is ignored", and so on for every pair a-b */
|
||||
opt_complementary = "f-b:b-f:S-L:L-S" IF_FEATURE_CROND_D(":d-l")
|
||||
- ":l+:d+"; /* -l and -d have numeric param */
|
||||
+ /* -l and -d have numeric param */
|
||||
+ ":l+" IF_FEATURE_CROND_D(":d+");
|
||||
opts = getopt32(argv, "l:L:fbSc:" IF_FEATURE_CROND_D("d:"),
|
||||
&G.log_level, &G.log_filename, &G.crontab_dir_name
|
||||
IF_FEATURE_CROND_D(,&G.log_level));
|
||||
@ -1,47 +0,0 @@
|
||||
--- busybox-1.19.2/networking/inetd.c
|
||||
+++ busybox-1.19.2-inetd/networking/inetd.c
|
||||
@@ -1278,6 +1278,7 @@ int inetd_main(int argc UNUSED_PARAM, ch
|
||||
sep->se_count = 0;
|
||||
rearm_alarm(); /* will revive it in RETRYTIME sec */
|
||||
restore_sigmask(&omask);
|
||||
+ maybe_close(new_udp_fd);
|
||||
maybe_close(accepted_fd);
|
||||
continue; /* -> check next fd in fd set */
|
||||
}
|
||||
@@ -1298,17 +1299,18 @@ int inetd_main(int argc UNUSED_PARAM, ch
|
||||
bb_perror_msg("vfork"+1);
|
||||
sleep(1);
|
||||
restore_sigmask(&omask);
|
||||
+ maybe_close(new_udp_fd);
|
||||
maybe_close(accepted_fd);
|
||||
continue; /* -> check next fd in fd set */
|
||||
}
|
||||
if (pid == 0)
|
||||
pid--; /* -1: "we did fork and we are child" */
|
||||
}
|
||||
- /* if pid == 0 here, we never forked */
|
||||
+ /* if pid == 0 here, we didn't fork */
|
||||
|
||||
if (pid > 0) { /* parent */
|
||||
if (sep->se_wait) {
|
||||
- /* tcp wait: we passed listening socket to child,
|
||||
+ /* wait: we passed socket to child,
|
||||
* will wait for child to terminate */
|
||||
sep->se_wait = pid;
|
||||
remove_fd_from_set(sep->se_fd);
|
||||
@@ -1345,9 +1347,13 @@ int inetd_main(int argc UNUSED_PARAM, ch
|
||||
setsid();
|
||||
/* "nowait" udp */
|
||||
if (new_udp_fd >= 0) {
|
||||
- len_and_sockaddr *lsa = xzalloc_lsa(sep->se_family);
|
||||
+ len_and_sockaddr *lsa;
|
||||
+ int r;
|
||||
+
|
||||
+ close(new_udp_fd);
|
||||
+ lsa = xzalloc_lsa(sep->se_family);
|
||||
/* peek at the packet and remember peer addr */
|
||||
- int r = recvfrom(ctrl, NULL, 0, MSG_PEEK|MSG_DONTWAIT,
|
||||
+ r = recvfrom(ctrl, NULL, 0, MSG_PEEK|MSG_DONTWAIT,
|
||||
&lsa->u.sa, &lsa->len);
|
||||
if (r < 0)
|
||||
goto do_exit1;
|
||||
@ -1,20 +0,0 @@
|
||||
--- busybox-1.19.2/sysklogd/syslogd.c
|
||||
+++ busybox-1.19.2-syslogd/sysklogd/syslogd.c
|
||||
@@ -278,7 +278,7 @@ static void parse_syslogdcfg(const char
|
||||
parser_t *parser;
|
||||
|
||||
parser = config_open2(file ? file : "/etc/syslog.conf",
|
||||
- file ? xfopen_for_read : fopen_or_warn_stdin);
|
||||
+ file ? xfopen_for_read : fopen_for_read);
|
||||
if (!parser)
|
||||
/* didn't find default /etc/syslog.conf */
|
||||
/* proceed as if we built busybox without config support */
|
||||
@@ -678,7 +678,7 @@ static void timestamp_and_log(int pri, c
|
||||
if (LOG_PRI(pri) < G.logLevel) {
|
||||
#if ENABLE_FEATURE_IPC_SYSLOG
|
||||
if ((option_mask32 & OPT_circularlog) && G.shbuf) {
|
||||
- log_to_shmem(msg);
|
||||
+ log_to_shmem(G.printbuf);
|
||||
return;
|
||||
}
|
||||
#endif
|
||||
@ -1,43 +0,0 @@
|
||||
--- busybox-1.19.2/coreutils/tail.c
|
||||
+++ busybox-1.19.2-tail/coreutils/tail.c
|
||||
@@ -203,7 +203,7 @@ int tail_main(int argc, char **argv)
|
||||
int fd = fds[i];
|
||||
|
||||
if (ENABLE_FEATURE_FANCY_TAIL && fd < 0)
|
||||
- continue; /* may happen with -E */
|
||||
+ continue; /* may happen with -F */
|
||||
|
||||
if (nfiles > header_threshhold) {
|
||||
tail_xprint_header(fmt, argv[i]);
|
||||
@@ -252,14 +252,14 @@ int tail_main(int argc, char **argv)
|
||||
* Used only by +N code ("start from Nth", 1-based): */
|
||||
seen = 1;
|
||||
newlines_seen = 0;
|
||||
- while ((nread = tail_read(fd, buf, tailbufsize-taillen)) > 0) {
|
||||
+ while ((nread = tail_read(fd, buf, tailbufsize - taillen)) > 0) {
|
||||
if (G.from_top) {
|
||||
int nwrite = nread;
|
||||
if (seen < count) {
|
||||
/* We need to skip a few more bytes/lines */
|
||||
if (COUNT_BYTES) {
|
||||
nwrite -= (count - seen);
|
||||
- seen = count;
|
||||
+ seen += nread;
|
||||
} else {
|
||||
char *s = buf;
|
||||
do {
|
||||
--- busybox-1.19.2/testsuite/tail.tests
|
||||
+++ busybox-1.19.2-tail/testsuite/tail.tests
|
||||
@@ -14,4 +14,12 @@ testing "tail: +N with N > file length"
|
||||
"0\n" \
|
||||
"" "qw"
|
||||
|
||||
+testing "tail: -c +N with largish N" \
|
||||
+ "
|
||||
+ dd if=/dev/zero bs=16k count=1 2>/dev/null | tail -c +8200 | wc -c;
|
||||
+ dd if=/dev/zero bs=16k count=1 2>/dev/null | tail -c +8208 | wc -c;
|
||||
+ " \
|
||||
+ "8185\n8177\n" \
|
||||
+ "" ""
|
||||
+
|
||||
exit $FAILCOUNT
|
||||
12
packages/sysutils/dbus/patches/dbus-1.4.16-speedup-0.1.patch
Normal file
12
packages/sysutils/dbus/patches/dbus-1.4.16-speedup-0.1.patch
Normal file
@ -0,0 +1,12 @@
|
||||
diff -Naur dbus-1.4.16/dbus/dbus-message.c dbus-1.4.16.patch/dbus/dbus-message.c
|
||||
--- dbus-1.4.16/dbus/dbus-message.c 2011-09-21 13:16:16.000000000 +0200
|
||||
+++ dbus-1.4.16.patch/dbus/dbus-message.c 2011-10-29 02:09:16.927338774 +0200
|
||||
@@ -3963,7 +3963,7 @@
|
||||
DBusValidationMode mode;
|
||||
dbus_uint32_t n_unix_fds = 0;
|
||||
|
||||
- mode = DBUS_VALIDATION_MODE_DATA_IS_UNTRUSTED;
|
||||
+ mode = DBUS_VALIDATION_MODE_WE_TRUST_THIS_DATA_ABSOLUTELY;
|
||||
|
||||
oom = FALSE;
|
||||
|
||||
@ -0,0 +1,12 @@
|
||||
diff -Naur kexec-tools-2.0.2/purgatory/Makefile kexec-tools-2.0.2.patch/purgatory/Makefile
|
||||
--- kexec-tools-2.0.2/purgatory/Makefile 2010-07-29 06:19:59.000000000 +0200
|
||||
+++ kexec-tools-2.0.2.patch/purgatory/Makefile 2011-10-30 18:38:31.462335639 +0100
|
||||
@@ -56,7 +56,7 @@
|
||||
-I$(srcdir)/include \
|
||||
-I$(shell $(CC) -print-file-name=include)
|
||||
$(PURGATORY): LDFLAGS=$($(ARCH)_PURGATORY_EXTRA_CFLAGS)\
|
||||
- --no-undefined -nostartfiles -nostdlib -nodefaultlibs \
|
||||
+ -nostartfiles -nostdlib -nodefaultlibs \
|
||||
-e purgatory_start -r
|
||||
|
||||
$(PURGATORY): $(PURGATORY_OBJS)
|
||||
@ -22,6 +22,9 @@
|
||||
|
||||
. config/options $1
|
||||
|
||||
# pciutils fails building with LTO support on gcc-4.6
|
||||
strip_lto
|
||||
|
||||
cd $PKG_BUILD
|
||||
|
||||
make OPT="$CFLAGS" \
|
||||
|
||||
@ -49,9 +49,11 @@ mkdir -p objdir-$1 && cd objdir-$1
|
||||
--disable-__cxa_atexit \
|
||||
--disable-libada \
|
||||
--disable-libmudflap \
|
||||
--enable-gold=both/ld \
|
||||
--enable-gold=yes \
|
||||
--enable-ld=default \
|
||||
--enable-plugin \
|
||||
--enable-lto \
|
||||
--disable-libquadmath \
|
||||
--disable-libssp \
|
||||
--disable-libgomp \
|
||||
--disable-shared \
|
||||
|
||||
@ -49,9 +49,11 @@ mkdir -p objdir-$1 && cd objdir-$1
|
||||
--disable-libmudflap \
|
||||
--disable-libssp \
|
||||
--disable-multilib \
|
||||
--enable-gold=both/ld \
|
||||
--enable-gold=yes \
|
||||
--enable-ld=default \
|
||||
--enable-plugin \
|
||||
--enable-lto \
|
||||
--disable-libquadmath \
|
||||
--enable-tls \
|
||||
--enable-shared \
|
||||
--enable-c99 \
|
||||
@ -61,11 +63,6 @@ mkdir -p objdir-$1 && cd objdir-$1
|
||||
|
||||
make
|
||||
|
||||
if [ ! "$DEBUG" = yes ]; then
|
||||
$STRIP `find . -name "*.so"`
|
||||
$STRIP `find . -name "*.so.[0-9]*"`
|
||||
fi
|
||||
|
||||
make install
|
||||
cp -PR $TARGET_NAME/libstdc++-v3/src/.libs/libstdc++.so* $SYSROOT_PREFIX/usr/lib
|
||||
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user