From b284a3168fa91a038925d2ecf5e4791011ea5e7d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 18 Nov 2019 10:15:03 +0000 Subject: gentoo resync : 18.11.2019 --- media-plugins/vdr-dvbhddevice/Manifest | 6 +-- .../vdr-dvbhddevice/files/convert-bool-fix.patch | 36 +++++++++++++++++ .../vdr-dvbhddevice-2.1.3_p20140115-r1.ebuild | 46 ---------------------- .../vdr-dvbhddevice-2.1.6_p20141116-r1.ebuild | 45 --------------------- .../vdr-dvbhddevice-2.2.0_p20180420.ebuild | 14 ++++--- 5 files changed, 47 insertions(+), 100 deletions(-) create mode 100644 media-plugins/vdr-dvbhddevice/files/convert-bool-fix.patch delete mode 100644 media-plugins/vdr-dvbhddevice/vdr-dvbhddevice-2.1.3_p20140115-r1.ebuild delete mode 100644 media-plugins/vdr-dvbhddevice/vdr-dvbhddevice-2.1.6_p20141116-r1.ebuild (limited to 'media-plugins/vdr-dvbhddevice') diff --git a/media-plugins/vdr-dvbhddevice/Manifest b/media-plugins/vdr-dvbhddevice/Manifest index acfefa3df494..9f199bbb4795 100644 --- a/media-plugins/vdr-dvbhddevice/Manifest +++ b/media-plugins/vdr-dvbhddevice/Manifest @@ -1,9 +1,7 @@ +AUX convert-bool-fix.patch 1174 BLAKE2B 4e2d8f6c905ebc45a5b4a8740b545ca7f9406ca5a32bdeb4d8681d4bda3e8b0ad31b5c3d3f5ae79027e741b3e4da93aee237131de8f73e23776019679f178c7f SHA512 3790a53abea21d9024b5f6d3f53d092f0c99fab3741b43aca3d9b26215efea142bce7a769b0d4263ef8303cdda50e68be4747265ef44858b8df48a277c5136d8 AUX define_AUDIO_GET_PTS.patch 360 BLAKE2B 59b15a5667e71df36ffca863dbcc5952ee9cc813c715fa4affd93de1a1988a5ce0e7d323739013e47567f96576c05292ba82ed2a44a4328139320467dbe201ad SHA512 16b020c92b33c481ea7b41205f048870df2bd3ae38cd5ba388a505e43d9893c20de7baa5aa298de42d83276d01630eb6a1ac949b18aee5226869b2b57264b5cc DIST dvbhddevice-2.1.3_p20140115.tar.gz 40424 BLAKE2B 99d5fece7557c7c9f2b0174c9b1f01ac7628f0f0b6aa954f3e829de4653e10cbed6d0516b966f69737aff9ffafd224b3558bd868e972b64ab60c965ba569555a SHA512 29729325affec5e1330cf361a0c82ee5ef9f48f9a6a5032881b331a6451c05c8d99831c43e3eb08129053a7549dd4cd73a5e0afc6fe04d35956c8fecad48d2f4 -DIST vdr-dvbhddevice-2.1.6_p20141116.tar.gz 40902 BLAKE2B 60829c76226c1f0254ac6cdd940fcbcbf08d4cf0a50bfd9ab992db80f63f07389ab29cd4a04aec6319744a39e86cce7dbfee240ab77e819726facd9dbc6d7964 SHA512 0189cf5bfd1d9648915ec65427b4eeeb85ac80281a07a910e65381d86913c37d5840abd8984f17028afe63eae457c7ce398a446e3ad4b70ae4deada316c14b5b DIST vdr-dvbhddevice-2.2.0_p20180420.tar.gz 42772 BLAKE2B c70842be34181b15aab69f5a62ba98f4cc72ad5148db684a45ae5c6b74431517b70cda72dbfb6abc371675fd2742f86000b02c645bfba5b6a6b64817f5c59b35 SHA512 bc6ede24897a7704ecefcfdca92eeaf1bf9f8ed2410a478a21cc712730bfe94616c01379a172214f664481fba636ee3aea33540a6cf258597015dfb73720c408 -EBUILD vdr-dvbhddevice-2.1.3_p20140115-r1.ebuild 1044 BLAKE2B 2bd45c2b8c14ee05aa378c7252f04470f66ce4724adaa5a55ce7eaf9ee15d893c80ccc77eabd29514243269192458ee41ecbfc2a6698967f78584b1b05e219d0 SHA512 8740268eb2f76b2625deaca9eccfa70df15b0322951e3ddda633f577dd9ee0ad3b4db4dc92479b6e704aea5269856c60cf0d045df8d09f0805b295c735d3c52e EBUILD vdr-dvbhddevice-2.1.3_p20140115.ebuild 842 BLAKE2B c487d9dc3d33893c57612bb0b0e29e0a2c3863675f4f0b2c45a1b62df449e07ecf7ad66a4f90febd8437ce6a822a396ad4aa6b8835aaa5bb38cea07edac5412b SHA512 ecda86c62b7f9049222f8714ce3e4d159e7d94cdb6ddf98669172c5ee2458d3c9245efd4127044d7feeb0b9de6da5251c7d98584c603f457c3cba12df4e0b8e6 -EBUILD vdr-dvbhddevice-2.1.6_p20141116-r1.ebuild 1004 BLAKE2B eef06e5956e37469ce7cc895cdf6d0bb1267dd181127c83ddb8b30ef7b85d3829a713bde5799299134135967e9fd46b378bf7c1ca24d1485702b559316b4816d SHA512 2e9b744bae3e1f0754bfb321af762422258effca238e2e6092fd7895923225eb6ed9415dc4cd835b89eb866013df59624a5acff9725bd862385d756115b79b58 -EBUILD vdr-dvbhddevice-2.2.0_p20180420.ebuild 864 BLAKE2B caee5aed7525c2ca82f14567c3171fe3c1e4fbe75c1354a5188c334ef24e19204689efa788d001627e39842a8d0245843112ecaea5e306490b20fc4cfae71659 SHA512 e77fbd39d863137ca39d36e0a859c002e2a10cf8a0a06d45432c481aba7a1af19b2c599180f81c962204084e4e506206261621031effc271974eef2e79808e0c +EBUILD vdr-dvbhddevice-2.2.0_p20180420.ebuild 1006 BLAKE2B aa7b4534fa104a06a0b9c7c5b70d063cb41f58383f3d1e64fcc5f897fceb3a9ec2e110f90eb804d344ae1f57c3bb8fa61f64d84295f18146c71464fa39ea39d1 SHA512 482836310f11a870d6b594b40bbd9c635cabbac5aaba71609387abbc01038b661d71a1ad9416e7656353df88440ab1fa4b4fc2a670a330176ab7d27e096a40e7 MISC metadata.xml 565 BLAKE2B a629f35ce42591e8d978f8a6d5876f709fecbbef016776b2f7dbbac1c35dd4b22507398532db75be26b84cf4d0bc611bdcfe7e8219c11918be6bfb2e5580e96c SHA512 1d507d140eab426dc90ef53fe5f842f97128052a6c6ec27eb09fc5ccf23378e76567a59ee7830d8f195b0557308e67286144855ec22e28f8a113c700d8e53d59 diff --git a/media-plugins/vdr-dvbhddevice/files/convert-bool-fix.patch b/media-plugins/vdr-dvbhddevice/files/convert-bool-fix.patch new file mode 100644 index 000000000000..0bdc79fba948 --- /dev/null +++ b/media-plugins/vdr-dvbhddevice/files/convert-bool-fix.patch @@ -0,0 +1,36 @@ +fix cannot convert bool to boolean wrt bug #693418 + +Signed-of-by: Joerg Bornkessel (13 Nov 2019) +diff -Naur powARman-dvbhddevice-2ea854ae8c7a.orig/dvbhdffdevice.c powARman-dvbhddevice-2ea854ae8c7a/dvbhdffdevice.c +--- powARman-dvbhddevice-2ea854ae8c7a.orig/dvbhdffdevice.c 2019-11-13 18:46:50.000000000 +0100 ++++ powARman-dvbhddevice-2ea854ae8c7a/dvbhdffdevice.c 2019-11-13 18:48:12.000000000 +0100 +@@ -1069,15 +1069,15 @@ + } + else { + esyslog("ERROR: out of memory"); +- return false; ++ return FALSE; + } + if (jcd->mem) { + cinfo->dest->next_output_byte = jcd->mem + Used; + cinfo->dest->free_in_buffer = jcd->size - Used; +- return true; ++ return TRUE; + } + } +- return false; ++ return FALSE; + } + + static void JpegCompressTermDestination(j_compress_ptr cinfo) +@@ -1122,8 +1122,8 @@ + cinfo.in_color_space = JCS_YCbCr; + + jpeg_set_defaults(&cinfo); +- jpeg_set_quality(&cinfo, Quality, true); +- jpeg_start_compress(&cinfo, true); ++ jpeg_set_quality(&cinfo, Quality, TRUE); ++ jpeg_start_compress(&cinfo, TRUE); + + int rs = Width * 3; + JSAMPROW rp[Height]; diff --git a/media-plugins/vdr-dvbhddevice/vdr-dvbhddevice-2.1.3_p20140115-r1.ebuild b/media-plugins/vdr-dvbhddevice/vdr-dvbhddevice-2.1.3_p20140115-r1.ebuild deleted file mode 100644 index 02e0463d33c9..000000000000 --- a/media-plugins/vdr-dvbhddevice/vdr-dvbhddevice-2.1.3_p20140115-r1.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit vdr-plugin-2 - -HG_REVISION="60c58ae453d0" -HG_REVISION_DATE="20140115" - -DESCRIPTION="VDR Plugin: output device for the 'Full Featured' TechnoTrend -S2-6400 DVB Card" -HOMEPAGE="https://bitbucket.org/powARman/dvbhddevice" -SRC_URI="https://bitbucket.org/powARman/dvbhddevice/get/${HG_REVISION}.tar.gz --> dvbhddevice-2.1.3_p${HG_REVISION_DATE}.tar.gz" - -KEYWORDS="~amd64 ~x86" -SLOT="0" -LICENSE="GPL-2" -IUSE="" - -DEPEND=">=media-video/vdr-1.7.39" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/dvbhddevice-${HG_REVISION}" - -src_prepare() { - vdr-plugin-2_src_prepare - - fix_vdr_libsi_include dvbhdffdevice.c - - if has_version ">=media-video/vdr-2.1.10"; then - sed -e "s:pm = RenderPixmaps():pm = dynamic_cast(RenderPixmaps()):"\ - -e "s:delete pm;:DestroyPixmap(pm);:"\ - -i hdffosd.c - fi -} - -src_install() { - vdr-plugin-2_src_install - - doheader dvbhdffdevice.h hdffcmd.h - - insinto /usr/include/libhdffcmd - doins libhdffcmd/*.h -} diff --git a/media-plugins/vdr-dvbhddevice/vdr-dvbhddevice-2.1.6_p20141116-r1.ebuild b/media-plugins/vdr-dvbhddevice/vdr-dvbhddevice-2.1.6_p20141116-r1.ebuild deleted file mode 100644 index a2da1c862aed..000000000000 --- a/media-plugins/vdr-dvbhddevice/vdr-dvbhddevice-2.1.6_p20141116-r1.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit vdr-plugin-2 - -HG_REVISION="88cd727ebc99" -HG_REVISION_DATE="20141116" - -DESCRIPTION="VDR Plugin: output device for the 'Full Featured' TechnoTrend -S2-6400 DVB Card" -HOMEPAGE="https://bitbucket.org/powARman/dvbhddevice" -SRC_URI="https://bitbucket.org/powARman/dvbhddevice/get/${HG_REVISION}.tar.gz -> - ${P}.tar.gz" - -KEYWORDS="~amd64 ~x86" -SLOT="0" -LICENSE="GPL-2" -IUSE="" - -DEPEND=">=media-video/vdr-2.0.0" - -S="${WORKDIR}/powARman-${VDRPLUGIN}-${HG_REVISION}" - -src_prepare() { - vdr-plugin-2_src_prepare - - fix_vdr_libsi_include dvbhdffdevice.c - - if has_version ">=media-video/vdr-2.1.10"; then - sed -e "s:pm = RenderPixmaps():pm = dynamic_cast(RenderPixmaps()):"\ - -e "s:delete pm;:DestroyPixmap(pm);:"\ - -i hdffosd.c - fi -} - -src_install() { - vdr-plugin-2_src_install - - doheader dvbhdffdevice.h hdffcmd.h - - insinto /usr/include/libhdffcmd - doins libhdffcmd/*.h -} diff --git a/media-plugins/vdr-dvbhddevice/vdr-dvbhddevice-2.2.0_p20180420.ebuild b/media-plugins/vdr-dvbhddevice/vdr-dvbhddevice-2.2.0_p20180420.ebuild index 9f21531f038a..67fe2ca2c87b 100644 --- a/media-plugins/vdr-dvbhddevice/vdr-dvbhddevice-2.2.0_p20180420.ebuild +++ b/media-plugins/vdr-dvbhddevice/vdr-dvbhddevice-2.2.0_p20180420.ebuild @@ -1,4 +1,4 @@ -# Copyright 2018 Gentoo Authors +# Copyright 2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -8,8 +8,7 @@ inherit vdr-plugin-2 HG_REVISION="2ea854ae8c7a" HG_REVISION_DATE="20180420" -DESCRIPTION="VDR Plugin: output device for the 'Full Featured' TechnoTrend -S2-6400 DVB Card" +DESCRIPTION="VDR Plugin: output device for the 'Full Featured' TechnoTrend S2-6400 DVB Card" HOMEPAGE="https://bitbucket.org/powARman/dvbhddevice" SRC_URI="https://bitbucket.org/powARman/dvbhddevice/get/${HG_REVISION}.tar.gz -> ${P}.tar.gz" @@ -17,17 +16,22 @@ SRC_URI="https://bitbucket.org/powARman/dvbhddevice/get/${HG_REVISION}.tar.gz -> LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" DEPEND=">=media-video/vdr-2.0.0" RDEPEND="${DEPEND}" +PATCHES=( + "${FILESDIR}/convert-bool-fix.patch" + "${FILESDIR}/define_AUDIO_GET_PTS.patch" ) +QA_FLAGS_IGNORED=" + usr/lib/vdr/plugins/libvdr-dvbhddevice.* + usr/lib64/vdr/plugins/libvdr-dvbhddevice.*" + S="${WORKDIR}/powARman-${VDRPLUGIN}-${HG_REVISION}" src_prepare() { vdr-plugin-2_src_prepare - eapply "${FILESDIR}/define_AUDIO_GET_PTS.patch" fix_vdr_libsi_include dvbhdffdevice.c } -- cgit v1.2.3