mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-29 05:36:47 +00:00
dvb-apps: update to githash 9f848ee and PKG_URL and tidy patches
Patches have been consolidated from upstream git and buildroot patches. Previous hg repository is no longer available.
This commit is contained in:
Rudi Heitbaum
parent
97c59b9d6b
commit
c8ff7907ac
@ -3,15 +3,18 @@
|
||||
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="dvb-apps"
|
||||
PKG_VERSION="3d43b280298c"
|
||||
PKG_SHA256="f39e2f0ebed7e32bce83522062ad4d414f67fccd5df1b647618524497e15e057"
|
||||
PKG_VERSION="9f848ee0b1529ad5d33b62d1035bfdaf607ccbd8"
|
||||
PKG_SHA256="5ed8693a7d469e47f01923d2a42720ff4b61de1760eb3dee1a49d0c9f8c62d93"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="https://www.linuxtv.org/wiki/index.php/LinuxTV_dvb-apps"
|
||||
PKG_URL="https://linuxtv.org/hg/dvb-apps/archive/${PKG_VERSION}.tar.bz2"
|
||||
PKG_URL="https://github.com/tbsdtv/dvb-apps/archive/${PKG_VERSION}.tar.gz"
|
||||
PKG_DEPENDS_TARGET="toolchain"
|
||||
PKG_LONGDESC="Applications for initial setup, testing and operation of an DVB device supporting the DVB-S, DVB-C, DVB-T, and ATSC."
|
||||
PKG_BUILD_FLAGS="-sysroot"
|
||||
|
||||
PKG_MAKE_OPTS_TARGET="enable_shared=no"
|
||||
PKG_MAKEINSTALL_OPTS_TARGET="enable_shared=no"
|
||||
|
||||
pre_make_target() {
|
||||
export PERL_USE_UNSAFE_INC=1
|
||||
}
|
||||
|
||||
@ -0,0 +1,24 @@
|
||||
From 71478aed635bfa8f458db4aa56022272a6a8badc Mon Sep 17 00:00:00 2001
|
||||
From: Lukas Rusak <lorusak@gmail.com>
|
||||
Date: Mon, 21 Dec 2015 09:12:10 +0000
|
||||
Subject: [PATCH] remove av7110_loadkeys
|
||||
|
||||
---
|
||||
util/Makefile | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/util/Makefile b/util/Makefile
|
||||
index c78598c..c3365fb 100644
|
||||
--- a/util/Makefile
|
||||
+++ b/util/Makefile
|
||||
@@ -4,7 +4,6 @@
|
||||
|
||||
all clean install:
|
||||
$(MAKE) -C atsc_epg $@
|
||||
- $(MAKE) -C av7110_loadkeys $@
|
||||
$(MAKE) -C dib3000-watch $@
|
||||
$(MAKE) -C dst-utils $@
|
||||
$(MAKE) -C dvbdate $@
|
||||
--
|
||||
2.43.0
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
diff -Naur dvb-apps-20090201/util/scan/diseqc.c dvb-apps-20090201a/util/scan/diseqc.c
|
||||
--- dvb-apps-20090201/util/scan/diseqc.c 2009-02-01 13:57:16.000000000 +0100
|
||||
+++ dvb-apps-20090201a/util/scan/diseqc.c 2009-02-14 13:45:42.000000000 +0100
|
||||
@@ -1,6 +1,6 @@
|
||||
+#include <time.h>
|
||||
#include <linux/dvb/frontend.h>
|
||||
#include <sys/ioctl.h>
|
||||
-#include <time.h>
|
||||
|
||||
#include "scan.h"
|
||||
#include "diseqc.h"
|
||||
@ -1,13 +0,0 @@
|
||||
diff --git a/Make.rules b/Make.rules
|
||||
index e867c3a..b2d8663 100644
|
||||
--- a/Make.rules
|
||||
+++ b/Make.rules
|
||||
@@ -9,7 +9,7 @@ ifneq ($(lib_name),)
|
||||
CFLAGS_LIB ?= -fPIC
|
||||
CFLAGS += $(CFLAGS_LIB)
|
||||
|
||||
-libraries = $(lib_name).so $(lib_name).a
|
||||
+libraries = $(lib_name).a
|
||||
|
||||
.PHONY: library
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
diff -Naur a/util/Makefile b/util/Makefile
|
||||
--- a/util/Makefile 2014-03-21 12:26:36.000000000 -0700
|
||||
+++ b/util/Makefile 2015-12-21 01:12:10.261957235 -0800
|
||||
@@ -4,7 +4,6 @@
|
||||
|
||||
all clean install:
|
||||
$(MAKE) -C atsc_epg $@
|
||||
- $(MAKE) -C av7110_loadkeys $@
|
||||
$(MAKE) -C dib3000-watch $@
|
||||
$(MAKE) -C dst-utils $@
|
||||
$(MAKE) -C dvbdate $@
|
||||
@ -1,52 +0,0 @@
|
||||
From: CvH <namerp@googlemail.com>
|
||||
Date: Wed, 22 Nov 2017 23:45:38 +0100
|
||||
Subject: [PATCH] fix for kernel >=4.14
|
||||
|
||||
---
|
||||
include/ca.h | 1 -
|
||||
util/dst-utils/dst_test.c | 14 --------------
|
||||
2 files changed, 15 deletions(-)
|
||||
|
||||
diff --git a/include/ca.h b/include/ca.h
|
||||
index c18537f..5ad21c9 100644
|
||||
--- a/include/ca.h
|
||||
+++ b/include/ca.h
|
||||
@@ -85,6 +85,5 @@ typedef struct ca_pid {
|
||||
#define CA_GET_MSG _IOR('o', 132, ca_msg_t)
|
||||
#define CA_SEND_MSG _IOW('o', 133, ca_msg_t)
|
||||
#define CA_SET_DESCR _IOW('o', 134, ca_descr_t)
|
||||
-#define CA_SET_PID _IOW('o', 135, ca_pid_t)
|
||||
|
||||
#endif
|
||||
diff --git a/util/dst-utils/dst_test.c b/util/dst-utils/dst_test.c
|
||||
index 74385de..5cf3bd8 100644
|
||||
--- a/util/dst-utils/dst_test.c
|
||||
+++ b/util/dst-utils/dst_test.c
|
||||
@@ -111,16 +111,6 @@ static int dst_reset(int cafd)
|
||||
return 0;
|
||||
}
|
||||
|
||||
-static int dst_set_pid(int cafd)
|
||||
-{
|
||||
- if ((ioctl(cafd, CA_SET_PID)) < 0) {
|
||||
- printf("%s: ioctl failed ..\n", __FUNCTION__);
|
||||
- return -1;
|
||||
- }
|
||||
-
|
||||
- return 0;
|
||||
-}
|
||||
-
|
||||
static int dst_get_descr(int cafd)
|
||||
{
|
||||
if ((ioctl(cafd, CA_GET_DESCR_INFO)) < 0) {
|
||||
@@ -229,10 +219,6 @@ int main(int argc, char *argv[])
|
||||
printf("%s: Reset\n", __FUNCTION__);
|
||||
dst_reset(cafd);
|
||||
break;
|
||||
- case 'p':
|
||||
- printf("%s: PID\n", __FUNCTION__);
|
||||
- dst_set_pid(cafd);
|
||||
- break;
|
||||
case 'g':
|
||||
printf("%s: Get Desc\n", __FUNCTION__);
|
||||
dst_get_descr(cafd);
|
||||
@ -1,28 +0,0 @@
|
||||
From 6e62b334cced721b0b2bed197fd36e44878580ce Mon Sep 17 00:00:00 2001
|
||||
From: MilhouseVH <milhouseVH.github@nmacleod.com>
|
||||
Date: Mon, 3 Feb 2020 23:30:43 +0000
|
||||
Subject: [PATCH] replace obsolete stime after glibc-2.31
|
||||
|
||||
---
|
||||
util/dvbdate/dvbdate.c | 5 ++++-
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/util/dvbdate/dvbdate.c b/util/dvbdate/dvbdate.c
|
||||
index f0df437..bff7204 100644
|
||||
--- a/util/dvbdate/dvbdate.c
|
||||
+++ b/util/dvbdate/dvbdate.c
|
||||
@@ -309,7 +309,10 @@ int atsc_scan_date(time_t *rx_time, unsigned int to)
|
||||
*/
|
||||
int set_time(time_t * new_time)
|
||||
{
|
||||
- if (stime(new_time)) {
|
||||
+ struct timespec ts;
|
||||
+ ts.tv_sec = *new_time;
|
||||
+ ts.tv_nsec = 0;
|
||||
+ if (clock_settime(CLOCK_REALTIME, &ts) < 0) {
|
||||
perror("Unable to set time");
|
||||
return -1;
|
||||
}
|
||||
--
|
||||
2.20.1
|
||||
|
||||
@ -1,37 +0,0 @@
|
||||
From e6ff7da39edd44fe6bb14bcba29c0fc5a02957a8 Mon Sep 17 00:00:00 2001
|
||||
From: CrazyCat <crazycat69@narod.ru>
|
||||
Date: Sun, 20 May 2018 21:22:24 +0300
|
||||
Subject: [PATCH] Some compat fixes.
|
||||
|
||||
---
|
||||
lib/libdvbapi/dvbnet.c | 4 ++++
|
||||
lib/libdvbapi/dvbvideo.c | 1 -
|
||||
2 files changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/lib/libdvbapi/dvbnet.c b/lib/libdvbapi/dvbnet.c
|
||||
index 25c09ad..7ddaabe 100644
|
||||
--- a/lib/libdvbapi/dvbnet.c
|
||||
+++ b/lib/libdvbapi/dvbnet.c
|
||||
@@ -29,6 +29,10 @@
|
||||
#include <errno.h>
|
||||
#include "dvbnet.h"
|
||||
|
||||
+#ifndef DVB_NET_FEEDTYPE_GSE
|
||||
+#define DVB_NET_FEEDTYPE_GSE 2 /* generic stream encapsulation */
|
||||
+#endif
|
||||
+
|
||||
int dvbnet_open(int adapter, int netdeviceid)
|
||||
{
|
||||
char filename[PATH_MAX+1];
|
||||
diff --git a/lib/libdvbapi/dvbvideo.c b/lib/libdvbapi/dvbvideo.c
|
||||
index f1ffbe8..18a4d3a 100644
|
||||
--- a/lib/libdvbapi/dvbvideo.c
|
||||
+++ b/lib/libdvbapi/dvbvideo.c
|
||||
@@ -26,7 +26,6 @@
|
||||
#include <unistd.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <linux/types.h>
|
||||
-#include <linux/dvb/video.h>
|
||||
#include <errno.h>
|
||||
#include "dvbvideo.h"
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
diff -ru a/Makefile b/Makefile
|
||||
--- a/Makefile 2014-03-21 20:26:36.000000000 +0100
|
||||
+++ b/Makefile 2022-12-04 20:52:52.827027541 +0100
|
||||
@@ -10,7 +10,6 @@
|
||||
|
||||
all clean install:
|
||||
$(MAKE) -C lib $@
|
||||
- $(MAKE) -C test $@
|
||||
$(MAKE) -C util $@
|
||||
|
||||
update:
|
||||
@ -1,49 +0,0 @@
|
||||
--- a/lib/libdvbapi/dvbaudio.c 2021-07-27 22:57:28.723492743 +1000
|
||||
+++ b/lib/libdvbapi/dvbaudio.c 2021-07-27 23:07:08.672581030 +1000
|
||||
@@ -25,10 +25,13 @@
|
||||
#include <fcntl.h>
|
||||
#include <unistd.h>
|
||||
#include <sys/ioctl.h>
|
||||
-#include <linux/dvb/audio.h>
|
||||
#include <errno.h>
|
||||
#include "dvbaudio.h"
|
||||
|
||||
+#ifndef AUDIO_SET_BYPASS_MODE
|
||||
+#define AUDIO_SET_BYPASS_MODE _IO('o', 8)
|
||||
+#endif
|
||||
+
|
||||
int dvbaudio_open(int adapter, int audiodeviceid)
|
||||
{
|
||||
char filename[PATH_MAX+1];
|
||||
--- a/test/test_av.c 2021-07-27 23:11:51.105535377 +1000
|
||||
+++ b/test/test_av.c 2021-07-27 23:12:05.035519211 +1000
|
||||
@@ -31,8 +31,6 @@
|
||||
#include <unistd.h>
|
||||
|
||||
#include <linux/types.h>
|
||||
-#include <linux/dvb/audio.h>
|
||||
-#include <linux/dvb/video.h>
|
||||
|
||||
int audioStop(int fd, char *arg)
|
||||
{
|
||||
--- a/util/szap/szap.c 2021-07-27 23:26:32.667530471 +1000
|
||||
+++ b/util/szap/szap.c 2021-07-27 23:26:46.154138354 +1000
|
||||
@@ -46,7 +46,6 @@
|
||||
|
||||
#include <linux/dvb/frontend.h>
|
||||
#include <linux/dvb/dmx.h>
|
||||
-#include <linux/dvb/audio.h>
|
||||
#include "lnb.h"
|
||||
#include "util.h"
|
||||
|
||||
@@ -57,6 +56,10 @@
|
||||
#define FALSE (1==0)
|
||||
#endif
|
||||
|
||||
+#ifndef AUDIO_SET_BYPASS_MODE
|
||||
+#define AUDIO_SET_BYPASS_MODE _IO('o', 8)
|
||||
+#endif
|
||||
+
|
||||
/* location of channel list file */
|
||||
#define CHANNEL_FILE "channels.conf"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user