From 29a24458d5466955a4fb1a2a4c0869010a12a0c2 Mon Sep 17 00:00:00 2001 From: Jakub Jirutka Date: Tue, 16 Aug 2016 15:17:55 +0200 Subject: community/tvheadend: improve abuild --- .../419e10eadde5048a99e40f23a37f4d9718496709.patch | 37 ------------------ .../9ddcb8d390f1d99f0cf0b3f78ca95024f0c99e94.patch | 44 ---------------------- community/tvheadend/APKBUILD | 44 ++++++++++------------ .../fix-canal-digitaal-hd-on-astra3.patch | 37 ++++++++++++++++++ community/tvheadend/fix-indentation.patch | 44 ++++++++++++++++++++++ 5 files changed, 101 insertions(+), 105 deletions(-) delete mode 100644 community/tvheadend/419e10eadde5048a99e40f23a37f4d9718496709.patch delete mode 100644 community/tvheadend/9ddcb8d390f1d99f0cf0b3f78ca95024f0c99e94.patch create mode 100644 community/tvheadend/fix-canal-digitaal-hd-on-astra3.patch create mode 100644 community/tvheadend/fix-indentation.patch (limited to 'community/tvheadend') diff --git a/community/tvheadend/419e10eadde5048a99e40f23a37f4d9718496709.patch b/community/tvheadend/419e10eadde5048a99e40f23a37f4d9718496709.patch deleted file mode 100644 index c81d65e613..0000000000 --- a/community/tvheadend/419e10eadde5048a99e40f23a37f4d9718496709.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 419e10eadde5048a99e40f23a37f4d9718496709 Mon Sep 17 00:00:00 2001 -From: Carlo Landmeter -Date: Wed, 23 Sep 2015 07:49:23 +0200 -Subject: [PATCH] fastscan: fix Canal Digitaal HD on astra3 - ---- - data/conf/fastscan | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/data/conf/fastscan b/data/conf/fastscan -index 56aad0f..ca0d361 100644 ---- a/data/conf/fastscan -+++ b/data/conf/fastscan -@@ -83,19 +83,19 @@ - { - "name": "Canal Digitaal HD", - "position": 235, -- "frequency": 12187000, -+ "frequency": 12070000, - "symbolrate" : 27500000, - "polarisation" : "H", -- "delsys" : "dvbs2", -+ "delsys" : "dvbs", - "pid": 901 - }, - { - "name": "TV Vlaanderen HD", - "position": 235, -- "frequency": 12187000, -+ "frequency": 12070000, - "symbolrate" : 27500000, - "polarisation" : "H", -- "delsys" : "dvbs2", -+ "delsys" : "dvbs", - "pid": 911 - }, - { diff --git a/community/tvheadend/9ddcb8d390f1d99f0cf0b3f78ca95024f0c99e94.patch b/community/tvheadend/9ddcb8d390f1d99f0cf0b3f78ca95024f0c99e94.patch deleted file mode 100644 index 5b0d355efc..0000000000 --- a/community/tvheadend/9ddcb8d390f1d99f0cf0b3f78ca95024f0c99e94.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 9ddcb8d390f1d99f0cf0b3f78ca95024f0c99e94 Mon Sep 17 00:00:00 2001 -From: Jaroslav Kysela -Date: Mon, 9 May 2016 09:25:43 +0200 -Subject: [PATCH] htsmsg: fix code indentation, fixes #3788 - ---- - src/htsmsg.c | 12 +++++++----- - 1 file changed, 7 insertions(+), 5 deletions(-) - -diff --git a/src/htsmsg.c b/src/htsmsg.c -index 11e36ea..9c9d842 100644 ---- a/src/htsmsg.c -+++ b/src/htsmsg.c -@@ -968,23 +968,25 @@ htsmsg_print0(htsmsg_t *msg, int indent) - TAILQ_FOREACH(f, &msg->hm_fields, hmf_link) { - - for(i = 0; i < indent; i++) printf("\t"); -- -+ - printf("%s (", f->hmf_name ?: ""); -- -+ - switch(f->hmf_type) { - - case HMF_MAP: - printf("MAP) = {\n"); - htsmsg_print0(&f->hmf_msg, indent + 1); -- for(i = 0; i < indent; i++) printf("\t"); printf("}\n"); -+ for(i = 0; i < indent; i++) printf("\t"); -+ printf("}\n"); - break; - - case HMF_LIST: - printf("LIST) = {\n"); - htsmsg_print0(&f->hmf_msg, indent + 1); -- for(i = 0; i < indent; i++) printf("\t"); printf("}\n"); -+ for(i = 0; i < indent; i++) printf("\t"); -+ printf("}\n"); - break; -- -+ - case HMF_STR: - printf("STR) = \"%s\"\n", f->hmf_str); - break; diff --git a/community/tvheadend/APKBUILD b/community/tvheadend/APKBUILD index 1ce5b3f7f9..322ac5756a 100644 --- a/community/tvheadend/APKBUILD +++ b/community/tvheadend/APKBUILD @@ -19,23 +19,13 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/tvheadend/tvheadend/archive/ $pkgname.initd $pkgname.confd satellites.xml - 419e10eadde5048a99e40f23a37f4d9718496709.patch - 9ddcb8d390f1d99f0cf0b3f78ca95024f0c99e94.patch" - -_builddir="$srcdir/$pkgname-$pkgver" - -prepare() { - local i - cd "$_builddir" - for i in $source; do - case $i in - *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; - esac - done -} + fix-canal-digitaal-hd-on-astra3.patch + fix-indentation.patch" +builddir="$srcdir/$pkgname-$pkgver" build() { - cd "$_builddir" + cd "$builddir" + ./configure --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man \ @@ -49,8 +39,10 @@ build() { } package() { - cd "$_builddir" + cd "$builddir" + make -j1 DESTDIR="$pkgdir" install || return 1 + install -m755 -D "$srcdir"/$pkgname.initd \ "$pkgdir"/etc/init.d/$pkgname || return 1 install -m755 -D "$srcdir"/$pkgname.confd \ @@ -63,7 +55,9 @@ dvb_scan() { pkgdesc="$pkgname dvb scan files" depends="$pkgname" arch="noarch" - cd "$_builddir" + + cd "$builddir" + mkdir -p "$subpkgdir"/usr/share/tvheadend/data mv "$pkgdir"/usr/share/tvheadend/data/dvb-scan \ "$subpkgdir"/usr/share/tvheadend/data || return 1 @@ -73,7 +67,9 @@ satellites_xml() { pkgdesc="$pkgname sattelites from http://satellites-xml.eu" depends="$pkgname" arch="noarch" - cd "$_builddir" + + cd "$builddir" + mkdir -p "$subpkgdir"/usr/share/tvheadend/data/satellites-xml/dvb-s msg "Generating sattelites from satellites.xml" support/sat_xml_scan.py "$srcdir"/satellites.xml \ @@ -84,17 +80,17 @@ md5sums="afe45a345151e7ce31db673e0c738e6e tvheadend-4.0.9.tar.gz 67d1cfcaf2dc211d702abe67285f9333 tvheadend.initd a409c44aecd93626a1a3a39306993c5d tvheadend.confd b2a8bae3e81eb114d489c38c658bbd36 satellites.xml -98d74270cc77aeb38a33569d95ab0840 419e10eadde5048a99e40f23a37f4d9718496709.patch -36b529977dbd20d773bbd5353cba04a7 9ddcb8d390f1d99f0cf0b3f78ca95024f0c99e94.patch" +98d74270cc77aeb38a33569d95ab0840 fix-canal-digitaal-hd-on-astra3.patch +36b529977dbd20d773bbd5353cba04a7 fix-indentation.patch" sha256sums="cea1106f45e286e8c25e6b2f0a581c28bd85e93ce3801ecaac7041568a214977 tvheadend-4.0.9.tar.gz cd0db26b3da95df7cd100e5e30b47cd884fa4a7d2cd27f1bee2f6bec0d6ad211 tvheadend.initd 671f7d410e51aaed4c93f284c180f646680f6b195b5bef47b3ae1fb99ed76dce tvheadend.confd fd545f9d960eabaca431f54208e4ef5ae97a6868d2a1b3da65493e609e7b7564 satellites.xml -5e80a1a5d7e5bb2beccc6a47007389c197f23472fd094faf9496350359c2467f 419e10eadde5048a99e40f23a37f4d9718496709.patch -fd078485deece74f21bc2a75f628f581d6e36082e1091b2e651e01ab44cad926 9ddcb8d390f1d99f0cf0b3f78ca95024f0c99e94.patch" +5e80a1a5d7e5bb2beccc6a47007389c197f23472fd094faf9496350359c2467f fix-canal-digitaal-hd-on-astra3.patch +fd078485deece74f21bc2a75f628f581d6e36082e1091b2e651e01ab44cad926 fix-indentation.patch" sha512sums="ba8c6edcef126c6a260a9251b0948747074061c8f16fb20f03b250c6698645172c9396530b7fa44bf9cf4d8305fcece08c672c812ba6c48211edfbb2691fb58e tvheadend-4.0.9.tar.gz 41143b33e18000aad99d7b17433ac7935fa40a6980c4bf0733e5cc16e2948d18810ce198ca435791c93992ba1e39dc6d55ca6af33c49087557310fd31ad22447 tvheadend.initd f81ace2fd2a86c561f70dca6c89a6217e632db01d5f5d1c6ccfd951c4a798a131767140c176a0a764fe3842363958b31fb2a707a871836795688136bc458f7d5 tvheadend.confd 905b98859d23a1d422a9de1bf002ad438bcd2ec30eb5804aa0701fab64ffeb140098db16b6522c8d0f602f44020232798650dd80fdffc15cd2b0225fd1f37501 satellites.xml -e35ac8d991134d531c6d436e391bb2a4c207a3ec40691fe07b178db798b6253bf5a2814c149254c2846f56c340ae63501d2afd0c5e90afb49251ee653d1f1b37 419e10eadde5048a99e40f23a37f4d9718496709.patch -fd0de0acbb2e211aaf67dd22928176821b38c450464fbc8e31fdc00bd656b54256e0d285d67a0af62dcc6816e91a51be60d4eaac8495765a1af937c802b8b8e8 9ddcb8d390f1d99f0cf0b3f78ca95024f0c99e94.patch" +e35ac8d991134d531c6d436e391bb2a4c207a3ec40691fe07b178db798b6253bf5a2814c149254c2846f56c340ae63501d2afd0c5e90afb49251ee653d1f1b37 fix-canal-digitaal-hd-on-astra3.patch +fd0de0acbb2e211aaf67dd22928176821b38c450464fbc8e31fdc00bd656b54256e0d285d67a0af62dcc6816e91a51be60d4eaac8495765a1af937c802b8b8e8 fix-indentation.patch" diff --git a/community/tvheadend/fix-canal-digitaal-hd-on-astra3.patch b/community/tvheadend/fix-canal-digitaal-hd-on-astra3.patch new file mode 100644 index 0000000000..c81d65e613 --- /dev/null +++ b/community/tvheadend/fix-canal-digitaal-hd-on-astra3.patch @@ -0,0 +1,37 @@ +From 419e10eadde5048a99e40f23a37f4d9718496709 Mon Sep 17 00:00:00 2001 +From: Carlo Landmeter +Date: Wed, 23 Sep 2015 07:49:23 +0200 +Subject: [PATCH] fastscan: fix Canal Digitaal HD on astra3 + +--- + data/conf/fastscan | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/data/conf/fastscan b/data/conf/fastscan +index 56aad0f..ca0d361 100644 +--- a/data/conf/fastscan ++++ b/data/conf/fastscan +@@ -83,19 +83,19 @@ + { + "name": "Canal Digitaal HD", + "position": 235, +- "frequency": 12187000, ++ "frequency": 12070000, + "symbolrate" : 27500000, + "polarisation" : "H", +- "delsys" : "dvbs2", ++ "delsys" : "dvbs", + "pid": 901 + }, + { + "name": "TV Vlaanderen HD", + "position": 235, +- "frequency": 12187000, ++ "frequency": 12070000, + "symbolrate" : 27500000, + "polarisation" : "H", +- "delsys" : "dvbs2", ++ "delsys" : "dvbs", + "pid": 911 + }, + { diff --git a/community/tvheadend/fix-indentation.patch b/community/tvheadend/fix-indentation.patch new file mode 100644 index 0000000000..5b0d355efc --- /dev/null +++ b/community/tvheadend/fix-indentation.patch @@ -0,0 +1,44 @@ +From 9ddcb8d390f1d99f0cf0b3f78ca95024f0c99e94 Mon Sep 17 00:00:00 2001 +From: Jaroslav Kysela +Date: Mon, 9 May 2016 09:25:43 +0200 +Subject: [PATCH] htsmsg: fix code indentation, fixes #3788 + +--- + src/htsmsg.c | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +diff --git a/src/htsmsg.c b/src/htsmsg.c +index 11e36ea..9c9d842 100644 +--- a/src/htsmsg.c ++++ b/src/htsmsg.c +@@ -968,23 +968,25 @@ htsmsg_print0(htsmsg_t *msg, int indent) + TAILQ_FOREACH(f, &msg->hm_fields, hmf_link) { + + for(i = 0; i < indent; i++) printf("\t"); +- ++ + printf("%s (", f->hmf_name ?: ""); +- ++ + switch(f->hmf_type) { + + case HMF_MAP: + printf("MAP) = {\n"); + htsmsg_print0(&f->hmf_msg, indent + 1); +- for(i = 0; i < indent; i++) printf("\t"); printf("}\n"); ++ for(i = 0; i < indent; i++) printf("\t"); ++ printf("}\n"); + break; + + case HMF_LIST: + printf("LIST) = {\n"); + htsmsg_print0(&f->hmf_msg, indent + 1); +- for(i = 0; i < indent; i++) printf("\t"); printf("}\n"); ++ for(i = 0; i < indent; i++) printf("\t"); ++ printf("}\n"); + break; +- ++ + case HMF_STR: + printf("STR) = \"%s\"\n", f->hmf_str); + break; -- cgit v1.2.3