From: Matthias Schwarzott Date: Mon, 2 Apr 2007 10:48:19 +0000 (+0000) Subject: Added vdr-1.5 patch. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7df14ef4b22f68053aba3afdb0821966af269152;p=gentoo.git Added vdr-1.5 patch. Package-Manager: portage-2.1.2.3 --- diff --git a/media-plugins/vdr-osdteletext/ChangeLog b/media-plugins/vdr-osdteletext/ChangeLog index 3a99da2e87e2..5f096cb50a5f 100644 --- a/media-plugins/vdr-osdteletext/ChangeLog +++ b/media-plugins/vdr-osdteletext/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-plugins/vdr-osdteletext -# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-osdteletext/ChangeLog,v 1.7 2006/09/28 11:27:38 hd_brummy Exp $ +# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-osdteletext/ChangeLog,v 1.8 2007/04/02 10:48:19 zzam Exp $ + +*vdr-osdteletext-0.5.1-r1 (02 Apr 2007) + + 02 Apr 2007; Matthias Schwarzott + +files/vdr-osdteletext-0.5.1-vdr-1.5.patch, + +vdr-osdteletext-0.5.1-r1.ebuild: + Added vdr-1.5 patch. 28 Sep 2006; Joerg Bornkessel files/rc-addon.sh: correct PATH handling diff --git a/media-plugins/vdr-osdteletext/Manifest b/media-plugins/vdr-osdteletext/Manifest index 3e90565b6f96..b093090dfe11 100644 --- a/media-plugins/vdr-osdteletext/Manifest +++ b/media-plugins/vdr-osdteletext/Manifest @@ -13,15 +13,23 @@ AUX rc-addon.sh 1118 RMD160 891f99d1cf023958057fbe2ab822b2f59173ee65 SHA1 adb93e MD5 0450c4b6d9048c9d2ede560720fb7543 files/rc-addon.sh 1118 RMD160 891f99d1cf023958057fbe2ab822b2f59173ee65 files/rc-addon.sh 1118 SHA256 224a99a4006e12a653e36d9c90f9c69dc215111c8d795ff76b69d331add02042 files/rc-addon.sh 1118 +AUX vdr-osdteletext-0.5.1-vdr-1.5.patch 1646 RMD160 f87e53a04d1c660d2fae0d5cac9bc528e505f3a2 SHA1 0d4efeae2dafa1b8ca54e3d45b7340c92a1ea7b5 SHA256 88fcb36684c2c2c9b4c2cb5ddc912af17278b06e1595a3f30ac52bacf61eae7d +MD5 99599c0ee67525196a286b6ad47effec files/vdr-osdteletext-0.5.1-vdr-1.5.patch 1646 +RMD160 f87e53a04d1c660d2fae0d5cac9bc528e505f3a2 files/vdr-osdteletext-0.5.1-vdr-1.5.patch 1646 +SHA256 88fcb36684c2c2c9b4c2cb5ddc912af17278b06e1595a3f30ac52bacf61eae7d files/vdr-osdteletext-0.5.1-vdr-1.5.patch 1646 DIST vdr-osdteletext-0.5.1.tgz 58631 RMD160 b53bee592844f4527917fe28a322e3561de19092 SHA1 acb2723c4208e083a34d3e23cfae1513615b63f7 SHA256 e3cb0b95d351d0fc63ba3e1ca82f776e44f1a1945ffad574b54a55e0169fa969 +EBUILD vdr-osdteletext-0.5.1-r1.ebuild 853 RMD160 94120ec77018b25582384fe82533f1c59b4c4ec9 SHA1 f4a2c5a82143273fd9a7847c13a3726c9cc63845 SHA256 f657c197b82a2cb0350c3814347eec0a05143662901d454cfa986008ea8103cd +MD5 f8246e9364dcac919472e9f6e1bff525 vdr-osdteletext-0.5.1-r1.ebuild 853 +RMD160 94120ec77018b25582384fe82533f1c59b4c4ec9 vdr-osdteletext-0.5.1-r1.ebuild 853 +SHA256 f657c197b82a2cb0350c3814347eec0a05143662901d454cfa986008ea8103cd vdr-osdteletext-0.5.1-r1.ebuild 853 EBUILD vdr-osdteletext-0.5.1.ebuild 816 RMD160 ce2cd0cd617dcac7736425731b10d3684eba74be SHA1 e610a273173f9404ae60a91ae242f97407c5b13d SHA256 9284ddf37e0dab13eb175fe1674a1bce5b7738680bc8959b8a9f4950542995fe MD5 1b7c4e375459794e534f6747c98fc982 vdr-osdteletext-0.5.1.ebuild 816 RMD160 ce2cd0cd617dcac7736425731b10d3684eba74be vdr-osdteletext-0.5.1.ebuild 816 SHA256 9284ddf37e0dab13eb175fe1674a1bce5b7738680bc8959b8a9f4950542995fe vdr-osdteletext-0.5.1.ebuild 816 -MISC ChangeLog 1062 RMD160 13c9a632f3e013ce60207b6d2368509d5bd60fca SHA1 9c918aa395abc5f11e0c60dae4ea326dfbf7ff03 SHA256 25e426eff15371eb49d16633d5b1cb1429b450ad39c1924999375a4c6da3cff4 -MD5 d0efb8e39a099a06fd2e6d8177333508 ChangeLog 1062 -RMD160 13c9a632f3e013ce60207b6d2368509d5bd60fca ChangeLog 1062 -SHA256 25e426eff15371eb49d16633d5b1cb1429b450ad39c1924999375a4c6da3cff4 ChangeLog 1062 +MISC ChangeLog 1257 RMD160 8eb6f4d9efe72ca7d8277e4a2f78b6f7ef700af7 SHA1 b213f2983da844c0913317c65363bf2ff3d011b9 SHA256 99c2f56992d878d2f8a570244648e9fd46f039ce9ba51d054c460d4cc4b734f7 +MD5 4b6d7c99ebe1688ab6e6c26c59a0035c ChangeLog 1257 +RMD160 8eb6f4d9efe72ca7d8277e4a2f78b6f7ef700af7 ChangeLog 1257 +SHA256 99c2f56992d878d2f8a570244648e9fd46f039ce9ba51d054c460d4cc4b734f7 ChangeLog 1257 MISC metadata.xml 428 RMD160 3be78f0eb360511ef05eb47d87aa3e59ef2484af SHA1 3321e1f1de113a21ae5e707d086f5dfda96467eb SHA256 7c0b6e088887e638b4fc4107b92dc81775cd3b8c9a55b16a05c2025de3e68150 MD5 eb608a4a5e947db8ef2a8bdb8bd22402 metadata.xml 428 RMD160 3be78f0eb360511ef05eb47d87aa3e59ef2484af metadata.xml 428 @@ -29,11 +37,13 @@ SHA256 7c0b6e088887e638b4fc4107b92dc81775cd3b8c9a55b16a05c2025de3e68150 metadata MD5 9bcd6b295ffd97f60a92f9303b564a27 files/digest-vdr-osdteletext-0.5.1 253 RMD160 3a0ccfa90925e1d66b5923dd20c0a05e45ecc53f files/digest-vdr-osdteletext-0.5.1 253 SHA256 8ea6924cc92874c0f31d4399d28a20be6b5f56ebc8183d8eb4903eb208fde43a files/digest-vdr-osdteletext-0.5.1 253 +MD5 9bcd6b295ffd97f60a92f9303b564a27 files/digest-vdr-osdteletext-0.5.1-r1 253 +RMD160 3a0ccfa90925e1d66b5923dd20c0a05e45ecc53f files/digest-vdr-osdteletext-0.5.1-r1 253 +SHA256 8ea6924cc92874c0f31d4399d28a20be6b5f56ebc8183d8eb4903eb208fde43a files/digest-vdr-osdteletext-0.5.1-r1 253 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.5 (GNU/Linux) -Comment: no further Information +Version: GnuPG v2.0.3 (GNU/Linux) -iD8DBQFFG7Hkdn07HTTCgIoRAkFjAJ0QMl4ff/qpIpZJ8DWDqoIrNC24RACfVAWJ -2vC8yc/O+dX+Y15AMncvTnw= -=k13V +iD8DBQFGEN9/t2vP6XvVdOcRAmk3AKDQgPTppAzeF3TashpJKGr4IP3HVQCgvP26 +QXLan3MZElri/hQjPOkl4cc= +=8Bzn -----END PGP SIGNATURE----- diff --git a/media-plugins/vdr-osdteletext/files/digest-vdr-osdteletext-0.5.1-r1 b/media-plugins/vdr-osdteletext/files/digest-vdr-osdteletext-0.5.1-r1 new file mode 100644 index 000000000000..e1d50c2bb0e0 --- /dev/null +++ b/media-plugins/vdr-osdteletext/files/digest-vdr-osdteletext-0.5.1-r1 @@ -0,0 +1,3 @@ +MD5 52c219e38a089504071237209ad114cd vdr-osdteletext-0.5.1.tgz 58631 +RMD160 b53bee592844f4527917fe28a322e3561de19092 vdr-osdteletext-0.5.1.tgz 58631 +SHA256 e3cb0b95d351d0fc63ba3e1ca82f776e44f1a1945ffad574b54a55e0169fa969 vdr-osdteletext-0.5.1.tgz 58631 diff --git a/media-plugins/vdr-osdteletext/files/vdr-osdteletext-0.5.1-vdr-1.5.patch b/media-plugins/vdr-osdteletext/files/vdr-osdteletext-0.5.1-vdr-1.5.patch new file mode 100644 index 000000000000..eef0fe66677c --- /dev/null +++ b/media-plugins/vdr-osdteletext/files/vdr-osdteletext-0.5.1-vdr-1.5.patch @@ -0,0 +1,55 @@ +diff -aur osdteletext-0.5.1/Makefile osdteletext/Makefile +--- osdteletext-0.5.1/Makefile 2005-08-08 18:29:22.000000000 +0200 ++++ osdteletext/Makefile 2006-04-23 17:54:49.000000000 +0200 +@@ -20,7 +20,6 @@ + + ### The directory environment: + +-DVBDIR = ../../../../DVB + VDRDIR = ../../.. + LIBDIR = ../../lib + TMPDIR = /tmp +@@ -32,6 +31,10 @@ + ### The version number of VDR (taken from VDR's "config.h"): + + VDRVERSION = $(shell grep 'define VDRVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g') ++APIVERSION = $(shell grep 'define APIVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g') ++ifeq ($(strip $(APIVERSION)),) ++ APIVERSION = $(VDRVERSION) ++endif + + ### The name of the distribution archive: + +@@ -40,7 +43,7 @@ + + ### Includes and Defines (add further entries here): + +-INCLUDES += -I$(VDRDIR)/include -I$(DVBDIR)/include ++INCLUDES += -I$(VDRDIR)/include + + DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"' -D_GNU_SOURCE + +@@ -72,7 +75,7 @@ + + libvdr-$(PLUGIN).so: $(OBJS) + $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ +- @cp $@ $(LIBDIR)/$@.$(VDRVERSION) ++ @cp $@ $(LIBDIR)/$@.$(APIVERSION) + + dist: clean + @-rm -rf $(TMPDIR)/$(ARCHIVE) +Nur in osdteletext: .svn. +diff -aur osdteletext-0.5.1/txtrecv.c osdteletext/txtrecv.c +--- osdteletext-0.5.1/txtrecv.c 2005-08-12 13:20:09.000000000 +0200 ++++ osdteletext/txtrecv.c 2007-01-14 00:14:15.667936696 +0100 +@@ -692,7 +692,9 @@ + */ + + cTxtReceiver::cTxtReceiver(int TPid, tChannelID chan) +-#if VDRVERSNUM >= 10319 ++#if VDRVERSNUM >= 10500 ++ : cReceiver(chan, -1, TPid), ++#elif VDRVERSNUM >= 10319 + : cReceiver(0, -1, TPid), + #else + : cReceiver(0, -1, 1, TPid), diff --git a/media-plugins/vdr-osdteletext/vdr-osdteletext-0.5.1-r1.ebuild b/media-plugins/vdr-osdteletext/vdr-osdteletext-0.5.1-r1.ebuild new file mode 100644 index 000000000000..3f69716ccb13 --- /dev/null +++ b/media-plugins/vdr-osdteletext/vdr-osdteletext-0.5.1-r1.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-osdteletext/vdr-osdteletext-0.5.1-r1.ebuild,v 1.1 2007/04/02 10:48:19 zzam Exp ${VDRPLUGIN}/vdr-${VDRPLUGIN}-0.3.1.ebuild,v 1.1 2003/05/13 09:39:19 fow0ryl Exp $ + +inherit vdr-plugin + +DESCRIPTION="Video Disk Recorder OSD-Teletext Plugin" +HOMEPAGE="http://www.wiesweg-online.de/linux/linux.html" +SRC_URI="http://www.wiesweg-online.de/linux/vdr/${P}.tgz + mirror://vdrfiles/${PN}/${P}.tgz" + +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND=">=media-video/vdr-1.2.5" + +PATCHES="${FILESDIR}/i18n_german_lang.diff + ${FILESDIR}/${P}-vdr-1.5.patch" + +src_install() { + vdr-plugin_src_install + + # create the teletext directory + diropts -m755 -ovdr -gvdr + keepdir /var/cache/${VDRPLUGIN} + +}