update orc to 0.4.4, from Brad

This commit is contained in:
sthen 2010-04-09 21:56:05 +00:00
parent e1e1c9cf88
commit 4dececaf10
7 changed files with 22 additions and 71 deletions

View File

@ -1,16 +1,14 @@
# $OpenBSD: Makefile,v 1.2 2010/04/03 00:21:14 sthen Exp $
# $OpenBSD: Makefile,v 1.3 2010/04/09 21:56:05 sthen Exp $
COMMENT= library and toolset to operate arrays of data
DISTNAME= orc-0.4.3
PKGNAME= ${DISTNAME}p0
DISTNAME= orc-0.4.4
CATEGORIES= devel
MASTER_SITES= http://code.entropywave.com/download/orc/
SHARED_LIBS+= orc-0.4 0.0 \
SHARED_LIBS= orc-0.4 1.0 \
orc-float-0.4 0.0 \
orc-pixel-0.4 0.0 \
orc-test-0.4 0.0
orc-test-0.4 0.1
HOMEPAGE= http://code.entropywave.com/projects/orc/
@ -25,6 +23,6 @@ WANTLIB= c m pthread
USE_LIBTOOL= Yes
CONFIGURE_STYLE= autoconf
AUTOCONF_VERSION= 2.63
AUTOCONF_VERSION= 2.64
.include <bsd.port.mk>

View File

@ -1,5 +1,5 @@
MD5 (orc-0.4.3.tar.gz) = my5wMMjfig03ERWGn+VoWg==
RMD160 (orc-0.4.3.tar.gz) = wWXaibUVANOd9l5cCU0F8uy+OaM=
SHA1 (orc-0.4.3.tar.gz) = nnPnvPodHhWkkvcvEQAkToefYNI=
SHA256 (orc-0.4.3.tar.gz) = TAJm2B2mf+8LKr1eYkqasNtd4E6yPDqyTiL1+c7u+/4=
SIZE (orc-0.4.3.tar.gz) = 538428
MD5 (orc-0.4.4.tar.gz) = NfO3KD85Grit5/lDMpQEFA==
RMD160 (orc-0.4.4.tar.gz) = ZMDwpGAQkNTVxJpxza6mKSFNtyY=
SHA1 (orc-0.4.4.tar.gz) = n6Z96wMmMS13Gd3x3GCH7IHpCEQ=
SHA256 (orc-0.4.4.tar.gz) = YviAjWGidYYcjgQpx2ky75I/DKUNuNw+c7B0WmMeOG8=
SIZE (orc-0.4.4.tar.gz) = 552110

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure_ac,v 1.1.1.1 2010/03/25 10:23:26 sthen Exp $
--- configure.ac.orig Wed Mar 17 19:16:07 2010
+++ configure.ac Wed Mar 17 19:16:50 2010
@@ -113,7 +113,7 @@ AC_DEFINE(ORC_EXPORTS, 1, [Defined for compiling inter
$OpenBSD: patch-configure_ac,v 1.2 2010/04/09 21:56:05 sthen Exp $
--- configure.ac.orig Tue Mar 30 01:46:21 2010
+++ configure.ac Sat Apr 3 01:00:59 2010
@@ -114,7 +114,7 @@ AC_DEFINE(ORC_EXPORTS, 1, [Defined for compiling inter
ORC_CFLAGS="$ORC_CFLAGS -I\$(top_srcdir)"
AC_SUBST(ORC_CFLAGS)

View File

@ -1,42 +0,0 @@
$OpenBSD: patch-orc_orccodemem_c,v 1.1.1.1 2010/03/25 10:23:26 sthen Exp $
--- orc/orccodemem.c.orig Mon Mar 22 20:35:43 2010
+++ orc/orccodemem.c Mon Mar 22 20:38:14 2010
@@ -29,26 +29,13 @@ orc_compiler_allocate_codemem (OrcCompiler *compiler)
int fd;
int n;
- /* FIXME something combining these two would be ideal */
-#if 1
{
- char filename[32] = "/tmp/orcexecXXXXXX";
- fd = mkstemp (filename);
- if (fd == -1) {
- /* FIXME oh crap */
- ORC_COMPILER_ERROR (compiler, "failed to create temp file");
- return;
- }
- unlink (filename);
- }
-#else
- {
char *filename;
- filename = malloc (strlen ("/tmp/orcexec") +
- strlen (compiler->program->name) + 1);
- sprintf(filename, "/tmp/orcexec%s", compiler->program->name);
- fd = open (filename, O_RDWR | O_CREAT, S_IRWXU);
+ filename = malloc (strlen ("/tmp/orcexec..") +
+ strlen (compiler->program->name) + 6 + 1);
+ sprintf(filename, "/tmp/orcexec.%s.XXXXXX", compiler->program->name);
+ fd = mkstemp (filename);
if (fd == -1) {
/* FIXME oh crap */
ORC_COMPILER_ERROR (compiler, "failed to create temp file");
@@ -57,7 +44,6 @@ orc_compiler_allocate_codemem (OrcCompiler *compiler)
unlink (filename);
free (filename);
}
-#endif
n = ftruncate (fd, SIZE);

View File

@ -1,12 +1,12 @@
$OpenBSD: patch-orc_pc_in,v 1.1.1.1 2010/03/25 10:23:26 sthen Exp $
--- orc.pc.in.orig Wed Mar 17 19:18:52 2010
+++ orc.pc.in Wed Mar 17 19:19:23 2010
$OpenBSD: patch-orc_pc_in,v 1.2 2010/04/09 21:56:05 sthen Exp $
--- orc.pc.in.orig Fri Mar 19 18:44:36 2010
+++ orc.pc.in Sat Apr 3 01:02:13 2010
@@ -8,7 +8,7 @@ toolsdir=${exec_prefix}/bin
Name: orc-@ORC_MAJORMINOR@
Description: Library of Optimized Inner Loops Runtime Compiler
Version: @VERSION@
-Libs: -L${libdir} -lorc-@ORC_MAJORMINOR@ @LIBM@ @LIBRT@
+Libs: -L${libdir} -lorc-@ORC_MAJORMINOR@ -pthread @LIBM@ @LIBRT@
-Libs: -L${libdir} -lorc-@ORC_MAJORMINOR@
+Libs: -L${libdir} -lorc-@ORC_MAJORMINOR@ -pthread
Libs.private: @LIBM@ @LIBRT@
Cflags: -I${includedir}
orcc=${toolsdir}/orcc@EXEEXT@

View File

@ -1,5 +1,4 @@
@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2010/03/25 10:23:26 sthen Exp $
@comment $OpenBSD: PFRAG.shared,v 1.2 2010/04/09 21:56:05 sthen Exp $
@lib lib/liborc-0.4.so.${LIBorc-0.4_VERSION}
@lib lib/liborc-float-0.4.so.${LIBorc-float-0.4_VERSION}
@lib lib/liborc-pixel-0.4.so.${LIBorc-pixel-0.4_VERSION}
@lib lib/liborc-test-0.4.so.${LIBorc-test-0.4_VERSION}

View File

@ -1,12 +1,10 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2010/03/25 10:23:26 sthen Exp $
@comment $OpenBSD: PLIST,v 1.2 2010/04/09 21:56:05 sthen Exp $
%%SHARED%%
@bin bin/orcc
include/orc-0.4/
include/orc-0.4/orc/
include/orc-0.4/orc-float/
include/orc-0.4/orc-float/orcfloat.h
include/orc-0.4/orc-pixel/
include/orc-0.4/orc-pixel/orcpixel.h
include/orc-0.4/orc-test/
include/orc-0.4/orc-test/orcarray.h
include/orc-0.4/orc-test/orcprofile.h
@ -30,8 +28,6 @@ lib/liborc-0.4.a
lib/liborc-0.4.la
lib/liborc-float-0.4.a
lib/liborc-float-0.4.la
lib/liborc-pixel-0.4.a
lib/liborc-pixel-0.4.la
lib/liborc-test-0.4.a
lib/liborc-test-0.4.la
lib/orc/