Skip to content

Commit

Permalink
Sync with upstream
Browse files Browse the repository at this point in the history
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
  • Loading branch information
ali1234 committed Aug 8, 2024
2 parents cbcd738 + 7098bdd commit 6b515be
Show file tree
Hide file tree
Showing 3,128 changed files with 429,680 additions and 42,096 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
17 changes: 11 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ DVBV3DIRS = atsc dvb-c dvb-s dvb-t
DVBV5DIRS = $(DVBV3DIRS) isdb-t

DVBV3CHANNELFILES = $(foreach dir,$(DVBV3DIRS),$(wildcard $(dir)/*))
DVBV3OUTPUTFILES = $(patsubst %,$(DVBV3OUTPUTDIR)/%,$(DVBV3CHANNELFILES))
DVBV5OUTPUTFILES = $(patsubst %,$(DVBV5OUTPUTDIR)/%,$(DVBV3CHANNELFILES))

DVBFORMATCONVERT_CHANNEL_DVBV5 = -ICHANNEL -ODVBV5
DVBFORMATCONVERT_CHANNEL_DVBV3 = -IDVBV5 -OCHANNEL
Expand All @@ -42,14 +44,17 @@ ifeq ($(DVBV3DIR),)
DVBV3DIR = dvbv3
endif

dvbv3:
@$(foreach var,$(DVBV3DIRS), $(MKDIR) $(DVBV3OUTPUTDIR)/$(var);)
@$(foreach var,$(DVBV3CHANNELFILES), $(DVBFORMATCONVERT) $(DVBFORMATCONVERT_CHANNEL_DVBV3) $(var) $(DVBV3OUTPUTDIR)/$(var);)

dvbv3/%: %
@$(MKDIR) "$(dir $@)"
@$(DVBFORMATCONVERT) $(DVBFORMATCONVERT_CHANNEL_DVBV3) "$<" "$@"

dvbv5: $(DVBV3OUTPUTDIR)
@$(foreach var,$(DVBV3DIRS), $(MKDIR) $(DVBV5OUTPUTDIR)/$(var);)
@$(foreach var,$(DVBV3CHANNELFILES), $(DVBFORMATCONVERT) $(DVBFORMATCONVERT_CHANNEL_DVBV5) $(DVBV3OUTPUTDIR)/$(var) $(DVBV5OUTPUTDIR)/$(var);)
dvbv5/%: %
@$(MKDIR) "$(dir $@)"
@cp "$<" "$@"

dvbv3: $(DVBV3OUTPUTFILES)
dvbv5: $(DVBV5OUTPUTFILES)

install:
@mkdir -p $(DATADIR)/$(DVBV5DIR)
Expand Down
Loading

0 comments on commit 6b515be

Please sign in to comment.