Jump to content


Photo

merge requests for PLi's git


  • Please log in to reply
1362 replies to this topic

Re: merge requests for PLi's git #1321 littlesat

  • PLi® Core member
  • 49,497 posts

+533
Excellent

Posted 16 March 2019 - 12:34

I think wanwizard should look at that...

WaveFrontier 28.2E | 23.5E | 19.2E | 16E | 13E | 10/9E | 7E | 5E | 1W | 4/5W | 15W


Re: merge requests for PLi's git #1322 WanWizard

  • Forum Moderator
    PLi® Core member
  • 48,863 posts

+835
Excellent

Posted 16 March 2019 - 13:00

https://github.com/O...igma2/pull/2061 (dvb.cpp: Restore removed code)

 

https://github.com/O...igma2/pull/2060 (Update po files using updateallpo-multiOS.sh)

 

Merged.


Currently in use: VU+Duo 4K (2xFBC S2), Amiko Viper T2C (T2), SAB Alpha Triple HD (S2+T2), Zgemma H3.T2C (T/C), Zgemma H6 (fallback), VU+Zero (fallback)

Many answers to your question can be found in our new and improved wiki.

note: I do not provide support via PM !

 


Re: merge requests for PLi's git #1323 WanWizard

  • Forum Moderator
    PLi® Core member
  • 48,863 posts

+835
Excellent

Posted 16 March 2019 - 13:01

I think wanwizard should look at that...

 

It is just a status gif.

 

The only issue I have with it is that it hardcodes the branch name, which means one more thing not to forget when we branch or merge....


Currently in use: VU+Duo 4K (2xFBC S2), Amiko Viper T2C (T2), SAB Alpha Triple HD (S2+T2), Zgemma H3.T2C (T/C), Zgemma H6 (fallback), VU+Zero (fallback)

Many answers to your question can be found in our new and improved wiki.

note: I do not provide support via PM !

 


Re: merge requests for PLi's git #1324 littlesat

  • PLi® Core member
  • 49,497 posts

+533
Excellent

Posted 16 March 2019 - 15:11

And that was exactly the point.... it would be better when that could also be derived somehow automatically

Edited by littlesat, 16 March 2019 - 15:12.

WaveFrontier 28.2E | 23.5E | 19.2E | 16E | 13E | 10/9E | 7E | 5E | 1W | 4/5W | 15W


Re: merge requests for PLi's git #1325 LraiZer

  • Senior Member
  • 80 posts

+17
Neutral

Posted 16 March 2019 - 20:16

I did also try Travis CI badge branch automatically with local pre-commit hook recently, but decided I did not like or use it in the end.

 

.git/hooks/pre-commit

#!/usr/bin/python
# place pre-commit file in your local .git/hooks/

import subprocess, re

# Hard-Coded for your repo
GITHUB_USER="LraiZer"
REPO="AutoBouquets"

# pro
#URL_TRAVIS="https://travis-ci.com/"
#URL_TOKEN="token=niZCz6igtFadBMtbzzkY&"

# free
URL_TRAVIS="https://travis-ci.org/"
URL_TOKEN=""

print "Starting pre-commit hook..."

BRANCH=subprocess.check_output(["git","rev-parse","--abbrev-ref","HEAD"]).strip()

# Output String with Variable substitution
travis="{REPO} [![Build Status]({URL_TRAVIS}" \
	"{GITHUB_USER}/{REPO}.svn?{URL_TOKEN}branch={BRANCH})]" \
	"({URL_TRAVIS}{GITHUB_USER}/{REPO})\n" \
	.format(URL_TRAVIS=URL_TRAVIS,URL_TOKEN=URL_TOKEN,
	GITHUB_USER=GITHUB_USER,REPO=REPO,BRANCH=BRANCH,)

sentinal_str="[![Build Status]"

readmelines=open("README.md").readlines()
with open("README.md", "w") as fh:
	for aline in readmelines:
		if sentinal_str in aline and travis != aline:
			print "Replacing Travis CI badge with ({URL_TRAVIS}" \
			"{GITHUB_USER}/{REPO}.svn?{URL_TOKEN}branch={BRANCH})" \
			.format(URL_TRAVIS=URL_TRAVIS,URL_TOKEN=URL_TOKEN,
			GITHUB_USER=GITHUB_USER,REPO=REPO,BRANCH=BRANCH,)
			fh.write(travis)
		else:
			fh.write(aline)

subprocess.check_output(["git", "add", "README.md"])

print "pre-commit hook complete."

In the end i opted to only allow travis to run on selected branches in my .travis.yml

 

eg.

branches:
  only:
  - develop
  - rc

AS most branches are derived from develop now, maybe you only need to run travis on develop and rc branches and have both these badges showing at the same time on all README?

Enigma2

develop:[![Build Status](https://travis-ci.org/OpenPLi/enigma2.svg?branch=develop)](https://travis-ci.org/OpenPLi/enigma2)
rc:[![Build Status](https://travis-ci.org/OpenPLi/enigma2.svg?branch=rc)](https://travis-ci.org/OpenPLi/enigma2)
=======
To build enigma2, start reading here: https://wiki.openpli.org/Information_for_Developers

Edited by LraiZer, 16 March 2019 - 20:18.


Re: merge requests for PLi's git #1326 Persian Prince

  • Senior Member
  • 1,702 posts

+232
Excellent

Posted 17 March 2019 - 08:22

https://github.com/O...e-core/pull/661 (Update enigma2-plugins.bb)

 

Silence this annoying warning:
 
do_package_qa: QA Issue: non -staticdev package contains static .a library: enigma2-plugin-systemplugins-networkbrowser path '/enigma2-plugin-systemplugins-networkbrowser/usr/lib/enigma2/python/Plugins/SystemPlugins/NetworkBrowser/netscan.a' [staticdev]

If you like my post click on green arrow :)

 

Open Vision image for your STB: https://github.com/OpenVisionE2


Re: merge requests for PLi's git #1327 Persian Prince

  • Senior Member
  • 1,702 posts

+232
Excellent

Posted 17 March 2019 - 10:17

Do you think https://github.com/O...eced8cef5a61e2a is good for PLi too?

 

It's the adapted version of adenin's changes for ATV.


Edited by Persian Prince, 17 March 2019 - 10:17.

If you like my post click on green arrow :)

 

Open Vision image for your STB: https://github.com/OpenVisionE2


Re: merge requests for PLi's git #1328 littlesat

  • PLi® Core member
  • 49,497 posts

+533
Excellent

Posted 17 March 2019 - 10:29

What is the exact need for this ‘terrible’ thing? What is it exactly doing/solving?

Edited by littlesat, 17 March 2019 - 10:29.

WaveFrontier 28.2E | 23.5E | 19.2E | 16E | 13E | 10/9E | 7E | 5E | 1W | 4/5W | 15W


Re: merge requests for PLi's git #1329 Abu Baniaz

  • PLi® Contributor
  • 1,156 posts

+26
Good

Posted 31 March 2019 - 19:53

Can someone cherry pick this in please? https://github.com/O...1c5e1f68296ba88
A video showing the effect is attached at following location
https://www.mediafire.com/file/2p288i6z6995r1a/subtitle_comparison.mp4/file
Right has modified code, left does not.

Re: merge requests for PLi's git #1330 WanWizard

  • Forum Moderator
    PLi® Core member
  • 48,863 posts

+835
Excellent

Posted 31 March 2019 - 21:50

Tried:

[wanwizard@catwoman] $ git apply /tmp/vix.patch
/tmp/vix.patch:209: trailing whitespace.
		
error: patch failed: lib/gdi/accel.cpp:460
error: lib/gdi/accel.cpp: patch does not apply

Currently in use: VU+Duo 4K (2xFBC S2), Amiko Viper T2C (T2), SAB Alpha Triple HD (S2+T2), Zgemma H3.T2C (T/C), Zgemma H6 (fallback), VU+Zero (fallback)

Many answers to your question can be found in our new and improved wiki.

note: I do not provide support via PM !

 


Re: merge requests for PLi's git #1331 Abu Baniaz

  • PLi® Contributor
  • 1,156 posts

+26
Good

Posted 31 March 2019 - 22:08

The bug is in PLi too by the way. There are two commits, first one is actual fix, second commit is for debug. Only difference in commits between PLi and ViX on the accel.cpp file is removal the 7025 stuff.
I got this conflict

<<<<<<< HEAD
eDebug("[gAccel] alloc failed");
=======
eDebug("[gAccel] accel alloc failed %d allocations already in place", m_accel_allocation.size());
>>>>>>> 8a1fc877a... Subtitle debug logging tweaks
return -3;

I picked first one here
https://github.com/A...de243e1b9729508

Re: merge requests for PLi's git #1332 Persian Prince

  • Senior Member
  • 1,702 posts

+232
Excellent

Posted 8 April 2019 - 21:25

https://github.com/O...e-core/pull/672 (Update libdca_0.0.6.bb: Fix fetch error, old URL won't work anymore.)


If you like my post click on green arrow :)

 

Open Vision image for your STB: https://github.com/OpenVisionE2


Re: merge requests for PLi's git #1333 WanWizard

  • Forum Moderator
    PLi® Core member
  • 48,863 posts

+835
Excellent

Posted 9 April 2019 - 16:32

Merged by Littlsat.


Currently in use: VU+Duo 4K (2xFBC S2), Amiko Viper T2C (T2), SAB Alpha Triple HD (S2+T2), Zgemma H3.T2C (T/C), Zgemma H6 (fallback), VU+Zero (fallback)

Many answers to your question can be found in our new and improved wiki.

note: I do not provide support via PM !

 


Re: merge requests for PLi's git #1334 Persian Prince

  • Senior Member
  • 1,702 posts

+232
Excellent

Posted 10 April 2019 - 11:24

https://github.com/O...igma2/pull/2106 (Update po files using updateallpo-multiOS.sh)


If you like my post click on green arrow :)

 

Open Vision image for your STB: https://github.com/OpenVisionE2


Re: merge requests for PLi's git #1335 littlesat

  • PLi® Core member
  • 49,497 posts

+533
Excellent

Posted 10 April 2019 - 11:44

Merged by WanWizard ;)


WaveFrontier 28.2E | 23.5E | 19.2E | 16E | 13E | 10/9E | 7E | 5E | 1W | 4/5W | 15W


Re: merge requests for PLi's git #1336 Persian Prince

  • Senior Member
  • 1,702 posts

+232
Excellent

Posted 16 April 2019 - 19:23

Merged by Littlsat.

 

 

Merged by WanWizard ;)

 

:D

 

May I ask is there a plan for supporting "osmio4kplus" and "viper4k" by PLi?


If you like my post click on green arrow :)

 

Open Vision image for your STB: https://github.com/OpenVisionE2


Re: merge requests for PLi's git #1337 WanWizard

  • Forum Moderator
    PLi® Core member
  • 48,863 posts

+835
Excellent

Posted 16 April 2019 - 19:43

I haven't seen any request from the manufacturers, which is a prerequisite.


Currently in use: VU+Duo 4K (2xFBC S2), Amiko Viper T2C (T2), SAB Alpha Triple HD (S2+T2), Zgemma H3.T2C (T/C), Zgemma H6 (fallback), VU+Zero (fallback)

Many answers to your question can be found in our new and improved wiki.

note: I do not provide support via PM !

 


Re: merge requests for PLi's git #1338 Persian Prince

  • Senior Member
  • 1,702 posts

+232
Excellent

Posted 21 May 2019 - 20:04

https://github.com/O...igma2/pull/2144 (Let more strings to be translatable)

If you like my post click on green arrow :)

 

Open Vision image for your STB: https://github.com/OpenVisionE2


Re: merge requests for PLi's git #1339 Persian Prince

  • Senior Member
  • 1,702 posts

+232
Excellent

Posted 1 June 2019 - 02:00

Would you please squash merge https://github.com/O...e-core/pull/687 into develop so we could use it?


If you like my post click on green arrow :)

 

Open Vision image for your STB: https://github.com/OpenVisionE2


Re: merge requests for PLi's git #1340 Persian Prince

  • Senior Member
  • 1,702 posts

+232
Excellent

Posted 27 July 2019 - 18:09

https://github.com/O...igma2/pull/2221 (frontend.cpp: Don't hardcode cab_max, also correct ATBM7821 which is an example of cab_max.)

 

https://github.com/O...e-core/pull/690 [Avoid PAK archive (application/x-pak)]

 

Seems these are last days for Iranian github users: https://www.reddit.c...hub_and_myself/


If you like my post click on green arrow :)

 

Open Vision image for your STB: https://github.com/OpenVisionE2





0 user(s) are reading this topic

0 members, 0 guests, 0 anonymous users