2011/testing/kernel/default/drivers/module-fglrx - Merge from devel/kernel/default/drivers/module-fgl...

[Fatih Arslan]

Author: fatih.arslan
Date: Wed Sep  7 09:21:36 2011
New Revision: 122912

Modified:
   2011/testing/kernel/default/drivers/module-fglrx/actions.py
   2011/testing/kernel/default/drivers/module-fglrx/files/desktop-files.patch
Log:
Merge from devel/kernel/default/drivers/module-fglrx:

rev. 119200, by fatih.arslan on 2011-05-22
New catalyst drivers 1.15

BUG:COMMENT:18158

rev. 119303, by fatih.arslan on 2011-05-24
Fixing alternatives that it should point to flgrx-libGLx.so rather then libGl.so
Move and rename fglrx-libglx.so to avoid a incompability with the xorg-server ones. This also prevent us to create another alternatives link

BUG:COMMENT:18158

rev. 119304, by fatih.arslan on 2011-05-24
Just rename fglrx-libGL to libGl, better than creating lots of symlinks

rev. 119309, by fatih.arslan on 2011-05-24
New release

rev. 120477, by fatih.arslan on 2011-06-20
* New release, unfortunately AMD doesnt provide any changelogs

rev. 121870, by fatih.arslan on 2011-08-01
New release which has PowerXpress support

rev. 121874, by fatih.arslan on 2011-08-01
Ready to launch

rev. 122568, by fatih.arslan on 2011-08-19
* New release
* ATI -> AMD branding has occured at some places
* Fixing 2D corruption when using Compiz with RandR 1.3 panning enabled
* Fixing X server crash fix for unity
* Fixing blank displays when starting X with CrossFire enabled
* Fixing black cursor issues
* Add missing display properties for DisplayPor

---
 actions.py                |    5 ++++-
 files/desktop-files.patch |   42 +++++++++++++++++++++---------------------
 2 files changed, 25 insertions(+), 22 deletions(-)

Modified: 2011/testing/kernel/default/drivers/module-fglrx/actions.py
=================================================================
--- 2011/testing/kernel/default/drivers/module-fglrx/actions.py	(original)
+++ 2011/testing/kernel/default/drivers/module-fglrx/actions.py	Wed Sep  7 09:21:36 2011
@@ -61,8 +61,11 @@
     pisitools.domove("/usr/lib/modules", "/usr/lib/fglrx")
     pisitools.insinto("/usr/lib/fglrx/modules", "%s/usr/X11R6/lib*/modules/*" % XDir)
 
-    pisitools.domove("/usr/lib/libGL.so.1.2", "/usr/lib/fglrx")
+    # libGl library name changed to fglrx-libGl since 1.15
+    pisitools.domove("/usr/lib/fglrx/fglrx-libGL.so.1.2", "/usr/lib/fglrx", "libGL.so.1.2")
+
     pisitools.domove("/usr/lib/fglrx/modules/dri", "/usr/lib/xorg/modules/")
+    pisitools.domove("/usr/lib/fglrx/modules/extensions/fglrx/fglrx-libglx.so", "/usr/lib/fglrx/modules/extensions", "libglx.so")
 
     # Necessary symlinks
     pisitools.dosym("/usr/lib/xorg/modules/dri/fglrx_dri.so", "/usr/lib/dri/fglrx_dri.so")

Modified: 2011/testing/kernel/default/drivers/module-fglrx/files/desktop-files.patch
=================================================================
--- 2011/testing/kernel/default/drivers/module-fglrx/files/desktop-files.patch	(original)
+++ 2011/testing/kernel/default/drivers/module-fglrx/files/desktop-files.patch	Wed Sep  7 09:21:36 2011
@@ -14,16 +14,16 @@
 +TryExec=/sys/module/fglrx
  
  
- Name=ATI Catalyst Control Center
-@@ -44,7 +45,7 @@ Name[sv]=ATI Catalyst Control Center
- Comment[sv]=Möjliggör konfiguration av inställningar för ATI-grafikmaskinvara.
- Name[th]=ATI Catalyst Control Center
- Comment[th]=ยอมให้ตั้งค่าฮาร์ดแวร์กราฟิก ATI
--Name[tr]=ATI Catalyst Control Center
-+Name[tr]=ATI Catalyst Denetim Merkezi
- Comment[tr]=ATI grafik donanım ayarlarının yapılandırılmasına olanak sağlar.
- Name[zh_CN]=ATI Catalyst Control Center
- Comment[zh_CN]=允许配置 ATI 图形硬件设置。
+ Name=AMD Catalyst Control Center
+@@ -44,7 +45,7 @@ Name[sv]=AMD Catalyst Control Center
+ Comment[sv]=Möjliggör konfiguration av inställningar för AMD-grafikmaskinvara.
+ Name[th]=AMD Catalyst Control Center
+ Comment[th]=ยอมให้ตั้งค่าฮาร์ดแวร์กราฟิก AMD
+-Name[tr]=AMD Catalyst Control Center
++Name[tr]=AMD Catalyst Denetim Merkezi
+ Comment[tr]=AMD grafik donanım ayarlarının yapılandırılmasına olanak sağlar.
+ Name[zh_CN]=AMD Catalyst Control Center
+ Comment[zh_CN]=允许配置 AMD 图形硬件设置。
 Index: work/common/usr/share/applications/amdccclesu.desktop
 ===================================================================
 --- work.orig/common/usr/share/applications/amdccclesu.desktop
@@ -39,14 +39,14 @@
 +Icon=amdcccle
 +TryExec=/sys/module/fglrx
  
- Name=ATI Catalyst Control Center (Administrative)
- Comment=Allows the configuration of the ATI graphics hardware settings that requires administrative access.
-@@ -43,7 +44,7 @@ Name[sv]=ATI Catalyst Control Center (Ad
- Comment[sv]=Möjliggör konfiguration av inställningar för ATI-grafikmaskinvara som kräver administrativ åtkomst.
- Name[th]=ATI Catalyst Control Center (สิทธิ์ผู้ดูแลระบบ)
- Comment[th]=ยอมให้ตั้งค่าฮาร์ดแวร์กราฟิก ATI ที่ต้องใช้สิทธิ์ของผู้ดูแลระบบ
--Name[tr]=ATI Catalyst Control Center (Yönetici)
-+Name[tr]=ATI Catalyst Denetim Merkezi (Yönetici)
- Comment[tr]=Yönetici erişimi gerektiren ATI grafik donanım ayarlarının yapılandırılmasına olanak sağlar.
- Name[zh_CN]=ATI Catalyst Control Center（管理）
- Comment[zh_CN]=允许配置需要管理权限才能访问的 ATI 图形硬件设置。
+ Name=AMD Catalyst Control Center (Administrative)
+ Comment=Allows the configuration of the AMD graphics hardware settings that requires administrative access.
+@@ -43,7 +44,7 @@ Name[sv]=AMD Catalyst Control Center (Ad
+ Comment[sv]=Möjliggör konfiguration av inställningar för AMD-grafikmaskinvara som kräver administrativ åtkomst.
+ Name[th]=AMD Catalyst Control Center (สิทธิ์ผู้ดูแลระบบ)
+ Comment[th]=ยอมให้ตั้งค่าฮาร์ดแวร์กราฟิก AMD ที่ต้องใช้สิทธิ์ของผู้ดูแลระบบ
+-Name[tr]=AMD Catalyst Control Center (Yönetici)
++Name[tr]=AMD Catalyst Denetim Merkezi (Yönetici)
+ Comment[tr]=Yönetici erişimi gerektiren AMD grafik donanım ayarlarının yapılandırılmasına olanak sağlar.
+ Name[zh_CN]=AMD Catalyst Control Center（管理）
+ Comment[zh_CN]=允许配置需要管理权限才能访问的 AMD 图形硬件设置。