| 1 |
commit: 78db5bfad049c51bcbe61dcff319c6ffb6a6546e |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Dec 11 13:12:55 2018 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Dec 11 13:15:54 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78db5bfa |
| 7 |
|
| 8 |
media-plugins/vdr-image: Remove last-rited pkg |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/666166 |
| 11 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 12 |
|
| 13 |
media-plugins/vdr-image/Manifest | 1 - |
| 14 |
media-plugins/vdr-image/files/rc-addon-0.3.0.sh | 21 ------- |
| 15 |
.../vdr-image/files/vdr-image-0.4.0-ffmpeg3.patch | 40 -------------- |
| 16 |
.../vdr-image/files/vdr-image-0.4.0-gentoo.diff | 24 -------- |
| 17 |
media-plugins/vdr-image/metadata.xml | 14 ----- |
| 18 |
media-plugins/vdr-image/vdr-image-0.4.0.ebuild | 64 ---------------------- |
| 19 |
profiles/package.mask | 5 -- |
| 20 |
7 files changed, 169 deletions(-) |
| 21 |
|
| 22 |
diff --git a/media-plugins/vdr-image/Manifest b/media-plugins/vdr-image/Manifest |
| 23 |
deleted file mode 100644 |
| 24 |
index 34cc540317c..00000000000 |
| 25 |
--- a/media-plugins/vdr-image/Manifest |
| 26 |
+++ /dev/null |
| 27 |
@@ -1 +0,0 @@ |
| 28 |
-DIST vdr-image-0.4.0.tgz 129200 BLAKE2B efcbb1bd724a2dcd0b787a4d768fb1148b91f05112aaf773704fb2d7eab9f64d67dcf4538bfa169176f3f7d18d15fc7decffd96626290e841a827a0f592e9094 SHA512 d66bb7ff48ed622ec21a7d828985229b6aaf908123c12b870e531f09dfe85e792afafa096cd5c4580296139275e2f7171d30f21fe1f8d88978e19c1eb36ab169 |
| 29 |
|
| 30 |
diff --git a/media-plugins/vdr-image/files/rc-addon-0.3.0.sh b/media-plugins/vdr-image/files/rc-addon-0.3.0.sh |
| 31 |
deleted file mode 100644 |
| 32 |
index 800351fbe87..00000000000 |
| 33 |
--- a/media-plugins/vdr-image/files/rc-addon-0.3.0.sh |
| 34 |
+++ /dev/null |
| 35 |
@@ -1,21 +0,0 @@ |
| 36 |
-# |
| 37 |
-# rc-addon plugin-startup-skript for vdr-image |
| 38 |
-# |
| 39 |
- |
| 40 |
-: ${IMAGE_MOUNT:=/usr/share/vdr/image/bin/mount-image.sh} |
| 41 |
-: ${IMAGE_CONVERT:=/usr/share/vdr/image/bin/imageplugin.sh} |
| 42 |
- |
| 43 |
-plugin_pre_vdr_start() { |
| 44 |
- add_plugin_param "-m ${IMAGE_MOUNT}" |
| 45 |
- add_plugin_param "-C ${IMAGE_CONVERT}" |
| 46 |
- add_plugin_param "-c image" |
| 47 |
- |
| 48 |
- if [ -f /usr/lib/vdr/inc/commands-functions.sh ]; then |
| 49 |
- . /usr/lib/vdr/inc/commands-functions.sh |
| 50 |
- else |
| 51 |
- #source /usr/share/vdr/inc/functions.sh |
| 52 |
- include commands-functions |
| 53 |
- fi |
| 54 |
- |
| 55 |
- merge_commands_conf /etc/vdr/imagecmds /etc/vdr/plugins/image/imagecmds.conf "${ORDER_IMAGECMDS}" |
| 56 |
-} |
| 57 |
|
| 58 |
diff --git a/media-plugins/vdr-image/files/vdr-image-0.4.0-ffmpeg3.patch b/media-plugins/vdr-image/files/vdr-image-0.4.0-ffmpeg3.patch |
| 59 |
deleted file mode 100644 |
| 60 |
index de0ca025e16..00000000000 |
| 61 |
--- a/media-plugins/vdr-image/files/vdr-image-0.4.0-ffmpeg3.patch |
| 62 |
+++ /dev/null |
| 63 |
@@ -1,40 +0,0 @@ |
| 64 |
-Index: image-0.4.0/liboutput/encode.c |
| 65 |
-=================================================================== |
| 66 |
---- image-0.4.0.orig/liboutput/encode.c |
| 67 |
-+++ image-0.4.0/liboutput/encode.c |
| 68 |
-@@ -150,7 +150,7 @@ void cEncode::SetupEncodingParameters(AV |
| 69 |
- } |
| 70 |
- context->max_b_frames=1; |
| 71 |
- context->flags |= CODEC_FLAG_QSCALE; |
| 72 |
-- context->pix_fmt = PIX_FMT_YUV420P; |
| 73 |
-+ context->pix_fmt = AV_PIX_FMT_YUV420P; |
| 74 |
- } |
| 75 |
- |
| 76 |
- bool cEncode::ConvertImageToFrame(AVFrame *frame) |
| 77 |
-@@ -173,7 +173,7 @@ bool cEncode::ConvertImageToFrame(AVFram |
| 78 |
- // Convert RGB to YUV |
| 79 |
- if(!avpicture_fill((AVPicture*)m_pImageFilled, |
| 80 |
- m_pImageRGB, |
| 81 |
-- PIX_FMT_RGB24, m_nWidth, m_nHeight)) |
| 82 |
-+ AV_PIX_FMT_RGB24, m_nWidth, m_nHeight)) |
| 83 |
- { |
| 84 |
- esyslog("imageplugin: failed avpicture_fill"); |
| 85 |
- return false; |
| 86 |
-@@ -182,13 +182,13 @@ bool cEncode::ConvertImageToFrame(AVFram |
| 87 |
- { |
| 88 |
- int result; |
| 89 |
- #ifndef HAVE_SWSCALER |
| 90 |
-- result=img_convert((AVPicture*)frame->data, PIX_FMT_YUV420P, |
| 91 |
-- (AVPicture*)m_pImageFilled, PIX_FMT_RGB24, |
| 92 |
-+ result=img_convert((AVPicture*)frame->data, AV_PIX_FMT_YUV420P, |
| 93 |
-+ (AVPicture*)m_pImageFilled, AV_PIX_FMT_RGB24, |
| 94 |
- m_nWidth, m_nHeight); |
| 95 |
- #else |
| 96 |
- SwsContext* convert_ctx = sws_getContext(m_nWidth, m_nHeight, |
| 97 |
-- PIX_FMT_RGB24, m_nWidth, m_nHeight, |
| 98 |
-- PIX_FMT_YUV420P, SWS_BICUBIC, NULL, NULL, NULL); |
| 99 |
-+ AV_PIX_FMT_RGB24, m_nWidth, m_nHeight, |
| 100 |
-+ AV_PIX_FMT_YUV420P, SWS_BICUBIC, NULL, NULL, NULL); |
| 101 |
- |
| 102 |
- if(!convert_ctx) { |
| 103 |
- esyslog("imageplugin: failed to initialize swscaler context"); |
| 104 |
|
| 105 |
diff --git a/media-plugins/vdr-image/files/vdr-image-0.4.0-gentoo.diff b/media-plugins/vdr-image/files/vdr-image-0.4.0-gentoo.diff |
| 106 |
deleted file mode 100644 |
| 107 |
index 11479f2fc8a..00000000000 |
| 108 |
--- a/media-plugins/vdr-image/files/vdr-image-0.4.0-gentoo.diff |
| 109 |
+++ /dev/null |
| 110 |
@@ -1,24 +0,0 @@ |
| 111 |
-diff -Naur image-0.2.7.26.orig/examples/imagecmds.conf image-0.2.7.26/examples/imagecmds.conf |
| 112 |
---- image-0.2.7.26.orig/examples/imagecmds.conf 2008-10-25 23:48:18.000000000 +0200 |
| 113 |
-+++ image-0.2.7.26/examples/imagecmds.conf 2008-10-25 23:50:53.000000000 +0200 |
| 114 |
-@@ -20,3 +20,5 @@ |
| 115 |
- Rotate JPEG picture lossless by 90 degrees to the right : jpegtran -rotate 90 %s > $CONVERT_TEMPDIR/tmp.jpg && mv $CONVERT_TEMPDIR/tmp.jpg %s |
| 116 |
- Rotate JPEG picture lossless by 90 degrees to the left : jpegtran -rotate 270 %s > $CONVERT_TEMPDIR/tmp.jpg && mv $CONVERT_TEMPDIR/tmp.jpg %s |
| 117 |
- Delete picture ?: rm -f %s |
| 118 |
-+Change burn template : echo ln -fs '%s' '/usr/share/vdr/burn/menu-bg.png' | /bin/bash |
| 119 |
-+Change burn template ( Button ) : echo ln -fs '%s' '/usr/share/vdr/burn/menu-button.png' | /bin/bash |
| 120 |
-\ Kein Zeilenumbruch am Dateiende. |
| 121 |
-diff -Naur image-0.2.7.26.orig/examples/imagecmds.conf.DE image-0.2.7.26/examples/imagecmds.conf.DE |
| 122 |
---- image-0.2.7.26.orig/examples/imagecmds.conf.DE 2008-10-25 23:48:18.000000000 +0200 |
| 123 |
-+++ image-0.2.7.26/examples/imagecmds.conf.DE 2008-10-25 23:55:49.000000000 +0200 |
| 124 |
-@@ -11,6 +11,8 @@ |
| 125 |
- Informationen über das Bild : identify -verbose |
| 126 |
- Größe des Bildes : du -chs %s |
| 127 |
- 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 |
| 128 |
--Rotatiere JPEG Bildes verlustlos um 90° nach Rechts : jpegtran -rotate 90 %s > $CONVERT_TEMPDIR/tmp.jpg && mv $CONVERT_TEMPDIR/tmp.jpg %s |
| 129 |
--Rotatiere JPEG Bildes verlustlos um 90° nach Links : jpegtran -rotate 270 %s > $CONVERT_TEMPDIR/tmp.jpg && mv $CONVERT_TEMPDIR/tmp.jpg %s |
| 130 |
-+Rotiere JPEG Bildes verlustlos um 90° nach Rechts : jpegtran -rotate 90 %s > $CONVERT_TEMPDIR/tmp.jpg && mv $CONVERT_TEMPDIR/tmp.jpg %s |
| 131 |
-+Rotiere JPEG Bildes verlustlos um 90° nach Links : jpegtran -rotate 270 %s > $CONVERT_TEMPDIR/tmp.jpg && mv $CONVERT_TEMPDIR/tmp.jpg %s |
| 132 |
- Lösche Bild ?: rm -f %s |
| 133 |
-+Hintergrund vdr-burn ändern : echo ln -fs '%s' '/usr/share/vdr/burn/menu-bg.png' | /bin/bash |
| 134 |
-+Button vdr-burn ändern : echo ln -fs '%s' '/usr/share/vdr/burn/menu-button.png' | /bin/bash |
| 135 |
|
| 136 |
diff --git a/media-plugins/vdr-image/metadata.xml b/media-plugins/vdr-image/metadata.xml |
| 137 |
deleted file mode 100644 |
| 138 |
index 8860e595d26..00000000000 |
| 139 |
--- a/media-plugins/vdr-image/metadata.xml |
| 140 |
+++ /dev/null |
| 141 |
@@ -1,14 +0,0 @@ |
| 142 |
-<?xml version="1.0" encoding="UTF-8"?> |
| 143 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 144 |
-<pkgmetadata> |
| 145 |
- <maintainer type="project"> |
| 146 |
- <email>vdr@g.o</email> |
| 147 |
- <name>Gentoo VDR Project</name> |
| 148 |
- <description> |
| 149 |
- Please contact maintainer before you change something. |
| 150 |
- </description> |
| 151 |
- </maintainer> |
| 152 |
- <longdescription> |
| 153 |
- VDR Plugin to show pictures on TV |
| 154 |
- </longdescription> |
| 155 |
-</pkgmetadata> |
| 156 |
|
| 157 |
diff --git a/media-plugins/vdr-image/vdr-image-0.4.0.ebuild b/media-plugins/vdr-image/vdr-image-0.4.0.ebuild |
| 158 |
deleted file mode 100644 |
| 159 |
index 15aba0b5a4c..00000000000 |
| 160 |
--- a/media-plugins/vdr-image/vdr-image-0.4.0.ebuild |
| 161 |
+++ /dev/null |
| 162 |
@@ -1,64 +0,0 @@ |
| 163 |
-# Copyright 1999-2018 Gentoo Foundation |
| 164 |
-# Distributed under the terms of the GNU General Public License v2 |
| 165 |
- |
| 166 |
-EAPI=7 |
| 167 |
- |
| 168 |
-inherit vdr-plugin-2 |
| 169 |
- |
| 170 |
-VERSION="1325" #every bump, new version |
| 171 |
- |
| 172 |
-DESCRIPTION="VDR plugin: display of digital images, like jpeg, tiff, png, bmp" |
| 173 |
-HOMEPAGE="https://projects.vdr-developer.org/projects/plg-image" |
| 174 |
-SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz" |
| 175 |
- |
| 176 |
-KEYWORDS="amd64 x86" |
| 177 |
-SLOT="0" |
| 178 |
-LICENSE="GPL-2" |
| 179 |
-IUSE="exif" |
| 180 |
- |
| 181 |
-COMMON_DEPEND=">=media-video/vdr-2 |
| 182 |
- >=virtual/ffmpeg-9 |
| 183 |
- >=media-libs/netpbm-10.0 |
| 184 |
- exif? ( media-libs/libexif )" |
| 185 |
- |
| 186 |
-DEPEND="${COMMON_DEPEND} |
| 187 |
- virtual/pkgconfig" |
| 188 |
- |
| 189 |
-RDEPEND="${COMMON_DEPEND} |
| 190 |
- media-tv/gentoo-vdr-scripts" |
| 191 |
- |
| 192 |
-VDR_RCADDON_FILE="${FILESDIR}/rc-addon-0.3.0.sh" |
| 193 |
- |
| 194 |
-src_prepare() { |
| 195 |
- vdr-plugin-2_src_prepare |
| 196 |
- |
| 197 |
- #wrong include |
| 198 |
- sed -e 's:<liboutput/stillimage-player.h>:"liboutput/stillimage-player.h":'\ |
| 199 |
- -i player-image.h |
| 200 |
- |
| 201 |
- # dangerous warning |
| 202 |
- sed -e "s:mktemp:mkstemp:" -i data-image.c |
| 203 |
- |
| 204 |
- eapply "${FILESDIR}/${P}-gentoo.diff" \ |
| 205 |
- "${FILESDIR}/${P}-ffmpeg3.patch" |
| 206 |
- |
| 207 |
- # ffmpeg-2.2.12, libav10 |
| 208 |
- sed -e "s:avcodec_alloc_frame:av_frame_alloc:" \ |
| 209 |
- -e "s:CODEC_ID_MPEG2VIDEO:AV_CODEC_ID_MPEG2VIDEO:" \ |
| 210 |
- -i liboutput/encode.c |
| 211 |
-} |
| 212 |
- |
| 213 |
-src_install() { |
| 214 |
- vdr-plugin-2_src_install |
| 215 |
- |
| 216 |
- insinto /etc/vdr/imagecmds |
| 217 |
- newins examples/imagecmds.conf imagecmds.example.conf |
| 218 |
- newins examples/imagecmds.conf.DE imagecmds.example.conf.de |
| 219 |
- |
| 220 |
- insinto /etc/vdr/plugins/image |
| 221 |
- doins examples/imagesources.conf |
| 222 |
- |
| 223 |
- into /usr/share/vdr/image |
| 224 |
- dobin scripts/imageplugin.sh |
| 225 |
- newbin scripts/mount.sh mount-image.sh |
| 226 |
-} |
| 227 |
|
| 228 |
diff --git a/profiles/package.mask b/profiles/package.mask |
| 229 |
index 10aa3a45d75..c89ce39d54c 100644 |
| 230 |
--- a/profiles/package.mask |
| 231 |
+++ b/profiles/package.mask |
| 232 |
@@ -271,11 +271,6 @@ media-plugins/mythplugins |
| 233 |
# No reverse deps, obsoleted in 2016 (#666130). Removal in a month. |
| 234 |
dev-python/jenkins-webapi |
| 235 |
|
| 236 |
-# Pacho Ramos <pacho@g.o> (11 Nov 2018) |
| 237 |
-# Build issues (#666166), upstream dead for years (#619624). Removal in a |
| 238 |
-# month. |
| 239 |
-media-plugins/vdr-image |
| 240 |
- |
| 241 |
# Mike Gilbert <floppym@g.o> (10 Nov 2018) |
| 242 |
# Open bugs and no Gentoo maintainer. |
| 243 |
# Removal in 30 days. |
Archives