Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync upstream #151

Open
wants to merge 67 commits into
base: tvheadend
Choose a base branch
from
Open

Sync upstream #151

wants to merge 67 commits into from

Conversation

ali1234
Copy link

@ali1234 ali1234 commented Aug 8, 2024

Merges the changes from upstream repository at:

https://git.linuxtv.org/dtv-scan-tables

In case of conflicts, the most recent changed file was used. In all
but two cases, this means using the version from upstream.

Conflicts:

Removed/Renamed:
dvb-s/Astra-19.2E - replaced by Astra-1{KR,L,M,N}-19.2E
dvb-s/Astra-28.2E - replaced by Astra-2{E,F,G}-28.2E
dvb-s/PalapaC2_C-113.0E - Satellite was decommissioned
dvb-s/Turksat-42.0E - Replaced by Trksat-{3,4}A-42.0E

TVHeadend version used:
dvb-t/de-All
dvb-t/ru-Peru

Upstream version used:
dvb-t/es-Huelva
dvb-t/ru-Perm
dvb-t/uk-Bilsdale
dvb-t/uk-BluebellHill
dvb-t/uk-Heathfield
dvb-t/uk-Mendip
dvb-t/uk-Oxford
dvb-t/uk-Rowridge
dvb-t/uk-SandyHeath
dvb-t/uk-Sudbury
dvb-t/uk-TunbridgeWells

125 other files modified only in TVHeadend.

3113 other files modified only in upstream.

Fixes #139
Fixes #132
Fixes #118
Fixes #109
Fixes #82
Fixes #78

Also obsoletes the following PRs - changes were applied upstream, please check them if your PR was closed:

Closes #150
Closes #149
Closes #148
Closes #143
Closes #142

Bernhard Rosenkränzer and others added 30 commits July 20, 2017 16:52
Add a scan file for EWCom Goms DVB-C

Signed-off-by: Bernhard Rosenkränzer <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
According with http://www.satbeams.com/satellites?id=2641, Intelsat 34
has:

	"22 C-band channels to provide services to to North and South America and
	 Europe and 18 Ku-band channels to provide services to Mexico, Central
	 America, Brazil, the Caribbean, Europe, a portion of the United States,
	 and the northern part of the Atlantic Ocean. It will serve the role
	 originally intended for Intelsat 27 that was lost at launch failure and
	 will replace Intelsat 805 and Galaxy 11 at 304.5 degrees East longitude
	 position."

Currently, we have only C-band frequencies for this satellite.

Add Ku-bands as used currently in South America.

The transponders that were obtained from Vivo TV package
matches the ones at:
	http://www.portaleds.com/satelites/listar.php?sat=3045
with a difference of 1-2 MHz.

The LNBf I have is not capable of tuning the two IP data channels
there, but I'm adding it, anyway, as it could be useful for someone.

Signed-off-by: Mauro Carvalho Chehab <[email protected]>
Synchronize ISDB-T tables with http://www.portalbsd.com.br/

Signed-off-by: Mauro Carvalho Chehab <[email protected]>
There are several new channel lists for Brazilian cities.

Add them.

Signed-off-by: Mauro Carvalho Chehab <[email protected]>
The channel lists below got renamed, because the city name
was wrong:

	br-sc-LuisAlves -> br-sc-LuizAlves
	br-sc-Picarras -> br-sc-BalnearioPicarras
	br-sc-SaoMiguelDoeste -> br-sc-SaoMiguelDoOeste
	br-sp-LuizAntonio -> br-sp-LuisAntonio
	br-sp-Mogiguacu -> br-sp-MogiGuacu
	br-es-CachoeiroDoItapemirim -> br-es-CachoeiroDeItapemirim

The cities below don't have digital channels yet:

	br-ba-Barrocas
	br-ms-Caarapo
	br-pi-Picos
	br-pr-BoaVistaDaAparecida

Signed-off-by: Mauro Carvalho Chehab <[email protected]>
DVB-C tuning information for Elisa cable-TV in Finnish
capital region and Riihimäki.

Signed-off-by: Mauro Carvalho Chehab <[email protected]>
As reported on Kaffeine's bugzilla:
	https://bugs.kde.org/show_bug.cgi?id=387513

Signed-off-by: Mauro Carvalho Chehab <[email protected]>
There were some frequency changes on this Satellite.
Update them.

Signed-off-by: Mauro Carvalho Chehab <[email protected]>
Update Finnish frequencies for Digita.

Signed-off-by: Mauro Carvalho Chehab <[email protected]>
I had to update the fr-All file in order to be able to find all the TV channels. Without the modifications, I was not able to find a channel at all.
Add the 11 mux from the province of Huelva (Spain)
Ziggo and UPC had merged, but the initial UPC transponder is still the correct one for former UPC customers.
See also https://gathering.tweakers.net/forum/list_message/31632914#31632914
…tic-Bird-3-5.0W - Ku Band

Hello,

The latest update for the file Atlantic-Bird-3-5.0W (Ku Band) is 2015-03-28:
https://git.linuxtv.org/dtv-scan-tables.git/log/dvb-s/Atlantic-Bird-3-5.0W
but since March 2015 there are a lot of changes in the tranponders list.
And now, a lot of transponders for Algerian, French and Italian TV and
Radio channels are missing.
Attached is an updated config scan file (Atlantic-Bird-3-5.0W.patch
file) for Atlantic-Bird-3-5.0W transponders in dvbv5 format.
Could you please ensure that this new patch is committed into the DVB
source code tree repositery?
PS : Attached there is also the full up to date file :
Atlantic-Bird-3-5.0W-2017-01-09.NEW.FULL if you need it

Thank you

Best regards
Atlantic Bird 1 was renamed to Eutelsat 12 West A in 2012 and moved from
12 to 36 degree's in 2016 and was thus not accurate anymore. In 2018 it
was repositioned to 59 east and renamed to Eutelsat 59A as can be seen
at [0]. So far there are no active transponders.

[0] http://space.skyrocket.de/doc_sdat/atlantic-bird-1.htm

Signed-off-by: Olliver Schinagl <[email protected]>
In 2012 Atlantic Bird 3 was renamed to Eutelsat 5 West A as can be seen
at [0]. Reflect this name change in the filename to make it easier to find.

[0] http://space.skyrocket.de/doc_sdat/stellat-1.htm

Signed-off-by: Olliver Schinagl <[email protected]>
ABS-1 appears to have replaced ABS-2 according to [0].
Lets rename it to reflect it's current name.

[0] http://space.skyrocket.de/doc_sdat/abs-2.htm

Signed-off-by: Olliver Schinagl <[email protected]>
The Amazonas 3 replaced the Amazonas 1 in 2012 as can be seen at [0].
Lets rename it accordingly. Further more, many of the transponders
have been dropped so remove those as well.

[0] http://space.skyrocket.de/doc_sdat/amazonas-3.htm

Signed-off-by: Olliver Schinagl <[email protected]>
Agila 2 was moved in late 2011 to 3 West, renamed to ABS-3 [0]. The
transponder frequencies are no match for the ABS-3 so lets just
remove it.

[0] http://space.skyrocket.de/doc_sdat/agila-2.htm

Signed-off-by: Olliver Schinagl <[email protected]>
No content changes where performed on these files.

Signed-off-by: Olliver Schinagl <[email protected]>
Due to a failure in the solar panels [0], Anik F1 was replaced by F1R in
2005. Anik F1 appears to be still active serving south America, but
without any DVB transponders.

[0] http://space.skyrocket.de/doc_sdat/anik-f1.htm

Signed-off-by: Olliver Schinagl <[email protected]>
Hello,

I have scanned the DVB-T channels of Zaragoza, Spain
I wanted to send them to share and that may be useful for other users.

Javier García
all current German DVB-T2 muxes
Includes some retunes, additional HD mux and Local mux.
There's a Kaffeine open BZ asking for this channel.

Add it.

Signed-off-by: Mauro Carvalho Chehab <[email protected]>
The entries for those satellites were obtained from
www.lyngsat.com via script.

Signed-off-by: Mauro Carvalho Chehab <[email protected]>
mchehab and others added 26 commits March 11, 2020 22:56
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
Frequency changes as a result of 700Mhz migration.

Signed-off-by: Jonathan McCrohan <[email protected]>
Signed-off-by: Sean Young <[email protected]>
Added the initial scan file for cable provider Dorfnetz from Liechtenstein.

Signed-off-by: Thomas Kaiser <[email protected]>
Signed-off-by: Sean Young <[email protected]>
8VSB modulation is used in korean cable DTV with standard cable
frequencies.

Signed-off-by: Sean Young <[email protected]>
The VHF DVB-T2 muxes were terminated by their operator DNA end of 2019.
Update also the UHF frequency muxes operated by Digita.

Signed-off-by: Olli Salonen <[email protected]>
Signed-off-by: Sean Young <[email protected]>
I have fixed the dtv-scan-tables/dvb-t/si-Ljubljana file for new
frequences in the center region.

Signed-off-by: Anton Luka Šijanec <[email protected]>
Signed-off-by: Sean Young <[email protected]>
Complete UK update for all transmitters.

Signed-off-by: Simon Liddicott <[email protected]>
Signed-off-by: Sean Young <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
Those two satellites have two names. Use Just one of them.

While here, update their frequencies from Lyngsat.

Signed-off-by: Mauro Carvalho Chehab <[email protected]>
Those are are new satellite descriptions that didn't use to
exist on Lyngsat. Add them.

Signed-off-by: Mauro Carvalho Chehab <[email protected]>
There are several entries that used to be at Lyngsat.
Several of them were merged with other entries.
On others, there's no TV signal anymore.

So, drop them.

Signed-off-by: Mauro Carvalho Chehab <[email protected]>
Data updated according with https://portalbsd.com.br/.

Signed-off-by: Mauro Carvalho Chehab <[email protected]>
only includes transmitters where there have been changes

Link: https://lore.kernel.org/linux-media/[email protected]
Signed-off-by: Simon Liddicott <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
There were some changes at Portugal channel frequencies, mostly
in 2020. Update the DVB-T channel list accordingly, in order to
reflect the current list of emitters.

Signed-off-by: Mauro Carvalho Chehab <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
updates all transmitter files, removes discontinued muxes

Link: https://lore.kernel.org/linux-media/[email protected]
Signed-off-by: Simon Liddicott <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
Those transponders may have been renamed or decommissioned. So,
drop them.

Signed-off-by: Mauro Carvalho Chehab <[email protected]>
Use the current lists from portalbsd.com.

Signed-off-by: Mauro Carvalho Chehab <[email protected]>
Adds a missing dvb-t2 transmitting station from Austria.

Link: https://lore.kernel.org/linux-media/[email protected]
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
Merges the changes from upstream repository at:

https://git.linuxtv.org/dtv-scan-tables

In case of conflicts, the most recent changed file was used. In all
but two cases, this means using the version from upstream.

 Conflicts:
	dvb-s/Astra-19.2E
	  - replaced by Astra-1{KR,L,M,N}-19.2E
	dvb-s/Astra-28.2E
	  - replaced by Astra-2{E,F,G}-28.2E
	dvb-s/PalapaC2_C-113.0E
	  - Satellite was decommissioned
	dvb-s/Turksat-42.0E
	  - Replaced by Trksat-{3,4}A-42.0E
	dvb-t/de-All
        dvb-t/ru-Perm
	  - TVHeadend version used
	dvb-t/es-Huelva
	dvb-t/ru-Perm
	dvb-t/uk-Bilsdale
	dvb-t/uk-BluebellHill
	dvb-t/uk-Heathfield
	dvb-t/uk-Mendip
	dvb-t/uk-Oxford
	dvb-t/uk-Rowridge
	dvb-t/uk-SandyHeath
	dvb-t/uk-Sudbury
	dvb-t/uk-TunbridgeWells
	  - Upstream version used

125 files modified only in TVHeadend.

3113 files modified only in upstream.

Fixes tvheadend#139
Fixes tvheadend#132
Fixes tvheadend#118
Fixes tvheadend#109
Fixes tvheadend#82
Fixes tvheadend#78

Also obsoletes the following PRs - changes were already applied upstream:

Closes tvheadend#150
Closes tvheadend#149
Closes tvheadend#148
Closes tvheadend#143
Closes tvheadend#142
@ali1234 ali1234 changed the title Syncupstream Sync upstream Aug 8, 2024
@apbarratt
Copy link

This is a tremendous piece of work and on a quicky check I can see it has exactly the changes I'm in need of to prevent having to set this stuff up manually myself. I do hope the folk on the dev team can get this merged in.

@andoma, @chewitt, @Flole998, @ProfYaffle, could this please be reviewed? I appreciate it's not the most exciting of repos, but it appears it won't be long till it's been 2 years since a PR were let through on this.

And perhaps there might be a way to puzzle out some automation to allow more frequent upstream updates too? I must have a look at the final diff to see what it is that requires these to be maintained separately as if TVHeadend's build process here could take advantage of upstream directly I'd imagine this maintenance process could become a thing of the past :)

@apbarratt
Copy link

Link to my recent forum post on this subject: https://tvheadend.org/d/8893-where-do-the-pre-defined-muxes-come-from

And apologies for all the tags to the dev team, I just really would hate for @ali1234's excellent work crawling through all those conflicts to go to waste :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet