summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--media-video/vdr/ChangeLog7
-rw-r--r--media-video/vdr/Manifest22
-rw-r--r--media-video/vdr/files/digest-vdr-1.4.0-r16
-rw-r--r--media-video/vdr/vdr-1.4.0-r1.ebuild262
4 files changed, 289 insertions, 8 deletions
diff --git a/media-video/vdr/ChangeLog b/media-video/vdr/ChangeLog
index 7ef7c2d8de82..9d08262c6421 100644
--- a/media-video/vdr/ChangeLog
+++ b/media-video/vdr/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-video/vdr
# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.61 2006/05/09 22:25:01 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.62 2006/05/14 20:19:00 zzam Exp $
+
+*vdr-1.4.0-r1 (14 May 2006)
+
+ 14 May 2006; Matthias Schwarzott <zzam@gentoo.org> +vdr-1.4.0-r1.ebuild:
+ Updated vdr-patchset. Added new bugfixes from KLS.
09 May 2006; Matthias Schwarzott <zzam@gentoo.org> vdr-1.3.45-r1.ebuild:
Stable on x86.
diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index 8c172fc827a0..aaf9ae78e1a8 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -60,6 +60,7 @@ DIST gentoo-vdr-patchset-1.3.44-1.tar.bz2 139885 RMD160 516f74cdef3a898defe4c59c
DIST gentoo-vdr-patchset-1.3.45-1.tar.bz2 170055 RMD160 8f533958656299f43bc514a2410713b474f465de SHA256 6dc18a376105208c95a29db9f290d49f974f01ff92bf8e11f9b0ee790ecaac39 size 170055
DIST gentoo-vdr-patchset-1.3.45-2.tar.bz2 166648 RMD160 9d430c80950986e33587c4721299c697b952f468 SHA256 08b0aa33e0660c98603a014c9bb01c9a32bd5fdafc6051636d93e4b4862bf4e0 size 166648
DIST gentoo-vdr-patchset-1.4.0-2.tar.bz2 149824 RMD160 e4d3b05810e8c697229679f34d8452efb9bc23dd SHA256 7ce52fdb86b222dcb53edb67162194ec27c4e2f182188296f594bb3e495de80d size 149824
+DIST gentoo-vdr-patchset-1.4.0-3.tar.bz2 181435 RMD160 43a3f758c2cfa723d2c3780e635dd6ae0658aad2 SHA256 5035456f6737a4ad551c1934160f2b273313f4c299175dd56e71d4aa5cf57345 size 181435
DIST vdr-1.2.6.tar.bz2 367069 RMD160 6780bedb49676cecfcea1275d9166e88fb93b97f SHA256 9d969043018d9578970c5d79e048e21870207042f6041a49996aad0c679b24d5 size 367069
DIST vdr-1.3.27-bigpatch-test4.diff.bz2 68563 RMD160 7cd1cd80f0e17e001ebab34134ebd3f02371fd46 SHA256 3eccc4b33d0d7948893e5fe49333dcac37680ffd6d3740fa2222216dc57f0ea6 size 68563
DIST vdr-1.3.27-enAIO-2.4.diff.gz 9821 RMD160 f383a27b1863a4184758dcb4227b7a91f0cde102 SHA256 05dca2075f596dc74c235a568366b5cd57cec734e97d64190a4ad7cdae060861 size 9821
@@ -140,14 +141,18 @@ EBUILD vdr-1.3.45.ebuild 5350 RMD160 20cef96e0638f21435b74377f4867f14a68851c4 SH
MD5 605cb84da22cd175dbcc0b5dd14b9b93 vdr-1.3.45.ebuild 5350
RMD160 20cef96e0638f21435b74377f4867f14a68851c4 vdr-1.3.45.ebuild 5350
SHA256 a167c1d2043b977001e331d5ed83870f5429447be99aa940df9a50c311bb562f vdr-1.3.45.ebuild 5350
+EBUILD vdr-1.4.0-r1.ebuild 5944 RMD160 489e7cc1fc427e86e4c8148d145fab128a42a6c3 SHA1 a6ef49cfcfdcc8deaebb6b998fd35060df058a48 SHA256 2b9840ab2c996157ab04980b0ee8f205fb640e6a2dc71575512448a902016f6b size 5944
+MD5 e1fe6ea4538167ade9e2844a21127a7b vdr-1.4.0-r1.ebuild 5944
+RMD160 489e7cc1fc427e86e4c8148d145fab128a42a6c3 vdr-1.4.0-r1.ebuild 5944
+SHA256 2b9840ab2c996157ab04980b0ee8f205fb640e6a2dc71575512448a902016f6b vdr-1.4.0-r1.ebuild 5944
EBUILD vdr-1.4.0.ebuild 5941 RMD160 cf20b797e5bb62b4bf7fbdfaff76d5b0a1e87d96 SHA1 ba6af8cca6e3e43a3a2d6ab83cb7f7a69ab42e4a SHA256 afa281ac718c9476e9d55850b7bb907dde3d1e4fc637fce52b59ffb2844f81db size 5941
MD5 71ba04249f3f2b9d6eeecfd4f04ac3f8 vdr-1.4.0.ebuild 5941
RMD160 cf20b797e5bb62b4bf7fbdfaff76d5b0a1e87d96 vdr-1.4.0.ebuild 5941
SHA256 afa281ac718c9476e9d55850b7bb907dde3d1e4fc637fce52b59ffb2844f81db vdr-1.4.0.ebuild 5941
-MISC ChangeLog 9177 RMD160 f52df8c70938f717aa87a46d2d845ef98d15d09c SHA1 c32e6dff1c8e2797ac2605c90257f8cfbc95f3b4 SHA256 fe384d5326cbe79065cd22a3a4676c1a51ecde6e5641313f72bad5dcef0a4503 size 9177
-MD5 db6efdb68dac0591c89970641831c701 ChangeLog 9177
-RMD160 f52df8c70938f717aa87a46d2d845ef98d15d09c ChangeLog 9177
-SHA256 fe384d5326cbe79065cd22a3a4676c1a51ecde6e5641313f72bad5dcef0a4503 ChangeLog 9177
+MISC ChangeLog 9335 RMD160 7760e31a33dd6cf36a1ab988f64a4e0616cbb9a9 SHA1 bc401f30a8f58e3991618a277827e0852afc3553 SHA256 e32fe883f2ce2620b8082ff5cb52d18816d721c977efd8cceabb29dc3c8c175d size 9335
+MD5 642ffe45ac1b5a5af15719cd271e111e ChangeLog 9335
+RMD160 7760e31a33dd6cf36a1ab988f64a4e0616cbb9a9 ChangeLog 9335
+SHA256 e32fe883f2ce2620b8082ff5cb52d18816d721c977efd8cceabb29dc3c8c175d ChangeLog 9335
MISC metadata.xml 259 RMD160 cc3cadd479ce9fb1e22948ac9f01f5725da33fa6 SHA1 71c8f0604523f99ac8b7849a01d861d721a191fd SHA256 313f79a460281914a7f72cb73e91eec5f5cfec67c79f657743d49036d04951fe size 259
MD5 a973dfa1638779880ca99f1c1435cac7 metadata.xml 259
RMD160 cc3cadd479ce9fb1e22948ac9f01f5725da33fa6 metadata.xml 259
@@ -200,10 +205,13 @@ SHA256 92ef7d82df941281068ea5a61d4cc92c2a1bbf0100aec61378d48a1e09c50f65 files/di
MD5 b55c9a1a1794749aedeaf232b0c66477 files/digest-vdr-1.4.0 518
RMD160 09585bb135d955b18de48a1087a3d07d8c7b1a33 files/digest-vdr-1.4.0 518
SHA256 8af37892a1ee85570dcd2a563c57b50b658c9401683d8f3dcf926c0e55303d6b files/digest-vdr-1.4.0 518
+MD5 4fd8c1fc5004943d5c0cf60feb0516a5 files/digest-vdr-1.4.0-r1 518
+RMD160 8bedad86129d80cee7b7bf27847711bc26adb0ce files/digest-vdr-1.4.0-r1 518
+SHA256 32fbea788c5fe10fd98e01fbae2a6a1bc994af4c0ccd26e451b1d08c80bf9f91 files/digest-vdr-1.4.0-r1 518
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.3 (GNU/Linux)
-iD8DBQFEYRbnZfSl1Kp5KmoRAgxeAJ4t3COhKx4uTG5e9SsNTrwaMrgwNACcCGZr
-F+YFuOwxkDDzIojTowHgDiI=
-=Xxqm
+iD8DBQFEZ5DVZfSl1Kp5KmoRAjL2AJ9ex6FWLSZoTQhxWGJNO30BhWxNQACgznD6
+mPckb6kP0+v5Q7DHlRfrH4g=
+=SQui
-----END PGP SIGNATURE-----
diff --git a/media-video/vdr/files/digest-vdr-1.4.0-r1 b/media-video/vdr/files/digest-vdr-1.4.0-r1
new file mode 100644
index 000000000000..a0b7d5e41414
--- /dev/null
+++ b/media-video/vdr/files/digest-vdr-1.4.0-r1
@@ -0,0 +1,6 @@
+MD5 65dc487c0936d07c7682926eda46c51d gentoo-vdr-patchset-1.4.0-3.tar.bz2 181435
+RMD160 43a3f758c2cfa723d2c3780e635dd6ae0658aad2 gentoo-vdr-patchset-1.4.0-3.tar.bz2 181435
+SHA256 5035456f6737a4ad551c1934160f2b273313f4c299175dd56e71d4aa5cf57345 gentoo-vdr-patchset-1.4.0-3.tar.bz2 181435
+MD5 4b74a75b6a1e98e0b1597661d71f813c vdr-1.4.0.tar.bz2 549076
+RMD160 b836221d98af904886309a4e589c24b7b6b4faab vdr-1.4.0.tar.bz2 549076
+SHA256 64fbd4508bf9ff97a5493f64b450ac5918d49efc12ec53a4580b0ed24b008969 vdr-1.4.0.tar.bz2 549076
diff --git a/media-video/vdr/vdr-1.4.0-r1.ebuild b/media-video/vdr/vdr-1.4.0-r1.ebuild
new file mode 100644
index 000000000000..4f374756310f
--- /dev/null
+++ b/media-video/vdr/vdr-1.4.0-r1.ebuild
@@ -0,0 +1,262 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.4.0-r1.ebuild,v 1.1 2006/05/14 20:19:00 zzam Exp $
+
+inherit eutils flag-o-matic
+
+IUSE="debug vanilla aio bigpatch jumpplay dvbplayer lnbsharing sourcecaps"
+IUSE="${IUSE} child-protection yaepg setup-plugin submenu subtitles rotor rds-timeout"
+
+PATCHSET_V=3
+PATCHSET_NAME=gentoo-${PN}-patchset-${PV}-${PATCHSET_V}
+
+DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB"
+HOMEPAGE="http://www.cadsoft.de/vdr/"
+SRC_URI="ftp://ftp.cadsoft.de/vdr/${P}.tar.bz2
+ !vanilla? ( mirror://gentoo/${PATCHSET_NAME}.tar.bz2 )"
+
+KEYWORDS="~amd64 ~ppc ~x86"
+SLOT="0"
+LICENSE="GPL-2"
+
+
+DEPEND="media-libs/jpeg
+ sys-apps/gawk
+ media-tv/linuxtv-dvb-headers
+ sys-libs/libcap"
+
+RDEPEND="${DEPEND}
+ dev-lang/perl
+ media-tv/vdrplugin-rebuild
+ !vanilla? ( >=media-tv/gentoo-vdr-scripts-0.3.1 )"
+
+# Relevant Pathes for vdr on gentoo
+DVB_DIR=/usr/include
+VDR_INCLUDE_DIR=/usr/include/vdr
+PLUGIN_LIB_DIR=/usr/lib/vdr/plugins
+CONF_DIR=/etc/vdr
+RC_DIR=/usr/lib/vdr/rcscript
+CAP_FILE=${S}/vdr-capabilities.sh
+CAPS="# Capabilities of the vdr-executable for use by startscript etc."
+
+
+pkg_setup() {
+ use debug && append-flags -g
+}
+
+add_cap() {
+ while [ "$1" ]; do
+ CAPS="${CAPS}\n$1=1"
+ shift
+ done
+}
+
+# works like use to check for active (and not active !abc) useflags
+# if more than one flag is given it returns that all flags are active
+#
+# "use_multi_and a b !c !d"
+# ==
+# "use a && use b && use !c && use !d"
+#
+use_multi_and() {
+ while [[ -n ${1} ]]; do
+ use ${1} || return 1
+
+ shift
+ done
+ return 0
+}
+
+# reads the line GENTOO_USE out of the beginning of the patch
+# example: GENTOO_USE: aio !bigpatch
+# and checks weather the useflags are set appropriate (via use_multi_and)
+# if check returns true the patch is applied
+#
+apply_vdr_patch() {
+ local APPLY=1
+ local p="${1}"
+ debug-print "PATCH:"
+ debug-print " $(basename ${p})"
+ local V1
+ local V2
+ while read V1 V2; do
+ case ${V1} in
+ GENTOO_USE:)
+ APPLY=0
+ if use_multi_and ${V2}; then
+ APPLY=1
+ break
+ fi
+ ;;
+ +++|---|diff|@@)
+ break;
+ ;;
+ *)
+ ;;
+ esac
+ done < "${p}"
+ [[ ${APPLY} == 0 ]] && return
+ debug-print " --> applied"
+ epatch "${p}"
+}
+
+# call apply_vdr_patch for all patchfiles in given directory
+
+apply_vdr_patchset() {
+ local p
+ for p in ${1}/*.{diff,patch}; do
+ [[ -f "${p}" ]] || continue
+ apply_vdr_patch "${p}"
+ done
+}
+
+src_unpack() {
+ unpack ${P}.tar.bz2
+ if [[ -n "${VDR_LOCAL_PATCHSET}" && -d "${ROOT}/${VDR_LOCAL_PATCHSET}" ]]; then
+ ewarn "Using local developer patchset."
+ PATCHSET_DIR="${ROOT}/${VDR_LOCAL_PATCHSET}"
+ else
+ unpack ${PATCHSET_NAME}.tar.bz2
+ PATCHSET_DIR=${WORKDIR}/${PATCHSET_NAME}
+ fi
+
+ cd ${S}
+
+ ebegin "Changing pathes for gentoo"
+ sed -e 's-$(DVBDIR)/include-$(DVBDIR)-' -i Makefile
+
+ sed \
+ -e 's-ConfigDirectory = VideoDirectory;-ConfigDirectory = CONFIGDIR;-' \
+ -i vdr.c
+
+ cat > Make.config <<-EOT
+ #
+ # Generated by ebuild ${PF}
+ #
+ DVBDIR = ${DVB_DIR}
+ PLUGINLIBDIR = ${PLUGIN_LIB_DIR}
+ CONFIGDIR = ${CONF_DIR}
+
+ DEFINES += -DCONFIGDIR=\"\$(CONFIGDIR)\"
+ EOT
+ eend 0
+
+ if use vanilla; then
+ ewarn "OK - You are on your own now!"
+ ewarn "no gentoo-patches will be applied!"
+ else
+ apply_vdr_patchset ${PATCHSET_DIR}
+
+ if use setup-plugin && use submenu; then
+ ewarn "Did not apply submenu-patch, can not be used at the same time as setup-plugin-patch."
+ fi
+ fi
+
+ # apply local patches defined by variable VDR_LOCAL_PATCHES_DIR
+ if test -n "${VDR_LOCAL_PATCHES_DIR}"; then
+ echo
+ einfo "Applying local patches"
+ for LOCALPATCH in ${VDR_LOCAL_PATCHES_DIR}/${PV}/*.{diff,patch}; do
+ test -f "${LOCALPATCH}" && epatch "${LOCALPATCH}"
+ done
+ fi
+
+ if [[ -n "${VDRSOURCE_DIR}" ]]; then
+ cp -r ${S} ${T}/source-tree
+ fi
+
+
+ if ! use vanilla; then
+ add_cap CAP_IRCTRL_RUNTIME_PARAM \
+ CAP_VFAT_RUNTIME_PARAM \
+ CAP_SHUTDOWN_SVDRP \
+ CAP_CHUID
+
+ echo -e ${CAPS} > ${CAP_FILE}
+ fi
+}
+
+src_install() {
+ exeinto /usr/bin
+ doexe vdr
+ doexe svdrpsend.pl
+
+ insinto ${VDR_INCLUDE_DIR}
+ doins *.h
+ doins Make.config
+
+ insinto ${VDR_INCLUDE_DIR}/libsi
+ doins libsi/*.h
+
+ keepdir ${CONF_DIR}/plugins
+
+ insinto ${CONF_DIR}
+ doins *.conf channels.conf.*
+
+ keepdir "${PLUGIN_LIB_DIR}"
+
+ doman vdr.1 vdr.5
+
+ dohtml *.html
+ dodoc MANUAL INSTALL README* HISTORY*
+ dodoc TODO-enAIO-rm CONTRIBUTORS
+
+ insinto ${RC_DIR}
+ doins ${CAP_FILE}
+
+ if [[ -n "${VDRSOURCE_DIR}" ]]; then
+ einfo "Installing sources"
+ insinto ${VDRSOURCE_DIR}/${P}
+ doins -r ${T}/source-tree/*
+ keepdir ${VDRSOURCE_DIR}/${P}/PLUGINS/lib
+ fi
+
+ if use setup-plugin; then
+ insinto /usr/share/vdr/setup
+ doins ${S}/menu.c
+
+ insinto /etc/vdr/plugins/setup
+ newins ${FILESDIR}/vdr-setup-menu-0.2.3.xml vdr-menu.xml
+ fi
+ chown -R vdr:vdr ${D}/${CONF_DIR}
+}
+
+pkg_postinst() {
+ einfo "It is a good idea to run vdrplugin-rebuild now"
+ if has_version "<media-video/vdr-1.3.36-r3"; then
+ ewarn "Upgrade Info:"
+ ewarn
+ ewarn "If you had used the use-flags lirc, rcu or vfat"
+ ewarn "then, you now have to enable the associated functionality"
+ ewarn "in /etc/conf.d/vdr"
+ ewarn
+ ewarn "vfat is now set with VFAT_FILENAMES."
+ ewarn "lirc/rcu are now set with IR_CTRL."
+ ebeep
+ fi
+
+ if use setup-plugin; then
+ echo
+ eerror "It is very important to emerge media-plugins/vdr-setup now"
+ eerror "and to have it activated in /etc/conf.de/vdr PLUGINS=\"\""
+ fi
+
+ local keysfound=0
+ local key
+ local warn_keys="JumpFwd JumpRew JumpFwdSlow JumpRewSlow"
+ local remote_file=${ROOT}/etc/vdr/remote.conf
+
+ if [[ -e ${remote_file} ]]; then
+ for key in ${warn_jeys}; do
+ if grep -q -i "\.${key} " "${remote_file}"; then
+ keysfound=1
+ break
+ fi
+ done
+ if [[ ${keysfound} == 1 ]]; then
+ ewarn "Your /etc/vdr/remote.conf contains keys which are no longer usable"
+ ewarn "Please remove these keys or vdr will not start:"
+ ewarn "# ${warn_keys}"
+ fi
+ fi
+}