commit: 5c98e186e6159b6e52182c32da38b3d48c2480bb
Author: Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 31 11:54:03 2018 +0000
Commit: Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
CommitDate: Fri Aug 31 11:54:03 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c98e186
media-plugins/vdr-image: eapi 7; cleanup old
Package-Manager: Portage-2.3.48, Repoman-2.3.10
media-plugins/vdr-image/Manifest | 1 -
.../vdr-image/files/vdr-image-0.3.1-ffmpeg-1.patch | 40 -------------
.../vdr-image/files/vdr-image-0.3.1-gentoo.diff | 24 --------
media-plugins/vdr-image/vdr-image-0.3.1.ebuild | 65 ----------------------
media-plugins/vdr-image/vdr-image-0.4.0.ebuild | 4 +-
5 files changed, 2 insertions(+), 132 deletions(-)
diff --git a/media-plugins/vdr-image/Manifest b/media-plugins/vdr-image/Manifest
index a14ed2ed92b..34cc540317c 100644
--- a/media-plugins/vdr-image/Manifest
+++ b/media-plugins/vdr-image/Manifest
@@ -1,2 +1 @@
-DIST vdr-image-0.3.1.tar.gz 124587 BLAKE2B
d086844b7b596b55d2609e0e41b01b41c5f4f20beb1b505dfb29e2a9d38aa9357375ea2ceb950557df2ab0449aefc4b55278c705c15d26bc7226a6e781ce958c
SHA512
a5a3b9d29958abc486d5fce4a6423d574894a604f792fe6e73b49daf3c02fe2df1ec7d7538db2a950482a77c7d47ebd8dd498ae55f265a0a7ef013b607dd0efb
DIST vdr-image-0.4.0.tgz 129200 BLAKE2B
efcbb1bd724a2dcd0b787a4d768fb1148b91f05112aaf773704fb2d7eab9f64d67dcf4538bfa169176f3f7d18d15fc7decffd96626290e841a827a0f592e9094
SHA512
d66bb7ff48ed622ec21a7d828985229b6aaf908123c12b870e531f09dfe85e792afafa096cd5c4580296139275e2f7171d30f21fe1f8d88978e19c1eb36ab169
diff --git a/media-plugins/vdr-image/files/vdr-image-0.3.1-ffmpeg-1.patch
b/media-plugins/vdr-image/files/vdr-image-0.3.1-ffmpeg-1.patch
deleted file mode 100644
index 78fd1d38443..00000000000
--- a/media-plugins/vdr-image/files/vdr-image-0.3.1-ffmpeg-1.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -urN image-0.3.1.old/liboutput/encode.c image-0.3.1/liboutput/encode.c
---- image-0.3.1.old/liboutput/encode.c 2013-06-17 21:23:23.308430203 +0200
-+++ image-0.3.1/liboutput/encode.c 2013-06-17 21:27:37.126421173 +0200
-@@ -49,7 +49,6 @@
-
- bool cEncode::Register()
- {
-- avcodec_init();
- #if 0
- // XXX to resolv: dosen't work with osdpip
- register_avcodec(&mpeg2video_encoder);
-@@ -100,7 +99,7 @@
- AVCodecContext *pAVCC = NULL;
- AVFrame *pAVF = NULL;
-
-- pAVCC = avcodec_alloc_context();
-+ pAVCC = avcodec_alloc_context3(NULL);
- if (! pAVCC)
- {
- esyslog("imageplugin: Failed to alloc memory for AVCodecContext.");
-@@ -116,7 +115,7 @@
- {
- SetupEncodingParameters(pAVCC);
-
-- if (avcodec_open(pAVCC, m_pavCodec) < 0)
-+ if (avcodec_open2(pAVCC, m_pavCodec, NULL) < 0)
- {
- esyslog("imageplugin: Couldn't open Codec.");
- }
-diff -urN image-0.3.1.old/liboutput/encode.h image-0.3.1/liboutput/encode.h
---- image-0.3.1.old/liboutput/encode.h 2013-06-17 21:23:23.308430203 +0200
-+++ image-0.3.1/liboutput/encode.h 2013-06-17 21:27:37.127421173 +0200
-@@ -14,6 +14,7 @@
-
- extern "C" {
- #include <libavcodec/avcodec.h>
-+#include <libavutil/mem.h>
- }
-
- #include "../setup-image.h"
diff --git a/media-plugins/vdr-image/files/vdr-image-0.3.1-gentoo.diff
b/media-plugins/vdr-image/files/vdr-image-0.3.1-gentoo.diff
deleted file mode 100644
index 11479f2fc8a..00000000000
--- a/media-plugins/vdr-image/files/vdr-image-0.3.1-gentoo.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur image-0.2.7.26.orig/examples/imagecmds.conf
image-0.2.7.26/examples/imagecmds.conf
---- image-0.2.7.26.orig/examples/imagecmds.conf 2008-10-25
23:48:18.000000000 +0200
-+++ image-0.2.7.26/examples/imagecmds.conf 2008-10-25 23:50:53.000000000
+0200
-@@ -20,3 +20,5 @@
- Rotate JPEG picture lossless by 90 degrees to the right : jpegtran -rotate
90 %s > $CONVERT_TEMPDIR/tmp.jpg && mv $CONVERT_TEMPDIR/tmp.jpg %s
- Rotate JPEG picture lossless by 90 degrees to the left : jpegtran -rotate
270 %s > $CONVERT_TEMPDIR/tmp.jpg && mv $CONVERT_TEMPDIR/tmp.jpg %s
- Delete picture ?: rm -f %s
-+Change burn template
: echo ln -fs '%s' '/usr/share/vdr/burn/menu-bg.png' | /bin/bash
-+Change burn template ( Button )
: echo ln -fs '%s' '/usr/share/vdr/burn/menu-button.png' | /bin/bash
-\ Kein Zeilenumbruch am Dateiende.
-diff -Naur image-0.2.7.26.orig/examples/imagecmds.conf.DE
image-0.2.7.26/examples/imagecmds.conf.DE
---- image-0.2.7.26.orig/examples/imagecmds.conf.DE 2008-10-25
23:48:18.000000000 +0200
-+++ image-0.2.7.26/examples/imagecmds.conf.DE 2008-10-25 23:55:49.000000000
+0200
-@@ -11,6 +11,8 @@
- Informationen �ber das Bild : identify -verbose
- Gr��e des Bildes : du -chs %s
- Exif Informationen des JPEG-Bildes ausgeben : jpegtopnm
-dumpexif %s >/dev/null 2> $CONVERT_TEMPDIR/exif.tmp && cat
$CONVERT_TEMPDIR/exif.tmp && rm -f $CONVERT_TEMPDIR/exif.tmp
--Rotatiere JPEG Bildes verlustlos um 90� nach Rechts : jpegtran -rotate
90 %s > $CONVERT_TEMPDIR/tmp.jpg && mv $CONVERT_TEMPDIR/tmp.jpg %s
--Rotatiere JPEG Bildes verlustlos um 90� nach Links : jpegtran -rotate
270 %s > $CONVERT_TEMPDIR/tmp.jpg && mv $CONVERT_TEMPDIR/tmp.jpg %s
-+Rotiere JPEG Bildes verlustlos um 90° nach Rechts : jpegtran -rotate 90
%s > $CONVERT_TEMPDIR/tmp.jpg && mv $CONVERT_TEMPDIR/tmp.jpg %s
-+Rotiere JPEG Bildes verlustlos um 90° nach Links : jpegtran -rotate 270
%s > $CONVERT_TEMPDIR/tmp.jpg && mv $CONVERT_TEMPDIR/tmp.jpg %s
- L�sche Bild ?: rm -f %s
-+Hintergrund vdr-burn ändern
: echo ln -fs '%s' '/usr/share/vdr/burn/menu-bg.png' | /bin/bash
-+Button vdr-burn ändern
: echo ln -fs '%s' '/usr/share/vdr/burn/menu-button.png' | /bin/bash
diff --git a/media-plugins/vdr-image/vdr-image-0.3.1.ebuild
b/media-plugins/vdr-image/vdr-image-0.3.1.ebuild
deleted file mode 100644
index 8343d9a7fa9..00000000000
--- a/media-plugins/vdr-image/vdr-image-0.3.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit vdr-plugin-2 flag-o-matic
-
-VERSION="679" #every bump, new version
-
-DESCRIPTION="VDR plugin: display of digital images, like jpeg, tiff, png, bmp"
-HOMEPAGE="https://projects.vdr-developer.org/projects/plg-image";
-SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tar.gz"
-
-KEYWORDS="amd64 x86"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="exif"
-
-COMMON_DEPEND=">=media-video/vdr-1.5.8
- >=virtual/ffmpeg-0.10
- >=media-libs/netpbm-10.0
- exif? ( media-libs/libexif )"
-
-DEPEND="${COMMON_DEPEND}
- virtual/pkgconfig"
-
-RDEPEND="${COMMON_DEPEND}
- >=media-tv/gentoo-vdr-scripts-0.2.2"
-
-VDR_RCADDON_FILE="${FILESDIR}/rc-addon-0.3.0.sh"
-BUILD_PARAMS="-j1"
-
-src_prepare() {
- # remove empty translation file
- rm "${S}"/po/{cs_CZ,da_DK,et_EE,hr_HR,hu_HU,nn_NO,pl_PL,ro_RO}.po
-
- vdr-plugin-2_src_prepare
-
- epatch "${FILESDIR}/${P}-gentoo.diff" \
- "${FILESDIR}/${P}-ffmpeg-1.patch"
-
- use !exif && sed -i "s:#WITHOUT_LIBEXIF:WITHOUT_LIBEXIF:" Makefile
-
- if has_version "<=virtual/ffmpeg-0.4.9_p20061016"; then
- BUILD_PARAMS="${BUILD_PARAMS} WITHOUT_SWSCALER=1"
- fi
-
- # UINT64_C is needed by ffmpeg headers
- append-cppflags -D__STDC_CONSTANT_MACROS
-}
-
-src_install() {
- vdr-plugin-2_src_install
-
- insinto /etc/vdr/imagecmds
- newins examples/imagecmds.conf imagecmds.example.conf
- newins examples/imagecmds.conf.DE imagecmds.example.conf.de
-
- insinto /etc/vdr/plugins/image
- doins examples/imagesources.conf
-
- into /usr/share/vdr/image
- dobin scripts/imageplugin.sh
- newbin scripts/mount.sh mount-image.sh
-}
diff --git a/media-plugins/vdr-image/vdr-image-0.4.0.ebuild
b/media-plugins/vdr-image/vdr-image-0.4.0.ebuild
index d00933099ff..15aba0b5a4c 100644
--- a/media-plugins/vdr-image/vdr-image-0.4.0.ebuild
+++ b/media-plugins/vdr-image/vdr-image-0.4.0.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
inherit vdr-plugin-2
@@ -39,7 +39,7 @@ src_prepare() {
# dangerous warning
sed -e "s:mktemp:mkstemp:" -i data-image.c
- epatch "${FILESDIR}/${P}-gentoo.diff" \
+ eapply "${FILESDIR}/${P}-gentoo.diff" \
"${FILESDIR}/${P}-ffmpeg3.patch"
# ffmpeg-2.2.12, libav10
