gentoo resync : 30.05.2020

2 files changed, 0 insertions, 101 deletions

diff --git a/dev-libs/libg15/Manifest b/dev-libs/libg15/Manifest
index af41ac5fac5c..7417215e83a3 100644
--- a/dev-libs/libg15/Manifest
+++ b/dev-libs/libg15/Manifest
@@ -1,4 +1,3 @@
-AUX g15tools.patch 2929 BLAKE2B cc88ba441a27b7cc2e256712536304f7a1d3667b04fc1e2583dea994321df8a59ad295a6cecc76cf5633a5f6994cb674e7a7f3f8eaf2c0d86dad35b3e7d0c8df SHA512 2cd1b1f54ea8d4cc2a322c657cce6b8252b9425df6ad031401d6187ff82472fc3fb974734cfefe80b85b3e1a3532b26a5685b5aa9ff42ca7453ec55892834e41
 DIST libg15-1.2.7.tar.bz2 232475 BLAKE2B 490193410f2127d4efc0bcf64909514faff2ecce57bba08e1cf53a958ab296a59bc12867bbd14ca1bf866e5f69833d99f4e3ebb7d078ece35725afe2c0dd03ab SHA512 ddffb38f5c3d9ce0cb90b0375c2f5d317a7bb3889fe59d56932a0889c6e15bc2f1e590757d3182eddf7c5bd3101303b332b18fbd37247c20f66e1be256aa93c0
 EBUILD libg15-1.2.7-r1.ebuild 781 BLAKE2B 21ba3edd5b9e96420b200b05fe8df6e4053c3c6586c6157e4dcce45fbce3c7b5b3f63a643e683dad8e21b1ebd1bd6946ec9ce430fd02d6d85bb5c98c6c5b07f5 SHA512 5f5e6ece6abef9db83d3da6d6c93b6c9c1dcf4c58c0cd24384500bf7c566cbfefd9c1df04efd7139b20122d16b453c0ad27f93f6bb28314c285736f88b770c4f
 EBUILD libg15-9999.ebuild 781 BLAKE2B 21ba3edd5b9e96420b200b05fe8df6e4053c3c6586c6157e4dcce45fbce3c7b5b3f63a643e683dad8e21b1ebd1bd6946ec9ce430fd02d6d85bb5c98c6c5b07f5 SHA512 5f5e6ece6abef9db83d3da6d6c93b6c9c1dcf4c58c0cd24384500bf7c566cbfefd9c1df04efd7139b20122d16b453c0ad27f93f6bb28314c285736f88b770c4f
diff --git a/dev-libs/libg15/files/g15tools.patch b/dev-libs/libg15/files/g15tools.patch
deleted file mode 100644
index 7eb6e915e596..000000000000
--- a/dev-libs/libg15/files/g15tools.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-Patch from upstream bug tracker:
-https://sourceforge.net/tracker/?func=detail&aid=3336448&group_id=167869&atid=844658
-
-As only part of G510 support was merged to upstream. Does NOT apply & compile
-on top of 1.2.7-r1.
-
-diff -aNru trunk/libg15/libg15.c mod/libg15/libg15.c
---- trunk/libg15/libg15.c	2011-03-31 23:33:44.000000000 +0000
-+++ mod/libg15/libg15.c	2011-06-26 07:08:21.000000000 +0000
-@@ -1029,6 +1029,76 @@
- 	}
- }
- 
-+// Logitech G510 Media Keys implementation. Unknown if this will work for other
-+// models. Using the backlight key as a modifier. The assumption is you would
-+// normally not be holding down the backlight key while pressing G-keys.
-+static void processKeyEvent2Byte(unsigned int *pressed_keys, unsigned char *buffer)
-+{
-+    // Key modifier
-+    *pressed_keys |= G15_KEY_LIGHT;
-+
-+    // XF86AudioPlay
-+    if (*pressed_keys & G15_KEY_G1)
-+	     *pressed_keys -= G15_KEY_G1;
-+
-+    // XF86AudioStop
-+    if (*pressed_keys & G15_KEY_G2)
-+	     *pressed_keys -= G15_KEY_G2;
-+
-+    // XF86AudioPrev
-+    if (*pressed_keys & G15_KEY_G3)
-+	     *pressed_keys -= G15_KEY_G3;
-+
-+    // XF86AudioNext
-+    if (*pressed_keys & G15_KEY_G4)
-+	     *pressed_keys -= G15_KEY_G4;
-+
-+    // XF86AudioMute
-+    if (*pressed_keys & G15_KEY_G5)
-+	     *pressed_keys -= G15_KEY_G5;
-+
-+    // XF86AudioRaiseVolume
-+    if (*pressed_keys & G15_KEY_G6)
-+	     *pressed_keys -= G15_KEY_G6;
-+
-+    // XF86AudioLowerVolume
-+    if (*pressed_keys & G15_KEY_G7)
-+	     *pressed_keys -= G15_KEY_G7;
-+
-+    g15_log(stderr,G15_LOG_WARN,"Keyboard: %x, %x\n", buffer[0], buffer[1]);
-+
-+    if (buffer[0] == 0x02)
-+    {
-+        // XF86AudioPlay
-+        if (buffer[1] & 0x08)
-+            *pressed_keys |= G15_KEY_G1;
-+
-+        // XF86AudioStop
-+        if (buffer[1] & 0x04)
-+            *pressed_keys |= G15_KEY_G2;
-+
-+        // XF86AudioPrev
-+        if (buffer[1] & 0x02)
-+            *pressed_keys |= G15_KEY_G3;
-+
-+        // XF86AudioNext
-+        if (buffer[1] & 0x01)
-+            *pressed_keys |= G15_KEY_G4;
-+
-+        // XF86AudioMute
-+        if (buffer[1] & 0x16)
-+            *pressed_keys |= G15_KEY_G5;
-+
-+        // XF86AudioRaiseVolume
-+        if (buffer[1] & 0x32)
-+            *pressed_keys |= G15_KEY_G6;
-+
-+        // XF86AudioLowerVolume
-+        if (buffer[1] & 0x64)
-+            *pressed_keys |= G15_KEY_G7;
-+    }
-+}
-+
- int getPressedKeys(unsigned int *pressed_keys, unsigned int timeout)
- {
-     unsigned char buffer[G15_KEY_READ_LENGTH];
-@@ -1063,6 +1133,13 @@
-       case 9:
-           processKeyEvent9Byte(pressed_keys, buffer);
-           return G15_NO_ERROR;
-+      case 2:
-+          if (g15DeviceCapabilities() & G15_DEVICE_G510)
-+			 {
-+              processKeyEvent2Byte(pressed_keys, buffer);
-+              return G15_NO_ERROR;
-+		    }
-+			 // Deliberate fallthrough
-       default:
-           return handle_usb_errors("Keyboard Read", ret); /* allow the app to deal with errors */
-     }