From: Matthias Schwarzott Date: Fri, 5 Jan 2007 14:10:56 +0000 (+0000) Subject: Version bumped. Added code to look into different dirs for finding local patches. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d3e5c392f17edb7bac97b4b0364fc1a43bcaa1b9;p=gentoo.git Version bumped. Added code to look into different dirs for finding local patches. Package-Manager: portage-2.1.2_rc4-r6 --- diff --git a/media-video/vdr/ChangeLog b/media-video/vdr/ChangeLog index 722d5dbf6ca3..7d3382a12497 100644 --- a/media-video/vdr/ChangeLog +++ b/media-video/vdr/ChangeLog @@ -1,6 +1,12 @@ # 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.74 2006/12/09 12:17:57 zzam Exp $ +# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.75 2007/01/05 14:10:56 zzam Exp $ + +*vdr-1.4.4_p3 (05 Jan 2007) + + 05 Jan 2007; Matthias Schwarzott +vdr-1.4.4_p3.ebuild: + Version bumped. Added code to look into different dirs for finding local + patches. 09 Dec 2006; Matthias Schwarzott vdr-1.4.4.ebuild: Marked stable on x86. diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest index 5c32e3367bdc..982aff445899 100644 --- a/media-video/vdr/Manifest +++ b/media-video/vdr/Manifest @@ -16,6 +16,7 @@ SHA256 487d380f3fe8cb9efff272e9bfffacde0c6f90bcb1d8522ef9533eabfaca5965 files/vd DIST gentoo-vdr-patchset-1.4.1-2.tar.bz2 174198 RMD160 cf4985f303dbd5b4923e67ab26f4654cb52d6e8b SHA1 8da1918018f9c169ed1d3f1d5d57606cd02842d1 SHA256 214ac208c8ad61065b23cc59b7ca60c2e9b5cccf742e2767ca8260de5b9e9d0f DIST gentoo-vdr-patchset-1.4.3-1.tar.bz2 175914 RMD160 4325ddb158834dd8208c5222d60339ef1a52b898 SHA1 f6ec90cc77bbd95c25f9ae0c59c7588d95d837e5 SHA256 e429f1e09cf416e5bb56ed8a4602e4713755e465692b4ea0a9cb604570b98e12 DIST gentoo-vdr-patchset-1.4.4-1.tar.bz2 188290 RMD160 27b7210395ddf9697b70e3f1e6065bb495093edb SHA1 97f79463374429c622f9b6ee21b6c901d9f753d0 SHA256 479153c6fc5b2b0eb7ddca17e12568c7469ad296929b874e75b4b58e59deb1cb +DIST gentoo-vdr-patchset-1.4.4_p3-1.tar.bz2 174196 RMD160 2c456191a0b32b75c7cb20d3697b8034257da657 SHA1 1e77c2d5432c5336f6509a19bca3e3b91c00e603 SHA256 8839c54f155e6a5483808794b46345c89f50d55e6d044dae36c2b61e919d6bbc DIST vdr-1.2.6.tar.bz2 367069 RMD160 6780bedb49676cecfcea1275d9166e88fb93b97f SHA1 31896db8b3d98c54acdbee34338fd48c067a15bf SHA256 9d969043018d9578970c5d79e048e21870207042f6041a49996aad0c679b24d5 DIST vdr-1.3.36-gentoo-patchset-0.2.tar.bz2 174683 RMD160 022c8afcd9ccea73cc8b7de2fb14f10a6ef9514a SHA1 585e62c9f57ebc8d598d8bc70b659f5d5a761238 SHA256 6a5e4d21808cc188a950f7c4bbd2edf23e65cdb5cc68871ba8c2f355550da857 DIST vdr-1.3.36.tar.bz2 513639 RMD160 3bbf1a98f81f35af1768b83b0749b4e12b47bf57 SHA1 69b62aa6f83b9ed2d417ad60ccba37ed74175a43 SHA256 bc79c9212f59127a379c7e4de5a9ff7741eaa2478a6eab0f58c93efadc11b901 @@ -42,10 +43,14 @@ EBUILD vdr-1.4.4.ebuild 4898 RMD160 3f740c73786b132960ec1ff74a885beb89f92133 SHA MD5 9a786771792191230cd8f846b7f4bd4a vdr-1.4.4.ebuild 4898 RMD160 3f740c73786b132960ec1ff74a885beb89f92133 vdr-1.4.4.ebuild 4898 SHA256 ba96f3714b7b0700578f05a946291caf0d4284ff634a78674914ec10a224a1ee vdr-1.4.4.ebuild 4898 -MISC ChangeLog 12036 RMD160 2f99545e432aa5135bdbd8d9ff31cba2d2f9f825 SHA1 3f24ad9eec06429eafb0c7580dce89a1ffbd743d SHA256 d681c0dd5f33a435d2cad6db33fefbf4dbeccaaacc286e0f4c9dbf4d21dfc4b4 -MD5 a4e4373f1c68f09d6eceefbc92a0646e ChangeLog 12036 -RMD160 2f99545e432aa5135bdbd8d9ff31cba2d2f9f825 ChangeLog 12036 -SHA256 d681c0dd5f33a435d2cad6db33fefbf4dbeccaaacc286e0f4c9dbf4d21dfc4b4 ChangeLog 12036 +EBUILD vdr-1.4.4_p3.ebuild 5231 RMD160 35f5d1dc48e7e29c8d26dfa783013a75ca1150f2 SHA1 95b74771fc107b5c35024db8a3e8622cbe67d7dc SHA256 ec878d46aba4d39f745f67864ff6bb585c21d847236f3e8c7c82a346baafcefa +MD5 135e9371fa855e6886911788daa113ef vdr-1.4.4_p3.ebuild 5231 +RMD160 35f5d1dc48e7e29c8d26dfa783013a75ca1150f2 vdr-1.4.4_p3.ebuild 5231 +SHA256 ec878d46aba4d39f745f67864ff6bb585c21d847236f3e8c7c82a346baafcefa vdr-1.4.4_p3.ebuild 5231 +MISC ChangeLog 12227 RMD160 f22d8e129740a54976730f2aae5d86a1bf05c5fb SHA1 7aa468973b77b28e266e7c38821ce354ba720d39 SHA256 035c0b781756a0106d627fdd6cecf4d7038ce75a608bec3443751817a94f5800 +MD5 62fd55b60a09440f6d09c0b3b45b9c26 ChangeLog 12227 +RMD160 f22d8e129740a54976730f2aae5d86a1bf05c5fb ChangeLog 12227 +SHA256 035c0b781756a0106d627fdd6cecf4d7038ce75a608bec3443751817a94f5800 ChangeLog 12227 MISC metadata.xml 257 RMD160 8bee49b98c59996aaaa019fb2c764c08d8004507 SHA1 d2419394e7d5c7463d7dea33e9190ebd57484531 SHA256 0dd45fbbaf1c6173535e371e3ff8a3faa41f3f89123ac9dffe338998599ebe26 MD5 116de98355049ce943c3b6fedc00b4a3 metadata.xml 257 RMD160 8bee49b98c59996aaaa019fb2c764c08d8004507 metadata.xml 257 @@ -65,10 +70,13 @@ SHA256 48f0e6b4ebbb980c39002ab219efe7a67c0dd9806f55cacb846440912f29fe28 files/di MD5 037bc6e29c84cda485ef84ab2572b9d9 files/digest-vdr-1.4.4 518 RMD160 151f05ce2c2c8ecef446b4349eaa8c10566491e7 files/digest-vdr-1.4.4 518 SHA256 960cc3e53d0b21eaa87289393374f69bd68a516c5d7102a74e5960598fcc624e files/digest-vdr-1.4.4 518 +MD5 0b4d3eba2a5ac971abeb9b6390ca45dc files/digest-vdr-1.4.4_p3 527 +RMD160 84e833e0796fc293646c3f591e1d395d9bf58fe7 files/digest-vdr-1.4.4_p3 527 +SHA256 81631181cb03e251471ac95afefbcd008e2fe4bd8034fd39c7b7da0495eac082 files/digest-vdr-1.4.4_p3 527 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.6 (GNU/Linux) +Version: GnuPG v2.0.1 (GNU/Linux) -iD8DBQFFeql8t2vP6XvVdOcRAltqAKDYBiDKRZkpMx8GOoPs5ktdhd3L6wCeNOod -Dfz+W+Mg4phb07/nRK7Z/7E= -=qqbL +iD8DBQFFnlyYt2vP6XvVdOcRAr8RAKDhOKccA/dUBLGDXoqySP6yv+GLfQCfU6V8 +2VPoF+1ejDZxcXMqKZ522Pw= +=+Z6v -----END PGP SIGNATURE----- diff --git a/media-video/vdr/files/digest-vdr-1.4.4_p3 b/media-video/vdr/files/digest-vdr-1.4.4_p3 new file mode 100644 index 000000000000..c24de81a1f22 --- /dev/null +++ b/media-video/vdr/files/digest-vdr-1.4.4_p3 @@ -0,0 +1,6 @@ +MD5 b1243e72737364ad7eac7b77dbbec9af gentoo-vdr-patchset-1.4.4_p3-1.tar.bz2 174196 +RMD160 2c456191a0b32b75c7cb20d3697b8034257da657 gentoo-vdr-patchset-1.4.4_p3-1.tar.bz2 174196 +SHA256 8839c54f155e6a5483808794b46345c89f50d55e6d044dae36c2b61e919d6bbc gentoo-vdr-patchset-1.4.4_p3-1.tar.bz2 174196 +MD5 3d5dbacda725f769099b774577d2e3af vdr-1.4.4.tar.bz2 559362 +RMD160 436cbbfb09f4e31f34db4038771fa7bac11230a1 vdr-1.4.4.tar.bz2 559362 +SHA256 d05ae4529d55ad577394239223b83d13a3d11c2c3aa0599896ccba8f67a01b36 vdr-1.4.4.tar.bz2 559362 diff --git a/media-video/vdr/vdr-1.4.4_p3.ebuild b/media-video/vdr/vdr-1.4.4_p3.ebuild new file mode 100644 index 000000000000..3046f26e71a7 --- /dev/null +++ b/media-video/vdr/vdr-1.4.4_p3.ebuild @@ -0,0 +1,218 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.4.4_p3.ebuild,v 1.1 2007/01/05 14:10:56 zzam Exp $ + +inherit eutils flag-o-matic multilib + +IUSE="debug vanilla aio bigpatch jumpplay dolby-record-switch dvbplayer + lnbsharing sourcecaps cmdsubmenu dxr3-audio-denoise + child-protection yaepg setup-plugin submenu subtitles rotor noepg" + +PATCHSET_V=1 +PATCHSET_NAME=gentoo-${PN}-patchset-${PV}-${PATCHSET_V} + +MY_P="${P%_p*}" +S=${WORKDIR}/${MY_P} + +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/${MY_P}.tar.bz2 + 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 + >=media-tv/gentoo-vdr-scripts-0.3.5" + +# Relevant Pathes for vdr on gentoo +DVB_DIR=/usr/include +VDR_INCLUDE_DIR=/usr/include/vdr +PLUGIN_LIB_DIR=/usr/$(get_libdir)/vdr/plugins +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 +} + +add_cap() { + while [ "$1" ]; do + CAPS="${CAPS}\n$1=1" + shift + done +} + +src_unpack() { + unpack ${MY_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 + + source ${PATCHSET_DIR}/apply_patchset.sh + apply_vdr_patchset "${PATCHSET_DIR}" + + if use !vanilla; then + 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 + local dir_tmp_var + local LOCALPATCHES_SUBDIR=${PV} + for dir_tmp_var in allversions-fallback ${PV%_p*} ${PV} ; do + if [[ -d ${VDR_LOCAL_PATCHES_DIR}/${dir_tmp_var} ]]; then + LOCALPATCHES_SUBDIR="${dir_tmp_var}" + fi + done + + einfo + if [[ ${LOCALPATCHES_SUBDIR} == ${PV} ]]; then + einfo "Applying local patches" + else + einfo "Applying local patches (Using subdirectory: ${LOCALPATCHES_SUBDIR})" + fi + + for LOCALPATCH in ${VDR_LOCAL_PATCHES_DIR}/${LOCALPATCHES_SUBDIR}/*.{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 + keepdir ${CONF_DIR}/themes + + 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 /usr/share/vdr + 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 "