From deba8115d2c2af26df42966b91ef04ff4dd79cde Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 14 May 2020 11:09:11 +0100 Subject: gentoo resync : 14.05.2020 --- media-video/dvdrip/Manifest | 4 +- media-video/dvdrip/dvdrip-0.98.11-r3.ebuild | 73 ---------------------- media-video/dvdrip/dvdrip-0.98.11-r4.ebuild | 12 +--- .../dvdrip/files/dvdrip-0.98.11-libav.patch | 29 --------- 4 files changed, 4 insertions(+), 114 deletions(-) delete mode 100644 media-video/dvdrip/dvdrip-0.98.11-r3.ebuild delete mode 100644 media-video/dvdrip/files/dvdrip-0.98.11-libav.patch (limited to 'media-video/dvdrip') diff --git a/media-video/dvdrip/Manifest b/media-video/dvdrip/Manifest index 49770aea20d1..45931c4fb06c 100644 --- a/media-video/dvdrip/Manifest +++ b/media-video/dvdrip/Manifest @@ -1,6 +1,4 @@ AUX dvdrip-0.98.11-fix_parallel_make.patch 880 BLAKE2B 3011cc4503bedfd056f6c587d65cf6bdd42d481f09f5c3644d8337ea11053fb6b91a0d88112385969c3592c8407294b8d1c661701e2b4f27ef4339e096125c80 SHA512 0fabe81659cb510357381d99ae8eea73a6a986e7c646dfd6b0fb7d38920a8b7cf9e79cb40a3606cb88a97f7ff9250d5e64aefb0fa599b9d9e6ae4ce91e692fb9 -AUX dvdrip-0.98.11-libav.patch 1183 BLAKE2B 68681c5c67b619fcf3a5b4e8d3b2023ef0c9f2f582804e95e09e9197a026879b5db8d3af65d79051558b32a5673d8bfd6d058378a9666cef1754d558f956d8e7 SHA512 38a4d034acb9f4cc0dcbe7deb274d820be5e8b623b8852316599fa76dc6407c7a0dd1c8fa204c659d075f0f5a0a7f73e99f6ca978859e845cc88b99ee51042ea DIST dvdrip-0.98.11.tar.gz 2075302 BLAKE2B 875ea2d9ee679657b7bebce10ecf037a2467f7e61a8ae8f9417bbb93115368d439e1347b8e0f9c9aae88e8e6d0886ac7dc9b5650420618231550994cca0b65ff SHA512 8bb2e4cb72666ac3f7d1953e02ac868070503f00b05ea39b4961f54042088d07abd4ef020a9cefec11e96e965d84dd95d00288e7562d92551f480ccba88b9dce -EBUILD dvdrip-0.98.11-r3.ebuild 1990 BLAKE2B 6abf8a9b0006f2b00445385c4352434f3d04fdcba7e4fe120f2e91a0628e81d2cecf7bc0237840fba8dc55c5c6090f4d584c692c25ffbf579264dce007718a76 SHA512 c9514775bac93f552dd5e28d2feb0dc8e0b11eb273d5e74b44cece1dd33884b00276649b2c7a6b20a7f5e095f97d551ccd5db49693afdd4440e7ea1a5e67c629 -EBUILD dvdrip-0.98.11-r4.ebuild 2136 BLAKE2B 633f8bdf5b5132880f0d15fc8c8a67e75291fa9ca08a8cd68f7cf5c6dad8ddaaa3690b796979e87f85a884ed616a26e5c0205ecda2eaf61d677b14d4107546d8 SHA512 40cb865d09ff9f507af317678e45b9dae06bc461ac2994d76be2986b564fc4b0f677c8b3fb14f48e234d0cef09e79da0a3c2f1c6fa315ef82b01359383186a3a +EBUILD dvdrip-0.98.11-r4.ebuild 1994 BLAKE2B 88b897b6d13b4e42f76ecb503d59694cfadf9b13e1c61281c06de9d5c79aca4ed3fa694a8a33bd9705398ebb25a06e0007348ae5629bd9b9f061d7570ef7ce1a SHA512 59dc2744f1484a9b35e7547b38e4d4384566884416e47252a2240caf5f2664fcc59e6a4b9e5be94200eee18ba50fa383050f5a96704f595418cb60510430e486 MISC metadata.xml 389 BLAKE2B 85a367f916a737f8a0010c54746610a34408c68919ce3d8b6728203597cdd1d155839c20e50de6565844c63d27f9e7305aba8d5ec1bb6b7e82384e577c2657c7 SHA512 f9762a6801b0f060cff8b36f328729aa20c71ec34fa33be7c6088e20004d3b42ac4d45b60c82774d7519b6be09b76aa9ea06b18fa252300b47fada916620ecfd diff --git a/media-video/dvdrip/dvdrip-0.98.11-r3.ebuild b/media-video/dvdrip/dvdrip-0.98.11-r3.ebuild deleted file mode 100644 index 3c99edbd3c5c..000000000000 --- a/media-video/dvdrip/dvdrip-0.98.11-r3.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils flag-o-matic perl-module - -DESCRIPTION="dvd::rip is a graphical frontend for transcode" -HOMEPAGE="https://www.exit1.org/dvdrip/" -SRC_URI="https://www.exit1.org/dvdrip/dist/${P}.tar.gz" - -SLOT="0" -KEYWORDS="amd64 ppc ppc64 x86" -IUSE="ffmpeg fping mplayer ogg subtitles vcd vorbis xine xvid" - -DEPEND=">=dev-perl/Event-ExecFlow-0.64 - >=dev-perl/Event-RPC-0.89 - dev-perl/Gtk2 - >=dev-perl/gtk2-ex-formfactory-0.65 - >=dev-perl/libintl-perl-1.16 - >=media-video/transcode-1.1.0[dvd,jpeg,mp3,ogg,vorbis] - virtual/imagemagick-tools - >=virtual/perl-podlators-2.5.3 -" -RDEPEND="${DEPEND} - x11-libs/gdk-pixbuf:2[jpeg] - x11-libs/gtk+:2 - ffmpeg? ( virtual/ffmpeg ) - fping? ( >=net-analyzer/fping-2.2 ) - mplayer? ( media-video/mplayer ) - ogg? ( media-sound/ogmtools ) - subtitles? ( media-video/subtitleripper ) - vcd? ( - media-video/transcode[mjpeg] - >=media-video/mjpegtools-1.6.0 - ) - vorbis? ( media-sound/vorbis-tools ) - xine? ( media-video/xine-ui ) - xvid? ( media-video/xvid4conf ) - >=media-video/lsdvd-0.15" - -pkg_setup() { - filter-flags -ftracer - export SKIP_UNPACK_REQUIRED_MODULES=1 #255269 - - perl_set_version -} - -src_prepare() { - sed -i -e 's:$(CC):$(CC) $(OTHERLDFLAGS):' src/Makefile || die #333739 - epatch "${FILESDIR}"/${P}-fix_parallel_make.patch - # Fix default device for >=udev-180 wrt #224559 - sed -i -e 's:/dev/dvd:/dev/cdrom:' lib/Video/DVDRip/Config.pm || die -} - -src_install() { - newicon lib/Video/DVDRip/icon.xpm dvdrip.xpm - make_desktop_entry dvdrip dvd::rip - - mydoc="Changes* Credits README TODO" perl-module_src_install -} - -pkg_postinst() { - # bug 173924 - if use fping; then - ewarn "For dvdrip-master to work correctly with cluster mode," - ewarn "the fping binary must be setuid." - ewarn "" - ewarn "Run this command to fix it:" - ewarn "chmod u=rwsx,g=rx,o=rx /usr/sbin/fping" - ewarn "" - ewarn "Note that this is a security risk when enabled." - fi -} diff --git a/media-video/dvdrip/dvdrip-0.98.11-r4.ebuild b/media-video/dvdrip/dvdrip-0.98.11-r4.ebuild index e6bca9fb326a..e26b6462724b 100644 --- a/media-video/dvdrip/dvdrip-0.98.11-r4.ebuild +++ b/media-video/dvdrip/dvdrip-0.98.11-r4.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 @@ -10,7 +10,7 @@ SRC_URI="https://www.exit1.org/dvdrip/dist/${P}.tar.gz" SLOT="0" KEYWORDS="amd64 ppc ppc64 x86" -IUSE="ffmpeg fping libav mplayer ogg subtitles vcd vorbis xine xvid" +IUSE="ffmpeg fping mplayer ogg subtitles vcd vorbis xine xvid" DEPEND=">=dev-perl/Event-ExecFlow-0.64 >=dev-perl/Event-RPC-0.89 @@ -24,10 +24,7 @@ DEPEND=">=dev-perl/Event-ExecFlow-0.64 RDEPEND="${DEPEND} x11-libs/gdk-pixbuf:2[jpeg] x11-libs/gtk+:2 - ffmpeg? ( - libav? ( media-video/libav ) - !libav? ( media-video/ffmpeg:0 ) - ) + ffmpeg? ( media-video/ffmpeg:0 ) fping? ( >=net-analyzer/fping-2.2 ) mplayer? ( media-video/mplayer ) ogg? ( media-sound/ogmtools ) @@ -54,9 +51,6 @@ src_prepare() { epatch "${FILESDIR}"/${P}-fix_parallel_make.patch # Fix default device for >=udev-180 wrt #224559 sed -i -e 's:/dev/dvd:/dev/cdrom:' lib/Video/DVDRip/Config.pm || die - - # Ubuntu patch for supporting libav - use libav && epatch "${FILESDIR}"/${P}-libav.patch } src_install() { diff --git a/media-video/dvdrip/files/dvdrip-0.98.11-libav.patch b/media-video/dvdrip/files/dvdrip-0.98.11-libav.patch deleted file mode 100644 index a9d60e2338b1..000000000000 --- a/media-video/dvdrip/files/dvdrip-0.98.11-libav.patch +++ /dev/null @@ -1,29 +0,0 @@ -Description: Port from ffmpeg to avconv. -Author: Dmitrijs Ledkovs - ---- dvdrip-0.98.11.orig/lib/Video/DVDRip/Depend.pm -+++ dvdrip-0.98.11/lib/Video/DVDRip/Depend.pm -@@ -114,10 +114,10 @@ my %TOOLS = ( - }, - ffmpeg => { - order => ++$ORDER, -- command => "ffmpeg", -+ command => "avconv", - comment => __ "FFmpeg video converter command line program", - optional => 1, -- version_cmd => "ffmpeg -version", -+ version_cmd => "avconv -version", - get_version => sub { - my ($cmd) = @_; - qx[$cmd 2>&1] =~ /version ([^\s]+)/i; ---- dvdrip-0.98.11.orig/lib/Video/DVDRip/Title.pm -+++ dvdrip-0.98.11/lib/Video/DVDRip/Title.pm -@@ -3184,7 +3184,7 @@ sub get_take_snapshot_command { - . "tcdemux -s 0x80 -x mpeg2 -S $grab_options->{S} " - . "-M 0 -d 0 -P /dev/null | " - . "tcextract -t vob -a 0 -x mpeg2 -d 0 | " -- . "ffmpeg -r $frame_rate -i - -an -r 1 -ss '$start' -vframes 1 snapshot%03d.png "; -+ . "avconv -r $frame_rate -i - -an -r 1 -ss '$start' -vframes 1 snapshot%03d.png "; - - $command .= " && " - . "execflow convert" -- cgit v1.2.3