From d99093fb4bb5652015c06274d64083daa2439e4f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 3 Mar 2021 10:28:17 +0000 Subject: gentoo resync : 03.03.2021 --- media-tv/v4l-dvb-saa716x/Manifest | 18 +-- .../v4l-dvb-saa716x/files/OSD_RAW_CMD_patch_2.diff | 27 ---- .../files/v4l-dvb-saa716x-3.19-set_gpio.patch | 24 ---- .../files/v4l-dvb-saa716x-4.10-fix-compile.patch | 18 --- .../files/v4l-dvb-saa716x-4.14.0-fix-compile.patch | 11 -- .../v4l-dvb-saa716x-4.15-fix-autorepeat.patch | 107 --------------- .../files/v4l-dvb-saa716x-4.15-fix-timers.patch | 41 ------ .../files/v4l-dvb-saa716x-4.16-fix-compile.patch | 49 ------- ...v4l-dvb-saa716x-4.17-define-AUDIO_GET_PTS.patch | 12 -- .../files/v4l-dvb-saa716x-4.2-fix-compile.patch | 34 ----- .../files/v4l-dvb-saa716x-4.5.2-fix-compile.patch | 13 -- .../files/v4l-dvb-saa716x-4.6.0-fix-compile.patch | 24 ---- .../files/v4l-dvb-saa716x-4.9-fix-warnings.patch | 146 --------------------- .../files/v4l-dvb-saa716x-Makefilepatch-2.diff | 8 -- media-tv/v4l-dvb-saa716x/metadata.xml | 3 - .../v4l-dvb-saa716x-0.0.1_p20170225-r3.ebuild | 55 -------- .../v4l-dvb-saa716x-0.0.1_p20170225-r4.ebuild | 61 --------- 17 files changed, 1 insertion(+), 650 deletions(-) delete mode 100644 media-tv/v4l-dvb-saa716x/files/OSD_RAW_CMD_patch_2.diff delete mode 100644 media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-3.19-set_gpio.patch delete mode 100644 media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.10-fix-compile.patch delete mode 100644 media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.14.0-fix-compile.patch delete mode 100644 media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.15-fix-autorepeat.patch delete mode 100644 media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.15-fix-timers.patch delete mode 100644 media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.16-fix-compile.patch delete mode 100644 media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.17-define-AUDIO_GET_PTS.patch delete mode 100644 media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.2-fix-compile.patch delete mode 100644 media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.5.2-fix-compile.patch delete mode 100644 media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.6.0-fix-compile.patch delete mode 100644 media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.9-fix-warnings.patch delete mode 100644 media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-Makefilepatch-2.diff delete mode 100644 media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20170225-r3.ebuild delete mode 100644 media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20170225-r4.ebuild (limited to 'media-tv/v4l-dvb-saa716x') diff --git a/media-tv/v4l-dvb-saa716x/Manifest b/media-tv/v4l-dvb-saa716x/Manifest index 0410daede848..1c1059654748 100644 --- a/media-tv/v4l-dvb-saa716x/Manifest +++ b/media-tv/v4l-dvb-saa716x/Manifest @@ -1,24 +1,8 @@ -AUX OSD_RAW_CMD_patch_2.diff 843 BLAKE2B 5bfe6200c3cb86cf42e359fd345af1b92f01bd88ca28cf467b1aa50998601444270fda755b566d17f89d5a9c412f72a4740c898796bd8de3fb39360d564ff862 SHA512 57688acc06ac9fcde332e3fba9d4048ac962d7c65c3844ff60e1d48956f7fe0f02315859f427cd5e21695ffa0c3d5cbd46ff953d7d1eca4b3e2ab165f6985e71 -AUX v4l-dvb-saa716x-3.19-set_gpio.patch 733 BLAKE2B d85a95e36fb0bb1d81035e7e2ed0b43b8e1b1fe0ba5da7ae5c76c285a83ee14ed58cb87f6489d0c5b4597db159368f28159cf1be5ca36ea7e470d5591b2eecd8 SHA512 e713779f02ebdc090a364e2339217c7f4fa2d54ba53d26f61a1a0241d19078e0278da14c8ba6520354d8a037c6834ae90271e39cdda279cfd8f4047277f24116 -AUX v4l-dvb-saa716x-4.10-fix-compile.patch 515 BLAKE2B 1617e86b85b411dd807a50353fe97ed6230362b3df79272cdcc2775e0b1a212bd394731e33ccfcfb72d85e4051ec7ee97480d3488ef40c7345628ef50b034d8f SHA512 6dc1b7b24c0d4c4b21f765ee0ac72f8b48f85ec40bb2cb7d51e589d03e64521d026a4e49f4b8c5d0e5b46b4e9332ac3785fa9a682a19dbad94f3b7ac50950653 -AUX v4l-dvb-saa716x-4.14.0-fix-compile.patch 572 BLAKE2B 28e625d28b81899e3cdb9cdbcdf01b7b14d359d3861de0507f0d4d1dcde5dd4d112c7de551a6a58fd2147d6f24c49d3c76272522ed34d49dadf976adde08d83e SHA512 b57bdd443d3ad33c170d4b40f35e7e8c5bb9a9bc7ba5f3defd2deff08c8ec377ffdae14c0d5fc8fab3ea1df10607fe9883904757ea359b4048ce43004645c453 -AUX v4l-dvb-saa716x-4.15-fix-autorepeat.patch 3274 BLAKE2B 60e6fb292be26b4a142eed4405c30c0aed973d81fbb76637894e7df90440278a23840a1dc953de66e5fd1d2feb16835aec08df440f6924e388d0bdc962231619 SHA512 7f65d977ae200714d04dc8ced2285f67e6059aed284b7e6a9efddd22a15e1ae59ae4024ee5d78e5ddb244892a2a97a6c3e29cd94eb78601b55f44b3f68ddc9b4 -AUX v4l-dvb-saa716x-4.15-fix-timers.patch 1399 BLAKE2B 9cf740de7b20e7bc62cd0835fe82d9e56fe8979ccbb3896b2ee6c5877658ccdcf7e0ea64f3c2188d1048ec4693369ab5b6522a72f27fd2d93564f4e50fce05ec SHA512 1383b1cb401311d94b47e07bd9d4b98bdb1aa3d9e378ae5a19c3405bd87ac79ea73f939540730f27240d55b8548b1c1b0e67d091e0eb302055f88110b3ae133d -AUX v4l-dvb-saa716x-4.16-fix-compile.patch 2239 BLAKE2B 59bbe5d68bd09ef2a39ea83d96a4f6b3d5d4b830f0d65035dde5a15d2aa7d00cc891647e2655b341053c61576b41314a44fc338a5802bce00588017e8bbd2d32 SHA512 739049a4960f7aa697b05c19784ad82414865bfe1349546b0eaa3b9f206440df72454e676b2520daa3c04d9cd5df757df8a2589561eec039c45f0e53f0b31c0d -AUX v4l-dvb-saa716x-4.17-define-AUDIO_GET_PTS.patch 434 BLAKE2B e7177501d016d2d7615a1d2acba1eba3d178a725fd32f1a102c02db57b189bb72dd5c2d2f982297c30ea3034000223451e3eb9f79ab7b3033ee7aa0463fa22c3 SHA512 5ccab631d70e499dc9b247e9b5f94c0dbef2b4ee2d6aede8fa7b1d06193dafc88b0155eba16195597212bf822bfeef3ffcdb7e61130eb16bd9891dfba2edfb01 -AUX v4l-dvb-saa716x-4.2-fix-compile.patch 2397 BLAKE2B f6b82c6441524d5045971e3b1fc723074733e95bfac85da03c7cdf39ee327ca0ceda98b1715feaea38d1cb5cf47cb00c996beba9c31251b7778f2e4f9e5fefba SHA512 621852c315437a9f5ada9f5624f08d25154d331cd0a95c479f3835ba9452cd0a17ecf6fdc4b37b5eb7504456ab8565e8d6670be8680e4ea6052b5f5c22c15c12 -AUX v4l-dvb-saa716x-4.5.2-fix-compile.patch 498 BLAKE2B 584300132b72ef0385c3e0b430df36788b57ff49884ee874b610d15fba024a949a81a014883c24b5ac4de77393bbc645715d68b55ec44139d8d5c6006421c9ed SHA512 3c94389b3ffb380a585d51b7e27e3fdf36b053524983fd58531e1d00b1ade2680759822df41363fa2e2ef279570f364178c7f4870c9c6b2fb52124f83eb4afb1 -AUX v4l-dvb-saa716x-4.6.0-fix-compile.patch 692 BLAKE2B f3dd9279abafc087f38233f8285409e3d6f4991e3fdd0b7593b5ec816f737ff2d2fc3e457ae6370efa6396e844af314de6986902e0e7de90cf294ff839b31e48 SHA512 64b03e316d938a3830b7aad3c6b6431a9360202470e62d3c696c4203ee98b15595be3bda727468b28a6f43b539931530a408582aab6fe280b8a0200224f2b96f -AUX v4l-dvb-saa716x-4.9-fix-warnings.patch 6368 BLAKE2B 178bb6bf0c391ce3c2a9e2a69c2b1938ebb6137891eab2d18e3bda42547efbfdea98677a4175bb610b21a45c4b3d543166791b517b8d116ea1361b645d612170 SHA512 e697a87b14727d8877ecc78622050bb9d8e5b0d964796c5c3275a8d72359712ec85a578e2189a102b23eedcdb17381533de9641a22103982ad5b0c9702e77901 AUX v4l-dvb-saa716x-5.6-fix-compile.patch 2085 BLAKE2B 117b7bb63174dcf49e33b1a4b350736c3ba7223f591265aa159a2c286049350aedf514bda0b5aff3aae84e6754311f47b3148acad88220984f8991c7893bce16 SHA512 53e27d1893d391a942af25b6032d9b4f0a49e6bd32186aac71c665ac80e78d608ae3e8e4ef8d0dc7436f7737de262cd5700ee6647f09698608bb75043da97c9e -AUX v4l-dvb-saa716x-Makefilepatch-2.diff 562 BLAKE2B 77adb5d5c67e14dddfce8462a98d565bc092b4e2f4dc48016602dfe0f1fa98d87e2c1317c0c3db1d1d1de8b91076e84cdd50d5b86350c060400fc2dd7ae9e5c1 SHA512 e0ff1c5a79f7b02323eff281bf6dc6ebb7a8fe7a43eb83ebd4a7379468924d3992790899bfabbbf2ee411cda6366ad6a677d8ad004a306e14b55d891f6f69dc0 AUX v4l-dvb-saa716x-up-to-4.14.patch 1182 BLAKE2B c8712113bdd071689820139fe026bba4464d392c055cd44b9aaabcc40d61f9dbdc42d5cd354db053ca69acd42bd25994dbdc486979856d3b8c11b182e39d186e SHA512 2865922c53c701aa8ef334c54b6ef4f55765bff054c3ab5a10eff6c4f550d3f9573696a845e830c9a6ee172e1fbd604c18c6d13a73ed2ba0ca60359c718fb702 AUX v4l-dvb-saa716x-up-to-4.17.patch 7545 BLAKE2B f213886abd2a30e61a7220785213d873d6a475ee71b308bde0415cd6ea437a3ddfdf5d57a74c4151977e3a9e871cb1663a3a01364595238c3f324812c6edec0a SHA512 c506bd0b1f54141b1df087cec234ef9496f8b67fd9105b8365029c40557638283811cf4c8a25c47dc621fc1ded700caa3ce48d96799c2348ba3dbf40768678b8 AUX v4l-dvb-saa716x-up-to-4.4.patch 3627 BLAKE2B a33f468400d820911782428375fe634fe9dfd47f09e71866d85a6988ae2c3ad973854ea9e6f390b33485fd8924649a1f4c9758728b28aa7bb196fbdb1f164f45 SHA512 181a835b475847548355621d284cb820c808d8652e8be2b50b9363720c2acf305e9a06237ecb04bae3931d1e3cdb6b50134339b50154130efe92680e0ba4290f AUX v4l-dvb-saa716x-up-to-4.9.patch 7704 BLAKE2B 3798312ef3938f2f162164c9891c251745570bca69704316b366bfecab9b6cc6c6c1c853091636e348d4a9646d874528f67f25c755dc219492347006c6c3f443 SHA512 efac2cf501f4cf0f3831f88cba184ae3bab367c3426adedeec8ee0f0efd3f2921c8c1bd840a2e6a45058b8c5228459bf6c95be0efceeaa4c6f7705e752b0e898 DIST v4l-dvb-saa716x-0.0.1_p20160322.tar.bz2 4070134 BLAKE2B 2c03d11ecd1f527ad066b2b14fcd2539e50fd07cefe2060be1bce96fd932d9ae83529f65b658ac550886f0c1f2b69a64d910011c80746353ffaed062865f1d6f SHA512 2ffb2acf00818b61af37a557e3b95a96b129b34ef80d24084483adfa35c0bb853b0abb626dbbf68bd9aa443c7436034542666274246fd47a603642a8e75ec83e -DIST v4l-dvb-saa716x-0.0.1_p20160322.tar.gz 5028181 BLAKE2B 6d0917e7c72a7c77ff376b1bb1e55a36421568cc7b9221f4724c9e24a9bb6334c201d99f48c92965365ada2cd085b22ca9758e55ca621deb5eb65de3ef3e9a38 SHA512 94a41467688a0363586c654102e35366071218432042bc324d041298ad4812139201f8df17eadb37ebb9baf2b097447fc0859270bcc4e8e0c73b17e0b8045343 -EBUILD v4l-dvb-saa716x-0.0.1_p20170225-r3.ebuild 2014 BLAKE2B 00761e3d2f40454ea374b33dc42c57f237f730ccbe4c7147e4f397c97b20ef95f70446cef5ea00b9f62874cb74178c4d30692a0a89dd41c29370566889a670ae SHA512 27de01b280bddc3c330f37176ec6b2b10789ae04a10387553812cfbd081f03e5aafdf634ef026c0e213203a68ef1d80bade167a7b8c2d1577d918b6b4451ef02 -EBUILD v4l-dvb-saa716x-0.0.1_p20170225-r4.ebuild 2474 BLAKE2B 86781a21de92635dc96d811423062ec87025055b74650262657ce1f07f5d957c2ef50769ee98d3babb0c362e085c9a509c6f40143feb3ff24a55b2682a25ba74 SHA512 5c33f05cd604f14dad0795c845964313829e34ac2c2cc7a39b2eb9ee52afc5d9a993da109e23489c8959a97df694f8b77d0faa8b535d60963a4e7a0334759a7d EBUILD v4l-dvb-saa716x-0.0.1_p20170225-r5.ebuild 1765 BLAKE2B ae903e7aeb0cffb4007a30f5017b8d06c8f075cda96cf7a7997f255b6efa291bb4848ce296e28c5d405858ad80933d602e1a5664be42c5c1fa2f8fdbae42d272 SHA512 ce4a5dc9d7fb08f9fd042ca5154ee5dbcf0278d5ba507609b6c69ced0ef6b6ba56a78c4139f27df1f4b432fdf6666121d3e677f1ab8ed3ab01b5e0002981734e -MISC metadata.xml 522 BLAKE2B 4fac71b04452341c84053cf601897155086cbe2d50bd0f04287ecae47ab06fb6b613197296ded88ebc8ac50230caa9d343449172eb73847d5ea763141bb6e3ba SHA512 651ce09fe8afac13810b4733051ccd326e8a468fae099c2a600fab0afac1071b2bba26837122fad5db235ddad25c80d56825d11b47e03eac8b0ca30dab1b3a61 +MISC metadata.xml 459 BLAKE2B 1d8433bb12454d60cb5a4bb5bf2edc5bdb2b4bd519d28138dc750bc8f021b742bc42dfa19b86305b3f7ab553cc95ef377a30c3400d33223e2189bd679a38bf85 SHA512 251f29b11dd2ec9ce4fd72cbf16986839dd8321902b1005ba922aad499dba61251dc41c2ae428442499a616d5844d3bd7b2af6d985966ae3a152dbce569b50ed diff --git a/media-tv/v4l-dvb-saa716x/files/OSD_RAW_CMD_patch_2.diff b/media-tv/v4l-dvb-saa716x/files/OSD_RAW_CMD_patch_2.diff deleted file mode 100644 index 7f09a1d60f1a..000000000000 --- a/media-tv/v4l-dvb-saa716x/files/OSD_RAW_CMD_patch_2.diff +++ /dev/null @@ -1,27 +0,0 @@ ---- linux/drivers/media/common/saa716x/saa716x_ff_cmd.h.orig 2011-11-12 14:46:51.175700236 +0100 -+++ linux/drivers/media/common/saa716x/saa716x_ff_cmd.h 2011-11-12 14:45:10.103702959 +0100 -@@ -1,6 +1,24 @@ - #ifndef __SAA716x_FF_CMD_H - #define __SAA716x_FF_CMD_H - -+#if !defined OSD_RAW_CMD -+typedef struct osd_raw_cmd_s { -+ const void *cmd_data; -+ int cmd_len; -+ void *result_data; -+ int result_len; -+} osd_raw_cmd_t; -+ -+typedef struct osd_raw_data_s { -+ const void *data_buffer; -+ int data_length; -+ int data_handle; -+} osd_raw_data_t; -+ -+#define OSD_RAW_CMD _IOWR('o', 162, osd_raw_cmd_t) -+#define OSD_RAW_DATA _IOWR('o', 163, osd_raw_data_t) -+#endif -+ - extern int sti7109_cmd_init(struct sti7109_dev *sti7109); - extern int sti7109_raw_cmd(struct sti7109_dev * sti7109, - osd_raw_cmd_t * cmd); diff --git a/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-3.19-set_gpio.patch b/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-3.19-set_gpio.patch deleted file mode 100644 index 895caa4449e0..000000000000 --- a/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-3.19-set_gpio.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- v4l-dvb-saa716x-d7e98fc59230-orig/linux/drivers/media/common/saa716x/saa716x_budget.c 2014-11-09 15:44:55.000000000 +0100 -+++ v4l-dvb-saa716x-d7e98fc59230/linux/drivers/media/common/saa716x/saa716x_budget.c 2015-02-28 13:58:01.258743639 +0100 -@@ -497,10 +497,10 @@ - break; - } - -- err = stv090x_set_gpio(fe, 2, 0, en, 0); -+ err = skystar2_stv090x_config.set_gpio(fe, 2, 0, en, 0); - if (err < 0) - goto exit; -- err = stv090x_set_gpio(fe, 3, 0, sel, 0); -+ err = skystar2_stv090x_config.set_gpio(fe, 3, 0, sel, 0); - if (err < 0) - goto exit; - -@@ -519,7 +519,7 @@ - else - value = 0; - -- err = stv090x_set_gpio(fe, 4, 0, value, 0); -+ err = skystar2_stv090x_config.set_gpio(fe, 4, 0, value, 0); - if (err < 0) - goto exit; - diff --git a/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.10-fix-compile.patch b/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.10-fix-compile.patch deleted file mode 100644 index 4086da102b80..000000000000 --- a/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.10-fix-compile.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/linux/drivers/media/common/saa716x/saa716x_ff.h -+++ b/linux/drivers/media/common/saa716x/saa716x_ff.h -@@ -1,7 +1,6 @@ - #ifndef __SAA716x_FF_H - #define __SAA716x_FF_H - --#include "dvb_filter.h" - #include "dvb_ringbuffer.h" - #include - #include -@@ -95,6 +94,7 @@ - #define MAX_RESULT_LEN 256 - #define MAX_DATA_LEN (1024 * 1024) - -+#define TS_SIZE 188 - #define TSOUT_LEN (1024 * TS_SIZE) - #define TSOUT_LEVEL_FILL (350 * TS_SIZE) - #define TSOUT_LEVEL_HIGH (30 * TS_SIZE) diff --git a/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.14.0-fix-compile.patch b/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.14.0-fix-compile.patch deleted file mode 100644 index fce2d5177985..000000000000 --- a/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.14.0-fix-compile.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/linux/drivers/media/common/saa716x/saa716x_pci.c 2018-03-24 11:39:20.777643694 +0100 -+++ b/linux/drivers/media/common/saa716x/saa716x_pci.c 2018-03-24 11:41:02.135696671 +0100 -@@ -39,7 +39,7 @@ - for (i = 0; i < SAA716x_MSI_MAX_VECTORS; i++) - saa716x->msix_entries[i].entry = i; - -- ret = pci_enable_msix(pdev, saa716x->msix_entries, SAA716x_MSI_MAX_VECTORS); -+ ret = pci_enable_msix_range(pdev, saa716x->msix_entries, SAA716x_MSI_MAX_VECTORS, SAA716x_MSI_MAX_VECTORS); - if (ret < 0) - dprintk(SAA716x_ERROR, 1, "MSI-X request failed <%d>", ret); - if (ret > 0) diff --git a/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.15-fix-autorepeat.patch b/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.15-fix-autorepeat.patch deleted file mode 100644 index e3a3a737663f..000000000000 --- a/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.15-fix-autorepeat.patch +++ /dev/null @@ -1,107 +0,0 @@ -# Source: https://github.com/s-moch/linux-saa716x/commit/0b2276ee2e6383ad577fce5c694f8c4062d5334b.patch - -From 0b2276ee2e6383ad577fce5c694f8c4062d5334b Mon Sep 17 00:00:00 2001 -From: Soeren Moch -Date: Sat, 2 Dec 2017 20:51:10 +0100 -Subject: [PATCH] saa716x_ff: Remove autorepeat handling - -Let the input layer handle autorepeat for the IR remote. -So no repeat_key timer is required anymore. - -Signed-off-by: Soeren Moch ---- - drivers/media/common/saa716x/saa716x_ff_ir.c | 45 ++++++++-------------------- - 1 file changed, 12 insertions(+), 33 deletions(-) - -diff --git a/drivers/media/common/saa716x/saa716x_ff_ir.c b/drivers/media/common/saa716x/saa716x_ff_ir.c -index 35624789aa862..ad6f38611026c 100644 ---- a/linux/drivers/media/common/saa716x/saa716x_ff_ir.c -+++ b/linux/drivers/media/common/saa716x/saa716x_ff_ir.c -@@ -40,7 +40,7 @@ struct infrared { - u8 protocol; - u16 last_key; - u16 last_toggle; -- bool delay_timer_finished; -+ bool key_pressed; - }; - - #define IR_RC5 0 -@@ -52,11 +52,12 @@ static void ir_emit_keyup(unsigned long parm) - { - struct infrared *ir = (struct infrared *) parm; - -- if (!ir || !test_bit(ir->last_key, ir->input_dev->key)) -+ if (!ir || !ir->key_pressed) - return; - - input_report_key(ir->input_dev, ir->last_key, 0); - input_sync(ir->input_dev); -+ ir->key_pressed = false; - } - - -@@ -114,28 +115,18 @@ static void ir_emit_key(unsigned long parm) - return; - } - -- if (timer_pending(&ir->keyup_timer)) { -- del_timer(&ir->keyup_timer); -- if (ir->last_key != keycode || toggle != ir->last_toggle) { -- ir->delay_timer_finished = false; -- input_event(ir->input_dev, EV_KEY, ir->last_key, 0); -- input_event(ir->input_dev, EV_KEY, keycode, 1); -- input_sync(ir->input_dev); -- } else if (ir->delay_timer_finished) { -- input_event(ir->input_dev, EV_KEY, keycode, 2); -- input_sync(ir->input_dev); -- } -- } else { -- ir->delay_timer_finished = false; -- input_event(ir->input_dev, EV_KEY, keycode, 1); -- input_sync(ir->input_dev); -- } -+ if (ir->key_pressed && -+ (ir->last_key != keycode || toggle != ir->last_toggle)) -+ input_event(ir->input_dev, EV_KEY, ir->last_key, 0); - -+ input_event(ir->input_dev, EV_KEY, keycode, 1); -+ input_sync(ir->input_dev); -+ -+ ir->key_pressed = true; - ir->last_key = keycode; - ir->last_toggle = toggle; - -- ir->keyup_timer.expires = jiffies + UP_TIMEOUT; -- add_timer(&ir->keyup_timer); -+ mod_timer(&ir->keyup_timer, jiffies + UP_TIMEOUT); - - } - -@@ -166,16 +157,6 @@ static void ir_register_keys(struct infrared *ir) - ir->input_dev->keycodemax = ARRAY_SIZE(ir->key_map); - } - -- --/* called by the input driver after rep[REP_DELAY] ms */ --static void ir_repeat_key(unsigned long parm) --{ -- struct infrared *ir = (struct infrared *) parm; -- -- ir->delay_timer_finished = true; --} -- -- - /* interrupt handler */ - void saa716x_ir_handler(struct saa716x_dev *saa716x, u32 ir_cmd) - { -@@ -236,9 +217,7 @@ int saa716x_ir_init(struct saa716x_dev *saa716x) - ir->key_map[i] = i+1; - ir_register_keys(ir); - -- /* override repeat timer */ -- input_dev->timer.function = ir_repeat_key; -- input_dev->timer.data = (unsigned long) ir; -+ input_enable_softrepeat(input_dev, 800, 200); - - tasklet_init(&ir->tasklet, ir_emit_key, (unsigned long) saa716x); - saa716x->ir_priv = ir; diff --git a/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.15-fix-timers.patch b/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.15-fix-timers.patch deleted file mode 100644 index 841c32e0515a..000000000000 --- a/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.15-fix-timers.patch +++ /dev/null @@ -1,41 +0,0 @@ -# Source: https://github.com/s-moch/linux-saa716x/commit/1002d79c4ba60de0dbeacba0f289119556d7450d.patch - -From 1002d79c4ba60de0dbeacba0f289119556d7450d Mon Sep 17 00:00:00 2001 -From: Soeren Moch -Date: Sat, 2 Dec 2017 21:23:34 +0100 -Subject: [PATCH] saa716x_ff: Convert to new timer API - -Convert to new timer API in linux-4.15. - -Signed-off-by: Soeren Moch ---- - drivers/media/common/saa716x/saa716x_ff_ir.c | 8 +++----- - 1 file changed, 3 insertions(+), 5 deletions(-) - -diff --git a/drivers/media/common/saa716x/saa716x_ff_ir.c b/drivers/media/common/saa716x/saa716x_ff_ir.c -index ad6f38611026c..7894adff4d4f6 100644 ---- a/linux/drivers/media/common/saa716x/saa716x_ff_ir.c -+++ b/linux/drivers/media/common/saa716x/saa716x_ff_ir.c -@@ -48,9 +48,9 @@ struct infrared { - - - /* key-up timer */ --static void ir_emit_keyup(unsigned long parm) -+static void ir_emit_keyup(struct timer_list *t) - { -- struct infrared *ir = (struct infrared *) parm; -+ struct infrared *ir = from_timer(ir, t, keyup_timer); - - if (!ir || !ir->key_pressed) - return; -@@ -184,9 +184,7 @@ int saa716x_ir_init(struct saa716x_dev *saa716x) - if (!ir) - return -ENOMEM; - -- init_timer(&ir->keyup_timer); -- ir->keyup_timer.function = ir_emit_keyup; -- ir->keyup_timer.data = (unsigned long) ir; -+ timer_setup(&ir->keyup_timer, ir_emit_keyup, 0); - - input_dev = input_allocate_device(); - if (!input_dev) diff --git a/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.16-fix-compile.patch b/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.16-fix-compile.patch deleted file mode 100644 index d6e63ef3b5a0..000000000000 --- a/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.16-fix-compile.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff -Naur powARman-v4l-dvb-saa716x-3b9fce66666a.orig/linux/drivers/media/common/saa716x/saa716x_adap.c powARman-v4l-dvb-saa716x-3b9fce66666a/linux/drivers/media/common/saa716x/saa716x_adap.c ---- powARman-v4l-dvb-saa716x-3b9fce66666a.orig/linux/drivers/media/common/saa716x/saa716x_adap.c 2018-04-04 08:24:59.454708009 +0200 -+++ powARman-v4l-dvb-saa716x-3b9fce66666a/linux/drivers/media/common/saa716x/saa716x_adap.c 2018-04-04 08:25:36.263560559 +0200 -@@ -1,9 +1,9 @@ - #include - --#include "dmxdev.h" --#include "dvbdev.h" --#include "dvb_demux.h" --#include "dvb_frontend.h" -+#include -+#include -+#include -+#include - - #include "saa716x_mod.h" - #include "saa716x_spi.h" -diff -Naur powARman-v4l-dvb-saa716x-3b9fce66666a.orig/linux/drivers/media/common/saa716x/saa716x_ff.h powARman-v4l-dvb-saa716x-3b9fce66666a/linux/drivers/media/common/saa716x/saa716x_ff.h ---- powARman-v4l-dvb-saa716x-3b9fce66666a.orig/linux/drivers/media/common/saa716x/saa716x_ff.h 2018-04-04 08:24:59.458708101 +0200 -+++ powARman-v4l-dvb-saa716x-3b9fce66666a/linux/drivers/media/common/saa716x/saa716x_ff.h 2018-04-04 08:25:36.263560559 +0200 -@@ -1,7 +1,7 @@ - #ifndef __SAA716x_FF_H - #define __SAA716x_FF_H - --#include "dvb_ringbuffer.h" -+#include - #include - #include - -diff -Naur powARman-v4l-dvb-saa716x-3b9fce66666a.orig/linux/drivers/media/common/saa716x/saa716x_priv.h powARman-v4l-dvb-saa716x-3b9fce66666a/linux/drivers/media/common/saa716x/saa716x_priv.h ---- powARman-v4l-dvb-saa716x-3b9fce66666a.orig/linux/drivers/media/common/saa716x/saa716x_priv.h 2018-04-04 08:24:59.458708101 +0200 -+++ powARman-v4l-dvb-saa716x-3b9fce66666a/linux/drivers/media/common/saa716x/saa716x_priv.h 2018-04-04 08:25:36.263560559 +0200 -@@ -18,11 +18,11 @@ - #include "saa716x_spi.h" - #include "saa716x_vip.h" - --#include "dvbdev.h" --#include "dvb_demux.h" --#include "dmxdev.h" --#include "dvb_frontend.h" --#include "dvb_net.h" -+#include -+#include -+#include -+#include -+#include - - #define SAA716x_ERROR 0 - #define SAA716x_NOTICE 1 diff --git a/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.17-define-AUDIO_GET_PTS.patch b/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.17-define-AUDIO_GET_PTS.patch deleted file mode 100644 index 8e418c82868e..000000000000 --- a/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.17-define-AUDIO_GET_PTS.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/linux/drivers/media/common/saa716x/saa716x_ff.h 2018-11-08 15:44:10.479886225 +0100 -+++ b/linux/drivers/media/common/saa716x/saa716x_ff.h 2018-11-08 15:45:19.981237523 +0100 -@@ -108,6 +108,9 @@ - #define VIDEO_CAPTURE_OFF 0 - #define VIDEO_CAPTURE_ONE_SHOT 1 - -+#ifndef AUDIO_GET_PTS -+#define AUDIO_GET_PTS _IOR('o', 19, __u64) -+#endif - - /* place to store all the necessary device information */ - struct sti7109_dev { diff --git a/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.2-fix-compile.patch b/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.2-fix-compile.patch deleted file mode 100644 index 392ef2583075..000000000000 --- a/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.2-fix-compile.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -urN powARman-v4l-dvb-saa716x-d7e98fc59230/linux/drivers/media/common/saa716x/saa716x_budget.c v4l-dvb-saa716x-0.0.1_p20141109-r1/work/powARman-v4l-dvb-saa716x-d7e98fc59230/linux/drivers/media/common/saa716x/saa716x_budget.c ---- powARman-v4l-dvb-saa716x-d7e98fc59230/linux/drivers/media/common/saa716x/saa716x_budget.c 2015-09-03 00:30:08.662553247 +0200 -+++ v4l-dvb-saa716x-0.0.1_p20141109-r1/work/powARman-v4l-dvb-saa716x-d7e98fc59230/linux/drivers/media/common/saa716x/saa716x_budget.c 2015-09-03 00:31:03.899206845 +0200 -@@ -306,7 +306,7 @@ - #define SAA716x_MODEL_TWINHAN_VP1028 "Twinhan/Azurewave VP-1028" - #define SAA716x_DEV_TWINHAN_VP1028 "DVB-S" - --static int vp1028_dvbs_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t voltage) -+static int vp1028_dvbs_set_voltage(struct dvb_frontend *fe, enum fe_sec_voltage voltage) - { - struct saa716x_dev *saa716x = fe->dvb->priv; - -diff -urN powARman-v4l-dvb-saa716x-d7e98fc59230/linux/drivers/media/common/saa716x/saa716x_hybrid.c v4l-dvb-saa716x-0.0.1_p20141109-r1/work/powARman-v4l-dvb-saa716x-d7e98fc59230/linux/drivers/media/common/saa716x/saa716x_hybrid.c ---- powARman-v4l-dvb-saa716x-d7e98fc59230/linux/drivers/media/common/saa716x/saa716x_hybrid.c 2014-11-09 15:44:55.000000000 +0100 -+++ v4l-dvb-saa716x-0.0.1_p20141109-r1/work/powARman-v4l-dvb-saa716x-d7e98fc59230/linux/drivers/media/common/saa716x/saa716x_hybrid.c 2015-09-03 00:31:03.899206845 +0200 -@@ -321,7 +321,7 @@ - .request_firmware = tda1004x_vp6090_request_firmware, - }; - --static int vp6090_dvbs_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t voltage) -+static int vp6090_dvbs_set_voltage(struct dvb_frontend *fe, enum fe_sec_voltage voltage) - { - struct saa716x_dev *saa716x = fe->dvb->priv; - -diff -urN powARman-v4l-dvb-saa716x-d7e98fc59230/linux/drivers/media/common/saa716x/saa716x_pci.c v4l-dvb-saa716x-0.0.1_p20141109-r1/work/powARman-v4l-dvb-saa716x-d7e98fc59230/linux/drivers/media/common/saa716x/saa716x_pci.c ---- powARman-v4l-dvb-saa716x-d7e98fc59230/linux/drivers/media/common/saa716x/saa716x_pci.c 2014-11-09 15:44:55.000000000 +0100 -+++ v4l-dvb-saa716x-0.0.1_p20141109-r1/work/powARman-v4l-dvb-saa716x-d7e98fc59230/linux/drivers/media/common/saa716x/saa716x_pci.c 2015-09-03 00:31:03.900206839 +0200 -@@ -1,3 +1,5 @@ -+#include -+#include - #include - #include - #include - diff --git a/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.5.2-fix-compile.patch b/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.5.2-fix-compile.patch deleted file mode 100644 index ac499acdccbc..000000000000 --- a/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.5.2-fix-compile.patch +++ /dev/null @@ -1,13 +0,0 @@ -fix compile with kernel >= 4.5.2 -wrt bug 581450 -Signed-of-by: Joerg Bornkessel 2016/05/05 ---- a/linux/drivers/media/common/saa716x/saa716x_pci.c.old 2016-04-27 20:59:51.000000000 +0200 -+++ b/linux/drivers/media/common/saa716x/saa716x_pci.c 2016-04-27 21:19:03.117822874 +0200 -@@ -1,6 +1,7 @@ - #include - #include - #include -+#include - #include - #include - #include diff --git a/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.6.0-fix-compile.patch b/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.6.0-fix-compile.patch deleted file mode 100644 index 5aeaabd29af1..000000000000 --- a/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.6.0-fix-compile.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/linux/drivers/media/common/saa716x/saa716x_pci.c 2017-02-26 18:48:27.196949325 +0100 -+++ b/linux/drivers/media/common/saa716x/saa716x_pci.c 2017-02-26 18:50:28.149283794 +0100 -@@ -1,9 +1,6 @@ - #include - #include --#include - #include --#include --#include - #include - #include - #include -@@ -20,11 +17,6 @@ - - #define DRIVER_NAME "SAA716x Core" - --static irqreturn_t saa716x_msi_handler(int irq, void *dev_id) --{ -- return IRQ_HANDLED; --} -- - static int saa716x_enable_msi(struct saa716x_dev *saa716x) - { - struct pci_dev *pdev = saa716x->pdev; diff --git a/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.9-fix-warnings.patch b/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.9-fix-warnings.patch deleted file mode 100644 index a32ab60868a6..000000000000 --- a/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.9-fix-warnings.patch +++ /dev/null @@ -1,146 +0,0 @@ ---- a/linux/drivers/media/common/saa716x/saa716x_rom.c 2015-12-29 19:40:55.000000000 +0100 -+++ a/linux/drivers/media/common/saa716x/saa716x_rom.c 2017-07-11 00:51:19.149941914 +0200 -@@ -113,7 +113,7 @@ - memcpy(rom_header, &buf[*offset], sizeof (struct saa716x_romhdr)); - if (rom_header->header_size != sizeof (struct saa716x_romhdr)) { - dprintk(SAA716x_ERROR, 1, -- "ERROR: Header size mismatch! Read size=%d bytes, Expected=%d", -+ "ERROR: Header size mismatch! Read size=%zd bytes, Expected=%d", - sizeof (struct saa716x_romhdr), - rom_header->header_size); - -@@ -237,7 +237,7 @@ - saa716x_descriptor_dbg(saa716x, buf, offset, header.size, header.ext_data); - if (header.size != sizeof (struct saa716x_decoder_hdr)) { - dprintk(SAA716x_ERROR, 1, -- "ERROR: Header size mismatch! Read size=%d bytes, Expected=%d", -+ "ERROR: Header size mismatch! Read size=%d bytes, Expected=%zd", - header.size, - sizeof (struct saa716x_decoder_hdr)); - -@@ -268,7 +268,7 @@ - saa716x_descriptor_dbg(saa716x, buf, offset, header.size, header.ext_data); - if (header.size != sizeof (struct saa716x_gpio_hdr)) { - dprintk(SAA716x_ERROR, 1, -- "ERROR: Header size mismatch! Read size=%d bytes, Expected=%d", -+ "ERROR: Header size mismatch! Read size=%d bytes, Expected=%zd", - header.size, - sizeof (struct saa716x_gpio_hdr)); - -@@ -305,7 +305,7 @@ - saa716x_descriptor_dbg(saa716x, buf, offset, header.size, header.ext_data); - if (header.size != sizeof (struct saa716x_video_decoder_hdr)) { - dprintk(SAA716x_ERROR, 1, -- "ERROR: Header size mismatch! Read size=%d bytes, Expected=%d", -+ "ERROR: Header size mismatch! Read size=%d bytes, Expected=%zd", - header.size, - sizeof (struct saa716x_video_decoder_hdr)); - -@@ -386,7 +386,7 @@ - saa716x_descriptor_dbg(saa716x, buf, offset, header.size, header.ext_data); - if (header.size != sizeof (struct saa716x_audio_decoder_hdr)) { - dprintk(SAA716x_ERROR, 1, -- "ERROR: Header size mismatch! Read size=%d bytes, Expected=%d", -+ "ERROR: Header size mismatch! Read size=%d bytes, Expected=%zd", - header.size, - sizeof (struct saa716x_audio_decoder_hdr)); - -@@ -417,7 +417,7 @@ - saa716x_descriptor_dbg(saa716x, buf, offset, header.size, header.ext_data); - if (header.size != sizeof (struct saa716x_evsrc_hdr)) { - dprintk(SAA716x_ERROR, 1, -- "ERROR: Header size mismatch! Read size=%d bytes, Expected=%d", -+ "ERROR: Header size mismatch! Read size=%d bytes, Expected=%zd", - header.size, - sizeof (struct saa716x_evsrc_hdr)); - -@@ -448,7 +448,7 @@ - saa716x_descriptor_dbg(saa716x, buf, offset, header.size, header.ext_data); - if (header.size != sizeof (struct saa716x_xbar_hdr)) { - dprintk(SAA716x_ERROR, 1, -- "ERROR: Header size mismatch! Read size=%d bytes, Expected=%d", -+ "ERROR: Header size mismatch! Read size=%d bytes, Expected=%zd", - header.size, - sizeof (struct saa716x_xbar_hdr)); - -@@ -486,7 +486,7 @@ - saa716x_descriptor_dbg(saa716x, buf, offset, header.size, header.ext_data); - if (header.size != sizeof (struct saa716x_tuner_hdr)) { - dprintk(SAA716x_ERROR, 1, -- "ERROR: Header size mismatch! Read size=%d bytes, Expected=%d", -+ "ERROR: Header size mismatch! Read size=%d bytes, Expected=%zd", - header.size, - sizeof (struct saa716x_tuner_hdr)); - -@@ -516,7 +516,7 @@ - saa716x_descriptor_dbg(saa716x, buf, offset, header.size, header.ext_data); - if (header.size != sizeof (struct saa716x_pll_hdr)) { - dprintk(SAA716x_ERROR, 1, -- "ERROR: Header size mismatch! Read size=%d bytes, Expected=%d", -+ "ERROR: Header size mismatch! Read size=%d bytes, Expected=%zd", - header.size, - sizeof (struct saa716x_pll_hdr)); - -@@ -546,7 +546,7 @@ - saa716x_descriptor_dbg(saa716x, buf, offset, header.size, header.ext_data); - if (header.size != sizeof (struct saa716x_channel_decoder_hdr)) { - dprintk(SAA716x_ERROR, 1, -- "ERROR: Header size mismatch! Read size=%d bytes, Expected=%d", -+ "ERROR: Header size mismatch! Read size=%d bytes, Expected=%zd", - header.size, - sizeof (struct saa716x_channel_decoder_hdr)); - -@@ -576,7 +576,7 @@ - saa716x_descriptor_dbg(saa716x, buf, offset, header.size, header.ext_data); - if (header.size != sizeof (struct saa716x_encoder_hdr)) { - dprintk(SAA716x_ERROR, 1, -- "ERROR: Header size mismatch! Read size=%d bytes, Expected=%d", -+ "ERROR: Header size mismatch! Read size=%d bytes, Expected=%zd", - header.size, - sizeof (struct saa716x_encoder_hdr)); - -@@ -606,7 +606,7 @@ - saa716x_descriptor_dbg(saa716x, buf, offset, header.size, header.ext_data); - if (header.size != sizeof (struct saa716x_ir_hdr)) { - dprintk(SAA716x_ERROR, 1, -- "ERROR: Header size mismatch! Read size=%d bytes, Expected=%d", -+ "ERROR: Header size mismatch! Read size=%d bytes, Expected=%zd", - header.size, - sizeof (struct saa716x_ir_hdr)); - -@@ -637,7 +637,7 @@ - saa716x_descriptor_dbg(saa716x, buf, offset, header.size, header.ext_data); - if (header.size != sizeof (struct saa716x_eeprom_hdr)) { - dprintk(SAA716x_ERROR, 1, -- "ERROR: Header size mismatch! Read size=%d bytes, Expected=%d", -+ "ERROR: Header size mismatch! Read size=%d bytes, Expected=%zd", - header.size, - sizeof (struct saa716x_eeprom_hdr)); - -@@ -668,7 +668,7 @@ - saa716x_descriptor_dbg(saa716x, buf, offset, header.size, header.ext_data); - if (header.size != sizeof (struct saa716x_filter_hdr)) { - dprintk(SAA716x_ERROR, 1, -- "ERROR: Header size mismatch! Read size=%d bytes, Expected=%d", -+ "ERROR: Header size mismatch! Read size=%d bytes, Expected=%zd", - header.size, - sizeof (struct saa716x_filter_hdr)); - -@@ -699,7 +699,7 @@ - saa716x_descriptor_dbg(saa716x, buf, offset, header.size, header.ext_data); - if (header.size != sizeof (struct saa716x_streamdev_hdr)) { - dprintk(SAA716x_ERROR, 1, -- "ERROR: Header size mismatch! Read size=%d bytes, Expected=%d", -+ "ERROR: Header size mismatch! Read size=%d bytes, Expected=%zd", - header.size, - sizeof (struct saa716x_streamdev_hdr)); - -@@ -789,7 +789,7 @@ - - memcpy(device, &buf[*offset], sizeof (struct saa716x_devinfo)); - if (device->struct_size != sizeof (struct saa716x_devinfo)) { -- dprintk(SAA716x_ERROR, 1, "ERROR: Device size mismatch! Read=%d bytes, expected=%d bytes", -+ dprintk(SAA716x_ERROR, 1, "ERROR: Device size mismatch! Read=%d bytes, expected=%zd bytes", - device->struct_size, - sizeof (struct saa716x_devinfo)); - diff --git a/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-Makefilepatch-2.diff b/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-Makefilepatch-2.diff deleted file mode 100644 index 78ba021fb4fe..000000000000 --- a/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-Makefilepatch-2.diff +++ /dev/null @@ -1,8 +0,0 @@ ---- v4l-dvb-saa716x-cfa4b4faab67/linux/drivers/media/common/saa716x/Makefile.orig 2013-03-02 07:44:51.112642592 +0100 -+++ v4l-dvb-saa716x-cfa4b4faab67/linux/drivers/media/common/saa716x/Makefile 2013-03-02 07:46:56.703138542 +0100 -@@ -24,3 +24,5 @@ - obj-$(CONFIG_DVB_SAA716X_FF) += saa716x_ff.o - - EXTRA_CFLAGS = -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/ -Idrivers/media/dvb-core/ -Idrivers/media/dvb-frontends/ -+EXTRA_CFLAGS += -Idrivers/media/common/tuners/ # up to kernel 3.6 -+EXTRA_CFLAGS += -Idrivers/media/tuners/ # kernel 3.7+ diff --git a/media-tv/v4l-dvb-saa716x/metadata.xml b/media-tv/v4l-dvb-saa716x/metadata.xml index 953cd1bea14f..bbd5b755d9bd 100644 --- a/media-tv/v4l-dvb-saa716x/metadata.xml +++ b/media-tv/v4l-dvb-saa716x/metadata.xml @@ -9,9 +9,6 @@ proxy-maint@gentoo.org Proxy Maintainers - - Install firmware - powARman/v4l-dvb-saa716x diff --git a/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20170225-r3.ebuild b/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20170225-r3.ebuild deleted file mode 100644 index 331af00aebdc..000000000000 --- a/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20170225-r3.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit linux-info linux-mod - -DESCRIPTION="driver for saa716x based dvb cards like TT S2-6400 or Skystar 2 eXpress HD" -HOMEPAGE="https://bitbucket.org/powARman/v4l-dvb-saa716x/overview" - -HG_REVISION="3b9fce66666a" -HG_REVISION_DATE="20160322" - -SRC_URI="https://bitbucket.org/powARman/v4l-dvb-saa716x/get/${HG_REVISION}.tar.gz --> v4l-dvb-saa716x-0.0.1_p${HG_REVISION_DATE}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~x86" -IUSE="+firmware" - -DEPEND="" -RDEPEND="${DEPEND} - firmware? ( sys-firmware/tt-s2-6400-firmware )" - -S="${WORKDIR}/powARman-v4l-dvb-saa716x-${HG_REVISION}" - -BUILD_TARGETS="modules" -MODULE_NAMES="saa716x_ff(misc:${EROOT%/}/usr/src/linux:${S}/linux/drivers/media/common/saa716x) - saa716x_core(misc:${EROOT%/}/usr/src/linux:${S}/linux/drivers/media/common/saa716x) - saa716x_budget(misc:${EROOT%/}/usr/src/linux:${S}/linux/drivers/media/common/saa716x) - saa716x_hybrid(misc:${EROOT%/}/usr/src/linux:${S}/linux/drivers/media/common/saa716x)" - -CONFIG_CHECK="DVB_CORE DVB_STV6110x DVB_STV090x" - -src_prepare() { - default - - eapply -p0 "${FILESDIR}/OSD_RAW_CMD_patch_2.diff" - eapply "${FILESDIR}/v4l-dvb-saa716x-Makefilepatch-2.diff" - kernel_is ge 3 19 0 && eapply "${FILESDIR}/v4l-dvb-saa716x-3.19-set_gpio.patch" - kernel_is ge 4 2 0 && eapply "${FILESDIR}/v4l-dvb-saa716x-4.2-fix-compile.patch" - kernel_is ge 4 5 2 && eapply "${FILESDIR}/v4l-dvb-saa716x-4.5.2-fix-compile.patch" - kernel_is ge 4 6 0 && eapply "${FILESDIR}/v4l-dvb-saa716x-4.6.0-fix-compile.patch" - kernel_is ge 4 9 0 && eapply "${FILESDIR}/v4l-dvb-saa716x-4.9-fix-warnings.patch" - kernel_is ge 4 10 0 && eapply "${FILESDIR}/v4l-dvb-saa716x-4.10-fix-compile.patch" -} - -src_compile() { - BUILD_PARAMS="SUBDIRS=${S}/linux/drivers/media/common/saa716x \ - CONFIG_SAA716X_CORE=m CONFIG_DVB_SAA716X_FF=m CONFIG_DVB_SAA716X_BUDGET=m \ - CONFIG_DVB_SAA716X_HYBRID=m" - addpredict "${EROOT%/}"/usr/src/linux/ - linux-mod_src_compile -} diff --git a/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20170225-r4.ebuild b/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20170225-r4.ebuild deleted file mode 100644 index 01a1f825cf79..000000000000 --- a/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20170225-r4.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 2019-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit linux-info linux-mod - -DESCRIPTION="driver for saa716x based dvb cards like TT S2-6400 or Skystar 2 eXpress HD" -HOMEPAGE="https://bitbucket.org/powARman/v4l-dvb-saa716x" - -REVISION="83f3bfd93a95" -REVISION_DATE="20160322" - -SRC_URI="https://bitbucket.org/powARman/v4l-dvb-saa716x/get/${REVISION}.tar.bz2 --> v4l-dvb-saa716x-0.0.1_p${REVISION_DATE}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+firmware" - -DEPEND="" -RDEPEND="${DEPEND} - firmware? ( sys-firmware/tt-s2-6400-firmware )" - -S="${WORKDIR}/powARman-v4l-dvb-saa716x-${REVISION}" - -BUILD_TARGETS="modules" -MODULE_NAMES=" - saa716x_ff(misc:${EROOT}/usr/src/linux:${S}/linux/drivers/media/common/saa716x) - saa716x_core(misc:${EROOT}/usr/src/linux:${S}/linux/drivers/media/common/saa716x) - saa716x_budget(misc:${EROOT}/usr/src/linux:${S}/linux/drivers/media/common/saa716x) - saa716x_hybrid(misc:${EROOT}/usr/src/linux:${S}/linux/drivers/media/common/saa716x)" - -CONFIG_CHECK="DVB_CORE DVB_STV6110x DVB_STV090x" - -src_prepare() { - default - - eapply -p0 "${FILESDIR}/OSD_RAW_CMD_patch_2.diff" - eapply "${FILESDIR}/v4l-dvb-saa716x-Makefilepatch-2.diff" - kernel_is ge 3 19 0 && eapply "${FILESDIR}/v4l-dvb-saa716x-3.19-set_gpio.patch" - kernel_is ge 4 2 0 && eapply "${FILESDIR}/v4l-dvb-saa716x-4.2-fix-compile.patch" - kernel_is ge 4 5 2 && eapply "${FILESDIR}/v4l-dvb-saa716x-4.5.2-fix-compile.patch" - kernel_is ge 4 6 0 && eapply "${FILESDIR}/v4l-dvb-saa716x-4.6.0-fix-compile.patch" - kernel_is ge 4 9 0 && eapply "${FILESDIR}/v4l-dvb-saa716x-4.9-fix-warnings.patch" - kernel_is ge 4 10 0 && eapply "${FILESDIR}/v4l-dvb-saa716x-4.10-fix-compile.patch" - kernel_is ge 4 14 0 && eapply "${FILESDIR}/v4l-dvb-saa716x-4.14.0-fix-compile.patch" - kernel_is ge 4 15 0 && eapply "${FILESDIR}/v4l-dvb-saa716x-4.15-fix-autorepeat.patch" - kernel_is ge 4 15 0 && eapply "${FILESDIR}/v4l-dvb-saa716x-4.15-fix-timers.patch" - kernel_is ge 4 16 0 && eapply "${FILESDIR}/v4l-dvb-saa716x-4.16-fix-compile.patch" - kernel_is ge 4 17 0 && eapply "${FILESDIR}/v4l-dvb-saa716x-4.17-define-AUDIO_GET_PTS.patch" -} - -src_compile() { - kernel_is le 5 0 && BUILD_PARAMS="SUBDIRS" || BUILD_PARAMS="M" - BUILD_PARAMS+="=${S}/linux/drivers/media/common/saa716x CONFIG_SAA716X_CORE=m \ - CONFIG_DVB_SAA716X_FF=m CONFIG_DVB_SAA716X_BUDGET=m CONFIG_DVB_SAA716X_HYBRID=m" - addpredict "${EROOT}"/usr/src/linux/ - linux-mod_src_compile -} -- cgit v1.2.3