summaryrefslogtreecommitdiff
path: root/media-video/vdr
diff options
context:
space:
mode:
Diffstat (limited to 'media-video/vdr')
-rw-r--r--media-video/vdr/Manifest4
-rw-r--r--media-video/vdr/files/vdr-2.0.6-r2_gentoo.patch73
-rw-r--r--media-video/vdr/files/vdr-2.2.0_unsignedtosigned.patch112
-rw-r--r--media-video/vdr/vdr-2.2.0-r3.ebuild (renamed from media-video/vdr/vdr-2.2.0-r2.ebuild)24
4 files changed, 127 insertions, 86 deletions
diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index d3a5aca3b0af..3d6c54243855 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -1,10 +1,10 @@
AUX channel_alternative.conf 332 BLAKE2B ec01e5109ecff9c2cf218d89ae9498809f45774a5fd4d5ba103dae957c038d5227e5a300c4ef0db4d418717776ee82e35676dc7e6d0dcdfdaf4195284c803c3e SHA512 738de5d5d99b54a516f41683834509b477590732db4e00b13b2f26e22c7349cb8517965a21251c08d29b0f368b2bb3fa64a1de71da09ffbedc5a401314a0eb5d
-AUX vdr-2.0.6-r2_gentoo.patch 2518 BLAKE2B 55ea5a454e4b561581e1b418952c71603412e21fa63c9ca70efe13f2dcb097d4312a0e1a8509db411a4bc452f577c441d95d97ee3cff5b2613336811dec209e3 SHA512 01416b5825595d5a8c813297dd1791978f0d4ffe1b06d2254772c3dc2d76d0c09720ada64dc332df156196d73b8500ae1dcdb08d95502a8c940baf4590ece545
AUX vdr-2.0.6_gentoo.patch 2255 BLAKE2B 36b8f013e363990f831d7d5216eeefe79caba9dbba531e1ec5452dc2c8ec49c7047be236b30fbf299f5167e86f5ed59775e59e9aca9babde5bbfc4bd751bf502 SHA512 7bb087d2f362e28700a6f22b2649bd61742a7967344f0132abaaa2ae30d4aef3e9a7afd06d80d2a4a97248abfa273cb5d7e20e419c8409a5a83744fd043fb7e9
AUX vdr-2.0.7_systemd_argsdir.patch 14827 BLAKE2B b2c8eedd695f761a718d295c83cc53d8da55679c8c46f261326e2e67707f9af65b51dfa8cbe96a86ddd34c216580fdeb5b3e33adcf01f825b0c8ffd7a4374d99 SHA512 f0510d27d4b5ff2bbc3f400e5e8e4aae165f665bc7455742e12ebe6f9c6e46985b2ac9fd4089fd3c33c71d975afe73a6e9e089fc6fd9f226c5d53e3fe0553317
AUX vdr-2.0.7_systemd_argsdir_vanilla.patch 14825 BLAKE2B 930955b2e80fa5a6c9ee24e89f3b980f7c4acded4c114cc78528d2afefa74dbdf4e0a6b41c968fcbba15943a3b91fecdebec725a9ae426f241e775893cbc369b SHA512 1270abaca1bed4a1dfc7756aaa9d1e3b17c5f35b69f3ff333988192ceddb10bbe03aa1973f878537d750b92a0a277213de193f98d6f113a2f447e342867639f3
AUX vdr-2.2.0-r2_gentoo.patch 2578 BLAKE2B f40bd2dadb802285eb229219b2c9e2966073d37cbb6233a309589d22dd875e4457bd4a66f37aba3e0dc679960d310ee718d1bf2d72112c2dbed89a53ca234330 SHA512 46e447fabdfa38dd164dae5aacc932933595f0a068b8c60b19e9aba635c1d4b7cdf368af9e5544933f0ec64550bb685b2705f39ebffba5b1a66897e27bca6ef1
AUX vdr-2.2.0_gentoo.patch 2322 BLAKE2B 7a7a2357bcefe53e251ed3a5b6b1cee1b85c76597c14746236671f044b5a7a5644bd1788e12499588aab87d7c342952c8b55e3a32868299e8c055983a2224b81 SHA512 c6953a7fb77717fdaa8ca05550496e25f4bc60d91c13ed0fb23d27e1a1ec433ec2d5cfb019717cf09eb7b67c9ebb91664b1b731dc28bc4f25e815871f6de0bc7
+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
@@ -13,5 +13,5 @@ DIST vdr-2.2.0.tar.bz2 922708 BLAKE2B 975e07d6d4c5bd13ee92be5d6a1826d6404b0c59e2
EBUILD vdr-2.0.6-r1.ebuild 6921 BLAKE2B bb5925105f29a4ac9d303459adc3742f3b817a352bb575271c20ce5565a3edb980bd89306ee978cfa398c38be4ae8f75cdf253b1fe6526f7384488cd1a917ab9 SHA512 10997c095cb8af5f0ffa00e07247a790cb038f42a9705a4e6b2e5ca715431dd51749dc5faf9beadf899a4170d9e01de92ff61cf1cdf6e21fe87e6dd60afab07b
EBUILD vdr-2.0.7.ebuild 7275 BLAKE2B ebe4497429f1a08314d80736f5f88ee58c0cb8df65f6930eb1de65b907cc713b29f06a46ac98cab330af24ea137ccbd47392a93d22db9d79395e5f29518489d8 SHA512 c43dd5e9d776ff640eb04b3064f77ead2931194642eb2b541a0add7e3df1c4d6291bfcf4996a450af5a4e979566ae6b374f4cbe20dca71e797fea29bdf5d8520
EBUILD vdr-2.2.0-r1.ebuild 7538 BLAKE2B fabc149e2174c9ba75bea2b3e560e1e8ad1a79ac31933162d31908843971d9529eb7cd63fc1e5adf0c025e3bfcbde914eab5e64314f60dffaa781001dc0b7e3e SHA512 641e41abcabaae613a2d6f0a6ba55194b04ee412ed48461869dc0e4c705a02bb7cfe7ae9c64cc7efadfd3a4ed9dd7a06661874bbbbf3a5e213269899a6b6d572
-EBUILD vdr-2.2.0-r2.ebuild 7474 BLAKE2B 7d15d0c9557e10cd90978644c4635522cfe8ba8dcc8808f5cf4a4fd3b26dccb7d71afb7a98768bc5cb85ba7068c3ac1ee61ee03f9f485183a857360796cd6c56 SHA512 b76b0b9feffa98fd29e964ff947f37f1c9df50a7ce1b8f6f24fd6ef6b3287722871b9301858518cadb3bd67a5a3f07b5ab329ad274fc411c1465cd333af33e70
+EBUILD vdr-2.2.0-r3.ebuild 7609 BLAKE2B 805e86f93e9f4d9492fd6c64025d28b6e444061ba46bab82873bdcc74399c5e8b1b2e85d8df64946695bf83de595401b66f9966d095e04bbf809c76ce7c7da5c SHA512 3c60eb03eb2d826fcdc021cfe91a859e1dce3affe47ca8c78dd035610c25ecb9cf9d3f5670a5c1d0c3d977ae0bad5d0ec5486daeea69208f08f748e77953cc64
MISC metadata.xml 2164 BLAKE2B 1976e2e6090ee6bddcc008794c4ffcc6ae656ab46d1ca459d01a6dd5b7736387d53af03f72685c4e9237ea04bb4f86da49ef9af7f7e1707b038b6a87ae9028c0 SHA512 b960e1d56205787e2c2f6334835b7d9f28fbd283850e2e7af6427a25a590719b7832cc2dcbd94b4ecf3e983fb846909d6b66cfadda89e5b8bcbc469a91651d24
diff --git a/media-video/vdr/files/vdr-2.0.6-r2_gentoo.patch b/media-video/vdr/files/vdr-2.0.6-r2_gentoo.patch
deleted file mode 100644
index 516bb7b7254f..000000000000
--- a/media-video/vdr/files/vdr-2.0.6-r2_gentoo.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-disabled plugin install from vdr source, we dont support this way
-patch to support LINGUAS variable
-fixed install on multicore cpu, creating CONFDIR on later time
-install libsi includes in own dir
-Signed-of-by: Joerg Bornkessel <hd_brummy@gentoo.org> 20/Jan/2015
-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/files/vdr-2.2.0_unsignedtosigned.patch b/media-video/vdr/files/vdr-2.2.0_unsignedtosigned.patch
new file mode 100644
index 000000000000..dd04abe1e2e8
--- /dev/null
+++ b/media-video/vdr/files/vdr-2.2.0_unsignedtosigned.patch
@@ -0,0 +1,112 @@
+compile fix for gcc-7.2
+this will only attache the core vdr, not the extpatch-ng
+https://www.linuxtv.org/pipermail/vdr/2017-March/029229.html
+
+Signed-of by: Joerg Bornkessel <hd_brummy@gentoo.org> (2018/07/15)
+diff -Naur vdr-2.2.0.orig/diseqc.c vdr-2.2.0/diseqc.c
+--- vdr-2.2.0.orig/diseqc.c 2018-07-15 15:59:17.000000000 +0200
++++ vdr-2.2.0/diseqc.c 2018-07-15 16:04:00.000000000 +0200
+@@ -253,10 +253,10 @@
+ return result;
+ }
+
+-uint cDiseqc::SetScrFrequency(uint SatFrequency, const cScr *Scr, uint8_t *Codes) const
++int cDiseqc::SetScrFrequency(int SatFrequency, const cScr *Scr, uint8_t *Codes) const
+ {
+ if ((Codes[0] & 0xF0) == 0x70 ) { // EN50607 aka JESS
+- uint t = SatFrequency == 0 ? 0 : (SatFrequency - 100);
++ int t = SatFrequency == 0 ? 0 : (SatFrequency - 100);
+ if (t < 2048 && Scr->Channel() >= 0 && Scr->Channel() < 32) {
+ Codes[1] = t >> 8 | Scr->Channel() << 3;
+ Codes[2] = t;
+@@ -266,7 +266,7 @@
+ }
+ }
+ else { // EN50494 aka Unicable
+- uint t = SatFrequency == 0 ? 0 : (SatFrequency + Scr->UserBand() + 2) / 4 - 350; // '+ 2' together with '/ 4' results in rounding!
++ int t = SatFrequency == 0 ? 0 : (SatFrequency + Scr->UserBand() + 2) / 4 - 350; // '+ 2' together with '/ 4' results in rounding!
+ if (t < 1024 && Scr->Channel() >= 0 && Scr->Channel() < 8) {
+ Codes[3] = t >> 8 | (t == 0 ? 0 : scrBank << 2) | Scr->Channel() << 5;
+ Codes[4] = t;
+@@ -399,7 +399,7 @@
+ return NULL;
+ }
+
+-cDiseqc::eDiseqcActions cDiseqc::Execute(const char **CurrentAction, uchar *Codes, uint8_t *MaxCodes, const cScr *Scr, uint *Frequency) const
++cDiseqc::eDiseqcActions cDiseqc::Execute(const char **CurrentAction, uchar *Codes, uint8_t *MaxCodes, const cScr *Scr, int *Frequency) const
+ {
+ if (!*CurrentAction)
+ *CurrentAction = commands;
+diff -Naur vdr-2.2.0.orig/diseqc.h vdr-2.2.0/diseqc.h
+--- vdr-2.2.0.orig/diseqc.h 2018-07-15 15:59:17.000000000 +0200
++++ vdr-2.2.0/diseqc.h 2018-07-15 16:02:11.000000000 +0200
+@@ -86,7 +86,7 @@
+ mutable int scrBank;
+ char *commands;
+ bool parsing;
+- uint SetScrFrequency(uint SatFrequency, const cScr *Scr, uint8_t *Codes) const;
++ int SetScrFrequency(int SatFrequency, const cScr *Scr, uint8_t *Codes) const;
+ int SetScrPin(const cScr *Scr, uint8_t *Codes) const;
+ const char *Wait(const char *s) const;
+ const char *GetPosition(const char *s) const;
+@@ -96,7 +96,7 @@
+ cDiseqc(void);
+ ~cDiseqc();
+ bool Parse(const char *s);
+- eDiseqcActions Execute(const char **CurrentAction, uchar *Codes, uint8_t *MaxCodes, const cScr *Scr, uint *Frequency) const;
++ eDiseqcActions Execute(const char **CurrentAction, uchar *Codes, uint8_t *MaxCodes, const cScr *Scr, int *Frequency) const;
+ ///< Parses the DiSEqC commands and returns the appropriate action code
+ ///< with every call. CurrentAction must be the address of a character pointer,
+ ///< which is initialized to NULL. This pointer is used internally while parsing
+diff -Naur vdr-2.2.0.orig/dvbdevice.c vdr-2.2.0/dvbdevice.c
+--- vdr-2.2.0.orig/dvbdevice.c 2018-07-15 15:59:17.000000000 +0200
++++ vdr-2.2.0/dvbdevice.c 2018-07-15 16:02:11.000000000 +0200
+@@ -329,7 +329,7 @@
+ void ClearEventQueue(void) const;
+ bool GetFrontendStatus(fe_status_t &Status) const;
+ cPositioner *GetPositioner(void);
+- void ExecuteDiseqc(const cDiseqc *Diseqc, unsigned int *Frequency);
++ void ExecuteDiseqc(const cDiseqc *Diseqc, int *Frequency);
+ void ResetToneAndVoltage(void);
+ bool SetFrontend(void);
+ virtual void Action(void);
+@@ -696,7 +696,7 @@
+ return positioner;
+ }
+
+-void cDvbTuner::ExecuteDiseqc(const cDiseqc *Diseqc, unsigned int *Frequency)
++void cDvbTuner::ExecuteDiseqc(const cDiseqc *Diseqc, int *Frequency)
+ {
+ if (!lnbPowerTurnedOn) {
+ CHECK(ioctl(fd_frontend, FE_SET_VOLTAGE, SEC_VOLTAGE_13)); // must explicitly turn on LNB power
+@@ -806,7 +806,7 @@
+
+ SETCMD(DTV_DELIVERY_SYSTEM, frontendType);
+ if (frontendType == SYS_DVBS || frontendType == SYS_DVBS2) {
+- unsigned int frequency = channel.Frequency();
++ int frequency = channel.Frequency();
+ if (Setup.DiSEqC) {
+ if (const cDiseqc *diseqc = Diseqcs.Get(device->CardIndex() + 1, channel.Source(), frequency, dtp.Polarization(), &scr)) {
+ frequency -= diseqc->Lof();
+@@ -829,7 +829,7 @@
+ }
+ else {
+ int tone = SEC_TONE_OFF;
+- if (frequency < (unsigned int)Setup.LnbSLOF) {
++ if (frequency < Setup.LnbSLOF) {
+ frequency -= Setup.LnbFrequLo;
+ tone = SEC_TONE_OFF;
+ }
+diff -Naur vdr-2.2.0.orig/remux.c vdr-2.2.0/remux.c
+--- vdr-2.2.0.orig/remux.c 2018-07-15 15:59:17.000000000 +0200
++++ vdr-2.2.0/remux.c 2018-07-15 16:02:11.000000000 +0200
+@@ -1654,7 +1654,7 @@
+ Div += parser->IFrameTemporalReferenceOffset();
+ if (Div <= 0)
+ Div = 1;
+- uint32_t Delta = ptsValues[0] / Div;
++ int Delta = ptsValues[0] / Div;
+ // determine frame info:
+ if (isVideo) {
+ if (abs(Delta - 3600) <= 1)
+diff -Naur vdr-2.2.0.orig/remux.c.orig vdr-2.2.0/remux.c.orig
diff --git a/media-video/vdr/vdr-2.2.0-r2.ebuild b/media-video/vdr/vdr-2.2.0-r3.ebuild
index 6062fc62c64a..2b4a137a165a 100644
--- a/media-video/vdr/vdr-2.2.0-r2.ebuild
+++ b/media-video/vdr/vdr-2.2.0-r3.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-inherit flag-o-matic toolchain-funcs
+inherit eutils flag-o-matic toolchain-funcs
# Switches supported by extensions-patch
EXT_PATCH_FLAGS="alternatechannel graphtft naludump permashift_v1 pinplugin
@@ -186,7 +186,7 @@ src_prepare() {
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."
+ einfo "EXT_PATCH_FLAGS are up to date."
else
ewarn "IUSE differences!"
local diff
@@ -215,7 +215,9 @@ src_prepare() {
eend $? "make depend failed"
fi
- eapply "${FILESDIR}/${P}-r2_gentoo.patch"
+ eapply "${FILESDIR}/${P}_gentoo.patch"
+ #gcc-7.2, this will fix only the core vdr, not the extpatch
+ eapply "${FILESDIR}/${P}_unsignedtosigned.patch"
# fix some makefile issues
sed -e "s:ifndef NO_KBD:ifeq (\$(USE_KBD),1):" \
@@ -234,16 +236,16 @@ src_prepare() {
echo -e ${CAPS} > "${CAP_FILE}"
- # L10N support
- einfo "\n \t VDR supports the L10N values"
+ # 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 L10N=\"${LING_PO}\"\n"
+ einfo "\t LINGUAS=\"${LING_PO}\"\n"
- if [[ -z ${L10N} ]]; then
- einfo "\n \t No values in L10N="
+ if [[ -z ${LINGUAS} ]]; then
+ einfo "\n \t No values in LINGUAS="
einfo "\t You will get only english text on OSD \n"
fi
@@ -255,7 +257,7 @@ src_install() {
# directory
emake install \
VIDEODIR="/" \
- DESTDIR="${D}" install || die "emake install failed"
+ DESTDIR="${D%/}" install || die "emake install failed"
keepdir "${PLUGIN_LIBDIR}"
@@ -278,7 +280,7 @@ src_install() {
doins "${FILESDIR}"/channel_alternative.conf
fi
- chown -R vdr:vdr "${D}/${CONF_DIR}"
+ chown -R vdr:vdr "${D%/}/${CONF_DIR}"
}
pkg_postinst() {
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 14:09:03 +0000