[gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-extrecmenu/files/

[gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-extrecmenu/files/

[David Seifert]

commit:     fb9a9239517fb5f71034a55557dcf1f42a939950
Author:     Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Thu Jan  5 18:37:08 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Jan 15 10:24:06 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb9a9239

media-plugins/vdr-extrecmenu: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/3338

 media-plugins/vdr-extrecmenu/files/vdr-1.7.27.diff | 98 ----------------------
 1 file changed, 98 deletions(-)

diff --git a/media-plugins/vdr-extrecmenu/files/vdr-1.7.27.diff b/media-plugins/vdr-extrecmenu/files/vdr-1.7.27.diff
deleted file mode 100644
index 7da0917..00000000
--- a/media-plugins/vdr-extrecmenu/files/vdr-1.7.27.diff
+++ /dev/null
@@ -1,98 +0,0 @@
-diff -Naur extrecmenu-1.2.1.orig/mymenueditrecording.c extrecmenu-1.2.1/mymenueditrecording.c
---- extrecmenu-1.2.1.orig/mymenueditrecording.c	2012-04-07 09:48:21.000000000 +0200
-+++ extrecmenu-1.2.1/mymenueditrecording.c	2012-04-07 09:52:03.000000000 +0200
-@@ -500,8 +500,8 @@
- myMenuRecordingDetails::myMenuRecordingDetails(cRecording *Recording):cOsdMenu(tr("Details"),12)
- {
-   recording=Recording;
--  priority=recording->priority;
--  lifetime=recording->lifetime;
-+  priority=recording->Priority();
-+  lifetime=recording->Lifetime();
- 
-   Add(new cMenuEditIntItem(trVDR("Priority"),&priority,0,MAXPRIORITY));
-   Add(new cMenuEditIntItem(trVDR("Lifetime"),&lifetime,0,MAXLIFETIME));
-@@ -514,7 +514,10 @@
-   {
-     if(Key==kOk)
-     {
--      if((priority!=recording->priority)||(lifetime!=recording->lifetime))
-+        int old_priority = recording->Priority();
-+        int old_lifetime = recording->Lifetime();
-+        if((priority!=old_priority)||(lifetime!=old_lifetime))
-+//      if((priority!=recording->priority)||(lifetime!=recording->lifetime))
-       {
- #if VDRVERSNUM > 10713
-         if(recording->IsPesRecording())
-diff -Naur extrecmenu-1.2.1.orig/tools.c extrecmenu-1.2.1/tools.c
---- extrecmenu-1.2.1.orig/tools.c	2012-04-07 09:48:21.000000000 +0200
-+++ extrecmenu-1.2.1/tools.c	2012-04-07 09:56:33.000000000 +0200
-@@ -456,7 +456,7 @@
-     if(!(fromfile=fromfilename->Open()) || !(tofile=tofilename->Open()))
-       return;
-     fromfile->SetReadAhead(MEGABYTE(20));
--    index=mark->position;
-+    index=mark->Position();
-     mark=frommarks.Next(mark);
-     tomarks.Add(0);
-     tomarks.Save();
-@@ -542,8 +542,8 @@
-     filesize+=length;
-     if(!lastiframe)
-       lastiframe=toindex->Last();
--      
--    if(mark && index >= mark->position)
-+
-+    if(mark && index >= mark->Position())
-     {
-       mark=frommarks.Next(mark);
-       tomarks.Add(lastiframe);
-@@ -552,7 +552,7 @@
-       tomarks.Save();
-       if(mark)
-       {
--        index=mark->position;
-+        index=mark->Position();
-         mark=frommarks.Next(mark);
-         currentfilenumber=0;
-         cutin=true;
-diff -Naur extrecmenu-1.2.1.orig/mymenurecordings.c extrecmenu-1.2.1/mymenurecordings.c
---- extrecmenu-1.2.1.orig/mymenurecordings.c	2012-04-07 10:08:35.000000000 +0200
-+++ extrecmenu-1.2.1/mymenurecordings.c	2012-04-07 10:17:19.000000000 +0200
-@@ -66,7 +66,9 @@
-   else
-   {
-     stringstream text;
--    text << *DateString(recording->start) << ", " << *TimeString(recording->start) << "\n\n";
-+//    text << *DateString(recording->start) << ", " << *TimeString(recording->start) << "\n\n";
-+    time_t start = recording->Start();
-+    text << *DateString(start) << ", " << *TimeString(start) << "\n\n";
- 
-     if(recording->Info()->Title())
-     {
-@@ -95,8 +97,12 @@
-     else
-       text << tr("Size") << ": " << recmb << " MB\n";
- 
--    text << trVDR("Priority") << ": " << recording->priority << "\n";
--    text << trVDR("Lifetime") << ": " << recording->lifetime << "\n";
-+//    text << trVDR("Priority") << ": " << recording->priority << "\n";
-+//    text << trVDR("Lifetime") << ": " << recording->lifetime << "\n";
-+    int prio = recording->Priority();
-+    int lft = recording->Lifetime();
-+    text << trVDR("Priority") << ": " << prio << "\n";
-+    text << trVDR("Lifetime") << ": " << lft << "\n";
- 
-     DisplayMenu()->SetText(text.str().c_str(),false);
-     cStatus::MsgOsdTextItem(text.str().c_str());
-@@ -192,7 +198,9 @@
- 
-       // date and time of recording
-       struct tm tm_r;
--      struct tm *t=localtime_r(&Recording->start,&tm_r);
-+//      struct tm *t=localtime_r(&Recording->start,&tm_r);
-+      time_t start = Recording->Start();
-+      struct tm *t=localtime_r(&start,&tm_r);
- 
-       idbuffer << t->tm_mday << t->tm_mon << t->tm_year
-                << t->tm_hour << t->tm_min;

[gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-extrecmenu/files/

[Jakov Smolić]

commit:     c5d5bf9cf8761cb1cf1fedf06e6f959dd73f9d2e
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue Oct 26 10:11:51 2021 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Tue Oct 26 11:05:53 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5d5bf9c

media-plugins/vdr-extrecmenu: remove unused file

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 media-plugins/vdr-extrecmenu/files/extrecmenu.mk | 127 -----------------------
 1 file changed, 127 deletions(-)

diff --git a/media-plugins/vdr-extrecmenu/files/extrecmenu.mk b/media-plugins/vdr-extrecmenu/files/extrecmenu.mk
deleted file mode 100644
index ae68843778f..00000000000
--- a/media-plugins/vdr-extrecmenu/files/extrecmenu.mk
+++ /dev/null
@@ -1,127 +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 = extrecmenu
-
-### 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)"'
-
-ifdef USE_PINPLUGIN
-DEFINES += -DUSE_PINPLUGIN
-endif
-
-DEFINES += -DUSE_VDR_CUTTER
-
-### The object files (add further files here):
-
-OBJS = $(PLUGIN).o mymenurecordings.o mymenueditrecording.o myreplaycontrol.o mymenucommands.o mymenusetup.o tools.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='<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* *~