summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoranonym <anonym@riseup.net>2016-12-21 14:28:55 +0100
committeranonym <anonym@riseup.net>2016-12-21 14:28:55 +0100
commita6a06c0a94dd282ef232b66ca9a62c6d293cbfe3 (patch)
treeeec3bf2ba8ff9cfc978b04a0cc246dcec503de38
parente645633cc17e19ec570679be12a76d83000ff926 (diff)
parentae2b15647053fed7c3ecc20d9db0cc7595bc04aa (diff)
Merge remote-tracking branch 'origin/bugfix/11853-mesa-12.0.3' into stable
Fix-committed: #11853, #11850
-rw-r--r--config/chroot_apt/preferences12
-rw-r--r--config/chroot_local-packageslists/tails-common.list1
2 files changed, 12 insertions, 1 deletions
diff --git a/config/chroot_apt/preferences b/config/chroot_apt/preferences
index d6a1494..6744af6 100644
--- a/config/chroot_apt/preferences
+++ b/config/chroot_apt/preferences
@@ -62,7 +62,8 @@ Package: icedove* iceowl* calendar-google-provider
Pin: origin deb.tails.boum.org
Pin-Priority: 999
-Package: lib*-mesa*
+Explanation: src:mesa
+Package: lib*-mesa* libgbm* libxatracker*
Pin: release o=Debian,n=jessie-backports
Pin-Priority: 1006
@@ -74,6 +75,11 @@ Package: libdvd-pkg
Pin: release o=Debian,n=jessie-backports
Pin-Priority: 999
+Explanation: src:llvm-toolchain-3.8
+Package: clang* llvm* libclang* libfuzzer* libllvm* liblldb* lldb* python-clang* python-lldb*
+Pin: release o=Debian,n=jessie-backports
+Pin-Priority: 999
+
Package: libnet-dbus-perl
Pin: release o=Debian,n=jessie-backports
Pin-Priority: 999
@@ -148,6 +154,10 @@ Package: virtualbox-guest-utils virtualbox-guest-dkms virtualbox-guest-x11
Pin: origin deb.tails.boum.org
Pin-Priority: 999
+Package: xserver-xorg-video-amdgpu
+Pin: release o=Debian,n=jessie-backports
+Pin-Priority: 999
+
Package: xserver-xorg-video-intel
Pin: release o=Debian,n=jessie-backports
Pin-Priority: 999
diff --git a/config/chroot_local-packageslists/tails-common.list b/config/chroot_local-packageslists/tails-common.list
index 79c275d..b7433a2 100644
--- a/config/chroot_local-packageslists/tails-common.list
+++ b/config/chroot_local-packageslists/tails-common.list
@@ -267,6 +267,7 @@ xserver-xorg-input-all
xserver-xorg-video-geode
#endif
xserver-xorg-video-all
+xserver-xorg-video-amdgpu
### Input methods
ibus-gtk