* [gentoo-commits] repo/gentoo:master commit in: media-video/dvdrip/, media-video/dvdrip/files/
@ 2015-10-27 18:53 Pacho Ramos
0 siblings, 0 replies; 3+ messages in thread
From: Pacho Ramos @ 2015-10-27 18:53 UTC (permalink / raw
To: gentoo-commits
commit: 3ab3271a94fe96c01203ddeef7d729059af8a08c
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 27 18:53:07 2015 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Tue Oct 27 18:53:07 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ab3271a
media-video/dvdrip: Support libav too (#474346)
Package-Manager: portage-2.2.23
media-video/dvdrip/dvdrip-0.98.11-r3.ebuild | 81 ++++++++++++++++++++++
.../dvdrip/files/dvdrip-0.98.11-libav.patch | 29 ++++++++
2 files changed, 110 insertions(+)
diff --git a/media-video/dvdrip/dvdrip-0.98.11-r3.ebuild b/media-video/dvdrip/dvdrip-0.98.11-r3.ebuild
new file mode 100644
index 0000000..fcf2a6b
--- /dev/null
+++ b/media-video/dvdrip/dvdrip-0.98.11-r3.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils flag-o-matic perl-module
+
+DESCRIPTION="dvd::rip is a graphical frontend for transcode"
+HOMEPAGE="http://www.exit1.org/dvdrip/"
+SRC_URI="http://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"
+
+DEPEND=">=dev-perl/Event-ExecFlow-0.64
+ >=dev-perl/Event-RPC-0.89
+ dev-perl/gtk2-perl
+ >=dev-perl/gtk2-ex-formfactory-0.65
+ >=dev-perl/libintl-perl-1.16
+ || ( media-gfx/graphicsmagick[imagemagick] media-gfx/imagemagick )
+ >=media-video/transcode-1.1.0[dvd,jpeg,mp3,ogg,vorbis]
+ >=virtual/perl-podlators-2.5.3
+"
+RDEPEND="${DEPEND}
+ x11-libs/gdk-pixbuf:2[jpeg]
+ x11-libs/gtk+:2
+ ffmpeg? (
+ libav? ( media-video/libav )
+ !libav? ( media-video/ffmpeg:0 )
+ )
+ 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
+
+ # Ubuntu patch for supporting libav
+ use libav && epatch "${FILESDIR}"/${P}-libav.patch
+}
+
+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/files/dvdrip-0.98.11-libav.patch b/media-video/dvdrip/files/dvdrip-0.98.11-libav.patch
new file mode 100644
index 0000000..a9d60e2
--- /dev/null
+++ b/media-video/dvdrip/files/dvdrip-0.98.11-libav.patch
@@ -0,0 +1,29 @@
+Description: Port from ffmpeg to avconv.
+Author: Dmitrijs Ledkovs <xnox@ubuntu.com>
+
+--- 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"
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/dvdrip/, media-video/dvdrip/files/
@ 2020-04-26 12:26 David Seifert
0 siblings, 0 replies; 3+ messages in thread
From: David Seifert @ 2020-04-26 12:26 UTC (permalink / raw
To: gentoo-commits
commit: c06a6eaaf99164792e150f7434f0c1c532f1ce83
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 26 12:25:42 2020 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Apr 26 12:25:42 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c06a6eaa
media-video/dvdrip: Remove media-video/libav
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: David Seifert <soap <AT> gentoo.org>
media-video/dvdrip/dvdrip-0.98.11-r4.ebuild | 12 +++------
.../dvdrip/files/dvdrip-0.98.11-libav.patch | 29 ----------------------
2 files changed, 3 insertions(+), 38 deletions(-)
diff --git a/media-video/dvdrip/dvdrip-0.98.11-r4.ebuild b/media-video/dvdrip/dvdrip-0.98.11-r4.ebuild
index e6bca9fb326..e26b6462724 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 a9d60e2338b..00000000000
--- 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 <xnox@ubuntu.com>
-
---- 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"
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/dvdrip/, media-video/dvdrip/files/
@ 2022-02-28 4:31 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2022-02-28 4:31 UTC (permalink / raw
To: gentoo-commits
commit: 160f5f74c8f3c1f566fda7411fe3086f85a65ef6
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 28 04:02:19 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Feb 28 04:02:19 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=160f5f74
media-video/dvdrip: update EAPI 5 -> 8
Bug: https://bugs.gentoo.org/831130
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-video/dvdrip/dvdrip-0.98.11-r5.ebuild | 86 ++++++++++++++++++++++
.../dvdrip-0.98.11-r5-fix_parallel_make.patch | 28 +++++++
2 files changed, 114 insertions(+)
diff --git a/media-video/dvdrip/dvdrip-0.98.11-r5.ebuild b/media-video/dvdrip/dvdrip-0.98.11-r5.ebuild
new file mode 100644
index 000000000000..543fe8b80371
--- /dev/null
+++ b/media-video/dvdrip/dvdrip-0.98.11-r5.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop 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? ( media-video/ffmpeg:0 )
+ 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
+"
+
+DOCS=( "Changes*" Credits README TODO )
+
+PATCHES=(
+ "${FILESDIR}"/${P}-r5-fix_parallel_make.patch
+)
+
+src_prepare() {
+ # bug #333739
+ sed -i -e 's:$(CC):$(CC) $(OTHERLDFLAGS):' src/Makefile || die
+
+ default
+
+ # Fix default device for >=udev-180, bug #224559
+ sed -i -e 's:/dev/dvd:/dev/cdrom:' lib/Video/DVDRip/Config.pm || die
+}
+
+src_configure() {
+ filter-flags -ftracer
+
+ # bug #255269
+ export SKIP_UNPACK_REQUIRED_MODULES=1
+
+ perl-module_src_configure
+}
+
+src_install() {
+ newicon lib/Video/DVDRip/icon.xpm dvdrip.xpm
+ make_desktop_entry dvdrip dvd::rip
+
+ 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 ${EROOT}/usr/sbin/fping"
+ ewarn ""
+ ewarn "Note that this is a security risk when enabled."
+ fi
+}
diff --git a/media-video/dvdrip/files/dvdrip-0.98.11-r5-fix_parallel_make.patch b/media-video/dvdrip/files/dvdrip-0.98.11-r5-fix_parallel_make.patch
new file mode 100644
index 000000000000..ded1f69cd28b
--- /dev/null
+++ b/media-video/dvdrip/files/dvdrip-0.98.11-r5-fix_parallel_make.patch
@@ -0,0 +1,28 @@
+http://bugs.gentoo.org/266739
+
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -3,10 +3,10 @@
+ all: ../bin/dvdrip-splitpipe ../bin/dvdrip-progress
+
+ ../bin/dvdrip-splitpipe: dvdrip-splitpipe.c
+- $(CC) $(OTHERLDFLAGS) $(CFLAGS) -o dvdrip-splitpipe dvdrip-splitpipe.c && mv dvdrip-splitpipe ../bin
++ $(CC) $(OTHERLDFLAGS) $(CFLAGS) -o ../bin/dvdrip-splitpipe dvdrip-splitpipe.c
+
+ ../bin/dvdrip-progress: dvdrip-progress.c
+- $(CC) $(OTHERLDFLAGS) $(CFLAGS) -o dvdrip-progress dvdrip-progress.c && mv dvdrip-progress ../bin
++ $(CC) $(OTHERLDFLAGS) $(CFLAGS) -o ../bin/dvdrip-progress dvdrip-progress.c
+
+ clean:
+ rm -f dvdrip-splitpipe ../bin/dvdrip-splitpipe dvdrip-progress ../bin/dvdrip-progress
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -52,7 +52,7 @@
+ sub MY::postamble {
+ '
+ bin/dvdrip-splitpipe bin/dvdrip-progress: src/Makefile
+- cd src && make
++ cd src && ( $(MAKE) CC=$(CC) )
+ ';
+ }
+
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-02-28 4:31 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-10-27 18:53 [gentoo-commits] repo/gentoo:master commit in: media-video/dvdrip/, media-video/dvdrip/files/ Pacho Ramos
-- strict thread matches above, loose matches on Subject: below --
2020-04-26 12:26 David Seifert
2022-02-28 4:31 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox