diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2016-03-08 20:58:47 +0200 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2016-03-08 20:58:47 +0200 |
| commit | 13c266a262374f037351e6da040d052b45a34ef7 (patch) | |
| tree | 37b5efb8cc1093c2e8fa5be7ae28a075488f47d3 /testing/tvheadend-git | |
| parent | f3775d33c63280a5cd4c566d46c6fbf08df1756f (diff) | |
| download | aports-13c266a262374f037351e6da040d052b45a34ef7.tar.bz2 aports-13c266a262374f037351e6da040d052b45a34ef7.tar.xz | |
Revert "testing/tvheadend-git: temp including musl ucontext.h"
This reverts commit e831ada5136c933b9d89ae6b828c468ba2c8a225.
Offending musl change has been reverted, so revert this hack also.
Diffstat (limited to 'testing/tvheadend-git')
| -rw-r--r-- | testing/tvheadend-git/APKBUILD | 13 | ||||
| -rw-r--r-- | testing/tvheadend-git/ucontext.h | 25 |
2 files changed, 4 insertions, 34 deletions
diff --git a/testing/tvheadend-git/APKBUILD b/testing/tvheadend-git/APKBUILD index 557d2818f..5a75c91d1 100644 --- a/testing/tvheadend-git/APKBUILD +++ b/testing/tvheadend-git/APKBUILD @@ -20,8 +20,7 @@ subpackages="$pkgname-doc $pkgname-dvb-scan:dvb_scan $pkgname-satellites-xml:sat source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.gz $pkgname.initd $pkgname.confd - satellites.xml - ucontext.h" + satellites.xml" giturl="https://github.com/tvheadend/tvheadend.git" disturl="dev.alpinelinux.org:/archive/$pkgname" @@ -36,7 +35,6 @@ prepare() { *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; esac done - cp $srcdir/ucontext.h src/ || return 1 } build() { @@ -89,15 +87,12 @@ satellites_xml() { md5sums="603b5ece17ff05eca8c105b6c91fae69 tvheadend-git-4.1_git20160308.tar.gz b2f3e611fb9c6c7013cc6e808dcb155c tvheadend-git.initd a29e609cc5f02c34812df253aa7bf623 tvheadend-git.confd -84e9f5d3446be49624303cbef43a2523 satellites.xml -d497c6eefeb57625de496ec78e46cc22 ucontext.h" +84e9f5d3446be49624303cbef43a2523 satellites.xml" sha256sums="8a9bf91cce7f95ef926cea7321dba5bb9184b50736b0391df5736fcfd1685f27 tvheadend-git-4.1_git20160308.tar.gz ca245780931d2507f40b8ed13a9fad44550243dda1ade863ac0fd5316716a992 tvheadend-git.initd 1fd4b100142ba9d7aa9b73d3168b3c015abd786894c6a284e9ecabae421d2cb9 tvheadend-git.confd -63e8a27474d88b821c5768b59043620ff92e0a4d2d8a87290d1a2ef2e3f8c39b satellites.xml -801beec26c076bafc8d13c612e611758e64d8bda526925df4eec39489e00ffd9 ucontext.h" +63e8a27474d88b821c5768b59043620ff92e0a4d2d8a87290d1a2ef2e3f8c39b satellites.xml" sha512sums="e304de9b05e343fab180294222fc0ee2aac544ba6a77f9ae6a1abf884ea9b3a1d9d675928f17dd23b5d55d140de1cf1f4e9cd9633777d936f938858533b37a9f tvheadend-git-4.1_git20160308.tar.gz db275e263d52d0515544cc52836d99d1cf43b7c17a8037f897d5788e770b69be85cb709f71e7fae4d66c4a2cef8c4f9533fc2ab41490776ee437e4db4d27fa31 tvheadend-git.initd dd55c56ffb0b090fc03537556340ac0dd17741d2ce9eeabb388af43b566e2764385affc2e4457fa7a6d94e44c491d7cf43c6b6d89dc1ba60dd9724cc488c0ef1 tvheadend-git.confd -38eb39ecdc0a165b18bab5dcd236a89f44b1e7c77e224612e45a50b3b8b2a6b20e72cdf3fe2ef75278b4c515906b75f547c8e1e7c86fef1712437bbbb7a0caeb satellites.xml -4b4193ddd0621292eb81c1e5e0329324795554c930cb1185c3fae47e9c4cb89153346f9e0146f192df96b0372ba08473199e5bd31905a6ca4b47f41889d12a7d ucontext.h" +38eb39ecdc0a165b18bab5dcd236a89f44b1e7c77e224612e45a50b3b8b2a6b20e72cdf3fe2ef75278b4c515906b75f547c8e1e7c86fef1712437bbbb7a0caeb satellites.xml" diff --git a/testing/tvheadend-git/ucontext.h b/testing/tvheadend-git/ucontext.h deleted file mode 100644 index 3bb776ed6..000000000 --- a/testing/tvheadend-git/ucontext.h +++ /dev/null @@ -1,25 +0,0 @@ -#ifndef _UCONTEXT_H -#define _UCONTEXT_H -#ifdef __cplusplus -extern "C" { -#endif - -#include <features.h> - -#include <signal.h> - -#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) -#define NGREG (sizeof(gregset_t)/sizeof(greg_t)) -#endif - -struct __ucontext; - -int getcontext(struct __ucontext *); -void makecontext(struct __ucontext *, void (*)(void), int, ...); -int setcontext(const struct __ucontext *); -int swapcontext(struct __ucontext *, const struct __ucontext *); - -#ifdef __cplusplus -} -#endif -#endif |