public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/vdr/devel:master commit in: media-video/vdr/files/, media-video/vdr/
@ 2015-02-03 11:50 Joerg Bornkessel
  0 siblings, 0 replies; 2+ messages in thread
From: Joerg Bornkessel @ 2015-02-03 11:50 UTC (permalink / raw
  To: gentoo-commits

commit:     a150ff0682dcc6d9848c0abe41ecee49c3706f6b
Author:     Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  3 11:50:05 2015 +0000
Commit:     Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
CommitDate: Tue Feb  3 11:50:05 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/vdr/devel.git;a=commit;h=a150ff06

upstream test request, http://www.vdr-portal.de/index.php?page=Thread&postID=1230810

Package-Manager: portage-2.2.15
Manifest-Sign-Key: 34C2808A

---
 media-video/vdr/ChangeLog                          |   7 +
 media-video/vdr/Manifest                           |  10 +-
 .../vdr/files/vdr-2.1.8-scheduleswitch.diff        |  18 ++
 media-video/vdr/vdr-2.1.8-r1.ebuild                | 311 +++++++++++++++++++++
 4 files changed, 342 insertions(+), 4 deletions(-)

diff --git a/media-video/vdr/ChangeLog b/media-video/vdr/ChangeLog
index 59ffff7..3f6e38c 100644
--- a/media-video/vdr/ChangeLog
+++ b/media-video/vdr/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*vdr-2.1.8-r1 (03 Feb 2015)
+
+  03 Feb 2015; Joerg Bornkessel <hd_brummy@gentoo.org> +vdr-2.1.8-r1.ebuild,
+  +files/vdr-2.1.8-scheduleswitch.diff:
+  upstream test request,
+  http://www.vdr-portal.de/index.php?page=Thread&postID=1230810
+
 *vdr-2.1.8 (01 Feb 2015)
 
   01 Feb 2015; Joerg Bornkessel <hd_brummy@gentoo.org> +vdr-2.1.8.ebuild,

diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index b25ab6d..3707aa5 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -6,6 +6,7 @@ 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-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
@@ -31,14 +32,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.ebuild 7624 SHA256 ee61c7eb7911a8f438f2d429ebb9615793db5f94351f419298faad005d414c24 SHA512 ab4becbc51ded5808bb7df7dce14db8cd9e685e42deed672ee29a97ca64f94276752652b61057a4f412f155d41eca741dff19180ce4d2f7496bd09c07dd085b7 WHIRLPOOL d6d2dcd482f8db246924c22ce673af2edf161feea77180cc77981c90b3b7b195cb0b00027f2ef705725d351fc6255436965a6645e1e07d2c477977e81a1cbc47
-MISC ChangeLog 26613 SHA256 0f203a38b8506c76859031325bc79c5f8273110cd63a139c3d5b1ff74f2c631b SHA512 6ff9076b0be5295b4f4271b3a6fd5ab07e29843d45b34ff7834db7df88135fe7ba5d2020ae723dcdb7087b3a28b24eba8daa75c23d82a2e36cb141aa9ddd3bd7 WHIRLPOOL b859939b4106738f6610cfb60b8cdfca21e1223c359988f3402da97fbe8e08d4d139ddcc320aa82ee24f580461773ee7092f31aa5a261bcaf4b6cb27380b9066
+MISC ChangeLog 26849 SHA256 61d6e50b122a202f3638b2e6ee6a4daaabc1b378354401445a57b14caef8e46d SHA512 fd7a68f978ae898182d005001d359c9131816ab93befc2cb6728c117c508286812add685c9d6eb98727201270f32eca529b1d9634c110fced17e12a45751b026 WHIRLPOOL 54a9576c06574ef3e2d2eb668c8666985c8c8abb272b42a329a4d869697bfaa9fe6726aa5dc871a59b24b7391c47a94b749a692748b690dfaae994c1a4971ef9
 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
 
-iD8DBQFUzkc5dn07HTTCgIoRCMSfAJoCUDNY0oNaYsiY3EDDHteajFqKfwCgmP2n
-23J2FS6MI9f1H97HGOguUGY=
-=vMVH
+iD8DBQFU0LXtdn07HTTCgIoRCMcsAJ93LL1KOAe4CdwypFrR3dTZ9gWnkgCeLt5q
+nwTsChWzsfnIu/whvcfWcyM=
+=ZifI
 -----END PGP SIGNATURE-----

diff --git a/media-video/vdr/files/vdr-2.1.8-scheduleswitch.diff b/media-video/vdr/files/vdr-2.1.8-scheduleswitch.diff
new file mode 100644
index 0000000..d5c9312
--- /dev/null
+++ b/media-video/vdr/files/vdr-2.1.8-scheduleswitch.diff
@@ -0,0 +1,18 @@
+--- 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/vdr-2.1.8-r1.ebuild b/media-video/vdr/vdr-2.1.8-r1.ebuild
new file mode 100644
index 0000000..03d5a9c
--- /dev/null
+++ b/media-video/vdr/vdr-2.1.8-r1.ebuild
@@ -0,0 +1,311 @@
+# 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}/${P}-scheduleswitch.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"
+}


^ permalink raw reply related	[flat|nested] 2+ messages in thread
* [gentoo-commits] proj/vdr/devel:master commit in: media-video/vdr/files/, media-video/vdr/
@ 2015-09-22 18:58 Joerg Bornkessel
  0 siblings, 0 replies; 2+ messages in thread
From: Joerg Bornkessel @ 2015-09-22 18:58 UTC (permalink / raw
  To: gentoo-commits

commit:     4b7b17ccc80c38d39b19f7773f09d4ec8de9e92c
Author:     Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 22 18:58:24 2015 +0000
Commit:     Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
CommitDate: Tue Sep 22 18:58:24 2015 +0000
URL:        https://gitweb.gentoo.org/proj/vdr/devel.git/commit/?id=4b7b17cc

clean up; new dev version

Package-Manager: portage-2.2.20.1
Manifest-Sign-Key: 0x767D3B1D34C2808A

 media-video/vdr/ChangeLog                          | 12 +++++
 media-video/vdr/Manifest                           | 16 +++----
 ...-2.1.10_gentoo.patch => vdr-2.3.1_gentoo.patch} |  0
 .../vdr/{vdr-2.1.10.ebuild => vdr-2.3.1.ebuild}    | 56 +++++++++++++---------
 4 files changed, 53 insertions(+), 31 deletions(-)

diff --git a/media-video/vdr/ChangeLog b/media-video/vdr/ChangeLog
index c2a2f9c..a4608fd 100644
--- a/media-video/vdr/ChangeLog
+++ b/media-video/vdr/ChangeLog
@@ -2,6 +2,18 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  22 Sep 2015; Joerg Bornkessel <hd_brummy@gentoo.org> -vdr-2.1.10.ebuild,
+  +vdr-2.3.1.ebuild, -files/vdr-2.1.10_gentoo.patch,
+  +files/vdr-2.3.1_gentoo.patch:
+  clean up; new dev version
+
+*vdr-2.3.1 (22 Sep 2015)
+
+  22 Sep 2015; Joerg Bornkessel <hd_brummy@gentoo.org> -vdr-2.1.10.ebuild,
+  +vdr-2.3.1.ebuild, -files/vdr-2.1.10_gentoo.patch,
+  +files/vdr-2.3.1_gentoo.patch:
+  clean up; new dev version
+
   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,

diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index 9a937d9..9a98a5d 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -2,17 +2,17 @@
 Hash: SHA256
 
 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
-DIST extpng-vdr-2.1.10-gentoo-edition-v1.patch.bz2 26220 SHA256 a707bcceb53a1a33457cd550762d4829bff70863b118e39c65dc4fc6cbc77a9b SHA512 de2e00ee1eaa9641ffdc6c33b8d3cc5286f852e9e865687d696b627b2b46e843c10c5e875d97878669dc4a2b8b5f65221f6818fb11a08378d6c54f19684e5b16 WHIRLPOOL 30eb7704a9d1aa1040192e96c7ffddc287818a8b4cd78c5d46f2d2b11bb01b780cafcea82c74079f83bcd431042180cd8dec32cf03bcb38404c1d38e3d7a8390
-DIST vdr-2.1.10.tar.bz2 918164 SHA256 3a2f8f96586566dc40b7e11c252643957d1e2456914deddea1080240f58d5ad8 SHA512 1c7faef55bcbd7f5cfca4863fa222ba0af5feec0d8c26f2dd6c1b1c78b66495d6e7670ea2d3fef624fb6b6517099596cd40cf87401176513e870d016e5bc50ce WHIRLPOOL a0731c22d4a0576bc6a366e3a3d87631ae1a1b44e26b91c64817a2d8c6603633b873ab027f6809e4e7003010b9b5b92cbf20f76e351d4ab9bd711c8fd1fe2f8c
-EBUILD vdr-2.1.10.ebuild 7559 SHA256 5b4bec2e02bc2d25ad1ebc59be17d83943777e5fe836c456e6ae13b07014e1ef SHA512 a2b5da1b81d51db59b1e4261de1083385e2b64704929ba8e744f2341049cde300955893869a0383ae240d5650ae29a310ca2bc5984d632044f3d109f7fc4b696 WHIRLPOOL 00b226e23e8a1cbfe71d6505c99ab601f8294a3d5b8e966e8bba9ad450e27a809ed4787782c2d9c1ef7f071bba6291982182adc6d09b04a086dfdd01412abc51
-MISC ChangeLog 28437 SHA256 361bf8962db011602fdf6ebf1988556416d146dd1cf599e6b3180ce992cd0806 SHA512 86cd60bb3a0e9c095f7a808e21157161b3c1d261c5fa932e1cb38d5e89931176cfb35ebdc558a0f437c746452964ff5c207182900546e640e3a60a3d0969198d WHIRLPOOL c0aa067fb6b8c87ba6aa95b996f4dacba400bf6070abc3d55057c9762ef9f346164971c68f2292d853fe3d6996ae730aca178085bc9924623fd7afcb840f1510
+AUX vdr-2.3.1_gentoo.patch 2321 SHA256 57e718074a07f11207d52db465afb05cc61100a7522c6413025e9d0ac49045c2 SHA512 2f6e2076779d4ce6cf22f5fb02d26bd991d12917d0769558ace8dbac528785a70bc10e5f2511ef506419e2b595eab30495f06a3ae769a0242a47397815150bf1 WHIRLPOOL d5fe4cce932a9ff784d10dcd237a849ce6dfb4399d54d2e601917b3f570a94c844529451339e43d6559b2461109b4080a6b8e4c48dbc1c570589c0e139c5bd21
+DIST extpng-vdr-2.3.1-gentoo-edition-v3.patch.bz2 26475 SHA256 5f4ee97963a2b156f6356773d0c1b4d1def5bc9e098471d44b6e250dd674849b SHA512 83d4fa26390bfb5af3c409563bcdfa25d5aa181acb6847d95044ed951674c95a803a462dbe290df463084187e6c9f496bc01cf06cd4a108497323be0404fe9e8 WHIRLPOOL d3a2e93fa843c3c6f72fad3f80d30b794767bdfdd9c99b499c1c65f3e7d4c84349c17863521577c23783a3f81ba83f48e838df32950d832a1dc625cac5de3dd2
+DIST vdr-2.3.1.tar.bz2 891255 SHA256 456d3f0ceb699b92ebeaf9ff4c0c68979724d10b01a89d5250133e6f4c262fa7 SHA512 525078247da68da8b3530d61c6c48cf4920c39b9603bc8a6d8c51f69d2b507a40951412606e3f85648ac8d64e28f1553c8f2fe8be80325e4ec880b2a4e564248 WHIRLPOOL 976ef0f291f9d0c55c9d381252e4e8a7872bc7ede719f8d24bd0b0529ce79838a5ca93b4a037a844ba0df206bf58a66f32b90c915eb67f11619578babb72bf3b
+EBUILD vdr-2.3.1.ebuild 8449 SHA256 ecd452cd77e48860b3543b094ced7cd96088a30eea7200aded36c5137c483aa2 SHA512 146a95645c624070794f5107ef5faedd556afd48f11eb9e1f3d5137cf3f85dffb3cc1228ead46f28a88686ca21c6c0bc806af1883b3efd0d8f233f2ee5178d73 WHIRLPOOL 3711a48bceffabb9af2ecfdbb023ffe205bdf88433b6c1803396413f9d9c066dfc82e78c40b51732ad15bb562787fc8da2405fb97b5c025b633221d554e80484
+MISC ChangeLog 28843 SHA256 4638b70ef7636a9f003a07a9b391d2e6469445999389530c580b9f47a029e94c SHA512 4ce8b22b8310567a0b2bc071e2d901ceb8f4194ebff2e523b49708827608087872ec5323bf83e71785d8654dc9015d26a0db6f6f217caef4a1d435865504cdf0 WHIRLPOOL 94b82948a0a404c46102417e0822d4a7296dcb507bc5fa97f2a64bc9218e22456a7109806c85cdaf01edcf34a835f7eb3a05c87340fd5046e5ccce0243bbc94a
 MISC metadata.xml 2138 SHA256 f570942c815bde637718a12a161b73dd50d7a418e169843ce8636c28dee11980 SHA512 d6545bbad63f5a7b64142248b733bb4ee74887063d3710ea1636e4da9ff89b01097ca2e95fc4603ed08167169235711ff83223554ad0f3cfc86640ee9b146bcb WHIRLPOOL cff75527edb8443764873500456a37bc08e9d901078b1352f67f23b73ad880a17d48f83e7004024cadd51e6002961b3eaab6312e79428706c6793d5bc043a714
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 Comment: added by hd_brummy@gentoo.org
 
-iD8DBQFU5tjZdn07HTTCgIoRCF0hAJ9Jmw0AZVkCtKeLAXzJUIB8zDkbTgCbBueH
-G4/GJ0UVNmRNaEh7kHON0MA=
-=O+nm
+iD8DBQFWAaTQdn07HTTCgIoRCHYdAKCTr2qRb9and8RawKEeoiXwzudhwQCgq+Vp
+s03ZX5dIlhvJaUHvalHifGU=
+=VReI
 -----END PGP SIGNATURE-----

diff --git a/media-video/vdr/files/vdr-2.1.10_gentoo.patch b/media-video/vdr/files/vdr-2.3.1_gentoo.patch
similarity index 100%
rename from media-video/vdr/files/vdr-2.1.10_gentoo.patch
rename to media-video/vdr/files/vdr-2.3.1_gentoo.patch

diff --git a/media-video/vdr/vdr-2.1.10.ebuild b/media-video/vdr/vdr-2.3.1.ebuild
similarity index 79%
rename from media-video/vdr/vdr-2.1.10.ebuild
rename to media-video/vdr/vdr-2.3.1.ebuild
index 0280ab1..e67f9b4 100644
--- a/media-video/vdr/vdr-2.1.10.ebuild
+++ b/media-video/vdr/vdr-2.3.1.ebuild
@@ -1,14 +1,14 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-2.2.0.ebuild,v 1.5 2015/03/30 13:25:58 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"
+EXT_PATCH_FLAGS="pinplugin graphtft naludump mainmenuhooks menuorg menuselection resumereset"
+#tmp disabled: alternatechannel permashift_v1 pinplugin ttxtsubs (-> channels)
 
 # names of the use-flags
 EXT_PATCH_FLAGS_RENAMED=""
@@ -16,13 +16,13 @@ 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}"
+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"
+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/"
@@ -33,7 +33,7 @@ KEYWORDS="~arm ~amd64 ~ppc ~x86"
 SLOT="0"
 LICENSE="GPL-2"
 
-COMMON_DEPEND="virtual/jpeg
+COMMON_DEPEND="virtual/jpeg:*
 	sys-libs/libcap
 	>=media-libs/fontconfig-2.4.2
 	>=media-libs/freetype-2"
@@ -44,7 +44,7 @@ DEPEND="${COMMON_DEPEND}
 
 RDEPEND="${COMMON_DEPEND}
 	dev-lang/perl
-	>=media-tv/gentoo-vdr-scripts-2.5_rc1
+	>=media-tv/gentoo-vdr-scripts-2.7
 	media-fonts/corefonts
 	bidi? ( dev-libs/fribidi )
 	systemd? ( sys-apps/systemd )"
@@ -145,6 +145,7 @@ src_prepare() {
 		DVBDIR			= ${DVBDIR}
 		PLUGINLIBDIR	= ${PLUGIN_LIBDIR}
 		CONFDIR			= ${CONF_DIR}
+#		ARGSDIR			= \$(CONFDIR)/conf.d
 		VIDEODIR		= /var/vdr/video
 		LOCDIR			= \$(PREFIX)/share/locale
 		INCDIR			= \$(PREFIX)/include
@@ -254,6 +255,7 @@ src_install() {
 	DESTDIR="${D}" install || die "emake install failed"
 
 	keepdir "${PLUGIN_LIBDIR}"
+#	keepdir "${ARGSDIR}"
 
 	# backup for plugins they don't be able to create this dir
 	keepdir "${CONF_DIR}"/plugins
@@ -262,32 +264,40 @@ src_install() {
 		dohtml *.html
 	fi
 
-	dodoc MANUAL INSTALL README* HISTORY CONTRIBUTORS
+	nonfatal 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 alternatechannel; then
+#		insinto /etc/vdr
+#		doins "${FILESDIR}"/channel_alternative.conf
+#	fi
 
 	chown -R vdr:vdr "${D}/${CONF_DIR}"
 }
 
-pkg_preinstall() {
-
-	has_version "<${CATEGORY}/${PN}-2.2"
-	previous_less_than_2_2=$
-}
-
 pkg_postinst() {
 
-	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
+	eerror "WARNING:"
+	eerror "========\n"
+
+	eerror "This is a *developer* version. Even though *I* use it in my productive"
+	eerror "environment, I strongly recommend that you only use it under controlled"
+	eerror "conditions and for testing and debugging.\n"
+
+	eerror "*** PLEASE BE VERY CAREFUL WHEN USING THIS DEVELOPER VERSION, ESPECIALLY"
+	eerror "*** IF YOU ENABLE THE NEW SVDRP PEERING! KEEP BACKUPS OF ALL YOUR TIMERS"
+	eerror "*** AND OBSERVE VERY CLOSELY WHETHER EVERYTHING WORKS AS EXPECTED. THIS"
+	eerror "*** VERSION INTRODUCES SOME MAJOR CHANGES IN HANDLING GLOBAL LISTS AND"
+	eerror "*** LOCKING, SO ANYTHING CAN HAPPEN! YOU HAVE BEEN WARNED!\n"
+
+	eerror "The main focus of this developer version is on the new locking mechanism"
+	eerror "for global lists, and the ability to handle remote timers."
+	eerror "Any plugins that access the global lists of timers, channels, schedules"
+	eerror "or recordings, will need to be adjusted (see below for details). Please"
+	eerror "do initial tests with plain vanilla VDR and just the output plugin you"
+	eerror "need.\n"
 
 	elog "It is a good idea to run vdrplugin-rebuild now."
 


^ permalink raw reply related	[flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-09-22 18:58 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-22 18:58 [gentoo-commits] proj/vdr/devel:master commit in: media-video/vdr/files/, media-video/vdr/ Joerg Bornkessel
  -- strict thread matches above, loose matches on Subject: below --
2015-02-03 11:50 Joerg Bornkessel

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox