aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--multimedia/tvheadend/Makefile5
-rw-r--r--multimedia/tvheadend/distinfo4
-rw-r--r--multimedia/tvheadend/files/patch-src__tvhpoll.c24
-rw-r--r--multimedia/tvheadend/pkg-message1
-rw-r--r--multimedia/tvheadend/pkg-plist4
5 files changed, 8 insertions, 30 deletions
diff --git a/multimedia/tvheadend/Makefile b/multimedia/tvheadend/Makefile
index 1a1d906a79b3..81c9e1c669c7 100644
--- a/multimedia/tvheadend/Makefile
+++ b/multimedia/tvheadend/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= tvheadend
-PORTVERSION= 3.4.0.20130714.2
-PORTREVISION= 1
+PORTVERSION= 3.4.0.20130726.3
CATEGORIES= multimedia
MASTER_SITES= http://people.freebsd.org/~decke/distfiles/
DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} dvb-scan-tables-20130714.tar.gz
@@ -22,7 +21,7 @@ LIB_DEPENDS= execinfo:${PORTSDIR}/devel/libexecinfo \
USE_GITHUB= yes
GH_ACCOUNT= decke
GH_TAGNAME= ${GH_COMMIT}
-GH_COMMIT= f665ccb
+GH_COMMIT= 8a8c1a8
USES= pkgconfig gmake
USE_PYTHON= yes
diff --git a/multimedia/tvheadend/distinfo b/multimedia/tvheadend/distinfo
index a68805d7af4e..1774fcab17ab 100644
--- a/multimedia/tvheadend/distinfo
+++ b/multimedia/tvheadend/distinfo
@@ -1,4 +1,4 @@
-SHA256 (tvheadend-3.4.0.20130714.2.tar.gz) = 385e4bc37d68c9c75e985f54df1bf18f87ef0aeece713a6619a8d264480b836f
-SIZE (tvheadend-3.4.0.20130714.2.tar.gz) = 2208312
+SHA256 (tvheadend-3.4.0.20130726.3.tar.gz) = 798e1972089303434738051820863a1092a4ea9cf413eea44b5381c667549c23
+SIZE (tvheadend-3.4.0.20130726.3.tar.gz) = 2321128
SHA256 (dvb-scan-tables-20130714.tar.gz) = ba4458cdb19149186e56c20498cedd85c4e42bcb283d3f5285c24bd643ec6507
SIZE (dvb-scan-tables-20130714.tar.gz) = 122674
diff --git a/multimedia/tvheadend/files/patch-src__tvhpoll.c b/multimedia/tvheadend/files/patch-src__tvhpoll.c
deleted file mode 100644
index fd279ef982f0..000000000000
--- a/multimedia/tvheadend/files/patch-src__tvhpoll.c
+++ /dev/null
@@ -1,24 +0,0 @@
---- src/tvhpoll.c.orig 2013-07-14 13:20:52.000000000 +0200
-+++ src/tvhpoll.c 2013-07-14 16:54:00.375898773 +0200
-@@ -121,10 +121,10 @@
- tvhpoll_alloc(tp, num);
- for (i = 0; i < num; i++) {
- if (evs[i].events & TVHPOLL_OUT){
-- EV_SET(tp->ev+i, evs[i].fd, EVFILT_WRITE, EV_ADD | EV_ENABLE, 0, 0, (void*)evs[i].data.u64);
-+ EV_SET(tp->ev+i, evs[i].fd, EVFILT_WRITE, EV_ADD | EV_ENABLE, 0, 0, (intptr_t*)evs[i].data.u64);
- }
- if (evs[i].events & TVHPOLL_IN){
-- EV_SET(tp->ev+i, evs[i].fd, EVFILT_READ, EV_ADD | EV_ENABLE, 0, 0, (void*)evs[i].data.u64);
-+ EV_SET(tp->ev+i, evs[i].fd, EVFILT_READ, EV_ADD | EV_ENABLE, 0, 0, (intptr_t*)evs[i].data.u64);
- }
- }
- return kevent(tp->fd, tp->ev, num, NULL, 0, NULL);
-@@ -177,7 +177,7 @@
- for (i = 0; i < nfds; i++) {
- evs[i].fd = tp->ev[i].ident;
- evs[i].events = 0;
-- evs[i].data.u64 = (uint64_t)tp->ev[i].udata;
-+ evs[i].data.u64 = (intptr_t)tp->ev[i].udata;
- if (tp->ev[i].filter & EVFILT_WRITE) evs[i].events |= TVHPOLL_OUT;
- if (tp->ev[i].filter & EVFILT_READ) evs[i].events |= TVHPOLL_IN;
- if (tp->ev[i].flags & EV_ERROR) evs[i].events |= TVHPOLL_ERR;
diff --git a/multimedia/tvheadend/pkg-message b/multimedia/tvheadend/pkg-message
index ff8070abdc12..a6859e0b8985 100644
--- a/multimedia/tvheadend/pkg-message
+++ b/multimedia/tvheadend/pkg-message
@@ -5,7 +5,6 @@ not received a lot of testing yet. It might break for you and
kill kenny or spill your beer so don't expect too much.
Known issues:
-- scanning does not work
- no libav support
- no libdvbcsa support
- no rc.d script
diff --git a/multimedia/tvheadend/pkg-plist b/multimedia/tvheadend/pkg-plist
index 4016e3cca7e5..8fbb931ac6d1 100644
--- a/multimedia/tvheadend/pkg-plist
+++ b/multimedia/tvheadend/pkg-plist
@@ -1864,7 +1864,9 @@ bin/tvheadend
%%DATADIR%%/src/webui/static/icons/world.png
%%DATADIR%%/src/webui/static/icons/wrench.png
%%DATADIR%%/src/webui/static/img/bg-header.png
+%%DATADIR%%/src/webui/static/img/error.png
%%DATADIR%%/src/webui/static/img/logo.png
+%%DATADIR%%/src/webui/static/img/spinner_black_bg.gif
%%DATADIR%%/src/webui/static/livegrid/livegrid-all.js
%%DATADIR%%/src/webui/static/livegrid/resources/css/ext-ux-livegrid.css
%%DATADIR%%/src/webui/static/livegrid/resources/images/loading.gif
@@ -1873,6 +1875,8 @@ bin/tvheadend
%%DATADIR%%/src/webui/static/lovcombo/css/lovcombo.css
%%DATADIR%%/src/webui/static/lovcombo/css/webpage.css
%%DATADIR%%/src/webui/static/lovcombo/lovcombo-all.js
+%%DATADIR%%/src/webui/static/tv.css
+%%DATADIR%%/src/webui/static/tv.js
%%DATADIR%%/src/webui/static/multiselect/ddview.js
%%DATADIR%%/src/webui/static/multiselect/multiselect.js
%%DATADIR%%/src/webui/static/multiselect/resources/bottom2.gif