Point 2) was applied with: http://anonscm.debian.org/gitweb/?p=pkg-xorg/lib/mesa.git;a=commitdiff; h=d4123fa1c466edcd9784bac1aaa7e64162bba549