aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2013-04-30 09:51:51 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2013-04-30 09:51:51 +0000
commit5bea7486cf36edb61d6b2355bf72542309f261d4 (patch)
tree82c05ff7230c15af5a258a6c2e9a347189196bee /main
parent2c629fdd237a1fbae83c807f796ee79c4dceeae9 (diff)
downloadaports-5bea7486cf36edb61d6b2355bf72542309f261d4.tar.bz2
aports-5bea7486cf36edb61d6b2355bf72542309f261d4.tar.xz
main/libraw1394: upgrade to 2.1.0
Diffstat (limited to 'main')
-rw-r--r--main/libraw1394/APKBUILD32
-rw-r--r--main/libraw1394/clock_monotonic_raw.patch12
2 files changed, 37 insertions, 7 deletions
diff --git a/main/libraw1394/APKBUILD b/main/libraw1394/APKBUILD
index c6a68981ad..3c6304198c 100644
--- a/main/libraw1394/APKBUILD
+++ b/main/libraw1394/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
pkgname=libraw1394
-pkgver=2.0.7
-pkgrel=1
+pkgver=2.1.0
+pkgrel=0
pkgdesc="Library to provide access to Linux 1394 subsystem"
url="http://sourceforge.net/projects/libraw1394"
arch="all"
@@ -10,15 +10,20 @@ depends=
depends_dev=
makedepends=""
install=
-subpackages="$pkgname-dev $pkgname-doc"
-source="ftp://ftp.kernel.org/pub/linux/libs/ieee1394/$pkgname-$pkgver.tar.bz2"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-tools"
+source="ftp://ftp.kernel.org/pub/linux/libs/ieee1394/$pkgname-$pkgver.tar.bz2
+ clock_monotonic_raw.patch"
_builddir="$srcdir"/$pkgname-$pkgver
prepare() {
cd "$_builddir"
- # apply patches here
+ for i in $source; do
+ case $i in
+ *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+ esac
+ done
}
build() {
@@ -26,7 +31,9 @@ build() {
./configure --prefix=/usr \
--sysconfdir=/etc \
--mandir=/usr/share/man \
- --infodir=/usr/share/info
+ --infodir=/usr/share/info \
+ --disable-static \
+ || return 1
make || return 1
}
@@ -36,4 +43,15 @@ package() {
rm "$pkgdir"/usr/lib/*.la
}
-md5sums="997ef18ab8e2e21f3966dff00e92be28 libraw1394-2.0.7.tar.bz2"
+tools() {
+ pkgdesc="Tools for libraw1394"
+ mkdir -p "$subpkgdir"/usr/
+ mv "$pkgdir"/usr/bin "$subpkgdir"/usr
+}
+
+md5sums="2f8d06a826b658bd0f3f0697e930dd52 libraw1394-2.1.0.tar.bz2
+5cc7574253fc6ed1270a680564145eaa clock_monotonic_raw.patch"
+sha256sums="81798ea6ce1c7f4eaf9d8970ee635f9ade7fd05735a82b291947814481af45df libraw1394-2.1.0.tar.bz2
+136d03b5b82a8bd6979ee3fa8205965a92fb6831303cf08badf24bea43ac4c8b clock_monotonic_raw.patch"
+sha512sums="01e38ae140fc672e82e2702f59530484dc08b3290c42089de48c43844f80584bcfac6d1cb86d47b22ac79b218efedfbb51a4bd2c229a461ec413c1161ea09330 libraw1394-2.1.0.tar.bz2
+023670bf96771b8a939c57cca109cdebd5a739a0950040bdb73a4e2e5cebcfbb7bc963341a90f96a9468797c97faf796a95df5541c6ba50eff935c62f0771261 clock_monotonic_raw.patch"
diff --git a/main/libraw1394/clock_monotonic_raw.patch b/main/libraw1394/clock_monotonic_raw.patch
new file mode 100644
index 0000000000..dd4f142688
--- /dev/null
+++ b/main/libraw1394/clock_monotonic_raw.patch
@@ -0,0 +1,12 @@
+--- ./tools/testlibraw.c.orig 2013-04-30 09:42:26.194087642 +0000
++++ ./tools/testlibraw.c 2013-04-30 09:43:01.231109699 +0000
+@@ -21,6 +21,9 @@
+ #include "../src/raw1394.h"
+ #include "../src/csr.h"
+
++#ifndef CLOCK_MONOTONIC_RAW
++#define CLOCK_MONOTONIC_RAW 4
++#endif
+
+ #define TESTADDR (CSR_REGISTER_BASE + CSR_CONFIG_ROM)
+