From 40549775008ba0e421e921fbeda780d415494d1e Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Mon, 16 Sep 2013 20:51:22 +0200
Subject: [PATCH] Revert "xf86-video-fglrx: Update to 13.6 beta (workaround
 beta signature)"

This reverts commit 46e64e3e1316a78795f255681a44d51e95477066.

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 ...gacy-12.6-remove-overlapping-pci-ids.patch | 433 ------------------
 packages/x11/driver/xf86-video-fglrx/build    |  28 +-
 .../driver/xf86-video-fglrx/config/amdpcsdb   |   1 +
 packages/x11/driver/xf86-video-fglrx/meta     |  13 +-
 .../xf86-video-fglrx-12.10-kernel-3.7.patch   | 132 ++++++
 .../xf86-video-fglrx-12.10-kernel-3.8.patch   |  13 +
 ...lrx-12.10-remove-overlapping-pci-ids.patch |  20 +
 ...glrx-12.10-replace_old_procfs_calls.patch} | 105 +----
 projects/ARCTIC_MC/options                    |   2 +-
 9 files changed, 197 insertions(+), 550 deletions(-)
 delete mode 100644 packages/x11/driver/xf86-video-fglrx-legacy/patches.upstream/xf86-video-fglrx-legacy-12.6-remove-overlapping-pci-ids.patch
 create mode 100644 packages/x11/driver/xf86-video-fglrx/patches.upstream/xf86-video-fglrx-12.10-kernel-3.7.patch
 create mode 100644 packages/x11/driver/xf86-video-fglrx/patches.upstream/xf86-video-fglrx-12.10-kernel-3.8.patch
 create mode 100644 packages/x11/driver/xf86-video-fglrx/patches.upstream/xf86-video-fglrx-12.10-remove-overlapping-pci-ids.patch
 rename packages/x11/driver/xf86-video-fglrx/patches.upstream/{replace_old_procfs_calls.patch => xf86-video-fglrx-12.10-replace_old_procfs_calls.patch} (72%)

diff --git a/packages/x11/driver/xf86-video-fglrx-legacy/patches.upstream/xf86-video-fglrx-legacy-12.6-remove-overlapping-pci-ids.patch b/packages/x11/driver/xf86-video-fglrx-legacy/patches.upstream/xf86-video-fglrx-legacy-12.6-remove-overlapping-pci-ids.patch
deleted file mode 100644
index e805e46f07..0000000000
--- a/packages/x11/driver/xf86-video-fglrx-legacy/patches.upstream/xf86-video-fglrx-legacy-12.6-remove-overlapping-pci-ids.patch
+++ /dev/null
@@ -1,433 +0,0 @@
-diff -Naur xf86-video-fglrx-legacy-12.6/common/lib/modules/fglrx/build_mod/fglrxko_pci_ids.h xf86-video-fglrx-legacy-12.6.patch/common/lib/modules/fglrx/build_mod/fglrxko_pci_ids.h
---- xf86-video-fglrx-legacy-12.6/common/lib/modules/fglrx/build_mod/fglrxko_pci_ids.h	2012-07-18 17:58:01.000000000 +0200
-+++ xf86-video-fglrx-legacy-12.6.patch/common/lib/modules/fglrx/build_mod/fglrxko_pci_ids.h	2013-06-06 23:56:41.440839811 +0200
-@@ -12,325 +12,138 @@
-  *  year of creation of the work.
-  */
- 
--    FGL_ASIC_ID(0x9640),
--    FGL_ASIC_ID(0x9641),
--    FGL_ASIC_ID(0x9642),
--    FGL_ASIC_ID(0x9643),
--    FGL_ASIC_ID(0x9644),
--    FGL_ASIC_ID(0x9645),
--    FGL_ASIC_ID(0x9647),
--    FGL_ASIC_ID(0x9648),
--    FGL_ASIC_ID(0x9649),
--    FGL_ASIC_ID(0x964A),
--    FGL_ASIC_ID(0x964B),
--    FGL_ASIC_ID(0x964C),
--    FGL_ASIC_ID(0x964E),
--    FGL_ASIC_ID(0x964F),
--    FGL_ASIC_ID(0x9903),
--    FGL_ASIC_ID(0x9904),
--    FGL_ASIC_ID(0x990F),
--    FGL_ASIC_ID(0x9905),
--    FGL_ASIC_ID(0x9906),
--    FGL_ASIC_ID(0x9907),
--    FGL_ASIC_ID(0x9908),
--    FGL_ASIC_ID(0x9909),
--    FGL_ASIC_ID(0x9992),
--    FGL_ASIC_ID(0x9993),
--    FGL_ASIC_ID(0x9994),
--    FGL_ASIC_ID(0x990A),
--    FGL_ASIC_ID(0x9900),
--    FGL_ASIC_ID(0x9901),
--    FGL_ASIC_ID(0x9990),
--    FGL_ASIC_ID(0x9991),
--    FGL_ASIC_ID(0x9803),
--    FGL_ASIC_ID(0x9804),
--    FGL_ASIC_ID(0x9805),
--    FGL_ASIC_ID(0x9802),
--    FGL_ASIC_ID(0x9808),
--    FGL_ASIC_ID(0x9809),
--    FGL_ASIC_ID(0x9806),
--    FGL_ASIC_ID(0x9807),
--    FGL_ASIC_ID(0x9610),
--    FGL_ASIC_ID(0x9611),
--    FGL_ASIC_ID(0x9612),
--    FGL_ASIC_ID(0x9613),
--    FGL_ASIC_ID(0x9614),
--    FGL_ASIC_ID(0x9615),
--    FGL_ASIC_ID(0x9616),
--    FGL_ASIC_ID(0x9710),
--    FGL_ASIC_ID(0x9711),
--    FGL_ASIC_ID(0x9712),
--    FGL_ASIC_ID(0x9713),
--    FGL_ASIC_ID(0x9714),
--    FGL_ASIC_ID(0x9715),
--    FGL_ASIC_ID(0x68F8),
--    FGL_ASIC_ID(0x68F9),
--    FGL_ASIC_ID(0x68FE),
--    FGL_ASIC_ID(0x68FA),
--    FGL_ASIC_ID(0x689B),
--    FGL_ASIC_ID(0x689E),
--    FGL_ASIC_ID(0x6898),
--    FGL_ASIC_ID(0x6899),
--    FGL_ASIC_ID(0x689C),
--    FGL_ASIC_ID(0x689D),
--    FGL_ASIC_ID(0x68B8),
--    FGL_ASIC_ID(0x68B9),
--    FGL_ASIC_ID(0x68BE),
--    FGL_ASIC_ID(0x68BA),
--    FGL_ASIC_ID(0x68BF),
--    FGL_ASIC_ID(0x68DA),
--    FGL_ASIC_ID(0x68D8),
--    FGL_ASIC_ID(0x68D9),
--    FGL_ASIC_ID(0x68DE),
--    FGL_ASIC_ID(0x6738),
--    FGL_ASIC_ID(0x6739),
--    FGL_ASIC_ID(0x673E),
--    FGL_ASIC_ID(0x6778),
--    FGL_ASIC_ID(0x677B),
--    FGL_ASIC_ID(0x6772),
--    FGL_ASIC_ID(0x6779),
--    FGL_ASIC_ID(0x6770),
--    FGL_ASIC_ID(0x671F),
--    FGL_ASIC_ID(0x6718),
--    FGL_ASIC_ID(0x6719),
--    FGL_ASIC_ID(0x671C),
--    FGL_ASIC_ID(0x671D),
--    FGL_ASIC_ID(0x675F),
--    FGL_ASIC_ID(0x6751),
--    FGL_ASIC_ID(0x675B),
--    FGL_ASIC_ID(0x675D),
--    FGL_ASIC_ID(0x6758),
--    FGL_ASIC_ID(0x6759),
--    FGL_ASIC_ID(0x6750),
-+    /* Those are all PC IDs that are not existing in the non legacy fglrx */
-     FGL_ASIC_ID(0x9400),
-     FGL_ASIC_ID(0x9401),
-     FGL_ASIC_ID(0x9402),
-     FGL_ASIC_ID(0x9403),
-     FGL_ASIC_ID(0x9405),
--    FGL_ASIC_ID(0x950F),
--    FGL_ASIC_ID(0x9513),
--    FGL_ASIC_ID(0x9451),
-+    FGL_ASIC_ID(0x940A),
-+    FGL_ASIC_ID(0x940B),
-+    FGL_ASIC_ID(0x940F),
-+    FGL_ASIC_ID(0x9440),
-     FGL_ASIC_ID(0x9441),
-+    FGL_ASIC_ID(0x9442),
-     FGL_ASIC_ID(0x9443),
-+    FGL_ASIC_ID(0x9444),
-+    FGL_ASIC_ID(0x9446),
-+    FGL_ASIC_ID(0x9447),
-+    FGL_ASIC_ID(0x944A),
-+    FGL_ASIC_ID(0x944B),
-+    FGL_ASIC_ID(0x944C),
-+    FGL_ASIC_ID(0x944E),
-+    FGL_ASIC_ID(0x944F),
-+    FGL_ASIC_ID(0x9450),
-+    FGL_ASIC_ID(0x9451),
-+    FGL_ASIC_ID(0x9452),
-+    FGL_ASIC_ID(0x9456),
-+    FGL_ASIC_ID(0x945A),
-+    FGL_ASIC_ID(0x945B),
-+    FGL_ASIC_ID(0x945E),
-+    FGL_ASIC_ID(0x9460),
-+    FGL_ASIC_ID(0x9462),
-+    FGL_ASIC_ID(0x946A),
-+    FGL_ASIC_ID(0x946B),
-+    FGL_ASIC_ID(0x947A),
-+    FGL_ASIC_ID(0x947B),
-+    FGL_ASIC_ID(0x9480),
-+    FGL_ASIC_ID(0x9487),
-+    FGL_ASIC_ID(0x9488),
-+    FGL_ASIC_ID(0x9489),
-+    FGL_ASIC_ID(0x948A),
-+    FGL_ASIC_ID(0x948F),
-+    FGL_ASIC_ID(0x9490),
-+    FGL_ASIC_ID(0x9491),
-+    FGL_ASIC_ID(0x9495),
-+    FGL_ASIC_ID(0x9498),
-+    FGL_ASIC_ID(0x949C),
-+    FGL_ASIC_ID(0x949E),
-+    FGL_ASIC_ID(0x949F),
-+    FGL_ASIC_ID(0x94A0),
-+    FGL_ASIC_ID(0x94A1),
-+    FGL_ASIC_ID(0x94A3),
-+    FGL_ASIC_ID(0x94B1),
-+    FGL_ASIC_ID(0x94B3),
-+    FGL_ASIC_ID(0x94B4),
-+    FGL_ASIC_ID(0x94B5),
-     FGL_ASIC_ID(0x94C0),
--    FGL_ASIC_ID(0x94C7),
--    FGL_ASIC_ID(0x94C4),
--    FGL_ASIC_ID(0x94C5),
-     FGL_ASIC_ID(0x94C1),
-     FGL_ASIC_ID(0x94C3),
--    FGL_ASIC_ID(0x94CC),
-+    FGL_ASIC_ID(0x94C4),
-+    FGL_ASIC_ID(0x94C5),
-     FGL_ASIC_ID(0x94C6),
--    FGL_ASIC_ID(0x95C0),
--    FGL_ASIC_ID(0x95C5),
--    FGL_ASIC_ID(0x95C7),
--    FGL_ASIC_ID(0x95C9),
--    FGL_ASIC_ID(0x95C6),
--    FGL_ASIC_ID(0x958E),
--    FGL_ASIC_ID(0x958A),
--    FGL_ASIC_ID(0x9586),
--    FGL_ASIC_ID(0x9587),
--    FGL_ASIC_ID(0x9580),
--    FGL_ASIC_ID(0x9588),
--    FGL_ASIC_ID(0x9589),
--    FGL_ASIC_ID(0x9590),
--    FGL_ASIC_ID(0x9598),
--    FGL_ASIC_ID(0x9599),
--    FGL_ASIC_ID(0x9596),
--    FGL_ASIC_ID(0x9597),
-+    FGL_ASIC_ID(0x94C7),
-+    FGL_ASIC_ID(0x94C8),
-+    FGL_ASIC_ID(0x94C9),
-+    FGL_ASIC_ID(0x94CB),
-+    FGL_ASIC_ID(0x94CC),
-     FGL_ASIC_ID(0x9500),
--    FGL_ASIC_ID(0x9515),
--    FGL_ASIC_ID(0x9505),
-     FGL_ASIC_ID(0x9501),
-+    FGL_ASIC_ID(0x9504),
-+    FGL_ASIC_ID(0x9505),
-+    FGL_ASIC_ID(0x9506),
-     FGL_ASIC_ID(0x9507),
--    FGL_ASIC_ID(0x9519),
-+    FGL_ASIC_ID(0x9508),
-+    FGL_ASIC_ID(0x9509),
-+    FGL_ASIC_ID(0x950F),
-+    FGL_ASIC_ID(0x9511),
-+    FGL_ASIC_ID(0x9513),
-+    FGL_ASIC_ID(0x9515),
-     FGL_ASIC_ID(0x9517),
-+    FGL_ASIC_ID(0x9519),
-     FGL_ASIC_ID(0x9540),
-     FGL_ASIC_ID(0x9541),
-     FGL_ASIC_ID(0x9542),
-     FGL_ASIC_ID(0x954E),
-     FGL_ASIC_ID(0x954F),
--    FGL_ASIC_ID(0x9487),
--    FGL_ASIC_ID(0x948F),
--    FGL_ASIC_ID(0x9498),
--    FGL_ASIC_ID(0x9490),
--    FGL_ASIC_ID(0x9495),
--    FGL_ASIC_ID(0x94B5),
--    FGL_ASIC_ID(0x94B3),
--    FGL_ASIC_ID(0x94B1),
--    FGL_ASIC_ID(0x94B4),
--    FGL_ASIC_ID(0x944C),
--    FGL_ASIC_ID(0x9450),
--    FGL_ASIC_ID(0x9452),
--    FGL_ASIC_ID(0x9442),
--    FGL_ASIC_ID(0x9440),
--    FGL_ASIC_ID(0x944E),
--    FGL_ASIC_ID(0x9460),
--    FGL_ASIC_ID(0x9462),
--    FGL_ASIC_ID(0x6838),
--    FGL_ASIC_ID(0x6839),
--    FGL_ASIC_ID(0x683B),
--    FGL_ASIC_ID(0x683D),
--    FGL_ASIC_ID(0x683F),
--    FGL_ASIC_ID(0x6858),
--    FGL_ASIC_ID(0x6859),
--    FGL_ASIC_ID(0x6849),
--    FGL_ASIC_ID(0x6850),
--    FGL_ASIC_ID(0x6818),
--    FGL_ASIC_ID(0x6819),
--    FGL_ASIC_ID(0x6798),
--    FGL_ASIC_ID(0x679A),
--    FGL_ASIC_ID(0x6799),
--    FGL_ASIC_ID(0x679E),
--    FGL_ASIC_ID(0x68A0),
--    FGL_ASIC_ID(0x68B0),
--    FGL_ASIC_ID(0x68B1),
--    FGL_ASIC_ID(0x68A1),
--    FGL_ASIC_ID(0x68A8),
--    FGL_ASIC_ID(0x6890),
--    FGL_ASIC_ID(0x68C0),
--    FGL_ASIC_ID(0x68C1),
--    FGL_ASIC_ID(0x68D0),
--    FGL_ASIC_ID(0x68D1),
--    FGL_ASIC_ID(0x68C7),
--    FGL_ASIC_ID(0x68E0),
--    FGL_ASIC_ID(0x68E1),
--    FGL_ASIC_ID(0x68F0),
--    FGL_ASIC_ID(0x68F1),
--    FGL_ASIC_ID(0x68E4),
--    FGL_ASIC_ID(0x68E5),
--    FGL_ASIC_ID(0x94CB),
--    FGL_ASIC_ID(0x94C9),
--    FGL_ASIC_ID(0x94C8),
-+    FGL_ASIC_ID(0x9552),
-+    FGL_ASIC_ID(0x9553),
-+    FGL_ASIC_ID(0x9555),
-+    FGL_ASIC_ID(0x9557),
-+    FGL_ASIC_ID(0x955F),
-+    FGL_ASIC_ID(0x9580),
-     FGL_ASIC_ID(0x9581),
-     FGL_ASIC_ID(0x9583),
-+    FGL_ASIC_ID(0x9586),
-+    FGL_ASIC_ID(0x9587),
-+    FGL_ASIC_ID(0x9588),
-+    FGL_ASIC_ID(0x9589),
-+    FGL_ASIC_ID(0x958A),
-     FGL_ASIC_ID(0x958B),
--    FGL_ASIC_ID(0x95C4),
--    FGL_ASIC_ID(0x95C2),
-+    FGL_ASIC_ID(0x958C),
-+    FGL_ASIC_ID(0x958D),
-+    FGL_ASIC_ID(0x958E),
-+    FGL_ASIC_ID(0x958F),
-+    FGL_ASIC_ID(0x9590),
-     FGL_ASIC_ID(0x9591),
-     FGL_ASIC_ID(0x9593),
--    FGL_ASIC_ID(0x9506),
--    FGL_ASIC_ID(0x9508),
--    FGL_ASIC_ID(0x9504),
--    FGL_ASIC_ID(0x9509),
--    FGL_ASIC_ID(0x9553),
--    FGL_ASIC_ID(0x9552),
--    FGL_ASIC_ID(0x955F),
--    FGL_ASIC_ID(0x9555),
--    FGL_ASIC_ID(0x9491),
--    FGL_ASIC_ID(0x9480),
--    FGL_ASIC_ID(0x9488),
--    FGL_ASIC_ID(0x948A),
--    FGL_ASIC_ID(0x94A0),
--    FGL_ASIC_ID(0x94A1),
--    FGL_ASIC_ID(0x945A),
--    FGL_ASIC_ID(0x945B),
--    FGL_ASIC_ID(0x945E),
--    FGL_ASIC_ID(0x944A),
--    FGL_ASIC_ID(0x944B),
--    FGL_ASIC_ID(0x6720),
--    FGL_ASIC_ID(0x6721),
--    FGL_ASIC_ID(0x6724),
--    FGL_ASIC_ID(0x6725),
--    FGL_ASIC_ID(0x6764),
--    FGL_ASIC_ID(0x6765),
--    FGL_ASIC_ID(0x6763),
--    FGL_ASIC_ID(0x6761),
--    FGL_ASIC_ID(0x6760),
--    FGL_ASIC_ID(0x6744),
--    FGL_ASIC_ID(0x6745),
--    FGL_ASIC_ID(0x6742),
--    FGL_ASIC_ID(0x6743),
--    FGL_ASIC_ID(0x6741),
--    FGL_ASIC_ID(0x6740),
--    FGL_ASIC_ID(0x6820),
--    FGL_ASIC_ID(0x6821),
--    FGL_ASIC_ID(0x6824),
--    FGL_ASIC_ID(0x6825),
--    FGL_ASIC_ID(0x6830),
--    FGL_ASIC_ID(0x6827),
--    FGL_ASIC_ID(0x682D),
--    FGL_ASIC_ID(0x682F),
--    FGL_ASIC_ID(0x6831),
--    FGL_ASIC_ID(0x6823),
--    FGL_ASIC_ID(0x6826),
--    FGL_ASIC_ID(0x6843),
--    FGL_ASIC_ID(0x6840),
--    FGL_ASIC_ID(0x6841),
--    FGL_ASIC_ID(0x6842),
--    FGL_ASIC_ID(0x6800),
--    FGL_ASIC_ID(0x6801),
--    FGL_ASIC_ID(0x68F1),
--    FGL_ASIC_ID(0x68E8),
--    FGL_ASIC_ID(0x68E9),
--    FGL_ASIC_ID(0x6888),
--    FGL_ASIC_ID(0x6889),
--    FGL_ASIC_ID(0x688A),
--    FGL_ASIC_ID(0x688D),
--    FGL_ASIC_ID(0x688C),
--    FGL_ASIC_ID(0x68A9),
--    FGL_ASIC_ID(0x6880),
--    FGL_ASIC_ID(0x68C8),
--    FGL_ASIC_ID(0x68C9),
--    FGL_ASIC_ID(0x958F),
-     FGL_ASIC_ID(0x9595),
-+    FGL_ASIC_ID(0x9596),
-+    FGL_ASIC_ID(0x9597),
-+    FGL_ASIC_ID(0x9598),
-+    FGL_ASIC_ID(0x9599),
-     FGL_ASIC_ID(0x959B),
--    FGL_ASIC_ID(0x9557),
--    FGL_ASIC_ID(0x9489),
--    FGL_ASIC_ID(0x94A3),
--    FGL_ASIC_ID(0x947A),
--    FGL_ASIC_ID(0x947B),
--    FGL_ASIC_ID(0x946A),
--    FGL_ASIC_ID(0x946B),
--    FGL_ASIC_ID(0x6728),
--    FGL_ASIC_ID(0x6729),
--    FGL_ASIC_ID(0x6722),
--    FGL_ASIC_ID(0x6723),
--    FGL_ASIC_ID(0x6726),
--    FGL_ASIC_ID(0x6727),
--    FGL_ASIC_ID(0x6766),
--    FGL_ASIC_ID(0x6767),
--    FGL_ASIC_ID(0x6768),
--    FGL_ASIC_ID(0x6762),
--    FGL_ASIC_ID(0x6700),
--    FGL_ASIC_ID(0x6701),
--    FGL_ASIC_ID(0x6702),
--    FGL_ASIC_ID(0x6703),
--    FGL_ASIC_ID(0x6704),
--    FGL_ASIC_ID(0x6705),
--    FGL_ASIC_ID(0x6706),
--    FGL_ASIC_ID(0x6707),
--    FGL_ASIC_ID(0x6708),
--    FGL_ASIC_ID(0x6709),
--    FGL_ASIC_ID(0x674A),
--    FGL_ASIC_ID(0x6746),
--    FGL_ASIC_ID(0x6747),
--    FGL_ASIC_ID(0x6748),
--    FGL_ASIC_ID(0x6749),
--    FGL_ASIC_ID(0x940F),
--    FGL_ASIC_ID(0x940B),
--    FGL_ASIC_ID(0x940A),
--    FGL_ASIC_ID(0x944F),
--    FGL_ASIC_ID(0x9447),
-+    FGL_ASIC_ID(0x95C0),
-+    FGL_ASIC_ID(0x95C2),
-+    FGL_ASIC_ID(0x95C4),
-+    FGL_ASIC_ID(0x95C5),
-+    FGL_ASIC_ID(0x95C6),
-+    FGL_ASIC_ID(0x95C7),
-+    FGL_ASIC_ID(0x95C9),
-     FGL_ASIC_ID(0x95CC),
--    FGL_ASIC_ID(0x958C),
--    FGL_ASIC_ID(0x958D),
--    FGL_ASIC_ID(0x9511),
--    FGL_ASIC_ID(0x949C),
--    FGL_ASIC_ID(0x949F),
--    FGL_ASIC_ID(0x949E),
--    FGL_ASIC_ID(0x9444),
--    FGL_ASIC_ID(0x9456),
--    FGL_ASIC_ID(0x9446),
--    FGL_ASIC_ID(0x6828),
--    FGL_ASIC_ID(0x6808),
--    FGL_ASIC_ID(0x684C),
--    FGL_ASIC_ID(0x6809),
--    FGL_ASIC_ID(0x6780),
--    FGL_ASIC_ID(0x6784),
--    FGL_ASIC_ID(0x6788),
--    FGL_ASIC_ID(0x678A),
--    FGL_ASIC_ID(0x68F2),
-     FGL_ASIC_ID(0x95CD),
-     FGL_ASIC_ID(0x95CE),
-     FGL_ASIC_ID(0x95CF),
--    
-+    FGL_ASIC_ID(0x9610),
-+    FGL_ASIC_ID(0x9611),
-+    FGL_ASIC_ID(0x9612),
-+    FGL_ASIC_ID(0x9613),
-+    FGL_ASIC_ID(0x9614),
-+    FGL_ASIC_ID(0x9615),
-+    FGL_ASIC_ID(0x9616),
-+    FGL_ASIC_ID(0x9710),
-+    FGL_ASIC_ID(0x9711),
-+    FGL_ASIC_ID(0x9712),
-+    FGL_ASIC_ID(0x9713),
-+    FGL_ASIC_ID(0x9714),
-+    FGL_ASIC_ID(0x9715), 
diff --git a/packages/x11/driver/xf86-video-fglrx/build b/packages/x11/driver/xf86-video-fglrx/build
index 27cee58478..2e8c90dbce 100755
--- a/packages/x11/driver/xf86-video-fglrx/build
+++ b/packages/x11/driver/xf86-video-fglrx/build
@@ -47,8 +47,7 @@ cd $ROOT/$PKG_BUILD
   mkdir -p $INSTALL_DIR/etc/ati
     cp common/etc/ati/amdpcsdb.default $INSTALL_DIR/etc/ati
     cp common/etc/ati/control $INSTALL_DIR/etc/ati
-    #cp common/etc/ati/signature $INSTALL_DIR/etc/ati
-    echo "b707d1012f4412b1c0f865b95bee38e0:8e29e1311d692383f0c1578136c309d48f32e6326c6953e589d85d8b6edb0ad0:8f62e3384a752180f19c538069dd00d3d137b2301a732a80f3ce068a6bd75cd48f61e2334a722183f69b53806edd5dd58f3eb5391a202ad3f69d01db6b8f5cd0" > $INSTALL_DIR/etc/ati/signature
+    cp common/etc/ati/signature $INSTALL_DIR/etc/ati
     ln -sf /storage/.config/fglrx.conf $INSTALL_DIR/etc/ati/amdpcsdb
 
 (
@@ -101,21 +100,20 @@ cd $ROOT/$PKG_BUILD
   mkdir -p $INSTALL_DIR/lib/xorg/modules/linux
     cp -P $BASEDIR/usr/X11R6/$LIBDIR/modules/linux/*.so $INSTALL_DIR/lib/xorg/modules/linux
 
-# disabled until we can expect non broken drivers from AMD:
-# if [ "$XVBA" = yes ]; then
-#   cp arch/$FGLRX_ARCH/usr/X11R6/$LIBDIR/libAMDXvBA.cap $INSTALL_DIR/lib
-#   cp arch/$FGLRX_ARCH/usr/X11R6/$LIBDIR/libAMDXvBA.so* $INSTALL_DIR/lib/libAMDXvBA.so.1
-#   cp arch/$FGLRX_ARCH/usr/X11R6/$LIBDIR/libXvBAW.so* $INSTALL_DIR/lib/libXvBAW.so.1
+if [ "$XVBA" = yes ]; then
+  cp arch/$FGLRX_ARCH/usr/X11R6/$LIBDIR/libAMDXvBA.cap $INSTALL_DIR/lib
+  cp arch/$FGLRX_ARCH/usr/X11R6/$LIBDIR/libAMDXvBA.so* $INSTALL_DIR/lib/libAMDXvBA.so.1
+  cp arch/$FGLRX_ARCH/usr/X11R6/$LIBDIR/libXvBAW.so* $INSTALL_DIR/lib/libXvBAW.so.1
 
-# # install needed files for toolchain
-#   mkdir -p $SYSROOT_PREFIX/usr/include/amd
-#     cp $PKG_DIR/source/amdxvba.h $SYSROOT_PREFIX/usr/include/amd
+# install needed files for toolchain
+  mkdir -p $SYSROOT_PREFIX/usr/include/amd
+    cp $PKG_DIR/source/amdxvba.h $SYSROOT_PREFIX/usr/include/amd
 
-#   mkdir -p $SYSROOT_PREFIX/usr/lib
-#     cp arch/$FGLRX_ARCH/usr/X11R6/*/libXvBAW.so* $SYSROOT_PREFIX/usr/lib
-#     ln -sf libXvBAW.so.1.0 $SYSROOT_PREFIX/usr/lib/libXvBAW.so.1
-#     ln -sf libXvBAW.so.1 $SYSROOT_PREFIX/usr/lib/libXvBAW.so
-# fi
+  mkdir -p $SYSROOT_PREFIX/usr/lib
+    cp arch/$FGLRX_ARCH/usr/X11R6/*/libXvBAW.so* $SYSROOT_PREFIX/usr/lib
+    ln -sf libXvBAW.so.1.0 $SYSROOT_PREFIX/usr/lib/libXvBAW.so.1
+    ln -sf libXvBAW.so.1 $SYSROOT_PREFIX/usr/lib/libXvBAW.so
+fi
 
 (
   cd $INSTALL_DIR/
diff --git a/packages/x11/driver/xf86-video-fglrx/config/amdpcsdb b/packages/x11/driver/xf86-video-fglrx/config/amdpcsdb
index 0ba5ce60b3..78f3aa06da 100644
--- a/packages/x11/driver/xf86-video-fglrx/config/amdpcsdb
+++ b/packages/x11/driver/xf86-video-fglrx/config/amdpcsdb
@@ -2,6 +2,7 @@ AMDPCSDBV1
 [AMDPCSROOT/SYSTEM/MCIL]
 DigitalHDTVDefaultUnderscan=V0
 UvdEnabled=V1
+HWUVD_H264Level51Support=V1
 
 [AMDPCSROOT/SYSTEM/DDX]
 
diff --git a/packages/x11/driver/xf86-video-fglrx/meta b/packages/x11/driver/xf86-video-fglrx/meta
index 844abf5999..653a3c6be4 100644
--- a/packages/x11/driver/xf86-video-fglrx/meta
+++ b/packages/x11/driver/xf86-video-fglrx/meta
@@ -17,15 +17,14 @@
 #  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################
-#http://www2.ati.com/drivers/beta/amd-driver-installer-catalyst-13-6-beta-x86.x86_64.zip
+
 PKG_NAME="xf86-video-fglrx"
-PKG_VERSION="13-6"
+PKG_VERSION="12.10"
 PKG_REV="1"
 PKG_ARCH="i386 x86_64"
 PKG_LICENSE="nonfree"
 PKG_SITE="http://www.ati.com/"
-#PKG_URL="http://www2.ati.com/drivers/linux/amd-driver-installer-catalyst-$PKG_VERSION-x86.x86_64.zip"
-PKG_URL="http://www2.ati.com/drivers/beta/amd-driver-installer-catalyst-$PKG_VERSION-beta-x86.x86_64.zip"
+PKG_URL="http://www2.ati.com/drivers/linux/amd-driver-installer-catalyst-$PKG_VERSION-x86.x86_64.zip"
 PKG_DEPENDS="linux libX11 libXinerama libXcomposite"
 PKG_BUILD_DEPENDS="toolchain util-macros libX11 libXinerama libXcomposite linux"
 PKG_PRIORITY="optional"
@@ -35,9 +34,3 @@ PKG_LONGDESC="These binary drivers provide optimized hardware acceleration of Op
 PKG_IS_ADDON="no"
 
 PKG_AUTORECONF="no"
-
-if [ "$XVBA" = yes ]; then
-# hack around broken AMD drivers
-  PKG_DEPENDS="libXVBA"
-  PKG_BUILD_DEPENDS="toolchain libXVBA"
-fi
diff --git a/packages/x11/driver/xf86-video-fglrx/patches.upstream/xf86-video-fglrx-12.10-kernel-3.7.patch b/packages/x11/driver/xf86-video-fglrx/patches.upstream/xf86-video-fglrx-12.10-kernel-3.7.patch
new file mode 100644
index 0000000000..47cd425aa5
--- /dev/null
+++ b/packages/x11/driver/xf86-video-fglrx/patches.upstream/xf86-video-fglrx-12.10-kernel-3.7.patch
@@ -0,0 +1,132 @@
+--- 12.9/common/lib/modules/fglrx/build_mod/firegl_public.c	2012-09-26 15:04:28.000000000 +0200
++++ 12.9/common/lib/modules/fglrx/build_mod/firegl_public.c	2012-10-16 20:30:42.146523753 +0200
+@@ -3892,7 +3892,11 @@
+                 KCL_DEBUG_ERROR(REMAP_PAGE_RANGE_STR " failed\n");
+                 return -EAGAIN;
+             }
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0)
+             vma->vm_flags |= VM_SHM | VM_RESERVED; /* Don't swap */
++#else
++            vma->vm_flags |= VM_SHM | VM_DONTEXPAND | VM_DONTDUMP; /* Don't swap */
++#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */
+             vma->vm_ops = &vm_ops;
+ 			break;
+ 
+@@ -3922,14 +3926,22 @@
+                 KCL_DEBUG_ERROR(REMAP_PAGE_RANGE_STR " failed\n");
+                 return -EAGAIN;
+             }
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0)
+             vma->vm_flags |= VM_SHM | VM_RESERVED; /* Don't swap */
++#else
++            vma->vm_flags |= VM_SHM | VM_DONTEXPAND | VM_DONTDUMP; /* Don't swap */
++#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */
+             vma->vm_ops = &vm_ops;
+             }
+ 			break;
+ #endif                    
+ 
+         case __KE_SHM:
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0)
+             vma->vm_flags |= VM_SHM | VM_RESERVED; /* Don't swap */
++#else
++            vma->vm_flags |= VM_SHM | VM_DONTEXPAND | VM_DONTDUMP; /* Don't swap */
++#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */
+             vma->vm_ops = &vm_shm_ops;
+             break;
+ 
+@@ -3937,7 +3949,11 @@
+ 
+             pages = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0)
+             vma->vm_flags |= VM_RESERVED;
++#else
++            vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP;
++#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */
+ 
+             //vma->vm_flags |=  VM_SHM | VM_LOCKED; /* DDDDDDDDDDon't swap */
+             //vma->vm_mm->locked_vm += pages; /* Kernel tracks aqmount of locked pages */
+@@ -3946,14 +3962,22 @@
+ 
+         case __KE_CTX:
+             pages = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0)
+             vma->vm_flags |= VM_LOCKED | VM_SHM | VM_RESERVED; /* Don't swap */
++#else
++            vma->vm_flags |= VM_LOCKED | VM_SHM | VM_DONTEXPAND | VM_DONTDUMP; /* Don't swap */
++#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */
+             vma->vm_mm->locked_vm += pages; /* Kernel tracks aqmount of locked pages */
+             vma->vm_ops = &vm_ctx_ops;
+             break;
+ 
+         case __KE_PCI_BQS:
+             pages = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0)
+             vma->vm_flags |= VM_LOCKED | VM_SHM | VM_RESERVED; /* Don't swap */
++#else
++            vma->vm_flags |= VM_LOCKED | VM_SHM | VM_DONTEXPAND | VM_DONTDUMP; /* Don't swap */
++#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */
+             vma->vm_mm->locked_vm += pages; /* Kernel tracks aqmount of locked pages */
+             vma->vm_ops = &vm_pci_bq_ops;
+             break;
+@@ -3984,9 +4008,17 @@
+                     return -EAGAIN;
+                 }
+ #ifdef __x86_64__
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0)
+                 vma->vm_flags |= VM_RESERVED;
+ #else
++                vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP;
++#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */
++#else
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0)
+                 vma->vm_flags |= VM_SHM | VM_RESERVED; /* Don't swap */
++#else
++                vma->vm_flags |= VM_SHM | VM_DONTEXPAND | VM_DONTDUMP; /* Don't swap */
++#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */
+ #endif
+                 vma->vm_ops = &vm_ops;
+             }
+@@ -4015,9 +4047,17 @@
+                     return -EAGAIN;
+                 }
+ #ifdef __x86_64__
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0)
+                 vma->vm_flags |= VM_RESERVED;
+ #else
++                vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP;
++#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */
++#else
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0)
+                 vma->vm_flags |= VM_SHM | VM_RESERVED; /* Don't swap */
++#else
++                vma->vm_flags |= VM_SHM | VM_DONTEXPAND | VM_DONTDUMP; /* Don't swap */
++#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */
+ #endif
+                 vma->vm_ops = &vm_agp_bq_ops;
+             }
+@@ -4025,7 +4065,11 @@
+ #endif /* __AGP__BUILTIN__ */
+ 
+         case __KE_KMAP:
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0)
+ 		    vma->vm_flags |= VM_SHM | VM_RESERVED;
++#else
++		    vma->vm_flags |= VM_SHM | VM_DONTEXPAND | VM_DONTDUMP;
++#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */
+             vma->vm_ops = &vm_kmap_ops;
+             if (readonly && (vma->vm_flags & VM_WRITE))
+             {
+@@ -4046,7 +4090,11 @@
+ #endif            
+             // fall through
+          case __KE_GART_CACHEABLE:
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0)
+              vma->vm_flags |= VM_RESERVED;
++#else
++             vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP;
++#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */
+              vma->vm_ops = &vm_gart_ops;
+              break;
+         default:
diff --git a/packages/x11/driver/xf86-video-fglrx/patches.upstream/xf86-video-fglrx-12.10-kernel-3.8.patch b/packages/x11/driver/xf86-video-fglrx/patches.upstream/xf86-video-fglrx-12.10-kernel-3.8.patch
new file mode 100644
index 0000000000..ad2f3f18cf
--- /dev/null
+++ b/packages/x11/driver/xf86-video-fglrx/patches.upstream/xf86-video-fglrx-12.10-kernel-3.8.patch
@@ -0,0 +1,13 @@
+--- 12.11/common/lib/modules/fglrx/build_mod/kcl_acpi.c	2012-10-23 22:44:52.000000000 +0200
++++ 12.11/common/lib/modules/fglrx/build_mod/kcl_acpi.c	2012-12-22 22:11:30.289750331 +0100
+@@ -775,7 +775,9 @@
+ unsigned int ATI_API_CALL KCL_ACPI_GetHandles(kcl_match_info_t *pInfo)
+ {
+ #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12)
+-    #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,19)
++    #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)
++        pInfo->video_handle = pInfo->pcidev->dev.acpi_node.handle;
++    #elif LINUX_VERSION_CODE > KERNEL_VERSION(2,6,19)
+         pInfo->video_handle = pInfo->pcidev->dev.archdata.acpi_handle;
+     #else 
+         pInfo->video_handle = pInfo->pcidev->dev.firmware_data;
diff --git a/packages/x11/driver/xf86-video-fglrx/patches.upstream/xf86-video-fglrx-12.10-remove-overlapping-pci-ids.patch b/packages/x11/driver/xf86-video-fglrx/patches.upstream/xf86-video-fglrx-12.10-remove-overlapping-pci-ids.patch
new file mode 100644
index 0000000000..cb6d32642f
--- /dev/null
+++ b/packages/x11/driver/xf86-video-fglrx/patches.upstream/xf86-video-fglrx-12.10-remove-overlapping-pci-ids.patch
@@ -0,0 +1,20 @@
+diff --git a/common/lib/modules/fglrx/build_mod/fglrxko_pci_ids.h b/common/lib/modules/fglrx/build_mod/fglrxko_pci_ids.h
+index b358d0b..d45a78a 100755
+--- a/common/lib/modules/fglrx/build_mod/fglrxko_pci_ids.h
++++ b/common/lib/modules/fglrx/build_mod/fglrxko_pci_ids.h
+@@ -97,7 +97,6 @@
+     FGL_ASIC_ID(0x677B),
+     FGL_ASIC_ID(0x6772),
+     FGL_ASIC_ID(0x6779),
+-    FGL_ASIC_ID(0x6770),
+     FGL_ASIC_ID(0x671F),
+     FGL_ASIC_ID(0x6718),
+     FGL_ASIC_ID(0x6719),
+@@ -147,7 +146,6 @@
+     FGL_ASIC_ID(0x68D1),
+     FGL_ASIC_ID(0x68C7),
+     FGL_ASIC_ID(0x68E0),
+-    FGL_ASIC_ID(0x68E1),
+     FGL_ASIC_ID(0x68F0),
+     FGL_ASIC_ID(0x68F1),
+     FGL_ASIC_ID(0x68E4),
diff --git a/packages/x11/driver/xf86-video-fglrx/patches.upstream/replace_old_procfs_calls.patch b/packages/x11/driver/xf86-video-fglrx/patches.upstream/xf86-video-fglrx-12.10-replace_old_procfs_calls.patch
similarity index 72%
rename from packages/x11/driver/xf86-video-fglrx/patches.upstream/replace_old_procfs_calls.patch
rename to packages/x11/driver/xf86-video-fglrx/patches.upstream/xf86-video-fglrx-12.10-replace_old_procfs_calls.patch
index a1f3a6ab73..ace2461268 100644
--- a/packages/x11/driver/xf86-video-fglrx/patches.upstream/replace_old_procfs_calls.patch
+++ b/packages/x11/driver/xf86-video-fglrx/patches.upstream/xf86-video-fglrx-12.10-replace_old_procfs_calls.patch
@@ -1,20 +1,7 @@
-From 455d3759e6d732a4e382dbdeca35afaedaf3f52e Mon Sep 17 00:00:00 2001
-From: Alberto Milone <alberto.milone@canonical.com>
-Date: Thu, 20 Jun 2013 16:02:12 +0200
-Subject: [PATCH 1/1] Add support for Linux 3.10
-
-source: http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/x11-drivers/ati-drivers/files/ati-drivers-13.6-linux-3.10-proc.diff
----
- drmP.h          |    4 -
- drm_proc.h      |   55 ------------
- firegl_public.c |  252 +++++++++++++++++++++++++++++++++++++++++++------------
- 3 files changed, 197 insertions(+), 114 deletions(-)
-
-diff --git a/drmP.h b/drmP.h
-index 81546b2..4e74526 100755
---- a/common/lib/modules/fglrx/build_mod/drmP.h
-+++ b/common/lib/modules/fglrx/build_mod//drmP.h
-@@ -901,10 +901,6 @@ int                   DRM(stub_register)(const char *name,
+diff -Naur xf86-video-fglrx-legacy/common/lib/modules/fglrx/build_mod/drmP.h xf86-video-fglrx-legacy.patch/common/lib/modules/fglrx/build_mod/drmP.h
+--- xf86-video-fglrx-legacy/common/lib/modules/fglrx/build_mod/drmP.h	2012-07-18 17:58:01.000000000 +0200
++++ xf86-video-fglrx-legacy.patch/common/lib/modules/fglrx/build_mod/drmP.h	2013-07-02 23:22:27.700054231 +0200
+@@ -901,10 +901,6 @@
  int                   DRM(stub_unregister)(int minor);
  
  				/* Proc support (drm_proc.h) */
@@ -25,11 +12,10 @@ index 81546b2..4e74526 100755
  extern int            DRM(proc_cleanup)(int minor,
  					struct proc_dir_entry *root,
  					struct proc_dir_entry *dev_root);
-diff --git a/drm_proc.h b/drm_proc.h
-index 1e3ab4a..c52ad7e 100755
---- a/common/lib/modules/fglrx/build_mod/drm_proc.h
-+++ b/common/lib/modules/fglrx/build_mod//drm_proc.h
-@@ -75,61 +75,6 @@ struct drm_proc_list {
+diff -Naur xf86-video-fglrx-legacy/common/lib/modules/fglrx/build_mod/drm_proc.h xf86-video-fglrx-legacy.patch/common/lib/modules/fglrx/build_mod/drm_proc.h
+--- xf86-video-fglrx-legacy/common/lib/modules/fglrx/build_mod/drm_proc.h	2012-07-18 17:58:01.000000000 +0200
++++ xf86-video-fglrx-legacy.patch/common/lib/modules/fglrx/build_mod/drm_proc.h	2013-07-02 23:22:27.701054202 +0200
+@@ -75,61 +75,6 @@
  #define DRM_PROC_ENTRIES (sizeof(DRM(proc_list))/sizeof(DRM(proc_list)[0]))
  
  /**
@@ -91,11 +77,10 @@ index 1e3ab4a..c52ad7e 100755
   * Cleanup the proc filesystem resources.
   *
   * \param minor device minor number.
-diff --git a/firegl_public.c b/firegl_public.c
-index d3ad3ce..890a0aa 100755
---- a/common/lib/modules/fglrx/build_mod/firegl_public.c
-+++ b/common/lib/modules/fglrx/build_mod//firegl_public.c
-@@ -583,6 +583,202 @@ kcl_proc_list_t KCL_PROC_FileList[] =
+diff -Naur xf86-video-fglrx-legacy/common/lib/modules/fglrx/build_mod/firegl_public.c xf86-video-fglrx-legacy.patch/common/lib/modules/fglrx/build_mod/firegl_public.c
+--- xf86-video-fglrx-legacy/common/lib/modules/fglrx/build_mod/firegl_public.c	2013-07-02 23:33:05.566156261 +0200
++++ xf86-video-fglrx-legacy.patch/common/lib/modules/fglrx/build_mod/firegl_public.c	2013-07-02 23:22:27.705054121 +0200
+@@ -571,6 +571,202 @@
      { "NULL",           NULL,                       NULL} // Terminate List!!!
  };
  
@@ -298,7 +283,7 @@ index d3ad3ce..890a0aa 100755
  static struct proc_dir_entry *firegl_proc_init( device_t *dev,
                                                  int minor,
                                                  struct proc_dir_entry *root,
-@@ -677,6 +873,7 @@ static struct proc_dir_entry *firegl_proc_init( device_t *dev,
+@@ -665,6 +861,7 @@
  
      return root;
  }
@@ -306,66 +291,4 @@ index d3ad3ce..890a0aa 100755
  
  static int firegl_proc_cleanup( int minor,
                                  struct proc_dir_entry *root,
-@@ -6135,59 +6332,4 @@ void ATI_API_CALL KCL_fpu_end(void)
-     kernel_fpu_end();
- }
- 
--/** Create new directory entry under "/proc/ati/...."
-- * Where
-- * root_dir - Root directory. If NULL then we should use "/proc/ati" root.
-- * name    - Pointer to the name of directory
-- * access  - Access attribute. We could use it to disable access to the directory for everybody accept owner.
-- *                By default owner is root.
-- * Return NULL if failure. Pointer to proc_dir_entry otherwise
-- */
--void * KCL_create_proc_dir(void *root_dir, const char *name, unsigned int access)
--{
--    struct proc_dir_entry *dir = NULL;
--
--    if (root_dir == NULL)
--         dir = create_proc_entry(name, S_IFDIR | access, firegl_stub_root);
--    else
--         dir = create_proc_entry(name, S_IFDIR | access, (struct proc_dir_entry *)root_dir);
--
--    return dir;
--}
--
--/* Remove proc directory entry
-- * root   - Pointer to directory proc entry or NULL if for "/proc/ati"
-- * name - Name to delete
-- */
--void KCL_remove_proc_dir_entry(void *root, const char *name)
--{
--    if (root == NULL)
--        remove_proc_entry(name, firegl_stub_root);
--    else
--        remove_proc_entry(name, (struct proc_dir_entry *)root);
--}
--
--
--/* Create proc_entry under "root_dir"
-- * read_fn - Function which will be called on read request
-- * write_fn - Function which will be called on write request
-- * private_data - Pointer to private data which will be passed
-- */
--void KCL_create_proc_entry(void *root_dir, const char *name, unsigned int access_mode, void *read_fn, void *write_fn, void *private_data)
--{
--    struct proc_dir_entry *ent = NULL;
--
--    if (root_dir == NULL || name == NULL)
--        return;
--
--    ent = create_proc_entry(name, access_mode, (struct proc_dir_entry *)root_dir);
--
--    if (ent)
--    {
--        ent->read_proc = (read_proc_t *)read_fn;    
--        ent->write_proc = (write_proc_t *)write_fn; 
--        ent->data = private_data;
--    }
--}
--
- #endif /* __KERNEL__ */
--- 
-1.7.9.5
-
+diff -Naur xf86-video-fglrx-legacy/common/lib/modules/fglrx/build_mod/firegl_public.c.orig xf86-video-fglrx-legacy.patch/common/lib/modules/fglrx/build_mod/firegl_public.c.orig
diff --git a/projects/ARCTIC_MC/options b/projects/ARCTIC_MC/options
index 8eec0d0aa8..edc5f67463 100755
--- a/projects/ARCTIC_MC/options
+++ b/projects/ARCTIC_MC/options
@@ -255,7 +255,7 @@
 # Xorg Graphic drivers to use (all / i915,i965,r200,r300,r600,fglrx,nvidia,nouveau,vmware)
 # Space separated list is supported,
 # e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeon nvidia nouveau"
-  GRAPHIC_DRIVERS="fglrx"
+  GRAPHIC_DRIVERS="fglrx-legacy"
 
 # XBMC Player implementation to use (default / bcm2835-driver / libamlplayer-m3)
   XBMCPLAYER_DRIVER="default"