diff options
Diffstat (limited to 'media-video')
26 files changed, 222 insertions, 454 deletions
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz Binary files differindex 93248d820553..e165e517f625 100644 --- a/media-video/Manifest.gz +++ b/media-video/Manifest.gz diff --git a/media-video/baka-mplayer/baka-mplayer-2.0.4-r1.ebuild b/media-video/baka-mplayer/baka-mplayer-2.0.4-r1.ebuild new file mode 100644 index 000000000000..480cd44a4484 --- /dev/null +++ b/media-video/baka-mplayer/baka-mplayer-2.0.4-r1.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit qmake-utils xdg-utils + +DESCRIPTION="Cross-platform libmpv-based multimedia player with uncluttered design" +HOMEPAGE="http://bakamplayer.u8sand.net/" +SRC_URI="https://github.com/u8sand/Baka-MPlayer/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +BDEPEND=" + dev-qt/linguist-tools:5 + virtual/pkgconfig +" +RDEPEND=" + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + dev-qt/qtx11extras:5 + media-video/mpv[libmpv] + x11-libs/libX11 +" +DEPEND="${RDEPEND}" + +S="${WORKDIR}/Baka-MPlayer-${PV}" + +PATCHES=( + "${FILESDIR}/${P}-gcc5.patch" + "${FILESDIR}/${P}-mpv23.patch" + "${FILESDIR}/${P}-playlist-regression.patch" +) + +src_prepare() { + default + # don't install license, man.gz, install the latter manually + sed -e "/^INSTALLS/s:\sman\slicense::" \ + -e '/^manual.path/s:'${PN}':'${PF}':' \ + -i src/Baka-MPlayer.pro || die + gunzip DOCS/baka-mplayer.1.gz || die +} + +src_configure() { + eqmake5 \ + INSTROOT="${D}" \ + CONFIG+=install_translations \ + lrelease="$(qt5_get_bindir)"/lrelease \ + lupdate="$(qt5_get_bindir)"/lupdate \ + src/Baka-MPlayer.pro +} + +src_install() { + default + doman DOCS/baka-mplayer.1 +} + +pkg_postinst() { + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_icon_cache_update +} diff --git a/media-video/baka-mplayer/baka-mplayer-9999.ebuild b/media-video/baka-mplayer/baka-mplayer-9999.ebuild new file mode 100644 index 000000000000..243a21f1b8af --- /dev/null +++ b/media-video/baka-mplayer/baka-mplayer-9999.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit qmake-utils git-r3 xdg-utils + +DESCRIPTION="Cross-platform libmpv-based multimedia player with uncluttered design" +HOMEPAGE="http://bakamplayer.u8sand.net/" +EGIT_REPO_URI="https://github.com/u8sand/Baka-MPlayer.git" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="" +IUSE="" + +BDEPEND=" + dev-qt/linguist-tools:5 + virtual/pkgconfig +" +RDEPEND=" + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + dev-qt/qtx11extras:5 + media-video/mpv[libmpv] + x11-libs/libX11 +" +DEPEND="${RDEPEND}" + +S="${WORKDIR}/baka-mplayer-${PV}" + +src_prepare() { + default + # don't install license, man.gz, install the latter manually + sed -e "/^INSTALLS/s/\sman\slicense//" -i src/Baka-MPlayer.pro || die + gunzip DOCS/baka-mplayer.1.gz || die +} + +src_configure() { + eqmake5 \ + INSTROOT="${D}" \ + CONFIG+=install_translations \ + lrelease="$(qt5_get_bindir)"/lrelease \ + lupdate="$(qt5_get_bindir)"/lupdate \ + src/Baka-MPlayer.pro +} + +src_install() { + default + doman DOCS/baka-mplayer.1 +} + +pkg_postinst() { + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_icon_cache_update +} diff --git a/media-video/baka-mplayer/files/baka-mplayer-2.0.4-mpv23.patch b/media-video/baka-mplayer/files/baka-mplayer-2.0.4-mpv23.patch new file mode 100644 index 000000000000..2b9af609de9b --- /dev/null +++ b/media-video/baka-mplayer/files/baka-mplayer-2.0.4-mpv23.patch @@ -0,0 +1,22 @@ +From 72325037151893f1ac17e0babae8826cd1382388 Mon Sep 17 00:00:00 2001 +From: Daniel Clarke <u8sand@gmail.com> +Date: Mon, 2 Jan 2017 15:38:39 -0500 +Subject: [PATCH] Replaced length with duration Fixes #239 + +--- + src/mpvhandler.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/mpvhandler.cpp b/src/mpvhandler.cpp +index 77b40408..5a900983 100644 +--- a/src/mpvhandler.cpp ++++ b/src/mpvhandler.cpp +@@ -679,7 +680,7 @@ void MpvHandler::LoadFileInfo() + fileInfo.media_title = mpv_get_property_string(mpv, "media-title"); + // get length + double len; +- mpv_get_property(mpv, "length", MPV_FORMAT_DOUBLE, &len); ++ mpv_get_property(mpv, "duration", MPV_FORMAT_DOUBLE, &len); + fileInfo.length = (int)len; + + LoadTracks(); diff --git a/media-video/baka-mplayer/files/baka-mplayer-2.0.4-playlist-regression.patch b/media-video/baka-mplayer/files/baka-mplayer-2.0.4-playlist-regression.patch new file mode 100644 index 000000000000..a6b361da12fe --- /dev/null +++ b/media-video/baka-mplayer/files/baka-mplayer-2.0.4-playlist-regression.patch @@ -0,0 +1,33 @@ +From cb42b7654c07426f36f765d1be7faf5ed3a3e591 Mon Sep 17 00:00:00 2001 +From: godly-devotion <azian.otaku@live.com> +Date: Tue, 1 Dec 2015 18:15:32 -0500 +Subject: [PATCH] Fix playlist regression from 01ec5a7 + +--- + src/ui/mainwindow.ui | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/src/ui/mainwindow.ui b/src/ui/mainwindow.ui +index 2430322c..a1b30779 100644 +--- a/src/ui/mainwindow.ui ++++ b/src/ui/mainwindow.ui +@@ -121,6 +121,10 @@ QListView { + #playlistWidget::item:selected { + background: #383838; + } ++#playlistWidget:item:selected:active, ++#playlistWidget:item:selected:!active { ++ color: whitesmoke; ++} + + /* QScrollBar */ + +@@ -1059,7 +1063,7 @@ QSlider::handle:horizontal { + <x>0</x> + <y>0</y> + <width>646</width> +- <height>24</height> ++ <height>23</height> + </rect> + </property> + <widget class="QMenu" name="menu_File"> diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest index dabc5104bb36..cad6865ec426 100644 --- a/media-video/ffmpeg/Manifest +++ b/media-video/ffmpeg/Manifest @@ -10,6 +10,6 @@ EBUILD ffmpeg-3.4.6-r1.ebuild 15654 BLAKE2B c10baf625da1c508acad431bf07955342774 EBUILD ffmpeg-4.1.3.ebuild 17098 BLAKE2B 4c936534afb8a35b729e2849a6ddb176896d0b1a7b1aa08f0adc44c6fffff2d29eeef94e7eb14192fb8e05912ae5b8d70c256d964e025bc5c03aedd6ad155b33 SHA512 7ab700e8b432d9545121b6c628eb72c6fda4239383e77f1277a3437262237f3cdc4bff4f2b84af84a7a1b2aafb9e0707a2a370e85a4854b0ee18eb5ee243800e EBUILD ffmpeg-4.1.4.ebuild 17106 BLAKE2B e1935375a52038b6a3c06570fded41a858bb484b4d33e5237fbd843728074712066bc04baab87c711e6cdeb5d45bcc434ae29b92a2a42e754a6bbc08caa1b562 SHA512 f84db133fa01cdf91cd5c60dc3ca410545493d0b9903751c9636ab7210e3bd19f69bc51e2237c80c213c68562dcced2a431c0fc7082214bf1edc7d3ea69217c2 EBUILD ffmpeg-4.2.1.ebuild 17780 BLAKE2B be10a290333454fdb75b531b9055559667fcc1441a695bc5df78f980a739823001d3e18a599b7e276dd44e6be5fadaeeb2507c6b36604ac0b5a540c5392b01b6 SHA512 0f56840c9d916cc74a19e06d8bfd7711b2db34974f89bed23247b9e5924244bb4c544889c5ef3d31851d0e53d04763e4ba1b60f86b01e2ed9a0efe6fea451fcd -EBUILD ffmpeg-4.2.2.ebuild 17780 BLAKE2B b6021ce235e7e1a5a4331f9bd12dd9baf56ad69745af0095c408d290ae97b5cfbbe3028963f5762a667585e7c262c93e79d2cfc6b727e377229a381bb9b657bc SHA512 97bf3083906a48430578e42a71bf9c20075b8dd437347601c0012d9e549c0896b86acc97c41b01e31e6d0e32b40f6fbbc08fcfb215f807747eb5230bfa9f3906 -EBUILD ffmpeg-9999.ebuild 17786 BLAKE2B f3480d115f1c4b3a56f562634cf48e870539c122d7ab51e5d52a28b9c554e9e4544baae5facd0aceece14fee19d179a1817116f7d710c7f1901bca38f7fe48e0 SHA512 58853bf44426aae9010621c404502c4252c13d55279df0f53a0b35c1749b4161c0acc8907cbdd734013e7f08e536b87639a0466af95e357dacfec8a91b03d46c +EBUILD ffmpeg-4.2.2.ebuild 17743 BLAKE2B b11082b207aea1fad93b1947d4d7ad281fe846e223542784629d4edfe49e8d5f5d1b4933a71260ddbc6e5eb5039b32b0f695518deba8c8cb6d64a36167421f25 SHA512 16ccb1d98bcf5d5654c7944712f35c91a0cfef45d00f44cd289551f5b2f7bf0dc46e106147156b96c6e320acfc370fd4b8b148aef6f5a362204b2328946297ad +EBUILD ffmpeg-9999.ebuild 17749 BLAKE2B 40392380368d3914b9824088857fb9d425526395238c0e1096ad9b46b3474839b279df3a9e132d298afb2683b2557bfa3c5c26cce6232bf766a7f90aa80ee135 SHA512 cbfd4161ff5a729a9d1d2cfc3b0fe8a369c397875f4d24cb93b15559f415a81e8a841158c37faaf4809acc37a2c281a47fbe995f2f5001d5d9853a5b0b5b34f0 MISC metadata.xml 5820 BLAKE2B 01cde597d11525602c97167c405cbcc2b42c28bcf074c3d035e6994ad7cead68e5256aea89d10680a9e4b61057a69a6dd66ead329b41685d206937e20761f475 SHA512 8a8a4fc714ba566024960eeada731ba71f30577cccd9fc1b775ac86f1093568cfc3f0f204129f65aec2d921838d1372fa5a9410223a44e60b83a759c07d632cc diff --git a/media-video/ffmpeg/ffmpeg-4.2.2.ebuild b/media-video/ffmpeg/ffmpeg-4.2.2.ebuild index 6d69c5477349..96cd4122b9ff 100644 --- a/media-video/ffmpeg/ffmpeg-4.2.2.ebuild +++ b/media-video/ffmpeg/ffmpeg-4.2.2.ebuild @@ -70,7 +70,7 @@ FFMPEG_FLAG_MAP=( +bzip2:bzlib cpudetection:runtime-cpudetect debug gcrypt gnutls gmp +gpl hardcoded-tables +iconv libressl:libtls libxml2 lzma +network opencl openssl +postproc samba:libsmbclient sdl:ffplay sdl:sdl2 vaapi vdpau - X:xlib xcb:libxcb xcb:libxcb-shm xcb:libxcb-xfixes +zlib + X:xlib X:libxcb X:libxcb-shm X:libxcb-xfixes +zlib # libavdevice options cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal opengl @@ -254,8 +254,8 @@ RDEPEND=" >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] >=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}] + >=x11-libs/libxcb-1.4[${MULTILIB_USEDEP}] ) - xcb? ( >=x11-libs/libxcb-1.4[${MULTILIB_USEDEP}] ) zeromq? ( >=net-libs/zeromq-4.1.6 ) zimg? ( >=media-libs/zimg-2.7.4:=[${MULTILIB_USEDEP}] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) @@ -301,7 +301,6 @@ GPL_REQUIRED_USE=" x264? ( gpl ) x265? ( gpl ) xvid? ( gpl ) - X? ( !xcb? ( gpl ) ) ) " REQUIRED_USE=" diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild index 69bdf4e82bac..b0f173916123 100644 --- a/media-video/ffmpeg/ffmpeg-9999.ebuild +++ b/media-video/ffmpeg/ffmpeg-9999.ebuild @@ -70,7 +70,7 @@ FFMPEG_FLAG_MAP=( +bzip2:bzlib cpudetection:runtime-cpudetect debug gcrypt gnutls gmp +gpl hardcoded-tables +iconv libressl:libtls libxml2 lzma +network opencl openssl +postproc samba:libsmbclient sdl:ffplay sdl:sdl2 vaapi vdpau - X:xlib xcb:libxcb xcb:libxcb-shm xcb:libxcb-xfixes +zlib + X:xlib X:libxcb X:libxcb-shm X:libxcb-xfixes +zlib # libavdevice options cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal opengl @@ -254,8 +254,8 @@ RDEPEND=" >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] >=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}] + >=x11-libs/libxcb-1.4[${MULTILIB_USEDEP}] ) - xcb? ( >=x11-libs/libxcb-1.4[${MULTILIB_USEDEP}] ) zeromq? ( >=net-libs/zeromq-4.1.6 ) zimg? ( >=media-libs/zimg-2.7.4:=[${MULTILIB_USEDEP}] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) @@ -301,7 +301,6 @@ GPL_REQUIRED_USE=" x264? ( gpl ) x265? ( gpl ) xvid? ( gpl ) - X? ( !xcb? ( gpl ) ) ) " REQUIRED_USE=" diff --git a/media-video/gxine/Manifest b/media-video/gxine/Manifest index 4d360f4d24c5..3286ee0b951b 100644 --- a/media-video/gxine/Manifest +++ b/media-video/gxine/Manifest @@ -6,5 +6,5 @@ AUX gxine-0.5.907-underlinking.patch 781 BLAKE2B 14a02ab58d17507486e43bb803f60b3 DIST gxine-0.5.907.tar.xz 910528 BLAKE2B 6c45e1b1d9819bdf9f51fbb3c8be5265144ae62f4e419eb4ab002b14c9705b48f943b28a67ff826a90e945679d487f16c9188ed45f26aa8fda0b0b45ddfe7657 SHA512 dd35c8a8810c233e81a28e9f10504645662d60dc9609451e7c49c5d516bb041b61a3b9c8f330021af1e527064cf3f62f37bde98402df7426f501d0c78c571045 DIST gxine-0.5.909.tar.xz 928544 BLAKE2B 4b649aca2602eafb5931f5f869d00d9e50f8e23c416bba0a661d895630f70840591cd3286626fc024deb45fe1484d8f640c2fb1412f536b665e6ff6b8091ce40 SHA512 87e65bb87fa416535f76253e4394447c6cd7dfaaa209b76c07b9aa81aeca0ca09399991bb2be8e6928fa3883ff61b155e173610c6c28aab10f5b1487e0699215 EBUILD gxine-0.5.907-r1.ebuild 2502 BLAKE2B 6cb7d5d4155e82094ca59db704105a9fb9e1367f21091f6f420c630bc395fa305e26f87ed81a51bf81b6ff6cb333e65d832112ba74def6bbf2982e498b3bfd93 SHA512 7796247639f723f8b15fb1001ecd8d80a131b93b165dca96aa5b4b7fbd0a1d8cf69d81a31556d5c2d54b3af4127bd8fd957ed88c123a599b65748c4498a25801 -EBUILD gxine-0.5.909.ebuild 2059 BLAKE2B 1590e16787454ce84d9fe26e07afec4634dba4ee0d1453c73cea7c0908235145dcbfcefd10ea1384cb3f2f347dcc635f6f874be13e0099f922ca88306d6db021 SHA512 26256a57f3529e8f01beca2a91b4fe506ca2278b95180a8f48e4893e7eb183df2a5cbe19eaba7f232f9848e2e49c28b408c30d7165e7fe04d950e93a6fdf4683 +EBUILD gxine-0.5.909.ebuild 2040 BLAKE2B cac2e1ceba42e0f9dc5646715a6b340bf1a13cfdc97f2f02518552f993da7387d937fb16c255e3e24548cbfd45bb4a900f06ee0170bdfaabec19b021b57ca050 SHA512 582000d1e21663e1c2159474886f8f6aa26df01191d1df919ed95300b0194c5e670f58a52584237d15a369651c08cd2c2b613111f2671a5fc996eb362a3cfb4d MISC metadata.xml 305 BLAKE2B 0704c2d6ae4a0e249d693a63f719b4ec470a08e1cf1b64342571dad7514fd2a14616bf0812aa8f6a0732049c702ee3e00ab005c5b650723577526413c8337ad5 SHA512 396865e52e9dc380cbf6d3dbf33deb69877495356dc6c6a09ba35ab3062608a93e7ab3d5d22564192070ddc186f3a5ff9ceea639911cc554ca6db5084a413587 diff --git a/media-video/gxine/gxine-0.5.909.ebuild b/media-video/gxine/gxine-0.5.909.ebuild index 6dbccad0720b..9619bbb4e5bd 100644 --- a/media-video/gxine/gxine-0.5.909.ebuild +++ b/media-video/gxine/gxine-0.5.909.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/xine/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ppc ppc64 x86" -IUSE="l10n_cs l10n_de lirc nls nsplugin udev +xcb xinerama" +IUSE="l10n_cs l10n_de lirc nls nsplugin udev xinerama" COMMON_DEPEND=">=media-libs/xine-lib-1.1.20[gtk] x11-libs/gtk+:2 @@ -20,13 +20,13 @@ COMMON_DEPEND=">=media-libs/xine-lib-1.1.20[gtk] x11-libs/libX11 x11-libs/libXext x11-libs/libXrender + x11-libs/libxcb lirc? ( app-misc/lirc ) nls? ( virtual/libintl ) nsplugin? ( dev-libs/nspr x11-libs/libXaw x11-libs/libXt ) udev? ( dev-libs/libgudev:= ) - xcb? ( x11-libs/libxcb ) xinerama? ( x11-libs/libXinerama )" DEPEND="${COMMON_DEPEND} virtual/pkgconfig @@ -48,7 +48,7 @@ src_configure() { $(use_enable nls) \ $(use_enable lirc) \ --enable-watchdog \ - $(use_with xcb) \ + --with-xcb \ $(has_version '<dev-lang/spidermonkey-1.8.5' && echo --with-spidermonkey=/usr/include/js) \ $(use_with nsplugin browser-plugin) \ $(use_with udev gudev) \ diff --git a/media-video/noad/Manifest b/media-video/noad/Manifest index 068e2ec15ed7..e2cfb2ac2c08 100644 --- a/media-video/noad/Manifest +++ b/media-video/noad/Manifest @@ -1,19 +1,11 @@ AUX confd_vdraddon.noad 1353 BLAKE2B 3387e476cc781ee66b93b9154d13f10761b5fd1e68509b0c593fcac8db87faf65eaf976ab322db37fec0c10143b92c598c105bc0b64ca7747bced8166dc392c7 SHA512 7d516aa290451ed79e010ba5f084ff120d1bb4e9cda68ff3a66a3b35786856dc9a6ebbf84df9f1d8d33f9ab3287018032377f675523b93edb89523fea456b29b AUX noad-reccmd 145 BLAKE2B f4cfd8f3a3b4651bc3afcdfd74e171b69d3fbfe6f95948db165003a3d4952c3a61dd3a0178340b69966aba59d5aec5d62e43a66cff73f277f0b722150ce68956 SHA512 83e53b1ff4af56ab188ea43ec34b843447101bd71f4eaa93b88892df8c5ff66160fbd441f13e19f7e73a5f6e193aacc003465ae174ad06ee3ae49a5c0977a60d -AUX patches-0.7.x/noad-0.7.3-ffmpeg_detection.diff 603 BLAKE2B 2668a382b6b254a54acd84762572eb5fa7984a30905428c8c104bf4a3f4e6bb827f1fa331b339b3ed3c1959a698dff02db5c0a5166b00f618aa627475ac7c985 SHA512 32bbefe976fbe556d468365fb96dd10137178c58aab8f996d7312afddad9e99000e08ab2b93a411f6a1dac7542619eec49d9287ef2d613b2ad35fb62b327df45 -AUX patches-0.7.x/noad-0.7.3-hangcheck.diff 617 BLAKE2B bafe6534d00ecaea889f92036f0f577da87b2b84ddb669a4a1b795b3f41113f17542c75f4aecfdb8b883aecac118fb32cd8d016a2aa142ab2f1805beb53b3d23 SHA512 b426c4999f534b2940849f5f647c06d76c282d6f4f74e44c729de847b8ffd2699e242a29762a4407615ed44394495775df0aaf8220238c5baf9bf548111103ff -AUX patches-0.7.x/noad-0.7.3_gcc-4.7.diff 527 BLAKE2B 4fedfd7a14237a55b56577cc3fc699be206cb1aa0d2c7199e5bb3d1a5b8c85335ec9c8d21771b5551fc990a6562bf92401e41a91f30630ad247686653bc53e5c SHA512 ddcaea8a324cd634a294881cf272be211a42edb317e3342f28166b211584a5599b1f8ab9869dfa56983d50ff78e3e27a163ca7d752fd8efca009ba3a01e539d4 -AUX patches-0.7.x/noad-0.7.3_missing_include.diff 277 BLAKE2B 695b19165619efc537b42ceedd0af72fa952f4cfbabfad45ed712f1b2a6885773ee2d7fe9e83174ac0bfa8970ddc17775e190087e038ab169ca9fe6c27f9b2fc SHA512 6c0c03597f71d71efbcd80ec3d4c2df8f38ff8e46140232c95e4d0ed354da9932b80ab9587dfe9376fd29670b7154cef1a33974c739eaf5981048f21844208c3 -AUX patches-0.8.x/noad-0.8.6-ffmpeg25.patch 459 BLAKE2B 2de74d69f102143a4f9122ad4abddce6068218f58276185267f43c739e93c871d0fddedf003198da968e7972783a5c66e18c6dd1a4e5450f899739301d007848 SHA512 13bd88c67d9e5a0b452cfa46fd8b66108404f2b3efd1fa23563f7d8456318495a5c15916bd81422cffab948673a29cfb15da2e217c4f58d454c460caaad59a3b -AUX patches-0.8.x/noad-0.8.6-libav9.diff 3036 BLAKE2B 40de3a6ddeb8832ffcd50384d4c687e7f71bd101a4b9b1f1a2ccb962e3734affff0cec0b95c6648a98d284a4e8d1c53e96dc2be562b489c9a70198ecdd4a3c10 SHA512 f7ecc4e8d2c30a77588cbf5a0977575a0a2a9c44aaca1f061e34795302f56f77bcddb096e6a8ec2d3398829faabcb78a29825e1c0bc28f2350d7a4a7d1f8e64e AUX pre-shutdown-15-noad.sh 771 BLAKE2B ce0053c6fb813c28d0c653ba0ba68819f03532c82b3ac5ce018b72c9feb93d20c096b1fe83ed0694849b6629cbe0e455ffc749f0caf9977de8eea2a075c41d5f SHA512 d40625e0704bc228879bd5d19d7a62eed4e56d1a688699dde8f628aedf320e86b4bfca474b42edc3f6a93e7f8528ba15d654a818d9b19bd3ac196c1ca8324910 AUX reccmds.noad.conf 61 BLAKE2B 4600a5a2fc948b0695c487e87013b1207873b2f1f70e30604cb20288bbf7f107b2fbdb9a63d7f7eb2a8612569bb4975756109c804eb351635582f87e68eda8e5 SHA512 953af51444af1e4a853e2a501fe0fb31ef0b982795e8a7b350cf0851f6f572884de87d74b71ce0630fcd59082290ce8b9730e343032fea6512da96f1a934fddb AUX record-50-noad.sh 1443 BLAKE2B 98cba3a0024bc8c4426d2cd5d1e0d5b9d2e2ead2c50f9f8186a6567d01f656adb4b5385bb29bf8ce3a68a747a973f9bb00f64a65b21e1c7d43b7f60e2f54c55a SHA512 6ef839ad9c4d7b238e9e02dfdca486623902a5e9f3de722f18b9f50eff03888d58d03f8a17448903bbec2f04d1abcee22d6672798dd23eee024339a6474b98c9 -DIST noad-0.7.3.tar.bz2 174036 BLAKE2B 11fbe9e794981b1666b04ff9d8909972a00db2daff90819d651324704836949af85278e807e7e6902b0198fd4dcd167c8722adcf816d95e15fe808efb93420a1 SHA512 0edc81c9b689c49b99cd68b80bf7acbb0af9757b4d5439edd0610ca96bf0ee4783844aa0dfe52e3303b21f5794af3ad9a216371d4e698bbf26f24bc31be43c66 DIST noad-0.8.6-ffmpeg3.4.diff.bz2 6261 BLAKE2B 4c1de8b72c9b25a056cabb5a74b4d9bbc42f6586b4e2166bf2cf5ac76d7617df3318a4a4b21fa5dbfb601e2f9bacc7bd2d8b54705750a2d761c5a73c5c745578 SHA512 f7b4879902e2344099ef337094fc8be1c4322d2fa1ed5d7c275adfed9dfcc1644cc18743191ffd4daaa44a83cf3936a8dd8a978c66aaeae18a38c6164a608b02 DIST noad-0.8.6.tar.bz2 188085 BLAKE2B fa9ae43984509f6da17028cda11f69dae0a74afcabe8daaaf2661d9791229bf1d5374b26abbcc9cd8f887b42c188a0d4871ae059dabac3b9bb9175533f096100 SHA512 ffca9e8bc78719350ffdfe59a4f258033f843ddf761ca5d8893cde5a4968a644c0318fd86b60e7b9e78b0650f8f02c68e6f7a95f4dfb702ab30d84ad3750c9e9 -EBUILD noad-0.7.3-r1.ebuild 2209 BLAKE2B d4cd9e1024360b1f1d6740b501d304d051bbb0327fc3b7e4ca3721d31da18b08c5557f8d000506c8f46aabf6ef39f8c13cc63236e2f1c1a1672bbe48f0a5ba48 SHA512 bee6253e1cedad70e2ebbe256e0d3cce3ba45b0123320f813c3fee4cc0aaddf097958d2aeeacaa2b1e741222281cfff9736bc89249a5774d1103257b8452f442 -EBUILD noad-0.8.6-r1.ebuild 1890 BLAKE2B 005750b00b334559f25087b925e2c9fc7f4da035252879c9ea50fd6cfbfdbf437618b8a5b26337494e5c0b6fcbb19323d6c24372c2de9c1f74b3f9b866c590c9 SHA512 8d6ef2f5688ffca4e97fc34baca05a6f1d658f38390d129c7e396b984115f25c5ce6333e90d38bcbc4410699f536f8369e00a6f3c7a7e7a0213b163c41c88b6f -EBUILD noad-0.8.6-r2.ebuild 2038 BLAKE2B d8b952ef694693a0911e127f8421ffc85897147f1d816da9eb442a0be71e6ee29976e2afe1edd51737a38e2e5e1b9d3a1310d3a0a068d57fd933959070ac1329 SHA512 3f1dcce94f84a82cb62232fefe5fbbf0979c5d2a1f9f52fbb092b6759e05dd2f258e9b6b75da7f259b365ded17f59b3196ef10c8057ff5d4e164c892d3c72a50 +DIST noad-0.8.6.tar.gz 226169 BLAKE2B c8aa44a868a7592b66a94a58065df5b3dc19562bf6bfb946fe60acebd2ea9f9090750836368bc6aeecf2fbd9938b0ec3f653d7908d3b34f27c3362fcea48e445 SHA512 abec49ea7d4dc4233d42bd42ba267bc7b235aace1597c5cd3dcbb7b4ede00c3778eaa2a0d8697fca4caf2b0ca94b540b87a862523a3028eb5cfe84db3c460ede EBUILD noad-0.8.6-r3.ebuild 1857 BLAKE2B 8d9c8d53830b308bad041d8d4e8da7c60b2b53a774370381728b1750dcd0023a6ee0f63603206a6c104d502a3a25a8631703597fc1fbcf7a1e3014bb66a6abbc SHA512 319c2d1e328ebf769ed9d7f44d7f07d8223c1412b95c7d1bc49883f2f28dcc479832e14b8a46e6003e3a7fb85522880fe3ab670fe307fa936fbf562a7a58c9af +EBUILD noad-0.8.6-r4.ebuild 1873 BLAKE2B ea6c5a407a88532145e2c6e64cd08f1be3a15ddf50ffa283c64b0fb1cb0ad85393f37b0f229ed54ce56b568eb2700217db437aebbae9e00871a16c70fd0f8a19 SHA512 f8e78c678a7ee69236ac41c3a3756c959f18dd0778233ebe6f2d181ef4b518ab6cb52cd6bd935d616043a52e7a7c8ae4a650a39f3658f2cdd5fcbfb8497e6485 MISC metadata.xml 580 BLAKE2B ff89aebf4857547381931544cba6740e7775ac238d26a64fc982e516738155318fe6740e4655a5280814d9ec9ce1f90fbee56b3610bdc20a9d3a4578eb69dcc2 SHA512 ca567b06bad92795d337a7ef814d5b45e959403142d9589edf1361a48e66daaa64f28a7c0a67c188dd2a449aafb5e0f2ca597097ee104c0a3a88c85194db1902 diff --git a/media-video/noad/files/patches-0.7.x/noad-0.7.3-ffmpeg_detection.diff b/media-video/noad/files/patches-0.7.x/noad-0.7.3-ffmpeg_detection.diff deleted file mode 100644 index e757aeb884b0..000000000000 --- a/media-video/noad/files/patches-0.7.x/noad-0.7.3-ffmpeg_detection.diff +++ /dev/null @@ -1,13 +0,0 @@ -Index: noad-0.7.3/configure.ac -=================================================================== ---- noad-0.7.3.orig/configure.ac -+++ noad-0.7.3/configure.ac -@@ -158,7 +158,7 @@ dnl check that libavcodec is usable - dnl --------------------------------------------------------------------------- - if test "$withffmpeg" == "1"; then - AC_SUBST(LIBAVCODEC,"-lavcodec") -- AC_CHECK_LIB([avcodec],[avcodec_init],[AC_SUBST(HAVE_LIBAVCODEC,1) AC_SUBST(LIBS,"$LIBS $LIBAVCODEC ") ]) -+ AC_CHECK_LIB([avcodec],[avcodec_register_all],[AC_SUBST(HAVE_LIBAVCODEC,1) AC_SUBST(LIBS,"$LIBS $LIBAVCODEC ") ]) - fi - - diff --git a/media-video/noad/files/patches-0.7.x/noad-0.7.3-hangcheck.diff b/media-video/noad/files/patches-0.7.x/noad-0.7.3-hangcheck.diff deleted file mode 100644 index 37788a197fd7..000000000000 --- a/media-video/noad/files/patches-0.7.x/noad-0.7.3-hangcheck.diff +++ /dev/null @@ -1,21 +0,0 @@ -diff -ru noad-0.6.0-orig/main.cpp noad-0.6.0/main.cpp ---- noad-0.6.0-orig/main.cpp 2007-05-12 17:28:01.000000000 +0200 -+++ noad-0.6.0/main.cpp 2007-05-12 18:20:30.000000000 +0200 -@@ -566,10 +566,17 @@ - signal(SIGABRT, signal_handler); - signal(SIGSEGV, signal_handler); - signal(SIGUSR1, signal_handler); -+ signal(SIGALRM, signal_handler); - - // do cleanup at exit... - atexit(cleanUp); - -+ -+ if (!bOnline) { -+ // now start alarm timer to kill hanging noad (hardcoded 30min timeout) -+ alarm(30*60); -+ } -+ - // now do the work.., - doNoad(bBefore, recDir); - diff --git a/media-video/noad/files/patches-0.7.x/noad-0.7.3_gcc-4.7.diff b/media-video/noad/files/patches-0.7.x/noad-0.7.3_gcc-4.7.diff deleted file mode 100644 index ca37f8e22a87..000000000000 --- a/media-video/noad/files/patches-0.7.x/noad-0.7.3_gcc-4.7.diff +++ /dev/null @@ -1,17 +0,0 @@ -https://bugs.gentoo.org/show_bug.cgi?id=423623 -compilefix gcc-4.7.x - -signed-of-by: Joerg Bornkessel <hd_brummy@gentoo.org> (2012/06/27) - -diff -Naur noad-0.7.3.orig/vdr_cl.h noad-0.7.3/vdr_cl.h ---- noad-0.7.3.orig/vdr_cl.h 2012-06-27 20:27:57.000000000 +0200 -+++ noad-0.7.3/vdr_cl.h 2012-06-27 20:30:56.000000000 +0200 -@@ -287,7 +287,7 @@ - { - T *l = new T; - if (l->Parse(s)) -- Add(l); -+ this->Add(l); - else - { - esyslog("ERROR: error in %s, line %d", fileName, line); diff --git a/media-video/noad/files/patches-0.7.x/noad-0.7.3_missing_include.diff b/media-video/noad/files/patches-0.7.x/noad-0.7.3_missing_include.diff deleted file mode 100644 index c3c335c2663b..000000000000 --- a/media-video/noad/files/patches-0.7.x/noad-0.7.3_missing_include.diff +++ /dev/null @@ -1,14 +0,0 @@ -Add missing includes for ressource limits. - -Signed-off-by: Markus Rathgeb <maggu2810@gmail.com> - ---- main.cpp -+++ main.cpp -@@ -22,6 +22,7 @@ - - #include <stdlib.h> - #include <time.h> -+#include <sys/resource.h> - #include <sys/wait.h> - #include <signal.h> - #include <execinfo.h> diff --git a/media-video/noad/files/patches-0.8.x/noad-0.8.6-ffmpeg25.patch b/media-video/noad/files/patches-0.8.x/noad-0.8.6-ffmpeg25.patch deleted file mode 100644 index 455252a74c8a..000000000000 --- a/media-video/noad/files/patches-0.8.x/noad-0.8.6-ffmpeg25.patch +++ /dev/null @@ -1,16 +0,0 @@ -Index: noad-0.8.6/ffmpeg_decoder.cpp -=================================================================== ---- noad-0.8.6.orig/ffmpeg_decoder.cpp -+++ noad-0.8.6/ffmpeg_decoder.cpp -@@ -253,7 +253,11 @@ int FFMPegDecoder::decoder_exit() - // close the file
- if( pFormatCtx )
- {
-+#if LIBAVFORMAT_VERSION_MAJOR < 54
- av_close_input_file(pFormatCtx);
-+#else
-+ avformat_close_input(&pFormatCtx);
-+#endif
- pFormatCtx = NULL;
- }
- // Close the codec
diff --git a/media-video/noad/files/patches-0.8.x/noad-0.8.6-libav9.diff b/media-video/noad/files/patches-0.8.x/noad-0.8.6-libav9.diff deleted file mode 100644 index a9b6c89d9f8c..000000000000 --- a/media-video/noad/files/patches-0.8.x/noad-0.8.6-libav9.diff +++ /dev/null @@ -1,106 +0,0 @@ -compile fix noad-0.8.6 -testet with libav-9 ffmpeg-2.2.9 -Signed-of-by: Joerg Bornkessel <hd_brummy@gentoo.o> (22 Oct 2014) -diff -Naur noad-0.8.6.orig/audiotools.cpp noad-0.8.6/audiotools.cpp ---- noad-0.8.6.orig/audiotools.cpp 2014-10-22 14:26:57.809249955 +0200 -+++ noad-0.8.6/audiotools.cpp 2014-10-22 14:28:06.830249955 +0200 -@@ -50,9 +50,9 @@ - uint8_t *outbuf=NULL; - AVCodec *codec=NULL; - AVCodecContext *codecContext= NULL; --#if LIBAVCODEC_VERSION_MAJOR > 54 -+//#if LIBAVCODEC_VERSION_MAJOR > 54 - AVDictionary *avDictionary = NULL; // "create" an empty dictionary --#endif -+//#endif - int64_t basepts=0; - int64_t audiobasepts=0; - //int64_t audiopts=0; -@@ -108,13 +108,13 @@ - codecContext = avcodec_alloc_context3(codec); - #endif - --#if LIBAVCODEC_VERSION_MAJOR > 54 -+//#if LIBAVCODEC_VERSION_MAJOR > 54 - /* open it */ - if (avcodec_open2(codecContext, codec, &avDictionary) < 0) --#else -+//#else - /* open it */ -- if (avcodec_open(codecContext, codec) < 0) --#endif -+// if (avcodec_open(codecContext, codec) < 0) -+//#endif - { - fprintf(stderr, "could not open codec\n"); - } -@@ -129,9 +129,9 @@ - { - free(outbuf); - avcodec_close(codecContext); --#if LIBAVCODEC_VERSION_MAJOR > 54 -+//#if LIBAVCODEC_VERSION_MAJOR > 54 - av_dict_free(&avDictionary); --#endif -+//#endif - av_free(codecContext); - av_codec_initialised = false; - } -diff -Naur noad-0.8.6.orig/ffmpeg_decoder.cpp noad-0.8.6/ffmpeg_decoder.cpp ---- noad-0.8.6.orig/ffmpeg_decoder.cpp 2014-10-22 14:26:57.808249955 +0200 -+++ noad-0.8.6/ffmpeg_decoder.cpp 2014-10-22 14:38:26.366249955 +0200 -@@ -184,7 +184,7 @@ -
- // Retrieve stream information
- resetDecoder();
-- int openCode2 = av_find_stream_info(pFormatCtx);
-+ int openCode2 = avformat_find_stream_info(pFormatCtx, NULL);
- if(openCode2<0)
- return -1; // Couldn't find stream information
-
-@@ -222,13 +222,13 @@ - if(pCodec->capabilities & CODEC_CAP_TRUNCATED)
- pCodecCtx->flags|=CODEC_FLAG_TRUNCATED;
-
--#if LIBAVCODEC_VERSION_MAJOR > 54
-+//#if LIBAVCODEC_VERSION_MAJOR > 54
- // Open codec
- if(avcodec_open2(pCodecCtx, pCodec,&avDictionary) < 0)
--#else
-+//#else
- // Open codec
-- if(avcodec_open(pCodecCtx, pCodec)<0)
--#endif
-+// if(avcodec_open(pCodecCtx, pCodec)<0)
-+//#endif
- return -1; // Could not open codec
-
-
-@@ -270,10 +270,10 @@ - pIOContext = NULL;
- }
- #endif
--#if LIBAVCODEC_VERSION_MAJOR > 54
-+//#if LIBAVCODEC_VERSION_MAJOR > 54
- av_dict_free(&avDictionary);
- avDictionary = NULL;
--#endif
-+//#endif
- return 0;
- }
-
-diff -Naur noad-0.8.6.orig/ffmpeg_decoder.h noad-0.8.6/ffmpeg_decoder.h ---- noad-0.8.6.orig/ffmpeg_decoder.h 2014-10-22 14:26:57.807249955 +0200 -+++ noad-0.8.6/ffmpeg_decoder.h 2014-10-22 14:36:27.213249955 +0200 -@@ -22,9 +22,9 @@ - int i, videoStream;
- AVCodecContext *pCodecCtx;
- AVCodec *pCodec;
--#if LIBAVCODEC_VERSION_MAJOR > 54
-+//#if LIBAVCODEC_VERSION_MAJOR > 54
- AVDictionary *avDictionary;
--#endif
-+//#endif
- AVFrame *pFrame;
-
- public:
diff --git a/media-video/noad/noad-0.7.3-r1.ebuild b/media-video/noad/noad-0.7.3-r1.ebuild deleted file mode 100644 index 3835c9d4b831..000000000000 --- a/media-video/noad/noad-0.7.3-r1.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools eutils toolchain-funcs - -DESCRIPTION="Mark commercial Breaks in VDR records" -HOMEPAGE="http://noad.heliohost.org/" -SRC_URI="http://noad.heliohost.org/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="ffmpeg" - -RDEPEND="media-gfx/imagemagick - media-libs/libmpeg2:= - ffmpeg? ( virtual/ffmpeg ) - !media-plugins/vdr-markad" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -src_prepare() { - EPATCH_FORCE=yes EPATCH_SUFFIX=diff EPATCH_SOURCE="${FILESDIR}"/patches-${PV%.*}.x epatch - - if has_version '>=media-video/vdr-1.7.15'; then - sed -i -e 's:2001:6419:' -i svdrpc.cpp || die - fi - - sed -i -e '/CXXFLAGS.*O3/d' configure.ac || die #426746 - - sed -i \ - -e "s:-lMagick++:$($(tc-getPKG_CONFIG) --libs-only-l Magick++):" \ - Makefile.am || die #467134 - - # FIXME: --with-tools, markpics will compile but showindex won't! - sed -i \ - -e '/^noinst_PROGRAMS/s:@TOOLSRC@::' \ - -e '/^EXTRA_PROGRAMS/s:showindex::' \ - Makefile.am || die - - # ld: audiotools.o: undefined reference to symbol 'av_free@@LIBAVUTIL_51' - if use ffmpeg; then - sed -i -e 's:-lavcodec:& -lavutil:' configure.ac || die - fi - - eautoreconf -} - -src_configure() { - econf \ - --with-magick \ - --with-mpeginclude=/usr/include/mpeg2dec \ - --with-tools \ - $(usex ffmpeg '--with-ffmpeg --with-ffmpeginclude=/usr/include' '') -} - -src_install() { - dobin noad markpics # showindex - - dodoc README INSTALL - # example scripts are installed as dokumentation - dodoc allnewnoad allnoad allnoadnice clearlogos noadifnew stat2html - - newconfd "${FILESDIR}"/confd_vdraddon.noad vdraddon.noad - - insinto /usr/share/vdr/record - doins "${FILESDIR}"/record-50-noad.sh - - insinto /usr/share/vdr/shutdown - doins "${FILESDIR}"/pre-shutdown-15-noad.sh - - insinto /etc/vdr/reccmds - doins "${FILESDIR}"/reccmds.noad.conf - - exeinto /usr/share/vdr/bin - doexe "${FILESDIR}"/noad-reccmd -} - -pkg_postinst() { - elog - elog "To integrate noad in VDR you should do this:" - elog - elog "start and set Parameter in /etc/conf.d/vdraddon.noad" - elog - elog "Note: You can use here all pararmeters for noad," - elog "please look in the documentation of noad." -} diff --git a/media-video/noad/noad-0.8.6-r2.ebuild b/media-video/noad/noad-0.8.6-r2.ebuild deleted file mode 100644 index d9c62f84e4be..000000000000 --- a/media-video/noad/noad-0.8.6-r2.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools eutils toolchain-funcs - -DESCRIPTION="Mark commercial breaks in VDR recordings" -HOMEPAGE="http://noad.net23.net/" -SRC_URI="http://noad.net23.net/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+ffmpeg imagemagick libmpeg2" - -RDEPEND=" - libmpeg2? ( media-libs/libmpeg2:= ) - ffmpeg? ( virtual/ffmpeg ) - imagemagick? ( media-gfx/imagemagick ) - !media-plugins/vdr-markad" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -REQUIRED_USE="|| ( ffmpeg libmpeg2 )" - -src_prepare() { - sed -i -e 's:2001:6419:' svdrpc.cpp main.cpp - - # wrt bug 575494 - sed -e "s:CODEC_ID_MP3:AV_CODEC_ID_MP3:" -i audiotools.cpp - sed -e "sCODEC_ID_PROBE:AV_CODEC_ID_PROBE:" -i ffmpeg_decoder.cpp - - # tested libav-9, ffmepg-2.2.9 - eapply "${FILESDIR}/patches-0.8.x/${P}-libav9.diff" \ - "${FILESDIR}/patches-0.8.x/${P}-ffmpeg25.patch" - - eautoreconf -} - -src_configure() { - econf \ - $(usex imagemagick '--with-magick') \ - $(usex ffmpeg '' '--without-ffmpeg') \ - $(usex libmpeg2 '' '--without-libmpeg2') \ - --with-tools -} - -src_compile() { - emake AR="$(tc-getAR)" # see bug #469810 -} - -src_install() { - dobin noad showindex checkMarks - use imagemagick && dobin markpics - - dodoc README INSTALL - # example scripts are installed as dokumentation - dodoc allnewnoad allnoad allnoadnice clearlogos noadcall.sh noadifnew stat2html statupd - - newconfd "${FILESDIR}"/confd_vdraddon.noad vdraddon.noad - - insinto /usr/share/vdr/record - doins "${FILESDIR}"/record-50-noad.sh - - insinto /usr/share/vdr/shutdown - doins "${FILESDIR}"/pre-shutdown-15-noad.sh - - insinto /etc/vdr/reccmds - doins "${FILESDIR}"/reccmds.noad.conf - - exeinto /usr/share/vdr/bin - doexe "${FILESDIR}"/noad-reccmd -} - -pkg_postinst() { - elog - elog "To integrate noad in VDR you should do this:" - elog - elog "start and set Parameter in /etc/conf.d/vdraddon.noad" - elog - elog "Note: You can use here all parameters for noad," - elog "please look in the documentation of noad." -} diff --git a/media-video/noad/noad-0.8.6-r1.ebuild b/media-video/noad/noad-0.8.6-r4.ebuild index 60d75aed517f..170684dc966e 100644 --- a/media-video/noad/noad-0.8.6-r1.ebuild +++ b/media-video/noad/noad-0.8.6-r4.ebuild @@ -1,34 +1,34 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit autotools eutils toolchain-funcs +EAPI=7 + +inherit autotools toolchain-funcs DESCRIPTION="Mark commercial breaks in VDR recordings" -HOMEPAGE="http://noad.net23.net/" -SRC_URI="http://noad.net23.net/${P}.tar.bz2" +HOMEPAGE="https://github.com/madmartin/noad" +SRC_URI="https://github.com/madmartin/noad/archive/v0.8.6.tar.gz -> ${P}.tar.gz + http://vdr.websitec.de/download/${PN}/${P}-ffmpeg3.4.diff.bz2" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="~amd64 ~x86" IUSE="+ffmpeg imagemagick libmpeg2" RDEPEND=" libmpeg2? ( media-libs/libmpeg2:= ) ffmpeg? ( virtual/ffmpeg ) - imagemagick? ( media-gfx/imagemagick ) - !media-plugins/vdr-markad" + imagemagick? ( media-gfx/imagemagick )" DEPEND="${RDEPEND} virtual/pkgconfig" REQUIRED_USE="|| ( ffmpeg libmpeg2 )" src_prepare() { - sed -i -e 's:2001:6419:' svdrpc.cpp main.cpp + default - # tested libav-9, ffmepg-2.2.9 - eapply "${FILESDIR}/patches-0.8.x/${P}-libav9.diff" \ - "${FILESDIR}/patches-0.8.x/${P}-ffmpeg25.patch" + #compile tested libav-13, ffmepg-3.4 + eapply "${WORKDIR}/${P}-ffmpeg3.4.diff" eautoreconf } diff --git a/media-video/peek/Manifest b/media-video/peek/Manifest index c23214137aaf..4d087d2f6902 100644 --- a/media-video/peek/Manifest +++ b/media-video/peek/Manifest @@ -1,6 +1,4 @@ AUX peek-1.4.0-meson.patch 1921 BLAKE2B a96de5120e454290215049023a857b71f32082060aebc007b41c3d310eef46462282b4ee1340e827861080e66cf1c0c6ea17af6b44c63c59c18405f3b7bbf146 SHA512 914d4166345b6e180733a01578564f9351da83aa82d958c4243d08edff4d682a6aec92b6ebb7256224cb17cc23e3146f97e144935a629b937a651805dac53241 -DIST peek-1.3.1.tar.gz 2654939 BLAKE2B f5d2b6c9ca1194891ff6a61c73bcfc63a6e0bbf8a282c4309bbedbd40e29e42ad78d9c37c8a3621ceb6cb2ad85bbf2364702f1db028f6282dd4f93e15d22b34c SHA512 cdf4190c555b0a40051862038c04dc7c164bf8bccf47202d0fcb74f527a8a7d5605bc2e112847e262e51a5a95c3d2b3497e4ec56834880564e8e4127869ad9df DIST peek-1.4.0.tar.gz 2647446 BLAKE2B 688acb01e127c31fd9d8c6713757bf01e6b4ed1211a32787f5729b6a26308599a61c4ab057a2a008d3cc388f9492a41e70c34c92e90ded0058bbb325e9f828c8 SHA512 ef1723f72d1c575493b2e9192cee6038807d37d875a797781169e5f4640635deda947362dcf2e1a9149fcfe88de532b8ea05c665b14b1befaa9aa8c982d9aa31 -EBUILD peek-1.3.1-r2.ebuild 1067 BLAKE2B e89292c2cfb18d2e50e755bd7cce8e84b25acb6485ab06762295de303b3c3872c75029d60f08cf4c61ec018155794835983bce575870cd8899d53d873c528a12 SHA512 fae2aec74e1813624eb8467d08277e106e83d52d134ada60300d71c1e206724ef7358fd5b8654f955996e1f2fe58b0cc989d50f4127731d5f93e65f26d8a1c0d -EBUILD peek-1.4.0.ebuild 934 BLAKE2B f293ed7cb851bcf2c64746702c4868935f84c976a7e5c83030272fe7fadd7b415e8cfe0b84c4fe9039773e3126d5dc9f292a16e5c3e98992531869ed27cb456e SHA512 9856f12f50a3bcb9ef57738b3ba5497d4ea0a1425076f17648e47569717fc876f5e460e391c5a3889e60c582bcfacb1a7e2f8709fbabec45e0f11275e6d19298 +EBUILD peek-1.4.0-r1.ebuild 937 BLAKE2B 7cf0c2130a46df64f448644f82acb6f5b1fa47e3a85dfd44a8227114d50fee973f581da66e0cf78a3b6379cc11cc1b15131fe37e8b3e5e438a2cffd9dd208835 SHA512 279c185694aa3984f7886210a1251c3ea0d5c90da1590eb9823159c1a69d0650a7fd0247ea0a8480980e298b9281c31e5dd1df407b88c83c84616b0934342f7c MISC metadata.xml 442 BLAKE2B 0737081df17bd9a248ff54ed5f788f5488c5506cb23de18dd57ade4e87f328a96fc249371cf2e78b8399528b3a3759440ceade1f16d0d1bd11a62263e12b4854 SHA512 c94b68c460e7d302d1761ba0d7adb23530c862e1a64b48f0688b68678a353cc7ae54433e6517c564e457c5ee5dac3ca6325ef967d11c66ae998da2348854296a diff --git a/media-video/peek/peek-1.3.1-r2.ebuild b/media-video/peek/peek-1.3.1-r2.ebuild deleted file mode 100644 index 75a4200a7855..000000000000 --- a/media-video/peek/peek-1.3.1-r2.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -VALA_MIN_API_VERSION="0.22" - -inherit gnome2 vala cmake-utils - -DESCRIPTION="Simple animated Gif screen recorder" -HOMEPAGE="https://github.com/phw/peek" -SRC_URI="https://github.com/phw/peek/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="keybinder test" -RESTRICT="!test? ( test )" - -RDEPEND=">=dev-libs/glib-2.38:2 - media-video/ffmpeg[X,encode,vpx,xcb] - virtual/imagemagick-tools - >=x11-libs/gtk+-3.14:3 - keybinder? ( dev-libs/keybinder:3 )" -DEPEND="${RDEPEND} - $(vala_depend) - app-text/txt2man - >=sys-devel/gettext-0.19" - -src_prepare() { - cmake-utils_src_prepare - gnome2_src_prepare - vala_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DGSETTINGS_COMPILE=OFF - -DKEYBINDER_FOUND=$(usex keybinder 1 0) - -DVALA_EXECUTABLE="${VALAC}" - ) - - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile - - # Compile helper programs for tests - if use test; then - cmake-utils_src_make -C tests - fi -} diff --git a/media-video/peek/peek-1.4.0.ebuild b/media-video/peek/peek-1.4.0-r1.ebuild index 569a57259a23..df8ee3d18b5d 100644 --- a/media-video/peek/peek-1.4.0.ebuild +++ b/media-video/peek/peek-1.4.0-r1.ebuild @@ -17,7 +17,7 @@ IUSE="keybinder test" RESTRICT="!test? ( test )" RDEPEND=">=dev-libs/glib-2.38:2 - media-video/ffmpeg[X,encode,vpx,xcb] + media-video/ffmpeg[X,encode,vpx,xcb(+)] virtual/imagemagick-tools >=x11-libs/gtk+-3.20:3 keybinder? ( dev-libs/keybinder:3 )" diff --git a/media-video/ushare/Manifest b/media-video/ushare/Manifest index fb508d531df5..4e51e48df724 100644 --- a/media-video/ushare/Manifest +++ b/media-video/ushare/Manifest @@ -11,5 +11,5 @@ AUX ushare.init.d 2050 BLAKE2B d0a71f1c5db918887b549847471455ae1d4e78b5a08db937e AUX ushare.init.d.ng 954 BLAKE2B f62f987fcaaa217e0b3a75d225351be4a8d486f4ff025c7fea5dd34a69e58a993fbafb43ab3b7feab474cdd736c6978d8cd149f919b758dc972e33508918376a SHA512 c70e6f47f29a9d555821c3bc2000ebd6533778208b46a7bbe823454e4b26408ab9b6e31ce7449dc84ae32fcc6754c3ca2a5afa0a0393a59888bda294f0e78c98 AUX ushare.service 189 BLAKE2B 29037c78c7fb3b263e166e06dd82a5785f499db24cfbe8227e1f4695d200fff89f5a1275255f06938d134b3871b1551fee1262eaf0580ec75fb3b87ad1888adf SHA512 141b1f592220d3785af821f085f9c03811a2370e1a8c6bb5d2739b4ae74421323df437d2a6672d943ab8371b6d5ccfb395a4943a10eb5c1e8bc0ff16a3177b15 DIST ushare-1.1a.tar.bz2 65864 BLAKE2B 2a6d6922ee46c96d89a6f9a3238a1cded04194c4e7b80432e87a1c2344dcbf36484959d4601a7da8dc599531334b15a0547fc571af72630f25562e07a4116ea9 SHA512 2144ef96e58960d4d11bcefcd857c7eb7adab8df4ff815772d3b9d668f9f9daa1312707eb00a770c461b2a316e094e6697a004723ea02e86ee872fbe60b4797c -EBUILD ushare-1.1a-r8.ebuild 1679 BLAKE2B 8b58b33b5ec2472727ecb25484b88ccdae67336ab31f6721a06ce2761a1eb6694e4a868eefb0be51c2ee20c0425bbe26c130580302cfa7fd57f35855ca2bf3bb SHA512 e4982b70647f50665eee3318dffc7a333d7b9b989a469164bba4ac408b277af259411d79ca0e4612cd9b06b133852ff08051a2558de596fdd1dd99ba3bbb7e9a -MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 +EBUILD ushare-1.1a-r9.ebuild 1676 BLAKE2B 917b6409d215b26c0e5d09ef9869d8791b70f6b979fa46aa126e1b2ba87411ad782b4cb14f2a3249c76e97f096c951e86b9e6814624e9b0c29e622126f999d3d SHA512 afd5a6c2f40ac6668577a21c8e78d92858eed332b245c98cc177d6f10af09d2b5048b942480b7158bff68797fa50f3eafe5b376b2591a07ca89e4432af54d037 +MISC metadata.xml 244 BLAKE2B 24ebafa89c32f799b62237b0d9442143de8ccb86c1625f2a49dd91ec9caa63cadc52000005b5b5ef148df89e907e1407330a8d8411ffb5f4facaf629a3184cb8 SHA512 d7a2290eb2970ef7fb9bea275b209c7ace388daadcf3e317b099767d72c7d9f0b894e23492f02e973d27010a7568e48549e4f502c9628efc3133012680304784 diff --git a/media-video/ushare/metadata.xml b/media-video/ushare/metadata.xml index 6f49eba8f496..c67d4dcaca5b 100644 --- a/media-video/ushare/metadata.xml +++ b/media-video/ushare/metadata.xml @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<!-- maintainer-needed --> + <maintainer type="person"> + <email>bkohler@gentoo.org</email> + <name>Ben Kohler</name> + </maintainer> </pkgmetadata> diff --git a/media-video/ushare/ushare-1.1a-r8.ebuild b/media-video/ushare/ushare-1.1a-r9.ebuild index 05358c1f6f9f..cc9171b8ad97 100644 --- a/media-video/ushare/ushare-1.1a-r8.ebuild +++ b/media-video/ushare/ushare-1.1a-r9.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -13,7 +13,7 @@ SLOT="0" KEYWORDS="amd64 x86" IUSE="nls" -RDEPEND=">=net-libs/libupnp-1.6.14:0" +RDEPEND="=net-libs/libupnp-1.6*:0" DEPEND="${RDEPEND} virtual/pkgconfig" |