From 608cf73835c6716e6fe237e0db2e8e13c6337025 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 25 Jan 2013 00:58:09 +0100 Subject: [PATCH 01/42] fuse-exfat: update to fuse-exfat-1.0.0 Signed-off-by: Stephan Raue --- packages/sysutils/fuse-exfat/meta | 2 +- .../patches/fuse-exfat-0.9.8-cross.patch | 18 ------------------ 2 files changed, 1 insertion(+), 19 deletions(-) delete mode 100644 packages/sysutils/fuse-exfat/patches/fuse-exfat-0.9.8-cross.patch diff --git a/packages/sysutils/fuse-exfat/meta b/packages/sysutils/fuse-exfat/meta index d16dd9d1f2..9fb4937ec4 100644 --- a/packages/sysutils/fuse-exfat/meta +++ b/packages/sysutils/fuse-exfat/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="fuse-exfat" -PKG_VERSION="0.9.8" +PKG_VERSION="1.0.0" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/sysutils/fuse-exfat/patches/fuse-exfat-0.9.8-cross.patch b/packages/sysutils/fuse-exfat/patches/fuse-exfat-0.9.8-cross.patch deleted file mode 100644 index 34d4c03e9e..0000000000 --- a/packages/sysutils/fuse-exfat/patches/fuse-exfat-0.9.8-cross.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -Naur fuse-exfat-0.9.7/SConstruct fuse-exfat-0.9.7.patch/SConstruct ---- fuse-exfat-0.9.7/SConstruct 2012-03-08 08:26:52.000000000 +0100 -+++ fuse-exfat-0.9.7.patch/SConstruct 2012-07-17 19:59:49.650457625 +0200 -@@ -33,6 +33,14 @@ - conf.env.Replace(CC = os.environ['CC']) - if 'CCFLAGS' in os.environ: - conf.env.Replace(CCFLAGS = os.environ['CCFLAGS']) -+if 'AR' in os.environ: -+ conf.env.Replace(AR = os.environ['AR']) -+if 'ARFLAGS' in os.environ: -+ conf.env.Replace(ARFLAGS = os.environ['ARFLAGS']) -+if 'RANLIB' in os.environ: -+ conf.env.Replace(RANLIB = os.environ['RANLIB']) -+if 'RANLIBFLAGS' in os.environ: -+ conf.env.Replace(RANLIBFLAGS = os.environ['RANLIBFLAGS']) - # Set default CCFLAGS for known compilers - if not conf.env['CCFLAGS']: - if conf.env['CC'] == 'gcc': From e190e7db9078e4d5dae6d4ee00069f69b7ddc1ae Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Fri, 25 Jan 2013 20:53:56 +0200 Subject: [PATCH 02/42] tvheadend: update to tvheadend-3.3.402, build with timeshift --- packages/addons/service/multimedia/tvheadend/build | 1 + .../service/multimedia/tvheadend/changelog.txt | 3 +++ .../multimedia/tvheadend/config/timeshift-config | 9 +++++++++ packages/addons/service/multimedia/tvheadend/meta | 2 +- .../multimedia/tvheadend/source/bin/tvheadend.start | 13 +++++++++++++ 5 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 packages/addons/service/multimedia/tvheadend/config/timeshift-config diff --git a/packages/addons/service/multimedia/tvheadend/build b/packages/addons/service/multimedia/tvheadend/build index c45ce63d65..7a69774b76 100755 --- a/packages/addons/service/multimedia/tvheadend/build +++ b/packages/addons/service/multimedia/tvheadend/build @@ -34,6 +34,7 @@ cd $PKG_BUILD --arch=$TARGET_ARCH \ --cpu=$TARGET_CPU \ --cc=$TARGET_CC \ + --enable-timeshift \ --enable-bundle make diff --git a/packages/addons/service/multimedia/tvheadend/changelog.txt b/packages/addons/service/multimedia/tvheadend/changelog.txt index 150264ddca..636af1b6db 100644 --- a/packages/addons/service/multimedia/tvheadend/changelog.txt +++ b/packages/addons/service/multimedia/tvheadend/changelog.txt @@ -1,3 +1,6 @@ +3.0.4 +- update to TVHeadend 3.3.402 + 3.0.3 - update to TVHeadend 3.3.328 - add an option to preload capmt_ca.so library diff --git a/packages/addons/service/multimedia/tvheadend/config/timeshift-config b/packages/addons/service/multimedia/tvheadend/config/timeshift-config new file mode 100644 index 0000000000..db9a792cc5 --- /dev/null +++ b/packages/addons/service/multimedia/tvheadend/config/timeshift-config @@ -0,0 +1,9 @@ +{ + "enabled": 0, + "ondemand": 0, + "path": "/storage/.xbmc/userdata/addon_data/service.multimedia.tvheadend/cache/timeshift", + "unlimited_period": 0, + "max_period": 3600, + "unlimited_size": 0, + "max_size": 1024 +} diff --git a/packages/addons/service/multimedia/tvheadend/meta b/packages/addons/service/multimedia/tvheadend/meta index ac201c9375..8e668c4c0f 100644 --- a/packages/addons/service/multimedia/tvheadend/meta +++ b/packages/addons/service/multimedia/tvheadend/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="tvheadend" -PKG_VERSION="3.3.328" +PKG_VERSION="3.3.402" PKG_REV="3" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/addons/service/multimedia/tvheadend/source/bin/tvheadend.start b/packages/addons/service/multimedia/tvheadend/source/bin/tvheadend.start index 08c859ea9b..d39b22dc8f 100755 --- a/packages/addons/service/multimedia/tvheadend/source/bin/tvheadend.start +++ b/packages/addons/service/multimedia/tvheadend/source/bin/tvheadend.start @@ -37,6 +37,9 @@ XMLTV_SETTINGS_FILE="$XMLTV_SETTINGS_DIR/config" DVR_SETTINGS_DIR="$ADDON_HOME/dvr" DVR_SETTINGS_FILE="$DVR_SETTINGS_DIR/config" DVR_DIR="$HOME/recordings" +TIMESHIFT_SETTINGS_DIR="$ADDON_HOME/timeshift" +TIMESHIFT_SETTINGS_FILE="$TIMESHIFT_SETTINGS_DIR/config" +TIMESHIFT_DIR="$ADDON_HOME/cache/timeshift" ## handle upgrade. this should be removed later @@ -81,6 +84,16 @@ if [ ! -f "$DVR_SETTINGS_FILE" ]; then fi fi +if [ ! -f "$TIMESHIFT_SETTINGS_FILE" ]; then + mkdir -p $TIMESHIFT_DIR + mkdir -p $TIMESHIFT_SETTINGS_DIR + if [ -f $ADDON_DIR/timeshift-config ]; then + cp $ADDON_DIR/timeshift-config $TIMESHIFT_SETTINGS_FILE + elif [ -f $ADDON_SYS_DIR/timeshift-config ]; then + cp $ADDON_SYS_DIR/timeshift-config $TIMESHIFT_SETTINGS_FILE + fi +fi + TVHEADEND_ARG="-C -s -u root -g video -c $ADDON_HOME" mkdir -p /var/config From 368e0600981e10f722fed115a93e954e46ff2e67 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 25 Jan 2013 20:18:20 +0100 Subject: [PATCH 03/42] xbmc: update to xbmc-aea93c3 Signed-off-by: Stephan Raue --- packages/mediacenter/xbmc-theme-Confluence/meta | 2 +- packages/mediacenter/xbmc/meta | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/mediacenter/xbmc-theme-Confluence/meta b/packages/mediacenter/xbmc-theme-Confluence/meta index 0935b7b117..61443de787 100644 --- a/packages/mediacenter/xbmc-theme-Confluence/meta +++ b/packages/mediacenter/xbmc-theme-Confluence/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc-theme-Confluence" -PKG_VERSION="6fc42b2" +PKG_VERSION="aea93c3" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc/meta b/packages/mediacenter/xbmc/meta index 534f952b8d..2e1c897752 100644 --- a/packages/mediacenter/xbmc/meta +++ b/packages/mediacenter/xbmc/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc" -PKG_VERSION="6fc42b2" +PKG_VERSION="aea93c3" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" From ea7d19804edd818f640a9aa5298dece33b808471 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sat, 26 Jan 2013 14:16:01 +0200 Subject: [PATCH 04/42] tvheadend: update to tvheadend-3.3.403. bump addon version --- packages/addons/service/multimedia/tvheadend/changelog.txt | 4 ++-- packages/addons/service/multimedia/tvheadend/meta | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/addons/service/multimedia/tvheadend/changelog.txt b/packages/addons/service/multimedia/tvheadend/changelog.txt index 636af1b6db..f3b59c4772 100644 --- a/packages/addons/service/multimedia/tvheadend/changelog.txt +++ b/packages/addons/service/multimedia/tvheadend/changelog.txt @@ -1,9 +1,9 @@ 3.0.4 -- update to TVHeadend 3.3.402 +- update to TVHeadend 3.3.403 3.0.3 - update to TVHeadend 3.3.328 -- add an option to preload capmt_ca.so library +- add an option to preload capmt_ca.so library 3.0.2 - update to TVHeadend 3.2.18 diff --git a/packages/addons/service/multimedia/tvheadend/meta b/packages/addons/service/multimedia/tvheadend/meta index 8e668c4c0f..5502c6f7af 100644 --- a/packages/addons/service/multimedia/tvheadend/meta +++ b/packages/addons/service/multimedia/tvheadend/meta @@ -19,8 +19,8 @@ ################################################################################ PKG_NAME="tvheadend" -PKG_VERSION="3.3.402" -PKG_REV="3" +PKG_VERSION="3.3.403" +PKG_REV="4" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.lonelycoder.com/hts/tvheadend_overview.html" From 5fad8bb95fa30f37307fa33843832d365c086041 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sat, 26 Jan 2013 15:36:27 +0200 Subject: [PATCH 05/42] transmission: add options to enable / disable LPD & DHT --- .../transmission/source/bin/transmission.start | 12 ++++++++++++ .../source/resources/language/English/strings.xml | 4 +++- .../transmission/source/resources/settings.xml | 2 ++ .../transmission/source/settings-default.xml | 2 ++ 4 files changed, 19 insertions(+), 1 deletion(-) diff --git a/packages/addons/service/downloadmanager/transmission/source/bin/transmission.start b/packages/addons/service/downloadmanager/transmission/source/bin/transmission.start index 455fbf7a5e..aa9972e29d 100755 --- a/packages/addons/service/downloadmanager/transmission/source/bin/transmission.start +++ b/packages/addons/service/downloadmanager/transmission/source/bin/transmission.start @@ -81,6 +81,18 @@ else TRANSMISSION_ARG="$TRANSMISSION_ARG --no-utp" fi +if [ "$TRANSMISSION_LPD" = "true" ]; then + TRANSMISSION_ARG="$TRANSMISSION_ARG --lpd" +else + TRANSMISSION_ARG="$TRANSMISSION_ARG --no-lpd" +fi + +if [ "$TRANSMISSION_LPD" = "true" ]; then + TRANSMISSION_ARG="$TRANSMISSION_ARG --dht" +else + TRANSMISSION_ARG="$TRANSMISSION_ARG --no-dht" +fi + if [ ! "$(pidof transmission-daemon)" ];then if [ -f "$LOCKDIR/$LOCKFILE" ] ; then rm -rf "$LOCKDIR/$LOCKFILE" diff --git a/packages/addons/service/downloadmanager/transmission/source/resources/language/English/strings.xml b/packages/addons/service/downloadmanager/transmission/source/resources/language/English/strings.xml index d5ff333d26..f95f3bfd40 100644 --- a/packages/addons/service/downloadmanager/transmission/source/resources/language/English/strings.xml +++ b/packages/addons/service/downloadmanager/transmission/source/resources/language/English/strings.xml @@ -16,6 +16,8 @@ Other Download Directory - Enable uTP support + Enable uTP for peer connections + Enable local peer discovery (LPD) + Enable distributed hash tables (DHT) diff --git a/packages/addons/service/downloadmanager/transmission/source/resources/settings.xml b/packages/addons/service/downloadmanager/transmission/source/resources/settings.xml index 9caf209ad7..ff158ca3e9 100644 --- a/packages/addons/service/downloadmanager/transmission/source/resources/settings.xml +++ b/packages/addons/service/downloadmanager/transmission/source/resources/settings.xml @@ -22,5 +22,7 @@ + + diff --git a/packages/addons/service/downloadmanager/transmission/source/settings-default.xml b/packages/addons/service/downloadmanager/transmission/source/settings-default.xml index c3de30f8e6..56dfa7b9ac 100644 --- a/packages/addons/service/downloadmanager/transmission/source/settings-default.xml +++ b/packages/addons/service/downloadmanager/transmission/source/settings-default.xml @@ -7,4 +7,6 @@ + + From 4d6a95c553191274896a8f763086100d2993b3b9 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sat, 26 Jan 2013 16:00:13 +0200 Subject: [PATCH 06/42] Revert "transmission: add options to enable / disable LPD & DHT" This reverts commit 5fad8bb95fa30f37307fa33843832d365c086041. --- .../transmission/source/bin/transmission.start | 12 ------------ .../source/resources/language/English/strings.xml | 4 +--- .../transmission/source/resources/settings.xml | 2 -- .../transmission/source/settings-default.xml | 2 -- 4 files changed, 1 insertion(+), 19 deletions(-) diff --git a/packages/addons/service/downloadmanager/transmission/source/bin/transmission.start b/packages/addons/service/downloadmanager/transmission/source/bin/transmission.start index aa9972e29d..455fbf7a5e 100755 --- a/packages/addons/service/downloadmanager/transmission/source/bin/transmission.start +++ b/packages/addons/service/downloadmanager/transmission/source/bin/transmission.start @@ -81,18 +81,6 @@ else TRANSMISSION_ARG="$TRANSMISSION_ARG --no-utp" fi -if [ "$TRANSMISSION_LPD" = "true" ]; then - TRANSMISSION_ARG="$TRANSMISSION_ARG --lpd" -else - TRANSMISSION_ARG="$TRANSMISSION_ARG --no-lpd" -fi - -if [ "$TRANSMISSION_LPD" = "true" ]; then - TRANSMISSION_ARG="$TRANSMISSION_ARG --dht" -else - TRANSMISSION_ARG="$TRANSMISSION_ARG --no-dht" -fi - if [ ! "$(pidof transmission-daemon)" ];then if [ -f "$LOCKDIR/$LOCKFILE" ] ; then rm -rf "$LOCKDIR/$LOCKFILE" diff --git a/packages/addons/service/downloadmanager/transmission/source/resources/language/English/strings.xml b/packages/addons/service/downloadmanager/transmission/source/resources/language/English/strings.xml index f95f3bfd40..d5ff333d26 100644 --- a/packages/addons/service/downloadmanager/transmission/source/resources/language/English/strings.xml +++ b/packages/addons/service/downloadmanager/transmission/source/resources/language/English/strings.xml @@ -16,8 +16,6 @@ Other Download Directory - Enable uTP for peer connections - Enable local peer discovery (LPD) - Enable distributed hash tables (DHT) + Enable uTP support diff --git a/packages/addons/service/downloadmanager/transmission/source/resources/settings.xml b/packages/addons/service/downloadmanager/transmission/source/resources/settings.xml index ff158ca3e9..9caf209ad7 100644 --- a/packages/addons/service/downloadmanager/transmission/source/resources/settings.xml +++ b/packages/addons/service/downloadmanager/transmission/source/resources/settings.xml @@ -22,7 +22,5 @@ - - diff --git a/packages/addons/service/downloadmanager/transmission/source/settings-default.xml b/packages/addons/service/downloadmanager/transmission/source/settings-default.xml index 56dfa7b9ac..c3de30f8e6 100644 --- a/packages/addons/service/downloadmanager/transmission/source/settings-default.xml +++ b/packages/addons/service/downloadmanager/transmission/source/settings-default.xml @@ -7,6 +7,4 @@ - - From 2a80b33c0db188737810ffe1d02ef7a43211f536 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sat, 26 Jan 2013 17:19:15 +0200 Subject: [PATCH 07/42] busybox: add sysctl.conf.sample --- packages/sysutils/busybox/config/sysctl.conf.sample | 3 +++ packages/sysutils/busybox/install | 12 +++--------- 2 files changed, 6 insertions(+), 9 deletions(-) create mode 100644 packages/sysutils/busybox/config/sysctl.conf.sample diff --git a/packages/sysutils/busybox/config/sysctl.conf.sample b/packages/sysutils/busybox/config/sysctl.conf.sample new file mode 100644 index 0000000000..37270a79d4 --- /dev/null +++ b/packages/sysutils/busybox/config/sysctl.conf.sample @@ -0,0 +1,3 @@ +## transmission with uTP support +# net.core.wmem_max=1048576 +# net.core.rmem_max=4194304 diff --git a/packages/sysutils/busybox/install b/packages/sysutils/busybox/install index 64b61ca2e2..49449deec0 100755 --- a/packages/sysutils/busybox/install +++ b/packages/sysutils/busybox/install @@ -50,6 +50,9 @@ USER_PWD="`$ROOT/$TOOLCHAIN/bin/cryptpw -m sha512 $USER_PASSWORD`" cp $PKG_DIR/config/httpd.conf $INSTALL/etc echo "chmod 000 $INSTALL/etc/shadow" >> $FAKEROOT_SCRIPT + mkdir -p $INSTALL/usr/config + cp $PKG_DIR/config/sysctl.conf.sample $INSTALL/usr/config + # /etc/fstab is needed by... touch $INSTALL/etc/fstab @@ -68,12 +71,3 @@ USER_PWD="`$ROOT/$TOOLCHAIN/bin/cryptpw -m sha512 $USER_PASSWORD`" mkdir -p $INSTALL/usr/www/error echo "404" > $INSTALL/usr/www/error/404.html - - # cron support - if [ "$CRON_SUPPORT" = "yes" ] ; then - mkdir -p $INSTALL/etc/init.d - cp $PKG_DIR/scripts/09_crond $INSTALL/etc/init.d/ - else - rm -f $INSTALL/sbin/crond - rm -f $INSTALL/bin/crontab - fi From db9196f8fd486d48bb5b7f4a9ed2d985c54a7d5e Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sat, 26 Jan 2013 17:20:24 +0200 Subject: [PATCH 08/42] Revert "transmission: net.core.{r,w}mem.max *workaround for uTP" This reverts commit 2cf0e0be30ebd6f6e73f1fb78adc897f1cb3ecd4. --- .../transmission/source/bin/transmission.start | 5 ----- 1 file changed, 5 deletions(-) diff --git a/packages/addons/service/downloadmanager/transmission/source/bin/transmission.start b/packages/addons/service/downloadmanager/transmission/source/bin/transmission.start index 455fbf7a5e..d024063421 100755 --- a/packages/addons/service/downloadmanager/transmission/source/bin/transmission.start +++ b/packages/addons/service/downloadmanager/transmission/source/bin/transmission.start @@ -89,11 +89,6 @@ if [ ! "$(pidof transmission-daemon)" ];then if [ -f "$LOCKDIR/$LOCKFILE" ] ; then break fi - # XXX: sysctls for uTP. we may remove this later - if [ "$TRANSMISSION_UTP" = "true" ]; then - sysctl -w net.core.wmem_max=1048576 > /dev/null 2>&1 - sysctl -w net.core.rmem_max=4194304 > /dev/null 2>&1 - fi EVENT_NOEPOLL=1 LD_LIBRARY_PATH="$ADDON_DIR/lib:$LD_LIBRARY_PATH" eval transmission-daemon -f $TRANSMISSION_ARG &>$LOG_FILE sleep 1 done & From 3a0a58f003e65c8e6130459abf0d8db17cedc208 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sat, 26 Jan 2013 17:20:25 +0200 Subject: [PATCH 09/42] Revert "transmission: uTP is now disabled by default. add option to enable it." This reverts commit 0b3c1a4e6730b9884a1682cd503ca270dc0d02df. --- .../transmission/source/bin/transmission.start | 6 ------ .../source/resources/language/English/strings.xml | 1 - .../transmission/source/resources/settings.xml | 1 - .../transmission/source/settings-default.xml | 1 - 4 files changed, 9 deletions(-) diff --git a/packages/addons/service/downloadmanager/transmission/source/bin/transmission.start b/packages/addons/service/downloadmanager/transmission/source/bin/transmission.start index d024063421..295d5173fc 100755 --- a/packages/addons/service/downloadmanager/transmission/source/bin/transmission.start +++ b/packages/addons/service/downloadmanager/transmission/source/bin/transmission.start @@ -75,12 +75,6 @@ else TRANSMISSION_ARG="$TRANSMISSION_ARG -T" fi -if [ "$TRANSMISSION_UTP" = "true" ]; then - TRANSMISSION_ARG="$TRANSMISSION_ARG --utp" -else - TRANSMISSION_ARG="$TRANSMISSION_ARG --no-utp" -fi - if [ ! "$(pidof transmission-daemon)" ];then if [ -f "$LOCKDIR/$LOCKFILE" ] ; then rm -rf "$LOCKDIR/$LOCKFILE" diff --git a/packages/addons/service/downloadmanager/transmission/source/resources/language/English/strings.xml b/packages/addons/service/downloadmanager/transmission/source/resources/language/English/strings.xml index d5ff333d26..8f0dd87c49 100644 --- a/packages/addons/service/downloadmanager/transmission/source/resources/language/English/strings.xml +++ b/packages/addons/service/downloadmanager/transmission/source/resources/language/English/strings.xml @@ -16,6 +16,5 @@ Other Download Directory - Enable uTP support diff --git a/packages/addons/service/downloadmanager/transmission/source/resources/settings.xml b/packages/addons/service/downloadmanager/transmission/source/resources/settings.xml index 9caf209ad7..4149778c6f 100644 --- a/packages/addons/service/downloadmanager/transmission/source/resources/settings.xml +++ b/packages/addons/service/downloadmanager/transmission/source/resources/settings.xml @@ -21,6 +21,5 @@ - diff --git a/packages/addons/service/downloadmanager/transmission/source/settings-default.xml b/packages/addons/service/downloadmanager/transmission/source/settings-default.xml index c3de30f8e6..ab23f3521f 100644 --- a/packages/addons/service/downloadmanager/transmission/source/settings-default.xml +++ b/packages/addons/service/downloadmanager/transmission/source/settings-default.xml @@ -6,5 +6,4 @@ - From 30c4121a0c90aa0e52d6ad49d9042d4fd474d1c8 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sat, 26 Jan 2013 17:24:27 +0200 Subject: [PATCH 10/42] busybox: oops, accidently removed cron support in 2a80b33c0. sry --- packages/sysutils/busybox/install | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/packages/sysutils/busybox/install b/packages/sysutils/busybox/install index 49449deec0..c7c8cc4769 100755 --- a/packages/sysutils/busybox/install +++ b/packages/sysutils/busybox/install @@ -71,3 +71,12 @@ USER_PWD="`$ROOT/$TOOLCHAIN/bin/cryptpw -m sha512 $USER_PASSWORD`" mkdir -p $INSTALL/usr/www/error echo "404" > $INSTALL/usr/www/error/404.html + + # cron support + if [ "$CRON_SUPPORT" = "yes" ] ; then + mkdir -p $INSTALL/etc/init.d + cp $PKG_DIR/scripts/09_crond $INSTALL/etc/init.d/ + else + rm -f $INSTALL/sbin/crond + rm -f $INSTALL/bin/crontab + fi From aece06480248ceed0ecefe8ce23c95128bbf8918 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sat, 26 Jan 2013 19:21:49 +0200 Subject: [PATCH 11/42] busybox: rework cron support --- packages/sysutils/busybox/build | 5 +++++ packages/sysutils/busybox/install | 3 --- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/sysutils/busybox/build b/packages/sysutils/busybox/build index 358a683c87..fe45f90c3c 100755 --- a/packages/sysutils/busybox/build +++ b/packages/sysutils/busybox/build @@ -39,6 +39,11 @@ cd $BUILD/busybox* # Build Busybox for system make distclean cp $BUSYBOX_CFG_FILE .config + if [ ! "$CRON_SUPPORT" = "yes" ] ; then + sed -i -e "s|^CONFIG_CROND=.*$|# CONFIG_CROND is not set|" .config + sed -i -e "s|^CONFIG_FEATURE_CROND_D=.*$|# CONFIG_FEATURE_CROND_D is not set|" .config + sed -i -e "s|^CONFIG_CRONTAB=.*$|# CONFIG_CRONTAB is not set|" .config + fi make oldconfig make ARCH=$TARGET_ARCH \ diff --git a/packages/sysutils/busybox/install b/packages/sysutils/busybox/install index c7c8cc4769..3cd5b33e0f 100755 --- a/packages/sysutils/busybox/install +++ b/packages/sysutils/busybox/install @@ -76,7 +76,4 @@ USER_PWD="`$ROOT/$TOOLCHAIN/bin/cryptpw -m sha512 $USER_PASSWORD`" if [ "$CRON_SUPPORT" = "yes" ] ; then mkdir -p $INSTALL/etc/init.d cp $PKG_DIR/scripts/09_crond $INSTALL/etc/init.d/ - else - rm -f $INSTALL/sbin/crond - rm -f $INSTALL/bin/crontab fi From 7564d70e96ca09b1de7eaa8af0b7df0b2f0f258b Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sat, 26 Jan 2013 20:04:07 +0200 Subject: [PATCH 12/42] eventlircd: fix -custom_config.patch broken in 201120e --- .../patches/eventlircd-42-002-custom_config.patch | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/packages/sysutils/remote/eventlircd/patches/eventlircd-42-002-custom_config.patch b/packages/sysutils/remote/eventlircd/patches/eventlircd-42-002-custom_config.patch index ad1b4fa78d..9412adce48 100644 --- a/packages/sysutils/remote/eventlircd/patches/eventlircd-42-002-custom_config.patch +++ b/packages/sysutils/remote/eventlircd/patches/eventlircd-42-002-custom_config.patch @@ -1,14 +1,12 @@ diff --git a/udev/lircd_helper.in b/udev/lircd_helper.in -index f580cc6..6befeed 100644 +index f580cc6..d4d7f3f 100644 --- a/udev/lircd_helper.in +++ b/udev/lircd_helper.in @@ -41,7 +41,11 @@ case "${ACTION}" in daemon="${daemon} --uinput" -- daemon="${daemon} --output=@localstatedir@/run/lirc/lircd-${devname_instance}" -- daemon="${daemon} --pidfile=@localstatedir@/run/lirc/lircd-${devname_instance}.pid" + daemon="${daemon} --output=@localstatedir@/run/lirc/lircd-${devname_instance}" + daemon="${daemon} --pidfile=@localstatedir@/run/lirc/lircd-${devname_instance}.pid" - daemon="${daemon} ${lircd_conf}" -+ daemon="${daemon} --output=@localstatedir@/run/lirc/lircd" -+ daemon="${daemon} --pidfile=@localstatedir@/run/lirc/lircd-${devname_instance}.pid" + if test -e "/storage/.config/lircd.conf" ; then + daemon="${daemon} /storage/.config/lircd.conf" + else From a5ee6b23cbafeff2313de69de0fa442a673bd579 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sat, 26 Jan 2013 20:17:17 +0200 Subject: [PATCH 13/42] tbs-linux-drivers: don't build ir-lirc-codec --- packages/linux-drivers/linux-tbs-drivers/build | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/linux-drivers/linux-tbs-drivers/build b/packages/linux-drivers/linux-tbs-drivers/build index af3aabce0e..779aa1a1a7 100755 --- a/packages/linux-drivers/linux-tbs-drivers/build +++ b/packages/linux-drivers/linux-tbs-drivers/build @@ -27,4 +27,6 @@ cd $BUILD/${PKG_NAME}-${PKG_VERSION}/linux-tbs-drivers [ "$TARGET_ARCH" = "i386" ] && ./v4l/tbs-x86_r3.sh [ "$TARGET_ARCH" = "x86_64" ] && ./v4l/tbs-x86_64.sh +LDFLAGS="" make DIR=$(kernel_path) prepare +sed -i -e "s|^CONFIG_IR_LIRC_CODEC=.*$|# CONFIG_IR_LIRC_CODEC is not set|" v4l/.config LDFLAGS="" make DIR=$(kernel_path) From 3f5ab0b9ef19f8c2e405a8364bca7abe6d9a6d3c Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 26 Jan 2013 23:04:26 +0100 Subject: [PATCH 14/42] lirc: update xbox config file to support uinput Signed-off-by: Stephan Raue --- .../remote/lirc/config/lircd.conf.xbox | 94 +++++++++++-------- 1 file changed, 57 insertions(+), 37 deletions(-) diff --git a/packages/sysutils/remote/lirc/config/lircd.conf.xbox b/packages/sysutils/remote/lirc/config/lircd.conf.xbox index d7cd33e9ee..764eec06d8 100644 --- a/packages/sysutils/remote/lirc/config/lircd.conf.xbox +++ b/packages/sysutils/remote/lirc/config/lircd.conf.xbox @@ -1,43 +1,63 @@ + +# Please make this file available to others +# by sending it to +# +# this config file was automatically generated +# using lirc-0.9.1-git(default) on Sat Jan 26 21:54:39 2013 +# +# contributed by +# +# brand: xbox.conf +# model no. of remote control: +# devices being controlled by this remote: +# + begin remote - name XboxDVDDongle - bits 8 - eps 30 - aeps 100 + name xbox.conf + bits 8 + eps 30 + aeps 100 - one 0 0 - zero 0 0 - gap 163983 - toggle_bit_mask 0x0 + one 0 0 + zero 0 0 + gap 63985 + min_repeat 13 +# suppress_repeat 13 +# uncomment to suppress unwanted repeats +# toggle_bit_mask 0x72 + toggle_bit_mask 0xE1 - begin codes - LEFT 0xA9 - UP 0xA6 - RIGHT 0xA8 - DOWN 0xA7 - SELECT 0x0B - 1 0xCE - 2 0xCD - 3 0xCC - 4 0xCB - 5 0xCA - 6 0xC9 - 7 0xC8 - 8 0xC7 - 9 0xC6 - 0 0xCF - MENU 0xF7 - DISPLAY 0xD5 - REVERSE 0xE2 - FORWARD 0xE3 - PLAY 0xEA - PAUSE 0xE6 - STOP 0xE0 - SKIP- 0xDD - SKIP+ 0xDF - TITLE 0xE5 - INFO 0xC3 - BACK 0xD8 - end codes + begin codes + KEY_OK 0xEA + KEY_STOP 0xE0 + KEY_PAUSE 0xE6 + KEY_NEXT 0xDF + KEY_PREVIOUS 0xDD + KEY_FASTFORWARD 0xE3 + KEY_REWIND 0xE2 + KEY_PROG1 0xD5 + KEY_TITLE 0xE5 + KEY_INFO 0xC3 + KEY_OK 0x0B + KEY_UP 0xA6 + KEY_DOWN 0xA7 + KEY_LEFT 0xA9 + KEY_RIGHT 0xA8 + KEY_MENU 0xF7 + KEY_BACK 0xD8 + KEY_0 0xCF + KEY_1 0xCE + KEY_2 0xCD + KEY_3 0xCC + KEY_4 0xCB + KEY_5 0xCA + KEY_6 0xC9 + KEY_7 0xC8 + KEY_8 0xC7 + KEY_9 0xC6 + end codes end remote + + From bf65f62be8e094a4f76b9aa011583ddaa459fefc Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 26 Jan 2013 23:04:49 +0100 Subject: [PATCH 15/42] eventlircd: simplyfing lirc udev rule Signed-off-by: Stephan Raue --- .../remote/eventlircd/udev.d/98-lircd.rules | 20 +++++-------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/packages/sysutils/remote/eventlircd/udev.d/98-lircd.rules b/packages/sysutils/remote/eventlircd/udev.d/98-lircd.rules index 99dbd09c30..4ab905ddcf 100644 --- a/packages/sysutils/remote/eventlircd/udev.d/98-lircd.rules +++ b/packages/sysutils/remote/eventlircd/udev.d/98-lircd.rules @@ -20,6 +20,11 @@ SUBSYSTEM=="lirc", \ ENV{lircd_driver}="default", \ ENV{lircd_conf}="/etc/lirc/lircd.conf" +### Microsoft Xbox DVD dongle +SUBSYSTEM=="lirc", DRIVERS=="lirc_xbox", \ + ENV{lircd_driver}="default", \ + ENV{lircd_conf}="/etc/lirc/lircd.conf.xbox" + #------------------------------------------------------------------------------- # Ask lircd_helper to handle USB devices that do not show up as lirc devices # and are supported by lircd. Remote controls that are USB HID devices that show @@ -36,21 +41,6 @@ ENV{ID_VENDOR_ID}=="0fe9", ENV{ID_MODEL_ID}=="9010", \ ENV{lircd_driver}="dvico", \ ENV{lircd_conf}="/etc/lirc/lircd.conf" -### Microsoft Xbox DVD dongle -ENV{ID_VENDOR_ID}=="045e", ENV{ID_MODEL_ID}=="0284", \ - ENV{lircd_driver}="default", \ - ENV{lircd_conf}="/etc/lirc/lircd.conf.xbox" - -### Gamester Xbox DVD dongle -ENV{ID_VENDOR_ID}=="040b", ENV{ID_MODEL_ID}=="6521", \ - ENV{lircd_driver}="default", \ - ENV{lircd_conf}="/etc/lirc/lircd.conf.xbox" - -### Chinese Manufacturers Xbox DVD dongle -ENV{ID_VENDOR_ID}=="ffff", ENV{ID_MODEL_ID}=="ffff", \ - ENV{lircd_driver}="default", \ - ENV{lircd_conf}="/etc/lirc/lircd.conf.xbox" - # Enable wake-on-usb for the USB remotes. ENV{lircd_driver}=="?*", ENV{lircd_conf}=="?*", RUN+="wakeup_enable" From d626253cfc1959774c70f1996ac0f00d11f0ef01 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 26 Jan 2013 23:05:29 +0100 Subject: [PATCH 16/42] e2fsprogs: update to e2fsprogs-1.42.7 Signed-off-by: Stephan Raue --- packages/sysutils/e2fsprogs/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/sysutils/e2fsprogs/meta b/packages/sysutils/e2fsprogs/meta index b06f50b064..9cf95274f8 100644 --- a/packages/sysutils/e2fsprogs/meta +++ b/packages/sysutils/e2fsprogs/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="e2fsprogs" -PKG_VERSION="1.42.6" +PKG_VERSION="1.42.7" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" From 99917e437e78942e838623399d2e22e337ff53df Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 26 Jan 2013 23:05:46 +0100 Subject: [PATCH 17/42] ntfs-3g_ntfsprogs: update to ntfs-3g_ntfsprogs-2013.1.13 Signed-off-by: Stephan Raue --- packages/sysutils/ntfs-3g_ntfsprogs/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/sysutils/ntfs-3g_ntfsprogs/meta b/packages/sysutils/ntfs-3g_ntfsprogs/meta index a4d3e5deda..cff28748f6 100644 --- a/packages/sysutils/ntfs-3g_ntfsprogs/meta +++ b/packages/sysutils/ntfs-3g_ntfsprogs/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="ntfs-3g_ntfsprogs" -PKG_VERSION="2012.1.15" +PKG_VERSION="2013.1.13" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" From 3765e1ac070c24abea9f8d454e2c8c9b728a214c Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 27 Jan 2013 02:43:47 +0100 Subject: [PATCH 18/42] systemd: add keymap support Signed-off-by: Stephan Raue --- packages/sysutils/systemd/build | 2 +- packages/sysutils/systemd/install | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/packages/sysutils/systemd/build b/packages/sysutils/systemd/build index eff6154fb6..27cf50fb45 100755 --- a/packages/sysutils/systemd/build +++ b/packages/sysutils/systemd/build @@ -74,7 +74,7 @@ ac_cv_func_malloc_0_nonnull=yes \ --disable-localed \ --disable-coredump \ --enable-gudev \ - --disable-keymap \ + --enable-keymap \ --disable-manpages \ --enable-split-usr \ --with-firmware-path="/storage/.config/firmware:/lib/firmware" \ diff --git a/packages/sysutils/systemd/install b/packages/sysutils/systemd/install index 636c100056..e22f81781f 100755 --- a/packages/sysutils/systemd/install +++ b/packages/sysutils/systemd/install @@ -54,10 +54,20 @@ mkdir -p $INSTALL/lib/systemd done cp $PKG_BUILD/mtd_probe $INSTALL/lib/udev + cp $PKG_BUILD/.libs/keymap $INSTALL/lib/udev + cp $PKG_BUILD/src/udev/keymap/findkeyboards $INSTALL/lib/udev + cp $PKG_BUILD/src/udev/keymap/keyboard-force-release.sh $INSTALL/lib/udev +mkdir -p $INSTALL/lib/udev/keymaps + cp $PKG_BUILD/keymaps/* $INSTALL/lib/udev/keymaps +mkdir -p $INSTALL/lib/udev/keymaps/force-release + cp $PKG_BUILD/keymaps-force-release/* $INSTALL/lib/udev/keymaps/force-release + mkdir -p $INSTALL/lib/udev/rules.d cp $PKG_BUILD/rules/*.rules $INSTALL/lib/udev/rules.d rm -rf $INSTALL/lib/udev/rules.d/80-net-name-slot.rules rm -rf $INSTALL/lib/udev/rules.d/99-systemd.rules + cp $PKG_BUILD/src/udev/keymap/*.rules $INSTALL/lib/udev/rules.d + mkdir -p $INSTALL/lib/udev/hwdb.d cp $PKG_BUILD/hwdb/*.hwdb $INSTALL/lib/udev/hwdb.d From f811ca5244384a47c2c2dbc97ab2a0b330262cba Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 27 Jan 2013 16:54:06 +0100 Subject: [PATCH 19/42] xkbcomp: update configure settings Signed-off-by: Stephan Raue --- packages/x11/app/xkbcomp/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/x11/app/xkbcomp/build b/packages/x11/app/xkbcomp/build index b2bf921a6f..a6bde88fc4 100755 --- a/packages/x11/app/xkbcomp/build +++ b/packages/x11/app/xkbcomp/build @@ -24,10 +24,10 @@ cd $PKG_BUILD -ac_cv_file___xkbparse_c=yes \ ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ --sysconfdir=/etc \ + --with-xkb-config-root=$XORG_PATH_XKB \ make From 1774a0a71150d4d9c35e2a89c199a336e3fb3558 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 27 Jan 2013 16:54:45 +0100 Subject: [PATCH 20/42] xkeyboard-config: update configure settings Signed-off-by: Stephan Raue --- packages/x11/data/xkeyboard-config/build | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/x11/data/xkeyboard-config/build b/packages/x11/data/xkeyboard-config/build index 17b863f79b..de68801b9d 100755 --- a/packages/x11/data/xkeyboard-config/build +++ b/packages/x11/data/xkeyboard-config/build @@ -34,10 +34,11 @@ XKBCOMP="/usr/bin/xkbcomp" \ --sysconfdir=/etc \ --without-xsltproc \ --enable-compat-rules \ + --enable-runtime-deps \ --enable-nls \ --disable-rpath \ --with-xkb-base=$XORG_PATH_XKB \ - --without-xkb-rules-symlink \ + --with-xkb-rules-symlink=xorg \ --with-gnu-ld \ make From 9b9b98b1a3dec7445e9823f80ce40f49f88502b7 Mon Sep 17 00:00:00 2001 From: Detlev Rackow Date: Mon, 28 Jan 2013 23:18:49 +0200 Subject: [PATCH 21/42] systemd: write to RTC in utc. to keep in line with connman --- packages/sysutils/systemd/udev.d/80-clock.rules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/sysutils/systemd/udev.d/80-clock.rules b/packages/sysutils/systemd/udev.d/80-clock.rules index 18aa7a2c63..6906498f93 100644 --- a/packages/sysutils/systemd/udev.d/80-clock.rules +++ b/packages/sysutils/systemd/udev.d/80-clock.rules @@ -1,2 +1,2 @@ -ACTION=="add", SUBSYSTEM=="rtc", RUN+="/sbin/hwclock --hctosys --rtc=/dev/%k" -ACTION=="add", MAJOR==10, MINOR==135, RUN+="/sbin/hwclock --hctosys --rtc=/dev/%k" +ACTION=="add", SUBSYSTEM=="rtc", RUN+="/sbin/hwclock --hctosys --utc --rtc=/dev/%k" +ACTION=="add", MAJOR==10, MINOR==135, RUN+="/sbin/hwclock --hctosys --utc --rtc=/dev/%k" From 5d1977062a0cdd88806fa95fd81e8ff42e8f1011 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Mon, 28 Jan 2013 23:54:37 +0200 Subject: [PATCH 22/42] libX11: fix non-working keyboard layouts (again) this is a partial solution. requires invocation of setxkbmap when a keyboard is added / replugged. a propper fix is to move xkb setup to udev. I will do that later when our new settings addon is ready. closes #108 #823 #1661 #1741 #1743 --- packages/x11/lib/libX11/build | 1 - packages/x11/lib/libX11/install | 6 ++++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/x11/lib/libX11/build b/packages/x11/lib/libX11/build index d5d6b22443..2a58cbfe35 100755 --- a/packages/x11/lib/libX11/build +++ b/packages/x11/lib/libX11/build @@ -42,7 +42,6 @@ cd $PKG_BUILD --disable-xcms \ --enable-xlocale \ --enable-xkb \ - --disable-xlocaledir \ --disable-xf86bigfont \ --enable-malloc0returnsnull \ --disable-specs \ diff --git a/packages/x11/lib/libX11/install b/packages/x11/lib/libX11/install index ecf4cacea2..7ee76b37a2 100755 --- a/packages/x11/lib/libX11/install +++ b/packages/x11/lib/libX11/install @@ -25,3 +25,9 @@ mkdir -p $INSTALL/usr/lib cp -P $PKG_BUILD/src/.libs/libX11*.so* $INSTALL/usr/lib rm -rf $INSTALL/usr/lib/libX11*.so*T + +mkdir -p $INSTALL/usr/share/X11 + cp -R $SYSROOT_PREFIX/usr/share/X11/locale $INSTALL/usr/share/X11 + +mkdir -p $INSTALL/usr/lib/X11 + cp -R $SYSROOT_PREFIX/usr/lib/X11/locale $INSTALL/usr/lib/X11 From 88b437dc03448bd2a51c820cb6dab21973b29a3b Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 29 Jan 2013 02:42:55 +0100 Subject: [PATCH 23/42] libX11: mostly cosmetics, we dont do install from $SYSROOT_PREFIX :-) Signed-off-by: Stephan Raue --- packages/x11/lib/libX11/build | 4 +++- packages/x11/lib/libX11/install | 9 +++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/packages/x11/lib/libX11/build b/packages/x11/lib/libX11/build index 2a58cbfe35..a31fde42f2 100755 --- a/packages/x11/lib/libX11/build +++ b/packages/x11/lib/libX11/build @@ -28,7 +28,6 @@ export CFLAGS_FOR_BUILD="$HOST_CFLAGS" export LDFLAGS_FOR_BUILD="$HOST_LDFLAGS" cd $PKG_BUILD - ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ @@ -41,6 +40,7 @@ cd $PKG_BUILD --enable-xthreads \ --disable-xcms \ --enable-xlocale \ + --disable-xlocaledir \ --enable-xkb \ --disable-xf86bigfont \ --enable-malloc0returnsnull \ @@ -54,5 +54,7 @@ cd $PKG_BUILD --without-lint make +make -C nls DESTDIR=`pwd`/.install install $MAKEINSTALL + diff --git a/packages/x11/lib/libX11/install b/packages/x11/lib/libX11/install index 7ee76b37a2..fb944d100e 100755 --- a/packages/x11/lib/libX11/install +++ b/packages/x11/lib/libX11/install @@ -26,8 +26,9 @@ mkdir -p $INSTALL/usr/lib cp -P $PKG_BUILD/src/.libs/libX11*.so* $INSTALL/usr/lib rm -rf $INSTALL/usr/lib/libX11*.so*T -mkdir -p $INSTALL/usr/share/X11 - cp -R $SYSROOT_PREFIX/usr/share/X11/locale $INSTALL/usr/share/X11 +mkdir -p $INSTALL + cp -R $PKG_BUILD/.install/* $INSTALL -mkdir -p $INSTALL/usr/lib/X11 - cp -R $SYSROOT_PREFIX/usr/lib/X11/locale $INSTALL/usr/lib/X11 +mkdir -p $INSTALL/usr/lib/X11/locale/common + cp -R $PKG_BUILD/modules/*/*/.libs/*.so* $INSTALL/usr/lib/X11/locale/common + rm -rf $INSTALL/usr/lib/X11/locale/common/*.so.*T \ No newline at end of file From 3f47dd5ec2618a0ca7e2054e5d07e1ad44beae03 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 29 Jan 2013 02:43:41 +0100 Subject: [PATCH 24/42] linux: update to linux-3.7.5 Signed-off-by: Stephan Raue --- packages/linux/meta | 2 +- .../linux-203-stb0899_enable_low_symbol_rate.patch | 0 ...linux-206.01-media-ene-ir-Fix-cleanup-on-probe-failure.patch | 0 ...2-media-rc-Make-probe-cleanup-goto-labels-more-verbose.patch | 0 .../linux-206.03-media-rc-Set-rdev-before-irq-setup.patch | 0 ...6.04-media-rc-Call-rc_register_device-before-irq-setup.patch | 0 packages/linux/patches/{3.7.4 => 3.7.5}/linux-210-dvbsky.patch | 0 .../{3.7.4 => 3.7.5}/linux-212-mantis_stb0899_faster_lock.patch | 0 .../patches/{3.7.4 => 3.7.5}/linux-213-cinergy_s2_usb_r2.patch | 0 .../linux-214-rtl28xxu_add_NOXON_USB_dongle_rev.2.patch | 0 .../linux-215-rtl28xxu_ASUS_My_Cinema-U3100Mini_Plus_V2.patch | 0 .../linux-216-rtl28xxu_add_Gigabyte_U7300_DVB-T_Dongle.patch | 0 .../patches/{3.7.4 => 3.7.5}/linux-221-ngene-octopus.patch | 0 .../{3.7.4 => 3.7.5}/linux-222-stb0899_signal_quality.patch | 0 .../patches/{3.7.4 => 3.7.5}/linux-700-jmicron_1_0_8_5.patch | 0 .../linux-950-saa716x_PCIe_interface_chipset.patch | 0 16 files changed, 1 insertion(+), 1 deletion(-) rename packages/linux/patches/{3.7.4 => 3.7.5}/linux-203-stb0899_enable_low_symbol_rate.patch (100%) rename packages/linux/patches/{3.7.4 => 3.7.5}/linux-206.01-media-ene-ir-Fix-cleanup-on-probe-failure.patch (100%) rename packages/linux/patches/{3.7.4 => 3.7.5}/linux-206.02-media-rc-Make-probe-cleanup-goto-labels-more-verbose.patch (100%) rename packages/linux/patches/{3.7.4 => 3.7.5}/linux-206.03-media-rc-Set-rdev-before-irq-setup.patch (100%) rename packages/linux/patches/{3.7.4 => 3.7.5}/linux-206.04-media-rc-Call-rc_register_device-before-irq-setup.patch (100%) rename packages/linux/patches/{3.7.4 => 3.7.5}/linux-210-dvbsky.patch (100%) rename packages/linux/patches/{3.7.4 => 3.7.5}/linux-212-mantis_stb0899_faster_lock.patch (100%) rename packages/linux/patches/{3.7.4 => 3.7.5}/linux-213-cinergy_s2_usb_r2.patch (100%) rename packages/linux/patches/{3.7.4 => 3.7.5}/linux-214-rtl28xxu_add_NOXON_USB_dongle_rev.2.patch (100%) rename packages/linux/patches/{3.7.4 => 3.7.5}/linux-215-rtl28xxu_ASUS_My_Cinema-U3100Mini_Plus_V2.patch (100%) rename packages/linux/patches/{3.7.4 => 3.7.5}/linux-216-rtl28xxu_add_Gigabyte_U7300_DVB-T_Dongle.patch (100%) rename packages/linux/patches/{3.7.4 => 3.7.5}/linux-221-ngene-octopus.patch (100%) rename packages/linux/patches/{3.7.4 => 3.7.5}/linux-222-stb0899_signal_quality.patch (100%) rename packages/linux/patches/{3.7.4 => 3.7.5}/linux-700-jmicron_1_0_8_5.patch (100%) rename packages/linux/patches/{3.7.4 => 3.7.5}/linux-950-saa716x_PCIe_interface_chipset.patch (100%) diff --git a/packages/linux/meta b/packages/linux/meta index bacaf9008f..dbe114288e 100644 --- a/packages/linux/meta +++ b/packages/linux/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="linux" -PKG_VERSION="3.7.4" +PKG_VERSION="3.7.5" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/linux/patches/3.7.4/linux-203-stb0899_enable_low_symbol_rate.patch b/packages/linux/patches/3.7.5/linux-203-stb0899_enable_low_symbol_rate.patch similarity index 100% rename from packages/linux/patches/3.7.4/linux-203-stb0899_enable_low_symbol_rate.patch rename to packages/linux/patches/3.7.5/linux-203-stb0899_enable_low_symbol_rate.patch diff --git a/packages/linux/patches/3.7.4/linux-206.01-media-ene-ir-Fix-cleanup-on-probe-failure.patch b/packages/linux/patches/3.7.5/linux-206.01-media-ene-ir-Fix-cleanup-on-probe-failure.patch similarity index 100% rename from packages/linux/patches/3.7.4/linux-206.01-media-ene-ir-Fix-cleanup-on-probe-failure.patch rename to packages/linux/patches/3.7.5/linux-206.01-media-ene-ir-Fix-cleanup-on-probe-failure.patch diff --git a/packages/linux/patches/3.7.4/linux-206.02-media-rc-Make-probe-cleanup-goto-labels-more-verbose.patch b/packages/linux/patches/3.7.5/linux-206.02-media-rc-Make-probe-cleanup-goto-labels-more-verbose.patch similarity index 100% rename from packages/linux/patches/3.7.4/linux-206.02-media-rc-Make-probe-cleanup-goto-labels-more-verbose.patch rename to packages/linux/patches/3.7.5/linux-206.02-media-rc-Make-probe-cleanup-goto-labels-more-verbose.patch diff --git a/packages/linux/patches/3.7.4/linux-206.03-media-rc-Set-rdev-before-irq-setup.patch b/packages/linux/patches/3.7.5/linux-206.03-media-rc-Set-rdev-before-irq-setup.patch similarity index 100% rename from packages/linux/patches/3.7.4/linux-206.03-media-rc-Set-rdev-before-irq-setup.patch rename to packages/linux/patches/3.7.5/linux-206.03-media-rc-Set-rdev-before-irq-setup.patch diff --git a/packages/linux/patches/3.7.4/linux-206.04-media-rc-Call-rc_register_device-before-irq-setup.patch b/packages/linux/patches/3.7.5/linux-206.04-media-rc-Call-rc_register_device-before-irq-setup.patch similarity index 100% rename from packages/linux/patches/3.7.4/linux-206.04-media-rc-Call-rc_register_device-before-irq-setup.patch rename to packages/linux/patches/3.7.5/linux-206.04-media-rc-Call-rc_register_device-before-irq-setup.patch diff --git a/packages/linux/patches/3.7.4/linux-210-dvbsky.patch b/packages/linux/patches/3.7.5/linux-210-dvbsky.patch similarity index 100% rename from packages/linux/patches/3.7.4/linux-210-dvbsky.patch rename to packages/linux/patches/3.7.5/linux-210-dvbsky.patch diff --git a/packages/linux/patches/3.7.4/linux-212-mantis_stb0899_faster_lock.patch b/packages/linux/patches/3.7.5/linux-212-mantis_stb0899_faster_lock.patch similarity index 100% rename from packages/linux/patches/3.7.4/linux-212-mantis_stb0899_faster_lock.patch rename to packages/linux/patches/3.7.5/linux-212-mantis_stb0899_faster_lock.patch diff --git a/packages/linux/patches/3.7.4/linux-213-cinergy_s2_usb_r2.patch b/packages/linux/patches/3.7.5/linux-213-cinergy_s2_usb_r2.patch similarity index 100% rename from packages/linux/patches/3.7.4/linux-213-cinergy_s2_usb_r2.patch rename to packages/linux/patches/3.7.5/linux-213-cinergy_s2_usb_r2.patch diff --git a/packages/linux/patches/3.7.4/linux-214-rtl28xxu_add_NOXON_USB_dongle_rev.2.patch b/packages/linux/patches/3.7.5/linux-214-rtl28xxu_add_NOXON_USB_dongle_rev.2.patch similarity index 100% rename from packages/linux/patches/3.7.4/linux-214-rtl28xxu_add_NOXON_USB_dongle_rev.2.patch rename to packages/linux/patches/3.7.5/linux-214-rtl28xxu_add_NOXON_USB_dongle_rev.2.patch diff --git a/packages/linux/patches/3.7.4/linux-215-rtl28xxu_ASUS_My_Cinema-U3100Mini_Plus_V2.patch b/packages/linux/patches/3.7.5/linux-215-rtl28xxu_ASUS_My_Cinema-U3100Mini_Plus_V2.patch similarity index 100% rename from packages/linux/patches/3.7.4/linux-215-rtl28xxu_ASUS_My_Cinema-U3100Mini_Plus_V2.patch rename to packages/linux/patches/3.7.5/linux-215-rtl28xxu_ASUS_My_Cinema-U3100Mini_Plus_V2.patch diff --git a/packages/linux/patches/3.7.4/linux-216-rtl28xxu_add_Gigabyte_U7300_DVB-T_Dongle.patch b/packages/linux/patches/3.7.5/linux-216-rtl28xxu_add_Gigabyte_U7300_DVB-T_Dongle.patch similarity index 100% rename from packages/linux/patches/3.7.4/linux-216-rtl28xxu_add_Gigabyte_U7300_DVB-T_Dongle.patch rename to packages/linux/patches/3.7.5/linux-216-rtl28xxu_add_Gigabyte_U7300_DVB-T_Dongle.patch diff --git a/packages/linux/patches/3.7.4/linux-221-ngene-octopus.patch b/packages/linux/patches/3.7.5/linux-221-ngene-octopus.patch similarity index 100% rename from packages/linux/patches/3.7.4/linux-221-ngene-octopus.patch rename to packages/linux/patches/3.7.5/linux-221-ngene-octopus.patch diff --git a/packages/linux/patches/3.7.4/linux-222-stb0899_signal_quality.patch b/packages/linux/patches/3.7.5/linux-222-stb0899_signal_quality.patch similarity index 100% rename from packages/linux/patches/3.7.4/linux-222-stb0899_signal_quality.patch rename to packages/linux/patches/3.7.5/linux-222-stb0899_signal_quality.patch diff --git a/packages/linux/patches/3.7.4/linux-700-jmicron_1_0_8_5.patch b/packages/linux/patches/3.7.5/linux-700-jmicron_1_0_8_5.patch similarity index 100% rename from packages/linux/patches/3.7.4/linux-700-jmicron_1_0_8_5.patch rename to packages/linux/patches/3.7.5/linux-700-jmicron_1_0_8_5.patch diff --git a/packages/linux/patches/3.7.4/linux-950-saa716x_PCIe_interface_chipset.patch b/packages/linux/patches/3.7.5/linux-950-saa716x_PCIe_interface_chipset.patch similarity index 100% rename from packages/linux/patches/3.7.4/linux-950-saa716x_PCIe_interface_chipset.patch rename to packages/linux/patches/3.7.5/linux-950-saa716x_PCIe_interface_chipset.patch From 4c2c481e28ebc8fd2a3e1eb79a58f7a269f5f92e Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 29 Jan 2013 02:48:56 +0100 Subject: [PATCH 25/42] projects/*/linux: disable SMB2 and CIFS FSCACHE support Signed-off-by: Stephan Raue --- projects/ARCTIC_MC/linux/linux.x86_64.conf | 6 +++--- projects/ATV/linux/linux.i386.conf | 4 ++-- projects/Fusion/linux/linux.i386.conf | 4 ++-- projects/Fusion/linux/linux.x86_64.conf | 4 ++-- projects/Generic/linux/linux.i386.conf | 4 ++-- projects/Generic_OSS/linux/linux.i386.conf | 4 ++-- projects/ION/linux/linux.i386.conf | 4 ++-- projects/ION/linux/linux.x86_64.conf | 4 ++-- projects/Intel/linux/linux.i386.conf | 4 ++-- projects/Intel/linux/linux.x86_64.conf | 4 ++-- projects/RPi/linux/linux.arm.conf | 2 +- projects/Ultra/linux/linux.x86_64.conf | 4 ++-- projects/Virtual/linux/linux.i386.conf | 4 ++-- projects/Virtual/linux/linux.x86_64.conf | 4 ++-- 14 files changed, 28 insertions(+), 28 deletions(-) diff --git a/projects/ARCTIC_MC/linux/linux.x86_64.conf b/projects/ARCTIC_MC/linux/linux.x86_64.conf index fcdfc11bcf..5622d097bb 100644 --- a/projects/ARCTIC_MC/linux/linux.x86_64.conf +++ b/projects/ARCTIC_MC/linux/linux.x86_64.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 3.7.3 Kernel Configuration +# Linux/x86_64 3.7.5 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -2974,8 +2974,8 @@ CONFIG_CIFS_STATS2=y # CONFIG_CIFS_XATTR is not set # CONFIG_CIFS_DEBUG2 is not set # CONFIG_CIFS_DFS_UPCALL is not set -CONFIG_CIFS_SMB2=y -CONFIG_CIFS_FSCACHE=y +# CONFIG_CIFS_SMB2 is not set +# CONFIG_CIFS_FSCACHE is not set # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set diff --git a/projects/ATV/linux/linux.i386.conf b/projects/ATV/linux/linux.i386.conf index f81580cc2f..5301805838 100644 --- a/projects/ATV/linux/linux.i386.conf +++ b/projects/ATV/linux/linux.i386.conf @@ -2902,8 +2902,8 @@ CONFIG_CIFS_STATS2=y # CONFIG_CIFS_XATTR is not set # CONFIG_CIFS_DEBUG2 is not set # CONFIG_CIFS_DFS_UPCALL is not set -CONFIG_CIFS_SMB2=y -CONFIG_CIFS_FSCACHE=y +# CONFIG_CIFS_SMB2 is not set +# CONFIG_CIFS_FSCACHE is not set # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set diff --git a/projects/Fusion/linux/linux.i386.conf b/projects/Fusion/linux/linux.i386.conf index 483448a23e..2f3692e776 100644 --- a/projects/Fusion/linux/linux.i386.conf +++ b/projects/Fusion/linux/linux.i386.conf @@ -3250,8 +3250,8 @@ CONFIG_CIFS_STATS2=y # CONFIG_CIFS_XATTR is not set # CONFIG_CIFS_DEBUG2 is not set # CONFIG_CIFS_DFS_UPCALL is not set -CONFIG_CIFS_SMB2=y -CONFIG_CIFS_FSCACHE=y +# CONFIG_CIFS_SMB2 is not set +# CONFIG_CIFS_FSCACHE is not set # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set diff --git a/projects/Fusion/linux/linux.x86_64.conf b/projects/Fusion/linux/linux.x86_64.conf index f5cbbd9068..4e972e3c08 100644 --- a/projects/Fusion/linux/linux.x86_64.conf +++ b/projects/Fusion/linux/linux.x86_64.conf @@ -3194,8 +3194,8 @@ CONFIG_CIFS_STATS2=y # CONFIG_CIFS_XATTR is not set # CONFIG_CIFS_DEBUG2 is not set # CONFIG_CIFS_DFS_UPCALL is not set -CONFIG_CIFS_SMB2=y -CONFIG_CIFS_FSCACHE=y +# CONFIG_CIFS_SMB2 is not set +# CONFIG_CIFS_FSCACHE is not set # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set diff --git a/projects/Generic/linux/linux.i386.conf b/projects/Generic/linux/linux.i386.conf index 4dae35128d..4479df2f7d 100644 --- a/projects/Generic/linux/linux.i386.conf +++ b/projects/Generic/linux/linux.i386.conf @@ -3434,8 +3434,8 @@ CONFIG_CIFS_STATS2=y # CONFIG_CIFS_XATTR is not set # CONFIG_CIFS_DEBUG2 is not set # CONFIG_CIFS_DFS_UPCALL is not set -CONFIG_CIFS_SMB2=y -CONFIG_CIFS_FSCACHE=y +# CONFIG_CIFS_SMB2 is not set +# CONFIG_CIFS_FSCACHE is not set # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set diff --git a/projects/Generic_OSS/linux/linux.i386.conf b/projects/Generic_OSS/linux/linux.i386.conf index 8b91b87896..1fc2313d55 100644 --- a/projects/Generic_OSS/linux/linux.i386.conf +++ b/projects/Generic_OSS/linux/linux.i386.conf @@ -3437,8 +3437,8 @@ CONFIG_CIFS_STATS2=y # CONFIG_CIFS_XATTR is not set # CONFIG_CIFS_DEBUG2 is not set # CONFIG_CIFS_DFS_UPCALL is not set -CONFIG_CIFS_SMB2=y -CONFIG_CIFS_FSCACHE=y +# CONFIG_CIFS_SMB2 is not set +# CONFIG_CIFS_FSCACHE is not set # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set diff --git a/projects/ION/linux/linux.i386.conf b/projects/ION/linux/linux.i386.conf index 223d79f0a4..3a23bab78f 100644 --- a/projects/ION/linux/linux.i386.conf +++ b/projects/ION/linux/linux.i386.conf @@ -3225,8 +3225,8 @@ CONFIG_CIFS_STATS2=y # CONFIG_CIFS_XATTR is not set # CONFIG_CIFS_DEBUG2 is not set # CONFIG_CIFS_DFS_UPCALL is not set -CONFIG_CIFS_SMB2=y -CONFIG_CIFS_FSCACHE=y +# CONFIG_CIFS_SMB2 is not set +# CONFIG_CIFS_FSCACHE is not set # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set diff --git a/projects/ION/linux/linux.x86_64.conf b/projects/ION/linux/linux.x86_64.conf index 7e3bdf8c75..b67a437723 100644 --- a/projects/ION/linux/linux.x86_64.conf +++ b/projects/ION/linux/linux.x86_64.conf @@ -3152,8 +3152,8 @@ CONFIG_CIFS_STATS2=y # CONFIG_CIFS_XATTR is not set # CONFIG_CIFS_DEBUG2 is not set # CONFIG_CIFS_DFS_UPCALL is not set -CONFIG_CIFS_SMB2=y -CONFIG_CIFS_FSCACHE=y +# CONFIG_CIFS_SMB2 is not set +# CONFIG_CIFS_FSCACHE is not set # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set diff --git a/projects/Intel/linux/linux.i386.conf b/projects/Intel/linux/linux.i386.conf index 9a4641319c..479800c606 100644 --- a/projects/Intel/linux/linux.i386.conf +++ b/projects/Intel/linux/linux.i386.conf @@ -3272,8 +3272,8 @@ CONFIG_CIFS_STATS2=y # CONFIG_CIFS_XATTR is not set # CONFIG_CIFS_DEBUG2 is not set # CONFIG_CIFS_DFS_UPCALL is not set -CONFIG_CIFS_SMB2=y -CONFIG_CIFS_FSCACHE=y +# CONFIG_CIFS_SMB2 is not set +# CONFIG_CIFS_FSCACHE is not set # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set diff --git a/projects/Intel/linux/linux.x86_64.conf b/projects/Intel/linux/linux.x86_64.conf index 491d8e2a1c..90dc83e016 100644 --- a/projects/Intel/linux/linux.x86_64.conf +++ b/projects/Intel/linux/linux.x86_64.conf @@ -3200,8 +3200,8 @@ CONFIG_CIFS_STATS2=y # CONFIG_CIFS_XATTR is not set # CONFIG_CIFS_DEBUG2 is not set # CONFIG_CIFS_DFS_UPCALL is not set -CONFIG_CIFS_SMB2=y -CONFIG_CIFS_FSCACHE=y +# CONFIG_CIFS_SMB2 is not set +# CONFIG_CIFS_FSCACHE is not set # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set diff --git a/projects/RPi/linux/linux.arm.conf b/projects/RPi/linux/linux.arm.conf index 58f33ea42e..a0820b8824 100644 --- a/projects/RPi/linux/linux.arm.conf +++ b/projects/RPi/linux/linux.arm.conf @@ -2261,7 +2261,7 @@ CONFIG_CIFS_STATS2=y # CONFIG_CIFS_XATTR is not set # CONFIG_CIFS_DEBUG2 is not set # CONFIG_CIFS_DFS_UPCALL is not set -CONFIG_CIFS_FSCACHE=y +# CONFIG_CIFS_FSCACHE is not set # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set diff --git a/projects/Ultra/linux/linux.x86_64.conf b/projects/Ultra/linux/linux.x86_64.conf index f11ec35e52..c17c03a583 100644 --- a/projects/Ultra/linux/linux.x86_64.conf +++ b/projects/Ultra/linux/linux.x86_64.conf @@ -2939,8 +2939,8 @@ CONFIG_CIFS_STATS2=y # CONFIG_CIFS_XATTR is not set # CONFIG_CIFS_DEBUG2 is not set # CONFIG_CIFS_DFS_UPCALL is not set -CONFIG_CIFS_SMB2=y -CONFIG_CIFS_FSCACHE=y +# CONFIG_CIFS_SMB2 is not set +# CONFIG_CIFS_FSCACHE is not set # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set diff --git a/projects/Virtual/linux/linux.i386.conf b/projects/Virtual/linux/linux.i386.conf index 1e1b0078f3..be7ee24075 100644 --- a/projects/Virtual/linux/linux.i386.conf +++ b/projects/Virtual/linux/linux.i386.conf @@ -3269,8 +3269,8 @@ CONFIG_CIFS_STATS2=y # CONFIG_CIFS_XATTR is not set # CONFIG_CIFS_DEBUG2 is not set # CONFIG_CIFS_DFS_UPCALL is not set -CONFIG_CIFS_SMB2=y -CONFIG_CIFS_FSCACHE=y +# CONFIG_CIFS_SMB2 is not set +# CONFIG_CIFS_FSCACHE is not set # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set diff --git a/projects/Virtual/linux/linux.x86_64.conf b/projects/Virtual/linux/linux.x86_64.conf index be65978745..15a6d55c50 100644 --- a/projects/Virtual/linux/linux.x86_64.conf +++ b/projects/Virtual/linux/linux.x86_64.conf @@ -3196,8 +3196,8 @@ CONFIG_CIFS_STATS2=y # CONFIG_CIFS_XATTR is not set # CONFIG_CIFS_DEBUG2 is not set # CONFIG_CIFS_DFS_UPCALL is not set -CONFIG_CIFS_SMB2=y -CONFIG_CIFS_FSCACHE=y +# CONFIG_CIFS_SMB2 is not set +# CONFIG_CIFS_FSCACHE is not set # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set From 7338855b9b5bdf0273bf63551dfbdd5ea7d12722 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 29 Jan 2013 03:15:15 +0100 Subject: [PATCH 26/42] Revert "setxkbmap: revert change to set keyboard layout via udev, this should partly fix the change keyboard layout issues, but needs some more work" This reverts commit 9eb0f5f1951a03fd25e691ea8fbda0356cf858f0. --- packages/x11/app/setxkbmap/install | 2 + .../{init.d/72_keyboard => scripts/xkb-setup} | 39 ++++++++----------- .../app/setxkbmap/udev.d/98-xorg-xkb.rules | 8 ++++ 3 files changed, 27 insertions(+), 22 deletions(-) rename packages/x11/app/setxkbmap/{init.d/72_keyboard => scripts/xkb-setup} (67%) mode change 100644 => 100755 create mode 100644 packages/x11/app/setxkbmap/udev.d/98-xorg-xkb.rules diff --git a/packages/x11/app/setxkbmap/install b/packages/x11/app/setxkbmap/install index 6a5aaf3171..16941ff820 100755 --- a/packages/x11/app/setxkbmap/install +++ b/packages/x11/app/setxkbmap/install @@ -25,3 +25,5 @@ mkdir -p $INSTALL/usr/bin cp $PKG_BUILD/$1 $INSTALL/usr/bin +mkdir -p $INSTALL/lib/udev + cp $PKG_DIR/scripts/xkb-setup $INSTALL/lib/udev diff --git a/packages/x11/app/setxkbmap/init.d/72_keyboard b/packages/x11/app/setxkbmap/scripts/xkb-setup old mode 100644 new mode 100755 similarity index 67% rename from packages/x11/app/setxkbmap/init.d/72_keyboard rename to packages/x11/app/setxkbmap/scripts/xkb-setup index 32478732e2..a2498b336a --- a/packages/x11/app/setxkbmap/init.d/72_keyboard +++ b/packages/x11/app/setxkbmap/scripts/xkb-setup @@ -1,3 +1,5 @@ +#!/bin/sh + ################################################################################ # This file is part of OpenELEC - http://www.openelec.tv # Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) @@ -18,28 +20,21 @@ # http://www.gnu.org/copyleft/gpl.html ################################################################################ -# setup keyboard layout -# -# runlevels: openelec +. /etc/profile +. /var/config/settings.conf -( - if [ -f /var/config/settings.conf ]; then - . /var/config/settings.conf +if [ -z $X11_KEYMAP ]; then + X11_KEYMAP="us" +fi - progress "setup keyboard layout" +if [ ! "$X11_KEYMAP2" == "-none-" ]; then + XKBLAYOUT="$X11_KEYMAP,$X11_KEYMAP2" + XKBOPTIONS="grp:alt_shift_toggle" +else + XKBLAYOUT="$X11_KEYMAP" +fi - if [ -z $X11_KEYMAP ]; then - X11_KEYMAP="us" - fi - - # waiting for Xorg to start - wait_for_xorg - - # setup keymap - if [ -z $X11_KEYMAP2 ]; then - setxkbmap -display $DISPLAY $X11_KEYMAP; - else - setxkbmap -display $DISPLAY -layout "$X11_KEYMAP,$X11_KEYMAP2" -option "grp:alt_shift_toggle"; - fi - fi -)& +echo "XKBMODEL=\"pc105\"" +echo "XKBVARIANT=\"\"" +echo "XKBLAYOUT=\"$XKBLAYOUT\"" +echo "XKBOPTIONS=\"$XKBOPTIONS\"" diff --git a/packages/x11/app/setxkbmap/udev.d/98-xorg-xkb.rules b/packages/x11/app/setxkbmap/udev.d/98-xorg-xkb.rules new file mode 100644 index 0000000000..a99b7f3c1e --- /dev/null +++ b/packages/x11/app/setxkbmap/udev.d/98-xorg-xkb.rules @@ -0,0 +1,8 @@ +ACTION!="add|change", GOTO="xorg_xkb_end" +SUBSYSTEM!="input", GOTO="xorg_xkb_end" +KERNEL!="event*", GOTO="xorg_xkb_end" + +ENV{ID_INPUT_KEY}=="?*", IMPORT{program}="xkb-setup" + +LABEL="xorg_xkb_end" + From 23b0220008c8a20226b68fdb09c41054672c2e1a Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 29 Jan 2013 04:30:30 +0100 Subject: [PATCH 27/42] xbmc: update to xbmc-12.0 Signed-off-by: Stephan Raue --- packages/mediacenter/xbmc-theme-Confluence/meta | 2 +- packages/mediacenter/xbmc/meta | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/mediacenter/xbmc-theme-Confluence/meta b/packages/mediacenter/xbmc-theme-Confluence/meta index 61443de787..2c3582cd78 100644 --- a/packages/mediacenter/xbmc-theme-Confluence/meta +++ b/packages/mediacenter/xbmc-theme-Confluence/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc-theme-Confluence" -PKG_VERSION="aea93c3" +PKG_VERSION="12.0" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc/meta b/packages/mediacenter/xbmc/meta index 2e1c897752..fe0b65c3b0 100644 --- a/packages/mediacenter/xbmc/meta +++ b/packages/mediacenter/xbmc/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc" -PKG_VERSION="aea93c3" +PKG_VERSION="12.0" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" From 8dcc5c97b839176fc39ed81eba0d552fb53d33a7 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 29 Jan 2013 04:30:50 +0100 Subject: [PATCH 28/42] xbmc: show XBMC splash Signed-off-by: Stephan Raue --- packages/mediacenter/xbmc/config/advancedsettings.xml | 1 - packages/mediacenter/xbmc/install | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/mediacenter/xbmc/config/advancedsettings.xml b/packages/mediacenter/xbmc/config/advancedsettings.xml index 81c059d66d..0b5968f9b3 100644 --- a/packages/mediacenter/xbmc/config/advancedsettings.xml +++ b/packages/mediacenter/xbmc/config/advancedsettings.xml @@ -1,6 +1,5 @@ - false false cputemp gputemp diff --git a/packages/mediacenter/xbmc/install b/packages/mediacenter/xbmc/install index 90983e8427..19dfc2172d 100755 --- a/packages/mediacenter/xbmc/install +++ b/packages/mediacenter/xbmc/install @@ -64,7 +64,7 @@ rm -rf $ROOT/$INSTALL/usr/share/xbmc/addons/visualization.milkdrop # overriding Splash image mkdir -p $INSTALL/usr/share/xbmc/media - rm -rf $INSTALL/usr/share/xbmc/media/Splash.png +# rm -rf $INSTALL/usr/share/xbmc/media/Splash.png # if [ -f $PROJECT_DIR/$PROJECT/splash/splash.png ]; then # cp $PROJECT_DIR/$PROJECT/splash/splash.png $INSTALL/usr/share/xbmc/media/Splash.png # else From 53ad9d2478a90124fa803bd87d7754484eadb129 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 29 Jan 2013 10:21:37 +0100 Subject: [PATCH 29/42] eglibc: update to eglibc-2.17-22321 Signed-off-by: Stephan Raue --- packages/toolchain/devel/eglibc/meta | 2 +- ...7-22220-select_fd_type.patch => eglibc-select_fd_type.patch} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename packages/toolchain/devel/eglibc/patches/{eglibc-2.17-22220-select_fd_type.patch => eglibc-select_fd_type.patch} (100%) diff --git a/packages/toolchain/devel/eglibc/meta b/packages/toolchain/devel/eglibc/meta index f7aadf2bb7..f3c72dd6df 100644 --- a/packages/toolchain/devel/eglibc/meta +++ b/packages/toolchain/devel/eglibc/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="eglibc" -PKG_VERSION="2.17-22220" +PKG_VERSION="2.17-22321" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/toolchain/devel/eglibc/patches/eglibc-2.17-22220-select_fd_type.patch b/packages/toolchain/devel/eglibc/patches/eglibc-select_fd_type.patch similarity index 100% rename from packages/toolchain/devel/eglibc/patches/eglibc-2.17-22220-select_fd_type.patch rename to packages/toolchain/devel/eglibc/patches/eglibc-select_fd_type.patch From 321041a8ba49eba79c3cf9df9cecc7b686a18191 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 29 Jan 2013 10:22:37 +0100 Subject: [PATCH 30/42] xbmc: update XVBA/VDPAU patches Signed-off-by: Stephan Raue --- ...ch => xbmc-801-xvba_support-ae08a23.patch} | 647 +++++++++++++----- ...-809-add_keymapping_for_XF86XK_Sleep.patch | 24 - ...dd_multithread_support_for_hi10p-0.1.patch | 107 --- 3 files changed, 484 insertions(+), 294 deletions(-) rename packages/mediacenter/xbmc/patches.x86/{xbmc-801-xvba_support-f3add0d.patch => xbmc-801-xvba_support-ae08a23.patch} (96%) delete mode 100644 packages/mediacenter/xbmc/patches.x86/xbmc-809-add_keymapping_for_XF86XK_Sleep.patch delete mode 100644 packages/mediacenter/xbmc/patches/xbmc-601-add_multithread_support_for_hi10p-0.1.patch diff --git a/packages/mediacenter/xbmc/patches.x86/xbmc-801-xvba_support-f3add0d.patch b/packages/mediacenter/xbmc/patches.x86/xbmc-801-xvba_support-ae08a23.patch similarity index 96% rename from packages/mediacenter/xbmc/patches.x86/xbmc-801-xvba_support-f3add0d.patch rename to packages/mediacenter/xbmc/patches.x86/xbmc-801-xvba_support-ae08a23.patch index 1f5db47dd0..97565b8864 100644 --- a/packages/mediacenter/xbmc/patches.x86/xbmc-801-xvba_support-f3add0d.patch +++ b/packages/mediacenter/xbmc/patches.x86/xbmc-801-xvba_support-ae08a23.patch @@ -1,7 +1,57 @@ -From c5afa461015a57c40157dc80012873b9578dd5cb Mon Sep 17 00:00:00 2001 +From bfd49543c49747236d401df4351767d584f756ac Mon Sep 17 00:00:00 2001 +From: wsnipex +Date: Sun, 4 Nov 2012 14:05:52 +0100 +Subject: [PATCH 01/72] configure: add --enable-pvraddons-with-dependencies + switch for intree building of PVR Addons + +--- + configure.in | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/configure.in b/configure.in +index 4769315..350d960 100644 +--- a/configure.in ++++ b/configure.in +@@ -521,6 +521,14 @@ AC_ARG_ENABLE([external-ffmpeg], + [use_external_ffmpeg=$use_external_libraries]) + + ### End of external library options ++### PVR addons specific ++AC_ARG_ENABLE([pvraddons-with-dependencies], ++ [AS_HELP_STRING([--enable-pvraddons-with-dependencies], ++ [enable build of pvr addons with dependencies (default is no) 'Linux only'])], ++ [use_pvraddons_with_deps=$enableval], ++ [use_pvraddons_with_deps=no]) ++ ++### End PVR addons specific + + if test "x$host_vendor" != "xapple"; then + DEFAULT_COMPILE_FLAGS="-fPIC -DPIC -D_REENTRANT" +@@ -2770,12 +2778,16 @@ XB_CONFIG_MODULE([pvr-addons], [ + if test "$USE_EXTERNAL_FFMPEG" = 1; then + PVR_EXT_FFMPEG="--enable-external-ffmpeg" + fi ++ if test "$use_pvraddons_with_deps" = "yes"; then ++ ADDONS_WITH_DEPS="--enable-addons-with-dependencies" ++ fi + ./configure \ + --prefix="${prefix}" \ + --host=$host_alias \ + --build=$build_alias \ + --target=$target_alias \ + $PVR_EXT_FFMPEG \ ++ $ADDONS_WITH_DEPS \ + CC="$CC" \ + CXX="$CXX" \ + CFLAGS="$CFLAGS" \ +-- +1.7.10 + + +From dc83e2351e8bf8e904102782ea489d2c8caa2802 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 28 May 2012 10:03:31 +0200 -Subject: [PATCH 01/65] VideoRenerers: add buffering +Subject: [PATCH 02/72] VideoRenerers: add buffering --- xbmc/Application.cpp | 3 + @@ -21,7 +71,7 @@ Subject: [PATCH 01/65] VideoRenerers: add buffering 14 files changed, 380 insertions(+), 93 deletions(-) diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp -index 2193cfe..d30bd61 100644 +index c6f0a14..18e6310 100644 --- a/xbmc/Application.cpp +++ b/xbmc/Application.cpp @@ -2367,7 +2367,10 @@ void CApplication::Render() @@ -897,7 +947,7 @@ index 2ab5684..f493ba7 100644 virtual unsigned int PreInit(); virtual void UnInit(); diff --git a/xbmc/cores/dvdplayer/DVDPlayer.cpp b/xbmc/cores/dvdplayer/DVDPlayer.cpp -index 54c6b29..b5ecf4d 100644 +index 0cd2510..315d64a 100644 --- a/xbmc/cores/dvdplayer/DVDPlayer.cpp +++ b/xbmc/cores/dvdplayer/DVDPlayer.cpp @@ -463,7 +463,7 @@ bool CDVDPlayer::OpenFile(const CFileItem& file, const CPlayerOptions &options) @@ -984,10 +1034,10 @@ index 3008c25..a4bb1ba 100644 1.7.10 -From b6c4e583144aa7b731d018bb9f5200f0ed284089 Mon Sep 17 00:00:00 2001 +From dacc0167c993efa6ac884fd3c439fc5f0c823934 Mon Sep 17 00:00:00 2001 From: xbmc Date: Tue, 2 Oct 2012 10:49:09 +0200 -Subject: [PATCH 02/65] linuxrenderer: delete all textures on reconfigure +Subject: [PATCH 03/72] linuxrenderer: delete all textures on reconfigure --- xbmc/cores/VideoRenderers/LinuxRendererGL.cpp | 2 +- @@ -1010,10 +1060,10 @@ index b32a7ea..a2dc2be 100644 1.7.10 -From 069c58739b142a2239b1f125e89b5810d9aa6225 Mon Sep 17 00:00:00 2001 +From 226539d21ba940ea8add89417df7102302c7ba79 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 28 May 2012 10:17:33 +0200 -Subject: [PATCH 03/65] drop frame counter in application, ask render manager +Subject: [PATCH 04/72] drop frame counter in application, ask render manager instead --- @@ -1024,7 +1074,7 @@ Subject: [PATCH 03/65] drop frame counter in application, ask render manager 4 files changed, 23 insertions(+), 45 deletions(-) diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp -index d30bd61..f5efb3a 100644 +index 18e6310..9a7b900 100644 --- a/xbmc/Application.cpp +++ b/xbmc/Application.cpp @@ -415,8 +415,6 @@ @@ -1119,7 +1169,7 @@ index d30bd61..f5efb3a 100644 } void CApplication::SetStandAlone(bool value) -@@ -5621,12 +5596,6 @@ bool CApplication::SwitchToFullScreen() +@@ -5638,12 +5613,6 @@ bool CApplication::SwitchToFullScreen() // See if we're playing a video, and are in GUI mode if ( IsPlayingVideo() && g_windowManager.GetActiveWindow() != WINDOW_FULLSCREEN_VIDEO) { @@ -1132,7 +1182,7 @@ index d30bd61..f5efb3a 100644 // then switch to fullscreen mode g_windowManager.ActivateWindow(WINDOW_FULLSCREEN_VIDEO); return true; -@@ -5859,7 +5828,6 @@ bool CApplication::IsCurrentThread() const +@@ -5876,7 +5845,6 @@ bool CApplication::IsCurrentThread() const bool CApplication::IsPresentFrame() { @@ -1141,10 +1191,10 @@ index d30bd61..f5efb3a 100644 return ret; diff --git a/xbmc/Application.h b/xbmc/Application.h -index 595b285..36ea33e 100644 +index 69609fa..6764a60 100644 --- a/xbmc/Application.h +++ b/xbmc/Application.h -@@ -421,10 +421,8 @@ class CApplication : public CXBApplicationEx, public IPlayerCallback, public IMs +@@ -422,10 +422,8 @@ class CApplication : public CXBApplicationEx, public IPlayerCallback, public IMs bool m_bEnableLegacyRes; bool m_bTestMode; bool m_bSystemScreenSaverEnable; @@ -1192,10 +1242,10 @@ index 34ff8d0..288175e 100644 1.7.10 -From e4af5841025ac832bd1719c1cfb0f42e4f26574f Mon Sep 17 00:00:00 2001 +From 0f81843cb7279f3b99607551967354ff30e15e4d Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 28 May 2012 10:34:39 +0200 -Subject: [PATCH 04/65] videoplayer: adopt lateness detection and dropping to +Subject: [PATCH 05/72] videoplayer: adopt lateness detection and dropping to buffering --- @@ -1734,10 +1784,10 @@ index fe7e12c..4913712 100644 1.7.10 -From 0279ba32133779c414b093185dfe387093ca0d03 Mon Sep 17 00:00:00 2001 +From 4bc6ff77b121468020578f9d393e8aaae1a419f6 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 28 May 2012 10:41:31 +0200 -Subject: [PATCH 05/65] videoplayer: update frametime, it might change due to +Subject: [PATCH 06/72] videoplayer: update frametime, it might change due to fps detection --- @@ -1761,10 +1811,10 @@ index 93908a7..4675556 100644 1.7.10 -From 6daaf4d05e6fdcc22bd289c9a64a90795ed0cb07 Mon Sep 17 00:00:00 2001 +From 723a731d68b9360f9804e8711255afa62c4ce34d Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 28 May 2012 10:43:06 +0200 -Subject: [PATCH 06/65] videoplayer: give streams with invalid fps a chance +Subject: [PATCH 07/72] videoplayer: give streams with invalid fps a chance for fps detection --- @@ -1788,10 +1838,10 @@ index 4675556..2ef6358 100644 1.7.10 -From c4b011e38d54e7fff1321091cefbb26c8eaecc65 Mon Sep 17 00:00:00 2001 +From 60c955c30cdfcf361396e47fc92a1e1883b085fe Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 28 May 2012 10:49:05 +0200 -Subject: [PATCH 07/65] dvdplayer: allow rewinding at end of stream, do a seek +Subject: [PATCH 08/72] dvdplayer: allow rewinding at end of stream, do a seek after rewind --- @@ -1799,7 +1849,7 @@ Subject: [PATCH 07/65] dvdplayer: allow rewinding at end of stream, do a seek 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/xbmc/cores/dvdplayer/DVDPlayer.cpp b/xbmc/cores/dvdplayer/DVDPlayer.cpp -index b5ecf4d..57e00e4 100644 +index 315d64a..6fcb6b3 100644 --- a/xbmc/cores/dvdplayer/DVDPlayer.cpp +++ b/xbmc/cores/dvdplayer/DVDPlayer.cpp @@ -1542,7 +1542,7 @@ void CDVDPlayer::HandlePlaySpeed() @@ -1811,7 +1861,7 @@ index b5ecf4d..57e00e4 100644 && m_SpeedState.lastpts != m_dvdPlayerVideo.GetCurrentPts() && m_SpeedState.lasttime != GetTime()) { -@@ -2178,6 +2178,12 @@ void CDVDPlayer::HandleMessages() +@@ -2183,6 +2183,12 @@ void CDVDPlayer::HandleMessages() pvrinputstream->Pause( speed == 0 ); } @@ -1828,10 +1878,10 @@ index b5ecf4d..57e00e4 100644 1.7.10 -From 22a1f2ea4fc9034d2e2097dd5331559c32db87e5 Mon Sep 17 00:00:00 2001 +From 8d237cf023501560fc394679819463034a209413 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 2 Sep 2012 16:05:21 +0200 -Subject: [PATCH 08/65] video player: present correct pts to user for a/v sync +Subject: [PATCH 09/72] video player: present correct pts to user for a/v sync (after buffering in renderer) --- @@ -1922,10 +1972,10 @@ index 4913712..509d5f7 100644 1.7.10 -From 140c373ba1ee2224744682f439c6598a0e694c7e Mon Sep 17 00:00:00 2001 +From 04a6a8b4ca29c17da6bbb9591685922b2f6f1442 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 28 May 2012 11:02:29 +0200 -Subject: [PATCH 09/65] vaapi: adopt to buffering in renderer +Subject: [PATCH 10/72] vaapi: adopt to buffering in renderer --- xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp | 2 +- @@ -1983,10 +2033,10 @@ index 863edc4..417cbc0 100644 1.7.10 -From 563a1ebb7f94ad9d66929991aa5f412cebd2419c Mon Sep 17 00:00:00 2001 +From 4d237410264bbff9c4ac373de498f80ecb15f7a3 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 7 Apr 2012 09:19:00 +0200 -Subject: [PATCH 10/65] vdpau: redesign +Subject: [PATCH 11/72] vdpau: redesign --- language/English/strings.po | 12 +- @@ -2017,7 +2067,7 @@ Subject: [PATCH 10/65] vdpau: redesign create mode 100644 xbmc/utils/ActorProtocol.h diff --git a/language/English/strings.po b/language/English/strings.po -index ac34df0..f825c57 100644 +index dff2978..88292d3 100644 --- a/language/English/strings.po +++ b/language/English/strings.po @@ -5114,7 +5114,15 @@ msgctxt "#13434" @@ -7696,7 +7746,7 @@ index 27887d4..72718e5 100644 bool m_videoEnableHighQualityHwScalers; float m_videoAutoScaleMaxFps; diff --git a/xbmc/settings/GUISettings.cpp b/xbmc/settings/GUISettings.cpp -index 23fdee7..c5936f9 100644 +index 76ec0cc..4cdb093 100644 --- a/xbmc/settings/GUISettings.cpp +++ b/xbmc/settings/GUISettings.cpp @@ -685,6 +685,8 @@ void CGUISettings::Initialize() @@ -8146,10 +8196,10 @@ index e7af3cb..2dd8a9f 100644 1.7.10 -From 3437f8d62c5dba3c47951298ba3c71796ebc6ee0 Mon Sep 17 00:00:00 2001 +From c088467d9d0955051a510dadbddb270ddc3e3c20 Mon Sep 17 00:00:00 2001 From: xbmc Date: Tue, 25 Sep 2012 12:14:15 +0200 -Subject: [PATCH 11/65] linuxrenderer: drop method RenderMultiPass +Subject: [PATCH 12/72] linuxrenderer: drop method RenderMultiPass --- xbmc/cores/VideoRenderers/LinuxRendererGL.cpp | 9 ++------- @@ -8199,10 +8249,10 @@ index 3218cd5..afc78c2 100644 1.7.10 -From b6374ee1781491fcc000e4e22888a30be00d0474 Mon Sep 17 00:00:00 2001 +From 0de3939247a63509e6bfab2e77c298eaa28aa29c Mon Sep 17 00:00:00 2001 From: xbmc Date: Tue, 25 Sep 2012 13:20:47 +0200 -Subject: [PATCH 12/65] linuxrenderer: implement progressive weave for vdpau +Subject: [PATCH 13/72] linuxrenderer: implement progressive weave for vdpau --- xbmc/cores/VideoRenderers/LinuxRendererGL.cpp | 55 ++++++++++++++++++------- @@ -8330,10 +8380,10 @@ index afc78c2..2fc34ae 100644 1.7.10 -From 83d9332c846b80af7aea8b0f4f35aaf6d06e7668 Mon Sep 17 00:00:00 2001 +From c12380f4b9c9c2671bfd1ebd3e29ba7cd83ac95e Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 15:22:05 +0200 -Subject: [PATCH 13/65] X11: ditch SDL for video and window events +Subject: [PATCH 14/72] X11: ditch SDL for video and window events --- xbmc/Application.cpp | 2 +- @@ -8349,7 +8399,7 @@ Subject: [PATCH 13/65] X11: ditch SDL for video and window events create mode 100644 xbmc/windowing/WinEventsX11.h diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp -index f5efb3a..b38d16a 100644 +index 9a7b900..fc8e721 100644 --- a/xbmc/Application.cpp +++ b/xbmc/Application.cpp @@ -790,7 +790,7 @@ bool CApplication::CreateGUI() @@ -9817,10 +9867,10 @@ index 2dd8a9f..9616d17 100644 1.7.10 -From 86e08d915ef0345be8ad2c7c7327445f0144d52c Mon Sep 17 00:00:00 2001 +From 58fa894afaffbc990ee1ab87ff55db30e36ab2c2 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 15:24:22 +0200 -Subject: [PATCH 14/65] X11: Add xbmc icon +Subject: [PATCH 15/72] X11: Add xbmc icon --- xbmc/windowing/X11/WinSystemX11.cpp | 126 ++++++++++++++++++++++++++++++++++- @@ -10009,10 +10059,10 @@ index 9616d17..debf714 100644 1.7.10 -From 8110f4d02a52a33e38a0d7abfad438df395d0b2e Mon Sep 17 00:00:00 2001 +From cad2ac7f357906f10f100a038ff28e83a69c68e8 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 20 May 2012 14:11:26 +0200 -Subject: [PATCH 15/65] X11: add SDL joystick until we have a better solution +Subject: [PATCH 16/72] X11: add SDL joystick until we have a better solution --- xbmc/windowing/WinEventsX11.cpp | 26 ++++++++++++++++++++++++++ @@ -10066,10 +10116,10 @@ index 24477ae..2ec86a8 100644 1.7.10 -From 77c5aa42be8282924c1f96bd6ac7cfcfee294974 Mon Sep 17 00:00:00 2001 +From fdefd4cf296518f31ad1165268fccd651e08dd3c Mon Sep 17 00:00:00 2001 From: Joakim Plate Date: Thu, 5 Jul 2012 12:35:55 +0200 -Subject: [PATCH 16/65] X11: factor out code handling device reset +Subject: [PATCH 17/72] X11: factor out code handling device reset notification --- @@ -10133,10 +10183,10 @@ index debf714..8c28e3f 100644 1.7.10 -From b32a793828136f11d050c09248648fb7f02df9aa Mon Sep 17 00:00:00 2001 +From 9a409794d1eb8ee0c4b0b1124dea7dd30af32c06 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 15:02:00 +0200 -Subject: [PATCH 17/65] X11: move xrandr events to WinEventsX11 +Subject: [PATCH 18/72] X11: move xrandr events to WinEventsX11 --- xbmc/windowing/WinEventsX11.cpp | 42 +++++++++++++++++++++++++++++++++++ @@ -10280,10 +10330,10 @@ index 70557d0..1cce843 100644 1.7.10 -From 5a45de1a4288e8a32b300335b8fcd1dd08db840a Mon Sep 17 00:00:00 2001 +From 1dc579a2d5c608cfd4f799971759d18cbd2957e5 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 12 Apr 2012 15:43:56 +0200 -Subject: [PATCH 18/65] xrandr: remove method RestoreState +Subject: [PATCH 19/72] xrandr: remove method RestoreState --- xbmc/windowing/X11/WinSystemX11.cpp | 13 +++++++++++-- @@ -10362,10 +10412,10 @@ index 2a269d0..5b64633 100644 1.7.10 -From 81449c0af3253d0ccc5413dae3dd80e98aa29f98 Mon Sep 17 00:00:00 2001 +From 4a6f0e986fc27b356041a4b1bb989e0e594c8aa7 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 20 May 2012 13:17:10 +0200 -Subject: [PATCH 19/65] xrandr: observe orientation +Subject: [PATCH 20/72] xrandr: observe orientation --- xbmc/windowing/X11/WinSystemX11.cpp | 61 +++++++++++++++++++++++++++++++++-- @@ -10534,10 +10584,10 @@ index 5b64633..618bd68 100644 1.7.10 -From ec7d0a2efdd7309d1f8c5cf6c435ac0e113e176f Mon Sep 17 00:00:00 2001 +From 97e5811e05a4ecde7249b2f76283729ff300fda9 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 11:54:15 +0200 -Subject: [PATCH 20/65] xrandr: allow getting info for multiple screen's +Subject: [PATCH 21/72] xrandr: allow getting info for multiple screen's Refactored by: Joakim Plate --- @@ -10712,10 +10762,10 @@ index 618bd68..0824af5 100644 1.7.10 -From 5645d3b0dcc06de721bd9bed270e73a495413fef Mon Sep 17 00:00:00 2001 +From 2b379b9ce21b6d61b44b647b79ef3587dbbcf0ec Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 11:44:00 +0200 -Subject: [PATCH 21/65] X11: fix multi-head setups +Subject: [PATCH 22/72] X11: fix multi-head setups --- language/English/strings.po | 4 +- @@ -10729,7 +10779,7 @@ Subject: [PATCH 21/65] X11: fix multi-head setups 8 files changed, 235 insertions(+), 115 deletions(-) diff --git a/language/English/strings.po b/language/English/strings.po -index f825c57..0d89387 100644 +index 88292d3..bba7284 100644 --- a/language/English/strings.po +++ b/language/English/strings.po @@ -895,7 +895,9 @@ msgctxt "#245" @@ -10756,7 +10806,7 @@ index efe5493..85d780d 100644 virtual void SetViewPort(CRect& viewPort); virtual void GetViewPort(CRect& viewPort); diff --git a/xbmc/settings/GUISettings.cpp b/xbmc/settings/GUISettings.cpp -index c5936f9..e98bfa8 100644 +index 4cdb093..0e320e1 100644 --- a/xbmc/settings/GUISettings.cpp +++ b/xbmc/settings/GUISettings.cpp @@ -392,11 +392,16 @@ void CGUISettings::Initialize() @@ -11447,10 +11497,10 @@ index 93cf5db..71034fc 100644 1.7.10 -From 7ca5c01cbe6d3cbc6e990ec899b5b1e96c3b644c Mon Sep 17 00:00:00 2001 +From 2a747f13a0a50dea0883d0d3c701ef290235a99b Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 11:36:32 +0200 -Subject: [PATCH 22/65] X11: remove all DefaultScreen and RootWindow macros +Subject: [PATCH 23/72] X11: remove all DefaultScreen and RootWindow macros --- xbmc/windowing/X11/WinSystemX11.cpp | 6 +++--- @@ -11518,10 +11568,10 @@ index f858f88..d192697 100644 1.7.10 -From efcade2f8d1ac7d12b02a2f9ecd800c9262eb608 Mon Sep 17 00:00:00 2001 +From cf018ebbf1eae8f5ae2914ef347aac5f963c0d71 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 11:45:22 +0200 -Subject: [PATCH 23/65] X11: remove all DefaultScreen and RootWindow macros +Subject: [PATCH 24/72] X11: remove all DefaultScreen and RootWindow macros (VideoRefClock) Note this is on a separate display connection. @@ -11593,10 +11643,10 @@ index 9785fe7..0004e07 100644 1.7.10 -From f4349a5aef80891eb84bdff08535dc1907168857 Mon Sep 17 00:00:00 2001 +From 5d8bfcd52e5a189515629c15c73434ef6c6bcc88 Mon Sep 17 00:00:00 2001 From: xbmc Date: Wed, 20 Jun 2012 17:37:11 +0200 -Subject: [PATCH 24/65] X11: recreate gl context after output has changed +Subject: [PATCH 25/72] X11: recreate gl context after output has changed --- xbmc/windowing/X11/WinSystemX11.cpp | 24 ++++++++++++++---------- @@ -11747,10 +11797,10 @@ index d192697..0f2d1d2 100644 1.7.10 -From 766d405b3210fb575bbeeda5c2d1dd4936f7b823 Mon Sep 17 00:00:00 2001 +From bd9a29b7661c75152174959f9f269f32c13a658b Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 12:06:25 +0200 -Subject: [PATCH 25/65] X11: hook video reference clock in windowing +Subject: [PATCH 26/72] X11: hook video reference clock in windowing --- xbmc/video/VideoReferenceClock.cpp | 71 ++++++++++++++++++++++++++---------- @@ -11955,10 +12005,10 @@ index dcc4f09..7eb6317 100644 1.7.10 -From 08e9dc3f84f93485a047885d5e8ce26c371dfcc0 Mon Sep 17 00:00:00 2001 +From 702f79eab647ec68030c99d6113976f3c602e87c Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 21 Jun 2012 17:26:51 +0200 -Subject: [PATCH 26/65] X11: fix video calibrations +Subject: [PATCH 27/72] X11: fix video calibrations --- xbmc/settings/Settings.cpp | 1 + @@ -12063,10 +12113,10 @@ index cc28f56..c046c86 100644 1.7.10 -From 83894260bf9cc7edfd1ed8d95c263034a5662158 Mon Sep 17 00:00:00 2001 +From 07920e322c9770ebb99becd104ebce0789c502fa Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 12:00:26 +0200 -Subject: [PATCH 27/65] X11: deactivate screen saver on startup +Subject: [PATCH 28/72] X11: deactivate screen saver on startup --- xbmc/windowing/X11/WinSystemX11.cpp | 29 +++++++++++++++++++++++++++++ @@ -12136,10 +12186,10 @@ index c046c86..e953d2d 100644 1.7.10 -From 6298d6e6bb5aa7095fd8834c5b33115dd26f2303 Mon Sep 17 00:00:00 2001 +From 835bcc9c7fd477012492ffc4cad2bdd9ce506064 Mon Sep 17 00:00:00 2001 From: FernetMenta Date: Thu, 5 Jul 2012 12:10:09 +0200 -Subject: [PATCH 28/65] X11: change method of going full-screen +Subject: [PATCH 29/72] X11: change method of going full-screen --- xbmc/windowing/X11/WinSystemX11.cpp | 9 ++++++++- @@ -12183,10 +12233,10 @@ index b3e7ab5..91f92c1 100644 1.7.10 -From 3ee15319a23761a412e8a9d1ad6b12da5ad9bef5 Mon Sep 17 00:00:00 2001 +From e2442797ff82b3ed8053f1a6422863ffce9cbe5f Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 28 Jun 2012 19:12:39 +0200 -Subject: [PATCH 29/65] X11: reset key repeat and key modifier on focus lost +Subject: [PATCH 30/72] X11: reset key repeat and key modifier on focus lost and gain --- @@ -12218,10 +12268,10 @@ index 6c22358..d86205d 100644 1.7.10 -From 63ca8875197d6834344e18d251dd53602b50613a Mon Sep 17 00:00:00 2001 +From 77a22163a7f611e9183b7cd0b817fc51a42d45de Mon Sep 17 00:00:00 2001 From: Joakim Plate Date: Thu, 5 Jul 2012 14:18:46 +0200 -Subject: [PATCH 30/65] X11: replace custom utf8 to unicode with charset +Subject: [PATCH 31/72] X11: replace custom utf8 to unicode with charset convertor (squash to x11 events) --- @@ -12438,10 +12488,10 @@ index 6100933..72955ad 100644 1.7.10 -From d549f751d3261799f94640181dda000e15fa8b66 Mon Sep 17 00:00:00 2001 +From e060b3197bbac54b79b604bbbf9a8e86257980f5 Mon Sep 17 00:00:00 2001 From: Joakim Plate Date: Thu, 5 Jul 2012 14:23:54 +0200 -Subject: [PATCH 31/65] X11: fixed invalid usage of sizeof() (squash into x11 +Subject: [PATCH 32/72] X11: fixed invalid usage of sizeof() (squash into x11 changes) --- @@ -12505,17 +12555,17 @@ index 72955ad..102a076 100644 1.7.10 -From 064ec732cd3a400dd16523770d6adaee2e4e10e6 Mon Sep 17 00:00:00 2001 +From c52af3ba68292f08331cbbbc940dfcea838a2f44 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 9 Jun 2012 18:23:53 +0200 -Subject: [PATCH 32/65] add missing keys to xbmc keytable +Subject: [PATCH 33/72] add missing keys to xbmc keytable --- xbmc/input/XBMC_keytable.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xbmc/input/XBMC_keytable.cpp b/xbmc/input/XBMC_keytable.cpp -index dbc28a7..0ab6e78 100644 +index aaf65ba..9d7922f 100644 --- a/xbmc/input/XBMC_keytable.cpp +++ b/xbmc/input/XBMC_keytable.cpp @@ -179,6 +179,8 @@ @@ -12531,10 +12581,10 @@ index dbc28a7..0ab6e78 100644 1.7.10 -From 0815b0e72b8e6db1523c1e0a7672e591bb5ba5ed Mon Sep 17 00:00:00 2001 +From 25587ee807eca2fc9dde4528e3fc930b337e38b0 Mon Sep 17 00:00:00 2001 From: xbmc Date: Fri, 16 Mar 2012 15:57:51 +0100 -Subject: [PATCH 33/65] videorefclock: temp deactivate of nv settings +Subject: [PATCH 34/72] videorefclock: temp deactivate of nv settings --- xbmc/video/VideoReferenceClock.cpp | 2 +- @@ -12557,10 +12607,10 @@ index fa8e35a..85e36c7 100644 1.7.10 -From 3d495917e2d8b0b68b18ae27cfb00d32821b0153 Mon Sep 17 00:00:00 2001 +From 4f8a95de09408321e2df3da891536c314fe3b4d2 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 20 Aug 2012 09:09:09 +0200 -Subject: [PATCH 34/65] videorefclock: ask graphics context for refresh rate +Subject: [PATCH 35/72] videorefclock: ask graphics context for refresh rate --- xbmc/video/VideoReferenceClock.cpp | 3 ++- @@ -12591,10 +12641,10 @@ index 85e36c7..8209163 100644 1.7.10 -From f355c4ee7062955f8974eed2a19c9d8519f8c914 Mon Sep 17 00:00:00 2001 +From 85d81f0c933cb0a75c2c21de86b4065e3db86002 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 9 Jul 2012 14:00:18 +0200 -Subject: [PATCH 35/65] X11: fix icon texture after +Subject: [PATCH 36/72] X11: fix icon texture after cc5ed3c2474084ebc0373a3046410e6f766e03f4 --- @@ -12702,10 +12752,10 @@ index 91f92c1..174ccef 100644 1.7.10 -From ce002ad4313fe9351f52f2306f953071b4717f41 Mon Sep 17 00:00:00 2001 +From 111c2f8fd0f6b698fbff0fda6dc6c17ce3644626 Mon Sep 17 00:00:00 2001 From: xbmc Date: Tue, 10 Jul 2012 11:14:12 +0200 -Subject: [PATCH 36/65] X11: check for window manager +Subject: [PATCH 37/72] X11: check for window manager --- xbmc/windowing/X11/WinSystemX11.cpp | 74 ++++++++++++++++++++++++++++++++++- @@ -12826,10 +12876,10 @@ index e953d2d..0b7c10a 100644 1.7.10 -From 7de4839edfbbae70a96b642c7b94da8094d6831c Mon Sep 17 00:00:00 2001 +From f1051e1991e5ef5d83ce428b841ac365082042ec Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 12 Jul 2012 11:11:47 +0200 -Subject: [PATCH 37/65] X11: dont set window on xrandr if no mode available +Subject: [PATCH 38/72] X11: dont set window on xrandr if no mode available --- xbmc/windowing/X11/WinSystemX11.cpp | 11 ++++++----- @@ -12866,10 +12916,10 @@ index 4f1ae26..c11ea89 100644 1.7.10 -From e682379b7bdb3594a0cfbee1ef9e4be57d78594d Mon Sep 17 00:00:00 2001 +From 83b9c33e88077d957884ee22316c218e570dc3d5 Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 26 Jul 2012 09:34:28 +0200 -Subject: [PATCH 38/65] X11: fix crash after a resolution change on startup +Subject: [PATCH 39/72] X11: fix crash after a resolution change on startup --- xbmc/windowing/X11/WinSystemX11.cpp | 3 ++- @@ -12893,10 +12943,10 @@ index c11ea89..0bd72d4 100644 1.7.10 -From a7698600db2b1f231bd5c47a47d4bf603f3d5933 Mon Sep 17 00:00:00 2001 +From b8956ed57f1b683ae79d7306c7461a31c894e9a9 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 15 Sep 2012 18:27:29 +0200 -Subject: [PATCH 39/65] X11: lock graphics context in NotifyXRREvent +Subject: [PATCH 40/72] X11: lock graphics context in NotifyXRREvent --- xbmc/windowing/X11/WinSystemX11.cpp | 2 ++ @@ -12919,10 +12969,10 @@ index 0bd72d4..ef83133 100644 1.7.10 -From bca47c8aa4ef5f69c2efd2f9cfd128d575776086 Mon Sep 17 00:00:00 2001 +From aed5d244b81b1a0b171b7fea3b332decafc96c56 Mon Sep 17 00:00:00 2001 From: Rainer Hochecker Date: Sat, 8 Oct 2011 16:45:13 +0200 -Subject: [PATCH 40/65] ffmpeg: add xvba hwaccel +Subject: [PATCH 41/72] ffmpeg: add xvba hwaccel --- lib/ffmpeg/configure | 8 ++ @@ -13789,10 +13839,10 @@ index f0d9c01..0f8cf7b 100644 1.7.10 -From 9dda703c82dd961e7f51dbde13ab799d86ef53f8 Mon Sep 17 00:00:00 2001 +From 922cada27e255bc3f685b700c2ffa4a146f87624 Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 12 Apr 2012 12:09:31 +0200 -Subject: [PATCH 41/65] xvba: add decoder +Subject: [PATCH 42/72] xvba: add decoder --- configure.in | 48 + @@ -13815,7 +13865,7 @@ Subject: [PATCH 41/65] xvba: add decoder create mode 100644 xbmc/cores/dvdplayer/DVDCodecs/Video/XVBA.h diff --git a/configure.in b/configure.in -index 1fc450b..f42e81c 100644 +index 350d960..3660fa4 100644 --- a/configure.in +++ b/configure.in @@ -124,6 +124,8 @@ vaapi_not_found="== Could not find libva. VAAPI support disabled. ==" @@ -13909,7 +13959,7 @@ index 1fc450b..f42e81c 100644 --enable-pthreads \ --enable-runtime-cpudetect \ diff --git a/language/English/strings.po b/language/English/strings.po -index 0d89387..ba647f3 100644 +index bba7284..ede18b3 100644 --- a/language/English/strings.po +++ b/language/English/strings.po @@ -5124,7 +5124,11 @@ msgctxt "#13436" @@ -17197,7 +17247,7 @@ index 15a39fa..e5e71f3 100644 if(m_bAllowFullscreen) diff --git a/xbmc/settings/GUISettings.cpp b/xbmc/settings/GUISettings.cpp -index e98bfa8..a87f871 100644 +index 0e320e1..10ef779 100644 --- a/xbmc/settings/GUISettings.cpp +++ b/xbmc/settings/GUISettings.cpp @@ -696,6 +696,9 @@ void CGUISettings::Initialize() @@ -17239,10 +17289,10 @@ index f25d10d..f6b1ea4 100644 1.7.10 -From 2c93be8f7888de573b1bd4e43818c4e354f9b7e4 Mon Sep 17 00:00:00 2001 +From 517eda0bf58a6376a82839ab92e51b97c143edf1 Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 23 Aug 2012 19:39:49 +0200 -Subject: [PATCH 42/65] ffmpeg: add av_find_default_stream_index to interface +Subject: [PATCH 43/72] ffmpeg: add av_find_default_stream_index to interface --- lib/DllAvFormat.h | 4 ++++ @@ -17288,10 +17338,10 @@ index 9bda3f3..bf31fcb 100644 1.7.10 -From cc5a834ad7499213db0ff8478656cb3d23bc6aa9 Mon Sep 17 00:00:00 2001 +From 23be471842ae9ea7bd62c18261a5e96a11045d04 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 20 Aug 2012 16:06:39 +0200 -Subject: [PATCH 43/65] dvdplayer: observe pts counter overflow +Subject: [PATCH 44/72] dvdplayer: observe pts counter overflow --- .../cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp | 198 +++++++++++++++++++- @@ -17577,10 +17627,10 @@ index 2b5f2e8..e0acf29 100644 1.7.10 -From a4c4c81076b5d30f7e4f8b18579ba71eac7126d1 Mon Sep 17 00:00:00 2001 +From 66382788a903f99ba317e972ba0445fc68320750 Mon Sep 17 00:00:00 2001 From: xbmc Date: Tue, 2 Oct 2012 13:02:10 +0200 -Subject: [PATCH 44/65] dvdplayer: avoid short screen flicker caused by +Subject: [PATCH 45/72] dvdplayer: avoid short screen flicker caused by unnecessary reconfigure of renderer --- @@ -17613,10 +17663,10 @@ index e5e71f3..8b02d81 100644 1.7.10 -From 58de6d26fab0eb7b876b4636666c3c1a0a7cc6d2 Mon Sep 17 00:00:00 2001 +From 04f4521c1938a7ac17acd59f3bd6be59c7ba8184 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sat, 16 Jun 2012 12:46:30 +0200 -Subject: [PATCH 45/65] xvba: do not use vaapi if xvba is present +Subject: [PATCH 46/72] xvba: do not use vaapi if xvba is present --- xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp | 9 +++++++++ @@ -17646,10 +17696,10 @@ index a2b9195..43a05b3 100644 1.7.10 -From a7246851e416366a59da075fe7fadf5af5365f3b Mon Sep 17 00:00:00 2001 +From a133b7fa119e859ec50b9f05a33de984105234f3 Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 11 Oct 2012 12:05:50 +0200 -Subject: [PATCH 46/65] vdpau: advanced settings for auto deinterlacing +Subject: [PATCH 47/72] vdpau: advanced settings for auto deinterlacing --- xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp | 8 ++++---- @@ -17715,20 +17765,20 @@ index 72718e5..aaa4702 100644 1.7.10 -From 07d871d33fcd1e92a714f7c3f1681e5e2988d8f9 Mon Sep 17 00:00:00 2001 +From 62540aeaa356823bd34e9367ac39eef23a6e4ce4 Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 11 Oct 2012 13:01:08 +0200 -Subject: [PATCH 47/65] dvdplayer: correct determination if video is playing +Subject: [PATCH 48/72] dvdplayer: correct determination if video is playing --- xbmc/cores/dvdplayer/DVDPlayer.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/xbmc/cores/dvdplayer/DVDPlayer.cpp b/xbmc/cores/dvdplayer/DVDPlayer.cpp -index 57e00e4..66cd24a 100644 +index 6fcb6b3..f76691d 100644 --- a/xbmc/cores/dvdplayer/DVDPlayer.cpp +++ b/xbmc/cores/dvdplayer/DVDPlayer.cpp -@@ -2377,9 +2377,16 @@ bool CDVDPlayer::IsPaused() const +@@ -2382,9 +2382,16 @@ bool CDVDPlayer::IsPaused() const bool CDVDPlayer::HasVideo() const { @@ -17751,10 +17801,10 @@ index 57e00e4..66cd24a 100644 1.7.10 -From eec6b29df168572d12dd3b683036682a66755135 Mon Sep 17 00:00:00 2001 +From 5a093bbd60d1ca47ed7c5e4639f28dafc1b565c1 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 14 Oct 2012 13:46:54 +0200 -Subject: [PATCH 48/65] rendermanager: fix stuttering in non full-screen mode, +Subject: [PATCH 49/72] rendermanager: fix stuttering in non full-screen mode, squash to add buffering --- @@ -17780,10 +17830,10 @@ index 0506823..b141c80 100644 1.7.10 -From 6c238cf78efc5e049c2d6275ba748ba110205b5e Mon Sep 17 00:00:00 2001 +From d0597caa2c922575efdf081d719d5665c626ffec Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 14 Oct 2012 17:54:02 +0200 -Subject: [PATCH 49/65] rendermanager: forgot to set flip event if buffering +Subject: [PATCH 50/72] rendermanager: forgot to set flip event if buffering is not used --- @@ -17826,10 +17876,10 @@ index b141c80..9290f80 100644 1.7.10 -From 18edbd82c3b10f096b2597dd9b951cdc083118ff Mon Sep 17 00:00:00 2001 +From c485392afa608bfbcf903fa53a9dd824258c96dd Mon Sep 17 00:00:00 2001 From: xbmc Date: Fri, 26 Oct 2012 15:30:22 +0200 -Subject: [PATCH 50/65] vdpau: fix small mem leak +Subject: [PATCH 51/72] vdpau: fix small mem leak --- xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp | 2 ++ @@ -17852,10 +17902,10 @@ index d95797b..fec4b88 100644 1.7.10 -From 01168b2d4e3b0a59925ce0985a10a952893f699c Mon Sep 17 00:00:00 2001 +From 9d7228a84013e409149d7b05d34545d1bdf06e27 Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 29 Oct 2012 18:25:56 +0100 -Subject: [PATCH 51/65] xvba: do not render if there is no valid texture +Subject: [PATCH 52/72] xvba: do not render if there is no valid texture --- xbmc/cores/VideoRenderers/LinuxRendererGL.cpp | 8 +++----- @@ -17889,10 +17939,10 @@ index ec3606a..7c3adcb 100644 1.7.10 -From afa62dee526b29430d6113ac039768c84cf425f1 Mon Sep 17 00:00:00 2001 +From 85be082db41b27cdd3824b8360dc021e17a84c22 Mon Sep 17 00:00:00 2001 From: xbmc Date: Fri, 2 Nov 2012 13:20:03 +0100 -Subject: [PATCH 52/65] player: fix rewind +Subject: [PATCH 53/72] player: fix rewind --- xbmc/cores/dvdplayer/DVDMessage.h | 5 ++++- @@ -17940,7 +17990,7 @@ index 30b2f5c..b9831d4 100644 class CDVDMsgPlayerSeekChapter : public CDVDMsg diff --git a/xbmc/cores/dvdplayer/DVDPlayer.cpp b/xbmc/cores/dvdplayer/DVDPlayer.cpp -index 66cd24a..3d56e81 100644 +index f76691d..07df0d8 100644 --- a/xbmc/cores/dvdplayer/DVDPlayer.cpp +++ b/xbmc/cores/dvdplayer/DVDPlayer.cpp @@ -1543,11 +1543,13 @@ void CDVDPlayer::HandlePlaySpeed() @@ -17967,7 +18017,7 @@ index 66cd24a..3d56e81 100644 } } } -@@ -2025,7 +2027,7 @@ void CDVDPlayer::HandleMessages() +@@ -2030,7 +2032,7 @@ void CDVDPlayer::HandleMessages() if(!m_pSubtitleDemuxer->SeekTime(time, msg.GetBackward())) CLog::Log(LOGDEBUG, "failed to seek subtitle demuxer: %d, success", time); } @@ -17976,7 +18026,7 @@ index 66cd24a..3d56e81 100644 } else CLog::Log(LOGWARNING, "error while seeking"); -@@ -2163,9 +2165,10 @@ void CDVDPlayer::HandleMessages() +@@ -2168,9 +2170,10 @@ void CDVDPlayer::HandleMessages() double offset; offset = CDVDClock::GetAbsoluteClock() - m_State.timestamp; offset *= m_playSpeed / DVD_PLAYSPEED_NORMAL; @@ -17988,7 +18038,7 @@ index 66cd24a..3d56e81 100644 m_State.timestamp = CDVDClock::GetAbsoluteClock(); } -@@ -2181,7 +2184,8 @@ void CDVDPlayer::HandleMessages() +@@ -2186,7 +2189,8 @@ void CDVDPlayer::HandleMessages() // do a seek after rewind, clock is not in sync with current pts if (m_playSpeed < 0 && speed >= 0) { @@ -17998,7 +18048,7 @@ index 66cd24a..3d56e81 100644 } // if playspeed is different then DVD_PLAYSPEED_NORMAL or DVD_PLAYSPEED_PAUSE -@@ -2762,10 +2766,11 @@ int64_t CDVDPlayer::GetTime() +@@ -2767,10 +2771,11 @@ int64_t CDVDPlayer::GetTime() { offset = CDVDClock::GetAbsoluteClock() - m_State.timestamp; offset *= m_playSpeed / DVD_PLAYSPEED_NORMAL; @@ -18011,7 +18061,7 @@ index 66cd24a..3d56e81 100644 } // return length in msec -@@ -3135,7 +3140,7 @@ bool CDVDPlayer::CloseTeletextStream(bool bWaitForBuffers) +@@ -3140,7 +3145,7 @@ bool CDVDPlayer::CloseTeletextStream(bool bWaitForBuffers) return true; } @@ -18020,7 +18070,7 @@ index 66cd24a..3d56e81 100644 { double startpts; if(accurate) -@@ -3147,19 +3152,23 @@ void CDVDPlayer::FlushBuffers(bool queued, double pts, bool accurate) +@@ -3152,19 +3157,23 @@ void CDVDPlayer::FlushBuffers(bool queued, double pts, bool accurate) if(startpts != DVD_NOPTS_VALUE) startpts -= m_offset_pts; @@ -18048,7 +18098,7 @@ index 66cd24a..3d56e81 100644 m_CurrentTeletext.dts = DVD_NOPTS_VALUE; m_CurrentTeletext.startpts = startpts; -@@ -3203,7 +3212,7 @@ void CDVDPlayer::FlushBuffers(bool queued, double pts, bool accurate) +@@ -3208,7 +3217,7 @@ void CDVDPlayer::FlushBuffers(bool queued, double pts, bool accurate) m_CurrentTeletext.started = false; } @@ -18058,7 +18108,7 @@ index 66cd24a..3d56e81 100644 UpdatePlayState(0); } diff --git a/xbmc/cores/dvdplayer/DVDPlayer.h b/xbmc/cores/dvdplayer/DVDPlayer.h -index 9438a9b..2bbb031 100644 +index d3c201e..70ecea9 100644 --- a/xbmc/cores/dvdplayer/DVDPlayer.h +++ b/xbmc/cores/dvdplayer/DVDPlayer.h @@ -310,7 +310,7 @@ class CDVDPlayer : public IPlayer, public CThread, public IDVDPlayer @@ -18137,10 +18187,10 @@ index 509d5f7..7cddda7 100644 1.7.10 -From b7b8cd1063c8bb3311662d80734f028ccbe6b8a6 Mon Sep 17 00:00:00 2001 +From 024ecda241754f02ad985fab9116e33b06b8d174 Mon Sep 17 00:00:00 2001 From: fritsch Date: Fri, 2 Nov 2012 17:56:12 +0100 -Subject: [PATCH 53/65] xvba: do not create decoder for surfaces larger than +Subject: [PATCH 54/72] xvba: do not create decoder for surfaces larger than width 2048 or height 1536 --- @@ -18177,10 +18227,10 @@ index e8e376a..b73c48a 100644 1.7.10 -From 7c3061b823a062e2305e5a682ea38e0863629ed2 Mon Sep 17 00:00:00 2001 +From 98ebb0d0232cf4a7ea2082f9f16e210a39e983e8 Mon Sep 17 00:00:00 2001 From: fritsch Date: Sun, 4 Nov 2012 16:24:10 +0100 -Subject: [PATCH 54/65] xvba: add string for available decoders - we are +Subject: [PATCH 55/72] xvba: add string for available decoders - we are important so make sure we are there --- @@ -18207,10 +18257,10 @@ index 0cea7a9..6fb74b7 100644 1.7.10 -From c2bc8d899564dd50b839a8e48b7bd8705c9c2c68 Mon Sep 17 00:00:00 2001 +From 84e701f7db6603a2942611d5c74ba645c625ec0d Mon Sep 17 00:00:00 2001 From: fritsch Date: Thu, 22 Nov 2012 21:32:21 +0100 -Subject: [PATCH 55/65] xvba: revisit Artefacts. There are more broken video +Subject: [PATCH 56/72] xvba: revisit Artefacts. There are more broken video files out there --- @@ -18244,10 +18294,10 @@ index a077442..87af687 100644 1.7.10 -From ed6c35b57d161805e76f9cc68acc7019b0360bf9 Mon Sep 17 00:00:00 2001 +From afd776e3e90a1787ce4c3392266d70368de4e164 Mon Sep 17 00:00:00 2001 From: xbmc Date: Fri, 23 Nov 2012 09:42:02 +0100 -Subject: [PATCH 56/65] xvba: reactivate accidently disabled +Subject: [PATCH 57/72] xvba: reactivate accidently disabled IsDecodingFinished --- @@ -18271,10 +18321,10 @@ index b73c48a..47ff25f 100644 1.7.10 -From 3e777702bb9911a4aa9cfcdbb7cedc908884f507 Mon Sep 17 00:00:00 2001 +From 37576c15f9e3a0c2dce593e9d9cb5a7863845de7 Mon Sep 17 00:00:00 2001 From: xbmc Date: Fri, 23 Nov 2012 17:41:12 +0100 -Subject: [PATCH 57/65] xrandr: fix query for multiple screens +Subject: [PATCH 58/72] xrandr: fix query for multiple screens --- xbmc/windowing/X11/XRandR.cpp | 10 ++++++---- @@ -18315,10 +18365,10 @@ index cc933b9..533e03d 100644 1.7.10 -From 77f16bb83a0ced22ab2e0be9249bea0ff9dd5e85 Mon Sep 17 00:00:00 2001 +From bd5d572c69ee254beedb5e9339831652943ea8b4 Mon Sep 17 00:00:00 2001 From: xbmc Date: Sun, 2 Dec 2012 15:46:55 +0100 -Subject: [PATCH 58/65] X11: add debug log to print out refresh after xrr +Subject: [PATCH 59/72] X11: add debug log to print out refresh after xrr event --- @@ -18346,10 +18396,10 @@ index ef83133..76c6362 100644 1.7.10 -From 1f04e7094e94ccd43a543228d04fee149e473966 Mon Sep 17 00:00:00 2001 +From d418ae1053a3842eb3e6a3bbd84666a5ee3defe2 Mon Sep 17 00:00:00 2001 From: xbmc Date: Tue, 11 Dec 2012 11:08:13 +0100 -Subject: [PATCH 59/65] X11: dont call XCloseDisplay on shutdown, it crashes +Subject: [PATCH 60/72] X11: dont call XCloseDisplay on shutdown, it crashes when powered doen by cec on ATI --- @@ -18374,10 +18424,10 @@ index 76c6362..e4e25b2 100644 1.7.10 -From b950ef11c5e8abe280a703963a945965709b5871 Mon Sep 17 00:00:00 2001 +From 3b700401e9aace50b5ce6c5d7ba2a2e33bb5217f Mon Sep 17 00:00:00 2001 From: xbmc Date: Wed, 12 Dec 2012 09:52:17 +0100 -Subject: [PATCH 60/65] vdpau: make interop gl default and remove setting, +Subject: [PATCH 61/72] vdpau: make interop gl default and remove setting, rename and intvert interop yuv --- @@ -18388,7 +18438,7 @@ Subject: [PATCH 60/65] vdpau: make interop gl default and remove setting, 4 files changed, 15 insertions(+), 30 deletions(-) diff --git a/language/English/strings.po b/language/English/strings.po -index ba647f3..8c179a9 100644 +index ede18b3..281a8a1 100644 --- a/language/English/strings.po +++ b/language/English/strings.po @@ -5121,7 +5121,7 @@ msgid "Allow Vdpau OpenGL interop" @@ -18473,7 +18523,7 @@ index fec4b88..ad140fb 100644 if (!glXBindTexImageEXT) glXBindTexImageEXT = (PFNGLXBINDTEXIMAGEEXTPROC)glXGetProcAddress((GLubyte *) "glXBindTexImageEXT"); diff --git a/xbmc/settings/GUISettings.cpp b/xbmc/settings/GUISettings.cpp -index a87f871..e45c85d 100644 +index 10ef779..a4bd524 100644 --- a/xbmc/settings/GUISettings.cpp +++ b/xbmc/settings/GUISettings.cpp @@ -690,8 +690,7 @@ void CGUISettings::Initialize() @@ -18532,10 +18582,10 @@ index 3c19a06..b9f18e4 100644 1.7.10 -From 0611007b884af1e485db0bb379a55a39a0e4a9a9 Mon Sep 17 00:00:00 2001 +From a060312a4e236858bf3c9a97d663c5643796b649 Mon Sep 17 00:00:00 2001 From: xbmc Date: Wed, 12 Dec 2012 18:34:47 +0100 -Subject: [PATCH 61/65] vdpau: drop studio level conversion +Subject: [PATCH 62/72] vdpau: drop studio level conversion --- language/English/strings.po | 6 +- @@ -18545,7 +18595,7 @@ Subject: [PATCH 61/65] vdpau: drop studio level conversion 4 files changed, 7 insertions(+), 98 deletions(-) diff --git a/language/English/strings.po b/language/English/strings.po -index 8c179a9..1cd9e04 100644 +index 281a8a1..fc896b3 100644 --- a/language/English/strings.po +++ b/language/English/strings.po @@ -4371,11 +4371,7 @@ msgctxt "#13121" @@ -18703,7 +18753,7 @@ index ad140fb..5851e1a 100644 } diff --git a/xbmc/settings/GUISettings.cpp b/xbmc/settings/GUISettings.cpp -index e45c85d..8980e9d 100644 +index a4bd524..67aeec9 100644 --- a/xbmc/settings/GUISettings.cpp +++ b/xbmc/settings/GUISettings.cpp @@ -772,7 +772,6 @@ void CGUISettings::Initialize() @@ -18718,10 +18768,10 @@ index e45c85d..8980e9d 100644 1.7.10 -From 6e60f7cc2fbda3af8ef8d5354625d9ca99139648 Mon Sep 17 00:00:00 2001 +From 6d03704ce1cbc7d09d684da1ced478b2b59c0b35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Coutant?= Date: Wed, 12 Dec 2012 19:49:47 +0100 -Subject: [PATCH 62/65] x11: support for multiple x screens +Subject: [PATCH 63/72] x11: support for multiple x screens --- xbmc/windowing/X11/XRandR.cpp | 2 +- @@ -18744,10 +18794,10 @@ index 533e03d..7a16488 100644 1.7.10 -From 23da4306821c2157f5cec95eade246d4c2f5361d Mon Sep 17 00:00:00 2001 +From 597c8449084e1e5ebfebfb31db570f7826d06517 Mon Sep 17 00:00:00 2001 From: xbmc Date: Wed, 12 Dec 2012 20:28:49 +0100 -Subject: [PATCH 63/65] vdpau: observe ffmpeg tags for color space +Subject: [PATCH 64/72] vdpau: observe ffmpeg tags for color space --- xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp | 38 ++++++++++++++++-------- @@ -18851,10 +18901,10 @@ index 4d1559c..471ad68 100644 1.7.10 -From 220d6d1416228b63b071dabf68a085c6d24facd6 Mon Sep 17 00:00:00 2001 +From 3f9308d76025ef1e31923fa9a06587f75c00f870 Mon Sep 17 00:00:00 2001 From: xbmc Date: Thu, 20 Dec 2012 19:35:38 +0100 -Subject: [PATCH 64/65] fix compile error after recent change +Subject: [PATCH 65/72] fix compile error after recent change --- xbmc/settings/GUIWindowSettingsCategory.cpp | 2 +- @@ -18877,10 +18927,10 @@ index b9f18e4..cacb32a 100644 1.7.10 -From f3add0d0f2995f8ec15e87780a930cf07dbe76ed Mon Sep 17 00:00:00 2001 +From 213792b2678760d42740d581a1ee71e186a31c4d Mon Sep 17 00:00:00 2001 From: xbmc Date: Mon, 24 Dec 2012 16:02:42 +0100 -Subject: [PATCH 65/65] pvr: increase changes counter of stream on stream +Subject: [PATCH 66/72] pvr: increase changes counter of stream on stream change, cosmetics after dd307930d39d92f145a01a16600cd00e01ec39be @@ -18914,3 +18964,274 @@ index 8c984f6..034e545 100644 -- 1.7.10 + +From e810d3bd68e89e800fba217e88184c2df0fe4040 Mon Sep 17 00:00:00 2001 +From: xbmc +Date: Thu, 17 Jan 2013 16:03:22 +0100 +Subject: [PATCH 67/72] X11: add keymapping for XF86XK_Sleep + +--- + xbmc/windowing/WinEventsX11.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/xbmc/windowing/WinEventsX11.cpp b/xbmc/windowing/WinEventsX11.cpp +index c31877e..ed31c04 100644 +--- a/xbmc/windowing/WinEventsX11.cpp ++++ b/xbmc/windowing/WinEventsX11.cpp +@@ -143,6 +143,7 @@ + , {XK_Break, XBMCK_BREAK} + , {XK_Menu, XBMCK_MENU} + , {XF86XK_PowerOff, XBMCK_POWER} ++, {XF86XK_Sleep, XBMCK_SLEEP} + , {XK_EcuSign, XBMCK_EURO} + , {XK_Undo, XBMCK_UNDO} + /* Media keys */ +-- +1.7.10 + + +From 2cb807b2f801f06723cde1bdd636550c08fc08ab Mon Sep 17 00:00:00 2001 +From: fritsch +Date: Sat, 12 Jan 2013 13:03:50 +0100 +Subject: [PATCH 68/72] dvdplayer: Allow multithread decoding for hi10p + content by default + +This allows decoding of some hi10p material on e.g. AMD Fusion with +both cores at the max. This introduces a new advancedsetting named +disablehi10pmultithreading to disable hi10p decoded multithreaded. +--- + .../DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp | 18 ++++++++++++++++-- + .../dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.h | 1 + + xbmc/settings/AdvancedSettings.cpp | 2 ++ + xbmc/settings/AdvancedSettings.h | 1 + + 4 files changed, 20 insertions(+), 2 deletions(-) + +diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp +index b3252ec..3f8a6e8 100644 +--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp ++++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp +@@ -154,6 +154,7 @@ enum PixelFormat CDVDVideoCodecFFmpeg::GetFormat( struct AVCodecContext * avctx + m_iScreenHeight = 0; + m_iOrientation = 0; + m_bSoftware = false; ++ m_isHi10p = false; + m_pHardware = NULL; + m_iLastKeyframe = 0; + m_dts = DVD_NOPTS_VALUE; +@@ -204,7 +205,10 @@ bool CDVDVideoCodecFFmpeg::Open(CDVDStreamInfo &hints, CDVDCodecOptions &options + case FF_PROFILE_H264_HIGH_444_PREDICTIVE: + case FF_PROFILE_H264_HIGH_444_INTRA: + case FF_PROFILE_H264_CAVLC_444: ++ // this is needed to not open the decoders + m_bSoftware = true; ++ // this we need to enable multithreading for hi10p via advancedsettings ++ m_isHi10p = true; + break; + } + } +@@ -277,8 +281,18 @@ bool CDVDVideoCodecFFmpeg::Open(CDVDStreamInfo &hints, CDVDCodecOptions &options + m_pCodecContext->codec_tag = hints.codec_tag; + /* Only allow slice threading, since frame threading is more + * sensitive to changes in frame sizes, and it causes crashes +- * during HW accell */ +- m_pCodecContext->thread_type = FF_THREAD_SLICE; ++ * during HW accell - so we unset it in this case. ++ * ++ * When we detect Hi10p and user did not disable hi10pmultithreading ++ * via advancedsettings.xml we keep the ffmpeg default thread type. ++ * */ ++ if(m_isHi10p && !g_advancedSettings.m_videoDisableHi10pMultithreading) ++ { ++ CLog::Log(LOGDEBUG,"CDVDVideoCodecFFmpeg::Open() Keep default threading for Hi10p: %d", ++ m_pCodecContext->thread_type); ++ } ++ else ++ m_pCodecContext->thread_type = FF_THREAD_SLICE; + + #if defined(TARGET_DARWIN_IOS) + // ffmpeg with enabled neon will crash and burn if this is enabled +diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.h b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.h +index bf4367c..db1d2b2 100644 +--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.h ++++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.h +@@ -116,6 +116,7 @@ class CDVDVideoCodecFFmpeg : public CDVDVideoCodec + + std::string m_name; + bool m_bSoftware; ++ bool m_isHi10p; + IHardwareDecoder *m_pHardware; + int m_iLastKeyframe; + double m_dts; +diff --git a/xbmc/settings/AdvancedSettings.cpp b/xbmc/settings/AdvancedSettings.cpp +index d913924..6a48309 100644 +--- a/xbmc/settings/AdvancedSettings.cpp ++++ b/xbmc/settings/AdvancedSettings.cpp +@@ -116,6 +116,7 @@ void CAdvancedSettings::Initialize() + m_DXVANoDeintProcForProgressive = false; + m_videoFpsDetect = 1; + m_videoDefaultLatency = 0.0; ++ m_videoDisableHi10pMultithreading = false; + + m_musicUseTimeSeeking = true; + m_musicTimeSeekForward = 10; +@@ -502,6 +503,7 @@ void CAdvancedSettings::ParseSettingsFile(const CStdString &file) + XMLUtils::GetBoolean(pElement,"enablehighqualityhwscalers", m_videoEnableHighQualityHwScalers); + XMLUtils::GetFloat(pElement,"autoscalemaxfps",m_videoAutoScaleMaxFps, 0.0f, 1000.0f); + XMLUtils::GetBoolean(pElement,"allowmpeg4vdpau",m_videoAllowMpeg4VDPAU); ++ XMLUtils::GetBoolean(pElement,"disablehi10pmultithreading",m_videoDisableHi10pMultithreading); + XMLUtils::GetBoolean(pElement,"allowmpeg4vaapi",m_videoAllowMpeg4VAAPI); + XMLUtils::GetBoolean(pElement, "disablebackgrounddeinterlace", m_videoDisableBackgroundDeinterlace); + XMLUtils::GetInt(pElement, "useocclusionquery", m_videoCaptureUseOcclusionQuery, -1, 1); +diff --git a/xbmc/settings/AdvancedSettings.h b/xbmc/settings/AdvancedSettings.h +index aaa4702..863e4f3 100644 +--- a/xbmc/settings/AdvancedSettings.h ++++ b/xbmc/settings/AdvancedSettings.h +@@ -168,6 +168,7 @@ class CAdvancedSettings + bool m_DXVAForceProcessorRenderer; + bool m_DXVANoDeintProcForProgressive; + int m_videoFpsDetect; ++ bool m_videoDisableHi10pMultithreading; + + CStdString m_videoDefaultPlayer; + CStdString m_videoDefaultDVDPlayer; +-- +1.7.10 + + +From 5e52fa15742e1300ac394738ead4ca2792c4812c Mon Sep 17 00:00:00 2001 +From: xbmc +Date: Mon, 21 Jan 2013 09:00:19 +0100 +Subject: [PATCH 69/72] X11: remove toggle full screen after resume + +--- + xbmc/powermanagement/PowerManager.cpp | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/xbmc/powermanagement/PowerManager.cpp b/xbmc/powermanagement/PowerManager.cpp +index a5534c9..7e2ddc6 100644 +--- a/xbmc/powermanagement/PowerManager.cpp ++++ b/xbmc/powermanagement/PowerManager.cpp +@@ -223,11 +223,6 @@ void CPowerManager::OnWake() + #if defined(_WIN32) + ShowWindow(g_hWnd,SW_RESTORE); + SetForegroundWindow(g_hWnd); +-#elif !defined(TARGET_DARWIN_OSX) +- // Hack to reclaim focus, thus rehiding system mouse pointer. +- // Surely there's a better way? +- g_graphicsContext.ToggleFullScreenRoot(); +- g_graphicsContext.ToggleFullScreenRoot(); + #endif + } + g_application.ResetScreenSaver(); +-- +1.7.10 + + +From e8f3e20dfb3bde4434e2aea69b34e22ba1859a31 Mon Sep 17 00:00:00 2001 +From: xbmc +Date: Wed, 23 Jan 2013 17:03:02 +0100 +Subject: [PATCH 70/72] xrandr: set screen on mode change command + +--- + xbmc/windowing/X11/XRandR.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/xbmc/windowing/X11/XRandR.cpp b/xbmc/windowing/X11/XRandR.cpp +index 7a16488..6531ba3 100644 +--- a/xbmc/windowing/X11/XRandR.cpp ++++ b/xbmc/windowing/X11/XRandR.cpp +@@ -246,7 +246,7 @@ bool CXRandR::SetMode(XOutput output, XMode mode) + m_currentMode = modeFound.id; + char cmd[255]; + if (getenv("XBMC_BIN_HOME")) +- snprintf(cmd, sizeof(cmd), "%s/xbmc-xrandr --output %s --mode %s", getenv("XBMC_BIN_HOME"), outputFound.name.c_str(), modeFound.id.c_str()); ++ snprintf(cmd, sizeof(cmd), "%s/xbmc-xrandr --screen %d --output %s --mode %s", getenv("XBMC_BIN_HOME"), outputFound.screen, outputFound.name.c_str(), modeFound.id.c_str()); + else + return false; + CLog::Log(LOGINFO, "XRANDR: %s", cmd); +-- +1.7.10 + + +From f229dba603070e1f0528d395c9d5d63f9044ae6e Mon Sep 17 00:00:00 2001 +From: xbmc +Date: Wed, 23 Jan 2013 17:03:39 +0100 +Subject: [PATCH 71/72] X11: recreate glx context when output changes + +--- + xbmc/windowing/X11/WinSystemX11.cpp | 6 +++--- + xbmc/windowing/X11/WinSystemX11.h | 2 +- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/xbmc/windowing/X11/WinSystemX11.cpp b/xbmc/windowing/X11/WinSystemX11.cpp +index e4e25b2..b87e264 100644 +--- a/xbmc/windowing/X11/WinSystemX11.cpp ++++ b/xbmc/windowing/X11/WinSystemX11.cpp +@@ -409,11 +409,11 @@ bool CWinSystemX11::IsSuitableVisual(XVisualInfo *vInfo) + return true; + } + +-bool CWinSystemX11::RefreshGlxContext() ++bool CWinSystemX11::RefreshGlxContext(bool force) + { + bool retVal = false; + +- if (m_glContext) ++ if (m_glContext && !force) + { + CLog::Log(LOGDEBUG, "CWinSystemX11::RefreshGlxContext: refreshing context"); + glXMakeCurrent(m_dpy, None, NULL); +@@ -930,7 +930,7 @@ bool CWinSystemX11::SetWindow(int width, int height, bool fullscreen, const CStd + } + + CDirtyRegionList dr; +- RefreshGlxContext(); ++ RefreshGlxContext(!m_currentOutput.Equals(output)); + XSync(m_dpy, FALSE); + g_graphicsContext.Clear(0); + g_graphicsContext.Flip(dr); +diff --git a/xbmc/windowing/X11/WinSystemX11.h b/xbmc/windowing/X11/WinSystemX11.h +index 0b7c10a..33b1739 100644 +--- a/xbmc/windowing/X11/WinSystemX11.h ++++ b/xbmc/windowing/X11/WinSystemX11.h +@@ -74,7 +74,7 @@ class CWinSystemX11 : public CWinSystemBase + void NotifyMouseCoverage(bool covered); + + protected: +- bool RefreshGlxContext(); ++ bool RefreshGlxContext(bool force); + void CheckDisplayEvents(); + void OnLostDevice(); + bool SetWindow(int width, int height, bool fullscreen, const CStdString &output); +-- +1.7.10 + + +From ae08a23a2f4fd78139e2ebca8a4a87ab619feb0b Mon Sep 17 00:00:00 2001 +From: xbmc +Date: Sun, 27 Jan 2013 12:10:19 +0100 +Subject: [PATCH 72/72] vdpau: switch off de-interlacing on ff + +--- + xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp +index 8858614..3e21d9d 100644 +--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp ++++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp +@@ -2043,8 +2043,9 @@ void CMixer::InitCycle() + EINTERLACEMETHOD method = GetDeinterlacingMethod(); + bool interlaced = m_mixerInput[1].DVDPic.iFlags & DVP_FLAG_INTERLACED; + +- if (mode == VS_DEINTERLACEMODE_FORCE || +- (mode == VS_DEINTERLACEMODE_AUTO && interlaced)) ++ if (!(flags & DVP_FLAG_NO_POSTPROC) && ++ (mode == VS_DEINTERLACEMODE_FORCE || ++ (mode == VS_DEINTERLACEMODE_AUTO && interlaced))) + { + if((method == VS_INTERLACEMETHOD_AUTO && interlaced) + || method == VS_INTERLACEMETHOD_VDPAU_BOB +-- +1.7.10 + diff --git a/packages/mediacenter/xbmc/patches.x86/xbmc-809-add_keymapping_for_XF86XK_Sleep.patch b/packages/mediacenter/xbmc/patches.x86/xbmc-809-add_keymapping_for_XF86XK_Sleep.patch deleted file mode 100644 index 0491ea4e5c..0000000000 --- a/packages/mediacenter/xbmc/patches.x86/xbmc-809-add_keymapping_for_XF86XK_Sleep.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 61faa9f05d3d78a68c8a317420391eb77ae0ef7a Mon Sep 17 00:00:00 2001 -From: xbmc -Date: Thu, 17 Jan 2013 16:03:22 +0100 -Subject: [PATCH] X11: add keymapping for XF86XK_Sleep - ---- - xbmc/windowing/WinEventsX11.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/xbmc/windowing/WinEventsX11.cpp b/xbmc/windowing/WinEventsX11.cpp -index c31877e..ed31c04 100644 ---- a/xbmc/windowing/WinEventsX11.cpp -+++ b/xbmc/windowing/WinEventsX11.cpp -@@ -143,6 +143,7 @@ - , {XK_Break, XBMCK_BREAK} - , {XK_Menu, XBMCK_MENU} - , {XF86XK_PowerOff, XBMCK_POWER} -+, {XF86XK_Sleep, XBMCK_SLEEP} - , {XK_EcuSign, XBMCK_EURO} - , {XK_Undo, XBMCK_UNDO} - /* Media keys */ --- -1.7.10 - diff --git a/packages/mediacenter/xbmc/patches/xbmc-601-add_multithread_support_for_hi10p-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-601-add_multithread_support_for_hi10p-0.1.patch deleted file mode 100644 index 3b285fd152..0000000000 --- a/packages/mediacenter/xbmc/patches/xbmc-601-add_multithread_support_for_hi10p-0.1.patch +++ /dev/null @@ -1,107 +0,0 @@ -From ca0ddf0673dea966af5bf0bc562f9ff69a551cd9 Mon Sep 17 00:00:00 2001 -From: fritsch -Date: Sat, 12 Jan 2013 13:03:50 +0100 -Subject: [PATCH] dvdplayer: Allow multithread decoding for hi10p content by - default - -This allows decoding of some hi10p material on e.g. AMD Fusion with -both cores at the max. This introduces a new advancedsetting named -disablehi10pmultithreading to disable hi10p decoded multithreaded. ---- - .../DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp | 18 ++++++++++++++++-- - .../dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.h | 1 + - xbmc/settings/AdvancedSettings.cpp | 2 ++ - xbmc/settings/AdvancedSettings.h | 1 + - 4 files changed, 20 insertions(+), 2 deletions(-) - -diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp -index 8f81637..77ac6b1 100644 ---- a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp -+++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp -@@ -138,6 +138,7 @@ enum PixelFormat CDVDVideoCodecFFmpeg::GetFormat( struct AVCodecContext * avctx - m_iScreenHeight = 0; - m_iOrientation = 0; - m_bSoftware = false; -+ m_isHi10p = false; - m_pHardware = NULL; - m_iLastKeyframe = 0; - m_dts = DVD_NOPTS_VALUE; -@@ -187,7 +188,10 @@ bool CDVDVideoCodecFFmpeg::Open(CDVDStreamInfo &hints, CDVDCodecOptions &options - case FF_PROFILE_H264_HIGH_444_PREDICTIVE: - case FF_PROFILE_H264_HIGH_444_INTRA: - case FF_PROFILE_H264_CAVLC_444: -+ // this is needed to not open the decoders - m_bSoftware = true; -+ // this we need to enable multithreading for hi10p via advancedsettings -+ m_isHi10p = true; - break; - } - } -@@ -247,8 +251,18 @@ bool CDVDVideoCodecFFmpeg::Open(CDVDStreamInfo &hints, CDVDCodecOptions &options - m_pCodecContext->codec_tag = hints.codec_tag; - /* Only allow slice threading, since frame threading is more - * sensitive to changes in frame sizes, and it causes crashes -- * during HW accell */ -- m_pCodecContext->thread_type = FF_THREAD_SLICE; -+ * during HW accell - so we unset it in this case. -+ * -+ * When we detect Hi10p and user did not disable hi10pmultithreading -+ * via advancedsettings.xml we keep the ffmpeg default thread type. -+ * */ -+ if(m_isHi10p && !g_advancedSettings.m_videoDisableHi10pMultithreading) -+ { -+ CLog::Log(LOGDEBUG,"CDVDVideoCodecFFmpeg::Open() Keep default threading for Hi10p: %d", -+ m_pCodecContext->thread_type); -+ } -+ else -+ m_pCodecContext->thread_type = FF_THREAD_SLICE; - - #if defined(TARGET_DARWIN_IOS) - // ffmpeg with enabled neon will crash and burn if this is enabled -diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.h b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.h -index 61d0305..827b2d9 100644 ---- a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.h -+++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.h -@@ -114,6 +114,7 @@ class CDVDVideoCodecFFmpeg : public CDVDVideoCodec - - std::string m_name; - bool m_bSoftware; -+ bool m_isHi10p; - IHardwareDecoder *m_pHardware; - int m_iLastKeyframe; - double m_dts; -diff --git a/xbmc/settings/AdvancedSettings.cpp b/xbmc/settings/AdvancedSettings.cpp -index 16800b7..1e0f3e0 100644 ---- a/xbmc/settings/AdvancedSettings.cpp -+++ b/xbmc/settings/AdvancedSettings.cpp -@@ -112,6 +112,7 @@ void CAdvancedSettings::Initialize() - m_DXVANoDeintProcForProgressive = false; - m_videoFpsDetect = 1; - m_videoDefaultLatency = 0.0; -+ m_videoDisableHi10pMultithreading = false; - - m_musicUseTimeSeeking = true; - m_musicTimeSeekForward = 10; -@@ -498,6 +499,7 @@ void CAdvancedSettings::ParseSettingsFile(const CStdString &file) - XMLUtils::GetBoolean(pElement,"enablehighqualityhwscalers", m_videoEnableHighQualityHwScalers); - XMLUtils::GetFloat(pElement,"autoscalemaxfps",m_videoAutoScaleMaxFps, 0.0f, 1000.0f); - XMLUtils::GetBoolean(pElement,"allowmpeg4vdpau",m_videoAllowMpeg4VDPAU); -+ XMLUtils::GetBoolean(pElement,"disablehi10pmultithreading",m_videoDisableHi10pMultithreading); - XMLUtils::GetBoolean(pElement,"allowmpeg4vaapi",m_videoAllowMpeg4VAAPI); - XMLUtils::GetBoolean(pElement, "disablebackgrounddeinterlace", m_videoDisableBackgroundDeinterlace); - XMLUtils::GetInt(pElement, "useocclusionquery", m_videoCaptureUseOcclusionQuery, -1, 1); -diff --git a/xbmc/settings/AdvancedSettings.h b/xbmc/settings/AdvancedSettings.h -index 27887d4..fc05e41 100644 ---- a/xbmc/settings/AdvancedSettings.h -+++ b/xbmc/settings/AdvancedSettings.h -@@ -164,6 +164,7 @@ class CAdvancedSettings - bool m_DXVAForceProcessorRenderer; - bool m_DXVANoDeintProcForProgressive; - int m_videoFpsDetect; -+ bool m_videoDisableHi10pMultithreading; - - CStdString m_videoDefaultPlayer; - CStdString m_videoDefaultDVDPlayer; --- -1.7.10 - From 2defc5f4bc9a378742f684e8c3744c603568e5ce Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Tue, 29 Jan 2013 19:59:36 +0400 Subject: [PATCH 31/42] revert b43 to wl for ATV users --- packages/linux-drivers/bcm_sta/build | 30 +++++++ packages/linux-drivers/bcm_sta/install | 33 ++++++++ packages/linux-drivers/bcm_sta/meta | 39 +++++++++ packages/linux-drivers/bcm_sta/need_unpack | 32 ++++++++ .../bcm_sta-5.100.82.112-001-license.patch | 21 +++++ .../bcm_sta-5.100.82.112-002-user-ioctl.patch | 29 +++++++ ...cm_sta-5.100.82.112-003-linux-recent.patch | 79 +++++++++++++++++++ ...m_sta-5.100.82.112-004-rename-device.patch | 26 ++++++ 8 files changed, 289 insertions(+) create mode 100755 packages/linux-drivers/bcm_sta/build create mode 100755 packages/linux-drivers/bcm_sta/install create mode 100644 packages/linux-drivers/bcm_sta/meta create mode 100755 packages/linux-drivers/bcm_sta/need_unpack create mode 100644 packages/linux-drivers/bcm_sta/patches/bcm_sta-5.100.82.112-001-license.patch create mode 100644 packages/linux-drivers/bcm_sta/patches/bcm_sta-5.100.82.112-002-user-ioctl.patch create mode 100644 packages/linux-drivers/bcm_sta/patches/bcm_sta-5.100.82.112-003-linux-recent.patch create mode 100644 packages/linux-drivers/bcm_sta/patches/bcm_sta-5.100.82.112-004-rename-device.patch diff --git a/packages/linux-drivers/bcm_sta/build b/packages/linux-drivers/bcm_sta/build new file mode 100755 index 0000000000..08f9b73866 --- /dev/null +++ b/packages/linux-drivers/bcm_sta/build @@ -0,0 +1,30 @@ +#!/bin/sh + +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) +# +# This Program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This Program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with OpenELEC.tv; see the file COPYING. If not, write to +# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +. config/options $1 + +cd $PKG_BUILD + +[ "$TARGET_ARCH" = "i386" ] && cd x86-32 +[ "$TARGET_ARCH" = "x86_64" ] && cd x86-64 + +KBUILD_NOPEDANTIC=1 make V=1 CC=$CC -C $(kernel_path) M=`pwd` diff --git a/packages/linux-drivers/bcm_sta/install b/packages/linux-drivers/bcm_sta/install new file mode 100755 index 0000000000..c7a21304d2 --- /dev/null +++ b/packages/linux-drivers/bcm_sta/install @@ -0,0 +1,33 @@ +#!/bin/sh + +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) +# +# This Program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This Program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with OpenELEC.tv; see the file COPYING. If not, write to +# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +. config/options $1 + +VER=`ls $BUILD/linux*/modules/lib/modules` + +mkdir -p $INSTALL/lib/modules/$VER/bcm_sta + if [ "$TARGET_ARCH" = "i386" ]; then + cp $PKG_BUILD/x86-32/wl.ko $INSTALL/lib/modules/$VER/bcm_sta + fi + if [ "$TARGET_ARCH" = "x86_64" ]; then + cp $PKG_BUILD/x86-64/wl.ko $INSTALL/lib/modules/$VER/bcm_sta + fi diff --git a/packages/linux-drivers/bcm_sta/meta b/packages/linux-drivers/bcm_sta/meta new file mode 100644 index 0000000000..763ab141f6 --- /dev/null +++ b/packages/linux-drivers/bcm_sta/meta @@ -0,0 +1,39 @@ +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) +# +# This Program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This Program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with OpenELEC.tv; see the file COPYING. If not, write to +# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +PKG_NAME="bcm_sta" +PKG_VERSION="5.100.82.112" +PKG_REV="1" +PKG_ARCH="i386 x86_64" +PKG_LICENSE="nonfree" +PKG_SITE="http://www.broadcom.com/" +PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz" +PKG_DEPENDS="" +PKG_BUILD_DEPENDS="toolchain linux" +PKG_PRIORITY="optional" +PKG_SECTION="driver" +PKG_SHORTDESC="bcm_sta: Broadcom's BCM4311-, BCM4312-, BCM4313-, BCM4321-, BCM4322-, BCM43224-, and BCM43225-based WLAN driver" +PKG_LONGDESC="These packages contain Broadcom's IEEE 802.11a/b/g/n hybrid Linux® device driver for use with Broadcom's BCM4311-, BCM4312-, BCM4313-, BCM4321-, BCM4322-, BCM43224-, and BCM43225-based hardware. There are different tars for 32-bit and 64-bit x86 CPU architectures. Make sure that you download the appropriate tar because the hybrid binary file must be of the appropriate architecture type. The hybrid binary file is agnostic to the specific version of the Linux kernel because it is designed to perform all interactions with the operating system through operating-system-specific files and an operating system abstraction layer file. All Linux operating-system-specific code is provided in source form, making it possible to retarget to different kernel versions and fix operating system related issues." +PKG_IS_ADDON="no" + +PKG_AUTORECONF="no" + +# Downloadlocation: +# http://www.broadcom.com/support/802.11/linux_sta.php \ No newline at end of file diff --git a/packages/linux-drivers/bcm_sta/need_unpack b/packages/linux-drivers/bcm_sta/need_unpack new file mode 100755 index 0000000000..ed70b61127 --- /dev/null +++ b/packages/linux-drivers/bcm_sta/need_unpack @@ -0,0 +1,32 @@ +#!/bin/sh + +################################################################################ +# This file is part of OpenELEC - http://www.openelec.tv +# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv) +# +# This Program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This Program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with OpenELEC.tv; see the file COPYING. If not, write to +# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. +# http://www.gnu.org/copyleft/gpl.html +################################################################################ + +. config/options $1 + +STAMP=$STAMPS/$1/unpack + +test $PKG_DIR/config/linux.$TARGET_ARCH.conf -nt $STAMP -o \ + $PROJECT_DIR/$PROJECT/linux/linux.$TARGET_ARCH.conf -nt $STAMP -o \ + $PKG_DIR/url -nt $STAMP -o \ + $PKG_DIR/meta -nt $STAMP && rm -f $STAMP + +exit 0 diff --git a/packages/linux-drivers/bcm_sta/patches/bcm_sta-5.100.82.112-001-license.patch b/packages/linux-drivers/bcm_sta/patches/bcm_sta-5.100.82.112-001-license.patch new file mode 100644 index 0000000000..e891a1180d --- /dev/null +++ b/packages/linux-drivers/bcm_sta/patches/bcm_sta-5.100.82.112-001-license.patch @@ -0,0 +1,21 @@ +--- a/x86-32/src/wl/sys/wl_linux.c 2010-12-15 02:58:07.000000000 +0100 ++++ b/x86-32/src/wl/sys/wl_linux.c 2010-12-25 18:15:43.356676382 +0100 +@@ -240,6 +240,7 @@ + + static int nompc = 0; + module_param(nompc, int, 0); ++MODULE_LICENSE("Mixed/Proprietary"); + + #ifdef quote_str + #undef quote_str +--- a/x86-64/src/wl/sys/wl_linux.c 2010-12-15 02:58:07.000000000 +0100 ++++ b/x86-64/src/wl/sys/wl_linux.c 2010-12-25 18:15:43.356676382 +0100 +@@ -240,6 +240,7 @@ + + static int nompc = 0; + module_param(nompc, int, 0); ++MODULE_LICENSE("Mixed/Proprietary"); + + #ifdef quote_str + #undef quote_str + diff --git a/packages/linux-drivers/bcm_sta/patches/bcm_sta-5.100.82.112-002-user-ioctl.patch b/packages/linux-drivers/bcm_sta/patches/bcm_sta-5.100.82.112-002-user-ioctl.patch new file mode 100644 index 0000000000..76dc48a4cf --- /dev/null +++ b/packages/linux-drivers/bcm_sta/patches/bcm_sta-5.100.82.112-002-user-ioctl.patch @@ -0,0 +1,29 @@ +--- a/x86-32/src/wl/sys/wl_cfg80211.c 2011-10-23 03:56:55.000000000 +1100 ++++ b/x86-32/src/wl/sys/wl_cfg80211.c 2012-05-24 18:43:17.324465658 +1000 +@@ -1466,7 +1466,10 @@ + scb_val.val = 0; + err = wl_dev_ioctl(dev, WLC_GET_RSSI, &scb_val, sizeof(scb_val_t)); + if (err) { +- WL_ERR(("Could not get rssi (%d)\n", err)); ++ if (err != -EINVAL) { ++ // Don't fill syslog with EINVAL error ++ WL_ERR(("Could not get rssi (%d)\n", err)); ++ } + return err; + } + rssi = dtoh32(scb_val.val); +--- a/x86-32/src/wl/sys/wl_linux.c 2011-10-23 03:56:55.000000000 +1100 ++++ b/x86-32/src/wl/sys/wl_linux.c 2012-05-24 18:43:17.324465658 +1000 +@@ -1579,11 +1579,7 @@ + } + + WL_LOCK(wl); +- if (!capable(CAP_NET_ADMIN)) { +- bcmerror = BCME_EPERM; +- } else { +- bcmerror = wlc_ioctl(wl->wlc, ioc.cmd, buf, ioc.len, wlif->wlcif); +- } ++ bcmerror = wlc_ioctl(wl->wlc, ioc.cmd, buf, ioc.len, wlif->wlcif); + WL_UNLOCK(wl); + + done1: diff --git a/packages/linux-drivers/bcm_sta/patches/bcm_sta-5.100.82.112-003-linux-recent.patch b/packages/linux-drivers/bcm_sta/patches/bcm_sta-5.100.82.112-003-linux-recent.patch new file mode 100644 index 0000000000..6037c1510c --- /dev/null +++ b/packages/linux-drivers/bcm_sta/patches/bcm_sta-5.100.82.112-003-linux-recent.patch @@ -0,0 +1,79 @@ +--- a/x86-32/Makefile 2012-10-15 23:08:11.256904135 +1100 ++++ b/x86-32/Makefile 2012-10-15 23:08:18.970262327 +1100 +@@ -15,21 +15,9 @@ + + ifneq ($(KERNELRELEASE),) + +- LINUXVER_GOODFOR_CFG80211:=$(strip $(shell \ +- if [ "$(VERSION)" -ge "2" -a "$(PATCHLEVEL)" -ge "6" -a "$(SUBLEVEL)" -ge "32" ]; then \ +- echo TRUE; \ +- else \ +- echo FALSE; \ +- fi \ +- )) ++ LINUXVER_GOODFOR_CFG80211:=TRUE + +- LINUXVER_WEXT_ONLY:=$(strip $(shell \ +- if [ "$(VERSION)" -ge "2" -a "$(PATCHLEVEL)" -ge "6" -a "$(SUBLEVEL)" -ge "17" ]; then \ +- echo FALSE; \ +- else \ +- echo TRUE; \ +- fi \ +- )) ++ LINUXVER_WEXT_ONLY:=FALSE + + ifneq ($(API),) + ifeq ($(API), CFG80211) +--- a/x86-32/src/wl/sys/wl_cfg80211.c 2012-10-15 23:08:11.266904352 +1100 ++++ b/x86-32/src/wl/sys/wl_cfg80211.c 2012-10-15 23:08:32.313638398 +1100 +@@ -42,7 +42,7 @@ + enum nl80211_iftype type, u32 *flags, struct vif_params *params); + static s32 __wl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev, + struct cfg80211_scan_request *request, struct cfg80211_ssid *this_ssid); +-static s32 wl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev, ++static s32 wl_cfg80211_scan(struct wiphy *wiphy, + struct cfg80211_scan_request *request); + static s32 wl_cfg80211_set_wiphy_params(struct wiphy *wiphy, u32 changed); + static s32 wl_cfg80211_join_ibss(struct wiphy *wiphy, struct net_device *dev, +@@ -570,10 +570,12 @@ + } + + static s32 +-wl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev, ++wl_cfg80211_scan(struct wiphy *wiphy, + struct cfg80211_scan_request *request) + { + s32 err = 0; ++ struct wl_priv *wl = wiphy_to_wl(wiphy); ++ struct net_device *ndev = wl_to_ndev(wl); + + CHECK_SYS_UP(); + err = __wl_cfg80211_scan(wiphy, ndev, request, NULL); +--- a/x86-32/src/wl/sys/wl_iw.h 2012-10-15 23:08:11.266904352 +1100 ++++ b/x86-32/src/wl/sys/wl_iw.h 2012-10-15 23:08:18.973595675 +1100 +@@ -15,6 +15,7 @@ + #ifndef _wl_iw_h_ + #define _wl_iw_h_ + ++#include + #include + + #include +--- a/x86-32/src/wl/sys/wl_linux.c 2012-10-15 23:08:11.266904352 +1100 ++++ b/x86-32/src/wl/sys/wl_linux.c 2012-10-15 23:08:18.973595675 +1100 +@@ -40,7 +40,6 @@ + #include + #define WLC_MAXBSSCFG 1 + +-#include + #include + #include + #include +@@ -385,7 +384,7 @@ + #endif + .ndo_get_stats = wl_get_stats, + .ndo_set_mac_address = wl_set_mac_address, +- .ndo_set_multicast_list = wl_set_multicast_list, ++ .ndo_set_rx_mode = wl_set_multicast_list, + .ndo_do_ioctl = wl_ioctl + }; diff --git a/packages/linux-drivers/bcm_sta/patches/bcm_sta-5.100.82.112-004-rename-device.patch b/packages/linux-drivers/bcm_sta/patches/bcm_sta-5.100.82.112-004-rename-device.patch new file mode 100644 index 0000000000..36d3d27288 --- /dev/null +++ b/packages/linux-drivers/bcm_sta/patches/bcm_sta-5.100.82.112-004-rename-device.patch @@ -0,0 +1,26 @@ +diff -Naur bcm_sta-5.100.82.38/x86-32/src/wl/sys/wl_linux.c bcm_sta-5.100.82.38.patch/x86-32/src/wl/sys/wl_linux.c +--- bcm_sta-5.100.82.38/x86-32/src/wl/sys/wl_linux.c 2010-12-15 02:58:07.000000000 +0100 ++++ bcm_sta-5.100.82.38.patch/x86-32/src/wl/sys/wl_linux.c 2010-12-27 22:14:38.679428984 +0100 +@@ -251,7 +251,7 @@ + #define quote_str(s) to_str(s) + + #ifndef BRCM_WLAN_IFNAME +-#define BRCM_WLAN_IFNAME eth%d ++#define BRCM_WLAN_IFNAME wlan%d + #endif + + static char name[IFNAMSIZ] = quote_str(BRCM_WLAN_IFNAME); +diff -Naur bcm_sta-5.100.82.38/x86-32/src/wl/sys/wl_linux.c.orig bcm_sta-5.100.82.38.patch/x86-32/src/wl/sys/wl_linux.c.orig +diff -Naur bcm_sta-5.100.82.38/x86-64/src/wl/sys/wl_linux.c bcm_sta-5.100.82.38.patch/x86-64/src/wl/sys/wl_linux.c +--- bcm_sta-5.100.82.38/x86-64/src/wl/sys/wl_linux.c 2010-12-15 03:01:09.000000000 +0100 ++++ bcm_sta-5.100.82.38.patch/x86-64/src/wl/sys/wl_linux.c 2010-12-27 22:15:18.273865927 +0100 +@@ -251,7 +251,7 @@ + #define quote_str(s) to_str(s) + + #ifndef BRCM_WLAN_IFNAME +-#define BRCM_WLAN_IFNAME eth%d ++#define BRCM_WLAN_IFNAME wlan%d + #endif + + static char name[IFNAMSIZ] = quote_str(BRCM_WLAN_IFNAME); +diff -Naur bcm_sta-5.100.82.38/x86-64/src/wl/sys/wl_linux.c.orig bcm_sta-5.100.82.38.patch/x86-64/src/wl/sys/wl_linux.c.orig From 2c51355e7774aefed8e919d9cbc21f42c354683f Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Tue, 29 Jan 2013 20:24:00 +0400 Subject: [PATCH 32/42] remove b43 kernel config --- projects/ATV/linux/linux.i386.conf | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/projects/ATV/linux/linux.i386.conf b/projects/ATV/linux/linux.i386.conf index 5301805838..a6c4c54407 100644 --- a/projects/ATV/linux/linux.i386.conf +++ b/projects/ATV/linux/linux.i386.conf @@ -1309,15 +1309,15 @@ CONFIG_CARL9170=m CONFIG_CARL9170_LEDS=y CONFIG_CARL9170_WPC=y # CONFIG_ATH6KL is not set -CONFIG_B43=m -CONFIG_B43_SSB=y -CONFIG_B43_PCI_AUTOSELECT=y -CONFIG_B43_PCICORE_AUTOSELECT=y -CONFIG_B43_PIO=y -CONFIG_B43_PHY_N=y -CONFIG_B43_PHY_LP=y +# CONFIG_B43 is not set +# CONFIG_B43_SSB is not set +# CONFIG_B43_PCI_AUTOSELECT is not set +# CONFIG_B43_PCICORE_AUTOSELECT is not set +# CONFIG_B43_PIO is not set +# CONFIG_B43_PHY_N is not set +# CONFIG_B43_PHY_LP is not set # CONFIG_B43_PHY_HT is not set -CONFIG_B43_LEDS=y +# CONFIG_B43_LEDS is not set # CONFIG_B43_DEBUG is not set # CONFIG_B43LEGACY is not set # CONFIG_BRCMFMAC is not set From 4f05ddedaa18776c5fd5468b808686f6b099eb6d Mon Sep 17 00:00:00 2001 From: Christian Hewitt Date: Tue, 29 Jan 2013 20:25:16 +0400 Subject: [PATCH 33/42] add bcm_sta to ATV drivers --- projects/ATV/options | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/ATV/options b/projects/ATV/options index 2207844b46..5432431588 100755 --- a/projects/ATV/options +++ b/projects/ATV/options @@ -161,7 +161,7 @@ # for a list of additinoal drivers see packages/linux-drivers # Space separated list is supported, # e.g. ADDITIONAL_DRIVERS="DRIVER1 DRIVER2" - ADDITIONAL_DRIVERS="RTL8192CU dvbhdhomerun" + ADDITIONAL_DRIVERS="RTL8192CU dvbhdhomerun bcm_sta" # build with network support (yes / no) NETWORK="yes" From fc78eb074ce3912a3dca555af00f8ecc76a252a5 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Tue, 29 Jan 2013 19:48:06 +0200 Subject: [PATCH 34/42] Python: install wsgiref. closes #1710 --- packages/lang/Python/build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/lang/Python/build b/packages/lang/Python/build index 06f2e57c99..44e1ee00e5 100755 --- a/packages/lang/Python/build +++ b/packages/lang/Python/build @@ -80,11 +80,11 @@ make -j1 CC="$TARGET_CC" \ sed -e "s|^LIBDIR=.*|LIBDIR= $SYSROOT_PREFIX/usr/lib|" \ -i $SYSROOT_PREFIX/usr/lib/python*/config/Makefile -EXCLUDE_DIRS="bsddb curses idlelib lib-tk lib2to3 msilib wsgiref" +EXCLUDE_DIRS="bsddb curses idlelib lib-tk lib2to3 msilib" 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 plat-linux2 sqlite3 xml xml/dom xml/etree" -INCLUDE_DIRS="$INCLUDE_DIRS xml/parsers xml/sax" +INCLUDE_DIRS="$INCLUDE_DIRS xml/parsers xml/sax wsgiref" mkdir -p ./Lib cp ../Lib/*.py ./Lib From a78774bbb06a3b72ae3ef68001f4288dabdab628 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 30 Jan 2013 03:56:55 +0100 Subject: [PATCH 35/42] projects/Fusion/linux: add ACPI_CPUFREQ driver, which replaces the POWERNOW_K8 driver, this fixes #1815 Signed-off-by: Stephan Raue --- projects/Fusion/linux/linux.i386.conf | 7 ++++--- projects/Fusion/linux/linux.x86_64.conf | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/projects/Fusion/linux/linux.i386.conf b/projects/Fusion/linux/linux.i386.conf index 2f3692e776..9b67bb9f91 100644 --- a/projects/Fusion/linux/linux.i386.conf +++ b/projects/Fusion/linux/linux.i386.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.7.3 Kernel Configuration +# Linux/i386 3.7.5 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -506,10 +506,11 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y # x86 CPU frequency scaling drivers # # CONFIG_X86_PCC_CPUFREQ is not set -# CONFIG_X86_ACPI_CPUFREQ is not set +CONFIG_X86_ACPI_CPUFREQ=y +CONFIG_X86_ACPI_CPUFREQ_CPB=y # CONFIG_X86_POWERNOW_K6 is not set # CONFIG_X86_POWERNOW_K7 is not set -CONFIG_X86_POWERNOW_K8=y +# CONFIG_X86_POWERNOW_K8 is not set # CONFIG_X86_GX_SUSPMOD is not set # CONFIG_X86_SPEEDSTEP_CENTRINO is not set # CONFIG_X86_SPEEDSTEP_ICH is not set diff --git a/projects/Fusion/linux/linux.x86_64.conf b/projects/Fusion/linux/linux.x86_64.conf index 4e972e3c08..adc689497d 100644 --- a/projects/Fusion/linux/linux.x86_64.conf +++ b/projects/Fusion/linux/linux.x86_64.conf @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 3.7.4 Kernel Configuration +# Linux/x86_64 3.7.5 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -478,8 +478,9 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y # x86 CPU frequency scaling drivers # # CONFIG_X86_PCC_CPUFREQ is not set -# CONFIG_X86_ACPI_CPUFREQ is not set -CONFIG_X86_POWERNOW_K8=y +CONFIG_X86_ACPI_CPUFREQ=y +CONFIG_X86_ACPI_CPUFREQ_CPB=y +# CONFIG_X86_POWERNOW_K8 is not set # CONFIG_X86_SPEEDSTEP_CENTRINO is not set # CONFIG_X86_P4_CLOCKMOD is not set From 52d73089f2dcd6cb41c4474c90ba9caa1764ac6f Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 30 Jan 2013 04:13:13 +0100 Subject: [PATCH 36/42] projects/*/linux: add Realtek PSTOR PCIe Cardreader support, this should fix #1798 Signed-off-by: Stephan Raue --- projects/Fusion/linux/linux.i386.conf | 3 ++- projects/Generic/linux/linux.i386.conf | 3 ++- projects/Generic_OSS/linux/linux.i386.conf | 3 ++- projects/ION/linux/linux.i386.conf | 3 ++- projects/ION/linux/linux.x86_64.conf | 3 ++- projects/Intel/linux/linux.i386.conf | 3 ++- projects/Intel/linux/linux.x86_64.conf | 3 ++- projects/Virtual/linux/linux.i386.conf | 3 ++- projects/Virtual/linux/linux.x86_64.conf | 3 ++- 9 files changed, 18 insertions(+), 9 deletions(-) diff --git a/projects/Fusion/linux/linux.i386.conf b/projects/Fusion/linux/linux.i386.conf index 9b67bb9f91..b0f9f4b0e4 100644 --- a/projects/Fusion/linux/linux.i386.conf +++ b/projects/Fusion/linux/linux.i386.conf @@ -2981,7 +2981,8 @@ CONFIG_R8187SE=m CONFIG_RTL8192U=m # CONFIG_RTLLIB is not set CONFIG_R8712U=m -# CONFIG_RTS_PSTOR is not set +CONFIG_RTS_PSTOR=m +# CONFIG_RTS_PSTOR_DEBUG is not set CONFIG_RTS5139=m # CONFIG_RTS5139_DEBUG is not set # CONFIG_TRANZPORT is not set diff --git a/projects/Generic/linux/linux.i386.conf b/projects/Generic/linux/linux.i386.conf index 4479df2f7d..43c8dfe53f 100644 --- a/projects/Generic/linux/linux.i386.conf +++ b/projects/Generic/linux/linux.i386.conf @@ -3153,7 +3153,8 @@ CONFIG_R8187SE=m CONFIG_RTL8192U=m # CONFIG_RTLLIB is not set CONFIG_R8712U=m -# CONFIG_RTS_PSTOR is not set +CONFIG_RTS_PSTOR=m +# CONFIG_RTS_PSTOR_DEBUG is not set CONFIG_RTS5139=m # CONFIG_RTS5139_DEBUG is not set # CONFIG_TRANZPORT is not set diff --git a/projects/Generic_OSS/linux/linux.i386.conf b/projects/Generic_OSS/linux/linux.i386.conf index 1fc2313d55..8eca4a51fe 100644 --- a/projects/Generic_OSS/linux/linux.i386.conf +++ b/projects/Generic_OSS/linux/linux.i386.conf @@ -3156,7 +3156,8 @@ CONFIG_R8187SE=m CONFIG_RTL8192U=m # CONFIG_RTLLIB is not set CONFIG_R8712U=m -# CONFIG_RTS_PSTOR is not set +CONFIG_RTS_PSTOR=m +# CONFIG_RTS_PSTOR_DEBUG is not set CONFIG_RTS5139=m # CONFIG_RTS5139_DEBUG is not set # CONFIG_TRANZPORT is not set diff --git a/projects/ION/linux/linux.i386.conf b/projects/ION/linux/linux.i386.conf index 3a23bab78f..3f950bf03e 100644 --- a/projects/ION/linux/linux.i386.conf +++ b/projects/ION/linux/linux.i386.conf @@ -2977,7 +2977,8 @@ CONFIG_R8187SE=m CONFIG_RTL8192U=m # CONFIG_RTLLIB is not set CONFIG_R8712U=m -# CONFIG_RTS_PSTOR is not set +CONFIG_RTS_PSTOR=m +# CONFIG_RTS_PSTOR_DEBUG is not set CONFIG_RTS5139=m # CONFIG_RTS5139_DEBUG is not set # CONFIG_TRANZPORT is not set diff --git a/projects/ION/linux/linux.x86_64.conf b/projects/ION/linux/linux.x86_64.conf index b67a437723..92d84c80b6 100644 --- a/projects/ION/linux/linux.x86_64.conf +++ b/projects/ION/linux/linux.x86_64.conf @@ -2903,7 +2903,8 @@ CONFIG_R8187SE=m CONFIG_RTL8192U=m # CONFIG_RTLLIB is not set CONFIG_R8712U=m -# CONFIG_RTS_PSTOR is not set +CONFIG_RTS_PSTOR=m +# CONFIG_RTS_PSTOR_DEBUG is not set CONFIG_RTS5139=m # CONFIG_RTS5139_DEBUG is not set # CONFIG_TRANZPORT is not set diff --git a/projects/Intel/linux/linux.i386.conf b/projects/Intel/linux/linux.i386.conf index 479800c606..8d3a15509c 100644 --- a/projects/Intel/linux/linux.i386.conf +++ b/projects/Intel/linux/linux.i386.conf @@ -3024,7 +3024,8 @@ CONFIG_R8187SE=m CONFIG_RTL8192U=m # CONFIG_RTLLIB is not set CONFIG_R8712U=m -# CONFIG_RTS_PSTOR is not set +CONFIG_RTS_PSTOR=m +# CONFIG_RTS_PSTOR_DEBUG is not set CONFIG_RTS5139=m # CONFIG_RTS5139_DEBUG is not set # CONFIG_TRANZPORT is not set diff --git a/projects/Intel/linux/linux.x86_64.conf b/projects/Intel/linux/linux.x86_64.conf index 90dc83e016..942bb66804 100644 --- a/projects/Intel/linux/linux.x86_64.conf +++ b/projects/Intel/linux/linux.x86_64.conf @@ -2951,7 +2951,8 @@ CONFIG_R8187SE=m CONFIG_RTL8192U=m # CONFIG_RTLLIB is not set CONFIG_R8712U=m -# CONFIG_RTS_PSTOR is not set +CONFIG_RTS_PSTOR=m +# CONFIG_RTS_PSTOR_DEBUG is not set CONFIG_RTS5139=m # CONFIG_RTS5139_DEBUG is not set # CONFIG_TRANZPORT is not set diff --git a/projects/Virtual/linux/linux.i386.conf b/projects/Virtual/linux/linux.i386.conf index be7ee24075..12e12cc8a6 100644 --- a/projects/Virtual/linux/linux.i386.conf +++ b/projects/Virtual/linux/linux.i386.conf @@ -3029,7 +3029,8 @@ CONFIG_R8187SE=m CONFIG_RTL8192U=m # CONFIG_RTLLIB is not set CONFIG_R8712U=m -# CONFIG_RTS_PSTOR is not set +CONFIG_RTS_PSTOR=m +# CONFIG_RTS_PSTOR_DEBUG is not set CONFIG_RTS5139=m # CONFIG_RTS5139_DEBUG is not set # CONFIG_TRANZPORT is not set diff --git a/projects/Virtual/linux/linux.x86_64.conf b/projects/Virtual/linux/linux.x86_64.conf index 15a6d55c50..91a757b942 100644 --- a/projects/Virtual/linux/linux.x86_64.conf +++ b/projects/Virtual/linux/linux.x86_64.conf @@ -2955,7 +2955,8 @@ CONFIG_R8187SE=m CONFIG_RTL8192U=m # CONFIG_RTLLIB is not set CONFIG_R8712U=m -# CONFIG_RTS_PSTOR is not set +CONFIG_RTS_PSTOR=m +# CONFIG_RTS_PSTOR_DEBUG is not set CONFIG_RTS5139=m # CONFIG_RTS5139_DEBUG is not set # CONFIG_TRANZPORT is not set From a581aee4cc230ade82622b5e62f6f7de914b2ae8 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 30 Jan 2013 05:39:32 +0100 Subject: [PATCH 37/42] linux: add patch to disable XBOX controller PIDs which are supported by lirc Signed-off-by: Stephan Raue --- .../patches/linux-059-remove_some_xpad_pids.patch | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 packages/linux/patches/linux-059-remove_some_xpad_pids.patch diff --git a/packages/linux/patches/linux-059-remove_some_xpad_pids.patch b/packages/linux/patches/linux-059-remove_some_xpad_pids.patch new file mode 100644 index 0000000000..93c94d2e39 --- /dev/null +++ b/packages/linux/patches/linux-059-remove_some_xpad_pids.patch @@ -0,0 +1,11 @@ +diff -Naur linux-3.7.5/drivers/input/joystick/xpad.c linux-3.7.5.patch/drivers/input/joystick/xpad.c +--- linux-3.7.5/drivers/input/joystick/xpad.c 2013-01-28 05:50:55.000000000 +0100 ++++ linux-3.7.5.patch/drivers/input/joystick/xpad.c 2013-01-30 05:14:21.434759231 +0100 +@@ -166,7 +166,6 @@ + { 0x0f0d, 0x0016, "Hori Real Arcade Pro.EX", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOX360 }, + { 0x0f0d, 0x000d, "Hori Fighting Stick EX2", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOX360 }, + { 0x1689, 0xfd00, "Razer Onza Tournament Edition", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX360 }, +- { 0xffff, 0xffff, "Chinese-made Xbox Controller", 0, XTYPE_XBOX }, + { 0x0000, 0x0000, "Generic X-Box pad", 0, XTYPE_UNKNOWN } + }; + From 38ee662107f3c50de6bd07f632a2243ba4e441cf Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 30 Jan 2013 05:42:00 +0100 Subject: [PATCH 38/42] projects/*/linux: reenable xpad driver, this should fix #1814 Signed-off-by: Stephan Raue --- projects/ARCTIC_MC/linux/linux.x86_64.conf | 4 +++- projects/ATV/linux/linux.i386.conf | 4 +++- projects/Fusion/linux/linux.i386.conf | 4 +++- projects/Fusion/linux/linux.x86_64.conf | 7 +++++-- projects/Generic/linux/linux.i386.conf | 4 +++- projects/Generic_OSS/linux/linux.i386.conf | 4 +++- projects/ION/linux/linux.i386.conf | 4 +++- projects/ION/linux/linux.x86_64.conf | 4 +++- projects/Intel/linux/linux.i386.conf | 4 +++- projects/Intel/linux/linux.x86_64.conf | 4 +++- projects/Ultra/linux/linux.x86_64.conf | 4 +++- projects/Virtual/linux/linux.i386.conf | 4 +++- projects/Virtual/linux/linux.x86_64.conf | 4 +++- 13 files changed, 41 insertions(+), 14 deletions(-) diff --git a/projects/ARCTIC_MC/linux/linux.x86_64.conf b/projects/ARCTIC_MC/linux/linux.x86_64.conf index 5622d097bb..1974941d1a 100644 --- a/projects/ARCTIC_MC/linux/linux.x86_64.conf +++ b/projects/ARCTIC_MC/linux/linux.x86_64.conf @@ -1364,7 +1364,9 @@ CONFIG_INPUT_JOYSTICK=y # CONFIG_JOYSTICK_ZHENHUA is not set # CONFIG_JOYSTICK_AS5011 is not set # CONFIG_JOYSTICK_JOYDUMP is not set -# CONFIG_JOYSTICK_XPAD is not set +CONFIG_JOYSTICK_XPAD=m +CONFIG_JOYSTICK_XPAD_FF=y +CONFIG_JOYSTICK_XPAD_LEDS=y # CONFIG_INPUT_TABLET is not set # CONFIG_INPUT_TOUCHSCREEN is not set CONFIG_INPUT_MISC=y diff --git a/projects/ATV/linux/linux.i386.conf b/projects/ATV/linux/linux.i386.conf index a6c4c54407..5570292849 100644 --- a/projects/ATV/linux/linux.i386.conf +++ b/projects/ATV/linux/linux.i386.conf @@ -1431,7 +1431,9 @@ CONFIG_INPUT_JOYSTICK=y # CONFIG_JOYSTICK_ZHENHUA is not set # CONFIG_JOYSTICK_AS5011 is not set # CONFIG_JOYSTICK_JOYDUMP is not set -# CONFIG_JOYSTICK_XPAD is not set +CONFIG_JOYSTICK_XPAD=m +CONFIG_JOYSTICK_XPAD_FF=y +CONFIG_JOYSTICK_XPAD_LEDS=y # CONFIG_INPUT_TABLET is not set # CONFIG_INPUT_TOUCHSCREEN is not set CONFIG_INPUT_MISC=y diff --git a/projects/Fusion/linux/linux.i386.conf b/projects/Fusion/linux/linux.i386.conf index b0f9f4b0e4..83f5c49acd 100644 --- a/projects/Fusion/linux/linux.i386.conf +++ b/projects/Fusion/linux/linux.i386.conf @@ -1495,7 +1495,9 @@ CONFIG_INPUT_JOYSTICK=y # CONFIG_JOYSTICK_ZHENHUA is not set # CONFIG_JOYSTICK_AS5011 is not set # CONFIG_JOYSTICK_JOYDUMP is not set -# CONFIG_JOYSTICK_XPAD is not set +CONFIG_JOYSTICK_XPAD=m +CONFIG_JOYSTICK_XPAD_FF=y +CONFIG_JOYSTICK_XPAD_LEDS=y # CONFIG_INPUT_TABLET is not set # CONFIG_INPUT_TOUCHSCREEN is not set CONFIG_INPUT_MISC=y diff --git a/projects/Fusion/linux/linux.x86_64.conf b/projects/Fusion/linux/linux.x86_64.conf index adc689497d..c555c3ec4d 100644 --- a/projects/Fusion/linux/linux.x86_64.conf +++ b/projects/Fusion/linux/linux.x86_64.conf @@ -1454,7 +1454,9 @@ CONFIG_INPUT_JOYSTICK=y # CONFIG_JOYSTICK_ZHENHUA is not set # CONFIG_JOYSTICK_AS5011 is not set # CONFIG_JOYSTICK_JOYDUMP is not set -# CONFIG_JOYSTICK_XPAD is not set +CONFIG_JOYSTICK_XPAD=m +CONFIG_JOYSTICK_XPAD_FF=y +CONFIG_JOYSTICK_XPAD_LEDS=y # CONFIG_INPUT_TABLET is not set # CONFIG_INPUT_TOUCHSCREEN is not set CONFIG_INPUT_MISC=y @@ -2925,7 +2927,8 @@ CONFIG_R8187SE=m CONFIG_RTL8192U=m # CONFIG_RTLLIB is not set CONFIG_R8712U=m -# CONFIG_RTS_PSTOR is not set +CONFIG_RTS_PSTOR=m +# CONFIG_RTS_PSTOR_DEBUG is not set CONFIG_RTS5139=m # CONFIG_RTS5139_DEBUG is not set # CONFIG_TRANZPORT is not set diff --git a/projects/Generic/linux/linux.i386.conf b/projects/Generic/linux/linux.i386.conf index 43c8dfe53f..1946a92c6e 100644 --- a/projects/Generic/linux/linux.i386.conf +++ b/projects/Generic/linux/linux.i386.conf @@ -1578,7 +1578,9 @@ CONFIG_INPUT_JOYSTICK=y # CONFIG_JOYSTICK_ZHENHUA is not set # CONFIG_JOYSTICK_AS5011 is not set # CONFIG_JOYSTICK_JOYDUMP is not set -# CONFIG_JOYSTICK_XPAD is not set +CONFIG_JOYSTICK_XPAD=m +CONFIG_JOYSTICK_XPAD_FF=y +CONFIG_JOYSTICK_XPAD_LEDS=y # CONFIG_INPUT_TABLET is not set # CONFIG_INPUT_TOUCHSCREEN is not set CONFIG_INPUT_MISC=y diff --git a/projects/Generic_OSS/linux/linux.i386.conf b/projects/Generic_OSS/linux/linux.i386.conf index 8eca4a51fe..7a850c37ae 100644 --- a/projects/Generic_OSS/linux/linux.i386.conf +++ b/projects/Generic_OSS/linux/linux.i386.conf @@ -1576,7 +1576,9 @@ CONFIG_INPUT_JOYSTICK=y # CONFIG_JOYSTICK_ZHENHUA is not set # CONFIG_JOYSTICK_AS5011 is not set # CONFIG_JOYSTICK_JOYDUMP is not set -# CONFIG_JOYSTICK_XPAD is not set +CONFIG_JOYSTICK_XPAD=m +CONFIG_JOYSTICK_XPAD_FF=y +CONFIG_JOYSTICK_XPAD_LEDS=y # CONFIG_INPUT_TABLET is not set # CONFIG_INPUT_TOUCHSCREEN is not set CONFIG_INPUT_MISC=y diff --git a/projects/ION/linux/linux.i386.conf b/projects/ION/linux/linux.i386.conf index 3f950bf03e..2c81c67b34 100644 --- a/projects/ION/linux/linux.i386.conf +++ b/projects/ION/linux/linux.i386.conf @@ -1501,7 +1501,9 @@ CONFIG_INPUT_JOYSTICK=y # CONFIG_JOYSTICK_ZHENHUA is not set # CONFIG_JOYSTICK_AS5011 is not set # CONFIG_JOYSTICK_JOYDUMP is not set -# CONFIG_JOYSTICK_XPAD is not set +CONFIG_JOYSTICK_XPAD=m +CONFIG_JOYSTICK_XPAD_FF=y +CONFIG_JOYSTICK_XPAD_LEDS=y # CONFIG_INPUT_TABLET is not set # CONFIG_INPUT_TOUCHSCREEN is not set CONFIG_INPUT_MISC=y diff --git a/projects/ION/linux/linux.x86_64.conf b/projects/ION/linux/linux.x86_64.conf index 92d84c80b6..c88c50f7b7 100644 --- a/projects/ION/linux/linux.x86_64.conf +++ b/projects/ION/linux/linux.x86_64.conf @@ -1443,7 +1443,9 @@ CONFIG_INPUT_JOYSTICK=y # CONFIG_JOYSTICK_ZHENHUA is not set # CONFIG_JOYSTICK_AS5011 is not set # CONFIG_JOYSTICK_JOYDUMP is not set -# CONFIG_JOYSTICK_XPAD is not set +CONFIG_JOYSTICK_XPAD=m +CONFIG_JOYSTICK_XPAD_FF=y +CONFIG_JOYSTICK_XPAD_LEDS=y # CONFIG_INPUT_TABLET is not set # CONFIG_INPUT_TOUCHSCREEN is not set CONFIG_INPUT_MISC=y diff --git a/projects/Intel/linux/linux.i386.conf b/projects/Intel/linux/linux.i386.conf index 8d3a15509c..9e50109638 100644 --- a/projects/Intel/linux/linux.i386.conf +++ b/projects/Intel/linux/linux.i386.conf @@ -1519,7 +1519,9 @@ CONFIG_INPUT_JOYSTICK=y # CONFIG_JOYSTICK_ZHENHUA is not set # CONFIG_JOYSTICK_AS5011 is not set # CONFIG_JOYSTICK_JOYDUMP is not set -# CONFIG_JOYSTICK_XPAD is not set +CONFIG_JOYSTICK_XPAD=m +CONFIG_JOYSTICK_XPAD_FF=y +CONFIG_JOYSTICK_XPAD_LEDS=y # CONFIG_INPUT_TABLET is not set # CONFIG_INPUT_TOUCHSCREEN is not set CONFIG_INPUT_MISC=y diff --git a/projects/Intel/linux/linux.x86_64.conf b/projects/Intel/linux/linux.x86_64.conf index 942bb66804..af57a14d86 100644 --- a/projects/Intel/linux/linux.x86_64.conf +++ b/projects/Intel/linux/linux.x86_64.conf @@ -1462,7 +1462,9 @@ CONFIG_INPUT_JOYSTICK=y # CONFIG_JOYSTICK_ZHENHUA is not set # CONFIG_JOYSTICK_AS5011 is not set # CONFIG_JOYSTICK_JOYDUMP is not set -# CONFIG_JOYSTICK_XPAD is not set +CONFIG_JOYSTICK_XPAD=m +CONFIG_JOYSTICK_XPAD_FF=y +CONFIG_JOYSTICK_XPAD_LEDS=y # CONFIG_INPUT_TABLET is not set # CONFIG_INPUT_TOUCHSCREEN is not set CONFIG_INPUT_MISC=y diff --git a/projects/Ultra/linux/linux.x86_64.conf b/projects/Ultra/linux/linux.x86_64.conf index c17c03a583..f2e3e58381 100644 --- a/projects/Ultra/linux/linux.x86_64.conf +++ b/projects/Ultra/linux/linux.x86_64.conf @@ -1366,7 +1366,9 @@ CONFIG_INPUT_JOYSTICK=y # CONFIG_JOYSTICK_ZHENHUA is not set # CONFIG_JOYSTICK_AS5011 is not set # CONFIG_JOYSTICK_JOYDUMP is not set -# CONFIG_JOYSTICK_XPAD is not set +CONFIG_JOYSTICK_XPAD=m +CONFIG_JOYSTICK_XPAD_FF=y +CONFIG_JOYSTICK_XPAD_LEDS=y # CONFIG_INPUT_TABLET is not set # CONFIG_INPUT_TOUCHSCREEN is not set CONFIG_INPUT_MISC=y diff --git a/projects/Virtual/linux/linux.i386.conf b/projects/Virtual/linux/linux.i386.conf index 12e12cc8a6..ad75b2f3f8 100644 --- a/projects/Virtual/linux/linux.i386.conf +++ b/projects/Virtual/linux/linux.i386.conf @@ -1521,7 +1521,9 @@ CONFIG_INPUT_JOYSTICK=y # CONFIG_JOYSTICK_ZHENHUA is not set # CONFIG_JOYSTICK_AS5011 is not set # CONFIG_JOYSTICK_JOYDUMP is not set -# CONFIG_JOYSTICK_XPAD is not set +CONFIG_JOYSTICK_XPAD=m +CONFIG_JOYSTICK_XPAD_FF=y +CONFIG_JOYSTICK_XPAD_LEDS=y # CONFIG_INPUT_TABLET is not set # CONFIG_INPUT_TOUCHSCREEN is not set CONFIG_INPUT_MISC=y diff --git a/projects/Virtual/linux/linux.x86_64.conf b/projects/Virtual/linux/linux.x86_64.conf index 91a757b942..1127dbf4fb 100644 --- a/projects/Virtual/linux/linux.x86_64.conf +++ b/projects/Virtual/linux/linux.x86_64.conf @@ -1463,7 +1463,9 @@ CONFIG_INPUT_JOYSTICK=y # CONFIG_JOYSTICK_ZHENHUA is not set # CONFIG_JOYSTICK_AS5011 is not set # CONFIG_JOYSTICK_JOYDUMP is not set -# CONFIG_JOYSTICK_XPAD is not set +CONFIG_JOYSTICK_XPAD=m +CONFIG_JOYSTICK_XPAD_FF=y +CONFIG_JOYSTICK_XPAD_LEDS=y # CONFIG_INPUT_TABLET is not set # CONFIG_INPUT_TOUCHSCREEN is not set CONFIG_INPUT_MISC=y From 52e8b1e9c7341f22289c440e61b4752000bc95c7 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 30 Jan 2013 06:23:39 +0100 Subject: [PATCH 39/42] Revert "bluez: rework install script, install some tools to release build" This reverts commit 3f796d5d855000c681aa2f122ee3ce731773928f. --- packages/network/bluez/build | 2 +- packages/network/bluez/install | 54 ++++++++++++++-------------------- 2 files changed, 23 insertions(+), 33 deletions(-) diff --git a/packages/network/bluez/build b/packages/network/bluez/build index 133e8152f3..1c9f9c300c 100755 --- a/packages/network/bluez/build +++ b/packages/network/bluez/build @@ -31,7 +31,7 @@ fi if [ "$DEVTOOLS" = "yes" ]; then DEVTOOLS_CONFIG="--enable-monitor --enable-test --enable-tools" else - DEVTOOLS_CONFIG="--disable-monitor --disable-test --enable-tools" + DEVTOOLS_CONFIG="--disable-monitor --disable-test --disable-tools" fi cd $PKG_BUILD diff --git a/packages/network/bluez/install b/packages/network/bluez/install index 70ab26b61c..61218f9d25 100755 --- a/packages/network/bluez/install +++ b/packages/network/bluez/install @@ -25,45 +25,35 @@ mkdir -p $INSTALL/etc/dbus-1/system.d cp $PKG_BUILD/src/bluetooth.conf $INSTALL/etc/dbus-1/system.d -mkdir -p $INSTALL/usr/lib/bluetooth - cp $PKG_BUILD/src/bluetoothd $INSTALL/usr/lib/bluetooth - cp $PKG_BUILD/obexd/src/obexd $INSTALL/usr/lib/bluetooth +mkdir -p $INSTALL/lib/udev + cp $PKG_BUILD/tools/hid2hci $INSTALL/lib/udev + +mkdir -p $INSTALL/lib/udev/rules.d + cp $PKG_BUILD/tools/97-hid2hci.rules $INSTALL/lib/udev/rules.d mkdir -p $INSTALL/usr/lib cp -P $PKG_BUILD/lib/.libs/libbluetooth.so* $INSTALL/usr/lib -# client - mkdir -p $INSTALL/usr/bin - cp $PKG_BUILD/client/bluetoothctl $INSTALL/usr/bin - -# tools - mkdir -p $INSTALL/lib/udev - cp $PKG_BUILD/tools/hid2hci $INSTALL/lib/udev - - mkdir -p $INSTALL/lib/udev/rules.d - cp $PKG_BUILD/tools/97-hid2hci.rules $INSTALL/lib/udev/rules.d - - mkdir -p $INSTALL/usr/bin - cp $PKG_BUILD/tools/bccmd $INSTALL/usr/bin - cp $PKG_BUILD/tools/ciptool $INSTALL/usr/bin - cp $PKG_BUILD/tools/hciattach $INSTALL/usr/bin - cp $PKG_BUILD/tools/hciconfig $INSTALL/usr/bin - cp $PKG_BUILD/tools/hcidump $INSTALL/usr/bin - cp $PKG_BUILD/tools/hcitool $INSTALL/usr/bin - cp $PKG_BUILD/tools/l2ping $INSTALL/usr/bin - cp $PKG_BUILD/tools/l2test $INSTALL/usr/bin - cp $PKG_BUILD/tools/rctest $INSTALL/usr/bin - cp $PKG_BUILD/tools/rfcomm $INSTALL/usr/bin - cp $PKG_BUILD/tools/sdptool $INSTALL/usr/bin - -# test +mkdir -p $INSTALL/usr/lib/bluetooth + cp $PKG_BUILD/src/bluetoothd $INSTALL/usr/lib/bluetooth + cp $PKG_BUILD/obexd/src/obexd $INSTALL/usr/lib/bluetooth if [ "$DEVTOOLS" = "yes" ]; then -# monitor - mkdir -p $INSTALL/usr/bin - cp $PKG_BUILD/monitor/btmon $INSTALL/usr/bin +mkdir -p $INSTALL/usr/bin + cp $PKG_BUILD/tools/bccmd $INSTALL/usr/bin + cp $PKG_BUILD/client/bluetoothctl $INSTALL/usr/bin + cp $PKG_BUILD/monitor/btmon $INSTALL/usr/bin + cp $PKG_BUILD/tools/ciptool $INSTALL/usr/bin + cp $PKG_BUILD/tools/hciattach $INSTALL/usr/bin + cp $PKG_BUILD/tools/hciconfig $INSTALL/usr/bin + cp $PKG_BUILD/tools/hcidump $INSTALL/usr/bin + cp $PKG_BUILD/tools/hcitool $INSTALL/usr/bin + cp $PKG_BUILD/tools/l2ping $INSTALL/usr/bin + cp $PKG_BUILD/tools/l2test $INSTALL/usr/bin + cp $PKG_BUILD/tools/rctest $INSTALL/usr/bin + cp $PKG_BUILD/tools/rfcomm $INSTALL/usr/bin + cp $PKG_BUILD/tools/sdptool $INSTALL/usr/bin -# test mkdir -p $INSTALL/usr/lib/bluez/test cp -P $PKG_BUILD/test/* $INSTALL/usr/lib/bluez/test chmod +x $INSTALL/usr/lib/bluez/test/* From 617d5bfc45965d1a11a091486f278f45c856c425 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 30 Jan 2013 06:23:52 +0100 Subject: [PATCH 40/42] Revert "bluez: build depend on 'readline'" This reverts commit ef1dc59246da91a9bdc78b6054e96fc06edd188d. --- packages/network/bluez/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/network/bluez/meta b/packages/network/bluez/meta index 233586be2e..8558547642 100644 --- a/packages/network/bluez/meta +++ b/packages/network/bluez/meta @@ -26,7 +26,7 @@ PKG_LICENSE="GPL" PKG_SITE="http://www.bluez.org/" PKG_URL="http://www.kernel.org/pub/linux/bluetooth/$PKG_NAME-$PKG_VERSION.tar.xz" PKG_DEPENDS="libusb-compat dbus glib systemd" -PKG_BUILD_DEPENDS="toolchain libusb-compat dbus glib systemd readline" +PKG_BUILD_DEPENDS="toolchain libusb-compat dbus glib systemd" PKG_PRIORITY="optional" PKG_SECTION="network" PKG_SHORTDESC="bluez: Bluetooth Tools and System Daemons for Linux." From bd1fe46897408d4722df18a23429245aef031e2c Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 30 Jan 2013 06:24:03 +0100 Subject: [PATCH 41/42] Revert "bluez: add init script and udev rule (needs rework)" This reverts commit 6e5d304a3f63280bdfccad3b994b91a1fff0972b. --- packages/network/bluez/init.d/22_bluez | 27 ------------------- .../network/bluez/udev.d/09-bluetooth.rules | 6 ----- 2 files changed, 33 deletions(-) delete mode 100644 packages/network/bluez/init.d/22_bluez delete mode 100644 packages/network/bluez/udev.d/09-bluetooth.rules diff --git a/packages/network/bluez/init.d/22_bluez b/packages/network/bluez/init.d/22_bluez deleted file mode 100644 index 92aa14170a..0000000000 --- a/packages/network/bluez/init.d/22_bluez +++ /dev/null @@ -1,27 +0,0 @@ -################################################################################ -# Copyright (C) 2009-2010 OpenELEC.tv -# http://www.openelec.tv -# -# This Program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This Program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC.tv; see the file COPYING. If not, write to -# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA. -# http://www.gnu.org/copyleft/gpl.html -################################################################################ - -# starting Bluetooth -# -# runlevels: openelec, textmode - -# starting Bluetooth manager - progress "starting Bluetooth manager" - /usr/lib/bluetooth/bluetoothd > /dev/null 2>&1 & diff --git a/packages/network/bluez/udev.d/09-bluetooth.rules b/packages/network/bluez/udev.d/09-bluetooth.rules deleted file mode 100644 index 7aa0a38d29..0000000000 --- a/packages/network/bluez/udev.d/09-bluetooth.rules +++ /dev/null @@ -1,6 +0,0 @@ -ACTION!="add|change", GOTO="end" - -KERNEL=="hci[0-9]*", SUBSYSTEM=="bluetooth", RUN+="/usr/bin/hciconfig %k up" -KERNEL=="hci[0-9]*", SUBSYSTEM=="bluetooth", RUN+="/usr/bin/hciconfig %k lm master" - -LABEL="end" From b612271f7f659780d6dcbf70a2a2abd4da9ae606 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 30 Jan 2013 06:24:12 +0100 Subject: [PATCH 42/42] Revert "bluez: update to bluez-5.1" This reverts commit d5e294aaa5b4fe4aaf2f257ff638ec0fde446ff4. --- packages/network/bluez/build | 47 +++++++++---- packages/network/bluez/config/main.conf | 66 +++++++++++++++++++ packages/network/bluez/install | 62 +++++++++++------ packages/network/bluez/meta | 2 +- .../patches/bluez-4.99-automake_1.13.patch | 12 ++++ .../bluez/patches/bluez-4.99-systemd.patch | 15 +++++ .../network/bluez/udev.d/09-bluetooth.rules | 6 ++ 7 files changed, 177 insertions(+), 33 deletions(-) create mode 100644 packages/network/bluez/config/main.conf create mode 100644 packages/network/bluez/patches/bluez-4.99-automake_1.13.patch create mode 100644 packages/network/bluez/patches/bluez-4.99-systemd.patch create mode 100644 packages/network/bluez/udev.d/09-bluetooth.rules diff --git a/packages/network/bluez/build b/packages/network/bluez/build index 1c9f9c300c..67668175df 100755 --- a/packages/network/bluez/build +++ b/packages/network/bluez/build @@ -22,17 +22,22 @@ . config/options +if [ "$ALSA_SUPPORT" = "yes" ]; then + BLUEZ_ALSA="--enable-audio --enable-alsa" +else + BLUEZ_ALSA="--disable-audio --disable-alsa" +fi + if [ "$DEBUG" = "yes" ]; then DEBUG_CONFIG="--enable-debug" else DEBUG_CONFIG="--disable-debug" fi - if [ "$DEVTOOLS" = "yes" ]; then - DEVTOOLS_CONFIG="--enable-monitor --enable-test --enable-tools" + DEVTOOLS_CONFIG="--enable-bccmd --enable-tools" else - DEVTOOLS_CONFIG="--disable-monitor --disable-test --disable-tools" -fi + DEVTOOLS_CONFIG="--disable-bccmd --disable-tools" +fi cd $PKG_BUILD ./configure --host=$TARGET_NAME \ @@ -45,18 +50,38 @@ cd $PKG_BUILD --disable-silent-rules \ --enable-shared \ --disable-static \ - --enable-library \ + --enable-optimization \ + --enable-fortify \ + --disable-pie \ + --enable-network \ + --disable-sap \ + --disable-proximity \ + --disable-serial \ + --enable-input \ + --enable-service \ + --enable-health \ + --disable-pnat \ + --disable-gstreamer \ + $BLUEZ_ALSA \ --enable-usb \ - --enable-udev \ - --disable-cups \ - --disable-obex \ - --enable-client \ - --disable-systemd \ --enable-datafiles \ - --disable-experimental \ + --enable-pcmcia \ + --enable-hid2hci \ + --enable-dfutool \ + --disable-hidd \ + --disable-pand \ + --disable-dund \ + --disable-cups \ + --enable-wiimote \ + --disable-maemo6 \ + --disable-dbusoob \ + --enable-thermometer \ + --disable-hal \ + --disable-capng \ --with-gnu-ld \ $DEBUG_CONFIG \ $DEVTOOLS_CONFIG \ + --disable-test make diff --git a/packages/network/bluez/config/main.conf b/packages/network/bluez/config/main.conf new file mode 100644 index 0000000000..0ff6b0b921 --- /dev/null +++ b/packages/network/bluez/config/main.conf @@ -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 diff --git a/packages/network/bluez/install b/packages/network/bluez/install index 61218f9d25..bf605ad081 100755 --- a/packages/network/bluez/install +++ b/packages/network/bluez/install @@ -22,39 +22,59 @@ . config/options +PKG_DIR=`find $PACKAGES -type d -name $1` + +mkdir -p $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/input/input.conf $INSTALL/etc/bluetooth + + if [ "$ALSA_SUPPORT" = yes ]; then + cp $PKG_BUILD/audio/audio.conf $INSTALL/etc/bluetooth + fi + mkdir -p $INSTALL/etc/dbus-1/system.d cp $PKG_BUILD/src/bluetooth.conf $INSTALL/etc/dbus-1/system.d mkdir -p $INSTALL/lib/udev +# not needed: cp $PKG_BUILD/scripts/bluetooth_serial $INSTALL/lib/udev +# not needed: chmod +x $INSTALL/lib/udev/bluetooth_serial cp $PKG_BUILD/tools/hid2hci $INSTALL/lib/udev mkdir -p $INSTALL/lib/udev/rules.d - cp $PKG_BUILD/tools/97-hid2hci.rules $INSTALL/lib/udev/rules.d + cp $PKG_BUILD/scripts/97-bluetooth.rules $INSTALL/lib/udev/rules.d +# todo: cp $PKG_BUILD/scripts/97-bluetooth-hid2hci.rules $INSTALL/lib/udev/rules.d +# not needed: cp $PKG_BUILD/scripts/97-bluetooth-serial.rules $INSTALL/lib/udev/rules.d mkdir -p $INSTALL/usr/lib cp -P $PKG_BUILD/lib/.libs/libbluetooth.so* $INSTALL/usr/lib -mkdir -p $INSTALL/usr/lib/bluetooth - cp $PKG_BUILD/src/bluetoothd $INSTALL/usr/lib/bluetooth - cp $PKG_BUILD/obexd/src/obexd $INSTALL/usr/lib/bluetooth +if [ "$ALSA_SUPPORT" = yes ]; then + mkdir -p $INSTALL/usr/lib/alsa + cp $PKG_BUILD/audio/.libs/*.so $INSTALL/usr/lib/alsa +fi + +mkdir -p $INSTALL/usr/lib/bluetooth/plugins + +mkdir -p $INSTALL/usr/sbin + cp $PKG_BUILD/src/bluetoothd $INSTALL/usr/sbin + +mkdir -p $INSTALL/usr/share/alsa + cp $PKG_BUILD/audio/bluetooth.conf $INSTALL/usr/share/alsa if [ "$DEVTOOLS" = "yes" ]; then -mkdir -p $INSTALL/usr/bin - cp $PKG_BUILD/tools/bccmd $INSTALL/usr/bin - cp $PKG_BUILD/client/bluetoothctl $INSTALL/usr/bin - cp $PKG_BUILD/monitor/btmon $INSTALL/usr/bin - cp $PKG_BUILD/tools/ciptool $INSTALL/usr/bin - cp $PKG_BUILD/tools/hciattach $INSTALL/usr/bin - cp $PKG_BUILD/tools/hciconfig $INSTALL/usr/bin - cp $PKG_BUILD/tools/hcidump $INSTALL/usr/bin - cp $PKG_BUILD/tools/hcitool $INSTALL/usr/bin - cp $PKG_BUILD/tools/l2ping $INSTALL/usr/bin - cp $PKG_BUILD/tools/l2test $INSTALL/usr/bin - cp $PKG_BUILD/tools/rctest $INSTALL/usr/bin - cp $PKG_BUILD/tools/rfcomm $INSTALL/usr/bin - cp $PKG_BUILD/tools/sdptool $INSTALL/usr/bin + mkdir -p $INSTALL/usr/bin + cp $PKG_BUILD/tools/ciptool $INSTALL/usr/bin + cp $PKG_BUILD/tools/dfutool $INSTALL/usr/bin + cp $PKG_BUILD/tools/hcitool $INSTALL/usr/bin + cp $PKG_BUILD/tools/l2ping $INSTALL/usr/bin + cp $PKG_BUILD/tools/rfcomm $INSTALL/usr/bin + cp $PKG_BUILD/tools/sdptool $INSTALL/usr/bin - mkdir -p $INSTALL/usr/lib/bluez/test - cp -P $PKG_BUILD/test/* $INSTALL/usr/lib/bluez/test - chmod +x $INSTALL/usr/lib/bluez/test/* +mkdir -p $INSTALL/usr/sbin + cp $PKG_BUILD/tools/bccmd $INSTALL/usr/sbin # TODO + cp $PKG_BUILD/tools/hciattach $INSTALL/usr/sbin + cp $PKG_BUILD/tools/hciconfig $INSTALL/usr/sbin fi + diff --git a/packages/network/bluez/meta b/packages/network/bluez/meta index 8558547642..26f83b8fc0 100644 --- a/packages/network/bluez/meta +++ b/packages/network/bluez/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="bluez" -PKG_VERSION="5.1" +PKG_VERSION="4.99" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/network/bluez/patches/bluez-4.99-automake_1.13.patch b/packages/network/bluez/patches/bluez-4.99-automake_1.13.patch new file mode 100644 index 0000000000..68b48872d4 --- /dev/null +++ b/packages/network/bluez/patches/bluez-4.99-automake_1.13.patch @@ -0,0 +1,12 @@ +diff -Naur bluez-4.101-old/configure.ac bluez-4.101-new/configure.ac +--- bluez-4.101-old/configure.ac 2012-06-22 09:36:49.000000000 -0700 ++++ bluez-4.101-new/configure.ac 2012-12-29 08:49:05.000000000 -0800 +@@ -2,7 +2,7 @@ + AC_INIT(bluez, 4.101) + + AM_INIT_AUTOMAKE([foreign subdir-objects color-tests]) +-AM_CONFIG_HEADER(config.h) ++AC_CONFIG_HEADERS(config.h) + + m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) + diff --git a/packages/network/bluez/patches/bluez-4.99-systemd.patch b/packages/network/bluez/patches/bluez-4.99-systemd.patch new file mode 100644 index 0000000000..56cfc6db29 --- /dev/null +++ b/packages/network/bluez/patches/bluez-4.99-systemd.patch @@ -0,0 +1,15 @@ +X-Git-Url: http://git.kernel.org/?p=bluetooth%2Fbluez.git;a=blobdiff_plain;f=tools%2Fhid2hci.c;h=e3a5b2ef785a782bd3da4ae9c44704a32dc2f665;hp=45a3a3db8b29411ee193e480f5ce8a82a40103d1;hb=35beaaa5b39d50eabd54563804182bb01a5d7ff4;hpb=cc47dc79aac98f7b25bd2afccf1c10560e779d16 + +diff --git a/tools/hid2hci.c b/tools/hid2hci.c +index 45a3a3d..e3a5b2e 100644 +--- a/tools/hid2hci.c ++++ b/tools/hid2hci.c +@@ -291,7 +291,7 @@ int main(int argc, char *argv[]) + if (udev == NULL) + goto exit; + +- snprintf(syspath, sizeof(syspath), "%s/%s", udev_get_sys_path(udev), devpath); ++ snprintf(syspath, sizeof(syspath), "/sys/%s", devpath); + udev_dev = udev_device_new_from_syspath(udev, syspath); + if (udev_dev == NULL) { + fprintf(stderr, "error: could not find '%s'\n", devpath); diff --git a/packages/network/bluez/udev.d/09-bluetooth.rules b/packages/network/bluez/udev.d/09-bluetooth.rules new file mode 100644 index 0000000000..b5be47b242 --- /dev/null +++ b/packages/network/bluez/udev.d/09-bluetooth.rules @@ -0,0 +1,6 @@ +ACTION!="add|change", GOTO="end" + +KERNEL=="hci[0-9]*", SUBSYSTEM=="bluetooth", RUN+="/usr/sbin/hciconfig %k up" +KERNEL=="hci[0-9]*", SUBSYSTEM=="bluetooth", RUN+="/usr/sbin/hciconfig %k lm master" + +LABEL="end"