public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: profiles/, media-plugins/vdr-image/files/, media-plugins/vdr-image/
@ 2018-12-11 13:16 Michał Górny
  0 siblings, 0 replies; only message in thread
From: Michał Górny @ 2018-12-11 13:16 UTC (permalink / raw
  To: gentoo-commits

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=UTF-8, Size: 10181 bytes --]

commit:     78db5bfad049c51bcbe61dcff319c6ffb6a6546e
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 11 13:12:55 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Dec 11 13:15:54 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78db5bfa

media-plugins/vdr-image: Remove last-rited pkg

Closes: https://bugs.gentoo.org/666166
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 media-plugins/vdr-image/Manifest                   |  1 -
 media-plugins/vdr-image/files/rc-addon-0.3.0.sh    | 21 -------
 .../vdr-image/files/vdr-image-0.4.0-ffmpeg3.patch  | 40 --------------
 .../vdr-image/files/vdr-image-0.4.0-gentoo.diff    | 24 --------
 media-plugins/vdr-image/metadata.xml               | 14 -----
 media-plugins/vdr-image/vdr-image-0.4.0.ebuild     | 64 ----------------------
 profiles/package.mask                              |  5 --
 7 files changed, 169 deletions(-)

diff --git a/media-plugins/vdr-image/Manifest b/media-plugins/vdr-image/Manifest
deleted file mode 100644
index 34cc540317c..00000000000
--- a/media-plugins/vdr-image/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST vdr-image-0.4.0.tgz 129200 BLAKE2B efcbb1bd724a2dcd0b787a4d768fb1148b91f05112aaf773704fb2d7eab9f64d67dcf4538bfa169176f3f7d18d15fc7decffd96626290e841a827a0f592e9094 SHA512 d66bb7ff48ed622ec21a7d828985229b6aaf908123c12b870e531f09dfe85e792afafa096cd5c4580296139275e2f7171d30f21fe1f8d88978e19c1eb36ab169

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
deleted file mode 100644
index 800351fbe87..00000000000
--- a/media-plugins/vdr-image/files/rc-addon-0.3.0.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# rc-addon plugin-startup-skript for vdr-image
-#
-
-: ${IMAGE_MOUNT:=/usr/share/vdr/image/bin/mount-image.sh}
-: ${IMAGE_CONVERT:=/usr/share/vdr/image/bin/imageplugin.sh}
-
-plugin_pre_vdr_start() {
-	add_plugin_param "-m ${IMAGE_MOUNT}"
-	add_plugin_param "-C ${IMAGE_CONVERT}"
-	add_plugin_param "-c image"
-	
-	if [ -f /usr/lib/vdr/inc/commands-functions.sh ]; then
-		. /usr/lib/vdr/inc/commands-functions.sh
-	else
-		#source /usr/share/vdr/inc/functions.sh
-		include commands-functions
-	fi
-
-	merge_commands_conf /etc/vdr/imagecmds /etc/vdr/plugins/image/imagecmds.conf "${ORDER_IMAGECMDS}"
-}

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
deleted file mode 100644
index de0ca025e16..00000000000
--- a/media-plugins/vdr-image/files/vdr-image-0.4.0-ffmpeg3.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Index: image-0.4.0/liboutput/encode.c
-===================================================================
---- image-0.4.0.orig/liboutput/encode.c
-+++ image-0.4.0/liboutput/encode.c
-@@ -150,7 +150,7 @@ void cEncode::SetupEncodingParameters(AV
-     }
-     context->max_b_frames=1;
-     context->flags |= CODEC_FLAG_QSCALE;
--    context->pix_fmt = PIX_FMT_YUV420P;
-+    context->pix_fmt = AV_PIX_FMT_YUV420P;
- }
- 
- bool cEncode::ConvertImageToFrame(AVFrame *frame)
-@@ -173,7 +173,7 @@ bool cEncode::ConvertImageToFrame(AVFram
-     // Convert RGB to YUV 
-     if(!avpicture_fill((AVPicture*)m_pImageFilled, 
-                                     m_pImageRGB, 
--                                    PIX_FMT_RGB24, m_nWidth, m_nHeight)) 
-+                                    AV_PIX_FMT_RGB24, m_nWidth, m_nHeight)) 
-     {
-         esyslog("imageplugin: failed avpicture_fill");
-         return false;
-@@ -182,13 +182,13 @@ bool cEncode::ConvertImageToFrame(AVFram
-     {
-         int result;
- #ifndef HAVE_SWSCALER
--        result=img_convert((AVPicture*)frame->data, PIX_FMT_YUV420P, 
--                       (AVPicture*)m_pImageFilled, PIX_FMT_RGB24, 
-+        result=img_convert((AVPicture*)frame->data, AV_PIX_FMT_YUV420P, 
-+                       (AVPicture*)m_pImageFilled, AV_PIX_FMT_RGB24, 
-                        m_nWidth, m_nHeight);
- #else
-         SwsContext* convert_ctx = sws_getContext(m_nWidth, m_nHeight, 
--                        PIX_FMT_RGB24, m_nWidth, m_nHeight, 
--                        PIX_FMT_YUV420P, SWS_BICUBIC, NULL, NULL, NULL);
-+                        AV_PIX_FMT_RGB24, m_nWidth, m_nHeight, 
-+                        AV_PIX_FMT_YUV420P, SWS_BICUBIC, NULL, NULL, NULL);
- 
- 	    if(!convert_ctx) {
-             esyslog("imageplugin: failed to initialize swscaler context");

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
deleted file mode 100644
index 11479f2fc8a..00000000000
--- a/media-plugins/vdr-image/files/vdr-image-0.4.0-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/metadata.xml b/media-plugins/vdr-image/metadata.xml
deleted file mode 100644
index 8860e595d26..00000000000
--- a/media-plugins/vdr-image/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>vdr@gentoo.org</email>
-		<name>Gentoo VDR Project</name>
-		<description>
-			Please contact maintainer before you change something.
-		</description>
-	</maintainer>
-	<longdescription>
-		VDR Plugin to show pictures on TV
-	</longdescription>
-</pkgmetadata>

diff --git a/media-plugins/vdr-image/vdr-image-0.4.0.ebuild b/media-plugins/vdr-image/vdr-image-0.4.0.ebuild
deleted file mode 100644
index 15aba0b5a4c..00000000000
--- a/media-plugins/vdr-image/vdr-image-0.4.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit vdr-plugin-2
-
-VERSION="1325" #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}.tgz"
-
-KEYWORDS="amd64 x86"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="exif"
-
-COMMON_DEPEND=">=media-video/vdr-2
-	>=virtual/ffmpeg-9
-	>=media-libs/netpbm-10.0
-	exif? ( media-libs/libexif )"
-
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-
-RDEPEND="${COMMON_DEPEND}
-	media-tv/gentoo-vdr-scripts"
-
-VDR_RCADDON_FILE="${FILESDIR}/rc-addon-0.3.0.sh"
-
-src_prepare() {
-	vdr-plugin-2_src_prepare
-
-	#wrong include
-	sed -e 's:<liboutput/stillimage-player.h>:"liboutput/stillimage-player.h":'\
-		-i player-image.h
-
-	# dangerous warning
-	sed -e "s:mktemp:mkstemp:" -i data-image.c
-
-	eapply "${FILESDIR}/${P}-gentoo.diff" \
-		"${FILESDIR}/${P}-ffmpeg3.patch"
-
-	# ffmpeg-2.2.12, libav10
-	sed -e "s:avcodec_alloc_frame:av_frame_alloc:" \
-		-e "s:CODEC_ID_MPEG2VIDEO:AV_CODEC_ID_MPEG2VIDEO:" \
-		-i liboutput/encode.c
-}
-
-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/profiles/package.mask b/profiles/package.mask
index 10aa3a45d75..c89ce39d54c 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -271,11 +271,6 @@ media-plugins/mythplugins
 # No reverse deps, obsoleted in 2016 (#666130). Removal in a month.
 dev-python/jenkins-webapi
 
-# Pacho Ramos <pacho@gentoo.org> (11 Nov 2018)
-# Build issues (#666166), upstream dead for years (#619624). Removal in a
-# month.
-media-plugins/vdr-image
-
 # Mike Gilbert <floppym@gentoo.org> (10 Nov 2018)
 # Open bugs and no Gentoo maintainer.
 # Removal in 30 days.


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2018-12-11 13:16 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-12-11 13:16 [gentoo-commits] repo/gentoo:master commit in: profiles/, media-plugins/vdr-image/files/, media-plugins/vdr-image/ Michał Górny

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox