diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-15 20:57:56 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-15 20:57:56 +0200 |
commit | e228dce45adc4f39671131dd0f0611e29ab85bf8 (patch) | |
tree | edef8e22a8f58c666ae65174174a3fc760bfe2d8 /package/bcm2835-vc | |
parent | 562a3446c4e13dc3c770ca86b062961d3dba4b31 (diff) | |
parent | bae480656aac1ec7ad3c2582bd6efe431298bcee (diff) |
Merge branch 'master' of openadk.org:/git/openadk
Diffstat (limited to 'package/bcm2835-vc')
4 files changed, 46 insertions, 4 deletions
diff --git a/package/bcm2835-vc/Makefile b/package/bcm2835-vc/Makefile index 1251ce8d3..97c818199 100644 --- a/package/bcm2835-vc/Makefile +++ b/package/bcm2835-vc/Makefile @@ -13,11 +13,8 @@ PKG_SECTION:= base PKG_DEPENDS:= libpthread PKG_SITES:= http://openadk.org/distfiles/ -PKG_LIBC_DEPENDS:= eglibc glibc PKG_SYSTEM_DEPENDS:= raspberry-pi -PKG_SUBPKGS:= BCM2835_VC - include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,BCM2835_VC,bcm2835-vc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) @@ -25,7 +22,7 @@ $(eval $(call PKG_template,BCM2835_VC,bcm2835-vc,${PKG_VERSION}-${PKG_RELEASE},$ CONFIG_STYLE:= manual do-configure: - (cd $(WRKBUILD) && cmake .) + (cd $(WRKBUILD) && cmake -DCMAKE_SYSTEM_NAME=Linux .) bcm2835-vc-install: $(INSTALL_DIR) ${IDIR_BCM2835_VC}/opt/vc/{bin,lib} diff --git a/package/bcm2835-vc/patches/patch-interface_vcos_pthreads_vcos_platform_h b/package/bcm2835-vc/patches/patch-interface_vcos_pthreads_vcos_platform_h new file mode 100644 index 000000000..95b5d480b --- /dev/null +++ b/package/bcm2835-vc/patches/patch-interface_vcos_pthreads_vcos_platform_h @@ -0,0 +1,12 @@ +--- bcm2835-vc-0.3.orig/interface/vcos/pthreads/vcos_platform.h 2013-09-27 14:22:08.000000000 +0200 ++++ bcm2835-vc-0.3/interface/vcos/pthreads/vcos_platform.h 2013-10-13 20:20:55.000000000 +0200 +@@ -120,9 +120,6 @@ typedef struct + + #define VCOS_ONCE_INIT PTHREAD_ONCE_INIT + +-#if defined(__arm__) && !defined(_HAVE_TIMER_T) && !defined(ANDROID) +-typedef __timer_t timer_t; +-#endif + typedef struct VCOS_TIMER_T + { + pthread_t thread; /**< id of the timer thread */ diff --git a/package/bcm2835-vc/patches/patch-interface_vcos_pthreads_vcos_pthreads_c b/package/bcm2835-vc/patches/patch-interface_vcos_pthreads_vcos_pthreads_c new file mode 100644 index 000000000..583fe04f3 --- /dev/null +++ b/package/bcm2835-vc/patches/patch-interface_vcos_pthreads_vcos_pthreads_c @@ -0,0 +1,11 @@ +--- bcm2835-vc-0.3.orig/interface/vcos/pthreads/vcos_pthreads.c 2013-09-27 14:22:08.000000000 +0200 ++++ bcm2835-vc-0.3/interface/vcos/pthreads/vcos_pthreads.c 2013-10-14 19:44:50.000000000 +0200 +@@ -580,7 +580,7 @@ const char ** vcos_get_argv(void) + */ + uint32_t _vcos_get_ticks_per_second(void) + { +- return HZ; ++ return 100; + } + + VCOS_STATUS_T vcos_once(VCOS_ONCE_T *once_control, diff --git a/package/bcm2835-vc/patches/patch-interface_vmcs_host_linux_vcfilesys_c b/package/bcm2835-vc/patches/patch-interface_vmcs_host_linux_vcfilesys_c new file mode 100644 index 000000000..c5419c90d --- /dev/null +++ b/package/bcm2835-vc/patches/patch-interface_vmcs_host_linux_vcfilesys_c @@ -0,0 +1,22 @@ +--- bcm2835-vc-0.3.orig/interface/vmcs_host/linux/vcfilesys.c 2013-09-27 14:22:08.000000000 +0200 ++++ bcm2835-vc-0.3/interface/vmcs_host/linux/vcfilesys.c 2013-10-14 20:10:02.000000000 +0200 +@@ -49,10 +49,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI + #include <ctype.h> + #include <limits.h> + +-#if !defined(ANDROID) && !defined( __USE_FILE_OFFSET64 ) +-#error "__USE_FILE_OFFSET64 isn't defined" +-#endif +- + #include "interface/vcos/vcos.h" + + /* Some hackery to prevent a clash with the Linux type of the same name */ +@@ -916,7 +912,7 @@ int vc_hostfs_set_attr(const char *path, + + if (pathbuf) + { +- __mode_t mode = 0; ++ mode_t mode = 0; + struct stat sb; + + backslash_to_slash(pathbuf); |