Update the backlight patch for pommed 1.39

2 files changed, 30 insertions, 32 deletions

diff --git a/app-laptop/pommed/Manifest b/app-laptop/pommed/Manifest
index c440097..874ede1 100644
--- a/app-laptop/pommed/Manifest
+++ b/app-laptop/pommed/Manifest
@@ -1,7 +1,7 @@
 AUX pommed-1.21-r1.patch 2917 RMD160 03e2562b327b1d578b9ddde1f151fdff46f84f18 SHA1 092ba342ce808e5072049ac9042582efb20832ec SHA256 f72975bd17bbbcbee50beb27cd8968260748388f397e583dab6d77b93e2af414
 AUX pommed-1.30.patch 2963 RMD160 1bd614f094d06877a4fbcd40e0c63239aff89447 SHA1 550a529ed3b747d2495782bb1b61cd9869fc6ecf SHA256 a5a001b9caf2ec59e912270dc4de322cf6099dd7be0bb583101558d7234af023
 AUX pommed-1.31.patch 2975 RMD160 e87ce67aa7b2624404759920d8f3ee7ec5037ea4 SHA1 cf2a1db51b5778d4e9fbaa3113f3e46eda65d36f SHA256 fc4a7f0969f750bd06377bacb32e43623c74cd99ed5cfa2febe28e6bf370d163
-AUX pommed-1.39-backlight.diff 1318 RMD160 e5ba4f5a94db86549c3e3743e1fd88b725b4a0a3 SHA1 f27304f7c6c72d2ab206740cee25fd39e5c987e2 SHA256 34b8746359858c2741bd645b307805d2b37ec1d7a49df45214b15880cf7d1e6d
+AUX pommed-1.39-backlight.diff 1471 RMD160 cc428d88f42a015b667d53313f554d57e9620e8a SHA1 64c1ebaeda284c6d4a58774a52bd3d4ab94d31a7 SHA256 7d9a40049504684a2c2b6da50829b75daff4c99e19fe6a2c26f7ddea42f985db
 AUX pommed-1.39.patch 3024 RMD160 6a95e06512cf8824ceb27d7bb5a82627bab92331 SHA1 fc45c11a94fb9933505ac90c69386c4203f19c50 SHA256 04a19e476daa7bdaeddd4527065c10872eb7add2a30e7ba9e966f542c068586a
 AUX pommed.rc 382 RMD160 9bc2e6c515f72eff59045ab20ac0b743b7c2030a SHA1 6bd5ec4bc79ae09919f5e66a6e13fff76f347e38 SHA256 91911d2f65eb26b1e449ae45e587ccd03d756bdb549142fe169bc1161e9fb6d5
 DIST pommed-1.21.tar.gz 1005380 RMD160 4e5155b9fda18f0bd08265b992e0f66be21575d0 SHA1 ac60bb3797096d777fbde39f6dce97c4e85e7d13 SHA256 56cf4e2d85d832b0231542f52f3c6928de675b8dc75175f9ea214ca9206a30bf
diff --git a/app-laptop/pommed/files/pommed-1.39-backlight.diff b/app-laptop/pommed/files/pommed-1.39-backlight.diff
index 8768d88..bb2c555 100644
--- a/app-laptop/pommed/files/pommed-1.39-backlight.diff
+++ b/app-laptop/pommed/files/pommed-1.39-backlight.diff
@@ -1,36 +1,34 @@
-diff -rup pommed-1.39.orig//pommed/sysfs_backlight.c pommed-1.39/pommed/sysfs_backlight.c
---- pommed-1.39.orig//pommed/sysfs_backlight.c	2011-06-02 17:24:05.000000000 +0800
-+++ pommed-1.39/pommed/sysfs_backlight.c	2011-07-16 17:14:57.843073357 +0800
-@@ -47,6 +47,7 @@ enum {
+--- pommed/sysfs_backlight.c.orig	2011-12-26 21:25:30.358524882 +0800
++++ pommed/sysfs_backlight.c	2011-12-26 21:26:52.998528464 +0800
+@@ -42,6 +42,7 @@ enum {
    SYSFS_DRIVER_NVIDIA,
-   SYSFS_DRIVER_NOUVEAU,
-   SYSFS_DRIVER_ACPI,
+   SYSFS_DRIVER_RIVA,
+ #else
 +  SYSFS_DRIVER_GMUX,
- #endif
-   SYSFS_DRIVER_MAX
- };
-@@ -70,6 +71,7 @@ static char *actual_brightness[] =
-     "/sys/class/backlight/nvidia_backlight/actual_brightness",
-     "/sys/class/backlight/nv_backlight/actual_brightness",
-     "/sys/class/backlight/acpi_video0/actual_brightness",
+   SYSFS_DRIVER_MBP,
+   SYSFS_DRIVER_APPLE,
+   SYSFS_DRIVER_NVIDIA,
+@@ -65,6 +66,7 @@ static char *actual_brightness[] =
+     "/sys/class/backlight/nvidiabl0/actual_brightness",
+     "/sys/class/backlight/rivabl0/actual_brightness",
+ #else
 +    "/sys/class/backlight/gmux/actual_brightness",
- #endif
-   };
- 
-@@ -88,6 +90,7 @@ static char *brightness[] =
-     "/sys/class/backlight/nvidia_backlight/brightness",
-     "/sys/class/backlight/nv_backlight/brightness",
-     "/sys/class/backlight/acpi_video0/brightness",
+     "/sys/class/backlight/mbp_backlight/actual_brightness",
+     "/sys/class/backlight/apple_backlight/actual_brightness",
+     "/sys/class/backlight/nvidia_backlight/actual_brightness",
+@@ -83,6 +85,7 @@ static char *brightness[] =
+     "/sys/class/backlight/nvidiabl0/brightness",
+     "/sys/class/backlight/rivabl0/brightness",
+ #else
 +    "/sys/class/backlight/gmux/brightness",
- #endif
-   };
- 
-@@ -106,6 +109,7 @@ static char *max_brightness[] =
-     "/sys/class/backlight/nvidia_backlight/max_brightness",
-     "/sys/class/backlight/nv_backlight/max_brightness",
-     "/sys/class/backlight/acpi_video0/max_brightness",
+     "/sys/class/backlight/mbp_backlight/brightness",
+     "/sys/class/backlight/apple_backlight/brightness",
+     "/sys/class/backlight/nvidia_backlight/brightness",
+@@ -101,6 +104,7 @@ static char *max_brightness[] =
+     "/sys/class/backlight/nvidiabl0/max_brightness",
+     "/sys/class/backlight/rivabl0/max_brightness",
+ #else
 +    "/sys/class/backlight/gmux/max_brightness",
- #endif
-   };
- 
-只在 pommed-1.39/pommed 存在：sysfs_backlight.c~
+     "/sys/class/backlight/mbp_backlight/max_brightness",
+     "/sys/class/backlight/apple_backlight/max_brightness",
+     "/sys/class/backlight/nvidia_backlight/max_brightness",