From 64e107b9b6058580ff0432107eb37cefb0b2a7d8 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 22 Oct 2018 11:09:47 +0100 Subject: gentoo resync : 22.10.2018 --- media-plugins/vdr-prefermenu/Manifest | 5 - media-plugins/vdr-prefermenu/files/prefermenu.mk | 123 --------------------- .../vdr-prefermenu-0.6.6-no-static-getfont.diff | 73 ------------ media-plugins/vdr-prefermenu/metadata.xml | 8 -- .../vdr-prefermenu/vdr-prefermenu-0.6.6-r2.ebuild | 37 ------- 5 files changed, 246 deletions(-) delete mode 100644 media-plugins/vdr-prefermenu/Manifest delete mode 100644 media-plugins/vdr-prefermenu/files/prefermenu.mk delete mode 100644 media-plugins/vdr-prefermenu/files/vdr-prefermenu-0.6.6-no-static-getfont.diff delete mode 100644 media-plugins/vdr-prefermenu/metadata.xml delete mode 100644 media-plugins/vdr-prefermenu/vdr-prefermenu-0.6.6-r2.ebuild (limited to 'media-plugins/vdr-prefermenu') diff --git a/media-plugins/vdr-prefermenu/Manifest b/media-plugins/vdr-prefermenu/Manifest deleted file mode 100644 index 27b4bcd0956d..000000000000 --- a/media-plugins/vdr-prefermenu/Manifest +++ /dev/null @@ -1,5 +0,0 @@ -AUX prefermenu.mk 3190 BLAKE2B bf926ef06ffa11cdfbe4890680c049e53e2446751f5d797057140e9c07ee3383b931394b682a0fa98bf95108e2d10a50779c81d6b00302f33a90e4ead21c74ef SHA512 b015935b165c7564a070dea26ae45b68a288a7a3b8ffe59ca79f374a13c18c359bf6af9c0b5ef254e7c266cd7345a832182b64e29b1218e2373a521a0fb5d891 -AUX vdr-prefermenu-0.6.6-no-static-getfont.diff 2201 BLAKE2B ec74d62d5fbb6584ee917bbabb0a2012504eaf0f2b7507c213e83715555193ed54d8286a72f7ea6a0ceb8e8eebdf8ca9329fedd48944dcd79963787b888dd547 SHA512 e67d5cfe06d30f2c7f38b7be9daca4f9d00e5265b85aaa20a7a5c3dc7184a085c44b1d1210f560bac560176c6f347a93bbc70c93c2773e7a4d79e7bbed953a91 -DIST vdr-prefermenu-0.6.6.tgz 19617 BLAKE2B 67ec25d33049435399b93be67fdce64ee7d225b9fda6d0fe3386d06ed5f85a04a40f1e4320db98e32ffa66b43963012f4d933b2d253e898aef5432d94e8120b6 SHA512 bc5e11757979a60f408c59d4d0f1d713899013d4a3485ff85e7bf139fb8f436ddd80799673c3d7a718a3d9cc0e75c216f73f1eccc3c2350826c5f8d6145157f6 -EBUILD vdr-prefermenu-0.6.6-r2.ebuild 788 BLAKE2B 69fff990303c617793164049e1e96d57e582bdc98d649706411790035925ca1b794776ce9fb7b6e1d14914e2253c41dcfa92ce04e9003dc58540fba53a003ca3 SHA512 207e017adf03d2a035647ea5456d5e7b5297bd03d7ce074000ec2aa7c5a7c183aa3d1fd6e0a165fa05bd64d6dbaec2e23bdc8f86dcf6d4c74e5d6522a84d5f5d -MISC metadata.xml 243 BLAKE2B 6287033e852823666551691771936aead83e7394d6c41f6f5a43a4c21309300e6fcfd90e8a87a82eb90433f86344426c07f2fb7833e7226d2e3c4df9fda1d2d6 SHA512 f7d6e467a5a96c0afdd42df3c0f3866240defc5bbea5ccddf4c0b1a3c004225af5d46dab67d45a5ac34535391584f3b3727fe79ef6cef1a11413636bbc35cf06 diff --git a/media-plugins/vdr-prefermenu/files/prefermenu.mk b/media-plugins/vdr-prefermenu/files/prefermenu.mk deleted file mode 100644 index 07940af47fe5..000000000000 --- a/media-plugins/vdr-prefermenu/files/prefermenu.mk +++ /dev/null @@ -1,123 +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 = prefermenu - -### 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): - -#INCLUDES += - -DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"' - -### The object files (add further files here): - -OBJS = $(PLUGIN).o preferosd.o prefersetup.o preferchannel.o - -### 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='' -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-prefermenu/files/vdr-prefermenu-0.6.6-no-static-getfont.diff b/media-plugins/vdr-prefermenu/files/vdr-prefermenu-0.6.6-no-static-getfont.diff deleted file mode 100644 index 0c0239d2ac48..000000000000 --- a/media-plugins/vdr-prefermenu/files/vdr-prefermenu-0.6.6-no-static-getfont.diff +++ /dev/null @@ -1,73 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 90_prefermenu-0.6.6-1.5.3.dpatch by Thomas Günther -## http://toms-cafe.de/vdr/download/prefermenu-0.6.6-1.5.3.diff -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Changes for VDR >= 1.5.3. - -@DPATCH@ ---- prefermenu-0.6.6/prefermenu.c -+++ prefermenu-0.6.6/prefermenu.c -@@ -75,6 +75,7 @@ - } - // Clean up the file with current VDR channels.conf - PreferedChannelsList.Save(); -+ const int LINEHEIGHT = cFont::GetFont(fontOsd)->Height(); - config.height= (config.lines * (LINEHEIGHT+BORDERSIZE+2))+BORDERSIZE; - return new cPreferOsd; - } ---- prefermenu-0.6.6/preferosd.c -+++ prefermenu-0.6.6/preferosd.c -@@ -60,6 +60,7 @@ - } - osd=cOsdProvider::NewOsd(config.originx, config.originy); - if (osd) { -+ const int LINEHEIGHT = cFont::GetFont(fontOsd)->Height(); - tArea Area = { 0, 0, config.width+LINEHEIGHT, config.height-1, 4}; - osd->SetAreas(&Area, 1); - DrawPreferMenu(0,0); -@@ -168,6 +169,7 @@ - { - if (current > 1) { - current -= 1; -+ const int LINEHEIGHT = cFont::GetFont(fontOsd)->Height(); - DrawPreferMenu(-LINEHEIGHT,1); - DisplayPreferMenu(); - //DrawPreferMneu(-10,1); -@@ -181,6 +183,7 @@ - { - if (current < number) { - current += 1; -+ const int LINEHEIGHT = cFont::GetFont(fontOsd)->Height(); - DrawPreferMenu(+LINEHEIGHT,-1); - DisplayPreferMenu(); - //DrawPreferMenu(+10,-1); -@@ -315,6 +318,8 @@ - - void cPreferOsd::DrawPreferMenu(int delta, int highlight) - { -+ const cFont *font = cFont::GetFont(fontOsd); -+ const int LINEHEIGHT = font->Height(); - - int middle = int(config.height/2) + config.height%2; - -@@ -390,6 +395,8 @@ - - void cPreferOsd::DrawChannelsNames(int delta) - { -+ const cFont *font = cFont::GetFont(fontOsd); -+ const int LINEHEIGHT = font->Height(); - - // XXX The margin is hardcoded for now - // TODO: make it more flexible ---- prefermenu-0.6.6/preferosd.h -+++ prefermenu-0.6.6/preferosd.h -@@ -4,8 +4,6 @@ - #include - - static const int BORDERSIZE = 2; --static const cFont *font = cFont::GetFont(fontOsd); --static const int LINEHEIGHT = font->Height(); - - - class cPreferOsd : public cOsdObject { diff --git a/media-plugins/vdr-prefermenu/metadata.xml b/media-plugins/vdr-prefermenu/metadata.xml deleted file mode 100644 index 27f419c289c3..000000000000 --- a/media-plugins/vdr-prefermenu/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - -vdr@gentoo.org -Gentoo VDR Project - - diff --git a/media-plugins/vdr-prefermenu/vdr-prefermenu-0.6.6-r2.ebuild b/media-plugins/vdr-prefermenu/vdr-prefermenu-0.6.6-r2.ebuild deleted file mode 100644 index 7b3a9b12408f..000000000000 --- a/media-plugins/vdr-prefermenu/vdr-prefermenu-0.6.6-r2.ebuild +++ /dev/null @@ -1,37 +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: presents a favourites channels menu" -HOMEPAGE="http://www.olivierjacques.com/vdr/prefermenu/" -SRC_URI="http://famillejacques.free.fr/vdr/prefermenu/vdr-${VDRPLUGIN}-${PV}.tgz" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND=">=media-video/vdr-2.0" - -PATCHES=("${FILESDIR}/${P}-no-static-getfont.diff") - -src_prepare() { - cp "${FILESDIR}/${VDRPLUGIN}.mk" Makefile - - vdr-plugin-2_src_prepare - - sed -e "s:RegisterI18n://RegisterI18n:" -i prefermenu.c -} - -src_install() { - vdr-plugin-2_src_install - - touch prefermenu.conf - - insopts -m0644 -gvdr -ovdr - insinto /etc/vdr/plugins/prefermenu - doins prefermenu.conf -} -- cgit v1.2.3