From 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 21:03:06 +0100 Subject: gentoo resync : 14.07.2018 --- app-misc/lirc/Manifest | 28 + app-misc/lirc/files/irexec-confd | 9 + app-misc/lirc/files/irexec-initd-0.8.6-r2 | 27 + app-misc/lirc/files/irexec-initd-0.9.4a-r2 | 27 + app-misc/lirc/files/irexec.service | 10 + .../files/lirc-0.8.3_pre1-remotewonderplus.patch | 26 + .../lirc/files/lirc-0.8.4-portaudio_check.patch | 18 + .../lirc/files/lirc-0.9.0-add-zotac-support.patch | 658 +++++++++++++++++++++ app-misc/lirc/files/lirc-0.9.0-atiusb_kfifo.patch | 14 + app-misc/lirc/files/lirc-0.9.0-fixed-font.patch | 20 + .../files/lirc-0.9.0-kernel-2.6.39-fixes.patch | 67 +++ .../lirc/files/lirc-0.9.0-kernel-3.3.0-fixes.patch | 50 ++ .../lirc/files/lirc-0.9.0-kernel-3.5-err-fix.patch | 12 + .../lirc/files/lirc-0.9.0-kernel-3.8-fixes.patch | 80 +++ app-misc/lirc/files/lirc.service | 11 + app-misc/lirc/files/lircd-0.8.6-r2 | 51 ++ app-misc/lirc/files/lircd.conf.4 | 22 + app-misc/lirc/files/lircm.service | 11 + app-misc/lirc/files/lircmd | 19 + app-misc/lirc/files/lircmd-0.10.0.conf | 4 + app-misc/lirc/files/lircmd-0.9.4a-r2 | 19 + app-misc/lirc/files/modprobed.lirc | 22 + app-misc/lirc/lirc-0.10.0.ebuild | 151 +++++ app-misc/lirc/lirc-0.10.1.ebuild | 151 +++++ app-misc/lirc/lirc-0.9.0-r6.ebuild | 428 ++++++++++++++ app-misc/lirc/metadata.xml | 25 + 26 files changed, 1960 insertions(+) create mode 100644 app-misc/lirc/Manifest create mode 100644 app-misc/lirc/files/irexec-confd create mode 100644 app-misc/lirc/files/irexec-initd-0.8.6-r2 create mode 100644 app-misc/lirc/files/irexec-initd-0.9.4a-r2 create mode 100644 app-misc/lirc/files/irexec.service create mode 100644 app-misc/lirc/files/lirc-0.8.3_pre1-remotewonderplus.patch create mode 100644 app-misc/lirc/files/lirc-0.8.4-portaudio_check.patch create mode 100644 app-misc/lirc/files/lirc-0.9.0-add-zotac-support.patch create mode 100644 app-misc/lirc/files/lirc-0.9.0-atiusb_kfifo.patch create mode 100644 app-misc/lirc/files/lirc-0.9.0-fixed-font.patch create mode 100644 app-misc/lirc/files/lirc-0.9.0-kernel-2.6.39-fixes.patch create mode 100644 app-misc/lirc/files/lirc-0.9.0-kernel-3.3.0-fixes.patch create mode 100644 app-misc/lirc/files/lirc-0.9.0-kernel-3.5-err-fix.patch create mode 100644 app-misc/lirc/files/lirc-0.9.0-kernel-3.8-fixes.patch create mode 100644 app-misc/lirc/files/lirc.service create mode 100644 app-misc/lirc/files/lircd-0.8.6-r2 create mode 100644 app-misc/lirc/files/lircd.conf.4 create mode 100644 app-misc/lirc/files/lircm.service create mode 100644 app-misc/lirc/files/lircmd create mode 100644 app-misc/lirc/files/lircmd-0.10.0.conf create mode 100644 app-misc/lirc/files/lircmd-0.9.4a-r2 create mode 100644 app-misc/lirc/files/modprobed.lirc create mode 100644 app-misc/lirc/lirc-0.10.0.ebuild create mode 100644 app-misc/lirc/lirc-0.10.1.ebuild create mode 100644 app-misc/lirc/lirc-0.9.0-r6.ebuild create mode 100644 app-misc/lirc/metadata.xml (limited to 'app-misc/lirc') diff --git a/app-misc/lirc/Manifest b/app-misc/lirc/Manifest new file mode 100644 index 000000000000..5a166f2416a4 --- /dev/null +++ b/app-misc/lirc/Manifest @@ -0,0 +1,28 @@ +AUX irexec-confd 280 BLAKE2B ad6663659c459811710a257cf357ddd5efbd17c09201c6e3ecc68d680004e8212e76365e09984b6c422fb5fa9603245c7443d1b71bb6064a2ed35734ab6dd630 SHA512 2b33e1044086d11fd6e1f9a204ce925182a3a2b92ef4399610e01702f9c2c8fbc87cae52961123297171eef3d40468ac17437b4281b26a5f3b256c9cebc612ac +AUX irexec-initd-0.8.6-r2 703 BLAKE2B c13b5348222f18d9883bc59f5db73ed1aa98f880c878f7059e0f150a9a0903395739a2364c2a9ce8d305f0d363bbc6aa676b20e4f70b941505770e30003897f9 SHA512 2d06c0bedbd2af9120caa54c049815a2bd920054afbcbd6b0bc1a48dab479527aea5e4fc7065428742f8d46032476ee37fb075669e93e16b2df5bfb8b572f86a +AUX irexec-initd-0.9.4a-r2 681 BLAKE2B d2bf21ab1fe275bf5afea31a890c1de3300e836879b76c1c33bb40a59d9ad2b33285745a4d0a78f8bc2f589ba44e6fde31c7d07a02d9751e4b13b23975b1d9aa SHA512 0514712ce1a3e147e1c798319f90663baab7509299e2eb35551a716cf208e42b225f8539968bba1bd15270006fb728ff2f458015fb07bf325df8b0e095f5a206 +AUX irexec.service 140 BLAKE2B 6ee184023b77da18b2447704165fbda27b6b19ae70f0ae99fd3f07f046e80c480fa851a3315fda6c20c5d68c8186d200bb2637ae2249f993338e08ee62b1c345 SHA512 573e037d7132d216f095e4af370cdd020d72eca4ca6dfb1a652d6cd3f533b7d86491469a14d86419406561a6fb6500567e5e38a13b8dd0c99c63ff8494562249 +AUX lirc-0.8.3_pre1-remotewonderplus.patch 943 BLAKE2B 1041002d814fef683eefd409874783d5d3fc4fccfdc740d6d499628399c86a1b2a99243894752753cb6c0eef549e6293474d13ec0a92cb3c87202fc4b1010c67 SHA512 f1c5b03eafb8fb9d4190e438fb4ca734cac102c7f3a097f193a0a1ac7cdee33b01fb1d794959e00be16c78bb66e34d113f3ff8fb87678e99f82670ec0306e3ca +AUX lirc-0.8.4-portaudio_check.patch 769 BLAKE2B 08450f17818ef2525af534345bd5e5544416b0fa6f91a854f98ce0b03667458cb54aa565a581f35169581f4ec7bb71bda365c41b00378bc2c5cac9ec19895924 SHA512 a4e63da5d03f1fbb072679c3a415ae55767d601512f158c5e2fc52a045b632a055b94dca4e9d0d236ceeeb367daf22d4cc71f542229edb4fb13410512a8e4f0b +AUX lirc-0.9.0-add-zotac-support.patch 19305 BLAKE2B aa968c0fe02057c3310731bdab00bc196657a826c28746e0038c9b72b85140669fc008b69e90c0bbf28bc222424a149b78014367eea7ccc551cdd53102f139eb SHA512 72ac76eba13ed043630b10adad7a8a0df9183c7b2eeab1cc2bee3f7d6a97d56382debcf61aa4a2d6068d85bbd8d592ee425f34a6ac6eabcbf0a300ed6fb208cb +AUX lirc-0.9.0-atiusb_kfifo.patch 437 BLAKE2B c2215e718924e5185cef1f5b80428902c20b3b69d313ee9f8fe0d98d5553bdf03ec64ac359c3e42c78e40c6d9d1b0f38986387e15a95e630796e3b2148688004 SHA512 d072ecd94ed4b7f1662441106650b7eb329cbe62887819c1e607ae87375a17dedea02a3a5dcf6956a1151743fd652ec5884577c595771740eef509daab8dbd02 +AUX lirc-0.9.0-fixed-font.patch 630 BLAKE2B 39e12cca466fbee96112395104b2055997ec6941465782ecb928de4793cba29203f5f99d280d530fbaadf5d2377d1e25a88e4897c103d3d12fbf0a6cfcd8e6e9 SHA512 782eb14bd540f202a3df71ce801a42b9adca17fa25a79265af6a3b0ed6b503a67b46a0d29ac6b4607862b712a3511a3a3f16cdc7bef70ba1e43967be11971ed4 +AUX lirc-0.9.0-kernel-2.6.39-fixes.patch 2175 BLAKE2B db4c75de0f7c2de3b99f50b17321ec1cd93bbba480536f533c64d07e8cac8fe1710f03d1f91005e5ff7db52ea906799aaf08ff1a6174fa4a2676d8f6f77da601 SHA512 a502b815cec565a49382e9ad0e7237a9bc7da431f41e94db42d214655577212606500ea2651a298db8cd3a68ce706461e6a773b0d9e3316ac7d49b2038fda354 +AUX lirc-0.9.0-kernel-3.3.0-fixes.patch 1545 BLAKE2B 400ef11e93b9cc58bbfa7f414df66208d1ad6fe14301b85dd05599b400aa1ecf6299b1e9692945f10f4b7ed085e8e087b0cdf218644bea0b7f785e00959d2be3 SHA512 75743844d7fe61a91174c1d7ee78a229e347659a35d1062a704c39e424d8a433efac4216a0b840282c38a4f2f22baa7a489c1c0402a40f734e7475992046a2ae +AUX lirc-0.9.0-kernel-3.5-err-fix.patch 326 BLAKE2B ebfc117d5f1f1abe2a456ea6b5ed730ec22ebe03fee976eaf9005464afbfe5519f290cb5a107946286b8632a695d2f352ddb8581f63c429f75a7080d1916189b SHA512 c3a6e802b140595155a7ae8dc695bc13e4d6147323949a8dc9c86857bf7abcd442339eac64f99869925c308a100bfb1b7b0eb715f086afb8997252164ff079df +AUX lirc-0.9.0-kernel-3.8-fixes.patch 2727 BLAKE2B 26601a6e34f0dadad36de1efa9b9a43127643a5c548372d9a64b2b919ddcef3d412ccd4bd59e8c18cd9d5fb9a41efe2d213a3f91397d9067a5851aa84b7832fe SHA512 0db9cbb3aba7d43dc497bc8009afb8335bfe013a06aa6936e1cd357e58c60f545575b06fb6941740d82b496dd4f2ac51b3a165435aee6b3c57107ae62bae7bdc +AUX lirc.service 216 BLAKE2B f1ee64926ab99eaeb5604f93d6394994eff97b9e5ae5b32a10d066e143e66278114722e15c3757815911ebc0485fde43c1f10e8abecf4a90550ccf4c08c5aa1b SHA512 c3e43d24f562ba5ac7e0f12d160026ebf5db00fe066d9e28e0cbb6767fb272474103ad271fba10b970a6613f6e4545150d61b7aa096c696fddca4f2db8019e49 +AUX lircd-0.8.6-r2 1204 BLAKE2B ae4082b6f063d3100865bb3e974d9ebec8f04e08dae8c296c30152f69700924b8850c85687a5cedb3895f52c1e7a576b0855a52e350462a0552da64cd3a7e6a4 SHA512 482fccd204671f6258822029b9eb9a1e22abf02e382b3814f924f171fd1168d46560f52a90727f3de60c27a78158173a4e0c3e848d45e489471c27851c907c05 +AUX lircd.conf.4 699 BLAKE2B 573b16d756f6df55c399fd77027ebb1e6bec1f28106d1a1d4cb028ab3694350a959486d33b82502a258492882e2fdfcb8f8e5220998ee4e1a503618ec247b30b SHA512 1fb1778f4cc72fc9c11b13a704b3abe80bcce5b3770b69b6b6bea8571e5293adad8c6968779b812e611b67734462c9a577cc71c6b16da3a5bfe31b8007300a62 +AUX lircm.service 174 BLAKE2B 30db4e9dd3eed5ae896f60d2363d25f5bf11c83b946e668e7b13e31465682405eb1e5bb436c8987a59ddf9be6e0032745a5867cbeca978ccaf9c47e8eb24633c SHA512 8baccd7138fb9095c99f4f0a8ef398114dfa2bba798f23e07d41d6a7433242e2e1f071d44e1b336fb2a36b30c650ed01f2ccdb1ed365e590f85007c012343db5 +AUX lircmd 364 BLAKE2B 71971476198f92bb2d26cbacc8fe330c4d73e0b36370180cfc6438047339487451b093455761b92660e3f3571c7884b97e6c79cbf7415bff6bcc6ad5198ddd43 SHA512 2f4aae24982a51c54fa59ddd8a48190c11f86ac67fc25bbb599f750be5b91e457c2f779e915943803bde2ec3e5e8988f3c0ffb9d1ea4a08c2e7f05cd3e8b75a5 +AUX lircmd-0.10.0.conf 57 BLAKE2B 8c39aac91bf5ac603a1495bb7e27b74ee5f09e55e35297aae75b17ed1bb858a57aa1f524d096ec2744f0d543b719f13e80a467869b7ac86e560cc396a24b0648 SHA512 6a69c7600024f00947dc35e3c6cebf7524fcf5f2a1e799fe70590fef2070c1049c4e6177711821f4e7b13972fd6f535591b48bb1006acd44fa650591b3265ace +AUX lircmd-0.9.4a-r2 382 BLAKE2B 14e6f7822d8878a9047fc26cb0927ae61c70092788133a387be62a9e54b3d4f3c78734f5dd0a54ddb04dd2b48ba270177ca7af777ac80ba8bacdcbe3f9ce2d62 SHA512 c744553b6246e62845ee61e18d78d97e7242969d0bb5478072bd9072ce0a02486306b577ca64c1c569c9b136e3231a4f0663c94114879827329a769e5f36413d +AUX modprobed.lirc 549 BLAKE2B f58dcefff1becd48edaddab0d48e46f361b99de714bc8d3ae0d72f49fc8699fe9b9c7d8818a94eb7b40a5a653bfc8ca61ec11374c49ecebd1ef235d4ed8b8c08 SHA512 a64cac97e21ab53c247d8dd3e518b3caee5eeb9c3558727eba8a04684894c6be1695ce681e71d559474f4e78bbb39130d97f843eae18e56b3d3eb70f1fbefc63 +DIST lirc-0.10.0.tar.bz2 2523528 BLAKE2B 5c133b40936060fbaa0a9463b1b07d9197d935388e3eb4e46791b1f844b82ea6b6d42ae0c6ce249ca306688fa5d15718f5a3a54b497fc9f168b8b736b06bdd1e SHA512 06ccc1c8c80bfd17a6d180ae39a17779cbba341086f90a03a2e552bfb71e3abcb13f991312fba0e57df79c1882c1e29a2f273dddcd46a9ff53160b556e1547ab +DIST lirc-0.10.1.tar.bz2 2523226 BLAKE2B 47b7ee87de8f64f7f829af519c0d296a85cf91790148927e850965177d4984bb994a0ad122cb59c3db508813d0824ffec45126e794abd08174a052361cea53e5 SHA512 31c0b6ee169b302b99994a2a3fa0ebcae0e01cb83c02fe02acf1de5ba8cf77a091a0221c7d8104448c30930adafe654cd08afb7d0df6b5b7ec2d47df26e5df9d +DIST lirc-0.9.0.tar.bz2 857286 BLAKE2B 034c7b8492dd42301bb6d40da8c6c95f714b925ee50e7396290231684024dc3fe3bb64987db92d2a4e4d56203436007e68222bbf9a775bb9d29bbefcc4a7c1e4 SHA512 e91534c63e6065bd7da3b15e1676edf1672b8beb21864a6825df86247d7d165bf2dee6f8191732933e24e42a406e46afc55559948e4061eed2de7b08fac13431 +EBUILD lirc-0.10.0.ebuild 3628 BLAKE2B 18880addbafab7abf3216e023ba27c568b1234f80a35bda0f45441d56f6e17c2ceb6623d5d25d9216b35d0aa4155eb060505d6c710913bf9052979654538e7d2 SHA512 375ada586cb5e60fc95d9c11962386d2cc2eb7e8ba8f3a40c12f766c9f256bd0812a5f9a564a1695eca60f05528e1f15d00b3fae359fb2a640525fac799a45b3 +EBUILD lirc-0.10.1.ebuild 3628 BLAKE2B 18880addbafab7abf3216e023ba27c568b1234f80a35bda0f45441d56f6e17c2ceb6623d5d25d9216b35d0aa4155eb060505d6c710913bf9052979654538e7d2 SHA512 375ada586cb5e60fc95d9c11962386d2cc2eb7e8ba8f3a40c12f766c9f256bd0812a5f9a564a1695eca60f05528e1f15d00b3fae359fb2a640525fac799a45b3 +EBUILD lirc-0.9.0-r6.ebuild 13250 BLAKE2B 81ca3c71e46089a8f3a1b412d53e60096f14c0825f8f4c7daf9fee9387e3eced4dda10c8e5dc4550a9e0eb1347b1db40972a3a2397154dce2a8e1d2ed8b99977 SHA512 0d620d93bccf35721830420a7e367b45c1b6a71891843db12fe4c96b0d1228de6367969545eeb0f0416833f195ed933eafef69d5d38a0a46a1f0ddc32829240b +MISC metadata.xml 1175 BLAKE2B 1bcfd5d3fed6ee42c3e53168cc40fd930e6b92bf52bc787c43439f053e1fb97bf841d71ec58ce3fae56187c77cac767613107e74a90f8871dcfe3f33e4ff293f SHA512 c1d6ff9a423c0ea5d52410d5dfa2cd9dd94b61109494c629706dc74c228032e19e6504884c50694450624d6c05f437eaaebaee0ab626f7004fc7377331fa847c diff --git a/app-misc/lirc/files/irexec-confd b/app-misc/lirc/files/irexec-confd new file mode 100644 index 000000000000..48eb8dd4c806 --- /dev/null +++ b/app-misc/lirc/files/irexec-confd @@ -0,0 +1,9 @@ +# Options to pass to the irexec process +IREXEC_OPTS="/etc/lircrc" + +# User to execute irexec as. +# Warning: Running irexec as root can open security holes +#IREXEC_USER="root" + +# Use this to disable the warning printed when starting irexec as root +# IREXEC_DISABLE_ROOT_WARNING=yes diff --git a/app-misc/lirc/files/irexec-initd-0.8.6-r2 b/app-misc/lirc/files/irexec-initd-0.8.6-r2 new file mode 100644 index 000000000000..e62497306d0f --- /dev/null +++ b/app-misc/lirc/files/irexec-initd-0.8.6-r2 @@ -0,0 +1,27 @@ +#!/sbin/openrc-run +# Copyright 2003 Martin Hierling +# Distributed under the terms of the GNU General Public License v2 + +: ${IREXEC_USER:=root} + +depend() { + need lirc +} + +start() { + if [ "x${IREXEC_USER}" = "xroot" -a "x${IREXEC_DISABLE_ROOT_WARNING}" != "xyes" ]; then + ewarn "Warning: Running irexec as root can open security holes" + fi + + ebegin "Starting irexec" + start-stop-daemon --start --chuid ${IREXEC_USER} --user ${IREXEC_USER} --chdir / \ + --exec /usr/bin/irexec -- --daemon ${IREXEC_OPTS} + eend $? "Failed to start irexec." +} + +stop() { + ebegin "Stopping irexec" + start-stop-daemon --stop --exec /usr/bin/irexec --user ${IREXEC_USER} + eend $? "Failed to stop irexec." +} + diff --git a/app-misc/lirc/files/irexec-initd-0.9.4a-r2 b/app-misc/lirc/files/irexec-initd-0.9.4a-r2 new file mode 100644 index 000000000000..01234c3264fa --- /dev/null +++ b/app-misc/lirc/files/irexec-initd-0.9.4a-r2 @@ -0,0 +1,27 @@ +#!/sbin/openrc-run +# Copyright 2003 Martin Hierling +# Distributed under the terms of the GNU General Public License v2 + +: ${IREXEC_USER:=root} + +depend() { + need lircd +} + +start() { + if [ "x${IREXEC_USER}" = "xroot" -a "x${IREXEC_DISABLE_ROOT_WARNING}" != "xyes" ]; then + ewarn "Warning: Running irexec as root can open security holes" + fi + + ebegin "Starting irexec" + start-stop-daemon --start --user ${IREXEC_USER} --chdir / \ + --exec /usr/bin/irexec -- --daemon ${IREXEC_OPTS} + eend $? "Failed to start irexec." +} + +stop() { + ebegin "Stopping irexec" + start-stop-daemon --stop --exec /usr/bin/irexec --user ${IREXEC_USER} + eend $? "Failed to stop irexec." +} + diff --git a/app-misc/lirc/files/irexec.service b/app-misc/lirc/files/irexec.service new file mode 100644 index 000000000000..53dac65dc234 --- /dev/null +++ b/app-misc/lirc/files/irexec.service @@ -0,0 +1,10 @@ +[Unit] +Description=IR Exec +After=lirc.service +Wants=lirc.service + +[Service] +ExecStart=/usr/bin/irexec + +[Install] +WantedBy=multi-user.target diff --git a/app-misc/lirc/files/lirc-0.8.3_pre1-remotewonderplus.patch b/app-misc/lirc/files/lirc-0.8.3_pre1-remotewonderplus.patch new file mode 100644 index 000000000000..66527bcc5709 --- /dev/null +++ b/app-misc/lirc/files/lirc-0.8.3_pre1-remotewonderplus.patch @@ -0,0 +1,26 @@ +--- lirc-0.8.0/drivers/lirc_atiusb/lirc_atiusb.c.orig 2005-10-29 08:18:53.000000000 -0600 ++++ lirc-0.8.0/drivers/lirc_atiusb/lirc_atiusb.c 2006-04-01 14:31:05.000000000 -0700 +@@ -147,8 +147,9 @@ + /* init strings */ + #define USB_OUTLEN 7 + +-static char init1[] = {0x01, 0x00, 0x20, 0x14}; +-static char init2[] = {0x01, 0x00, 0x20, 0x14, 0x20, 0x20, 0x20}; ++static char init1[] = {0x80, 0x05, 0x1b, 0x15, 0x14, 0x20, 0x24, 0x15}; ++static char init2[] = {0x83, 0x03}; ++static char init3[] = {0x84, 0xd7, 0x020}; + + struct in_endpt { + /* inner link in list of endpoints for the remote specified by ir */ +@@ -1034,8 +1034,9 @@ + usb_sndintpipe(ir->usbdev, oep->ep->bEndpointAddress), oep->buf, + USB_OUTLEN, usb_remote_send, oep, oep->ep->bInterval); + +- send_packet(oep, 0x8004, init1); +- send_packet(oep, 0x8007, init2); ++ send_packet(oep, 0x8007, init1); ++ send_packet(oep, 0x8002, init2); ++ send_packet(oep, 0x8003, init3); + } + } + diff --git a/app-misc/lirc/files/lirc-0.8.4-portaudio_check.patch b/app-misc/lirc/files/lirc-0.8.4-portaudio_check.patch new file mode 100644 index 000000000000..36f5f360cd18 --- /dev/null +++ b/app-misc/lirc/files/lirc-0.8.4-portaudio_check.patch @@ -0,0 +1,18 @@ +Portaudio is only needed for LIRC_DEVICES=audio, so not checking for Portaudio when the device is disabled will prevent automagic dependencies. +--- configure.ac.orig 2009-03-13 10:02:50.000000000 +0100 ++++ configure.ac 2009-03-13 10:04:00.000000000 +0100 +@@ -336,14 +336,6 @@ + AC_DEFINE(HAVE_LIBIRMAN_SW) + possible_drivers="${possible_drivers} (irman_sw)" + ) +-dnl audio driver requires PortAudio library installed and some linker flags +-AC_CHECK_HEADERS(portaudio.h,[ +- AC_CHECK_LIB(portaudio, Pa_Initialize,[ +- AC_DEFINE(HAVE_LIBPORTAUDIO) +- possible_drivers="${possible_drivers} (audio)" +- ],,${portaudio_lib_other} +- )] +-) + dnl audio_alsa driver requires ALSA library installed and some linker flags + have_alsa=no + AC_CHECK_HEADERS(alsa/asoundlib.h,[ 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 new file mode 100644 index 000000000000..381860ced6fb --- /dev/null +++ b/app-misc/lirc/files/lirc-0.9.0-add-zotac-support.patch @@ -0,0 +1,658 @@ +diff -rupN base/configure.ac mod/configure.ac +--- base/configure.ac 2011-03-25 23:28:18.000000000 +0100 ++++ mod/configure.ac 2013-03-21 16:25:07.218419985 +0100 +@@ -383,7 +383,7 @@ AC_CHECK_HEADERS(linux/input.h,[ + dnl check if hiddev is available + AC_CHECK_HEADERS([linux/types.h]) + AC_CHECK_HEADERS([linux/hiddev.h],[ +- possible_drivers="${possible_drivers} (asusdh) (bw6130) (dvico) (macmini)" ++ possible_drivers="${possible_drivers} (asusdh) (bw6130) (dvico) (macmini) (zotac)" + AC_MSG_CHECKING(for HIDDEV_FLAG_UREF support) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + #include +@@ -393,7 +393,7 @@ AC_CHECK_HEADERS([linux/hiddev.h],[ + ]])],[ + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_LINUX_HIDDEV_FLAG_UREF) +- possible_drivers="${possible_drivers} (samsung) (sb0540)" ++ possible_drivers="${possible_drivers} (samsung) (sb0540) (zotac)" + ],[ + AC_MSG_RESULT(no) + ]) +@@ -446,7 +446,7 @@ AC_ARG_WITH(driver, + srm7500libusb, tekram, + tekram_bt829, tira, tira_raw, ttusbir, + tuxbox, tvbox, udp, uirt2, uirt2_raw, +- usb_uirt_raw, usbx, wpc8769l], ++ usb_uirt_raw, usbx, wpc8769l, zotac], + driver=${withval}, + driver="unset" + ) +@@ -464,6 +464,7 @@ portaudio_lib="" + alsa_lib="" + atilibusb_lib="" + atwf83_lib="" ++zotac_lib="" + awlibusb_lib="" + dfclibusb_lib="" + srm7500libusb_lib="" +@@ -683,6 +684,10 @@ if test "$driver" = "userspace" -o "$dri + usbx) + hw_module="${hw_module} hw_usbx.o serial.o" + ;; ++ zotac) ++ hw_module="${hw_module} hw_zotac.o" ++ zotac_lib=-lpthread ++ ;; + esac + done + #remove duplicates +@@ -733,6 +738,14 @@ if test "$driver" = "alsa_usb"; then + lircd_conf="creative/lircd.conf.alsa_usb" + fi + ++if test "$driver" = "zotac"; then ++ lirc_driver="$driver" ++ hw_module="hw_zotac.o" ++ HW_DEFAULT="hw_zotac" ++ lircd_conf="zotac/lircd.conf.zotac" ++ zotac_lib=-lpthread ++fi ++ + if test "$driver" = "animax"; then + lirc_driver="lirc_dev lirc_serial" + lircd_conf="animax/lircd.conf.animax" +@@ -1499,6 +1512,7 @@ if test "$lirc_driver" = "none" || \ + test "$lirc_driver" = "macmini" || \ + test "$lirc_driver" = "samsung" || \ + test "$lirc_driver" = "sb0540" || \ ++ test "$lirc_driver" = "zotac" || \ + test "$lirc_driver" = "srm7500libusb" || \ + test "$lirc_driver" = "userspace"; then + lirc_driver= +@@ -1669,7 +1683,7 @@ if ! echo ${hw_module}|grep " receive.o" + receive="receive.o" + fi + +-hw_module_libs="${alsa_lib} ${atilibusb_lib} ${awlibusb_lib} ${caraca_lib} ${commandir_lib} ${dfclibusb_lib} ${ftdi_lib} ${iguanaIR_lib} ${irman_lib} ${portaudio_lib} ${srm7500libusb_lib} ${atwf83_lib}" ++hw_module_libs="${alsa_lib} ${atilibusb_lib} ${awlibusb_lib} ${caraca_lib} ${commandir_lib} ${dfclibusb_lib} ${ftdi_lib} ${iguanaIR_lib} ${irman_lib} ${portaudio_lib} ${srm7500libusb_lib} ${atwf83_lib} ${zotac_lib}" + + dnl tell the Makefiles what we decided + AC_SUBST(daemon) +diff -rupN base/daemons/Makefile.am mod/daemons/Makefile.am +--- base/daemons/Makefile.am 2011-03-25 23:28:18.000000000 +0100 ++++ mod/daemons/Makefile.am 2013-03-21 16:25:40.488790784 +0100 +@@ -58,7 +58,8 @@ EXTRA_libhw_module_a_SOURCES = \ + hw_usbx.c hw_usbx.h \ + receive.c receive.h \ + transmit.c transmit.h \ +- serial.c serial.h ++ serial.c serial.h \ ++ hw_zotac.c + + libhw_module_a_LIBADD = @hw_module@ + libhw_module_a_DEPENDENCIES = @hw_module@ +diff -rupN base/daemons/hw-types.c mod/daemons/hw-types.c +--- base/daemons/hw-types.c 2011-03-25 23:28:18.000000000 +0100 ++++ mod/daemons/hw-types.c 2013-03-21 16:26:38.913200218 +0100 +@@ -59,6 +59,7 @@ extern struct hardware hw_uirt2; + extern struct hardware hw_uirt2_raw; + extern struct hardware hw_usb_uirt_raw; + extern struct hardware hw_usbx; ++extern struct hardware hw_zotac; + + #ifndef HW_DEFAULT + # define HW_DEFAULT hw_default +@@ -160,6 +161,7 @@ struct hardware *hw_list[] = { + #ifdef HAVE_LINUX_HIDDEV_FLAG_UREF + &hw_samsung, + &hw_sb0540, ++ &hw_zotac, + #endif + &hw_silitek, + #ifdef HAVE_LIBUSB +diff -rupN base/daemons/hw_zotac.c mod/daemons/hw_zotac.c +--- base/daemons/hw_zotac.c 1970-01-01 01:00:00.000000000 +0100 ++++ mod/daemons/hw_zotac.c 2013-03-21 16:31:06.989272556 +0100 +@@ -0,0 +1,429 @@ ++/**************************************************************************** ++ ** hw_zotac.c ************************************************************* ++ **************************************************************************** ++ * ++ * Lirc driver for Zotac remote ++ * ++ * Copyright (C) 2010 Rainer Hochecker ++ * ++ * Distribute under GPL version 2 or later. ++ * ++ */ ++ ++#ifdef HAVE_CONFIG_H ++# include ++#endif ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include "hardware.h" ++#include "ir_remote.h" ++#include "lircd.h" ++ ++enum { ++ RPT_NO = 0, ++ RPT_YES = 1, ++}; ++ ++static int zotac_init(); ++static int zotac_deinit(); ++static char *zotac_rec(struct ir_remote *remotes); ++static int zotac_decode(struct ir_remote *remote, ir_code * prep, ir_code * codep, ir_code * postp, int *repeat_flagp, ++ lirc_t * min_remaining_gapp, lirc_t * max_remaining_gapp); ++static void *zotac_repeat(); ++static int zotac_getcode(); ++ ++/** Max number of repetitions */ ++static unsigned max_repeat_count = 500; ++/** Code that triggers key release */ ++static unsigned release_code = 0x00000000; ++/** Code that triggers device remove */ ++static unsigned remove_code =0x00FFFFFF; ++/** Time to wait before first repetition */ ++static unsigned repeat_time1_us = 500000; ++/** Time to wait between two repetitions */ ++static unsigned repeat_time2_us = 100000; ++/** Pipe between main thread and repetition thread */ ++static int fd_pipe[2] = { -1, -1 }; ++ ++/** Thread that simulates repetitions */ ++static pthread_t repeat_thread; ++/** File descriptor for the real device */ ++static int fd_hidraw; ++ ++static int main_code_length = 32; ++static signed int main_code = 0; ++static struct timeval start, end, last; ++static int repeat_state = RPT_NO; ++static int error_state = 0; ++static int probe_code = 0; ++ ++#ifdef HAVE_LINUX_HIDDEV_FLAG_UREF ++/* Zotac USB iR Receiver */ ++struct hardware hw_zotac = { ++ "/dev/usb/hiddev0", /* "device" */ ++ -1, /* fd (device) */ ++ LIRC_CAN_REC_LIRCCODE, /* features */ ++ 0, /* send_mode */ ++ LIRC_MODE_LIRCCODE, /* rec_mode */ ++ 32, /* code_length */ ++ zotac_init, /* init_func */ ++ zotac_deinit, /* deinit_func */ ++ NULL, /* send_func */ ++ zotac_rec, /* rec_func */ ++ zotac_decode, /* decode_func */ ++ NULL, /* ioctl_func */ ++ NULL, /* readdata */ ++ "zotac" /* name */ ++}; ++#endif ++ ++static int zotac_decode(struct ir_remote *remote, ir_code * prep, ir_code * codep, ir_code * postp, int *repeat_flagp, ++ lirc_t * min_remaining_gapp, lirc_t * max_remaining_gapp) ++{ ++ LOGPRINTF(1, "zotac_decode"); ++ ++ if (!map_code(remote, prep, codep, postp, 0, 0, main_code_length, main_code, 0, 0)) { ++ return 0; ++ } ++ ++ map_gap(remote, &start, &last, 0, repeat_flagp, min_remaining_gapp, max_remaining_gapp); ++ /* override repeat */ ++ *repeat_flagp = repeat_state; ++ ++ return 1; ++} ++ ++static int zotac_getcode() { ++ ++ ssize_t rd; ++ struct hiddev_usage_ref uref; ++ struct hiddev_report_info rinfo; ++ struct hiddev_field_info finfo; ++ int shift = 0; ++ ++ rd = read(fd_hidraw, &uref, sizeof(uref)); ++ if (rd < 0) { ++ logprintf(LOG_ERR, "error reading '%s'", hw.device); ++ logperror(LOG_ERR, NULL); ++ zotac_deinit(); ++ error_state = 1; ++ return -1; ++ } ++ ++ if (uref.field_index == HID_FIELD_INDEX_NONE) { ++ /* ++ * we get this when the new report has been send from ++ * device at this point we have the uref structure ++ * prefilled with correct report type and id ++ * ++ */ ++ ++ switch (uref.report_id) { ++ case 1: /* USB standard keyboard usage page */ ++ { ++ /* This page reports cursor keys */ ++ LOGPRINTF(3, "Keyboard (standard)\n"); ++ ++ /* check for special codes */ ++ uref.field_index = 0; ++ uref.usage_index = 1; ++ /* fetch the usage code for given indexes */ ++ ioctl(fd_hidraw, HIDIOCGUCODE, &uref, sizeof(uref)); ++ /* fetch the value from report */ ++ ioctl(fd_hidraw, HIDIOCGUSAGE, &uref, sizeof(uref)); ++ ++ if (uref.value) ++ shift = 1; ++ ++ /* populate required field number */ ++ uref.field_index = 1; ++ uref.usage_index = 0; ++ /* fetch the usage code for given indexes */ ++ ioctl(fd_hidraw, HIDIOCGUCODE, &uref, sizeof(uref)); ++ /* fetch the value from report */ ++ ioctl(fd_hidraw, HIDIOCGUSAGE, &uref, sizeof(uref)); ++ /* now we have the key */ ++ ++ LOGPRINTF(3, "usage: %x value: %x shift: %d\n",uref.usage_code, uref.value, shift); ++ ++ /* now we have the key */ ++ if (uref.value) { ++ probe_code = (uref.usage_code | uref.value); ++ if (shift) ++ probe_code |= 0x10000000; ++ LOGPRINTF(3, "Main code 1: %x\n", probe_code); ++ return 1; ++ } ++ else { ++ LOGPRINTF(3, "rel button\n"); ++ probe_code = release_code; ++ return 2; ++ } ++ } ++ break; ++ ++ case 2: ++ case 3: /* USB generic desktop usage page */ ++ case 4: ++ { ++ /* This page reports power key ++ * (via SystemControl SLEEP) ++ */ ++ LOGPRINTF(3, "Generic desktop (standard)\n"); ++ ++ ++ /* traverse report descriptor */ ++ rinfo.report_type = HID_REPORT_TYPE_INPUT; ++ rinfo.report_id = HID_REPORT_ID_FIRST; ++ rd = ioctl(fd_hidraw, HIDIOCGREPORTINFO, &rinfo); ++ ++ unsigned int i,j; ++ while (rd >= 0) { ++ for (i = 0; i < rinfo.num_fields; i++) { ++ finfo.report_type = rinfo.report_type; ++ finfo.report_id = rinfo.report_id; ++ finfo.field_index = i; ++ ioctl(fd_hidraw, HIDIOCGFIELDINFO, &finfo); ++ for (j = 0; j < finfo.maxusage; j++) { ++ uref.field_index = i; ++ uref.usage_index = j; ++ ioctl(fd_hidraw, HIDIOCGUCODE, &uref); ++ ioctl(fd_hidraw, HIDIOCGUSAGE, &uref); ++ ++ if (uref.value != 0) { ++ LOGPRINTF(3, "field: %d, idx: %d, usage: %x value: %x\n",i, j, uref.usage_code, uref.value); ++ probe_code = uref.usage_code; ++ return 1; ++ } ++ } ++ } ++ rinfo.report_id |= HID_REPORT_ID_NEXT; ++ rd = ioctl(fd_hidraw, HIDIOCGREPORTINFO, &rinfo); ++ } ++ return 2; ++ } ++ break; ++ default: ++ /* Unknown/unsupported report id. ++ * Should not happen because remaining reports ++ * from report descriptor seem to be unused by remote. ++ */ ++ logprintf(LOG_ERR, "Unexpected report id %d", uref.report_id); ++ break; ++ } ++ } ++ else { ++ /* This page reports power key ++ * (via SystemControl SLEEP) ++ */ ++ LOGPRINTF(3, "Same Event ...\n"); ++ ++ /* traverse report descriptor */ ++ rinfo.report_type = HID_REPORT_TYPE_INPUT; ++ rinfo.report_id = HID_REPORT_ID_FIRST; ++ rd = ioctl(fd_hidraw, HIDIOCGREPORTINFO, &rinfo); ++ ++ unsigned int i,j; ++ while (rd >= 0) { ++ for (i = 0; i < rinfo.num_fields; i++) { ++ finfo.report_type = rinfo.report_type; ++ finfo.report_id = rinfo.report_id; ++ finfo.field_index = i; ++ ioctl(fd_hidraw, HIDIOCGFIELDINFO, &finfo); ++ for (j = 0; j < finfo.maxusage; j++) { ++ uref.field_index = i; ++ uref.usage_index = j; ++ ioctl(fd_hidraw, HIDIOCGUCODE, &uref); ++ ioctl(fd_hidraw, HIDIOCGUSAGE, &uref); ++ ++ if (uref.value != 0) { ++ LOGPRINTF(3, "usage: %x value: %x\n",uref.usage_code, uref.value); ++ //probe_code = uref.usage_code; ++ return 0; ++ } ++ } ++ } ++ rinfo.report_id |= HID_REPORT_ID_NEXT; ++ rd = ioctl(fd_hidraw, HIDIOCGREPORTINFO, &rinfo); ++ } ++ return 2; ++ } ++ return 0; ++} ++ ++static int zotac_init() ++{ ++ logprintf(LOG_INFO, "zotac initializing '%s'", hw.device); ++ if ((fd_hidraw = open(hw.device, O_RDONLY)) < 0) { ++ logprintf(LOG_ERR, "unable to open '%s'", hw.device); ++ return 0; ++ } ++ int flags = HIDDEV_FLAG_UREF | HIDDEV_FLAG_REPORT; ++ if (ioctl(fd_hidraw, HIDIOCSFLAG, &flags)) { ++ return 0; ++ } ++ hw.fd = fd_hidraw; ++ ++ /* Create pipe so that events sent by the repeat thread will ++ trigger main thread */ ++ if (pipe(fd_pipe) != 0) { ++ logperror(LOG_ERR, "couldn't open pipe"); ++ close(fd_hidraw); ++ return 0; ++ } ++ hw.fd = fd_pipe[0]; ++ /* Create thread to simulate repetitions */ ++ if (pthread_create(&repeat_thread, NULL, zotac_repeat, NULL)) { ++ logprintf(LOG_ERR, "Could not create \"repeat thread\""); ++ return 0; ++ } ++ return 1; ++} ++ ++static int zotac_deinit() ++{ ++ pthread_cancel(repeat_thread); ++ if (fd_hidraw != -1) { ++ // Close device if it is open ++ logprintf(LOG_INFO, "closing '%s'", hw.device); ++ close(fd_hidraw); ++ fd_hidraw = -1; ++ } ++ // Close pipe input ++ if (fd_pipe[1] >= 0) { ++ close(fd_pipe[1]); ++ fd_pipe[1] = -1; ++ } ++ // Close pipe output ++ if (fd_pipe[0] >= 0) { ++ close(fd_pipe[0]); ++ fd_pipe[0] = -1; ++ } ++ hw.fd = -1; ++ return 1; ++} ++ ++/** ++ * Runtime that reads device, forwards codes to main thread ++ * and simulates repetitions. ++ */ ++static void *zotac_repeat() ++{ ++ int repeat_count = 0; ++ unsigned current_code; ++ int ret; ++ int sel; ++ fd_set files; ++ struct timeval delay; ++ int pressed = 0; ++ int fd = fd_pipe[1]; ++ ++ while (1) { ++ // Initialize set to monitor device's events ++ FD_ZERO(&files); ++ FD_SET(fd_hidraw, &files); ++ if (pressed) { ++ sel = select(FD_SETSIZE, &files, NULL, NULL, &delay); ++ } else { ++ sel = select(FD_SETSIZE, &files, NULL, NULL, NULL); ++ } ++ ++ switch (sel) { ++ case 1: ++ // Data ready in device's file ++ ret = zotac_getcode(); ++ ++ if (ret < 0) { ++ // Error ++ logprintf(LOG_ERR, "(%s) Could not read %s", __FUNCTION__, hw.device); ++ goto exit_loop; ++ } ++ if (ret == 1) { ++ // Key code : forward it to main thread ++ pressed = 1; ++ repeat_count = 0; ++ delay.tv_sec = 0; ++ delay.tv_usec = repeat_time1_us; ++ current_code = probe_code; ++ } else if (ret == 2) { ++ // Release code : stop repetitions ++ pressed = 0; ++ current_code = release_code; ++ } else if (ret == 0) { ++ continue; ++ } ++ break; ++ case 0: ++ repeat_count++; ++ if (repeat_count >= max_repeat_count) { ++ // Too many repetitions, something must have gone wrong ++ logprintf(LOG_ERR,"(%s) too many repetitions", __FUNCTION__); ++ goto exit_loop; ++ } ++ // Timeout : send current_code again to main ++ // thread to simulate repetition ++ delay.tv_sec = 0; ++ delay.tv_usec = repeat_time2_us; ++ break; ++ default: ++ // Error ++ logprintf(LOG_ERR, "(%s) select() failed", __FUNCTION__); ++ goto exit_loop; ++ } ++ // Send code to main thread through pipe ++ write(fd, ¤t_code, sizeof(current_code)); ++ } ++exit_loop: ++ ++ // Wake up main thread with special key code ++ current_code = remove_code; ++ write(fd, ¤t_code, sizeof(current_code)); ++ return NULL; ++} ++ ++/* ++* Aureal Technology ATWF@83 cheap remote ++* specific code. ++*/ ++ ++static char *zotac_rec(struct ir_remote *remotes) ++{ ++ unsigned ev; ++ int rd; ++ last = end; ++ gettimeofday(&start, NULL); ++ rd = read(hw.fd, &ev, sizeof(ev)); ++ ++ if (rd == -1) { ++ // Error ++ logprintf(LOG_ERR, "(%s) could not read pipe", __FUNCTION__); ++ zotac_deinit(); ++ return 0; ++ } ++ ++ if (ev == release_code) { ++ // Release code ++ main_code = 0; ++ return 0; ++ } else if (ev == remove_code) { ++ // Device has been removed ++ zotac_deinit(); ++ return 0; ++ } ++ ++ LOGPRINTF(1, "zotac : %x", ev); ++ // Record the code and check for repetition ++ if (main_code == ev) { ++ repeat_state = RPT_YES; ++ } else { ++ main_code = ev; ++ repeat_state = RPT_NO; ++ } ++ gettimeofday(&end, NULL); ++ return decode_all(remotes); ++} +diff -rupN base/remotes/zotac/lircd.conf.zotac mod/remotes/zotac/lircd.conf.zotac +--- base/remotes/zotac/lircd.conf.zotac 1970-01-01 01:00:00.000000000 +0100 ++++ mod/remotes/zotac/lircd.conf.zotac 2013-03-21 16:31:31.343367869 +0100 +@@ -0,0 +1,77 @@ ++ ++# Please make this file available to others ++# by sending it to ++# ++# this config file was automatically generated ++# using lirc-0.9.1-git(zotac) on Mon Apr 2 14:10:29 2012 ++# ++# contributed by ++# ++# brand: zotac.conf ++# model no. of remote control: ++# devices being controlled by this remote: ++# ++ ++begin remote ++ ++ name zotac.conf ++ bits 32 ++ eps 30 ++ aeps 100 ++ ++ one 0 0 ++ zero 0 0 ++ gap 100123 ++ min_repeat 9 ++# suppress_repeat 9 ++# uncomment to suppress unwanted repeats ++# toggle_bit_mask 0x7004F ++ ++ begin codes ++ KEY_SLEEP 0x00010082 ++ KEY_WAKEUP 0x00010083 ++ KEY_RECORD 0x000C00B2 ++ KEY_PAUSE 0x000C00B1 ++ KEY_STOP 0x000C00B7 ++ KEY_REWIND 0x000C00B4 ++ KEY_PLAY 0x000C00B0 ++ KEY_FORWARD 0x000C00B3 ++ KEY_LEFTSHIFT 0x000C00B6 ++ KEY_RIGHTSHIFT 0x000C00B5 ++ KEY_BACK 0x000C0224 ++ KEY_INFO 0x000C0209 ++ KEY_MENU 0xFFBC000D ++ KEY_UP 0x00070052 ++ KEY_LEFT 0x00070050 ++ KEY_RIGHT 0x0007004F ++ KEY_DOWN 0x00070051 ++ KEY_OK 0x00070028 ++ KEY_VOLUMEUP 0x000C00E9 ++ KEY_VOLUMEDOWN 0x000C00EA ++ KEY_MUTE 0x000C00E2 ++ KEY_CHANNELUP 0x000C009C ++ KEY_CHANNELDOWN 0x000C009D ++ KEY_1 0x0007001E ++ KEY_2 0x0007001F ++ KEY_3 0x00070020 ++ KEY_4 0x00070021 ++ KEY_5 0x00070022 ++ KEY_6 0x00070023 ++ KEY_7 0x00070024 ++ KEY_8 0x00070025 ++ KEY_9 0x00070026 ++ KEY_0 0x00070027 ++ KEY_NUMERIC_STAR 0x10070025 ++ KEY_NUMERIC_POUND 0x10070020 ++ KEY_CLEAR 0x00070029 ++ KEY_TEXT 0xFFBC005A ++ KEY_TITLE 0x000C008D ++ KEY_ENTER 0x00070028 ++ KEY_RED 0xFFBC005B ++ KEY_GREEN 0xFFBC005C ++ KEY_YELLOW 0xFFBC005D ++ KEY_BLUE 0xFFBC005E ++ end codes ++ ++end remote ++ +diff -rupN base/setup.data mod/setup.data +--- base/setup.data 2011-03-25 23:28:18.000000000 +0100 ++++ mod/setup.data 2013-03-21 16:28:11.433935463 +0100 +@@ -146,6 +146,7 @@ hw_menu_entry: @hw-usb + usb_uirt_raw: "USB-UIRT" + mplay: "VLSystem MPlay Blast" + mplay: "VLSystem MPlay Mini" ++ zotac: "Zotac USB IR Receiver" + + param_type: \ + act200l \ +@@ -260,7 +261,8 @@ param_type: \ + ttusbir \ + tvbox \ + udp \ +- wpc8769l ++ wpc8769l \ ++ zotac + none: + + default_param: \ +@@ -331,7 +333,8 @@ default_param: \ + ttusbir \ + tvbox \ + udp \ +- wpc8769l ++ wpc8769l \ ++ zotac + none: + + default_param: \ diff --git a/app-misc/lirc/files/lirc-0.9.0-atiusb_kfifo.patch b/app-misc/lirc/files/lirc-0.9.0-atiusb_kfifo.patch new file mode 100644 index 000000000000..32edb244b412 --- /dev/null +++ b/app-misc/lirc/files/lirc-0.9.0-atiusb_kfifo.patch @@ -0,0 +1,14 @@ +--- a/drivers/lirc_atiusb/lirc_atiusb.c 2012-07-17 16:04:39.000000000 -0400 ++++ b/drivers/lirc_atiusb/lirc_atiusb.c 2012-07-17 16:19:06.000000000 -0400 +@@ -1050,7 +1050,11 @@ + goto new_irctl_failure_check; + } + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 38) + if (lirc_buffer_init(driver->rbuf, dclen, 1)) { ++#else ++ if (lirc_buffer_init(driver->rbuf, dclen, 2)) { ++#endif + mem_failure = 4; + goto new_irctl_failure_check; + } diff --git a/app-misc/lirc/files/lirc-0.9.0-fixed-font.patch b/app-misc/lirc/files/lirc-0.9.0-fixed-font.patch new file mode 100644 index 000000000000..fd122e7362b6 --- /dev/null +++ b/app-misc/lirc/files/lirc-0.9.0-fixed-font.patch @@ -0,0 +1,20 @@ +--- a/tools/xmode2.c 2011-03-25 23:28:18.000000000 +0100 ++++ b/tools/xmode2.c 2012-07-29 19:36:34.972246587 +0200 +@@ -69,7 +69,7 @@ + Window w0, w1; /*w0 = root */ + char w1_wname[] = "xmode2"; + char w1_iname[] = "xmode2"; +-char font1_name[] = "-*-Courier-medium-r-*-*-8-*-*-m-*-iso8859-1"; ++char font1_name[] = "fixed"; + + int w1_x = 0, w1_y = 0; + unsigned int w1_w = 640, w1_h = 480, w1_border = 0; +@@ -201,7 +201,7 @@ + printf("coudn't allocate blue color\n"); + f1_str = XLoadQueryFont(d1, font1_name); + if (f1_str == NULL) { +- printf("could't load font\n"); ++ printf("couldn't load font\n"); + exit(EXIT_FAILURE); + } + diff --git a/app-misc/lirc/files/lirc-0.9.0-kernel-2.6.39-fixes.patch b/app-misc/lirc/files/lirc-0.9.0-kernel-2.6.39-fixes.patch new file mode 100644 index 000000000000..624737090bbe --- /dev/null +++ b/app-misc/lirc/files/lirc-0.9.0-kernel-2.6.39-fixes.patch @@ -0,0 +1,67 @@ +diff -u a/drivers/lirc_atiusb/lirc_atiusb.c b/drivers/lirc_atiusb/lirc_atiusb.c +--- a/drivers/lirc_atiusb/lirc_atiusb.c ++++ b/drivers/lirc_atiusb/lirc_atiusb.c +@@ -48,7 +48,9 @@ + #include + #include + #include ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 39) + #include ++#endif + #include + #include + #include +diff -u a/drivers/lirc_i2c/lirc_i2c.c b/drivers/lirc_i2c/lirc_i2c.c +--- a/drivers/lirc_i2c/lirc_i2c.c ++++ b/drivers/lirc_i2c/lirc_i2c.c +@@ -555,8 +555,8 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id) + kfree(ir); + return -EINVAL; + } +- printk(KERN_INFO "lirc_i2c: chip 0x%x found @ 0x%02x (%s)\n", +- adap->id, addr, ir->c.name); ++ printk(KERN_INFO "lirc_i2c: chip found @ 0x%02x (%s)\n", ++ addr, ir->c.name); + + #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31) + /* register device */ +diff -u a/drivers/lirc_wpc8769l/lirc_wpc8769l.c b/drivers/lirc_wpc8769l/lirc_wpc8769l.c +--- a/drivers/lirc_wpc8769l/lirc_wpc8769l.c ++++ b/drivers/lirc_wpc8769l/lirc_wpc8769l.c +@@ -361,14 +361,22 @@ static irqreturn_t irq_handler(int irqno, void *blah, struct pt_regs *regs) + size = count << 3; + + ldata = (unsigned long *) data_buf; ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 39) + next_one = generic_find_next_le_bit(ldata, size, 0); ++#else ++ next_one = find_next_zero_bit_le(ldata, size, 0); ++#endif + + if (next_one > 0) + put_pulse_bit(next_one + * WPC8769L_USECS_PER_BIT); + + while (next_one < size) { ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 39) + next_zero = generic_find_next_zero_le_bit(ldata, ++#else ++ next_zero = find_next_zero_bit_le(ldata, ++#endif + size, next_one + 1); + + put_space_bit( +@@ -376,7 +384,11 @@ static irqreturn_t irq_handler(int irqno, void *blah, struct pt_regs *regs) + * WPC8769L_USECS_PER_BIT); + + if (next_zero < size) { ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 39) + next_one = generic_find_next_le_bit(ldata, ++#else ++ next_one = find_next_bit_le(ldata, ++#endif + size, next_zero + 1); + + put_pulse_bit( +-- +1.7.5.4 diff --git a/app-misc/lirc/files/lirc-0.9.0-kernel-3.3.0-fixes.patch b/app-misc/lirc/files/lirc-0.9.0-kernel-3.3.0-fixes.patch new file mode 100644 index 000000000000..9b7d3ef1f539 --- /dev/null +++ b/app-misc/lirc/files/lirc-0.9.0-kernel-3.3.0-fixes.patch @@ -0,0 +1,50 @@ +diff -ur drivers/lirc_serial/lirc_serial.c drivers.new/lirc_serial/lirc_serial.c +--- drivers/lirc_serial/lirc_serial.c 2011-03-25 18:28:18.000000000 -0400 ++++ drivers.new/lirc_serial/lirc_serial.c 2012-10-24 14:32:14.000000000 -0400 +@@ -66,7 +66,12 @@ + #include + #include + ++#include "drivers/kcompat.h" ++#if LINUX_VERSION_CODE > KERNEL_VERSION(3, 3, 0) ++#include ++#else + #include ++#endif + #include + #include + #include +@@ -80,7 +85,6 @@ + #define UART_IE_IXP42X_UUE 0x40 /* IXP42X UART Unit enable */ + #define UART_IE_IXP42X_RTOIE 0x10 /* IXP42X Receiver Data Timeout int.enable */ + +-#include "drivers/kcompat.h" + #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 35) + #include + #include +diff -ur drivers/lirc_sir/lirc_sir.c drivers.new/lirc_sir/lirc_sir.c +--- drivers/lirc_sir/lirc_sir.c 2011-03-25 18:28:18.000000000 -0400 ++++ drivers.new/lirc_sir/lirc_sir.c 2012-10-24 14:32:46.000000000 -0400 +@@ -59,7 +59,14 @@ + #include + #include + #include ++ ++#include "drivers/kcompat.h" ++#if LINUX_VERSION_CODE > KERNEL_VERSION(3, 3, 0) ++#include ++#else + #include ++#endif ++ + #include + #include + #include +@@ -74,7 +81,6 @@ + + #include + +-#include "drivers/kcompat.h" + #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 35) + #include + #include diff --git a/app-misc/lirc/files/lirc-0.9.0-kernel-3.5-err-fix.patch b/app-misc/lirc/files/lirc-0.9.0-kernel-3.5-err-fix.patch new file mode 100644 index 000000000000..b06d94efb322 --- /dev/null +++ b/app-misc/lirc/files/lirc-0.9.0-kernel-3.5-err-fix.patch @@ -0,0 +1,12 @@ +--- a/drivers/kcompat.h 2011-03-25 18:28:18.000000000 -0400 ++++ b/drivers/kcompat.h 2012-11-27 13:37:55.000000000 -0500 +@@ -136,4 +136,9 @@ + ) + #endif + ++#ifndef err ++#define err(format, arg...) \ ++ printk(KERN_ERR KBUILD_MODNAME ": " format "\n", ##arg) ++#endif ++ + #endif /* _KCOMPAT_H */ diff --git a/app-misc/lirc/files/lirc-0.9.0-kernel-3.8-fixes.patch b/app-misc/lirc/files/lirc-0.9.0-kernel-3.8-fixes.patch new file mode 100644 index 000000000000..bd11b61c19d8 --- /dev/null +++ b/app-misc/lirc/files/lirc-0.9.0-kernel-3.8-fixes.patch @@ -0,0 +1,80 @@ +diff -Naur lirc-0.9.0/drivers/lirc_serial/lirc_serial.c lirc-0.9.0.new/drivers/lirc_serial/lirc_serial.c +--- lirc-0.9.0/drivers/lirc_serial/lirc_serial.c 2013-05-24 11:58:31.017566567 -0400 ++++ lirc-0.9.0.new/drivers/lirc_serial/lirc_serial.c 2013-05-24 12:00:38.733568898 -0400 +@@ -1107,12 +1107,12 @@ + + static struct platform_device *lirc_serial_dev; + +-static int __devinit lirc_serial_probe(struct platform_device *dev) ++static int lirc_serial_probe(struct platform_device *dev) + { + return 0; + } + +-static int __devexit lirc_serial_remove(struct platform_device *dev) ++static int lirc_serial_remove(struct platform_device *dev) + { + return 0; + } +@@ -1163,7 +1163,7 @@ + + static struct platform_driver lirc_serial_driver = { + .probe = lirc_serial_probe, +- .remove = __devexit_p(lirc_serial_remove), ++ .remove = lirc_serial_remove, + .suspend = lirc_serial_suspend, + .resume = lirc_serial_resume, + .driver = { +diff -Naur lirc-0.9.0/drivers/lirc_sir/lirc_sir.c lirc-0.9.0.new/drivers/lirc_sir/lirc_sir.c +--- lirc-0.9.0/drivers/lirc_sir/lirc_sir.c 2013-05-24 11:58:31.017566567 -0400 ++++ lirc-0.9.0.new/drivers/lirc_sir/lirc_sir.c 2013-05-24 12:00:38.733568898 -0400 +@@ -1296,19 +1296,19 @@ + return 0; + } + +-static int __devinit lirc_sir_probe(struct platform_device *dev) ++static int lirc_sir_probe(struct platform_device *dev) + { + return 0; + } + +-static int __devexit lirc_sir_remove(struct platform_device *dev) ++static int lirc_sir_remove(struct platform_device *dev) + { + return 0; + } + + static struct platform_driver lirc_sir_driver = { + .probe = lirc_sir_probe, +- .remove = __devexit_p(lirc_sir_remove), ++ .remove = lirc_sir_remove, + .driver = { + .name = "lirc_sir", + .owner = THIS_MODULE, +diff -Naur lirc-0.9.0/drivers/lirc_wpc8769l/lirc_wpc8769l.c lirc-0.9.0.new/drivers/lirc_wpc8769l/lirc_wpc8769l.c +--- lirc-0.9.0/drivers/lirc_wpc8769l/lirc_wpc8769l.c 2013-05-24 11:58:30.974566567 -0400 ++++ lirc-0.9.0.new/drivers/lirc_wpc8769l/lirc_wpc8769l.c 2013-05-24 12:00:38.734568898 -0400 +@@ -942,12 +942,12 @@ + #ifdef MODULE + static struct platform_device *lirc_wpc8769l_platform_dev; + +-static int __devinit lirc_wpc8769l_probe(struct platform_device *dev) ++static int lirc_wpc8769l_probe(struct platform_device *dev) + { + return 0; + } + +-static int __devexit lirc_wpc8769l_remove(struct platform_device *dev) ++static int lirc_wpc8769l_remove(struct platform_device *dev) + { + return 0; + } +@@ -975,7 +975,7 @@ + + static struct platform_driver lirc_wpc8769l_platform_driver = { + .probe = lirc_wpc8769l_probe, +- .remove = __devexit_p(lirc_wpc8769l_remove), ++ .remove = lirc_wpc8769l_remove, + .suspend = lirc_wpc8769l_suspend, + .resume = lirc_wpc8769l_resume, + .driver = { diff --git a/app-misc/lirc/files/lirc.service b/app-misc/lirc/files/lirc.service new file mode 100644 index 000000000000..e184dfc09d44 --- /dev/null +++ b/app-misc/lirc/files/lirc.service @@ -0,0 +1,11 @@ +[Unit] +Description=Linux Infrared Remote Control +After=network.target + +[Service] +RuntimeDirectory=lirc +ExecStart=/usr/sbin/lircd --nodaemon --driver=default --device=/dev/lirc0 + +[Install] +WantedBy=multi-user.target + diff --git a/app-misc/lirc/files/lircd-0.8.6-r2 b/app-misc/lirc/files/lircd-0.8.6-r2 new file mode 100644 index 000000000000..757d4e689e18 --- /dev/null +++ b/app-misc/lirc/files/lircd-0.8.6-r2 @@ -0,0 +1,51 @@ +#!/sbin/openrc-run +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +PIDFILE=/var/run/lirc/${SVCNAME}.pid +: ${LIRCD_SYMLINKFILE:=/dev/lircd} +: ${LIRCD_SOCKET:=/var/run/lirc/lircd} + +depend() { + need localmount + use modules + provide lirc +} + +start() { + local retval + + ebegin "Starting lircd" + + for retval in ${LIRCD_SET_SYSCLASSRCS} ; do + if [ -e /sys/class/rc/${retval}/protocols ] && \ + grep -qs 'lirc' /sys/class/rc/${retval}/protocols ; then + einfo "Setting lirc protocol active for ${retval}" + echo lirc >/sys/class/rc/${retval}/protocols + fi + done + + checkpath -q -d -m 0755 -o root:root /var/run/lirc + rm -Rf ${LIRCD_SOCKET} && ln -s ${LIRCD_SOCKET} ${LIRCD_SYMLINKFILE} + if [ $? -ne 0 ]; then + eend $? "Unable to create symbolic link ${LIRCD_SYMLINKFILE}" + return 1 + fi + + start-stop-daemon --start --quiet --pidfile "${PIDFILE}" --exec /usr/sbin/lircd -- \ + -P "${PIDFILE}" ${LIRCD_OPTS} + retval=$? + + if [ ${retval} -ne 0 ]; then + rm -Rf ${LIRCD_SOCKET} + fi + + eend ${retval} +} + +stop() { + ebegin "Stopping lircd" + rm -f ${LIRCD_SYMLINKFILE} + start-stop-daemon --stop --quiet --pidfile "${PIDFILE}" --exec /usr/sbin/lircd + eend $? +} diff --git a/app-misc/lirc/files/lircd.conf.4 b/app-misc/lirc/files/lircd.conf.4 new file mode 100644 index 000000000000..f59c5f214283 --- /dev/null +++ b/app-misc/lirc/files/lircd.conf.4 @@ -0,0 +1,22 @@ +# Options to pass to the lircd process + +# for devices with lirc-kernel-module +#LIRCD_OPTS="-d /dev/lirc0" +#LIRCD_OPTS="-d /dev/lirc" + +# for devices using the input-layer +#LIRCD_OPTS="-H devinput -d /dev/input/by-path/pci-0000:00:0a.0--event-ir" +# This should work, Bug #235107 +#LIRCD_OPTS="-H devinput -d name=*DVB*" + +# set default protocol to 'lirc' for in-kernel IR decoding +# for the following entries in /sys/class/rc/ +# (space-separated list if there is more than one) +LIRCD_SET_SYSCLASSRCS="rc0" + +# If running mulitple instances of lircd, the following +# can be used to override the default socket path and +# socket symlink +#LIRCD_SOCKET="/var/run/lirc/lircd" +#LIRCD_SYMLINKFILE="/dev/lircd" + diff --git a/app-misc/lirc/files/lircm.service b/app-misc/lirc/files/lircm.service new file mode 100644 index 000000000000..cfd2c93caf6a --- /dev/null +++ b/app-misc/lirc/files/lircm.service @@ -0,0 +1,11 @@ +[Unit] +Description=LIRC Mouse +Requires=lirc.service +After=network.target lirc.service + +[Service] +ExecStart=/usr/sbin/lircmd --nodaemon + +[Install] +WantedBy=multi-user.target + diff --git a/app-misc/lirc/files/lircmd b/app-misc/lirc/files/lircmd new file mode 100644 index 000000000000..e979f74413fc --- /dev/null +++ b/app-misc/lirc/files/lircmd @@ -0,0 +1,19 @@ +#!/sbin/openrc-run +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +depend() { + need lircd +} + +start() { + ebegin "Starting lircmd" + start-stop-daemon --start --quiet --exec /usr/sbin/lircmd + eend $? +} + +stop() { + ebegin "Stopping lircmd" + start-stop-daemon --stop --quiet --exec /usr/sbin/lircmd + eend $? +} diff --git a/app-misc/lirc/files/lircmd-0.10.0.conf b/app-misc/lirc/files/lircmd-0.10.0.conf new file mode 100644 index 000000000000..4ba169de582d --- /dev/null +++ b/app-misc/lirc/files/lircmd-0.10.0.conf @@ -0,0 +1,4 @@ +# Options to pass to the lircmd process + +LIRCMD_OPTS="" + diff --git a/app-misc/lirc/files/lircmd-0.9.4a-r2 b/app-misc/lirc/files/lircmd-0.9.4a-r2 new file mode 100644 index 000000000000..a287dc75c636 --- /dev/null +++ b/app-misc/lirc/files/lircmd-0.9.4a-r2 @@ -0,0 +1,19 @@ +#!/sbin/openrc-run +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +depend() { + need lircd +} + +start() { + ebegin "Starting lircmd" + start-stop-daemon --start --quiet --exec /usr/sbin/lircmd -- ${LIRCMD_OPTS} + eend $? +} + +stop() { + ebegin "Stopping lircmd" + start-stop-daemon --stop --quiet --exec /usr/sbin/lircmd + eend $? +} diff --git a/app-misc/lirc/files/modprobed.lirc b/app-misc/lirc/files/modprobed.lirc new file mode 100644 index 000000000000..2ed95589b66d --- /dev/null +++ b/app-misc/lirc/files/modprobed.lirc @@ -0,0 +1,22 @@ +# +# For first serial receivers: +# +#options lirc_serial irq=4 io=0x3f8 +#options lirc_sir irq=4 io=0x3f8 + +# +# Detach first serial port from serial-driver. +# Use this when you have your serial-port-driver statically +# compiled into your kernel, or as a module but loaded before +# the lirc-module. +# +#install lirc_serial setserial /dev/ttyS0 uart none; modprobe --ignore-install lirc_serial +# +#install lirc_sir setserial /dev/ttyS0 uart none; modprobe --ignore-install lirc_sir + + +# +# For parallel receivers: +# +#options lirc_parallel irq=7 io=0x3bc + diff --git a/app-misc/lirc/lirc-0.10.0.ebuild b/app-misc/lirc/lirc-0.10.0.ebuild new file mode 100644 index 000000000000..9b8d2c10c013 --- /dev/null +++ b/app-misc/lirc/lirc-0.10.0.ebuild @@ -0,0 +1,151 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python3_4 python3_{5,6} ) + +inherit eutils flag-o-matic linux-info python-single-r1 systemd xdg-utils + +DESCRIPTION="decode and send infra-red signals of many commonly used remote controls" +HOMEPAGE="http://www.lirc.org/" + +LIRC_DRIVER_DEVICE="/dev/lirc0" + +MY_P=${PN}-${PV/_/-} + +if [[ "${PV/_pre/}" = "${PV}" ]]; then + SRC_URI="mirror://sourceforge/lirc/${MY_P}.tar.bz2" +else + SRC_URI="http://www.lirc.org/software/snapshots/${MY_P}.tar.bz2" +fi + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86" +IUSE="audio +devinput doc ftdi gtk inputlirc static-libs systemd +uinput usb X" + +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} + gtk? ( X ) +" + +S="${WORKDIR}/${MY_P}" + +COMMON_DEPEND=" + ${PYTHON_DEPS} + audio? ( + >media-libs/portaudio-18 + media-libs/alsa-lib + ) + dev-python/pyyaml[${PYTHON_USEDEP}] + ftdi? ( dev-embedded/libftdi:0 ) + systemd? ( sys-apps/systemd ) + usb? ( virtual/libusb:0 ) + X? ( + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + ) +" + +DEPEND=" + ${COMMON_DEPEND} + dev-libs/libxslt + doc? ( app-doc/doxygen ) + sys-apps/kmod + sys-kernel/linux-headers +" + +RDEPEND=" + ${COMMON_DEPEND} + gtk? ( + x11-libs/vte[introspection] + dev-python/pygobject[${PYTHON_USEDEP}] + ) + inputlirc? ( app-misc/inputlircd ) +" + +pkg_setup() { + use uinput && CONFIG_CHECK="INPUT_UINPUT" +} + +src_configure() { + xdg_environment_reset + econf \ + --localstatedir="${EPREFIX}/var" \ + $(use_enable static-libs static) \ + $(use_enable devinput) \ + $(use_enable uinput) \ + $(use_with X x) +} + +src_install() { + default + + if use !gtk ; then + # lirc-setup requires gtk + rm "${ED%/}"/usr/bin/lirc-setup || die + fi + + newinitd "${FILESDIR}"/lircd-0.8.6-r2 lircd + newinitd "${FILESDIR}"/lircmd-0.9.4a-r2 lircmd + newconfd "${FILESDIR}"/lircd.conf.4 lircd + newconfd "${FILESDIR}"/lircmd-0.10.0.conf lircmd + + insinto /etc/modprobe.d/ + newins "${FILESDIR}"/modprobed.lirc lirc.conf + + newinitd "${FILESDIR}"/irexec-initd-0.9.4a-r2 irexec + newconfd "${FILESDIR}"/irexec-confd irexec + + keepdir /etc/lirc + if [[ -e "${ED%/}"/etc/lirc/lircd.conf ]]; then + newdoc "${ED%/}"/etc/lirc/lircd.conf lircd.conf.example + fi + + find "${ED}" -name '*.la' -delete || die + + # Avoid QA notice + rm -d "${ED%/}"/var/run/lirc || die + rm -d "${ED%/}"/var/run || die +} + +pkg_preinst() { + local dir="${EROOT%/}/etc/modprobe.d" + if [[ -a "${dir}"/lirc && ! -a "${dir}"/lirc.conf ]]; then + elog "Renaming ${dir}/lirc to lirc.conf" + mv -f "${dir}/lirc" "${dir}/lirc.conf" || die + fi + + # copy the first file that can be found + if [[ -f "${EROOT%/}"/etc/lirc/lircd.conf ]]; then + cp "${EROOT%/}"/etc/lirc/lircd.conf "${T}"/lircd.conf || die + elif [[ -f "${EROOT%/}"/etc/lircd.conf ]]; then + cp "${EROOT%/}"/etc/lircd.conf "${T}"/lircd.conf || die + MOVE_OLD_LIRCD_CONF=1 + elif [[ -f "${ED%/}"/etc/lirc/lircd.conf ]]; then + cp "${ED%/}"/etc/lirc/lircd.conf "${T}"/lircd.conf || die + fi + + # stop portage from touching the config file + if [[ -e "${ED%/}"/etc/lirc/lircd.conf ]]; then + rm -f "${ED%/}"/etc/lirc/lircd.conf || die + fi +} + +pkg_postinst() { + # copy config file to new location + # without portage knowing about it + # so it will not delete it on unmerge or ever touch it again + if [[ -e "${T}"/lircd.conf ]]; then + cp "${T}"/lircd.conf "${EROOT%/}"/etc/lirc/lircd.conf || die + if [[ "$MOVE_OLD_LIRCD_CONF" = "1" ]]; then + elog "Moved /etc/lircd.conf to /etc/lirc/lircd.conf" + rm -f "${EROOT%/}"/etc/lircd.conf || die + fi + fi + + einfo "The new default location for lircd.conf is inside of" + einfo "${EROOT%/}/etc/lirc/ directory" +} diff --git a/app-misc/lirc/lirc-0.10.1.ebuild b/app-misc/lirc/lirc-0.10.1.ebuild new file mode 100644 index 000000000000..9b8d2c10c013 --- /dev/null +++ b/app-misc/lirc/lirc-0.10.1.ebuild @@ -0,0 +1,151 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python3_4 python3_{5,6} ) + +inherit eutils flag-o-matic linux-info python-single-r1 systemd xdg-utils + +DESCRIPTION="decode and send infra-red signals of many commonly used remote controls" +HOMEPAGE="http://www.lirc.org/" + +LIRC_DRIVER_DEVICE="/dev/lirc0" + +MY_P=${PN}-${PV/_/-} + +if [[ "${PV/_pre/}" = "${PV}" ]]; then + SRC_URI="mirror://sourceforge/lirc/${MY_P}.tar.bz2" +else + SRC_URI="http://www.lirc.org/software/snapshots/${MY_P}.tar.bz2" +fi + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86" +IUSE="audio +devinput doc ftdi gtk inputlirc static-libs systemd +uinput usb X" + +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} + gtk? ( X ) +" + +S="${WORKDIR}/${MY_P}" + +COMMON_DEPEND=" + ${PYTHON_DEPS} + audio? ( + >media-libs/portaudio-18 + media-libs/alsa-lib + ) + dev-python/pyyaml[${PYTHON_USEDEP}] + ftdi? ( dev-embedded/libftdi:0 ) + systemd? ( sys-apps/systemd ) + usb? ( virtual/libusb:0 ) + X? ( + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + ) +" + +DEPEND=" + ${COMMON_DEPEND} + dev-libs/libxslt + doc? ( app-doc/doxygen ) + sys-apps/kmod + sys-kernel/linux-headers +" + +RDEPEND=" + ${COMMON_DEPEND} + gtk? ( + x11-libs/vte[introspection] + dev-python/pygobject[${PYTHON_USEDEP}] + ) + inputlirc? ( app-misc/inputlircd ) +" + +pkg_setup() { + use uinput && CONFIG_CHECK="INPUT_UINPUT" +} + +src_configure() { + xdg_environment_reset + econf \ + --localstatedir="${EPREFIX}/var" \ + $(use_enable static-libs static) \ + $(use_enable devinput) \ + $(use_enable uinput) \ + $(use_with X x) +} + +src_install() { + default + + if use !gtk ; then + # lirc-setup requires gtk + rm "${ED%/}"/usr/bin/lirc-setup || die + fi + + newinitd "${FILESDIR}"/lircd-0.8.6-r2 lircd + newinitd "${FILESDIR}"/lircmd-0.9.4a-r2 lircmd + newconfd "${FILESDIR}"/lircd.conf.4 lircd + newconfd "${FILESDIR}"/lircmd-0.10.0.conf lircmd + + insinto /etc/modprobe.d/ + newins "${FILESDIR}"/modprobed.lirc lirc.conf + + newinitd "${FILESDIR}"/irexec-initd-0.9.4a-r2 irexec + newconfd "${FILESDIR}"/irexec-confd irexec + + keepdir /etc/lirc + if [[ -e "${ED%/}"/etc/lirc/lircd.conf ]]; then + newdoc "${ED%/}"/etc/lirc/lircd.conf lircd.conf.example + fi + + find "${ED}" -name '*.la' -delete || die + + # Avoid QA notice + rm -d "${ED%/}"/var/run/lirc || die + rm -d "${ED%/}"/var/run || die +} + +pkg_preinst() { + local dir="${EROOT%/}/etc/modprobe.d" + if [[ -a "${dir}"/lirc && ! -a "${dir}"/lirc.conf ]]; then + elog "Renaming ${dir}/lirc to lirc.conf" + mv -f "${dir}/lirc" "${dir}/lirc.conf" || die + fi + + # copy the first file that can be found + if [[ -f "${EROOT%/}"/etc/lirc/lircd.conf ]]; then + cp "${EROOT%/}"/etc/lirc/lircd.conf "${T}"/lircd.conf || die + elif [[ -f "${EROOT%/}"/etc/lircd.conf ]]; then + cp "${EROOT%/}"/etc/lircd.conf "${T}"/lircd.conf || die + MOVE_OLD_LIRCD_CONF=1 + elif [[ -f "${ED%/}"/etc/lirc/lircd.conf ]]; then + cp "${ED%/}"/etc/lirc/lircd.conf "${T}"/lircd.conf || die + fi + + # stop portage from touching the config file + if [[ -e "${ED%/}"/etc/lirc/lircd.conf ]]; then + rm -f "${ED%/}"/etc/lirc/lircd.conf || die + fi +} + +pkg_postinst() { + # copy config file to new location + # without portage knowing about it + # so it will not delete it on unmerge or ever touch it again + if [[ -e "${T}"/lircd.conf ]]; then + cp "${T}"/lircd.conf "${EROOT%/}"/etc/lirc/lircd.conf || die + if [[ "$MOVE_OLD_LIRCD_CONF" = "1" ]]; then + elog "Moved /etc/lircd.conf to /etc/lirc/lircd.conf" + rm -f "${EROOT%/}"/etc/lircd.conf || die + fi + fi + + einfo "The new default location for lircd.conf is inside of" + einfo "${EROOT%/}/etc/lirc/ directory" +} diff --git a/app-misc/lirc/lirc-0.9.0-r6.ebuild b/app-misc/lirc/lirc-0.9.0-r6.ebuild new file mode 100644 index 000000000000..8672858485e8 --- /dev/null +++ b/app-misc/lirc/lirc-0.9.0-r6.ebuild @@ -0,0 +1,428 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=4 + +inherit eutils linux-mod linux-info systemd toolchain-funcs flag-o-matic autotools + +DESCRIPTION="decode and send infra-red signals of many commonly used remote controls" +HOMEPAGE="http://www.lirc.org/" + +MY_P=${PN}-${PV/_/} + +if [[ "${PV/_pre/}" = "${PV}" ]]; then + SRC_URI="mirror://sourceforge/lirc/${MY_P}.tar.bz2" +else + SRC_URI="http://www.lirc.org/software/snapshots/${MY_P}.tar.bz2" +fi + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="amd64 ppc ppc64 x86" +IUSE="debug doc hardware-carrier transmitter static-libs X" + +S="${WORKDIR}/${MY_P}" + +RDEPEND=" + X? ( + x11-libs/libX11 + x11-libs/libSM + x11-libs/libICE + ) + lirc_devices_alsa_usb? ( media-libs/alsa-lib ) + lirc_devices_audio? ( >media-libs/portaudio-18 ) + lirc_devices_irman? ( media-libs/libirman )" + +# 2012-07-17, Ian Stakenvicius +# A helper script that scrapes out values for nearly all of the variables below +# from lirc's configure.ac is available at +# https://dev.gentoo.org/~axs/helper-for-lirc-iuse.sh + +# This are drivers with names matching the +# parameter --with-driver=NAME +IUSE_LIRC_DEVICES_DIRECT=" + all userspace accent act200l act220l + adaptec alsa_usb animax asusdh atilibusb + atiusb audio audio_alsa avermedia avermedia_vdomate + avermedia98 awlibusb bestbuy bestbuy2 breakoutbox + bte bw6130 caraca chronos commandir + cph06x creative creative_infracd + devinput digimatrix dsp dvico ea65 ene0100 + exaudio flyvideo ftdi gvbctv5pci hauppauge + hauppauge_dvb hercules_smarttv_stereo i2cuser + igorplugusb iguanaIR imon imon_24g imon_knob + imon_lcd imon_pad imon_rsc irdeo irdeo_remote + irlink irman irreal it87 ite8709 + knc_one kworld leadtek_0007 leadtek_0010 + leadtek_pvr2000 livedrive_midi + livedrive_seq logitech macmini + mediafocusI mouseremote + mouseremote_ps2 mp3anywhere mplay nslu2 + packard_bell parallel pcmak pcmak_usb + pctv pixelview_bt878 pixelview_pak + pixelview_pro provideo realmagic + remotemaster sa1100 samsung sasem sb0540 serial + silitek sir slinke streamzap tekram + tekram_bt829 tira ttusbir tuxbox tvbox udp uirt2 + uirt2_raw usb_uirt_raw usbx wpc8769l zotac" + +# drivers that need special handling and +# must have another name specified for +# parameter --with-driver=NAME +IUSE_LIRC_DEVICES_SPECIAL=" + serial_igor_cesko + remote_wonder_plus xboxusb inputlirc" + +IUSE_LIRC_DEVICES="${IUSE_LIRC_DEVICES_DIRECT} ${IUSE_LIRC_DEVICES_SPECIAL}" + +# The following are lists which are used to provide ewarns on incompatibilities +# with the kernel: + +#drivers that do not build kernel modules +NO_KMOD_BUILT_FOR_DEV=" + accent bte creative creative_infracd devinput dsp ea65 exaudio + ftdi i2cuser irlink irreal livedrive_midi livedrive_seq logitech + mediafocusI mouseremote mouseremote_ps2 mp3anywhere mplay mplay2 + pcmak pcmak_usb pctv realmagic remotemaster silitek tira tira_raw + tuxbox udp uirt2 uirt2_raw usb_uirt_raw usbx" + +#drivers that build lirc_dev and so will conflict with kernel lirc_dev +LIRCDEV_BUILT_FOR_DEV="all + act200l act220l adaptec animax atiusb breakoutbox hauppauge + hauppauge_dvb hercules_smarttv_stereo igorplugusb imon imon_24g + imon_knob imon_lcd imon_pad imon_rsc irdeo irdeo_remote knc_one + leadtek_pvr2000 nslu2 packard_bell parallel pixelview_bt878 + provideo sa1100 sasem serial sir tekram tekram_bt829 ttusbir + tvbox wpc8769l zotac" + +#lirc_gpio drivers, which cannot be supported on kernel >= 2.6.22 +LIRC_GPIO_DEV=" + avermedia avermedia98 avermedia_vdomate bestbuy bestbuy2 chronos + cph03x cph06x flyvideo gvbctv5pci kworld leadtek_0007 leadtek_0010 + pixelview_pak pixelview_pro" + +#device-driver which use libusb +LIBUSB_USED_BY_DEV=" + all atilibusb awlibusb sasem igorplugusb imon imon_lcd imon_pad + imon_rsc streamzap xboxusb irlink commandir" + +for dev in ${LIBUSB_USED_BY_DEV}; do + DEPEND="${DEPEND} lirc_devices_${dev}? ( virtual/libusb:0 )" +done + +# adding only compile-time depends +DEPEND="${RDEPEND} ${DEPEND} + virtual/linux-sources + lirc_devices_ftdi? ( dev-embedded/libftdi:0 ) + lirc_devices_all? ( dev-embedded/libftdi:0 )" + +# adding only run-time depends +RDEPEND="${RDEPEND} + lirc_devices_inputlirc? ( app-misc/inputlircd ) + lirc_devices_iguanaIR? ( app-misc/iguanaIR )" + +# add all devices to IUSE +# and ensure lirc_devices_all is not set alongside lirc_devices_* +REQUIRED_USE="lirc_devices_all? (" +for dev in ${IUSE_LIRC_DEVICES}; do + IUSE="${IUSE} lirc_devices_${dev}" + if [[ "${dev}" != "all" ]]; then + REQUIRED_USE="${REQUIRED_USE} !lirc_devices_${dev}" + fi +done +REQUIRED_USE="${REQUIRED_USE} )" + +add_device() { + local dev="${1}" + local desc="device ${dev}" + if [[ -n "${2}" ]]; then + desc="${2}" + fi + + # Bug #187418 + if kernel_is ge 2 6 22 && [[ " ${LIRC_GPIO_DEV} " == *" ${dev} "* ]]; then + eerror "${desc} uses lirc_gpio which fails with kernel 2.6.22 or above. Not building." + eerror "Use 'devinput' instead, or use 'userspace' along with in-kernel drivers" + return 0 + fi + : ${lirc_device_count:=0} + ((lirc_device_count++)) + + elog "Compiling support for ${desc}" + + if [[ " ${LIRCDEV_BUILT_FOR_DEV} " == *" ${dev} "* ]] ; then + if linux_chkconfig_present LIRC ; then + ewarn "${desc} builds lirc_dev and CONFIG_LIRC is set in the kernel -- this may conflict." + fi + if ! linux_chkconfig_present MODULE_UNLOAD ; then + ewarn "${desc} builds modules and CONFIG_MODULE_UNLOAD is unset in kernel." + ewarn "You will need MODULE_UNLOAD support in your kernel." + fi + fi + if [[ " ${NO_KMOD_BUILT_FOR_DEV} " == *" ${dev} "* ]] && ! linux_chkconfig_present IR_LIRC_CODEC ; then + ewarn "${desc} builds no kernel module and CONFIG_IR_LIRC_CODEC is unset in kernel." + fi + + if [[ ${lirc_device_count} -eq 2 ]] ; then + ewarn + ewarn "LIRC_DEVICES has more than one entry." + ewarn "When selecting multiple devices for lirc to be supported," + ewarn "it can not be guaranteed that the drivers play nice together." + ewarn "If this is not intended, then please adjust LIRC_DEVICES" + ewarn "and re-emerge." + ewarn + fi + + MY_OPTS="${MY_OPTS} --with-driver=${dev}" +} + +pkg_pretend() { + if [[ -n "${LIRC_OPTS}" ]] ; then + ewarn + ewarn "LIRC_OPTS is deprecated from lirc-0.8.0-r1 on." + ewarn + ewarn "Please use LIRC_DEVICES from now on." + ewarn "e.g. LIRC_DEVICES=\"serial sir\"" + ewarn + ewarn "Flags are now set per use-flags." + ewarn "e.g. transmitter, hardware-carrier" + + local opt + local unsupported_opts="" + + # test for allowed options for LIRC_OPTS + for opt in ${LIRC_OPTS}; do + case ${opt} in + --with-port=*|--with-irq=*|--with-timer=*|--with-tty=*) + MY_OPTS="${MY_OPTS} ${opt}" + ;; + *) + unsupported_opts="${unsupported_opts} ${opt}" + ;; + esac + done + if [[ -n ${unsupported_opts} ]]; then + eerror "These options are no longer allowed to be set" + eerror "with LIRC_OPTS: ${unsupported_opts}" + die "LIRC_OPTS is no longer supported, use LIRC_DEVICES." + fi + fi +} + +pkg_setup() { + linux-mod_pkg_setup + + # set default configure options + MY_OPTS="" + LIRC_DRIVER_DEVICE="/dev/lirc0" + + if use lirc_devices_all; then + # compile in drivers for a lot of devices + add_device all "a lot of devices" + else + # compile in only requested drivers + local dev + for dev in ${IUSE_LIRC_DEVICES_DIRECT}; do + if use lirc_devices_${dev}; then + add_device ${dev} + fi + done + + if use lirc_devices_remote_wonder_plus; then + add_device atiusb "device Remote Wonder Plus (atiusb-based)" + fi + + if use lirc_devices_serial_igor_cesko; then + add_device serial "serial with Igor Cesko design" + MY_OPTS="${MY_OPTS} --with-igor" + fi + + if use lirc_devices_imon_pad; then + ewarn "The imon_pad driver has incorporated the previous pad2keys patch" + ewarn "and removed the pad2keys_active option for the lirc_imon module" + ewarn "because it is always active." + ewarn "If you have an older imon VFD device, you may need to add the module" + ewarn "option display_type=1 to override autodetection and force VFD mode." + fi + + if use lirc_devices_xboxusb; then + add_device atiusb "device xboxusb" + fi + + if [[ "${MY_OPTS}" == "" ]]; then + if [[ "${PROFILE_ARCH}" == "xbox" ]]; then + # on xbox: use special driver + add_device atiusb "device xboxusb" + else + # no driver requested + elog + elog "Compiling only the lirc-applications, but no drivers." + elog "Enable drivers with LIRC_DEVICES if you need them." + MY_OPTS="--with-driver=none" + fi + fi + fi + + use hardware-carrier && MY_OPTS="${MY_OPTS} --without-soft-carrier" + use transmitter && MY_OPTS="${MY_OPTS} --with-transmitter" + + einfo + einfo "lirc-configure-opts: ${MY_OPTS}" + elog "Setting default lirc-device to ${LIRC_DRIVER_DEVICE}" + + filter-flags -Wl,-O1 +} + +src_prepare() { + # Rip out dos CRLF + edos2unix contrib/lirc.rules + + # Apply patches needed for some special device-types + use lirc_devices_audio || epatch "${FILESDIR}"/lirc-0.8.4-portaudio_check.patch + use lirc_devices_remote_wonder_plus && epatch "${FILESDIR}"/lirc-0.8.3_pre1-remotewonderplus.patch + + # Apply fixes for kernel-2.6.39 and above + epatch "${FILESDIR}"/${P}-kernel-2.6.39-fixes.patch + # Slightly massaged upstream patch to fix kfifo issues >=2.6.38 + # for bug 377033 + epatch "${FILESDIR}"/${P}-atiusb_kfifo.patch + # Apply fixes for kernel-3.3 and above (bug 439538) + epatch "${FILESDIR}"/${P}-kernel-3.3.0-fixes.patch + # Apply fix for missing err() in usb.h for kernel 3.5+ (bug 444736) + epatch "${FILESDIR}"/${P}-kernel-3.5-err-fix.patch + # Apply fix for missing __devinit __devexit defines in kernel 3.8+ (bug 461532) + epatch "${FILESDIR}"/${P}-kernel-3.8-fixes.patch + # Add support for zotac remote, bug 342848 + epatch "${FILESDIR}"/${P}-add-zotac-support.patch + # Use fixed font + epatch "${FILESDIR}"/${P}-fixed-font.patch + + # Do not build drivers from the top-level Makefile + sed -i -e 's:\(SUBDIRS =\) drivers\(.*\):\1\2:' Makefile.am + + # remove parallel driver on SMP systems + if linux_chkconfig_present SMP ; then + sed -i -e "s:lirc_parallel\.o::" drivers/lirc_parallel/Makefile.am + fi + + # Bug #187418 - only need this part for lirc_devices_all as others die in pkg_setup + if use lirc_devices_all && kernel_is ge 2 6 22 ; then + ewarn "Disabling lirc_gpio driver as it does no longer work Kernel 2.6.22+" + sed -i -e "s:lirc_gpio\.o::" drivers/lirc_gpio/Makefile.am + fi + + # respect CFLAGS + sed -i -e 's:CFLAGS="-O2:CFLAGS=""\n#CFLAGS="-O2:' configure.ac + + # setting default device-node + local f + for f in configure.ac acconfig.h; do + [[ -f "$f" ]] && sed -i -e '/#define LIRC_DRIVER_DEVICE/d' "$f" + done + echo "#define LIRC_DRIVER_DEVICE \"${LIRC_DRIVER_DEVICE}\"" >> acconfig.h + + sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die # automake 1.13 + eautoreconf +} + +src_configure() { + econf \ + --localstatedir=/var \ + --with-syslog=LOG_DAEMON \ + --enable-sandboxed \ + --with-kerneldir="${KV_DIR}" \ + --with-moduledir="/lib/modules/${KV_FULL}/misc" \ + $(use_enable debug) \ + $(use_enable static-libs static) \ + $(use_with X x) \ + ${MY_OPTS} \ + ABI="${KERNEL_ABI}" \ + ARCH="$(tc-arch-kernel)" +} + +src_compile() { + # force non-parallel make, Bug 196134 (confirmed valid for 0.9.0-r2) + emake -j1 + + MODULE_NAMES="lirc(misc:${S}/drivers)" + BUILD_TARGETS="all" + linux-mod_src_compile +} + +src_install() { + emake DESTDIR="${D}" install + emake -C drivers DESTDIR="${D}" install + + newinitd "${FILESDIR}"/lircd-0.8.6-r2 lircd + newinitd "${FILESDIR}"/lircmd lircmd + newconfd "${FILESDIR}"/lircd.conf.4 lircd + + insinto /etc/modprobe.d/ + newins "${FILESDIR}"/modprobed.lirc lirc.conf + + newinitd "${FILESDIR}"/irexec-initd-0.8.6-r2 irexec + newconfd "${FILESDIR}"/irexec-confd irexec + + systemd_dounit "${FILESDIR}"/irexec.service + systemd_dounit "${FILESDIR}"/lirc.service + systemd_dounit "${FILESDIR}"/lircm.service + + if use doc ; then + dohtml doc/html/*.html + insinto /usr/share/doc/${PF}/images + doins doc/images/* + fi + + insinto /usr/share/lirc/remotes + doins -r remotes/* + + keepdir /etc/lirc + if [[ -e "${D}"/etc/lirc/lircd.conf ]]; then + newdoc "${D}"/etc/lirc/lircd.conf lircd.conf.example + fi + + use static-libs || rm "${D}/usr/$(get_libdir)/liblirc_client.la" +} + +pkg_preinst() { + linux-mod_pkg_preinst + + local dir="${EROOT}/etc/modprobe.d" + if [[ -a "${dir}"/lirc && ! -a "${dir}"/lirc.conf ]]; then + elog "Renaming ${dir}/lirc to lirc.conf" + mv -f "${dir}/lirc" "${dir}/lirc.conf" + fi + + # copy the first file that can be found + if [[ -f "${EROOT}"/etc/lirc/lircd.conf ]]; then + cp "${EROOT}"/etc/lirc/lircd.conf "${T}"/lircd.conf + elif [[ -f "${EROOT}"/etc/lircd.conf ]]; then + cp "${EROOT}"/etc/lircd.conf "${T}"/lircd.conf + MOVE_OLD_LIRCD_CONF=1 + elif [[ -f "${D}"/etc/lirc/lircd.conf ]]; then + cp "${D}"/etc/lirc/lircd.conf "${T}"/lircd.conf + fi + + # stop portage from touching the config file + if [[ -e "${D}"/etc/lirc/lircd.conf ]]; then + rm -f "${D}"/etc/lirc/lircd.conf + fi +} + +pkg_postinst() { + linux-mod_pkg_postinst + + # copy config file to new location + # without portage knowing about it + # so it will not delete it on unmerge or ever touch it again + if [[ -e "${T}"/lircd.conf ]]; then + cp "${T}"/lircd.conf "${EROOT}"/etc/lirc/lircd.conf + if [[ "$MOVE_OLD_LIRCD_CONF" = "1" ]]; then + elog "Moved /etc/lircd.conf to /etc/lirc/lircd.conf" + rm -f "${EROOT}"/etc/lircd.conf + fi + fi + + einfo "The new default location for lircd.conf is inside of" + einfo "/etc/lirc/ directory" +} diff --git a/app-misc/lirc/metadata.xml b/app-misc/lirc/metadata.xml new file mode 100644 index 000000000000..3a8d3814118e --- /dev/null +++ b/app-misc/lirc/metadata.xml @@ -0,0 +1,25 @@ + + + + + candrews@gentoo.org + Craig Andrews + + + Enable support for uinput + Support the devinput input device + The transmitter device generates its clock signal in hardware + Add transmitter support to some lirc-drivers (e.g. serial) + Add a dependency on app-misc/inputlircd + Support using an audio device connected to an IR receiver + Support FTDI devices + Include GTK support which enables the use of lirc-setup + + + lirc + + + LIRC (Linux Infrared remote control) allows users to receive and send infrared signals. + + + -- cgit v1.2.3