fixed bug 482826

Package-Manager: portage-2.1.12.2/cvs/Linux x86_64
Manifest-Sign-Key: 0x2B6559ED

3 files changed, 16 insertions, 12 deletions

diff --git a/app-misc/lirc/ChangeLog b/app-misc/lirc/ChangeLog
index 911718b64ce1..903d109158ff 100644
--- a/app-misc/lirc/ChangeLog
+++ b/app-misc/lirc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/lirc
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/ChangeLog,v 1.243 2013/08/27 18:24:40 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/ChangeLog,v 1.244 2013/08/29 13:58:34 axs Exp $
+
+  29 Aug 2013; Ian Stakenvicius <axs@gentoo.org>
+  files/lirc-0.9.0-add-zotac-support.patch:
+  fixed bug 482826
 
 *lirc-0.9.0-r3 (27 Aug 2013)
 
diff --git a/app-misc/lirc/Manifest b/app-misc/lirc/Manifest
index 72edbefce6b9..4739fc741e59 100644
--- a/app-misc/lirc/Manifest
+++ b/app-misc/lirc/Manifest
@@ -6,7 +6,7 @@ AUX irexec-initd 808 SHA256 9325419aa45d80c205bc1cd47fe839b178da74bca5dd928cbe3a
 AUX irexec-initd-0.8.6-r2 816 SHA256 5e5a31fbd93294a6e210499a880fcab371b23706824c9d60d827b0187d7bade4 SHA512 b90226e8dc29ed1769275a010e0b1f5376b91d4f3cfd7bb9dd135bdee31c0f7849f31a885baafe4cbbf9f11b548712e1d78198b44252c779ffeccc5e47730054 WHIRLPOOL 00936357f3df1f63821d7da4f4452ba25a5368d4d128c088e421be2fff2e50d1a190522a9aac6712da2867e827492e674806e5871f797eacf12d333091991f96
 AUX lirc-0.8.3_pre1-remotewonderplus.patch 943 SHA256 547efbfa30f282ba9100495044e3b720c8f74c44f9a4e34db934d2ac7976fe29 SHA512 f1c5b03eafb8fb9d4190e438fb4ca734cac102c7f3a097f193a0a1ac7cdee33b01fb1d794959e00be16c78bb66e34d113f3ff8fb87678e99f82670ec0306e3ca WHIRLPOOL 999b01a1c2860457bf9ed68891cbb497595d58fe57627bc87d5f6401835ee5586ebcf124e1f563264ba64df22e38c7a6ccfbaf628123c5a2419bb0f57f74f19a
 AUX lirc-0.8.4-portaudio_check.patch 769 SHA256 01e2034aaa6a7eb039e5c0e6c3b4a6ed38860614d3d0b0005d99a4aac2b3827e SHA512 a4e63da5d03f1fbb072679c3a415ae55767d601512f158c5e2fc52a045b632a055b94dca4e9d0d236ceeeb367daf22d4cc71f542229edb4fb13410512a8e4f0b WHIRLPOOL 0717efa4d7934c9736b220ec4416d1827397267b34bc3343a16a5963729fcfaa4871bb4e47b1aebbb310ea5bcc2bfaa7c675a451f5db46d979f0e4438e84a37e
-AUX lirc-0.9.0-add-zotac-support.patch 19299 SHA256 c3bb9a808a9cd17825a491d9c193eb92fbdb82265064a77b5798fdf6c14a423f SHA512 598123b32f95d3445dd18417a8682f65e5620be7b5bc9656f921ba154a91c4e91ef8a071549fb8590a50d617747251e2b9858fac75c695dda3e442c0ba0498c8 WHIRLPOOL 450631ce389a09ab18c885398b4090e6e9a5995b6b011ac2ad5b69103b9fbc0f0bc9a84ec8495cf67b7a76f617cacc020c44618d1af6af53774a708ce12cf29c
+AUX lirc-0.9.0-add-zotac-support.patch 19305 SHA256 47d8a1b19f44ec2244cd95bb54dba6e5f2a565d067f63a0b7ffbc1d6a4be3462 SHA512 72ac76eba13ed043630b10adad7a8a0df9183c7b2eeab1cc2bee3f7d6a97d56382debcf61aa4a2d6068d85bbd8d592ee425f34a6ac6eabcbf0a300ed6fb208cb WHIRLPOOL 748fbd3b27995a62c8f449b4fb48f2eaca1ce1f3db4b187e67296a69b4a7fa85641a847be6e4300ed4055aafce29c6c4f94796334409d6b2d3fb6b2c3d1764bf
 AUX lirc-0.9.0-atiusb_kfifo.patch 437 SHA256 b7950ee185588a3626b8024cb22c0e67c8514362f5c9cb74bfcead8018e11b02 SHA512 d072ecd94ed4b7f1662441106650b7eb329cbe62887819c1e607ae87375a17dedea02a3a5dcf6956a1151743fd652ec5884577c595771740eef509daab8dbd02 WHIRLPOOL f0013dd75d6cf3486cddbea4e97e7ca9962af882befc5e994f258d1eb5e77e09379c4ca246e407f4c7ad5438b860e0e3b0abb2cade6f04b101525f060188ed03
 AUX lirc-0.9.0-kernel-2.6.39-fixes.patch 2175 SHA256 f5f48c867716288835a73b8d29aa9b1fcc4905a723e1f99e35fe396b2c759957 SHA512 a502b815cec565a49382e9ad0e7237a9bc7da431f41e94db42d214655577212606500ea2651a298db8cd3a68ce706461e6a773b0d9e3316ac7d49b2038fda354 WHIRLPOOL f1968f51cc29ce4f630c59c964d106e024f4cb3e5938ea80b271800a65d130a42531db5fe6e220ae20577cd4f1998de09e5dbdf52ff1cf6f3839922dd9ece114
 AUX lirc-0.9.0-kernel-3.3.0-fixes.patch 1545 SHA256 f02e7b3c52dd17e179b6f89afc15f5eec2889a18f1df4523df680fbf50adb584 SHA512 75743844d7fe61a91174c1d7ee78a229e347659a35d1062a704c39e424d8a433efac4216a0b840282c38a4f2f22baa7a489c1c0402a40f734e7475992046a2ae WHIRLPOOL 871523dc5a9757d170b740acd9845b0ba42c4c5c4c5fdc71b5c701cefa2f6122cf1cb6171698e6bf2e605d93f052d15371657f5c1901794819ca2c3eded2ec1f
@@ -23,12 +23,12 @@ AUX modulesd.lirc 482 SHA256 3906b61951e1245cb3c9b16e81255a735f7bcdbbfcbedcdf44c
 DIST lirc-0.9.0.tar.bz2 857286 SHA256 6323afae6ad498d4369675f77ec3dbb680fe661bea586aa296e67f2e2daba4ff SHA512 e91534c63e6065bd7da3b15e1676edf1672b8beb21864a6825df86247d7d165bf2dee6f8191732933e24e42a406e46afc55559948e4061eed2de7b08fac13431 WHIRLPOOL 0a1c00b07898aa7a5d78865fb73c6d26c6331dd0a4945773a801d29e40298b365eb58cae113a95fcf73be678a24ac082ad0868e8051303d732882fb82a859a7b
 EBUILD lirc-0.9.0-r2.ebuild 13219 SHA256 0144d66a05851190164280918d22c5f2fb5b3336c2c908cc35f21560e07dcf87 SHA512 9648a79319a7964ffe21892071d287bf4bf1138d3941442b0784674889b94c0832c9fb4ebccea24321a0a21ec8d97d95f75c3372fb6162f5354b7e5395a02ca0 WHIRLPOOL 3a6e341ada5ba0b272730f2ba0e9b7326d6ca1d845a7863821b6af5098a999347bc5490f97ca9dac267fe1d8eaec87ac4746826bcc07150af5eca5a5f098cf1b
 EBUILD lirc-0.9.0-r3.ebuild 13329 SHA256 748b81824bc5bed49c966f2b7f28210331302fe7fe68bfdcb90509a0a6c3dbbc SHA512 ebf1c0540e4e904cfdac54cd9fe3880a78e404970c8b9a6104048b5ec67f6efe70d2c022cb92d697a771a057a7b060eabfa064e44d75bc758cad9d99945300a9 WHIRLPOOL 793461e423b0823d04012d842886264653c1bd85071121586da37ee4e5cec74b5cf077bcc739f07df5fe6e95df91eec037af42e5f216ce6d70fb455b1ad1871c
-MISC ChangeLog 40163 SHA256 b2ca7c7e10ab5e995d9ca6e4e3115b9d951d68f430a9916e219d45742adcc345 SHA512 5dce9861a17d37b85c34fe2ecfb2274b1c40770bdd2ba72e2edc4b02d3fc49bb3349f3abe19e04170a478dc2ac40b5c885f7079361f44e0d2b21b7ee9aa4543b WHIRLPOOL b57db3c6542a0e169967046dd0d33f5bc6188ccd290b93907a09b06acb25bffec745164e5d07822d9862b0cf73c51b5fe6cf83bacbf1ed1f14c7cae4f84470e3
+MISC ChangeLog 40276 SHA256 77633c89e65687609e79bec7f094a24c1f4451cf8266329c0e0d93816f89095c SHA512 d7878c62beaef239e54ae49359e2e0d64602915cba9f672e5b36f3245f37fa2e613f7c144e70cca0d77c0cfd6a43d1b0c59ac9c72a4a2ced934e35d5e02b82f5 WHIRLPOOL 22a1058fd7a2f0b3b3e3bbf23ae395b9093ff474da438086d8be10daf935275ae1f3664e038a3d91222f65cda4900bcacaa7c99d1cf9d2a28f7f33776e074b43
 MISC metadata.xml 376 SHA256 e3b4637a67a93eb4b9457fa5941e8a6a891adca11a1ebc80c21a59650eac93aa SHA512 17eca2da394c7ca359766b80a0bd743f57235e49f422a7c2b1108e7d2dcdd7ea38ba36d8b3e3bc58b3d3818d75af99c0220eefff9d73aea97b561278cc243ce7 WHIRLPOOL 39c1156d377164114fb8730153a9e5e9dd4753ed98aec00fdff779de354336c3f791dd4fde3a0eff2dff3a8e62279f6e1ab473cf5e6cf00902f3febce0e2ac4f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iF4EAREIAAYFAlIc7v4ACgkQ2ugaI38ACPDrjwEAphAYHdLYS2Za6nUj5DGjlG18
-DjPd8eYBKj+hcybmkfcA/jtHbPv3oZNKrBt2qTZ3PuFxxXRahCYutOaWA0UsE8i7
-=PZH7
+iF4EAREIAAYFAlIfU6EACgkQ2ugaI38ACPCBOwD/S2XiEvLzfilLoH0/I6XMaRYb
+pJM8dklmihxKt66wqJQA/Ay2Egpd3x7jXKbA8iEipzATqj6exOCq65Q9nS9VuB1O
+=z6rR
 -----END PGP SIGNATURE-----
diff --git a/app-misc/lirc/files/lirc-0.9.0-add-zotac-support.patch b/app-misc/lirc/files/lirc-0.9.0-add-zotac-support.patch
index 3fe6b6055bf0..381860ced6fb 100644
--- a/app-misc/lirc/files/lirc-0.9.0-add-zotac-support.patch
+++ b/app-misc/lirc/files/lirc-0.9.0-add-zotac-support.patch
@@ -155,15 +155,15 @@ diff -rupN base/daemons/hw_zotac.c mod/daemons/hw_zotac.c
 +static int zotac_getcode();
 +
 +/** Max number of repetitions */
-+const unsigned max_repeat_count = 500;
++static unsigned max_repeat_count = 500;
 +/** Code that triggers key release */
-+const unsigned release_code = 0x00000000;
++static unsigned release_code = 0x00000000;
 +/** Code that triggers device remove  */
-+const unsigned remove_code =0x00FFFFFF;
++static unsigned remove_code =0x00FFFFFF;
 +/** Time to wait before first repetition */
-+const unsigned repeat_time1_us = 500000;
++static unsigned repeat_time1_us = 500000;
 +/** Time to wait between two repetitions */
-+const unsigned repeat_time2_us = 100000;
++static unsigned repeat_time2_us = 100000;
 +/** Pipe between main thread and repetition thread */
 +static int fd_pipe[2] = { -1, -1 };
 +
@@ -172,7 +172,7 @@ diff -rupN base/daemons/hw_zotac.c mod/daemons/hw_zotac.c
 +/** File descriptor for the real device */
 +static int fd_hidraw;
 +
-+const int main_code_length = 32;
++static int main_code_length = 32;
 +static signed int main_code = 0;
 +static struct timeval start, end, last;
 +static int repeat_state = RPT_NO;