diff options
Diffstat (limited to 'media-video/vdr')
-rw-r--r-- | media-video/vdr/Manifest | 10 | ||||
-rw-r--r-- | media-video/vdr/files/vdr-2.0.6_gentoo.patch | 68 | ||||
-rw-r--r-- | media-video/vdr/metadata.xml | 10 | ||||
-rw-r--r-- | media-video/vdr/vdr-2.0.6-r1.ebuild | 277 | ||||
-rw-r--r-- | media-video/vdr/vdr-2.2.0-r4.ebuild | 2 | ||||
-rw-r--r-- | media-video/vdr/vdr-2.2.0-r5.ebuild (renamed from media-video/vdr/vdr-2.2.0-r3.ebuild) | 64 |
6 files changed, 36 insertions, 395 deletions
diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest index 4e933c0d7b5f..8a047a817bd5 100644 --- a/media-video/vdr/Manifest +++ b/media-video/vdr/Manifest @@ -1,15 +1,11 @@ AUX channel_alternative.conf 332 BLAKE2B ec01e5109ecff9c2cf218d89ae9498809f45774a5fd4d5ba103dae957c038d5227e5a300c4ef0db4d418717776ee82e35676dc7e6d0dcdfdaf4195284c803c3e SHA512 738de5d5d99b54a516f41683834509b477590732db4e00b13b2f26e22c7349cb8517965a21251c08d29b0f368b2bb3fa64a1de71da09ffbedc5a401314a0eb5d -AUX vdr-2.0.6_gentoo.patch 2255 BLAKE2B 36b8f013e363990f831d7d5216eeefe79caba9dbba531e1ec5452dc2c8ec49c7047be236b30fbf299f5167e86f5ed59775e59e9aca9babde5bbfc4bd751bf502 SHA512 7bb087d2f362e28700a6f22b2649bd61742a7967344f0132abaaa2ae30d4aef3e9a7afd06d80d2a4a97248abfa273cb5d7e20e419c8409a5a83744fd043fb7e9 AUX vdr-2.2.0-jpeg-9c.patch 811 BLAKE2B fcfef4fca2e2e412f5f4fda858c98978abca85198cf0b88808059d52e9ef260b66b3bc64c1c6eb6498c11923f6d51ea3b29e4b650d1426dc8457a293db025a5a SHA512 91a90e04fa6790a5efa58c1f55b427f8c4fae9266a7998857508d7c9470ab0b7513de49cf2be28e35dc361fbedb492d092ed6cabf7dce1551646a48e8aa4a544 AUX vdr-2.2.0_gcc7extpng.patch 705 BLAKE2B da34652e596d39c3a8c210a6034c2c2aba6649f9cd5e194f00a0ed21f3d2b67de68c560a4e6d2e927a262152a1998c5c279e4451248a918a757adc543a4eab03 SHA512 1f319f71c3819d82e83f68979f2876d7169d086c161939c105cd15d2107e68cbc95cda09e7e883a74e6c95c7db5b0dc58eb92662833732c180250322413ac85b AUX vdr-2.2.0_gentoo.patch 2395 BLAKE2B 72f238b09ae26f915b9de53c357815a757f158da3b47ec009a5126f38bcfe5adec8657f9ca69dced3202c12f0751e88ce1fec0231feeb9b4e8e019556df3b61b SHA512 64c299db8e2fa0545ba9379330ecc365ec0dda9991ef5e85af3fd3a842bdef196aa811b083b50edca5db757e437e181248b5825e32dd463bd916167b4ddda5c7 AUX vdr-2.2.0_glibc-2.24.patch 1395 BLAKE2B 83a82c516554c2fce3b47078c494ddbbd0dbdbe148f1e6525532865b6f61a79110da5d55d17e6357887655ba840525f7349b221bb356a180813ae28bdfd7d1de SHA512 73acef83ada40d067b1c7207e527d782de5bc16027571a31f6411a5a075ef6fbdbd3ecd466314aaa08a01b0bf90a35c36306b5533ea4fecc0e024f7df939517a AUX vdr-2.2.0_unsignedtosigned.patch 5237 BLAKE2B 21c3eddc9e5684337be332ae22c97b6068681ebc8c9ff39a8d673f3511c216fd78ff9bbb43f90fd8f60d8e9bef3b4f0ac4b982469887e91a50919c0d786809ed SHA512 eb740bbfa70d205ee5db66b0aa234a09c54a49cfd60027536af86a208097f0a47dc84e7dae4a6af2cd5c34187b41cd0905ad678c7d610159fe09684b645d6a45 -DIST extpng-vdr-2.0.6-gentoo-edition-v6.patch.bz2 69472 BLAKE2B 60669e9c20b2bd573eb05733bbf9548d2e643b36693be8b15a377b38470708a71b29e2a16baf7ed378132265f814ec9d35dae749ccf6ae204cd9beb787dc8f57 SHA512 f4ecb786ec5a026fa75fcf539518e80273bf43fc325c13a380c70eb85351910efa991b3ee71ca477e597bc2b4598a18620b6cf00fc02714acfcc4e6112d84b6c DIST extpng-vdr-2.2.0-gentoo-edition-v1.patch.bz2 34664 BLAKE2B 81b68ebe0ef4588c3676f0b7a2c766d8d4d4f754a987b3be5868f3c6eff9158d4cea8e492ca81df535e637dbdc5baff638d1fafb4163e9d9a2d0125aba17e2e1 SHA512 16d6fbb8201f003dfe653b6a49424b794d7e697e27ad6f2383dbe17b76712ea5a3da88a676900b84d75ff7425bf3eb9084d60a89a4598758f482dc1f013f7b3e -DIST vdr-2.0.6.tar.bz2 839575 BLAKE2B 40de46d8465b7008bc29c7e2c1c241d4114aa3d62aa6a0acd81636133c295cd87c2fc618e725885c98f47445220e897c23188373457a96b51cf832ca417c9842 SHA512 070ebbfb85478887088567872a71744305dbf9c75de8b095a8fe46d883b0b4fe140539caeb2243715f42793a45790a127542655f549f7ea3cb71c4f9912fa07d DIST vdr-2.2.0.tar.bz2 922708 BLAKE2B 975e07d6d4c5bd13ee92be5d6a1826d6404b0c59e20fa2e30689b185a61e02d54782ad528e6a4f15e0d36806b30bcf48aa336d63adb3604e78056ff318e0fd2c SHA512 183f58133915c6c0fe8ec2b88becbcb2a36418210e6dcf7931053d3771d727c3581593f9eb5c9693abf39e22e728f7b41c42079cd704610c3636ec05134ea93d -EBUILD vdr-2.0.6-r1.ebuild 6921 BLAKE2B bb5925105f29a4ac9d303459adc3742f3b817a352bb575271c20ce5565a3edb980bd89306ee978cfa398c38be4ae8f75cdf253b1fe6526f7384488cd1a917ab9 SHA512 10997c095cb8af5f0ffa00e07247a790cb038f42a9705a4e6b2e5ca715431dd51749dc5faf9beadf899a4170d9e01de92ff61cf1cdf6e21fe87e6dd60afab07b -EBUILD vdr-2.2.0-r3.ebuild 7640 BLAKE2B 6ce00d92f5acbace24c681f3880f8a329bdc69c5ea24f9d72bbc56d2f0a321b4a1db5205f90b3165b602d44b96584b7e07a21b494a004c63f8e5dfec691fdacc SHA512 b50b96b575b82f89771e6c29220419466723e30e7a5e8cc6cfc729f4058285c23930c1703e678086eadd1660b720ca06089d38ba4777d6e22ae8e53a88b0490c -EBUILD vdr-2.2.0-r4.ebuild 8102 BLAKE2B 91f99ea7f1b62d207b89b3662dfc7a7cbe4feade9f15468468563550890fef21dc0751484f14c12c5232daeba13d047a29004b73e6014030e72dc1a9df109dae SHA512 3e02b8a0bf4b89360ca79f7389e01157451f58399ebc2714fbc950cb10be26b079aef8119a87cc43524966e24b205fe88d349456ffef5739370802843cce0286 -MISC metadata.xml 2370 BLAKE2B 83f3c1ca39413cba205d9d779f09c314d8ae1c661fb2c7b5e67133bfbd52d2ed58b7f9636824f7f9c42cb9222006c45228645951f838c202e9ee89e9d977d7e2 SHA512 89a56bbefbcf45c38f4bc069d1dc30e7db9c10262db555a61804cf68018a0f0a8106534453780ceaea398ad3fb25285d88baba56460e2de9682376dc4ef52985 +EBUILD vdr-2.2.0-r4.ebuild 8100 BLAKE2B 108a7185466fb38efe0f2644e493b7e874dced3963825a4cf78a96e8afaa7b3aabae17ef10f45e5c3f972a18e921520b772f502f3bccd83362695a61fd6d6aef SHA512 c56c79a147230f0e4dc33c2f5722f35ba97803e7388c41bb498495c3cb644a65b65957269a482218317856d536a14b47ffb7e08aca269fe945168039c238e89a +EBUILD vdr-2.2.0-r5.ebuild 8111 BLAKE2B 8422450ce89242b7a434a3e413c2a211b417c6eda7b415952dd59774c81b38c8e2b7c348a44d1911b97e159d357c38ceff15c5a5f50d141c0b6d3b8d66b8a655 SHA512 ede37811fa9be88ab1e7732a6dc9949d0258ab62b30205d16e98e3a9d721a45752e5582dbd3d531fd6547473d64b8ccb0a35000ce1d783d2915d38042c459993 +MISC metadata.xml 1665 BLAKE2B a94302446f9bdda540fa5e03f61670325c6a23702dc38f67e876025d60f421d1a54f532c33d02e6938de0d756e91810ca1259f9a8b06ceb425e33dcd3babcc1d SHA512 9482d1a2528354978c7c013816c2672959b109794b8c2a020604ef1e9df28f893a4c1e01ac34b707b7e8f60bad93f44be770daeea4b6f2950a7fb2d276de3223 diff --git a/media-video/vdr/files/vdr-2.0.6_gentoo.patch b/media-video/vdr/files/vdr-2.0.6_gentoo.patch deleted file mode 100644 index 1641fc8e2ee6..000000000000 --- a/media-video/vdr/files/vdr-2.0.6_gentoo.patch +++ /dev/null @@ -1,68 +0,0 @@ -diff -Naur vdr-2.0.6.orig/Makefile vdr-2.0.6/Makefile ---- vdr-2.0.6.orig/Makefile 2014-09-22 22:17:23.000000000 +0200 -+++ vdr-2.0.6/Makefile 2014-09-24 15:22:43.000000000 +0200 -@@ -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)$(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: -@@ -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/metadata.xml b/media-video/vdr/metadata.xml index 246bd87c2005..d0e7ffcbce82 100644 --- a/media-video/vdr/metadata.xml +++ b/media-video/vdr/metadata.xml @@ -16,25 +16,17 @@ <use> <flag name="alternatechannel">Use alternate channel on record</flag> <flag name="bidi">fribidi support, for languages, written from right to left</flag> - <flag name="ddepgentry">remove duplicate EPG entries</flag> - <flag name="dvlvidprefer">controls video-dir choice on recording</flag> <flag name="graphtft">support for vdr-graphtft plugin up from version 0.1.7</flag> <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="keyboard">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 <pkg>media-plugins/vdr-menuorg</pkg></flag> <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 into RAM, need plugin <pkg>media-plugins/vdr-permashift</pkg></flag> - <flag name="permashift_v1">permanent timeshift by recording live TV into RAM, need plugin <pkg>media-plugins/vdr-permashift</pkg></flag> <flag name="pinplugin">Support for <pkg>media-plugins/vdr-pin</pkg></flag> <flag name="resumereset">rreset resume of EOF</flag> - <flag name="rotor">Enable support for plugin vdr-rotor for dish-positioner.</flag> <flag name="ttxtsubs">support for <pkg>media-plugins/vdr-ttxtsubs</pkg></flag> - <flag name="vasarajanauloja">replacement for the liemikuutio patch, adds some nice must haves features</flag> - <flag name="wareagleicon">Replace original icon set in menu</flag> - <flag name="yaepg">Enables support for the vdr-yaepg plugin</flag> </use> </pkgmetadata> diff --git a/media-video/vdr/vdr-2.0.6-r1.ebuild b/media-video/vdr/vdr-2.0.6-r1.ebuild deleted file mode 100644 index 63de150c12f6..000000000000 --- a/media-video/vdr/vdr-2.0.6-r1.ebuild +++ /dev/null @@ -1,277 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils flag-o-matic multilib toolchain-funcs - -# Switches supported by extensions-patch -EXT_PATCH_FLAGS="alternatechannel ddepgentry dvlvidprefer graphtft - jumpplay jumpingseconds mainmenuhooks menuorg naludump permashift permashift_v1 - pinplugin rotor ttxtsubs vasarajanauloja wareagleicon yaepg" - -# 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-v6" - -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/${MY_P}.tar.bz2 - https://dev.gentoo.org/~hd_brummy/distfiles/${EXT_P}.patch.bz2" - -KEYWORDS="amd64 ~arm ~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}/${PN}-2.0.6_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 - 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_postinst() { - 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.2.0-r4.ebuild b/media-video/vdr/vdr-2.2.0-r4.ebuild index 27229bab9fa3..41a6e54da799 100644 --- a/media-video/vdr/vdr-2.2.0-r4.ebuild +++ b/media-video/vdr/vdr-2.2.0-r4.ebuild @@ -28,7 +28,7 @@ SRC_URI="ftp://ftp.tvdr.de/vdr/${MY_P}.tar.bz2 LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~ppc x86" IUSE="bidi debug +kbd html systemd vanilla ${EXT_PATCH_FLAGS} ${EXT_PATCH_FLAGS_RENAMED}" COMMON_DEPEND=" diff --git a/media-video/vdr/vdr-2.2.0-r3.ebuild b/media-video/vdr/vdr-2.2.0-r5.ebuild index dfbfd553e107..740d4182bd84 100644 --- a/media-video/vdr/vdr-2.2.0-r3.ebuild +++ b/media-video/vdr/vdr-2.2.0-r5.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit eutils flag-o-matic toolchain-funcs +inherit flag-o-matic toolchain-funcs # Switches supported by extensions-patch -EXT_PATCH_FLAGS="alternatechannel graphtft naludump permashift_v1 pinplugin +EXT_PATCH_FLAGS="alternatechannel graphtft naludump permashift pinplugin mainmenuhooks menuorg menuselection resumereset ttxtsubs" # names of the use-flags @@ -15,8 +15,6 @@ 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}" @@ -26,34 +24,33 @@ 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/${MY_P}.tar.bz2 - https://dev.gentoo.org/~hd_brummy/distfiles/${EXT_P}.patch.bz2" + mirror://gentoo/${EXT_P}.patch.bz2" -KEYWORDS="amd64 ~arm ~arm64 ~ppc x86" -SLOT="0" LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86" +IUSE="bidi debug keyboard html systemd vanilla ${EXT_PATCH_FLAGS} ${EXT_PATCH_FLAGS_RENAMED}" -COMMON_DEPEND="virtual/jpeg:* +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" - + >=virtual/linuxtv-dvb-headers-5.3" RDEPEND="${COMMON_DEPEND} dev-lang/perl >=media-tv/gentoo-vdr-scripts-2.7 media-fonts/corefonts bidi? ( dev-libs/fribidi ) systemd? ( sys-apps/systemd )" +BDEPEND="sys-devel/gettext" -CONF_DIR=/etc/vdr -CAP_FILE=${S}/capabilities.sh +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" @@ -71,12 +68,12 @@ add_cap() { enable_patch() { local arg ARG_UPPER for arg; do - ARG_UPPER=$(echo $arg|tr '[:lower:]' '[:upper:]') - echo "${ARG_UPPER} = 1" >> Make.config + ARG_UPPER=$(echo $arg | tr '[:lower:]' '[:upper:]') + echo "${ARG_UPPER} = 1" >> Make.config || die "cannot write to 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 + echo "-DUSE_${ARG_UPPER}" >> "${T}"/defines.tmp || die "cannot write to defines.tmp" + cat "${T}"/defines.tmp | tr \\\012 ' ' > "${T}"/defines.IUSE || die "cannot write to defines.tmp" export DEFINES_IUSE=$( cat ${T}/defines.IUSE ) done } @@ -86,7 +83,7 @@ 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 + Make.config.template >> Make.config || die "cannot write to Make.config" } extensions_all_defines() { @@ -94,7 +91,7 @@ extensions_all_defines() { sed -e '/^#\?[A-Z].*= 1/!d' -e 's/^#\?//' -e 's/ .*//' \ Make.config.template \ | sort \ - | tr '[:upper:]' '[:lower:]' + | tr '[:upper:]' '[:lower:]' || die "error in function extensions_all_defines" } lang_po() { @@ -107,20 +104,20 @@ src_configure() { # systemd notification support export "SDNOTIFY=$(usex systemd 1 0)" # with/without keyboard - export "USE_KBD=$(usex kbd 1 0)" + export "USE_KBD=$(usex keyboard 1 0)" } src_prepare() { - # apply maintainace-patches + # apply maintenance-patches ebegin "Changing paths for gentoo" - local DVBDIR=/usr/include + 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} + DVBDIR="${i}" break fi done @@ -136,7 +133,7 @@ src_prepare() { die "DVB headers too old" fi - cat > Make.config <<-EOT + cat > Make.config <<-EOT || die "cannot write to Make.config" # # Generated by ebuild ${PF} # @@ -168,6 +165,7 @@ src_prepare() { # Now apply extensions patch eapply "${WORKDIR}/${EXT_P}.patch" + sed -e 's/PERMASHIFT_V1/PERMASHIFT/g' -i "${S}"/*.[ch] "${S}"/Make.config* || die "sed failed" # This allows us to start even if some plugin does not exist # or is not loadable. @@ -180,10 +178,10 @@ src_prepare() { # (or have them already hard enabled) local IGNORE_PATCHES="pluginmissing" - extensions_all_defines > "${T}"/new.IUSE + extensions_all_defines > "${T}"/new.IUSE || die "cannot write to new.IUSE" echo $EXT_PATCH_FLAGS $EXT_PATCH_FLAGS_RENAMED_EXT_NAME \ $IGNORE_PATCHES | \ - tr ' ' '\n' |sort > "${T}"/old.IUSE + tr ' ' '\n' |sort > "${T}"/old.IUSE || die "cannot write to old.IUSE" local DIFFS=$(diff -u "${T}"/old.IUSE "${T}"/new.IUSE|grep '^[+-][^+-]') if [[ -z ${DIFFS} ]]; then einfo "EXT_PATCH_FLAGS are up to date." @@ -208,7 +206,7 @@ src_prepare() { # add defined use-flags compile options to vdr.pc sed -e "s:\$(CDEFINES) \$(CINCLUDES) \$(HDRDIR):\$(CDEFINES) \$(CINCLUDES) \$(HDRDIR) \$(DEFINES_IUSE):" \ - -i Makefile + -i Makefile || die "sed fails on Makefile" ebegin "Make depend" emake .dependencies >/dev/null @@ -226,7 +224,7 @@ src_prepare() { 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 + -i "${S}"/Makefile || die "sed fails on Makefile" eapply_user @@ -260,7 +258,7 @@ src_install() { # directory emake install \ VIDEODIR="/" \ - DESTDIR="${D}" install + DESTDIR="${ED}" install keepdir "${PLUGIN_LIBDIR}" @@ -283,7 +281,7 @@ src_install() { doins "${FILESDIR}"/channel_alternative.conf fi - chown -R vdr:vdr "${D}/${CONF_DIR}" + chown -R vdr:vdr "${ED}/${CONF_DIR}" || die "chown failed" } pkg_postinst() { |