diff options
| author | Carlo Landmeter <clandmeter@gmail.com> | 2014-02-15 10:02:23 +0000 |
|---|---|---|
| committer | Carlo Landmeter <clandmeter@gmail.com> | 2014-02-15 10:02:23 +0000 |
| commit | 70f5b33b867f28eb2a65b723358fde8e075f5aa3 (patch) | |
| tree | 0b560086dbeab3dfdf0253dd4f572788c6b6ba1d | |
| parent | a017b875e1b7b7be7d76b21c79b041853a33472f (diff) | |
| download | aports-70f5b33b867f28eb2a65b723358fde8e075f5aa3.tar.bz2 aports-70f5b33b867f28eb2a65b723358fde8e075f5aa3.tar.xz | |
main/tvheadend: musl build fixes
| -rw-r--r-- | main/tvheadend/APKBUILD | 13 | ||||
| -rw-r--r-- | main/tvheadend/musl-fixes.patch | 51 |
2 files changed, 59 insertions, 5 deletions
diff --git a/main/tvheadend/APKBUILD b/main/tvheadend/APKBUILD index fd21cfaaaa..f9c0dcbef4 100644 --- a/main/tvheadend/APKBUILD +++ b/main/tvheadend/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Francesco Colista <francesco.colista@gmail.com> pkgname=tvheadend pkgver=3.4.27 -pkgrel=1 +pkgrel=2 pkgdesc="TV Streaming server for linux" url="http://www.lonelycoder.com/hts/tvheadend_overview.html" arch="all" @@ -18,7 +18,7 @@ source="https://github.com/tvheadend/tvheadend/archive/3.4patch1.tar.gz tvheadend.initd tvheadend.confd disable-caid-1817.patch -" + musl-fixes.patch" _builddir="$srcdir/$pkgname-3.4patch1" prepare() { @@ -62,12 +62,15 @@ package() { md5sums="86d1be0ad6e02bd2aecd3d529a026797 3.4patch1.tar.gz c68694d41e7ce0d94913e4332c060618 tvheadend.initd 17cf7dfaf27706409a004c246c1a2c3c tvheadend.confd -0f1bfa326772fefceeee982642e0caac disable-caid-1817.patch" +0f1bfa326772fefceeee982642e0caac disable-caid-1817.patch +e5b0ea614d34816e9aec3c12706e0328 musl-fixes.patch" sha256sums="50438809ff43ab332d255248096e9531ac85e6c51511206a3f68cfc1697f4ead 3.4patch1.tar.gz 58891cd106314b7cb61f0ce68b58ebf58fd0bfe8b0cce03949b828ae90f53ee9 tvheadend.initd 4d4cb6071eac087d91858fedfaf1ce57bae78cab008658dc6b7a0d5c62d1762e tvheadend.confd -023b8001ea2ef07f60556524db44e315bd1700e3b27494b01d95bb3aa91ab4b2 disable-caid-1817.patch" +023b8001ea2ef07f60556524db44e315bd1700e3b27494b01d95bb3aa91ab4b2 disable-caid-1817.patch +a325ec6fa4fa5fc4819c59b602f2096024069566f5111535dbca50da054e1e80 musl-fixes.patch" sha512sums="fb6dc59fbaf5ea43f69452ff6b034ed80b040bb15f5c43f26a3f8075601066354f82e5cf15f7c5215adf1387edfa57468f71605aacfc0824a996aee108a0f11a 3.4patch1.tar.gz 7727ae66b8c6cb8f8348e05229622251270366c781ced57539490910275e190a052b9438ff5e0e0ed515896e01460d451866396400c99e9e519a4a1176657f18 tvheadend.initd 20fa0004877d74e40e4e98023284f088432c3fec12ef8bfccde40a49a122669a8a6c2a6d5211517a8dd7fd3a9646b08c3296929360a20ad6683ba90a9086b734 tvheadend.confd -4b2d22a0ec72c1ca95c9499b523ed437abcb49f9e475e0e6b9be994a51e03330a87f02fd12a9f549e42278d11866c9a858efebeaf088b97c9f968a668282ffbd disable-caid-1817.patch" +4b2d22a0ec72c1ca95c9499b523ed437abcb49f9e475e0e6b9be994a51e03330a87f02fd12a9f549e42278d11866c9a858efebeaf088b97c9f968a668282ffbd disable-caid-1817.patch +d247c431be3ed722f7e98f44e3ba437f94ec6100c79e68294421a75f1d8a1cf27ec7d1da3e821ac7e03b32fd2e36f86773e57db40ef27b9b234db54422a7b9d7 musl-fixes.patch" diff --git a/main/tvheadend/musl-fixes.patch b/main/tvheadend/musl-fixes.patch new file mode 100644 index 0000000000..7a9f1f5a91 --- /dev/null +++ b/main/tvheadend/musl-fixes.patch @@ -0,0 +1,51 @@ +diff --git a/src/capmt.c b/src/capmt.c +index 16a774c..b858ad1 100644 +--- a/src/capmt.c ++++ b/src/capmt.c +@@ -77,9 +77,6 @@ + + #ifdef __GNUC__ + #include <features.h> +-#if __GNUC_PREREQ(4, 3) +-#pragma GCC diagnostic ignored "-Warray-bounds" +-#endif + #endif + + #define MAX_CA 4 +diff --git a/src/muxer/tvh/mkmux.c b/src/muxer/tvh/mkmux.c +index c42ca26..c46888f 100644 +--- a/src/muxer/tvh/mkmux.c ++++ b/src/muxer/tvh/mkmux.c +@@ -24,6 +24,7 @@ + #include <unistd.h> + #include <assert.h> + #include <string.h> ++#include <sys/uio.h> + + #include "tvheadend.h" + #include "streaming.h" +diff --git a/src/trap.c b/src/trap.c +index b0fe543..adfd7b7 100644 +--- a/src/trap.c ++++ b/src/trap.c +@@ -165,7 +165,7 @@ traphandler(int sig, siginfo_t *si, void *UC) + si->si_addr, reason ?: "N/A"); + + tvhlog_spawn(LOG_ALERT, "CRASH", "Loaded libraries: %s ", libs); +- snprintf(tmpbuf, sizeof(tmpbuf), "Register dump [%d]: ", NGREG); ++ snprintf(tmpbuf, sizeof(tmpbuf), "Register dump [%d]: ", (int) NGREG); + + for(i = 0; i < NGREG; i++) { + #if __WORDSIZE == 64 +diff --git a/src/tvheadend.h b/src/tvheadend.h +index f2f2378..d9837d9 100644 +--- a/src/tvheadend.h ++++ b/src/tvheadend.h +@@ -27,6 +27,7 @@ + #include <netinet/in.h> + #include <sys/time.h> + #include <libgen.h> ++#include <sys/stat.h> + + #include "queue.h" + #include "avg.h" |