compilefix >=vdr-1.7.27

Package-Manager: portage-2.1.10.11/cvs/Linux i686

4 files changed, 89 insertions, 7 deletions

diff --git a/media-plugins/vdr-graphtft/ChangeLog b/media-plugins/vdr-graphtft/ChangeLog
index e816aa9b0f1d..67268bbf515a 100644
--- a/media-plugins/vdr-graphtft/ChangeLog
+++ b/media-plugins/vdr-graphtft/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/vdr-graphtft
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-graphtft/ChangeLog,v 1.29 2012/03/12 17:30:52 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-graphtft/ChangeLog,v 1.30 2012/04/07 01:36:55 hd_brummy Exp $
+
+  07 Apr 2012; Joerg Bornkessel <hd_brummy@gentoo.org>
+  vdr-graphtft-0.3.4.ebuild, +files/vdr-1.7.27.diff:
+  compilefix >=vdr-1.7.27
 
   12 Mar 2012; Joerg Bornkessel <hd_brummy@gentoo.org>
   -vdr-graphtft-0.2.2-r1.ebuild, -files/vdr-graphtft-0.2.2-avutil50.patch,
diff --git a/media-plugins/vdr-graphtft/Manifest b/media-plugins/vdr-graphtft/Manifest
index 1c0946339607..46af181bc027 100644
--- a/media-plugins/vdr-graphtft/Manifest
+++ b/media-plugins/vdr-graphtft/Manifest
@@ -4,6 +4,7 @@ Hash: SHA1
 AUX confd 1233 RMD160 7b0183644d7ff2f2c0488ec10190e40afc11dab3 SHA1 803cf52c0b13cc2b110f8c8706f8fda15bd532a7 SHA256 2ddbe4e535d7f18a002df6760b41f9c24a4cb95695480a210d148bc046582063
 AUX graphtft-fe 995 RMD160 669a22a7bd3d5d7efdf7468f2f1692d118b77a09 SHA1 722a35ee6c93632d669e789897eaed2b48baec41 SHA256 1f97afe93133b38e0a0679baf7abfa85d532d1908801da1cd1c70e5104338107
 AUX rc-addon.sh 347 RMD160 2590e2083dd556b00d528643829a4bd16cb4eacd SHA1 f3d7599243ac5d468cf1c81a6391b16570f841e7 SHA256 9e0842f058670bfc5af58e2f12a334b31e7741cd3e2f3fb6d1cb5ae8475c3efe
+AUX vdr-1.7.27.diff 2645 RMD160 40aef6e28a397f6f7052f8148ca57865c3a4dde0 SHA1 330380126e0739e7d40585bd76588f87afb1d947 SHA256 96ea5e85342cebcbc98551b766fc02e8b351b616e52f4d1a565e19bac84ce514
 AUX vdr-graphtft-0.3.2.24_ffmpeg-0.5.diff 1510 RMD160 6bf209fc3ecdfbd0e398162b1e7cfeebb926ce4a SHA1 bb9e3c0200a9d120846869b57714941fb498ec01 SHA256 5d5274914de62d77ff4fcf5f32a6b12c74be721ce986cd17074c6e1a7947339b
 AUX vdr-graphtft-0.3.2.24_gcc-4.4.x.diff 2903 RMD160 c87cb78c744955797231588b49dd883f4a8916b7 SHA1 74add8c610f22cdd91c8521fc26e4e42af4f0b86 SHA256 ef4e8dcecaa103c73b3f50d1e5c2ede2b9306f6dd5c000d84e6d64151c3cc864
 AUX vdr-graphtft-0.3.2.24_gentoo.diff 4754 RMD160 57ecff3f499eabf828fe5187238325b43e165eea SHA1 55dad00159b65690220bd337716b4a6a47ca3412 SHA256 d55e03ebe3a1e50b50178be79746ce6db25afde401f7d94de708715df3bb4d68
@@ -14,14 +15,14 @@ AUX vdr-graphtft-0.3.4_vdr-1.7.26_ChannelSwitch.patch 1478 RMD160 451fc490e1f816
 DIST vdr-graphtft-0.3.2.24.tar.bz2 145047 RMD160 2c767a7bf0cfa76592499953fe22141073e653ac SHA1 cc80e8b86865ec2547ad8103cac03d4ac7840a9b SHA256 86c8432c12b5a8cd8818e2b9e5f326547218bbd89d165895b95d51405b4a72d7
 DIST vdr-graphtft-0.3.4.tar.gz 176477 RMD160 5dcb4d6890cb6e7262dafc2a44a2b33db926d0e8 SHA1 d05647f1256ec07047507fba15645374c3bde06a SHA256 e4a6a4ebcce8aad161962a148ecb813609c838e4e9324a605934606dc1d87313
 EBUILD vdr-graphtft-0.3.2.24.ebuild 2383 RMD160 cd7af4a1638b60a81ea5c1504c637de64c60220e SHA1 4dfdd4d1e681fd0cea6b71b1a39304c58ef91dc8 SHA256 68ec5c3af45e9065fe3958051f31a12a410858350dcf8ffb96331b95425590cf
-EBUILD vdr-graphtft-0.3.4.ebuild 2386 RMD160 878700d63530e545c6ad65f7aca7de65ebbc17af SHA1 b7218c5ad2936da5e50f7c0716d3fac20c156bd7 SHA256 d268f768be54b84f577d9de426c86caf8cbb7ed9990730b4503b07289ea08145
-MISC ChangeLog 6824 RMD160 c339ebbaf96d8ec1fbc88671b51ffcec29bd8c7c SHA1 dc79f16d61b63b54c42c34726a27d9fd703ab715 SHA256 018fce9b76f664b6039dfa91ef848f333a444c5b0e663670c02d2ceaf423543d
+EBUILD vdr-graphtft-0.3.4.ebuild 2479 RMD160 14f865f2200d4afcc30312a7a2a15ce7375e1931 SHA1 18412b4c1f63e727b7ad854bae781ba884cad24b SHA256 e6454f53a823b3bd12419ef839fdd3e0aaf8777918c8bd66ca5ff4c0a1a1a585
+MISC ChangeLog 6959 RMD160 0e3b7560e338698da92789bcbc30d65c6cd24583 SHA1 630f720a3a48b9a58a15570aae6d38c651d44eb1 SHA256 0ea8b257c02a2ef3491733f82499c1359c63474b570ed7adc0d03bdcd37f754e
 MISC metadata.xml 659 RMD160 3fd53b58573a60e87e1f2d78f0ec7de700121244 SHA1 85ba547e5e7cf18e3554b372b9c5ffa1e94c2002 SHA256 305a976d2549db15f2261c7415fd81a8d06ec93956cd10ed271096c7cf9ad5bb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 Comment: added by hd_brummy@gentoo.org
 
-iD8DBQFPXjRhdn07HTTCgIoRAr5wAJ4/x5ONqprdD4/FA2/apaEs1At4OgCgrlfM
-Yuvq1MVeWGC8RQpKrnUonYQ=
-=Gs+K
+iD8DBQFPf5tJdn07HTTCgIoRAue6AJ4hqcAwz+M9LHqoqYrAlGEpOWCfeACeOYwX
+F1dTDNKM1rv9gk3cwGl4YzE=
+=awin
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-graphtft/files/vdr-1.7.27.diff b/media-plugins/vdr-graphtft/files/vdr-1.7.27.diff
new file mode 100644
index 000000000000..9d8d499b5168
--- /dev/null
+++ b/media-plugins/vdr-graphtft/files/vdr-1.7.27.diff
@@ -0,0 +1,73 @@
+diff -Naur graphtft-30.orig/dspitems.c graphtft-30/dspitems.c
+--- graphtft-30.orig/dspitems.c	2012-04-07 03:09:26.000000000 +0200
++++ graphtft-30/dspitems.c	2012-04-07 03:11:03.000000000 +0200
+@@ -397,7 +397,7 @@
+          else if (strcasecmp(var, "Path") == 0)
+             return Str::notNull(recording->FileName());
+          else if (strcasecmp(var, "Time") == 0)
+-            return formatDateTime(recording->start, fmt, buf, sizeof(buf));
++            return formatDateTime(recording->Start(), fmt, buf, sizeof(buf));
+          else if (strcasecmp(var, "EventID") == 0)
+             return Str::toStr(!recording->Info() ? na : (int)recording->Info()->EventID());
+          else if (strcasecmp(var, "SubTitle") == 0)
+diff -Naur graphtft-30.orig/graphtft.c graphtft-30/graphtft.c
+--- graphtft-30.orig/graphtft.c	2012-04-07 03:16:05.000000000 +0200
++++ graphtft-30/graphtft.c	2012-04-07 03:19:52.000000000 +0200
+@@ -311,7 +311,7 @@
+    GraphTFTSetup.PluginConfPath = strdup(DATA_DIR);
+ 
+ #if APIVERSNUM < 10507
+-   RegisterI18n(Phrases);
++//   RegisterI18n(Phrases);
+ #endif
+ 
+    display = new cGraphTFTDisplay(THEMEVERSION);
+diff -Naur graphtft-30.orig/graphtft.h graphtft-30/graphtft.h
+--- graphtft-30.orig/graphtft.h	2012-04-07 03:16:05.000000000 +0200
++++ graphtft-30/graphtft.h	2012-04-07 03:21:04.000000000 +0200
+@@ -16,7 +16,7 @@
+ #include <vdr/config.h>
+ 
+ #if APIVERSNUM < 10507
+-#  include "i18n.h"
++//#  include "i18n.h"
+ #  define trNOOP(s) (s)
+ #endif
+ 
+diff -Naur graphtft-30.orig/Makefile graphtft-30/Makefile
+--- graphtft-30.orig/Makefile	2012-04-07 03:16:05.000000000 +0200
++++ graphtft-30/Makefile	2012-04-07 03:18:44.000000000 +0200
+@@ -240,7 +240,7 @@
+ ### The object files (add further files here):
+ 
+ COMMONOBJS = $(PLUGIN).o dspitems.o display.o \
+-	i18n.o setup.o osd.o scan.o theme.o common.o sysinfo.o \
++	setup.o osd.o scan.o theme.o common.o sysinfo.o \
+    touchthread.o
+ 
+ # transfer.o
+@@ -311,10 +311,10 @@
+ 
+ ### Targets:
+ 
+-all: libvdr-$(PLUGIN).so i18n
++all: libvdr-$(PLUGIN).so
+ 	@cp libvdr-$(PLUGIN).so $(LIBDIR)/libvdr-$(PLUGIN).so.$(APIVERSION)
+ 
+-alli: libvdr-$(PLUGIN).so i18n
++alli: libvdr-$(PLUGIN).so
+ 
+ libvdr-$(PLUGIN).so: $(COMMONOBJS) $(IMLIBOBJS) $(DFBOBJS)
+ 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $^ $(LIBS) -o $@
+diff -Naur graphtft-30.orig/setup.h graphtft-30/setup.h
+--- graphtft-30.orig/setup.h	2012-04-07 03:16:05.000000000 +0200
++++ graphtft-30/setup.h	2012-04-07 03:21:41.000000000 +0200
+@@ -22,7 +22,7 @@
+ #include "theme.h"
+ 
+ #if APIVERSNUM < 10507
+-#  include "i18n.h"
++//#  include "i18n.h"
+ #endif
+ 
+ //***************************************************************************
diff --git a/media-plugins/vdr-graphtft/vdr-graphtft-0.3.4.ebuild b/media-plugins/vdr-graphtft/vdr-graphtft-0.3.4.ebuild
index 0ea92767ef32..96628c5d64da 100644
--- a/media-plugins/vdr-graphtft/vdr-graphtft-0.3.4.ebuild
+++ b/media-plugins/vdr-graphtft/vdr-graphtft-0.3.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-graphtft/vdr-graphtft-0.3.4.ebuild,v 1.1 2012/03/12 17:22:31 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-graphtft/vdr-graphtft-0.3.4.ebuild,v 1.2 2012/04/07 01:36:55 hd_brummy Exp $
 
 EAPI="4"
 
@@ -58,6 +58,10 @@ src_prepare() {
 
 	# UINT64_C is needed by ffmpeg headers
 	append-flags -D__STDC_CONSTANT_MACROS
+
+	if has_version ">=media-video/vdr-1.7.27"; then
+		epatch "${FILESDIR}/vdr-1.7.27.diff"
+	fi
 }
 
 src_compile() {