From a798af66cf18f6f929ddaa3944d38dc0440bb62a Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Sun, 27 Oct 2019 14:10:15 +0100 Subject: media-video/streamdvd: EAPI 7 Bug: https://bugs.gentoo.org/697264 Signed-off-by: Sebastian Pipping Package-Manager: Portage-2.3.78, Repoman-2.3.16 --- .../streamdvd/files/streamdvd-0.4-gcc43.patch | 24 ++++----- media-video/streamdvd/files/streamdvd-0.4.patch | 8 +-- media-video/streamdvd/streamdvd-0.4-r1.ebuild | 60 ---------------------- media-video/streamdvd/streamdvd-0.4-r2.ebuild | 59 +++++++++++++++++++++ 4 files changed, 75 insertions(+), 76 deletions(-) delete mode 100644 media-video/streamdvd/streamdvd-0.4-r1.ebuild create mode 100644 media-video/streamdvd/streamdvd-0.4-r2.ebuild (limited to 'media-video/streamdvd') diff --git a/media-video/streamdvd/files/streamdvd-0.4-gcc43.patch b/media-video/streamdvd/files/streamdvd-0.4-gcc43.patch index 89e33f58db4b..5c52498af5c9 100644 --- a/media-video/streamdvd/files/streamdvd-0.4-gcc43.patch +++ b/media-video/streamdvd/files/streamdvd-0.4-gcc43.patch @@ -1,6 +1,6 @@ -diff -aur mplex.old/inputstrm.cpp mplex/inputstrm.cpp ---- mplex.old/inputstrm.cpp 2004-03-08 23:10:53.000000000 +0100 -+++ mplex/inputstrm.cpp 2008-07-07 23:28:19.000000000 +0200 +diff -aur a/mplex/inputstrm.cpp b/mplex/inputstrm.cpp +--- a/mplex/inputstrm.cpp 2004-03-08 23:10:53.000000000 +0100 ++++ b/mplex/inputstrm.cpp 2008-07-07 23:28:19.000000000 +0200 @@ -23,6 +23,7 @@ #include "config.h" @@ -9,9 +9,9 @@ diff -aur mplex.old/inputstrm.cpp mplex/inputstrm.cpp #include "mjpeg_types.h" #include "fastintfns.h" -diff -aur mplex.old/multiplexor.cpp mplex/multiplexor.cpp ---- mplex.old/multiplexor.cpp 2004-03-08 23:10:53.000000000 +0100 -+++ mplex/multiplexor.cpp 2008-07-07 23:28:19.000000000 +0200 +diff -aur a/mplex/multiplexor.cpp b/mplex/multiplexor.cpp +--- a/mplex/multiplexor.cpp 2004-03-08 23:10:53.000000000 +0100 ++++ b/mplex/multiplexor.cpp 2008-07-07 23:28:19.000000000 +0200 @@ -22,6 +22,7 @@ #include "config.h" #include @@ -20,9 +20,9 @@ diff -aur mplex.old/multiplexor.cpp mplex/multiplexor.cpp #include "mjpeg_types.h" #include "mjpeg_logging.h" -diff -aur mplex.old/padstrm.cpp mplex/padstrm.cpp ---- mplex.old/padstrm.cpp 2004-03-08 23:10:53.000000000 +0100 -+++ mplex/padstrm.cpp 2008-07-07 23:28:19.000000000 +0200 +diff -aur a/mplex/padstrm.cpp b/mplex/padstrm.cpp +--- a/mplex/padstrm.cpp 2004-03-08 23:10:53.000000000 +0100 ++++ b/mplex/padstrm.cpp 2008-07-07 23:28:19.000000000 +0200 @@ -25,6 +25,7 @@ #endif @@ -31,9 +31,9 @@ diff -aur mplex.old/padstrm.cpp mplex/padstrm.cpp -diff -aur mplex.old/zalphastrm_in.cpp mplex/zalphastrm_in.cpp ---- mplex.old/zalphastrm_in.cpp 2004-03-08 23:10:53.000000000 +0100 -+++ mplex/zalphastrm_in.cpp 2008-07-07 23:28:19.000000000 +0200 +diff -aur a/mplex/zalphastrm_in.cpp b/mplex/zalphastrm_in.cpp +--- a/mplex/zalphastrm_in.cpp 2004-03-08 23:10:53.000000000 +0100 ++++ b/mplex/zalphastrm_in.cpp 2008-07-07 23:28:19.000000000 +0200 @@ -23,6 +23,7 @@ #include "config.h" #include diff --git a/media-video/streamdvd/files/streamdvd-0.4.patch b/media-video/streamdvd/files/streamdvd-0.4.patch index d078aa7059a3..693a4070f61f 100644 --- a/media-video/streamdvd/files/streamdvd-0.4.patch +++ b/media-video/streamdvd/files/streamdvd-0.4.patch @@ -1,5 +1,5 @@ ---- Gui/StreamDVD/Gui.pm.orig 2004-03-08 23:10:53.000000000 +0100 -+++ Gui/StreamDVD/Gui.pm 2004-05-30 13:24:38.342490078 +0200 +--- a/Gui/StreamDVD/Gui.pm 2004-03-08 23:10:53.000000000 +0100 ++++ b/Gui/StreamDVD/Gui.pm 2004-05-30 13:24:38.342490078 +0200 @@ -18,7 +18,7 @@ use Tk::BrowseEntry; use Tk::LabFrame; @@ -9,8 +9,8 @@ use StreamDVD::Defs; use StreamDVD::Calc; use strict; ---- Gui/StreamDVD/Config.pm.orig 2004-03-08 23:10:53.000000000 +0100 -+++ Gui/StreamDVD/Config.pm 2004-05-30 13:24:28.314195864 +0200 +--- a/Gui/StreamDVD/Config.pm 2004-03-08 23:10:53.000000000 +0100 ++++ b/Gui/StreamDVD/Config.pm 2004-05-30 13:24:28.314195864 +0200 @@ -284,7 +284,7 @@ $self->{MOUNT} = "/dvd"; $self->{TEMPDIR} = "/tmp"; diff --git a/media-video/streamdvd/streamdvd-0.4-r1.ebuild b/media-video/streamdvd/streamdvd-0.4-r1.ebuild deleted file mode 100644 index 531705d009b6..000000000000 --- a/media-video/streamdvd/streamdvd-0.4-r1.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=0 - -inherit eutils toolchain-funcs - -DESCRIPTION="fast tool to backup Video DVDs 'on the fly'" -HOMEPAGE="http://www.badabum.de/streamdvd.html" -SRC_URI="http://www.badabum.de/down/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" - -IUSE="X" - -DEPEND="media-libs/libdvdread - media-video/lsdvd - X? ( dev-perl/Tk - dev-perl/Tk-JPEG-Lite - virtual/cdrtools - >=media-video/dvdauthor-0.6.5 - >=app-cdr/dvd+rw-tools-5.13.4.7.4 )" - -S=${WORKDIR}/StreamDVD-${PV} - -src_unpack() { - unpack ${A} - cd "${S}" - use X && epatch "${FILESDIR}"/${P}.patch - - epatch "${FILESDIR}"/${P}-makefile.patch - epatch "${FILESDIR}"/${P}-gcc41.patch - epatch "${FILESDIR}"/${P}-libdvdread.patch - epatch "${FILESDIR}"/${P}-gcc43.patch - epatch "${FILESDIR}"/${P}-gcc44.patch -} - -src_compile() { - emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" all addon || die # compile also optional packages -} - -src_install() { - dobin streamdvd streamanalyze - newbin lsdvd lsdvd-streamdvd # patched lsdvd, rename to avoid conflict with media-video/lsdvd - dodoc README - newdoc contrib/lsdvd/AUTHORS AUTHORS.lsdvd - newdoc contrib/lsdvd/README README.lsdvd - newdoc contrib/StreamAnalyze/README README.streamanalyze - if use X - then - eval `perl '-V:installvendorlib'` - insinto "$installvendorlib/StreamDVD" - doins Gui/StreamDVD/*.pm - dobin Gui/StreamDVD.pl - dosym StreamDVD.pl /usr/bin/streamdvd_gui # convinience symlink - newdoc Gui/README README.gui - fi -} diff --git a/media-video/streamdvd/streamdvd-0.4-r2.ebuild b/media-video/streamdvd/streamdvd-0.4-r2.ebuild new file mode 100644 index 000000000000..9c889d779a06 --- /dev/null +++ b/media-video/streamdvd/streamdvd-0.4-r2.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit eutils toolchain-funcs + +DESCRIPTION="fast tool to backup Video DVDs 'on the fly'" +HOMEPAGE="http://www.badabum.de/streamdvd.html" +SRC_URI="http://www.badabum.de/down/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" + +IUSE="X" + +DEPEND="media-libs/libdvdread + media-video/lsdvd + X? ( dev-perl/Tk + dev-perl/Tk-JPEG-Lite + virtual/cdrtools + >=media-video/dvdauthor-0.6.5 + >=app-cdr/dvd+rw-tools-5.13.4.7.4 )" + +S="${WORKDIR}"/StreamDVD-${PV} + +src_prepare() { + use X && eapply "${FILESDIR}"/${P}.patch + + eapply "${FILESDIR}"/${P}-makefile.patch + eapply "${FILESDIR}"/${P}-gcc41.patch + eapply "${FILESDIR}"/${P}-libdvdread.patch + eapply "${FILESDIR}"/${P}-gcc43.patch + eapply "${FILESDIR}"/${P}-gcc44.patch + + eapply_user +} + +src_compile() { + emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" all addon # compile also optional packages +} + +src_install() { + dobin streamdvd streamanalyze + newbin lsdvd lsdvd-streamdvd # patched lsdvd, rename to avoid conflict with media-video/lsdvd + dodoc README + newdoc contrib/lsdvd/AUTHORS AUTHORS.lsdvd + newdoc contrib/lsdvd/README README.lsdvd + newdoc contrib/StreamAnalyze/README README.streamanalyze + if use X; then + eval `perl '-V:installvendorlib'` + insinto "$installvendorlib/StreamDVD" + doins Gui/StreamDVD/*.pm + dobin Gui/StreamDVD.pl + dosym StreamDVD.pl /usr/bin/streamdvd_gui # convinience symlink + newdoc Gui/README README.gui + fi +} -- cgit v1.2.3-65-gdbad