diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2016-02-11 12:59:25 +0000 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2016-02-11 12:59:25 +0000 |
| commit | e51dc3ec2de764ad64fda854fd78f519b9a83524 (patch) | |
| tree | 3b5082d96694b9972c570edebbe0d62a7dc16271 | |
| parent | b6f4cf4fa4a1b000882822e3cb3e106af1c3330c (diff) | |
| download | aports-e51dc3ec2de764ad64fda854fd78f519b9a83524.tar.bz2 aports-e51dc3ec2de764ad64fda854fd78f519b9a83524.tar.xz | |
main/raspberrypi: upgrade to snapshot of 2016-02-02
| -rw-r--r-- | main/raspberrypi/APKBUILD | 22 | ||||
| -rw-r--r-- | main/raspberrypi/fix-build.patch | 11 | ||||
| -rw-r--r-- | main/raspberrypi/fix-inlines.patch | 26 |
3 files changed, 9 insertions, 50 deletions
diff --git a/main/raspberrypi/APKBUILD b/main/raspberrypi/APKBUILD index 23f279fbe3..0884071ff0 100644 --- a/main/raspberrypi/APKBUILD +++ b/main/raspberrypi/APKBUILD @@ -1,8 +1,8 @@ # Maintainer: Timo Teräs <timo.teras@iki.fi> pkgname=raspberrypi -pkgver=0.20150825 -_commitid=fb11b39d97371c076eef7c85bbcab5733883a41e -pkgrel=1 +pkgver=0.20160202 +_commitid=2a4af2192c0e161555fdb2a12e902b587166c4a6 +pkgrel=0 pkgdesc="Raspberry Pi support tools" url="https://github.com/raspberrypi/userland" arch="armhf" @@ -15,7 +15,6 @@ options="!fhs" subpackages="$pkgname-dev $pkgname-libs" source="raspberrypi-$pkgver.tar.gz::https://github.com/raspberrypi/userland/archive/$_commitid.tar.gz fix-build.patch - fix-inlines.patch " _sourcedir="$srcdir"/userland-$_commitid @@ -58,12 +57,9 @@ libs() { mv "$pkgdir"/opt/vc/lib/* "$subpkgdir"/opt/vc/lib } -md5sums="892449f3d18208da4ea2f871c21c8e35 raspberrypi-0.20150825.tar.gz -5e2f8c8f8d59541370b7df4918352443 fix-build.patch -87d5150f912486b7dadfee05d1f034cb fix-inlines.patch" -sha256sums="3521fa369732c7caa9a343c19a4b37d1b1056033965f0654a07547a936da87df raspberrypi-0.20150825.tar.gz -90610f473acb5267eff18baaaca39076401dd375156ce2bf2e220738fac0ee99 fix-build.patch -cae600ccfcbf3699e4e968352d5c483536bdab0a1b0700fc40b620bf3b6e50a6 fix-inlines.patch" -sha512sums="806c888e5a927204c817fc25a0bc91a1cedb0f2385ccb2c54de5c966e8dc59cf1277e51b3fd9bb005352995d9f725b9be6c357499121e634ec9332b35fee9fb0 raspberrypi-0.20150825.tar.gz -8697565069613dc824a516784553eb0ea5edcaa072dfc57fc38c32d0d7f6051273a2eedae840e8909fd046bf828eb4aaa50c2fff31c371c9ef23b7d4f33450aa fix-build.patch -1b54703bb63f995f7c9b80801975302d7e6df4f396e1213dff3004d399e60cde2714c46480555e935e793e168865e44964514a3d41dfd7a1fb74759f7ce65c7e fix-inlines.patch" +md5sums="dd863d22e4d6e9b018ad0d4a888658df raspberrypi-0.20160202.tar.gz +71e462b752fbf710bb025c5ac056ab2c fix-build.patch" +sha256sums="5c25eb4de5feb11fdf74d58779f4cc615cda6623b81648ae15ae5e4ddf94c5ce raspberrypi-0.20160202.tar.gz +c65cefe64f39456166701f8c0e6fbaa3e617b935929397df5f87b6238f73feba fix-build.patch" +sha512sums="e0ccf4c71b802c98358df16eb62fbbaf6dcd567cb5b0b6938c463624e4034debaf0d3aa20f3275dea9d313574c5ce6e004e7aebef976aad3bd49cf5e136a4b78 raspberrypi-0.20160202.tar.gz +f0780bfe1dd8b2fb3a78e5c8a9f22f36c15f2d1e703b83f4dae7908159ccc59a51502a90d26a5faa7e05ac539f15651fa0d60d4d4728d7d26f963174e406e646 fix-build.patch" diff --git a/main/raspberrypi/fix-build.patch b/main/raspberrypi/fix-build.patch index 2fb11e748f..51284f9e99 100644 --- a/main/raspberrypi/fix-build.patch +++ b/main/raspberrypi/fix-build.patch @@ -1,14 +1,3 @@ ---- userland-d4aa617de3b196399bb8e2ce32e181768cb52179.orig/host_applications/linux/apps/raspicam/RaspiVidYUV.c -+++ userland-d4aa617de3b196399bb8e2ce32e181768cb52179/host_applications/linux/apps/raspicam/RaspiVidYUV.c -@@ -106,8 +106,6 @@ - /// Run/record forever - #define WAIT_METHOD_FOREVER 4 - --extern FILE *stderr, *stdout; -- - int mmal_status_to_int(MMAL_STATUS_T status); - static void signal_handler(int signal_number); - --- userland-d4aa617de3b196399bb8e2ce32e181768cb52179.orig/host_applications/linux/libs/debug_sym/debug_sym.c +++ userland-d4aa617de3b196399bb8e2ce32e181768cb52179/host_applications/linux/libs/debug_sym/debug_sym.c @@ -67,6 +67,8 @@ diff --git a/main/raspberrypi/fix-inlines.patch b/main/raspberrypi/fix-inlines.patch deleted file mode 100644 index 57f35183d7..0000000000 --- a/main/raspberrypi/fix-inlines.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- userland-fb11b39d97371c076eef7c85bbcab5733883a41e.orig/interface/vcos/vcos_types.h -+++ userland-fb11b39d97371c076eef7c85bbcab5733883a41e/interface/vcos/vcos_types.h -@@ -121,10 +121,10 @@ - #if defined(NDEBUG) - - #ifdef __GNUC__ --# define VCOS_INLINE_DECL extern __inline__ -+# define VCOS_INLINE_DECL extern - # define VCOS_INLINE_IMPL static __inline__ - #else --# define VCOS_INLINE_DECL static _VCOS_INLINE /* declare a func */ -+# define VCOS_INLINE_DECL extern - # define VCOS_INLINE_IMPL static _VCOS_INLINE /* implement a func inline */ - #endif - ---- userland-fb11b39d97371c076eef7c85bbcab5733883a41e.orig/interface/vcos/pthreads/vcos_platform_types.h -+++ userland-fb11b39d97371c076eef7c85bbcab5733883a41e/interface/vcos/pthreads/vcos_platform_types.h -@@ -61,7 +61,7 @@ - #define VCOS_ASSERT_MSG(...) ((VCOS_ASSERT_LOGGING && !VCOS_ASSERT_LOGGING_DISABLE) ? vcos_pthreads_logging_assert(__FILE__, __func__, __LINE__, __VA_ARGS__) : (void)0) - - #define VCOS_INLINE_BODIES --#define VCOS_INLINE_DECL extern __inline__ -+#define VCOS_INLINE_DECL extern - #define VCOS_INLINE_IMPL static __inline__ - - #ifdef __cplusplus |