Skip to content

Commit

Permalink
tvheadend-4.3: update libhdhomerun to 2020 version + fixes (#3915)
Browse files Browse the repository at this point in the history
  • Loading branch information
th0ma7 authored Mar 17, 2020
1 parent b691c3f commit e22094e
Show file tree
Hide file tree
Showing 6 changed files with 31 additions and 16 deletions.
4 changes: 3 additions & 1 deletion cross/libhdhomerun/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PKG_NAME = libhdhomerun
PKG_VERS = 20190621
PKG_VERS = 20200225
PKG_EXT = tgz
PKG_DIST_NAME = $(PKG_NAME)_$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = http://download.silicondust.com/hdhomerun
Expand All @@ -20,5 +20,7 @@ include ../../mk/spksrc.cross-cc.mk
myInstall:
@install -m 755 -d $(STAGING_INSTALL_PREFIX)/include/libhdhomerun
@install -m 644 $(INSTALL_DIR)/../$(PKG_DIR)/*.h $(STAGING_INSTALL_PREFIX)/include/libhdhomerun/
@install -m 755 -d $(STAGING_INSTALL_PREFIX)/bin
@install -m 755 $(INSTALL_DIR)/../$(PKG_DIR)/hdhomerun_config $(STAGING_INSTALL_PREFIX)/bin/
@install -m 755 -d $(STAGING_INSTALL_PREFIX)/lib
@install -m 644 $(INSTALL_DIR)/../$(PKG_DIR)/libhdhomerun.so $(STAGING_INSTALL_PREFIX)/lib/
1 change: 1 addition & 0 deletions cross/libhdhomerun/PLIST
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
bin:bin/hdhomerun_config
lib:lib/libhdhomerun.so
6 changes: 3 additions & 3 deletions cross/libhdhomerun/digests
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
libhdhomerun_20190621.tgz SHA1 f34b062c5b2bdf1ce9da6a10e5c6ed4209510a5a
libhdhomerun_20190621.tgz SHA256 9a60f663b00de5f820bdb85806662e25f22da248b14942e33a8b43a0331f855a
libhdhomerun_20190621.tgz MD5 0720a217952dbe05fba6e32ce430f7c7
libhdhomerun_20200225.tgz SHA1 c8d16242d51423d38e3430f4542c1c8819ea6882
libhdhomerun_20200225.tgz SHA256 f6493e4a643a4ba9c3b2424b7f491186efc2ba5fd93d2285d65b7c5aca676cf9
libhdhomerun_20200225.tgz MD5 1319c5e7cf6af80085f60078a18d465e
10 changes: 0 additions & 10 deletions cross/tvheadend/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ CONFIGURE_ARGS += --disable-ffmpeg_static --enable-libav
CONFIGURE_ARGS += --disable-libfdkaac_static --disable-libopus_static --disable-libtheora --disable-libtheora_static
CONFIGURE_ARGS += --disable-libvorbis_static --disable-libvpx_static --disable-libx264_static --disable-libx265_static

POST_PATCH_TARGET = post_patch_target_tvheadend

ifeq ($(wildcard $(FFMPEG_DIR)),)
DEPENDS += cross/ffmpeg
endif
Expand All @@ -32,11 +30,3 @@ include ../../mk/spksrc.cross-cc.mk
ifeq ($(findstring $(ARCH),$(ARM5_ARCHES)),$(ARCH))
CONFIGURE_ARGS += --nowerror
endif

.PHONY: post_patch_target_tvheadend

post_patch_target_tvheadend:
@if [ "$(ARCH)" = "ppc853x" ] || [ "$(ARCH)" = "qoriq" ]; then \
cat $(PWD)/patches/ppc/isoc9x.patch | ($(RUN) patch -p0) ;\
cat $(PWD)/patches/ppc/hts_strtab-undo-inlining-of-functions.patch | ($(RUN) patch -p0) ;\
fi;
22 changes: 22 additions & 0 deletions cross/tvheadend/patches/ppc853x/ppc853-old-gcc.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
diff -uprN ../tvheadend-git221c29b40b1e53ae09a69d9458442dd4fea665f5.ORIG/Makefile ./Makefile
--- ../tvheadend-git221c29b40b1e53ae09a69d9458442dd4fea665f5.ORIG/Makefile 2019-11-28 13:11:58.000000000 -0500
+++ ./Makefile 2020-03-02 20:33:50.811069069 -0500
@@ -36,7 +36,7 @@ CFLAGS += -g
ifeq ($(CONFIG_CCDEBUG),yes)
CFLAGS += -O0
else
-CFLAGS += -O2 -D_FORTIFY_SOURCE=2
+CFLAGS += -O2
endif
ifeq ($(CONFIG_PIE),yes)
CFLAGS += -fPIE
@@ -52,9 +52,6 @@ endif
CFLAGS += -Wall -Wwrite-strings -Wno-deprecated-declarations
CFLAGS += -Wmissing-prototypes
CFLAGS += -fms-extensions -funsigned-char -fno-strict-aliasing
-ifeq ($(COMPILER), gcc)
-CFLAGS += -Wno-stringop-truncation -Wno-stringop-overflow
-endif
CFLAGS += -D_FILE_OFFSET_BITS=64
CFLAGS += -I${BUILDDIR} -I${ROOTDIR}/src -I${ROOTDIR}
ifeq ($(CONFIG_ANDROID),yes)
4 changes: 2 additions & 2 deletions spk/tvheadend/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ SPK_GIT_HASH = 221c29b
SPK_GIT_DATE = 20191128
SPK_VERS = $(SPK_SHORT_VERS).$(SPK_GIT_DATE)~$(SPK_GIT_HASH)
TVH_VERS = $(SPK_SHORT_VERS)~$(SPK_GIT_HASH)
SPK_REV = 17
SPK_REV = 19
SPK_ICON = src/tvheadend.png
DSM_UI_DIR = app

Expand All @@ -20,7 +20,7 @@ DESCRIPTION = Tvheadend is a TV streaming server and recorder for Linux, FreeBSD
RELOAD_UI = yes
DISPLAY_NAME = Tvheadend
STARTABLE = yes
CHANGELOG = "1. Use latest github commit on 4.3 branch 221c29b<br/>2. Update all trivial dependencies to latest versions<br/>3. New package built on m4tt075 v4.28 version"
CHANGELOG = "1. Update to latest version of libhdhomerun<br/>2. qoriq arch fix<br/>3. SurveillanceStation-DSCam fix for issue no. 3868"
HOMEPAGE = https://tvheadend.org/
LICENSE = GPL v3

Expand Down

0 comments on commit e22094e

Please sign in to comment.