Merge pull request #1181 from ilpianista/master

Bump libbcm2835 to 1.44
This commit is contained in:
Kevin Mihelich 2015-05-05 06:12:24 -06:00
commit d730a14095
2 changed files with 5 additions and 41 deletions

View file

@ -4,30 +4,23 @@ buildarch=20
_pkgbasename=bcm2835
pkgname=libbcm2835
pkgver=1.42
pkgver=1.44
pkgrel=1
pkgdesc="C library for Broadcom BCM 2835 as used in Raspberry Pi"
url="http://www.airspayce.com/mikem/bcm2835/"
arch=('armv6h' 'armv7h')
license=('GPL')
options=('staticlibs')
source=(http://www.airspayce.com/mikem/${_pkgbasename}/${_pkgbasename}-${pkgver}.tar.gz bcm2835.patch)
md5sums=('3f60ac30ada6b8f7036243f13da441ba'
'f38a6a1b15598d03c6e882b08c082afa')
prepare() {
cd ${srcdir}/${_pkgbasename}-${pkgver}
patch -p1 -i "$srcdir/bcm2835.patch"
}
source=(http://www.airspayce.com/mikem/${_pkgbasename}/${_pkgbasename}-${pkgver}.tar.gz)
md5sums=('f37bd6526b38face9e3ae29d97970a72')
build() {
cd ${srcdir}/${_pkgbasename}-${pkgver}
cd ${_pkgbasename}-${pkgver}
./configure --prefix=/usr
make
}
package() {
cd ${srcdir}/${_pkgbasename}-${pkgver}
cd ${_pkgbasename}-${pkgver}
make DESTDIR="${pkgdir}" install
}

View file

@ -1,29 +0,0 @@
diff -u -r bcm2835-1.42-orig/src/bcm2835.c bcm2835-1.42/src/bcm2835.c
--- bcm2835-1.42-orig/src/bcm2835.c 2015-03-09 06:00:44.000000000 +0100
+++ bcm2835-1.42/src/bcm2835.c 2015-03-22 19:29:37.531488655 +0100
@@ -122,9 +122,9 @@
uint32_t ret;
#ifdef BCM2835_HAVE_DMB
__asm__( "\
- dmb \
- ldr %[ret], [%[paddr]] \
- dmb \
+ dmb \n\
+ ldr %[ret], [%[paddr]]\n\
+ dmb \n\
" : [ret] "=r" (ret) : [paddr] "r" (paddr) : "memory" );
#else
__asm__( "\
@@ -176,9 +176,9 @@
/* Following code provides memory barriers before and after the write */
#ifdef BCM2835_HAVE_DMB
__asm__( "\
- dmb \
- str %[value], [%[paddr]] \
- dmb \
+ dmb \n\
+ str %[value], [%[paddr]]\n\
+ dmb \n\
" : : [paddr] "r" (paddr), [value] "r" (value) : "memory" );
#else
__asm__( "\