From cff1e1481004c108df0b55edcdb65a6acc17d40f Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Fri, 13 Jun 2014 19:31:37 +0000 Subject: [PATCH] orc: converted recipe, bumped version. --- dev-lang/orc/orc-0.4.16.recipe | 26 -------- dev-lang/orc/orc-0.4.19.recipe | 78 ++++++++++++++++++++++++ dev-lang/orc/patches/orc-0.4.16.patch | 11 ---- dev-lang/orc/patches/orc-0.4.19.patchset | 43 +++++++++++++ 4 files changed, 121 insertions(+), 37 deletions(-) delete mode 100644 dev-lang/orc/orc-0.4.16.recipe create mode 100644 dev-lang/orc/orc-0.4.19.recipe delete mode 100644 dev-lang/orc/patches/orc-0.4.16.patch create mode 100644 dev-lang/orc/patches/orc-0.4.19.patchset diff --git a/dev-lang/orc/orc-0.4.16.recipe b/dev-lang/orc/orc-0.4.16.recipe deleted file mode 100644 index e7fa5a9b5..000000000 --- a/dev-lang/orc/orc-0.4.16.recipe +++ /dev/null @@ -1,26 +0,0 @@ -DESCRIPTION="orc - The Oil Runtime Compiler" -HOMEPAGE="http://code.entropywave.com/orc/" -SRC_URI="http://code.entropywave.com/download/orc/orc-0.4.16.tar.gz" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -CHECKSUM_MD5="e482932e544c847761449b106ecbc483" -BUILD() -{ - cd orc-0.4.16 - autoconf - COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --datadir=`finddir B_COMMON_DATA_DIRECTORY` \ - --mandir=$COMMON_DOCS/man - make -} - -INSTALL() -{ - cd orc-0.4.16 - make install -} - -LICENSE="BSD (2-clause)" -COPYRIGHT="2002 - 2009 David A. Schleef" \ No newline at end of file diff --git a/dev-lang/orc/orc-0.4.19.recipe b/dev-lang/orc/orc-0.4.19.recipe new file mode 100644 index 000000000..009d5cbad --- /dev/null +++ b/dev-lang/orc/orc-0.4.19.recipe @@ -0,0 +1,78 @@ +SUMMARY="The Oil Runtime Compiler" +DESCRIPTION=" +Orc is a library and set of tools for compiling and executing \ +very simple programs that operate on arrays of data. The \"language\" \ +is a generic assembly language that represents many of the features \ +available in SIMD architectures, including saturated addition and \ +subtraction, and many arithmetic operations. +" +HOMEPAGE="http://code.entropywave.com/orc/" +COPYRIGHT=" + 2002-2009 David A. Schleef + " +LICENSE="BSD (2-clause)" +SRC_URI="http://gstreamer.freedesktop.org/src/orc/orc-$portVersion.tar.gz" +CHECKSUM_SHA256="e21f50321a21c33178bbe41ea8bd27c49ae60aeb8c22902a215f7141297fb59e" +REVISION="1" +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 !x86" + +PATCHES="orc-$portVersion.patchset" + +PROVIDES=" + orc$secondaryArchSuffix = $portVersion compat >= 0 + lib:liborc_0.4$secondaryArchSuffix = 0.19.0 compat >= 0 + lib:liborc_test_0.4$secondaryArchSuffix = 0.19.0 compat >= 0 + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + " +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + " +BUILD_PREREQUIRES=" + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:libtoolize + cmd:make + " + +BUILD() +{ + autoreconf -f -i -I m4 + runConfigure ./configure --disable-gtk-doc + make $jobArgs +} + +INSTALL() +{ + make install + + prepareInstalledDevelLibs liborc-0.4 \ + liborc-test-0.4 + fixPkgconfig + # fix include path in pkgconfig + sed -i -e 's#^includedir=\(.*\)#includedir=\1/orc-0.4#g' \ + $developLibDir/pkgconfig/orc-0.4.pc + + # devel package + packageEntries devel \ + $binDir \ + $developDir +} + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + orc${secondaryArchSuffix}_devel = $portVersion compat >= 0.4 + cmd:orc_bugreport + cmd:orcc + devel:liborc_0.4$secondaryArchSuffix = 0.19.0 compat >= 0 + devel:liborc_test_0.4$secondaryArchSuffix = 0.19.0 compat >= 0 + " +REQUIRES_devel=" + orc$secondaryArchSuffix == $portVersion base + " diff --git a/dev-lang/orc/patches/orc-0.4.16.patch b/dev-lang/orc/patches/orc-0.4.16.patch deleted file mode 100644 index 68a87ff5a..000000000 --- a/dev-lang/orc/patches/orc-0.4.16.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- orc-0.4.16/configure.ac 2011-10-03 03:34:22.054788096 +0000 -+++ orc-0.4.16-haiku/configure.ac 2012-04-08 21:58:47.729808896 +0000 -@@ -97,7 +97,7 @@ - mingw*|pw32*|cygwin*) - AC_DEFINE(HAVE_CODEMEM_VIRTUALALLOC, 1, [Use VirtualAlloc to allocate code for execution]) - ;; -- linux*|darwin*|solaris*|netbsd*|freebsd*|openbsd*|kfreebsd*|dragonfly*|gnu*) -+ linux*|darwin*|solaris*|netbsd*|freebsd*|openbsd*|kfreebsd*|dragonfly*|gnu*|haiku*) - AC_DEFINE(HAVE_CODEMEM_MMAP, 1, [Use mmap to allocate code for execution]) - ;; - *) diff --git a/dev-lang/orc/patches/orc-0.4.19.patchset b/dev-lang/orc/patches/orc-0.4.19.patchset new file mode 100644 index 000000000..5ba1e7aec --- /dev/null +++ b/dev-lang/orc/patches/orc-0.4.19.patchset @@ -0,0 +1,43 @@ +From 65ca1ed4bdcb05d3ad5a27ebae881b7fc7b92ab3 Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Fri, 13 Jun 2014 18:20:13 +0000 +Subject: haiku patch + + +diff --git a/configure.ac b/configure.ac +index a396b05..ddfdede 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -10,7 +10,7 @@ AM_INIT_AUTOMAKE(1.6) + ORC_MAJORMINOR=0.4 + AC_SUBST(ORC_MAJORMINOR) + +-AC_CONFIG_HEADER(config.h) ++AC_CONFIG_HEADERS(config.h) + + dnl CURRENT, REVISION, AGE + dnl - library source changed -> increment REVISION +@@ -97,7 +97,7 @@ case "${host_os}" in + mingw*|pw32*|cygwin*) + AC_DEFINE(HAVE_CODEMEM_VIRTUALALLOC, 1, [Use VirtualAlloc to allocate code for execution]) + ;; +- linux*|darwin*|solaris*|netbsd*|freebsd*|openbsd*|kfreebsd*|dragonfly*|gnu*) ++ linux*|darwin*|solaris*|netbsd*|freebsd*|openbsd*|kfreebsd*|dragonfly*|gnu*|haiku*) + AC_DEFINE(HAVE_CODEMEM_MMAP, 1, [Use mmap to allocate code for execution]) + ;; + *) +@@ -114,6 +114,11 @@ case "${host_os}" in + PTHREAD_CFLAGS= + PTHREAD_LIBS= + ;; ++ haiku*) ++ AC_DEFINE(HAVE_THREAD_PTHREAD, 1, [Use pthread thread code]) ++ PTHREAD_CFLAGS= ++ PTHREAD_LIBS= ++ ;; + *) + AC_DEFINE(HAVE_THREAD_PTHREAD, 1, [Use pthread thread code]) + PTHREAD_CFLAGS= +-- +1.8.3.4 +