wok-6.x rev 19881
bluez: fix bluez-simple-agent
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Mon Apr 03 10:27:24 2017 +0200 (2017-04-03) |
parents | 43defa66ccf4 |
children | 2717d404353b |
files | bluez/receipt linld/stuff/src/MEMTOP.ASM |
line diff
1.1 --- a/bluez/receipt Sun Apr 02 17:28:17 2017 +0200 1.2 +++ b/bluez/receipt Mon Apr 03 10:27:24 2017 +0200 1.3 @@ -10,6 +10,7 @@ 1.4 TARBALL="$PACKAGE-$VERSION.tar.bz2" 1.5 #WGET_URL="http://www.kernel.org/pub/linux/bluetooth/$TARBALL" 1.6 WGET_URL="http://sourceware.mirrors.tds.net/pub/kernel.org/linux/bluetooth/$TARBALL" 1.7 +CONFIG_FILES="/etc/bluetooth" 1.8 TAGS="bluetooth" 1.9 1.10 DEPENDS="linux-bluetooth alsa-lib glib dbus pygobject dbus-python" 1.11 @@ -19,6 +20,7 @@ 1.12 compile_rules() 1.13 { 1.14 sed -i 's/NEED_USB/xx&/' tools/*.c 1.15 + sed -i 's/from gi.repo.*/try:\n &\nexcept ImportError:\n import gobject as GObject/' test/simple-agent 1.16 1.17 ./configure \ 1.18 --prefix=/usr \
2.1 --- a/linld/stuff/src/MEMTOP.ASM Sun Apr 02 17:28:17 2017 +0200 2.2 +++ b/linld/stuff/src/MEMTOP.ASM Mon Apr 03 10:27:24 2017 +0200 2.3 @@ -42,16 +42,15 @@ 2.4 ;*************************************************************** 2.5 ; proc _memtop_e801 near 2.6 2.7 - ;push cx bx 2.8 xor cx,cx ;fix to work around buggy 2.9 xor dx,dx ; BIOSes which dont clear/set 2.10 stc ; carry on pass/error of 2.11 mov ax,0E801h 2.12 int 15h 2.13 jc @@err 2.14 - test cx,cx ;kludge to handle BIOSes 2.15 - jnz @@use_cxdx ; which report their extended 2.16 - test dx,dx ; memory in AX/BX rather than 2.17 + push cx ;kludge to handle BIOSes 2.18 + or cx,dx ; which report their extended 2.19 + pop cx ; memory in AX/BX rather than 2.20 jnz @@use_cxdx ; CX/DX. The spec I have read 2.21 @@use_axbx: mov dx,bx ; seems to indicate AX/BX 2.22 ;jmp @@end_kludge ; are more reasonable anyway... 2.23 @@ -59,7 +58,6 @@ 2.24 @@use_cxdx: xchg ax,cx 2.25 @@end_kludge: ;now: dx=64k units above 16m 2.26 ; ax=1k units above 1m below 16m (max 3c00h) 2.27 - ;pop bx cx 2.28 test dx,dx 2.29 jz tokb ;dx=0 here, ax=kbs above 1m 2.30 xor ax,ax ;ignore info on low 16M (assume full)