Merge lp://qastaging/~andrikos/ubuntu/quantal/fglrx-installer-updates/fglrx-13.2-beta3 into lp://qastaging/ubuntu/quantal/fglrx-installer-updates
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://qastaging/~andrikos/ubuntu/quantal/fglrx-installer-updates/fglrx-13.2-beta3 |
| Merge into: | lp://qastaging/ubuntu/quantal/fglrx-installer-updates |
| Prerequisite: | lp://qastaging/ubuntu/raring-proposed/fglrx-installer-updates |
| Diff against target: |
2781 lines (+1597/-288) 24 files modified
arch/x86/usr/lib/fglrx/switchlibGL (+49/-66) arch/x86_64/usr/lib64/fglrx/switchlibGL (+49/-66) debian/changelog (+8/-0) debian/fglrx-updates.install (+4/-4) debian/overrides/fglrx-updates (+4/-4) etc/ati/amdpcsdb.default (+1126/-39) etc/ati/atiogl.xml (+41/-32) etc/ati/signature (+1/-1) lib/modules/fglrx/build_mod/drm.h (+1/-1) lib/modules/fglrx/build_mod/firegl_public.c (+51/-0) lib/modules/fglrx/build_mod/firegl_public.h (+52/-9) lib/modules/fglrx/build_mod/kcl_acpi.c (+17/-0) lib/modules/fglrx/build_mod/kcl_acpi.h (+1/-0) lib/modules/fglrx/build_mod/kcl_debug.c (+3/-8) lib/modules/fglrx/build_mod/kcl_io.c (+0/-8) lib/modules/fglrx/build_mod/kcl_io.h (+19/-2) lib/modules/fglrx/build_mod/kcl_pci.c (+31/-11) lib/modules/fglrx/build_mod/kcl_pci.h (+75/-9) lib/modules/fglrx/build_mod/kcl_str.c (+1/-3) lib/modules/fglrx/build_mod/kcl_str.h (+50/-20) lib/modules/fglrx/build_mod/kcl_type.h (+3/-1) lib/modules/fglrx/build_mod/kcl_wait.c (+1/-1) lib/modules/fglrx/build_mod/kcl_wait.h (+7/-0) usr/include/GL/glATI.h (+3/-3) |
| To merge this branch: | bzr merge lp://qastaging/~andrikos/ubuntu/quantal/fglrx-installer-updates/fglrx-13.2-beta3 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Alberto Milone | Pending | ||
|
Review via email:
|
|||
Description of the change
This packages the newest upstream driver (13.2beta3)
This new version (and any above 13.1 inclusive) seems to solve Bug #1068404 without any need to mess with the intel driver
Unmerged revisions
- 30. By Nick Andrik
-
* New upstream release 13.2-beta3
- Fix a problem where X crashes on fglrx/intel hybrid GPU systems
(LP: #1068404) - 29. By Alberto Milone
-
* debian/rules:
- Make sure that build calls build-arch (as it used to do).
- Separate regen-from-templates from build. - 28. By Alberto Milone
-
* debian/rules:
- Revert change to separate regen-from-templates from
the build target. This fixes a FTBFS. - 27. By Alberto Milone
-
* debian/
control{ .in}:
- Restore the previous conflict/replace/ provide dropped
by mistake. - 26. By Alberto Milone
-
* debian/
control{ .in}:
- Remove whitespace.
- Conflict/replace/ provide other flavours.
- Drop all the dependencies on the linux-headers.
* debian/rules:
- Separate regen-from-templates from build.
- Automate debian/control generation. - 25. By Alberto Milone
-
* New upstream release.
* debian/dkms.conf. in,
replace-archdata. acpi_handle- with-acpi_ node.handle. patch:
- Add support for Linux 3.8 (LP: #1095755).
Thanks to Robert Hooker for the patch.
* debian/substvars:
- Remove versioned dependency on xserver-xorg-core.
* debian/10fglrx.in, debian/rules:
- Fix paths which prevented OpenGL operations on hybrid systems
on amd64 (LP: #1068661). Thanks to Nick Andrik for the patch. - 24. By Alberto Milone
-
* debian/control:
- Conflict/replace/ provide new nvidia flavours.
- Depend on other flavours of kernel headers.
* debian/10fglrx.in:
- Fix path for powerxpress (LP: #1068661). Thanks
to Nick Andrik and Lu Xingzhe for suggesting
the fix.[ Benjamin Kerensa ]
* debian/control:
- Add ${misc:Depends} depends as needed. - 23. By Alberto Milone
-
* debian/
dkms.conf. in,
replace-VM_RESERVED- with-VM_ DONTEXPAND- and-VM_ DONTDU. patch:
- Add support for Linux 3.7 (LP: #1075937).
