| 1 |
commit: 5c98e186e6159b6e52182c32da38b3d48c2480bb |
| 2 |
Author: Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Aug 31 11:54:03 2018 +0000 |
| 4 |
Commit: Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Aug 31 11:54:03 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c98e186 |
| 7 |
|
| 8 |
media-plugins/vdr-image: eapi 7; cleanup old |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.48, Repoman-2.3.10 |
| 11 |
|
| 12 |
media-plugins/vdr-image/Manifest | 1 - |
| 13 |
.../vdr-image/files/vdr-image-0.3.1-ffmpeg-1.patch | 40 ------------- |
| 14 |
.../vdr-image/files/vdr-image-0.3.1-gentoo.diff | 24 -------- |
| 15 |
media-plugins/vdr-image/vdr-image-0.3.1.ebuild | 65 ---------------------- |
| 16 |
media-plugins/vdr-image/vdr-image-0.4.0.ebuild | 4 +- |
| 17 |
5 files changed, 2 insertions(+), 132 deletions(-) |
| 18 |
|
| 19 |
diff --git a/media-plugins/vdr-image/Manifest b/media-plugins/vdr-image/Manifest |
| 20 |
index a14ed2ed92b..34cc540317c 100644 |
| 21 |
--- a/media-plugins/vdr-image/Manifest |
| 22 |
+++ b/media-plugins/vdr-image/Manifest |
| 23 |
@@ -1,2 +1 @@ |
| 24 |
-DIST vdr-image-0.3.1.tar.gz 124587 BLAKE2B d086844b7b596b55d2609e0e41b01b41c5f4f20beb1b505dfb29e2a9d38aa9357375ea2ceb950557df2ab0449aefc4b55278c705c15d26bc7226a6e781ce958c SHA512 a5a3b9d29958abc486d5fce4a6423d574894a604f792fe6e73b49daf3c02fe2df1ec7d7538db2a950482a77c7d47ebd8dd498ae55f265a0a7ef013b607dd0efb |
| 25 |
DIST vdr-image-0.4.0.tgz 129200 BLAKE2B efcbb1bd724a2dcd0b787a4d768fb1148b91f05112aaf773704fb2d7eab9f64d67dcf4538bfa169176f3f7d18d15fc7decffd96626290e841a827a0f592e9094 SHA512 d66bb7ff48ed622ec21a7d828985229b6aaf908123c12b870e531f09dfe85e792afafa096cd5c4580296139275e2f7171d30f21fe1f8d88978e19c1eb36ab169 |
| 26 |
|
| 27 |
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 |
| 28 |
deleted file mode 100644 |
| 29 |
index 78fd1d38443..00000000000 |
| 30 |
--- a/media-plugins/vdr-image/files/vdr-image-0.3.1-ffmpeg-1.patch |
| 31 |
+++ /dev/null |
| 32 |
@@ -1,40 +0,0 @@ |
| 33 |
-diff -urN image-0.3.1.old/liboutput/encode.c image-0.3.1/liboutput/encode.c |
| 34 |
---- image-0.3.1.old/liboutput/encode.c 2013-06-17 21:23:23.308430203 +0200 |
| 35 |
-+++ image-0.3.1/liboutput/encode.c 2013-06-17 21:27:37.126421173 +0200 |
| 36 |
-@@ -49,7 +49,6 @@ |
| 37 |
- |
| 38 |
- bool cEncode::Register() |
| 39 |
- { |
| 40 |
-- avcodec_init(); |
| 41 |
- #if 0 |
| 42 |
- // XXX to resolv: dosen't work with osdpip |
| 43 |
- register_avcodec(&mpeg2video_encoder); |
| 44 |
-@@ -100,7 +99,7 @@ |
| 45 |
- AVCodecContext *pAVCC = NULL; |
| 46 |
- AVFrame *pAVF = NULL; |
| 47 |
- |
| 48 |
-- pAVCC = avcodec_alloc_context(); |
| 49 |
-+ pAVCC = avcodec_alloc_context3(NULL); |
| 50 |
- if (! pAVCC) |
| 51 |
- { |
| 52 |
- esyslog("imageplugin: Failed to alloc memory for AVCodecContext."); |
| 53 |
-@@ -116,7 +115,7 @@ |
| 54 |
- { |
| 55 |
- SetupEncodingParameters(pAVCC); |
| 56 |
- |
| 57 |
-- if (avcodec_open(pAVCC, m_pavCodec) < 0) |
| 58 |
-+ if (avcodec_open2(pAVCC, m_pavCodec, NULL) < 0) |
| 59 |
- { |
| 60 |
- esyslog("imageplugin: Couldn't open Codec."); |
| 61 |
- } |
| 62 |
-diff -urN image-0.3.1.old/liboutput/encode.h image-0.3.1/liboutput/encode.h |
| 63 |
---- image-0.3.1.old/liboutput/encode.h 2013-06-17 21:23:23.308430203 +0200 |
| 64 |
-+++ image-0.3.1/liboutput/encode.h 2013-06-17 21:27:37.127421173 +0200 |
| 65 |
-@@ -14,6 +14,7 @@ |
| 66 |
- |
| 67 |
- extern "C" { |
| 68 |
- #include <libavcodec/avcodec.h> |
| 69 |
-+#include <libavutil/mem.h> |
| 70 |
- } |
| 71 |
- |
| 72 |
- #include "../setup-image.h" |
| 73 |
|
| 74 |
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 |
| 75 |
deleted file mode 100644 |
| 76 |
index 11479f2fc8a..00000000000 |
| 77 |
--- a/media-plugins/vdr-image/files/vdr-image-0.3.1-gentoo.diff |
| 78 |
+++ /dev/null |
| 79 |
@@ -1,24 +0,0 @@ |
| 80 |
-diff -Naur image-0.2.7.26.orig/examples/imagecmds.conf image-0.2.7.26/examples/imagecmds.conf |
| 81 |
---- image-0.2.7.26.orig/examples/imagecmds.conf 2008-10-25 23:48:18.000000000 +0200 |
| 82 |
-+++ image-0.2.7.26/examples/imagecmds.conf 2008-10-25 23:50:53.000000000 +0200 |
| 83 |
-@@ -20,3 +20,5 @@ |
| 84 |
- Rotate JPEG picture lossless by 90 degrees to the right : jpegtran -rotate 90 %s > $CONVERT_TEMPDIR/tmp.jpg && mv $CONVERT_TEMPDIR/tmp.jpg %s |
| 85 |
- Rotate JPEG picture lossless by 90 degrees to the left : jpegtran -rotate 270 %s > $CONVERT_TEMPDIR/tmp.jpg && mv $CONVERT_TEMPDIR/tmp.jpg %s |
| 86 |
- Delete picture ?: rm -f %s |
| 87 |
-+Change burn template : echo ln -fs '%s' '/usr/share/vdr/burn/menu-bg.png' | /bin/bash |
| 88 |
-+Change burn template ( Button ) : echo ln -fs '%s' '/usr/share/vdr/burn/menu-button.png' | /bin/bash |
| 89 |
-\ Kein Zeilenumbruch am Dateiende. |
| 90 |
-diff -Naur image-0.2.7.26.orig/examples/imagecmds.conf.DE image-0.2.7.26/examples/imagecmds.conf.DE |
| 91 |
---- image-0.2.7.26.orig/examples/imagecmds.conf.DE 2008-10-25 23:48:18.000000000 +0200 |
| 92 |
-+++ image-0.2.7.26/examples/imagecmds.conf.DE 2008-10-25 23:55:49.000000000 +0200 |
| 93 |
-@@ -11,6 +11,8 @@ |
| 94 |
- Informationen über das Bild : identify -verbose |
| 95 |
- Größe des Bildes : du -chs %s |
| 96 |
- 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 |
| 97 |
--Rotatiere JPEG Bildes verlustlos um 90° nach Rechts : jpegtran -rotate 90 %s > $CONVERT_TEMPDIR/tmp.jpg && mv $CONVERT_TEMPDIR/tmp.jpg %s |
| 98 |
--Rotatiere JPEG Bildes verlustlos um 90° nach Links : jpegtran -rotate 270 %s > $CONVERT_TEMPDIR/tmp.jpg && mv $CONVERT_TEMPDIR/tmp.jpg %s |
| 99 |
-+Rotiere JPEG Bildes verlustlos um 90° nach Rechts : jpegtran -rotate 90 %s > $CONVERT_TEMPDIR/tmp.jpg && mv $CONVERT_TEMPDIR/tmp.jpg %s |
| 100 |
-+Rotiere JPEG Bildes verlustlos um 90° nach Links : jpegtran -rotate 270 %s > $CONVERT_TEMPDIR/tmp.jpg && mv $CONVERT_TEMPDIR/tmp.jpg %s |
| 101 |
- Lösche Bild ?: rm -f %s |
| 102 |
-+Hintergrund vdr-burn ändern : echo ln -fs '%s' '/usr/share/vdr/burn/menu-bg.png' | /bin/bash |
| 103 |
-+Button vdr-burn ändern : echo ln -fs '%s' '/usr/share/vdr/burn/menu-button.png' | /bin/bash |
| 104 |
|
| 105 |
diff --git a/media-plugins/vdr-image/vdr-image-0.3.1.ebuild b/media-plugins/vdr-image/vdr-image-0.3.1.ebuild |
| 106 |
deleted file mode 100644 |
| 107 |
index 8343d9a7fa9..00000000000 |
| 108 |
--- a/media-plugins/vdr-image/vdr-image-0.3.1.ebuild |
| 109 |
+++ /dev/null |
| 110 |
@@ -1,65 +0,0 @@ |
| 111 |
-# Copyright 1999-2018 Gentoo Foundation |
| 112 |
-# Distributed under the terms of the GNU General Public License v2 |
| 113 |
- |
| 114 |
-EAPI="5" |
| 115 |
- |
| 116 |
-inherit vdr-plugin-2 flag-o-matic |
| 117 |
- |
| 118 |
-VERSION="679" #every bump, new version |
| 119 |
- |
| 120 |
-DESCRIPTION="VDR plugin: display of digital images, like jpeg, tiff, png, bmp" |
| 121 |
-HOMEPAGE="https://projects.vdr-developer.org/projects/plg-image" |
| 122 |
-SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tar.gz" |
| 123 |
- |
| 124 |
-KEYWORDS="amd64 x86" |
| 125 |
-SLOT="0" |
| 126 |
-LICENSE="GPL-2" |
| 127 |
-IUSE="exif" |
| 128 |
- |
| 129 |
-COMMON_DEPEND=">=media-video/vdr-1.5.8 |
| 130 |
- >=virtual/ffmpeg-0.10 |
| 131 |
- >=media-libs/netpbm-10.0 |
| 132 |
- exif? ( media-libs/libexif )" |
| 133 |
- |
| 134 |
-DEPEND="${COMMON_DEPEND} |
| 135 |
- virtual/pkgconfig" |
| 136 |
- |
| 137 |
-RDEPEND="${COMMON_DEPEND} |
| 138 |
- >=media-tv/gentoo-vdr-scripts-0.2.2" |
| 139 |
- |
| 140 |
-VDR_RCADDON_FILE="${FILESDIR}/rc-addon-0.3.0.sh" |
| 141 |
-BUILD_PARAMS="-j1" |
| 142 |
- |
| 143 |
-src_prepare() { |
| 144 |
- # remove empty translation file |
| 145 |
- rm "${S}"/po/{cs_CZ,da_DK,et_EE,hr_HR,hu_HU,nn_NO,pl_PL,ro_RO}.po |
| 146 |
- |
| 147 |
- vdr-plugin-2_src_prepare |
| 148 |
- |
| 149 |
- epatch "${FILESDIR}/${P}-gentoo.diff" \ |
| 150 |
- "${FILESDIR}/${P}-ffmpeg-1.patch" |
| 151 |
- |
| 152 |
- use !exif && sed -i "s:#WITHOUT_LIBEXIF:WITHOUT_LIBEXIF:" Makefile |
| 153 |
- |
| 154 |
- if has_version "<=virtual/ffmpeg-0.4.9_p20061016"; then |
| 155 |
- BUILD_PARAMS="${BUILD_PARAMS} WITHOUT_SWSCALER=1" |
| 156 |
- fi |
| 157 |
- |
| 158 |
- # UINT64_C is needed by ffmpeg headers |
| 159 |
- append-cppflags -D__STDC_CONSTANT_MACROS |
| 160 |
-} |
| 161 |
- |
| 162 |
-src_install() { |
| 163 |
- vdr-plugin-2_src_install |
| 164 |
- |
| 165 |
- insinto /etc/vdr/imagecmds |
| 166 |
- newins examples/imagecmds.conf imagecmds.example.conf |
| 167 |
- newins examples/imagecmds.conf.DE imagecmds.example.conf.de |
| 168 |
- |
| 169 |
- insinto /etc/vdr/plugins/image |
| 170 |
- doins examples/imagesources.conf |
| 171 |
- |
| 172 |
- into /usr/share/vdr/image |
| 173 |
- dobin scripts/imageplugin.sh |
| 174 |
- newbin scripts/mount.sh mount-image.sh |
| 175 |
-} |
| 176 |
|
| 177 |
diff --git a/media-plugins/vdr-image/vdr-image-0.4.0.ebuild b/media-plugins/vdr-image/vdr-image-0.4.0.ebuild |
| 178 |
index d00933099ff..15aba0b5a4c 100644 |
| 179 |
--- a/media-plugins/vdr-image/vdr-image-0.4.0.ebuild |
| 180 |
+++ b/media-plugins/vdr-image/vdr-image-0.4.0.ebuild |
| 181 |
@@ -1,7 +1,7 @@ |
| 182 |
# Copyright 1999-2018 Gentoo Foundation |
| 183 |
# Distributed under the terms of the GNU General Public License v2 |
| 184 |
|
| 185 |
-EAPI=5 |
| 186 |
+EAPI=7 |
| 187 |
|
| 188 |
inherit vdr-plugin-2 |
| 189 |
|
| 190 |
@@ -39,7 +39,7 @@ src_prepare() { |
| 191 |
# dangerous warning |
| 192 |
sed -e "s:mktemp:mkstemp:" -i data-image.c |
| 193 |
|
| 194 |
- epatch "${FILESDIR}/${P}-gentoo.diff" \ |
| 195 |
+ eapply "${FILESDIR}/${P}-gentoo.diff" \ |
| 196 |
"${FILESDIR}/${P}-ffmpeg3.patch" |
| 197 |
|
| 198 |
# ffmpeg-2.2.12, libav10 |
Archives