diff -u compiz-0.7.2/debian/changelog compiz-0.7.2/debian/changelog --- compiz-0.7.2/debian/changelog +++ compiz-0.7.2/debian/changelog @@ -1,3 +1,12 @@ +compiz (1:0.7.2-0ubuntu3) hardy; urgency=low + + [ Andrea Chiavazza ] + * debian/patches/100-check_pciids_whitelist.patch: + - start compiz even if using the ati or radeon driver and using a laptop + if the card has a whitelisted pciid (LP: #201330) + + -- Andrea Chiavazza Tue, 01 Apr 2008 16:58:15 +0100 + compiz (1:0.7.2-0ubuntu2) hardy; urgency=low [ Travis Watkins ] diff -u compiz-0.7.2/debian/patches/series compiz-0.7.2/debian/patches/series --- compiz-0.7.2/debian/patches/series +++ compiz-0.7.2/debian/patches/series @@ -30,0 +31 @@ +100-check_pciids_whitelist.patch only in patch2: unchanged: --- compiz-0.7.2.orig/debian/patches/100-check_pciids_whitelist.patch +++ compiz-0.7.2/debian/patches/100-check_pciids_whitelist.patch @@ -0,0 +1,38 @@ +Index: compiz-0.7.2/debian/compiz-manager +=================================================================== +--- compiz-0.7.2.orig/debian/compiz-manager 2008-04-04 23:51:36.000000000 +0100 ++++ compiz-0.7.2/debian/compiz-manager 2008-04-04 23:51:36.000000000 +0100 +@@ -251,6 +251,18 @@ + return 0 + } + ++# check if pciid is in a list passed as arguments ++have_pciid() ++{ ++ OUTPUT=$(lspci -vn | grep -i VGA) ++ for ID in $@; do ++ if echo "$OUTPUT" | egrep -q "$ID"; then ++ return 0 ++ fi ++ done ++ return 1 ++} ++ + # check driver whitelist + running_under_whitelisted_driver() + { +@@ -265,8 +277,12 @@ + return 0 + fi + +- #don't run on laptops using ati driver +- if laptop-detect; then ++ #don't run on laptops using ati driver unless with a whitelisted pciid ++ T=" 1002:3154 1002:4336 1002:4337 1002:4c57 1002:4c66 1002:4e50 1002:4e56" ++ T="$T 1002:5460 1002:5835" ++ WHITELIST_PCIIDS_LAPTOP_ATI="$T" ++ unset T ++ if laptop-detect && ! have_pciid "$WHITELIST_PCIIDS_LAPTOP_ATI"; then + for DRV in ati radeon; do + if egrep -q "Loading ${XORG_DRIVER_PATH}${DRV}_drv\.so" $LOG && + ! egrep -q "Unloading ${XORG_DRIVER_PATH}${DRV}_drv\.so" $LOG;