From 586819755b4dbfdffdc8a725ab7c0f86095b8489 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 15 Sep 2018 17:37:09 +0100 Subject: gentoo resync : 15.09.2018 --- media-video/Manifest.gz | Bin 28414 -> 28408 bytes media-video/gnome-mpv/Manifest | 2 + media-video/gnome-mpv/gnome-mpv-0.15.ebuild | 37 ++ media-video/libav/Manifest | 2 +- media-video/libav/libav-12.2.ebuild | 4 +- media-video/mediainfo/Manifest | 6 +- media-video/mediainfo/mediainfo-18.03.ebuild | 77 ---- media-video/mediainfo/mediainfo-18.05.ebuild | 9 +- media-video/mediainfo/mediainfo-18.08.1.ebuild | 80 ++++ media-video/smplayer/Manifest | 2 +- media-video/smplayer/smplayer-18.6.0.ebuild | 2 +- media-video/v4l2loopback/Manifest | 6 +- .../v4l2loopback/v4l2loopback-0.10.0.ebuild | 58 --- .../v4l2loopback/v4l2loopback-0.12.0.ebuild | 59 +++ media-video/v4l2loopback/v4l2loopback-9999.ebuild | 15 +- media-video/vdr/Manifest | 6 +- .../vdr/files/vdr-2.0.7_systemd_argsdir.patch | 438 --------------------- .../files/vdr-2.0.7_systemd_argsdir_vanilla.patch | 438 --------------------- media-video/vdr/vdr-2.0.7.ebuild | 288 -------------- media-video/vdr/vdr-2.2.0-r3.ebuild | 4 +- 20 files changed, 206 insertions(+), 1327 deletions(-) create mode 100644 media-video/gnome-mpv/gnome-mpv-0.15.ebuild delete mode 100644 media-video/mediainfo/mediainfo-18.03.ebuild create mode 100644 media-video/mediainfo/mediainfo-18.08.1.ebuild delete mode 100644 media-video/v4l2loopback/v4l2loopback-0.10.0.ebuild create mode 100644 media-video/v4l2loopback/v4l2loopback-0.12.0.ebuild delete mode 100644 media-video/vdr/files/vdr-2.0.7_systemd_argsdir.patch delete mode 100644 media-video/vdr/files/vdr-2.0.7_systemd_argsdir_vanilla.patch delete mode 100644 media-video/vdr/vdr-2.0.7.ebuild (limited to 'media-video') diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz index 67225c718e80..f656fad3f8ad 100644 Binary files a/media-video/Manifest.gz and b/media-video/Manifest.gz differ diff --git a/media-video/gnome-mpv/Manifest b/media-video/gnome-mpv/Manifest index 0b6e17f4015b..fa9cf0149e65 100644 --- a/media-video/gnome-mpv/Manifest +++ b/media-video/gnome-mpv/Manifest @@ -1,3 +1,5 @@ DIST gnome-mpv-0.14.tar.xz 313300 BLAKE2B 5296b416928c8d62ed6d50cee7a0a27d19fb5bf8c0f1196276792272b5823c4d4efd8057b8dd7b64fc66281c36428f667ddaf3672389d3168e48de50594e2810 SHA512 c802f5f978dd3760faf5b78a5e59bd8e9960cc05ac67a1373d29371936b422272ba7541d05dd228b89cb97ac180460907fcb7da31bafbdcdd2445681230685e2 +DIST gnome-mpv-0.15.tar.xz 314960 BLAKE2B 9a12d090ae743fc723f83154bf212a84d7544f38f13107d2f5c9fdf45e0283559cb861a40f638a4c8d8af04a73442c12ccfd35b3ffad014df6af260ba3db9104 SHA512 a5ef912c65c453aebe2fad136221fb98e201bd438d13115c02d7d0c8d7310b19fcd74a3deec6dbbb8499eb0ae765ba80aa7731c01e9e4a753e62f50fad70837b EBUILD gnome-mpv-0.14.ebuild 712 BLAKE2B a41fd5844f2b88245de1e974286570ce8aadbc45e92bb0af5c94e404dafd544d7e86259e729a55e24fdf3e7a5606481f457611fb196bcb7674a85c6b9fcf9313 SHA512 6859f4194cc12387ffcaa097f8e3e8a2ae11ce4b760f141f8ca42936655f23e35eaa4ec7d5e66e82c592fa01d50802f4484c7a060411a937580a57775d5563b2 +EBUILD gnome-mpv-0.15.ebuild 846 BLAKE2B d2c962cade1beded76926eaaf5a4a022eadcd88591d11efbea7109b00324af9bb23e6d8a88e92d97480b6f82ba610fa8a27d10294db51ff5b212407211fa3a77 SHA512 4997e87ba5b4427b83b7f3c136fa5379ebc92730d69756e20718e903a54defc9747253881790dc435b6d13c8d12c9e2476cac2ee741f08cc9a15305407772e20 MISC metadata.xml 240 BLAKE2B 9fdc2353993b08138d11aacc71a6026e52430fe7b4b4d0a195dd03a5334b6c18dba7a88279e18c6b97cfbd1e0c818f5310b5d1419e77b3ede373c62321f4c2e6 SHA512 3b569f3b00bb1b30eb7c5f2e3c372f3b87d96cb333d36857973c85d8b5da1f480918ad7f3b1ed9cdbe7db6bcd1db35b454d34559a430c28008b5a1dccc65776b diff --git a/media-video/gnome-mpv/gnome-mpv-0.15.ebuild b/media-video/gnome-mpv/gnome-mpv-0.15.ebuild new file mode 100644 index 000000000000..bf2df00cb8ee --- /dev/null +++ b/media-video/gnome-mpv/gnome-mpv-0.15.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit gnome2-utils xdg-utils meson + +DESCRIPTION="A simple GTK+ frontend for mpv" +HOMEPAGE="https://gnome-mpv.github.io/" +SRC_URI="https://github.com/gnome-mpv/gnome-mpv/releases/download/v${PV}/${P}.tar.xz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64" + +RDEPEND=">=dev-libs/glib-2.44 + >=x11-libs/gtk+-3.20:3 + >=media-video/mpv-0.27[libmpv] + media-libs/libepoxy" +DEPEND="${RDEPEND} + dev-libs/appstream-glib + dev-util/glib-utils + virtual/pkgconfig" + +RESTRICT="test" # broken .po files failing validation in 0.15; try again on next bump! + +pkg_postinst() { + xdg_desktop_database_update + gnome2_icon_cache_update + gnome2_schemas_update +} + +pkg_postrm() { + xdg_desktop_database_update + gnome2_icon_cache_update + gnome2_schemas_update +} diff --git a/media-video/libav/Manifest b/media-video/libav/Manifest index 94fab6e0f7cd..a7f12614c4aa 100644 --- a/media-video/libav/Manifest +++ b/media-video/libav/Manifest @@ -10,7 +10,7 @@ DIST libav-13_pre20171219.tar.xz 5427904 BLAKE2B 074dc5d071aeb656fc14a015c2e3c16 DIST libav-9.17.tar.xz 4080028 BLAKE2B 206e80835292af9f4c1c65539e69981b6993679c11e8a1feef1e37dc32174e47744ebce319b8709bcd60804f493fab1e524c781e174d60d9ebe35ad01f6fbc60 SHA512 20af83d4b6a23c159c2386b6592ba6a6acf3f2c54e8aeb16dd0c8a64d637fbde24f37b864698b1143c6802b64a7b5e8ddfe0e7601b35c35686a789e2b3232f5a EBUILD libav-11.8.ebuild 11090 BLAKE2B bce6ee5af8fb86a4ca1c760fff386b4e3c7c70f4b8353e2d24162c7da9a42ee742b6a230b3e6b84ef57fb1bd957bb83e2d7c340e669ea2de4f98e46c2af8f319 SHA512 6b50605fe7e2d0f9468fa46e8d7b513db03603622ff69559e4517c1f610ea4be8fb8bceada46ab50694cc9bbbf6c0a5d1d2aa35a20046ffda7a60d4991d74037 EBUILD libav-11.9999.ebuild 10990 BLAKE2B 2bab5e0b48d1d490d35c991fd74f4629a0de5b5375d7f9955c0d49c4f7a35fd6f1cfcc91b09833d89dc8f4fe01a29b0ab9058887c2ab2a299a957c0a6acfd50d SHA512 d5a1a7ecd91dbf0bad318ec8c5705afff4b12fd956da8e2a06ac7de002dd23e3dd8a86b5e162097901617d52ca0bdafd5ccc09b08fec51dc9b249d2169b58d90 -EBUILD libav-12.2.ebuild 11371 BLAKE2B a558cbff15f22cd682d718a54f92bd2649fbb599ef4c381ad955c4bb96d9481f478e4248c9551b64b069193ce1d5a54b2690be837972d8b183c836a2e1bdb124 SHA512 b49a1637c76d20c52ec9dc7abec7924251f1bf6f4be618cf469d6fd7d317e07046841f3e25a74bb3860aceb0d928335feabd9a42bb2b9d296648e1d70efba861 +EBUILD libav-12.2.ebuild 11369 BLAKE2B e9a42c458e83c67aaf24a75d19eaef75d5e46a5ab86731cbf8c7ef0fb56deba7f225aa1247b87ef52632d8ae216ae42cd9a2701303682ffe1317ff7744e50b53 SHA512 07276111122185e4b0997024a0a1709c1cd93766a3f3ef30d118ccb5fd95281c45d6009a4fa48ec62d24404d99a8b90d1e0e2ca0abd1049b68fe2b4b3054ae4a EBUILD libav-13_pre20171219.ebuild 10790 BLAKE2B 5a33e384d54549ec4fad1c082022b9d7187c3e3032461c38a1e237683e6e27b400a7bf23bc220fde169b1b2d7fd59b50620dbc4c4d9d2c8b2df195fbd3d4be05 SHA512 764fbebd1a086913e2a85430732a7b56a369a02a0200f10ed6fd7fef552bf76638df65601f7e2afdbc68987dccd777c403ed2799cca096bf606e382ee2681f54 EBUILD libav-9.17.ebuild 9976 BLAKE2B 053e88c957d482f172b0ad170ed35712e86758d945df08e666640b28743d8970fc2c481b69c0ed74234a2a66e4e0116573f7e660500365f77e6ca3b41b55007e SHA512 0dba0e1cd904a8cacf6d50e6370983bba1dd85d5495e934d83def260a35a4d28fb14876d36d528dc4b2a34442e0d22b22e69a10b2b7d13506c9f175fad3e980a EBUILD libav-9999.ebuild 10849 BLAKE2B 1cccc4d2a8e55b9bc0f14d838689a253d52db1e741fe22f8b00bf2d90ab1460b0598e7c1fe9773ed7650af8d20942601698ae86e465272054ec8f5bb28b22936 SHA512 0c41cc11dd22ab4a7afe412e78e07d693a57dfbc97667a4bbe12eb294406f524d287a226ac7911ed3b6a329bf9a5b1b20d08f96d9cdb614fa947c9ef19f10035 diff --git a/media-video/libav/libav-12.2.ebuild b/media-video/libav/libav-12.2.ebuild index 41a6b2cf7eac..855312ca1307 100644 --- a/media-video/libav/libav-12.2.ebuild +++ b/media-video/libav/libav-12.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -30,7 +30,7 @@ fi LICENSE="LGPL-2.1 gpl? ( GPL-3 )" SLOT="0/12" -[[ ${PV} == *9999 ]] || KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 +[[ ${PV} == *9999 ]] || KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" IUSE="aac alsa amr bs2b +bzip2 cdio cpudetection custom-cflags debug doc +encode faac fdk diff --git a/media-video/mediainfo/Manifest b/media-video/mediainfo/Manifest index 63d11a1bbaec..4f7f48ab1b76 100644 --- a/media-video/mediainfo/Manifest +++ b/media-video/mediainfo/Manifest @@ -1,5 +1,5 @@ -DIST mediainfo_18.03.tar.xz 1328024 BLAKE2B 3d304d7894b02f0f9355217b4c3a3f26a85e88d7be7c66a16ad8a8995421a51cf32c6f0f358aa7fbf246a1deb710cecec13a1be3f1700247c132b248624a414f SHA512 c4ed389c9d6a918196d3337fd5f50229e9e3b565745fc328462de7e0fe3a55496300ef5e2f784027669ff6f2428c5d573c5941eb0b26276dca6dc93a1286fbc1 DIST mediainfo_18.05.tar.xz 1359000 BLAKE2B e82e337f7ec7158bf8b9222fae8fc65b16211a42214f0f24003c0eebee523cf7d383aee827e4170a5317e8c470eb637ebb7154fdd2f104f2c1ce9913e8b4519e SHA512 10ffad5828d7afe83533e6e850f7124499fe1cdce024c9f3f46c5ab2333e19d40747feea641ce0b8a8d37f9aa069db39e205d0ac2bf1f5189ee2b044d6d7e2bf -EBUILD mediainfo-18.03.ebuild 1577 BLAKE2B 51903a0f1a34350dfcacd76f10842ae9748918b8df00b4e8264c2af1f2cd64b6fcdbf02cc44f7e01c5dd884eb0acd9b5fb36aa712435ad7b85f5623f8edd5eae SHA512 9e3b0a882c366d7d9cfe2a7b3f4fc54e56e966833aa19a7cce4b9c5499e3327f914f3147f68798e5bdc506fb98254c6103985e159f0046429c56b6dc8f69d362 -EBUILD mediainfo-18.05.ebuild 1579 BLAKE2B 7a04fcd279c9f1c892d00e620194143dd4b6c4baec926007fae5f4ad21901e0cab8dcf1fbfc181711809df8e7a9d438e2489e1897937340ca0d5c0071732cae7 SHA512 123b967d7f22a1b699a52b90f2412dbe2798ffb979350db05491f01a9b46d6feb08952fa8e03a92858330840f810d375fa898b3641394c3e701817644c153acb +DIST mediainfo_18.08.1.tar.xz 1392800 BLAKE2B 426c9b560e31c10e5ba1a3d2a02e7a3cf2e89410e64ec800ff2881939d8774205eb134bfa5685866705e3fe424954edce91cdfea60e060249bb5cb7f10fa4da3 SHA512 ff807138a253dfe8ea79d568a0c742e9391709e1e0ae3c5d0ce0e5345f2306057b541e5eb2bdd6bf0032f287b2387dfc21a506698ccd2c81a9f70679cf518480 +EBUILD mediainfo-18.05.ebuild 1603 BLAKE2B 1d6c4c5e6c9aac199d3b0b6013406c6d206ba593e551a49b4363c535de99e06d68be8fc0ba8d84af8545a72baf767aaf4002657a54a94e9c24527a491dcb5e2f SHA512 927729dcb410b7458fdaf656392e64f4173ef69b158d161c04753cd29bb8c313fd8c574c33a529951a3cc27caa34b6377bea4869b8ca27d1187a4cae3ed0e55a +EBUILD mediainfo-18.08.1.ebuild 1605 BLAKE2B decd7c6b5e41d3a0f649eb5d197bc399961b7bf7e7155ac85f92ff15aecac309f7d6cc93bfaf926765cdd5c7c9439f04be4d3564b0712f580e685489edc56378 SHA512 d99a91de941f042dc88db5c746efdcee1f6ea93ffd9d99f56edbf8c8dbb385c7a4bd7db19c2fd6c7631605694648dc2e745b371cf1f57563d4d339c37658afc0 MISC metadata.xml 343 BLAKE2B 53fbddabb217e6584379432d0ee85ef7e8a5a9ba13bf0e9fe71a22c2a1f0495d692e51cf17ea17427f22d65c94fc97bb7c5d0a3407e9c810c91616aa92d3e71e SHA512 3647e319de82c1521bd1e6a28dc7a64435b052130102d7a4b6f1478d92cfc94a164b7d9435855b4929d584be2f886f6bc51c84f6cb63b8431ac028583d57f0a3 diff --git a/media-video/mediainfo/mediainfo-18.03.ebuild b/media-video/mediainfo/mediainfo-18.03.ebuild deleted file mode 100644 index 23284f7dca84..000000000000 --- a/media-video/mediainfo/mediainfo-18.03.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -WX_GTK_VER="3.0" - -inherit gnome2-utils xdg-utils autotools wxwidgets - -DESCRIPTION="MediaInfo supplies technical and tag information about media files" -HOMEPAGE="https://mediaarea.net/mediainfo/ https://github.com/MediaArea/MediaInfo" -SRC_URI="https://mediaarea.net/download/source/${PN}/${PV}/${P/-/_}.tar.xz" - -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="curl mms wxwidgets" - -RDEPEND="sys-libs/zlib - >=media-libs/libzen-0.4.37 - ~media-libs/lib${P}[curl=,mms=] - wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -S=${WORKDIR}/MediaInfo - -pkg_setup() { - TARGETS="CLI" - use wxwidgets && TARGETS+=" GUI" -} - -src_prepare() { - eapply_user - - local target - for target in ${TARGETS}; do - cd "${S}"/Project/GNU/${target} || die - sed -i -e "s:-O2::" configure.ac || die - eautoreconf - done -} - -src_configure() { - local target - for target in ${TARGETS}; do - cd "${S}"/Project/GNU/${target} || die - local args="" - [[ ${target} == "GUI" ]] && args="--with-wxwidgets --with-wx-gui" - econf ${args} - done -} - -src_compile() { - local target - for target in ${TARGETS}; do - cd "${S}"/Project/GNU/${target} || die - default - done -} -src_install() { - local target - for target in ${TARGETS}; do - cd "${S}"/Project/GNU/${target} || die - default - dodoc "${S}"/History_${target}.txt - done -} - -pkg_postinst() { - gnome2_icon_cache_update - xdg_desktop_database_update -} - -pkg_postrm() { - gnome2_icon_cache_update - xdg_desktop_database_update -} diff --git a/media-video/mediainfo/mediainfo-18.05.ebuild b/media-video/mediainfo/mediainfo-18.05.ebuild index 48b2796d9299..c1e8e6060b13 100644 --- a/media-video/mediainfo/mediainfo-18.05.ebuild +++ b/media-video/mediainfo/mediainfo-18.05.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://mediaarea.net/download/source/${PN}/${PV}/${P/-/_}.tar.xz" LICENSE="BSD-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="curl mms wxwidgets" RDEPEND="sys-libs/zlib @@ -26,11 +26,14 @@ S=${WORKDIR}/MediaInfo pkg_setup() { TARGETS="CLI" - use wxwidgets && TARGETS+=" GUI" + if use wxwidgets; then + TARGETS+=" GUI" + setup-wxwidgets + fi } src_prepare() { - eapply_user + default local target for target in ${TARGETS}; do diff --git a/media-video/mediainfo/mediainfo-18.08.1.ebuild b/media-video/mediainfo/mediainfo-18.08.1.ebuild new file mode 100644 index 000000000000..8f0fa38d3856 --- /dev/null +++ b/media-video/mediainfo/mediainfo-18.08.1.ebuild @@ -0,0 +1,80 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +WX_GTK_VER="3.0" + +inherit gnome2-utils xdg-utils autotools wxwidgets + +DESCRIPTION="MediaInfo supplies technical and tag information about media files" +HOMEPAGE="https://mediaarea.net/mediainfo/ https://github.com/MediaArea/MediaInfo" +SRC_URI="https://mediaarea.net/download/source/${PN}/${PV}/${P/-/_}.tar.xz" + +LICENSE="BSD-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="curl mms wxwidgets" + +RDEPEND="sys-libs/zlib + >=media-libs/libzen-0.4.37 + ~media-libs/lib${P}[curl=,mms=] + wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +S=${WORKDIR}/MediaInfo + +pkg_setup() { + TARGETS="CLI" + if use wxwidgets; then + TARGETS+=" GUI" + setup-wxwidgets + fi +} + +src_prepare() { + default + + local target + for target in ${TARGETS}; do + cd "${S}"/Project/GNU/${target} || die + sed -i -e "s:-O2::" configure.ac || die + eautoreconf + done +} + +src_configure() { + local target + for target in ${TARGETS}; do + cd "${S}"/Project/GNU/${target} || die + local args="" + [[ ${target} == "GUI" ]] && args="--with-wxwidgets --with-wx-gui" + econf ${args} + done +} + +src_compile() { + local target + for target in ${TARGETS}; do + cd "${S}"/Project/GNU/${target} || die + default + done +} +src_install() { + local target + for target in ${TARGETS}; do + cd "${S}"/Project/GNU/${target} || die + default + dodoc "${S}"/History_${target}.txt + done +} + +pkg_postinst() { + gnome2_icon_cache_update + xdg_desktop_database_update +} + +pkg_postrm() { + gnome2_icon_cache_update + xdg_desktop_database_update +} diff --git a/media-video/smplayer/Manifest b/media-video/smplayer/Manifest index 4cd13668b24e..45d9817b9e06 100644 --- a/media-video/smplayer/Manifest +++ b/media-video/smplayer/Manifest @@ -8,5 +8,5 @@ DIST smplayer-18.5.0.tar.bz2 5040367 BLAKE2B 18b1db622f11cb8c9a5f088071fae8b3d7d DIST smplayer-18.6.0.tar.bz2 5111791 BLAKE2B db19932703d93cba7f3f54989988d88af7ed033a61388f89263f613ce743cfd1ff649dad9db2b43193a459110267ee176eae9640f814e77545cfe6b5fb53abe2 SHA512 8383c8c3d4a171adc189d6bc4c11c0b7a8ea78bf8ff8518589647dfd846b314cf3290a1d607c617e7e971ee29c6966666bf9d306d1b1c1bb4824f42efd97c7a8 EBUILD smplayer-18.3.0.ebuild 3210 BLAKE2B ba9f7d3676975005609ad952cc02f3b859b016dc7442cd07117bbae390a6f820dfafce3177fff8802ee673d1b5ab68ae1bbb0ca26325526ce793ca0f2ce38cc1 SHA512 0f9a893db8bfc70f2bcad5ff6c6a394d9af54ff81793d475cd5a9ebe6aebcb1402083cbc18e68227f9a99389c6c16ebd2ed5e81a2e7a936739038703a3ae7ef4 EBUILD smplayer-18.5.0.ebuild 3212 BLAKE2B c33eac8e4b85c11234107d4f316c999dcd04085e180bfbe1703a72adf804c11f7b2ad685e656d12ded2ca09be6efe07c8e636842d1c6eb31c76d081d4491c531 SHA512 e56132a6953a0f5fd980adc562a63edfa11d4e2eb73d41442fa9b52ad4b028e73e70623435aad7ab347d2286e438274e54e67a1911fa2eb68c3381ea562c184e -EBUILD smplayer-18.6.0.ebuild 3212 BLAKE2B c33eac8e4b85c11234107d4f316c999dcd04085e180bfbe1703a72adf804c11f7b2ad685e656d12ded2ca09be6efe07c8e636842d1c6eb31c76d081d4491c531 SHA512 e56132a6953a0f5fd980adc562a63edfa11d4e2eb73d41442fa9b52ad4b028e73e70623435aad7ab347d2286e438274e54e67a1911fa2eb68c3381ea562c184e +EBUILD smplayer-18.6.0.ebuild 3210 BLAKE2B ba9f7d3676975005609ad952cc02f3b859b016dc7442cd07117bbae390a6f820dfafce3177fff8802ee673d1b5ab68ae1bbb0ca26325526ce793ca0f2ce38cc1 SHA512 0f9a893db8bfc70f2bcad5ff6c6a394d9af54ff81793d475cd5a9ebe6aebcb1402083cbc18e68227f9a99389c6c16ebd2ed5e81a2e7a936739038703a3ae7ef4 MISC metadata.xml 886 BLAKE2B 93069f16c27051f346dfd71113b7998f84c09efc7b1b7ad05600f82712e1693368a99bd51e4833cb8ec5c6433ec41f002370e564a2f67aace9e65fea14ce7653 SHA512 e82489ac4436ddbecd44783d694f1056a8a40b278ef941faa236079ad4cfdf0d542cee8c73b7ae1492efe76c2cac31c6a641e2187e01a1210d4b5cd519a839f4 diff --git a/media-video/smplayer/smplayer-18.6.0.ebuild b/media-video/smplayer/smplayer-18.6.0.ebuild index 8b62e36f20f2..711f309f6bec 100644 --- a/media-video/smplayer/smplayer-18.6.0.ebuild +++ b/media-video/smplayer/smplayer-18.6.0.ebuild @@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" LICENSE="GPL-2+ BSD-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux" +KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux" IUSE="autoshutdown bidi debug mpris" COMMON_DEPEND=" diff --git a/media-video/v4l2loopback/Manifest b/media-video/v4l2loopback/Manifest index 59f7e62be6df..b5833f962a3e 100644 --- a/media-video/v4l2loopback/Manifest +++ b/media-video/v4l2loopback/Manifest @@ -1,4 +1,4 @@ -DIST v4l2loopback-0.10.0.tar.gz 46976 BLAKE2B 9e26aa0079f92deefcb3b48816a5279e994be77e1cb54450a91dbec63953858bf378e85d9f93a0694539809987c87461b3f5795b9632aa9d968974f49d3eca77 SHA512 990b83cc592bf66861483d5ed8ebd7aba9d23f8ab54dc11d82ac3c88588cbd340d9cc49f7b758095e76bf9c5f02822700074506439ba51bcafc5cc7c1c979cb8 -EBUILD v4l2loopback-0.10.0.ebuild 1074 BLAKE2B e9c8bab716277e96a97716d2dee418e58eb9c328b236415f81bfd690f652c9f7aaa9a66d5c5b9cb9e94a538c0d951f446e2f5e6f6e8caaf7f2f72c359c28828e SHA512 e1f29959ef17b013f5b593f6621d4e8e459a1474e6b1b5d35ad82a7c9ccd56a43782fdc259d1b241d9c1a2868eb8b872f7b06b9fcafb45ad98e11a5474c2e9d8 -EBUILD v4l2loopback-9999.ebuild 1074 BLAKE2B e9c8bab716277e96a97716d2dee418e58eb9c328b236415f81bfd690f652c9f7aaa9a66d5c5b9cb9e94a538c0d951f446e2f5e6f6e8caaf7f2f72c359c28828e SHA512 e1f29959ef17b013f5b593f6621d4e8e459a1474e6b1b5d35ad82a7c9ccd56a43782fdc259d1b241d9c1a2868eb8b872f7b06b9fcafb45ad98e11a5474c2e9d8 +DIST v4l2loopback-0.12.0.tar.gz 48723 BLAKE2B 6d62b7839889f43422623e1cfc52142846e796ca184b567906ab950642012a5c581ac656d3e4a71d806786e7ff347298f1f7aabba33743508ba388beb590c03f SHA512 e951fcc2b0a55ec5cd9812c2c26c0cab6e37b99bbb5b8512e28c67b3c59e981b776cb3285a0275f027dbddc010855f12134b9f3fa92f20e19e4de713f77289a1 +EBUILD v4l2loopback-0.12.0.ebuild 1146 BLAKE2B feffacf81094b0f3c44684b83647cfcd89a0da3c36e5e97cd64ba0b51fc87da6c1f057ccb3b30b73a4c41d06aabd42198ab8911b7390d6065a74c1a6425e5532 SHA512 5f37991d56c3a1a9f80c30e61c40eaf09455387bffae0ddcec57d0c100d6dea68d4ed329bb7373b6f140791a5f27fbe7cc27f752e3cb4333e360835c8bfa67a2 +EBUILD v4l2loopback-9999.ebuild 1146 BLAKE2B feffacf81094b0f3c44684b83647cfcd89a0da3c36e5e97cd64ba0b51fc87da6c1f057ccb3b30b73a4c41d06aabd42198ab8911b7390d6065a74c1a6425e5532 SHA512 5f37991d56c3a1a9f80c30e61c40eaf09455387bffae0ddcec57d0c100d6dea68d4ed329bb7373b6f140791a5f27fbe7cc27f752e3cb4333e360835c8bfa67a2 MISC metadata.xml 409 BLAKE2B 4984f700c73efd018324e1ad5439c39f495bb91ccbdc26235f47aeef0806ce641353db485b234d35e6c316807b41c0b0b3baa9496773d5d758eb3c257750952d SHA512 49c5467e89452ca7499d6653dd519a5aff28f80a1b50c26e1332ee1f5ee24b6dbd87af5089da443d0e30571e9e7a72befcf1bbfc561d6503f84b9148084ce851 diff --git a/media-video/v4l2loopback/v4l2loopback-0.10.0.ebuild b/media-video/v4l2loopback/v4l2loopback-0.10.0.ebuild deleted file mode 100644 index 7c408014c5c4..000000000000 --- a/media-video/v4l2loopback/v4l2loopback-0.10.0.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit linux-mod - -case ${PV} in -9999) - inherit git-r3 - KEYWORDS="" - EGIT_REPO_URI="git://github.com/umlaeute/v4l2loopback.git" - ;; -*) - inherit vcs-snapshot - KEYWORDS="~amd64 ~x86" - SRC_URI="https://github.com/umlaeute/v4l2loopback/tarball/v${PV} -> ${P}.tar.gz" - ;; -esac - -DESCRIPTION="v4l2 loopback device which output is it's own input" -HOMEPAGE="https://github.com/umlaeute/v4l2loopback" - -LICENSE="GPL-2" -SLOT="0" -IUSE="examples" - -CONFIG_CHECK="VIDEO_DEV" -MODULE_NAMES="v4l2loopback(video:)" -BUILD_TARGETS="all" - -DEPEND="" -RDEPEND="${DEPEND}" - -pkg_setup() { - linux-mod_pkg_setup - export KERNELRELEASE=${KV_FULL} -} - -src_compile() { - linux-mod_src_compile - if use examples; then - cd "${S}"/examples - emake - fi -} - -src_install() { - linux-mod_src_install - dosbin utils/v4l2loopback-ctl - dodoc doc/kernel_debugging.txt - dodoc doc/docs.txt - if use examples; then - dosbin examples/yuv4mpeg_to_v4l2 - docinto examples - dodoc examples/{*.sh,*.c,Makefile} - fi -} diff --git a/media-video/v4l2loopback/v4l2loopback-0.12.0.ebuild b/media-video/v4l2loopback/v4l2loopback-0.12.0.ebuild new file mode 100644 index 000000000000..c2f92d34a0f1 --- /dev/null +++ b/media-video/v4l2loopback/v4l2loopback-0.12.0.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit linux-mod toolchain-funcs + +case ${PV} in +9999) + inherit git-r3 + KEYWORDS="" + EGIT_REPO_URI="git://github.com/umlaeute/v4l2loopback.git" + ;; +*) + inherit vcs-snapshot + KEYWORDS="~amd64 ~x86" + SRC_URI="https://github.com/umlaeute/v4l2loopback/tarball/v${PV} -> ${P}.tar.gz" + ;; +esac + +DESCRIPTION="v4l2 loopback device which output is it's own input" +HOMEPAGE="https://github.com/umlaeute/v4l2loopback" + +LICENSE="GPL-2" +SLOT="0" +IUSE="examples" + +CONFIG_CHECK="VIDEO_DEV" +MODULE_NAMES="v4l2loopback(video:)" +BUILD_TARGETS="all" + +pkg_setup() { + linux-mod_pkg_setup + export KERNELRELEASE=${KV_FULL} +} + +src_prepare() { + default + sed -i -e 's/gcc /$(CC) /' examples/Makefile || die +} + +src_compile() { + linux-mod_src_compile + if use examples; then + emake CC=$(tc-getCC) -C examples + fi +} + +src_install() { + linux-mod_src_install + dosbin utils/v4l2loopback-ctl + dodoc doc/kernel_debugging.txt + dodoc doc/docs.txt + if use examples; then + dosbin examples/yuv4mpeg_to_v4l2 + docinto examples + dodoc examples/{*.sh,*.c,Makefile} + fi +} diff --git a/media-video/v4l2loopback/v4l2loopback-9999.ebuild b/media-video/v4l2loopback/v4l2loopback-9999.ebuild index 7c408014c5c4..c2f92d34a0f1 100644 --- a/media-video/v4l2loopback/v4l2loopback-9999.ebuild +++ b/media-video/v4l2loopback/v4l2loopback-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit linux-mod +inherit linux-mod toolchain-funcs case ${PV} in 9999) @@ -29,19 +29,20 @@ CONFIG_CHECK="VIDEO_DEV" MODULE_NAMES="v4l2loopback(video:)" BUILD_TARGETS="all" -DEPEND="" -RDEPEND="${DEPEND}" - pkg_setup() { linux-mod_pkg_setup export KERNELRELEASE=${KV_FULL} } +src_prepare() { + default + sed -i -e 's/gcc /$(CC) /' examples/Makefile || die +} + src_compile() { linux-mod_src_compile if use examples; then - cd "${S}"/examples - emake + emake CC=$(tc-getCC) -C examples fi } diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest index adfac42f5263..ef70502c51d7 100644 --- a/media-video/vdr/Manifest +++ b/media-video/vdr/Manifest @@ -1,7 +1,5 @@ AUX channel_alternative.conf 332 BLAKE2B ec01e5109ecff9c2cf218d89ae9498809f45774a5fd4d5ba103dae957c038d5227e5a300c4ef0db4d418717776ee82e35676dc7e6d0dcdfdaf4195284c803c3e SHA512 738de5d5d99b54a516f41683834509b477590732db4e00b13b2f26e22c7349cb8517965a21251c08d29b0f368b2bb3fa64a1de71da09ffbedc5a401314a0eb5d AUX vdr-2.0.6_gentoo.patch 2255 BLAKE2B 36b8f013e363990f831d7d5216eeefe79caba9dbba531e1ec5452dc2c8ec49c7047be236b30fbf299f5167e86f5ed59775e59e9aca9babde5bbfc4bd751bf502 SHA512 7bb087d2f362e28700a6f22b2649bd61742a7967344f0132abaaa2ae30d4aef3e9a7afd06d80d2a4a97248abfa273cb5d7e20e419c8409a5a83744fd043fb7e9 -AUX vdr-2.0.7_systemd_argsdir.patch 14827 BLAKE2B b2c8eedd695f761a718d295c83cc53d8da55679c8c46f261326e2e67707f9af65b51dfa8cbe96a86ddd34c216580fdeb5b3e33adcf01f825b0c8ffd7a4374d99 SHA512 f0510d27d4b5ff2bbc3f400e5e8e4aae165f665bc7455742e12ebe6f9c6e46985b2ac9fd4089fd3c33c71d975afe73a6e9e089fc6fd9f226c5d53e3fe0553317 -AUX vdr-2.0.7_systemd_argsdir_vanilla.patch 14825 BLAKE2B 930955b2e80fa5a6c9ee24e89f3b980f7c4acded4c114cc78528d2afefa74dbdf4e0a6b41c968fcbba15943a3b91fecdebec725a9ae426f241e775893cbc369b SHA512 1270abaca1bed4a1dfc7756aaa9d1e3b17c5f35b69f3ff333988192ceddb10bbe03aa1973f878537d750b92a0a277213de193f98d6f113a2f447e342867639f3 AUX vdr-2.2.0-r2_gentoo.patch 2578 BLAKE2B f40bd2dadb802285eb229219b2c9e2966073d37cbb6233a309589d22dd875e4457bd4a66f37aba3e0dc679960d310ee718d1bf2d72112c2dbed89a53ca234330 SHA512 46e447fabdfa38dd164dae5aacc932933595f0a068b8c60b19e9aba635c1d4b7cdf368af9e5544933f0ec64550bb685b2705f39ebffba5b1a66897e27bca6ef1 AUX vdr-2.2.0_gcc7extpng.patch 705 BLAKE2B da34652e596d39c3a8c210a6034c2c2aba6649f9cd5e194f00a0ed21f3d2b67de68c560a4e6d2e927a262152a1998c5c279e4451248a918a757adc543a4eab03 SHA512 1f319f71c3819d82e83f68979f2876d7169d086c161939c105cd15d2107e68cbc95cda09e7e883a74e6c95c7db5b0dc58eb92662833732c180250322413ac85b AUX vdr-2.2.0_gentoo.patch 2322 BLAKE2B 7a7a2357bcefe53e251ed3a5b6b1cee1b85c76597c14746236671f044b5a7a5644bd1788e12499588aab87d7c342952c8b55e3a32868299e8c055983a2224b81 SHA512 c6953a7fb77717fdaa8ca05550496e25f4bc60d91c13ed0fb23d27e1a1ec433ec2d5cfb019717cf09eb7b67c9ebb91664b1b731dc28bc4f25e815871f6de0bc7 @@ -10,10 +8,8 @@ AUX vdr-2.2.0_unsignedtosigned.patch 5237 BLAKE2B 21c3eddc9e5684337be332ae22c97b DIST extpng-vdr-2.0.6-gentoo-edition-v6.patch.bz2 69472 BLAKE2B 60669e9c20b2bd573eb05733bbf9548d2e643b36693be8b15a377b38470708a71b29e2a16baf7ed378132265f814ec9d35dae749ccf6ae204cd9beb787dc8f57 SHA512 f4ecb786ec5a026fa75fcf539518e80273bf43fc325c13a380c70eb85351910efa991b3ee71ca477e597bc2b4598a18620b6cf00fc02714acfcc4e6112d84b6c DIST extpng-vdr-2.2.0-gentoo-edition-v1.patch.bz2 34664 BLAKE2B 81b68ebe0ef4588c3676f0b7a2c766d8d4d4f754a987b3be5868f3c6eff9158d4cea8e492ca81df535e637dbdc5baff638d1fafb4163e9d9a2d0125aba17e2e1 SHA512 16d6fbb8201f003dfe653b6a49424b794d7e697e27ad6f2383dbe17b76712ea5a3da88a676900b84d75ff7425bf3eb9084d60a89a4598758f482dc1f013f7b3e DIST vdr-2.0.6.tar.bz2 839575 BLAKE2B 40de46d8465b7008bc29c7e2c1c241d4114aa3d62aa6a0acd81636133c295cd87c2fc618e725885c98f47445220e897c23188373457a96b51cf832ca417c9842 SHA512 070ebbfb85478887088567872a71744305dbf9c75de8b095a8fe46d883b0b4fe140539caeb2243715f42793a45790a127542655f549f7ea3cb71c4f9912fa07d -DIST vdr-2.0.7.tar.bz2 841511 BLAKE2B bde06dd038ea2ebfa8768742c02bc7046448ade29032a90130f721af1c4c5d2301ff52065a04c51b31f14250d8ae252d796d93e3012ea1057f2359b1ef9c327c SHA512 cba35f62162cd681179872915023890f492e95cc94d65aadd3cb4d03d7e3c7e2f197e7f35149cdf872169af35c2b841e1042e054f28164860b7cea8367793ce0 DIST vdr-2.2.0.tar.bz2 922708 BLAKE2B 975e07d6d4c5bd13ee92be5d6a1826d6404b0c59e20fa2e30689b185a61e02d54782ad528e6a4f15e0d36806b30bcf48aa336d63adb3604e78056ff318e0fd2c SHA512 183f58133915c6c0fe8ec2b88becbcb2a36418210e6dcf7931053d3771d727c3581593f9eb5c9693abf39e22e728f7b41c42079cd704610c3636ec05134ea93d EBUILD vdr-2.0.6-r1.ebuild 6921 BLAKE2B bb5925105f29a4ac9d303459adc3742f3b817a352bb575271c20ce5565a3edb980bd89306ee978cfa398c38be4ae8f75cdf253b1fe6526f7384488cd1a917ab9 SHA512 10997c095cb8af5f0ffa00e07247a790cb038f42a9705a4e6b2e5ca715431dd51749dc5faf9beadf899a4170d9e01de92ff61cf1cdf6e21fe87e6dd60afab07b -EBUILD vdr-2.0.7.ebuild 7275 BLAKE2B ebe4497429f1a08314d80736f5f88ee58c0cb8df65f6930eb1de65b907cc713b29f06a46ac98cab330af24ea137ccbd47392a93d22db9d79395e5f29518489d8 SHA512 c43dd5e9d776ff640eb04b3064f77ead2931194642eb2b541a0add7e3df1c4d6291bfcf4996a450af5a4e979566ae6b374f4cbe20dca71e797fea29bdf5d8520 EBUILD vdr-2.2.0-r1.ebuild 7538 BLAKE2B fabc149e2174c9ba75bea2b3e560e1e8ad1a79ac31933162d31908843971d9529eb7cd63fc1e5adf0c025e3bfcbde914eab5e64314f60dffaa781001dc0b7e3e SHA512 641e41abcabaae613a2d6f0a6ba55194b04ee412ed48461869dc0e4c705a02bb7cfe7ae9c64cc7efadfd3a4ed9dd7a06661874bbbbf3a5e213269899a6b6d572 -EBUILD vdr-2.2.0-r3.ebuild 7697 BLAKE2B 54b9bcbb607313e222cb5c3d784b3a08008b18e812c0d9ae6db664adab54c321e12b36ccccb8418016b89a02f24e2d94b6de4114e858c09b84ed7337b1dd7f6b SHA512 bee1097c7dbf79833e3fc6b0276c113ca8f05275c0353f30221cfe6a31217bd256f16ab731342c30cd21b9f1decb24fd1ca15f40ae74e4caa7561f8cc983d1c3 +EBUILD vdr-2.2.0-r3.ebuild 7638 BLAKE2B bdaf7b1db55325b3ac4adae95079a78e859043f1644c986e065ba38fb46a63f0594d52c2ff4e07ffb37c8ead72a6e902e4007c955dc831a99f03c1c947ff7ca9 SHA512 fb7dce28351be1c777a93e98b40fc1dde6fc74ee393015c58535048220440caa53781d46184c546f619f6d294a7ebfb01cb42b76b255d7a787b3c5366d11b012 MISC metadata.xml 2164 BLAKE2B 1976e2e6090ee6bddcc008794c4ffcc6ae656ab46d1ca459d01a6dd5b7736387d53af03f72685c4e9237ea04bb4f86da49ef9af7f7e1707b038b6a87ae9028c0 SHA512 b960e1d56205787e2c2f6334835b7d9f28fbd283850e2e7af6427a25a590719b7832cc2dcbd94b4ecf3e983fb846909d6b66cfadda89e5b8bcbc469a91651d24 diff --git a/media-video/vdr/files/vdr-2.0.7_systemd_argsdir.patch b/media-video/vdr/files/vdr-2.0.7_systemd_argsdir.patch deleted file mode 100644 index de9f4b90163f..000000000000 --- a/media-video/vdr/files/vdr-2.0.7_systemd_argsdir.patch +++ /dev/null @@ -1,438 +0,0 @@ -diff -Naur vdr-2.0.7.orig/HISTORY vdr-2.0.7/HISTORY ---- vdr-2.0.7.orig/HISTORY 2015-01-23 09:16:13.735620000 +0100 -+++ vdr-2.0.7/HISTORY 2015-01-23 09:17:29.038614491 +0100 -@@ -7916,6 +7916,16 @@ - - The APIVERSION has been increased to 2.0.6 due to the changes to pat.h, sdt.h and - the functional modification to cFont::CreateFont(). - -+2015-01-18: Version 2.0.6 + backport of systemd support from versions 2.1.6 and 2.1.7 -+ -+- Added support for systemd (thanks to Christopher Reimer). To activate this you -+ need to add "SDNOTIFY=1" to the 'make' call. -+ -+2015-01-18: Version 2.0.6 + backport of reading command line arguments from files, from version 2.1$ -+ -+- VDR now reads command line options from *.conf files in /etc/vdr/conf.d (thanks -+ to Lars Hanisch). See vdr.1 and vdr.5 for details. -+ - 2015-01-20: Version 2.0.7 - - - Fixed a possible division by zero in frame rate detection. -diff -Naur vdr-2.0.7.orig/Make.config.template vdr-2.0.7/Make.config.template ---- vdr-2.0.7.orig/Make.config.template 2015-01-23 09:16:13.736620000 +0100 -+++ vdr-2.0.7/Make.config.template 2015-01-23 09:16:34.199618503 +0100 -@@ -38,6 +38,7 @@ - - #VIDEODIR = /srv/vdr/video - #CONFDIR = /var/lib/vdr -+#ARGSDIR = /etc/vdr/conf.d - #CACHEDIR = /var/cache/vdr - - # Overrides for preset/legacy configurations: -diff -Naur vdr-2.0.7.orig/Makefile vdr-2.0.7/Makefile ---- vdr-2.0.7.orig/Makefile 2015-01-23 09:16:13.724620001 +0100 -+++ vdr-2.0.7/Makefile 2015-01-23 09:17:58.588612330 +0100 -@@ -31,6 +31,7 @@ - DESTDIR ?= - VIDEODIR ?= /srv/vdr/video - CONFDIR ?= /var/lib/vdr -+ARGSDIR ?= /etc/vdr/conf.d - CACHEDIR ?= /var/cache/vdr - - PREFIX ?= /usr/local -@@ -66,7 +67,7 @@ - - SILIB = $(LSIDIR)/libsi.a - --OBJS = audio.o channels.o ci.o config.o cutter.o device.o diseqc.o dvbdevice.o dvbci.o\ -+OBJS = args.o audio.o channels.o ci.o config.o cutter.o device.o diseqc.o dvbdevice.o dvbci.o\ - dvbplayer.o dvbspu.o dvbsubtitle.o eit.o eitscan.o epg.o filter.o font.o i18n.o interface.o keys.o\ - lirc.o menu.o menuitems.o nit.o osdbase.o osd.o pat.o player.o plugin.o\ - receiver.o recorder.o recording.o remote.o remux.o ringbuffer.o sdt.o sections.o shutdown.o\ -@@ -111,12 +112,18 @@ - DEFINES += -DBIDI - LIBS += $(shell pkg-config --libs fribidi) - endif -+ifdef SDNOTIFY -+INCLUDES += $(shell pkg-config --cflags libsystemd-daemon) -+DEFINES += -DSDNOTIFY -+LIBS += $(shell pkg-config --libs libsystemd-daemon) -+endif - - LIRC_DEVICE ?= /var/run/lirc/lircd - - DEFINES += -DLIRC_DEVICE=\"$(LIRC_DEVICE)\" - DEFINES += -DVIDEODIR=\"$(VIDEODIR)\" - DEFINES += -DCONFDIR=\"$(CONFDIR)\" -+DEFINES += -DARGSDIR=\"$(ARGSDIR)\" - DEFINES += -DCACHEDIR=\"$(CACHEDIR)\" - DEFINES += -DRESDIR=\"$(RESDIR)\" - DEFINES += -DPLUGINDIR=\"$(LIBDIR)\" -@@ -161,6 +168,7 @@ - @echo "mandir=$(MANDIR)" >> $@ - @echo "configdir=$(CONFDIR)" >> $@ - @echo "videodir=$(VIDEODIR)" >> $@ -+ @echo "argsdir=$(ARGSDIR)" >> $@ - @echo "cachedir=$(CACHEDIR)" >> $@ - @echo "resdir=$(RESDIR)" >> $@ - @echo "libdir=$(LIBDIR)" >> $@ -@@ -278,6 +286,7 @@ - install-dirs: - @mkdir -p $(DESTDIR)$(VIDEODIR) - # @mkdir -p $(DESTDIR)$(CONFDIR) -+ @mkdir -p $(DESTDIR)$(ARGSDIR) - # @mkdir -p $(DESTDIR)$(CACHEDIR) - @mkdir -p $(DESTDIR)$(RESDIR) - -diff -Naur vdr-2.0.7.orig/args.c vdr-2.0.7/args.c ---- vdr-2.0.7.orig/args.c 1970-01-01 01:00:00.000000000 +0100 -+++ vdr-2.0.7/args.c 2015-01-23 09:16:34.199618503 +0100 -@@ -0,0 +1,129 @@ -+/* -+ * args.c: Read arguments from files -+ * -+ * See the main source file 'vdr.c' for copyright information and -+ * how to reach the author. -+ * -+ * Original version written by Lars Hanisch . -+ * -+ * $Id$ -+ */ -+ -+#include "args.h" -+#include -+ -+cArgs::cArgs(const char *Argv0) -+{ -+ argv0 = Argv0; -+ argc = 0; -+ argv = NULL; -+} -+ -+cArgs::~cArgs(void) -+{ -+ if (argv != NULL) -+ delete [] argv; -+} -+ -+bool cArgs::AddArg(const char *s) -+{ -+ if (inVdrSection) -+ args.Append(strdup(s)); -+ else if (*lastArg == NULL) -+ return false; -+ else -+ lastArg = cString::sprintf("%s %s", *lastArg, s); -+ return true; -+} -+ -+bool cArgs::ReadDirectory(const char *Directory) -+{ -+ if (argv != NULL) -+ delete [] argv; -+ argc = 0; -+ argv = NULL; -+ args.Clear(); -+ lastArg = NULL; -+ inVdrSection = false; -+ cFileNameList files(Directory, false); -+ if (files.Size() == 0) -+ return false; -+ for (int i = 0; i < files.Size(); i++) { -+ const char *fileName = files.At(i); -+ if (startswith(fileName, ".") || !endswith(fileName, ".conf")) -+ continue; -+ cString fullFileName = AddDirectory(Directory, fileName); -+ struct stat fs; -+ if ((access(*fullFileName, F_OK) != 0) || (stat(*fullFileName, &fs) != 0) || S_ISDIR(fs.st_mode)) -+ continue; -+ bool ok = true; -+ int line = 0; -+ FILE *f = fopen(*fullFileName, "r"); -+ if (f) { -+ char *s; -+ cReadLine ReadLine; -+ while ((s = ReadLine.Read(f)) != NULL) { -+ line++; -+ s = stripspace(skipspace(s)); -+ if (!isempty(s) && (s[0] != '#')) { -+ if (startswith(s, "[") && endswith(s, "]")) { -+ s[strlen(s) - 1] = 0; -+ s++; -+ if (*lastArg) { -+ args.Append(strdup(*lastArg)); -+ lastArg = NULL; -+ } -+ if (strcmp(s, "vdr") == 0) -+ inVdrSection = true; -+ else { -+ inVdrSection = false; -+ lastArg = cString::sprintf("--plugin=%s", s); -+ } -+ } -+ else { -+ if ((strlen(s) > 2) && (s[0] == '-') && (s[1] != '-')) { // short option, split at first space -+ char *p = strchr(s, ' '); -+ if (p == NULL) { -+ ok = AddArg(s); -+ if (!ok) -+ break; -+ } -+ else { -+ *p = 0; -+ p++; -+ ok = AddArg(s); -+ if (!ok) -+ break; -+ ok = AddArg(p); -+ if (!ok) -+ break; -+ } -+ } -+ else { -+ ok = AddArg(s); -+ if (!ok) -+ break; -+ } -+ } -+ } -+ } -+ fclose(f); -+ } -+ if (!ok) { -+ esyslog("ERROR: args file %s, line %d", *fullFileName, line); -+ return false; -+ } -+ } -+ if (*lastArg) { -+ args.Append(strdup(*lastArg)); -+ lastArg = NULL; -+ } -+ argv = new char*[args.Size() + 1]; -+ argv[0] = strdup(*argv0); -+ argc = 1; -+ for (int i = 0; i < args.Size(); i++) { -+ argv[argc] = args.At(i); -+ argc++; -+ } -+ return true; -+} -diff -Naur vdr-2.0.7.orig/args.h vdr-2.0.7/args.h ---- vdr-2.0.7.orig/args.h 1970-01-01 01:00:00.000000000 +0100 -+++ vdr-2.0.7/args.h 2015-01-23 09:16:34.199618503 +0100 -@@ -0,0 +1,34 @@ -+/* -+ * args.h: Read arguments from files -+ * -+ * See the main source file 'vdr.c' for copyright information and -+ * how to reach the author. -+ * -+ * Original version written by Lars Hanisch . -+ * -+ * $Id$ -+ */ -+ -+#ifndef __ARGS_H -+#define __ARGS_H -+ -+#include "tools.h" -+ -+class cArgs { -+private: -+ cString argv0; -+ cStringList args; -+ cString lastArg; -+ bool inVdrSection; -+ int argc; -+ char **argv; -+ bool AddArg(const char *s); -+public: -+ cArgs(const char *Argv0); -+ ~cArgs(void); -+ bool ReadDirectory(const char *Directory); -+ int GetArgc(void) const { return argc; }; -+ char **GetArgv(void) const { return argv; }; -+ }; -+ -+#endif //__ARGS_H -diff -Naur vdr-2.0.7.orig/interface.c vdr-2.0.7/interface.c ---- vdr-2.0.7.orig/interface.c 2015-01-23 09:16:13.725620001 +0100 -+++ vdr-2.0.7/interface.c 2015-01-23 09:16:34.199618503 +0100 -@@ -10,6 +10,9 @@ - #include "interface.h" - #include - #include -+#ifdef SDNOTIFY -+#include -+#endif - #include - #include "i18n.h" - #include "status.h" -@@ -159,6 +162,9 @@ - bool known = Keys.KnowsRemote(Remote->Name()); - dsyslog("remote control %s - %s", Remote->Name(), known ? "keys known" : "learning keys"); - if (!known) { -+#ifdef SDNOTIFY -+ sd_notify(0, "READY=1\nSTATUS=Learning keys..."); -+#endif - cSkinDisplayMenu *DisplayMenu = Skins.Current()->DisplayMenu(); - DisplayMenu->SetMenuCategory(mcUnknown); - char Headline[256]; -diff -Naur vdr-2.0.7.orig/vdr.1 vdr-2.0.7/vdr.1 ---- vdr-2.0.7.orig/vdr.1 2015-01-23 09:16:13.730620000 +0100 -+++ vdr-2.0.7/vdr.1 2015-01-23 09:16:34.200618503 +0100 -@@ -178,6 +178,10 @@ - Read resource files from \fIdir\fR - (default is to read them from the config directory). - .TP -+.BI \-\-showargs[= dir ] -+Read command line arguments from \fIdir\fR (default is \fI/etc/vdr/conf.d\fR), -+display them to the console and exit. -+.TP - .BI \-s\ cmd ,\ \-\-shutdown= cmd - Call \fIcmd\fR to shutdown the computer. See the file \fIINSTALL\fR for more - information. -@@ -213,6 +217,10 @@ - .BI \-w\ sec ,\ \-\-watchdog= sec - Activate the watchdog timer with a timeout of \fIsec\fR seconds. - A value of \fB0\fR (default) disables the watchdog. -+.P -+If started without any options, vdr tries to read command line options -+from files named '*.conf' in the directory /etc/vdr/conf.d. Files are -+read in alphabetical order. See vdr(5) for details. - .SH SIGNALS - .TP - .B SIGINT, SIGTERM -diff -Naur vdr-2.0.7.orig/vdr.5 vdr-2.0.7/vdr.5 ---- vdr-2.0.7.orig/vdr.5 2015-01-23 09:16:13.732620000 +0100 -+++ vdr-2.0.7/vdr.5 2015-01-23 09:16:34.200618503 +0100 -@@ -895,6 +895,33 @@ - just 16 bit wide. The internal representation in VDR allows for 32 bit to - be used, so that external tools can generate EPG data that is guaranteed - not to collide with the ids of existing data. -+.SS COMMANDLINE OPTIONS -+If started without any options, vdr tries to read any files in the directory -+/etc/vdr/conf.d with names that do not begin with a '.' and that end with '.conf'. -+These files are read in alphabetical order. The format of these files is -+ -+# comment -+.br -+[name] -+.br -+-a -+.br -+-b 123 -+.br -+--long -+.br -+--longarg=123 -+.br -+ -+Any lines that begin with '#' as the first non-whitespace character are considered -+comments and are ignored. -+A command line option file consists of one or more sections, indicated by '[name]', -+where 'name' is either the fixed word 'vdr' (if this section contains options for -+the main VDR program) or the name of the plugin this section applies to. -+Each option must be written on a separate line, including the leading '-' (for -+a short option) or '--' (for a long option). If the option has additional arguments, -+they have to be written on the same line as the option itself, separated from the -+option with a blank (short option) or equal sign (long option). - .SH SEE ALSO - .BR vdr (1) - .SH AUTHOR -diff -Naur vdr-2.0.7.orig/vdr.c vdr-2.0.7/vdr.c ---- vdr-2.0.7.orig/vdr.c 2015-01-23 09:16:13.732620000 +0100 -+++ vdr-2.0.7/vdr.c 2015-01-23 09:16:34.200618503 +0100 -@@ -34,8 +34,12 @@ - #include - #include - #include -+#ifdef SDNOTIFY -+#include -+#endif - #include - #include -+#include "args.h" - #include "audio.h" - #include "channels.h" - #include "config.h" -@@ -192,6 +196,7 @@ - #define DEFAULTWATCHDOG 0 // seconds - #define DEFAULTVIDEODIR VIDEODIR - #define DEFAULTCONFDIR dd(CONFDIR, VideoDirectory) -+#define DEFAULTARGSDIR dd(ARGSDIR, "/etc/vdr/conf.d") - #define DEFAULTCACHEDIR dd(CACHEDIR, VideoDirectory) - #define DEFAULTRESDIR dd(RESDIR, ConfigDirectory) - #define DEFAULTPLUGINDIR PLUGINDIR -@@ -229,6 +234,15 @@ - VdrUser = VDR_USER; - #endif - -+ cArgs *Args = NULL; -+ if (argc == 1) { -+ Args = new cArgs(argv[0]); -+ if (Args->ReadDirectory(DEFAULTARGSDIR)) { -+ argc = Args->GetArgc(); -+ argv = Args->GetArgv(); -+ } -+ } -+ - SetVideoDirectory(VideoDirectory); - cPluginManager PluginManager(DEFAULTPLUGINDIR); - -@@ -256,6 +270,7 @@ - { "port", required_argument, NULL, 'p' }, - { "record", required_argument, NULL, 'r' }, - { "resdir", required_argument, NULL, 'r' | 0x100 }, -+ { "showargs", optional_argument, NULL, 's' | 0x200 }, - { "shutdown", required_argument, NULL, 's' }, - { "split", no_argument, NULL, 's' | 0x100 }, - { "terminal", required_argument, NULL, 't' }, -@@ -428,6 +443,19 @@ - case 's' | 0x100: - Setup.SplitEditedFiles = 1; - break; -+ case 's' | 0x200: { -+ const char *ArgsDir = optarg ? optarg : DEFAULTARGSDIR; -+ cArgs Args(argv[0]); -+ if (!Args.ReadDirectory(ArgsDir)) { -+ fprintf(stderr, "vdr: can't read arguments from directory: %s\n", ArgsDir); -+ return 2; -+ } -+ int c = Args.GetArgc(); -+ char **v = Args.GetArgv(); -+ for (int i = 1; i < c; i++) -+ printf("%s\n", v[i]); -+ return 0; -+ } - case 't': Terminal = optarg; - if (access(Terminal, R_OK | W_OK) < 0) { - fprintf(stderr, "vdr: can't access terminal: %s\n", Terminal); -@@ -541,6 +569,8 @@ - " -s CMD, --shutdown=CMD call CMD to shutdown the computer\n" - " --split split edited files at the editing marks (only\n" - " useful in conjunction with --edit)\n" -+ " --showargs[=DIR] print the arguments read from DIR and exit\n" -+ " (default: %s)\n" - " -t TTY, --terminal=TTY controlling tty\n" - " -u USER, --user=USER run as user USER; only applicable if started as\n" - " root\n" -@@ -563,6 +593,7 @@ - DEFAULTLOCDIR, - DEFAULTSVDRPPORT, - DEFAULTRESDIR, -+ DEFAULTARGSDIR, - DEFAULTVIDEODIR, - DEFAULTWATCHDOG - ); -@@ -848,6 +879,10 @@ - alarm(WatchdogTimeout); // Initial watchdog timer start - } - -+#ifdef SDNOTIFY -+ sd_notify(0, "READY=1\nSTATUS=Ready"); -+#endif -+ - // Main program loop: - - #define DELETE_MENU ((IsInfoMenu &= (Menu == NULL)), delete Menu, Menu = NULL) diff --git a/media-video/vdr/files/vdr-2.0.7_systemd_argsdir_vanilla.patch b/media-video/vdr/files/vdr-2.0.7_systemd_argsdir_vanilla.patch deleted file mode 100644 index f7bae16fdd40..000000000000 --- a/media-video/vdr/files/vdr-2.0.7_systemd_argsdir_vanilla.patch +++ /dev/null @@ -1,438 +0,0 @@ -diff -Naur vdr-2.0.7.orig/HISTORY vdr-2.0.7/HISTORY ---- vdr-2.0.7.orig/HISTORY 2015-01-23 09:07:52.777656645 +0100 -+++ vdr-2.0.7/HISTORY 2015-01-23 09:09:57.798647500 +0100 -@@ -7916,6 +7916,16 @@ - - The APIVERSION has been increased to 2.0.6 due to the changes to pat.h, sdt.h and - the functional modification to cFont::CreateFont(). - -+2015-01-18: Version 2.0.6 + backport of systemd support from versions 2.1.6 and 2.1.7 -+ -+- Added support for systemd (thanks to Christopher Reimer). To activate this you -+ need to add "SDNOTIFY=1" to the 'make' call. -+ -+2015-01-18: Version 2.0.6 + backport of reading command line arguments from files, from version 2.1$ -+ -+- VDR now reads command line options from *.conf files in /etc/vdr/conf.d (thanks -+ to Lars Hanisch). See vdr.1 and vdr.5 for details. -+ - 2015-01-20: Version 2.0.7 - - - Fixed a possible division by zero in frame rate detection. -diff -Naur vdr-2.0.7.orig/Make.config.template vdr-2.0.7/Make.config.template ---- vdr-2.0.7.orig/Make.config.template 2015-01-23 09:07:52.765656646 +0100 -+++ vdr-2.0.7/Make.config.template 2015-01-23 09:08:15.775654963 +0100 -@@ -38,6 +38,7 @@ - - #VIDEODIR = /srv/vdr/video - #CONFDIR = /var/lib/vdr -+#ARGSDIR = /etc/vdr/conf.d - #CACHEDIR = /var/cache/vdr - - # Overrides for preset/legacy configurations: -diff -Naur vdr-2.0.7.orig/Makefile vdr-2.0.7/Makefile ---- vdr-2.0.7.orig/Makefile 2015-01-23 09:07:52.778656645 +0100 -+++ vdr-2.0.7/Makefile 2015-01-23 09:11:11.158642134 +0100 -@@ -31,6 +31,7 @@ - DESTDIR ?= - VIDEODIR ?= /srv/vdr/video - CONFDIR ?= /var/lib/vdr -+ARGSDIR ?= /etc/vdr/conf.d - CACHEDIR ?= /var/cache/vdr - - PREFIX ?= /usr/local -@@ -66,7 +67,7 @@ - - SILIB = $(LSIDIR)/libsi.a - --OBJS = audio.o channels.o ci.o config.o cutter.o device.o diseqc.o dvbdevice.o dvbci.o\ -+OBJS = args.o audio.o channels.o ci.o config.o cutter.o device.o diseqc.o dvbdevice.o dvbci.o\ - dvbplayer.o dvbspu.o dvbsubtitle.o eit.o eitscan.o epg.o filter.o font.o i18n.o interface.o keys.o\ - lirc.o menu.o menuitems.o nit.o osdbase.o osd.o pat.o player.o plugin.o\ - receiver.o recorder.o recording.o remote.o remux.o ringbuffer.o sdt.o sections.o shutdown.o\ -@@ -93,12 +94,18 @@ - DEFINES += -DBIDI - LIBS += $(shell pkg-config --libs fribidi) - endif -+ifdef SDNOTIFY -+INCLUDES += $(shell pkg-config --cflags libsystemd-daemon) -+DEFINES += -DSDNOTIFY -+LIBS += $(shell pkg-config --libs libsystemd-daemon) -+endif - - LIRC_DEVICE ?= /var/run/lirc/lircd - - DEFINES += -DLIRC_DEVICE=\"$(LIRC_DEVICE)\" - DEFINES += -DVIDEODIR=\"$(VIDEODIR)\" - DEFINES += -DCONFDIR=\"$(CONFDIR)\" -+DEFINES += -DARGSDIR=\"$(ARGSDIR)\" - DEFINES += -DCACHEDIR=\"$(CACHEDIR)\" - DEFINES += -DRESDIR=\"$(RESDIR)\" - DEFINES += -DPLUGINDIR=\"$(LIBDIR)\" -@@ -143,6 +150,7 @@ - @echo "mandir=$(MANDIR)" >> $@ - @echo "configdir=$(CONFDIR)" >> $@ - @echo "videodir=$(VIDEODIR)" >> $@ -+ @echo "argsdir=$(ARGSDIR)" >> $@ - @echo "cachedir=$(CACHEDIR)" >> $@ - @echo "resdir=$(RESDIR)" >> $@ - @echo "libdir=$(LIBDIR)" >> $@ -@@ -260,6 +268,7 @@ - install-dirs: - @mkdir -p $(DESTDIR)$(VIDEODIR) - # @mkdir -p $(DESTDIR)$(CONFDIR) -+ @mkdir -p $(DESTDIR)$(ARGSDIR) - # @mkdir -p $(DESTDIR)$(CACHEDIR) - @mkdir -p $(DESTDIR)$(RESDIR) - -diff -Naur vdr-2.0.7.orig/args.c vdr-2.0.7/args.c ---- vdr-2.0.7.orig/args.c 1970-01-01 01:00:00.000000000 +0100 -+++ vdr-2.0.7/args.c 2015-01-23 09:08:15.775654963 +0100 -@@ -0,0 +1,129 @@ -+/* -+ * args.c: Read arguments from files -+ * -+ * See the main source file 'vdr.c' for copyright information and -+ * how to reach the author. -+ * -+ * Original version written by Lars Hanisch . -+ * -+ * $Id$ -+ */ -+ -+#include "args.h" -+#include -+ -+cArgs::cArgs(const char *Argv0) -+{ -+ argv0 = Argv0; -+ argc = 0; -+ argv = NULL; -+} -+ -+cArgs::~cArgs(void) -+{ -+ if (argv != NULL) -+ delete [] argv; -+} -+ -+bool cArgs::AddArg(const char *s) -+{ -+ if (inVdrSection) -+ args.Append(strdup(s)); -+ else if (*lastArg == NULL) -+ return false; -+ else -+ lastArg = cString::sprintf("%s %s", *lastArg, s); -+ return true; -+} -+ -+bool cArgs::ReadDirectory(const char *Directory) -+{ -+ if (argv != NULL) -+ delete [] argv; -+ argc = 0; -+ argv = NULL; -+ args.Clear(); -+ lastArg = NULL; -+ inVdrSection = false; -+ cFileNameList files(Directory, false); -+ if (files.Size() == 0) -+ return false; -+ for (int i = 0; i < files.Size(); i++) { -+ const char *fileName = files.At(i); -+ if (startswith(fileName, ".") || !endswith(fileName, ".conf")) -+ continue; -+ cString fullFileName = AddDirectory(Directory, fileName); -+ struct stat fs; -+ if ((access(*fullFileName, F_OK) != 0) || (stat(*fullFileName, &fs) != 0) || S_ISDIR(fs.st_mode)) -+ continue; -+ bool ok = true; -+ int line = 0; -+ FILE *f = fopen(*fullFileName, "r"); -+ if (f) { -+ char *s; -+ cReadLine ReadLine; -+ while ((s = ReadLine.Read(f)) != NULL) { -+ line++; -+ s = stripspace(skipspace(s)); -+ if (!isempty(s) && (s[0] != '#')) { -+ if (startswith(s, "[") && endswith(s, "]")) { -+ s[strlen(s) - 1] = 0; -+ s++; -+ if (*lastArg) { -+ args.Append(strdup(*lastArg)); -+ lastArg = NULL; -+ } -+ if (strcmp(s, "vdr") == 0) -+ inVdrSection = true; -+ else { -+ inVdrSection = false; -+ lastArg = cString::sprintf("--plugin=%s", s); -+ } -+ } -+ else { -+ if ((strlen(s) > 2) && (s[0] == '-') && (s[1] != '-')) { // short option, split at first space -+ char *p = strchr(s, ' '); -+ if (p == NULL) { -+ ok = AddArg(s); -+ if (!ok) -+ break; -+ } -+ else { -+ *p = 0; -+ p++; -+ ok = AddArg(s); -+ if (!ok) -+ break; -+ ok = AddArg(p); -+ if (!ok) -+ break; -+ } -+ } -+ else { -+ ok = AddArg(s); -+ if (!ok) -+ break; -+ } -+ } -+ } -+ } -+ fclose(f); -+ } -+ if (!ok) { -+ esyslog("ERROR: args file %s, line %d", *fullFileName, line); -+ return false; -+ } -+ } -+ if (*lastArg) { -+ args.Append(strdup(*lastArg)); -+ lastArg = NULL; -+ } -+ argv = new char*[args.Size() + 1]; -+ argv[0] = strdup(*argv0); -+ argc = 1; -+ for (int i = 0; i < args.Size(); i++) { -+ argv[argc] = args.At(i); -+ argc++; -+ } -+ return true; -+} -diff -Naur vdr-2.0.7.orig/args.h vdr-2.0.7/args.h ---- vdr-2.0.7.orig/args.h 1970-01-01 01:00:00.000000000 +0100 -+++ vdr-2.0.7/args.h 2015-01-23 09:08:15.775654963 +0100 -@@ -0,0 +1,34 @@ -+/* -+ * args.h: Read arguments from files -+ * -+ * See the main source file 'vdr.c' for copyright information and -+ * how to reach the author. -+ * -+ * Original version written by Lars Hanisch . -+ * -+ * $Id$ -+ */ -+ -+#ifndef __ARGS_H -+#define __ARGS_H -+ -+#include "tools.h" -+ -+class cArgs { -+private: -+ cString argv0; -+ cStringList args; -+ cString lastArg; -+ bool inVdrSection; -+ int argc; -+ char **argv; -+ bool AddArg(const char *s); -+public: -+ cArgs(const char *Argv0); -+ ~cArgs(void); -+ bool ReadDirectory(const char *Directory); -+ int GetArgc(void) const { return argc; }; -+ char **GetArgv(void) const { return argv; }; -+ }; -+ -+#endif //__ARGS_H -diff -Naur vdr-2.0.7.orig/interface.c vdr-2.0.7/interface.c ---- vdr-2.0.7.orig/interface.c 2015-01-23 09:07:52.765656646 +0100 -+++ vdr-2.0.7/interface.c 2015-01-23 09:08:15.775654963 +0100 -@@ -10,6 +10,9 @@ - #include "interface.h" - #include - #include -+#ifdef SDNOTIFY -+#include -+#endif - #include - #include "i18n.h" - #include "status.h" -@@ -159,6 +162,9 @@ - bool known = Keys.KnowsRemote(Remote->Name()); - dsyslog("remote control %s - %s", Remote->Name(), known ? "keys known" : "learning keys"); - if (!known) { -+#ifdef SDNOTIFY -+ sd_notify(0, "READY=1\nSTATUS=Learning keys..."); -+#endif - cSkinDisplayMenu *DisplayMenu = Skins.Current()->DisplayMenu(); - DisplayMenu->SetMenuCategory(mcUnknown); - char Headline[256]; -diff -Naur vdr-2.0.7.orig/vdr.1 vdr-2.0.7/vdr.1 ---- vdr-2.0.7.orig/vdr.1 2015-01-23 09:07:52.770656646 +0100 -+++ vdr-2.0.7/vdr.1 2015-01-23 09:08:15.776654963 +0100 -@@ -178,6 +178,10 @@ - Read resource files from \fIdir\fR - (default is to read them from the config directory). - .TP -+.BI \-\-showargs[= dir ] -+Read command line arguments from \fIdir\fR (default is \fI/etc/vdr/conf.d\fR), -+display them to the console and exit. -+.TP - .BI \-s\ cmd ,\ \-\-shutdown= cmd - Call \fIcmd\fR to shutdown the computer. See the file \fIINSTALL\fR for more - information. -@@ -213,6 +217,10 @@ - .BI \-w\ sec ,\ \-\-watchdog= sec - Activate the watchdog timer with a timeout of \fIsec\fR seconds. - A value of \fB0\fR (default) disables the watchdog. -+.P -+If started without any options, vdr tries to read command line options -+from files named '*.conf' in the directory /etc/vdr/conf.d. Files are -+read in alphabetical order. See vdr(5) for details. - .SH SIGNALS - .TP - .B SIGINT, SIGTERM -diff -Naur vdr-2.0.7.orig/vdr.5 vdr-2.0.7/vdr.5 ---- vdr-2.0.7.orig/vdr.5 2015-01-23 09:07:52.772656646 +0100 -+++ vdr-2.0.7/vdr.5 2015-01-23 09:08:15.776654963 +0100 -@@ -889,6 +889,33 @@ - just 16 bit wide. The internal representation in VDR allows for 32 bit to - be used, so that external tools can generate EPG data that is guaranteed - not to collide with the ids of existing data. -+.SS COMMANDLINE OPTIONS -+If started without any options, vdr tries to read any files in the directory -+/etc/vdr/conf.d with names that do not begin with a '.' and that end with '.conf'. -+These files are read in alphabetical order. The format of these files is -+ -+# comment -+.br -+[name] -+.br -+-a -+.br -+-b 123 -+.br -+--long -+.br -+--longarg=123 -+.br -+ -+Any lines that begin with '#' as the first non-whitespace character are considered -+comments and are ignored. -+A command line option file consists of one or more sections, indicated by '[name]', -+where 'name' is either the fixed word 'vdr' (if this section contains options for -+the main VDR program) or the name of the plugin this section applies to. -+Each option must be written on a separate line, including the leading '-' (for -+a short option) or '--' (for a long option). If the option has additional arguments, -+they have to be written on the same line as the option itself, separated from the -+option with a blank (short option) or equal sign (long option). - .SH SEE ALSO - .BR vdr (1) - .SH AUTHOR -diff -Naur vdr-2.0.7.orig/vdr.c vdr-2.0.7/vdr.c ---- vdr-2.0.7.orig/vdr.c 2015-01-23 09:07:52.772656646 +0100 -+++ vdr-2.0.7/vdr.c 2015-01-23 09:08:15.776654963 +0100 -@@ -34,8 +34,12 @@ - #include - #include - #include -+#ifdef SDNOTIFY -+#include -+#endif - #include - #include -+#include "args.h" - #include "audio.h" - #include "channels.h" - #include "config.h" -@@ -186,6 +190,7 @@ - #define DEFAULTWATCHDOG 0 // seconds - #define DEFAULTVIDEODIR VIDEODIR - #define DEFAULTCONFDIR dd(CONFDIR, VideoDirectory) -+#define DEFAULTARGSDIR dd(ARGSDIR, "/etc/vdr/conf.d") - #define DEFAULTCACHEDIR dd(CACHEDIR, VideoDirectory) - #define DEFAULTRESDIR dd(RESDIR, ConfigDirectory) - #define DEFAULTPLUGINDIR PLUGINDIR -@@ -223,6 +228,15 @@ - VdrUser = VDR_USER; - #endif - -+ cArgs *Args = NULL; -+ if (argc == 1) { -+ Args = new cArgs(argv[0]); -+ if (Args->ReadDirectory(DEFAULTARGSDIR)) { -+ argc = Args->GetArgc(); -+ argv = Args->GetArgv(); -+ } -+ } -+ - SetVideoDirectory(VideoDirectory); - cPluginManager PluginManager(DEFAULTPLUGINDIR); - -@@ -250,6 +264,7 @@ - { "port", required_argument, NULL, 'p' }, - { "record", required_argument, NULL, 'r' }, - { "resdir", required_argument, NULL, 'r' | 0x100 }, -+ { "showargs", optional_argument, NULL, 's' | 0x200 }, - { "shutdown", required_argument, NULL, 's' }, - { "split", no_argument, NULL, 's' | 0x100 }, - { "terminal", required_argument, NULL, 't' }, -@@ -422,6 +437,19 @@ - case 's' | 0x100: - Setup.SplitEditedFiles = 1; - break; -+ case 's' | 0x200: { -+ const char *ArgsDir = optarg ? optarg : DEFAULTARGSDIR; -+ cArgs Args(argv[0]); -+ if (!Args.ReadDirectory(ArgsDir)) { -+ fprintf(stderr, "vdr: can't read arguments from directory: %s\n", ArgsDir); -+ return 2; -+ } -+ int c = Args.GetArgc(); -+ char **v = Args.GetArgv(); -+ for (int i = 1; i < c; i++) -+ printf("%s\n", v[i]); -+ return 0; -+ } - case 't': Terminal = optarg; - if (access(Terminal, R_OK | W_OK) < 0) { - fprintf(stderr, "vdr: can't access terminal: %s\n", Terminal); -@@ -535,6 +563,8 @@ - " -s CMD, --shutdown=CMD call CMD to shutdown the computer\n" - " --split split edited files at the editing marks (only\n" - " useful in conjunction with --edit)\n" -+ " --showargs[=DIR] print the arguments read from DIR and exit\n" -+ " (default: %s)\n" - " -t TTY, --terminal=TTY controlling tty\n" - " -u USER, --user=USER run as user USER; only applicable if started as\n" - " root\n" -@@ -557,6 +587,7 @@ - DEFAULTLOCDIR, - DEFAULTSVDRPPORT, - DEFAULTRESDIR, -+ DEFAULTARGSDIR, - DEFAULTVIDEODIR, - DEFAULTWATCHDOG - ); -@@ -837,6 +868,10 @@ - alarm(WatchdogTimeout); // Initial watchdog timer start - } - -+#ifdef SDNOTIFY -+ sd_notify(0, "READY=1\nSTATUS=Ready"); -+#endif -+ - // Main program loop: - - #define DELETE_MENU ((IsInfoMenu &= (Menu == NULL)), delete Menu, Menu = NULL) diff --git a/media-video/vdr/vdr-2.0.7.ebuild b/media-video/vdr/vdr-2.0.7.ebuild deleted file mode 100644 index f5d9d5ed815d..000000000000 --- a/media-video/vdr/vdr-2.0.7.ebuild +++ /dev/null @@ -1,288 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils flag-o-matic multilib toolchain-funcs - -# Switches supported by extensions-patch -EXT_PATCH_FLAGS="alternatechannel ddepgentry dvlvidprefer graphtft - jumpplay jumpingseconds mainmenuhooks menuorg naludump permashift permashift_v1 - pinplugin rotor ttxtsubs vasarajanauloja wareagleicon yaepg" - -# names of the use-flags -EXT_PATCH_FLAGS_RENAMED="" - -# names ext-patch uses internally, here only used for maintainer checks -EXT_PATCH_FLAGS_RENAMED_EXT_NAME="" - -IUSE="bidi debug html systemd vanilla ${EXT_PATCH_FLAGS} ${EXT_PATCH_FLAGS_RENAMED}" - -MY_PV="${PV%_p*}" -MY_P="${PN}-${MY_PV}" -S="${WORKDIR}/${MY_P}" - -EXT_P="extpng-${PN}-2.0.6-gentoo-edition-v6" - -DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB" -HOMEPAGE="http://www.tvdr.de/" -SRC_URI="ftp://ftp.tvdr.de/vdr/${MY_P}.tar.bz2 - https://dev.gentoo.org/~hd_brummy/distfiles/${EXT_P}.patch.bz2" - -KEYWORDS="~arm ~amd64 ~ppc ~x86" -SLOT="0" -LICENSE="GPL-2" - -REQUIRED_USE=" - permashift? ( !permashift_v1 ) - permashift_v1? ( !permashift )" - -COMMON_DEPEND="virtual/jpeg:* - sys-libs/libcap - >=media-libs/fontconfig-2.4.2 - >=media-libs/freetype-2" - -DEPEND="${COMMON_DEPEND} - >=virtual/linuxtv-dvb-headers-5.3 - sys-devel/gettext" - -RDEPEND="${COMMON_DEPEND} - dev-lang/perl - >=media-tv/gentoo-vdr-scripts-2.5 - media-fonts/corefonts - bidi? ( dev-libs/fribidi ) - systemd? ( sys-apps/systemd )" - -CONF_DIR=/etc/vdr -CAP_FILE=${S}/capabilities.sh -CAPS="# Capabilities of the vdr-executable for use by startscript etc." - -pkg_setup() { - use debug && append-flags -g - - PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins" - - tc-export CC CXX AR -} - -add_cap() { - local arg - for arg; do - CAPS="${CAPS}\n${arg}=1" - done -} - -enable_patch() { - local arg ARG_UPPER - for arg; do - ARG_UPPER=$(echo $arg|tr '[:lower:]' '[:upper:]') - echo "${ARG_UPPER} = 1" >> Make.config - - # codesnippet to bring the extpng defines into the vdr.pc CXXFLAGS CFLAGS - echo "-DUSE_${ARG_UPPER}" >> "${T}"/defines.tmp - cat "${T}"/defines.tmp | tr \\\012 ' ' > "${T}"/defines.IUSE - export DEFINES_IUSE=$( cat ${T}/defines.IUSE ) - done -} - -extensions_add_make_conf() -{ - # copy all ifdef for extensions-patch to Make.config - sed -e '1,/need to touch the following:/d' \ - -e '/need to touch the following/,/^$/d' \ - Make.config.template >> Make.config -} - -extensions_all_defines() { - # extract all possible settings for extensions-patch - sed -e '/^#\?[A-Z].*= 1/!d' -e 's/^#\?//' -e 's/ .*//' \ - Make.config.template \ - | sort \ - | tr '[:upper:]' '[:lower:]' -} - -lang_po() { - LING_PO=$( ls ${S}/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' ) -} - -src_prepare() { - # apply maintainace-patches - ebegin "Changing paths for gentoo" - - local DVBDIR=/usr/include - local i - for i in ${DVB_HEADER_PATH} /usr/include/v4l-dvb-hg /usr/include; do - [[ -d ${i} ]] || continue - if [[ -f ${i}/linux/dvb/dmx.h ]]; then - einfo "Found DVB header files in ${i}" - DVBDIR=${i} - break - fi - done - - # checking for s2api headers - local api_version - api_version=$(awk -F' ' '/define DVB_API_VERSION / {print $3}' "${DVBDIR}"/linux/dvb/version.h) - api_version=${api_version}*$(awk -F' ' '/define DVB_API_VERSION_MINOR / {print $3}' "${DVBDIR}"/linux/dvb/version.h) - - if [[ ${api_version:-0} -lt 5*3 ]]; then - eerror "DVB header files do not contain s2api support or too old for ${P}" - eerror "You cannot compile VDR against old dvb-header" - die "DVB headers too old" - fi - - cat > Make.config <<-EOT - # - # Generated by ebuild ${PF} - # - PREFIX = /usr - DVBDIR = ${DVBDIR} - PLUGINLIBDIR = ${PLUGIN_LIBDIR} - CONFDIR = ${CONF_DIR} - VIDEODIR = /var/vdr/video - LOCDIR = \$(PREFIX)/share/locale - INCDIR = \$(PREFIX)/include - - DEFINES += -DCONFDIR=\"\$(CONFDIR)\" - INCLUDES += -I\$(DVBDIR) - - # >=vdr-1.7.36-r1; parameter only used for compiletime on vdr - # PLUGINLIBDIR (plugin Makefile old) = LIBDIR (plugin Makefile new) - LIBDIR = ${PLUGIN_LIBDIR} - PCDIR = /usr/$(get_libdir)/pkgconfig - EOT - eend 0 - - # support languages, written from right to left - BUILD_PARAMS+=" BIDI=$(usex bidi 1 0)" - - # systemd support - use systemd && BUILD_PARAMS+=" SDNOTIFY=$(usex systemd 1 0)" - - if ! use vanilla; then - - # Now apply extensions patch - epatch "${WORKDIR}/${EXT_P}.patch" - - # This allows us to start even if some plugin does not exist - # or is not loadable. - enable_patch PLUGINMISSING - enable_patch CHANNELBIND - - if [[ -n ${VDR_MAINTAINER_MODE} ]]; then - einfo "Doing maintainer checks:" - - # we do not support these patches - # (or have them already hard enabled) - local IGNORE_PATCHES="pluginmissing channelbind" - - extensions_all_defines > "${T}"/new.IUSE - echo $EXT_PATCH_FLAGS $EXT_PATCH_FLAGS_RENAMED_EXT_NAME \ - $IGNORE_PATCHES | \ - tr ' ' '\n' |sort > "${T}"/old.IUSE - local DIFFS=$(diff -u "${T}"/old.IUSE "${T}"/new.IUSE|grep '^[+-][^+-]') - if [[ -z ${DIFFS} ]]; then - einfo "EXT_PATCH_FLAGS is up to date." - else - ewarn "IUSE differences!" - local diff - for diff in $DIFFS; do - ewarn "$diff" - done - fi - fi - - ebegin "Enabling selected patches" - local flag - for flag in $EXT_PATCH_FLAGS; do - use $flag && enable_patch ${flag} - done - - eend 0 - - extensions_add_make_conf - - # add defined use-flags compile options to vdr.pc - sed -e "s:\$(CDEFINES) \$(CINCLUDES) \$(HDRDIR):\$(CDEFINES) \$(CINCLUDES) \$(HDRDIR) \$(DEFINES_IUSE):" \ - -i Makefile - - ebegin "Make depend" - emake .dependencies >/dev/null - eend $? "make depend failed" - fi - - epatch "${FILESDIR}/${PN}-2.0.6-r2_gentoo.patch" - - # backport from vdr-2.1.7 for better systemd support - if use vanilla; then - epatch "${FILESDIR}/${P}_systemd_argsdir_vanilla.patch" - else - epatch "${FILESDIR}/${P}_systemd_argsdir.patch" - fi - - epatch_user - - add_cap CAP_UTF8 - - add_cap CAP_IRCTRL_RUNTIME_PARAM \ - CAP_VFAT_RUNTIME_PARAM \ - CAP_CHUID \ - CAP_SHUTDOWN_AUTO_RETRY - - echo -e ${CAPS} > "${CAP_FILE}" - - # LINGUAS support - einfo "\n \t VDR supports the LINGUAS values" - - lang_po - - einfo "\t Please set one of this values in your sytem make.conf" - einfo "\t LINGUAS=\"${LING_PO}\"\n" - - if [[ -z ${LINGUAS} ]]; then - einfo "\n \t No values in LINGUAS=" - einfo "\t You will get only english text on OSD \n" - fi - - strip-linguas ${LING_PO} en -} - -src_install() { -# # trick makefile not to create a videodir by supplying it with an existing -# # directory - emake \ - VIDEODIR="/" \ - DESTDIR="${D}" install || die "emake install failed" - - keepdir "${PLUGIN_LIBDIR}" - - # backup for plugins they don't be able to create this dir - keepdir "${CONF_DIR}"/plugins - - if use html; then - dohtml *.html - fi - - dodoc MANUAL INSTALL README* HISTORY CONTRIBUTORS - - insinto /usr/share/vdr - doins "${CAP_FILE}" - - if use alternatechannel; then - insinto /etc/vdr - doins "${FILESDIR}"/channel_alternative.conf - fi - - chown -R vdr:vdr "${D}/${CONF_DIR}" -} - -pkg_postinst() { - elog "It is a good idea to run vdrplugin-rebuild now." - - elog "To get nice symbols in OSD we recommend to install" - elog "\t1. emerge media-fonts/vdrsymbols-ttf" - elog "\t2. select font VDRSymbolsSans in Setup" - elog "" - elog "To get an idea how to proceed now, have a look at our vdr-guide:" - elog "\thttps://wiki.gentoo.org/wiki/VDR" -} diff --git a/media-video/vdr/vdr-2.2.0-r3.ebuild b/media-video/vdr/vdr-2.2.0-r3.ebuild index 1da9aad71f86..ff3911ffe097 100644 --- a/media-video/vdr/vdr-2.2.0-r3.ebuild +++ b/media-video/vdr/vdr-2.2.0-r3.ebuild @@ -213,13 +213,13 @@ src_prepare() { ebegin "Make depend" emake .dependencies >/dev/null eend $? "make depend failed" + + eapply "${FILESDIR}/${P}_gcc7extpng.patch" fi eapply "${FILESDIR}/${P}_gentoo.patch" - #gcc-7.2, this will fix only the core vdr, not the extpatch eapply "${FILESDIR}/${P}_unsignedtosigned.patch" eapply "${FILESDIR}/${P}_glibc-2.24.patch" - eapply "${FILESDIR}/${P}_gcc7extpng.patch" # fix some makefile issues sed -e "s:ifndef NO_KBD:ifeq (\$(USE_KBD),1):" \ -- cgit v1.2.3