diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-07-19 22:05:27 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-07-19 22:05:27 +0100 |
commit | 121ed4eec41fbf03e1998d09eede1bf449da63b9 (patch) | |
tree | ce9341d77d1507f67d4a3a1472da9011b5baa0a8 /media-tv | |
parent | dd762ff83c330186ee2ede002e08b2f780cddd51 (diff) |
gentoo resync : 19.07.2019
Diffstat (limited to 'media-tv')
-rw-r--r-- | media-tv/Manifest.gz | bin | 3759 -> 3769 bytes | |||
-rw-r--r-- | media-tv/dtv-scan-tables/Manifest | 3 | ||||
-rw-r--r-- | media-tv/dtv-scan-tables/dtv-scan-tables-9999.ebuild | 14 | ||||
-rw-r--r-- | media-tv/dtv-scan-tables/files/Makefile.patch | 55 | ||||
-rw-r--r-- | media-tv/gtk-v4l/Manifest | 2 | ||||
-rw-r--r-- | media-tv/gtk-v4l/metadata.xml | 1 | ||||
-rw-r--r-- | media-tv/kodi/Manifest | 2 | ||||
-rw-r--r-- | media-tv/kodi/kodi-9999.ebuild | 2 | ||||
-rw-r--r-- | media-tv/nvtv/Manifest | 2 | ||||
-rw-r--r-- | media-tv/nvtv/nvtv-0.4.7-r3.ebuild | 4 |
10 files changed, 74 insertions, 11 deletions
diff --git a/media-tv/Manifest.gz b/media-tv/Manifest.gz Binary files differindex 451108d1af17..4e470a964fbf 100644 --- a/media-tv/Manifest.gz +++ b/media-tv/Manifest.gz diff --git a/media-tv/dtv-scan-tables/Manifest b/media-tv/dtv-scan-tables/Manifest index 9f6a5186ec37..8ee97f0ed2e8 100644 --- a/media-tv/dtv-scan-tables/Manifest +++ b/media-tv/dtv-scan-tables/Manifest @@ -1,4 +1,5 @@ +AUX Makefile.patch 2012 BLAKE2B b9de2e1df4ada602cc824e16abe8bd3ed1c1855052c0ff24bddc86fd646b53e948d619ab9d878d015e009122b6eeddd7f1889f43909dd69f29273d3a175c481b SHA512 346e6d4ae239b223153408362f172d0af1a4aa63bbf6a1b65074d1e7827b03662332a5bc5966370a2bfec197c2f2df1e3d638187754a1dfcf7dc4bbda8476370 DIST dtv-scan-tables-2017-10-03-c1986d5148d8.tar.bz2 168709 BLAKE2B fb4a7ad5b6892a7e7eed1d57ebb49b1f4493076f6f744953d2d5c51c0e1cf7fdaf864ad050c578c2697f5b11d72c245b96ee369522cb58d38a1a2cef035099a7 SHA512 e2b0cf8f52b536be6a532b4a2896421a8150fdc19613e92c92d0c8275fcfd306cb091db32fa26f97bbec0a51ef4ba61b5f98e8c974280a3f6dd36b67a3bf4aad EBUILD dtv-scan-tables-0_p20171003.ebuild 736 BLAKE2B e97f810aa9a13bf409de4b71a7be136a3ddae6afb724afc3d7b2e1d2041f648158619fa29ddf904288304886c5cec3470c23149f96707c1fc08d6c7af2a05dc5 SHA512 772d083bdb99c78fe8b72c9552919d333a3fd97753e5c4da07cb1c305664deb021c71a19d49ce13101bc8f768970adfe7b1f12b4ed6447100a3a69590735d286 -EBUILD dtv-scan-tables-9999.ebuild 742 BLAKE2B 2b051afd0c0fd13514330eb0bef4e05ef2cd5fc12aea4c56905bf1f431d9181938dc26a0161c105e12daa7cb819b1ee68d70d0585000913b8dbde52fd5c5cc6a SHA512 e8c072d25cfa7262faa3ab2e1d597b523a50eb42f7b3c68ab62b8d9e5a3fa237d380012aa9daa83e03aee4e3bbd09e037fcce0906f8e34d9971453322c91ac8c +EBUILD dtv-scan-tables-9999.ebuild 864 BLAKE2B 33ba2e1e329559cc34a217216534ad80f25249ca5f47d45a86bb877ed5babe545465e5429ef5acf639d2bb092ab015cd6b80071b5e6da079df4f8b5cf4f52262 SHA512 56e57caf097145a0c2fce2acad42df479467f87f6842738b4943d8fb2f70ff603a71a3c5d43939ce00f82d9faaf4ecbe6f23637363be73831a18f8749fb2c3a1 MISC metadata.xml 247 BLAKE2B 158fa8dff063e01e64b4835fa1f199518ecf7d81282ee8c893efc0d4d73454e16adb3189ee8cd1272bbada6fb5ffc2b5aadbd796490c829cba1a4b8e3e20f29f SHA512 8bffd29ab89c8dc401ad49655e30a6bd3a953bf8f6c9309b318f3b03ed7bcf2e5c10533ac70967e549edcd512f6be13b9bce3e36175286370ba499dcb119f6fc diff --git a/media-tv/dtv-scan-tables/dtv-scan-tables-9999.ebuild b/media-tv/dtv-scan-tables/dtv-scan-tables-9999.ebuild index c4ec5b113aae..305e482a9150 100644 --- a/media-tv/dtv-scan-tables/dtv-scan-tables-9999.ebuild +++ b/media-tv/dtv-scan-tables/dtv-scan-tables-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 if [[ ${PV#9999} != ${PV} ]]; then inherit git-r3 @@ -20,13 +20,21 @@ SLOT="0" DEPEND=">=media-tv/v4l-utils-1.4" +PATCHES=( "${FILESDIR}"/Makefile.patch ) DOCS=( README ) +src_prepare() { + default + + # Conversion failure! + rm -v dvb-t/ke-Nairobi || die +} + src_compile() { emake dvbv3 dvbv5 } src_install() { - emake PREFIX="${ED}usr" install install_v3 + emake PREFIX="${ED}/usr" install install_v3 einstalldocs } diff --git a/media-tv/dtv-scan-tables/files/Makefile.patch b/media-tv/dtv-scan-tables/files/Makefile.patch new file mode 100644 index 000000000000..60c6cde17ef2 --- /dev/null +++ b/media-tv/dtv-scan-tables/files/Makefile.patch @@ -0,0 +1,55 @@ +From 17049393c60503d305787d06b7137227a99ed2af Mon Sep 17 00:00:00 2001 +From: James Le Cuirot <chewi@gentoo.org> +Date: Sat, 13 Jul 2019 16:23:23 +0100 +Subject: [PATCH] Improve Makefile to avoid "Argument list too long" error + +I wouldn't expect a foreach loop to be prone to this issue but it's +not the right way to write a Makefile anyway. + +Note that conversion failures are now fatal and the dvb-t/ke-Nairobi +file is failing to convert at the moment. + +Signed-off-by: James Le Cuirot <chewi@gentoo.org> +--- + Makefile | 16 ++++++++++------ + 1 file changed, 10 insertions(+), 6 deletions(-) + +diff --git a/Makefile b/Makefile +index 901dc9d..7cdb5bc 100644 +--- a/Makefile ++++ b/Makefile +@@ -17,6 +17,8 @@ DVBV3DIRS = atsc dvb-c dvb-s dvb-t + DVBV5DIRS = $(DVBV3DIRS) isdb-t + + DVBV3CHANNELFILES = $(foreach dir,$(DVBV3DIRS),$(wildcard $(dir)/*)) ++DVBV3OUTPUTFILES = $(patsubst %,$(DVBV3OUTPUTDIR)/%,$(DVBV3CHANNELFILES)) ++DVBV5OUTPUTFILES = $(patsubst %,$(DVBV5OUTPUTDIR)/%,$(DVBV3CHANNELFILES)) + + DVBFORMATCONVERT_CHANNEL_DVBV5 = -ICHANNEL -ODVBV5 + DVBFORMATCONVERT_CHANNEL_DVBV3 = -IDVBV5 -OCHANNEL +@@ -42,14 +44,16 @@ ifeq ($(DVBV3DIR),) + DVBV3DIR = dvbv3 + endif + +-dvbv3: +- @$(foreach var,$(DVBV3DIRS), $(MKDIR) $(DVBV3OUTPUTDIR)/$(var);) +- @$(foreach var,$(DVBV3CHANNELFILES), $(DVBFORMATCONVERT) $(DVBFORMATCONVERT_CHANNEL_DVBV3) $(var) $(DVBV3OUTPUTDIR)/$(var);) ++$(DVBV3OUTPUTFILES): $(DVBV3OUTPUTDIR)/%: % ++ @$(MKDIR) "$(dir $@)" ++ @$(DVBFORMATCONVERT) $(DVBFORMATCONVERT_CHANNEL_DVBV3) "$<" "$@" + ++$(DVBV5OUTPUTFILES): $(DVBV5OUTPUTDIR)/%: $(DVBV3OUTPUTDIR)/% ++ @$(MKDIR) "$(dir $@)" ++ @$(DVBFORMATCONVERT) $(DVBFORMATCONVERT_CHANNEL_DVBV5) "$<" "$@" + +-dvbv5: $(DVBV3OUTPUTDIR) +- @$(foreach var,$(DVBV3DIRS), $(MKDIR) $(DVBV5OUTPUTDIR)/$(var);) +- @$(foreach var,$(DVBV3CHANNELFILES), $(DVBFORMATCONVERT) $(DVBFORMATCONVERT_CHANNEL_DVBV5) $(DVBV3OUTPUTDIR)/$(var) $(DVBV5OUTPUTDIR)/$(var);) ++dvbv3: $(DVBV3OUTPUTFILES) ++dvbv5: $(DVBV5OUTPUTFILES) + + install: + @mkdir -p $(DATADIR)/$(DVBV5DIR) +-- +2.21.0 + diff --git a/media-tv/gtk-v4l/Manifest b/media-tv/gtk-v4l/Manifest index 2affb0bdd236..7100109bc02f 100644 --- a/media-tv/gtk-v4l/Manifest +++ b/media-tv/gtk-v4l/Manifest @@ -1,4 +1,4 @@ AUX gtk-v4l-0.4-device-remove-source-on-finalize.patch 1850 BLAKE2B 534955aab1ddecd3586ae472c3b6bcc2fd48da2a796bd2bedd93b430865b015c8519e616e890dff4064ecbe10c4e163aec79ff36aa428f1de4b436bda04123b0 SHA512 2fea2369c1f2084a71f4f934c870f14b08ddf61fa0ed50fb9de9c8250b431519cf38470d404d8428e667c958c9a1b2a674fc71177f508d85a1b7468b881a2d3c DIST gtk-v4l-0.4.tar.gz 328732 BLAKE2B b9040bb4be35d21998226e776f6844da12d75b4db51c8191ee658d9ef5701b27f8b400914eea07a39bb2ed0855f34a59c547bf412031c033212b9966fa1fe97e SHA512 ed0e1245d9b1cfce6612c91dacd09f26850a9420088d7de172c4bd582b70f4427820940e6cf98a831493edfe52d20fb02d6b2d62b695a24127097f50963df321 EBUILD gtk-v4l-0.4.ebuild 806 BLAKE2B 25ed080f64b8180a4d87f64de82ea54357c4f81a1806ea6ca9300ad5794fe2a4921c57abff824fab7b17185f81f38543793b27ebb3b5b5afb29b275f2b620925 SHA512 02f2d08a85b127dc279d8e4659d66522fc4c61ddc9c8688bf82560978a9dc2cb40e7ddda4e9764ca933308a4e75ec5583e7e8604c790a0d2a3a666dbd148dbec -MISC metadata.xml 139 BLAKE2B b4a59c22790dfec3fbcfaea41ef363401766736b68a85bedae00e1944d0a848aa97104c2f34244c0fe7b6363029281f965fc1b3545301d341cda371eaa976274 SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be +MISC metadata.xml 165 BLAKE2B ed7e2ebe9f71491aa6163627bdb6606e798b98ca85c053b50442182a245074a9e09b290835e7c8fb4a10e4e8227c16ec306fd16f337cb66904095d864e698e8b SHA512 bebe508b4e0a7ca4a046f9befd3d7ddb702756024756a5f0d9fb5ace5fe3f5a98f9d42afda4597b7d1338607b8d43e41c8fcd6d20d31da3ebad2b420edd2cb59 diff --git a/media-tv/gtk-v4l/metadata.xml b/media-tv/gtk-v4l/metadata.xml index 097975e3adc2..58f638b2ac3e 100644 --- a/media-tv/gtk-v4l/metadata.xml +++ b/media-tv/gtk-v4l/metadata.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> + <!--maintainer-needed--> </pkgmetadata> diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest index 1bff0ba50e49..a062b527560a 100644 --- a/media-tv/kodi/Manifest +++ b/media-tv/kodi/Manifest @@ -50,5 +50,5 @@ EBUILD kodi-18.2.ebuild 9400 BLAKE2B a236eead7bb444fc6ded827cf434e223cd214ec4db3 EBUILD kodi-18.2_rc1.ebuild 9400 BLAKE2B a236eead7bb444fc6ded827cf434e223cd214ec4db315f0b273abfa175d802c87195cefb05417203d7df8218d3c2f7551f61cbf9a80a7a7a1788cbcab588904b SHA512 31a112c047428237cd700dde8db40b7b5e312d20cc4fe381464188115e63fb0c7dc6b164bb4425011975c99ae7bc710be9d5b1cc9631c2135b1e1e62b7fdc4dc EBUILD kodi-18.3-r1.ebuild 9659 BLAKE2B 52afc68fc38678c85d9c3020f90e7a22730768a9eebf2321ed35971b39529ae7162578cdf9f62a45ba0aa77a6af2251d387bab6b95468849359840b2b9bc189f SHA512 98a1cb61847a4aead8f03c3da13188e05f3457b5b5ba616297c302f7cebc80d898d962c3594512285ceb5bf821075de5a02b46719ca6f26a21443a6e3924c69b EBUILD kodi-18.3.ebuild 9362 BLAKE2B 8282d6fab77eaa1ab2b3fbffee5e9bed24256fd444e542b8870c9c4c5c4f4a0ce9e2fe56e09a718f8db703efeb6d51d32ec5c953f768a1531bd1eaef12bbabc4 SHA512 ef41401db872973fc2ec1e99e6c1fe3099b6970b110904f175139e92b85a4ad5514e657d5fbc55d4d523caaf4dc7e4b0bd908d7b05ee5bc4c3e9d797509249d3 -EBUILD kodi-9999.ebuild 9659 BLAKE2B 52afc68fc38678c85d9c3020f90e7a22730768a9eebf2321ed35971b39529ae7162578cdf9f62a45ba0aa77a6af2251d387bab6b95468849359840b2b9bc189f SHA512 98a1cb61847a4aead8f03c3da13188e05f3457b5b5ba616297c302f7cebc80d898d962c3594512285ceb5bf821075de5a02b46719ca6f26a21443a6e3924c69b +EBUILD kodi-9999.ebuild 9597 BLAKE2B 9d11a63cf9fbcdced35f9085c882d39a3bada6b06b915731736673ef1aa6e7bc7bf9e35ccea268a438452c18c4379dc54122ee5df17b50a08d563e84be621bd4 SHA512 e98bfe9fb809939b97a47b1aaf3c45aa143b1816fea6272e6a8ba4ee431f3d12722d2ba8ea7ffc85d60ae3836f14cd54d07afd5790ddf179431f0cf2cd952e8b MISC metadata.xml 1837 BLAKE2B 7052432c77adf9951a0f6e18334034236db79bbf364a0003c9ed5dfe715219ed4165b66a6e6a74a065616956d2f32d450dd4f2f73161c47a7e71fe6a72bc323b SHA512 8a2761b8c4fdf0f0da113bba03fe36b1a7a28193e90b1b1c281f6fc452ba6879f385a37781b43c1022c2e51c4c0db173441343bf165779fa0bd92d80e1e94113 diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild index 83375bd4ab1b..d46ca6fba602 100644 --- a/media-tv/kodi/kodi-9999.ebuild +++ b/media-tv/kodi/kodi-9999.ebuild @@ -199,7 +199,6 @@ src_prepare() { # Prepare tools and libs witch are configured with autotools during compile time AUTOTOOLS_DIRS=( - "${S}"/lib/cpluff "${S}"/tools/depends/native/TexturePacker/src "${S}"/tools/depends/native/JsonSchemaBuilder/src ) @@ -214,7 +213,6 @@ src_prepare() { # Prevent autoreconf rerun sed -e 's/autoreconf -vif/echo "autoreconf already done in src_prepare()"/' -i \ - "${S}"/cmake/modules/FindCpluff.cmake \ "${S}"/tools/depends/native/TexturePacker/src/autogen.sh \ "${S}"/tools/depends/native/JsonSchemaBuilder/src/autogen.sh \ || die diff --git a/media-tv/nvtv/Manifest b/media-tv/nvtv/Manifest index d2b003a2a023..82ab74ffe27e 100644 --- a/media-tv/nvtv/Manifest +++ b/media-tv/nvtv/Manifest @@ -1,5 +1,5 @@ AUX nvtv.start 425 BLAKE2B 605018e20976a40736da4494cb6a5d5ec7efb57bcb711d9147d7d05b7cd6c80bcb412a445a0d89af1581d2762d4644b35525027b155161d42b8d040469647de8 SHA512 e91e5bfb5573becbebc0eea3070fd8d18c0abdea6687cdb540ceef0dad7021328cf28e6ca4e6399b1787586e325cd03f60e09a8462aef0341f2297ac05204b66 AUX respect-cflags.patch 865 BLAKE2B b146217e8d5bd7e5c9768d92e52be09de8f37f926ebd43e2d5ea6748c99f7dfaf3c679aa1eb9c4659514c86635ab9c82d6a9bdd5b75843cace6024870f642b7d SHA512 abe0a9ccce9c9a9a729aadf444c4bd91e7c94ab3c04817ad12fa471f77fb8fa54235ddc86c798fac94c988cfa58075d3bf2fc40ef26fdd3c629b6f81848951e5 DIST nvtv-0.4.7.tar.gz 419564 BLAKE2B 95010c42162c790293b159eb3c43ebc436933f9126cce0130e0d2e616219a47173d12570a4fbb8a45d32f59a92314b8734bd51b83fcadbd22a1e1c1f7306d929 SHA512 086de916b3b783a2071906e8f2eb98009f2f73627dc75ee086bde9864de3fb18ddf6d981c56225ac3dca3c837ff3575deb2aeca042be4cca9dc7a876cc41282d -EBUILD nvtv-0.4.7-r3.ebuild 812 BLAKE2B c08e72d9cb1df9dd5b86d427f5650872734204724edeba0e6c944605d6f08049e610244e88c5e38fa5cc70f41a015fa49d8d8015c31ccef18911f0967427b299 SHA512 3bf0138b17e67241832d575a3c6fb974de7ea262fec74dd592a9cd40c91574756c06726f606252b51a2362041e0d369466ee9ce4f4ba99b3cdfc21991b4cf650 +EBUILD nvtv-0.4.7-r3.ebuild 809 BLAKE2B 31e68a4ecb3283eb5809c1031a3870b864ac86d5fe9bd16e043351e4a44d292ae831b73ba0dab47fcd658de7d101b479f80338f54c48490ecb9c5eeec7cf863f SHA512 81d83bd02fa21e36986ab3424fa2ba4b0ce1ce79dd9f08be54679e283e122e759489edd2546c0b99155dbc1690e40a2be72eb1151e8c95dc9b57998ce7bd5d85 MISC metadata.xml 306 BLAKE2B 473e2fe51f275d4303e22d8fc32dbca9f023f58848aa05854db2b36f6eee2c8de264809f308744678f0de0c8bf89bc2f16e40cca8b087510a914132f6a95ed7e SHA512 fb364cfd967773a1db12aafedcae8812dba9413da3eea5513a29537733214ee128432296bc5a51a79ba72863b8344e8dcac657092d6b199e8c34f56052cc7d6d diff --git a/media-tv/nvtv/nvtv-0.4.7-r3.ebuild b/media-tv/nvtv/nvtv-0.4.7-r3.ebuild index e188d0766f7b..1d8d0dea9c2b 100644 --- a/media-tv/nvtv/nvtv-0.4.7-r3.ebuild +++ b/media-tv/nvtv/nvtv-0.4.7-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/nv-tv-out/${P}.tar.gz" SLOT="0" LICENSE="GPL-2" -KEYWORDS="~x86 ~amd64" +KEYWORDS="~amd64 ~x86" RDEPEND="sys-apps/pciutils[-zlib] gtk? ( x11-libs/gtk+:2 ) |