Wed Mar 12 21:05:32 2008 UTC ()
add two patches from upstream:
-link against librt is needed
-fix some gcc inline asm for mmx to declare %ecx clobbered
(drochner)
diff -r1.14 -r1.15 pkgsrc/devel/liboil/Makefile
diff -r1.11 -r1.12 pkgsrc/devel/liboil/distinfo
diff -r0 -r1.1 pkgsrc/devel/liboil/patches/patch-ag
diff -r0 -r1.1 pkgsrc/devel/liboil/patches/patch-ah
--- pkgsrc/devel/liboil/Makefile 2008/02/28 19:28:24 1.14
+++ pkgsrc/devel/liboil/Makefile 2008/03/12 21:05:32 1.15
| @@ -1,17 +1,18 @@ | | | @@ -1,17 +1,18 @@ |
1 | # $NetBSD: Makefile,v 1.14 2008/02/28 19:28:24 drochner Exp $ | | 1 | # $NetBSD: Makefile,v 1.15 2008/03/12 21:05:32 drochner Exp $ |
2 | # | | 2 | # |
3 | | | 3 | |
4 | DISTNAME= liboil-0.3.13 | | 4 | DISTNAME= liboil-0.3.13 |
| | | 5 | PKGREVISION= 1 |
5 | CATEGORIES= devel | | 6 | CATEGORIES= devel |
6 | MASTER_SITES= http://liboil.freedesktop.org/download/ | | 7 | MASTER_SITES= http://liboil.freedesktop.org/download/ |
7 | | | 8 | |
8 | MAINTAINER= pkgsrc-users@NetBSD.org | | 9 | MAINTAINER= pkgsrc-users@NetBSD.org |
9 | HOMEPAGE= http://liboil.freedesktop.org/wiki/ | | 10 | HOMEPAGE= http://liboil.freedesktop.org/wiki/ |
10 | COMMENT= Library of simple, CPU-optimized functions | | 11 | COMMENT= Library of simple, CPU-optimized functions |
11 | | | 12 | |
12 | GNU_CONFIGURE= yes | | 13 | GNU_CONFIGURE= yes |
13 | USE_FEATURES= asprintf | | 14 | USE_FEATURES= asprintf |
14 | USE_LIBTOOL= yes | | 15 | USE_LIBTOOL= yes |
15 | | | 16 | |
16 | CONFIGURE_ARGS+= --disable-glib # Only used by examples. | | 17 | CONFIGURE_ARGS+= --disable-glib # Only used by examples. |
17 | #CONFIGURE_ARGS+= --enable-debug | | 18 | #CONFIGURE_ARGS+= --enable-debug |
--- pkgsrc/devel/liboil/distinfo 2008/02/29 16:58:14 1.11
+++ pkgsrc/devel/liboil/distinfo 2008/03/12 21:05:32 1.12
| @@ -1,11 +1,13 @@ | | | @@ -1,11 +1,13 @@ |
1 | $NetBSD: distinfo,v 1.11 2008/02/29 16:58:14 tnn Exp $ | | 1 | $NetBSD: distinfo,v 1.12 2008/03/12 21:05:32 drochner Exp $ |
2 | | | 2 | |
3 | SHA1 (liboil-0.3.13.tar.gz) = 1c08d92810a76afce7a2cba2b5f969a096ecf8a0 | | 3 | SHA1 (liboil-0.3.13.tar.gz) = 1c08d92810a76afce7a2cba2b5f969a096ecf8a0 |
4 | RMD160 (liboil-0.3.13.tar.gz) = aefcf9c7a100b5faff3449573bff6238db0bdb34 | | 4 | RMD160 (liboil-0.3.13.tar.gz) = aefcf9c7a100b5faff3449573bff6238db0bdb34 |
5 | Size (liboil-0.3.13.tar.gz) = 813995 bytes | | 5 | Size (liboil-0.3.13.tar.gz) = 813995 bytes |
6 | SHA1 (patch-aa) = d0adb03ef3a1eb5daf059cbfd53bba0ce8338fb1 | | 6 | SHA1 (patch-aa) = d0adb03ef3a1eb5daf059cbfd53bba0ce8338fb1 |
7 | SHA1 (patch-ab) = 36a06f38f34f43ab6d181f4e9028f7b9adf5332b | | 7 | SHA1 (patch-ab) = 36a06f38f34f43ab6d181f4e9028f7b9adf5332b |
8 | SHA1 (patch-ac) = 8ccb2b0323b337902c384f4bdda856ca1cc2b023 | | 8 | SHA1 (patch-ac) = 8ccb2b0323b337902c384f4bdda856ca1cc2b023 |
9 | SHA1 (patch-ad) = 9d38917949c5f7b06229587f2338de7d1745147f | | 9 | SHA1 (patch-ad) = 9d38917949c5f7b06229587f2338de7d1745147f |
10 | SHA1 (patch-ae) = ca873368c23a5e3bd7475e9aeb64ffb74e7e2ea7 | | 10 | SHA1 (patch-ae) = ca873368c23a5e3bd7475e9aeb64ffb74e7e2ea7 |
11 | SHA1 (patch-af) = 9a6a42eb98f0c41d2a9fc5da91eb084864d3f16e | | 11 | SHA1 (patch-af) = 9a6a42eb98f0c41d2a9fc5da91eb084864d3f16e |
| | | 12 | SHA1 (patch-ag) = 9a553b1748081e8eedcc33ba0f0d733de2636ae7 |
| | | 13 | SHA1 (patch-ah) = 690996951555a22df4094445c537582ffbfcefa7 |
$NetBSD: patch-ag,v 1.1 2008/03/12 21:05:32 drochner Exp $
--- liboil/Makefile.in.orig 2008-03-03 17:32:22.000000000 +0100
+++ liboil/Makefile.in
@@ -448,7 +448,8 @@ nodist_liboil_@LIBOIL_MAJORMINOR@_la_SOU
liboil_@LIBOIL_MAJORMINOR@_la_LIBADD = \
liboilfunctions.la \
- $(LIBM)
+ $(LIBM) \
+ $(LIBRT)
liboil_@LIBOIL_MAJORMINOR@_la_CFLAGS = $(LIBOIL_CFLAGS)
liboil_@LIBOIL_MAJORMINOR@_la_LDFLAGS = \
$NetBSD: patch-ah,v 1.1 2008/03/12 21:05:32 drochner Exp $
--- liboil/i386_amd64/copy.c.orig 2008-03-03 17:35:30.000000000 +0100
+++ liboil/i386_amd64/copy.c
@@ -375,7 +375,8 @@ static void splat_u16_ns_mmx (uint16_t *
" emms\n"
: [dest] "+r" (dest),
[n] "+r" (n)
- : [src] "r" (src));
+ : [src] "r" (src)
+ : "ecx");
}
OIL_DEFINE_IMPL_FULL (splat_u16_ns_mmx, splat_u16_ns, OIL_IMPL_FLAG_MMX|OIL_IMPL_FLAG_MMXEXT);
@@ -401,7 +402,8 @@ static void splat_u16_ns_mmx_2 (uint16_t
" emms\n"
: [dest] "+r" (dest),
[n] "+r" (n)
- : [src] "r" (src));
+ : [src] "r" (src)
+ : "ecx");
}
OIL_DEFINE_IMPL_FULL (splat_u16_ns_mmx_2, splat_u16_ns, OIL_IMPL_FLAG_MMX|OIL_IMPL_FLAG_MMXEXT);
@@ -429,7 +431,8 @@ static void splat_u16_ns_mmx_3 (uint16_t
" emms\n"
: [dest] "+r" (dest),
[n] "+r" (n)
- : [src] "r" (src));
+ : [src] "r" (src)
+ : "ecx");
}
OIL_DEFINE_IMPL_FULL (splat_u16_ns_mmx_3, splat_u16_ns, OIL_IMPL_FLAG_MMX|OIL_IMPL_FLAG_MMXEXT);