commit: ca3bcfbeafebb438605484c08817cfd072cb0fdd Author: Aaron Bauman <bman <AT> gentoo <DOT> org> AuthorDate: Sun Jan 5 04:03:11 2020 +0000 Commit: Aaron Bauman <bman <AT> gentoo <DOT> org> CommitDate: Sun Jan 5 04:03:11 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca3bcfbe
media-plugins/*: drop last-rited pkgs Signed-off-by: Aaron Bauman <bman <AT> gentoo.org> media-plugins/vdr-coverviewer/Manifest | 1 - .../files/vdr-coverviewer-0.0.2-vdr-1.5.x.diff | 48 ----- media-plugins/vdr-coverviewer/metadata.xml | 8 - .../vdr-coverviewer/vdr-coverviewer-0.0.2.ebuild | 28 --- media-plugins/vdr-music/Manifest | 1 - media-plugins/vdr-music/files/music.mk | 198 --------------------- media-plugins/vdr-music/metadata.xml | 8 - media-plugins/vdr-music/vdr-music-0.9.9.ebuild | 54 ------ profiles/package.mask | 7 - 9 files changed, 353 deletions(-) diff --git a/media-plugins/vdr-coverviewer/Manifest b/media-plugins/vdr-coverviewer/Manifest deleted file mode 100644 index 4560fefe9ee..00000000000 --- a/media-plugins/vdr-coverviewer/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST vdr-coverviewer-0.0.2.tar.gz 66187 BLAKE2B 4cecad1d4805725a4864d1d481492d8a1ff26437dee7ec9eb6a032989a86a1f699c70fa04e513d71275d5d3cf6de2eae5a583701f7ac6d3667fd4b3d97c63cad SHA512 17bac6c700eb39278f3cbbe7833cebab78a1998a8ec6e86bd61cc1c532cf02cc091ecb0174b785f4b7ebb87cd107e9bee0852a85a2b53c276689fe3326e218d3 diff --git a/media-plugins/vdr-coverviewer/files/vdr-coverviewer-0.0.2-vdr-1.5.x.diff b/media-plugins/vdr-coverviewer/files/vdr-coverviewer-0.0.2-vdr-1.5.x.diff deleted file mode 100644 index d70d006ed1f..00000000000 --- a/media-plugins/vdr-coverviewer/files/vdr-coverviewer-0.0.2-vdr-1.5.x.diff +++ /dev/null @@ -1,48 +0,0 @@ ---- control-image.c~ 2007-05-18 14:08:11.000000000 +0200 -+++ control-image.c 2007-06-09 16:40:18.000000000 +0200 -@@ -251,7 +251,11 @@ - - void cImageControl::FadeIn(void) - { -+#if VDRVERSNUM >= 10500 -+ SetNeedsFastResponse(true); -+#else - needsFastResponse = true; -+#endif - - int i; - int alpha = 0; -@@ -279,13 +283,21 @@ - fd--; - } - -+#if VDRVERSNUM >= 10500 -+ SetNeedsFastResponse(false); -+#else - needsFastResponse = false; -+#endif - } - - - void cImageControl::FadeOut(void) - { -+#if VDRVERSNUM >= 10500 -+ SetNeedsFastResponse(true); -+#else - needsFastResponse = true; -+#endif - - int i; - int alpha = 255; -@@ -312,7 +324,11 @@ - fd--; - } - -+#if VDRVERSNUM >= 10500 -+ SetNeedsFastResponse(false); -+#else - needsFastResponse = false; -+#endif - } - - diff --git a/media-plugins/vdr-coverviewer/metadata.xml b/media-plugins/vdr-coverviewer/metadata.xml deleted file mode 100644 index 27f419c289c..00000000000 --- a/media-plugins/vdr-coverviewer/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> -<email>v...@gentoo.org</email> -<name>Gentoo VDR Project</name> -</maintainer> -</pkgmetadata> diff --git a/media-plugins/vdr-coverviewer/vdr-coverviewer-0.0.2.ebuild b/media-plugins/vdr-coverviewer/vdr-coverviewer-0.0.2.ebuild deleted file mode 100644 index b383e8f30e4..00000000000 --- a/media-plugins/vdr-coverviewer/vdr-coverviewer-0.0.2.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit vdr-plugin-2 - -DESCRIPTION="VDR plugin: coverviewer for vdr-music" -HOMEPAGE="http://www.vdr.glaserei-franz.de/" -SRC_URI="http://www.kost.sh/vdr/${P}.tar.gz" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="~amd64 ~x86" -IUSE="imagemagick" - -PATCHES=( "${FILESDIR}/${P}-vdr-1.5.x.diff" ) - -DEPEND="imagemagick? ( media-gfx/imagemagick ) - !imagemagick? ( media-libs/imlib2 )" - -RDEPEND="media-plugins/vdr-music" - -src_prepare() { - vdr-plugin-2_src_prepare - - use imagemagick && sed -i Makefile -e "s:#HAVE_MAGICK=1:HAVE_MAGICK=1:" -} diff --git a/media-plugins/vdr-music/Manifest b/media-plugins/vdr-music/Manifest deleted file mode 100644 index 6c2a7a3b1ac..00000000000 --- a/media-plugins/vdr-music/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST vdr-music-0.9.9-dev2.tgz 2189767 BLAKE2B a4ece0904304d7b9cc13532e5ce6833508cf69137dbec7d2e28cac7dc77128344f23183a40d863bba9476f19490d4b26baa9dbfab298161c4e89619544768d1a SHA512 65d9d6b1c76144dfcdb67d884c6cb44066c2bb15ccad0da1e011941b54695f47e4ae104397db1d77d6108ec7cdd81b785901a05fa1c6e07e42df71d021ab1fa7 diff --git a/media-plugins/vdr-music/files/music.mk b/media-plugins/vdr-music/files/music.mk deleted file mode 100644 index 0ff1d5893e1..00000000000 --- a/media-plugins/vdr-music/files/music.mk +++ /dev/null @@ -1,198 +0,0 @@ -# -# Makefile for a Video Disk Recorder plugin -# - -# The official name of this plugin. -# This name will be used in the '-P...' option of VDR to load the plugin. -# By default the main source file also carries this name. - -PLUGIN = music - -### The version number of this plugin (taken from the main source file): - -VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ print $$6 }' | sed -e 's/[";]//g') - -### The directory environment: - -# Use package data if installed...otherwise assume we're under the VDR source directory: -PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc)) -LIBDIR = $(call PKGCFG,libdir) -LOCDIR = $(call PKGCFG,locdir) -PLGCFG = $(call PKGCFG,plgcfg) -# -TMPDIR ?= /tmp - -### The compiler options: - -export CFLAGS = $(call PKGCFG,cflags) -export CXXFLAGS = $(call PKGCFG,cxxflags) - -### The version number of VDR's plugin API: - -APIVERSION = $(call PKGCFG,apiversion) - -### Allow user defined options to overwrite defaults: - --include $(PLGCFG) - -### The name of the distribution archive: - -ARCHIVE = $(PLUGIN)-$(VERSION) -PACKAGE = vdr-$(ARCHIVE) - -### The name of the shared object file: - -SOFILE = libvdr-$(PLUGIN).so - -### Includes and Defines (add further entries here): - -# (Default) DO NOT UNCOMMENT IT IN DEVELOPER-VERSIONS -HAVE_IMAGEMAGICK=1 -# Uncomment the following line, if you don't have libsndfile installed -#WITHOUT_LIBSNDFILE=1 - -# Uncomment the following line, if you don't have libvorbisfile installed -#WITHOUT_LIBVORBISFILE=1 - -#BROKEN_PCM=1 -# Uncomment if you want debug output on stdout -##DEBUG=1 - -# internal use -# BUGHUNT -#BUGHUNT=1 - -# internal use -# DEBUG_COVER -#DEBUG_COVER=1 - -###INCLUDES += - -###DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"' -INCLUDES += -I$(VDRINCDIR) - -DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"' - -ifdef BROKEN_PCM - DEFINES += -DBROKEN_PCM -endif - -ifeq ($(shell test -f $(VDRDIR)/fontsym.h ; echo $$?),0) - DEFINES += -DHAVE_BEAUTYPATCH -endif - -ifdef DBG - CXXFLAGS += -g -endif - -ifdef DEBUG - DEFINES += -DDEBUG -else - DEFINES += -DNO_DEBUG -endif - -ifdef BUGHUNT - DEFINES += -DBUGHUNT -endif - -ifdef DEBUG_COVER - DEFINES += -DDEBUG_COVER -endif - -### The object files (add further files here): - -OBJS = $(PLUGIN).o config.o vars.o bitmap.o \ - commands.o options.o lyrics.o funct.o cover.o skin.o visual.o tracklist.o \ - search.o mp3id3.o mp3id3tag.o rating.o menubrowse.o mp3control.o \ - icons.o data.o menu.o \ - data-mp3.o setup-mp3.o player-mp3.o stream.o network.o \ - decoder.o decoder-mp3.o decoder-mp3-stream.o decoder-snd.o \ - decoder-ogg.o - -LIBS += -lasound -lmad -lid3tag - -ifdef HAVE_IMAGEMAGICK - INCLUDES += $(shell pkg-config --cflags MagickCore) - LIBS += $(shell pkg-config --libs Magick++) - DEFINES += -DHAVE_IMAGEMAGICK -else - INCLUDES += -I$(IMLIB)/src - LIBS += $(shell imlib2-config --libs) - DEFINES += -DHAVE_IMLIB2 -endif - -ifndef WITHOUT_LIBSNDFILE - LIBS += -lsndfile - DEFINES += -DHAVE_SNDFILE -endif - -ifndef WITHOUT_LIBVORBISFILE - LIBS += -lvorbisfile -lvorbis - DEFINES += -DHAVE_VORBISFILE -endif - -### The main target: - -all: $(SOFILE) i18n - -### Implicit rules: - -%.o: %.c - $(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) -o $@ $< - -### Dependencies: - -MAKEDEP = $(CXX) -MM -MG -DEPFILE = .dependencies -$(DEPFILE): Makefile - @$(MAKEDEP) $(CXXFLAGS) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@ - --include $(DEPFILE) - -### Internationalization (I18N): - -PODIR = po -I18Npo = $(wildcard $(PODIR)/*.po) -I18Nmo = $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file)))) -I18Nmsgs = $(addprefix $(DESTDIR)$(LOCDIR)/, $(addsuffix /LC_MESSAGES/vdr-$(PLUGIN).mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file)))))) -I18Npot = $(PODIR)/$(PLUGIN).pot - -%.mo: %.po - msgfmt -c -o $@ $< - -$(I18Npot): $(wildcard *.c) - xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --package-name=vdr-$(PLUGIN) --package-version=$(VERSION) --msgid-bugs-address='<see README>' -o $@ `ls $^` - -%.po: $(I18Npot) - msgmerge -U --no-wrap --no-location --backup=none -q -N $@ $< - @touch $@ - -$(I18Nmsgs): $(DESTDIR)$(LOCDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo - install -D -m644 $< $@ - -.PHONY: i18n -i18n: $(I18Nmo) $(I18Npot) - -install-i18n: $(I18Nmsgs) - -### Targets: - -$(SOFILE): $(OBJS) - $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@ - -install-lib: $(SOFILE) - install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION) - -install: install-lib install-i18n - -dist: $(I18Npo) clean - @-rm -rf $(TMPDIR)/$(ARCHIVE) - @mkdir $(TMPDIR)/$(ARCHIVE) - @cp -a * $(TMPDIR)/$(ARCHIVE) - @tar czf $(PACKAGE).tgz -C $(TMPDIR) $(ARCHIVE) - @-rm -rf $(TMPDIR)/$(ARCHIVE) - @echo Distribution package created as $(PACKAGE).tgz - -clean: - @-rm -f $(PODIR)/*.mo $(PODIR)/*.pot - @-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~ diff --git a/media-plugins/vdr-music/metadata.xml b/media-plugins/vdr-music/metadata.xml deleted file mode 100644 index 27f419c289c..00000000000 --- a/media-plugins/vdr-music/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> -<email>v...@gentoo.org</email> -<name>Gentoo VDR Project</name> -</maintainer> -</pkgmetadata> diff --git a/media-plugins/vdr-music/vdr-music-0.9.9.ebuild b/media-plugins/vdr-music/vdr-music-0.9.9.ebuild deleted file mode 100644 index a9a7a268fc8..00000000000 --- a/media-plugins/vdr-music/vdr-music-0.9.9.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit vdr-plugin-2 - -MY_P="${P}-dev2" -S="${WORKDIR}/music-${PV}-dev2" - -DESCRIPTION="VDR plugin: music" -HOMEPAGE="http://www.vdr.glaserei-franz.de/vdrplugins.htm" -SRC_URI="http://www.glaserei-franz.de/VDR/Moronimo/files/${MY_P}.tgz" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="~amd64 ~x86" -IUSE="+imagemagick debug sndfile vorbis" - -DEPEND=">=media-video/vdr-1.6.0 - media-libs/libmad - media-libs/libid3tag - imagemagick? ( media-gfx/imagemagick[png] ) - sndfile? ( media-libs/libsndfile ) - vorbis? ( media-libs/libvorbis ) - !imagemagick? ( media-libs/imlib2[png] )" - -RDEPEND="sys-process/at - media-sound/id3v2" - -src_prepare() { -# # prepare sources with new Makefile handling -# cp "${FILESDIR}/music.mk" "${S}"/Makefile - - # clean up from untranslated .po files - rm "${S}"/po/{ca_ES,cs_CZ,da_DK,el_GR,es_ES,et_EE,fi_FI,fr_FR,hr_HR,hu_HU,it_IT,nl_NL,nn_NO,pl_PL,pt_PT,ro_RO,ru_RU,sl_SI,sv_SE,tr_TR}.po - - vdr-plugin-2_src_prepare - - use !vorbis && sed -i Makefile -e "s:#WITHOUT_LIBVORBISFILE=1:WITHOUT_LIBVORBISFILE=1:" - use !sndfile && sed -i Makefile -e "s:#WITHOUT_LIBSNDFILE=1:WITHOUT_LIBSNDFILE=1:" - use !debug && sed -i Makefile -e "s:DEBUG=1:#DEBUG=1:" - use imagemagick && sed -i Makefile \ - -e "s:#HAVE_MAGICK=1:HAVE_MAGICK=1:" \ - -e "s:#MAGICKDIR=:MAGICKDIR=:" -} - -src_install() { - vdr-plugin-2_src_install - - insinto /etc/vdr/plugins/music - doins -r moronsuite/music/* - chown -R vdr:vdr "${D}"/etc/vdr/plugins/music -} diff --git a/profiles/package.mask b/profiles/package.mask index ca9d9189e2c..131feb568a4 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -706,13 +706,6 @@ sci-astronomy/casacore # Removal in 30 days. Bug #602024. app-laptop/nvidiabl -# Michał Górny <mgo...@gentoo.org> (2019-12-01) -# The plugin is broken with multiple dependencies. It is also dead -# upstream. Removing per maintainer's request. -# Removal in 30 days. Bug #314309. -media-plugins/vdr-coverviewer -media-plugins/vdr-music - # Michał Górny <mgo...@gentoo.org> (2019-12-01) # Unresolved vulnerability. Also apparently fails to build (#574048). # Removal in 30 days. Bug #463338.