[gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-markad/, media-plugins/vdr-markad/files/
commit: 5b2a7d1a528bad0b4dda3b8c3bdfeaaf9aeb6f17
Author: Mikle Kolyada gentoo org>
AuthorDate: Thu May 2 18:53:00 2019 +
Commit: Mikle Kolyada gentoo org>
CommitDate: Thu May 2 18:53:00 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b2a7d1a
media-plugins/vdr-markad: remove last rited package
Signed-off-by: Mikle Kolyada gentoo.org>
media-plugins/vdr-markad/Manifest | 1 -
.../vdr-markad/files/vdr-markad-0.1.4-libav9.patch | 40 -
.../files/vdr-markad-0.1.4_ffmpeg-2.patch | 13 -
media-plugins/vdr-markad/metadata.xml | 8 ---
.../vdr-markad/vdr-markad-0.1.4-r1.ebuild | 66 --
.../vdr-markad/vdr-markad-0.1.4-r2.ebuild | 66 --
media-plugins/vdr-markad/vdr-markad-0.1.4.ebuild | 61
7 files changed, 255 deletions(-)
diff --git a/media-plugins/vdr-markad/Manifest
b/media-plugins/vdr-markad/Manifest
deleted file mode 100644
index 6bd9a688d1b..000
--- a/media-plugins/vdr-markad/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST vdr-markad-0.1.4.tgz 118728 BLAKE2B
f261bf7ecda87fe526acf229e66a710becdd86326cc6b5082fa7db2e7ab1fe35f850be2b3fa67947389d6cc77d2c7beccf26d5879124c74d8d0ba4a2e15f0bad
SHA512
10121e72803f489cdcabb46c989ecf4ae2ced1893bbdaccefbeef412ca34b124952ddf4639b3f78da3413e7b784ead4a60034a70cbab43a7c27e0e41f9653ae1
diff --git a/media-plugins/vdr-markad/files/vdr-markad-0.1.4-libav9.patch
b/media-plugins/vdr-markad/files/vdr-markad-0.1.4-libav9.patch
deleted file mode 100644
index f11fc613700..000
--- a/media-plugins/vdr-markad/files/vdr-markad-0.1.4-libav9.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -urN markad-0.1.4.old/command/decoder.cpp markad-0.1.4/command/decoder.cpp
markad-0.1.4.old/command/decoder.cpp 2013-06-17 21:52:44.67552
+0200
-+++ markad-0.1.4/command/decoder.cpp 2013-06-17 21:53:03.708366863 +0200
-@@ -11,6 +11,7 @@
- #include
- #include
- #include
-+#include
-
- #include "decoder.h"
-
-@@ -172,7 +173,7 @@
-
- if (video_codec)
- {
--video_context = avcodec_alloc_context();
-+video_context = avcodec_alloc_context3(NULL);
- if (video_context)
- {
- if (video_codec->capabilities & CODEC_CAP_TRUNCATED)
-@@ -321,7 +322,7 @@
- {
- avcodec_flush_buffers(video_context);
- AVCodecContext *dest;
--dest=avcodec_alloc_context();
-+dest=avcodec_alloc_context3(NULL);
- if (dest)
- {
- if (avcodec_copy_context(dest,video_context)!=0) ret=false;
-diff -urN markad-0.1.4.old/command/decoder.h markad-0.1.4/command/decoder.h
markad-0.1.4.old/command/decoder.h 2013-06-17 21:52:44.67552 +0200
-+++ markad-0.1.4/command/decoder.h 2013-06-17 21:53:03.708366863 +0200
-@@ -18,6 +18,7 @@
- #include
- #else
- #include
-+#include
- #endif
-
- #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
diff --git a/media-plugins/vdr-markad/files/vdr-markad-0.1.4_ffmpeg-2.patch
b/media-plugins/vdr-markad/files/vdr-markad-0.1.4_ffmpeg-2.patch
deleted file mode 100644
index c94d54ea7ae..000
--- a/media-plugins/vdr-markad/files/vdr-markad-0.1.4_ffmpeg-2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naur markad-0.1.4.orig/command/decoder.cpp
markad-0.1.4/command/decoder.cpp
markad-0.1.4.orig/command/decoder.cpp 2014-01-29 20:16:23.0
+0100
-+++ markad-0.1.4/command/decoder.cpp 2014-01-29 20:17:49.0 +0100
-@@ -152,7 +152,8 @@
- }
-
- video_codec=NULL;
--CodecID video_codecid;
-+//CodecID video_codecid;
-+AVCodecID video_codecid;
-
- if (useH264)
- {
diff --git a/media-plugins/vdr-markad/metadata.xml
b/media-plugins/vdr-markad/metadata.xml
deleted file mode 100644
index 27f419c289c..000
--- a/media-plugins/vdr-markad/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-http://www.gentoo.org/dtd/metadata.dtd;>
-
-
-v...@gentoo.org
-Gentoo VDR Project
-
-
diff --git a/media-plugins/vdr-markad/vdr-markad-0.1.4-r1.ebuild
b/media-plugins/vdr-markad/vdr-markad-0.1.4-r1.ebuild
deleted file mode 100644
index 263e2ce1abb..000
--- a/media-plugins/vdr-markad/vdr-markad-0.1.4-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit vdr-plugin-2
-
-VERSION="1041" # every bump, new version
-
-DESCRIPTION="VDR Plugin: marks advertisements in VDR recordings"
-HOMEPAGE="https://projects.vdr-developer.org/projects/plg-markad/;
-SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz"
-
-KEYWORDS="amd64 x86"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE=""
-
-DEPEND=">=media-video/vdr-1.6
- virtual/ffmpeg[mp3,x264]
- !media-video/noad"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${VDRPLUGIN}-${PV}/plugin"
-S2="${WORKDIR}/${VDRPLUGIN}-${PV}/command"
-
-# vdr-plugin-2.eclass changes
[gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-markad/
commit: c2689e2bf6334d019b71af5eafd0042783e595b4
Author: Michael Mair-Keimberger gmail com>
AuthorDate: Sun Mar 11 17:17:12 2018 +
Commit: Aaron Bauman gentoo org>
CommitDate: Mon Mar 26 19:15:36 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2689e2b
media-plugins/vdr-markad: use HTTPS
media-plugins/vdr-markad/vdr-markad-0.1.4-r1.ebuild | 4 ++--
media-plugins/vdr-markad/vdr-markad-0.1.4-r2.ebuild | 4 ++--
media-plugins/vdr-markad/vdr-markad-0.1.4.ebuild| 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/media-plugins/vdr-markad/vdr-markad-0.1.4-r1.ebuild
b/media-plugins/vdr-markad/vdr-markad-0.1.4-r1.ebuild
index fe03db19423..263e2ce1abb 100644
--- a/media-plugins/vdr-markad/vdr-markad-0.1.4-r1.ebuild
+++ b/media-plugins/vdr-markad/vdr-markad-0.1.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -8,7 +8,7 @@ inherit vdr-plugin-2
VERSION="1041" # every bump, new version
DESCRIPTION="VDR Plugin: marks advertisements in VDR recordings"
-HOMEPAGE="http://projects.vdr-developer.org/projects/plg-markad/;
+HOMEPAGE="https://projects.vdr-developer.org/projects/plg-markad/;
SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz"
KEYWORDS="amd64 x86"
diff --git a/media-plugins/vdr-markad/vdr-markad-0.1.4-r2.ebuild
b/media-plugins/vdr-markad/vdr-markad-0.1.4-r2.ebuild
index 863359cf467..3d18884c2cc 100644
--- a/media-plugins/vdr-markad/vdr-markad-0.1.4-r2.ebuild
+++ b/media-plugins/vdr-markad/vdr-markad-0.1.4-r2.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
@@ -8,7 +8,7 @@ inherit vdr-plugin-2
VERSION="1041" # every bump, new version
DESCRIPTION="VDR Plugin: marks advertisements in VDR recordings"
-HOMEPAGE="http://projects.vdr-developer.org/projects/plg-markad/;
+HOMEPAGE="https://projects.vdr-developer.org/projects/plg-markad/;
SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz"
KEYWORDS="~amd64 ~arm ~x86"
diff --git a/media-plugins/vdr-markad/vdr-markad-0.1.4.ebuild
b/media-plugins/vdr-markad/vdr-markad-0.1.4.ebuild
index c093a955b1d..2b5962e457c 100644
--- a/media-plugins/vdr-markad/vdr-markad-0.1.4.ebuild
+++ b/media-plugins/vdr-markad/vdr-markad-0.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -8,7 +8,7 @@ inherit vdr-plugin-2
VERSION="1041" # every bump, new version
DESCRIPTION="VDR Plugin: marks advertisements in VDR recordings"
-HOMEPAGE="http://projects.vdr-developer.org/projects/plg-markad/;
+HOMEPAGE="https://projects.vdr-developer.org/projects/plg-markad/;
SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz"
KEYWORDS="amd64 x86"
[gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-markad/
commit: 8494eb217fe33ebe476394d9c034e0d1c7f30922
Author: Matthias Schwarzott gentoo org>
AuthorDate: Sun Mar 5 19:11:56 2017 +
Commit: Matthias Schwarzott gentoo org>
CommitDate: Sun Mar 5 19:11:56 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8494eb21
media-plugins/vdr-markad: Remove required ffmpeg flag x264, as only decoding is
needed. Add ~arm keyword.
Package-Manager: Portage-2.3.4, Repoman-2.3.2
.../vdr-markad/vdr-markad-0.1.4-r2.ebuild | 66 ++
1 file changed, 66 insertions(+)
diff --git a/media-plugins/vdr-markad/vdr-markad-0.1.4-r2.ebuild
b/media-plugins/vdr-markad/vdr-markad-0.1.4-r2.ebuild
new file mode 100644
index 000..863359cf467
--- /dev/null
+++ b/media-plugins/vdr-markad/vdr-markad-0.1.4-r2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vdr-plugin-2
+
+VERSION="1041" # every bump, new version
+
+DESCRIPTION="VDR Plugin: marks advertisements in VDR recordings"
+HOMEPAGE="http://projects.vdr-developer.org/projects/plg-markad/;
+SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz"
+
+KEYWORDS="~amd64 ~arm ~x86"
+SLOT="0"
+LICENSE="GPL-2"
+IUSE=""
+
+DEPEND=">=media-video/vdr-1.6
+ virtual/ffmpeg[mp3]
+ !media-video/noad"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${VDRPLUGIN}-${PV}/plugin"
+S2="${WORKDIR}/${VDRPLUGIN}-${PV}/command"
+
+# vdr-plugin-2.eclass changes
+PO_SUBDIR="../command"
+
+src_prepare() {
+ vdr-plugin-2_src_prepare
+
+ cd "${S2}"
+ epatch "${FILESDIR}/${PN}-0.1.4-libav9.patch"
+ sed -i Makefile \
+ -e "s:\$(CXXFLAGS) \$(OBJS):\$(CXXFLAGS) \$(LDFLAGS) \$(OBJS):"
\
+ -e "s:\@\$(STRIP) \$(DESTDIR)/usr/bin/markad::"
+
+ if has_version ">=media-video/vdr-1.7.15"; then
+ sed -e "s:2001:6419:" -i markad-standalone.cpp
+ fi
+
+ epatch "${FILESDIR}/${P}_ffmpeg-2.patch"
+
+ # compile fix, tested libav11, ffmpeg-2.5.2
+ sed -e "s:CODEC_ID_:AV_CODEC_ID_:"\
+ -e "s:avcodec_alloc_frame:av_frame_alloc:"\
+ -i "${S2}"/decoder.cpp
+}
+
+src_compile() {
+ vdr-plugin-2_src_compile
+
+ cd "${S2}"
+ emake markad || die "Compiling command-line markad binary failed"
+}
+
+src_install() {
+ vdr-plugin-2_src_install
+
+ cd "${S2}"
+ emake install DESTDIR="${D}" || die "emake install failed"
+
+ cd "${WORKDIR}/${VDRPLUGIN}-${PV}"
+ dodoc README HISTORY
+}
