* [gentoo-commits] proj/vdr/devel:master commit in: media-video/vdr/, media-video/vdr/files/
@ 2014-10-03 22:01 Joerg Bornkessel
0 siblings, 0 replies; 8+ messages in thread
From: Joerg Bornkessel @ 2014-10-03 22:01 UTC (permalink / raw
To: gentoo-commits
commit: 42d5331c35308bbd50ea46632782d149b04e3e21
Author: Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 26 20:49:52 2014 +0000
Commit: Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
CommitDate: Fri Sep 26 20:49:52 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/vdr/devel.git;a=commit;h=42d5331c
extended patchset for vdr-permashift-1;
wrt bug 521570; wrt bug 499444
Package-Manager: portage-2.2.13
Manifest-Sign-Key: 34C2808A
---
media-video/vdr/ChangeLog | 8 +
media-video/vdr/Manifest | 13 +-
media-video/vdr/files/vdr-2.1.6_gentoo.patch | 68 ++++++
media-video/vdr/metadata.xml | 1 +
media-video/vdr/vdr-2.1.6-r1.ebuild | 302 +++++++++++++++++++++++++++
5 files changed, 387 insertions(+), 5 deletions(-)
diff --git a/media-video/vdr/ChangeLog b/media-video/vdr/ChangeLog
index 9d7b2fc..877212d 100644
--- a/media-video/vdr/ChangeLog
+++ b/media-video/vdr/ChangeLog
@@ -2,6 +2,14 @@
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*vdr-2.1.6-r1 (26 Sep 2014)
+
+ 26 Sep 2014; Joerg Bornkessel <hd_brummy@gentoo.org> +vdr-2.1.6-r1.ebuild,
+ +files/vdr-2.1.6_gentoo.patch, metadata.xml:
+ extended patchset for vdr-permashift-1;
+
+ wrt bug 521570; wrt bug 499444
+
*vdr-2.1.5 (24 Feb 2014)
24 Feb 2014; Joerg Bornkessel <hd_brummy@gentoo.org> +vdr-2.1.5.ebuild:
diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index 045f5e9..d4c0c25 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -3,10 +3,12 @@ Hash: SHA256
AUX channel_alternative.conf 332 SHA256 30fb0a5147c01429c2813505cc69658cf1bfa1b70537bce07365017f653be5ce SHA512 738de5d5d99b54a516f41683834509b477590732db4e00b13b2f26e22c7349cb8517965a21251c08d29b0f368b2bb3fa64a1de71da09ffbedc5a401314a0eb5d WHIRLPOOL 96ead1c37c9e88e6593536a2182b813d3ae86c8e55e79a4cc5ff2d29ec0694405d26c82cb2295bb3f1e7e61c0ec93a646acc518e35ed6eff4d66c9219cc35677
AUX vdr-2.1.1_gentoo.patch 2488 SHA256 25275f22d8d183c089accd9463862aa772d2c13ae18c4f5769916c06b4b5918e SHA512 a36d8be52e7815165327e7322ce5f5537243a3cedc7b5e695ecddce567e8536cb44724540e5079fcda90f58a95f6fb26de4d1cc2842ce8d5460e4010623042f0 WHIRLPOOL 0885af205152ff2228bde0799a05c02efdb7fc712d740a640eecaff6296c7df1285883460e1dd452f0dbc6b4621ddcb0a7c89a21cc241a935f7b7526d2f852f5
+AUX vdr-2.1.6_gentoo.patch 2255 SHA256 75ec762630d2e9099843151fd0b6e04c5b114faea2052392144d64c648cf5482 SHA512 0711128380cec9a6ec2e8212226a4a20896888467f323bc006bd1c4cbf1b8e1ce488c2f7227e0903847888e7e37159aecf6d82fdc1b50009a1c869d3da5134c0 WHIRLPOOL e984c7fb87fa3d7eedc203e3b5ac4d2cc9b528dc3a70d8a15582c6dee58589af6d8179fa542f3f45d2e9c6d9889b90e691b77b6d3398f4b6b200635bdc2c404e
DIST extpng-vdr-2.1.1-gentoo-edition-v1.patch.bz2 76312 SHA256 42ed177d9064f555bb5396123790eaa9cf4b500536698af29bda0193c951faab SHA512 07cf50a0f9edf2f8b1542ad314b86f18b88e9409cc9aef400585c7dafb8fc691b2d476d18b088bc0d3de8ec7bf88241ba5418f99e156353cbcf78de406238cf8 WHIRLPOOL c027a0f107db181b617d3f1d3da461733bc03edd975adab03473979877ee5503efcb88903c20a0c0c1063f40710cf14c68456bc8038902b1e29f4194e02f6cb5
DIST extpng-vdr-2.1.2-gentoo-edition-v3.patch.bz2 30698 SHA256 c2ba5ada4cadb44dde87dc5de8b9a1306fa274d0cca8f856ce5e829e16d7d51f SHA512 a4520423182ef44f56b9e6807622a68ba404e1b14e81b8e4153ec23bb4f7e1ec4feabf458dfaddb9a829140e404f6988ad92dbd5b3768ff447918b609b80c29a WHIRLPOOL 9fca245602fbf5926794276da516f82d2846c53781d46720f2cab967bc7839d0494dc7592e76a864fa313ab0e04aefbba5e5f8bf429d7ccc4c31a1e126cdcba4
DIST extpng-vdr-2.1.3-gentoo-edition-v1.patch.bz2 121553 SHA256 6ca5a1db1395001cc80178e61fbc9230e425e1c0d00b386e056283e4967326d4 SHA512 22e596f618fccaa61aa48c0ca32566a7937e539c54506ffab7f1fc98261da100dfc7ef47ee043535bcd18e1fd096ca3b897b251cad1a2ab4d9c0f285aba848d1 WHIRLPOOL b122620875e822eb1a2102c4ff7dc5055c3ee5e57320db2c0d04b864ef87fe04b9b6659483b164f8bc0a8a5db6180ff6668b152357dedfc13d1de42e15645e1e
DIST extpng-vdr-2.1.5-gentoo-edition-v1.patch.bz2 30725 SHA256 eea5f1e92b5ef01d3c7165ee6bb3fa4d2daac6b5fd576b1de59775579aad87c1 SHA512 cf0ea1b756eebfb9f56cac9df126cc6b94eda2634bf9f88ec936e444744232909a11fa65e82f26f905536dd216383347010da6d5094e23c0c1210c007f54d813 WHIRLPOOL ff27809b5a454a5cecacf6ec04e6a3cc0c3b6627a7528fb42bef46ba9c7bf54b08e3b20eaeec19a997b8dd1df31bb9d41d0d176943a1c8e06b1f817b9ce91549
+DIST extpng-vdr-2.1.6-gentoo-edition-v1.patch.bz2 63223 SHA256 aade7b0d8d4158662710686ff476e59077f9bdfb9e2942a2769e69e2861c87ad SHA512 47ef68d457892591e38d74eef225ad320d3a31d86c6df2efa99a175902fa12ace9c68b52a77863b14220e1e9c261505bc4f7d8237f228a88b431a9ce792fa3a4 WHIRLPOOL 590b72be01a53a4cab0100bab198a89ee6bcb2fe38c690e1f8a23bcbecbb2097e4b544e68a1e8ab2d7cf7b1acef75b94a4917afbe9123bdfe93aaaf2bd0c83cf
DIST vdr-2.1.1.tar.bz2 842414 SHA256 96292f4f2a47fea9fdd432bdcca6e2f11747e2b19feac6d6f7af1797c5abfa37 SHA512 f31c774cc5c383b97cdae98892906c66ce27a2277ccde185815299ddd894e18908a6c252c92bddfefb82a8fe933c9c2b5e6f91947db526bb86bab9ff08cb8158 WHIRLPOOL e92705b8fec477a4e10c563f4440ba54ccb499823b15a6227ac2633fc55a56fad023b6f8b5d4450505344dfb5a1871ceb3a787c9e9470c178f947874fc79eef0
DIST vdr-2.1.2-gcc.patch.gz 542 SHA256 8ac11be7074231604868e5f4a153df44b957543227c4cb0fcadbf693900b25d8 SHA512 4b3595e3ed3ef291bf155500d96d3355656f11442bc9a9a13ddbdfc35ae3156a894c12da1f4a20bdf6a7e35c3cb0904ab1c5c2d14698ffe6595ffc9d5b37a2ad WHIRLPOOL 96cbcea605e52a76974196f5a7ec44b49222f0fb3048428286ab974ec6633e4bdd6523796a0109ba866aaba101b270b099dc4983b439d6ad84c00890cb7078d8
DIST vdr-2.1.2.tar.bz2 850237 SHA256 1bf9c636145acf2d67716475314efe9703619759f0fdbae02d89fe599730f2a4 SHA512 4e9bf4705a64d4fab790d6cf0b92151537e282a8a3a41eeb13cddf3a966b303b31fc32fd62b27450adc68134ca853aaa6dd5b6d7a9c672c6165aab9f044c19b5 WHIRLPOOL 525ce8c05cbaeb9f3d8108117fb18dc5b64885e311c3a40dd704888b0a5020cb3ef6fcd9d57af200d94ffc0479add8c6a651791885ff67f7f93cf45a0aec1d8b
@@ -19,14 +21,15 @@ EBUILD vdr-2.1.2-r1.ebuild 8321 SHA256 ff2085c3ecf9516785c3a2276bf33ed72c1bfb7b5
EBUILD vdr-2.1.3.ebuild 7580 SHA256 4f1d2cd7315feff70ad7998cf48e17000e2c11d9f31585e102116e2efb363cbc SHA512 c16bf7fb00356724d5444622f8eb44d4d82934074326da23e9cd389843d8b11384fc7aaa5d0582d90d09efc4fd4235feb8ebb08b20a52866b2bc5d86df5b2779 WHIRLPOOL a3713eeb62a91d2ab50d8bb618b5022816a54c33c5816809c4fd17b5d78351a0f0101a92da496027f555f7fd76a6abbb9dafa0021d6791b6d18057ba6b469db3
EBUILD vdr-2.1.4.ebuild 7626 SHA256 52e401c14b42ca78269b92891ecebd56e75c91d3e4057e883bd75fdc3733252c SHA512 7ac51ac0f48091330cfd35bbaaeb38bf9d1ce7939d3af4a136e751793e9e5adfc93e51c7d87309f65168f5ea487bbc0d281081c7a5f0f230d2f2495f2fab36fa WHIRLPOOL f3a10af9acd971408f0169bfee2c8ee71e136b00d55752dd6584e853b3d8c8279913d3b92e3a90c4e77448c6a94ef2de16ac994a83e15bd06581074ae7233264
EBUILD vdr-2.1.5.ebuild 7626 SHA256 4474642d859a7db733edea6d03f2cb74b140c047cc2f16633be7d9fd4f67acc4 SHA512 3847e37a87a54604566f1dd2e4f782ba0b7fb62c3cd2517fc3875e8b01b8a61058ea20a051675f9864c68354f5f4b734902bf6b31783801305a78f00d5527011 WHIRLPOOL 15d51e9631736241db7cb9365254994701496f317c1a16a8e68606a7642b63598bad540f7c8cc6920199314fe3dd08c1e3781c85dced88acf80998775bd17dca
+EBUILD vdr-2.1.6-r1.ebuild 7598 SHA256 42e8a5c0913abff0fa7d8c84862a2afec1885a5d028ed718b9380822bdad242e SHA512 d6160012db0e8ff6e9de0923ac6bf5883792ee7dba6cead3c570b2f1ef4df272778ba796cea0ac96c76f1d9315f7d7af1bb9db8593733e578954b5483813accd WHIRLPOOL 6d9fbc49bd143bc5f301fd0c057d53fbb6ea17a5ae29d35539fa416a15557f01d353e6c823163744c0e5a74ab5ce9c440571d7ba698f5a4add888f69d152bb47
EBUILD vdr-2.1.6.ebuild 7626 SHA256 8d128e1328ab8f459b9f8d572fae519fdf9164a5f2016d477a98224c9f11c73d SHA512 04d51894b136a1623ca092058c35a0d5032a5078119f54c7b31509ebc97ce0f82288f19850228608f4ba761b05fc414427a93c6a2603e4d9a2a14017c46785f2 WHIRLPOOL cf190de629d45b7e32c09d9d9a18d19bc3abb136bf49b651124972b4844e61caab5640c7057548ada98c49d53026546469c908a139e524b9fca21bd697a1f92e
-MISC ChangeLog 25471 SHA256 dce16700d2048d9dc260736651b2c1457539ae542cb6f09c7c465a0ba539a48d SHA512 7a369b5238cf1c04653eb361a1b3d4664dc5507745196fbe51bf1c6030ff22d4a24c6b6531f627b7fe09a3cb9df038ff7512810ffb0a4508818e68bc0d0ba446 WHIRLPOOL deee48eb278bb029977f04795729794e81dd8f40e958e1eaf8381640a364699faee5132c65ea93be11e86d323f72d4dad0e3b1e926e1f854e20809535f5fccf9
-MISC metadata.xml 1955 SHA256 bd67b709aec3d06a0d3911bb8105626e435b072572bfea89b2314a4879a2ab72 SHA512 22f93d7f4ffbc5458ec35b49cf716427f8d29021ae35b01514b3dd58776f4b2a537fb7c814dc7c104616315f0aa7b8fac51fc1ce4402dcafa57db779206649d5 WHIRLPOOL d4a204d2dfffeaa1901c4e917f1942cf8fd72e50262a082a13c07171d6572ed96c4d4c0aeeee8cb873288b69d5be714bf14b12b1bba5801d9cd7af5114706629
+MISC ChangeLog 25701 SHA256 293d34461686e0364a298d8da28ee02777bd66be19ba0663fa958ca16c595ca3 SHA512 bfc91f18b3a65ae894bfb63b09d99fa3b736604f4f59b48cd4f1f5748d9ec5469e149dc7b6242d09d96f1f0d9bee79eb56b4cb50207a5d458ca65257b69ab107 WHIRLPOOL f085b38785e0aaf1e6901e6148e439026d8049baa21f66859e68fd87ee4e074de23e2feb21d01e68bad40543a25a97ea015f65a9bf70fda30e7d15d01b929c87
+MISC metadata.xml 2071 SHA256 d308d181e741e458ef838af1e003e85323eb23f17b9de610317fe45a7ef92d8f SHA512 cb7c405c0d07ec536d5db70db514121e96f73b4ade0eca80d5e5c12f3cc4f209ce5d1c1c3b3129aaa8f974b843a54fda73684d05c684e403d955079d0f119e56 WHIRLPOOL e606dcf24f8bbcd427ff9e3c26ae022c50332cec79cdb1f39febe7fd25f076a9ab2439232b4b7870ea3e000026b5163f6ceb8727b77f5609060f710f40b3a498
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
Comment: added by hd_brummy@gentoo.org
-iD8DBQFTJfF4dn07HTTCgIoRCHQiAJ96pI3pHRrZNgo0s/YpP0Ss9u/DZwCgtHqM
-QN5CUr/48uZcVZ43jxWab5c=
-=O2bY
+iD8DBQFUJdFwdn07HTTCgIoRCG4xAKC3DkeVqnFUlDVmJ0liROsfCtw/DwCdEk4T
+iccb7Z+uP6/3xiY9rdNILec=
+=j7Ku
-----END PGP SIGNATURE-----
diff --git a/media-video/vdr/files/vdr-2.1.6_gentoo.patch b/media-video/vdr/files/vdr-2.1.6_gentoo.patch
new file mode 100644
index 0000000..708760c
--- /dev/null
+++ b/media-video/vdr/files/vdr-2.1.6_gentoo.patch
@@ -0,0 +1,68 @@
+diff -Naur vdr-2.1.6.orig/Makefile vdr-2.1.6/Makefile
+--- vdr-2.1.6.orig/Makefile 2014-09-26 17:29:18.000000000 +0200
++++ vdr-2.1.6/Makefile 2014-09-26 18:45:13.000000000 +0200
+@@ -114,7 +114,7 @@
+ VDRVERSION = $(shell sed -ne '/define VDRVERSION/s/^.*"\(.*\)".*$$/\1/p' config.h)
+ APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' config.h)
+
+-all: vdr i18n plugins
++all: vdr i18n
+
+ # Implicit rules:
+
+@@ -167,7 +167,7 @@
+
+ PODIR = po
+ LOCALEDIR = locale
+-I18Npo = $(wildcard $(PODIR)/*.po)
++I18Npo = $(foreach dir,$(LINGUAS),$(wildcard $(PODIR)/$(dir)*.po))
+ I18Nmo = $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file))))
+ I18Nmsgs = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr.mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
+ I18Npot = $(PODIR)/vdr.pot
+@@ -190,7 +190,7 @@
+
+ install-i18n: i18n
+ @mkdir -p $(DESTDIR)$(LOCDIR)
+- cp -r $(LOCALEDIR)/* $(DESTDIR)$(LOCDIR)
++ @(cd $(LOCALEDIR); for linguas in $(LINGUAS); do [ "$$linguas" = "en" ] && continue; cp -r --parents $$linguas* $(DESTDIR)$(LOCDIR); done)
+
+ # The 'include' directory (for plugins):
+
+@@ -252,7 +252,7 @@
+
+ # Install the files (note that 'install-pc' must be first!):
+
+-install: install-pc install-bin install-dirs install-conf install-doc install-plugins install-i18n install-includes
++install: install-pc install-bin install-dirs install-conf install-doc install-i18n install-includes
+
+ # VDR binary:
+
+@@ -264,11 +264,12 @@
+
+ install-dirs:
+ @mkdir -p $(DESTDIR)$(VIDEODIR)
+- @mkdir -p $(DESTDIR)$(CONFDIR)
+- @mkdir -p $(DESTDIR)$(CACHEDIR)
++# @mkdir -p $(DESTDIR)$(CONFDIR)
++# @mkdir -p $(DESTDIR)$(CACHEDIR)
+ @mkdir -p $(DESTDIR)$(RESDIR)
+
+ install-conf:
++ @mkdir -p $(DESTDIR)$(CONFDIR)
+ @cp -pn *.conf $(DESTDIR)$(CONFDIR)
+
+ # Documentation:
+@@ -295,8 +296,11 @@
+ # Includes:
+
+ install-includes: include-dir
+- @mkdir -p $(DESTDIR)$(INCDIR)
+- @cp -pLR include/vdr include/libsi $(DESTDIR)$(INCDIR)
++# @mkdir -p $(DESTDIR)$(INCDIR)
++# @cp -pLR include/vdr include/libsi $(DESTDIR)$(INCDIR)
++ @mkdir -p $(DESTDIR)$(INCDIR)/vdr $(DESTDIR)$(INCDIR)/vdr/libsi
++ @cp -pLR include/vdr $(DESTDIR)$(INCDIR)
++ @cp -pLR include/libsi Make.config $(DESTDIR)$(INCDIR)/vdr
+
+ # pkg-config file:
+
diff --git a/media-video/vdr/metadata.xml b/media-video/vdr/metadata.xml
index 892b779..9a90cac 100644
--- a/media-video/vdr/metadata.xml
+++ b/media-video/vdr/metadata.xml
@@ -22,6 +22,7 @@
<flag name="menuselection">adds support for menu hotkeys of double digits</flag>
<flag name="naludump">Removes NALU fill data from h.264-Streams of TS files</flag>
<flag name="permashift">permanent timeshift by recording live TV on hard disk, need plugin vdr-permashift</flag>
+ <flag name="permashift_v1">permanent timeshift by recording live TV on RAM, need plugin >=vdr-permashift-1</flag>
<flag name="pinplugin">Support for pin plugin</flag>
<flag name="resumereset">rreset resume of EOF</flag>
<flag name="setup">Enable support for the plugin vdr-setup</flag>
diff --git a/media-video/vdr/vdr-2.1.6-r1.ebuild b/media-video/vdr/vdr-2.1.6-r1.ebuild
new file mode 100644
index 0000000..ef99ecf
--- /dev/null
+++ b/media-video/vdr/vdr-2.1.6-r1.ebuild
@@ -0,0 +1,302 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-2.0.2-r1.ebuild,v 1.2 2013/07/07 09:52:20 hd_brummy Exp $
+
+EAPI=5
+
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+# Switches supported by extensions-patch
+EXT_PATCH_FLAGS="alternatechannel binaryskip graphtft jumpingseconds jumpplay naludump permashift
+ permashift_v1 pinplugin mainmenuhooks menuorg menuselection resumereset ttxtsubs wareagleicon yaepg"
+# ddepgentry
+
+# names of the use-flags
+EXT_PATCH_FLAGS_RENAMED=""
+
+# names ext-patch uses internally, here only used for maintainer checks
+EXT_PATCH_FLAGS_RENAMED_EXT_NAME=""
+
+IUSE="bidi debug html vanilla ${EXT_PATCH_FLAGS} ${EXT_PATCH_FLAGS_RENAMED}"
+
+MY_PV="${PV%_p*}"
+MY_P="${PN}-${MY_PV}"
+S="${WORKDIR}/${MY_P}"
+
+EXT_P="extpng-${P}-gentoo-edition-v1"
+#EXT_P="extpng-${PN}-2.1.6-gentoo-edition-v1"
+
+DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB"
+HOMEPAGE="http://www.tvdr.de/"
+SRC_URI="ftp://ftp.tvdr.de/vdr/Developer/${MY_P}.tar.bz2
+ http://dev.gentoo.org/~hd_brummy/distfiles/${EXT_P}.patch.bz2"
+
+KEYWORDS="~arm ~amd64 ~ppc ~x86"
+SLOT="0"
+LICENSE="GPL-2"
+
+REQUIRED_USE="
+ permashift? ( !permashift_v1 )
+ permashift_v1? ( !permashift )"
+
+COMMON_DEPEND="virtual/jpeg
+ sys-libs/libcap
+ >=media-libs/fontconfig-2.4.2
+ >=media-libs/freetype-2"
+
+DEPEND="${COMMON_DEPEND}
+ >=virtual/linuxtv-dvb-headers-5.3
+ sys-devel/gettext"
+
+RDEPEND="${COMMON_DEPEND}
+ dev-lang/perl
+ >=media-tv/gentoo-vdr-scripts-2.5_rc1
+ media-fonts/corefonts
+ bidi? ( dev-libs/fribidi )"
+
+CONF_DIR=/etc/vdr
+CAP_FILE=${S}/capabilities.sh
+CAPS="# Capabilities of the vdr-executable for use by startscript etc."
+
+pkg_setup() {
+
+ use debug && append-flags -g
+
+ PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins"
+
+ tc-export CC CXX AR
+}
+
+add_cap() {
+ local arg
+ for arg; do
+ CAPS="${CAPS}\n${arg}=1"
+ done
+}
+
+enable_patch() {
+ local arg ARG_UPPER
+ for arg; do
+ ARG_UPPER=$(echo $arg|tr '[:lower:]' '[:upper:]')
+ echo "${ARG_UPPER} = 1" >> Make.config
+
+ # codesnippet to bring the extpng defines into the vdr.pc CXXFLAGS CFLAGS
+ echo "-DUSE_${ARG_UPPER}" >> "${T}"/defines.tmp
+ cat "${T}"/defines.tmp | tr \\\012 ' ' > "${T}"/defines.IUSE
+ export DEFINES_IUSE=$( cat ${T}/defines.IUSE )
+ done
+}
+
+extensions_add_make_conf()
+{
+ # copy all ifdef for extensions-patch to Make.config
+ sed -e '1,/need to touch the following:/d' \
+ -e '/need to touch the following/,/^$/d' \
+ Make.config.template >> Make.config
+}
+
+extensions_all_defines() {
+ # extract all possible settings for extensions-patch
+ sed -e '/^#\?[A-Z].*= 1/!d' -e 's/^#\?//' -e 's/ .*//' \
+ Make.config.template \
+ | sort \
+ | tr '[:upper:]' '[:lower:]'
+}
+
+lang_po() {
+ LING_PO=$( ls ${S}/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' )
+}
+
+src_prepare() {
+ # apply maintainace-patches
+ ebegin "Changing paths for gentoo"
+
+ local DVBDIR=/usr/include
+ local i
+ for i in ${DVB_HEADER_PATH} /usr/include/v4l-dvb-hg /usr/include; do
+ [[ -d ${i} ]] || continue
+ if [[ -f ${i}/linux/dvb/dmx.h ]]; then
+ einfo "Found DVB header files in ${i}"
+ DVBDIR=${i}
+ break
+ fi
+ done
+
+ # checking for s2api headers
+ local api_version
+ api_version=$(awk -F' ' '/define DVB_API_VERSION / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
+ api_version=${api_version}*$(awk -F' ' '/define DVB_API_VERSION_MINOR / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
+
+ if [[ ${api_version:-0} -lt 5*3 ]]; then
+ eerror "DVB header files do not contain s2api support or too old for ${P}"
+ eerror "You cannot compile VDR against old dvb-header"
+ die "DVB headers too old"
+ fi
+
+ cat > Make.config <<-EOT
+ #
+ # Generated by ebuild ${PF}
+ #
+ PREFIX = /usr
+ DVBDIR = ${DVBDIR}
+ PLUGINLIBDIR = ${PLUGIN_LIBDIR}
+ CONFDIR = ${CONF_DIR}
+ VIDEODIR = /var/vdr/video
+ LOCDIR = \$(PREFIX)/share/locale
+ INCDIR = \$(PREFIX)/include
+
+ DEFINES += -DCONFDIR=\"\$(CONFDIR)\"
+ INCLUDES += -I\$(DVBDIR)
+
+ # >=vdr-1.7.36-r1; parameter only used for compiletime on vdr
+ # PLUGINLIBDIR (plugin Makefile old) = LIBDIR (plugin Makefile new)
+ LIBDIR = ${PLUGIN_LIBDIR}
+ PCDIR = /usr/$(get_libdir)/pkgconfig
+ EOT
+ eend 0
+
+ # support languages, written from right to left
+ BUILD_PARAMS+=" BIDI=$(usex bidi 1 0)"
+
+ epatch "${FILESDIR}/${P}_gentoo.patch"
+
+ if ! use vanilla; then
+
+ # Now apply extensions patch
+ epatch "${WORKDIR}/${EXT_P}.patch"
+
+ # This allows us to start even if some plugin does not exist
+ # or is not loadable.
+ enable_patch PLUGINMISSING
+
+ if [[ -n ${VDR_MAINTAINER_MODE} ]]; then
+ einfo "Doing maintainer checks:"
+
+ # we do not support these patches
+ # (or have them already hard enabled)
+ local IGNORE_PATCHES="pluginmissing"
+
+ extensions_all_defines > "${T}"/new.IUSE
+ echo $EXT_PATCH_FLAGS $EXT_PATCH_FLAGS_RENAMED_EXT_NAME \
+ $IGNORE_PATCHES | \
+ tr ' ' '\n' |sort > "${T}"/old.IUSE
+ local DIFFS=$(diff -u "${T}"/old.IUSE "${T}"/new.IUSE|grep '^[+-][^+-]')
+ if [[ -z ${DIFFS} ]]; then
+ einfo "EXT_PATCH_FLAGS is up to date."
+ else
+ ewarn "IUSE differences!"
+ local diff
+ for diff in $DIFFS; do
+ ewarn "$diff"
+ done
+ fi
+ fi
+
+ ebegin "Enabling selected patches"
+ local flag
+ for flag in $EXT_PATCH_FLAGS; do
+ use $flag && enable_patch ${flag}
+ done
+
+ eend 0
+
+ extensions_add_make_conf
+
+ # add defined use-flags compile options to vdr.pc
+ sed -e "s:\$(CDEFINES) \$(CINCLUDES) \$(HDRDIR):\$(CDEFINES) \$(CINCLUDES) \$(HDRDIR) \$(DEFINES_IUSE):" \
+ -i Makefile
+
+ ebegin "Make depend"
+ emake .dependencies >/dev/null
+ eend $? "make depend failed"
+ fi
+
+ epatch_user
+
+ add_cap CAP_UTF8
+
+ add_cap CAP_IRCTRL_RUNTIME_PARAM \
+ CAP_VFAT_RUNTIME_PARAM \
+ CAP_CHUID \
+ CAP_SHUTDOWN_AUTO_RETRY
+
+ echo -e ${CAPS} > "${CAP_FILE}"
+
+ # LINGUAS support
+ einfo "\n \t VDR supports the LINGUAS values"
+
+ lang_po
+
+ einfo "\t Please set one of this values in your sytem make.conf"
+ einfo "\t LINGUAS=\"${LING_PO}\"\n"
+
+ if [[ -z ${LINGUAS} ]]; then
+ einfo "\n \t No values in LINGUAS="
+ einfo "\t You will get only english text on OSD \n"
+ fi
+
+ strip-linguas ${LING_PO} en
+}
+
+src_install() {
+ # trick makefile not to create a videodir by supplying it with an existing
+ # directory
+ emake \
+ VIDEODIR="/" \
+ DESTDIR="${D}" install || die "emake install failed"
+
+ keepdir "${PLUGIN_LIBDIR}"
+
+ keepdir "${CONF_DIR}"/plugins
+ keepdir "${CONF_DIR}"/themes
+
+ if use html; then
+ dohtml *.html
+ fi
+
+ dodoc MANUAL INSTALL README* HISTORY CONTRIBUTORS
+
+ insinto /usr/share/vdr
+ doins "${CAP_FILE}"
+
+ if use alternatechannel; then
+ insinto /etc/vdr
+ doins "${FILESDIR}"/channel_alternative.conf
+ fi
+
+ chown -R vdr:vdr "${D}/${CONF_DIR}"
+}
+
+#pkg_preinst() {
+
+# example syntax...
+# has_version "<${CATEGORY}/${PN}-1.7.36"
+# previous_less_than_1_7_36=$?
+#}
+
+pkg_postinst() {
+
+ elog "This is a *developer* version."
+ elog "We strongly recommend that you only use it under controlled"
+ elog "conditions and for testing and debugging."
+
+ # correct wrong permission from earlier install
+ CACHEOWNER="$(stat -c %U /var/cache/vdr)"
+ if [ ! ${CACHEOWNER} == vdr ]; then
+ chown -R vdr:vdr "${ROOT}/var/cache/vdr"
+ fi
+
+# example syntax
+# if [[ previous_less_than_1_7_36=$? = 0 ]] ; then
+ #elog "bla foo"
+# fi
+
+ elog "It is a good idea to run vdrplugin-rebuild now."
+
+ elog "To get nice symbols in OSD we recommend to install"
+ elog "\t1. emerge media-fonts/vdrsymbols-ttf"
+ elog "\t2. select font VDRSymbolsSans in Setup"
+ elog ""
+ elog "To get an idea how to proceed now, have a look at our vdr-guide:"
+ elog "\thttp://www.gentoo.org/doc/en/vdr-guide.xml"
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] proj/vdr/devel:master commit in: media-video/vdr/, media-video/vdr/files/
@ 2015-01-22 2:32 Joerg Bornkessel
0 siblings, 0 replies; 8+ messages in thread
From: Joerg Bornkessel @ 2015-01-22 2:32 UTC (permalink / raw
To: gentoo-commits
commit: 5fae3438ab90b864e5d7c1d0361be15e8e0dfb95
Author: Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 18 13:02:40 2015 +0000
Commit: Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
CommitDate: Sun Jan 18 13:02:40 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/vdr/devel.git;a=commit;h=5fae3438
bump
Package-Manager: portage-2.2.15
Manifest-Sign-Key: 34C2808A
---
media-video/vdr/ChangeLog | 6 +
media-video/vdr/Manifest | 12 +-
media-video/vdr/files/vdr-2.1.7_C++11.patch | 86 ++++++++
media-video/vdr/files/vdr-2.1.7_gentoo.patch | 70 ++++++
media-video/vdr/vdr-2.1.7.ebuild | 307 +++++++++++++++++++++++++++
5 files changed, 477 insertions(+), 4 deletions(-)
diff --git a/media-video/vdr/ChangeLog b/media-video/vdr/ChangeLog
index d6481d4..ad83044 100644
--- a/media-video/vdr/ChangeLog
+++ b/media-video/vdr/ChangeLog
@@ -2,6 +2,12 @@
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*vdr-2.1.7 (18 Jan 2015)
+
+ 18 Jan 2015; Joerg Bornkessel <hd_brummy@gentoo.org> +vdr-2.1.7.ebuild,
+ +files/vdr-2.1.7_C++11.patch, +files/vdr-2.1.7_gentoo.patch:
+ bump
+
04 Jan 2015; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-2.1.1.ebuild,
vdr-2.1.2-r1.ebuild, vdr-2.1.3.ebuild, vdr-2.1.4.ebuild, vdr-2.1.5.ebuild,
vdr-2.1.6.ebuild, vdr-2.1.6-r1.ebuild, vdr-2.1.6-r2.ebuild:
diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index 995c2a5..99f2e0d 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -4,6 +4,8 @@ Hash: SHA256
AUX channel_alternative.conf 332 SHA256 30fb0a5147c01429c2813505cc69658cf1bfa1b70537bce07365017f653be5ce SHA512 738de5d5d99b54a516f41683834509b477590732db4e00b13b2f26e22c7349cb8517965a21251c08d29b0f368b2bb3fa64a1de71da09ffbedc5a401314a0eb5d WHIRLPOOL 96ead1c37c9e88e6593536a2182b813d3ae86c8e55e79a4cc5ff2d29ec0694405d26c82cb2295bb3f1e7e61c0ec93a646acc518e35ed6eff4d66c9219cc35677
AUX vdr-2.1.1_gentoo.patch 2488 SHA256 25275f22d8d183c089accd9463862aa772d2c13ae18c4f5769916c06b4b5918e SHA512 a36d8be52e7815165327e7322ce5f5537243a3cedc7b5e695ecddce567e8536cb44724540e5079fcda90f58a95f6fb26de4d1cc2842ce8d5460e4010623042f0 WHIRLPOOL 0885af205152ff2228bde0799a05c02efdb7fc712d740a640eecaff6296c7df1285883460e1dd452f0dbc6b4621ddcb0a7c89a21cc241a935f7b7526d2f852f5
AUX vdr-2.1.6_gentoo.patch 2255 SHA256 75ec762630d2e9099843151fd0b6e04c5b114faea2052392144d64c648cf5482 SHA512 0711128380cec9a6ec2e8212226a4a20896888467f323bc006bd1c4cbf1b8e1ce488c2f7227e0903847888e7e37159aecf6d82fdc1b50009a1c869d3da5134c0 WHIRLPOOL e984c7fb87fa3d7eedc203e3b5ac4d2cc9b528dc3a70d8a15582c6dee58589af6d8179fa542f3f45d2e9c6d9889b90e691b77b6d3398f4b6b200635bdc2c404e
+AUX vdr-2.1.7_C++11.patch 4553 SHA256 3ff8f4762009a932cf63c4239e21f4cca2445cce160b578e5c5c5979b3fefc54 SHA512 41376c3a4bc4754401e2ce140aea5ce1a1b5ad4388c95446b8e1c8e7ab8acd21c35f24d961b4c16b4cc2500d73345cb73a8b4fa2c13dc90cb781dcac625195ec WHIRLPOOL 3b21733e5b065fc2d4188dfa872557cd4558265f3eaea3411d5a402c1cad14ed86379623e25ab908a4c43e165d4ac171bb1788b71b9b6644fd6510a928150f68
+AUX vdr-2.1.7_gentoo.patch 2322 SHA256 8088a4f314e0b8d908f82cfe2a7392a18db679a7324bfa92dce49431c50313ec SHA512 c6953a7fb77717fdaa8ca05550496e25f4bc60d91c13ed0fb23d27e1a1ec433ec2d5cfb019717cf09eb7b67c9ebb91664b1b731dc28bc4f25e815871f6de0bc7 WHIRLPOOL 88d4e8407b085604525d9bae1f34a957ae5f168ac657a99c45dcba5f08185351ccb03736cfc464960d3f2157ac6357ffbf8b602dd1da49ee94efb403f71731d8
DIST extpng-vdr-2.1.1-gentoo-edition-v1.patch.bz2 76312 SHA256 42ed177d9064f555bb5396123790eaa9cf4b500536698af29bda0193c951faab SHA512 07cf50a0f9edf2f8b1542ad314b86f18b88e9409cc9aef400585c7dafb8fc691b2d476d18b088bc0d3de8ec7bf88241ba5418f99e156353cbcf78de406238cf8 WHIRLPOOL c027a0f107db181b617d3f1d3da461733bc03edd975adab03473979877ee5503efcb88903c20a0c0c1063f40710cf14c68456bc8038902b1e29f4194e02f6cb5
DIST extpng-vdr-2.1.2-gentoo-edition-v3.patch.bz2 30698 SHA256 c2ba5ada4cadb44dde87dc5de8b9a1306fa274d0cca8f856ce5e829e16d7d51f SHA512 a4520423182ef44f56b9e6807622a68ba404e1b14e81b8e4153ec23bb4f7e1ec4feabf458dfaddb9a829140e404f6988ad92dbd5b3768ff447918b609b80c29a WHIRLPOOL 9fca245602fbf5926794276da516f82d2846c53781d46720f2cab967bc7839d0494dc7592e76a864fa313ab0e04aefbba5e5f8bf429d7ccc4c31a1e126cdcba4
DIST extpng-vdr-2.1.3-gentoo-edition-v1.patch.bz2 121553 SHA256 6ca5a1db1395001cc80178e61fbc9230e425e1c0d00b386e056283e4967326d4 SHA512 22e596f618fccaa61aa48c0ca32566a7937e539c54506ffab7f1fc98261da100dfc7ef47ee043535bcd18e1fd096ca3b897b251cad1a2ab4d9c0f285aba848d1 WHIRLPOOL b122620875e822eb1a2102c4ff7dc5055c3ee5e57320db2c0d04b864ef87fe04b9b6659483b164f8bc0a8a5db6180ff6668b152357dedfc13d1de42e15645e1e
@@ -16,6 +18,7 @@ DIST vdr-2.1.3.tar.bz2 862445 SHA256 959c3243672ffd8b67da7072e7201f2b483b684fb18
DIST vdr-2.1.4.tar.bz2 862733 SHA256 a3208d6229622b089d19c238c5b78b80e7d82e0220710e8044ea8729c6931202 SHA512 269c145d8547b66ba5782aadfa9b479d2237cae674af080701d50b42c4a29872f187dea4b8c47f7326dec4958c8671fb5286131f5169b9ffa6e8ca56366a1b14 WHIRLPOOL d97ff9e91719492306ab115a484113793f34324bd5626ebdd105f2d94287465fd921eb8d92f4c35594c5145ed9bd3346164efa2fd247cbe7c83cae55de053457
DIST vdr-2.1.5.tar.bz2 869767 SHA256 e642dcaaa1a5edc3683e33c5b154c6439a1427c24dc8685f36a0bb919774a890 SHA512 3bb6192ac7d7db024838c0d4f07797f70ee4da02b14ae0effa24f3b079fea8f42be089754cbffad013dbf9d87829d20b3dee66eed390b061088487f2784c8c75 WHIRLPOOL b2a6e5742fa6212f453713dad574dc51102ccfa2b9aaa036ea53249d220404157ced8e9c20d9550184741edb5211de9286a9c3e6249c07949fab54a0b727acff
DIST vdr-2.1.6.tar.bz2 872380 SHA256 232a326f9a4a609746da42a9c7ee632f394496b7e8215d71dfdcff3fcde4e145 SHA512 ce98ff6167e340ec7cd8d23012e2632f5a41fe20979359c2684771ba86458bb6b48736b34b9474f6ccb7492951c69a3849c086848c2870e8c7476941f64022df WHIRLPOOL df9159648464682841b5ed9c14a584c53e154f74084c432e6e5e94bf2b0e095c72b23e25329f582fd1e18b34c93717f1d91f7ff6c3a29887ad870021eaecc2a3
+DIST vdr-2.1.7.tar.bz2 880225 SHA256 86fcf656bc121e4cb8b92a2c06dbeda7b22dfd033ba74b9940f368e82fdbcafc SHA512 32d1a14fbbafd28870f5c30009fa9ae38ff34933ae3b6eb00029284f3c4ddc039bae563ed8381792c47006d26d6a33a19b67e29a227eac6f0ff36a7bbe9faa30 WHIRLPOOL 7a49a332f508ff2ec3597ccf4c944249f3380a5559bb5e225083376e1813280fbf2e56356d1345c2f7383ddbf81e94d1d9fe4c4604b3addb5e276a9060255f55
EBUILD vdr-2.1.1.ebuild 8500 SHA256 dd4e4100a0db15897ade0cf0b34348052dba6dcb531bce73096126a4684f159f SHA512 fee916284d4252180bdf1ee099eb0bd6d577eecb7f3a39607ae50b3f7e977393edf9b0aa4b65f9d7c7a711f61145f2cc8e44a6faa6d19812c40f8bca19f1d6c6 WHIRLPOOL ffa40b3f63ad2d697cf9297e733eb7047b6a20c39ecb7649a216dc615d090e3a13962b63231c58ea4c17b63b65e15a8e37aecb4e95261ccf2e44d2041bd5824b
EBUILD vdr-2.1.2-r1.ebuild 8311 SHA256 9bb5f5f02624f885bffb29f4703d9f8fc73dfd5c1b2dbbfee510fa0e88bf0e0d SHA512 6e5cb3e1e554bb159ae693c023208a52547549e943a959c747d32a957b031c72848717556a7b99e0d3efc6c6d305b257d448d7144dac6fe544d4cbf336622b84 WHIRLPOOL ebf0a876e87b376bc81af8e8f9af05b603e873f789f5ca135977aa7feeb8e529cdbd1caf0c931218e296baccc4ebbef1dbf4bdd38ffa176657166da14ab4924b
EBUILD vdr-2.1.3.ebuild 7570 SHA256 f9a7b23ec5d6d7f671dd5180ba32a3858223a0778f25f78d03a190553fbfb020 SHA512 086312ab9572b64342cc56c33178cfd2e7aa0ea961dde3c942758d9f7a821da2c03a495ec7aa8cc8a83016324f7fee0d6863aede6c5f34b104880066bc680ccc WHIRLPOOL ba1427d2e9d9539ba1791f1e381f8383bf116ac16887d8a67f3be70ecadeb29bb053a74f18be3233a415f0cd443f7885ca9348b0c0cb65cf36456f1769f07761
@@ -24,13 +27,14 @@ EBUILD vdr-2.1.5.ebuild 7616 SHA256 1ba2350f5a43fb520ab8c0bad29b59c42431b2219637
EBUILD vdr-2.1.6-r1.ebuild 7588 SHA256 aab0a8b51860d6e99bffe5490ca7ce8ed218a4368f257cd938aca70b7e78fa1a SHA512 43f8a20f215b62f27013c8b4961c1f6446fa0d42b125c54e5f60a5d903273d7328d8cc20d2c221d9ca5fa12fe745e8e867a543b2a36254ec6b1ad001353db2de WHIRLPOOL 380d1368d680b0db24a487f25e1080c67a3b9e133c700672be8a2b38b469288291abfd86735b31b1c6f99e5de346bf399bfc13e14c9ba5e11695fd55505081f1
EBUILD vdr-2.1.6-r2.ebuild 7648 SHA256 9949037814fa0636037325e94067838e6df6dce8a0dc77fd20c8abaa08ee3e5a SHA512 2f44e6d552b5da3589ca3a6144d4d2ff76a822f955023855690ea386f98cb7ff6f43a3faa470a1659338e8c43d8e2b3ccee0e915ed41738bfd8b191ea372ee58 WHIRLPOOL 5b2775f70851b4bd94e9382e8b3709e08b53c63a9fae0f64fa7f7b0038c9d4d6ba5d2a60a6e41ce34d48ef9475c56bc7eaa80fabaeb356a335c8fe57edeb50ea
EBUILD vdr-2.1.6.ebuild 7616 SHA256 ca9c89b9db90646cfe89964f8f5094af9c8be19404ea3d05ba75d2283af40f6a SHA512 0ea0d208c8140cb158a98cdc8ffd0711d0bf5b2fc635f3724ee7273e735371d232ce7bd7086805b0c38bd9c3f8e04b438d28b81b76c4f6f2c6f1d2acd0cc8b33 WHIRLPOOL 5580d45a8d145e481cfb04ef338868b94398f434ff2daed0f77d347b471b1ce8ec4e35a9ef48c3f1d2368dca57074201456be22f4236bc41bf7f0442eaea38b3
-MISC ChangeLog 26231 SHA256 fb22ed04f5a84e6c07a176e1152f49e313e0d708d08b97855923290166a10c65 SHA512 3a3e0d9e565a01c5cf0aba484719c14fba9660f30fde7ec11d41d437d8b283e57e6da9d3e4b51bc4a7f8911670ce6aa932e24041d9204275222078ef67633cec WHIRLPOOL cf80d8b66e792127d094362a067263c069fc4c62abda5792c4f2d21e6c825a3acde7fe1aa264820abf26e990bb8de016813a29a5d5e24e3d09739f838db5752f
+EBUILD vdr-2.1.7.ebuild 7724 SHA256 352022abc89e0fee871f672c8d476a9d1529eca9a817ee7d0d60edc3986dbfd3 SHA512 ee62924473e3909f578805db1bc58c17f657c6adf5f8a3948f83ae9366cea8f101f341f6a5789a8e00236d110db50f01f453dd13e7c0f65dd2915750fb6860dc WHIRLPOOL dd3570aee1e0236caf9a2c40122f28e787933128c6d1f938a74c889725f2a8e4295cbd8fa4951030164364db2d1669b8bc75a8f9df31b053cd61fedd81695d1f
+MISC ChangeLog 26402 SHA256 c75f7c5aa9bcf6c553a87e747a23ce25bac72f90f8f6a2e8281cc7c6fc59113c SHA512 45159c5e8a605a6456b1efa08bb0fb2e6e17f3a7c9cadbfdf2150cceae62540c5ec41a0ca2288089f6d92bebbc67cb9c43d354ccc6ea040c61d167d6c9905565 WHIRLPOOL 8a77b2548e5af3dd2c4ec400565dc7697b38e663f0ee5de6899adcc5c6e006c5d0bdda5e679378d72081406733a8eaf1372b17518386a565c4db4d2494511b72
MISC metadata.xml 2071 SHA256 d308d181e741e458ef838af1e003e85323eb23f17b9de610317fe45a7ef92d8f SHA512 cb7c405c0d07ec536d5db70db514121e96f73b4ade0eca80d5e5c12f3cc4f209ce5d1c1c3b3129aaa8f974b843a54fda73684d05c684e403d955079d0f119e56 WHIRLPOOL e606dcf24f8bbcd427ff9e3c26ae022c50332cec79cdb1f39febe7fd25f076a9ab2439232b4b7870ea3e000026b5163f6ceb8727b77f5609060f710f40b3a498
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
Comment: added by hd_brummy@gentoo.org
-iD8DBQFUqJYGdn07HTTCgIoRCNNJAKCoiQ6xVE9Ihi4jcIH8U66KZoUWjwCfQnQU
-omvfJ8eIm/KOjeCxX9ADc5M=
-=1nz/
+iD8DBQFUu67wdn07HTTCgIoRCF9bAKC9C3C0GwTNLucBMXq8f+m3xqNFTQCfZDiM
+MRgsJAAEi90v6lEweE1tMLc=
+=N2bC
-----END PGP SIGNATURE-----
diff --git a/media-video/vdr/files/vdr-2.1.7_C++11.patch b/media-video/vdr/files/vdr-2.1.7_C++11.patch
new file mode 100644
index 0000000..6746968
--- /dev/null
+++ b/media-video/vdr/files/vdr-2.1.7_C++11.patch
@@ -0,0 +1,86 @@
+Invalid suffix on Literal with GCC 4.8 and C++11
+warning: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wliteral-suffix]
+
+Signed-of-by: Joerg Bornkessel <hd_brummy@gentoo.org> Jan/18/2015
+
+diff -Naur vdr-2.1.7.orig/dvbsubtitle.c vdr-2.1.7/dvbsubtitle.c
+--- vdr-2.1.7.orig/dvbsubtitle.c 2015-01-18 12:52:48.949414301 +0100
++++ vdr-2.1.7/dvbsubtitle.c 2015-01-18 13:04:01.889448784 +0100
+@@ -1042,7 +1042,7 @@
+ default: dbgpages("unknown page state: %d<br>\n", pageState);
+ }
+ bs.SkipBits(2); // reserved
+- dbgpages("<hr>\n<b>page</b> id %d version %d pts %"PRId64" timeout %d state %d<br>\n", pageId, pageVersionNumber, pts, pageTimeout, pageState);
++ dbgpages("<hr>\n<b>page</b> id %d version %d pts %" PRId64 " timeout %d state %d<br>\n", pageId, pageVersionNumber, pts, pageTimeout, pageState);
+ regionRefs.Clear();
+ while (!bs.IsEOF())
+ regionRefs.Add(new cSubtitleRegionRef(bs));
+@@ -1073,7 +1073,7 @@
+ default: dbgpages("unknown page state: %d<br>\n", pageState);
+ }
+ bs.SkipBits(6);
+- dbgpages("<hr>\n<b>page</b> id %d version %d pts %"PRId64" timeout %d state %d<br>\n", pageId, pageVersionNumber, pts, pageTimeout, pageState);
++ dbgpages("<hr>\n<b>page</b> id %d version %d pts %" PRId64 " timeout %d state %d<br>\n", pageId, pageVersionNumber, pts, pageTimeout, pageState);
+ regionRefs.Clear();
+ pending = true;
+ }
+@@ -1384,7 +1384,7 @@
+ if (Length > PayloadOffset + SubstreamHeaderLength) {
+ int64_t pts = PesHasPts(Data) ? PesGetPts(Data) : -1;
+ if (pts >= 0)
+- dbgconverter("converter PTS: %"PRId64"<br>\n", pts);
++ dbgconverter("converter PTS: %" PRId64 "<br>\n", pts);
+ const uchar *data = Data + PayloadOffset + SubstreamHeaderLength; // skip substream header
+ int length = Length - PayloadOffset - SubstreamHeaderLength; // skip substream header
+ if (ResetSubtitleAssembler)
+@@ -1420,7 +1420,7 @@
+ if (Length > PayloadOffset) {
+ int64_t pts = PesHasPts(Data) ? PesGetPts(Data) : -1;
+ if (pts >= 0)
+- dbgconverter("converter PTS: %"PRId64"<br>\n", pts);
++ dbgconverter("converter PTS: %" PRId64 "<br>\n", pts);
+ const uchar *data = Data + PayloadOffset;
+ int length = Length - PayloadOffset;
+ if (length > 0) {
+@@ -1488,7 +1488,7 @@
+ dbgoutput("showing bitmap #%d of %d<br>\n", sb->Index() + 1, bitmaps->Count());
+ sb->Draw(osd);
+ Timeout.Set(sb->Timeout() * 1000);
+- dbgconverter("PTS: %"PRId64" STC: %"PRId64" (%"PRId64") timeout: %d<br>\n", sb->Pts(), STC, Delta, sb->Timeout());
++ dbgconverter("PTS: %" PRId64 " STC: %" PRId64 " (%" PRId64 ") timeout: %d<br>\n", sb->Pts(), STC, Delta, sb->Timeout());
+ }
+ }
+ else
+diff -Naur vdr-2.1.7.orig/recording.c vdr-2.1.7/recording.c
+--- vdr-2.1.7.orig/recording.c 2015-01-18 12:52:48.956080968 +0100
++++ vdr-2.1.7/recording.c 2015-01-18 13:05:42.346120598 +0100
+@@ -1749,7 +1749,7 @@
+ off_t FileSizeSrc = FileSize(FileNameSrc);
+ off_t FileSizeDst = FileSize(FileNameDst);
+ if (FileSizeSrc != FileSizeDst) {
+- esyslog("ERROR: file size discrepancy: %"PRId64" != %"PRId64, FileSizeSrc, FileSizeDst);
++ esyslog("ERROR: file size discrepancy: %" PRId64 " != %" PRId64, FileSizeSrc, FileSizeDst);
+ break;
+ }
+ }
+@@ -2476,7 +2476,7 @@
+ delta = int(buf.st_size % sizeof(tIndexTs));
+ if (delta) {
+ delta = sizeof(tIndexTs) - delta;
+- esyslog("ERROR: invalid file size (%"PRId64") in '%s'", buf.st_size, *fileName);
++ esyslog("ERROR: invalid file size (%" PRId64 ") in '%s'", buf.st_size, *fileName);
+ }
+ last = int((buf.st_size + delta) / sizeof(tIndexTs) - 1);
+ if ((!Record || Update) && last >= 0) {
+diff -Naur vdr-2.1.7.orig/remote.c vdr-2.1.7/remote.c
+--- vdr-2.1.7.orig/remote.c 2015-01-18 12:52:48.949414301 +0100
++++ vdr-2.1.7/remote.c 2015-01-18 13:06:40.752790258 +0100
+@@ -124,7 +124,7 @@
+ bool cRemote::Put(uint64_t Code, bool Repeat, bool Release)
+ {
+ char buffer[32];
+- snprintf(buffer, sizeof(buffer), "%016"PRIX64, Code);
++ snprintf(buffer, sizeof(buffer), "%016" PRIX64, Code);
+ return Put(buffer, Repeat, Release);
+ }
+
diff --git a/media-video/vdr/files/vdr-2.1.7_gentoo.patch b/media-video/vdr/files/vdr-2.1.7_gentoo.patch
new file mode 100644
index 0000000..37ffd3c
--- /dev/null
+++ b/media-video/vdr/files/vdr-2.1.7_gentoo.patch
@@ -0,0 +1,70 @@
+diff -Naur vdr-2.1.7.orig/Makefile vdr-2.1.7/Makefile
+--- vdr-2.1.7.orig/Makefile 2015-01-18 12:37:45.506034673 +0100
++++ vdr-2.1.7/Makefile 2015-01-18 12:38:34.086037162 +0100
+@@ -116,7 +116,7 @@
+ VDRVERSION = $(shell sed -ne '/define VDRVERSION/s/^.*"\(.*\)".*$$/\1/p' config.h)
+ APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' config.h)
+
+-all: vdr i18n plugins
++all: vdr i18n
+
+ # Implicit rules:
+
+@@ -170,7 +170,7 @@
+
+ PODIR = po
+ LOCALEDIR = locale
+-I18Npo = $(wildcard $(PODIR)/*.po)
++I18Npo = $(foreach dir,$(LINGUAS),$(wildcard $(PODIR)/$(dir)*.po))
+ I18Nmo = $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file))))
+ I18Nmsgs = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr.mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
+ I18Npot = $(PODIR)/vdr.pot
+@@ -193,7 +193,7 @@
+
+ install-i18n: i18n
+ @mkdir -p $(DESTDIR)$(LOCDIR)
+- cp -r $(LOCALEDIR)/* $(DESTDIR)$(LOCDIR)
++ @(cd $(LOCALEDIR); for linguas in $(LINGUAS); do [ "$$linguas" = "en" ] && continue; cp -r --parents $$linguas* $(DESTDIR)$(LOCDIR); done)
+
+ # The 'include' directory (for plugins):
+
+@@ -255,7 +255,7 @@
+
+ # Install the files (note that 'install-pc' must be first!):
+
+-install: install-pc install-bin install-dirs install-conf install-doc install-plugins install-i18n install-includes
++install: install-pc install-bin install-dirs install-conf install-doc install-i18n install-includes
+
+ # VDR binary:
+
+@@ -267,12 +267,13 @@
+
+ install-dirs:
+ @mkdir -p $(DESTDIR)$(VIDEODIR)
+- @mkdir -p $(DESTDIR)$(CONFDIR)
+- @mkdir -p $(DESTDIR)$(ARGSDIR)
+- @mkdir -p $(DESTDIR)$(CACHEDIR)
++# @mkdir -p $(DESTDIR)$(CONFDIR)
++# @mkdir -p $(DESTDIR)$(ARGSDIR)
++# @mkdir -p $(DESTDIR)$(CACHEDIR)
+ @mkdir -p $(DESTDIR)$(RESDIR)
+
+ install-conf:
++ @mkdir -p $(DESTDIR)$(CONFDIR)
+ @cp -pn *.conf $(DESTDIR)$(CONFDIR)
+
+ # Documentation:
+@@ -299,8 +300,11 @@
+ # Includes:
+
+ install-includes: include-dir
+- @mkdir -p $(DESTDIR)$(INCDIR)
+- @cp -pLR include/vdr include/libsi $(DESTDIR)$(INCDIR)
++# @mkdir -p $(DESTDIR)$(INCDIR)
++# @cp -pLR include/vdr include/libsi $(DESTDIR)$(INCDIR)
++ @mkdir -p $(DESTDIR)$(INCDIR)/vdr $(DESTDIR)$(INCDIR)/vdr/libsi
++ @cp -pLR include/vdr $(DESTDIR)$(INCDIR)
++ @cp -pLR include/libsi Make.config $(DESTDIR)$(INCDIR)/vdr
+
+ # pkg-config file:
+
diff --git a/media-video/vdr/vdr-2.1.7.ebuild b/media-video/vdr/vdr-2.1.7.ebuild
new file mode 100644
index 0000000..8ddd95a
--- /dev/null
+++ b/media-video/vdr/vdr-2.1.7.ebuild
@@ -0,0 +1,307 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-2.0.2-r1.ebuild,v 1.2 2013/07/07 09:52:20 hd_brummy Exp $
+
+EAPI=5
+
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+# Switches supported by extensions-patch
+EXT_PATCH_FLAGS="alternatechannel binaryskip graphtft jumpingseconds jumpplay naludump permashift
+ permashift_v1 pinplugin mainmenuhooks menuorg menuselection resumereset ttxtsubs wareagleicon yaepg"
+# ddepgentry
+
+# names of the use-flags
+EXT_PATCH_FLAGS_RENAMED=""
+
+# names ext-patch uses internally, here only used for maintainer checks
+EXT_PATCH_FLAGS_RENAMED_EXT_NAME=""
+
+IUSE="bidi debug html systemd vanilla ${EXT_PATCH_FLAGS} ${EXT_PATCH_FLAGS_RENAMED}"
+
+MY_PV="${PV%_p*}"
+MY_P="${PN}-${MY_PV}"
+S="${WORKDIR}/${MY_P}"
+
+EXT_P="extpng-${PN}-2.1.6-gentoo-edition-v2"
+
+DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB"
+HOMEPAGE="http://www.tvdr.de/"
+SRC_URI="ftp://ftp.tvdr.de/vdr/Developer/${MY_P}.tar.bz2
+ http://dev.gentoo.org/~hd_brummy/distfiles/${EXT_P}.patch.bz2"
+
+KEYWORDS="~arm ~amd64 ~ppc ~x86"
+SLOT="0"
+LICENSE="GPL-2"
+
+REQUIRED_USE="
+ permashift? ( !permashift_v1 )
+ permashift_v1? ( !permashift )"
+
+COMMON_DEPEND="virtual/jpeg
+ sys-libs/libcap
+ >=media-libs/fontconfig-2.4.2
+ >=media-libs/freetype-2"
+
+DEPEND="${COMMON_DEPEND}
+ >=virtual/linuxtv-dvb-headers-5.3
+ sys-devel/gettext"
+
+RDEPEND="${COMMON_DEPEND}
+ dev-lang/perl
+ >=media-tv/gentoo-vdr-scripts-2.5_rc1
+ media-fonts/corefonts
+ bidi? ( dev-libs/fribidi )
+ systemd? ( sys-apps/systemd )"
+
+CONF_DIR=/etc/vdr
+CAP_FILE=${S}/capabilities.sh
+CAPS="# Capabilities of the vdr-executable for use by startscript etc."
+
+pkg_setup() {
+
+ use debug && append-flags -g
+
+ PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins"
+
+ tc-export CC CXX AR
+}
+
+add_cap() {
+ local arg
+ for arg; do
+ CAPS="${CAPS}\n${arg}=1"
+ done
+}
+
+enable_patch() {
+ local arg ARG_UPPER
+ for arg; do
+ ARG_UPPER=$(echo $arg|tr '[:lower:]' '[:upper:]')
+ echo "${ARG_UPPER} = 1" >> Make.config
+
+ # codesnippet to bring the extpng defines into the vdr.pc CXXFLAGS CFLAGS
+ echo "-DUSE_${ARG_UPPER}" >> "${T}"/defines.tmp
+ cat "${T}"/defines.tmp | tr \\\012 ' ' > "${T}"/defines.IUSE
+ export DEFINES_IUSE=$( cat ${T}/defines.IUSE )
+ done
+}
+
+extensions_add_make_conf()
+{
+ # copy all ifdef for extensions-patch to Make.config
+ sed -e '1,/need to touch the following:/d' \
+ -e '/need to touch the following/,/^$/d' \
+ Make.config.template >> Make.config
+}
+
+extensions_all_defines() {
+ # extract all possible settings for extensions-patch
+ sed -e '/^#\?[A-Z].*= 1/!d' -e 's/^#\?//' -e 's/ .*//' \
+ Make.config.template \
+ | sort \
+ | tr '[:upper:]' '[:lower:]'
+}
+
+lang_po() {
+ LING_PO=$( ls ${S}/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' )
+}
+
+src_prepare() {
+ # apply maintainace-patches
+ ebegin "Changing paths for gentoo"
+
+ local DVBDIR=/usr/include
+ local i
+ for i in ${DVB_HEADER_PATH} /usr/include/v4l-dvb-hg /usr/include; do
+ [[ -d ${i} ]] || continue
+ if [[ -f ${i}/linux/dvb/dmx.h ]]; then
+ einfo "Found DVB header files in ${i}"
+ DVBDIR=${i}
+ break
+ fi
+ done
+
+ # checking for s2api headers
+ local api_version
+ api_version=$(awk -F' ' '/define DVB_API_VERSION / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
+ api_version=${api_version}*$(awk -F' ' '/define DVB_API_VERSION_MINOR / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
+
+ if [[ ${api_version:-0} -lt 5*3 ]]; then
+ eerror "DVB header files do not contain s2api support or too old for ${P}"
+ eerror "You cannot compile VDR against old dvb-header"
+ die "DVB headers too old"
+ fi
+
+ cat > Make.config <<-EOT
+ #
+ # Generated by ebuild ${PF}
+ #
+ PREFIX = /usr
+ DVBDIR = ${DVBDIR}
+ PLUGINLIBDIR = ${PLUGIN_LIBDIR}
+ CONFDIR = ${CONF_DIR}
+ VIDEODIR = /var/vdr/video
+ LOCDIR = \$(PREFIX)/share/locale
+ INCDIR = \$(PREFIX)/include
+
+ DEFINES += -DCONFDIR=\"\$(CONFDIR)\"
+ INCLUDES += -I\$(DVBDIR)
+
+ # >=vdr-1.7.36-r1; parameter only used for compiletime on vdr
+ # PLUGINLIBDIR (plugin Makefile old) = LIBDIR (plugin Makefile new)
+ LIBDIR = ${PLUGIN_LIBDIR}
+ PCDIR = /usr/$(get_libdir)/pkgconfig
+ EOT
+ eend 0
+
+ # support languages, written from right to left
+ BUILD_PARAMS+=" BIDI=$(usex bidi 1 0)"
+
+ # systemd support
+ BUILD_PARAMS+=" SDNOTIFY=$(usex systemd 1 0)"
+
+ epatch "${FILESDIR}/${P}_gentoo.patch"
+ epatch "${FILESDIR}/${P}_C++11.patch"
+
+ if ! use vanilla; then
+
+ # Now apply extensions patch
+ epatch "${WORKDIR}/${EXT_P}.patch"
+
+ # This allows us to start even if some plugin does not exist
+ # or is not loadable.
+ enable_patch PLUGINMISSING
+
+ if [[ -n ${VDR_MAINTAINER_MODE} ]]; then
+ einfo "Doing maintainer checks:"
+
+ # we do not support these patches
+ # (or have them already hard enabled)
+ local IGNORE_PATCHES="pluginmissing"
+
+ extensions_all_defines > "${T}"/new.IUSE
+ echo $EXT_PATCH_FLAGS $EXT_PATCH_FLAGS_RENAMED_EXT_NAME \
+ $IGNORE_PATCHES | \
+ tr ' ' '\n' |sort > "${T}"/old.IUSE
+ local DIFFS=$(diff -u "${T}"/old.IUSE "${T}"/new.IUSE|grep '^[+-][^+-]')
+ if [[ -z ${DIFFS} ]]; then
+ einfo "EXT_PATCH_FLAGS is up to date."
+ else
+ ewarn "IUSE differences!"
+ local diff
+ for diff in $DIFFS; do
+ ewarn "$diff"
+ done
+ fi
+ fi
+
+ ebegin "Enabling selected patches"
+ local flag
+ for flag in $EXT_PATCH_FLAGS; do
+ use $flag && enable_patch ${flag}
+ done
+
+ eend 0
+
+ extensions_add_make_conf
+
+ # add defined use-flags compile options to vdr.pc
+ sed -e "s:\$(CDEFINES) \$(CINCLUDES) \$(HDRDIR):\$(CDEFINES) \$(CINCLUDES) \$(HDRDIR) \$(DEFINES_IUSE):" \
+ -i Makefile
+
+ ebegin "Make depend"
+ emake .dependencies >/dev/null
+ eend $? "make depend failed"
+ fi
+
+ epatch_user
+
+ add_cap CAP_UTF8
+
+ add_cap CAP_IRCTRL_RUNTIME_PARAM \
+ CAP_VFAT_RUNTIME_PARAM \
+ CAP_CHUID \
+ CAP_SHUTDOWN_AUTO_RETRY
+
+ echo -e ${CAPS} > "${CAP_FILE}"
+
+ # LINGUAS support
+ einfo "\n \t VDR supports the LINGUAS values"
+
+ lang_po
+
+ einfo "\t Please set one of this values in your sytem make.conf"
+ einfo "\t LINGUAS=\"${LING_PO}\"\n"
+
+ if [[ -z ${LINGUAS} ]]; then
+ einfo "\n \t No values in LINGUAS="
+ einfo "\t You will get only english text on OSD \n"
+ fi
+
+ strip-linguas ${LING_PO} en
+}
+
+src_install() {
+ # trick makefile not to create a videodir by supplying it with an existing
+ # directory
+ emake \
+ VIDEODIR="/" \
+ DESTDIR="${D}" install || die "emake install failed"
+
+ keepdir "${PLUGIN_LIBDIR}"
+
+ keepdir "${CONF_DIR}"/plugins
+ keepdir "${CONF_DIR}"/themes
+ keepdir "${CONF_DIR}"/conf.d
+
+ if use html; then
+ dohtml *.html
+ fi
+
+ dodoc MANUAL INSTALL README* HISTORY CONTRIBUTORS
+
+ insinto /usr/share/vdr
+ doins "${CAP_FILE}"
+
+ if use alternatechannel; then
+ insinto /etc/vdr
+ doins "${FILESDIR}"/channel_alternative.conf
+ fi
+
+ chown -R vdr:vdr "${D}/${CONF_DIR}"
+}
+
+#pkg_preinst() {
+
+# example syntax...
+# has_version "<${CATEGORY}/${PN}-1.7.36"
+# previous_less_than_1_7_36=$?
+#}
+
+pkg_postinst() {
+
+ elog "This is a *developer* version."
+ elog "We strongly recommend that you only use it under controlled"
+ elog "conditions and for testing and debugging."
+
+ # correct wrong permission from earlier install
+ CACHEOWNER="$(stat -c %U /var/cache/vdr)"
+ if [ ! ${CACHEOWNER} == vdr ]; then
+ chown -R vdr:vdr "${ROOT}/var/cache/vdr"
+ fi
+
+# example syntax
+# if [[ previous_less_than_1_7_36=$? = 0 ]] ; then
+ #elog "bla foo"
+# fi
+
+ elog "It is a good idea to run vdrplugin-rebuild now."
+
+ elog "To get nice symbols in OSD we recommend to install"
+ elog "\t1. emerge media-fonts/vdrsymbols-ttf"
+ elog "\t2. select font VDRSymbolsSans in Setup"
+ elog ""
+ elog "To get an idea how to proceed now, have a look at our vdr-guide:"
+ elog "\thttps://wiki.gentoo.org/wiki/VDR"
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] proj/vdr/devel:master commit in: media-video/vdr/, media-video/vdr/files/
@ 2015-02-01 16:59 Joerg Bornkessel
0 siblings, 0 replies; 8+ messages in thread
From: Joerg Bornkessel @ 2015-02-01 16:59 UTC (permalink / raw
To: gentoo-commits
commit: 833b0f52cbb2db8c5a52e115e786ab9ac22edd88
Author: Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 1 15:33:14 2015 +0000
Commit: Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
CommitDate: Sun Feb 1 15:33:14 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/vdr/devel.git;a=commit;h=833b0f52
bump; this version reduced the available use-flags due support in core vdr
Package-Manager: portage-2.2.15
Manifest-Sign-Key: 34C2808A
---
media-video/vdr/ChangeLog | 6 +
media-video/vdr/Manifest | 12 +-
media-video/vdr/files/vdr-2.1.8_gentoo.patch | 70 ++++++
media-video/vdr/vdr-2.1.8.ebuild | 305 +++++++++++++++++++++++++++
4 files changed, 389 insertions(+), 4 deletions(-)
diff --git a/media-video/vdr/ChangeLog b/media-video/vdr/ChangeLog
index ad83044..59ffff7 100644
--- a/media-video/vdr/ChangeLog
+++ b/media-video/vdr/ChangeLog
@@ -2,6 +2,12 @@
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*vdr-2.1.8 (01 Feb 2015)
+
+ 01 Feb 2015; Joerg Bornkessel <hd_brummy@gentoo.org> +vdr-2.1.8.ebuild,
+ +files/vdr-2.1.8_gentoo.patch:
+ bump; this version reduced the available use-flags due support in core vdr
+
*vdr-2.1.7 (18 Jan 2015)
18 Jan 2015; Joerg Bornkessel <hd_brummy@gentoo.org> +vdr-2.1.7.ebuild,
diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index 99f2e0d..b25ab6d 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -6,11 +6,13 @@ AUX vdr-2.1.1_gentoo.patch 2488 SHA256 25275f22d8d183c089accd9463862aa772d2c13ae
AUX vdr-2.1.6_gentoo.patch 2255 SHA256 75ec762630d2e9099843151fd0b6e04c5b114faea2052392144d64c648cf5482 SHA512 0711128380cec9a6ec2e8212226a4a20896888467f323bc006bd1c4cbf1b8e1ce488c2f7227e0903847888e7e37159aecf6d82fdc1b50009a1c869d3da5134c0 WHIRLPOOL e984c7fb87fa3d7eedc203e3b5ac4d2cc9b528dc3a70d8a15582c6dee58589af6d8179fa542f3f45d2e9c6d9889b90e691b77b6d3398f4b6b200635bdc2c404e
AUX vdr-2.1.7_C++11.patch 4553 SHA256 3ff8f4762009a932cf63c4239e21f4cca2445cce160b578e5c5c5979b3fefc54 SHA512 41376c3a4bc4754401e2ce140aea5ce1a1b5ad4388c95446b8e1c8e7ab8acd21c35f24d961b4c16b4cc2500d73345cb73a8b4fa2c13dc90cb781dcac625195ec WHIRLPOOL 3b21733e5b065fc2d4188dfa872557cd4558265f3eaea3411d5a402c1cad14ed86379623e25ab908a4c43e165d4ac171bb1788b71b9b6644fd6510a928150f68
AUX vdr-2.1.7_gentoo.patch 2322 SHA256 8088a4f314e0b8d908f82cfe2a7392a18db679a7324bfa92dce49431c50313ec SHA512 c6953a7fb77717fdaa8ca05550496e25f4bc60d91c13ed0fb23d27e1a1ec433ec2d5cfb019717cf09eb7b67c9ebb91664b1b731dc28bc4f25e815871f6de0bc7 WHIRLPOOL 88d4e8407b085604525d9bae1f34a957ae5f168ac657a99c45dcba5f08185351ccb03736cfc464960d3f2157ac6357ffbf8b602dd1da49ee94efb403f71731d8
+AUX vdr-2.1.8_gentoo.patch 2322 SHA256 8088a4f314e0b8d908f82cfe2a7392a18db679a7324bfa92dce49431c50313ec SHA512 c6953a7fb77717fdaa8ca05550496e25f4bc60d91c13ed0fb23d27e1a1ec433ec2d5cfb019717cf09eb7b67c9ebb91664b1b731dc28bc4f25e815871f6de0bc7 WHIRLPOOL 88d4e8407b085604525d9bae1f34a957ae5f168ac657a99c45dcba5f08185351ccb03736cfc464960d3f2157ac6357ffbf8b602dd1da49ee94efb403f71731d8
DIST extpng-vdr-2.1.1-gentoo-edition-v1.patch.bz2 76312 SHA256 42ed177d9064f555bb5396123790eaa9cf4b500536698af29bda0193c951faab SHA512 07cf50a0f9edf2f8b1542ad314b86f18b88e9409cc9aef400585c7dafb8fc691b2d476d18b088bc0d3de8ec7bf88241ba5418f99e156353cbcf78de406238cf8 WHIRLPOOL c027a0f107db181b617d3f1d3da461733bc03edd975adab03473979877ee5503efcb88903c20a0c0c1063f40710cf14c68456bc8038902b1e29f4194e02f6cb5
DIST extpng-vdr-2.1.2-gentoo-edition-v3.patch.bz2 30698 SHA256 c2ba5ada4cadb44dde87dc5de8b9a1306fa274d0cca8f856ce5e829e16d7d51f SHA512 a4520423182ef44f56b9e6807622a68ba404e1b14e81b8e4153ec23bb4f7e1ec4feabf458dfaddb9a829140e404f6988ad92dbd5b3768ff447918b609b80c29a WHIRLPOOL 9fca245602fbf5926794276da516f82d2846c53781d46720f2cab967bc7839d0494dc7592e76a864fa313ab0e04aefbba5e5f8bf429d7ccc4c31a1e126cdcba4
DIST extpng-vdr-2.1.3-gentoo-edition-v1.patch.bz2 121553 SHA256 6ca5a1db1395001cc80178e61fbc9230e425e1c0d00b386e056283e4967326d4 SHA512 22e596f618fccaa61aa48c0ca32566a7937e539c54506ffab7f1fc98261da100dfc7ef47ee043535bcd18e1fd096ca3b897b251cad1a2ab4d9c0f285aba848d1 WHIRLPOOL b122620875e822eb1a2102c4ff7dc5055c3ee5e57320db2c0d04b864ef87fe04b9b6659483b164f8bc0a8a5db6180ff6668b152357dedfc13d1de42e15645e1e
DIST extpng-vdr-2.1.5-gentoo-edition-v1.patch.bz2 30725 SHA256 eea5f1e92b5ef01d3c7165ee6bb3fa4d2daac6b5fd576b1de59775579aad87c1 SHA512 cf0ea1b756eebfb9f56cac9df126cc6b94eda2634bf9f88ec936e444744232909a11fa65e82f26f905536dd216383347010da6d5094e23c0c1210c007f54d813 WHIRLPOOL ff27809b5a454a5cecacf6ec04e6a3cc0c3b6627a7528fb42bef46ba9c7bf54b08e3b20eaeec19a997b8dd1df31bb9d41d0d176943a1c8e06b1f817b9ce91549
DIST extpng-vdr-2.1.6-gentoo-edition-v2.patch.bz2 63143 SHA256 df8d3b428bfdce7443c39029c11e66d9c328c13b0dc46163707e06238054be8b SHA512 4ca1c6afc412decef231f0a1b8d0b64e4d38fc469cb3f15a301f24d613f4edfa32a8c12dff7b7ce562541f3b3d17561a4e0e7c0ae17c6dcc2d0a7090d73f9690 WHIRLPOOL ef3d0b935e9dcc084e54d9e7548a863ece66f6ab60c1ec31c81dcb01bd7e84a532fb0313a9e9d6773a9d5e85fa25672e4c293c4b1df0a226e0eecbbbc4cfe053
+DIST extpng-vdr-2.1.8-gentoo-edition-v2.patch.bz2 29910 SHA256 0e885f6b76bfe4246f14156810343afa441b09d205daad704962b3df4c976748 SHA512 571976e0393cd84703a13b1236233af6f00e4f7fcaf5e93b017fafe84ab9dd09ea7c245aa6657ebebe8cafa35135c05821bab1f4093c687dc9cf61a5437c585f WHIRLPOOL 3e9ca9d0974c9470f5358c7185d484bbdcc052ad6afe3b7cdb0789f86a4170dbdb830606ba3c53d85878e659289a43015487421b6978c81798f16b196c104b4f
DIST vdr-2.1.1.tar.bz2 842414 SHA256 96292f4f2a47fea9fdd432bdcca6e2f11747e2b19feac6d6f7af1797c5abfa37 SHA512 f31c774cc5c383b97cdae98892906c66ce27a2277ccde185815299ddd894e18908a6c252c92bddfefb82a8fe933c9c2b5e6f91947db526bb86bab9ff08cb8158 WHIRLPOOL e92705b8fec477a4e10c563f4440ba54ccb499823b15a6227ac2633fc55a56fad023b6f8b5d4450505344dfb5a1871ceb3a787c9e9470c178f947874fc79eef0
DIST vdr-2.1.2-gcc.patch.gz 542 SHA256 8ac11be7074231604868e5f4a153df44b957543227c4cb0fcadbf693900b25d8 SHA512 4b3595e3ed3ef291bf155500d96d3355656f11442bc9a9a13ddbdfc35ae3156a894c12da1f4a20bdf6a7e35c3cb0904ab1c5c2d14698ffe6595ffc9d5b37a2ad WHIRLPOOL 96cbcea605e52a76974196f5a7ec44b49222f0fb3048428286ab974ec6633e4bdd6523796a0109ba866aaba101b270b099dc4983b439d6ad84c00890cb7078d8
DIST vdr-2.1.2.tar.bz2 850237 SHA256 1bf9c636145acf2d67716475314efe9703619759f0fdbae02d89fe599730f2a4 SHA512 4e9bf4705a64d4fab790d6cf0b92151537e282a8a3a41eeb13cddf3a966b303b31fc32fd62b27450adc68134ca853aaa6dd5b6d7a9c672c6165aab9f044c19b5 WHIRLPOOL 525ce8c05cbaeb9f3d8108117fb18dc5b64885e311c3a40dd704888b0a5020cb3ef6fcd9d57af200d94ffc0479add8c6a651791885ff67f7f93cf45a0aec1d8b
@@ -19,6 +21,7 @@ DIST vdr-2.1.4.tar.bz2 862733 SHA256 a3208d6229622b089d19c238c5b78b80e7d82e02207
DIST vdr-2.1.5.tar.bz2 869767 SHA256 e642dcaaa1a5edc3683e33c5b154c6439a1427c24dc8685f36a0bb919774a890 SHA512 3bb6192ac7d7db024838c0d4f07797f70ee4da02b14ae0effa24f3b079fea8f42be089754cbffad013dbf9d87829d20b3dee66eed390b061088487f2784c8c75 WHIRLPOOL b2a6e5742fa6212f453713dad574dc51102ccfa2b9aaa036ea53249d220404157ced8e9c20d9550184741edb5211de9286a9c3e6249c07949fab54a0b727acff
DIST vdr-2.1.6.tar.bz2 872380 SHA256 232a326f9a4a609746da42a9c7ee632f394496b7e8215d71dfdcff3fcde4e145 SHA512 ce98ff6167e340ec7cd8d23012e2632f5a41fe20979359c2684771ba86458bb6b48736b34b9474f6ccb7492951c69a3849c086848c2870e8c7476941f64022df WHIRLPOOL df9159648464682841b5ed9c14a584c53e154f74084c432e6e5e94bf2b0e095c72b23e25329f582fd1e18b34c93717f1d91f7ff6c3a29887ad870021eaecc2a3
DIST vdr-2.1.7.tar.bz2 880225 SHA256 86fcf656bc121e4cb8b92a2c06dbeda7b22dfd033ba74b9940f368e82fdbcafc SHA512 32d1a14fbbafd28870f5c30009fa9ae38ff34933ae3b6eb00029284f3c4ddc039bae563ed8381792c47006d26d6a33a19b67e29a227eac6f0ff36a7bbe9faa30 WHIRLPOOL 7a49a332f508ff2ec3597ccf4c944249f3380a5559bb5e225083376e1813280fbf2e56356d1345c2f7383ddbf81e94d1d9fe4c4604b3addb5e276a9060255f55
+DIST vdr-2.1.8.tar.bz2 890588 SHA256 96d3209742e2b61d7e75ce54f767d61adc9857472f2c79df5479a4e60772975e SHA512 f1b1d6261aabe8517a3e26a93244c4bc307289b41c033bedf7d25a468bb428a1a6f9a290fceccb9fa1cbf049a0eae7530902da1586143895457f2a997479b2d5 WHIRLPOOL 90c9a946ac43b66be01a9568b885b2162f01e7edf8665cde4c5c73b4c46750d67aed61cd383e33ba6e824b29212afe63b00c0f8a142c0c87b98507a370928663
EBUILD vdr-2.1.1.ebuild 8500 SHA256 dd4e4100a0db15897ade0cf0b34348052dba6dcb531bce73096126a4684f159f SHA512 fee916284d4252180bdf1ee099eb0bd6d577eecb7f3a39607ae50b3f7e977393edf9b0aa4b65f9d7c7a711f61145f2cc8e44a6faa6d19812c40f8bca19f1d6c6 WHIRLPOOL ffa40b3f63ad2d697cf9297e733eb7047b6a20c39ecb7649a216dc615d090e3a13962b63231c58ea4c17b63b65e15a8e37aecb4e95261ccf2e44d2041bd5824b
EBUILD vdr-2.1.2-r1.ebuild 8311 SHA256 9bb5f5f02624f885bffb29f4703d9f8fc73dfd5c1b2dbbfee510fa0e88bf0e0d SHA512 6e5cb3e1e554bb159ae693c023208a52547549e943a959c747d32a957b031c72848717556a7b99e0d3efc6c6d305b257d448d7144dac6fe544d4cbf336622b84 WHIRLPOOL ebf0a876e87b376bc81af8e8f9af05b603e873f789f5ca135977aa7feeb8e529cdbd1caf0c931218e296baccc4ebbef1dbf4bdd38ffa176657166da14ab4924b
EBUILD vdr-2.1.3.ebuild 7570 SHA256 f9a7b23ec5d6d7f671dd5180ba32a3858223a0778f25f78d03a190553fbfb020 SHA512 086312ab9572b64342cc56c33178cfd2e7aa0ea961dde3c942758d9f7a821da2c03a495ec7aa8cc8a83016324f7fee0d6863aede6c5f34b104880066bc680ccc WHIRLPOOL ba1427d2e9d9539ba1791f1e381f8383bf116ac16887d8a67f3be70ecadeb29bb053a74f18be3233a415f0cd443f7885ca9348b0c0cb65cf36456f1769f07761
@@ -28,13 +31,14 @@ EBUILD vdr-2.1.6-r1.ebuild 7588 SHA256 aab0a8b51860d6e99bffe5490ca7ce8ed218a4368
EBUILD vdr-2.1.6-r2.ebuild 7648 SHA256 9949037814fa0636037325e94067838e6df6dce8a0dc77fd20c8abaa08ee3e5a SHA512 2f44e6d552b5da3589ca3a6144d4d2ff76a822f955023855690ea386f98cb7ff6f43a3faa470a1659338e8c43d8e2b3ccee0e915ed41738bfd8b191ea372ee58 WHIRLPOOL 5b2775f70851b4bd94e9382e8b3709e08b53c63a9fae0f64fa7f7b0038c9d4d6ba5d2a60a6e41ce34d48ef9475c56bc7eaa80fabaeb356a335c8fe57edeb50ea
EBUILD vdr-2.1.6.ebuild 7616 SHA256 ca9c89b9db90646cfe89964f8f5094af9c8be19404ea3d05ba75d2283af40f6a SHA512 0ea0d208c8140cb158a98cdc8ffd0711d0bf5b2fc635f3724ee7273e735371d232ce7bd7086805b0c38bd9c3f8e04b438d28b81b76c4f6f2c6f1d2acd0cc8b33 WHIRLPOOL 5580d45a8d145e481cfb04ef338868b94398f434ff2daed0f77d347b471b1ce8ec4e35a9ef48c3f1d2368dca57074201456be22f4236bc41bf7f0442eaea38b3
EBUILD vdr-2.1.7.ebuild 7724 SHA256 352022abc89e0fee871f672c8d476a9d1529eca9a817ee7d0d60edc3986dbfd3 SHA512 ee62924473e3909f578805db1bc58c17f657c6adf5f8a3948f83ae9366cea8f101f341f6a5789a8e00236d110db50f01f453dd13e7c0f65dd2915750fb6860dc WHIRLPOOL dd3570aee1e0236caf9a2c40122f28e787933128c6d1f938a74c889725f2a8e4295cbd8fa4951030164364db2d1669b8bc75a8f9df31b053cd61fedd81695d1f
-MISC ChangeLog 26402 SHA256 c75f7c5aa9bcf6c553a87e747a23ce25bac72f90f8f6a2e8281cc7c6fc59113c SHA512 45159c5e8a605a6456b1efa08bb0fb2e6e17f3a7c9cadbfdf2150cceae62540c5ec41a0ca2288089f6d92bebbc67cb9c43d354ccc6ea040c61d167d6c9905565 WHIRLPOOL 8a77b2548e5af3dd2c4ec400565dc7697b38e663f0ee5de6899adcc5c6e006c5d0bdda5e679378d72081406733a8eaf1372b17518386a565c4db4d2494511b72
+EBUILD vdr-2.1.8.ebuild 7624 SHA256 ee61c7eb7911a8f438f2d429ebb9615793db5f94351f419298faad005d414c24 SHA512 ab4becbc51ded5808bb7df7dce14db8cd9e685e42deed672ee29a97ca64f94276752652b61057a4f412f155d41eca741dff19180ce4d2f7496bd09c07dd085b7 WHIRLPOOL d6d2dcd482f8db246924c22ce673af2edf161feea77180cc77981c90b3b7b195cb0b00027f2ef705725d351fc6255436965a6645e1e07d2c477977e81a1cbc47
+MISC ChangeLog 26613 SHA256 0f203a38b8506c76859031325bc79c5f8273110cd63a139c3d5b1ff74f2c631b SHA512 6ff9076b0be5295b4f4271b3a6fd5ab07e29843d45b34ff7834db7df88135fe7ba5d2020ae723dcdb7087b3a28b24eba8daa75c23d82a2e36cb141aa9ddd3bd7 WHIRLPOOL b859939b4106738f6610cfb60b8cdfca21e1223c359988f3402da97fbe8e08d4d139ddcc320aa82ee24f580461773ee7092f31aa5a261bcaf4b6cb27380b9066
MISC metadata.xml 2071 SHA256 d308d181e741e458ef838af1e003e85323eb23f17b9de610317fe45a7ef92d8f SHA512 cb7c405c0d07ec536d5db70db514121e96f73b4ade0eca80d5e5c12f3cc4f209ce5d1c1c3b3129aaa8f974b843a54fda73684d05c684e403d955079d0f119e56 WHIRLPOOL e606dcf24f8bbcd427ff9e3c26ae022c50332cec79cdb1f39febe7fd25f076a9ab2439232b4b7870ea3e000026b5163f6ceb8727b77f5609060f710f40b3a498
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
Comment: added by hd_brummy@gentoo.org
-iD8DBQFUu67wdn07HTTCgIoRCF9bAKC9C3C0GwTNLucBMXq8f+m3xqNFTQCfZDiM
-MRgsJAAEi90v6lEweE1tMLc=
-=N2bC
+iD8DBQFUzkc5dn07HTTCgIoRCMSfAJoCUDNY0oNaYsiY3EDDHteajFqKfwCgmP2n
+23J2FS6MI9f1H97HGOguUGY=
+=vMVH
-----END PGP SIGNATURE-----
diff --git a/media-video/vdr/files/vdr-2.1.8_gentoo.patch b/media-video/vdr/files/vdr-2.1.8_gentoo.patch
new file mode 100644
index 0000000..37ffd3c
--- /dev/null
+++ b/media-video/vdr/files/vdr-2.1.8_gentoo.patch
@@ -0,0 +1,70 @@
+diff -Naur vdr-2.1.7.orig/Makefile vdr-2.1.7/Makefile
+--- vdr-2.1.7.orig/Makefile 2015-01-18 12:37:45.506034673 +0100
++++ vdr-2.1.7/Makefile 2015-01-18 12:38:34.086037162 +0100
+@@ -116,7 +116,7 @@
+ VDRVERSION = $(shell sed -ne '/define VDRVERSION/s/^.*"\(.*\)".*$$/\1/p' config.h)
+ APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' config.h)
+
+-all: vdr i18n plugins
++all: vdr i18n
+
+ # Implicit rules:
+
+@@ -170,7 +170,7 @@
+
+ PODIR = po
+ LOCALEDIR = locale
+-I18Npo = $(wildcard $(PODIR)/*.po)
++I18Npo = $(foreach dir,$(LINGUAS),$(wildcard $(PODIR)/$(dir)*.po))
+ I18Nmo = $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file))))
+ I18Nmsgs = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr.mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
+ I18Npot = $(PODIR)/vdr.pot
+@@ -193,7 +193,7 @@
+
+ install-i18n: i18n
+ @mkdir -p $(DESTDIR)$(LOCDIR)
+- cp -r $(LOCALEDIR)/* $(DESTDIR)$(LOCDIR)
++ @(cd $(LOCALEDIR); for linguas in $(LINGUAS); do [ "$$linguas" = "en" ] && continue; cp -r --parents $$linguas* $(DESTDIR)$(LOCDIR); done)
+
+ # The 'include' directory (for plugins):
+
+@@ -255,7 +255,7 @@
+
+ # Install the files (note that 'install-pc' must be first!):
+
+-install: install-pc install-bin install-dirs install-conf install-doc install-plugins install-i18n install-includes
++install: install-pc install-bin install-dirs install-conf install-doc install-i18n install-includes
+
+ # VDR binary:
+
+@@ -267,12 +267,13 @@
+
+ install-dirs:
+ @mkdir -p $(DESTDIR)$(VIDEODIR)
+- @mkdir -p $(DESTDIR)$(CONFDIR)
+- @mkdir -p $(DESTDIR)$(ARGSDIR)
+- @mkdir -p $(DESTDIR)$(CACHEDIR)
++# @mkdir -p $(DESTDIR)$(CONFDIR)
++# @mkdir -p $(DESTDIR)$(ARGSDIR)
++# @mkdir -p $(DESTDIR)$(CACHEDIR)
+ @mkdir -p $(DESTDIR)$(RESDIR)
+
+ install-conf:
++ @mkdir -p $(DESTDIR)$(CONFDIR)
+ @cp -pn *.conf $(DESTDIR)$(CONFDIR)
+
+ # Documentation:
+@@ -299,8 +300,11 @@
+ # Includes:
+
+ install-includes: include-dir
+- @mkdir -p $(DESTDIR)$(INCDIR)
+- @cp -pLR include/vdr include/libsi $(DESTDIR)$(INCDIR)
++# @mkdir -p $(DESTDIR)$(INCDIR)
++# @cp -pLR include/vdr include/libsi $(DESTDIR)$(INCDIR)
++ @mkdir -p $(DESTDIR)$(INCDIR)/vdr $(DESTDIR)$(INCDIR)/vdr/libsi
++ @cp -pLR include/vdr $(DESTDIR)$(INCDIR)
++ @cp -pLR include/libsi Make.config $(DESTDIR)$(INCDIR)/vdr
+
+ # pkg-config file:
+
diff --git a/media-video/vdr/vdr-2.1.8.ebuild b/media-video/vdr/vdr-2.1.8.ebuild
new file mode 100644
index 0000000..fcb81e5
--- /dev/null
+++ b/media-video/vdr/vdr-2.1.8.ebuild
@@ -0,0 +1,305 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-2.0.2-r1.ebuild,v 1.2 2013/07/07 09:52:20 hd_brummy Exp $
+
+EAPI=5
+
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+# Switches supported by extensions-patch
+EXT_PATCH_FLAGS="alternatechannel graphtft naludump permashift
+ permashift_v1 pinplugin mainmenuhooks menuorg menuselection resumereset ttxtsubs wareagleicon"
+
+# names of the use-flags
+EXT_PATCH_FLAGS_RENAMED=""
+
+# names ext-patch uses internally, here only used for maintainer checks
+EXT_PATCH_FLAGS_RENAMED_EXT_NAME=""
+
+IUSE="bidi debug html systemd vanilla ${EXT_PATCH_FLAGS} ${EXT_PATCH_FLAGS_RENAMED}"
+
+MY_PV="${PV%_p*}"
+MY_P="${PN}-${MY_PV}"
+S="${WORKDIR}/${MY_P}"
+
+EXT_P="extpng-${P}-gentoo-edition-v2"
+
+DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB"
+HOMEPAGE="http://www.tvdr.de/"
+SRC_URI="ftp://ftp.tvdr.de/vdr/Developer/${MY_P}.tar.bz2
+ http://dev.gentoo.org/~hd_brummy/distfiles/${EXT_P}.patch.bz2"
+
+KEYWORDS="~arm ~amd64 ~ppc ~x86"
+SLOT="0"
+LICENSE="GPL-2"
+
+REQUIRED_USE="
+ permashift? ( !permashift_v1 )
+ permashift_v1? ( !permashift )"
+
+COMMON_DEPEND="virtual/jpeg
+ sys-libs/libcap
+ >=media-libs/fontconfig-2.4.2
+ >=media-libs/freetype-2"
+
+DEPEND="${COMMON_DEPEND}
+ >=virtual/linuxtv-dvb-headers-5.3
+ sys-devel/gettext"
+
+RDEPEND="${COMMON_DEPEND}
+ dev-lang/perl
+ >=media-tv/gentoo-vdr-scripts-2.5_rc1
+ media-fonts/corefonts
+ bidi? ( dev-libs/fribidi )
+ systemd? ( sys-apps/systemd )"
+
+CONF_DIR=/etc/vdr
+CAP_FILE=${S}/capabilities.sh
+CAPS="# Capabilities of the vdr-executable for use by startscript etc."
+
+pkg_setup() {
+
+ use debug && append-flags -g
+
+ PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins"
+
+ tc-export CC CXX AR
+}
+
+add_cap() {
+ local arg
+ for arg; do
+ CAPS="${CAPS}\n${arg}=1"
+ done
+}
+
+enable_patch() {
+ local arg ARG_UPPER
+ for arg; do
+ ARG_UPPER=$(echo $arg|tr '[:lower:]' '[:upper:]')
+ echo "${ARG_UPPER} = 1" >> Make.config
+
+ # codesnippet to bring the extpng defines into the vdr.pc CXXFLAGS CFLAGS
+ echo "-DUSE_${ARG_UPPER}" >> "${T}"/defines.tmp
+ cat "${T}"/defines.tmp | tr \\\012 ' ' > "${T}"/defines.IUSE
+ export DEFINES_IUSE=$( cat ${T}/defines.IUSE )
+ done
+}
+
+extensions_add_make_conf()
+{
+ # copy all ifdef for extensions-patch to Make.config
+ sed -e '1,/need to touch the following:/d' \
+ -e '/need to touch the following/,/^$/d' \
+ Make.config.template >> Make.config
+}
+
+extensions_all_defines() {
+ # extract all possible settings for extensions-patch
+ sed -e '/^#\?[A-Z].*= 1/!d' -e 's/^#\?//' -e 's/ .*//' \
+ Make.config.template \
+ | sort \
+ | tr '[:upper:]' '[:lower:]'
+}
+
+lang_po() {
+ LING_PO=$( ls ${S}/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' )
+}
+
+src_prepare() {
+ # apply maintainace-patches
+ ebegin "Changing paths for gentoo"
+
+ local DVBDIR=/usr/include
+ local i
+ for i in ${DVB_HEADER_PATH} /usr/include/v4l-dvb-hg /usr/include; do
+ [[ -d ${i} ]] || continue
+ if [[ -f ${i}/linux/dvb/dmx.h ]]; then
+ einfo "Found DVB header files in ${i}"
+ DVBDIR=${i}
+ break
+ fi
+ done
+
+ # checking for s2api headers
+ local api_version
+ api_version=$(awk -F' ' '/define DVB_API_VERSION / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
+ api_version=${api_version}*$(awk -F' ' '/define DVB_API_VERSION_MINOR / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
+
+ if [[ ${api_version:-0} -lt 5*3 ]]; then
+ eerror "DVB header files do not contain s2api support or too old for ${P}"
+ eerror "You cannot compile VDR against old dvb-header"
+ die "DVB headers too old"
+ fi
+
+ cat > Make.config <<-EOT
+ #
+ # Generated by ebuild ${PF}
+ #
+ PREFIX = /usr
+ DVBDIR = ${DVBDIR}
+ PLUGINLIBDIR = ${PLUGIN_LIBDIR}
+ CONFDIR = ${CONF_DIR}
+ VIDEODIR = /var/vdr/video
+ LOCDIR = \$(PREFIX)/share/locale
+ INCDIR = \$(PREFIX)/include
+
+ DEFINES += -DCONFDIR=\"\$(CONFDIR)\"
+ INCLUDES += -I\$(DVBDIR)
+
+ # >=vdr-1.7.36-r1; parameter only used for compiletime on vdr
+ # PLUGINLIBDIR (plugin Makefile old) = LIBDIR (plugin Makefile new)
+ LIBDIR = ${PLUGIN_LIBDIR}
+ PCDIR = /usr/$(get_libdir)/pkgconfig
+ EOT
+ eend 0
+
+ # support languages, written from right to left
+ BUILD_PARAMS+=" BIDI=$(usex bidi 1 0)"
+
+ # systemd support
+ BUILD_PARAMS+=" SDNOTIFY=$(usex systemd 1 0)"
+
+ if ! use vanilla; then
+
+ # Now apply extensions patch
+ epatch "${WORKDIR}/${EXT_P}.patch"
+
+ # This allows us to start even if some plugin does not exist
+ # or is not loadable.
+ enable_patch PLUGINMISSING
+
+ if [[ -n ${VDR_MAINTAINER_MODE} ]]; then
+ einfo "Doing maintainer checks:"
+
+ # we do not support these patches
+ # (or have them already hard enabled)
+ local IGNORE_PATCHES="pluginmissing"
+
+ extensions_all_defines > "${T}"/new.IUSE
+ echo $EXT_PATCH_FLAGS $EXT_PATCH_FLAGS_RENAMED_EXT_NAME \
+ $IGNORE_PATCHES | \
+ tr ' ' '\n' |sort > "${T}"/old.IUSE
+ local DIFFS=$(diff -u "${T}"/old.IUSE "${T}"/new.IUSE|grep '^[+-][^+-]')
+ if [[ -z ${DIFFS} ]]; then
+ einfo "EXT_PATCH_FLAGS is up to date."
+ else
+ ewarn "IUSE differences!"
+ local diff
+ for diff in $DIFFS; do
+ ewarn "$diff"
+ done
+ fi
+ fi
+
+ ebegin "Enabling selected patches"
+ local flag
+ for flag in $EXT_PATCH_FLAGS; do
+ use $flag && enable_patch ${flag}
+ done
+
+ eend 0
+
+ extensions_add_make_conf
+
+ # add defined use-flags compile options to vdr.pc
+ sed -e "s:\$(CDEFINES) \$(CINCLUDES) \$(HDRDIR):\$(CDEFINES) \$(CINCLUDES) \$(HDRDIR) \$(DEFINES_IUSE):" \
+ -i Makefile
+
+ ebegin "Make depend"
+ emake .dependencies >/dev/null
+ eend $? "make depend failed"
+ fi
+
+ epatch "${FILESDIR}/${P}_gentoo.patch"
+
+ epatch_user
+
+ add_cap CAP_UTF8
+
+ add_cap CAP_IRCTRL_RUNTIME_PARAM \
+ CAP_VFAT_RUNTIME_PARAM \
+ CAP_CHUID \
+ CAP_SHUTDOWN_AUTO_RETRY
+
+ echo -e ${CAPS} > "${CAP_FILE}"
+
+ # LINGUAS support
+ einfo "\n \t VDR supports the LINGUAS values"
+
+ lang_po
+
+ einfo "\t Please set one of this values in your sytem make.conf"
+ einfo "\t LINGUAS=\"${LING_PO}\"\n"
+
+ if [[ -z ${LINGUAS} ]]; then
+ einfo "\n \t No values in LINGUAS="
+ einfo "\t You will get only english text on OSD \n"
+ fi
+
+ strip-linguas ${LING_PO} en
+}
+
+src_install() {
+ # trick makefile not to create a videodir by supplying it with an existing
+ # directory
+ emake \
+ VIDEODIR="/" \
+ DESTDIR="${D}" install || die "emake install failed"
+
+ keepdir "${PLUGIN_LIBDIR}"
+
+ keepdir "${CONF_DIR}"/plugins
+ keepdir "${CONF_DIR}"/themes
+ keepdir "${CONF_DIR}"/conf.d
+
+ if use html; then
+ dohtml *.html
+ fi
+
+ dodoc MANUAL INSTALL README* HISTORY CONTRIBUTORS
+
+ insinto /usr/share/vdr
+ doins "${CAP_FILE}"
+
+ if use alternatechannel; then
+ insinto /etc/vdr
+ doins "${FILESDIR}"/channel_alternative.conf
+ fi
+
+ chown -R vdr:vdr "${D}/${CONF_DIR}"
+}
+
+#pkg_preinst() {
+
+# example syntax...
+# has_version "<${CATEGORY}/${PN}-1.7.36"
+# previous_less_than_1_7_36=$?
+#}
+
+pkg_postinst() {
+
+ elog "This is a *developer* version."
+ elog "We strongly recommend that you only use it under controlled"
+ elog "conditions and for testing and debugging."
+
+ # correct wrong permission from earlier install
+ CACHEOWNER="$(stat -c %U /var/cache/vdr)"
+ if [ ! ${CACHEOWNER} == vdr ]; then
+ chown -R vdr:vdr "${ROOT}/var/cache/vdr"
+ fi
+
+# example syntax
+# if [[ previous_less_than_1_7_36=$? = 0 ]] ; then
+ #elog "bla foo"
+# fi
+
+ elog "It is a good idea to run vdrplugin-rebuild now."
+
+ elog "To get nice symbols in OSD we recommend to install"
+ elog "\t1. emerge media-fonts/vdrsymbols-ttf"
+ elog "\t2. select font VDRSymbolsSans in Setup"
+ elog ""
+ elog "To get an idea how to proceed now, have a look at our vdr-guide:"
+ elog "\thttps://wiki.gentoo.org/wiki/VDR"
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] proj/vdr/devel:master commit in: media-video/vdr/, media-video/vdr/files/
@ 2015-02-04 10:38 Joerg Bornkessel
0 siblings, 0 replies; 8+ messages in thread
From: Joerg Bornkessel @ 2015-02-04 10:38 UTC (permalink / raw
To: gentoo-commits
commit: 62475f2c6c0d0aaf6e985a1cf4f982d06077ac9d
Author: Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 4 10:37:54 2015 +0000
Commit: Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
CommitDate: Wed Feb 4 10:37:54 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/vdr/devel.git;a=commit;h=62475f2c
test request from upstream for several patches
Package-Manager: portage-2.2.15
Manifest-Sign-Key: 34C2808A
---
media-video/vdr/ChangeLog | 11 ++
media-video/vdr/Manifest | 16 ++-
.../vdr/files/01_vdr-2.1.8-eit-memleak-v1.diff | 54 ++++++++
.../vdr/files/02_vdr-2.1.8-binaryskipstrict.diff | 95 ++++++++++++++
...witch.diff => 03_vdr-2.1.8-scheduleswitch.diff} | 0
.../vdr/files/04_vdr-2.1.8-scheduleswitchblue.diff | 139 +++++++++++++++++++++
.../vdr/files/06_vdr-2.1.8-skipeditedresume.diff | 12 ++
.../{vdr-2.1.8-r1.ebuild => vdr-2.1.8-r2.ebuild} | 6 +-
8 files changed, 326 insertions(+), 7 deletions(-)
diff --git a/media-video/vdr/ChangeLog b/media-video/vdr/ChangeLog
index 3f6e38c..e31d1a8 100644
--- a/media-video/vdr/ChangeLog
+++ b/media-video/vdr/ChangeLog
@@ -2,6 +2,17 @@
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*vdr-2.1.8-r2 (04 Feb 2015)
+
+ 04 Feb 2015; Joerg Bornkessel <hd_brummy@gentoo.org> -vdr-2.1.8-r1.ebuild,
+ +vdr-2.1.8-r2.ebuild, +files/02_vdr-2.1.8-binaryskipstrict.diff,
+ +files/01_vdr-2.1.8-eit-memleak-v1.diff,
+ +files/03_vdr-2.1.8-scheduleswitch.diff,
+ -files/vdr-2.1.8-scheduleswitch.diff,
+ +files/04_vdr-2.1.8-scheduleswitchblue.diff,
+ +files/06_vdr-2.1.8-skipeditedresume.diff:
+ test request from upstream for several patches
+
*vdr-2.1.8-r1 (03 Feb 2015)
03 Feb 2015; Joerg Bornkessel <hd_brummy@gentoo.org> +vdr-2.1.8-r1.ebuild,
diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index 3707aa5..1b8ad2a 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -1,12 +1,16 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
+AUX 01_vdr-2.1.8-eit-memleak-v1.diff 2187 SHA256 9eb0419d2732749f8a8b4b516fe81518e6a704f1b6f95e2d5a7e59f1549744bb SHA512 aa52fbab030487f94313124c5d889390e764db073d05d7a5a120ec424fe03dafadc5f60eade6c44249eb34810ff4b2feedb9278b5c31187f48284444a453cbbf WHIRLPOOL b4bc5073c5bab23d1740bd22cd5cffe61c4efe6670dc3a297e795e60f00f900805e986aefee6802b7833689220fcd7736961c91ef107723f65f7fb8a286dd406
+AUX 02_vdr-2.1.8-binaryskipstrict.diff 4571 SHA256 49d6eefc31b56ffc69fc3b063bff37bdf6c2eafe6b8b172803d71ecb24cc9fb0 SHA512 8c3c7a7eb20cf46d8d7630bae6413c8ba6a2c1e4530a6faa0ed43ad681657534046816a18b37e567cf4f13f56256443457c8e551bc3e4307ab44c76225a45a72 WHIRLPOOL 879e872ac1e4fc88f71c9a939372de4f673c26699c2db66e83b253ee0d5b9526a5fc78d3c7c9912f7d8a0d16bb9ca23b0446146aba0dc06caa8f17bfd3b5b2dd
+AUX 03_vdr-2.1.8-scheduleswitch.diff 566 SHA256 a913e3177624199c1921b98067b3ffecddc7c3daadb23c493f5231347660cccb SHA512 b054e92ac7e51c2721d8816966bde29f3082a1c242a2c0313d88a23d211fdf934e9f6f7302800361d79996a50e4e54984396f65ff5a07f065fac6c6194aa3a67 WHIRLPOOL 2b5d12701e9a73a88e9f49e8a6a394d699f87e0bdc27782ee1cc361e85840600fd362fc8adaff9a9fdcef6a4e579736113932c5518036d34ff63e6310bd230f8
+AUX 04_vdr-2.1.8-scheduleswitchblue.diff 4972 SHA256 5df3d8b8e8637d9280ba04eb2d94fdb974fcf66a82960012ae519bb7b02ff548 SHA512 7ac0c985ed86668486183eac9c569cae3d0e49062c1f7470fe84832e67732eacca84d8e28e03661c4a194d7ad8b5d538b55d04187471520dcb2fa8238130f556 WHIRLPOOL 13fbad5ddf9348441f7d1803c55a07e709e2fe7a3f7c2ad5ad94207dfb730c1f10abfa42b4845919559807fbbb1182473e7e0e766a1035df1735e562ab9f46e1
+AUX 06_vdr-2.1.8-skipeditedresume.diff 702 SHA256 03b701ca2737e63df1cf1e5e1f2331e282ab5c26a4741951ddd07700e7b8488c SHA512 0a0393c599235147df2ec82c41570c0cae9316bc344cc3b00c1a1110fb7d9ffd2f67774b5882f0f9bc9f2b4ce5b98f0b109c52cb3fe2fab5df92bc5bd02277a3 WHIRLPOOL af8772fd694c10c9edc840b4b351a2c2d24be54f1f954888a49841cb02997e16efd54ca8cd6b918697a4f987c5ef7b6a11d1a03a079db12c9c42bbda9515ae60
AUX channel_alternative.conf 332 SHA256 30fb0a5147c01429c2813505cc69658cf1bfa1b70537bce07365017f653be5ce SHA512 738de5d5d99b54a516f41683834509b477590732db4e00b13b2f26e22c7349cb8517965a21251c08d29b0f368b2bb3fa64a1de71da09ffbedc5a401314a0eb5d WHIRLPOOL 96ead1c37c9e88e6593536a2182b813d3ae86c8e55e79a4cc5ff2d29ec0694405d26c82cb2295bb3f1e7e61c0ec93a646acc518e35ed6eff4d66c9219cc35677
AUX vdr-2.1.1_gentoo.patch 2488 SHA256 25275f22d8d183c089accd9463862aa772d2c13ae18c4f5769916c06b4b5918e SHA512 a36d8be52e7815165327e7322ce5f5537243a3cedc7b5e695ecddce567e8536cb44724540e5079fcda90f58a95f6fb26de4d1cc2842ce8d5460e4010623042f0 WHIRLPOOL 0885af205152ff2228bde0799a05c02efdb7fc712d740a640eecaff6296c7df1285883460e1dd452f0dbc6b4621ddcb0a7c89a21cc241a935f7b7526d2f852f5
AUX vdr-2.1.6_gentoo.patch 2255 SHA256 75ec762630d2e9099843151fd0b6e04c5b114faea2052392144d64c648cf5482 SHA512 0711128380cec9a6ec2e8212226a4a20896888467f323bc006bd1c4cbf1b8e1ce488c2f7227e0903847888e7e37159aecf6d82fdc1b50009a1c869d3da5134c0 WHIRLPOOL e984c7fb87fa3d7eedc203e3b5ac4d2cc9b528dc3a70d8a15582c6dee58589af6d8179fa542f3f45d2e9c6d9889b90e691b77b6d3398f4b6b200635bdc2c404e
AUX vdr-2.1.7_C++11.patch 4553 SHA256 3ff8f4762009a932cf63c4239e21f4cca2445cce160b578e5c5c5979b3fefc54 SHA512 41376c3a4bc4754401e2ce140aea5ce1a1b5ad4388c95446b8e1c8e7ab8acd21c35f24d961b4c16b4cc2500d73345cb73a8b4fa2c13dc90cb781dcac625195ec WHIRLPOOL 3b21733e5b065fc2d4188dfa872557cd4558265f3eaea3411d5a402c1cad14ed86379623e25ab908a4c43e165d4ac171bb1788b71b9b6644fd6510a928150f68
AUX vdr-2.1.7_gentoo.patch 2322 SHA256 8088a4f314e0b8d908f82cfe2a7392a18db679a7324bfa92dce49431c50313ec SHA512 c6953a7fb77717fdaa8ca05550496e25f4bc60d91c13ed0fb23d27e1a1ec433ec2d5cfb019717cf09eb7b67c9ebb91664b1b731dc28bc4f25e815871f6de0bc7 WHIRLPOOL 88d4e8407b085604525d9bae1f34a957ae5f168ac657a99c45dcba5f08185351ccb03736cfc464960d3f2157ac6357ffbf8b602dd1da49ee94efb403f71731d8
-AUX vdr-2.1.8-scheduleswitch.diff 566 SHA256 a913e3177624199c1921b98067b3ffecddc7c3daadb23c493f5231347660cccb SHA512 b054e92ac7e51c2721d8816966bde29f3082a1c242a2c0313d88a23d211fdf934e9f6f7302800361d79996a50e4e54984396f65ff5a07f065fac6c6194aa3a67 WHIRLPOOL 2b5d12701e9a73a88e9f49e8a6a394d699f87e0bdc27782ee1cc361e85840600fd362fc8adaff9a9fdcef6a4e579736113932c5518036d34ff63e6310bd230f8
AUX vdr-2.1.8_gentoo.patch 2322 SHA256 8088a4f314e0b8d908f82cfe2a7392a18db679a7324bfa92dce49431c50313ec SHA512 c6953a7fb77717fdaa8ca05550496e25f4bc60d91c13ed0fb23d27e1a1ec433ec2d5cfb019717cf09eb7b67c9ebb91664b1b731dc28bc4f25e815871f6de0bc7 WHIRLPOOL 88d4e8407b085604525d9bae1f34a957ae5f168ac657a99c45dcba5f08185351ccb03736cfc464960d3f2157ac6357ffbf8b602dd1da49ee94efb403f71731d8
DIST extpng-vdr-2.1.1-gentoo-edition-v1.patch.bz2 76312 SHA256 42ed177d9064f555bb5396123790eaa9cf4b500536698af29bda0193c951faab SHA512 07cf50a0f9edf2f8b1542ad314b86f18b88e9409cc9aef400585c7dafb8fc691b2d476d18b088bc0d3de8ec7bf88241ba5418f99e156353cbcf78de406238cf8 WHIRLPOOL c027a0f107db181b617d3f1d3da461733bc03edd975adab03473979877ee5503efcb88903c20a0c0c1063f40710cf14c68456bc8038902b1e29f4194e02f6cb5
DIST extpng-vdr-2.1.2-gentoo-edition-v3.patch.bz2 30698 SHA256 c2ba5ada4cadb44dde87dc5de8b9a1306fa274d0cca8f856ce5e829e16d7d51f SHA512 a4520423182ef44f56b9e6807622a68ba404e1b14e81b8e4153ec23bb4f7e1ec4feabf458dfaddb9a829140e404f6988ad92dbd5b3768ff447918b609b80c29a WHIRLPOOL 9fca245602fbf5926794276da516f82d2846c53781d46720f2cab967bc7839d0494dc7592e76a864fa313ab0e04aefbba5e5f8bf429d7ccc4c31a1e126cdcba4
@@ -32,15 +36,15 @@ EBUILD vdr-2.1.6-r1.ebuild 7588 SHA256 aab0a8b51860d6e99bffe5490ca7ce8ed218a4368
EBUILD vdr-2.1.6-r2.ebuild 7648 SHA256 9949037814fa0636037325e94067838e6df6dce8a0dc77fd20c8abaa08ee3e5a SHA512 2f44e6d552b5da3589ca3a6144d4d2ff76a822f955023855690ea386f98cb7ff6f43a3faa470a1659338e8c43d8e2b3ccee0e915ed41738bfd8b191ea372ee58 WHIRLPOOL 5b2775f70851b4bd94e9382e8b3709e08b53c63a9fae0f64fa7f7b0038c9d4d6ba5d2a60a6e41ce34d48ef9475c56bc7eaa80fabaeb356a335c8fe57edeb50ea
EBUILD vdr-2.1.6.ebuild 7616 SHA256 ca9c89b9db90646cfe89964f8f5094af9c8be19404ea3d05ba75d2283af40f6a SHA512 0ea0d208c8140cb158a98cdc8ffd0711d0bf5b2fc635f3724ee7273e735371d232ce7bd7086805b0c38bd9c3f8e04b438d28b81b76c4f6f2c6f1d2acd0cc8b33 WHIRLPOOL 5580d45a8d145e481cfb04ef338868b94398f434ff2daed0f77d347b471b1ce8ec4e35a9ef48c3f1d2368dca57074201456be22f4236bc41bf7f0442eaea38b3
EBUILD vdr-2.1.7.ebuild 7724 SHA256 352022abc89e0fee871f672c8d476a9d1529eca9a817ee7d0d60edc3986dbfd3 SHA512 ee62924473e3909f578805db1bc58c17f657c6adf5f8a3948f83ae9366cea8f101f341f6a5789a8e00236d110db50f01f453dd13e7c0f65dd2915750fb6860dc WHIRLPOOL dd3570aee1e0236caf9a2c40122f28e787933128c6d1f938a74c889725f2a8e4295cbd8fa4951030164364db2d1669b8bc75a8f9df31b053cd61fedd81695d1f
-EBUILD vdr-2.1.8-r1.ebuild 7887 SHA256 98b3a9d8dc91ce7cbc929fe98b263d1a3c86e2d4f3af3b4e67d656fde3a2706f SHA512 5099f5e7e71d9e69f394f0ccafaef1f46f74894fad2b0f51ee49c588f34bb2ed8c5ba4356175f6a7c9699e1421feac85729d2e46cd7f471003873e271e34e329 WHIRLPOOL e343eb290876e7b80f1fe36ade2d078c0de9be1c686920f1b56348e76224e025d29a2cef5bd42ce0283193628240c6e5dbca19128e7c5ff629640b95e0aafca3
+EBUILD vdr-2.1.8-r2.ebuild 8123 SHA256 6dcd1d1f7d9e262c2618126d6af3bad45b5d9c09e6591f5df94e4f96116259eb SHA512 2f6f613d5add2fb97efc9e58dede7d1a64cfddc79e056271072cf32d164fc26adc067d96586074d5588749a7978ad1eaa57e1c0b7b3177ce0bb6c220c37b1719 WHIRLPOOL 3f848dae71a31471649470b6f7b8eaf7c0a96daaf7dffe6cbe36bd3145ec6e149fd518394b3e13c8465c0ca4c5ee97972009f13a687114e00f551ce5cab0268a
EBUILD vdr-2.1.8.ebuild 7624 SHA256 ee61c7eb7911a8f438f2d429ebb9615793db5f94351f419298faad005d414c24 SHA512 ab4becbc51ded5808bb7df7dce14db8cd9e685e42deed672ee29a97ca64f94276752652b61057a4f412f155d41eca741dff19180ce4d2f7496bd09c07dd085b7 WHIRLPOOL d6d2dcd482f8db246924c22ce673af2edf161feea77180cc77981c90b3b7b195cb0b00027f2ef705725d351fc6255436965a6645e1e07d2c477977e81a1cbc47
-MISC ChangeLog 26849 SHA256 61d6e50b122a202f3638b2e6ee6a4daaabc1b378354401445a57b14caef8e46d SHA512 fd7a68f978ae898182d005001d359c9131816ab93befc2cb6728c117c508286812add685c9d6eb98727201270f32eca529b1d9634c110fced17e12a45751b026 WHIRLPOOL 54a9576c06574ef3e2d2eb668c8666985c8c8abb272b42a329a4d869697bfaa9fe6726aa5dc871a59b24b7391c47a94b749a692748b690dfaae994c1a4971ef9
+MISC ChangeLog 27290 SHA256 5c4ac2d412830199894b2c074cf1eaa76ab7f9686587dcff2371f7583dc96c64 SHA512 cc5adf3e114d777edf5fadd58de5af2d91844b6c3d6ee2732d52a68ad83c78b1c52f9f3e289b11b7ee3a826f6917d237a84dcc9fedd3ea3fb23d3d0ad325d0ea WHIRLPOOL 2e6a7ecaafcbd40163f8b6f2a0509f12eecded4cc8121560836e2ceb0c0b91dddb5686866986ad83f3e557088e64399d799c9a7b5e76d95741146a52f6ee7385
MISC metadata.xml 2071 SHA256 d308d181e741e458ef838af1e003e85323eb23f17b9de610317fe45a7ef92d8f SHA512 cb7c405c0d07ec536d5db70db514121e96f73b4ade0eca80d5e5c12f3cc4f209ce5d1c1c3b3129aaa8f974b843a54fda73684d05c684e403d955079d0f119e56 WHIRLPOOL e606dcf24f8bbcd427ff9e3c26ae022c50332cec79cdb1f39febe7fd25f076a9ab2439232b4b7870ea3e000026b5163f6ceb8727b77f5609060f710f40b3a498
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
Comment: added by hd_brummy@gentoo.org
-iD8DBQFU0LXtdn07HTTCgIoRCMcsAJ93LL1KOAe4CdwypFrR3dTZ9gWnkgCeLt5q
-nwTsChWzsfnIu/whvcfWcyM=
-=ZifI
+iD8DBQFU0faCdn07HTTCgIoRCBAvAJ9H0paDU07ZQFUqmFDWR1+sEs86JgCgl3Ih
+NYBN0xIssvWa0A6N8TCSR/Y=
+=k3V2
-----END PGP SIGNATURE-----
diff --git a/media-video/vdr/files/01_vdr-2.1.8-eit-memleak-v1.diff b/media-video/vdr/files/01_vdr-2.1.8-eit-memleak-v1.diff
new file mode 100644
index 0000000..742a879
--- /dev/null
+++ b/media-video/vdr/files/01_vdr-2.1.8-eit-memleak-v1.diff
@@ -0,0 +1,54 @@
+diff --git a/eit.c b/eit.c
+index 30c017b..031fc93 100644
+--- a/eit.c
++++ b/eit.c
+@@ -136,8 +136,8 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data, bo
+ UseExtendedEventDescriptor = true;
+ }
+ if (UseExtendedEventDescriptor) {
+- ExtendedEventDescriptors->Add(eed);
+- d = NULL; // so that it is not deleted
++ if (ExtendedEventDescriptors->Add(eed))
++ d = NULL; // so that it is not deleted
+ }
+ if (eed->getDescriptorNumber() == eed->getLastDescriptorNumber())
+ UseExtendedEventDescriptor = false;
+diff --git a/libsi/si.c b/libsi/si.c
+index 0ef3939..edc9074 100644
+--- a/libsi/si.c
++++ b/libsi/si.c
+@@ -198,17 +198,18 @@ void DescriptorGroup::Delete() {
+ }
+ }
+
+-void DescriptorGroup::Add(GroupDescriptor *d) {
++bool DescriptorGroup::Add(GroupDescriptor *d) {
+ if (!array) {
+ length=d->getLastDescriptorNumber()+1;
+ array=new GroupDescriptor*[length]; //numbering is zero-based
+ for (int i=0;i<length;i++)
+ array[i]=0;
+ } else if (length != d->getLastDescriptorNumber()+1)
+- return; //avoid crash in case of misuse
++ return false; //avoid crash in case of misuse
+ if (length <= d->getDescriptorNumber())
+- return; // see http://www.vdr-portal.de/board60-linux/board14-betriebssystem/board69-c-t-vdr/p1025777-segfault-mit-vdr-1-7-21/#post1025777
++ return false; // see http://www.vdr-portal.de/board60-linux/board14-betriebssystem/board69-c-t-vdr/p1025777-segfault-mit-vdr-1-7-21/#post1025777
+ array[d->getDescriptorNumber()]=d;
++ return true;
+ }
+
+ bool DescriptorGroup::isComplete() {
+diff --git a/libsi/si.h b/libsi/si.h
+index 1e65111..7b47d02 100644
+--- a/libsi/si.h
++++ b/libsi/si.h
+@@ -483,7 +483,7 @@ class DescriptorGroup {
+ public:
+ DescriptorGroup(bool deleteOnDesctruction=true);
+ ~DescriptorGroup();
+- void Add(GroupDescriptor *d);
++ bool Add(GroupDescriptor *d);
+ void Delete();
+ int getLength() { return length; }
+ GroupDescriptor **getDescriptors() { return array; }
diff --git a/media-video/vdr/files/02_vdr-2.1.8-binaryskipstrict.diff b/media-video/vdr/files/02_vdr-2.1.8-binaryskipstrict.diff
new file mode 100644
index 0000000..63cd3dd
--- /dev/null
+++ b/media-video/vdr/files/02_vdr-2.1.8-binaryskipstrict.diff
@@ -0,0 +1,95 @@
+===================================================================
+RCS file: ./RCS/MANUAL
+retrieving revision 3.10
+diff -u -r3.10 ./MANUAL
+--- ./MANUAL 2015/01/29 15:55:21 3.10
++++ ./MANUAL 2015/02/02 12:40:07
+@@ -1006,6 +1006,18 @@
+ the binary mode and makes '1' and '3' always skip the number
+ of seconds configured as the initial value.
+
++ Binary skip strict = yes
++ When skipping in binary mode with the '1' and '3' keys, the
++ distance of the skip is halved with every key press after the
++ first change of direction. While this allows for locating a
++ particular position in a recording very fast, once you make
++ one step too many in the current direction you have no chance
++ of ever reaching the desired point any more. You will have to
++ wait for the timeout to occur and start binary skipping anew.
++ If this option is set to 'no', the skip distance will only be
++ halved if the direction actually changes. That way, even if
++ you missed the target point, you can still back up to it.
++
+ Resume ID = 0 Defines an additional ID that can be used in a multi user
+ environment, so that every user has his/her own resume
+ files for each recording. The valid range is 0...99, with
+===================================================================
+RCS file: ./RCS/config.c
+retrieving revision 3.6
+diff -u -r3.6 ./config.c
+--- ./config.c 2015/01/29 09:01:30 3.6
++++ ./config.c 2015/02/02 12:22:30
+@@ -475,6 +475,7 @@
+ PauseAtLastMark = 0;
+ BinarySkipInitial = 120;
+ BinarySkipTimeout = 3;
++ BinarySkipStrict = 1;
+ ResumeID = 0;
+ CurrentChannel = -1;
+ CurrentVolume = MAXVOLUME;
+@@ -693,6 +694,7 @@
+ else if (!strcasecmp(Name, "PauseAtLastMark")) PauseAtLastMark = atoi(Value);
+ else if (!strcasecmp(Name, "BinarySkipInitial")) BinarySkipInitial = atoi(Value);
+ else if (!strcasecmp(Name, "BinarySkipTimeout")) BinarySkipTimeout = atoi(Value);
++ else if (!strcasecmp(Name, "BinarySkipStrict")) BinarySkipStrict = atoi(Value);
+ else if (!strcasecmp(Name, "ResumeID")) ResumeID = atoi(Value);
+ else if (!strcasecmp(Name, "CurrentChannel")) CurrentChannel = atoi(Value);
+ else if (!strcasecmp(Name, "CurrentVolume")) CurrentVolume = atoi(Value);
+@@ -815,6 +817,7 @@
+ Store("PauseAtLastMark", PauseAtLastMark);
+ Store("BinarySkipInitial", BinarySkipInitial);
+ Store("BinarySkipTimeout", BinarySkipTimeout);
++ Store("BinarySkipStrict", BinarySkipStrict);
+ Store("ResumeID", ResumeID);
+ Store("CurrentChannel", CurrentChannel);
+ Store("CurrentVolume", CurrentVolume);
+===================================================================
+RCS file: ./RCS/config.h
+retrieving revision 3.14
+diff -u -r3.14 ./config.h
+--- ./config.h 2015/02/01 14:59:52 3.14
++++ ./config.h 2015/02/02 12:21:13
+@@ -338,6 +338,7 @@
+ int PauseAtLastMark;
+ int BinarySkipInitial;
+ int BinarySkipTimeout;
++ int BinarySkipStrict;
+ int ResumeID;
+ int CurrentChannel;
+ int CurrentVolume;
+===================================================================
+RCS file: ./RCS/menu.c
+retrieving revision 3.35
+diff -u -r3.35 ./menu.c
+--- ./menu.c 2015/02/01 10:42:11 3.35
++++ ./menu.c 2015/02/02 12:23:18
+@@ -3641,6 +3641,7 @@
+ Add(new cMenuEditBoolItem(tr("Setup.Replay$Pause replay at last mark"), &data.PauseAtLastMark));
+ Add(new cMenuEditIntItem( tr("Setup.Replay$Binary skip initial value (s)"), &data.BinarySkipInitial, 10, 600));
+ Add(new cMenuEditIntItem( tr("Setup.Replay$Binary skip timeout (s)"), &data.BinarySkipTimeout, 0, 10));
++ Add(new cMenuEditBoolItem(tr("Setup.Replay$Binary skip strict"), &data.BinarySkipStrict));
+ Add(new cMenuEditIntItem(tr("Setup.Replay$Resume ID"), &data.ResumeID, 0, 99));
+ }
+
+@@ -5007,7 +5008,10 @@
+ }
+ else if (Key != lastKey) {
+ currentValue /= 2;
+- lastKey = kNone; // once the direction has changed, every further call halves the value
++ if (Setup.BinarySkipStrict)
++ lastKey = kNone; // once the direction has changed, every further call halves the value
++ else
++ lastKey = Key; // only halve the value when the direction is changed
+ }
+ timeout.Set(Setup.BinarySkipTimeout * 1000);
+ return max(currentValue, 1);
diff --git a/media-video/vdr/files/vdr-2.1.8-scheduleswitch.diff b/media-video/vdr/files/03_vdr-2.1.8-scheduleswitch.diff
similarity index 100%
rename from media-video/vdr/files/vdr-2.1.8-scheduleswitch.diff
rename to media-video/vdr/files/03_vdr-2.1.8-scheduleswitch.diff
diff --git a/media-video/vdr/files/04_vdr-2.1.8-scheduleswitchblue.diff b/media-video/vdr/files/04_vdr-2.1.8-scheduleswitchblue.diff
new file mode 100644
index 0000000..963d3ba
--- /dev/null
+++ b/media-video/vdr/files/04_vdr-2.1.8-scheduleswitchblue.diff
@@ -0,0 +1,139 @@
+--- menu.c 2015/02/03 10:42:55 3.37
++++ menu.c 2015/02/03 11:51:29
+@@ -1377,6 +1377,7 @@
+ class cMenuWhatsOn : public cOsdMenu {
+ private:
+ bool now;
++ bool canSwitch;
+ int helpKeys;
+ int timerState;
+ eOSState Record(void);
+@@ -1401,7 +1402,8 @@
+ {
+ SetMenuCategory(Now ? mcScheduleNow : mcScheduleNext);
+ now = Now;
+- helpKeys = -1;
++ canSwitch = false;
++ helpKeys = 0;
+ timerState = 0;
+ Timers.Modified(timerState);
+ for (cChannel *Channel = Channels.First(); Channel; Channel = Channels.Next(Channel)) {
+@@ -1434,16 +1436,27 @@
+ void cMenuWhatsOn::SetHelpKeys(void)
+ {
+ cMenuScheduleItem *item = (cMenuScheduleItem *)Get(Current());
++ canSwitch = false;
+ int NewHelpKeys = 0;
+ if (item) {
+ if (item->timerMatch == tmFull)
+- NewHelpKeys = 2;
++ NewHelpKeys |= 0x02; // "Timer"
+ else
+- NewHelpKeys = 1;
++ NewHelpKeys |= 0x01; // "Record"
++ if (now)
++ NewHelpKeys |= 0x04; // "Next"
++ else
++ NewHelpKeys |= 0x08; // "Now"
++ if (cChannel *Channel = Channels.GetByChannelID(item->event->ChannelID(), true)) {
++ if (Channel->Number() != cDevice::CurrentChannel()) {
++ NewHelpKeys |= 0x10; // "Switch"
++ canSwitch = true;
++ }
++ }
+ }
+ if (NewHelpKeys != helpKeys) {
+ const char *Red[] = { NULL, tr("Button$Record"), tr("Button$Timer") };
+- SetHelp(Red[NewHelpKeys], now ? tr("Button$Next") : tr("Button$Now"), tr("Button$Schedule"), tr("Button$Switch"));
++ SetHelp(Red[NewHelpKeys & 0x03], now ? tr("Button$Next") : tr("Button$Now"), tr("Button$Schedule"), canSwitch ? tr("Button$Switch") : NULL);
+ helpKeys = NewHelpKeys;
+ }
+ }
+@@ -1519,10 +1532,12 @@
+ }
+ }
+ break;
+- case kBlue: return Switch();
++ case kBlue: if (canSwitch)
++ return Switch();
++ break;
+ case kInfo:
+ case kOk: if (Count())
+- return AddSubMenu(new cMenuEvent(((cMenuScheduleItem *)Get(Current()))->event, true, true));
++ return AddSubMenu(new cMenuEvent(((cMenuScheduleItem *)Get(Current()))->event, canSwitch, true));
+ break;
+ default: break;
+ }
+@@ -1543,7 +1558,7 @@
+ cSchedulesLock schedulesLock;
+ const cSchedules *schedules;
+ bool now, next;
+- int otherChannel;
++ bool canSwitch;
+ int helpKeys;
+ int timerState;
+ eOSState Number(void);
+@@ -1566,8 +1581,8 @@
+ {
+ SetMenuCategory(mcSchedule);
+ now = next = false;
+- otherChannel = 0;
+- helpKeys = -1;
++ canSwitch = false;
++ helpKeys = 0;
+ timerState = 0;
+ Timers.Modified(timerState);
+ cMenuScheduleItem::SetSortMode(cMenuScheduleItem::ssmAllThis);
+@@ -1673,16 +1688,23 @@
+ void cMenuSchedule::SetHelpKeys(void)
+ {
+ cMenuScheduleItem *item = (cMenuScheduleItem *)Get(Current());
++ canSwitch = false;
+ int NewHelpKeys = 0;
+ if (item) {
+ if (item->timerMatch == tmFull)
+- NewHelpKeys = 2;
++ NewHelpKeys |= 0x02; // "Timer"
+ else
+- NewHelpKeys = 1;
++ NewHelpKeys |= 0x01; // "Record"
++ if (cChannel *Channel = Channels.GetByChannelID(item->event->ChannelID(), true)) {
++ if (Channel->Number() != cDevice::CurrentChannel()) {
++ NewHelpKeys |= 0x10; // "Switch"
++ canSwitch = true;
++ }
++ }
+ }
+ if (NewHelpKeys != helpKeys) {
+ const char *Red[] = { NULL, tr("Button$Record"), tr("Button$Timer") };
+- SetHelp(Red[NewHelpKeys], tr("Button$Now"), tr("Button$Next"));
++ SetHelp(Red[NewHelpKeys & 0x03], tr("Button$Now"), tr("Button$Next"), canSwitch ? tr("Button$Switch") : NULL);
+ helpKeys = NewHelpKeys;
+ }
+ }
+@@ -1787,12 +1809,12 @@
+ case kYellow: if (schedules)
+ return AddSubMenu(new cMenuWhatsOn(schedules, false, cMenuWhatsOn::CurrentChannel()));
+ break;
+- case kBlue: if (Count() && otherChannel)
++ case kBlue: if (canSwitch)
+ return Switch();
+ break;
+ case kInfo:
+ case kOk: if (Count())
+- return AddSubMenu(new cMenuEvent(((cMenuScheduleItem *)Get(Current()))->event, otherChannel, true));
++ return AddSubMenu(new cMenuEvent(((cMenuScheduleItem *)Get(Current()))->event, canSwitch, true));
+ break;
+ default: break;
+ }
+@@ -1805,10 +1827,6 @@
+ if (channel) {
+ cMenuScheduleItem::SetSortMode(cMenuScheduleItem::ssmAllThis);
+ PrepareScheduleAllThis(NULL, channel);
+- if (channel->Number() != cDevice::CurrentChannel()) {
+- otherChannel = channel->Number();
+- SetHelp(Count() ? tr("Button$Record") : NULL, tr("Button$Now"), tr("Button$Next"), tr("Button$Switch"));
+- }
+ Display();
+ }
+ }
diff --git a/media-video/vdr/files/06_vdr-2.1.8-skipeditedresume.diff b/media-video/vdr/files/06_vdr-2.1.8-skipeditedresume.diff
new file mode 100644
index 0000000..bcfcb2c
--- /dev/null
+++ b/media-video/vdr/files/06_vdr-2.1.8-skipeditedresume.diff
@@ -0,0 +1,12 @@
+diff -Naur vdr-2.1.8.orig/dvbplayer.c vdr-2.1.8/dvbplayer.c
+--- vdr-2.1.8.orig/dvbplayer.c 2015-02-04 10:20:26.000000000 +0100
++++ vdr-2.1.8/dvbplayer.c 2015-02-04 10:22:10.000000000 +0100
+@@ -431,6 +431,8 @@
+ if (index) {
+ int Index = ptsIndex.FindIndex(DeviceGetSTC());
+ if (Index >= 0) {
++ if (Setup.SkipEdited && marks.First() && abs(Index - marks.First()->Position()) <= int(round(RESUMEBACKUP * framesPerSecond)))
++ Index = 0; // when stopping within RESUMEBACKUP of the first mark the recording shall still be considered unviewed
+ #ifdef USE_RESUMERESET
+ int backup = int(round(RESUMEBACKUP * framesPerSecond));
+ if (Index >= index->Last() - backup)
diff --git a/media-video/vdr/vdr-2.1.8-r1.ebuild b/media-video/vdr/vdr-2.1.8-r2.ebuild
similarity index 96%
rename from media-video/vdr/vdr-2.1.8-r1.ebuild
rename to media-video/vdr/vdr-2.1.8-r2.ebuild
index 03d5a9c..91707aa 100644
--- a/media-video/vdr/vdr-2.1.8-r1.ebuild
+++ b/media-video/vdr/vdr-2.1.8-r2.ebuild
@@ -217,7 +217,11 @@ src_prepare() {
# http://www.vdr-portal.de/index.php?page=Thread&postID=1230810
einfo "\ntest request from upstream maintainer"
einfo "http://www.vdr-portal.de/index.php?page=Thread&postID=1230810"
- epatch "${FILESDIR}/${P}-scheduleswitch.diff"
+ epatch "${FILESDIR}/01_vdr-2.1.8-eit-memleak-v1.diff"
+ epatch "${FILESDIR}/02_vdr-2.1.8-binaryskipstrict.diff"
+ epatch "${FILESDIR}/03_vdr-2.1.8-scheduleswitch.diff"
+ epatch "${FILESDIR}/04_vdr-2.1.8-scheduleswitchblue.diff"
+ epatch "${FILESDIR}/06_vdr-2.1.8-skipeditedresume.diff"
epatch_user
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] proj/vdr/devel:master commit in: media-video/vdr/, media-video/vdr/files/
@ 2015-02-08 20:30 Joerg Bornkessel
0 siblings, 0 replies; 8+ messages in thread
From: Joerg Bornkessel @ 2015-02-08 20:30 UTC (permalink / raw
To: gentoo-commits
commit: c222c0d527ac8b70e3e8655ab2151c4959def484
Author: Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 8 20:30:14 2015 +0000
Commit: Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
CommitDate: Sun Feb 8 20:30:14 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/vdr/devel.git;a=commit;h=c222c0d5
bump
Package-Manager: portage-2.2.15
Manifest-Sign-Key: 34C2808A
---
media-video/vdr/ChangeLog | 6 +
media-video/vdr/Manifest | 14 +-
media-video/vdr/files/vdr-2.1.9_gentoo.patch | 70 +++++++
media-video/vdr/metadata.xml | 1 +
media-video/vdr/vdr-2.1.9.ebuild | 295 +++++++++++++++++++++++++++
5 files changed, 381 insertions(+), 5 deletions(-)
diff --git a/media-video/vdr/ChangeLog b/media-video/vdr/ChangeLog
index e31d1a8..6c8deee 100644
--- a/media-video/vdr/ChangeLog
+++ b/media-video/vdr/ChangeLog
@@ -2,6 +2,12 @@
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*vdr-2.1.9 (08 Feb 2015)
+
+ 08 Feb 2015; Joerg Bornkessel <hd_brummy@gentoo.org> +vdr-2.1.9.ebuild,
+ +files/vdr-2.1.9_gentoo.patch, metadata.xml:
+ bump
+
*vdr-2.1.8-r2 (04 Feb 2015)
04 Feb 2015; Joerg Bornkessel <hd_brummy@gentoo.org> -vdr-2.1.8-r1.ebuild,
diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index 1b8ad2a..8dadc93 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -12,12 +12,14 @@ AUX vdr-2.1.6_gentoo.patch 2255 SHA256 75ec762630d2e9099843151fd0b6e04c5b114faea
AUX vdr-2.1.7_C++11.patch 4553 SHA256 3ff8f4762009a932cf63c4239e21f4cca2445cce160b578e5c5c5979b3fefc54 SHA512 41376c3a4bc4754401e2ce140aea5ce1a1b5ad4388c95446b8e1c8e7ab8acd21c35f24d961b4c16b4cc2500d73345cb73a8b4fa2c13dc90cb781dcac625195ec WHIRLPOOL 3b21733e5b065fc2d4188dfa872557cd4558265f3eaea3411d5a402c1cad14ed86379623e25ab908a4c43e165d4ac171bb1788b71b9b6644fd6510a928150f68
AUX vdr-2.1.7_gentoo.patch 2322 SHA256 8088a4f314e0b8d908f82cfe2a7392a18db679a7324bfa92dce49431c50313ec SHA512 c6953a7fb77717fdaa8ca05550496e25f4bc60d91c13ed0fb23d27e1a1ec433ec2d5cfb019717cf09eb7b67c9ebb91664b1b731dc28bc4f25e815871f6de0bc7 WHIRLPOOL 88d4e8407b085604525d9bae1f34a957ae5f168ac657a99c45dcba5f08185351ccb03736cfc464960d3f2157ac6357ffbf8b602dd1da49ee94efb403f71731d8
AUX vdr-2.1.8_gentoo.patch 2322 SHA256 8088a4f314e0b8d908f82cfe2a7392a18db679a7324bfa92dce49431c50313ec SHA512 c6953a7fb77717fdaa8ca05550496e25f4bc60d91c13ed0fb23d27e1a1ec433ec2d5cfb019717cf09eb7b67c9ebb91664b1b731dc28bc4f25e815871f6de0bc7 WHIRLPOOL 88d4e8407b085604525d9bae1f34a957ae5f168ac657a99c45dcba5f08185351ccb03736cfc464960d3f2157ac6357ffbf8b602dd1da49ee94efb403f71731d8
+AUX vdr-2.1.9_gentoo.patch 2322 SHA256 8088a4f314e0b8d908f82cfe2a7392a18db679a7324bfa92dce49431c50313ec SHA512 c6953a7fb77717fdaa8ca05550496e25f4bc60d91c13ed0fb23d27e1a1ec433ec2d5cfb019717cf09eb7b67c9ebb91664b1b731dc28bc4f25e815871f6de0bc7 WHIRLPOOL 88d4e8407b085604525d9bae1f34a957ae5f168ac657a99c45dcba5f08185351ccb03736cfc464960d3f2157ac6357ffbf8b602dd1da49ee94efb403f71731d8
DIST extpng-vdr-2.1.1-gentoo-edition-v1.patch.bz2 76312 SHA256 42ed177d9064f555bb5396123790eaa9cf4b500536698af29bda0193c951faab SHA512 07cf50a0f9edf2f8b1542ad314b86f18b88e9409cc9aef400585c7dafb8fc691b2d476d18b088bc0d3de8ec7bf88241ba5418f99e156353cbcf78de406238cf8 WHIRLPOOL c027a0f107db181b617d3f1d3da461733bc03edd975adab03473979877ee5503efcb88903c20a0c0c1063f40710cf14c68456bc8038902b1e29f4194e02f6cb5
DIST extpng-vdr-2.1.2-gentoo-edition-v3.patch.bz2 30698 SHA256 c2ba5ada4cadb44dde87dc5de8b9a1306fa274d0cca8f856ce5e829e16d7d51f SHA512 a4520423182ef44f56b9e6807622a68ba404e1b14e81b8e4153ec23bb4f7e1ec4feabf458dfaddb9a829140e404f6988ad92dbd5b3768ff447918b609b80c29a WHIRLPOOL 9fca245602fbf5926794276da516f82d2846c53781d46720f2cab967bc7839d0494dc7592e76a864fa313ab0e04aefbba5e5f8bf429d7ccc4c31a1e126cdcba4
DIST extpng-vdr-2.1.3-gentoo-edition-v1.patch.bz2 121553 SHA256 6ca5a1db1395001cc80178e61fbc9230e425e1c0d00b386e056283e4967326d4 SHA512 22e596f618fccaa61aa48c0ca32566a7937e539c54506ffab7f1fc98261da100dfc7ef47ee043535bcd18e1fd096ca3b897b251cad1a2ab4d9c0f285aba848d1 WHIRLPOOL b122620875e822eb1a2102c4ff7dc5055c3ee5e57320db2c0d04b864ef87fe04b9b6659483b164f8bc0a8a5db6180ff6668b152357dedfc13d1de42e15645e1e
DIST extpng-vdr-2.1.5-gentoo-edition-v1.patch.bz2 30725 SHA256 eea5f1e92b5ef01d3c7165ee6bb3fa4d2daac6b5fd576b1de59775579aad87c1 SHA512 cf0ea1b756eebfb9f56cac9df126cc6b94eda2634bf9f88ec936e444744232909a11fa65e82f26f905536dd216383347010da6d5094e23c0c1210c007f54d813 WHIRLPOOL ff27809b5a454a5cecacf6ec04e6a3cc0c3b6627a7528fb42bef46ba9c7bf54b08e3b20eaeec19a997b8dd1df31bb9d41d0d176943a1c8e06b1f817b9ce91549
DIST extpng-vdr-2.1.6-gentoo-edition-v2.patch.bz2 63143 SHA256 df8d3b428bfdce7443c39029c11e66d9c328c13b0dc46163707e06238054be8b SHA512 4ca1c6afc412decef231f0a1b8d0b64e4d38fc469cb3f15a301f24d613f4edfa32a8c12dff7b7ce562541f3b3d17561a4e0e7c0ae17c6dcc2d0a7090d73f9690 WHIRLPOOL ef3d0b935e9dcc084e54d9e7548a863ece66f6ab60c1ec31c81dcb01bd7e84a532fb0313a9e9d6773a9d5e85fa25672e4c293c4b1df0a226e0eecbbbc4cfe053
DIST extpng-vdr-2.1.8-gentoo-edition-v2.patch.bz2 29910 SHA256 0e885f6b76bfe4246f14156810343afa441b09d205daad704962b3df4c976748 SHA512 571976e0393cd84703a13b1236233af6f00e4f7fcaf5e93b017fafe84ab9dd09ea7c245aa6657ebebe8cafa35135c05821bab1f4093c687dc9cf61a5437c585f WHIRLPOOL 3e9ca9d0974c9470f5358c7185d484bbdcc052ad6afe3b7cdb0789f86a4170dbdb830606ba3c53d85878e659289a43015487421b6978c81798f16b196c104b4f
+DIST extpng-vdr-2.1.9-gentoo-edition-v1.patch.bz2 26239 SHA256 9a2f98de98af6f9954179aeae0848e0c183fe5d85e63652d7d2f859c49d0a77a SHA512 6705a448810ee6061ce5009ff243a14c40ce9395f1d83b8223e1472c8481277abde3be900aca5b2a4291cb3f94c4f4fd58d326a88c7b12cf5493d558403ded87 WHIRLPOOL 91d45ed0a67e672886506843cf9dd933736ec46720641e9b9a692540aa5ef4dde2db50e1b636bfa7caf69ca53fd991de7d69bd2818e6f82aea4344666e96e98a
DIST vdr-2.1.1.tar.bz2 842414 SHA256 96292f4f2a47fea9fdd432bdcca6e2f11747e2b19feac6d6f7af1797c5abfa37 SHA512 f31c774cc5c383b97cdae98892906c66ce27a2277ccde185815299ddd894e18908a6c252c92bddfefb82a8fe933c9c2b5e6f91947db526bb86bab9ff08cb8158 WHIRLPOOL e92705b8fec477a4e10c563f4440ba54ccb499823b15a6227ac2633fc55a56fad023b6f8b5d4450505344dfb5a1871ceb3a787c9e9470c178f947874fc79eef0
DIST vdr-2.1.2-gcc.patch.gz 542 SHA256 8ac11be7074231604868e5f4a153df44b957543227c4cb0fcadbf693900b25d8 SHA512 4b3595e3ed3ef291bf155500d96d3355656f11442bc9a9a13ddbdfc35ae3156a894c12da1f4a20bdf6a7e35c3cb0904ab1c5c2d14698ffe6595ffc9d5b37a2ad WHIRLPOOL 96cbcea605e52a76974196f5a7ec44b49222f0fb3048428286ab974ec6633e4bdd6523796a0109ba866aaba101b270b099dc4983b439d6ad84c00890cb7078d8
DIST vdr-2.1.2.tar.bz2 850237 SHA256 1bf9c636145acf2d67716475314efe9703619759f0fdbae02d89fe599730f2a4 SHA512 4e9bf4705a64d4fab790d6cf0b92151537e282a8a3a41eeb13cddf3a966b303b31fc32fd62b27450adc68134ca853aaa6dd5b6d7a9c672c6165aab9f044c19b5 WHIRLPOOL 525ce8c05cbaeb9f3d8108117fb18dc5b64885e311c3a40dd704888b0a5020cb3ef6fcd9d57af200d94ffc0479add8c6a651791885ff67f7f93cf45a0aec1d8b
@@ -27,6 +29,7 @@ DIST vdr-2.1.5.tar.bz2 869767 SHA256 e642dcaaa1a5edc3683e33c5b154c6439a1427c24dc
DIST vdr-2.1.6.tar.bz2 872380 SHA256 232a326f9a4a609746da42a9c7ee632f394496b7e8215d71dfdcff3fcde4e145 SHA512 ce98ff6167e340ec7cd8d23012e2632f5a41fe20979359c2684771ba86458bb6b48736b34b9474f6ccb7492951c69a3849c086848c2870e8c7476941f64022df WHIRLPOOL df9159648464682841b5ed9c14a584c53e154f74084c432e6e5e94bf2b0e095c72b23e25329f582fd1e18b34c93717f1d91f7ff6c3a29887ad870021eaecc2a3
DIST vdr-2.1.7.tar.bz2 880225 SHA256 86fcf656bc121e4cb8b92a2c06dbeda7b22dfd033ba74b9940f368e82fdbcafc SHA512 32d1a14fbbafd28870f5c30009fa9ae38ff34933ae3b6eb00029284f3c4ddc039bae563ed8381792c47006d26d6a33a19b67e29a227eac6f0ff36a7bbe9faa30 WHIRLPOOL 7a49a332f508ff2ec3597ccf4c944249f3380a5559bb5e225083376e1813280fbf2e56356d1345c2f7383ddbf81e94d1d9fe4c4604b3addb5e276a9060255f55
DIST vdr-2.1.8.tar.bz2 890588 SHA256 96d3209742e2b61d7e75ce54f767d61adc9857472f2c79df5479a4e60772975e SHA512 f1b1d6261aabe8517a3e26a93244c4bc307289b41c033bedf7d25a468bb428a1a6f9a290fceccb9fa1cbf049a0eae7530902da1586143895457f2a997479b2d5 WHIRLPOOL 90c9a946ac43b66be01a9568b885b2162f01e7edf8665cde4c5c73b4c46750d67aed61cd383e33ba6e824b29212afe63b00c0f8a142c0c87b98507a370928663
+DIST vdr-2.1.9.tar.bz2 908415 SHA256 324de39ea3d7e8366f21cf98cfa049772fcdaf69dbcb150cd491898d3f68e310 SHA512 ee5abd9b98879b5dea84e439c57969316db92eb1729daac3f2258f38611d09dee49a43d59f9d01fb8af52dac569f9c611d18d8bd7e49ef3e65c22e599aae9c81 WHIRLPOOL c6fe523248f70f06872745f4253b77b783e21d15ffe8f1bad3de166046f39c5cb75ada51eaea945687eba6b86e26f9e168137429d7dc4201347d035e08631ddb
EBUILD vdr-2.1.1.ebuild 8500 SHA256 dd4e4100a0db15897ade0cf0b34348052dba6dcb531bce73096126a4684f159f SHA512 fee916284d4252180bdf1ee099eb0bd6d577eecb7f3a39607ae50b3f7e977393edf9b0aa4b65f9d7c7a711f61145f2cc8e44a6faa6d19812c40f8bca19f1d6c6 WHIRLPOOL ffa40b3f63ad2d697cf9297e733eb7047b6a20c39ecb7649a216dc615d090e3a13962b63231c58ea4c17b63b65e15a8e37aecb4e95261ccf2e44d2041bd5824b
EBUILD vdr-2.1.2-r1.ebuild 8311 SHA256 9bb5f5f02624f885bffb29f4703d9f8fc73dfd5c1b2dbbfee510fa0e88bf0e0d SHA512 6e5cb3e1e554bb159ae693c023208a52547549e943a959c747d32a957b031c72848717556a7b99e0d3efc6c6d305b257d448d7144dac6fe544d4cbf336622b84 WHIRLPOOL ebf0a876e87b376bc81af8e8f9af05b603e873f789f5ca135977aa7feeb8e529cdbd1caf0c931218e296baccc4ebbef1dbf4bdd38ffa176657166da14ab4924b
EBUILD vdr-2.1.3.ebuild 7570 SHA256 f9a7b23ec5d6d7f671dd5180ba32a3858223a0778f25f78d03a190553fbfb020 SHA512 086312ab9572b64342cc56c33178cfd2e7aa0ea961dde3c942758d9f7a821da2c03a495ec7aa8cc8a83016324f7fee0d6863aede6c5f34b104880066bc680ccc WHIRLPOOL ba1427d2e9d9539ba1791f1e381f8383bf116ac16887d8a67f3be70ecadeb29bb053a74f18be3233a415f0cd443f7885ca9348b0c0cb65cf36456f1769f07761
@@ -38,13 +41,14 @@ EBUILD vdr-2.1.6.ebuild 7616 SHA256 ca9c89b9db90646cfe89964f8f5094af9c8be19404ea
EBUILD vdr-2.1.7.ebuild 7724 SHA256 352022abc89e0fee871f672c8d476a9d1529eca9a817ee7d0d60edc3986dbfd3 SHA512 ee62924473e3909f578805db1bc58c17f657c6adf5f8a3948f83ae9366cea8f101f341f6a5789a8e00236d110db50f01f453dd13e7c0f65dd2915750fb6860dc WHIRLPOOL dd3570aee1e0236caf9a2c40122f28e787933128c6d1f938a74c889725f2a8e4295cbd8fa4951030164364db2d1669b8bc75a8f9df31b053cd61fedd81695d1f
EBUILD vdr-2.1.8-r2.ebuild 8123 SHA256 6dcd1d1f7d9e262c2618126d6af3bad45b5d9c09e6591f5df94e4f96116259eb SHA512 2f6f613d5add2fb97efc9e58dede7d1a64cfddc79e056271072cf32d164fc26adc067d96586074d5588749a7978ad1eaa57e1c0b7b3177ce0bb6c220c37b1719 WHIRLPOOL 3f848dae71a31471649470b6f7b8eaf7c0a96daaf7dffe6cbe36bd3145ec6e149fd518394b3e13c8465c0ca4c5ee97972009f13a687114e00f551ce5cab0268a
EBUILD vdr-2.1.8.ebuild 7624 SHA256 ee61c7eb7911a8f438f2d429ebb9615793db5f94351f419298faad005d414c24 SHA512 ab4becbc51ded5808bb7df7dce14db8cd9e685e42deed672ee29a97ca64f94276752652b61057a4f412f155d41eca741dff19180ce4d2f7496bd09c07dd085b7 WHIRLPOOL d6d2dcd482f8db246924c22ce673af2edf161feea77180cc77981c90b3b7b195cb0b00027f2ef705725d351fc6255436965a6645e1e07d2c477977e81a1cbc47
-MISC ChangeLog 27290 SHA256 5c4ac2d412830199894b2c074cf1eaa76ab7f9686587dcff2371f7583dc96c64 SHA512 cc5adf3e114d777edf5fadd58de5af2d91844b6c3d6ee2732d52a68ad83c78b1c52f9f3e289b11b7ee3a826f6917d237a84dcc9fedd3ea3fb23d3d0ad325d0ea WHIRLPOOL 2e6a7ecaafcbd40163f8b6f2a0509f12eecded4cc8121560836e2ceb0c0b91dddb5686866986ad83f3e557088e64399d799c9a7b5e76d95741146a52f6ee7385
-MISC metadata.xml 2071 SHA256 d308d181e741e458ef838af1e003e85323eb23f17b9de610317fe45a7ef92d8f SHA512 cb7c405c0d07ec536d5db70db514121e96f73b4ade0eca80d5e5c12f3cc4f209ce5d1c1c3b3129aaa8f974b843a54fda73684d05c684e403d955079d0f119e56 WHIRLPOOL e606dcf24f8bbcd427ff9e3c26ae022c50332cec79cdb1f39febe7fd25f076a9ab2439232b4b7870ea3e000026b5163f6ceb8727b77f5609060f710f40b3a498
+EBUILD vdr-2.1.9.ebuild 7375 SHA256 ec162ed5f246a0891074685395507c91e134f8a706ab625ef800b823670c5541 SHA512 cddb1bb90e91c97fbd57cbd15b535b7289bef6a5b4521a72097b678f8d8063b586d56302d47da82882fd021031167ce61b11e36128657ba99f94edbaa3071c04 WHIRLPOOL 2b8cb039457773cc12cedca26ff3e9396e4de80b1802cea84bd715373cf525294a1fe18a3e46a2b5aa4786adf8d0450f520529653a486cf35555b597dbbc678f
+MISC ChangeLog 27445 SHA256 22a496404d3b2ac829cf54c720faefa11ad85f2cbc31961a8e7548222bceea5f SHA512 09b057429321f4492b47ae2e5fff4236f8cb5168f71ba9bf8bedee246162c192fa4fe3740de515ab34a211cea291bb37e5c615d558d15541b4c68d9f4969d8b5 WHIRLPOOL ad80b1592b03c6880d8275ff7254db9f8e479ef0d844dec0454c236edd2c64df97e81682e492d961a1ab3274967eea5962989797ad8ca6dd5d1f529154306e07
+MISC metadata.xml 2138 SHA256 f570942c815bde637718a12a161b73dd50d7a418e169843ce8636c28dee11980 SHA512 d6545bbad63f5a7b64142248b733bb4ee74887063d3710ea1636e4da9ff89b01097ca2e95fc4603ed08167169235711ff83223554ad0f3cfc86640ee9b146bcb WHIRLPOOL cff75527edb8443764873500456a37bc08e9d901078b1352f67f23b73ad880a17d48f83e7004024cadd51e6002961b3eaab6312e79428706c6793d5bc043a714
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
Comment: added by hd_brummy@gentoo.org
-iD8DBQFU0faCdn07HTTCgIoRCBAvAJ9H0paDU07ZQFUqmFDWR1+sEs86JgCgl3Ih
-NYBN0xIssvWa0A6N8TCSR/Y=
-=k3V2
+iD8DBQFU18dWdn07HTTCgIoRCNpKAJ4rpjNih8BMydM2k1lHOze/T1x/vwCbBCBJ
+cZYs8HgUNP3WDBYkpUavr5A=
+=cc9T
-----END PGP SIGNATURE-----
diff --git a/media-video/vdr/files/vdr-2.1.9_gentoo.patch b/media-video/vdr/files/vdr-2.1.9_gentoo.patch
new file mode 100644
index 0000000..37ffd3c
--- /dev/null
+++ b/media-video/vdr/files/vdr-2.1.9_gentoo.patch
@@ -0,0 +1,70 @@
+diff -Naur vdr-2.1.7.orig/Makefile vdr-2.1.7/Makefile
+--- vdr-2.1.7.orig/Makefile 2015-01-18 12:37:45.506034673 +0100
++++ vdr-2.1.7/Makefile 2015-01-18 12:38:34.086037162 +0100
+@@ -116,7 +116,7 @@
+ VDRVERSION = $(shell sed -ne '/define VDRVERSION/s/^.*"\(.*\)".*$$/\1/p' config.h)
+ APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' config.h)
+
+-all: vdr i18n plugins
++all: vdr i18n
+
+ # Implicit rules:
+
+@@ -170,7 +170,7 @@
+
+ PODIR = po
+ LOCALEDIR = locale
+-I18Npo = $(wildcard $(PODIR)/*.po)
++I18Npo = $(foreach dir,$(LINGUAS),$(wildcard $(PODIR)/$(dir)*.po))
+ I18Nmo = $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file))))
+ I18Nmsgs = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr.mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
+ I18Npot = $(PODIR)/vdr.pot
+@@ -193,7 +193,7 @@
+
+ install-i18n: i18n
+ @mkdir -p $(DESTDIR)$(LOCDIR)
+- cp -r $(LOCALEDIR)/* $(DESTDIR)$(LOCDIR)
++ @(cd $(LOCALEDIR); for linguas in $(LINGUAS); do [ "$$linguas" = "en" ] && continue; cp -r --parents $$linguas* $(DESTDIR)$(LOCDIR); done)
+
+ # The 'include' directory (for plugins):
+
+@@ -255,7 +255,7 @@
+
+ # Install the files (note that 'install-pc' must be first!):
+
+-install: install-pc install-bin install-dirs install-conf install-doc install-plugins install-i18n install-includes
++install: install-pc install-bin install-dirs install-conf install-doc install-i18n install-includes
+
+ # VDR binary:
+
+@@ -267,12 +267,13 @@
+
+ install-dirs:
+ @mkdir -p $(DESTDIR)$(VIDEODIR)
+- @mkdir -p $(DESTDIR)$(CONFDIR)
+- @mkdir -p $(DESTDIR)$(ARGSDIR)
+- @mkdir -p $(DESTDIR)$(CACHEDIR)
++# @mkdir -p $(DESTDIR)$(CONFDIR)
++# @mkdir -p $(DESTDIR)$(ARGSDIR)
++# @mkdir -p $(DESTDIR)$(CACHEDIR)
+ @mkdir -p $(DESTDIR)$(RESDIR)
+
+ install-conf:
++ @mkdir -p $(DESTDIR)$(CONFDIR)
+ @cp -pn *.conf $(DESTDIR)$(CONFDIR)
+
+ # Documentation:
+@@ -299,8 +300,11 @@
+ # Includes:
+
+ install-includes: include-dir
+- @mkdir -p $(DESTDIR)$(INCDIR)
+- @cp -pLR include/vdr include/libsi $(DESTDIR)$(INCDIR)
++# @mkdir -p $(DESTDIR)$(INCDIR)
++# @cp -pLR include/vdr include/libsi $(DESTDIR)$(INCDIR)
++ @mkdir -p $(DESTDIR)$(INCDIR)/vdr $(DESTDIR)$(INCDIR)/vdr/libsi
++ @cp -pLR include/vdr $(DESTDIR)$(INCDIR)
++ @cp -pLR include/libsi Make.config $(DESTDIR)$(INCDIR)/vdr
+
+ # pkg-config file:
+
diff --git a/media-video/vdr/metadata.xml b/media-video/vdr/metadata.xml
index 9a90cac..8bd1561 100644
--- a/media-video/vdr/metadata.xml
+++ b/media-video/vdr/metadata.xml
@@ -17,6 +17,7 @@
<flag name="html">Install HTML documentation</flag>
<flag name="jumpplay">Enables automatic jumping over cut marks while watching a recording</flag>
<flag name="jumpingseconds">skip seconds in played records</flag>
+ <flag name="kbd">enable keyboard support as remote device</flag>
<flag name="mainmenuhooks">Allows to replace main menu entries by some special plugins (like epgsearch, extrecmenu, ...)</flag>
<flag name="menuorg">Enables support for the menuorg-plugin</flag>
<flag name="menuselection">adds support for menu hotkeys of double digits</flag>
diff --git a/media-video/vdr/vdr-2.1.9.ebuild b/media-video/vdr/vdr-2.1.9.ebuild
new file mode 100644
index 0000000..623b95f
--- /dev/null
+++ b/media-video/vdr/vdr-2.1.9.ebuild
@@ -0,0 +1,295 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-2.0.2-r1.ebuild,v 1.2 2013/07/07 09:52:20 hd_brummy Exp $
+
+EAPI=5
+
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+# Switches supported by extensions-patch
+EXT_PATCH_FLAGS="alternatechannel graphtft naludump permashift_v1 pinplugin
+ mainmenuhooks menuorg menuselection resumereset ttxtsubs"
+
+# names of the use-flags
+EXT_PATCH_FLAGS_RENAMED=""
+
+# names ext-patch uses internally, here only used for maintainer checks
+EXT_PATCH_FLAGS_RENAMED_EXT_NAME="bidi no_kbd sdnotify"
+
+IUSE="bidi debug kbd html systemd vanilla ${EXT_PATCH_FLAGS} ${EXT_PATCH_FLAGS_RENAMED}"
+
+MY_PV="${PV%_p*}"
+MY_P="${PN}-${MY_PV}"
+S="${WORKDIR}/${MY_P}"
+
+EXT_P="extpng-${P}-gentoo-edition-v1"
+
+DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB"
+HOMEPAGE="http://www.tvdr.de/"
+SRC_URI="ftp://ftp.tvdr.de/vdr/Developer/${MY_P}.tar.bz2
+ http://dev.gentoo.org/~hd_brummy/distfiles/${EXT_P}.patch.bz2"
+
+KEYWORDS="~arm ~amd64 ~ppc ~x86"
+SLOT="0"
+LICENSE="GPL-2"
+
+COMMON_DEPEND="virtual/jpeg
+ sys-libs/libcap
+ >=media-libs/fontconfig-2.4.2
+ >=media-libs/freetype-2"
+
+DEPEND="${COMMON_DEPEND}
+ >=virtual/linuxtv-dvb-headers-5.3
+ sys-devel/gettext"
+
+RDEPEND="${COMMON_DEPEND}
+ dev-lang/perl
+ >=media-tv/gentoo-vdr-scripts-2.5_rc1
+ media-fonts/corefonts
+ bidi? ( dev-libs/fribidi )
+ systemd? ( sys-apps/systemd )"
+
+CONF_DIR=/etc/vdr
+CAP_FILE=${S}/capabilities.sh
+CAPS="# Capabilities of the vdr-executable for use by startscript etc."
+
+pkg_setup() {
+
+ use debug && append-flags -g
+
+ PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins"
+
+ tc-export CC CXX AR
+}
+
+add_cap() {
+ local arg
+ for arg; do
+ CAPS="${CAPS}\n${arg}=1"
+ done
+}
+
+enable_patch() {
+ local arg ARG_UPPER
+ for arg; do
+ ARG_UPPER=$(echo $arg|tr '[:lower:]' '[:upper:]')
+ echo "${ARG_UPPER} = 1" >> Make.config
+
+ # codesnippet to bring the extpng defines into the vdr.pc CXXFLAGS CFLAGS
+ echo "-DUSE_${ARG_UPPER}" >> "${T}"/defines.tmp
+ cat "${T}"/defines.tmp | tr \\\012 ' ' > "${T}"/defines.IUSE
+ export DEFINES_IUSE=$( cat ${T}/defines.IUSE )
+ done
+}
+
+extensions_add_make_conf()
+{
+ # copy all ifdef for extensions-patch to Make.config
+ sed -e '1,/need to touch the following:/d' \
+ -e '/need to touch the following/,/^$/d' \
+ Make.config.template >> Make.config
+}
+
+extensions_all_defines() {
+ # extract all possible settings for extensions-patch
+ sed -e '/^#\?[A-Z].*= 1/!d' -e 's/^#\?//' -e 's/ .*//' \
+ Make.config.template \
+ | sort \
+ | tr '[:upper:]' '[:lower:]'
+}
+
+lang_po() {
+ LING_PO=$( ls ${S}/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' )
+}
+
+src_prepare() {
+ # apply maintainace-patches
+ ebegin "Changing paths for gentoo"
+
+ local DVBDIR=/usr/include
+ local i
+ for i in ${DVB_HEADER_PATH} /usr/include/v4l-dvb-hg /usr/include; do
+ [[ -d ${i} ]] || continue
+ if [[ -f ${i}/linux/dvb/dmx.h ]]; then
+ einfo "Found DVB header files in ${i}"
+ DVBDIR=${i}
+ break
+ fi
+ done
+
+ # checking for s2api headers
+ local api_version
+ api_version=$(awk -F' ' '/define DVB_API_VERSION / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
+ api_version=${api_version}*$(awk -F' ' '/define DVB_API_VERSION_MINOR / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
+
+ if [[ ${api_version:-0} -lt 5*3 ]]; then
+ eerror "DVB header files do not contain s2api support or too old for ${P}"
+ eerror "You cannot compile VDR against old dvb-header"
+ die "DVB headers too old"
+ fi
+
+ cat > Make.config <<-EOT
+ #
+ # Generated by ebuild ${PF}
+ #
+ PREFIX = /usr
+ DVBDIR = ${DVBDIR}
+ PLUGINLIBDIR = ${PLUGIN_LIBDIR}
+ CONFDIR = ${CONF_DIR}
+ VIDEODIR = /var/vdr/video
+ LOCDIR = \$(PREFIX)/share/locale
+ INCDIR = \$(PREFIX)/include
+
+ DEFINES += -DCONFDIR=\"\$(CONFDIR)\"
+ INCLUDES += -I\$(DVBDIR)
+
+ # >=vdr-1.7.36-r1; parameter only used for compiletime on vdr
+ # PLUGINLIBDIR (plugin Makefile old) = LIBDIR (plugin Makefile new)
+ LIBDIR = ${PLUGIN_LIBDIR}
+ PCDIR = /usr/$(get_libdir)/pkgconfig
+
+ #BIDI = 1
+ #SDNOTIFY = 1
+ NO_KBD = 1
+ EOT
+ eend 0
+
+ # support languages, written from right to left
+ if use bidi; then
+ sed -e "s:#BIDI = 1:BIDI = 1:" -i Make.config
+ fi
+
+ # systemd notification support
+ if use systemd; then
+ sed -e "s:#SDNOTIFY = 1:SDNOTIFY = 1:" -i Make.config
+ fi
+
+ # with/witout keyboard
+ if use kbd; then
+ sed -e "s:NO_KBD = 1:#NO_KBD = 1:" -i Make.config
+ fi
+
+ if ! use vanilla; then
+
+ # Now apply extensions patch
+ epatch "${WORKDIR}/${EXT_P}.patch"
+
+ # This allows us to start even if some plugin does not exist
+ # or is not loadable.
+ enable_patch PLUGINMISSING
+
+ if [[ -n ${VDR_MAINTAINER_MODE} ]]; then
+ einfo "Doing maintainer checks:"
+
+ # we do not support these patches
+ # (or have them already hard enabled)
+ local IGNORE_PATCHES="pluginmissing"
+
+ extensions_all_defines > "${T}"/new.IUSE
+ echo $EXT_PATCH_FLAGS $EXT_PATCH_FLAGS_RENAMED_EXT_NAME \
+ $IGNORE_PATCHES | \
+ tr ' ' '\n' |sort > "${T}"/old.IUSE
+ local DIFFS=$(diff -u "${T}"/old.IUSE "${T}"/new.IUSE|grep '^[+-][^+-]')
+ if [[ -z ${DIFFS} ]]; then
+ einfo "EXT_PATCH_FLAGS is up to date."
+ else
+ ewarn "IUSE differences!"
+ local diff
+ for diff in $DIFFS; do
+ ewarn "$diff"
+ done
+ fi
+ fi
+
+ ebegin "Enabling selected patches"
+ local flag
+ for flag in $EXT_PATCH_FLAGS; do
+ use $flag && enable_patch ${flag}
+ done
+
+ eend 0
+
+ extensions_add_make_conf
+
+ # add defined use-flags compile options to vdr.pc
+ sed -e "s:\$(CDEFINES) \$(CINCLUDES) \$(HDRDIR):\$(CDEFINES) \$(CINCLUDES) \$(HDRDIR) \$(DEFINES_IUSE):" \
+ -i Makefile
+
+ ebegin "Make depend"
+ emake .dependencies >/dev/null
+ eend $? "make depend failed"
+ fi
+
+ epatch "${FILESDIR}/${P}_gentoo.patch"
+
+ epatch_user
+
+ add_cap CAP_UTF8
+
+ add_cap CAP_IRCTRL_RUNTIME_PARAM \
+ CAP_VFAT_RUNTIME_PARAM \
+ CAP_CHUID \
+ CAP_SHUTDOWN_AUTO_RETRY
+
+ echo -e ${CAPS} > "${CAP_FILE}"
+
+ # LINGUAS support
+ einfo "\n \t VDR supports the LINGUAS values"
+
+ lang_po
+
+ einfo "\t Please set one of this values in your sytem make.conf"
+ einfo "\t LINGUAS=\"${LING_PO}\"\n"
+
+ if [[ -z ${LINGUAS} ]]; then
+ einfo "\n \t No values in LINGUAS="
+ einfo "\t You will get only english text on OSD \n"
+ fi
+
+ strip-linguas ${LING_PO} en
+}
+
+src_install() {
+ # trick makefile not to create a videodir by supplying it with an existing
+ # directory
+ emake \
+ VIDEODIR="/" \
+ DESTDIR="${D}" install || die "emake install failed"
+
+ keepdir "${PLUGIN_LIBDIR}"
+
+ # backup for plugins they don't be able to create this dir
+ keepdir "${CONF_DIR}"/plugins
+
+ if use html; then
+ dohtml *.html
+ fi
+
+ dodoc MANUAL INSTALL README* HISTORY CONTRIBUTORS
+
+ insinto /usr/share/vdr
+ doins "${CAP_FILE}"
+
+ if use alternatechannel; then
+ insinto /etc/vdr
+ doins "${FILESDIR}"/channel_alternative.conf
+ fi
+
+ chown -R vdr:vdr "${D}/${CONF_DIR}"
+}
+
+pkg_postinst() {
+
+# elog "\n\t---- 15 YEARS ANNIVERSARY EDITON ----\n"
+# elog "\tA lot of thanks to Klaus Schmiedinger"
+# elog "\tfor this nice piece of Software...\n"
+
+ elog "It is a good idea to run vdrplugin-rebuild now."
+
+ elog "To get nice symbols in OSD we recommend to install"
+ elog "\t1. emerge media-fonts/vdrsymbols-ttf"
+ elog "\t2. select font VDRSymbolsSans in Setup"
+ elog ""
+ elog "To get an idea how to proceed now, have a look at our vdr-guide:"
+ elog "\thttps://wiki.gentoo.org/wiki/VDR"
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] proj/vdr/devel:master commit in: media-video/vdr/, media-video/vdr/files/
@ 2015-02-11 14:14 Joerg Bornkessel
0 siblings, 0 replies; 8+ messages in thread
From: Joerg Bornkessel @ 2015-02-11 14:14 UTC (permalink / raw
To: gentoo-commits
commit: bd12d1945f40c21d09c4d3cf033898c738ece22b
Author: Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 11 14:14:11 2015 +0000
Commit: Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
CommitDate: Wed Feb 11 14:14:11 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/vdr/devel.git;a=commit;h=bd12d194
bump
Package-Manager: portage-2.2.15
Manifest-Sign-Key: 34C2808A
---
media-video/vdr/ChangeLog | 6 ++
media-video/vdr/Manifest | 14 +++--
media-video/vdr/files/vdr-2.1.10_gentoo.patch | 70 ++++++++++++++++++++++
.../vdr/{vdr-2.1.9.ebuild => vdr-2.1.10.ebuild} | 51 +++++++++-------
media-video/vdr/vdr-2.1.9.ebuild | 2 +-
5 files changed, 114 insertions(+), 29 deletions(-)
diff --git a/media-video/vdr/ChangeLog b/media-video/vdr/ChangeLog
index 6c8deee..4c73ed1 100644
--- a/media-video/vdr/ChangeLog
+++ b/media-video/vdr/ChangeLog
@@ -2,6 +2,12 @@
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*vdr-2.1.10 (11 Feb 2015)
+
+ 11 Feb 2015; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-2.1.9.ebuild,
+ +vdr-2.1.10.ebuild, +files/vdr-2.1.10_gentoo.patch:
+ bump
+
*vdr-2.1.9 (08 Feb 2015)
08 Feb 2015; Joerg Bornkessel <hd_brummy@gentoo.org> +vdr-2.1.9.ebuild,
diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index 8dadc93..cc916c5 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -7,6 +7,7 @@ AUX 03_vdr-2.1.8-scheduleswitch.diff 566 SHA256 a913e3177624199c1921b98067b3ffec
AUX 04_vdr-2.1.8-scheduleswitchblue.diff 4972 SHA256 5df3d8b8e8637d9280ba04eb2d94fdb974fcf66a82960012ae519bb7b02ff548 SHA512 7ac0c985ed86668486183eac9c569cae3d0e49062c1f7470fe84832e67732eacca84d8e28e03661c4a194d7ad8b5d538b55d04187471520dcb2fa8238130f556 WHIRLPOOL 13fbad5ddf9348441f7d1803c55a07e709e2fe7a3f7c2ad5ad94207dfb730c1f10abfa42b4845919559807fbbb1182473e7e0e766a1035df1735e562ab9f46e1
AUX 06_vdr-2.1.8-skipeditedresume.diff 702 SHA256 03b701ca2737e63df1cf1e5e1f2331e282ab5c26a4741951ddd07700e7b8488c SHA512 0a0393c599235147df2ec82c41570c0cae9316bc344cc3b00c1a1110fb7d9ffd2f67774b5882f0f9bc9f2b4ce5b98f0b109c52cb3fe2fab5df92bc5bd02277a3 WHIRLPOOL af8772fd694c10c9edc840b4b351a2c2d24be54f1f954888a49841cb02997e16efd54ca8cd6b918697a4f987c5ef7b6a11d1a03a079db12c9c42bbda9515ae60
AUX channel_alternative.conf 332 SHA256 30fb0a5147c01429c2813505cc69658cf1bfa1b70537bce07365017f653be5ce SHA512 738de5d5d99b54a516f41683834509b477590732db4e00b13b2f26e22c7349cb8517965a21251c08d29b0f368b2bb3fa64a1de71da09ffbedc5a401314a0eb5d WHIRLPOOL 96ead1c37c9e88e6593536a2182b813d3ae86c8e55e79a4cc5ff2d29ec0694405d26c82cb2295bb3f1e7e61c0ec93a646acc518e35ed6eff4d66c9219cc35677
+AUX vdr-2.1.10_gentoo.patch 2322 SHA256 8088a4f314e0b8d908f82cfe2a7392a18db679a7324bfa92dce49431c50313ec SHA512 c6953a7fb77717fdaa8ca05550496e25f4bc60d91c13ed0fb23d27e1a1ec433ec2d5cfb019717cf09eb7b67c9ebb91664b1b731dc28bc4f25e815871f6de0bc7 WHIRLPOOL 88d4e8407b085604525d9bae1f34a957ae5f168ac657a99c45dcba5f08185351ccb03736cfc464960d3f2157ac6357ffbf8b602dd1da49ee94efb403f71731d8
AUX vdr-2.1.1_gentoo.patch 2488 SHA256 25275f22d8d183c089accd9463862aa772d2c13ae18c4f5769916c06b4b5918e SHA512 a36d8be52e7815165327e7322ce5f5537243a3cedc7b5e695ecddce567e8536cb44724540e5079fcda90f58a95f6fb26de4d1cc2842ce8d5460e4010623042f0 WHIRLPOOL 0885af205152ff2228bde0799a05c02efdb7fc712d740a640eecaff6296c7df1285883460e1dd452f0dbc6b4621ddcb0a7c89a21cc241a935f7b7526d2f852f5
AUX vdr-2.1.6_gentoo.patch 2255 SHA256 75ec762630d2e9099843151fd0b6e04c5b114faea2052392144d64c648cf5482 SHA512 0711128380cec9a6ec2e8212226a4a20896888467f323bc006bd1c4cbf1b8e1ce488c2f7227e0903847888e7e37159aecf6d82fdc1b50009a1c869d3da5134c0 WHIRLPOOL e984c7fb87fa3d7eedc203e3b5ac4d2cc9b528dc3a70d8a15582c6dee58589af6d8179fa542f3f45d2e9c6d9889b90e691b77b6d3398f4b6b200635bdc2c404e
AUX vdr-2.1.7_C++11.patch 4553 SHA256 3ff8f4762009a932cf63c4239e21f4cca2445cce160b578e5c5c5979b3fefc54 SHA512 41376c3a4bc4754401e2ce140aea5ce1a1b5ad4388c95446b8e1c8e7ab8acd21c35f24d961b4c16b4cc2500d73345cb73a8b4fa2c13dc90cb781dcac625195ec WHIRLPOOL 3b21733e5b065fc2d4188dfa872557cd4558265f3eaea3411d5a402c1cad14ed86379623e25ab908a4c43e165d4ac171bb1788b71b9b6644fd6510a928150f68
@@ -14,6 +15,7 @@ AUX vdr-2.1.7_gentoo.patch 2322 SHA256 8088a4f314e0b8d908f82cfe2a7392a18db679a73
AUX vdr-2.1.8_gentoo.patch 2322 SHA256 8088a4f314e0b8d908f82cfe2a7392a18db679a7324bfa92dce49431c50313ec SHA512 c6953a7fb77717fdaa8ca05550496e25f4bc60d91c13ed0fb23d27e1a1ec433ec2d5cfb019717cf09eb7b67c9ebb91664b1b731dc28bc4f25e815871f6de0bc7 WHIRLPOOL 88d4e8407b085604525d9bae1f34a957ae5f168ac657a99c45dcba5f08185351ccb03736cfc464960d3f2157ac6357ffbf8b602dd1da49ee94efb403f71731d8
AUX vdr-2.1.9_gentoo.patch 2322 SHA256 8088a4f314e0b8d908f82cfe2a7392a18db679a7324bfa92dce49431c50313ec SHA512 c6953a7fb77717fdaa8ca05550496e25f4bc60d91c13ed0fb23d27e1a1ec433ec2d5cfb019717cf09eb7b67c9ebb91664b1b731dc28bc4f25e815871f6de0bc7 WHIRLPOOL 88d4e8407b085604525d9bae1f34a957ae5f168ac657a99c45dcba5f08185351ccb03736cfc464960d3f2157ac6357ffbf8b602dd1da49ee94efb403f71731d8
DIST extpng-vdr-2.1.1-gentoo-edition-v1.patch.bz2 76312 SHA256 42ed177d9064f555bb5396123790eaa9cf4b500536698af29bda0193c951faab SHA512 07cf50a0f9edf2f8b1542ad314b86f18b88e9409cc9aef400585c7dafb8fc691b2d476d18b088bc0d3de8ec7bf88241ba5418f99e156353cbcf78de406238cf8 WHIRLPOOL c027a0f107db181b617d3f1d3da461733bc03edd975adab03473979877ee5503efcb88903c20a0c0c1063f40710cf14c68456bc8038902b1e29f4194e02f6cb5
+DIST extpng-vdr-2.1.10-gentoo-edition-v1.patch.bz2 26220 SHA256 a707bcceb53a1a33457cd550762d4829bff70863b118e39c65dc4fc6cbc77a9b SHA512 de2e00ee1eaa9641ffdc6c33b8d3cc5286f852e9e865687d696b627b2b46e843c10c5e875d97878669dc4a2b8b5f65221f6818fb11a08378d6c54f19684e5b16 WHIRLPOOL 30eb7704a9d1aa1040192e96c7ffddc287818a8b4cd78c5d46f2d2b11bb01b780cafcea82c74079f83bcd431042180cd8dec32cf03bcb38404c1d38e3d7a8390
DIST extpng-vdr-2.1.2-gentoo-edition-v3.patch.bz2 30698 SHA256 c2ba5ada4cadb44dde87dc5de8b9a1306fa274d0cca8f856ce5e829e16d7d51f SHA512 a4520423182ef44f56b9e6807622a68ba404e1b14e81b8e4153ec23bb4f7e1ec4feabf458dfaddb9a829140e404f6988ad92dbd5b3768ff447918b609b80c29a WHIRLPOOL 9fca245602fbf5926794276da516f82d2846c53781d46720f2cab967bc7839d0494dc7592e76a864fa313ab0e04aefbba5e5f8bf429d7ccc4c31a1e126cdcba4
DIST extpng-vdr-2.1.3-gentoo-edition-v1.patch.bz2 121553 SHA256 6ca5a1db1395001cc80178e61fbc9230e425e1c0d00b386e056283e4967326d4 SHA512 22e596f618fccaa61aa48c0ca32566a7937e539c54506ffab7f1fc98261da100dfc7ef47ee043535bcd18e1fd096ca3b897b251cad1a2ab4d9c0f285aba848d1 WHIRLPOOL b122620875e822eb1a2102c4ff7dc5055c3ee5e57320db2c0d04b864ef87fe04b9b6659483b164f8bc0a8a5db6180ff6668b152357dedfc13d1de42e15645e1e
DIST extpng-vdr-2.1.5-gentoo-edition-v1.patch.bz2 30725 SHA256 eea5f1e92b5ef01d3c7165ee6bb3fa4d2daac6b5fd576b1de59775579aad87c1 SHA512 cf0ea1b756eebfb9f56cac9df126cc6b94eda2634bf9f88ec936e444744232909a11fa65e82f26f905536dd216383347010da6d5094e23c0c1210c007f54d813 WHIRLPOOL ff27809b5a454a5cecacf6ec04e6a3cc0c3b6627a7528fb42bef46ba9c7bf54b08e3b20eaeec19a997b8dd1df31bb9d41d0d176943a1c8e06b1f817b9ce91549
@@ -21,6 +23,7 @@ DIST extpng-vdr-2.1.6-gentoo-edition-v2.patch.bz2 63143 SHA256 df8d3b428bfdce744
DIST extpng-vdr-2.1.8-gentoo-edition-v2.patch.bz2 29910 SHA256 0e885f6b76bfe4246f14156810343afa441b09d205daad704962b3df4c976748 SHA512 571976e0393cd84703a13b1236233af6f00e4f7fcaf5e93b017fafe84ab9dd09ea7c245aa6657ebebe8cafa35135c05821bab1f4093c687dc9cf61a5437c585f WHIRLPOOL 3e9ca9d0974c9470f5358c7185d484bbdcc052ad6afe3b7cdb0789f86a4170dbdb830606ba3c53d85878e659289a43015487421b6978c81798f16b196c104b4f
DIST extpng-vdr-2.1.9-gentoo-edition-v1.patch.bz2 26239 SHA256 9a2f98de98af6f9954179aeae0848e0c183fe5d85e63652d7d2f859c49d0a77a SHA512 6705a448810ee6061ce5009ff243a14c40ce9395f1d83b8223e1472c8481277abde3be900aca5b2a4291cb3f94c4f4fd58d326a88c7b12cf5493d558403ded87 WHIRLPOOL 91d45ed0a67e672886506843cf9dd933736ec46720641e9b9a692540aa5ef4dde2db50e1b636bfa7caf69ca53fd991de7d69bd2818e6f82aea4344666e96e98a
DIST vdr-2.1.1.tar.bz2 842414 SHA256 96292f4f2a47fea9fdd432bdcca6e2f11747e2b19feac6d6f7af1797c5abfa37 SHA512 f31c774cc5c383b97cdae98892906c66ce27a2277ccde185815299ddd894e18908a6c252c92bddfefb82a8fe933c9c2b5e6f91947db526bb86bab9ff08cb8158 WHIRLPOOL e92705b8fec477a4e10c563f4440ba54ccb499823b15a6227ac2633fc55a56fad023b6f8b5d4450505344dfb5a1871ceb3a787c9e9470c178f947874fc79eef0
+DIST vdr-2.1.10.tar.bz2 918164 SHA256 3a2f8f96586566dc40b7e11c252643957d1e2456914deddea1080240f58d5ad8 SHA512 1c7faef55bcbd7f5cfca4863fa222ba0af5feec0d8c26f2dd6c1b1c78b66495d6e7670ea2d3fef624fb6b6517099596cd40cf87401176513e870d016e5bc50ce WHIRLPOOL a0731c22d4a0576bc6a366e3a3d87631ae1a1b44e26b91c64817a2d8c6603633b873ab027f6809e4e7003010b9b5b92cbf20f76e351d4ab9bd711c8fd1fe2f8c
DIST vdr-2.1.2-gcc.patch.gz 542 SHA256 8ac11be7074231604868e5f4a153df44b957543227c4cb0fcadbf693900b25d8 SHA512 4b3595e3ed3ef291bf155500d96d3355656f11442bc9a9a13ddbdfc35ae3156a894c12da1f4a20bdf6a7e35c3cb0904ab1c5c2d14698ffe6595ffc9d5b37a2ad WHIRLPOOL 96cbcea605e52a76974196f5a7ec44b49222f0fb3048428286ab974ec6633e4bdd6523796a0109ba866aaba101b270b099dc4983b439d6ad84c00890cb7078d8
DIST vdr-2.1.2.tar.bz2 850237 SHA256 1bf9c636145acf2d67716475314efe9703619759f0fdbae02d89fe599730f2a4 SHA512 4e9bf4705a64d4fab790d6cf0b92151537e282a8a3a41eeb13cddf3a966b303b31fc32fd62b27450adc68134ca853aaa6dd5b6d7a9c672c6165aab9f044c19b5 WHIRLPOOL 525ce8c05cbaeb9f3d8108117fb18dc5b64885e311c3a40dd704888b0a5020cb3ef6fcd9d57af200d94ffc0479add8c6a651791885ff67f7f93cf45a0aec1d8b
DIST vdr-2.1.3.tar.bz2 862445 SHA256 959c3243672ffd8b67da7072e7201f2b483b684fb18c2c4c5eb47e54dbd4d141 SHA512 4468c516095c7c64f02c42af40a4c321aecfbea0e070417559879a1e86869f7eb1308b53442302a7c7a56c070c825b6c2f32bea79c7c9e09e9e39e4b265369f4 WHIRLPOOL 92a289b023391b5e9b9af7430d1eb18e8a8c6d97e67f3d0c40c51a6943eff6552af94d8a93d349504a8fe2c9dde4573f98240022f823d828757a963676a1c357
@@ -31,6 +34,7 @@ DIST vdr-2.1.7.tar.bz2 880225 SHA256 86fcf656bc121e4cb8b92a2c06dbeda7b22dfd033ba
DIST vdr-2.1.8.tar.bz2 890588 SHA256 96d3209742e2b61d7e75ce54f767d61adc9857472f2c79df5479a4e60772975e SHA512 f1b1d6261aabe8517a3e26a93244c4bc307289b41c033bedf7d25a468bb428a1a6f9a290fceccb9fa1cbf049a0eae7530902da1586143895457f2a997479b2d5 WHIRLPOOL 90c9a946ac43b66be01a9568b885b2162f01e7edf8665cde4c5c73b4c46750d67aed61cd383e33ba6e824b29212afe63b00c0f8a142c0c87b98507a370928663
DIST vdr-2.1.9.tar.bz2 908415 SHA256 324de39ea3d7e8366f21cf98cfa049772fcdaf69dbcb150cd491898d3f68e310 SHA512 ee5abd9b98879b5dea84e439c57969316db92eb1729daac3f2258f38611d09dee49a43d59f9d01fb8af52dac569f9c611d18d8bd7e49ef3e65c22e599aae9c81 WHIRLPOOL c6fe523248f70f06872745f4253b77b783e21d15ffe8f1bad3de166046f39c5cb75ada51eaea945687eba6b86e26f9e168137429d7dc4201347d035e08631ddb
EBUILD vdr-2.1.1.ebuild 8500 SHA256 dd4e4100a0db15897ade0cf0b34348052dba6dcb531bce73096126a4684f159f SHA512 fee916284d4252180bdf1ee099eb0bd6d577eecb7f3a39607ae50b3f7e977393edf9b0aa4b65f9d7c7a711f61145f2cc8e44a6faa6d19812c40f8bca19f1d6c6 WHIRLPOOL ffa40b3f63ad2d697cf9297e733eb7047b6a20c39ecb7649a216dc615d090e3a13962b63231c58ea4c17b63b65e15a8e37aecb4e95261ccf2e44d2041bd5824b
+EBUILD vdr-2.1.10.ebuild 7559 SHA256 5b4bec2e02bc2d25ad1ebc59be17d83943777e5fe836c456e6ae13b07014e1ef SHA512 a2b5da1b81d51db59b1e4261de1083385e2b64704929ba8e744f2341049cde300955893869a0383ae240d5650ae29a310ca2bc5984d632044f3d109f7fc4b696 WHIRLPOOL 00b226e23e8a1cbfe71d6505c99ab601f8294a3d5b8e966e8bba9ad450e27a809ed4787782c2d9c1ef7f071bba6291982182adc6d09b04a086dfdd01412abc51
EBUILD vdr-2.1.2-r1.ebuild 8311 SHA256 9bb5f5f02624f885bffb29f4703d9f8fc73dfd5c1b2dbbfee510fa0e88bf0e0d SHA512 6e5cb3e1e554bb159ae693c023208a52547549e943a959c747d32a957b031c72848717556a7b99e0d3efc6c6d305b257d448d7144dac6fe544d4cbf336622b84 WHIRLPOOL ebf0a876e87b376bc81af8e8f9af05b603e873f789f5ca135977aa7feeb8e529cdbd1caf0c931218e296baccc4ebbef1dbf4bdd38ffa176657166da14ab4924b
EBUILD vdr-2.1.3.ebuild 7570 SHA256 f9a7b23ec5d6d7f671dd5180ba32a3858223a0778f25f78d03a190553fbfb020 SHA512 086312ab9572b64342cc56c33178cfd2e7aa0ea961dde3c942758d9f7a821da2c03a495ec7aa8cc8a83016324f7fee0d6863aede6c5f34b104880066bc680ccc WHIRLPOOL ba1427d2e9d9539ba1791f1e381f8383bf116ac16887d8a67f3be70ecadeb29bb053a74f18be3233a415f0cd443f7885ca9348b0c0cb65cf36456f1769f07761
EBUILD vdr-2.1.4.ebuild 7616 SHA256 348deaf194a5b0ec8980e5c0b2f5231580e1a597e46c14ecabae6a946ac6a0f8 SHA512 92d4e1fac1f1f542356dfa84545a04f1bd136a98a1ec829281e21fc9878e6983645fa7261483b75778e8b5119795a9389f101da07102340141e6e419e1585425 WHIRLPOOL 9dd6c66680490af90b9398e3b96df06c8f32ffe464ba5d9c8a61e17131a5b7f1fc1f629d142477477e768f4f25d3bc7e542f922c29e37211b1a5cb531d479b4f
@@ -41,14 +45,14 @@ EBUILD vdr-2.1.6.ebuild 7616 SHA256 ca9c89b9db90646cfe89964f8f5094af9c8be19404ea
EBUILD vdr-2.1.7.ebuild 7724 SHA256 352022abc89e0fee871f672c8d476a9d1529eca9a817ee7d0d60edc3986dbfd3 SHA512 ee62924473e3909f578805db1bc58c17f657c6adf5f8a3948f83ae9366cea8f101f341f6a5789a8e00236d110db50f01f453dd13e7c0f65dd2915750fb6860dc WHIRLPOOL dd3570aee1e0236caf9a2c40122f28e787933128c6d1f938a74c889725f2a8e4295cbd8fa4951030164364db2d1669b8bc75a8f9df31b053cd61fedd81695d1f
EBUILD vdr-2.1.8-r2.ebuild 8123 SHA256 6dcd1d1f7d9e262c2618126d6af3bad45b5d9c09e6591f5df94e4f96116259eb SHA512 2f6f613d5add2fb97efc9e58dede7d1a64cfddc79e056271072cf32d164fc26adc067d96586074d5588749a7978ad1eaa57e1c0b7b3177ce0bb6c220c37b1719 WHIRLPOOL 3f848dae71a31471649470b6f7b8eaf7c0a96daaf7dffe6cbe36bd3145ec6e149fd518394b3e13c8465c0ca4c5ee97972009f13a687114e00f551ce5cab0268a
EBUILD vdr-2.1.8.ebuild 7624 SHA256 ee61c7eb7911a8f438f2d429ebb9615793db5f94351f419298faad005d414c24 SHA512 ab4becbc51ded5808bb7df7dce14db8cd9e685e42deed672ee29a97ca64f94276752652b61057a4f412f155d41eca741dff19180ce4d2f7496bd09c07dd085b7 WHIRLPOOL d6d2dcd482f8db246924c22ce673af2edf161feea77180cc77981c90b3b7b195cb0b00027f2ef705725d351fc6255436965a6645e1e07d2c477977e81a1cbc47
-EBUILD vdr-2.1.9.ebuild 7375 SHA256 ec162ed5f246a0891074685395507c91e134f8a706ab625ef800b823670c5541 SHA512 cddb1bb90e91c97fbd57cbd15b535b7289bef6a5b4521a72097b678f8d8063b586d56302d47da82882fd021031167ce61b11e36128657ba99f94edbaa3071c04 WHIRLPOOL 2b8cb039457773cc12cedca26ff3e9396e4de80b1802cea84bd715373cf525294a1fe18a3e46a2b5aa4786adf8d0450f520529653a486cf35555b597dbbc678f
-MISC ChangeLog 27445 SHA256 22a496404d3b2ac829cf54c720faefa11ad85f2cbc31961a8e7548222bceea5f SHA512 09b057429321f4492b47ae2e5fff4236f8cb5168f71ba9bf8bedee246162c192fa4fe3740de515ab34a211cea291bb37e5c615d558d15541b4c68d9f4969d8b5 WHIRLPOOL ad80b1592b03c6880d8275ff7254db9f8e479ef0d844dec0454c236edd2c64df97e81682e492d961a1ab3274967eea5962989797ad8ca6dd5d1f529154306e07
+EBUILD vdr-2.1.9.ebuild 7374 SHA256 f07e6f9e80eed659aab17f83a85a755f61a3310b794009a2c8ec244a99be75e9 SHA512 7287f81b150cd6be492e9a13b16527309b27dc44e373b1fef41def68592aa2a493fd94658599fab93041588a4e9a8da7a16657cea946dd12e1bdb1a6ffb1dd5c WHIRLPOOL 2f01a4a1b19a4f46d6b98554038a657217c362007cdbd4ab1d2986d9a0b5c710138f5bcde820a598d0fcbb718e15d97a3ab1482e4b91b5ef3ec1823b83c00d91
+MISC ChangeLog 27607 SHA256 7145e2a2ce699b979c5b3ee07045056903a3d638548719435cfad38784925584 SHA512 72023ca89572e0b55d2b352ee9ef638dd0613c6d6f8831e362c6d311e6389dc6fb6cef3f8907e1648ea9dd1146956648412aed754bc05c0ae96c87e0fe36d6dd WHIRLPOOL 101e369f5a91df0e4d915dd55d70a2d9889fb4802094fc10216968d98e59b04dc790a5be8d4543321927b47c15a90b3e881b7b226f3f0a1dfd5b830e5c69a664
MISC metadata.xml 2138 SHA256 f570942c815bde637718a12a161b73dd50d7a418e169843ce8636c28dee11980 SHA512 d6545bbad63f5a7b64142248b733bb4ee74887063d3710ea1636e4da9ff89b01097ca2e95fc4603ed08167169235711ff83223554ad0f3cfc86640ee9b146bcb WHIRLPOOL cff75527edb8443764873500456a37bc08e9d901078b1352f67f23b73ad880a17d48f83e7004024cadd51e6002961b3eaab6312e79428706c6793d5bc043a714
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
Comment: added by hd_brummy@gentoo.org
-iD8DBQFU18dWdn07HTTCgIoRCNpKAJ4rpjNih8BMydM2k1lHOze/T1x/vwCbBCBJ
-cZYs8HgUNP3WDBYkpUavr5A=
-=cc9T
+iD8DBQFU22Ozdn07HTTCgIoRCCr4AJ9wugXAZS144aT5d38zlidMgZ9lLwCfWwtc
+v1MPPqGiMY55dPq0IghRgLM=
+=OPsX
-----END PGP SIGNATURE-----
diff --git a/media-video/vdr/files/vdr-2.1.10_gentoo.patch b/media-video/vdr/files/vdr-2.1.10_gentoo.patch
new file mode 100644
index 0000000..37ffd3c
--- /dev/null
+++ b/media-video/vdr/files/vdr-2.1.10_gentoo.patch
@@ -0,0 +1,70 @@
+diff -Naur vdr-2.1.7.orig/Makefile vdr-2.1.7/Makefile
+--- vdr-2.1.7.orig/Makefile 2015-01-18 12:37:45.506034673 +0100
++++ vdr-2.1.7/Makefile 2015-01-18 12:38:34.086037162 +0100
+@@ -116,7 +116,7 @@
+ VDRVERSION = $(shell sed -ne '/define VDRVERSION/s/^.*"\(.*\)".*$$/\1/p' config.h)
+ APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' config.h)
+
+-all: vdr i18n plugins
++all: vdr i18n
+
+ # Implicit rules:
+
+@@ -170,7 +170,7 @@
+
+ PODIR = po
+ LOCALEDIR = locale
+-I18Npo = $(wildcard $(PODIR)/*.po)
++I18Npo = $(foreach dir,$(LINGUAS),$(wildcard $(PODIR)/$(dir)*.po))
+ I18Nmo = $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file))))
+ I18Nmsgs = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr.mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
+ I18Npot = $(PODIR)/vdr.pot
+@@ -193,7 +193,7 @@
+
+ install-i18n: i18n
+ @mkdir -p $(DESTDIR)$(LOCDIR)
+- cp -r $(LOCALEDIR)/* $(DESTDIR)$(LOCDIR)
++ @(cd $(LOCALEDIR); for linguas in $(LINGUAS); do [ "$$linguas" = "en" ] && continue; cp -r --parents $$linguas* $(DESTDIR)$(LOCDIR); done)
+
+ # The 'include' directory (for plugins):
+
+@@ -255,7 +255,7 @@
+
+ # Install the files (note that 'install-pc' must be first!):
+
+-install: install-pc install-bin install-dirs install-conf install-doc install-plugins install-i18n install-includes
++install: install-pc install-bin install-dirs install-conf install-doc install-i18n install-includes
+
+ # VDR binary:
+
+@@ -267,12 +267,13 @@
+
+ install-dirs:
+ @mkdir -p $(DESTDIR)$(VIDEODIR)
+- @mkdir -p $(DESTDIR)$(CONFDIR)
+- @mkdir -p $(DESTDIR)$(ARGSDIR)
+- @mkdir -p $(DESTDIR)$(CACHEDIR)
++# @mkdir -p $(DESTDIR)$(CONFDIR)
++# @mkdir -p $(DESTDIR)$(ARGSDIR)
++# @mkdir -p $(DESTDIR)$(CACHEDIR)
+ @mkdir -p $(DESTDIR)$(RESDIR)
+
+ install-conf:
++ @mkdir -p $(DESTDIR)$(CONFDIR)
+ @cp -pn *.conf $(DESTDIR)$(CONFDIR)
+
+ # Documentation:
+@@ -299,8 +300,11 @@
+ # Includes:
+
+ install-includes: include-dir
+- @mkdir -p $(DESTDIR)$(INCDIR)
+- @cp -pLR include/vdr include/libsi $(DESTDIR)$(INCDIR)
++# @mkdir -p $(DESTDIR)$(INCDIR)
++# @cp -pLR include/vdr include/libsi $(DESTDIR)$(INCDIR)
++ @mkdir -p $(DESTDIR)$(INCDIR)/vdr $(DESTDIR)$(INCDIR)/vdr/libsi
++ @cp -pLR include/vdr $(DESTDIR)$(INCDIR)
++ @cp -pLR include/libsi Make.config $(DESTDIR)$(INCDIR)/vdr
+
+ # pkg-config file:
+
diff --git a/media-video/vdr/vdr-2.1.9.ebuild b/media-video/vdr/vdr-2.1.10.ebuild
similarity index 91%
copy from media-video/vdr/vdr-2.1.9.ebuild
copy to media-video/vdr/vdr-2.1.10.ebuild
index 623b95f..0280ab1 100644
--- a/media-video/vdr/vdr-2.1.9.ebuild
+++ b/media-video/vdr/vdr-2.1.10.ebuild
@@ -7,7 +7,7 @@ EAPI=5
inherit eutils flag-o-matic multilib toolchain-funcs
# Switches supported by extensions-patch
-EXT_PATCH_FLAGS="alternatechannel graphtft naludump permashift_v1 pinplugin
+EXT_PATCH_FLAGS="alternatechannel graphtft naludump permashift_v1 pinplugin
mainmenuhooks menuorg menuselection resumereset ttxtsubs"
# names of the use-flags
@@ -102,6 +102,15 @@ lang_po() {
LING_PO=$( ls ${S}/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' )
}
+src_configure() {
+ # support languages, written from right to left
+ export "BIDI=$(usex bidi 1 0)"
+ # systemd notification support
+ export "SDNOTIFY=$(usex systemd 1 0)"
+ # with/without keyboard
+ export "USE_KBD=$(usex kbd 1 0)"
+}
+
src_prepare() {
# apply maintainace-patches
ebegin "Changing paths for gentoo"
@@ -148,27 +157,9 @@ src_prepare() {
LIBDIR = ${PLUGIN_LIBDIR}
PCDIR = /usr/$(get_libdir)/pkgconfig
- #BIDI = 1
- #SDNOTIFY = 1
- NO_KBD = 1
EOT
eend 0
- # support languages, written from right to left
- if use bidi; then
- sed -e "s:#BIDI = 1:BIDI = 1:" -i Make.config
- fi
-
- # systemd notification support
- if use systemd; then
- sed -e "s:#SDNOTIFY = 1:SDNOTIFY = 1:" -i Make.config
- fi
-
- # with/witout keyboard
- if use kbd; then
- sed -e "s:NO_KBD = 1:#NO_KBD = 1:" -i Make.config
- fi
-
if ! use vanilla; then
# Now apply extensions patch
@@ -222,6 +213,12 @@ src_prepare() {
epatch "${FILESDIR}/${P}_gentoo.patch"
+ # fix some makefile issues
+ sed -e "s:ifndef NO_KBD:ifeq (\$(USE_KBD),1):" \
+ -e "s:ifdef BIDI:ifeq (\$(BIDI),1):" \
+ -e "s:ifdef SDNOTIFY:ifeq (\$(SDNOTIFY),1):" \
+ -i "${S}"/Makefile
+
epatch_user
add_cap CAP_UTF8
@@ -252,7 +249,7 @@ src_prepare() {
src_install() {
# trick makefile not to create a videodir by supplying it with an existing
# directory
- emake \
+ einstall \
VIDEODIR="/" \
DESTDIR="${D}" install || die "emake install failed"
@@ -278,11 +275,19 @@ src_install() {
chown -R vdr:vdr "${D}/${CONF_DIR}"
}
+pkg_preinstall() {
+
+ has_version "<${CATEGORY}/${PN}-2.2"
+ previous_less_than_2_2=$
+}
+
pkg_postinst() {
-# elog "\n\t---- 15 YEARS ANNIVERSARY EDITON ----\n"
-# elog "\tA lot of thanks to Klaus Schmiedinger"
-# elog "\tfor this nice piece of Software...\n"
+ if [[ $previous_less_than_2_2 = 0 ]] ; then
+ elog "\n\t---- 15 YEARS ANNIVERSARY EDITON ----\n"
+ elog "\tA lot of thanks to Klaus Schmiedinger"
+ elog "\tfor this nice piece of Software...\n"
+ fi
elog "It is a good idea to run vdrplugin-rebuild now."
diff --git a/media-video/vdr/vdr-2.1.9.ebuild b/media-video/vdr/vdr-2.1.9.ebuild
index 623b95f..c04c127 100644
--- a/media-video/vdr/vdr-2.1.9.ebuild
+++ b/media-video/vdr/vdr-2.1.9.ebuild
@@ -7,7 +7,7 @@ EAPI=5
inherit eutils flag-o-matic multilib toolchain-funcs
# Switches supported by extensions-patch
-EXT_PATCH_FLAGS="alternatechannel graphtft naludump permashift_v1 pinplugin
+EXT_PATCH_FLAGS="alternatechannel graphtft naludump permashift_v1 pinplugin
mainmenuhooks menuorg menuselection resumereset ttxtsubs"
# names of the use-flags
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] proj/vdr/devel:master commit in: media-video/vdr/, media-video/vdr/files/
@ 2015-02-11 21:51 Joerg Bornkessel
0 siblings, 0 replies; 8+ messages in thread
From: Joerg Bornkessel @ 2015-02-11 21:51 UTC (permalink / raw
To: gentoo-commits
commit: ac3d91b4d4cec48d68ac2be6fce72e7798c4fcd9
Author: Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 11 21:34:46 2015 +0000
Commit: Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
CommitDate: Wed Feb 11 21:34:46 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/vdr/devel.git;a=commit;h=ac3d91b4
patch fixed
Package-Manager: portage-2.2.15
Manifest-Sign-Key: 34C2808A
---
media-video/vdr/ChangeLog | 4 ++++
media-video/vdr/Manifest | 10 +++++-----
media-video/vdr/files/vdr-2.1.10_gentoo.patch | 2 +-
3 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/media-video/vdr/ChangeLog b/media-video/vdr/ChangeLog
index 4c73ed1..ca96bbd 100644
--- a/media-video/vdr/ChangeLog
+++ b/media-video/vdr/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 11 Feb 2015; Joerg Bornkessel <hd_brummy@gentoo.org>
+ files/vdr-2.1.10_gentoo.patch:
+ patch fixed
+
*vdr-2.1.10 (11 Feb 2015)
11 Feb 2015; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-2.1.9.ebuild,
diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index cc916c5..bbdeefb 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -7,7 +7,7 @@ AUX 03_vdr-2.1.8-scheduleswitch.diff 566 SHA256 a913e3177624199c1921b98067b3ffec
AUX 04_vdr-2.1.8-scheduleswitchblue.diff 4972 SHA256 5df3d8b8e8637d9280ba04eb2d94fdb974fcf66a82960012ae519bb7b02ff548 SHA512 7ac0c985ed86668486183eac9c569cae3d0e49062c1f7470fe84832e67732eacca84d8e28e03661c4a194d7ad8b5d538b55d04187471520dcb2fa8238130f556 WHIRLPOOL 13fbad5ddf9348441f7d1803c55a07e709e2fe7a3f7c2ad5ad94207dfb730c1f10abfa42b4845919559807fbbb1182473e7e0e766a1035df1735e562ab9f46e1
AUX 06_vdr-2.1.8-skipeditedresume.diff 702 SHA256 03b701ca2737e63df1cf1e5e1f2331e282ab5c26a4741951ddd07700e7b8488c SHA512 0a0393c599235147df2ec82c41570c0cae9316bc344cc3b00c1a1110fb7d9ffd2f67774b5882f0f9bc9f2b4ce5b98f0b109c52cb3fe2fab5df92bc5bd02277a3 WHIRLPOOL af8772fd694c10c9edc840b4b351a2c2d24be54f1f954888a49841cb02997e16efd54ca8cd6b918697a4f987c5ef7b6a11d1a03a079db12c9c42bbda9515ae60
AUX channel_alternative.conf 332 SHA256 30fb0a5147c01429c2813505cc69658cf1bfa1b70537bce07365017f653be5ce SHA512 738de5d5d99b54a516f41683834509b477590732db4e00b13b2f26e22c7349cb8517965a21251c08d29b0f368b2bb3fa64a1de71da09ffbedc5a401314a0eb5d WHIRLPOOL 96ead1c37c9e88e6593536a2182b813d3ae86c8e55e79a4cc5ff2d29ec0694405d26c82cb2295bb3f1e7e61c0ec93a646acc518e35ed6eff4d66c9219cc35677
-AUX vdr-2.1.10_gentoo.patch 2322 SHA256 8088a4f314e0b8d908f82cfe2a7392a18db679a7324bfa92dce49431c50313ec SHA512 c6953a7fb77717fdaa8ca05550496e25f4bc60d91c13ed0fb23d27e1a1ec433ec2d5cfb019717cf09eb7b67c9ebb91664b1b731dc28bc4f25e815871f6de0bc7 WHIRLPOOL 88d4e8407b085604525d9bae1f34a957ae5f168ac657a99c45dcba5f08185351ccb03736cfc464960d3f2157ac6357ffbf8b602dd1da49ee94efb403f71731d8
+AUX vdr-2.1.10_gentoo.patch 2321 SHA256 57e718074a07f11207d52db465afb05cc61100a7522c6413025e9d0ac49045c2 SHA512 2f6e2076779d4ce6cf22f5fb02d26bd991d12917d0769558ace8dbac528785a70bc10e5f2511ef506419e2b595eab30495f06a3ae769a0242a47397815150bf1 WHIRLPOOL d5fe4cce932a9ff784d10dcd237a849ce6dfb4399d54d2e601917b3f570a94c844529451339e43d6559b2461109b4080a6b8e4c48dbc1c570589c0e139c5bd21
AUX vdr-2.1.1_gentoo.patch 2488 SHA256 25275f22d8d183c089accd9463862aa772d2c13ae18c4f5769916c06b4b5918e SHA512 a36d8be52e7815165327e7322ce5f5537243a3cedc7b5e695ecddce567e8536cb44724540e5079fcda90f58a95f6fb26de4d1cc2842ce8d5460e4010623042f0 WHIRLPOOL 0885af205152ff2228bde0799a05c02efdb7fc712d740a640eecaff6296c7df1285883460e1dd452f0dbc6b4621ddcb0a7c89a21cc241a935f7b7526d2f852f5
AUX vdr-2.1.6_gentoo.patch 2255 SHA256 75ec762630d2e9099843151fd0b6e04c5b114faea2052392144d64c648cf5482 SHA512 0711128380cec9a6ec2e8212226a4a20896888467f323bc006bd1c4cbf1b8e1ce488c2f7227e0903847888e7e37159aecf6d82fdc1b50009a1c869d3da5134c0 WHIRLPOOL e984c7fb87fa3d7eedc203e3b5ac4d2cc9b528dc3a70d8a15582c6dee58589af6d8179fa542f3f45d2e9c6d9889b90e691b77b6d3398f4b6b200635bdc2c404e
AUX vdr-2.1.7_C++11.patch 4553 SHA256 3ff8f4762009a932cf63c4239e21f4cca2445cce160b578e5c5c5979b3fefc54 SHA512 41376c3a4bc4754401e2ce140aea5ce1a1b5ad4388c95446b8e1c8e7ab8acd21c35f24d961b4c16b4cc2500d73345cb73a8b4fa2c13dc90cb781dcac625195ec WHIRLPOOL 3b21733e5b065fc2d4188dfa872557cd4558265f3eaea3411d5a402c1cad14ed86379623e25ab908a4c43e165d4ac171bb1788b71b9b6644fd6510a928150f68
@@ -46,13 +46,13 @@ EBUILD vdr-2.1.7.ebuild 7724 SHA256 352022abc89e0fee871f672c8d476a9d1529eca9a817
EBUILD vdr-2.1.8-r2.ebuild 8123 SHA256 6dcd1d1f7d9e262c2618126d6af3bad45b5d9c09e6591f5df94e4f96116259eb SHA512 2f6f613d5add2fb97efc9e58dede7d1a64cfddc79e056271072cf32d164fc26adc067d96586074d5588749a7978ad1eaa57e1c0b7b3177ce0bb6c220c37b1719 WHIRLPOOL 3f848dae71a31471649470b6f7b8eaf7c0a96daaf7dffe6cbe36bd3145ec6e149fd518394b3e13c8465c0ca4c5ee97972009f13a687114e00f551ce5cab0268a
EBUILD vdr-2.1.8.ebuild 7624 SHA256 ee61c7eb7911a8f438f2d429ebb9615793db5f94351f419298faad005d414c24 SHA512 ab4becbc51ded5808bb7df7dce14db8cd9e685e42deed672ee29a97ca64f94276752652b61057a4f412f155d41eca741dff19180ce4d2f7496bd09c07dd085b7 WHIRLPOOL d6d2dcd482f8db246924c22ce673af2edf161feea77180cc77981c90b3b7b195cb0b00027f2ef705725d351fc6255436965a6645e1e07d2c477977e81a1cbc47
EBUILD vdr-2.1.9.ebuild 7374 SHA256 f07e6f9e80eed659aab17f83a85a755f61a3310b794009a2c8ec244a99be75e9 SHA512 7287f81b150cd6be492e9a13b16527309b27dc44e373b1fef41def68592aa2a493fd94658599fab93041588a4e9a8da7a16657cea946dd12e1bdb1a6ffb1dd5c WHIRLPOOL 2f01a4a1b19a4f46d6b98554038a657217c362007cdbd4ab1d2986d9a0b5c710138f5bcde820a598d0fcbb718e15d97a3ab1482e4b91b5ef3ec1823b83c00d91
-MISC ChangeLog 27607 SHA256 7145e2a2ce699b979c5b3ee07045056903a3d638548719435cfad38784925584 SHA512 72023ca89572e0b55d2b352ee9ef638dd0613c6d6f8831e362c6d311e6389dc6fb6cef3f8907e1648ea9dd1146956648412aed754bc05c0ae96c87e0fe36d6dd WHIRLPOOL 101e369f5a91df0e4d915dd55d70a2d9889fb4802094fc10216968d98e59b04dc790a5be8d4543321927b47c15a90b3e881b7b226f3f0a1dfd5b830e5c69a664
+MISC ChangeLog 27710 SHA256 0abcdf5811c0fbb70b14ada32e78d4e18f7bdcd57ea3635043b5f814ebdfcc75 SHA512 13394038c28037513e147d84b68851217cf851cd94194e58aa2b4f0226400969eaad406cb3f94f5cc1d4537efe1d892735b36be80b82a0e37daf8c10148bff01 WHIRLPOOL c66268d201357862ede39aff11ef037314c5e592ded3d3a0c288d3f4a6d68bbbf7f309683dfd316cb4173b1b169c97ee0ceebdf01ce039ced70ebb309f470ace
MISC metadata.xml 2138 SHA256 f570942c815bde637718a12a161b73dd50d7a418e169843ce8636c28dee11980 SHA512 d6545bbad63f5a7b64142248b733bb4ee74887063d3710ea1636e4da9ff89b01097ca2e95fc4603ed08167169235711ff83223554ad0f3cfc86640ee9b146bcb WHIRLPOOL cff75527edb8443764873500456a37bc08e9d901078b1352f67f23b73ad880a17d48f83e7004024cadd51e6002961b3eaab6312e79428706c6793d5bc043a714
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
Comment: added by hd_brummy@gentoo.org
-iD8DBQFU22Ozdn07HTTCgIoRCCr4AJ9wugXAZS144aT5d38zlidMgZ9lLwCfWwtc
-v1MPPqGiMY55dPq0IghRgLM=
-=OPsX
+iD8DBQFU28r2dn07HTTCgIoRCCBDAKCOdxgoZXk02BdlMzPQyD0i/V2SmgCgjkNE
+LQOG15tN3EvyyILmDfabp5g=
+=Hlho
-----END PGP SIGNATURE-----
diff --git a/media-video/vdr/files/vdr-2.1.10_gentoo.patch b/media-video/vdr/files/vdr-2.1.10_gentoo.patch
index 37ffd3c..810bfaa 100644
--- a/media-video/vdr/files/vdr-2.1.10_gentoo.patch
+++ b/media-video/vdr/files/vdr-2.1.10_gentoo.patch
@@ -45,7 +45,7 @@ diff -Naur vdr-2.1.7.orig/Makefile vdr-2.1.7/Makefile
- @mkdir -p $(DESTDIR)$(ARGSDIR)
- @mkdir -p $(DESTDIR)$(CACHEDIR)
+# @mkdir -p $(DESTDIR)$(CONFDIR)
-+# @mkdir -p $(DESTDIR)$(ARGSDIR)
++ @mkdir -p $(DESTDIR)$(ARGSDIR)
+# @mkdir -p $(DESTDIR)$(CACHEDIR)
@mkdir -p $(DESTDIR)$(RESDIR)
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] proj/vdr/devel:master commit in: media-video/vdr/, media-video/vdr/files/
@ 2015-02-20 12:32 Joerg Bornkessel
0 siblings, 0 replies; 8+ messages in thread
From: Joerg Bornkessel @ 2015-02-20 12:32 UTC (permalink / raw
To: gentoo-commits
commit: c234adedef25628eb5b6930c8771f717b09a437c
Author: Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 20 06:48:57 2015 +0000
Commit: Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
CommitDate: Fri Feb 20 06:48:57 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/vdr/devel.git;a=commit;h=c234aded
clean up
Package-Manager: portage-2.2.17
Manifest-Sign-Key: 34C2808A
---
media-video/vdr/ChangeLog | 14 +
media-video/vdr/Manifest | 50 +--
.../vdr/files/01_vdr-2.1.8-eit-memleak-v1.diff | 54 ----
.../vdr/files/02_vdr-2.1.8-binaryskipstrict.diff | 95 ------
.../vdr/files/03_vdr-2.1.8-scheduleswitch.diff | 18 --
.../vdr/files/04_vdr-2.1.8-scheduleswitchblue.diff | 139 ---------
.../vdr/files/06_vdr-2.1.8-skipeditedresume.diff | 12 -
media-video/vdr/files/vdr-2.1.1_gentoo.patch | 75 -----
media-video/vdr/files/vdr-2.1.6_gentoo.patch | 68 -----
media-video/vdr/files/vdr-2.1.7_C++11.patch | 86 ------
media-video/vdr/files/vdr-2.1.7_gentoo.patch | 70 -----
media-video/vdr/files/vdr-2.1.8_gentoo.patch | 70 -----
media-video/vdr/files/vdr-2.1.9_gentoo.patch | 70 -----
media-video/vdr/vdr-2.1.1.ebuild | 334 ---------------------
media-video/vdr/vdr-2.1.2-r1.ebuild | 327 --------------------
media-video/vdr/vdr-2.1.3.ebuild | 303 -------------------
media-video/vdr/vdr-2.1.4.ebuild | 304 -------------------
media-video/vdr/vdr-2.1.5.ebuild | 304 -------------------
media-video/vdr/vdr-2.1.6-r1.ebuild | 302 -------------------
media-video/vdr/vdr-2.1.6-r2.ebuild | 305 -------------------
media-video/vdr/vdr-2.1.6.ebuild | 304 -------------------
media-video/vdr/vdr-2.1.7.ebuild | 307 -------------------
media-video/vdr/vdr-2.1.8-r2.ebuild | 315 -------------------
media-video/vdr/vdr-2.1.8.ebuild | 305 -------------------
media-video/vdr/vdr-2.1.9.ebuild | 295 ------------------
25 files changed, 19 insertions(+), 4507 deletions(-)
diff --git a/media-video/vdr/ChangeLog b/media-video/vdr/ChangeLog
index ca96bbd..c2a2f9c 100644
--- a/media-video/vdr/ChangeLog
+++ b/media-video/vdr/ChangeLog
@@ -2,6 +2,20 @@
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 20 Feb 2015; Joerg Bornkessel <hd_brummy@gentoo.org> -vdr-2.1.1.ebuild,
+ -vdr-2.1.2-r1.ebuild, -vdr-2.1.3.ebuild, -vdr-2.1.4.ebuild,
+ -vdr-2.1.5.ebuild, -vdr-2.1.6.ebuild, -vdr-2.1.6-r1.ebuild,
+ -vdr-2.1.6-r2.ebuild, -vdr-2.1.7.ebuild, -vdr-2.1.8.ebuild,
+ -vdr-2.1.8-r2.ebuild, -vdr-2.1.9.ebuild, -files/vdr-2.1.1_gentoo.patch,
+ -files/vdr-2.1.6_gentoo.patch, -files/vdr-2.1.7_C++11.patch,
+ -files/vdr-2.1.7_gentoo.patch, -files/02_vdr-2.1.8-binaryskipstrict.diff,
+ -files/01_vdr-2.1.8-eit-memleak-v1.diff,
+ -files/03_vdr-2.1.8-scheduleswitch.diff,
+ -files/04_vdr-2.1.8-scheduleswitchblue.diff,
+ -files/06_vdr-2.1.8-skipeditedresume.diff, -files/vdr-2.1.8_gentoo.patch,
+ -files/vdr-2.1.9_gentoo.patch:
+ clean up
+
11 Feb 2015; Joerg Bornkessel <hd_brummy@gentoo.org>
files/vdr-2.1.10_gentoo.patch:
patch fixed
diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index bbdeefb..9a937d9 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -1,58 +1,18 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-AUX 01_vdr-2.1.8-eit-memleak-v1.diff 2187 SHA256 9eb0419d2732749f8a8b4b516fe81518e6a704f1b6f95e2d5a7e59f1549744bb SHA512 aa52fbab030487f94313124c5d889390e764db073d05d7a5a120ec424fe03dafadc5f60eade6c44249eb34810ff4b2feedb9278b5c31187f48284444a453cbbf WHIRLPOOL b4bc5073c5bab23d1740bd22cd5cffe61c4efe6670dc3a297e795e60f00f900805e986aefee6802b7833689220fcd7736961c91ef107723f65f7fb8a286dd406
-AUX 02_vdr-2.1.8-binaryskipstrict.diff 4571 SHA256 49d6eefc31b56ffc69fc3b063bff37bdf6c2eafe6b8b172803d71ecb24cc9fb0 SHA512 8c3c7a7eb20cf46d8d7630bae6413c8ba6a2c1e4530a6faa0ed43ad681657534046816a18b37e567cf4f13f56256443457c8e551bc3e4307ab44c76225a45a72 WHIRLPOOL 879e872ac1e4fc88f71c9a939372de4f673c26699c2db66e83b253ee0d5b9526a5fc78d3c7c9912f7d8a0d16bb9ca23b0446146aba0dc06caa8f17bfd3b5b2dd
-AUX 03_vdr-2.1.8-scheduleswitch.diff 566 SHA256 a913e3177624199c1921b98067b3ffecddc7c3daadb23c493f5231347660cccb SHA512 b054e92ac7e51c2721d8816966bde29f3082a1c242a2c0313d88a23d211fdf934e9f6f7302800361d79996a50e4e54984396f65ff5a07f065fac6c6194aa3a67 WHIRLPOOL 2b5d12701e9a73a88e9f49e8a6a394d699f87e0bdc27782ee1cc361e85840600fd362fc8adaff9a9fdcef6a4e579736113932c5518036d34ff63e6310bd230f8
-AUX 04_vdr-2.1.8-scheduleswitchblue.diff 4972 SHA256 5df3d8b8e8637d9280ba04eb2d94fdb974fcf66a82960012ae519bb7b02ff548 SHA512 7ac0c985ed86668486183eac9c569cae3d0e49062c1f7470fe84832e67732eacca84d8e28e03661c4a194d7ad8b5d538b55d04187471520dcb2fa8238130f556 WHIRLPOOL 13fbad5ddf9348441f7d1803c55a07e709e2fe7a3f7c2ad5ad94207dfb730c1f10abfa42b4845919559807fbbb1182473e7e0e766a1035df1735e562ab9f46e1
-AUX 06_vdr-2.1.8-skipeditedresume.diff 702 SHA256 03b701ca2737e63df1cf1e5e1f2331e282ab5c26a4741951ddd07700e7b8488c SHA512 0a0393c599235147df2ec82c41570c0cae9316bc344cc3b00c1a1110fb7d9ffd2f67774b5882f0f9bc9f2b4ce5b98f0b109c52cb3fe2fab5df92bc5bd02277a3 WHIRLPOOL af8772fd694c10c9edc840b4b351a2c2d24be54f1f954888a49841cb02997e16efd54ca8cd6b918697a4f987c5ef7b6a11d1a03a079db12c9c42bbda9515ae60
AUX channel_alternative.conf 332 SHA256 30fb0a5147c01429c2813505cc69658cf1bfa1b70537bce07365017f653be5ce SHA512 738de5d5d99b54a516f41683834509b477590732db4e00b13b2f26e22c7349cb8517965a21251c08d29b0f368b2bb3fa64a1de71da09ffbedc5a401314a0eb5d WHIRLPOOL 96ead1c37c9e88e6593536a2182b813d3ae86c8e55e79a4cc5ff2d29ec0694405d26c82cb2295bb3f1e7e61c0ec93a646acc518e35ed6eff4d66c9219cc35677
AUX vdr-2.1.10_gentoo.patch 2321 SHA256 57e718074a07f11207d52db465afb05cc61100a7522c6413025e9d0ac49045c2 SHA512 2f6e2076779d4ce6cf22f5fb02d26bd991d12917d0769558ace8dbac528785a70bc10e5f2511ef506419e2b595eab30495f06a3ae769a0242a47397815150bf1 WHIRLPOOL d5fe4cce932a9ff784d10dcd237a849ce6dfb4399d54d2e601917b3f570a94c844529451339e43d6559b2461109b4080a6b8e4c48dbc1c570589c0e139c5bd21
-AUX vdr-2.1.1_gentoo.patch 2488 SHA256 25275f22d8d183c089accd9463862aa772d2c13ae18c4f5769916c06b4b5918e SHA512 a36d8be52e7815165327e7322ce5f5537243a3cedc7b5e695ecddce567e8536cb44724540e5079fcda90f58a95f6fb26de4d1cc2842ce8d5460e4010623042f0 WHIRLPOOL 0885af205152ff2228bde0799a05c02efdb7fc712d740a640eecaff6296c7df1285883460e1dd452f0dbc6b4621ddcb0a7c89a21cc241a935f7b7526d2f852f5
-AUX vdr-2.1.6_gentoo.patch 2255 SHA256 75ec762630d2e9099843151fd0b6e04c5b114faea2052392144d64c648cf5482 SHA512 0711128380cec9a6ec2e8212226a4a20896888467f323bc006bd1c4cbf1b8e1ce488c2f7227e0903847888e7e37159aecf6d82fdc1b50009a1c869d3da5134c0 WHIRLPOOL e984c7fb87fa3d7eedc203e3b5ac4d2cc9b528dc3a70d8a15582c6dee58589af6d8179fa542f3f45d2e9c6d9889b90e691b77b6d3398f4b6b200635bdc2c404e
-AUX vdr-2.1.7_C++11.patch 4553 SHA256 3ff8f4762009a932cf63c4239e21f4cca2445cce160b578e5c5c5979b3fefc54 SHA512 41376c3a4bc4754401e2ce140aea5ce1a1b5ad4388c95446b8e1c8e7ab8acd21c35f24d961b4c16b4cc2500d73345cb73a8b4fa2c13dc90cb781dcac625195ec WHIRLPOOL 3b21733e5b065fc2d4188dfa872557cd4558265f3eaea3411d5a402c1cad14ed86379623e25ab908a4c43e165d4ac171bb1788b71b9b6644fd6510a928150f68
-AUX vdr-2.1.7_gentoo.patch 2322 SHA256 8088a4f314e0b8d908f82cfe2a7392a18db679a7324bfa92dce49431c50313ec SHA512 c6953a7fb77717fdaa8ca05550496e25f4bc60d91c13ed0fb23d27e1a1ec433ec2d5cfb019717cf09eb7b67c9ebb91664b1b731dc28bc4f25e815871f6de0bc7 WHIRLPOOL 88d4e8407b085604525d9bae1f34a957ae5f168ac657a99c45dcba5f08185351ccb03736cfc464960d3f2157ac6357ffbf8b602dd1da49ee94efb403f71731d8
-AUX vdr-2.1.8_gentoo.patch 2322 SHA256 8088a4f314e0b8d908f82cfe2a7392a18db679a7324bfa92dce49431c50313ec SHA512 c6953a7fb77717fdaa8ca05550496e25f4bc60d91c13ed0fb23d27e1a1ec433ec2d5cfb019717cf09eb7b67c9ebb91664b1b731dc28bc4f25e815871f6de0bc7 WHIRLPOOL 88d4e8407b085604525d9bae1f34a957ae5f168ac657a99c45dcba5f08185351ccb03736cfc464960d3f2157ac6357ffbf8b602dd1da49ee94efb403f71731d8
-AUX vdr-2.1.9_gentoo.patch 2322 SHA256 8088a4f314e0b8d908f82cfe2a7392a18db679a7324bfa92dce49431c50313ec SHA512 c6953a7fb77717fdaa8ca05550496e25f4bc60d91c13ed0fb23d27e1a1ec433ec2d5cfb019717cf09eb7b67c9ebb91664b1b731dc28bc4f25e815871f6de0bc7 WHIRLPOOL 88d4e8407b085604525d9bae1f34a957ae5f168ac657a99c45dcba5f08185351ccb03736cfc464960d3f2157ac6357ffbf8b602dd1da49ee94efb403f71731d8
-DIST extpng-vdr-2.1.1-gentoo-edition-v1.patch.bz2 76312 SHA256 42ed177d9064f555bb5396123790eaa9cf4b500536698af29bda0193c951faab SHA512 07cf50a0f9edf2f8b1542ad314b86f18b88e9409cc9aef400585c7dafb8fc691b2d476d18b088bc0d3de8ec7bf88241ba5418f99e156353cbcf78de406238cf8 WHIRLPOOL c027a0f107db181b617d3f1d3da461733bc03edd975adab03473979877ee5503efcb88903c20a0c0c1063f40710cf14c68456bc8038902b1e29f4194e02f6cb5
DIST extpng-vdr-2.1.10-gentoo-edition-v1.patch.bz2 26220 SHA256 a707bcceb53a1a33457cd550762d4829bff70863b118e39c65dc4fc6cbc77a9b SHA512 de2e00ee1eaa9641ffdc6c33b8d3cc5286f852e9e865687d696b627b2b46e843c10c5e875d97878669dc4a2b8b5f65221f6818fb11a08378d6c54f19684e5b16 WHIRLPOOL 30eb7704a9d1aa1040192e96c7ffddc287818a8b4cd78c5d46f2d2b11bb01b780cafcea82c74079f83bcd431042180cd8dec32cf03bcb38404c1d38e3d7a8390
-DIST extpng-vdr-2.1.2-gentoo-edition-v3.patch.bz2 30698 SHA256 c2ba5ada4cadb44dde87dc5de8b9a1306fa274d0cca8f856ce5e829e16d7d51f SHA512 a4520423182ef44f56b9e6807622a68ba404e1b14e81b8e4153ec23bb4f7e1ec4feabf458dfaddb9a829140e404f6988ad92dbd5b3768ff447918b609b80c29a WHIRLPOOL 9fca245602fbf5926794276da516f82d2846c53781d46720f2cab967bc7839d0494dc7592e76a864fa313ab0e04aefbba5e5f8bf429d7ccc4c31a1e126cdcba4
-DIST extpng-vdr-2.1.3-gentoo-edition-v1.patch.bz2 121553 SHA256 6ca5a1db1395001cc80178e61fbc9230e425e1c0d00b386e056283e4967326d4 SHA512 22e596f618fccaa61aa48c0ca32566a7937e539c54506ffab7f1fc98261da100dfc7ef47ee043535bcd18e1fd096ca3b897b251cad1a2ab4d9c0f285aba848d1 WHIRLPOOL b122620875e822eb1a2102c4ff7dc5055c3ee5e57320db2c0d04b864ef87fe04b9b6659483b164f8bc0a8a5db6180ff6668b152357dedfc13d1de42e15645e1e
-DIST extpng-vdr-2.1.5-gentoo-edition-v1.patch.bz2 30725 SHA256 eea5f1e92b5ef01d3c7165ee6bb3fa4d2daac6b5fd576b1de59775579aad87c1 SHA512 cf0ea1b756eebfb9f56cac9df126cc6b94eda2634bf9f88ec936e444744232909a11fa65e82f26f905536dd216383347010da6d5094e23c0c1210c007f54d813 WHIRLPOOL ff27809b5a454a5cecacf6ec04e6a3cc0c3b6627a7528fb42bef46ba9c7bf54b08e3b20eaeec19a997b8dd1df31bb9d41d0d176943a1c8e06b1f817b9ce91549
-DIST extpng-vdr-2.1.6-gentoo-edition-v2.patch.bz2 63143 SHA256 df8d3b428bfdce7443c39029c11e66d9c328c13b0dc46163707e06238054be8b SHA512 4ca1c6afc412decef231f0a1b8d0b64e4d38fc469cb3f15a301f24d613f4edfa32a8c12dff7b7ce562541f3b3d17561a4e0e7c0ae17c6dcc2d0a7090d73f9690 WHIRLPOOL ef3d0b935e9dcc084e54d9e7548a863ece66f6ab60c1ec31c81dcb01bd7e84a532fb0313a9e9d6773a9d5e85fa25672e4c293c4b1df0a226e0eecbbbc4cfe053
-DIST extpng-vdr-2.1.8-gentoo-edition-v2.patch.bz2 29910 SHA256 0e885f6b76bfe4246f14156810343afa441b09d205daad704962b3df4c976748 SHA512 571976e0393cd84703a13b1236233af6f00e4f7fcaf5e93b017fafe84ab9dd09ea7c245aa6657ebebe8cafa35135c05821bab1f4093c687dc9cf61a5437c585f WHIRLPOOL 3e9ca9d0974c9470f5358c7185d484bbdcc052ad6afe3b7cdb0789f86a4170dbdb830606ba3c53d85878e659289a43015487421b6978c81798f16b196c104b4f
-DIST extpng-vdr-2.1.9-gentoo-edition-v1.patch.bz2 26239 SHA256 9a2f98de98af6f9954179aeae0848e0c183fe5d85e63652d7d2f859c49d0a77a SHA512 6705a448810ee6061ce5009ff243a14c40ce9395f1d83b8223e1472c8481277abde3be900aca5b2a4291cb3f94c4f4fd58d326a88c7b12cf5493d558403ded87 WHIRLPOOL 91d45ed0a67e672886506843cf9dd933736ec46720641e9b9a692540aa5ef4dde2db50e1b636bfa7caf69ca53fd991de7d69bd2818e6f82aea4344666e96e98a
-DIST vdr-2.1.1.tar.bz2 842414 SHA256 96292f4f2a47fea9fdd432bdcca6e2f11747e2b19feac6d6f7af1797c5abfa37 SHA512 f31c774cc5c383b97cdae98892906c66ce27a2277ccde185815299ddd894e18908a6c252c92bddfefb82a8fe933c9c2b5e6f91947db526bb86bab9ff08cb8158 WHIRLPOOL e92705b8fec477a4e10c563f4440ba54ccb499823b15a6227ac2633fc55a56fad023b6f8b5d4450505344dfb5a1871ceb3a787c9e9470c178f947874fc79eef0
DIST vdr-2.1.10.tar.bz2 918164 SHA256 3a2f8f96586566dc40b7e11c252643957d1e2456914deddea1080240f58d5ad8 SHA512 1c7faef55bcbd7f5cfca4863fa222ba0af5feec0d8c26f2dd6c1b1c78b66495d6e7670ea2d3fef624fb6b6517099596cd40cf87401176513e870d016e5bc50ce WHIRLPOOL a0731c22d4a0576bc6a366e3a3d87631ae1a1b44e26b91c64817a2d8c6603633b873ab027f6809e4e7003010b9b5b92cbf20f76e351d4ab9bd711c8fd1fe2f8c
-DIST vdr-2.1.2-gcc.patch.gz 542 SHA256 8ac11be7074231604868e5f4a153df44b957543227c4cb0fcadbf693900b25d8 SHA512 4b3595e3ed3ef291bf155500d96d3355656f11442bc9a9a13ddbdfc35ae3156a894c12da1f4a20bdf6a7e35c3cb0904ab1c5c2d14698ffe6595ffc9d5b37a2ad WHIRLPOOL 96cbcea605e52a76974196f5a7ec44b49222f0fb3048428286ab974ec6633e4bdd6523796a0109ba866aaba101b270b099dc4983b439d6ad84c00890cb7078d8
-DIST vdr-2.1.2.tar.bz2 850237 SHA256 1bf9c636145acf2d67716475314efe9703619759f0fdbae02d89fe599730f2a4 SHA512 4e9bf4705a64d4fab790d6cf0b92151537e282a8a3a41eeb13cddf3a966b303b31fc32fd62b27450adc68134ca853aaa6dd5b6d7a9c672c6165aab9f044c19b5 WHIRLPOOL 525ce8c05cbaeb9f3d8108117fb18dc5b64885e311c3a40dd704888b0a5020cb3ef6fcd9d57af200d94ffc0479add8c6a651791885ff67f7f93cf45a0aec1d8b
-DIST vdr-2.1.3.tar.bz2 862445 SHA256 959c3243672ffd8b67da7072e7201f2b483b684fb18c2c4c5eb47e54dbd4d141 SHA512 4468c516095c7c64f02c42af40a4c321aecfbea0e070417559879a1e86869f7eb1308b53442302a7c7a56c070c825b6c2f32bea79c7c9e09e9e39e4b265369f4 WHIRLPOOL 92a289b023391b5e9b9af7430d1eb18e8a8c6d97e67f3d0c40c51a6943eff6552af94d8a93d349504a8fe2c9dde4573f98240022f823d828757a963676a1c357
-DIST vdr-2.1.4.tar.bz2 862733 SHA256 a3208d6229622b089d19c238c5b78b80e7d82e0220710e8044ea8729c6931202 SHA512 269c145d8547b66ba5782aadfa9b479d2237cae674af080701d50b42c4a29872f187dea4b8c47f7326dec4958c8671fb5286131f5169b9ffa6e8ca56366a1b14 WHIRLPOOL d97ff9e91719492306ab115a484113793f34324bd5626ebdd105f2d94287465fd921eb8d92f4c35594c5145ed9bd3346164efa2fd247cbe7c83cae55de053457
-DIST vdr-2.1.5.tar.bz2 869767 SHA256 e642dcaaa1a5edc3683e33c5b154c6439a1427c24dc8685f36a0bb919774a890 SHA512 3bb6192ac7d7db024838c0d4f07797f70ee4da02b14ae0effa24f3b079fea8f42be089754cbffad013dbf9d87829d20b3dee66eed390b061088487f2784c8c75 WHIRLPOOL b2a6e5742fa6212f453713dad574dc51102ccfa2b9aaa036ea53249d220404157ced8e9c20d9550184741edb5211de9286a9c3e6249c07949fab54a0b727acff
-DIST vdr-2.1.6.tar.bz2 872380 SHA256 232a326f9a4a609746da42a9c7ee632f394496b7e8215d71dfdcff3fcde4e145 SHA512 ce98ff6167e340ec7cd8d23012e2632f5a41fe20979359c2684771ba86458bb6b48736b34b9474f6ccb7492951c69a3849c086848c2870e8c7476941f64022df WHIRLPOOL df9159648464682841b5ed9c14a584c53e154f74084c432e6e5e94bf2b0e095c72b23e25329f582fd1e18b34c93717f1d91f7ff6c3a29887ad870021eaecc2a3
-DIST vdr-2.1.7.tar.bz2 880225 SHA256 86fcf656bc121e4cb8b92a2c06dbeda7b22dfd033ba74b9940f368e82fdbcafc SHA512 32d1a14fbbafd28870f5c30009fa9ae38ff34933ae3b6eb00029284f3c4ddc039bae563ed8381792c47006d26d6a33a19b67e29a227eac6f0ff36a7bbe9faa30 WHIRLPOOL 7a49a332f508ff2ec3597ccf4c944249f3380a5559bb5e225083376e1813280fbf2e56356d1345c2f7383ddbf81e94d1d9fe4c4604b3addb5e276a9060255f55
-DIST vdr-2.1.8.tar.bz2 890588 SHA256 96d3209742e2b61d7e75ce54f767d61adc9857472f2c79df5479a4e60772975e SHA512 f1b1d6261aabe8517a3e26a93244c4bc307289b41c033bedf7d25a468bb428a1a6f9a290fceccb9fa1cbf049a0eae7530902da1586143895457f2a997479b2d5 WHIRLPOOL 90c9a946ac43b66be01a9568b885b2162f01e7edf8665cde4c5c73b4c46750d67aed61cd383e33ba6e824b29212afe63b00c0f8a142c0c87b98507a370928663
-DIST vdr-2.1.9.tar.bz2 908415 SHA256 324de39ea3d7e8366f21cf98cfa049772fcdaf69dbcb150cd491898d3f68e310 SHA512 ee5abd9b98879b5dea84e439c57969316db92eb1729daac3f2258f38611d09dee49a43d59f9d01fb8af52dac569f9c611d18d8bd7e49ef3e65c22e599aae9c81 WHIRLPOOL c6fe523248f70f06872745f4253b77b783e21d15ffe8f1bad3de166046f39c5cb75ada51eaea945687eba6b86e26f9e168137429d7dc4201347d035e08631ddb
-EBUILD vdr-2.1.1.ebuild 8500 SHA256 dd4e4100a0db15897ade0cf0b34348052dba6dcb531bce73096126a4684f159f SHA512 fee916284d4252180bdf1ee099eb0bd6d577eecb7f3a39607ae50b3f7e977393edf9b0aa4b65f9d7c7a711f61145f2cc8e44a6faa6d19812c40f8bca19f1d6c6 WHIRLPOOL ffa40b3f63ad2d697cf9297e733eb7047b6a20c39ecb7649a216dc615d090e3a13962b63231c58ea4c17b63b65e15a8e37aecb4e95261ccf2e44d2041bd5824b
EBUILD vdr-2.1.10.ebuild 7559 SHA256 5b4bec2e02bc2d25ad1ebc59be17d83943777e5fe836c456e6ae13b07014e1ef SHA512 a2b5da1b81d51db59b1e4261de1083385e2b64704929ba8e744f2341049cde300955893869a0383ae240d5650ae29a310ca2bc5984d632044f3d109f7fc4b696 WHIRLPOOL 00b226e23e8a1cbfe71d6505c99ab601f8294a3d5b8e966e8bba9ad450e27a809ed4787782c2d9c1ef7f071bba6291982182adc6d09b04a086dfdd01412abc51
-EBUILD vdr-2.1.2-r1.ebuild 8311 SHA256 9bb5f5f02624f885bffb29f4703d9f8fc73dfd5c1b2dbbfee510fa0e88bf0e0d SHA512 6e5cb3e1e554bb159ae693c023208a52547549e943a959c747d32a957b031c72848717556a7b99e0d3efc6c6d305b257d448d7144dac6fe544d4cbf336622b84 WHIRLPOOL ebf0a876e87b376bc81af8e8f9af05b603e873f789f5ca135977aa7feeb8e529cdbd1caf0c931218e296baccc4ebbef1dbf4bdd38ffa176657166da14ab4924b
-EBUILD vdr-2.1.3.ebuild 7570 SHA256 f9a7b23ec5d6d7f671dd5180ba32a3858223a0778f25f78d03a190553fbfb020 SHA512 086312ab9572b64342cc56c33178cfd2e7aa0ea961dde3c942758d9f7a821da2c03a495ec7aa8cc8a83016324f7fee0d6863aede6c5f34b104880066bc680ccc WHIRLPOOL ba1427d2e9d9539ba1791f1e381f8383bf116ac16887d8a67f3be70ecadeb29bb053a74f18be3233a415f0cd443f7885ca9348b0c0cb65cf36456f1769f07761
-EBUILD vdr-2.1.4.ebuild 7616 SHA256 348deaf194a5b0ec8980e5c0b2f5231580e1a597e46c14ecabae6a946ac6a0f8 SHA512 92d4e1fac1f1f542356dfa84545a04f1bd136a98a1ec829281e21fc9878e6983645fa7261483b75778e8b5119795a9389f101da07102340141e6e419e1585425 WHIRLPOOL 9dd6c66680490af90b9398e3b96df06c8f32ffe464ba5d9c8a61e17131a5b7f1fc1f629d142477477e768f4f25d3bc7e542f922c29e37211b1a5cb531d479b4f
-EBUILD vdr-2.1.5.ebuild 7616 SHA256 1ba2350f5a43fb520ab8c0bad29b59c42431b22196376fd04067067411de4841 SHA512 10dbb1102b078baa67a1a7249528ee69a906f54a0dfc9db50929b38f9a7e0c501c3df8ba1db02e6b5ba15c9ad33a4f51dcb3bafd44d48afa40894a21355ab086 WHIRLPOOL d260b3c452db3bf3bc32d520caa5b0fa5b9fdc8d169226c3868f90bca4bd22658e0282b8210ef385c6300872809b3ba8252197a7a185eea1249f5c3cec7e086f
-EBUILD vdr-2.1.6-r1.ebuild 7588 SHA256 aab0a8b51860d6e99bffe5490ca7ce8ed218a4368f257cd938aca70b7e78fa1a SHA512 43f8a20f215b62f27013c8b4961c1f6446fa0d42b125c54e5f60a5d903273d7328d8cc20d2c221d9ca5fa12fe745e8e867a543b2a36254ec6b1ad001353db2de WHIRLPOOL 380d1368d680b0db24a487f25e1080c67a3b9e133c700672be8a2b38b469288291abfd86735b31b1c6f99e5de346bf399bfc13e14c9ba5e11695fd55505081f1
-EBUILD vdr-2.1.6-r2.ebuild 7648 SHA256 9949037814fa0636037325e94067838e6df6dce8a0dc77fd20c8abaa08ee3e5a SHA512 2f44e6d552b5da3589ca3a6144d4d2ff76a822f955023855690ea386f98cb7ff6f43a3faa470a1659338e8c43d8e2b3ccee0e915ed41738bfd8b191ea372ee58 WHIRLPOOL 5b2775f70851b4bd94e9382e8b3709e08b53c63a9fae0f64fa7f7b0038c9d4d6ba5d2a60a6e41ce34d48ef9475c56bc7eaa80fabaeb356a335c8fe57edeb50ea
-EBUILD vdr-2.1.6.ebuild 7616 SHA256 ca9c89b9db90646cfe89964f8f5094af9c8be19404ea3d05ba75d2283af40f6a SHA512 0ea0d208c8140cb158a98cdc8ffd0711d0bf5b2fc635f3724ee7273e735371d232ce7bd7086805b0c38bd9c3f8e04b438d28b81b76c4f6f2c6f1d2acd0cc8b33 WHIRLPOOL 5580d45a8d145e481cfb04ef338868b94398f434ff2daed0f77d347b471b1ce8ec4e35a9ef48c3f1d2368dca57074201456be22f4236bc41bf7f0442eaea38b3
-EBUILD vdr-2.1.7.ebuild 7724 SHA256 352022abc89e0fee871f672c8d476a9d1529eca9a817ee7d0d60edc3986dbfd3 SHA512 ee62924473e3909f578805db1bc58c17f657c6adf5f8a3948f83ae9366cea8f101f341f6a5789a8e00236d110db50f01f453dd13e7c0f65dd2915750fb6860dc WHIRLPOOL dd3570aee1e0236caf9a2c40122f28e787933128c6d1f938a74c889725f2a8e4295cbd8fa4951030164364db2d1669b8bc75a8f9df31b053cd61fedd81695d1f
-EBUILD vdr-2.1.8-r2.ebuild 8123 SHA256 6dcd1d1f7d9e262c2618126d6af3bad45b5d9c09e6591f5df94e4f96116259eb SHA512 2f6f613d5add2fb97efc9e58dede7d1a64cfddc79e056271072cf32d164fc26adc067d96586074d5588749a7978ad1eaa57e1c0b7b3177ce0bb6c220c37b1719 WHIRLPOOL 3f848dae71a31471649470b6f7b8eaf7c0a96daaf7dffe6cbe36bd3145ec6e149fd518394b3e13c8465c0ca4c5ee97972009f13a687114e00f551ce5cab0268a
-EBUILD vdr-2.1.8.ebuild 7624 SHA256 ee61c7eb7911a8f438f2d429ebb9615793db5f94351f419298faad005d414c24 SHA512 ab4becbc51ded5808bb7df7dce14db8cd9e685e42deed672ee29a97ca64f94276752652b61057a4f412f155d41eca741dff19180ce4d2f7496bd09c07dd085b7 WHIRLPOOL d6d2dcd482f8db246924c22ce673af2edf161feea77180cc77981c90b3b7b195cb0b00027f2ef705725d351fc6255436965a6645e1e07d2c477977e81a1cbc47
-EBUILD vdr-2.1.9.ebuild 7374 SHA256 f07e6f9e80eed659aab17f83a85a755f61a3310b794009a2c8ec244a99be75e9 SHA512 7287f81b150cd6be492e9a13b16527309b27dc44e373b1fef41def68592aa2a493fd94658599fab93041588a4e9a8da7a16657cea946dd12e1bdb1a6ffb1dd5c WHIRLPOOL 2f01a4a1b19a4f46d6b98554038a657217c362007cdbd4ab1d2986d9a0b5c710138f5bcde820a598d0fcbb718e15d97a3ab1482e4b91b5ef3ec1823b83c00d91
-MISC ChangeLog 27710 SHA256 0abcdf5811c0fbb70b14ada32e78d4e18f7bdcd57ea3635043b5f814ebdfcc75 SHA512 13394038c28037513e147d84b68851217cf851cd94194e58aa2b4f0226400969eaad406cb3f94f5cc1d4537efe1d892735b36be80b82a0e37daf8c10148bff01 WHIRLPOOL c66268d201357862ede39aff11ef037314c5e592ded3d3a0c288d3f4a6d68bbbf7f309683dfd316cb4173b1b169c97ee0ceebdf01ce039ced70ebb309f470ace
+MISC ChangeLog 28437 SHA256 361bf8962db011602fdf6ebf1988556416d146dd1cf599e6b3180ce992cd0806 SHA512 86cd60bb3a0e9c095f7a808e21157161b3c1d261c5fa932e1cb38d5e89931176cfb35ebdc558a0f437c746452964ff5c207182900546e640e3a60a3d0969198d WHIRLPOOL c0aa067fb6b8c87ba6aa95b996f4dacba400bf6070abc3d55057c9762ef9f346164971c68f2292d853fe3d6996ae730aca178085bc9924623fd7afcb840f1510
MISC metadata.xml 2138 SHA256 f570942c815bde637718a12a161b73dd50d7a418e169843ce8636c28dee11980 SHA512 d6545bbad63f5a7b64142248b733bb4ee74887063d3710ea1636e4da9ff89b01097ca2e95fc4603ed08167169235711ff83223554ad0f3cfc86640ee9b146bcb WHIRLPOOL cff75527edb8443764873500456a37bc08e9d901078b1352f67f23b73ad880a17d48f83e7004024cadd51e6002961b3eaab6312e79428706c6793d5bc043a714
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
Comment: added by hd_brummy@gentoo.org
-iD8DBQFU28r2dn07HTTCgIoRCCBDAKCOdxgoZXk02BdlMzPQyD0i/V2SmgCgjkNE
-LQOG15tN3EvyyILmDfabp5g=
-=Hlho
+iD8DBQFU5tjZdn07HTTCgIoRCF0hAJ9Jmw0AZVkCtKeLAXzJUIB8zDkbTgCbBueH
+G4/GJ0UVNmRNaEh7kHON0MA=
+=O+nm
-----END PGP SIGNATURE-----
diff --git a/media-video/vdr/files/01_vdr-2.1.8-eit-memleak-v1.diff b/media-video/vdr/files/01_vdr-2.1.8-eit-memleak-v1.diff
deleted file mode 100644
index 742a879..0000000
--- a/media-video/vdr/files/01_vdr-2.1.8-eit-memleak-v1.diff
+++ /dev/null
@@ -1,54 +0,0 @@
-diff --git a/eit.c b/eit.c
-index 30c017b..031fc93 100644
---- a/eit.c
-+++ b/eit.c
-@@ -136,8 +136,8 @@ cEIT::cEIT(cSchedules *Schedules, int Source, u_char Tid, const u_char *Data, bo
- UseExtendedEventDescriptor = true;
- }
- if (UseExtendedEventDescriptor) {
-- ExtendedEventDescriptors->Add(eed);
-- d = NULL; // so that it is not deleted
-+ if (ExtendedEventDescriptors->Add(eed))
-+ d = NULL; // so that it is not deleted
- }
- if (eed->getDescriptorNumber() == eed->getLastDescriptorNumber())
- UseExtendedEventDescriptor = false;
-diff --git a/libsi/si.c b/libsi/si.c
-index 0ef3939..edc9074 100644
---- a/libsi/si.c
-+++ b/libsi/si.c
-@@ -198,17 +198,18 @@ void DescriptorGroup::Delete() {
- }
- }
-
--void DescriptorGroup::Add(GroupDescriptor *d) {
-+bool DescriptorGroup::Add(GroupDescriptor *d) {
- if (!array) {
- length=d->getLastDescriptorNumber()+1;
- array=new GroupDescriptor*[length]; //numbering is zero-based
- for (int i=0;i<length;i++)
- array[i]=0;
- } else if (length != d->getLastDescriptorNumber()+1)
-- return; //avoid crash in case of misuse
-+ return false; //avoid crash in case of misuse
- if (length <= d->getDescriptorNumber())
-- return; // see http://www.vdr-portal.de/board60-linux/board14-betriebssystem/board69-c-t-vdr/p1025777-segfault-mit-vdr-1-7-21/#post1025777
-+ return false; // see http://www.vdr-portal.de/board60-linux/board14-betriebssystem/board69-c-t-vdr/p1025777-segfault-mit-vdr-1-7-21/#post1025777
- array[d->getDescriptorNumber()]=d;
-+ return true;
- }
-
- bool DescriptorGroup::isComplete() {
-diff --git a/libsi/si.h b/libsi/si.h
-index 1e65111..7b47d02 100644
---- a/libsi/si.h
-+++ b/libsi/si.h
-@@ -483,7 +483,7 @@ class DescriptorGroup {
- public:
- DescriptorGroup(bool deleteOnDesctruction=true);
- ~DescriptorGroup();
-- void Add(GroupDescriptor *d);
-+ bool Add(GroupDescriptor *d);
- void Delete();
- int getLength() { return length; }
- GroupDescriptor **getDescriptors() { return array; }
diff --git a/media-video/vdr/files/02_vdr-2.1.8-binaryskipstrict.diff b/media-video/vdr/files/02_vdr-2.1.8-binaryskipstrict.diff
deleted file mode 100644
index 63cd3dd..0000000
--- a/media-video/vdr/files/02_vdr-2.1.8-binaryskipstrict.diff
+++ /dev/null
@@ -1,95 +0,0 @@
-===================================================================
-RCS file: ./RCS/MANUAL
-retrieving revision 3.10
-diff -u -r3.10 ./MANUAL
---- ./MANUAL 2015/01/29 15:55:21 3.10
-+++ ./MANUAL 2015/02/02 12:40:07
-@@ -1006,6 +1006,18 @@
- the binary mode and makes '1' and '3' always skip the number
- of seconds configured as the initial value.
-
-+ Binary skip strict = yes
-+ When skipping in binary mode with the '1' and '3' keys, the
-+ distance of the skip is halved with every key press after the
-+ first change of direction. While this allows for locating a
-+ particular position in a recording very fast, once you make
-+ one step too many in the current direction you have no chance
-+ of ever reaching the desired point any more. You will have to
-+ wait for the timeout to occur and start binary skipping anew.
-+ If this option is set to 'no', the skip distance will only be
-+ halved if the direction actually changes. That way, even if
-+ you missed the target point, you can still back up to it.
-+
- Resume ID = 0 Defines an additional ID that can be used in a multi user
- environment, so that every user has his/her own resume
- files for each recording. The valid range is 0...99, with
-===================================================================
-RCS file: ./RCS/config.c
-retrieving revision 3.6
-diff -u -r3.6 ./config.c
---- ./config.c 2015/01/29 09:01:30 3.6
-+++ ./config.c 2015/02/02 12:22:30
-@@ -475,6 +475,7 @@
- PauseAtLastMark = 0;
- BinarySkipInitial = 120;
- BinarySkipTimeout = 3;
-+ BinarySkipStrict = 1;
- ResumeID = 0;
- CurrentChannel = -1;
- CurrentVolume = MAXVOLUME;
-@@ -693,6 +694,7 @@
- else if (!strcasecmp(Name, "PauseAtLastMark")) PauseAtLastMark = atoi(Value);
- else if (!strcasecmp(Name, "BinarySkipInitial")) BinarySkipInitial = atoi(Value);
- else if (!strcasecmp(Name, "BinarySkipTimeout")) BinarySkipTimeout = atoi(Value);
-+ else if (!strcasecmp(Name, "BinarySkipStrict")) BinarySkipStrict = atoi(Value);
- else if (!strcasecmp(Name, "ResumeID")) ResumeID = atoi(Value);
- else if (!strcasecmp(Name, "CurrentChannel")) CurrentChannel = atoi(Value);
- else if (!strcasecmp(Name, "CurrentVolume")) CurrentVolume = atoi(Value);
-@@ -815,6 +817,7 @@
- Store("PauseAtLastMark", PauseAtLastMark);
- Store("BinarySkipInitial", BinarySkipInitial);
- Store("BinarySkipTimeout", BinarySkipTimeout);
-+ Store("BinarySkipStrict", BinarySkipStrict);
- Store("ResumeID", ResumeID);
- Store("CurrentChannel", CurrentChannel);
- Store("CurrentVolume", CurrentVolume);
-===================================================================
-RCS file: ./RCS/config.h
-retrieving revision 3.14
-diff -u -r3.14 ./config.h
---- ./config.h 2015/02/01 14:59:52 3.14
-+++ ./config.h 2015/02/02 12:21:13
-@@ -338,6 +338,7 @@
- int PauseAtLastMark;
- int BinarySkipInitial;
- int BinarySkipTimeout;
-+ int BinarySkipStrict;
- int ResumeID;
- int CurrentChannel;
- int CurrentVolume;
-===================================================================
-RCS file: ./RCS/menu.c
-retrieving revision 3.35
-diff -u -r3.35 ./menu.c
---- ./menu.c 2015/02/01 10:42:11 3.35
-+++ ./menu.c 2015/02/02 12:23:18
-@@ -3641,6 +3641,7 @@
- Add(new cMenuEditBoolItem(tr("Setup.Replay$Pause replay at last mark"), &data.PauseAtLastMark));
- Add(new cMenuEditIntItem( tr("Setup.Replay$Binary skip initial value (s)"), &data.BinarySkipInitial, 10, 600));
- Add(new cMenuEditIntItem( tr("Setup.Replay$Binary skip timeout (s)"), &data.BinarySkipTimeout, 0, 10));
-+ Add(new cMenuEditBoolItem(tr("Setup.Replay$Binary skip strict"), &data.BinarySkipStrict));
- Add(new cMenuEditIntItem(tr("Setup.Replay$Resume ID"), &data.ResumeID, 0, 99));
- }
-
-@@ -5007,7 +5008,10 @@
- }
- else if (Key != lastKey) {
- currentValue /= 2;
-- lastKey = kNone; // once the direction has changed, every further call halves the value
-+ if (Setup.BinarySkipStrict)
-+ lastKey = kNone; // once the direction has changed, every further call halves the value
-+ else
-+ lastKey = Key; // only halve the value when the direction is changed
- }
- timeout.Set(Setup.BinarySkipTimeout * 1000);
- return max(currentValue, 1);
diff --git a/media-video/vdr/files/03_vdr-2.1.8-scheduleswitch.diff b/media-video/vdr/files/03_vdr-2.1.8-scheduleswitch.diff
deleted file mode 100644
index d5c9312..0000000
--- a/media-video/vdr/files/03_vdr-2.1.8-scheduleswitch.diff
+++ /dev/null
@@ -1,18 +0,0 @@
---- menu.c 2015/02/02 12:23:18 3.36
-+++ menu.c 2015/02/03 10:42:55
-@@ -1748,9 +1748,12 @@
-
- eOSState cMenuSchedule::Switch(void)
- {
-- if (otherChannel) {
-- if (Channels.SwitchTo(otherChannel))
-- return osEnd;
-+ cMenuScheduleItem *item = (cMenuScheduleItem *)Get(Current());
-+ if (item) {
-+ if (cChannel *Channel = Channels.GetByChannelID(item->event->ChannelID(), true)) {
-+ if (Channels.SwitchTo(Channel->Number()))
-+ return osEnd;
-+ }
- }
- Skins.Message(mtError, tr("Can't switch channel!"));
- return osContinue;
diff --git a/media-video/vdr/files/04_vdr-2.1.8-scheduleswitchblue.diff b/media-video/vdr/files/04_vdr-2.1.8-scheduleswitchblue.diff
deleted file mode 100644
index 963d3ba..0000000
--- a/media-video/vdr/files/04_vdr-2.1.8-scheduleswitchblue.diff
+++ /dev/null
@@ -1,139 +0,0 @@
---- menu.c 2015/02/03 10:42:55 3.37
-+++ menu.c 2015/02/03 11:51:29
-@@ -1377,6 +1377,7 @@
- class cMenuWhatsOn : public cOsdMenu {
- private:
- bool now;
-+ bool canSwitch;
- int helpKeys;
- int timerState;
- eOSState Record(void);
-@@ -1401,7 +1402,8 @@
- {
- SetMenuCategory(Now ? mcScheduleNow : mcScheduleNext);
- now = Now;
-- helpKeys = -1;
-+ canSwitch = false;
-+ helpKeys = 0;
- timerState = 0;
- Timers.Modified(timerState);
- for (cChannel *Channel = Channels.First(); Channel; Channel = Channels.Next(Channel)) {
-@@ -1434,16 +1436,27 @@
- void cMenuWhatsOn::SetHelpKeys(void)
- {
- cMenuScheduleItem *item = (cMenuScheduleItem *)Get(Current());
-+ canSwitch = false;
- int NewHelpKeys = 0;
- if (item) {
- if (item->timerMatch == tmFull)
-- NewHelpKeys = 2;
-+ NewHelpKeys |= 0x02; // "Timer"
- else
-- NewHelpKeys = 1;
-+ NewHelpKeys |= 0x01; // "Record"
-+ if (now)
-+ NewHelpKeys |= 0x04; // "Next"
-+ else
-+ NewHelpKeys |= 0x08; // "Now"
-+ if (cChannel *Channel = Channels.GetByChannelID(item->event->ChannelID(), true)) {
-+ if (Channel->Number() != cDevice::CurrentChannel()) {
-+ NewHelpKeys |= 0x10; // "Switch"
-+ canSwitch = true;
-+ }
-+ }
- }
- if (NewHelpKeys != helpKeys) {
- const char *Red[] = { NULL, tr("Button$Record"), tr("Button$Timer") };
-- SetHelp(Red[NewHelpKeys], now ? tr("Button$Next") : tr("Button$Now"), tr("Button$Schedule"), tr("Button$Switch"));
-+ SetHelp(Red[NewHelpKeys & 0x03], now ? tr("Button$Next") : tr("Button$Now"), tr("Button$Schedule"), canSwitch ? tr("Button$Switch") : NULL);
- helpKeys = NewHelpKeys;
- }
- }
-@@ -1519,10 +1532,12 @@
- }
- }
- break;
-- case kBlue: return Switch();
-+ case kBlue: if (canSwitch)
-+ return Switch();
-+ break;
- case kInfo:
- case kOk: if (Count())
-- return AddSubMenu(new cMenuEvent(((cMenuScheduleItem *)Get(Current()))->event, true, true));
-+ return AddSubMenu(new cMenuEvent(((cMenuScheduleItem *)Get(Current()))->event, canSwitch, true));
- break;
- default: break;
- }
-@@ -1543,7 +1558,7 @@
- cSchedulesLock schedulesLock;
- const cSchedules *schedules;
- bool now, next;
-- int otherChannel;
-+ bool canSwitch;
- int helpKeys;
- int timerState;
- eOSState Number(void);
-@@ -1566,8 +1581,8 @@
- {
- SetMenuCategory(mcSchedule);
- now = next = false;
-- otherChannel = 0;
-- helpKeys = -1;
-+ canSwitch = false;
-+ helpKeys = 0;
- timerState = 0;
- Timers.Modified(timerState);
- cMenuScheduleItem::SetSortMode(cMenuScheduleItem::ssmAllThis);
-@@ -1673,16 +1688,23 @@
- void cMenuSchedule::SetHelpKeys(void)
- {
- cMenuScheduleItem *item = (cMenuScheduleItem *)Get(Current());
-+ canSwitch = false;
- int NewHelpKeys = 0;
- if (item) {
- if (item->timerMatch == tmFull)
-- NewHelpKeys = 2;
-+ NewHelpKeys |= 0x02; // "Timer"
- else
-- NewHelpKeys = 1;
-+ NewHelpKeys |= 0x01; // "Record"
-+ if (cChannel *Channel = Channels.GetByChannelID(item->event->ChannelID(), true)) {
-+ if (Channel->Number() != cDevice::CurrentChannel()) {
-+ NewHelpKeys |= 0x10; // "Switch"
-+ canSwitch = true;
-+ }
-+ }
- }
- if (NewHelpKeys != helpKeys) {
- const char *Red[] = { NULL, tr("Button$Record"), tr("Button$Timer") };
-- SetHelp(Red[NewHelpKeys], tr("Button$Now"), tr("Button$Next"));
-+ SetHelp(Red[NewHelpKeys & 0x03], tr("Button$Now"), tr("Button$Next"), canSwitch ? tr("Button$Switch") : NULL);
- helpKeys = NewHelpKeys;
- }
- }
-@@ -1787,12 +1809,12 @@
- case kYellow: if (schedules)
- return AddSubMenu(new cMenuWhatsOn(schedules, false, cMenuWhatsOn::CurrentChannel()));
- break;
-- case kBlue: if (Count() && otherChannel)
-+ case kBlue: if (canSwitch)
- return Switch();
- break;
- case kInfo:
- case kOk: if (Count())
-- return AddSubMenu(new cMenuEvent(((cMenuScheduleItem *)Get(Current()))->event, otherChannel, true));
-+ return AddSubMenu(new cMenuEvent(((cMenuScheduleItem *)Get(Current()))->event, canSwitch, true));
- break;
- default: break;
- }
-@@ -1805,10 +1827,6 @@
- if (channel) {
- cMenuScheduleItem::SetSortMode(cMenuScheduleItem::ssmAllThis);
- PrepareScheduleAllThis(NULL, channel);
-- if (channel->Number() != cDevice::CurrentChannel()) {
-- otherChannel = channel->Number();
-- SetHelp(Count() ? tr("Button$Record") : NULL, tr("Button$Now"), tr("Button$Next"), tr("Button$Switch"));
-- }
- Display();
- }
- }
diff --git a/media-video/vdr/files/06_vdr-2.1.8-skipeditedresume.diff b/media-video/vdr/files/06_vdr-2.1.8-skipeditedresume.diff
deleted file mode 100644
index bcfcb2c..0000000
--- a/media-video/vdr/files/06_vdr-2.1.8-skipeditedresume.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur vdr-2.1.8.orig/dvbplayer.c vdr-2.1.8/dvbplayer.c
---- vdr-2.1.8.orig/dvbplayer.c 2015-02-04 10:20:26.000000000 +0100
-+++ vdr-2.1.8/dvbplayer.c 2015-02-04 10:22:10.000000000 +0100
-@@ -431,6 +431,8 @@
- if (index) {
- int Index = ptsIndex.FindIndex(DeviceGetSTC());
- if (Index >= 0) {
-+ if (Setup.SkipEdited && marks.First() && abs(Index - marks.First()->Position()) <= int(round(RESUMEBACKUP * framesPerSecond)))
-+ Index = 0; // when stopping within RESUMEBACKUP of the first mark the recording shall still be considered unviewed
- #ifdef USE_RESUMERESET
- int backup = int(round(RESUMEBACKUP * framesPerSecond));
- if (Index >= index->Last() - backup)
diff --git a/media-video/vdr/files/vdr-2.1.1_gentoo.patch b/media-video/vdr/files/vdr-2.1.1_gentoo.patch
deleted file mode 100644
index f263c8a..0000000
--- a/media-video/vdr/files/vdr-2.1.1_gentoo.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-disabled compile from included plugins, we dont support this way on gentoo
-support for linguas handling
-fixed install an multicore cpu
-
-changed path to install header files in own dir vdr, libsi
-
-Signed-of-by: Joerg Bornkessel <hd_brummy@gentoo.org> (2013/03/30)
-
-diff -Naur vdr-1.7.42.orig/Makefile vdr-1.7.42/Makefile
---- vdr-1.7.42.orig/Makefile 2013-03-30 21:19:19.000000000 +0100
-+++ vdr-1.7.42/Makefile 2013-03-30 21:24:47.000000000 +0100
-@@ -109,7 +109,7 @@
- VDRVERSION = $(shell sed -ne '/define VDRVERSION/s/^.*"\(.*\)".*$$/\1/p' config.h)
- APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' config.h)
-
--all: vdr i18n plugins
-+all: vdr i18n
-
- # Implicit rules:
-
-@@ -162,7 +162,7 @@
-
- PODIR = po
- LOCALEDIR = locale
--I18Npo = $(wildcard $(PODIR)/*.po)
-+I18Npo = $(foreach dir,$(LINGUAS),$(wildcard $(PODIR)/$(dir)*.po))
- I18Nmo = $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file))))
- I18Nmsgs = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr.mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
- I18Npot = $(PODIR)/vdr.pot
-@@ -185,7 +185,7 @@
-
- install-i18n: i18n
- @mkdir -p $(DESTDIR)$(LOCDIR)
-- cp -r $(LOCALEDIR)/* $(DESTDIR)$(LOCDIR)
-+ @(cd $(LOCALEDIR); for linguas in $(LINGUAS); do [ "$$linguas" = "en" ] && continue; cp -r --parents $$linguas* $(DESTDIR)$(LOCDIR); done)
-
- # The 'include' directory (for plugins):
-
-@@ -247,7 +247,7 @@
-
- # Install the files (note that 'install-pc' must be first!):
-
--install: install-pc install-bin install-dirs install-conf install-doc install-plugins install-i18n install-includes
-+install: install-pc install-bin install-dirs install-conf install-doc install-i18n install-includes
-
- # VDR binary:
-
-@@ -259,11 +259,12 @@
-
- install-dirs:
- @mkdir -p $(DESTDIR)$(VIDEODIR)
-- @mkdir -p $(DESTDIR)$(CONFDIR)
-+# @mkdir -p $(DESTDIR)$(CONFDIR)
- @mkdir -p $(DESTDIR)$(CACHEDIR)
- @mkdir -p $(DESTDIR)$(RESDIR)
-
- install-conf:
-+ @mkdir -p $(DESTDIR)$(CONFDIR)
- @cp -pn *.conf $(DESTDIR)$(CONFDIR)
-
- # Documentation:
-@@ -290,8 +291,11 @@
- # Includes:
-
- install-includes: include-dir
-- @mkdir -p $(DESTDIR)$(INCDIR)
-- @cp -pLR include/vdr include/libsi $(DESTDIR)$(INCDIR)
-+# @mkdir -p $(DESTDIR)$(INCDIR)
-+# @cp -pLR include/vdr include/libsi $(DESTDIR)$(INCDIR)
-+ @mkdir -p $(DESTDIR)$(INCDIR)/vdr $(DESTDIR)$(INCDIR)/vdr/libsi
-+ @cp -pLR include/vdr $(DESTDIR)$(INCDIR)
-+ @cp -pLR include/libsi Make.config $(DESTDIR)$(INCDIR)/vdr
-
- # pkg-config file:
-
diff --git a/media-video/vdr/files/vdr-2.1.6_gentoo.patch b/media-video/vdr/files/vdr-2.1.6_gentoo.patch
deleted file mode 100644
index 708760c..0000000
--- a/media-video/vdr/files/vdr-2.1.6_gentoo.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-diff -Naur vdr-2.1.6.orig/Makefile vdr-2.1.6/Makefile
---- vdr-2.1.6.orig/Makefile 2014-09-26 17:29:18.000000000 +0200
-+++ vdr-2.1.6/Makefile 2014-09-26 18:45:13.000000000 +0200
-@@ -114,7 +114,7 @@
- VDRVERSION = $(shell sed -ne '/define VDRVERSION/s/^.*"\(.*\)".*$$/\1/p' config.h)
- APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' config.h)
-
--all: vdr i18n plugins
-+all: vdr i18n
-
- # Implicit rules:
-
-@@ -167,7 +167,7 @@
-
- PODIR = po
- LOCALEDIR = locale
--I18Npo = $(wildcard $(PODIR)/*.po)
-+I18Npo = $(foreach dir,$(LINGUAS),$(wildcard $(PODIR)/$(dir)*.po))
- I18Nmo = $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file))))
- I18Nmsgs = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr.mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
- I18Npot = $(PODIR)/vdr.pot
-@@ -190,7 +190,7 @@
-
- install-i18n: i18n
- @mkdir -p $(DESTDIR)$(LOCDIR)
-- cp -r $(LOCALEDIR)/* $(DESTDIR)$(LOCDIR)
-+ @(cd $(LOCALEDIR); for linguas in $(LINGUAS); do [ "$$linguas" = "en" ] && continue; cp -r --parents $$linguas* $(DESTDIR)$(LOCDIR); done)
-
- # The 'include' directory (for plugins):
-
-@@ -252,7 +252,7 @@
-
- # Install the files (note that 'install-pc' must be first!):
-
--install: install-pc install-bin install-dirs install-conf install-doc install-plugins install-i18n install-includes
-+install: install-pc install-bin install-dirs install-conf install-doc install-i18n install-includes
-
- # VDR binary:
-
-@@ -264,11 +264,12 @@
-
- install-dirs:
- @mkdir -p $(DESTDIR)$(VIDEODIR)
-- @mkdir -p $(DESTDIR)$(CONFDIR)
-- @mkdir -p $(DESTDIR)$(CACHEDIR)
-+# @mkdir -p $(DESTDIR)$(CONFDIR)
-+# @mkdir -p $(DESTDIR)$(CACHEDIR)
- @mkdir -p $(DESTDIR)$(RESDIR)
-
- install-conf:
-+ @mkdir -p $(DESTDIR)$(CONFDIR)
- @cp -pn *.conf $(DESTDIR)$(CONFDIR)
-
- # Documentation:
-@@ -295,8 +296,11 @@
- # Includes:
-
- install-includes: include-dir
-- @mkdir -p $(DESTDIR)$(INCDIR)
-- @cp -pLR include/vdr include/libsi $(DESTDIR)$(INCDIR)
-+# @mkdir -p $(DESTDIR)$(INCDIR)
-+# @cp -pLR include/vdr include/libsi $(DESTDIR)$(INCDIR)
-+ @mkdir -p $(DESTDIR)$(INCDIR)/vdr $(DESTDIR)$(INCDIR)/vdr/libsi
-+ @cp -pLR include/vdr $(DESTDIR)$(INCDIR)
-+ @cp -pLR include/libsi Make.config $(DESTDIR)$(INCDIR)/vdr
-
- # pkg-config file:
-
diff --git a/media-video/vdr/files/vdr-2.1.7_C++11.patch b/media-video/vdr/files/vdr-2.1.7_C++11.patch
deleted file mode 100644
index 6746968..0000000
--- a/media-video/vdr/files/vdr-2.1.7_C++11.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-Invalid suffix on Literal with GCC 4.8 and C++11
-warning: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wliteral-suffix]
-
-Signed-of-by: Joerg Bornkessel <hd_brummy@gentoo.org> Jan/18/2015
-
-diff -Naur vdr-2.1.7.orig/dvbsubtitle.c vdr-2.1.7/dvbsubtitle.c
---- vdr-2.1.7.orig/dvbsubtitle.c 2015-01-18 12:52:48.949414301 +0100
-+++ vdr-2.1.7/dvbsubtitle.c 2015-01-18 13:04:01.889448784 +0100
-@@ -1042,7 +1042,7 @@
- default: dbgpages("unknown page state: %d<br>\n", pageState);
- }
- bs.SkipBits(2); // reserved
-- dbgpages("<hr>\n<b>page</b> id %d version %d pts %"PRId64" timeout %d state %d<br>\n", pageId, pageVersionNumber, pts, pageTimeout, pageState);
-+ dbgpages("<hr>\n<b>page</b> id %d version %d pts %" PRId64 " timeout %d state %d<br>\n", pageId, pageVersionNumber, pts, pageTimeout, pageState);
- regionRefs.Clear();
- while (!bs.IsEOF())
- regionRefs.Add(new cSubtitleRegionRef(bs));
-@@ -1073,7 +1073,7 @@
- default: dbgpages("unknown page state: %d<br>\n", pageState);
- }
- bs.SkipBits(6);
-- dbgpages("<hr>\n<b>page</b> id %d version %d pts %"PRId64" timeout %d state %d<br>\n", pageId, pageVersionNumber, pts, pageTimeout, pageState);
-+ dbgpages("<hr>\n<b>page</b> id %d version %d pts %" PRId64 " timeout %d state %d<br>\n", pageId, pageVersionNumber, pts, pageTimeout, pageState);
- regionRefs.Clear();
- pending = true;
- }
-@@ -1384,7 +1384,7 @@
- if (Length > PayloadOffset + SubstreamHeaderLength) {
- int64_t pts = PesHasPts(Data) ? PesGetPts(Data) : -1;
- if (pts >= 0)
-- dbgconverter("converter PTS: %"PRId64"<br>\n", pts);
-+ dbgconverter("converter PTS: %" PRId64 "<br>\n", pts);
- const uchar *data = Data + PayloadOffset + SubstreamHeaderLength; // skip substream header
- int length = Length - PayloadOffset - SubstreamHeaderLength; // skip substream header
- if (ResetSubtitleAssembler)
-@@ -1420,7 +1420,7 @@
- if (Length > PayloadOffset) {
- int64_t pts = PesHasPts(Data) ? PesGetPts(Data) : -1;
- if (pts >= 0)
-- dbgconverter("converter PTS: %"PRId64"<br>\n", pts);
-+ dbgconverter("converter PTS: %" PRId64 "<br>\n", pts);
- const uchar *data = Data + PayloadOffset;
- int length = Length - PayloadOffset;
- if (length > 0) {
-@@ -1488,7 +1488,7 @@
- dbgoutput("showing bitmap #%d of %d<br>\n", sb->Index() + 1, bitmaps->Count());
- sb->Draw(osd);
- Timeout.Set(sb->Timeout() * 1000);
-- dbgconverter("PTS: %"PRId64" STC: %"PRId64" (%"PRId64") timeout: %d<br>\n", sb->Pts(), STC, Delta, sb->Timeout());
-+ dbgconverter("PTS: %" PRId64 " STC: %" PRId64 " (%" PRId64 ") timeout: %d<br>\n", sb->Pts(), STC, Delta, sb->Timeout());
- }
- }
- else
-diff -Naur vdr-2.1.7.orig/recording.c vdr-2.1.7/recording.c
---- vdr-2.1.7.orig/recording.c 2015-01-18 12:52:48.956080968 +0100
-+++ vdr-2.1.7/recording.c 2015-01-18 13:05:42.346120598 +0100
-@@ -1749,7 +1749,7 @@
- off_t FileSizeSrc = FileSize(FileNameSrc);
- off_t FileSizeDst = FileSize(FileNameDst);
- if (FileSizeSrc != FileSizeDst) {
-- esyslog("ERROR: file size discrepancy: %"PRId64" != %"PRId64, FileSizeSrc, FileSizeDst);
-+ esyslog("ERROR: file size discrepancy: %" PRId64 " != %" PRId64, FileSizeSrc, FileSizeDst);
- break;
- }
- }
-@@ -2476,7 +2476,7 @@
- delta = int(buf.st_size % sizeof(tIndexTs));
- if (delta) {
- delta = sizeof(tIndexTs) - delta;
-- esyslog("ERROR: invalid file size (%"PRId64") in '%s'", buf.st_size, *fileName);
-+ esyslog("ERROR: invalid file size (%" PRId64 ") in '%s'", buf.st_size, *fileName);
- }
- last = int((buf.st_size + delta) / sizeof(tIndexTs) - 1);
- if ((!Record || Update) && last >= 0) {
-diff -Naur vdr-2.1.7.orig/remote.c vdr-2.1.7/remote.c
---- vdr-2.1.7.orig/remote.c 2015-01-18 12:52:48.949414301 +0100
-+++ vdr-2.1.7/remote.c 2015-01-18 13:06:40.752790258 +0100
-@@ -124,7 +124,7 @@
- bool cRemote::Put(uint64_t Code, bool Repeat, bool Release)
- {
- char buffer[32];
-- snprintf(buffer, sizeof(buffer), "%016"PRIX64, Code);
-+ snprintf(buffer, sizeof(buffer), "%016" PRIX64, Code);
- return Put(buffer, Repeat, Release);
- }
-
diff --git a/media-video/vdr/files/vdr-2.1.7_gentoo.patch b/media-video/vdr/files/vdr-2.1.7_gentoo.patch
deleted file mode 100644
index 37ffd3c..0000000
--- a/media-video/vdr/files/vdr-2.1.7_gentoo.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-diff -Naur vdr-2.1.7.orig/Makefile vdr-2.1.7/Makefile
---- vdr-2.1.7.orig/Makefile 2015-01-18 12:37:45.506034673 +0100
-+++ vdr-2.1.7/Makefile 2015-01-18 12:38:34.086037162 +0100
-@@ -116,7 +116,7 @@
- VDRVERSION = $(shell sed -ne '/define VDRVERSION/s/^.*"\(.*\)".*$$/\1/p' config.h)
- APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' config.h)
-
--all: vdr i18n plugins
-+all: vdr i18n
-
- # Implicit rules:
-
-@@ -170,7 +170,7 @@
-
- PODIR = po
- LOCALEDIR = locale
--I18Npo = $(wildcard $(PODIR)/*.po)
-+I18Npo = $(foreach dir,$(LINGUAS),$(wildcard $(PODIR)/$(dir)*.po))
- I18Nmo = $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file))))
- I18Nmsgs = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr.mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
- I18Npot = $(PODIR)/vdr.pot
-@@ -193,7 +193,7 @@
-
- install-i18n: i18n
- @mkdir -p $(DESTDIR)$(LOCDIR)
-- cp -r $(LOCALEDIR)/* $(DESTDIR)$(LOCDIR)
-+ @(cd $(LOCALEDIR); for linguas in $(LINGUAS); do [ "$$linguas" = "en" ] && continue; cp -r --parents $$linguas* $(DESTDIR)$(LOCDIR); done)
-
- # The 'include' directory (for plugins):
-
-@@ -255,7 +255,7 @@
-
- # Install the files (note that 'install-pc' must be first!):
-
--install: install-pc install-bin install-dirs install-conf install-doc install-plugins install-i18n install-includes
-+install: install-pc install-bin install-dirs install-conf install-doc install-i18n install-includes
-
- # VDR binary:
-
-@@ -267,12 +267,13 @@
-
- install-dirs:
- @mkdir -p $(DESTDIR)$(VIDEODIR)
-- @mkdir -p $(DESTDIR)$(CONFDIR)
-- @mkdir -p $(DESTDIR)$(ARGSDIR)
-- @mkdir -p $(DESTDIR)$(CACHEDIR)
-+# @mkdir -p $(DESTDIR)$(CONFDIR)
-+# @mkdir -p $(DESTDIR)$(ARGSDIR)
-+# @mkdir -p $(DESTDIR)$(CACHEDIR)
- @mkdir -p $(DESTDIR)$(RESDIR)
-
- install-conf:
-+ @mkdir -p $(DESTDIR)$(CONFDIR)
- @cp -pn *.conf $(DESTDIR)$(CONFDIR)
-
- # Documentation:
-@@ -299,8 +300,11 @@
- # Includes:
-
- install-includes: include-dir
-- @mkdir -p $(DESTDIR)$(INCDIR)
-- @cp -pLR include/vdr include/libsi $(DESTDIR)$(INCDIR)
-+# @mkdir -p $(DESTDIR)$(INCDIR)
-+# @cp -pLR include/vdr include/libsi $(DESTDIR)$(INCDIR)
-+ @mkdir -p $(DESTDIR)$(INCDIR)/vdr $(DESTDIR)$(INCDIR)/vdr/libsi
-+ @cp -pLR include/vdr $(DESTDIR)$(INCDIR)
-+ @cp -pLR include/libsi Make.config $(DESTDIR)$(INCDIR)/vdr
-
- # pkg-config file:
-
diff --git a/media-video/vdr/files/vdr-2.1.8_gentoo.patch b/media-video/vdr/files/vdr-2.1.8_gentoo.patch
deleted file mode 100644
index 37ffd3c..0000000
--- a/media-video/vdr/files/vdr-2.1.8_gentoo.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-diff -Naur vdr-2.1.7.orig/Makefile vdr-2.1.7/Makefile
---- vdr-2.1.7.orig/Makefile 2015-01-18 12:37:45.506034673 +0100
-+++ vdr-2.1.7/Makefile 2015-01-18 12:38:34.086037162 +0100
-@@ -116,7 +116,7 @@
- VDRVERSION = $(shell sed -ne '/define VDRVERSION/s/^.*"\(.*\)".*$$/\1/p' config.h)
- APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' config.h)
-
--all: vdr i18n plugins
-+all: vdr i18n
-
- # Implicit rules:
-
-@@ -170,7 +170,7 @@
-
- PODIR = po
- LOCALEDIR = locale
--I18Npo = $(wildcard $(PODIR)/*.po)
-+I18Npo = $(foreach dir,$(LINGUAS),$(wildcard $(PODIR)/$(dir)*.po))
- I18Nmo = $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file))))
- I18Nmsgs = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr.mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
- I18Npot = $(PODIR)/vdr.pot
-@@ -193,7 +193,7 @@
-
- install-i18n: i18n
- @mkdir -p $(DESTDIR)$(LOCDIR)
-- cp -r $(LOCALEDIR)/* $(DESTDIR)$(LOCDIR)
-+ @(cd $(LOCALEDIR); for linguas in $(LINGUAS); do [ "$$linguas" = "en" ] && continue; cp -r --parents $$linguas* $(DESTDIR)$(LOCDIR); done)
-
- # The 'include' directory (for plugins):
-
-@@ -255,7 +255,7 @@
-
- # Install the files (note that 'install-pc' must be first!):
-
--install: install-pc install-bin install-dirs install-conf install-doc install-plugins install-i18n install-includes
-+install: install-pc install-bin install-dirs install-conf install-doc install-i18n install-includes
-
- # VDR binary:
-
-@@ -267,12 +267,13 @@
-
- install-dirs:
- @mkdir -p $(DESTDIR)$(VIDEODIR)
-- @mkdir -p $(DESTDIR)$(CONFDIR)
-- @mkdir -p $(DESTDIR)$(ARGSDIR)
-- @mkdir -p $(DESTDIR)$(CACHEDIR)
-+# @mkdir -p $(DESTDIR)$(CONFDIR)
-+# @mkdir -p $(DESTDIR)$(ARGSDIR)
-+# @mkdir -p $(DESTDIR)$(CACHEDIR)
- @mkdir -p $(DESTDIR)$(RESDIR)
-
- install-conf:
-+ @mkdir -p $(DESTDIR)$(CONFDIR)
- @cp -pn *.conf $(DESTDIR)$(CONFDIR)
-
- # Documentation:
-@@ -299,8 +300,11 @@
- # Includes:
-
- install-includes: include-dir
-- @mkdir -p $(DESTDIR)$(INCDIR)
-- @cp -pLR include/vdr include/libsi $(DESTDIR)$(INCDIR)
-+# @mkdir -p $(DESTDIR)$(INCDIR)
-+# @cp -pLR include/vdr include/libsi $(DESTDIR)$(INCDIR)
-+ @mkdir -p $(DESTDIR)$(INCDIR)/vdr $(DESTDIR)$(INCDIR)/vdr/libsi
-+ @cp -pLR include/vdr $(DESTDIR)$(INCDIR)
-+ @cp -pLR include/libsi Make.config $(DESTDIR)$(INCDIR)/vdr
-
- # pkg-config file:
-
diff --git a/media-video/vdr/files/vdr-2.1.9_gentoo.patch b/media-video/vdr/files/vdr-2.1.9_gentoo.patch
deleted file mode 100644
index 37ffd3c..0000000
--- a/media-video/vdr/files/vdr-2.1.9_gentoo.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-diff -Naur vdr-2.1.7.orig/Makefile vdr-2.1.7/Makefile
---- vdr-2.1.7.orig/Makefile 2015-01-18 12:37:45.506034673 +0100
-+++ vdr-2.1.7/Makefile 2015-01-18 12:38:34.086037162 +0100
-@@ -116,7 +116,7 @@
- VDRVERSION = $(shell sed -ne '/define VDRVERSION/s/^.*"\(.*\)".*$$/\1/p' config.h)
- APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' config.h)
-
--all: vdr i18n plugins
-+all: vdr i18n
-
- # Implicit rules:
-
-@@ -170,7 +170,7 @@
-
- PODIR = po
- LOCALEDIR = locale
--I18Npo = $(wildcard $(PODIR)/*.po)
-+I18Npo = $(foreach dir,$(LINGUAS),$(wildcard $(PODIR)/$(dir)*.po))
- I18Nmo = $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file))))
- I18Nmsgs = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr.mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
- I18Npot = $(PODIR)/vdr.pot
-@@ -193,7 +193,7 @@
-
- install-i18n: i18n
- @mkdir -p $(DESTDIR)$(LOCDIR)
-- cp -r $(LOCALEDIR)/* $(DESTDIR)$(LOCDIR)
-+ @(cd $(LOCALEDIR); for linguas in $(LINGUAS); do [ "$$linguas" = "en" ] && continue; cp -r --parents $$linguas* $(DESTDIR)$(LOCDIR); done)
-
- # The 'include' directory (for plugins):
-
-@@ -255,7 +255,7 @@
-
- # Install the files (note that 'install-pc' must be first!):
-
--install: install-pc install-bin install-dirs install-conf install-doc install-plugins install-i18n install-includes
-+install: install-pc install-bin install-dirs install-conf install-doc install-i18n install-includes
-
- # VDR binary:
-
-@@ -267,12 +267,13 @@
-
- install-dirs:
- @mkdir -p $(DESTDIR)$(VIDEODIR)
-- @mkdir -p $(DESTDIR)$(CONFDIR)
-- @mkdir -p $(DESTDIR)$(ARGSDIR)
-- @mkdir -p $(DESTDIR)$(CACHEDIR)
-+# @mkdir -p $(DESTDIR)$(CONFDIR)
-+# @mkdir -p $(DESTDIR)$(ARGSDIR)
-+# @mkdir -p $(DESTDIR)$(CACHEDIR)
- @mkdir -p $(DESTDIR)$(RESDIR)
-
- install-conf:
-+ @mkdir -p $(DESTDIR)$(CONFDIR)
- @cp -pn *.conf $(DESTDIR)$(CONFDIR)
-
- # Documentation:
-@@ -299,8 +300,11 @@
- # Includes:
-
- install-includes: include-dir
-- @mkdir -p $(DESTDIR)$(INCDIR)
-- @cp -pLR include/vdr include/libsi $(DESTDIR)$(INCDIR)
-+# @mkdir -p $(DESTDIR)$(INCDIR)
-+# @cp -pLR include/vdr include/libsi $(DESTDIR)$(INCDIR)
-+ @mkdir -p $(DESTDIR)$(INCDIR)/vdr $(DESTDIR)$(INCDIR)/vdr/libsi
-+ @cp -pLR include/vdr $(DESTDIR)$(INCDIR)
-+ @cp -pLR include/libsi Make.config $(DESTDIR)$(INCDIR)/vdr
-
- # pkg-config file:
-
diff --git a/media-video/vdr/vdr-2.1.1.ebuild b/media-video/vdr/vdr-2.1.1.ebuild
deleted file mode 100644
index d6a5546..0000000
--- a/media-video/vdr/vdr-2.1.1.ebuild
+++ /dev/null
@@ -1,334 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-2.0.2-r1.ebuild,v 1.2 2013/07/07 09:52:20 hd_brummy Exp $
-
-EAPI="5"
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-# Switches supported by extensions-patch
-EXT_PATCH_FLAGS="alternatechannel ddepgentry graphtft
- jumpplay jumpingseconds mainmenuhooks menuorg naludump permashift
- pinplugin setup ttxtsubs vasarajanauloja wareagleicon yaepg"
-# dvlvidprefer; disabled, need fixing!!!
-
-# names of the use-flags
-EXT_PATCH_FLAGS_RENAMED=""
-
-# names ext-patch uses internally, here only used for maintainer checks
-EXT_PATCH_FLAGS_RENAMED_EXT_NAME=""
-
-IUSE="bidi debug dxr3 html vanilla ${EXT_PATCH_FLAGS} ${EXT_PATCH_FLAGS_RENAMED}"
-
-MY_PV="${PV%_p*}"
-MY_P="${PN}-${MY_PV}"
-S="${WORKDIR}/${MY_P}"
-
-EXT_P="extpng-${P}-gentoo-edition-v1"
-
-DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB"
-HOMEPAGE="http://www.tvdr.de/"
-SRC_URI="ftp://ftp.tvdr.de/vdr/Developer/${MY_P}.tar.bz2
- http://dev.gentoo.org/~hd_brummy/distfiles/${EXT_P}.patch.bz2"
-
-KEYWORDS="~arm ~amd64 ~ppc ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-
-REQUIRED_USE="setup? ( !menuorg )
- menuorg? ( !setup )"
-
-COMMON_DEPEND="virtual/jpeg
- sys-libs/libcap
- >=media-libs/fontconfig-2.4.2
- >=media-libs/freetype-2
- setup? ( >=dev-libs/tinyxml-2.6.1[stl] )"
-
-DEPEND="${COMMON_DEPEND}
- >=virtual/linuxtv-dvb-headers-5.3
- sys-devel/gettext"
-
-RDEPEND="${COMMON_DEPEND}
- dev-lang/perl
- >=media-tv/gentoo-vdr-scripts-0.2.0
- media-fonts/corefonts
- bidi? ( dev-libs/fribidi )"
-
-# pull in vdr-setup to get the xml files, else menu will not work
-PDEPEND="setup? ( >=media-plugins/vdr-setup-0.3.1-r3 )"
-
-CONF_DIR=/etc/vdr
-CAP_FILE=${S}/capabilities.sh
-CAPS="# Capabilities of the vdr-executable for use by startscript etc."
-
-pkg_setup() {
-# if [ -n "${VDR_LOCAL_PATCHES_DIR}" ]; then
-# eerror "Using VDR_LOCAL_PATCHES_DIR is obsolete!"
-# eerror "Please move all your patches into"
-# eerror "${EROOT}/etc/portage/patches/${CATEGORY}/${P}"
-# eerror "and remove or unset the VDR_LOCAL_PATCHES_DIR variable."
-# die
-# fi
-
- use debug && append-flags -g
-
- PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins"
-
- tc-export CC CXX AR
-}
-
-add_cap() {
- local arg
- for arg; do
- CAPS="${CAPS}\n${arg}=1"
- done
-}
-
-enable_patch() {
- local arg ARG_UPPER
- for arg; do
- ARG_UPPER=$(echo $arg|tr '[:lower:]' '[:upper:]')
- echo "${ARG_UPPER} = 1" >> Make.config
-
- # codesnippet to bring the extpng defines into the vdr.pc CXXFLAGS CFLAGS
- echo "-DUSE_${ARG_UPPER}" >> "${T}"/defines.tmp
- cat "${T}"/defines.tmp | tr \\\012 ' ' > "${T}"/defines.IUSE
- export DEFINES_IUSE=$( cat ${T}/defines.IUSE )
- done
-}
-
-extensions_add_make_conf()
-{
- # copy all ifdef for extensions-patch to Make.config
- sed -e '1,/need to touch the following:/d' \
- -e '/need to touch the following/,/^$/d' \
- Make.config.template >> Make.config
-}
-
-extensions_all_defines() {
- # extract all possible settings for extensions-patch
- sed -e '/^#\?[A-Z].*= 1/!d' -e 's/^#\?//' -e 's/ .*//' \
- Make.config.template \
- | sort \
- | tr '[:upper:]' '[:lower:]'
-}
-
-lang_po() {
- LING_PO=$( ls ${S}/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' )
-}
-
-src_prepare() {
- # apply maintainace-patches
-
- ebegin "Changing paths for gentoo"
-
- local DVBDIR=/usr/include
- local i
- for i in ${DVB_HEADER_PATH} /usr/include/v4l-dvb-hg /usr/include; do
- [[ -d ${i} ]] || continue
- if [[ -f ${i}/linux/dvb/dmx.h ]]; then
- einfo "Found DVB header files in ${i}"
- DVBDIR=${i}
- break
- fi
- done
-
- # checking for s2api headers
- local api_version
- api_version=$(awk -F' ' '/define DVB_API_VERSION / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
- api_version=${api_version}*$(awk -F' ' '/define DVB_API_VERSION_MINOR / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
-
- if [[ ${api_version:-0} -lt 5*3 ]]; then
- eerror "DVB header files do not contain s2api support or too old for ${P}"
- eerror "You cannot compile VDR against old dvb-header"
- die "DVB headers too old"
- fi
-
- cat > Make.config <<-EOT
- #
- # Generated by ebuild ${PF}
- #
- PREFIX = /usr
- DVBDIR = ${DVBDIR}
- PLUGINLIBDIR = ${PLUGIN_LIBDIR}
- CONFDIR = ${CONF_DIR}
- VIDEODIR = /var/vdr/video
- LOCDIR = \$(PREFIX)/share/locale
- INCDIR = \$(PREFIX)/include
-
- DEFINES += -DCONFDIR=\"\$(CONFDIR)\"
- INCLUDES += -I\$(DVBDIR)
-
- # >=vdr-1.7.36-r1; parameter only used for compiletime on vdr
- # PLUGINLIBDIR (plugin Makefile old) = LIBDIR (plugin Makefile new)
- LIBDIR = ${PLUGIN_LIBDIR}
- PCDIR = /usr/$(get_libdir)/pkgconfig
- EOT
- eend 0
-
- # support languages, written from right to left
- BUILD_PARAMS+=" BIDI=$(usex bidi 1 0)"
-
- epatch "${FILESDIR}/${PN}-2.1.1_gentoo.patch"
-
- if ! use vanilla; then
-
- # Now apply extensions patch
- epatch "${WORKDIR}/${EXT_P}.patch"
-
- # This allows us to start even if some plugin does not exist
- # or is not loadable.
- enable_patch PLUGINMISSING
- enable_patch CHANNELBIND
-
- if [[ -n ${VDR_MAINTAINER_MODE} ]]; then
- einfo "Doing maintainer checks:"
-
- # we do not support these patches
- # (or have them already hard enabled)
- local IGNORE_PATCHES="pluginmissing channelbind"
-
- extensions_all_defines > "${T}"/new.IUSE
- echo $EXT_PATCH_FLAGS $EXT_PATCH_FLAGS_RENAMED_EXT_NAME \
- $IGNORE_PATCHES | \
- tr ' ' '\n' |sort > "${T}"/old.IUSE
- local DIFFS=$(diff -u "${T}"/old.IUSE "${T}"/new.IUSE|grep '^[+-][^+-]')
- if [[ -z ${DIFFS} ]]; then
- einfo "EXT_PATCH_FLAGS is up to date."
- else
- ewarn "IUSE differences!"
- local diff
- for diff in $DIFFS; do
- ewarn "$diff"
- done
- fi
- fi
-
- ebegin "Enabling selected patches"
- local flag
- for flag in $EXT_PATCH_FLAGS; do
- use $flag && enable_patch ${flag}
- done
-
- eend 0
-
- extensions_add_make_conf
-
- # add defined use-flags compile options to vdr.pc
- sed -e "s:\$(CDEFINES) \$(CINCLUDES) \$(HDRDIR):\$(CDEFINES) \$(CINCLUDES) \$(HDRDIR) \$(DEFINES_IUSE):" \
- -i Makefile
-
- ebegin "Make depend"
- emake .dependencies >/dev/null
- eend $? "make depend failed"
- fi
-
- epatch_user
-
- add_cap CAP_UTF8
-
- add_cap CAP_IRCTRL_RUNTIME_PARAM \
- CAP_VFAT_RUNTIME_PARAM \
- CAP_CHUID \
- CAP_SHUTDOWN_AUTO_RETRY
-
- echo -e ${CAPS} > "${CAP_FILE}"
-
- # LINGUAS support
- einfo "\n \t VDR supports the LINGUAS values"
-
- lang_po
-
- einfo "\t Please set one of this values in your sytem make.conf"
- einfo "\t LINGUAS=\"${LING_PO}\"\n"
-
- if [[ -z ${LINGUAS} ]]; then
- einfo "\n \t No values in LINGUAS="
- einfo "\t You will get only english text on OSD \n"
- fi
-
- strip-linguas ${LING_PO} en
-}
-
-src_install() {
- # trick makefile not to create a videodir by supplying it with an existing
- # directory
- einstall \
- VIDEODIR="/" \
- DESTDIR="${D}" \
- || die "einstall failed"
-
- keepdir "${PLUGIN_LIBDIR}"
-
- keepdir "${CONF_DIR}"/plugins
- keepdir "${CONF_DIR}"/themes
-
- diropts -m0755 -ovdr -gvdr
- keepdir /var/cache/vdr
-
- if use html; then
- dohtml *.html
- fi
-
- dodoc MANUAL INSTALL README* HISTORY CONTRIBUTORS
-
- insinto /usr/share/vdr
- doins "${CAP_FILE}"
-
- if use alternatechannel; then
- insinto /etc/vdr
- doins "${FILESDIR}"/channel_alternative.conf
- fi
-
- if use setup; then
- insinto /usr/share/vdr/setup
- doins "${S}"/menu.c
- fi
-
- chown -R vdr:vdr "${D}/${CONF_DIR}"
-}
-
-#pkg_preinst() {
-
-# example syntax...
-# has_version "<${CATEGORY}/${PN}-1.7.36"
-# previous_less_than_1_7_36=$?
-#}
-
-pkg_postinst() {
-
- elog "This is a *developer* version."
- elog "We strongly recommend that you only use it under controlled"
- elog "conditions and for testing and debugging."
-
- # correct wrong permission from earlier install
- CACHEOWNER="$(stat -c %U /var/cache/vdr)"
- if [ ! ${CACHEOWNER} == vdr ]; then
- chown -R vdr:vdr "${ROOT}/var/cache/vdr"
- fi
-
-# example syntax
-# if [[ previous_less_than_1_7_36=$? = 0 ]] ; then
- #elog "bla foo"
-# fi
-
- elog "It is a good idea to run vdrplugin-rebuild now."
-
- if use setup; then
- if ! has_version media-plugins/vdr-setup || \
- ! egrep -q '^setup$' "${ROOT}/etc/conf.d/vdr.plugins"; then
-
- echo
- ewarn "You have compiled media-video/vdr with USE=\"setup\""
- ewarn "It is very important to emerge media-plugins/vdr-setup now!"
- ewarn "and you have to loaded it in /etc/conf.d/vdr.plugins"
- fi
- fi
-
- elog "To get nice symbols in OSD we recommend to install"
- elog "\t1. emerge media-fonts/vdrsymbols-ttf"
- elog "\t2. select font VDRSymbolsSans in Setup"
- elog ""
- elog "To get an idea how to proceed now, have a look at our vdr-guide:"
- elog "\thttps://wiki.gentoo.org/wiki/VDR"
-}
diff --git a/media-video/vdr/vdr-2.1.2-r1.ebuild b/media-video/vdr/vdr-2.1.2-r1.ebuild
deleted file mode 100644
index 81d89b7..0000000
--- a/media-video/vdr/vdr-2.1.2-r1.ebuild
+++ /dev/null
@@ -1,327 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-2.0.2-r1.ebuild,v 1.2 2013/07/07 09:52:20 hd_brummy Exp $
-
-EAPI="5"
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-# Switches supported by extensions-patch
-EXT_PATCH_FLAGS="alternatechannel binaryskip graphtft jumpingseconds jumpplay naludump permashift
- pinplugin mainmenuhooks menuorg menuselection resumereset ttxtsubs wareagleicon yaepg"
-# ddepgentry setup
-
-# names of the use-flags
-EXT_PATCH_FLAGS_RENAMED=""
-
-# names ext-patch uses internally, here only used for maintainer checks
-EXT_PATCH_FLAGS_RENAMED_EXT_NAME=""
-
-IUSE="bidi debug html vanilla ${EXT_PATCH_FLAGS} ${EXT_PATCH_FLAGS_RENAMED}"
-
-MY_PV="${PV%_p*}"
-MY_P="${PN}-${MY_PV}"
-S="${WORKDIR}/${MY_P}"
-
-EXT_P="extpng-${P}-gentoo-edition-v3"
-
-DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB"
-HOMEPAGE="http://www.tvdr.de/"
-SRC_URI="ftp://ftp.tvdr.de/vdr/Developer/${MY_P}.tar.bz2
- http://dev.gentoo.org/~hd_brummy/distfiles/${EXT_P}.patch.bz2
- http://www.saunalahti.fi/~rahrenbe/vdr/patches/${P}-gcc.patch.gz"
-
-KEYWORDS="~arm ~amd64 ~ppc ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-
-#REQUIRED_USE="setup? ( !menuorg )
-# menuorg? ( !setup )"
-
-COMMON_DEPEND="virtual/jpeg
- sys-libs/libcap
- >=media-libs/fontconfig-2.4.2
- >=media-libs/freetype-2"
-# setup? ( >=dev-libs/tinyxml-2.6.1[stl] )"
-
-DEPEND="${COMMON_DEPEND}
- >=virtual/linuxtv-dvb-headers-5.3
- sys-devel/gettext"
-
-RDEPEND="${COMMON_DEPEND}
- dev-lang/perl
- >=media-tv/gentoo-vdr-scripts-0.2.0
- media-fonts/corefonts
- bidi? ( dev-libs/fribidi )"
-
-# pull in vdr-setup to get the xml files, else menu will not work
-#PDEPEND="setup? ( >=media-plugins/vdr-setup-0.3.1-r3 )"
-
-CONF_DIR=/etc/vdr
-CAP_FILE=${S}/capabilities.sh
-CAPS="# Capabilities of the vdr-executable for use by startscript etc."
-
-pkg_setup() {
-
- use debug && append-flags -g
-
- PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins"
-
- tc-export CC CXX AR
-}
-
-add_cap() {
- local arg
- for arg; do
- CAPS="${CAPS}\n${arg}=1"
- done
-}
-
-enable_patch() {
- local arg ARG_UPPER
- for arg; do
- ARG_UPPER=$(echo $arg|tr '[:lower:]' '[:upper:]')
- echo "${ARG_UPPER} = 1" >> Make.config
-
- # codesnippet to bring the extpng defines into the vdr.pc CXXFLAGS CFLAGS
- echo "-DUSE_${ARG_UPPER}" >> "${T}"/defines.tmp
- cat "${T}"/defines.tmp | tr \\\012 ' ' > "${T}"/defines.IUSE
- export DEFINES_IUSE=$( cat ${T}/defines.IUSE )
- done
-}
-
-extensions_add_make_conf()
-{
- # copy all ifdef for extensions-patch to Make.config
- sed -e '1,/need to touch the following:/d' \
- -e '/need to touch the following/,/^$/d' \
- Make.config.template >> Make.config
-}
-
-extensions_all_defines() {
- # extract all possible settings for extensions-patch
- sed -e '/^#\?[A-Z].*= 1/!d' -e 's/^#\?//' -e 's/ .*//' \
- Make.config.template \
- | sort \
- | tr '[:upper:]' '[:lower:]'
-}
-
-lang_po() {
- LING_PO=$( ls ${S}/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' )
-}
-
-src_prepare() {
- # apply maintainace-patches
-
- ebegin "Changing paths for gentoo"
-
- local DVBDIR=/usr/include
- local i
- for i in ${DVB_HEADER_PATH} /usr/include/v4l-dvb-hg /usr/include; do
- [[ -d ${i} ]] || continue
- if [[ -f ${i}/linux/dvb/dmx.h ]]; then
- einfo "Found DVB header files in ${i}"
- DVBDIR=${i}
- break
- fi
- done
-
- # checking for s2api headers
- local api_version
- api_version=$(awk -F' ' '/define DVB_API_VERSION / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
- api_version=${api_version}*$(awk -F' ' '/define DVB_API_VERSION_MINOR / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
-
- if [[ ${api_version:-0} -lt 5*3 ]]; then
- eerror "DVB header files do not contain s2api support or too old for ${P}"
- eerror "You cannot compile VDR against old dvb-header"
- die "DVB headers too old"
- fi
-
- cat > Make.config <<-EOT
- #
- # Generated by ebuild ${PF}
- #
- PREFIX = /usr
- DVBDIR = ${DVBDIR}
- PLUGINLIBDIR = ${PLUGIN_LIBDIR}
- CONFDIR = ${CONF_DIR}
- VIDEODIR = /var/vdr/video
- LOCDIR = \$(PREFIX)/share/locale
- INCDIR = \$(PREFIX)/include
-
- DEFINES += -DCONFDIR=\"\$(CONFDIR)\"
- INCLUDES += -I\$(DVBDIR)
-
- # >=vdr-1.7.36-r1; parameter only used for compiletime on vdr
- # PLUGINLIBDIR (plugin Makefile old) = LIBDIR (plugin Makefile new)
- LIBDIR = ${PLUGIN_LIBDIR}
- PCDIR = /usr/$(get_libdir)/pkgconfig
- EOT
- eend 0
-
- # support languages, written from right to left
- BUILD_PARAMS+=" BIDI=$(usex bidi 1 0)"
-
- epatch "${FILESDIR}/${PN}-2.1.1_gentoo.patch"
- epatch "${WORKDIR}/${P}-gcc.patch" # tmp gcc fix from Rolf Ahrenberg
-
- if ! use vanilla; then
-
- # Now apply extensions patch
- epatch "${WORKDIR}/${EXT_P}.patch"
-
- # This allows us to start even if some plugin does not exist
- # or is not loadable.
- enable_patch PLUGINMISSING
-
- if [[ -n ${VDR_MAINTAINER_MODE} ]]; then
- einfo "Doing maintainer checks:"
-
- # we do not support these patches
- # (or have them already hard enabled)
- local IGNORE_PATCHES="pluginmissing"
-
- extensions_all_defines > "${T}"/new.IUSE
- echo $EXT_PATCH_FLAGS $EXT_PATCH_FLAGS_RENAMED_EXT_NAME \
- $IGNORE_PATCHES | \
- tr ' ' '\n' |sort > "${T}"/old.IUSE
- local DIFFS=$(diff -u "${T}"/old.IUSE "${T}"/new.IUSE|grep '^[+-][^+-]')
- if [[ -z ${DIFFS} ]]; then
- einfo "EXT_PATCH_FLAGS is up to date."
- else
- ewarn "IUSE differences!"
- local diff
- for diff in $DIFFS; do
- ewarn "$diff"
- done
- fi
- fi
-
- ebegin "Enabling selected patches"
- local flag
- for flag in $EXT_PATCH_FLAGS; do
- use $flag && enable_patch ${flag}
- done
-
- eend 0
-
- extensions_add_make_conf
-
- # add defined use-flags compile options to vdr.pc
- sed -e "s:\$(CDEFINES) \$(CINCLUDES) \$(HDRDIR):\$(CDEFINES) \$(CINCLUDES) \$(HDRDIR) \$(DEFINES_IUSE):" \
- -i Makefile
-
- ebegin "Make depend"
- emake .dependencies >/dev/null
- eend $? "make depend failed"
- fi
-
- epatch_user
-
- add_cap CAP_UTF8
-
- add_cap CAP_IRCTRL_RUNTIME_PARAM \
- CAP_VFAT_RUNTIME_PARAM \
- CAP_CHUID \
- CAP_SHUTDOWN_AUTO_RETRY
-
- echo -e ${CAPS} > "${CAP_FILE}"
-
- # LINGUAS support
- einfo "\n \t VDR supports the LINGUAS values"
-
- lang_po
-
- einfo "\t Please set one of this values in your sytem make.conf"
- einfo "\t LINGUAS=\"${LING_PO}\"\n"
-
- if [[ -z ${LINGUAS} ]]; then
- einfo "\n \t No values in LINGUAS="
- einfo "\t You will get only english text on OSD \n"
- fi
-
- strip-linguas ${LING_PO} en
-}
-
-src_install() {
- # trick makefile not to create a videodir by supplying it with an existing
- # directory
- einstall \
- VIDEODIR="/" \
- DESTDIR="${D}" \
- || die "einstall failed"
-
- keepdir "${PLUGIN_LIBDIR}"
-
- keepdir "${CONF_DIR}"/plugins
- keepdir "${CONF_DIR}"/themes
-
- diropts -m0755 -ovdr -gvdr
- keepdir /var/cache/vdr
-
- if use html; then
- dohtml *.html
- fi
-
- dodoc MANUAL INSTALL README* HISTORY CONTRIBUTORS
-
- insinto /usr/share/vdr
- doins "${CAP_FILE}"
-
- if use alternatechannel; then
- insinto /etc/vdr
- doins "${FILESDIR}"/channel_alternative.conf
- fi
-
-# if use setup; then
-# insinto /usr/share/vdr/setup
-# doins "${S}"/menu.c
-# fi
-
- chown -R vdr:vdr "${D}/${CONF_DIR}"
-}
-
-#pkg_preinst() {
-
-# example syntax...
-# has_version "<${CATEGORY}/${PN}-1.7.36"
-# previous_less_than_1_7_36=$?
-#}
-
-pkg_postinst() {
-
- elog "This is a *developer* version."
- elog "We strongly recommend that you only use it under controlled"
- elog "conditions and for testing and debugging."
-
- # correct wrong permission from earlier install
- CACHEOWNER="$(stat -c %U /var/cache/vdr)"
- if [ ! ${CACHEOWNER} == vdr ]; then
- chown -R vdr:vdr "${ROOT}/var/cache/vdr"
- fi
-
-# example syntax
-# if [[ previous_less_than_1_7_36=$? = 0 ]] ; then
- #elog "bla foo"
-# fi
-
- elog "It is a good idea to run vdrplugin-rebuild now."
-
-# if use setup; then
-# if ! has_version media-plugins/vdr-setup || \
-# ! egrep -q '^setup$' "${ROOT}/etc/conf.d/vdr.plugins"; then
-#
-# echo
-# ewarn "You have compiled media-video/vdr with USE=\"setup\""
-# ewarn "It is very important to emerge media-plugins/vdr-setup now!"
-# ewarn "and you have to loaded it in /etc/conf.d/vdr.plugins"
-# fi
-# fi
-
- elog "To get nice symbols in OSD we recommend to install"
- elog "\t1. emerge media-fonts/vdrsymbols-ttf"
- elog "\t2. select font VDRSymbolsSans in Setup"
- elog ""
- elog "To get an idea how to proceed now, have a look at our vdr-guide:"
- elog "\thttps://wiki.gentoo.org/wiki/VDR"
-}
diff --git a/media-video/vdr/vdr-2.1.3.ebuild b/media-video/vdr/vdr-2.1.3.ebuild
deleted file mode 100644
index f23fd39..0000000
--- a/media-video/vdr/vdr-2.1.3.ebuild
+++ /dev/null
@@ -1,303 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-2.0.2-r1.ebuild,v 1.2 2013/07/07 09:52:20 hd_brummy Exp $
-
-EAPI=5
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-# Switches supported by extensions-patch
-EXT_PATCH_FLAGS="alternatechannel binaryskip graphtft jumpingseconds jumpplay naludump permashift
- pinplugin mainmenuhooks menuorg menuselection resumereset ttxtsubs wareagleicon yaepg"
-# ddepgentry
-
-# names of the use-flags
-EXT_PATCH_FLAGS_RENAMED=""
-
-# names ext-patch uses internally, here only used for maintainer checks
-EXT_PATCH_FLAGS_RENAMED_EXT_NAME=""
-
-IUSE="bidi debug html vanilla ${EXT_PATCH_FLAGS} ${EXT_PATCH_FLAGS_RENAMED}"
-
-MY_PV="${PV%_p*}"
-MY_P="${PN}-${MY_PV}"
-S="${WORKDIR}/${MY_P}"
-
-EXT_P="extpng-${P}-gentoo-edition-v1"
-
-DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB"
-HOMEPAGE="http://www.tvdr.de/"
-SRC_URI="ftp://ftp.tvdr.de/vdr/Developer/${MY_P}.tar.bz2
- http://dev.gentoo.org/~hd_brummy/distfiles/${EXT_P}.patch.bz2"
-
-KEYWORDS="~arm ~amd64 ~ppc ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-
-COMMON_DEPEND="virtual/jpeg
- sys-libs/libcap
- >=media-libs/fontconfig-2.4.2
- >=media-libs/freetype-2"
-
-DEPEND="${COMMON_DEPEND}
- >=virtual/linuxtv-dvb-headers-5.3
- sys-devel/gettext"
-
-RDEPEND="${COMMON_DEPEND}
- dev-lang/perl
- >=media-tv/gentoo-vdr-scripts-0.2.0
- media-fonts/corefonts
- bidi? ( dev-libs/fribidi )"
-
-CONF_DIR=/etc/vdr
-CAP_FILE=${S}/capabilities.sh
-CAPS="# Capabilities of the vdr-executable for use by startscript etc."
-
-pkg_setup() {
-
- use debug && append-flags -g
-
- PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins"
-
- tc-export CC CXX AR
-}
-
-add_cap() {
- local arg
- for arg; do
- CAPS="${CAPS}\n${arg}=1"
- done
-}
-
-enable_patch() {
- local arg ARG_UPPER
- for arg; do
- ARG_UPPER=$(echo $arg|tr '[:lower:]' '[:upper:]')
- echo "${ARG_UPPER} = 1" >> Make.config
-
- # codesnippet to bring the extpng defines into the vdr.pc CXXFLAGS CFLAGS
- echo "-DUSE_${ARG_UPPER}" >> "${T}"/defines.tmp
- cat "${T}"/defines.tmp | tr \\\012 ' ' > "${T}"/defines.IUSE
- export DEFINES_IUSE=$( cat ${T}/defines.IUSE )
- done
-}
-
-extensions_add_make_conf()
-{
- # copy all ifdef for extensions-patch to Make.config
- sed -e '1,/need to touch the following:/d' \
- -e '/need to touch the following/,/^$/d' \
- Make.config.template >> Make.config
-}
-
-extensions_all_defines() {
- # extract all possible settings for extensions-patch
- sed -e '/^#\?[A-Z].*= 1/!d' -e 's/^#\?//' -e 's/ .*//' \
- Make.config.template \
- | sort \
- | tr '[:upper:]' '[:lower:]'
-}
-
-lang_po() {
- LING_PO=$( ls ${S}/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' )
-}
-
-src_prepare() {
- # apply maintainace-patches
-
- ebegin "Changing paths for gentoo"
-
- local DVBDIR=/usr/include
- local i
- for i in ${DVB_HEADER_PATH} /usr/include/v4l-dvb-hg /usr/include; do
- [[ -d ${i} ]] || continue
- if [[ -f ${i}/linux/dvb/dmx.h ]]; then
- einfo "Found DVB header files in ${i}"
- DVBDIR=${i}
- break
- fi
- done
-
- # checking for s2api headers
- local api_version
- api_version=$(awk -F' ' '/define DVB_API_VERSION / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
- api_version=${api_version}*$(awk -F' ' '/define DVB_API_VERSION_MINOR / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
-
- if [[ ${api_version:-0} -lt 5*3 ]]; then
- eerror "DVB header files do not contain s2api support or too old for ${P}"
- eerror "You cannot compile VDR against old dvb-header"
- die "DVB headers too old"
- fi
-
- cat > Make.config <<-EOT
- #
- # Generated by ebuild ${PF}
- #
- PREFIX = /usr
- DVBDIR = ${DVBDIR}
- PLUGINLIBDIR = ${PLUGIN_LIBDIR}
- CONFDIR = ${CONF_DIR}
- VIDEODIR = /var/vdr/video
- LOCDIR = \$(PREFIX)/share/locale
- INCDIR = \$(PREFIX)/include
-
- DEFINES += -DCONFDIR=\"\$(CONFDIR)\"
- INCLUDES += -I\$(DVBDIR)
-
- # >=vdr-1.7.36-r1; parameter only used for compiletime on vdr
- # PLUGINLIBDIR (plugin Makefile old) = LIBDIR (plugin Makefile new)
- LIBDIR = ${PLUGIN_LIBDIR}
- PCDIR = /usr/$(get_libdir)/pkgconfig
- EOT
- eend 0
-
- # support languages, written from right to left
- BUILD_PARAMS+=" BIDI=$(usex bidi 1 0)"
-
- epatch "${FILESDIR}/${PN}-2.1.1_gentoo.patch"
-# epatch "${WORKDIR}/${P}-gcc.patch" # tmp gcc fix from Rolf Ahrenberg
-
- if ! use vanilla; then
-
- # Now apply extensions patch
- epatch "${WORKDIR}/${EXT_P}.patch"
-
- # This allows us to start even if some plugin does not exist
- # or is not loadable.
- enable_patch PLUGINMISSING
-
- if [[ -n ${VDR_MAINTAINER_MODE} ]]; then
- einfo "Doing maintainer checks:"
-
- # we do not support these patches
- # (or have them already hard enabled)
- local IGNORE_PATCHES="pluginmissing"
-
- extensions_all_defines > "${T}"/new.IUSE
- echo $EXT_PATCH_FLAGS $EXT_PATCH_FLAGS_RENAMED_EXT_NAME \
- $IGNORE_PATCHES | \
- tr ' ' '\n' |sort > "${T}"/old.IUSE
- local DIFFS=$(diff -u "${T}"/old.IUSE "${T}"/new.IUSE|grep '^[+-][^+-]')
- if [[ -z ${DIFFS} ]]; then
- einfo "EXT_PATCH_FLAGS is up to date."
- else
- ewarn "IUSE differences!"
- local diff
- for diff in $DIFFS; do
- ewarn "$diff"
- done
- fi
- fi
-
- ebegin "Enabling selected patches"
- local flag
- for flag in $EXT_PATCH_FLAGS; do
- use $flag && enable_patch ${flag}
- done
-
- eend 0
-
- extensions_add_make_conf
-
- # add defined use-flags compile options to vdr.pc
- sed -e "s:\$(CDEFINES) \$(CINCLUDES) \$(HDRDIR):\$(CDEFINES) \$(CINCLUDES) \$(HDRDIR) \$(DEFINES_IUSE):" \
- -i Makefile
-
- ebegin "Make depend"
- emake .dependencies >/dev/null
- eend $? "make depend failed"
- fi
-
- epatch_user
-
- add_cap CAP_UTF8
-
- add_cap CAP_IRCTRL_RUNTIME_PARAM \
- CAP_VFAT_RUNTIME_PARAM \
- CAP_CHUID \
- CAP_SHUTDOWN_AUTO_RETRY
-
- echo -e ${CAPS} > "${CAP_FILE}"
-
- # LINGUAS support
- einfo "\n \t VDR supports the LINGUAS values"
-
- lang_po
-
- einfo "\t Please set one of this values in your sytem make.conf"
- einfo "\t LINGUAS=\"${LING_PO}\"\n"
-
- if [[ -z ${LINGUAS} ]]; then
- einfo "\n \t No values in LINGUAS="
- einfo "\t You will get only english text on OSD \n"
- fi
-
- strip-linguas ${LING_PO} en
-}
-
-src_install() {
- # trick makefile not to create a videodir by supplying it with an existing
- # directory
- einstall \
- VIDEODIR="/" \
- DESTDIR="${D}" \
- || die "einstall failed"
-
- keepdir "${PLUGIN_LIBDIR}"
-
- keepdir "${CONF_DIR}"/plugins
- keepdir "${CONF_DIR}"/themes
-
- diropts -m0755 -ovdr -gvdr
- keepdir /var/cache/vdr
-
- if use html; then
- dohtml *.html
- fi
-
- dodoc MANUAL INSTALL README* HISTORY CONTRIBUTORS
-
- insinto /usr/share/vdr
- doins "${CAP_FILE}"
-
- if use alternatechannel; then
- insinto /etc/vdr
- doins "${FILESDIR}"/channel_alternative.conf
- fi
-
- chown -R vdr:vdr "${D}/${CONF_DIR}"
-}
-
-#pkg_preinst() {
-
-# example syntax...
-# has_version "<${CATEGORY}/${PN}-1.7.36"
-# previous_less_than_1_7_36=$?
-#}
-
-pkg_postinst() {
-
- elog "This is a *developer* version."
- elog "We strongly recommend that you only use it under controlled"
- elog "conditions and for testing and debugging."
-
- # correct wrong permission from earlier install
- CACHEOWNER="$(stat -c %U /var/cache/vdr)"
- if [ ! ${CACHEOWNER} == vdr ]; then
- chown -R vdr:vdr "${ROOT}/var/cache/vdr"
- fi
-
-# example syntax
-# if [[ previous_less_than_1_7_36=$? = 0 ]] ; then
- #elog "bla foo"
-# fi
-
- elog "It is a good idea to run vdrplugin-rebuild now."
-
- elog "To get nice symbols in OSD we recommend to install"
- elog "\t1. emerge media-fonts/vdrsymbols-ttf"
- elog "\t2. select font VDRSymbolsSans in Setup"
- elog ""
- elog "To get an idea how to proceed now, have a look at our vdr-guide:"
- elog "\thttps://wiki.gentoo.org/wiki/VDR"
-}
diff --git a/media-video/vdr/vdr-2.1.4.ebuild b/media-video/vdr/vdr-2.1.4.ebuild
deleted file mode 100644
index 996a54a..0000000
--- a/media-video/vdr/vdr-2.1.4.ebuild
+++ /dev/null
@@ -1,304 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-2.0.2-r1.ebuild,v 1.2 2013/07/07 09:52:20 hd_brummy Exp $
-
-EAPI=5
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-# Switches supported by extensions-patch
-EXT_PATCH_FLAGS="alternatechannel binaryskip graphtft jumpingseconds jumpplay naludump permashift
- pinplugin mainmenuhooks menuorg menuselection resumereset ttxtsubs wareagleicon yaepg"
-# ddepgentry
-
-# names of the use-flags
-EXT_PATCH_FLAGS_RENAMED=""
-
-# names ext-patch uses internally, here only used for maintainer checks
-EXT_PATCH_FLAGS_RENAMED_EXT_NAME=""
-
-IUSE="bidi debug html vanilla ${EXT_PATCH_FLAGS} ${EXT_PATCH_FLAGS_RENAMED}"
-
-MY_PV="${PV%_p*}"
-MY_P="${PN}-${MY_PV}"
-S="${WORKDIR}/${MY_P}"
-
-#EXT_P="extpng-${P}-gentoo-edition-v1"
-EXT_P="extpng-${PN}-2.1.3-gentoo-edition-v1"
-
-DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB"
-HOMEPAGE="http://www.tvdr.de/"
-SRC_URI="ftp://ftp.tvdr.de/vdr/Developer/${MY_P}.tar.bz2
- http://dev.gentoo.org/~hd_brummy/distfiles/${EXT_P}.patch.bz2"
-
-KEYWORDS="~arm ~amd64 ~ppc ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-
-COMMON_DEPEND="virtual/jpeg
- sys-libs/libcap
- >=media-libs/fontconfig-2.4.2
- >=media-libs/freetype-2"
-
-DEPEND="${COMMON_DEPEND}
- >=virtual/linuxtv-dvb-headers-5.3
- sys-devel/gettext"
-
-RDEPEND="${COMMON_DEPEND}
- dev-lang/perl
- >=media-tv/gentoo-vdr-scripts-0.2.0
- media-fonts/corefonts
- bidi? ( dev-libs/fribidi )"
-
-CONF_DIR=/etc/vdr
-CAP_FILE=${S}/capabilities.sh
-CAPS="# Capabilities of the vdr-executable for use by startscript etc."
-
-pkg_setup() {
-
- use debug && append-flags -g
-
- PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins"
-
- tc-export CC CXX AR
-}
-
-add_cap() {
- local arg
- for arg; do
- CAPS="${CAPS}\n${arg}=1"
- done
-}
-
-enable_patch() {
- local arg ARG_UPPER
- for arg; do
- ARG_UPPER=$(echo $arg|tr '[:lower:]' '[:upper:]')
- echo "${ARG_UPPER} = 1" >> Make.config
-
- # codesnippet to bring the extpng defines into the vdr.pc CXXFLAGS CFLAGS
- echo "-DUSE_${ARG_UPPER}" >> "${T}"/defines.tmp
- cat "${T}"/defines.tmp | tr \\\012 ' ' > "${T}"/defines.IUSE
- export DEFINES_IUSE=$( cat ${T}/defines.IUSE )
- done
-}
-
-extensions_add_make_conf()
-{
- # copy all ifdef for extensions-patch to Make.config
- sed -e '1,/need to touch the following:/d' \
- -e '/need to touch the following/,/^$/d' \
- Make.config.template >> Make.config
-}
-
-extensions_all_defines() {
- # extract all possible settings for extensions-patch
- sed -e '/^#\?[A-Z].*= 1/!d' -e 's/^#\?//' -e 's/ .*//' \
- Make.config.template \
- | sort \
- | tr '[:upper:]' '[:lower:]'
-}
-
-lang_po() {
- LING_PO=$( ls ${S}/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' )
-}
-
-src_prepare() {
- # apply maintainace-patches
-
- ebegin "Changing paths for gentoo"
-
- local DVBDIR=/usr/include
- local i
- for i in ${DVB_HEADER_PATH} /usr/include/v4l-dvb-hg /usr/include; do
- [[ -d ${i} ]] || continue
- if [[ -f ${i}/linux/dvb/dmx.h ]]; then
- einfo "Found DVB header files in ${i}"
- DVBDIR=${i}
- break
- fi
- done
-
- # checking for s2api headers
- local api_version
- api_version=$(awk -F' ' '/define DVB_API_VERSION / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
- api_version=${api_version}*$(awk -F' ' '/define DVB_API_VERSION_MINOR / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
-
- if [[ ${api_version:-0} -lt 5*3 ]]; then
- eerror "DVB header files do not contain s2api support or too old for ${P}"
- eerror "You cannot compile VDR against old dvb-header"
- die "DVB headers too old"
- fi
-
- cat > Make.config <<-EOT
- #
- # Generated by ebuild ${PF}
- #
- PREFIX = /usr
- DVBDIR = ${DVBDIR}
- PLUGINLIBDIR = ${PLUGIN_LIBDIR}
- CONFDIR = ${CONF_DIR}
- VIDEODIR = /var/vdr/video
- LOCDIR = \$(PREFIX)/share/locale
- INCDIR = \$(PREFIX)/include
-
- DEFINES += -DCONFDIR=\"\$(CONFDIR)\"
- INCLUDES += -I\$(DVBDIR)
-
- # >=vdr-1.7.36-r1; parameter only used for compiletime on vdr
- # PLUGINLIBDIR (plugin Makefile old) = LIBDIR (plugin Makefile new)
- LIBDIR = ${PLUGIN_LIBDIR}
- PCDIR = /usr/$(get_libdir)/pkgconfig
- EOT
- eend 0
-
- # support languages, written from right to left
- BUILD_PARAMS+=" BIDI=$(usex bidi 1 0)"
-
- epatch "${FILESDIR}/${PN}-2.1.1_gentoo.patch"
-# epatch "${WORKDIR}/${P}-gcc.patch" # tmp gcc fix from Rolf Ahrenberg
-
- if ! use vanilla; then
-
- # Now apply extensions patch
- epatch "${WORKDIR}/${EXT_P}.patch"
-
- # This allows us to start even if some plugin does not exist
- # or is not loadable.
- enable_patch PLUGINMISSING
-
- if [[ -n ${VDR_MAINTAINER_MODE} ]]; then
- einfo "Doing maintainer checks:"
-
- # we do not support these patches
- # (or have them already hard enabled)
- local IGNORE_PATCHES="pluginmissing"
-
- extensions_all_defines > "${T}"/new.IUSE
- echo $EXT_PATCH_FLAGS $EXT_PATCH_FLAGS_RENAMED_EXT_NAME \
- $IGNORE_PATCHES | \
- tr ' ' '\n' |sort > "${T}"/old.IUSE
- local DIFFS=$(diff -u "${T}"/old.IUSE "${T}"/new.IUSE|grep '^[+-][^+-]')
- if [[ -z ${DIFFS} ]]; then
- einfo "EXT_PATCH_FLAGS is up to date."
- else
- ewarn "IUSE differences!"
- local diff
- for diff in $DIFFS; do
- ewarn "$diff"
- done
- fi
- fi
-
- ebegin "Enabling selected patches"
- local flag
- for flag in $EXT_PATCH_FLAGS; do
- use $flag && enable_patch ${flag}
- done
-
- eend 0
-
- extensions_add_make_conf
-
- # add defined use-flags compile options to vdr.pc
- sed -e "s:\$(CDEFINES) \$(CINCLUDES) \$(HDRDIR):\$(CDEFINES) \$(CINCLUDES) \$(HDRDIR) \$(DEFINES_IUSE):" \
- -i Makefile
-
- ebegin "Make depend"
- emake .dependencies >/dev/null
- eend $? "make depend failed"
- fi
-
- epatch_user
-
- add_cap CAP_UTF8
-
- add_cap CAP_IRCTRL_RUNTIME_PARAM \
- CAP_VFAT_RUNTIME_PARAM \
- CAP_CHUID \
- CAP_SHUTDOWN_AUTO_RETRY
-
- echo -e ${CAPS} > "${CAP_FILE}"
-
- # LINGUAS support
- einfo "\n \t VDR supports the LINGUAS values"
-
- lang_po
-
- einfo "\t Please set one of this values in your sytem make.conf"
- einfo "\t LINGUAS=\"${LING_PO}\"\n"
-
- if [[ -z ${LINGUAS} ]]; then
- einfo "\n \t No values in LINGUAS="
- einfo "\t You will get only english text on OSD \n"
- fi
-
- strip-linguas ${LING_PO} en
-}
-
-src_install() {
- # trick makefile not to create a videodir by supplying it with an existing
- # directory
- einstall \
- VIDEODIR="/" \
- DESTDIR="${D}" \
- || die "einstall failed"
-
- keepdir "${PLUGIN_LIBDIR}"
-
- keepdir "${CONF_DIR}"/plugins
- keepdir "${CONF_DIR}"/themes
-
- diropts -m0755 -ovdr -gvdr
- keepdir /var/cache/vdr
-
- if use html; then
- dohtml *.html
- fi
-
- dodoc MANUAL INSTALL README* HISTORY CONTRIBUTORS
-
- insinto /usr/share/vdr
- doins "${CAP_FILE}"
-
- if use alternatechannel; then
- insinto /etc/vdr
- doins "${FILESDIR}"/channel_alternative.conf
- fi
-
- chown -R vdr:vdr "${D}/${CONF_DIR}"
-}
-
-#pkg_preinst() {
-
-# example syntax...
-# has_version "<${CATEGORY}/${PN}-1.7.36"
-# previous_less_than_1_7_36=$?
-#}
-
-pkg_postinst() {
-
- elog "This is a *developer* version."
- elog "We strongly recommend that you only use it under controlled"
- elog "conditions and for testing and debugging."
-
- # correct wrong permission from earlier install
- CACHEOWNER="$(stat -c %U /var/cache/vdr)"
- if [ ! ${CACHEOWNER} == vdr ]; then
- chown -R vdr:vdr "${ROOT}/var/cache/vdr"
- fi
-
-# example syntax
-# if [[ previous_less_than_1_7_36=$? = 0 ]] ; then
- #elog "bla foo"
-# fi
-
- elog "It is a good idea to run vdrplugin-rebuild now."
-
- elog "To get nice symbols in OSD we recommend to install"
- elog "\t1. emerge media-fonts/vdrsymbols-ttf"
- elog "\t2. select font VDRSymbolsSans in Setup"
- elog ""
- elog "To get an idea how to proceed now, have a look at our vdr-guide:"
- elog "\thttps://wiki.gentoo.org/wiki/VDR"
-}
diff --git a/media-video/vdr/vdr-2.1.5.ebuild b/media-video/vdr/vdr-2.1.5.ebuild
deleted file mode 100644
index 0375db9..0000000
--- a/media-video/vdr/vdr-2.1.5.ebuild
+++ /dev/null
@@ -1,304 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-2.0.2-r1.ebuild,v 1.2 2013/07/07 09:52:20 hd_brummy Exp $
-
-EAPI=5
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-# Switches supported by extensions-patch
-EXT_PATCH_FLAGS="alternatechannel binaryskip graphtft jumpingseconds jumpplay naludump permashift
- pinplugin mainmenuhooks menuorg menuselection resumereset ttxtsubs wareagleicon yaepg"
-# ddepgentry
-
-# names of the use-flags
-EXT_PATCH_FLAGS_RENAMED=""
-
-# names ext-patch uses internally, here only used for maintainer checks
-EXT_PATCH_FLAGS_RENAMED_EXT_NAME=""
-
-IUSE="bidi debug html vanilla ${EXT_PATCH_FLAGS} ${EXT_PATCH_FLAGS_RENAMED}"
-
-MY_PV="${PV%_p*}"
-MY_P="${PN}-${MY_PV}"
-S="${WORKDIR}/${MY_P}"
-
-EXT_P="extpng-${P}-gentoo-edition-v1"
-#EXT_P="extpng-${PN}-2.1.4-gentoo-edition-v1"
-
-DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB"
-HOMEPAGE="http://www.tvdr.de/"
-SRC_URI="ftp://ftp.tvdr.de/vdr/Developer/${MY_P}.tar.bz2
- http://dev.gentoo.org/~hd_brummy/distfiles/${EXT_P}.patch.bz2"
-
-KEYWORDS="~arm ~amd64 ~ppc ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-
-COMMON_DEPEND="virtual/jpeg
- sys-libs/libcap
- >=media-libs/fontconfig-2.4.2
- >=media-libs/freetype-2"
-
-DEPEND="${COMMON_DEPEND}
- >=virtual/linuxtv-dvb-headers-5.3
- sys-devel/gettext"
-
-RDEPEND="${COMMON_DEPEND}
- dev-lang/perl
- >=media-tv/gentoo-vdr-scripts-0.2.0
- media-fonts/corefonts
- bidi? ( dev-libs/fribidi )"
-
-CONF_DIR=/etc/vdr
-CAP_FILE=${S}/capabilities.sh
-CAPS="# Capabilities of the vdr-executable for use by startscript etc."
-
-pkg_setup() {
-
- use debug && append-flags -g
-
- PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins"
-
- tc-export CC CXX AR
-}
-
-add_cap() {
- local arg
- for arg; do
- CAPS="${CAPS}\n${arg}=1"
- done
-}
-
-enable_patch() {
- local arg ARG_UPPER
- for arg; do
- ARG_UPPER=$(echo $arg|tr '[:lower:]' '[:upper:]')
- echo "${ARG_UPPER} = 1" >> Make.config
-
- # codesnippet to bring the extpng defines into the vdr.pc CXXFLAGS CFLAGS
- echo "-DUSE_${ARG_UPPER}" >> "${T}"/defines.tmp
- cat "${T}"/defines.tmp | tr \\\012 ' ' > "${T}"/defines.IUSE
- export DEFINES_IUSE=$( cat ${T}/defines.IUSE )
- done
-}
-
-extensions_add_make_conf()
-{
- # copy all ifdef for extensions-patch to Make.config
- sed -e '1,/need to touch the following:/d' \
- -e '/need to touch the following/,/^$/d' \
- Make.config.template >> Make.config
-}
-
-extensions_all_defines() {
- # extract all possible settings for extensions-patch
- sed -e '/^#\?[A-Z].*= 1/!d' -e 's/^#\?//' -e 's/ .*//' \
- Make.config.template \
- | sort \
- | tr '[:upper:]' '[:lower:]'
-}
-
-lang_po() {
- LING_PO=$( ls ${S}/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' )
-}
-
-src_prepare() {
- # apply maintainace-patches
-
- ebegin "Changing paths for gentoo"
-
- local DVBDIR=/usr/include
- local i
- for i in ${DVB_HEADER_PATH} /usr/include/v4l-dvb-hg /usr/include; do
- [[ -d ${i} ]] || continue
- if [[ -f ${i}/linux/dvb/dmx.h ]]; then
- einfo "Found DVB header files in ${i}"
- DVBDIR=${i}
- break
- fi
- done
-
- # checking for s2api headers
- local api_version
- api_version=$(awk -F' ' '/define DVB_API_VERSION / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
- api_version=${api_version}*$(awk -F' ' '/define DVB_API_VERSION_MINOR / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
-
- if [[ ${api_version:-0} -lt 5*3 ]]; then
- eerror "DVB header files do not contain s2api support or too old for ${P}"
- eerror "You cannot compile VDR against old dvb-header"
- die "DVB headers too old"
- fi
-
- cat > Make.config <<-EOT
- #
- # Generated by ebuild ${PF}
- #
- PREFIX = /usr
- DVBDIR = ${DVBDIR}
- PLUGINLIBDIR = ${PLUGIN_LIBDIR}
- CONFDIR = ${CONF_DIR}
- VIDEODIR = /var/vdr/video
- LOCDIR = \$(PREFIX)/share/locale
- INCDIR = \$(PREFIX)/include
-
- DEFINES += -DCONFDIR=\"\$(CONFDIR)\"
- INCLUDES += -I\$(DVBDIR)
-
- # >=vdr-1.7.36-r1; parameter only used for compiletime on vdr
- # PLUGINLIBDIR (plugin Makefile old) = LIBDIR (plugin Makefile new)
- LIBDIR = ${PLUGIN_LIBDIR}
- PCDIR = /usr/$(get_libdir)/pkgconfig
- EOT
- eend 0
-
- # support languages, written from right to left
- BUILD_PARAMS+=" BIDI=$(usex bidi 1 0)"
-
- epatch "${FILESDIR}/${PN}-2.1.1_gentoo.patch"
-# epatch "${WORKDIR}/${P}-gcc.patch" # tmp gcc fix from Rolf Ahrenberg
-
- if ! use vanilla; then
-
- # Now apply extensions patch
- epatch "${WORKDIR}/${EXT_P}.patch"
-
- # This allows us to start even if some plugin does not exist
- # or is not loadable.
- enable_patch PLUGINMISSING
-
- if [[ -n ${VDR_MAINTAINER_MODE} ]]; then
- einfo "Doing maintainer checks:"
-
- # we do not support these patches
- # (or have them already hard enabled)
- local IGNORE_PATCHES="pluginmissing"
-
- extensions_all_defines > "${T}"/new.IUSE
- echo $EXT_PATCH_FLAGS $EXT_PATCH_FLAGS_RENAMED_EXT_NAME \
- $IGNORE_PATCHES | \
- tr ' ' '\n' |sort > "${T}"/old.IUSE
- local DIFFS=$(diff -u "${T}"/old.IUSE "${T}"/new.IUSE|grep '^[+-][^+-]')
- if [[ -z ${DIFFS} ]]; then
- einfo "EXT_PATCH_FLAGS is up to date."
- else
- ewarn "IUSE differences!"
- local diff
- for diff in $DIFFS; do
- ewarn "$diff"
- done
- fi
- fi
-
- ebegin "Enabling selected patches"
- local flag
- for flag in $EXT_PATCH_FLAGS; do
- use $flag && enable_patch ${flag}
- done
-
- eend 0
-
- extensions_add_make_conf
-
- # add defined use-flags compile options to vdr.pc
- sed -e "s:\$(CDEFINES) \$(CINCLUDES) \$(HDRDIR):\$(CDEFINES) \$(CINCLUDES) \$(HDRDIR) \$(DEFINES_IUSE):" \
- -i Makefile
-
- ebegin "Make depend"
- emake .dependencies >/dev/null
- eend $? "make depend failed"
- fi
-
- epatch_user
-
- add_cap CAP_UTF8
-
- add_cap CAP_IRCTRL_RUNTIME_PARAM \
- CAP_VFAT_RUNTIME_PARAM \
- CAP_CHUID \
- CAP_SHUTDOWN_AUTO_RETRY
-
- echo -e ${CAPS} > "${CAP_FILE}"
-
- # LINGUAS support
- einfo "\n \t VDR supports the LINGUAS values"
-
- lang_po
-
- einfo "\t Please set one of this values in your sytem make.conf"
- einfo "\t LINGUAS=\"${LING_PO}\"\n"
-
- if [[ -z ${LINGUAS} ]]; then
- einfo "\n \t No values in LINGUAS="
- einfo "\t You will get only english text on OSD \n"
- fi
-
- strip-linguas ${LING_PO} en
-}
-
-src_install() {
- # trick makefile not to create a videodir by supplying it with an existing
- # directory
- einstall \
- VIDEODIR="/" \
- DESTDIR="${D}" \
- || die "einstall failed"
-
- keepdir "${PLUGIN_LIBDIR}"
-
- keepdir "${CONF_DIR}"/plugins
- keepdir "${CONF_DIR}"/themes
-
- diropts -m0755 -ovdr -gvdr
- keepdir /var/cache/vdr
-
- if use html; then
- dohtml *.html
- fi
-
- dodoc MANUAL INSTALL README* HISTORY CONTRIBUTORS
-
- insinto /usr/share/vdr
- doins "${CAP_FILE}"
-
- if use alternatechannel; then
- insinto /etc/vdr
- doins "${FILESDIR}"/channel_alternative.conf
- fi
-
- chown -R vdr:vdr "${D}/${CONF_DIR}"
-}
-
-#pkg_preinst() {
-
-# example syntax...
-# has_version "<${CATEGORY}/${PN}-1.7.36"
-# previous_less_than_1_7_36=$?
-#}
-
-pkg_postinst() {
-
- elog "This is a *developer* version."
- elog "We strongly recommend that you only use it under controlled"
- elog "conditions and for testing and debugging."
-
- # correct wrong permission from earlier install
- CACHEOWNER="$(stat -c %U /var/cache/vdr)"
- if [ ! ${CACHEOWNER} == vdr ]; then
- chown -R vdr:vdr "${ROOT}/var/cache/vdr"
- fi
-
-# example syntax
-# if [[ previous_less_than_1_7_36=$? = 0 ]] ; then
- #elog "bla foo"
-# fi
-
- elog "It is a good idea to run vdrplugin-rebuild now."
-
- elog "To get nice symbols in OSD we recommend to install"
- elog "\t1. emerge media-fonts/vdrsymbols-ttf"
- elog "\t2. select font VDRSymbolsSans in Setup"
- elog ""
- elog "To get an idea how to proceed now, have a look at our vdr-guide:"
- elog "\thttps://wiki.gentoo.org/wiki/VDR"
-}
diff --git a/media-video/vdr/vdr-2.1.6-r1.ebuild b/media-video/vdr/vdr-2.1.6-r1.ebuild
deleted file mode 100644
index 69bf4ae..0000000
--- a/media-video/vdr/vdr-2.1.6-r1.ebuild
+++ /dev/null
@@ -1,302 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-2.0.2-r1.ebuild,v 1.2 2013/07/07 09:52:20 hd_brummy Exp $
-
-EAPI=5
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-# Switches supported by extensions-patch
-EXT_PATCH_FLAGS="alternatechannel binaryskip graphtft jumpingseconds jumpplay naludump permashift
- permashift_v1 pinplugin mainmenuhooks menuorg menuselection resumereset ttxtsubs wareagleicon yaepg"
-# ddepgentry
-
-# names of the use-flags
-EXT_PATCH_FLAGS_RENAMED=""
-
-# names ext-patch uses internally, here only used for maintainer checks
-EXT_PATCH_FLAGS_RENAMED_EXT_NAME=""
-
-IUSE="bidi debug html vanilla ${EXT_PATCH_FLAGS} ${EXT_PATCH_FLAGS_RENAMED}"
-
-MY_PV="${PV%_p*}"
-MY_P="${PN}-${MY_PV}"
-S="${WORKDIR}/${MY_P}"
-
-EXT_P="extpng-${P}-gentoo-edition-v2"
-#EXT_P="extpng-${PN}-2.1.6-gentoo-edition-v1"
-
-DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB"
-HOMEPAGE="http://www.tvdr.de/"
-SRC_URI="ftp://ftp.tvdr.de/vdr/Developer/${MY_P}.tar.bz2
- http://dev.gentoo.org/~hd_brummy/distfiles/${EXT_P}.patch.bz2"
-
-KEYWORDS="~arm ~amd64 ~ppc ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-
-REQUIRED_USE="
- permashift? ( !permashift_v1 )
- permashift_v1? ( !permashift )"
-
-COMMON_DEPEND="virtual/jpeg
- sys-libs/libcap
- >=media-libs/fontconfig-2.4.2
- >=media-libs/freetype-2"
-
-DEPEND="${COMMON_DEPEND}
- >=virtual/linuxtv-dvb-headers-5.3
- sys-devel/gettext"
-
-RDEPEND="${COMMON_DEPEND}
- dev-lang/perl
- >=media-tv/gentoo-vdr-scripts-2.5_rc1
- media-fonts/corefonts
- bidi? ( dev-libs/fribidi )"
-
-CONF_DIR=/etc/vdr
-CAP_FILE=${S}/capabilities.sh
-CAPS="# Capabilities of the vdr-executable for use by startscript etc."
-
-pkg_setup() {
-
- use debug && append-flags -g
-
- PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins"
-
- tc-export CC CXX AR
-}
-
-add_cap() {
- local arg
- for arg; do
- CAPS="${CAPS}\n${arg}=1"
- done
-}
-
-enable_patch() {
- local arg ARG_UPPER
- for arg; do
- ARG_UPPER=$(echo $arg|tr '[:lower:]' '[:upper:]')
- echo "${ARG_UPPER} = 1" >> Make.config
-
- # codesnippet to bring the extpng defines into the vdr.pc CXXFLAGS CFLAGS
- echo "-DUSE_${ARG_UPPER}" >> "${T}"/defines.tmp
- cat "${T}"/defines.tmp | tr \\\012 ' ' > "${T}"/defines.IUSE
- export DEFINES_IUSE=$( cat ${T}/defines.IUSE )
- done
-}
-
-extensions_add_make_conf()
-{
- # copy all ifdef for extensions-patch to Make.config
- sed -e '1,/need to touch the following:/d' \
- -e '/need to touch the following/,/^$/d' \
- Make.config.template >> Make.config
-}
-
-extensions_all_defines() {
- # extract all possible settings for extensions-patch
- sed -e '/^#\?[A-Z].*= 1/!d' -e 's/^#\?//' -e 's/ .*//' \
- Make.config.template \
- | sort \
- | tr '[:upper:]' '[:lower:]'
-}
-
-lang_po() {
- LING_PO=$( ls ${S}/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' )
-}
-
-src_prepare() {
- # apply maintainace-patches
- ebegin "Changing paths for gentoo"
-
- local DVBDIR=/usr/include
- local i
- for i in ${DVB_HEADER_PATH} /usr/include/v4l-dvb-hg /usr/include; do
- [[ -d ${i} ]] || continue
- if [[ -f ${i}/linux/dvb/dmx.h ]]; then
- einfo "Found DVB header files in ${i}"
- DVBDIR=${i}
- break
- fi
- done
-
- # checking for s2api headers
- local api_version
- api_version=$(awk -F' ' '/define DVB_API_VERSION / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
- api_version=${api_version}*$(awk -F' ' '/define DVB_API_VERSION_MINOR / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
-
- if [[ ${api_version:-0} -lt 5*3 ]]; then
- eerror "DVB header files do not contain s2api support or too old for ${P}"
- eerror "You cannot compile VDR against old dvb-header"
- die "DVB headers too old"
- fi
-
- cat > Make.config <<-EOT
- #
- # Generated by ebuild ${PF}
- #
- PREFIX = /usr
- DVBDIR = ${DVBDIR}
- PLUGINLIBDIR = ${PLUGIN_LIBDIR}
- CONFDIR = ${CONF_DIR}
- VIDEODIR = /var/vdr/video
- LOCDIR = \$(PREFIX)/share/locale
- INCDIR = \$(PREFIX)/include
-
- DEFINES += -DCONFDIR=\"\$(CONFDIR)\"
- INCLUDES += -I\$(DVBDIR)
-
- # >=vdr-1.7.36-r1; parameter only used for compiletime on vdr
- # PLUGINLIBDIR (plugin Makefile old) = LIBDIR (plugin Makefile new)
- LIBDIR = ${PLUGIN_LIBDIR}
- PCDIR = /usr/$(get_libdir)/pkgconfig
- EOT
- eend 0
-
- # support languages, written from right to left
- BUILD_PARAMS+=" BIDI=$(usex bidi 1 0)"
-
- epatch "${FILESDIR}/${P}_gentoo.patch"
-
- if ! use vanilla; then
-
- # Now apply extensions patch
- epatch "${WORKDIR}/${EXT_P}.patch"
-
- # This allows us to start even if some plugin does not exist
- # or is not loadable.
- enable_patch PLUGINMISSING
-
- if [[ -n ${VDR_MAINTAINER_MODE} ]]; then
- einfo "Doing maintainer checks:"
-
- # we do not support these patches
- # (or have them already hard enabled)
- local IGNORE_PATCHES="pluginmissing"
-
- extensions_all_defines > "${T}"/new.IUSE
- echo $EXT_PATCH_FLAGS $EXT_PATCH_FLAGS_RENAMED_EXT_NAME \
- $IGNORE_PATCHES | \
- tr ' ' '\n' |sort > "${T}"/old.IUSE
- local DIFFS=$(diff -u "${T}"/old.IUSE "${T}"/new.IUSE|grep '^[+-][^+-]')
- if [[ -z ${DIFFS} ]]; then
- einfo "EXT_PATCH_FLAGS is up to date."
- else
- ewarn "IUSE differences!"
- local diff
- for diff in $DIFFS; do
- ewarn "$diff"
- done
- fi
- fi
-
- ebegin "Enabling selected patches"
- local flag
- for flag in $EXT_PATCH_FLAGS; do
- use $flag && enable_patch ${flag}
- done
-
- eend 0
-
- extensions_add_make_conf
-
- # add defined use-flags compile options to vdr.pc
- sed -e "s:\$(CDEFINES) \$(CINCLUDES) \$(HDRDIR):\$(CDEFINES) \$(CINCLUDES) \$(HDRDIR) \$(DEFINES_IUSE):" \
- -i Makefile
-
- ebegin "Make depend"
- emake .dependencies >/dev/null
- eend $? "make depend failed"
- fi
-
- epatch_user
-
- add_cap CAP_UTF8
-
- add_cap CAP_IRCTRL_RUNTIME_PARAM \
- CAP_VFAT_RUNTIME_PARAM \
- CAP_CHUID \
- CAP_SHUTDOWN_AUTO_RETRY
-
- echo -e ${CAPS} > "${CAP_FILE}"
-
- # LINGUAS support
- einfo "\n \t VDR supports the LINGUAS values"
-
- lang_po
-
- einfo "\t Please set one of this values in your sytem make.conf"
- einfo "\t LINGUAS=\"${LING_PO}\"\n"
-
- if [[ -z ${LINGUAS} ]]; then
- einfo "\n \t No values in LINGUAS="
- einfo "\t You will get only english text on OSD \n"
- fi
-
- strip-linguas ${LING_PO} en
-}
-
-src_install() {
- # trick makefile not to create a videodir by supplying it with an existing
- # directory
- emake \
- VIDEODIR="/" \
- DESTDIR="${D}" install || die "emake install failed"
-
- keepdir "${PLUGIN_LIBDIR}"
-
- keepdir "${CONF_DIR}"/plugins
- keepdir "${CONF_DIR}"/themes
-
- if use html; then
- dohtml *.html
- fi
-
- dodoc MANUAL INSTALL README* HISTORY CONTRIBUTORS
-
- insinto /usr/share/vdr
- doins "${CAP_FILE}"
-
- if use alternatechannel; then
- insinto /etc/vdr
- doins "${FILESDIR}"/channel_alternative.conf
- fi
-
- chown -R vdr:vdr "${D}/${CONF_DIR}"
-}
-
-#pkg_preinst() {
-
-# example syntax...
-# has_version "<${CATEGORY}/${PN}-1.7.36"
-# previous_less_than_1_7_36=$?
-#}
-
-pkg_postinst() {
-
- elog "This is a *developer* version."
- elog "We strongly recommend that you only use it under controlled"
- elog "conditions and for testing and debugging."
-
- # correct wrong permission from earlier install
- CACHEOWNER="$(stat -c %U /var/cache/vdr)"
- if [ ! ${CACHEOWNER} == vdr ]; then
- chown -R vdr:vdr "${ROOT}/var/cache/vdr"
- fi
-
-# example syntax
-# if [[ previous_less_than_1_7_36=$? = 0 ]] ; then
- #elog "bla foo"
-# fi
-
- elog "It is a good idea to run vdrplugin-rebuild now."
-
- elog "To get nice symbols in OSD we recommend to install"
- elog "\t1. emerge media-fonts/vdrsymbols-ttf"
- elog "\t2. select font VDRSymbolsSans in Setup"
- elog ""
- elog "To get an idea how to proceed now, have a look at our vdr-guide:"
- elog "\thttps://wiki.gentoo.org/wiki/VDR"
-}
diff --git a/media-video/vdr/vdr-2.1.6-r2.ebuild b/media-video/vdr/vdr-2.1.6-r2.ebuild
deleted file mode 100644
index d6ac645..0000000
--- a/media-video/vdr/vdr-2.1.6-r2.ebuild
+++ /dev/null
@@ -1,305 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-2.0.2-r1.ebuild,v 1.2 2013/07/07 09:52:20 hd_brummy Exp $
-
-EAPI=5
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-# Switches supported by extensions-patch
-EXT_PATCH_FLAGS="alternatechannel binaryskip graphtft jumpingseconds jumpplay naludump permashift
- permashift_v1 pinplugin mainmenuhooks menuorg menuselection resumereset ttxtsubs wareagleicon yaepg"
-# ddepgentry
-
-# names of the use-flags
-EXT_PATCH_FLAGS_RENAMED=""
-
-# names ext-patch uses internally, here only used for maintainer checks
-EXT_PATCH_FLAGS_RENAMED_EXT_NAME=""
-
-IUSE="bidi debug html systemd vanilla ${EXT_PATCH_FLAGS} ${EXT_PATCH_FLAGS_RENAMED}"
-
-MY_PV="${PV%_p*}"
-MY_P="${PN}-${MY_PV}"
-S="${WORKDIR}/${MY_P}"
-
-EXT_P="extpng-${P}-gentoo-edition-v2"
-
-DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB"
-HOMEPAGE="http://www.tvdr.de/"
-SRC_URI="ftp://ftp.tvdr.de/vdr/Developer/${MY_P}.tar.bz2
- http://dev.gentoo.org/~hd_brummy/distfiles/${EXT_P}.patch.bz2"
-
-KEYWORDS="~arm ~amd64 ~ppc ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-
-REQUIRED_USE="
- permashift? ( !permashift_v1 )
- permashift_v1? ( !permashift )"
-
-COMMON_DEPEND="virtual/jpeg
- sys-libs/libcap
- >=media-libs/fontconfig-2.4.2
- >=media-libs/freetype-2"
-
-DEPEND="${COMMON_DEPEND}
- >=virtual/linuxtv-dvb-headers-5.3
- sys-devel/gettext"
-
-RDEPEND="${COMMON_DEPEND}
- dev-lang/perl
- >=media-tv/gentoo-vdr-scripts-2.5_rc1
- media-fonts/corefonts
- bidi? ( dev-libs/fribidi )
- systemd? ( sys-apps/systemd )"
-
-CONF_DIR=/etc/vdr
-CAP_FILE=${S}/capabilities.sh
-CAPS="# Capabilities of the vdr-executable for use by startscript etc."
-
-pkg_setup() {
-
- use debug && append-flags -g
-
- PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins"
-
- tc-export CC CXX AR
-}
-
-add_cap() {
- local arg
- for arg; do
- CAPS="${CAPS}\n${arg}=1"
- done
-}
-
-enable_patch() {
- local arg ARG_UPPER
- for arg; do
- ARG_UPPER=$(echo $arg|tr '[:lower:]' '[:upper:]')
- echo "${ARG_UPPER} = 1" >> Make.config
-
- # codesnippet to bring the extpng defines into the vdr.pc CXXFLAGS CFLAGS
- echo "-DUSE_${ARG_UPPER}" >> "${T}"/defines.tmp
- cat "${T}"/defines.tmp | tr \\\012 ' ' > "${T}"/defines.IUSE
- export DEFINES_IUSE=$( cat ${T}/defines.IUSE )
- done
-}
-
-extensions_add_make_conf()
-{
- # copy all ifdef for extensions-patch to Make.config
- sed -e '1,/need to touch the following:/d' \
- -e '/need to touch the following/,/^$/d' \
- Make.config.template >> Make.config
-}
-
-extensions_all_defines() {
- # extract all possible settings for extensions-patch
- sed -e '/^#\?[A-Z].*= 1/!d' -e 's/^#\?//' -e 's/ .*//' \
- Make.config.template \
- | sort \
- | tr '[:upper:]' '[:lower:]'
-}
-
-lang_po() {
- LING_PO=$( ls ${S}/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' )
-}
-
-src_prepare() {
- # apply maintainace-patches
- ebegin "Changing paths for gentoo"
-
- local DVBDIR=/usr/include
- local i
- for i in ${DVB_HEADER_PATH} /usr/include/v4l-dvb-hg /usr/include; do
- [[ -d ${i} ]] || continue
- if [[ -f ${i}/linux/dvb/dmx.h ]]; then
- einfo "Found DVB header files in ${i}"
- DVBDIR=${i}
- break
- fi
- done
-
- # checking for s2api headers
- local api_version
- api_version=$(awk -F' ' '/define DVB_API_VERSION / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
- api_version=${api_version}*$(awk -F' ' '/define DVB_API_VERSION_MINOR / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
-
- if [[ ${api_version:-0} -lt 5*3 ]]; then
- eerror "DVB header files do not contain s2api support or too old for ${P}"
- eerror "You cannot compile VDR against old dvb-header"
- die "DVB headers too old"
- fi
-
- cat > Make.config <<-EOT
- #
- # Generated by ebuild ${PF}
- #
- PREFIX = /usr
- DVBDIR = ${DVBDIR}
- PLUGINLIBDIR = ${PLUGIN_LIBDIR}
- CONFDIR = ${CONF_DIR}
- VIDEODIR = /var/vdr/video
- LOCDIR = \$(PREFIX)/share/locale
- INCDIR = \$(PREFIX)/include
-
- DEFINES += -DCONFDIR=\"\$(CONFDIR)\"
- INCLUDES += -I\$(DVBDIR)
-
- # >=vdr-1.7.36-r1; parameter only used for compiletime on vdr
- # PLUGINLIBDIR (plugin Makefile old) = LIBDIR (plugin Makefile new)
- LIBDIR = ${PLUGIN_LIBDIR}
- PCDIR = /usr/$(get_libdir)/pkgconfig
- EOT
- eend 0
-
- # support languages, written from right to left
- BUILD_PARAMS+=" BIDI=$(usex bidi 1 0)"
-
- # systemd support
- BUILD_PARAMS+=" SDNOTIFY=$(usex systemd 1 0)"
-
- epatch "${FILESDIR}/${P}_gentoo.patch"
-
- if ! use vanilla; then
-
- # Now apply extensions patch
- epatch "${WORKDIR}/${EXT_P}.patch"
-
- # This allows us to start even if some plugin does not exist
- # or is not loadable.
- enable_patch PLUGINMISSING
-
- if [[ -n ${VDR_MAINTAINER_MODE} ]]; then
- einfo "Doing maintainer checks:"
-
- # we do not support these patches
- # (or have them already hard enabled)
- local IGNORE_PATCHES="pluginmissing"
-
- extensions_all_defines > "${T}"/new.IUSE
- echo $EXT_PATCH_FLAGS $EXT_PATCH_FLAGS_RENAMED_EXT_NAME \
- $IGNORE_PATCHES | \
- tr ' ' '\n' |sort > "${T}"/old.IUSE
- local DIFFS=$(diff -u "${T}"/old.IUSE "${T}"/new.IUSE|grep '^[+-][^+-]')
- if [[ -z ${DIFFS} ]]; then
- einfo "EXT_PATCH_FLAGS is up to date."
- else
- ewarn "IUSE differences!"
- local diff
- for diff in $DIFFS; do
- ewarn "$diff"
- done
- fi
- fi
-
- ebegin "Enabling selected patches"
- local flag
- for flag in $EXT_PATCH_FLAGS; do
- use $flag && enable_patch ${flag}
- done
-
- eend 0
-
- extensions_add_make_conf
-
- # add defined use-flags compile options to vdr.pc
- sed -e "s:\$(CDEFINES) \$(CINCLUDES) \$(HDRDIR):\$(CDEFINES) \$(CINCLUDES) \$(HDRDIR) \$(DEFINES_IUSE):" \
- -i Makefile
-
- ebegin "Make depend"
- emake .dependencies >/dev/null
- eend $? "make depend failed"
- fi
-
- epatch_user
-
- add_cap CAP_UTF8
-
- add_cap CAP_IRCTRL_RUNTIME_PARAM \
- CAP_VFAT_RUNTIME_PARAM \
- CAP_CHUID \
- CAP_SHUTDOWN_AUTO_RETRY
-
- echo -e ${CAPS} > "${CAP_FILE}"
-
- # LINGUAS support
- einfo "\n \t VDR supports the LINGUAS values"
-
- lang_po
-
- einfo "\t Please set one of this values in your sytem make.conf"
- einfo "\t LINGUAS=\"${LING_PO}\"\n"
-
- if [[ -z ${LINGUAS} ]]; then
- einfo "\n \t No values in LINGUAS="
- einfo "\t You will get only english text on OSD \n"
- fi
-
- strip-linguas ${LING_PO} en
-}
-
-src_install() {
- # trick makefile not to create a videodir by supplying it with an existing
- # directory
- emake \
- VIDEODIR="/" \
- DESTDIR="${D}" install || die "emake install failed"
-
- keepdir "${PLUGIN_LIBDIR}"
-
- keepdir "${CONF_DIR}"/plugins
- keepdir "${CONF_DIR}"/themes
-
- if use html; then
- dohtml *.html
- fi
-
- dodoc MANUAL INSTALL README* HISTORY CONTRIBUTORS
-
- insinto /usr/share/vdr
- doins "${CAP_FILE}"
-
- if use alternatechannel; then
- insinto /etc/vdr
- doins "${FILESDIR}"/channel_alternative.conf
- fi
-
- chown -R vdr:vdr "${D}/${CONF_DIR}"
-}
-
-#pkg_preinst() {
-
-# example syntax...
-# has_version "<${CATEGORY}/${PN}-1.7.36"
-# previous_less_than_1_7_36=$?
-#}
-
-pkg_postinst() {
-
- elog "This is a *developer* version."
- elog "We strongly recommend that you only use it under controlled"
- elog "conditions and for testing and debugging."
-
- # correct wrong permission from earlier install
- CACHEOWNER="$(stat -c %U /var/cache/vdr)"
- if [ ! ${CACHEOWNER} == vdr ]; then
- chown -R vdr:vdr "${ROOT}/var/cache/vdr"
- fi
-
-# example syntax
-# if [[ previous_less_than_1_7_36=$? = 0 ]] ; then
- #elog "bla foo"
-# fi
-
- elog "It is a good idea to run vdrplugin-rebuild now."
-
- elog "To get nice symbols in OSD we recommend to install"
- elog "\t1. emerge media-fonts/vdrsymbols-ttf"
- elog "\t2. select font VDRSymbolsSans in Setup"
- elog ""
- elog "To get an idea how to proceed now, have a look at our vdr-guide:"
- elog "\thttps://wiki.gentoo.org/wiki/VDR"
-}
diff --git a/media-video/vdr/vdr-2.1.6.ebuild b/media-video/vdr/vdr-2.1.6.ebuild
deleted file mode 100644
index 95976f6..0000000
--- a/media-video/vdr/vdr-2.1.6.ebuild
+++ /dev/null
@@ -1,304 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-2.0.2-r1.ebuild,v 1.2 2013/07/07 09:52:20 hd_brummy Exp $
-
-EAPI=5
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-# Switches supported by extensions-patch
-EXT_PATCH_FLAGS="alternatechannel binaryskip graphtft jumpingseconds jumpplay naludump permashift
- pinplugin mainmenuhooks menuorg menuselection resumereset ttxtsubs wareagleicon yaepg"
-# ddepgentry
-
-# names of the use-flags
-EXT_PATCH_FLAGS_RENAMED=""
-
-# names ext-patch uses internally, here only used for maintainer checks
-EXT_PATCH_FLAGS_RENAMED_EXT_NAME=""
-
-IUSE="bidi debug html vanilla ${EXT_PATCH_FLAGS} ${EXT_PATCH_FLAGS_RENAMED}"
-
-MY_PV="${PV%_p*}"
-MY_P="${PN}-${MY_PV}"
-S="${WORKDIR}/${MY_P}"
-
-#EXT_P="extpng-${P}-gentoo-edition-v1"
-EXT_P="extpng-${PN}-2.1.5-gentoo-edition-v1"
-
-DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB"
-HOMEPAGE="http://www.tvdr.de/"
-SRC_URI="ftp://ftp.tvdr.de/vdr/Developer/${MY_P}.tar.bz2
- http://dev.gentoo.org/~hd_brummy/distfiles/${EXT_P}.patch.bz2"
-
-KEYWORDS="~arm ~amd64 ~ppc ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-
-COMMON_DEPEND="virtual/jpeg
- sys-libs/libcap
- >=media-libs/fontconfig-2.4.2
- >=media-libs/freetype-2"
-
-DEPEND="${COMMON_DEPEND}
- >=virtual/linuxtv-dvb-headers-5.3
- sys-devel/gettext"
-
-RDEPEND="${COMMON_DEPEND}
- dev-lang/perl
- >=media-tv/gentoo-vdr-scripts-0.2.0
- media-fonts/corefonts
- bidi? ( dev-libs/fribidi )"
-
-CONF_DIR=/etc/vdr
-CAP_FILE=${S}/capabilities.sh
-CAPS="# Capabilities of the vdr-executable for use by startscript etc."
-
-pkg_setup() {
-
- use debug && append-flags -g
-
- PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins"
-
- tc-export CC CXX AR
-}
-
-add_cap() {
- local arg
- for arg; do
- CAPS="${CAPS}\n${arg}=1"
- done
-}
-
-enable_patch() {
- local arg ARG_UPPER
- for arg; do
- ARG_UPPER=$(echo $arg|tr '[:lower:]' '[:upper:]')
- echo "${ARG_UPPER} = 1" >> Make.config
-
- # codesnippet to bring the extpng defines into the vdr.pc CXXFLAGS CFLAGS
- echo "-DUSE_${ARG_UPPER}" >> "${T}"/defines.tmp
- cat "${T}"/defines.tmp | tr \\\012 ' ' > "${T}"/defines.IUSE
- export DEFINES_IUSE=$( cat ${T}/defines.IUSE )
- done
-}
-
-extensions_add_make_conf()
-{
- # copy all ifdef for extensions-patch to Make.config
- sed -e '1,/need to touch the following:/d' \
- -e '/need to touch the following/,/^$/d' \
- Make.config.template >> Make.config
-}
-
-extensions_all_defines() {
- # extract all possible settings for extensions-patch
- sed -e '/^#\?[A-Z].*= 1/!d' -e 's/^#\?//' -e 's/ .*//' \
- Make.config.template \
- | sort \
- | tr '[:upper:]' '[:lower:]'
-}
-
-lang_po() {
- LING_PO=$( ls ${S}/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' )
-}
-
-src_prepare() {
- # apply maintainace-patches
-
- ebegin "Changing paths for gentoo"
-
- local DVBDIR=/usr/include
- local i
- for i in ${DVB_HEADER_PATH} /usr/include/v4l-dvb-hg /usr/include; do
- [[ -d ${i} ]] || continue
- if [[ -f ${i}/linux/dvb/dmx.h ]]; then
- einfo "Found DVB header files in ${i}"
- DVBDIR=${i}
- break
- fi
- done
-
- # checking for s2api headers
- local api_version
- api_version=$(awk -F' ' '/define DVB_API_VERSION / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
- api_version=${api_version}*$(awk -F' ' '/define DVB_API_VERSION_MINOR / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
-
- if [[ ${api_version:-0} -lt 5*3 ]]; then
- eerror "DVB header files do not contain s2api support or too old for ${P}"
- eerror "You cannot compile VDR against old dvb-header"
- die "DVB headers too old"
- fi
-
- cat > Make.config <<-EOT
- #
- # Generated by ebuild ${PF}
- #
- PREFIX = /usr
- DVBDIR = ${DVBDIR}
- PLUGINLIBDIR = ${PLUGIN_LIBDIR}
- CONFDIR = ${CONF_DIR}
- VIDEODIR = /var/vdr/video
- LOCDIR = \$(PREFIX)/share/locale
- INCDIR = \$(PREFIX)/include
-
- DEFINES += -DCONFDIR=\"\$(CONFDIR)\"
- INCLUDES += -I\$(DVBDIR)
-
- # >=vdr-1.7.36-r1; parameter only used for compiletime on vdr
- # PLUGINLIBDIR (plugin Makefile old) = LIBDIR (plugin Makefile new)
- LIBDIR = ${PLUGIN_LIBDIR}
- PCDIR = /usr/$(get_libdir)/pkgconfig
- EOT
- eend 0
-
- # support languages, written from right to left
- BUILD_PARAMS+=" BIDI=$(usex bidi 1 0)"
-
- epatch "${FILESDIR}/${PN}-2.1.1_gentoo.patch"
-# epatch "${WORKDIR}/${P}-gcc.patch" # tmp gcc fix from Rolf Ahrenberg
-
- if ! use vanilla; then
-
- # Now apply extensions patch
- epatch "${WORKDIR}/${EXT_P}.patch"
-
- # This allows us to start even if some plugin does not exist
- # or is not loadable.
- enable_patch PLUGINMISSING
-
- if [[ -n ${VDR_MAINTAINER_MODE} ]]; then
- einfo "Doing maintainer checks:"
-
- # we do not support these patches
- # (or have them already hard enabled)
- local IGNORE_PATCHES="pluginmissing"
-
- extensions_all_defines > "${T}"/new.IUSE
- echo $EXT_PATCH_FLAGS $EXT_PATCH_FLAGS_RENAMED_EXT_NAME \
- $IGNORE_PATCHES | \
- tr ' ' '\n' |sort > "${T}"/old.IUSE
- local DIFFS=$(diff -u "${T}"/old.IUSE "${T}"/new.IUSE|grep '^[+-][^+-]')
- if [[ -z ${DIFFS} ]]; then
- einfo "EXT_PATCH_FLAGS is up to date."
- else
- ewarn "IUSE differences!"
- local diff
- for diff in $DIFFS; do
- ewarn "$diff"
- done
- fi
- fi
-
- ebegin "Enabling selected patches"
- local flag
- for flag in $EXT_PATCH_FLAGS; do
- use $flag && enable_patch ${flag}
- done
-
- eend 0
-
- extensions_add_make_conf
-
- # add defined use-flags compile options to vdr.pc
- sed -e "s:\$(CDEFINES) \$(CINCLUDES) \$(HDRDIR):\$(CDEFINES) \$(CINCLUDES) \$(HDRDIR) \$(DEFINES_IUSE):" \
- -i Makefile
-
- ebegin "Make depend"
- emake .dependencies >/dev/null
- eend $? "make depend failed"
- fi
-
- epatch_user
-
- add_cap CAP_UTF8
-
- add_cap CAP_IRCTRL_RUNTIME_PARAM \
- CAP_VFAT_RUNTIME_PARAM \
- CAP_CHUID \
- CAP_SHUTDOWN_AUTO_RETRY
-
- echo -e ${CAPS} > "${CAP_FILE}"
-
- # LINGUAS support
- einfo "\n \t VDR supports the LINGUAS values"
-
- lang_po
-
- einfo "\t Please set one of this values in your sytem make.conf"
- einfo "\t LINGUAS=\"${LING_PO}\"\n"
-
- if [[ -z ${LINGUAS} ]]; then
- einfo "\n \t No values in LINGUAS="
- einfo "\t You will get only english text on OSD \n"
- fi
-
- strip-linguas ${LING_PO} en
-}
-
-src_install() {
- # trick makefile not to create a videodir by supplying it with an existing
- # directory
- einstall \
- VIDEODIR="/" \
- DESTDIR="${D}" \
- || die "einstall failed"
-
- keepdir "${PLUGIN_LIBDIR}"
-
- keepdir "${CONF_DIR}"/plugins
- keepdir "${CONF_DIR}"/themes
-
- diropts -m0755 -ovdr -gvdr
- keepdir /var/cache/vdr
-
- if use html; then
- dohtml *.html
- fi
-
- dodoc MANUAL INSTALL README* HISTORY CONTRIBUTORS
-
- insinto /usr/share/vdr
- doins "${CAP_FILE}"
-
- if use alternatechannel; then
- insinto /etc/vdr
- doins "${FILESDIR}"/channel_alternative.conf
- fi
-
- chown -R vdr:vdr "${D}/${CONF_DIR}"
-}
-
-#pkg_preinst() {
-
-# example syntax...
-# has_version "<${CATEGORY}/${PN}-1.7.36"
-# previous_less_than_1_7_36=$?
-#}
-
-pkg_postinst() {
-
- elog "This is a *developer* version."
- elog "We strongly recommend that you only use it under controlled"
- elog "conditions and for testing and debugging."
-
- # correct wrong permission from earlier install
- CACHEOWNER="$(stat -c %U /var/cache/vdr)"
- if [ ! ${CACHEOWNER} == vdr ]; then
- chown -R vdr:vdr "${ROOT}/var/cache/vdr"
- fi
-
-# example syntax
-# if [[ previous_less_than_1_7_36=$? = 0 ]] ; then
- #elog "bla foo"
-# fi
-
- elog "It is a good idea to run vdrplugin-rebuild now."
-
- elog "To get nice symbols in OSD we recommend to install"
- elog "\t1. emerge media-fonts/vdrsymbols-ttf"
- elog "\t2. select font VDRSymbolsSans in Setup"
- elog ""
- elog "To get an idea how to proceed now, have a look at our vdr-guide:"
- elog "\thttps://wiki.gentoo.org/wiki/VDR"
-}
diff --git a/media-video/vdr/vdr-2.1.7.ebuild b/media-video/vdr/vdr-2.1.7.ebuild
deleted file mode 100644
index 8ddd95a..0000000
--- a/media-video/vdr/vdr-2.1.7.ebuild
+++ /dev/null
@@ -1,307 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-2.0.2-r1.ebuild,v 1.2 2013/07/07 09:52:20 hd_brummy Exp $
-
-EAPI=5
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-# Switches supported by extensions-patch
-EXT_PATCH_FLAGS="alternatechannel binaryskip graphtft jumpingseconds jumpplay naludump permashift
- permashift_v1 pinplugin mainmenuhooks menuorg menuselection resumereset ttxtsubs wareagleicon yaepg"
-# ddepgentry
-
-# names of the use-flags
-EXT_PATCH_FLAGS_RENAMED=""
-
-# names ext-patch uses internally, here only used for maintainer checks
-EXT_PATCH_FLAGS_RENAMED_EXT_NAME=""
-
-IUSE="bidi debug html systemd vanilla ${EXT_PATCH_FLAGS} ${EXT_PATCH_FLAGS_RENAMED}"
-
-MY_PV="${PV%_p*}"
-MY_P="${PN}-${MY_PV}"
-S="${WORKDIR}/${MY_P}"
-
-EXT_P="extpng-${PN}-2.1.6-gentoo-edition-v2"
-
-DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB"
-HOMEPAGE="http://www.tvdr.de/"
-SRC_URI="ftp://ftp.tvdr.de/vdr/Developer/${MY_P}.tar.bz2
- http://dev.gentoo.org/~hd_brummy/distfiles/${EXT_P}.patch.bz2"
-
-KEYWORDS="~arm ~amd64 ~ppc ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-
-REQUIRED_USE="
- permashift? ( !permashift_v1 )
- permashift_v1? ( !permashift )"
-
-COMMON_DEPEND="virtual/jpeg
- sys-libs/libcap
- >=media-libs/fontconfig-2.4.2
- >=media-libs/freetype-2"
-
-DEPEND="${COMMON_DEPEND}
- >=virtual/linuxtv-dvb-headers-5.3
- sys-devel/gettext"
-
-RDEPEND="${COMMON_DEPEND}
- dev-lang/perl
- >=media-tv/gentoo-vdr-scripts-2.5_rc1
- media-fonts/corefonts
- bidi? ( dev-libs/fribidi )
- systemd? ( sys-apps/systemd )"
-
-CONF_DIR=/etc/vdr
-CAP_FILE=${S}/capabilities.sh
-CAPS="# Capabilities of the vdr-executable for use by startscript etc."
-
-pkg_setup() {
-
- use debug && append-flags -g
-
- PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins"
-
- tc-export CC CXX AR
-}
-
-add_cap() {
- local arg
- for arg; do
- CAPS="${CAPS}\n${arg}=1"
- done
-}
-
-enable_patch() {
- local arg ARG_UPPER
- for arg; do
- ARG_UPPER=$(echo $arg|tr '[:lower:]' '[:upper:]')
- echo "${ARG_UPPER} = 1" >> Make.config
-
- # codesnippet to bring the extpng defines into the vdr.pc CXXFLAGS CFLAGS
- echo "-DUSE_${ARG_UPPER}" >> "${T}"/defines.tmp
- cat "${T}"/defines.tmp | tr \\\012 ' ' > "${T}"/defines.IUSE
- export DEFINES_IUSE=$( cat ${T}/defines.IUSE )
- done
-}
-
-extensions_add_make_conf()
-{
- # copy all ifdef for extensions-patch to Make.config
- sed -e '1,/need to touch the following:/d' \
- -e '/need to touch the following/,/^$/d' \
- Make.config.template >> Make.config
-}
-
-extensions_all_defines() {
- # extract all possible settings for extensions-patch
- sed -e '/^#\?[A-Z].*= 1/!d' -e 's/^#\?//' -e 's/ .*//' \
- Make.config.template \
- | sort \
- | tr '[:upper:]' '[:lower:]'
-}
-
-lang_po() {
- LING_PO=$( ls ${S}/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' )
-}
-
-src_prepare() {
- # apply maintainace-patches
- ebegin "Changing paths for gentoo"
-
- local DVBDIR=/usr/include
- local i
- for i in ${DVB_HEADER_PATH} /usr/include/v4l-dvb-hg /usr/include; do
- [[ -d ${i} ]] || continue
- if [[ -f ${i}/linux/dvb/dmx.h ]]; then
- einfo "Found DVB header files in ${i}"
- DVBDIR=${i}
- break
- fi
- done
-
- # checking for s2api headers
- local api_version
- api_version=$(awk -F' ' '/define DVB_API_VERSION / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
- api_version=${api_version}*$(awk -F' ' '/define DVB_API_VERSION_MINOR / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
-
- if [[ ${api_version:-0} -lt 5*3 ]]; then
- eerror "DVB header files do not contain s2api support or too old for ${P}"
- eerror "You cannot compile VDR against old dvb-header"
- die "DVB headers too old"
- fi
-
- cat > Make.config <<-EOT
- #
- # Generated by ebuild ${PF}
- #
- PREFIX = /usr
- DVBDIR = ${DVBDIR}
- PLUGINLIBDIR = ${PLUGIN_LIBDIR}
- CONFDIR = ${CONF_DIR}
- VIDEODIR = /var/vdr/video
- LOCDIR = \$(PREFIX)/share/locale
- INCDIR = \$(PREFIX)/include
-
- DEFINES += -DCONFDIR=\"\$(CONFDIR)\"
- INCLUDES += -I\$(DVBDIR)
-
- # >=vdr-1.7.36-r1; parameter only used for compiletime on vdr
- # PLUGINLIBDIR (plugin Makefile old) = LIBDIR (plugin Makefile new)
- LIBDIR = ${PLUGIN_LIBDIR}
- PCDIR = /usr/$(get_libdir)/pkgconfig
- EOT
- eend 0
-
- # support languages, written from right to left
- BUILD_PARAMS+=" BIDI=$(usex bidi 1 0)"
-
- # systemd support
- BUILD_PARAMS+=" SDNOTIFY=$(usex systemd 1 0)"
-
- epatch "${FILESDIR}/${P}_gentoo.patch"
- epatch "${FILESDIR}/${P}_C++11.patch"
-
- if ! use vanilla; then
-
- # Now apply extensions patch
- epatch "${WORKDIR}/${EXT_P}.patch"
-
- # This allows us to start even if some plugin does not exist
- # or is not loadable.
- enable_patch PLUGINMISSING
-
- if [[ -n ${VDR_MAINTAINER_MODE} ]]; then
- einfo "Doing maintainer checks:"
-
- # we do not support these patches
- # (or have them already hard enabled)
- local IGNORE_PATCHES="pluginmissing"
-
- extensions_all_defines > "${T}"/new.IUSE
- echo $EXT_PATCH_FLAGS $EXT_PATCH_FLAGS_RENAMED_EXT_NAME \
- $IGNORE_PATCHES | \
- tr ' ' '\n' |sort > "${T}"/old.IUSE
- local DIFFS=$(diff -u "${T}"/old.IUSE "${T}"/new.IUSE|grep '^[+-][^+-]')
- if [[ -z ${DIFFS} ]]; then
- einfo "EXT_PATCH_FLAGS is up to date."
- else
- ewarn "IUSE differences!"
- local diff
- for diff in $DIFFS; do
- ewarn "$diff"
- done
- fi
- fi
-
- ebegin "Enabling selected patches"
- local flag
- for flag in $EXT_PATCH_FLAGS; do
- use $flag && enable_patch ${flag}
- done
-
- eend 0
-
- extensions_add_make_conf
-
- # add defined use-flags compile options to vdr.pc
- sed -e "s:\$(CDEFINES) \$(CINCLUDES) \$(HDRDIR):\$(CDEFINES) \$(CINCLUDES) \$(HDRDIR) \$(DEFINES_IUSE):" \
- -i Makefile
-
- ebegin "Make depend"
- emake .dependencies >/dev/null
- eend $? "make depend failed"
- fi
-
- epatch_user
-
- add_cap CAP_UTF8
-
- add_cap CAP_IRCTRL_RUNTIME_PARAM \
- CAP_VFAT_RUNTIME_PARAM \
- CAP_CHUID \
- CAP_SHUTDOWN_AUTO_RETRY
-
- echo -e ${CAPS} > "${CAP_FILE}"
-
- # LINGUAS support
- einfo "\n \t VDR supports the LINGUAS values"
-
- lang_po
-
- einfo "\t Please set one of this values in your sytem make.conf"
- einfo "\t LINGUAS=\"${LING_PO}\"\n"
-
- if [[ -z ${LINGUAS} ]]; then
- einfo "\n \t No values in LINGUAS="
- einfo "\t You will get only english text on OSD \n"
- fi
-
- strip-linguas ${LING_PO} en
-}
-
-src_install() {
- # trick makefile not to create a videodir by supplying it with an existing
- # directory
- emake \
- VIDEODIR="/" \
- DESTDIR="${D}" install || die "emake install failed"
-
- keepdir "${PLUGIN_LIBDIR}"
-
- keepdir "${CONF_DIR}"/plugins
- keepdir "${CONF_DIR}"/themes
- keepdir "${CONF_DIR}"/conf.d
-
- if use html; then
- dohtml *.html
- fi
-
- dodoc MANUAL INSTALL README* HISTORY CONTRIBUTORS
-
- insinto /usr/share/vdr
- doins "${CAP_FILE}"
-
- if use alternatechannel; then
- insinto /etc/vdr
- doins "${FILESDIR}"/channel_alternative.conf
- fi
-
- chown -R vdr:vdr "${D}/${CONF_DIR}"
-}
-
-#pkg_preinst() {
-
-# example syntax...
-# has_version "<${CATEGORY}/${PN}-1.7.36"
-# previous_less_than_1_7_36=$?
-#}
-
-pkg_postinst() {
-
- elog "This is a *developer* version."
- elog "We strongly recommend that you only use it under controlled"
- elog "conditions and for testing and debugging."
-
- # correct wrong permission from earlier install
- CACHEOWNER="$(stat -c %U /var/cache/vdr)"
- if [ ! ${CACHEOWNER} == vdr ]; then
- chown -R vdr:vdr "${ROOT}/var/cache/vdr"
- fi
-
-# example syntax
-# if [[ previous_less_than_1_7_36=$? = 0 ]] ; then
- #elog "bla foo"
-# fi
-
- elog "It is a good idea to run vdrplugin-rebuild now."
-
- elog "To get nice symbols in OSD we recommend to install"
- elog "\t1. emerge media-fonts/vdrsymbols-ttf"
- elog "\t2. select font VDRSymbolsSans in Setup"
- elog ""
- elog "To get an idea how to proceed now, have a look at our vdr-guide:"
- elog "\thttps://wiki.gentoo.org/wiki/VDR"
-}
diff --git a/media-video/vdr/vdr-2.1.8-r2.ebuild b/media-video/vdr/vdr-2.1.8-r2.ebuild
deleted file mode 100644
index 91707aa..0000000
--- a/media-video/vdr/vdr-2.1.8-r2.ebuild
+++ /dev/null
@@ -1,315 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-2.0.2-r1.ebuild,v 1.2 2013/07/07 09:52:20 hd_brummy Exp $
-
-EAPI=5
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-# Switches supported by extensions-patch
-EXT_PATCH_FLAGS="alternatechannel graphtft naludump permashift
- permashift_v1 pinplugin mainmenuhooks menuorg menuselection resumereset ttxtsubs wareagleicon"
-
-# names of the use-flags
-EXT_PATCH_FLAGS_RENAMED=""
-
-# names ext-patch uses internally, here only used for maintainer checks
-EXT_PATCH_FLAGS_RENAMED_EXT_NAME=""
-
-IUSE="bidi debug html systemd vanilla ${EXT_PATCH_FLAGS} ${EXT_PATCH_FLAGS_RENAMED}"
-
-MY_PV="${PV%_p*}"
-MY_P="${PN}-${MY_PV}"
-S="${WORKDIR}/${MY_P}"
-
-EXT_P="extpng-${P}-gentoo-edition-v2"
-
-DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB"
-HOMEPAGE="http://www.tvdr.de/"
-SRC_URI="ftp://ftp.tvdr.de/vdr/Developer/${MY_P}.tar.bz2
- http://dev.gentoo.org/~hd_brummy/distfiles/${EXT_P}.patch.bz2"
-
-KEYWORDS="~arm ~amd64 ~ppc ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-
-REQUIRED_USE="
- permashift? ( !permashift_v1 )
- permashift_v1? ( !permashift )"
-
-COMMON_DEPEND="virtual/jpeg
- sys-libs/libcap
- >=media-libs/fontconfig-2.4.2
- >=media-libs/freetype-2"
-
-DEPEND="${COMMON_DEPEND}
- >=virtual/linuxtv-dvb-headers-5.3
- sys-devel/gettext"
-
-RDEPEND="${COMMON_DEPEND}
- dev-lang/perl
- >=media-tv/gentoo-vdr-scripts-2.5_rc1
- media-fonts/corefonts
- bidi? ( dev-libs/fribidi )
- systemd? ( sys-apps/systemd )"
-
-CONF_DIR=/etc/vdr
-CAP_FILE=${S}/capabilities.sh
-CAPS="# Capabilities of the vdr-executable for use by startscript etc."
-
-pkg_setup() {
-
- use debug && append-flags -g
-
- PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins"
-
- tc-export CC CXX AR
-}
-
-add_cap() {
- local arg
- for arg; do
- CAPS="${CAPS}\n${arg}=1"
- done
-}
-
-enable_patch() {
- local arg ARG_UPPER
- for arg; do
- ARG_UPPER=$(echo $arg|tr '[:lower:]' '[:upper:]')
- echo "${ARG_UPPER} = 1" >> Make.config
-
- # codesnippet to bring the extpng defines into the vdr.pc CXXFLAGS CFLAGS
- echo "-DUSE_${ARG_UPPER}" >> "${T}"/defines.tmp
- cat "${T}"/defines.tmp | tr \\\012 ' ' > "${T}"/defines.IUSE
- export DEFINES_IUSE=$( cat ${T}/defines.IUSE )
- done
-}
-
-extensions_add_make_conf()
-{
- # copy all ifdef for extensions-patch to Make.config
- sed -e '1,/need to touch the following:/d' \
- -e '/need to touch the following/,/^$/d' \
- Make.config.template >> Make.config
-}
-
-extensions_all_defines() {
- # extract all possible settings for extensions-patch
- sed -e '/^#\?[A-Z].*= 1/!d' -e 's/^#\?//' -e 's/ .*//' \
- Make.config.template \
- | sort \
- | tr '[:upper:]' '[:lower:]'
-}
-
-lang_po() {
- LING_PO=$( ls ${S}/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' )
-}
-
-src_prepare() {
- # apply maintainace-patches
- ebegin "Changing paths for gentoo"
-
- local DVBDIR=/usr/include
- local i
- for i in ${DVB_HEADER_PATH} /usr/include/v4l-dvb-hg /usr/include; do
- [[ -d ${i} ]] || continue
- if [[ -f ${i}/linux/dvb/dmx.h ]]; then
- einfo "Found DVB header files in ${i}"
- DVBDIR=${i}
- break
- fi
- done
-
- # checking for s2api headers
- local api_version
- api_version=$(awk -F' ' '/define DVB_API_VERSION / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
- api_version=${api_version}*$(awk -F' ' '/define DVB_API_VERSION_MINOR / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
-
- if [[ ${api_version:-0} -lt 5*3 ]]; then
- eerror "DVB header files do not contain s2api support or too old for ${P}"
- eerror "You cannot compile VDR against old dvb-header"
- die "DVB headers too old"
- fi
-
- cat > Make.config <<-EOT
- #
- # Generated by ebuild ${PF}
- #
- PREFIX = /usr
- DVBDIR = ${DVBDIR}
- PLUGINLIBDIR = ${PLUGIN_LIBDIR}
- CONFDIR = ${CONF_DIR}
- VIDEODIR = /var/vdr/video
- LOCDIR = \$(PREFIX)/share/locale
- INCDIR = \$(PREFIX)/include
-
- DEFINES += -DCONFDIR=\"\$(CONFDIR)\"
- INCLUDES += -I\$(DVBDIR)
-
- # >=vdr-1.7.36-r1; parameter only used for compiletime on vdr
- # PLUGINLIBDIR (plugin Makefile old) = LIBDIR (plugin Makefile new)
- LIBDIR = ${PLUGIN_LIBDIR}
- PCDIR = /usr/$(get_libdir)/pkgconfig
- EOT
- eend 0
-
- # support languages, written from right to left
- BUILD_PARAMS+=" BIDI=$(usex bidi 1 0)"
-
- # systemd support
- BUILD_PARAMS+=" SDNOTIFY=$(usex systemd 1 0)"
-
- if ! use vanilla; then
-
- # Now apply extensions patch
- epatch "${WORKDIR}/${EXT_P}.patch"
-
- # This allows us to start even if some plugin does not exist
- # or is not loadable.
- enable_patch PLUGINMISSING
-
- if [[ -n ${VDR_MAINTAINER_MODE} ]]; then
- einfo "Doing maintainer checks:"
-
- # we do not support these patches
- # (or have them already hard enabled)
- local IGNORE_PATCHES="pluginmissing"
-
- extensions_all_defines > "${T}"/new.IUSE
- echo $EXT_PATCH_FLAGS $EXT_PATCH_FLAGS_RENAMED_EXT_NAME \
- $IGNORE_PATCHES | \
- tr ' ' '\n' |sort > "${T}"/old.IUSE
- local DIFFS=$(diff -u "${T}"/old.IUSE "${T}"/new.IUSE|grep '^[+-][^+-]')
- if [[ -z ${DIFFS} ]]; then
- einfo "EXT_PATCH_FLAGS is up to date."
- else
- ewarn "IUSE differences!"
- local diff
- for diff in $DIFFS; do
- ewarn "$diff"
- done
- fi
- fi
-
- ebegin "Enabling selected patches"
- local flag
- for flag in $EXT_PATCH_FLAGS; do
- use $flag && enable_patch ${flag}
- done
-
- eend 0
-
- extensions_add_make_conf
-
- # add defined use-flags compile options to vdr.pc
- sed -e "s:\$(CDEFINES) \$(CINCLUDES) \$(HDRDIR):\$(CDEFINES) \$(CINCLUDES) \$(HDRDIR) \$(DEFINES_IUSE):" \
- -i Makefile
-
- ebegin "Make depend"
- emake .dependencies >/dev/null
- eend $? "make depend failed"
- fi
-
- epatch "${FILESDIR}/${P}_gentoo.patch"
-
- # test request from upstream
- # http://www.vdr-portal.de/index.php?page=Thread&postID=1230810
- einfo "\ntest request from upstream maintainer"
- einfo "http://www.vdr-portal.de/index.php?page=Thread&postID=1230810"
- epatch "${FILESDIR}/01_vdr-2.1.8-eit-memleak-v1.diff"
- epatch "${FILESDIR}/02_vdr-2.1.8-binaryskipstrict.diff"
- epatch "${FILESDIR}/03_vdr-2.1.8-scheduleswitch.diff"
- epatch "${FILESDIR}/04_vdr-2.1.8-scheduleswitchblue.diff"
- epatch "${FILESDIR}/06_vdr-2.1.8-skipeditedresume.diff"
-
- epatch_user
-
- add_cap CAP_UTF8
-
- add_cap CAP_IRCTRL_RUNTIME_PARAM \
- CAP_VFAT_RUNTIME_PARAM \
- CAP_CHUID \
- CAP_SHUTDOWN_AUTO_RETRY
-
- echo -e ${CAPS} > "${CAP_FILE}"
-
- # LINGUAS support
- einfo "\n \t VDR supports the LINGUAS values"
-
- lang_po
-
- einfo "\t Please set one of this values in your sytem make.conf"
- einfo "\t LINGUAS=\"${LING_PO}\"\n"
-
- if [[ -z ${LINGUAS} ]]; then
- einfo "\n \t No values in LINGUAS="
- einfo "\t You will get only english text on OSD \n"
- fi
-
- strip-linguas ${LING_PO} en
-}
-
-src_install() {
- # trick makefile not to create a videodir by supplying it with an existing
- # directory
- emake \
- VIDEODIR="/" \
- DESTDIR="${D}" install || die "emake install failed"
-
- keepdir "${PLUGIN_LIBDIR}"
-
- keepdir "${CONF_DIR}"/plugins
- keepdir "${CONF_DIR}"/themes
- keepdir "${CONF_DIR}"/conf.d
-
- if use html; then
- dohtml *.html
- fi
-
- dodoc MANUAL INSTALL README* HISTORY CONTRIBUTORS
-
- insinto /usr/share/vdr
- doins "${CAP_FILE}"
-
- if use alternatechannel; then
- insinto /etc/vdr
- doins "${FILESDIR}"/channel_alternative.conf
- fi
-
- chown -R vdr:vdr "${D}/${CONF_DIR}"
-}
-
-#pkg_preinst() {
-
-# example syntax...
-# has_version "<${CATEGORY}/${PN}-1.7.36"
-# previous_less_than_1_7_36=$?
-#}
-
-pkg_postinst() {
-
- elog "This is a *developer* version."
- elog "We strongly recommend that you only use it under controlled"
- elog "conditions and for testing and debugging."
-
- # correct wrong permission from earlier install
- CACHEOWNER="$(stat -c %U /var/cache/vdr)"
- if [ ! ${CACHEOWNER} == vdr ]; then
- chown -R vdr:vdr "${ROOT}/var/cache/vdr"
- fi
-
-# example syntax
-# if [[ previous_less_than_1_7_36=$? = 0 ]] ; then
- #elog "bla foo"
-# fi
-
- elog "It is a good idea to run vdrplugin-rebuild now."
-
- elog "To get nice symbols in OSD we recommend to install"
- elog "\t1. emerge media-fonts/vdrsymbols-ttf"
- elog "\t2. select font VDRSymbolsSans in Setup"
- elog ""
- elog "To get an idea how to proceed now, have a look at our vdr-guide:"
- elog "\thttps://wiki.gentoo.org/wiki/VDR"
-}
diff --git a/media-video/vdr/vdr-2.1.8.ebuild b/media-video/vdr/vdr-2.1.8.ebuild
deleted file mode 100644
index fcb81e5..0000000
--- a/media-video/vdr/vdr-2.1.8.ebuild
+++ /dev/null
@@ -1,305 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-2.0.2-r1.ebuild,v 1.2 2013/07/07 09:52:20 hd_brummy Exp $
-
-EAPI=5
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-# Switches supported by extensions-patch
-EXT_PATCH_FLAGS="alternatechannel graphtft naludump permashift
- permashift_v1 pinplugin mainmenuhooks menuorg menuselection resumereset ttxtsubs wareagleicon"
-
-# names of the use-flags
-EXT_PATCH_FLAGS_RENAMED=""
-
-# names ext-patch uses internally, here only used for maintainer checks
-EXT_PATCH_FLAGS_RENAMED_EXT_NAME=""
-
-IUSE="bidi debug html systemd vanilla ${EXT_PATCH_FLAGS} ${EXT_PATCH_FLAGS_RENAMED}"
-
-MY_PV="${PV%_p*}"
-MY_P="${PN}-${MY_PV}"
-S="${WORKDIR}/${MY_P}"
-
-EXT_P="extpng-${P}-gentoo-edition-v2"
-
-DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB"
-HOMEPAGE="http://www.tvdr.de/"
-SRC_URI="ftp://ftp.tvdr.de/vdr/Developer/${MY_P}.tar.bz2
- http://dev.gentoo.org/~hd_brummy/distfiles/${EXT_P}.patch.bz2"
-
-KEYWORDS="~arm ~amd64 ~ppc ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-
-REQUIRED_USE="
- permashift? ( !permashift_v1 )
- permashift_v1? ( !permashift )"
-
-COMMON_DEPEND="virtual/jpeg
- sys-libs/libcap
- >=media-libs/fontconfig-2.4.2
- >=media-libs/freetype-2"
-
-DEPEND="${COMMON_DEPEND}
- >=virtual/linuxtv-dvb-headers-5.3
- sys-devel/gettext"
-
-RDEPEND="${COMMON_DEPEND}
- dev-lang/perl
- >=media-tv/gentoo-vdr-scripts-2.5_rc1
- media-fonts/corefonts
- bidi? ( dev-libs/fribidi )
- systemd? ( sys-apps/systemd )"
-
-CONF_DIR=/etc/vdr
-CAP_FILE=${S}/capabilities.sh
-CAPS="# Capabilities of the vdr-executable for use by startscript etc."
-
-pkg_setup() {
-
- use debug && append-flags -g
-
- PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins"
-
- tc-export CC CXX AR
-}
-
-add_cap() {
- local arg
- for arg; do
- CAPS="${CAPS}\n${arg}=1"
- done
-}
-
-enable_patch() {
- local arg ARG_UPPER
- for arg; do
- ARG_UPPER=$(echo $arg|tr '[:lower:]' '[:upper:]')
- echo "${ARG_UPPER} = 1" >> Make.config
-
- # codesnippet to bring the extpng defines into the vdr.pc CXXFLAGS CFLAGS
- echo "-DUSE_${ARG_UPPER}" >> "${T}"/defines.tmp
- cat "${T}"/defines.tmp | tr \\\012 ' ' > "${T}"/defines.IUSE
- export DEFINES_IUSE=$( cat ${T}/defines.IUSE )
- done
-}
-
-extensions_add_make_conf()
-{
- # copy all ifdef for extensions-patch to Make.config
- sed -e '1,/need to touch the following:/d' \
- -e '/need to touch the following/,/^$/d' \
- Make.config.template >> Make.config
-}
-
-extensions_all_defines() {
- # extract all possible settings for extensions-patch
- sed -e '/^#\?[A-Z].*= 1/!d' -e 's/^#\?//' -e 's/ .*//' \
- Make.config.template \
- | sort \
- | tr '[:upper:]' '[:lower:]'
-}
-
-lang_po() {
- LING_PO=$( ls ${S}/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' )
-}
-
-src_prepare() {
- # apply maintainace-patches
- ebegin "Changing paths for gentoo"
-
- local DVBDIR=/usr/include
- local i
- for i in ${DVB_HEADER_PATH} /usr/include/v4l-dvb-hg /usr/include; do
- [[ -d ${i} ]] || continue
- if [[ -f ${i}/linux/dvb/dmx.h ]]; then
- einfo "Found DVB header files in ${i}"
- DVBDIR=${i}
- break
- fi
- done
-
- # checking for s2api headers
- local api_version
- api_version=$(awk -F' ' '/define DVB_API_VERSION / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
- api_version=${api_version}*$(awk -F' ' '/define DVB_API_VERSION_MINOR / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
-
- if [[ ${api_version:-0} -lt 5*3 ]]; then
- eerror "DVB header files do not contain s2api support or too old for ${P}"
- eerror "You cannot compile VDR against old dvb-header"
- die "DVB headers too old"
- fi
-
- cat > Make.config <<-EOT
- #
- # Generated by ebuild ${PF}
- #
- PREFIX = /usr
- DVBDIR = ${DVBDIR}
- PLUGINLIBDIR = ${PLUGIN_LIBDIR}
- CONFDIR = ${CONF_DIR}
- VIDEODIR = /var/vdr/video
- LOCDIR = \$(PREFIX)/share/locale
- INCDIR = \$(PREFIX)/include
-
- DEFINES += -DCONFDIR=\"\$(CONFDIR)\"
- INCLUDES += -I\$(DVBDIR)
-
- # >=vdr-1.7.36-r1; parameter only used for compiletime on vdr
- # PLUGINLIBDIR (plugin Makefile old) = LIBDIR (plugin Makefile new)
- LIBDIR = ${PLUGIN_LIBDIR}
- PCDIR = /usr/$(get_libdir)/pkgconfig
- EOT
- eend 0
-
- # support languages, written from right to left
- BUILD_PARAMS+=" BIDI=$(usex bidi 1 0)"
-
- # systemd support
- BUILD_PARAMS+=" SDNOTIFY=$(usex systemd 1 0)"
-
- if ! use vanilla; then
-
- # Now apply extensions patch
- epatch "${WORKDIR}/${EXT_P}.patch"
-
- # This allows us to start even if some plugin does not exist
- # or is not loadable.
- enable_patch PLUGINMISSING
-
- if [[ -n ${VDR_MAINTAINER_MODE} ]]; then
- einfo "Doing maintainer checks:"
-
- # we do not support these patches
- # (or have them already hard enabled)
- local IGNORE_PATCHES="pluginmissing"
-
- extensions_all_defines > "${T}"/new.IUSE
- echo $EXT_PATCH_FLAGS $EXT_PATCH_FLAGS_RENAMED_EXT_NAME \
- $IGNORE_PATCHES | \
- tr ' ' '\n' |sort > "${T}"/old.IUSE
- local DIFFS=$(diff -u "${T}"/old.IUSE "${T}"/new.IUSE|grep '^[+-][^+-]')
- if [[ -z ${DIFFS} ]]; then
- einfo "EXT_PATCH_FLAGS is up to date."
- else
- ewarn "IUSE differences!"
- local diff
- for diff in $DIFFS; do
- ewarn "$diff"
- done
- fi
- fi
-
- ebegin "Enabling selected patches"
- local flag
- for flag in $EXT_PATCH_FLAGS; do
- use $flag && enable_patch ${flag}
- done
-
- eend 0
-
- extensions_add_make_conf
-
- # add defined use-flags compile options to vdr.pc
- sed -e "s:\$(CDEFINES) \$(CINCLUDES) \$(HDRDIR):\$(CDEFINES) \$(CINCLUDES) \$(HDRDIR) \$(DEFINES_IUSE):" \
- -i Makefile
-
- ebegin "Make depend"
- emake .dependencies >/dev/null
- eend $? "make depend failed"
- fi
-
- epatch "${FILESDIR}/${P}_gentoo.patch"
-
- epatch_user
-
- add_cap CAP_UTF8
-
- add_cap CAP_IRCTRL_RUNTIME_PARAM \
- CAP_VFAT_RUNTIME_PARAM \
- CAP_CHUID \
- CAP_SHUTDOWN_AUTO_RETRY
-
- echo -e ${CAPS} > "${CAP_FILE}"
-
- # LINGUAS support
- einfo "\n \t VDR supports the LINGUAS values"
-
- lang_po
-
- einfo "\t Please set one of this values in your sytem make.conf"
- einfo "\t LINGUAS=\"${LING_PO}\"\n"
-
- if [[ -z ${LINGUAS} ]]; then
- einfo "\n \t No values in LINGUAS="
- einfo "\t You will get only english text on OSD \n"
- fi
-
- strip-linguas ${LING_PO} en
-}
-
-src_install() {
- # trick makefile not to create a videodir by supplying it with an existing
- # directory
- emake \
- VIDEODIR="/" \
- DESTDIR="${D}" install || die "emake install failed"
-
- keepdir "${PLUGIN_LIBDIR}"
-
- keepdir "${CONF_DIR}"/plugins
- keepdir "${CONF_DIR}"/themes
- keepdir "${CONF_DIR}"/conf.d
-
- if use html; then
- dohtml *.html
- fi
-
- dodoc MANUAL INSTALL README* HISTORY CONTRIBUTORS
-
- insinto /usr/share/vdr
- doins "${CAP_FILE}"
-
- if use alternatechannel; then
- insinto /etc/vdr
- doins "${FILESDIR}"/channel_alternative.conf
- fi
-
- chown -R vdr:vdr "${D}/${CONF_DIR}"
-}
-
-#pkg_preinst() {
-
-# example syntax...
-# has_version "<${CATEGORY}/${PN}-1.7.36"
-# previous_less_than_1_7_36=$?
-#}
-
-pkg_postinst() {
-
- elog "This is a *developer* version."
- elog "We strongly recommend that you only use it under controlled"
- elog "conditions and for testing and debugging."
-
- # correct wrong permission from earlier install
- CACHEOWNER="$(stat -c %U /var/cache/vdr)"
- if [ ! ${CACHEOWNER} == vdr ]; then
- chown -R vdr:vdr "${ROOT}/var/cache/vdr"
- fi
-
-# example syntax
-# if [[ previous_less_than_1_7_36=$? = 0 ]] ; then
- #elog "bla foo"
-# fi
-
- elog "It is a good idea to run vdrplugin-rebuild now."
-
- elog "To get nice symbols in OSD we recommend to install"
- elog "\t1. emerge media-fonts/vdrsymbols-ttf"
- elog "\t2. select font VDRSymbolsSans in Setup"
- elog ""
- elog "To get an idea how to proceed now, have a look at our vdr-guide:"
- elog "\thttps://wiki.gentoo.org/wiki/VDR"
-}
diff --git a/media-video/vdr/vdr-2.1.9.ebuild b/media-video/vdr/vdr-2.1.9.ebuild
deleted file mode 100644
index c04c127..0000000
--- a/media-video/vdr/vdr-2.1.9.ebuild
+++ /dev/null
@@ -1,295 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-2.0.2-r1.ebuild,v 1.2 2013/07/07 09:52:20 hd_brummy Exp $
-
-EAPI=5
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-# Switches supported by extensions-patch
-EXT_PATCH_FLAGS="alternatechannel graphtft naludump permashift_v1 pinplugin
- mainmenuhooks menuorg menuselection resumereset ttxtsubs"
-
-# names of the use-flags
-EXT_PATCH_FLAGS_RENAMED=""
-
-# names ext-patch uses internally, here only used for maintainer checks
-EXT_PATCH_FLAGS_RENAMED_EXT_NAME="bidi no_kbd sdnotify"
-
-IUSE="bidi debug kbd html systemd vanilla ${EXT_PATCH_FLAGS} ${EXT_PATCH_FLAGS_RENAMED}"
-
-MY_PV="${PV%_p*}"
-MY_P="${PN}-${MY_PV}"
-S="${WORKDIR}/${MY_P}"
-
-EXT_P="extpng-${P}-gentoo-edition-v1"
-
-DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB"
-HOMEPAGE="http://www.tvdr.de/"
-SRC_URI="ftp://ftp.tvdr.de/vdr/Developer/${MY_P}.tar.bz2
- http://dev.gentoo.org/~hd_brummy/distfiles/${EXT_P}.patch.bz2"
-
-KEYWORDS="~arm ~amd64 ~ppc ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-
-COMMON_DEPEND="virtual/jpeg
- sys-libs/libcap
- >=media-libs/fontconfig-2.4.2
- >=media-libs/freetype-2"
-
-DEPEND="${COMMON_DEPEND}
- >=virtual/linuxtv-dvb-headers-5.3
- sys-devel/gettext"
-
-RDEPEND="${COMMON_DEPEND}
- dev-lang/perl
- >=media-tv/gentoo-vdr-scripts-2.5_rc1
- media-fonts/corefonts
- bidi? ( dev-libs/fribidi )
- systemd? ( sys-apps/systemd )"
-
-CONF_DIR=/etc/vdr
-CAP_FILE=${S}/capabilities.sh
-CAPS="# Capabilities of the vdr-executable for use by startscript etc."
-
-pkg_setup() {
-
- use debug && append-flags -g
-
- PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins"
-
- tc-export CC CXX AR
-}
-
-add_cap() {
- local arg
- for arg; do
- CAPS="${CAPS}\n${arg}=1"
- done
-}
-
-enable_patch() {
- local arg ARG_UPPER
- for arg; do
- ARG_UPPER=$(echo $arg|tr '[:lower:]' '[:upper:]')
- echo "${ARG_UPPER} = 1" >> Make.config
-
- # codesnippet to bring the extpng defines into the vdr.pc CXXFLAGS CFLAGS
- echo "-DUSE_${ARG_UPPER}" >> "${T}"/defines.tmp
- cat "${T}"/defines.tmp | tr \\\012 ' ' > "${T}"/defines.IUSE
- export DEFINES_IUSE=$( cat ${T}/defines.IUSE )
- done
-}
-
-extensions_add_make_conf()
-{
- # copy all ifdef for extensions-patch to Make.config
- sed -e '1,/need to touch the following:/d' \
- -e '/need to touch the following/,/^$/d' \
- Make.config.template >> Make.config
-}
-
-extensions_all_defines() {
- # extract all possible settings for extensions-patch
- sed -e '/^#\?[A-Z].*= 1/!d' -e 's/^#\?//' -e 's/ .*//' \
- Make.config.template \
- | sort \
- | tr '[:upper:]' '[:lower:]'
-}
-
-lang_po() {
- LING_PO=$( ls ${S}/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' )
-}
-
-src_prepare() {
- # apply maintainace-patches
- ebegin "Changing paths for gentoo"
-
- local DVBDIR=/usr/include
- local i
- for i in ${DVB_HEADER_PATH} /usr/include/v4l-dvb-hg /usr/include; do
- [[ -d ${i} ]] || continue
- if [[ -f ${i}/linux/dvb/dmx.h ]]; then
- einfo "Found DVB header files in ${i}"
- DVBDIR=${i}
- break
- fi
- done
-
- # checking for s2api headers
- local api_version
- api_version=$(awk -F' ' '/define DVB_API_VERSION / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
- api_version=${api_version}*$(awk -F' ' '/define DVB_API_VERSION_MINOR / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
-
- if [[ ${api_version:-0} -lt 5*3 ]]; then
- eerror "DVB header files do not contain s2api support or too old for ${P}"
- eerror "You cannot compile VDR against old dvb-header"
- die "DVB headers too old"
- fi
-
- cat > Make.config <<-EOT
- #
- # Generated by ebuild ${PF}
- #
- PREFIX = /usr
- DVBDIR = ${DVBDIR}
- PLUGINLIBDIR = ${PLUGIN_LIBDIR}
- CONFDIR = ${CONF_DIR}
- VIDEODIR = /var/vdr/video
- LOCDIR = \$(PREFIX)/share/locale
- INCDIR = \$(PREFIX)/include
-
- DEFINES += -DCONFDIR=\"\$(CONFDIR)\"
- INCLUDES += -I\$(DVBDIR)
-
- # >=vdr-1.7.36-r1; parameter only used for compiletime on vdr
- # PLUGINLIBDIR (plugin Makefile old) = LIBDIR (plugin Makefile new)
- LIBDIR = ${PLUGIN_LIBDIR}
- PCDIR = /usr/$(get_libdir)/pkgconfig
-
- #BIDI = 1
- #SDNOTIFY = 1
- NO_KBD = 1
- EOT
- eend 0
-
- # support languages, written from right to left
- if use bidi; then
- sed -e "s:#BIDI = 1:BIDI = 1:" -i Make.config
- fi
-
- # systemd notification support
- if use systemd; then
- sed -e "s:#SDNOTIFY = 1:SDNOTIFY = 1:" -i Make.config
- fi
-
- # with/witout keyboard
- if use kbd; then
- sed -e "s:NO_KBD = 1:#NO_KBD = 1:" -i Make.config
- fi
-
- if ! use vanilla; then
-
- # Now apply extensions patch
- epatch "${WORKDIR}/${EXT_P}.patch"
-
- # This allows us to start even if some plugin does not exist
- # or is not loadable.
- enable_patch PLUGINMISSING
-
- if [[ -n ${VDR_MAINTAINER_MODE} ]]; then
- einfo "Doing maintainer checks:"
-
- # we do not support these patches
- # (or have them already hard enabled)
- local IGNORE_PATCHES="pluginmissing"
-
- extensions_all_defines > "${T}"/new.IUSE
- echo $EXT_PATCH_FLAGS $EXT_PATCH_FLAGS_RENAMED_EXT_NAME \
- $IGNORE_PATCHES | \
- tr ' ' '\n' |sort > "${T}"/old.IUSE
- local DIFFS=$(diff -u "${T}"/old.IUSE "${T}"/new.IUSE|grep '^[+-][^+-]')
- if [[ -z ${DIFFS} ]]; then
- einfo "EXT_PATCH_FLAGS is up to date."
- else
- ewarn "IUSE differences!"
- local diff
- for diff in $DIFFS; do
- ewarn "$diff"
- done
- fi
- fi
-
- ebegin "Enabling selected patches"
- local flag
- for flag in $EXT_PATCH_FLAGS; do
- use $flag && enable_patch ${flag}
- done
-
- eend 0
-
- extensions_add_make_conf
-
- # add defined use-flags compile options to vdr.pc
- sed -e "s:\$(CDEFINES) \$(CINCLUDES) \$(HDRDIR):\$(CDEFINES) \$(CINCLUDES) \$(HDRDIR) \$(DEFINES_IUSE):" \
- -i Makefile
-
- ebegin "Make depend"
- emake .dependencies >/dev/null
- eend $? "make depend failed"
- fi
-
- epatch "${FILESDIR}/${P}_gentoo.patch"
-
- epatch_user
-
- add_cap CAP_UTF8
-
- add_cap CAP_IRCTRL_RUNTIME_PARAM \
- CAP_VFAT_RUNTIME_PARAM \
- CAP_CHUID \
- CAP_SHUTDOWN_AUTO_RETRY
-
- echo -e ${CAPS} > "${CAP_FILE}"
-
- # LINGUAS support
- einfo "\n \t VDR supports the LINGUAS values"
-
- lang_po
-
- einfo "\t Please set one of this values in your sytem make.conf"
- einfo "\t LINGUAS=\"${LING_PO}\"\n"
-
- if [[ -z ${LINGUAS} ]]; then
- einfo "\n \t No values in LINGUAS="
- einfo "\t You will get only english text on OSD \n"
- fi
-
- strip-linguas ${LING_PO} en
-}
-
-src_install() {
- # trick makefile not to create a videodir by supplying it with an existing
- # directory
- emake \
- VIDEODIR="/" \
- DESTDIR="${D}" install || die "emake install failed"
-
- keepdir "${PLUGIN_LIBDIR}"
-
- # backup for plugins they don't be able to create this dir
- keepdir "${CONF_DIR}"/plugins
-
- if use html; then
- dohtml *.html
- fi
-
- dodoc MANUAL INSTALL README* HISTORY CONTRIBUTORS
-
- insinto /usr/share/vdr
- doins "${CAP_FILE}"
-
- if use alternatechannel; then
- insinto /etc/vdr
- doins "${FILESDIR}"/channel_alternative.conf
- fi
-
- chown -R vdr:vdr "${D}/${CONF_DIR}"
-}
-
-pkg_postinst() {
-
-# elog "\n\t---- 15 YEARS ANNIVERSARY EDITON ----\n"
-# elog "\tA lot of thanks to Klaus Schmiedinger"
-# elog "\tfor this nice piece of Software...\n"
-
- elog "It is a good idea to run vdrplugin-rebuild now."
-
- elog "To get nice symbols in OSD we recommend to install"
- elog "\t1. emerge media-fonts/vdrsymbols-ttf"
- elog "\t2. select font VDRSymbolsSans in Setup"
- elog ""
- elog "To get an idea how to proceed now, have a look at our vdr-guide:"
- elog "\thttps://wiki.gentoo.org/wiki/VDR"
-}
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2015-02-20 23:12 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-02-04 10:38 [gentoo-commits] proj/vdr/devel:master commit in: media-video/vdr/, media-video/vdr/files/ Joerg Bornkessel
-- strict thread matches above, loose matches on Subject: below --
2015-02-20 12:32 Joerg Bornkessel
2015-02-11 21:51 Joerg Bornkessel
2015-02-11 14:14 Joerg Bornkessel
2015-02-08 20:30 Joerg Bornkessel
2015-02-01 16:59 Joerg Bornkessel
2015-01-22 2:32 Joerg Bornkessel
2014-10-03 22:01 Joerg Bornkessel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox