diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2015-01-13 09:37:52 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-01-13 09:37:52 +0000 |
| commit | e76726cbc5335bfc01c468fbe17ff793e1016372 (patch) | |
| tree | 0304a43d83d1910dcb655e00fe44a6d54b564278 | |
| parent | 9ce2af228e84ca9d75658fc8d2d51141a9d94983 (diff) | |
| download | aports-e76726cbc5335bfc01c468fbe17ff793e1016372.tar.bz2 aports-e76726cbc5335bfc01c468fbe17ff793e1016372.tar.xz | |
main/tvheadend: linux-headers and bsd-compat-headers build fix
| -rw-r--r-- | main/tvheadend/APKBUILD | 18 | ||||
| -rw-r--r-- | main/tvheadend/sys-queue.patch | 17 |
2 files changed, 29 insertions, 6 deletions
diff --git a/main/tvheadend/APKBUILD b/main/tvheadend/APKBUILD index f9c0dcbef4..8783b17daf 100644 --- a/main/tvheadend/APKBUILD +++ b/main/tvheadend/APKBUILD @@ -2,14 +2,15 @@ # Maintainer: Francesco Colista <francesco.colista@gmail.com> pkgname=tvheadend pkgver=3.4.27 -pkgrel=2 +pkgrel=3 pkgdesc="TV Streaming server for linux" url="http://www.lonelycoder.com/hts/tvheadend_overview.html" arch="all" license="GPL3" depends="" depends_dev="openssl-dev libdvbcsa-dev curl-dev avahi-dev" -makedepends="$depends_dev python python findutils bash" +makedepends="$depends_dev python python findutils bash linux-headers + bsd-compat-headers" pkgusers="$pkgname" pkggroups="$pkgname" install="$pkgname.pre-install" @@ -18,7 +19,9 @@ source="https://github.com/tvheadend/tvheadend/archive/3.4patch1.tar.gz tvheadend.initd tvheadend.confd disable-caid-1817.patch - musl-fixes.patch" + musl-fixes.patch + sys-queue.patch + " _builddir="$srcdir/$pkgname-3.4patch1" prepare() { @@ -63,14 +66,17 @@ md5sums="86d1be0ad6e02bd2aecd3d529a026797 3.4patch1.tar.gz c68694d41e7ce0d94913e4332c060618 tvheadend.initd 17cf7dfaf27706409a004c246c1a2c3c tvheadend.confd 0f1bfa326772fefceeee982642e0caac disable-caid-1817.patch -e5b0ea614d34816e9aec3c12706e0328 musl-fixes.patch" +e5b0ea614d34816e9aec3c12706e0328 musl-fixes.patch +eaa9ba5217b05decbce9201ec2d60e21 sys-queue.patch" sha256sums="50438809ff43ab332d255248096e9531ac85e6c51511206a3f68cfc1697f4ead 3.4patch1.tar.gz 58891cd106314b7cb61f0ce68b58ebf58fd0bfe8b0cce03949b828ae90f53ee9 tvheadend.initd 4d4cb6071eac087d91858fedfaf1ce57bae78cab008658dc6b7a0d5c62d1762e tvheadend.confd 023b8001ea2ef07f60556524db44e315bd1700e3b27494b01d95bb3aa91ab4b2 disable-caid-1817.patch -a325ec6fa4fa5fc4819c59b602f2096024069566f5111535dbca50da054e1e80 musl-fixes.patch" +a325ec6fa4fa5fc4819c59b602f2096024069566f5111535dbca50da054e1e80 musl-fixes.patch +d07357f7887e11db367580b03cdbb19ef04f3cba8cb25e4419fab1f5582e29dd sys-queue.patch" sha512sums="fb6dc59fbaf5ea43f69452ff6b034ed80b040bb15f5c43f26a3f8075601066354f82e5cf15f7c5215adf1387edfa57468f71605aacfc0824a996aee108a0f11a 3.4patch1.tar.gz 7727ae66b8c6cb8f8348e05229622251270366c781ced57539490910275e190a052b9438ff5e0e0ed515896e01460d451866396400c99e9e519a4a1176657f18 tvheadend.initd 20fa0004877d74e40e4e98023284f088432c3fec12ef8bfccde40a49a122669a8a6c2a6d5211517a8dd7fd3a9646b08c3296929360a20ad6683ba90a9086b734 tvheadend.confd 4b2d22a0ec72c1ca95c9499b523ed437abcb49f9e475e0e6b9be994a51e03330a87f02fd12a9f549e42278d11866c9a858efebeaf088b97c9f968a668282ffbd disable-caid-1817.patch -d247c431be3ed722f7e98f44e3ba437f94ec6100c79e68294421a75f1d8a1cf27ec7d1da3e821ac7e03b32fd2e36f86773e57db40ef27b9b234db54422a7b9d7 musl-fixes.patch" +d247c431be3ed722f7e98f44e3ba437f94ec6100c79e68294421a75f1d8a1cf27ec7d1da3e821ac7e03b32fd2e36f86773e57db40ef27b9b234db54422a7b9d7 musl-fixes.patch +7dcb5772e9bf03688db1e97acb2dd05f3988f1506af95df603b568c7c9aac3684b1995b32ac8aeeb6d4360bf059aece69a5662ace1158dd875bc280f411cd8f5 sys-queue.patch" diff --git a/main/tvheadend/sys-queue.patch b/main/tvheadend/sys-queue.patch new file mode 100644 index 0000000000..0cec28c7bc --- /dev/null +++ b/main/tvheadend/sys-queue.patch @@ -0,0 +1,17 @@ +--- ./src/queue.h.orig ++++ ./src/queue.h +@@ -86,12 +86,14 @@ + * Some extra functions for LIST manipulation + */ + ++#ifndef LIST_MOVE + #define LIST_MOVE(newhead, oldhead, field) do { \ + if((oldhead)->lh_first) { \ + (oldhead)->lh_first->field.le_prev = &(newhead)->lh_first; \ + } \ + (newhead)->lh_first = (oldhead)->lh_first; \ + } while (0) ++#endif + + #define LIST_INSERT_SORTED(head, elm, field, cmpfunc) do { \ + if(LIST_EMPTY(head)) { \ |