From de91d09573f0d290763a236dfdf9dfba2cb554e0 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Wed, 11 Jun 2014 20:49:10 +0000 Subject: [PATCH 01/27] popt: converted to an actual recipe --- dev-libs/popt/patches/popt-1.16.patchset | 43 ++++++++++++++ dev-libs/popt/popt-1.16.recipe | 75 +++++++++++++++++++----- 2 files changed, 103 insertions(+), 15 deletions(-) create mode 100644 dev-libs/popt/patches/popt-1.16.patchset diff --git a/dev-libs/popt/patches/popt-1.16.patchset b/dev-libs/popt/patches/popt-1.16.patchset new file mode 100644 index 000000000..ebefa4c9a --- /dev/null +++ b/dev-libs/popt/patches/popt-1.16.patchset @@ -0,0 +1,43 @@ +From 4db73bb22181c9c029fecdd52eb0e73b0e638ef6 Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Wed, 11 Jun 2014 16:57:20 +0000 +Subject: haiku patch + + +diff --git a/configure.ac b/configure.ac +index 22f8bfc..0972545 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -46,7 +46,6 @@ AC_GCC_TRADITIONAL + AC_SYS_LARGEFILE + + AC_ISC_POSIX +-AM_C_PROTOTYPES + + AC_CHECK_HEADERS(float.h fnmatch.h glob.h langinfo.h libintl.h mcheck.h unistd.h) + +diff --git a/testit.sh b/testit.sh +index 2a7b4aa..2779f7c 100755 +--- a/testit.sh ++++ b/testit.sh +@@ -115,7 +115,7 @@ run test1 "test1 - 56" "arg1: 0 arg2: (none) aFlag: 0xface" --nobitclr + run test1 "test1 - 57" "arg1: 0 arg2: (none) aBits: foo,baz" --bits foo,bar,baz,!bar + + run test1 "test1 - 58" "\ +-Usage: lt-test1 [-I?] [-c|--cb2=STRING] [--arg1] [-2|--arg2=ARG] ++Usage: test1 [-I?] [-c|--cb2=STRING] [--arg1] [-2|--arg2=ARG] + [-3|--arg3=ANARG] [-onedash] [--optional=STRING] [--val] + [-i|--int=INT] [-s|--short=SHORT] [-l|--long=LONG] + [-L|--longlong=LONGLONG] [-f|--float=FLOAT] [-d|--double=DOUBLE] +@@ -124,7 +124,7 @@ Usage: lt-test1 [-I?] [-c|--cb2=STRING] [--arg1] [-2|--arg2=ARG] + [--bitxor] [--nstr=STRING] [--lstr=STRING] [-I|--inc] + [-c|--cb=STRING] [--longopt] [-?|--help] [--usage] [--simple=ARG]" --usage + run test1 "test1 - 59" "\ +-Usage: lt-test1 [OPTION...] ++Usage: test1 [OPTION...] + --arg1 First argument with a really long + description. After all, we have to test + argument help wrapping somehow, right? +-- +1.8.3.4 + diff --git a/dev-libs/popt/popt-1.16.recipe b/dev-libs/popt/popt-1.16.recipe index c7b6f8b3f..c3a30e42b 100644 --- a/dev-libs/popt/popt-1.16.recipe +++ b/dev-libs/popt/popt-1.16.recipe @@ -1,27 +1,72 @@ -DESCRIPTION="popt" -HOMEPAGE="http://rpm5.org/files/popt/" +SUMMARY="A command line option parsing library" +DESCRIPTION=" +This is the popt(3) command line option parsing library. While it is similiar \ +to getopt(3), it contains a number of enhancements, including: + 1) popt is fully reentrant + 2) popt can parse arbitrary argv[] style arrays while \ +getopt(3) makes this quite difficult + 3) popt allows users to alias command line arguments + 4) popt provides convience functions for parsing strings \ +into argv[] style arrays +" +LICENSE="MIT" +COPYRIGHT="1998-2002 Red Hat, Inc." +HOMEPAGE="http://rpm5.org/files/popt/" SRC_URI="http://rpm5.org/files/popt/popt-1.16.tar.gz" +CHECKSUM_SHA256="e728ed296fe9f069a0e005003c3d6b2dde3d9cad453422a10d6558616d304cc8" REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -CHECKSUM_MD5="3743beefa3dd6247a73f8f7a32c14c33" +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86 x86_gcc2" + +PATCHES="popt-1.16.patchset" + +PROVIDES=" + popt$secondaryArchSuffix = $portVersion + lib:libpopt$secondaryArchSuffix = 0.0.0 compat >= 0 + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + " +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + " +BUILD_PREREQUIRES=" + cmd:libtoolize + cmd:autoconf + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:make + cmd:sed + " + BUILD() { - cd popt-1.16 - libtoolize --force --copy --install - echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.ac - aclocal -I m4 + libtoolize -fci autoconf - automake - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make + runConfigure ./configure + make $jobArgs } INSTALL() { - cd popt-1.16 make install + + prepareInstalledDevelLibs libpopt + fixPkgconfig + + # devel package + packageEntries devel \ + $developDir \ + $manDir/man3 } -LICENSE="MIT" -COPYRIGHT="1998-2002 Red Hat, Inc." \ No newline at end of file + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + popt${secondaryArchSuffix}_devel = $portVersion + devel:libpopt$secondaryArchSuffix = 0.0.0 compat >= 0 + " +REQUIRES_devel=" + popt$secondaryArchSuffix == $portVersion base + " From 31dd2560cf958ee2be823fc84631fdb8733d996b Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Wed, 11 Jun 2014 20:49:59 +0000 Subject: [PATCH 02/27] libdv: added a recipe for version 1.0.0 --- media-libs/libdv/libdv-1.0.0.recipe | 75 +++++++++++++++++++ media-libs/libdv/patches/libdv-1.0.0.patchset | 47 ++++++++++++ 2 files changed, 122 insertions(+) create mode 100644 media-libs/libdv/libdv-1.0.0.recipe create mode 100644 media-libs/libdv/patches/libdv-1.0.0.patchset diff --git a/media-libs/libdv/libdv-1.0.0.recipe b/media-libs/libdv/libdv-1.0.0.recipe new file mode 100644 index 000000000..6dc72151a --- /dev/null +++ b/media-libs/libdv/libdv-1.0.0.recipe @@ -0,0 +1,75 @@ +SUMMARY="a GPL codec for DV video" +DESCRIPTION=" +The Quasar DV codec (libdv) is a software codec for DV video, the encoding format \ +used by most digital camcorders, typically those that support the IEEE 1394 \ +(a.k.a FireWire or i.Link) interface. Libdv was developed according to the \ +official standards for DV video: IEC 61834 and SMPTE 314M." +HOMEPAGE="http://libdv.sourceforge.net" +COPYRIGHT=" + 1999 Erik Walthinsen + 1999 Charles 'Buck' Krasic " +LICENSE="GNU LGPL v2.1" +SRC_URI="http://sourceforge.net/projects/libdv/files/libdv/$portVersion/libdv-$portVersion.tar.gz" +CHECKSUM_SHA256="a305734033a9c25541a59e8dd1c254409953269ea7c710c39e540bd8853389ba" +REVISION="1" +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +PATCHES="libdv-$portVersion.patchset" + +PROVIDES=" + libdv$secondaryArchSuffix = $portVersion compat >= 1.0 + lib:libdv$secondaryArchSuffix = 4.0.3 compat >= 4 + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libsdl_1.2$secondaryArchSuffix + lib:libpopt$secondaryArchSuffix + " +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:libsdl_1.2$secondaryArchSuffix + devel:libpopt${secondaryArchSuffix} + " +BUILD_PREREQUIRES=" + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:libtoolize + cmd:make + " + +BUILD() +{ + libtoolize --force --copy --install + aclocal + autoconf + automake + runConfigure ./configure --disable-gtk \ + --without-debug + make $jobArgs +} + +INSTALL() +{ + make install + + prepareInstalledDevelLibs libdv + fixPkgconfig + + # devel package + packageEntries devel \ + $developDir +} + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + libdv${secondaryArchSuffix}_devel = $portVersion compat >= 1.0 + devel:libdv$secondaryArchSuffix = 4.0.3 compat >= 4 + " +REQUIRES_devel=" + libdv$secondaryArchSuffix == $portVersion base + " diff --git a/media-libs/libdv/patches/libdv-1.0.0.patchset b/media-libs/libdv/patches/libdv-1.0.0.patchset new file mode 100644 index 000000000..437cfd5b9 --- /dev/null +++ b/media-libs/libdv/patches/libdv-1.0.0.patchset @@ -0,0 +1,47 @@ +From dbbb34e3759ad5e67150f959a7cc2eb1dc2d1bdf Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Wed, 11 Jun 2014 18:05:39 +0000 +Subject: haiku patch + + +diff --git a/configure.ac b/configure.ac +index 2b95735..20c67c2 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1,7 +1,7 @@ + dnl Process this file with autoconf to produce a configure script. + AC_INIT(libdv/parse.c) + dnl AC_CONFIG_AUX_DIR(config) +-AM_CONFIG_HEADER(config.h) ++AC_CONFIG_HEADERS(config.h) + + RPM_RELEASE=1 + AC_CANONICAL_HOST +@@ -161,11 +161,6 @@ AM_CONDITIONAL(HOST_X86_64, test x$arch_x86_64 = xtrue) + + dnl Checks for libraries. + have_gtk="false" +-if $use_gtk; then +- REQUIRES='glib >= 1.2.4 gtk+ >= 1.2.4' +- PKG_CHECK_MODULES(GTK,$REQUIRES,have_gtk="true",have_gtk="false") +- AC_DEFINE(HAVE_GTK) +-fi + + AM_CONDITIONAL(HAVE_GTK, test x$have_gtk = xtrue) + +diff --git a/encodedv/Makefile.am b/encodedv/Makefile.am +index 2887e7c..63b1c69 100644 +--- a/encodedv/Makefile.am ++++ b/encodedv/Makefile.am +@@ -9,7 +9,7 @@ LIBTOOL = $(SHELL) $(top_builddir)/libtool --silent + + CLEANFILES = + +-bin_PROGRAMS= encodedv dvconnect dubdv ++bin_PROGRAMS= encodedv dubdv + + noinst_PROGRAMS= fix_headers scan_packet_headers steal_header ppmqscale dvavi + +-- +1.8.3.4 + From f46c65c770a43f479b87ac8f0577300dd7dd0dd5 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Thu, 12 Jun 2014 19:18:59 +0000 Subject: [PATCH 03/27] libquicktime: added recipe for version 1.2.4 * tested x86 --- .../libquicktime/libquicktime-1.2.4.recipe | 111 ++++++++++++++++++ .../patches/libquicktime-1.2.4.patchset | 65 ++++++++++ 2 files changed, 176 insertions(+) create mode 100644 media-libs/libquicktime/libquicktime-1.2.4.recipe create mode 100644 media-libs/libquicktime/patches/libquicktime-1.2.4.patchset diff --git a/media-libs/libquicktime/libquicktime-1.2.4.recipe b/media-libs/libquicktime/libquicktime-1.2.4.recipe new file mode 100644 index 000000000..a4b72dcfe --- /dev/null +++ b/media-libs/libquicktime/libquicktime-1.2.4.recipe @@ -0,0 +1,111 @@ +SUMMARY="A library to handle Quicktime format files." +DESCRIPTION=" +libquicktime is a library for reading and writing quicktime files. It \ +is based on the quicktime4linux library, with the following \ +extensions: + + * Sourcetree upgraded with autoconf/automake/libtool and all the \ +other stuff, people like in "standard" linux libraries. + * All 3rd party libraries (jpeg, OggVorbis) were removed to reduce \ +download size, compilation time and code duplication on users harddisks. \ +Instead, the sytemwide installed libaries are autodetected by the \ +configure script. + * All codecs have been moved into dynamically loadable modules. \ +This makes it possible to distribute closed source codecs (or codecs \ +with an incompatible license) as separate packages. + * Unlike other quicktime libraries, we are source compatible with \ +quicktime4linux. Programs like cinelerra or xmovie can be compiled with \ +libquicktime (if the build system is modified, see our web page for more \ +info). + * The codecs themselves are also source compatible with \ +quicktime4linux, so porting codecs between quicktime4linux and \ +libquicktime requires only little brain load. + * Special API extensions allow access to the codec registry. \ +Applications can get important information about the codecs, their \ +settable parameters etc. at runtime. +" +HOMEPAGE="http://libquicktime.sourceforge.net" +COPYRIGHT=" + 2002 Heroine Virtual Ltd. + 2002-2007 Members of the libquicktime project. +" +LICENSE="GNU LGPL v2.1" +SRC_URI="http://sourceforge.net/projects/libquicktime/files/libquicktime/$portVersion/libquicktime-$portVersion.tar.gz" +CHECKSUM_SHA256="1c53359c33b31347b4d7b00d3611463fe5e942cae3ec0fefe0d2fd413fd47368" +REVISION="1" +ARCHITECTURES="?x86_gcc2 x86 ?x86_64" +SECONDARY_ARCHITECTURES="?x86_gcc2 x86" + +PATCHES="libquicktime-$portVersion.patchset" + +PROVIDES=" + libquicktime$secondaryArchSuffix = $portVersion compat >= 1.2 + lib:libquicktime$secondaryArchSuffix = 0.0.0 compat >= 0 + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libpng15$secondaryArchSuffix + lib:libjpeg$secondaryArchSuffix + lib:libvorbis$secondaryArchSuffix + lib:libogg$secondaryArchSuffix + lib:libdv$secondaryArchSuffix + lib:libmp3lame$secondaryArchSuffix + lib:libfaad$secondaryArchSuffix + lib:libiconv$secondaryArchSuffix + lib:libz$secondaryArchSuffix + " +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:libpng15$secondaryArchSuffix + devel:libjpeg$secondaryArchSuffix + devel:libvorbis$secondaryArchSuffix + devel:libogg$secondaryArchSuffix + devel:libdv$secondaryArchSuffix + devel:libmp3lame$secondaryArchSuffix + devel:libfaad$secondaryArchSuffix + devel:libiconv$secondaryArchSuffix + devel:libz$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:libtoolize + cmd:make + cmd:pkg_config + cmd:gettext + " + +BUILD() +{ + aclocal + libtoolize --force --copy --install + ./autogen.sh + runConfigure ./configure --without-doxygen \ + --with-libdv + make $jobArgs +} + +INSTALL() +{ + make install + + prepareInstalledDevelLibs libquicktime + fixPkgconfig + + # devel package + packageEntries devel \ + $developDir +} + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + libquicktime${secondaryArchSuffix}_devel = $portVersion compat >= 1.2 + devel:libquicktime$secondaryArchSuffix = 0.0.0 compat >= 0 + " +REQUIRES_devel=" + libquicktime$secondaryArchSuffix == $portVersion base + " diff --git a/media-libs/libquicktime/patches/libquicktime-1.2.4.patchset b/media-libs/libquicktime/patches/libquicktime-1.2.4.patchset new file mode 100644 index 000000000..a153a4991 --- /dev/null +++ b/media-libs/libquicktime/patches/libquicktime-1.2.4.patchset @@ -0,0 +1,65 @@ +From 8d52abdda6bcd2f979d70a27524403812889f2a2 Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Thu, 12 Jun 2014 17:58:08 +0000 +Subject: Haiku patch + + +diff --git a/configure.ac b/configure.ac +index da1dabc..4718ef2 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -9,7 +9,7 @@ LQT_VERSION_MICRO=`echo $VERSION | cut -d . -f 3 | cut -d p -f 1` + + USER_CFLAGS=$CFLAGS + +-AM_CONFIG_HEADER(config.h) ++AC_CONFIG_HEADERS(config.h) + + AC_CANONICAL_HOST + AM_MAINTAINER_MODE +@@ -242,9 +242,9 @@ OLD_CFLAGS=$CFLAGS + OLD_LIBS=$LIBS + + if test x$have_vorbis = xtrue; then +-LIBS="$LIBS -lmp3lame -lvorbis -lm" ++LIBS="$LIBS -lmp3lame -lvorbis" + else +-LIBS="$LIBS -lmp3lame -lm" ++LIBS="$LIBS -lmp3lame" + fi + + dnl CFLAGS="$CFLAGS" +@@ -664,7 +664,7 @@ if test "x$with_faac" != "xno"; then + OLD_CFLAGS=$CFLAGS + OLD_LIBS=$LIBS + +-LIBS="$LIBS -lfaac -lm" ++LIBS="$LIBS -lfaac" + CFLAGS="$CFLAGS" + + AC_MSG_CHECKING(for faac) +@@ -732,7 +732,7 @@ OLD_CFLAGS=$CFLAGS + OLD_LIBS=$LIBS + + CFLAGS="$CFLAGS" +-LIBS="$LIBS -lfaad -lm" ++LIBS="$LIBS -lfaad" + + AC_MSG_CHECKING(for neaacdec.h usability for faad2) + +diff --git a/m4/vorbis.m4 b/m4/vorbis.m4 +index 300cc6c..5a28b34 100644 +--- a/m4/vorbis.m4 ++++ b/m4/vorbis.m4 +@@ -23,7 +23,7 @@ AC_ARG_ENABLE(vorbistest, [ --disable-vorbistest Do not try to compile an + VORBIS_LIBS="-L$prefix/lib" + fi + +- VORBIS_LIBS="$VORBIS_LIBS -lvorbis -lm" ++ VORBIS_LIBS="$VORBIS_LIBS -lvorbis" + VORBISFILE_LIBS="-lvorbisfile" + VORBISENC_LIBS="-lvorbisenc" + +-- +1.8.3.4 + From ecef7cd03c562f5f36fd7bb0e6bc72ee9d6281f8 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Thu, 12 Jun 2014 19:20:05 +0000 Subject: [PATCH 04/27] mjpegtools: added recipe for version 2.1.0 * tested x86 --- .../mjpegtools/mjpegtools-2.1.0.recipe | 171 ++++++++++++++++++ .../patches/mjpegtools-2.1.0.patchset | 55 ++++++ 2 files changed, 226 insertions(+) create mode 100644 media-video/mjpegtools/mjpegtools-2.1.0.recipe create mode 100644 media-video/mjpegtools/patches/mjpegtools-2.1.0.patchset diff --git a/media-video/mjpegtools/mjpegtools-2.1.0.recipe b/media-video/mjpegtools/mjpegtools-2.1.0.recipe new file mode 100644 index 000000000..61f207715 --- /dev/null +++ b/media-video/mjpegtools/mjpegtools-2.1.0.recipe @@ -0,0 +1,171 @@ +SUMMARY="Audio and Video Tools for Motion JPEG and MPEG" +DESCRIPTION=" +Programs for MJPEG recording and playback and simple cut-and-paste \ +editting and MPEG compression of audio and video. +" +HOMEPAGE="http://mjpeg.sourceforge.net" +LICENSE=" + GNU GPL v2 + " +COPYRIGHT=" + 2000-2003 Fabrice Bellard + 2003-2012 the FFmpeg developers + " +SRC_URI="http://sourceforge.net/projects/mjpeg/files/mjpegtools/$portVersion/mjpegtools-$portVersion.tar.gz" +CHECKSUM_SHA256="864f143d7686377f8ab94d91283c696ebd906bf256b2eacc7e9fb4dddcedc407" +REVISION="1" +ARCHITECTURES="?x86_gcc2 x86 ?x86_64" +SECONDARY_ARCHITECTURES="?x86_gcc2 x86" + +PATCHES="mjpegtools-2.1.0.patchset" + +PROVIDES=" + mjpegtools$secondaryArchSuffix = $portVersion compat >= 2 + lib:liblavfile_2.1$secondaryArchSuffix = 0.0.0 compat >= 0 + lib:liblavjpeg_2.1$secondaryArchSuffix = 0.0.0 compat >= 0 + lib:libmjpegutils_2.1$secondaryArchSuffix = 0.0.0 compat >= 0 + lib:libmpeg2encpp_2.1$secondaryArchSuffix = 0.0.0 compat >= 0 + lib:libmplex2_2.1$secondaryArchSuffix = 0.0.0 compat >= 0 + " + +if [ -z "$secondaryArchSuffix" ]; then + PROVIDES="$PROVIDES + cmd:anytovcd.sh = $portVersion compat >= 2 + cmd:jpeg2yuv = $portVersion compat >= 2 + cmd:lav2avi.sh = $portVersion compat >= 2 + cmd:lav2mpeg = $portVersion compat >= 2 + cmd:lav2wav = $portVersion compat >= 2 + cmd:lav2yuv = $portVersion compat >= 2 + cmd:lavaddwav = $portVersion compat >= 2 + cmd:lavinfo = $portVersion compat >= 2 + cmd:lavpipe = $portVersion compat >= 2 + cmd:lavtc.sh = $portVersion compat >= 2 + cmd:lavtrans = $portVersion compat >= 2 + cmd:matteblend.flt = $portVersion compat >= 2 + cmd:mjpeg_simd_helper = $portVersion compat >= 2 + cmd:mp2enc = $portVersion compat >= 2 + cmd:mpeg2enc = $portVersion compat >= 2 + cmd:mpegtranscode = $portVersion compat >= 2 + cmd:mplex = $portVersion compat >= 2 + cmd:multiblend.flt = $portVersion compat >= 2 + cmd:pgmtoy4m = $portVersion compat >= 2 + cmd:png2yuv = $portVersion compat >= 2 + cmd:pnmtoy4m = $portVersion compat >= 2 + cmd:ppmtoy4m = $portVersion compat >= 2 + cmd:transist.flt = $portVersion compat >= 2 + cmd:y4mblack = $portVersion compat >= 2 + cmd:y4mcolorbars = $portVersion compat >= 2 + cmd:y4mdenoise = $portVersion compat >= 2 + cmd:y4mhist = $portVersion compat >= 2 + cmd:y4minterlace = $portVersion compat >= 2 + cmd:y4mivtc = $portVersion compat >= 2 + cmd:y4mscaler = $portVersion compat >= 2 + cmd:y4mshift = $portVersion compat >= 2 + cmd:y4mspatialfilter = $portVersion compat >= 2 + cmd:y4mstabilizer = $portVersion compat >= 2 + cmd:y4mtopnm = $portVersion compat >= 2 + cmd:y4mtoppm = $portVersion compat >= 2 + cmd:y4mtoyuv = $portVersion compat >= 2 + cmd:y4munsharp = $portVersion compat >= 2 + cmd:ypipe = $portVersion compat >= 2 + cmd:yuv2lav = $portVersion compat >= 2 + cmd:yuv4mpeg = $portVersion compat >= 2 + cmd:yuvcorrect = $portVersion compat >= 2 + cmd:yuvcorrect_tune = $portVersion compat >= 2 + cmd:yuvdeinterlace = $portVersion compat >= 2 + cmd:yuvdenoise = $portVersion compat >= 2 + cmd:yuvfps = $portVersion compat >= 2 + cmd:yuvinactive = $portVersion compat >= 2 + cmd:yuvkineco = $portVersion compat >= 2 + cmd:yuvmedianfilter = $portVersion compat >= 2 + cmd:yuvscaler = $portVersion compat >= 2 + cmd:yuvycsnoise = $portVersion compat >= 2 + cmd:yuyvtoy4m = $portVersion compat >= 2 + " +fi + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libjpeg$secondaryArchSuffix + lib:libpng15$secondaryArchSuffix + lib:libz$secondaryArchSuffix + " +BUILD_REQUIRES=" + devel:libjpeg$secondaryArchSuffix + devel:libpng15$secondaryArchSuffix + devel:libz$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:make + cmd:awk + cmd:sed + cmd:pkg_config + cmd:nasm + cmd:libtoolize + cmd:autoconf + cmd:automake + cmd:aclocal + " + +BUILD() +{ + libtoolize -fci + aclocal + autoconf + automake + runConfigure ./configure + make $jobArgs +} + +INSTALL() +{ + make install + + mv $libDir/libmjpegutils.a $libDir/libmjpegutils-2.1.a + mv $libDir/liblavfile.a $libDir/liblavfile-2.1.a + mv $libDir/liblavjpeg.a $libDir/liblavjpeg-2.1.a + mv $libDir/libmpeg2encpp.a $libDir/libmpeg2encpp-2.1.a + mv $libDir/libmplex2.a $libDir/libmplex2-2.1.a + mv $libDir/libmjpegutils.la $libDir/libmjpegutils-2.1.la + mv $libDir/liblavfile.la $libDir/liblavfile-2.1.la + mv $libDir/liblavjpeg.la $libDir/liblavjpeg-2.1.la + mv $libDir/libmpeg2encpp.la $libDir/libmpeg2encpp-2.1.la + mv $libDir/libmplex2.la $libDir/libmplex2-2.1.la + mv $libDir/libmjpegutils.so $libDir/libmjpegutils-2.1.so + mv $libDir/liblavfile.so $libDir/liblavfile-2.1.so + mv $libDir/liblavjpeg.so $libDir/liblavjpeg-2.1.so + mv $libDir/libmpeg2encpp.so $libDir/libmpeg2encpp-2.1.so + mv $libDir/libmplex2.so $libDir/libmplex2-2.1.so + + prepareInstalledDevelLibs \ + libmjpegutils-2.1 liblavfile-2.1 liblavjpeg-2.1 \ + libmpeg2encpp-2.1 libmplex2-2.1 + fixPkgconfig + + # devel package + packageEntries devel \ + $developDir + + # Remove stuff we don't need in the secondary architecture base package. + if [ -n "$secondaryArchSuffix" ]; then + rm -rf $prefix/bin + rm -rf $documentationDir + fi +} + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + mjpegtools${secondaryArchSuffix}_devel = $portVersion compat >= 2 + devel:liblavfile_2.1$secondaryArchSuffix = 0.0.0 compat >= 0 + devel:liblavjpeg_2.1$secondaryArchSuffix = 0.0.0 compat >= 0 + devel:libmjpegutils_2.1$secondaryArchSuffix = 0.0.0 compat >= 0 + devel:libmpeg2encpp_2.1$secondaryArchSuffix = 0.0.0 compat >= 0 + devel:libmplex2_2.1$secondaryArchSuffix = 0.0.0 compat >= 0 + " +REQUIRES_devel=" + mjpegtools$secondaryArchSuffix == $portVersion + " diff --git a/media-video/mjpegtools/patches/mjpegtools-2.1.0.patchset b/media-video/mjpegtools/patches/mjpegtools-2.1.0.patchset new file mode 100644 index 000000000..610089c37 --- /dev/null +++ b/media-video/mjpegtools/patches/mjpegtools-2.1.0.patchset @@ -0,0 +1,55 @@ +From f4fa8ee2c60a7f6ce3e091e39e887337b30710d3 Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Wed, 11 Jun 2014 17:25:38 +0000 +Subject: haiku patch + + +diff --git a/configure.ac b/configure.ac +index 8ad5562..c0994fc 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -130,6 +130,9 @@ case $host in + [ LIBM_LIBS="-lcpml" + have_cpml=true ],,) + ;; ++ haiku*) ++ LIBM_LIBS="" ++ ;; + *) + AC_MSG_RESULT([no]) + ;; +diff --git a/lavtools/Makefile.am b/lavtools/Makefile.am +index 117dce7..e84a3c2 100644 +--- a/lavtools/Makefile.am ++++ b/lavtools/Makefile.am +@@ -152,7 +152,7 @@ jpeg2yuv_LDADD = $(LIBMJPEGUTILS) liblavjpeg.la $(JPEG_LIBS) + + png2yuv_SOURCES = png2yuv.c colorspace.c subsample.c + png2yuv_CPPFLAGS = $(AM_CPPFLAGS) $(LIBPNG_CFLAGS) +-png2yuv_LDADD = $(LIBMJPEGUTILS) $(LIBPNG_LIBS) -lz -lm ++png2yuv_LDADD = $(LIBMJPEGUTILS) $(LIBPNG_LIBS) -lz + + lavpipe_SOURCES = lavpipe.c pipelist.c + lavpipe_LDADD = $(LIBMJPEGUTILS) +diff --git a/y4mdenoise/newdenoise.cc b/y4mdenoise/newdenoise.cc +index d84890b..3b0a4ec 100644 +--- a/y4mdenoise/newdenoise.cc ++++ b/y4mdenoise/newdenoise.cc +@@ -1853,12 +1853,14 @@ BasicThread::Initialize (void) + mjpeg_error_exit1 ("pthread_attr_init() failed: %s", + strerror (nErr)); + ++#ifndef __HAIKU__ + // Inherit scheduling parameters from the main thread. + nErr = pthread_attr_setinheritsched (&sThreadAttributes, + PTHREAD_INHERIT_SCHED); + if (nErr != 0) + mjpeg_error_exit1 ("pthread_attr_setinheritsched() failed: %s", + strerror (nErr)); ++#endif + + // Create the thread. + nErr = pthread_create (&m_oThreadInfo, +-- +1.8.3.4 + From e396b55fb42570846a4ddf74b87a022f6f0411db Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Thu, 12 Jun 2014 19:26:54 +0000 Subject: [PATCH 05/27] gmp: Drop some old / broken recipes --- dev-libs/gmp/gmp-4.3.1.recipe | 33 ---------------- dev-libs/gmp/gmp-5.0.1.recipe | 33 ---------------- dev-libs/gmp/gmp-5.0.5.recipe | 33 ---------------- dev-libs/gmp/gmp-5.1.1.recipe | 74 ----------------------------------- 4 files changed, 173 deletions(-) delete mode 100644 dev-libs/gmp/gmp-4.3.1.recipe delete mode 100644 dev-libs/gmp/gmp-5.0.1.recipe delete mode 100644 dev-libs/gmp/gmp-5.0.5.recipe delete mode 100644 dev-libs/gmp/gmp-5.1.1.recipe diff --git a/dev-libs/gmp/gmp-4.3.1.recipe b/dev-libs/gmp/gmp-4.3.1.recipe deleted file mode 100644 index 811275dc9..000000000 --- a/dev-libs/gmp/gmp-4.3.1.recipe +++ /dev/null @@ -1,33 +0,0 @@ -DESCRIPTION="GMP - GNU Multiple Precision Arithmetic Library" -HOMEPAGE="http://gmplib.org/" -SRC_URI="ftp://ftp.gmplib.org/pub/gmp-4.3.1/gmp-4.3.1.tar.bz2" -CHECKSUM_MD5="26cec15a90885042dd4a15c4003b08ae" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd gmp-4.3.1 - libtoolize --force --copy --install - aclocal - autoconf - automake --add-missing - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL() -{ - cd gmp-4.3.1 - make install -} - -TEST() -{ - cd gmp-4.3.1 - make check -} - -LICENSE="GNU GPL v3 - GNU LGPL v3" -COPYRIGHT="1991-2009 Free Software Foundation, Inc." diff --git a/dev-libs/gmp/gmp-5.0.1.recipe b/dev-libs/gmp/gmp-5.0.1.recipe deleted file mode 100644 index 5b7af9fa7..000000000 --- a/dev-libs/gmp/gmp-5.0.1.recipe +++ /dev/null @@ -1,33 +0,0 @@ -DESCRIPTION="GMP - GNU Multiple Precision Arithmetic Library" -HOMEPAGE="http://gmplib.org/" -SRC_URI="ftp://ftp.gmplib.org/pub/gmp-5.0.1/gmp-5.0.1.tar.bz2" -CHECKSUM_MD5="6bac6df75c192a13419dfd71d19240a7" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd gmp-5.0.1 - libtoolize --force --copy --install - aclocal - autoconf - automake --add-missing - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL() -{ - cd gmp-5.0.1 - make install -} - -TEST() -{ - cd gmp-5.0.1 - make check -} - -LICENSE="GNU GPL v3 - GNU LGPL v3" -COPYRIGHT="1991-2010 Free Software Foundation, Inc." diff --git a/dev-libs/gmp/gmp-5.0.5.recipe b/dev-libs/gmp/gmp-5.0.5.recipe deleted file mode 100644 index b9daccb9c..000000000 --- a/dev-libs/gmp/gmp-5.0.5.recipe +++ /dev/null @@ -1,33 +0,0 @@ -DESCRIPTION="GMP - GNU Multiple Precision Arithmetic Library" -HOMEPAGE="http://gmplib.org/" -SRC_URI="ftp://ftp.gmplib.org/pub/gmp-5.0.5/gmp-5.0.5.tar.xz" -CHECKSUM_MD5="8aef50959acec2a1ad41d144ffe0f3b5" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd gmp-5.0.5 - libtoolize --force --copy --install - aclocal - autoconf - automake --add-missing - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL() -{ - cd gmp-5.0.5 - make install -} - -TEST() -{ - cd gmp-5.0.5 - make check -} - -LICENSE="GNU GPL v3 - GNU LGPL v3" -COPYRIGHT="1991-2012 Free Software Foundation, Inc." diff --git a/dev-libs/gmp/gmp-5.1.1.recipe b/dev-libs/gmp/gmp-5.1.1.recipe deleted file mode 100644 index 8f9f53dd8..000000000 --- a/dev-libs/gmp/gmp-5.1.1.recipe +++ /dev/null @@ -1,74 +0,0 @@ -SUMMARY="GMP - GNU Multiple Precision Arithmetic Library" -DESCRIPTION=" -The GNU Multiple Precision Arithmetic Library (GMP) is a free library for \ -arbitrary-precision arithmetic, operating on signed integers, rational numbers, \ -and floating point numbers. There are no practical limits to the precision \ -except the ones implied by the available memory in the machine GMP runs on \ -(operand dimension limit is 2^(32)-1 bits on 32-bit machines and 2^37 bits on \ -64-bit machines). GMP has a rich set of functions, and the functions have a \ -regular interface. The basic interface is for C but wrappers exist for other \ -languages including Ada, C++, C#, OCaml, Perl, PHP, and Python. -" -HOMEPAGE="http://gmplib.org/" -SRC_URI="ftp://ftp.gmplib.org/pub/gmp-5.1.1/gmp-5.1.1.tar.xz" -CHECKSUM_SHA256="4bd64d782fdeb61aeed45b434fca5246d66baa9de76f87cba30c38460d8834c2" -LICENSE="GNU GPL v3 - GNU LGPL v3" -COPYRIGHT="1991-2013 Free Software Foundation, Inc." -REVISION="1" -ARCHITECTURES="x86 x86_gcc2" -SECONDARY_ARCHITECTURES="x86_gcc2 x86" -PROVIDES="gmp$secondaryArchSuffix = $portVersion compat >= 5.1 - lib:libgmp$secondaryArchSuffix = 10.1.1 compat >= 10 - " -REQUIRES=" - haiku$secondaryArchSuffix >= $haikuVersion - " -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion - " -BUILD_PREREQUIRES=" - cmd:gcc$secondaryArchSuffix - cmd:libtool - cmd:autoconf - cmd:automake - cmd:make - " - -BUILD() -{ - libtoolize --force --copy --install - aclocal - autoconf - automake --add-missing - runConfigure ./configure - make $jobArgs -} - -INSTALL() -{ - make install includedir=$includeDir includeexecdir=$includeDir - - # prepare devel/lib - prepareInstalledDevelLibs libgmp - - # devel package - packageEntries devel \ - $developDir -} - -TEST() -{ - make check -} - -# ----- devel package - -PROVIDES_devel=" - gmp${secondaryArchSuffix}_devel = $portVersion - devel:libgmp$secondaryArchSuffix = 10.1.1 compat >= 0 - " -REQUIRES_devel=" - gmp$secondaryArchSuffix == $portVersion base - " - From 086d814af0b4da221d7507ea74d9de763b62355b Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Thu, 12 Jun 2014 19:29:47 +0000 Subject: [PATCH 06/27] cmake: Drop some old / broken recipes * 2.8.5 was even missing patchsets --- dev-util/cmake/cmake-2.8.10.2.recipe | 29 -- dev-util/cmake/cmake-2.8.5.recipe | 52 --- dev-util/cmake/patches/cmake-2.8.10.2.patch | 460 -------------------- 3 files changed, 541 deletions(-) delete mode 100644 dev-util/cmake/cmake-2.8.10.2.recipe delete mode 100644 dev-util/cmake/cmake-2.8.5.recipe delete mode 100644 dev-util/cmake/patches/cmake-2.8.10.2.patch diff --git a/dev-util/cmake/cmake-2.8.10.2.recipe b/dev-util/cmake/cmake-2.8.10.2.recipe deleted file mode 100644 index 3ab461703..000000000 --- a/dev-util/cmake/cmake-2.8.10.2.recipe +++ /dev/null @@ -1,29 +0,0 @@ -DESCRIPTION="cmake - Cross platform Make" -HOMEPAGE="http://www.cmake.org" -SRC_URI="http://www.cmake.org/files/v2.8/cmake-2.8.10.2.tar.gz" -CHECKSUM_MD5="097278785da7182ec0aea8769d06860c" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd cmake-2.8.10.2 - # cmake assumes the aclocal dir is in share/aclocal - sed -i 's/share\/aclocal/data\/aclocal/g' Source/cmakemain.cxx - sed -i 's/share\/aclocal/data\/aclocal/g' Utilities/CMakeLists.txt - - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --datadir=/data/cmake \ - --docdir=/documentation/doc/CMake \ - --mandir=/documentation/man - make -} - -INSTALL() -{ - cd cmake-2.8.10.2 - make install -} - -LICENSE="CMake" -COPYRIGHT="2002-2012 Kitware, Inc., Insight Consortium, All rights reserved." diff --git a/dev-util/cmake/cmake-2.8.5.recipe b/dev-util/cmake/cmake-2.8.5.recipe deleted file mode 100644 index 3f8de3c12..000000000 --- a/dev-util/cmake/cmake-2.8.5.recipe +++ /dev/null @@ -1,52 +0,0 @@ -DESCRIPTION=" -CMake is a cross-platform, open-source build system. It is a family of tools \ -designed to build, test and package software. CMake is used to control the \ -software compilation process using simple platform and compiler independent \ -configuration files. CMake generates native makefiles and workspaces that can \ -be used in the compiler environment of your choice. -" -HOMEPAGE="http://www.cmake.org" -LICENSE="CMake" -COPYRIGHT="2002-2011 Kitware, Inc., Insight Consortium, All rights reserved." -SRC_URI="http://www.cmake.org/files/v2.8/cmake-2.8.5.tar.gz" -CHECKSUM_SHA256="5e18bff75f01656c64f553412a8905527e1b85efaf3163c6fb81ea5aaced0b91" -REVISION="6" -ARCHITECTURES="x86_gcc2 x86 x86_64" - -PATCHES="cmake-2.8.5.patchset" - -PROVIDES=" - cmake = $portVersion compat >= 2.8 - cmd:cmake = $portVersion compat >= 2.8 - cmd:cpack = $portVersion compat >= 2.8 - cmd:ctest = $portVersion compat >= 2.8 - " -REQUIRES=" - haiku >= $haikuVersion - " -BUILD_REQUIRES=" - " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion - cmd:gcc - cmd:grep - cmd:ld - cmd:libtool - cmd:make - cmd:sed - " - - -BUILD() -{ - ./configure --prefix=$prefix \ - --datadir=/$relativeDataDir/cmake \ - --docdir=/$relativeDocDir \ - --mandir=/$relativeManDir - make $jobArgs -} - -INSTALL() -{ - make install -} diff --git a/dev-util/cmake/patches/cmake-2.8.10.2.patch b/dev-util/cmake/patches/cmake-2.8.10.2.patch deleted file mode 100644 index da4732325..000000000 --- a/dev-util/cmake/patches/cmake-2.8.10.2.patch +++ /dev/null @@ -1,460 +0,0 @@ -diff -urN cmake-2.8.10.2-orig/bootstrap cmake-2.8.10.2/bootstrap ---- cmake-2.8.10.2-orig/bootstrap 2012-11-27 05:26:34.015728640 -0800 -+++ cmake-2.8.10.2/bootstrap 2012-12-03 12:02:17.615251968 -0800 -@@ -146,7 +146,9 @@ - cmake_default_prefix="c:/Program Files/CMake" - fi - elif ${cmake_system_haiku}; then -- cmake_default_prefix=`/bin/finddir B_COMMON_DIRECTORY` -+ cmake_default_prefix=`finddir B_COMMON_DIRECTORY` -+ cmake_man_dir="/documentation/man" -+ cmake_doc_dir="/documentation/doc/cmake-${cmake_version}" - else - cmake_default_prefix="/usr/local" - fi -diff -urN cmake-2.8.10.2-orig/Modules/CMakePlatformId.h.in cmake-2.8.10.2/Modules/CMakePlatformId.h.in ---- cmake-2.8.10.2-orig/Modules/CMakePlatformId.h.in 2012-11-27 05:26:32.056623104 -0800 -+++ cmake-2.8.10.2/Modules/CMakePlatformId.h.in 2012-12-03 12:02:17.633864192 -0800 -@@ -35,11 +35,8 @@ - #elif defined(__hpux) || defined(__hpux__) - # define PLATFORM_ID "HP-UX" - --#elif defined(__HAIKU) || defined(__HAIKU__) || defined(_HAIKU) -+#elif defined(__HAIKU__) - # define PLATFORM_ID "Haiku" --/* Haiku also defines __BEOS__ so we must -- put it prior to the check for __BEOS__ --*/ - - #elif defined(__BeOS) || defined(__BEOS__) || defined(_BEOS) - # define PLATFORM_ID "BeOS" ---- cmake-2.8.10.2-orig/Modules/FindFreetype.cmake 2012-11-27 13:26:32.037486592 +0000 -+++ cmake-2.8.10.2/Modules/FindFreetype.cmake 2013-02-10 23:15:25.000000000 +0000 -@@ -46,20 +46,22 @@ - HINTS - ENV FREETYPE_DIR - PATHS -+ /boot/develop/headers - /usr/local/X11R6 - /usr/local/X11 - /usr/freeware -- PATH_SUFFIXES include/freetype2 include -+ PATH_SUFFIXES include/freetype2 include 3rdparty - ) - - find_path(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h - HINTS - ENV FREETYPE_DIR - PATHS -+ /boot/develop/headers - /usr/local/X11R6 - /usr/local/X11 - /usr/freeware -- PATH_SUFFIXES include/freetype2 include -+ PATH_SUFFIXES include/freetype2 include 3rdparty/freetype2 3rdparty - ) - - find_library(FREETYPE_LIBRARY -@@ -68,6 +70,7 @@ - ENV FREETYPE_DIR - PATH_SUFFIXES lib - PATHS -+ /boot/system/lib - /usr/local/X11R6 - /usr/local/X11 - /usr/freeware - -diff -urN cmake-2.8.10.2-orig/Modules/FindGLUT.cmake cmake-2.8.10.2/Modules/FindGLUT.cmake ---- cmake-2.8.10.2-orig/Modules/FindGLUT.cmake 2012-11-27 13:26:32.057147392 +0000 -+++ cmake-2.8.10.2/Modules/FindGLUT.cmake 2012-12-04 09:11:43.176422912 +0000 -@@ -46,19 +46,23 @@ - /usr/openwin/include - /opt/graphics/OpenGL/include - /opt/graphics/OpenGL/contrib/libglut -+ /boot/develop/headers/os/opengl - ) - - find_library( GLUT_glut_LIBRARY glut - /usr/openwin/lib -+ /boot/develop/lib/x86/ - ) - -- find_library( GLUT_Xi_LIBRARY Xi -- /usr/openwin/lib -- ) -- -- find_library( GLUT_Xmu_LIBRARY Xmu -- /usr/openwin/lib -- ) -+ if(NOT BEOS AND NOT HAIKU) -+ find_library( GLUT_Xi_LIBRARY Xi -+ /usr/openwin/lib -+ ) -+ -+ find_library( GLUT_Xmu_LIBRARY Xmu -+ /usr/openwin/lib -+ ) -+ endif() - - endif () - -@@ -70,12 +74,18 @@ - if (GLUT_FOUND) - # Is -lXi and -lXmu required on all platforms that have it? - # If not, we need some way to figure out what platform we are on. -- set( GLUT_LIBRARIES -- ${GLUT_glut_LIBRARY} -- ${GLUT_Xmu_LIBRARY} -- ${GLUT_Xi_LIBRARY} -- ${GLUT_cocoa_LIBRARY} -- ) -+ if(BEOS OR HAIKU) -+ set( GLUT_LIBRARIES -+ ${GLUT_glut_LIBRARY} -+ ) -+ else -+ set( GLUT_LIBRARIES -+ ${GLUT_glut_LIBRARY} -+ ${GLUT_Xmu_LIBRARY} -+ ${GLUT_Xi_LIBRARY} -+ ${GLUT_cocoa_LIBRARY} -+ ) -+ endif() - - #The following deprecated settings are for backwards compatibility with CMake1.4 - set (GLUT_LIBRARY ${GLUT_LIBRARIES}) - -diff -urN cmake-2.8.10.2-orig/Modules/FindLua51.cmake cmake-2.8.10.2/Modules/FindLua51.cmake ---- cmake-2.8.10.2-orig/Modules/FindLua51.cmake 2012-11-27 05:26:32.033030144 -0800 -+++ cmake-2.8.10.2/Modules/FindLua51.cmake 2012-12-03 12:02:17.644612096 -0800 -@@ -54,7 +54,7 @@ - - if(LUA_LIBRARY) - # include the math library for Unix -- if(UNIX AND NOT APPLE) -+ if(UNIX AND NOT APPLE AND NOT BEOS AND NOT HAIKU) - find_library(LUA_MATH_LIBRARY m) - set( LUA_LIBRARIES "${LUA_LIBRARY};${LUA_MATH_LIBRARY}" CACHE STRING "Lua Libraries") - # For Windows and Mac, don't need to explicitly include the math library -diff -urN cmake-2.8.10.2-orig/Modules/FindOpenGL.cmake cmake-2.8.10.2/Modules/FindOpenGL.cmake ---- cmake-2.8.10.2-orig/Modules/FindOpenGL.cmake 2012-11-27 05:26:32.034340864 -0800 -+++ cmake-2.8.10.2/Modules/FindOpenGL.cmake 2012-12-03 12:02:17.651952128 -0800 -@@ -80,6 +80,7 @@ - /usr/share/doc/NVIDIA_GLX-1.0/include - /usr/openwin/share/include - /opt/graphics/OpenGL/include /usr/X11R6/include -+ /boot/develop/headers/os/opengl - ) - - find_path(OPENGL_xmesa_INCLUDE_DIR GL/xmesa.h -@@ -94,6 +95,7 @@ - /usr/openwin/lib - /usr/shlib /usr/X11R6/lib - ${HPUX_IA_OPENGL_LIB_PATH} -+ /boot/develop/lib/x86/ - ) - - # On Unix OpenGL most certainly always requires X11. -diff -urN cmake-2.8.10.2-orig/Modules/Platform/Haiku.cmake cmake-2.8.10.2/Modules/Platform/Haiku.cmake ---- cmake-2.8.10.2-orig/Modules/Platform/Haiku.cmake 2012-12-03 12:11:47.804519936 -0800 -+++ cmake-2.8.10.2/Modules/Platform/Haiku.cmake 2012-12-03 12:02:17.652738560 -0800 -@@ -1,20 +1,25 @@ -+set(HAIKU 1) -+set(UNIX 1) -+ -+set(CMAKE_DL_LIBS "") --set(BEOS 1) -- --set(CMAKE_DL_LIBS root be) --set(CMAKE_C_COMPILE_OPTIONS_PIC "-fPIC") --set(CMAKE_C_COMPILE_OPTIONS_PIE "-fPIE") - set(CMAKE_SHARED_LIBRARY_C_FLAGS "-fPIC") -+set(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-shared") --set(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-nostart") - set(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-rpath,") - set(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":") -+set(CMAKE_SHARED_LIBRARY_RPATH_LINK_C_FLAG "-Wl,-rpath-link,") - set(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-soname,") -+set(CMAKE_EXE_EXPORTS_C_FLAG "-Wl,--export-dynamic") -+ -+list(APPEND CMAKE_SYSTEM_PREFIX_PATH -+ /boot/common/non-packaged -+ /boot/common -+ /boot/system -+ ) -+list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES -+ /boot/common/non-packaged/lib -+ /boot/common/lib -+ /boot/develop/lib/x86 -+ ) -- --include(Platform/UnixPaths) --list(APPEND CMAKE_SYSTEM_PREFIX_PATH /boot/common) --list(APPEND CMAKE_SYSTEM_INCLUDE_PATH /boot/common/include) --list(APPEND CMAKE_SYSTEM_LIBRARY_PATH /boot/common/lib) --list(APPEND CMAKE_SYSTEM_PROGRAM_PATH /boot/common/bin) --list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES /boot/common/lib) - list(APPEND CMAKE_SYSTEM_INCLUDE_PATH /boot/develop/headers/3rdparty) - list(APPEND CMAKE_SYSTEM_LIBRARY_PATH /boot/develop/lib/x86) - -diff -urN cmake-2.8.10.2-orig/Source/cmCTest.cxx cmake-2.8.10.2/Source/cmCTest.cxx ---- cmake-2.8.10.2-orig/Source/cmCTest.cxx 2012-11-27 05:26:32.060030976 -0800 -+++ cmake-2.8.10.2/Source/cmCTest.cxx 2012-12-03 12:02:17.659816448 -0800 -@@ -53,7 +53,7 @@ - #include - #include - --#if defined(__BEOS__) && !defined(__HAIKU__) -+#if defined(__BEOS__) - #include /* disable_debugger() API. */ - #endif - -diff -urN cmake-2.8.10.2-orig/Source/cmExportCommand.cxx cmake-2.8.10.2/Source/cmExportCommand.cxx ---- cmake-2.8.10.2-orig/Source/cmExportCommand.cxx 2012-11-27 05:26:33.039059456 -0800 -+++ cmake-2.8.10.2/Source/cmExportCommand.cxx 2012-12-03 12:02:17.665059328 -0800 -@@ -20,7 +20,8 @@ - #include "cmExportBuildFileGenerator.h" - - #if defined(__HAIKU__) --#include -+#include -+#include - #endif - - cmExportCommand::cmExportCommand() -@@ -305,14 +306,15 @@ - const char* hash) - { - #if defined(__HAIKU__) -- BPath dir; -- if (find_directory(B_USER_SETTINGS_DIRECTORY, &dir) != B_OK) -+ char dir[B_PATH_NAME_LENGTH]; -+ if (find_directory(B_USER_SETTINGS_DIRECTORY, -1, false, dir, sizeof(dir)) != -+ B_OK) - { - return; - } -- dir.Append("cmake/packages"); -- dir.Append(package.c_str()); -- std::string fname = dir.Path(); -+ std::string fname = dir; -+ fname += "/cmake/packages/"; -+ fname += package; - #else - const char* home = cmSystemTools::GetEnv("HOME"); - if(!home) -diff -urN cmake-2.8.10.2-orig/Source/cmFindPackageCommand.cxx cmake-2.8.10.2/Source/cmFindPackageCommand.cxx ---- cmake-2.8.10.2-orig/Source/cmFindPackageCommand.cxx 2012-11-27 05:26:33.059768832 -0800 -+++ cmake-2.8.10.2/Source/cmFindPackageCommand.cxx 2012-12-03 12:02:17.666107904 -0800 -@@ -19,7 +19,9 @@ - #endif - - #if defined(__HAIKU__) --#include -+#include -+#include -+#include - #endif - - void cmFindPackageNeedBackwardsCompatibility(const std::string& variable, -@@ -1583,12 +1585,13 @@ - #if defined(_WIN32) && !defined(__CYGWIN__) - this->LoadPackageRegistryWinUser(); - #elif defined(__HAIKU__) -- BPath dir; -- if (find_directory(B_USER_SETTINGS_DIRECTORY, &dir) == B_OK) -+ char dir[B_PATH_NAME_LENGTH]; -+ if (find_directory(B_USER_SETTINGS_DIRECTORY, -1, false, dir, sizeof(dir)) == -+ B_OK) - { -- dir.Append("cmake/packages"); -- dir.Append(this->Name.c_str()); -- this->LoadPackageRegistryDir(dir.Path()); -+ strlcat(dir, "/cmake/packages/", sizeof(dir)); -+ strlcat(dir, this->Name.c_str(), sizeof(dir)); -+ this->LoadPackageRegistryDir(dir); - } - #else - if(const char* home = cmSystemTools::GetEnv("HOME")) -diff -urN cmake-2.8.10.2-orig/Source/cmLocalGenerator.cxx cmake-2.8.10.2/Source/cmLocalGenerator.cxx ---- cmake-2.8.10.2-orig/Source/cmLocalGenerator.cxx 2012-11-27 05:26:33.035389440 -0800 -+++ cmake-2.8.10.2/Source/cmLocalGenerator.cxx 2012-12-03 12:02:17.672399360 -0800 -@@ -37,7 +37,8 @@ - #include - - #if defined(__HAIKU__) --#include -+#include -+#include - #endif - - cmLocalGenerator::cmLocalGenerator() -@@ -354,12 +355,12 @@ - prefix = prefix_win32.c_str(); - } - #elif defined(__HAIKU__) -+ char dir[B_PATH_NAME_LENGTH]; - if (!prefix) - { -- BPath dir; -- if (find_directory(B_COMMON_DIRECTORY, &dir) == B_OK) -+ if (find_directory(B_COMMON_DIRECTORY, -1, false, dir, sizeof(dir)) == B_OK) - { -- prefix = dir.Path(); -+ prefix = dir; - } - else - { -diff -urN cmake-2.8.10.2-orig/Source/CPack/cmCPackGenerator.cxx cmake-2.8.10.2/Source/CPack/cmCPackGenerator.cxx ---- cmake-2.8.10.2-orig/Source/CPack/cmCPackGenerator.cxx 2012-11-27 05:26:32.015466496 -0800 -+++ cmake-2.8.10.2/Source/CPack/cmCPackGenerator.cxx 2012-12-03 12:02:17.677904384 -0800 -@@ -27,7 +27,8 @@ - #include - - #if defined(__HAIKU__) --#include -+#include -+#include - #endif - - //---------------------------------------------------------------------- -@@ -1265,10 +1266,10 @@ - this->InstallPath += "-"; - this->InstallPath += this->GetOption("CPACK_PACKAGE_VERSION"); - #elif defined(__HAIKU__) -- BPath dir; -- if (find_directory(B_COMMON_DIRECTORY, &dir) == B_OK) -+ char dir[B_PATH_NAME_LENGTH]; -+ if (find_directory(B_COMMON_DIRECTORY, -1, false, dir, sizeof(dir)) == B_OK) - { -- this->InstallPath = dir.Path(); -+ this->InstallPath = dir; - } - else - { -diff -urN cmake-2.8.10.2-orig/Source/CPack/cmCPackGeneratorFactory.cxx cmake-2.8.10.2/Source/CPack/cmCPackGeneratorFactory.cxx ---- cmake-2.8.10.2-orig/Source/CPack/cmCPackGeneratorFactory.cxx 2012-12-03 12:07:50.301203456 -0800 -+++ cmake-2.8.10.2/Source/CPack/cmCPackGeneratorFactory.cxx 2012-12-03 12:02:17.678428672 -0800 -@@ -113,7 +113,7 @@ - } - #endif - #if !defined(_WIN32) \ -+ && !defined(__QNXNTO__) && !defined(__BEOS__) && !defined(__HAIKU__) -- && !defined(__QNXNTO__) && !defined(__BEOS__) - if (cmCPackDebGenerator::CanGenerate()) - { - this->RegisterGenerator("DEB", "Debian packages", -diff -urN cmake-2.8.10.2-orig/Source/kwsys/ProcessUNIX.c cmake-2.8.10.2/Source/kwsys/ProcessUNIX.c ---- cmake-2.8.10.2-orig/Source/kwsys/ProcessUNIX.c 2012-11-27 05:26:33.000524288 -0800 -+++ cmake-2.8.10.2/Source/kwsys/ProcessUNIX.c 2012-12-03 12:02:17.707264512 -0800 -@@ -63,10 +63,6 @@ - #include /* DIR, dirent */ - #include /* isspace */ - --#ifdef __HAIKU__ --#undef __BEOS__ --#endif -- - #if defined(__VMS) - # define KWSYSPE_VMS_NONBLOCK , O_NONBLOCK - #else -diff -urN cmake-2.8.10.2-orig/Source/kwsys/SystemTools.cxx cmake-2.8.10.2/Source/kwsys/SystemTools.cxx ---- cmake-2.8.10.2-orig/Source/kwsys/SystemTools.cxx 2012-11-27 05:26:33.005505024 -0800 -+++ cmake-2.8.10.2/Source/kwsys/SystemTools.cxx 2012-12-03 12:02:17.708313088 -0800 -@@ -157,7 +157,7 @@ - #include - #endif - --#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__) -+#if defined(__BEOS__) && !defined(__ZETA__) - #include - #include - -diff -urN cmake-2.8.10.2-orig/Source/kwsys/testDynamicLoader.cxx cmake-2.8.10.2/Source/kwsys/testDynamicLoader.cxx ---- cmake-2.8.10.2-orig/Source/kwsys/testDynamicLoader.cxx 2012-11-27 05:26:33.006815744 -0800 -+++ cmake-2.8.10.2/Source/kwsys/testDynamicLoader.cxx 2012-12-03 12:02:17.713818112 -0800 -@@ -15,7 +15,7 @@ - #include KWSYS_HEADER(ios/iostream) - #include KWSYS_HEADER(stl/string) - --#if defined(__BEOS__) && !defined(__HAIKU__) -+#if defined(__BEOS__) - #include /* disable_debugger() API. */ - #endif - -diff -urN cmake-2.8.10.2-orig/Source/kwsys/testProcess.c cmake-2.8.10.2/Source/kwsys/testProcess.c ---- cmake-2.8.10.2-orig/Source/kwsys/testProcess.c 2012-11-27 05:26:33.007602176 -0800 -+++ cmake-2.8.10.2/Source/kwsys/testProcess.c 2012-12-03 12:02:17.714604544 -0800 -@@ -32,7 +32,7 @@ - # pragma warn -8060 /* possibly incorrect assignment */ - #endif - --#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__) -+#if defined(__BEOS__) && !defined(__ZETA__) - /* BeOS 5 doesn't have usleep(), but it has snooze(), which is identical. */ - # include - static inline void testProcess_usleep(unsigned int msec) -diff -urN cmake-2.8.10.2-orig/Tests/ComplexOneConfig/Library/CMakeLists.txt cmake-2.8.10.2/Tests/ComplexOneConfig/Library/CMakeLists.txt ---- cmake-2.8.10.2-orig/Tests/ComplexOneConfig/Library/CMakeLists.txt 2012-11-27 05:26:34.013369344 -0800 -+++ cmake-2.8.10.2/Tests/ComplexOneConfig/Library/CMakeLists.txt 2012-12-03 12:02:42.181665792 -0800 -@@ -51,7 +51,7 @@ - FULL_DOCS "A simple etst proerty that means nothign and is used for nothing" - ) - set_target_properties(CMakeTestCLibraryShared PROPERTIES FOO BAR) --if(NOT BEOS AND NOT WIN32) # No libm on BeOS. -+if(NOT BEOS AND NOT WIN32 AND NOT HAIKU) # No libm on BeOS. - set_target_properties(CMakeTestCLibraryShared PROPERTIES LINK_FLAGS "-lm") - endif() - get_target_property(FOO_BAR_VAR CMakeTestCLibraryShared FOO) -diff -urN cmake-2.8.10.2-orig/Utilities/cmcurl/CMake/CurlTests.c cmake-2.8.10.2/Utilities/cmcurl/CMake/CurlTests.c ---- cmake-2.8.10.2-orig/Utilities/cmcurl/CMake/CurlTests.c 2012-11-27 05:26:34.045350912 -0800 -+++ cmake-2.8.10.2/Utilities/cmcurl/CMake/CurlTests.c 2012-12-03 12:02:42.189005824 -0800 -@@ -38,7 +38,7 @@ - # define PLATFORM_AIX_V3 - #endif - --#if defined(PLATFORM_SUNOS4) || defined(PLATFORM_AIX_V3) || (defined(__BEOS__) && !defined(__HAIKU__)) -+#if defined(PLATFORM_SUNOS4) || defined(PLATFORM_AIX_V3) || defined(__BEOS__) - #error "O_NONBLOCK does not work on this platform" - #endif - int socket; -diff -urN cmake-2.8.10.2-orig/Utilities/cmcurl/select.c cmake-2.8.10.2/Utilities/cmcurl/select.c ---- cmake-2.8.10.2-orig/Utilities/cmcurl/select.c 2012-11-27 05:26:34.055312384 -0800 -+++ cmake-2.8.10.2/Utilities/cmcurl/select.c 2012-12-03 12:02:42.189792256 -0800 -@@ -39,7 +39,7 @@ - #error "We can't compile without select() support!" - #endif - --#if defined(__BEOS__) && !defined(__HAIKU__) -+#if defined(__BEOS__) - /* BeOS has FD_SET defined in socket.h */ - #include - #endif -diff -urN cmake-2.8.10.2-orig/Utilities/cmzlib/zconf.h cmake-2.8.10.2/Utilities/cmzlib/zconf.h ---- cmake-2.8.10.2-orig/Utilities/cmzlib/zconf.h 2012-11-27 05:26:34.022020096 -0800 -+++ cmake-2.8.10.2/Utilities/cmzlib/zconf.h 2012-12-03 12:02:42.190578688 -0800 -@@ -237,7 +237,7 @@ - # endif - #endif - --#if defined (__BEOS__) && !defined (__HAIKU__) -+#if defined (__BEOS__) - # ifdef ZLIB_DLL - # ifdef ZLIB_INTERNAL - # define ZEXPORT __declspec(dllexport) -diff -urN cmake-2.8.10.2-orig/Utilities/cmzlib/zutil.h cmake-2.8.10.2/Utilities/cmzlib/zutil.h ---- cmake-2.8.10.2-orig/Utilities/cmzlib/zutil.h 2012-11-27 05:26:34.022806528 -0800 -+++ cmake-2.8.10.2/Utilities/cmzlib/zutil.h 2012-12-03 12:02:42.195559424 -0800 -@@ -147,12 +147,6 @@ - # define OS_CODE 0x0f - #endif - --/* Haiku defines both __HAIKU__ and __BEOS__ (for now) */ --/* many BeOS workarounds are no longer needed in Haiku */ --#if defined(__HAIKU__) && defined(__BEOS__) --#undef __BEOS__ --#endif -- - #if defined(_BEOS_) || defined(RISCOS) - # define fdopen(fd,mode) NULL /* No fdopen() */ - #endif From 61b230f8f86204fefd76004931e3a7820e757bfe Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Thu, 12 Jun 2014 19:33:41 +0000 Subject: [PATCH 07/27] libdvdread: Drop some old / broken recipes * Copy 4.2.0 patch to 4.2.1 * libdvdread-svn1168.patch was actually 1:1 libdvdread-4.2.0.patch --- media-libs/libdvdread/libdvdread-4.1.3.recipe | 20 ------------ media-libs/libdvdread/libdvdread-4.2.1.recipe | 2 +- .../libdvdread/libdvdread-svn1168.recipe | 23 ------------- .../libdvdread/libdvdread-svn1226.recipe | 25 --------------- .../libdvdread/patches/libdvdread-4.1.3.patch | 24 -------------- ...d-svn1168.patch => libdvdread-4.2.1.patch} | 32 ++++++++----------- .../patches/libdvdread-svn1226.patch | 26 --------------- 7 files changed, 15 insertions(+), 137 deletions(-) delete mode 100644 media-libs/libdvdread/libdvdread-4.1.3.recipe delete mode 100644 media-libs/libdvdread/libdvdread-svn1168.recipe delete mode 100644 media-libs/libdvdread/libdvdread-svn1226.recipe delete mode 100644 media-libs/libdvdread/patches/libdvdread-4.1.3.patch rename media-libs/libdvdread/patches/{libdvdread-svn1168.patch => libdvdread-4.2.1.patch} (60%) delete mode 100644 media-libs/libdvdread/patches/libdvdread-svn1226.patch diff --git a/media-libs/libdvdread/libdvdread-4.1.3.recipe b/media-libs/libdvdread/libdvdread-4.1.3.recipe deleted file mode 100644 index b016206fe..000000000 --- a/media-libs/libdvdread/libdvdread-4.1.3.recipe +++ /dev/null @@ -1,20 +0,0 @@ -DESCRIPTION="libdvdread" -HOMEPAGE="http://www.mplayerhq.hu/design7/news.html" -SRC_URI="http://www3.mplayerhq.hu/MPlayer/releases/dvdnav/libdvdread-4.1.3.tar.bz2" -CHECKSUM_MD5="6dc068d442c85a3cdd5ad3da75f6c6e8" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd libdvdread-4.1.3 - ./autogen.sh - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL() -{ - cd libdvdread-4.1.3 - make install -} diff --git a/media-libs/libdvdread/libdvdread-4.2.1.recipe b/media-libs/libdvdread/libdvdread-4.2.1.recipe index be2de068d..3afdfabe6 100644 --- a/media-libs/libdvdread/libdvdread-4.2.1.recipe +++ b/media-libs/libdvdread/libdvdread-4.2.1.recipe @@ -17,7 +17,7 @@ REVISION="1" ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 ?x86" -PATCHES="libdvdread-4.2.0.patch" +PATCHES="libdvdread-4.2.1.patch" PROVIDES=" libdvdread${secondaryArchSuffix} = $portVersion diff --git a/media-libs/libdvdread/libdvdread-svn1168.recipe b/media-libs/libdvdread/libdvdread-svn1168.recipe deleted file mode 100644 index 2c9bfcf7d..000000000 --- a/media-libs/libdvdread/libdvdread-svn1168.recipe +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION="libdvdread is a library for DVD navigation tools" -HOMEPAGE="http://mplayerhq.hu" -SRC_URI="http://download.m0k.org/handbrake/contrib/libdvdread-svn1168.tar.gz" -CHECKSUM_MD5="39cb0b27cc6b05e4f5c849dececf1f7a" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd libdvdread - libtoolize --force --copy --install - aclocal - autoconf - ./autogen.sh - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL() -{ - cd libdvdread - make install -} diff --git a/media-libs/libdvdread/libdvdread-svn1226.recipe b/media-libs/libdvdread/libdvdread-svn1226.recipe deleted file mode 100644 index f40b24a82..000000000 --- a/media-libs/libdvdread/libdvdread-svn1226.recipe +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION="libdvdread is a library for DVD navigation tools" -HOMEPAGE="http://mplayerhq.hu" -SRC_URI="http://download.m0k.org/handbrake/contrib/libdvdread-svn1168.tar.gz" -CHECKSUM_MD5="39cb0b27cc6b05e4f5c849dececf1f7a" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd libdvdread - svn up -r 1226 - libtoolize --force --copy --install - aclocal - autoconf - ./autogen.sh - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --datarootdir=`finddir B_COMMON_DATA_DIRECTORY` - make -} - -INSTALL() -{ - cd libdvdread - make install -} diff --git a/media-libs/libdvdread/patches/libdvdread-4.1.3.patch b/media-libs/libdvdread/patches/libdvdread-4.1.3.patch deleted file mode 100644 index c7cebd27d..000000000 --- a/media-libs/libdvdread/patches/libdvdread-4.1.3.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -urN libdvdread-4.1.3/configure.ac libdvdread-4.1.3-haiku/configure.ac ---- libdvdread-4.1.3/configure.ac 2009-02-19 08:11:30.000000000 +0000 -+++ libdvdread-4.1.3-haiku/configure.ac 2009-02-19 08:03:55.000000000 +0000 -@@ -145,6 +145,8 @@ - *cygwin*) - LDFLAGS="-no-undefined $LDFLAGS" - ;; -+ *haiku*) -+ ;; - *) - AC_CHECK_LIB(c, dlopen, - DYNAMIC_LD_LIBS="", -diff -urN libdvdread-4.1.3/src/bswap.h libdvdread-4.1.3-haiku/src/bswap.h ---- libdvdread-4.1.3/src/bswap.h 2009-02-19 08:11:31.000000000 +0000 -+++ libdvdread-4.1.3-haiku/src/bswap.h 2009-02-19 08:09:28.000000000 +0000 -@@ -71,7 +71,7 @@ - * functionality! - */ - --#elif defined(__FreeBSD__) || defined(__sun) || defined(__bsdi__) || defined(WIN32) || defined(__CYGWIN__) || defined(__BEOS__) -+#elif defined(__FreeBSD__) || defined(__sun) || defined(__bsdi__) || defined(WIN32) || defined(__CYGWIN__) || defined(__BEOS__) || defined(__HAIKU__) - #define B2N_16(x) \ - x = ((((x) & 0xff00) >> 8) | \ - (((x) & 0x00ff) << 8)) diff --git a/media-libs/libdvdread/patches/libdvdread-svn1168.patch b/media-libs/libdvdread/patches/libdvdread-4.2.1.patch similarity index 60% rename from media-libs/libdvdread/patches/libdvdread-svn1168.patch rename to media-libs/libdvdread/patches/libdvdread-4.2.1.patch index f92ea62f7..7ca237fcc 100644 --- a/media-libs/libdvdread/patches/libdvdread-svn1168.patch +++ b/media-libs/libdvdread/patches/libdvdread-4.2.1.patch @@ -1,26 +1,22 @@ -Index: libdvdread/src/bswap.h -=================================================================== ---- libdvdread/src/bswap.h (revision 1168) -+++ libdvdread/src/bswap.h (working copy) -@@ -73,7 +73,7 @@ - * functionality! - */ - --#elif defined(__FreeBSD__) || defined(__sun) || defined(__bsdi__) || defined(WIN32) || defined(__CYGWIN__) || defined(__BEOS__) || defined(__OS2__) -+#elif defined(__FreeBSD__) || defined(__sun) || defined(__bsdi__) || defined(WIN32) || defined(__CYGWIN__) || defined(__BEOS__) || defined(__HAIKU__) || defined(__OS2__) - #define B2N_16(x) \ - x = ((((x) & 0xff00) >> 8) | \ - (((x) & 0x00ff) << 8)) -Index: configure.ac -=================================================================== ---- libdvdread/configure.ac (revision 1168) -+++ libdvdread/configure.ac (working copy) +--- libdvdread-4.2.0/configure.ac 2011-10-07 20:20:59.008912896 +0000 ++++ libdvdread-4.2.0-haiku/configure.ac 2012-04-09 16:22:42.155713536 +0000 @@ -148,6 +148,8 @@ *os2*) LDFLAGS="-no-undefined -Zbin-files $LDFLAGS" ;; + *haiku*) -+ ;; ++ ;; *) AC_CHECK_LIB(c, dlopen, DYNAMIC_LD_LIBS="", +--- libdvdread-4.2.0/src/bswap.h 2008-10-09 22:04:24.005242880 +0000 ++++ libdvdread-4.2.0-haiku/src/bswap.h 2012-04-09 16:24:41.829947904 +0000 +@@ -73,7 +73,7 @@ + * functionality! + */ + +-#elif defined(__FreeBSD__) || defined(__sun) || defined(__bsdi__) || defined(WIN32) || defined(__CYGWIN__) || defined(__BEOS__) || defined(__OS2__) ++#elif defined(__FreeBSD__) || defined(__sun) || defined(__bsdi__) || defined(WIN32) || defined(__CYGWIN__) || defined(__BEOS__) || defined(__OS2__)|| defined(__HAIKU__) + #define B2N_16(x) \ + x = ((((x) & 0xff00) >> 8) | \ + (((x) & 0x00ff) << 8)) diff --git a/media-libs/libdvdread/patches/libdvdread-svn1226.patch b/media-libs/libdvdread/patches/libdvdread-svn1226.patch deleted file mode 100644 index 345fb9cea..000000000 --- a/media-libs/libdvdread/patches/libdvdread-svn1226.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: libdvdread/src/bswap.h -=================================================================== ---- libdvdread/src/bswap.h (revision 1226) -+++ libdvdread/src/bswap.h (working copy) -@@ -73,7 +73,7 @@ - * functionality! - */ - --#elif defined(__FreeBSD__) || defined(__sun) || defined(__bsdi__) || defined(WIN32) || defined(__CYGWIN__) || defined(__BEOS__) || defined(__OS2__) -+#elif defined(__FreeBSD__) || defined(__sun) || defined(__bsdi__) || defined(WIN32) || defined(__CYGWIN__) || defined(__BEOS__) || defined(__HAIKU__) || defined(__OS2__) - #define B2N_16(x) \ - x = ((((x) & 0xff00) >> 8) | \ - (((x) & 0x00ff) << 8)) -Index: configure.ac -=================================================================== ---- libdvdread/configure.ac (revision 1226) -+++ libdvdread/configure.ac (working copy) -@@ -148,6 +148,8 @@ - *os2*) - LDFLAGS="-no-undefined -Zbin-files $LDFLAGS" - ;; -+ *haiku*) -+ ;; - *) - AC_CHECK_LIB(c, dlopen, - DYNAMIC_LD_LIBS="", From c522c1de5090fef308e602b5aae6bf3895d4f192 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Thu, 12 Jun 2014 20:44:02 +0000 Subject: [PATCH 08/27] patch cleanup: Make sure recipes have matching patches. * Ruby 1.9.3 shouldn't point to the 1.9.1 patch, etc. --- dev-lang/perl/patches/perl-5.18.2.patchset | 546 ++++++++++++++++++ dev-lang/perl/perl-5.18.2.recipe | 2 +- dev-lang/ruby/patches/ruby-1.9.3.patchset | 545 +++++++++++++++++ dev-lang/ruby/ruby-1.9.3.recipe | 2 +- ...scons-2.2.0.patch => scons-2.3.1.patchset} | 73 ++- dev-util/scons/scons-2.3.1.recipe | 2 +- dev-vcs/mercurial/mercurial-2.9.1.recipe | 2 +- dev-vcs/mercurial/mercurial-2.9.2.recipe | 2 +- .../mercurial/patches/mercurial-2.9.1.patch | 12 + .../mercurial/patches/mercurial-2.9.2.patch | 12 + .../haikuwebkit/haikuwebkit-1.3.0.recipe | 2 +- .../haikuwebkit/haikuwebkit-1.3.1.recipe | 2 +- .../haikuwebkit/haikuwebkit-1.3.2.recipe | 2 +- .../patches/haikuwebkit-1.3.0.patchset | 29 + .../patches/haikuwebkit-1.3.1.patchset | 29 + haiku-libs/libprefs/libprefs-1.2.5.recipe | 2 +- .../{libprefs.patch => libprefs-1.2.5.patch} | 0 media-libs/libdvdnav/libdvdnav-4.2.1.recipe | 2 +- sys-devel/llvm/llvm-3.4.1.recipe | 2 +- sys-devel/llvm/patches/llvm-3.4.1.patchset | 25 + 20 files changed, 1259 insertions(+), 34 deletions(-) create mode 100644 dev-lang/perl/patches/perl-5.18.2.patchset create mode 100644 dev-lang/ruby/patches/ruby-1.9.3.patchset rename dev-util/scons/patches/{scons-2.2.0.patch => scons-2.3.1.patchset} (54%) create mode 100644 dev-vcs/mercurial/patches/mercurial-2.9.1.patch create mode 100644 dev-vcs/mercurial/patches/mercurial-2.9.2.patch create mode 100644 haiku-libs/haikuwebkit/patches/haikuwebkit-1.3.0.patchset create mode 100644 haiku-libs/haikuwebkit/patches/haikuwebkit-1.3.1.patchset rename haiku-libs/libprefs/patches/{libprefs.patch => libprefs-1.2.5.patch} (100%) create mode 100644 sys-devel/llvm/patches/llvm-3.4.1.patchset diff --git a/dev-lang/perl/patches/perl-5.18.2.patchset b/dev-lang/perl/patches/perl-5.18.2.patchset new file mode 100644 index 000000000..6db252c67 --- /dev/null +++ b/dev-lang/perl/patches/perl-5.18.2.patchset @@ -0,0 +1,546 @@ +From 4bef2ada1d8a38b4dff88f0659a3b9e181bf1950 Mon Sep 17 00:00:00 2001 +From: Oliver Tappe +Date: Sun, 22 Sep 2013 14:52:03 +0200 +Subject: Tell perl that BFS has a link count of 1 + + +diff --git a/cpan/File-Temp/lib/File/Temp.pm b/cpan/File-Temp/lib/File/Temp.pm +index ac57c26..759690c 100644 +--- a/cpan/File-Temp/lib/File/Temp.pm ++++ b/cpan/File-Temp/lib/File/Temp.pm +@@ -2051,7 +2051,8 @@ sub unlink0 { + # On NFS the link count may still be 1 but we can't know that + # we are on NFS. Since we can't be sure, we'll defer it + +- return 1 if $fh[3] == 0 || $^O eq 'cygwin'; ++ # On haiku, the link count seems to be always 1 (at least for BFS) ++ return 1 if $fh[3] == 0 || $^O eq 'cygwin' || $^O eq 'haiku'; + } + # fall-through if we can't unlink now + _deferred_unlink($fh, $path, 0); +-- +1.8.3.4 + + +From e54a8f98abfea2be3eec53b4bbe2cbaaf9f39139 Mon Sep 17 00:00:00 2001 +From: Oliver Tappe +Date: Sun, 22 Sep 2013 14:52:53 +0200 +Subject: Haiku defines, but does not implement O_EXLOCK + + +diff --git a/cpan/File-Temp/t/lock.t b/cpan/File-Temp/t/lock.t +index ff8c7f9..4364bf6 100644 +--- a/cpan/File-Temp/t/lock.t ++++ b/cpan/File-Temp/t/lock.t +@@ -8,7 +8,8 @@ use Fcntl; + BEGIN { + # see if we have O_EXLOCK + eval { &Fcntl::O_EXLOCK; }; +- if ($@) { ++ if ($@ || $^O eq 'haiku') { ++ # haiku doesn't implement O_EXLOCK yet (but it defines the value) + plan skip_all => 'Do not seem to have O_EXLOCK'; + } else { + plan tests => 4; +-- +1.8.3.4 + + +From 30f81dcecdfb9c49ad8824314348cd23ef43ec0f Mon Sep 17 00:00:00 2001 +From: Oliver Tappe +Date: Sun, 22 Sep 2013 14:53:40 +0200 +Subject: haiku sets all its specifics via Configure + + +diff --git a/hints/haiku.sh b/hints/haiku.sh +index fa8ebe5..0f09f53 100644 +--- a/hints/haiku.sh ++++ b/hints/haiku.sh +@@ -1,44 +1 @@ +-# Haiku hints file +-# $Id$ +- +-case "$prefix" in +-'') prefix="/boot/common" ;; +-*) ;; # pass the user supplied value through +-esac +- +-libpth='/boot/home/config/lib /boot/common/lib /system/lib' +-usrinc='/boot/develop/headers/posix' +-locinc='/boot/home/config/include /boot/common/include /boot/develop/headers' +- +-libc='/system/lib/libroot.so' +-libs='-lnetwork' +- +-# Use Haiku's malloc() by default. +-case "$usemymalloc" in +-'') usemymalloc='n' ;; +-esac +- +-# Haiku generally supports hard links, but the default file system (BFS) +-# doesn't. So better avoid using hard links. +-d_link='undef' +-dont_use_nlink='define' +- +-# The array syserrlst[] is useless for the most part. +-# Large negative numbers really kind of suck in arrays. +-d_syserrlst='undef' +- +-# Haiku uses gcc. +-cc="gcc" +-ld='gcc' +- +-# The runtime loader library path variable is LIBRARY_PATH. +-case "$ldlibpthname" in +-'') ldlibpthname=LIBRARY_PATH ;; +-esac +- +-# as of alpha 4.1 (at the latest) some symbols are versioned, +-# confusing the nm lookup +-case "$usenm" in +-'') usenm='undef' ;; +-esac +- ++# haiku sets all its specifics via Configure +-- +1.8.3.4 + + +From 187343906d2ed78aa5e5b4b3a6cfb7ad199c726f Mon Sep 17 00:00:00 2001 +From: Oliver Tappe +Date: Sun, 22 Sep 2013 14:54:15 +0200 +Subject: Tell perl that Haiku needs haikuish.h installed as well + + +diff --git a/installperl b/installperl +index e64b1c3..8ae20cc 100755 +--- a/installperl ++++ b/installperl +@@ -379,6 +379,11 @@ elsif ($Is_Cygwin) { # On Cygwin symlink it to CORE to make Makefile happy + + # AIX needs perl.exp installed as well. + push(@corefiles,'perl.exp') if $^O eq 'aix'; ++ if ($^O eq 'haiku') { ++ # Haiku needs haikuish.h installed as well. ++ mkpath("$installarchlib/CORE/haiku", $opts{verbose}, 0777); ++ push(@corefiles,'haiku/haikuish.h'); ++ } + } + foreach my $file (@corefiles) { + # HP-UX (at least) needs to maintain execute permissions +-- +1.8.3.4 + + +From 936c1f0486788b814578ea469f4441d1755dac71 Mon Sep 17 00:00:00 2001 +From: Oliver Tappe +Date: Sun, 22 Sep 2013 14:55:13 +0200 +Subject: Fix handling of exit codes on Haiku + + +diff --git a/t/run/exit.t b/t/run/exit.t +index 02e57c6..e836410 100644 +--- a/t/run/exit.t ++++ b/t/run/exit.t +@@ -55,18 +55,18 @@ is( ${^CHILD_ERROR_NATIVE}, $native_success, 'Normal exit ${^CHILD_ERROR_NATIVE + if (!$vms_exit_mode) { + my $posix_ok = eval { require POSIX; }; + my $wait_macros_ok = defined &POSIX::WIFEXITED; +- eval { POSIX::WIFEXITED(${^CHILD_ERROR_NATIVE}) }; ++ eval { POSIX::WIFEXITED($?) }; + $wait_macros_ok = 0 if $@; + $exit = run('exit 42'); + is( $exit >> 8, 42, 'Non-zero exit' ); + is( $exit, $?, 'Non-zero exit $?' ); +- isnt( !${^CHILD_ERROR_NATIVE}, 0, 'Non-zero exit ${^CHILD_ERROR_NATIVE}' ); ++ isnt( ${^CHILD_ERROR_NATIVE}, 0, 'Non-zero exit ${^CHILD_ERROR_NATIVE}' ); + SKIP: { + skip("No POSIX", 3) unless $posix_ok; + skip("No POSIX wait macros", 3) unless $wait_macros_ok; +- ok(POSIX::WIFEXITED(${^CHILD_ERROR_NATIVE}), "WIFEXITED"); +- ok(!POSIX::WIFSIGNALED(${^CHILD_ERROR_NATIVE}), "WIFSIGNALED"); +- is(POSIX::WEXITSTATUS(${^CHILD_ERROR_NATIVE}), 42, "WEXITSTATUS"); ++ ok(POSIX::WIFEXITED($?), "WIFEXITED"); ++ ok(!POSIX::WIFSIGNALED($?), "WIFSIGNALED"); ++ is(POSIX::WEXITSTATUS($?), 42, "WEXITSTATUS"); + } + + SKIP: { +@@ -85,9 +85,9 @@ if (!$vms_exit_mode) { + SKIP: { + skip("No POSIX", 3) unless $posix_ok; + skip("No POSIX wait macros", 3) unless $wait_macros_ok; +- ok(!POSIX::WIFEXITED(${^CHILD_ERROR_NATIVE}), "WIFEXITED"); +- ok(POSIX::WIFSIGNALED(${^CHILD_ERROR_NATIVE}), "WIFSIGNALED"); +- is(POSIX::WTERMSIG(${^CHILD_ERROR_NATIVE}), 15, "WTERMSIG"); ++ ok(!POSIX::WIFEXITED($?), "WIFEXITED"); ++ ok(POSIX::WIFSIGNALED($?), "WIFSIGNALED"); ++ is(POSIX::WTERMSIG($?), 15, "WTERMSIG"); + } + } + +-- +1.8.3.4 + + +From c8c19c0e4b6493dd5122749ba0f0d7d8b1b89117 Mon Sep 17 00:00:00 2001 +From: Oliver Tappe +Date: Sun, 22 Sep 2013 15:00:44 +0200 +Subject: Fix include path of errno.h + + +diff --git a/ext/Errno/Errno_pm.PL b/ext/Errno/Errno_pm.PL +index b707911..7999ae4 100644 +--- a/ext/Errno/Errno_pm.PL ++++ b/ext/Errno/Errno_pm.PL +@@ -143,7 +143,7 @@ sub get_files { + $file{$linux_errno_h} = 1; + } elsif ($^O eq 'haiku') { + # hidden in a special place +- $file{'/boot/develop/headers/posix/errno.h'} = 1; ++ $file{'/boot/system/develop/headers/posix/errno.h'} = 1; + + } elsif ($^O eq 'vos') { + # avoid problem where cpp returns non-POSIX pathnames +-- +1.8.3.4 + + +From 46ed1ae1bc678bda0d0fe3efb589847798afab58 Mon Sep 17 00:00:00 2001 +From: Oliver Tappe +Date: Sat, 28 Sep 2013 13:46:42 +0200 +Subject: Adjust ExtUtils::MakeMaker for PM-Haiku. + +* MakeMaker-projects trying to install into 'site-perl' while specifying + PREFIX would end up using a wrong 'site-perl' prefix. +* Split MM_Haiku.pm off MM_BeOS.pm, implementing Haiku-specific overrides + for MakeMaker. + +diff --git a/cpan/ExtUtils-MakeMaker/MANIFEST b/cpan/ExtUtils-MakeMaker/MANIFEST +index 72feb7d..8eb81f3 100644 +--- a/cpan/ExtUtils-MakeMaker/MANIFEST ++++ b/cpan/ExtUtils-MakeMaker/MANIFEST +@@ -48,6 +48,7 @@ lib/ExtUtils/MM_BeOS.pm + lib/ExtUtils/MM_Cygwin.pm + lib/ExtUtils/MM_Darwin.pm + lib/ExtUtils/MM_DOS.pm ++lib/ExtUtils/MM_Haiku.pm + lib/ExtUtils/MM_MacOS.pm + lib/ExtUtils/MM_NW5.pm + lib/ExtUtils/MM_OS2.pm +diff --git a/cpan/ExtUtils-MakeMaker/NOTES b/cpan/ExtUtils-MakeMaker/NOTES +index cb29aec..bfa628c 100644 +--- a/cpan/ExtUtils-MakeMaker/NOTES ++++ b/cpan/ExtUtils-MakeMaker/NOTES +@@ -80,9 +80,9 @@ The MM_* hierarchy + + MM_Win95 MM_NW5 + \ / +-MM_BeOS MM_Cygwin MM_OS2 MM_VMS MM_Win32 MM_DOS MM_UWIN +- \ | | | / / / +- ------------------------------------------------ ++MM_BeOS MM_Cygwin MM_OS2 MM_VMS MM_Win32 MM_DOS MM_UWIN MM_Haiku ++ \ | | | / / / / ++ -------------------------------------------------------- + | | + MM_Unix | + | | +diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM.pm +index 26ed594..dfeea45 100644 +--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM.pm ++++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM.pm +@@ -59,7 +59,8 @@ if( $^O eq 'MSWin32' ) { + $Is{UWIN} = $^O =~ /^uwin(-nt)?$/; + $Is{Cygwin} = $^O eq 'cygwin'; + $Is{NW5} = $Config{osname} eq 'NetWare'; # intentional +-$Is{BeOS} = ($^O =~ /beos/i or $^O eq 'haiku'); ++$Is{BeOS} = $^O =~ /beos/i; ++$Is{Haiku} = $^O eq 'haiku'; + $Is{DOS} = $^O eq 'dos'; + if( $Is{NW5} ) { + $^O = 'NetWare'; +diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Haiku.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Haiku.pm +new file mode 100644 +index 0000000..81e5f99 +--- /dev/null ++++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Haiku.pm +@@ -0,0 +1,70 @@ ++package ExtUtils::MM_Haiku; ++ ++use strict; ++ ++=head1 NAME ++ ++ExtUtils::MM_Haiku - methods to override UN*X behaviour in ExtUtils::MakeMaker ++ ++=head1 SYNOPSIS ++ ++ use ExtUtils::MM_Haiku; # Done internally by ExtUtils::MakeMaker if needed ++ ++=head1 DESCRIPTION ++ ++See ExtUtils::MM_Unix for a documentation of the methods provided ++there. This package overrides the implementation of these methods, not ++the semantics. ++ ++=over 4 ++ ++=cut ++ ++use ExtUtils::MakeMaker::Config; ++use File::Spec; ++require ExtUtils::MM_Any; ++require ExtUtils::MM_Unix; ++ ++our @ISA = qw( ExtUtils::MM_Any ExtUtils::MM_Unix ); ++our $VERSION = '6.66'; ++ ++ ++=item os_flavor ++ ++Haiku is Haiku. ++ ++=cut ++ ++sub os_flavor { ++ return('Haiku'); ++} ++ ++=head3 init_INSTALL_from_PREFIX ++ ++ $mm->init_INSTALL_from_PREFIX; ++ ++=cut ++ ++sub init_INSTALL_from_PREFIX { ++ my $self = shift; ++ ++ # If a prefix has been given from outside, the default implementation ++ # will set PERLPREFIX, SITEPREFIX and VENDORPREFIX to identical values, ++ # but due to the way how Haiku's package management works, PERLPREFIX ++ # and VENDORPREFIX are not writable at all (as they're being populated ++ # from installed packages via package-fs). SITEPREFIX, however needs to ++ # be set to a path which can be written to (since site packages are ++ # expected to be installed "manually") - so we make sure it points ++ # to a 'non-packaged'-folder: ++ my $prefixGiven = $self->{PREFIX}; ++ $self->SUPER::init_INSTALL_from_PREFIX(); ++ if ($prefixGiven) { ++ $self->{SITEPREFIX} = '$(PREFIX)/non-packaged'; ++ } ++} ++ ++=back ++ ++1; ++__END__ ++ +-- +1.8.3.4 + + +From f9458e30c41213d315721183c9f10c3605812f57 Mon Sep 17 00:00:00 2001 +From: Oliver Tappe +Date: Tue, 8 Oct 2013 22:16:37 +0200 +Subject: Avoid using -rpath for dynamic modules. + + +diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Haiku.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Haiku.pm +index 81e5f99..25ace13 100644 +--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Haiku.pm ++++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Haiku.pm +@@ -65,6 +65,33 @@ sub init_INSTALL_from_PREFIX { + + =back + ++=head3 init_others ++ ++ $MM->init_others(); ++ ++Initializes the macro definitions having to do with compiling and ++linking used by tools_other() and places them in the $MM object. ++ ++If there is no description, its the same as the parameter to ++WriteMakefile() documented in ExtUtils::MakeMaker. ++ ++=cut ++ ++sub init_others { ++ my $self = shift; ++ ++ $self->SUPER::init_others(); ++ ++ # Don't use run-time paths for libraries required by dynamic ++ # modules on Haiku, as that wouldn't work should a library be moved ++ # (for instance because the package has been activated somewhere else). ++ $self->{LD_RUN_PATH} = ""; ++ ++ return; ++} ++ ++=back ++ + 1; + __END__ + +-- +1.8.3.4 + + +From 5d6dde9cb0022bdeee490b383ff1991eacc3b9cc Mon Sep 17 00:00:00 2001 +From: Oliver Tappe +Date: Tue, 8 Oct 2013 22:17:26 +0200 +Subject: Add script sitecustomize.pl for setting up @INC as we need it. + + +diff --git a/sitecustomize.pl b/sitecustomize.pl +new file mode 100644 +index 0000000..a321e51 +--- /dev/null ++++ b/sitecustomize.pl +@@ -0,0 +1,36 @@ ++#! perl ++ ++use Config; ++ ++# Remove all compiled-in paths referring to Perl's installation dir ++# and replace them with a static set of paths that implement the intended ++# searching order: ++my @ourINC = ( ++ "/boot/home/config/lib/perl5/$Config{version}/$Config{archname}", ++ "/boot/home/config/lib/perl5/$Config{version}", ++ "/boot/home/config/non-packaged/lib/perl5/site_perl/$Config{version}/$Config{archname}", ++ "/boot/home/config/non-packaged/lib/perl5/site_perl/$Config{version}", ++ "/boot/home/config/lib/perl5/vendor_perl/$Config{version}/$Config{archname}", ++ "/boot/home/config/lib/perl5/vendor_perl/$Config{version}", ++ "/boot/home/config/lib/perl5/vendor_perl", ++ "/boot/system/lib/perl5/$Config{version}/$Config{archname}", ++ "/boot/system/lib/perl5/$Config{version}", ++ "/boot/system/non-packaged/lib/perl5/site_perl/$Config{version}/$Config{archname}", ++ "/boot/system/non-packaged/lib/perl5/site_perl/$Config{version}", ++ "/boot/system/lib/perl5/vendor_perl/$Config{version}/$Config{archname}", ++ "/boot/system/lib/perl5/vendor_perl/$Config{version}", ++ "/boot/system/lib/perl5/vendor_perl", ++); ++my @newINC; ++my $removedPerlPaths; ++foreach my $inc (@INC) { ++ if ($inc =~ m[^/packages/perl-$Config{version}-\d+/.self/]o) { ++ if (! $removedPerlPaths) { ++ push @newINC, @ourINC; ++ $removedPerlPaths = 1; ++ } ++ next; ++ } ++ push @newINC, $inc; ++} ++@INC = @newINC; +-- +1.8.3.4 + + +From f33151a4535dd22acaae24d4b16da3115b6cef64 Mon Sep 17 00:00:00 2001 +From: Oliver Tappe +Date: Wed, 9 Oct 2013 20:29:38 +0200 +Subject: Fix initialization check for CPAN. + +* On Haiku, only the site-lib directories will ever be writable, + as the others read-only. This avoids CPAN asking for a way to + circumvent unwritable lib dirs. + +diff --git a/cpan/CPAN/lib/CPAN/FirstTime.pm b/cpan/CPAN/lib/CPAN/FirstTime.pm +index b099b04..55bf194 100644 +--- a/cpan/CPAN/lib/CPAN/FirstTime.pm ++++ b/cpan/CPAN/lib/CPAN/FirstTime.pm +@@ -2010,6 +2010,12 @@ sub _print_urllist { + } + + sub _can_write_to_libdirs { ++ if ($^O eq 'haiku') { ++ # on Haiku, the other dirs are never writable, as they are ++ # being populated by packagefs ++ return -w $Config{installsitelib} ++ && -w $Config{installsitearch} ++ } + return -w $Config{installprivlib} + && -w $Config{installarchlib} + && -w $Config{installsitelib} +-- +1.8.3.4 + + +From 6fbbb6e99558e992f373cddd6ae02a3656ad7ce0 Mon Sep 17 00:00:00 2001 +From: Oliver Tappe +Date: Sun, 13 Oct 2013 17:32:50 +0200 +Subject: Add support for HAIKU_USE_VENDOR_DIRECTORIES. + +* Adjust MakeMaker to automatically switch to vendor directories if + requested via HAIKU_USE_VENDOR_DIRECTORIES. + +diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Haiku.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Haiku.pm +index 25ace13..0be8c3d 100644 +--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Haiku.pm ++++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Haiku.pm +@@ -29,21 +29,20 @@ our @ISA = qw( ExtUtils::MM_Any ExtUtils::MM_Unix ); + our $VERSION = '6.66'; + + +-=item os_flavor +- +-Haiku is Haiku. +- +-=cut +- + sub os_flavor { + return('Haiku'); + } + +-=head3 init_INSTALL_from_PREFIX ++sub init_main { ++ my $self = shift; + +- $mm->init_INSTALL_from_PREFIX; ++ # switch to vendor directories if requested. ++ if ($ENV{'HAIKU_USE_VENDOR_DIRECTORIES'}) { ++ $self->{INSTALLDIRS} ||= 'vendor'; ++ } + +-=cut ++ $self->SUPER::init_main(); ++} + + sub init_INSTALL_from_PREFIX { + my $self = shift; +@@ -63,20 +62,6 @@ sub init_INSTALL_from_PREFIX { + } + } + +-=back +- +-=head3 init_others +- +- $MM->init_others(); +- +-Initializes the macro definitions having to do with compiling and +-linking used by tools_other() and places them in the $MM object. +- +-If there is no description, its the same as the parameter to +-WriteMakefile() documented in ExtUtils::MakeMaker. +- +-=cut +- + sub init_others { + my $self = shift; + +@@ -90,8 +75,6 @@ sub init_others { + return; + } + +-=back +- + 1; + __END__ + +-- +1.8.3.4 + diff --git a/dev-lang/perl/perl-5.18.2.recipe b/dev-lang/perl/perl-5.18.2.recipe index 19c28d011..e819a8c0a 100644 --- a/dev-lang/perl/perl-5.18.2.recipe +++ b/dev-lang/perl/perl-5.18.2.recipe @@ -23,7 +23,7 @@ CHECKSUM_SHA256="7cbed5ef11900e8f68041215eea0de5e443d53393f84c41d5c9c69c150a4982 REVISION="2" ARCHITECTURES="x86_gcc2 x86 x86_64 arm" -PATCHES="perl-5.18.1.patchset" +PATCHES="perl-5.18.2.patchset" PROVIDES=" # assume that any perl commands are backwards compatible to version 5. diff --git a/dev-lang/ruby/patches/ruby-1.9.3.patchset b/dev-lang/ruby/patches/ruby-1.9.3.patchset new file mode 100644 index 000000000..d382648d4 --- /dev/null +++ b/dev-lang/ruby/patches/ruby-1.9.3.patchset @@ -0,0 +1,545 @@ +From 7bab20a22b69de3239de475cbc72a5c39864f43c Mon Sep 17 00:00:00 2001 +From: Chris Roberts +Date: Mon, 11 Nov 2013 19:00:01 -0700 +Subject: applying patch ruby-1.9.1.patch + + +diff --git a/configure.in b/configure.in +index c98a024..113d4e5 100644 +--- a/configure.in ++++ b/configure.in +@@ -1462,11 +1462,11 @@ if test "$with_dln_a_out" != yes; then + haiku*) case "$target_cpu" in + powerpc*) + : ${LDSHARED="ld -xms"} +- DLDFLAGS="$DLDFLAGS "'-export Init_$(TARGET) -lbe -lroot glue-noinit.a init_term_dyn.o start_dyn.o' ++ DLDFLAGS="$DLDFLAGS "'-export Init_$(TARGET) -lroot glue-noinit.a init_term_dyn.o start_dyn.o' + ;; + i586*) + : ${LDSHARED="ld -shared"} +- DLDFLAGS="$DLDFLAGS -L/boot/develop/lib/x86 -lbe -lroot" ++ DLDFLAGS="$DLDFLAGS -L/boot/system/develop/lib -lroot -L/boot/home/config/develop/lib" + ;; + esac + : ${LIBPATHENV=LIBRARY_PATH} +diff --git a/ext/nkf/nkf-utf8/nkf.h b/ext/nkf/nkf-utf8/nkf.h +index 0998837..814ceef 100644 +--- a/ext/nkf/nkf-utf8/nkf.h ++++ b/ext/nkf/nkf-utf8/nkf.h +@@ -164,6 +164,11 @@ void setbinmode(FILE *fp) + # ifndef HAVE_LOCALE_H + # define HAVE_LOCALE_H + # endif ++#elif defined(__HAIKU__) ++# undef HAVE_LANGINFO_H ++# ifndef HAVE_LOCALE_H ++# define HAVE_LOCALE_H ++# endif + #else + # ifndef HAVE_LANGINFO_H + # define HAVE_LANGINFO_H +diff --git a/ext/openssl/ossl.c b/ext/openssl/ossl.c +index a3b612b..d900ef3 100644 +--- a/ext/openssl/ossl.c ++++ b/ext/openssl/ossl.c +@@ -92,7 +92,7 @@ ossl_x509_ary2sk(VALUE ary) + + #define OSSL_IMPL_SK2ARY(name, type) \ + VALUE \ +-ossl_##name##_sk2ary(STACK *sk) \ ++ossl_##name##_sk2ary(STACK_OF(type) *sk) \ + { \ + type *t; \ + int i, num; \ +@@ -102,7 +102,7 @@ ossl_##name##_sk2ary(STACK *sk) \ + OSSL_Debug("empty sk!"); \ + return Qnil; \ + } \ +- num = sk_num(sk); \ ++ num = sk_##type##_num(sk); \ + if (num < 0) { \ + OSSL_Debug("items in sk < -1???"); \ + return rb_ary_new(); \ +@@ -110,7 +110,7 @@ ossl_##name##_sk2ary(STACK *sk) \ + ary = rb_ary_new2(num); \ + \ + for (i=0; i= 0x10000000L ++#define STACK _STACK ++#endif ++ ++/* + * String to HEXString conversion + */ + int string2hex(const unsigned char *, int, char **, int *); +diff --git a/ext/openssl/ossl_config.c b/ext/openssl/ossl_config.c +index bc5067f..5ec5b06 100644 +--- a/ext/openssl/ossl_config.c ++++ b/ext/openssl/ossl_config.c +@@ -1,5 +1,5 @@ + /* +- * $Id: ossl_config.c 18971 2008-08-31 03:36:09Z nobu $ ++ * $Id: ossl_config.c 27460 2010-04-23 14:28:56Z akr $ + * 'OpenSSL for Ruby' project + * Copyright (C) 2001-2002 Michal Rokos + * All rights reserved. +@@ -33,8 +33,8 @@ + VALUE cConfig; + VALUE eConfigError; + +-/* +- * Public ++/* ++ * Public + */ + + static CONF *parse_config(VALUE, CONF*); +@@ -154,7 +154,7 @@ ossl_config_initialize(int argc, VALUE *argv, VALUE self) + _CONF_new_data(conf); + } + #endif +- ++ + return self; + } + +@@ -187,11 +187,30 @@ ossl_config_add_value(VALUE self, VALUE section, VALUE name, VALUE value) + OPENSSL_free(cv); + ossl_raise(eConfigError, "_CONF_add_string failure"); + } +- ++ + return value; + #endif + } + ++static void ++rb_ossl_config_modify_check(VALUE config) ++{ ++ if (OBJ_FROZEN(config)) rb_error_frozen("OpenSSL::Config"); ++ if (!OBJ_UNTRUSTED(config) && rb_safe_level() >= 4) ++ rb_raise(rb_eSecurityError, "Insecure: can't modify OpenSSL config"); ++} ++ ++#if !defined(OSSL_NO_CONF_API) ++static VALUE ++ossl_config_add_value_m(VALUE self, VALUE section, VALUE name, VALUE value) ++{ ++ rb_ossl_config_modify_check(self); ++ return ossl_config_add_value(self, section, name, value); ++} ++#else ++#define ossl_config_add_value_m rb_f_notimplement ++#endif ++ + static VALUE + ossl_config_get_value(VALUE self, VALUE section, VALUE name) + { +@@ -214,7 +233,7 @@ static VALUE + ossl_config_get_value_old(int argc, VALUE *argv, VALUE self) + { + VALUE section, name; +- ++ + rb_scan_args(argc, argv, "11", §ion, &name); + + /* support conf.value(nil, "HOME") -> conf.get_value("", "HOME") */ +@@ -247,6 +266,7 @@ ossl_config_set_section(VALUE self, VALUE section, VALUE hash) + { + VALUE arg[2]; + ++ rb_ossl_config_modify_check(self); + arg[0] = self; + arg[1] = section; + rb_block_call(hash, rb_intern("each"), 0, 0, set_conf_section_i, (VALUE)arg); +@@ -278,7 +298,7 @@ ossl_config_get_section(VALUE self, VALUE section) + return hash; + } + for (i=0; iname), rb_str_new2(entry->value)); + } + +@@ -292,15 +312,16 @@ ossl_config_get_section_old(VALUE self, VALUE section) + return ossl_config_get_section(self, section); + } + +-#ifdef IMPLEMENT_LHASH_DOALL_ARG_FN ++#if defined(IMPLEMENT_LHASH_DOALL_ARG_FN) && defined(LHASH_OF) + static void +-get_conf_section(CONF_VALUE *cv, VALUE ary) ++get_conf_section_doall_arg(CONF_VALUE *cv, void *tmp) + { ++ VALUE ary = (VALUE)tmp; + if(cv->name) return; + rb_ary_push(ary, rb_str_new2(cv->section)); + } + +-static IMPLEMENT_LHASH_DOALL_ARG_FN(get_conf_section, CONF_VALUE*, VALUE); ++static IMPLEMENT_LHASH_DOALL_ARG_FN(get_conf_section, CONF_VALUE, void) + + static VALUE + ossl_config_get_sections(VALUE self) +@@ -310,14 +331,16 @@ ossl_config_get_sections(VALUE self) + + GetConfig(self, conf); + ary = rb_ary_new(); +- lh_doall_arg(conf->data, LHASH_DOALL_ARG_FN(get_conf_section), (void*)ary); ++ lh_doall_arg((_LHASH *)conf->data, LHASH_DOALL_ARG_FN(get_conf_section), ++ (void*)ary); + + return ary; + } + + static void +-dump_conf_value(CONF_VALUE *cv, VALUE str) ++dump_conf_value_doall_arg(CONF_VALUE *cv, void *tmp) + { ++ VALUE str = (VALUE)tmp; + STACK_OF(CONF_VALUE) *sk; + CONF_VALUE *v; + int i, num; +@@ -338,7 +361,7 @@ dump_conf_value(CONF_VALUE *cv, VALUE str) + rb_str_cat2(str, "\n"); + } + +-static IMPLEMENT_LHASH_DOALL_ARG_FN(dump_conf_value, CONF_VALUE*, VALUE); ++static IMPLEMENT_LHASH_DOALL_ARG_FN(dump_conf_value, CONF_VALUE, void) + + static VALUE + dump_conf(CONF *conf) +@@ -346,7 +369,8 @@ dump_conf(CONF *conf) + VALUE str; + + str = rb_str_new(0, 0); +- lh_doall_arg(conf->data, LHASH_DOALL_ARG_FN(dump_conf_value), (void*)str); ++ lh_doall_arg((_LHASH *)conf->data, LHASH_DOALL_ARG_FN(dump_conf_value), ++ (void*)str); + + return str; + } +@@ -362,7 +386,7 @@ ossl_config_to_s(VALUE self) + } + + static void +-each_conf_value(CONF_VALUE *cv, void* dummy) ++each_conf_value_doall_arg(CONF_VALUE *cv, void *dummy) + { + STACK_OF(CONF_VALUE) *sk; + CONF_VALUE *v; +@@ -382,7 +406,7 @@ each_conf_value(CONF_VALUE *cv, void* dummy) + } + } + +-static IMPLEMENT_LHASH_DOALL_ARG_FN(each_conf_value, CONF_VALUE*, void*); ++static IMPLEMENT_LHASH_DOALL_ARG_FN(each_conf_value, CONF_VALUE, void *) + + static VALUE + ossl_config_each(VALUE self) +@@ -392,7 +416,8 @@ ossl_config_each(VALUE self) + RETURN_ENUMERATOR(self, 0, 0); + + GetConfig(self, conf); +- lh_doall_arg(conf->data, LHASH_DOALL_ARG_FN(each_conf_value), (void*)NULL); ++ lh_doall_arg((_LHASH *)conf->data, LHASH_DOALL_ARG_FN(each_conf_value), ++ (void*)NULL); + + return self; + } +@@ -456,7 +481,7 @@ Init_ossl_config() + rb_define_method(cConfig, "initialize", ossl_config_initialize, -1); + rb_define_method(cConfig, "get_value", ossl_config_get_value, 2); + rb_define_method(cConfig, "value", ossl_config_get_value_old, -1); +- rb_define_method(cConfig, "add_value", ossl_config_add_value, 3); ++ rb_define_method(cConfig, "add_value", ossl_config_add_value_m, 3); + rb_define_method(cConfig, "[]", ossl_config_get_section, 1); + rb_define_method(cConfig, "section", ossl_config_get_section_old, 1); + rb_define_method(cConfig, "[]=", ossl_config_set_section, 2); +diff --git a/ext/openssl/ossl_pkcs7.c b/ext/openssl/ossl_pkcs7.c +index f7cd156..644e91a 100644 +--- a/ext/openssl/ossl_pkcs7.c ++++ b/ext/openssl/ossl_pkcs7.c +@@ -572,12 +572,11 @@ ossl_pkcs7_add_certificate(VALUE self, VALUE cert) + return self; + } + +-static STACK * +-pkcs7_get_certs_or_crls(VALUE self, int want_certs) ++static STACK_OF(X509) * ++pkcs7_get_certs(VALUE self) + { + PKCS7 *pkcs7; + STACK_OF(X509) *certs; +- STACK_OF(X509_CRL) *crls; + int i; + + GetPKCS7(self, pkcs7); +@@ -585,17 +584,38 @@ pkcs7_get_certs_or_crls(VALUE self, int want_certs) + switch(i){ + case NID_pkcs7_signed: + certs = pkcs7->d.sign->cert; +- crls = pkcs7->d.sign->crl; + break; + case NID_pkcs7_signedAndEnveloped: + certs = pkcs7->d.signed_and_enveloped->cert; ++ break; ++ default: ++ certs = NULL; ++ } ++ ++ return certs; ++} ++ ++static STACK_OF(X509_CRL) * ++pkcs7_get_crls(VALUE self) ++{ ++ PKCS7 *pkcs7; ++ STACK_OF(X509_CRL) *crls; ++ int i; ++ ++ GetPKCS7(self, pkcs7); ++ i = OBJ_obj2nid(pkcs7->type); ++ switch(i){ ++ case NID_pkcs7_signed: ++ crls = pkcs7->d.sign->crl; ++ break; ++ case NID_pkcs7_signedAndEnveloped: + crls = pkcs7->d.signed_and_enveloped->crl; + break; + default: +- certs = crls = NULL; ++ crls = NULL; + } + +- return want_certs ? certs : crls; ++ return crls; + } + + static VALUE +@@ -610,7 +630,7 @@ ossl_pkcs7_set_certificates(VALUE self, VALUE ary) + STACK_OF(X509) *certs; + X509 *cert; + +- certs = pkcs7_get_certs_or_crls(self, 1); ++ certs = pkcs7_get_certs(self); + while((cert = sk_X509_pop(certs))) X509_free(cert); + rb_block_call(ary, rb_intern("each"), 0, 0, ossl_pkcs7_set_certs_i, self); + +@@ -620,7 +640,7 @@ ossl_pkcs7_set_certificates(VALUE self, VALUE ary) + static VALUE + ossl_pkcs7_get_certificates(VALUE self) + { +- return ossl_x509_sk2ary(pkcs7_get_certs_or_crls(self, 1)); ++ return ossl_x509_sk2ary(pkcs7_get_certs(self)); + } + + static VALUE +@@ -650,7 +670,7 @@ ossl_pkcs7_set_crls(VALUE self, VALUE ary) + STACK_OF(X509_CRL) *crls; + X509_CRL *crl; + +- crls = pkcs7_get_certs_or_crls(self, 0); ++ crls = pkcs7_get_crls(self); + while((crl = sk_X509_CRL_pop(crls))) X509_CRL_free(crl); + rb_block_call(ary, rb_intern("each"), 0, 0, ossl_pkcs7_set_crls_i, self); + +@@ -660,7 +680,7 @@ ossl_pkcs7_set_crls(VALUE self, VALUE ary) + static VALUE + ossl_pkcs7_get_crls(VALUE self) + { +- return ossl_x509crl_sk2ary(pkcs7_get_certs_or_crls(self, 0)); ++ return ossl_x509crl_sk2ary(pkcs7_get_crls(self)); + } + + static VALUE +diff --git a/ext/openssl/ossl_ssl.c b/ext/openssl/ossl_ssl.c +index c278edc..1167627 100644 +--- a/ext/openssl/ossl_ssl.c ++++ b/ext/openssl/ossl_ssl.c +@@ -1195,10 +1195,10 @@ ossl_ssl_get_peer_cert_chain(VALUE self) + } + chain = SSL_get_peer_cert_chain(ssl); + if(!chain) return Qnil; +- num = sk_num(chain); ++ num = sk_X509_num(chain); + ary = rb_ary_new2(num); + for (i = 0; i < num; i++){ +- cert = (X509*)sk_value(chain, i); ++ cert = sk_X509_value(chain, i); + rb_ary_push(ary, ossl_x509_new(cert)); + } + +diff --git a/ext/openssl/ossl_ssl_session.c b/ext/openssl/ossl_ssl_session.c +index b236e4d..4d0848f 100644 +--- a/ext/openssl/ossl_ssl_session.c ++++ b/ext/openssl/ossl_ssl_session.c +@@ -72,6 +72,16 @@ static VALUE ossl_ssl_session_initialize(VALUE self, VALUE arg1) + return self; + } + ++#if HAVE_SSL_SESSION_CMP == 0 ++int SSL_SESSION_cmp(const SSL_SESSION *a,const SSL_SESSION *b) ++{ ++ if (a->ssl_version != b->ssl_version || ++ a->session_id_length != b->session_id_length) ++ return 1; ++ return memcmp(a->session_id,b-> session_id, a->session_id_length); ++} ++#endif ++ + /* + * call-seq: + * session1 == session2 -> boolean +diff --git a/ext/openssl/ossl_x509attr.c b/ext/openssl/ossl_x509attr.c +index 248e02a..2634cd9 100644 +--- a/ext/openssl/ossl_x509attr.c ++++ b/ext/openssl/ossl_x509attr.c +@@ -218,8 +218,9 @@ ossl_x509attr_get_value(VALUE self) + ossl_str_adjust(str, p); + } + else{ +- length = i2d_ASN1_SET_OF_ASN1_TYPE(attr->value.set, NULL, +- i2d_ASN1_TYPE, V_ASN1_SET, V_ASN1_UNIVERSAL, 0); ++ length = i2d_ASN1_SET_OF_ASN1_TYPE(attr->value.set, ++ (unsigned char **) NULL, i2d_ASN1_TYPE, ++ V_ASN1_SET, V_ASN1_UNIVERSAL, 0); + str = rb_str_new(0, length); + p = (unsigned char *)RSTRING_PTR(str); + i2d_ASN1_SET_OF_ASN1_TYPE(attr->value.set, &p, +diff --git a/ext/openssl/ossl_x509crl.c b/ext/openssl/ossl_x509crl.c +index 3896b6e..c5123ae 100644 +--- a/ext/openssl/ossl_x509crl.c ++++ b/ext/openssl/ossl_x509crl.c +@@ -264,7 +264,7 @@ ossl_x509crl_get_revoked(VALUE self) + VALUE ary, revoked; + + GetX509CRL(self, crl); +- num = sk_X509_CRL_num(X509_CRL_get_REVOKED(crl)); ++ num = sk_X509_REVOKED_num(X509_CRL_get_REVOKED(crl)); + if (num < 0) { + OSSL_Debug("num < 0???"); + return rb_ary_new(); +@@ -272,7 +272,7 @@ ossl_x509crl_get_revoked(VALUE self) + ary = rb_ary_new2(num); + for(i=0; i +Date: Mon, 11 Nov 2013 20:00:13 -0700 +Subject: Use gcc for linking modules + + +diff --git a/configure.in b/configure.in +index 113d4e5..9bfbfb3 100644 +--- a/configure.in ++++ b/configure.in +@@ -1465,7 +1465,10 @@ if test "$with_dln_a_out" != yes; then + DLDFLAGS="$DLDFLAGS "'-export Init_$(TARGET) -lroot glue-noinit.a init_term_dyn.o start_dyn.o' + ;; + i586*) +- : ${LDSHARED="ld -shared"} ++ : ${LDSHARED="${CC} -shared"} ++ if test "$rb_cv_binary_elf" = yes; then ++ LDFLAGS="$LDFLAGS -Wl,-export-dynamic" ++ fi + DLDFLAGS="$DLDFLAGS -L/boot/system/develop/lib -lroot -L/boot/home/config/develop/lib" + ;; + esac +-- +1.8.3.4 + + +From c43e8e49d47f7778314d9a723f9430fa4686f7ba Mon Sep 17 00:00:00 2001 +From: Chris Roberts +Date: Mon, 11 Nov 2013 23:13:59 -0700 +Subject: Add soname flags for libruby.so + + +diff --git a/configure.in b/configure.in +index 9bfbfb3..611b586 100644 +--- a/configure.in ++++ b/configure.in +@@ -1777,6 +1777,10 @@ if test "$enable_shared" = 'yes'; then + ;; + esac + ;; ++ haiku*) ++ LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR)' ++ LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).so' ++ ;; + darwin*) + LIBRUBY_SO='lib$(RUBY_SO_NAME).$(MAJOR).$(MINOR).$(TEENY).dylib' + LIBRUBY_LDSHARED='cc -dynamiclib -undefined suppress -flat_namespace' +-- +1.8.3.4 + + +From c6983e184282d3ffbb88c095ff13d1913c18a3f8 Mon Sep 17 00:00:00 2001 +From: Rene Gollent +Date: Wed, 18 Dec 2013 21:52:24 -0500 +Subject: Add case for x86_64. + + +diff --git a/configure.in b/configure.in +index 611b586..01f0bb0 100644 +--- a/configure.in ++++ b/configure.in +@@ -1464,7 +1464,7 @@ if test "$with_dln_a_out" != yes; then + : ${LDSHARED="ld -xms"} + DLDFLAGS="$DLDFLAGS "'-export Init_$(TARGET) -lroot glue-noinit.a init_term_dyn.o start_dyn.o' + ;; +- i586*) ++ i586*|x86_64*) + : ${LDSHARED="${CC} -shared"} + if test "$rb_cv_binary_elf" = yes; then + LDFLAGS="$LDFLAGS -Wl,-export-dynamic" +-- +1.8.3.4 + diff --git a/dev-lang/ruby/ruby-1.9.3.recipe b/dev-lang/ruby/ruby-1.9.3.recipe index b676700a0..8c9fd8a13 100644 --- a/dev-lang/ruby/ruby-1.9.3.recipe +++ b/dev-lang/ruby/ruby-1.9.3.recipe @@ -78,7 +78,7 @@ REQUIRES_devel=" SOURCE_DIR="ruby-1.9.3-p545" -PATCHES="ruby-1.9.1.patchset" +PATCHES="ruby-1.9.3.patchset" BUILD() { diff --git a/dev-util/scons/patches/scons-2.2.0.patch b/dev-util/scons/patches/scons-2.3.1.patchset similarity index 54% rename from dev-util/scons/patches/scons-2.2.0.patch rename to dev-util/scons/patches/scons-2.3.1.patchset index 15d06891d..1ecca99d2 100644 --- a/dev-util/scons/patches/scons-2.2.0.patch +++ b/dev-util/scons/patches/scons-2.3.1.patchset @@ -1,7 +1,14 @@ -diff -Naur ./scons-2.2.0/engine/SCons/Platform/__init__.py ./scons-2.2.0-haiku/engine/SCons/Platform/__init__.py ---- ./scons-2.2.0/engine/SCons/Platform/__init__.py 2012-08-05 15:38:31.009961472 +0000 -+++ ./scons-2.2.0-haiku/engine/SCons/Platform/__init__.py 2012-09-30 13:28:21.978583552 +0000 -@@ -78,6 +78,8 @@ +From 8f1968371d3426d08cba8dafa44eaaa0cb59b13f Mon Sep 17 00:00:00 2001 +From: Ingo Weinhold +Date: Fri, 9 Aug 2013 17:46:35 +0200 +Subject: Add support for the Haiku platform + + +diff --git a/engine/SCons/Platform/__init__.py b/engine/SCons/Platform/__init__.py +index 2cab3c8..373938d 100644 +--- a/engine/SCons/Platform/__init__.py ++++ b/engine/SCons/Platform/__init__.py +@@ -78,6 +78,8 @@ def platform_default(): return 'aix' elif sys.platform.find('darwin') != -1: return 'darwin' @@ -10,10 +17,12 @@ diff -Naur ./scons-2.2.0/engine/SCons/Platform/__init__.py ./scons-2.2.0-haiku/e else: return 'posix' elif os.name == 'os2': -diff -Naur ./scons-2.2.0/engine/SCons/Platform/haiku.py ./scons-2.2.0-haiku/engine/SCons/Platform/haiku.py ---- ./scons-2.2.0/engine/SCons/Platform/haiku.py 1970-01-01 00:00:00.000000000 +0000 -+++ ./scons-2.2.0-haiku/engine/SCons/Platform/haiku.py 2012-09-30 13:30:07.109051904 +0000 -@@ -0,0 +1,54 @@ +diff --git a/engine/SCons/Platform/haiku.py b/engine/SCons/Platform/haiku.py +new file mode 100644 +index 0000000..5c802dd +--- /dev/null ++++ b/engine/SCons/Platform/haiku.py +@@ -0,0 +1,69 @@ +"""SCons.Platform.haiku + +Platform-specific initialization for Haiku systems. @@ -48,23 +57,41 @@ diff -Naur ./scons-2.2.0/engine/SCons/Platform/haiku.py ./scons-2.2.0-haiku/engi + +__revision__ = "" + -+import posix +import commands ++import os ++import posix + -+def findDir( identifier ): -+ return commands.getoutput( 'finddir %s' % identifier ) ++def findDir(identifier): ++ return commands.getoutput('finddir %s' % identifier) + +def generate(env): + posix.generate(env) -+ -+ # path list -+ listPath = [ '.' ] -+ listPath.append( '%s/bin' % findDir( 'B_USER_CONFIG_DIRECTORY' ) ) -+ listPath.append( findDir( 'B_COMMON_BIN_DIRECTORY' ) ) -+ listPath.append( findDir( 'B_SYSTEM_BIN_DIRECTORY' ) ) -+ listPath.append( findDir( 'B_BEOS_BIN_DIRECTORY' ) ) -+ listPath.append( '%s/tools/gnupro/bin' % findDir( 'B_COMMON_DEVELOP_DIRECTORY' ) ) -+ env['ENV']['PATH'] = ':'.join( listPath ) -+ -+ # help the linker find the startfiles -+ env['ENV']['BELIBRARIES'] = ':%s/lib/x86' % findDir( 'B_COMMON_DEVELOP_DIRECTORY' ) ++ ++ # determine, if building for the secondary architecture ++ secondaryArch = os.environ.get('HAIKU_SECONDARY_ARCH') ++ archSubDir = '/' + secondaryArch if secondaryArch else '' ++ ++ # PATH ++ pathDescriptions = [ ++ ('B_USER_NONPACKAGED_BIN_DIRECTORY', None), ++ ('B_USER_CONFIG_DIRECTORY', 'bin'), ++ ('B_COMMON_NONPACKAGED_BIN_DIRECTORY', None), ++ ('B_COMMON_BIN_DIRECTORY', None), ++ ('B_SYSTEM_BIN_DIRECTORY', None) ++ ] ++ ++ paths = [] ++ for pathConstant, subDir in pathDescriptions: ++ path = findDir(pathConstant) ++ if subDir: ++ path += '/' + subDir ++ paths.append(path) ++ ++ if secondaryArch: ++ # prepend the secondary arch subdirectories ++ paths = [path + archSubDir for path in paths] + paths ++ ++ env['ENV']['PATH'] = ':'.join(paths) +-- +1.7.10.2 + diff --git a/dev-util/scons/scons-2.3.1.recipe b/dev-util/scons/scons-2.3.1.recipe index 34c143f5a..636281c94 100644 --- a/dev-util/scons/scons-2.3.1.recipe +++ b/dev-util/scons/scons-2.3.1.recipe @@ -14,7 +14,7 @@ CHECKSUM_SHA256="091ab468f8e6084c30f3ae9fd48828e3884021401cfef4b713d13161ba12020 REVISION="3" ARCHITECTURES="x86_gcc2 x86 x86_64" -PATCHES="scons-2.2.0.patchset" +PATCHES="scons-2.3.1.patchset" PROVIDES=" scons = $portVersion compat >= 2 diff --git a/dev-vcs/mercurial/mercurial-2.9.1.recipe b/dev-vcs/mercurial/mercurial-2.9.1.recipe index 09d14f259..0edd1c388 100644 --- a/dev-vcs/mercurial/mercurial-2.9.1.recipe +++ b/dev-vcs/mercurial/mercurial-2.9.1.recipe @@ -10,7 +10,7 @@ CHECKSUM_SHA256="a20fb1434ecbdb070ef955c7c292db9eb2676bfc1ac165e95ba73866623bc01 REVISION="1" ARCHITECTURES="x86_gcc2 x86 x86_64" -PATCHES="mercurial-2.8.1.patch" +PATCHES="mercurial-2.9.1.patch" PROVIDES=" mercurial = $portVersion compat >= 2 diff --git a/dev-vcs/mercurial/mercurial-2.9.2.recipe b/dev-vcs/mercurial/mercurial-2.9.2.recipe index 540756cd4..af343a973 100644 --- a/dev-vcs/mercurial/mercurial-2.9.2.recipe +++ b/dev-vcs/mercurial/mercurial-2.9.2.recipe @@ -10,7 +10,7 @@ CHECKSUM_SHA256="86462b3a1518e137cfe813dc273b8acb120ad71230a1813c0dc9335223b38f5 REVISION="1" ARCHITECTURES="x86_gcc2 x86 x86_64" -PATCHES="mercurial-2.8.1.patch" +PATCHES="mercurial-2.9.2.patch" PROVIDES=" mercurial = $portVersion compat >= 2 diff --git a/dev-vcs/mercurial/patches/mercurial-2.9.1.patch b/dev-vcs/mercurial/patches/mercurial-2.9.1.patch new file mode 100644 index 000000000..edfe44133 --- /dev/null +++ b/dev-vcs/mercurial/patches/mercurial-2.9.1.patch @@ -0,0 +1,12 @@ +diff -up mercurial-2.8.1/mercurial/ui.py.orig mercurial-2.8.1/mercurial/ui.py +--- mercurial-2.8.1/mercurial/ui.py.orig 2012-06-01 22:48:21.025690112 -0600 ++++ mercurial-2.8.1/mercurial/ui.py 2012-06-04 17:15:16.317980672 -0600 +@@ -693,7 +693,7 @@ class ui(object): + # avoid confusion. + editor = 'E' + else: +- editor = 'vi' ++ editor = 'nano' + return (os.environ.get("HGEDITOR") or + self.config("ui", "editor") or + os.environ.get("VISUAL") or diff --git a/dev-vcs/mercurial/patches/mercurial-2.9.2.patch b/dev-vcs/mercurial/patches/mercurial-2.9.2.patch new file mode 100644 index 000000000..edfe44133 --- /dev/null +++ b/dev-vcs/mercurial/patches/mercurial-2.9.2.patch @@ -0,0 +1,12 @@ +diff -up mercurial-2.8.1/mercurial/ui.py.orig mercurial-2.8.1/mercurial/ui.py +--- mercurial-2.8.1/mercurial/ui.py.orig 2012-06-01 22:48:21.025690112 -0600 ++++ mercurial-2.8.1/mercurial/ui.py 2012-06-04 17:15:16.317980672 -0600 +@@ -693,7 +693,7 @@ class ui(object): + # avoid confusion. + editor = 'E' + else: +- editor = 'vi' ++ editor = 'nano' + return (os.environ.get("HGEDITOR") or + self.config("ui", "editor") or + os.environ.get("VISUAL") or diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.3.0.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.3.0.recipe index cd1262412..39d1fb7ff 100644 --- a/haiku-libs/haikuwebkit/haikuwebkit-1.3.0.recipe +++ b/haiku-libs/haikuwebkit/haikuwebkit-1.3.0.recipe @@ -26,7 +26,7 @@ SECONDARY_ARCHITECTURES="x86" if [ $effectiveTargetArchitecture == x86_64 ]; then - PATCHES="haikuwebkit-1.2.5.patchset" + PATCHES="haikuwebkit-1.3.0.patchset" fi PROVIDES=" diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.3.1.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.3.1.recipe index 8f4f94b61..aa53e9a76 100644 --- a/haiku-libs/haikuwebkit/haikuwebkit-1.3.1.recipe +++ b/haiku-libs/haikuwebkit/haikuwebkit-1.3.1.recipe @@ -26,7 +26,7 @@ SECONDARY_ARCHITECTURES="x86" if [ $effectiveTargetArchitecture == x86_64 ]; then - PATCHES="haikuwebkit-1.2.5.patchset" + PATCHES="haikuwebkit-1.3.1.patchset" fi PROVIDES=" diff --git a/haiku-libs/haikuwebkit/haikuwebkit-1.3.2.recipe b/haiku-libs/haikuwebkit/haikuwebkit-1.3.2.recipe index 822a935cf..a726061eb 100644 --- a/haiku-libs/haikuwebkit/haikuwebkit-1.3.2.recipe +++ b/haiku-libs/haikuwebkit/haikuwebkit-1.3.2.recipe @@ -26,7 +26,7 @@ SECONDARY_ARCHITECTURES="x86" if [ $effectiveTargetArchitecture == x86_64 ]; then - PATCHES="haikuwebkit-1.2.5.patchset" + PATCHES="haikuwebkit-1.3.2.patchset" fi PROVIDES=" diff --git a/haiku-libs/haikuwebkit/patches/haikuwebkit-1.3.0.patchset b/haiku-libs/haikuwebkit/patches/haikuwebkit-1.3.0.patchset new file mode 100644 index 000000000..d4c97a1f8 --- /dev/null +++ b/haiku-libs/haikuwebkit/patches/haikuwebkit-1.3.0.patchset @@ -0,0 +1,29 @@ +From 77b90ebb44229f5e920e95d517cd153c5c3c0ce8 Mon Sep 17 00:00:00 2001 +From: Jonathan Schleifer +Date: Wed, 19 Mar 2014 00:52:39 +0100 +Subject: [PATCH] Fix compilation on x86_64 + +--- + Source/JavaScriptCore/offlineasm/asm.rb | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/Source/JavaScriptCore/offlineasm/asm.rb b/Source/JavaScriptCore/offlineasm/asm.rb +index 8fe6228..0f5849c 100644 +--- a/Source/JavaScriptCore/offlineasm/asm.rb ++++ b/Source/JavaScriptCore/offlineasm/asm.rb +@@ -209,7 +209,11 @@ class Assembler + + def self.labelReference(labelName) + if !$emitWinAsm +- "\" LOCAL_REFERENCE(#{labelName}) \"" ++ if labelName == 'llint_throw_from_slow_path_trampoline' ++ "\" GLOBAL_REFERENCE(#{labelName}) \"" ++ else ++ "\" LOCAL_REFERENCE(#{labelName}) \"" ++ end + else + "#{labelName}" + end +-- +Jonathan + diff --git a/haiku-libs/haikuwebkit/patches/haikuwebkit-1.3.1.patchset b/haiku-libs/haikuwebkit/patches/haikuwebkit-1.3.1.patchset new file mode 100644 index 000000000..d4c97a1f8 --- /dev/null +++ b/haiku-libs/haikuwebkit/patches/haikuwebkit-1.3.1.patchset @@ -0,0 +1,29 @@ +From 77b90ebb44229f5e920e95d517cd153c5c3c0ce8 Mon Sep 17 00:00:00 2001 +From: Jonathan Schleifer +Date: Wed, 19 Mar 2014 00:52:39 +0100 +Subject: [PATCH] Fix compilation on x86_64 + +--- + Source/JavaScriptCore/offlineasm/asm.rb | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/Source/JavaScriptCore/offlineasm/asm.rb b/Source/JavaScriptCore/offlineasm/asm.rb +index 8fe6228..0f5849c 100644 +--- a/Source/JavaScriptCore/offlineasm/asm.rb ++++ b/Source/JavaScriptCore/offlineasm/asm.rb +@@ -209,7 +209,11 @@ class Assembler + + def self.labelReference(labelName) + if !$emitWinAsm +- "\" LOCAL_REFERENCE(#{labelName}) \"" ++ if labelName == 'llint_throw_from_slow_path_trampoline' ++ "\" GLOBAL_REFERENCE(#{labelName}) \"" ++ else ++ "\" LOCAL_REFERENCE(#{labelName}) \"" ++ end + else + "#{labelName}" + end +-- +Jonathan + diff --git a/haiku-libs/libprefs/libprefs-1.2.5.recipe b/haiku-libs/libprefs/libprefs-1.2.5.recipe index d6306bfb8..caca21844 100644 --- a/haiku-libs/libprefs/libprefs-1.2.5.recipe +++ b/haiku-libs/libprefs/libprefs-1.2.5.recipe @@ -33,7 +33,7 @@ BUILD_PREREQUIRES=" SOURCE_DIR="libprefs125" -PATCHES="libprefs.patch" +PATCHES="libprefs-1.2.5.patch" BUILD() { diff --git a/haiku-libs/libprefs/patches/libprefs.patch b/haiku-libs/libprefs/patches/libprefs-1.2.5.patch similarity index 100% rename from haiku-libs/libprefs/patches/libprefs.patch rename to haiku-libs/libprefs/patches/libprefs-1.2.5.patch diff --git a/media-libs/libdvdnav/libdvdnav-4.2.1.recipe b/media-libs/libdvdnav/libdvdnav-4.2.1.recipe index 3b139d378..83dd97331 100644 --- a/media-libs/libdvdnav/libdvdnav-4.2.1.recipe +++ b/media-libs/libdvdnav/libdvdnav-4.2.1.recipe @@ -14,7 +14,7 @@ REVISION="1" ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 ?x86" -PATCHES="libdvdnav-4.2.0.patch" +PATCHES="libdvdnav-4.2.1.patch" PROVIDES=" libdvdnav${secondaryArchSuffix} = $portVersion diff --git a/sys-devel/llvm/llvm-3.4.1.recipe b/sys-devel/llvm/llvm-3.4.1.recipe index fedd4c33b..d8610eef2 100644 --- a/sys-devel/llvm/llvm-3.4.1.recipe +++ b/sys-devel/llvm/llvm-3.4.1.recipe @@ -70,7 +70,7 @@ BUILD_PREREQUIRES=" cmd:grep " -PATCHES="llvm-3.4.patchset" +PATCHES="llvm-3.4.1.patchset" SOURCE_DIR="$portVersionedName.src" diff --git a/sys-devel/llvm/patches/llvm-3.4.1.patchset b/sys-devel/llvm/patches/llvm-3.4.1.patchset new file mode 100644 index 000000000..9f14d94d8 --- /dev/null +++ b/sys-devel/llvm/patches/llvm-3.4.1.patchset @@ -0,0 +1,25 @@ +From 744634aa845c403f5a39b8257bbacd36dc1dd351 Mon Sep 17 00:00:00 2001 +From: Alexander von Gluck IV +Date: Wed, 22 Jan 2014 05:04:31 +0000 +Subject: [PATCH] haiku: fix Host.h for endian.h + +--- + include/llvm/Support/Host.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/llvm/Support/Host.h b/include/llvm/Support/Host.h +index 28c4cc7..ab985a4 100644 +--- a/include/llvm/Support/Host.h ++++ b/include/llvm/Support/Host.h +@@ -16,7 +16,7 @@ + + #include "llvm/ADT/StringMap.h" + +-#if defined(__linux__) || defined(__GNU__) ++#if defined(__linux__) || defined(__GNU__) || defined(__HAIKU__) + #include + #else + #if !defined(BYTE_ORDER) && !defined(LLVM_ON_WIN32) +-- +1.8.3.4 + From 8d414241d1912e12e37e43437d8479709ca6be01 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Fri, 13 Jun 2014 16:01:04 +0000 Subject: [PATCH 09/27] libmetalink: added recipe for version 0.1.2 --- .../libmetalink/libmetalink-0.1.2.recipe | 77 +++++++++++++++++++ .../patches/libmetalink-0.1.2.patchset | 31 ++++++++ 2 files changed, 108 insertions(+) create mode 100644 media-libs/libmetalink/libmetalink-0.1.2.recipe create mode 100644 media-libs/libmetalink/patches/libmetalink-0.1.2.patchset diff --git a/media-libs/libmetalink/libmetalink-0.1.2.recipe b/media-libs/libmetalink/libmetalink-0.1.2.recipe new file mode 100644 index 000000000..1ab81bc98 --- /dev/null +++ b/media-libs/libmetalink/libmetalink-0.1.2.recipe @@ -0,0 +1,77 @@ +SUMMARY="A library to read Metalink files." +DESCRIPTION=" +Libmetalink is a library to read Metalink XML download description \ +format. It supports Metalink version 3 and Metalink version 4 (RFC \ +5854). +" +HOMEPAGE="http://launchpad.net/libmetalink" +COPYRIGHT=" + 2008 Tatsuhiro Tsujikawa + " +LICENSE="MIT" +SRC_URI="https://launchpad.net/libmetalink/trunk/packagingfix/+download/libmetalink-$portVersion.tar.bz2" +CHECKSUM_SHA256="cbed9121bf550ef14a434d6ed3d8806ded7a339db16b698cfa2f39fdc3d48bf6" +REVISION="1" +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +PATCHES="libmetalink-$portVersion.patchset" + +PROVIDES=" + libmetalink$secondaryArchSuffix = $portVersion compat >= 0 + lib:libmetalink$secondaryArchSuffix = 3.0.0 compat >= 3 + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libexpat$secondaryArchSuffix + " +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:libexpat$secondaryArchSuffix + devel:libxml2$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:libtoolize + cmd:make + cmd:find + cmd:pkg_config + " + +BUILD() +{ + libtoolize --force --copy --install + aclocal + autoconf + automake --add-missing + runConfigure ./configure --disable-dependency-tracking \ + --without-libxml2 + make $jobArgs +} + +INSTALL() +{ + make install + + prepareInstalledDevelLibs libmetalink + fixPkgconfig + + # devel package + packageEntries devel \ + $developDir \ + $manDir/man3 +} + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + libmetalink${secondaryArchSuffix}_devel = $portVersion compat >= 0 + devel:libmetalink$secondaryArchSuffix = 3.0.0 compat >= 3 + " +REQUIRES_devel=" + libmetalink$secondaryArchSuffix == $portVersion base + " diff --git a/media-libs/libmetalink/patches/libmetalink-0.1.2.patchset b/media-libs/libmetalink/patches/libmetalink-0.1.2.patchset new file mode 100644 index 000000000..bc946ba29 --- /dev/null +++ b/media-libs/libmetalink/patches/libmetalink-0.1.2.patchset @@ -0,0 +1,31 @@ +From d04fd063299d5bb51ad4f1a84aa00beab5ed1170 Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Fri, 13 Jun 2014 14:18:29 +0000 +Subject: haiku patch + + +diff --git a/configure.ac b/configure.ac +index 1d2e686..1643fe5 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -78,7 +78,7 @@ AC_SUBST([NUMBER_VERSION], `printf "0x%02x%02x%02x" $MAJOR_VERSION $MINOR_VERSIO + # Checks for libraries. + + if test "x$with_libexpat" = "xyes"; then +- AM_PATH_LIBEXPAT ++ PKG_CHECK_MODULES([EXPAT],[expat],[have_libexpat=yes]) + fi + + if test "x$with_libxml2" = "xyes" && test "x$have_libexpat" != "xyes"; then +@@ -185,7 +185,7 @@ AC_MSG_NOTICE([summary of build options: + CPPFLAGS: ${CPPFLAGS} + C preprocessor: ${CPP} + Library types: Shared=${enable_shared}, Static=${enable_static} +- Libexpat: ${have_libexpat} ${EXPAT_CFLAGS} ${EXPAT_LIBS} ++ Libexpat: ${have_expat} ${EXPAT_CFLAGS} ${EXPAT_LIBS} + Libxml2: ${have_libxml2} ${XML_CPPFLAGS} ${XML_LIBS} + CUnit: ${have_cunit} ${CUNIT_CFLAGS} ${CUNIT_LIBS} + ]) +-- +1.8.3.4 + From d4beae7da365bc4c3ea7950166c627868bc02525 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Fri, 13 Jun 2014 16:01:45 +0000 Subject: [PATCH 10/27] expat: added recipe for version 2.1.0 --- dev-libs/expat/expat-2.1.0.recipe | 86 +++++++++++++++++++++++++++++++ 1 file changed, 86 insertions(+) create mode 100644 dev-libs/expat/expat-2.1.0.recipe diff --git a/dev-libs/expat/expat-2.1.0.recipe b/dev-libs/expat/expat-2.1.0.recipe new file mode 100644 index 000000000..7d9aa0431 --- /dev/null +++ b/dev-libs/expat/expat-2.1.0.recipe @@ -0,0 +1,86 @@ +SUMMARY="XML parser toolkit" +DESCRIPTION=" +Expat is an XML parser library written in C. It is a stream-oriented parser in \ +which an application registers handlers for things the parser might find in \ +the XML document (like start tags). +" +HOMEPAGE="http://expat.sourceforge.net/" +COPYRIGHT=" + 1998-2000 Thai Open Source Software Center Ltd and Clark Cooper + 2001-2006 Expat maintainers. + " +LICENSE="MIT" +SRC_URI="http://sourceforge.net/projects/expat/files/expat/$portVersion/expat-$portVersion.tar.gz" +CHECKSUM_SHA256="823705472f816df21c8f6aa026dd162b280806838bb55b3432b0fb1fcca7eb86" +REVISION="1" +ARCHITECTURES="x86_gcc2 x86 x86_64 arm" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +PROVIDES=" + expat$secondaryArchSuffix = $portVersion compat >= 2.1 + lib:libexpat$secondaryArchSuffix = 1.6.0 compat >= 1 + " +if [ -z "$secondaryArchSuffix" ]; then + PROVIDES="$PROVIDES + cmd:xmlwf = $portVersion compat >= 2.1 + " +fi + +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + " +BUILD_REQUIRES=" + " +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + cmd:aclocal + cmd:autoconf + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:libtoolize + cmd:make + " + +PATCH() +{ + echo "AC_CONFIG_MACRO_DIR([m4])" >> configure.in + echo "ACLOCAL_AMFLAGS = -I m4" >> Makefile.am +} + +BUILD() +{ + rm -f conftools/libtool.m4 + libtoolize --force --copy --install + aclocal -I conftools -I m4 + autoconf + runConfigure ./configure + make $jobArgs +} + +INSTALL() +{ + make install + + # remove command for secondary architecture + if [ -n "$secondaryArchSuffix" ]; then + rm -rf $binDir + fi + + # prepare develop/lib + prepareInstalledDevelLibs libexpat + fixPkgconfig + + # devel package + packageEntries devel \ + $developDir +} + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + expat${secondaryArchSuffix}_devel = $portVersion + devel:libexpat${secondaryArchSuffix} = 1.6.0 compat >= 1 + " +REQUIRES_devel=" + expat${secondaryArchSuffix} == $portVersion base + " From 3ae39d83f73efe89bb20a4c12b77627a0f229548 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Fri, 13 Jun 2014 16:06:47 +0000 Subject: [PATCH 11/27] libquicktime: fixed build --- .../libquicktime/libquicktime-1.2.4.recipe | 28 +++++++++++++++---- .../patches/libquicktime-1.2.4.patchset | 19 +++++++++++-- 2 files changed, 39 insertions(+), 8 deletions(-) diff --git a/media-libs/libquicktime/libquicktime-1.2.4.recipe b/media-libs/libquicktime/libquicktime-1.2.4.recipe index a4b72dcfe..8d2bfed39 100644 --- a/media-libs/libquicktime/libquicktime-1.2.4.recipe +++ b/media-libs/libquicktime/libquicktime-1.2.4.recipe @@ -33,8 +33,8 @@ LICENSE="GNU LGPL v2.1" SRC_URI="http://sourceforge.net/projects/libquicktime/files/libquicktime/$portVersion/libquicktime-$portVersion.tar.gz" CHECKSUM_SHA256="1c53359c33b31347b4d7b00d3611463fe5e942cae3ec0fefe0d2fd413fd47368" REVISION="1" -ARCHITECTURES="?x86_gcc2 x86 ?x86_64" -SECONDARY_ARCHITECTURES="?x86_gcc2 x86" +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" PATCHES="libquicktime-$portVersion.patchset" @@ -42,6 +42,19 @@ PROVIDES=" libquicktime$secondaryArchSuffix = $portVersion compat >= 1.2 lib:libquicktime$secondaryArchSuffix = 0.0.0 compat >= 0 " +if [ -z "$secondaryArchSuffix" ]; then + PROVIDES="$PROVIDES + cmd:lqt_transcode + cmd:lqtremux + cmd:qt2text + cmd:qtdechunk + cmd:qtdump + cmd:qtinfo + cmd:qtrechunk + cmd:qtstreamize + cmd:qtyuv4toyuv + " +fi REQUIRES=" haiku$secondaryArchSuffix >= $haikuVersion lib:libpng15$secondaryArchSuffix @@ -53,6 +66,7 @@ REQUIRES=" lib:libfaad$secondaryArchSuffix lib:libiconv$secondaryArchSuffix lib:libz$secondaryArchSuffix + lib:libintl$secondaryArchSuffix " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel >= $haikuVersion @@ -65,6 +79,7 @@ BUILD_REQUIRES=" devel:libfaad$secondaryArchSuffix devel:libiconv$secondaryArchSuffix devel:libz$secondaryArchSuffix + devel:libintl$secondaryArchSuffix " BUILD_PREREQUIRES=" cmd:aclocal @@ -74,17 +89,18 @@ BUILD_PREREQUIRES=" cmd:ld$secondaryArchSuffix cmd:libtoolize cmd:make - cmd:pkg_config + cmd:pkg_config${secondaryArchSuffix} cmd:gettext " BUILD() { - aclocal libtoolize --force --copy --install - ./autogen.sh + aclocal -I m4 + autoconf + automake runConfigure ./configure --without-doxygen \ - --with-libdv + --with-libdv --without-cpuflags make $jobArgs } diff --git a/media-libs/libquicktime/patches/libquicktime-1.2.4.patchset b/media-libs/libquicktime/patches/libquicktime-1.2.4.patchset index a153a4991..a2dff8faa 100644 --- a/media-libs/libquicktime/patches/libquicktime-1.2.4.patchset +++ b/media-libs/libquicktime/patches/libquicktime-1.2.4.patchset @@ -1,11 +1,11 @@ -From 8d52abdda6bcd2f979d70a27524403812889f2a2 Mon Sep 17 00:00:00 2001 +From 6c572e20694fc0478baaccaef6801a314938d65e Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Thu, 12 Jun 2014 17:58:08 +0000 Subject: Haiku patch diff --git a/configure.ac b/configure.ac -index da1dabc..4718ef2 100644 +index da1dabc..dceea22 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ LQT_VERSION_MICRO=`echo $VERSION | cut -d . -f 3 | cut -d p -f 1` @@ -29,6 +29,21 @@ index da1dabc..4718ef2 100644 fi dnl CFLAGS="$CFLAGS" +@@ -568,11 +568,11 @@ AVCODEC_BUILD="3412992" + + AC_ARG_WITH([ffmpeg], AS_HELP_STRING([--without-ffmpeg], [Build without ffmpeg library (default: test)])) + +-if test "x$with_ffmpeg" != "xno"; then ++dnl if test "x$with_ffmpeg" != "xno"; then + +-ACL_PATH_AVCODEC($AVCODEC_BUILD , have_libavcodec="true", have_libavcodec="false") ++dnl ACL_PATH_AVCODEC($AVCODEC_BUILD , have_libavcodec="true", have_libavcodec="false") + +-fi ++dnl fi + + AVCODEC_REQUIRED=$AVCODEC_VERSION + @@ -664,7 +664,7 @@ if test "x$with_faac" != "xno"; then OLD_CFLAGS=$CFLAGS OLD_LIBS=$LIBS From 2c24222f00452fa1d520a00960e6ad5828877b61 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Fri, 13 Jun 2014 16:10:07 +0000 Subject: [PATCH 12/27] lame: added missing build dependency. * enable x86_64 * secondary architecture support. --- media-sound/lame/lame-3.99.5.recipe | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/media-sound/lame/lame-3.99.5.recipe b/media-sound/lame/lame-3.99.5.recipe index 71bd387db..f8938b3db 100644 --- a/media-sound/lame/lame-3.99.5.recipe +++ b/media-sound/lame/lame-3.99.5.recipe @@ -13,20 +13,28 @@ SRC_URI="http://downloads.sourceforge.net/project/lame/lame/3.99/lame-3.99.5.tar CHECKSUM_SHA256="24346b4158e4af3bd9f2e194bb23eb473c75fb7377011523353196b19b9a23ff" LICENSE="GNU LGPL v2" COPYRIGHT="1998-2012 Mike Cheng et al." -REVISION="2" -ARCHITECTURES="x86 x86_gcc2" +REVISION="3" +ARCHITECTURES="x86 x86_gcc2 x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" - lame = $portVersion compat >= 1 - cmd:lame = $portVersion compat >= 1 - lib:libmp3lame = $portVersion compat >= 0.0.0 + lame$secondaryArchSuffix = $portVersion compat >= 1 + lib:libmp3lame$secondaryArchSuffix = $portVersion compat >= 0.0.0 " +if [ -z "$secondaryArchSuffix" ]; then + PROVIDES="$PROVIDES + cmd:lame = $portVersion compat >= 1 + " +fi REQUIRES=" haiku >= $haikuVersion - lib:libiconv + lib:libiconv$secondaryArchSuffix " BUILD_REQUIRES=" haiku_devel >= $haikuVersion + devel:libiconv$secondaryArchSuffix + " +BUILD_PREREQUIRES=" cmd:aclocal cmd:autoconf cmd:automake @@ -36,7 +44,7 @@ BUILD_REQUIRES=" cmd:make cmd:m4 cmd:sed - devel:libiconv + cmd:find " PATCHES="lame-3.99.5.patch" @@ -87,9 +95,9 @@ INSTALL() # ----- devel package ------------------------------------------------------- PROVIDES_devel=" - lame_devel = $portVersion - devel:libmp3lame = 0.0.0 compat >= 0 + lame${secondaryArchSuffix}_devel = $portVersion + devel:libmp3lame${secondaryArchSuffix} = 0.0.0 compat >= 0 " REQUIRES_devel=" - lame == $portVersion base + lame${secondaryArchSuffix} == $portVersion base " From d3ebf027d76789e2269b0fa0d991259ed1d8ced6 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Fri, 13 Jun 2014 16:49:33 +0000 Subject: [PATCH 13/27] mjpegtools: enable x86_64. --- .../mjpegtools/mjpegtools-2.1.0.recipe | 6 ++--- .../patches/mjpegtools-2.1.0.patchset | 26 ++++++++++++++++--- 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/media-video/mjpegtools/mjpegtools-2.1.0.recipe b/media-video/mjpegtools/mjpegtools-2.1.0.recipe index 61f207715..b563924ec 100644 --- a/media-video/mjpegtools/mjpegtools-2.1.0.recipe +++ b/media-video/mjpegtools/mjpegtools-2.1.0.recipe @@ -14,8 +14,8 @@ COPYRIGHT=" SRC_URI="http://sourceforge.net/projects/mjpeg/files/mjpegtools/$portVersion/mjpegtools-$portVersion.tar.gz" CHECKSUM_SHA256="864f143d7686377f8ab94d91283c696ebd906bf256b2eacc7e9fb4dddcedc407" REVISION="1" -ARCHITECTURES="?x86_gcc2 x86 ?x86_64" -SECONDARY_ARCHITECTURES="?x86_gcc2 x86" +ARCHITECTURES="!x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="!x86_gcc2 x86" PATCHES="mjpegtools-2.1.0.patchset" @@ -116,7 +116,7 @@ BUILD() aclocal autoconf automake - runConfigure ./configure + runConfigure ./configure --disable-dependency-tracking make $jobArgs } diff --git a/media-video/mjpegtools/patches/mjpegtools-2.1.0.patchset b/media-video/mjpegtools/patches/mjpegtools-2.1.0.patchset index 610089c37..276601339 100644 --- a/media-video/mjpegtools/patches/mjpegtools-2.1.0.patchset +++ b/media-video/mjpegtools/patches/mjpegtools-2.1.0.patchset @@ -1,11 +1,11 @@ -From f4fa8ee2c60a7f6ce3e091e39e887337b30710d3 Mon Sep 17 00:00:00 2001 +From 6bb33f02e730526ca22abe041a5f81c87bd137ce Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Wed, 11 Jun 2014 17:25:38 +0000 Subject: haiku patch diff --git a/configure.ac b/configure.ac -index 8ad5562..c0994fc 100644 +index 8ad5562..8c9c428 100644 --- a/configure.ac +++ b/configure.ac @@ -130,6 +130,9 @@ case $host in @@ -18,8 +18,17 @@ index 8ad5562..c0994fc 100644 *) AC_MSG_RESULT([no]) ;; +@@ -355,7 +358,7 @@ case $host_cpu in + AC_DEFINE(HAVE_X86CPU,1, [Compiling for x86-64 architecture CPU]) + have_x86cpu=true + have_x86_64cpu=true +- PROGRAM_NOPIC="-fno-PIC" ++ PROGRAM_NOPIC="" + ;; + powerpc | powerpc64) + AC_MSG_RESULT(PowerPC) diff --git a/lavtools/Makefile.am b/lavtools/Makefile.am -index 117dce7..e84a3c2 100644 +index 117dce7..417d7d2 100644 --- a/lavtools/Makefile.am +++ b/lavtools/Makefile.am @@ -152,7 +152,7 @@ jpeg2yuv_LDADD = $(LIBMJPEGUTILS) liblavjpeg.la $(JPEG_LIBS) @@ -50,6 +59,17 @@ index d84890b..3b0a4ec 100644 // Create the thread. nErr = pthread_create (&m_oThreadInfo, +diff --git a/yuvscaler/Makefile.am b/yuvscaler/Makefile.am +index 1fe4d75..d855a93 100644 +--- a/yuvscaler/Makefile.am ++++ b/yuvscaler/Makefile.am +@@ -18,6 +18,5 @@ noinst_HEADERS = \ + + EXTRA_DIST = yuvscaler_implementation.txt + +-yuvscaler_CFLAGS=@PROGRAM_NOPIC@ + yuvscaler_SOURCES = yuvscaler.c yuvscaler_resample.c yuvscaler_bicubic.c + yuvscaler_LDADD = $(LIBMJPEGUTILS) $(LIBM_LIBS) -- 1.8.3.4 From 3d6bd506ebe7c7bfcafd221dbe336a83e562942c Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Fri, 13 Jun 2014 17:47:58 +0000 Subject: [PATCH 14/27] libssh2: added recipe for version 1.4.3 --- net-libs/libssh2/libssh2-1.4.3.recipe | 79 +++++++++++++++++++ .../libssh2/patches/libssh2-1.4.3.patchset | 57 +++++++++++++ 2 files changed, 136 insertions(+) create mode 100644 net-libs/libssh2/libssh2-1.4.3.recipe create mode 100644 net-libs/libssh2/patches/libssh2-1.4.3.patchset diff --git a/net-libs/libssh2/libssh2-1.4.3.recipe b/net-libs/libssh2/libssh2-1.4.3.recipe new file mode 100644 index 000000000..d0a9ab37b --- /dev/null +++ b/net-libs/libssh2/libssh2-1.4.3.recipe @@ -0,0 +1,79 @@ +SUMMARY="A SSH2 library." +DESCRIPTION=" +libssh2 is a library implementing the SSH2 protocol, available under \ +the revised BSD license. +" +HOMEPAGE="http://www.libssh2.org" +COPYRIGHT=" + 2004-2007 Sara Golemon + 2005,2006 Mikhail Gusarov + 2006-2007 The Written Word, Inc. + 2007 Eli Fant + 2009 Daniel Stenberg + 2008, 2009 Simon Josefsson + " +LICENSE="BSD (3-clause)" +SRC_URI="http://www.libssh2.org/download/libssh2-$portVersion.tar.gz" +CHECKSUM_SHA256="eac6f85f9df9db2e6386906a6227eb2cd7b3245739561cad7d6dc1d5d021b96d" +REVISION="1" +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +PATCHES="libssh2-$portVersion.patchset" + +PROVIDES=" + libssh2$secondaryArchSuffix = $portVersion compat >= 1.4 + lib:libssh2$secondaryArchSuffix = 1.0.1 compat >= 1 + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:libcrypto$secondaryArchSuffix + lib:libssl$secondaryArchSuffix + lib:libz$secondaryArchSuffix + " +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:libcrypto$secondaryArchSuffix + devel:libssl$secondaryArchSuffix + devel:libz$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:libtoolize + cmd:make + cmd:pkg_config$secondaryArchSuffix + " + +BUILD() +{ + autoreconf -I m4 -f -i + runConfigure ./configure + make $jobArgs +} + +INSTALL() +{ + make install + + prepareInstalledDevelLibs libssh2 + fixPkgconfig + + # devel package + packageEntries devel \ + $developDir \ + $manDir/man3 +} + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + libssh2${secondaryArchSuffix}_devel = $portVersion compat >= 1.4 + devel:libssh2$secondaryArchSuffix = 1.0.1 compat >= 1 + " +REQUIRES_devel=" + libssh2$secondaryArchSuffix == $portVersion base + " diff --git a/net-libs/libssh2/patches/libssh2-1.4.3.patchset b/net-libs/libssh2/patches/libssh2-1.4.3.patchset new file mode 100644 index 000000000..d1db5689c --- /dev/null +++ b/net-libs/libssh2/patches/libssh2-1.4.3.patchset @@ -0,0 +1,57 @@ +From 22c9d0908444b0d912ace76ea22f89b90b43a01c Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Fri, 13 Jun 2014 17:08:13 +0000 +Subject: haiku patch + + +diff --git a/configure.ac b/configure.ac +index dfc6988..6c2f519 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -2,7 +2,7 @@ + AC_INIT(libssh2, [-], libssh2-devel@cool.haxx.se) + AC_CONFIG_MACRO_DIR([m4]) + AC_CONFIG_SRCDIR([src]) +-AM_CONFIG_HEADER([src/libssh2_config.h example/libssh2_config.h]) ++AC_CONFIG_HEADERS([src/libssh2_config.h example/libssh2_config.h]) + AM_MAINTAINER_MODE + + dnl SED is needed by some of the tools +-- +1.8.3.4 + + +From 25a2ec62ce50144b20d9bf3cb674ce4e9b5beece Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Fri, 13 Jun 2014 17:19:49 +0000 +Subject: haiku patch + + +diff --git a/configure.ac b/configure.ac +index 6c2f519..b68cfba 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -60,7 +60,7 @@ dnl Our configure and build reentrant settings + CURL_CONFIGURE_REENTRANT + + # Some systems (Solaris?) have socket() in -lsocket. +-AC_SEARCH_LIBS(socket, socket) ++AC_SEARCH_LIBS(socket,[socket network]) + + # Solaris has inet_addr() in -lnsl. + AC_SEARCH_LIBS(inet_addr, nsl) +diff --git a/example/x11.c b/example/x11.c +index 6480dc8..a669a73 100644 +--- a/example/x11.c ++++ b/example/x11.c +@@ -10,6 +10,7 @@ + #include + #include + #include ++#include + #include + #include + #include +-- +1.8.3.4 + From cff1e1481004c108df0b55edcdb65a6acc17d40f Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Fri, 13 Jun 2014 19:31:37 +0000 Subject: [PATCH 15/27] 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 + From dfdaaca9d915e675608fa85a7edc679f7a789a71 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Fri, 13 Jun 2014 19:32:56 +0000 Subject: [PATCH 16/27] schroedinger: converted recipe. --- .../patches/schroedinger-1.0.11.patch | 13 --- .../patches/schroedinger-1.0.11.patchset | 33 ++++++++ .../schroedinger/schroedinger-1.0.11.recipe | 84 +++++++++++++++---- 3 files changed, 100 insertions(+), 30 deletions(-) delete mode 100644 media-libs/schroedinger/patches/schroedinger-1.0.11.patch create mode 100644 media-libs/schroedinger/patches/schroedinger-1.0.11.patchset diff --git a/media-libs/schroedinger/patches/schroedinger-1.0.11.patch b/media-libs/schroedinger/patches/schroedinger-1.0.11.patch deleted file mode 100644 index c495e9017..000000000 --- a/media-libs/schroedinger/patches/schroedinger-1.0.11.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- schroedinger-1.0.11/configure.ac 2012-01-23 01:32:45.012320768 +0000 -+++ schroedinger-1.0.11-haiku/configure.ac 2012-04-09 11:35:40.101187584 +0000 -@@ -85,6 +85,10 @@ - PTHREAD_CFLAGS= - PTHREAD_LIBS=-pthread - ;; -+ haiku*) -+ PTHREAD_CFLAGS= -+ PTHREAD_LIBS= -+ ;; - *) - PTHREAD_CFLAGS= - PTHREAD_LIBS=-lpthread diff --git a/media-libs/schroedinger/patches/schroedinger-1.0.11.patchset b/media-libs/schroedinger/patches/schroedinger-1.0.11.patchset new file mode 100644 index 000000000..22b591029 --- /dev/null +++ b/media-libs/schroedinger/patches/schroedinger-1.0.11.patchset @@ -0,0 +1,33 @@ +From 0c4df55a7f402a239470bef6e9bb5bf43b30da4e Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Fri, 13 Jun 2014 18:42:15 +0000 +Subject: Haiku patch + + +diff --git a/configure.ac b/configure.ac +index 80b561c..448daf8 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -12,7 +12,7 @@ AM_INIT_AUTOMAKE(1.6) + SCHRO_MAJORMINOR=1.0 + AC_SUBST(SCHRO_MAJORMINOR) + +-AM_CONFIG_HEADER(config.h) ++AC_CONFIG_HEADERS(config.h) + + dnl CURRENT, REVISION, AGE + dnl - library source changed -> increment REVISION +@@ -85,6 +85,10 @@ if test "x${with_thread}" = "xpthread" ; then + PTHREAD_CFLAGS= + PTHREAD_LIBS=-pthread + ;; ++ haiku*) ++ PTHREAD_CFLAGS= ++ PTHREAD_LIBS= ++ ;; + *) + PTHREAD_CFLAGS= + PTHREAD_LIBS=-lpthread +-- +1.8.3.4 + diff --git a/media-libs/schroedinger/schroedinger-1.0.11.recipe b/media-libs/schroedinger/schroedinger-1.0.11.recipe index 31bdc5fbb..43303b290 100644 --- a/media-libs/schroedinger/schroedinger-1.0.11.recipe +++ b/media-libs/schroedinger/schroedinger-1.0.11.recipe @@ -1,27 +1,77 @@ -DESCRIPTION="Schroedinger Dirac Video codec" -HOMEPAGE="http://www.diracvideo.org" -SRC_URI="http://diracvideo.org/download/schroedinger/schroedinger-1.0.11.tar.gz" +SUMMARY="Schroedinger Dirac Video codec" +DESCRIPTION=" +Schroedinger (or "schro" for short) is an implementation of the \ +Dirac and SMPTE VC-2 video compression specification. Dirac was \ +developed by BBC Research & Development (http://www.bbc.co.uk/rd/) \ +as an open technology with open licensing. +Schroedinger is the C library implementing video encoding and \ +decoding. Most end users will want to use an application that \ +uses the Schroedinger library for encoding and decoding Dirac \ +streams. A few such applications are Totem, VLC, and Mplayer. \ +In addition, media frameworks such as GStreamer and decoding \ +libraries such as ffmpeg can be configured to use Schroedinger \ +either internally or via plugins. +" +HOMEPAGE="http://www.diracvideo.org" +COPYRIGHT=" + 2006 BBC and Fluendo" +LICENSE="MIT" +SRC_URI="http://diracvideo.org/download/schroedinger/schroedinger-$portVersion.tar.gz" +CHECKSUM_SHA256="1e572a0735b92aca5746c4528f9bebd35aa0ccf8619b22fa2756137a8cc9f912" REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-util/pkg-config >= 0.23 - dev-lang/orc >= 0.4.16" -CHECKSUM_MD5="da6af08e564ca1157348fb8d92efc891" +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +PATCHES="schroedinger-$portVersion.patchset" + +PROVIDES=" + schroedinger$secondaryArchSuffix = $portVersion compat >= 1.0 + lib:libschroedinger_1.0$secondaryArchSuffix = 0.11.0 compat >= 0 + " +REQUIRES=" + haiku$secondaryArchSuffix >= $haikuVersion + lib:liborc_0.4$secondaryArchSuffix + " +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion + devel:liborc_0.4$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:libtoolize + cmd:make + cmd:pkg_config$secondaryArchSuffix + " + BUILD() { - cd schroedinger-1.0.11 - 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 + autoreconf -f -i -I m4 + runConfigure ./configure + make $jobArgs } INSTALL() { - cd schroedinger-1.0.11 make install + + prepareInstalledDevelLibs libschroedinger-1.0 + fixPkgconfig + + # devel package + packageEntries devel \ + $developDir } -LICENSE="MIT" -COPYRIGHT="2006 BBC and Fluendo" +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + schroedinger${secondaryArchSuffix}_devel = $portVersion compat >= 1.0 + devel:libschroedinger_1.0$secondaryArchSuffix = 0.11.0 compat >= 0 + " +REQUIRES_devel=" + schroedinger$secondaryArchSuffix == $portVersion base + " From e6d610f9ef3de0db02ad4e751d16c26238c666ec Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Fri, 13 Jun 2014 20:49:59 +0000 Subject: [PATCH 17/27] x264: converted recipe --- .../x264/patches/x264-20140308.patchset | 23 +++++++ media-libs/x264/x264-20140308.recipe | 67 +++++++++++++++++++ 2 files changed, 90 insertions(+) create mode 100644 media-libs/x264/patches/x264-20140308.patchset create mode 100644 media-libs/x264/x264-20140308.recipe diff --git a/media-libs/x264/patches/x264-20140308.patchset b/media-libs/x264/patches/x264-20140308.patchset new file mode 100644 index 000000000..1acbed1f1 --- /dev/null +++ b/media-libs/x264/patches/x264-20140308.patchset @@ -0,0 +1,23 @@ +From a31af43d0e8d602e467570de30b816b01f30bd40 Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Fri, 13 Jun 2014 19:56:27 +0000 +Subject: Haiku patch + + +diff --git a/configure b/configure +index 0177cfc..d1a118f 100755 +--- a/configure ++++ b/configure +@@ -550,6 +550,9 @@ case $host_os in + HAVE_GETOPT_LONG=0 + CFLAGS="$CFLAGS -I\$(SRCPATH)/extras" + ;; ++ *haiku*) ++ SYS="haiku" ++ ;; + *) + die "Unknown system $host, edit the configure" + ;; +-- +1.8.3.4 + diff --git a/media-libs/x264/x264-20140308.recipe b/media-libs/x264/x264-20140308.recipe new file mode 100644 index 000000000..6d5fcdc7d --- /dev/null +++ b/media-libs/x264/x264-20140308.recipe @@ -0,0 +1,67 @@ +SUMMARY="x264 h.264/AVC encoder" +DESCRIPTION=" +x264 is a h.264/AVC encoder library. +" +HOMEPAGE="http://www.videolan.org/developers/x264.html" +COPYRIGHT=" + 2003-2012 http://www.videolan.org/developers/x264.html + " +LICENSE="GNU GPL v2" +SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20140308-2245.tar.bz2" +CHECKSUM_SHA256="b179cb1e1d4f51418d292011a7494d5b62145571c05c22007f28d8fd89d2ebbe" +REVISION="1" +ARCHITECTURES="?x86_gcc2 x86 !x86_64" +SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86" + +PATCHES="x264-$portVersion.patchset" + +PROVIDES=" + x264$secondaryArchSuffix = $portVersion compat >= 20140308 + lib:libx264$secondaryArchSuffix = 142 compat >= 142 + " +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 + cmd:yasm >= 1.2.0 + " + +SOURCE_DIR="x264-snapshot-20140308-2245" + +BUILD() +{ + CFLAGS="-fPIC" runConfigure --omit-dirs \ + "manDir oldIncludeDir sbinDir localStateDir sharedStateDir sysconfDir infoDir dataDir dataRootDir libExecDir docDir" \ + --omit-buildspec ./configure --enable-pic --enable-shared + make $jobArgs +} + +INSTALL() +{ + make install + + prepareInstalledDevelLibs libx264 + + # devel package + packageEntries devel \ + $developDir + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + x264${secondaryArchSuffix}_devel = $portVersion compat >= 20140308 + devel:libx264$secondaryArchSuffix = 142 compat >= 142 + " +REQUIRES_devel=" + x264$secondaryArchSuffix == $portVersion base + " From 0d00a5baa909ef10773894b20576348a36dbc78c Mon Sep 17 00:00:00 2001 From: PulkoMandy Date: Sat, 14 Jun 2014 09:06:34 +0200 Subject: [PATCH 18/27] cmake: add ARM support. * Only to please the bootstrap build process. --- dev-util/cmake/cmake-3.0.0_rc6.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-util/cmake/cmake-3.0.0_rc6.recipe b/dev-util/cmake/cmake-3.0.0_rc6.recipe index 7cc09ac37..a7acc8d41 100644 --- a/dev-util/cmake/cmake-3.0.0_rc6.recipe +++ b/dev-util/cmake/cmake-3.0.0_rc6.recipe @@ -12,7 +12,7 @@ COPYRIGHT="2002-2014 Kitware, Inc., Insight Consortium, All rights reserved." SRC_URI="http://www.cmake.org/files/v3.0/cmake-3.0.0-rc6.tar.gz" CHECKSUM_SHA256="bb34dacec33b3ac26ee05b0a66b95ed8f52a0ce212f13c3e65a923944cdd484a" REVISION="1" -ARCHITECTURES="x86 x86_64" +ARCHITECTURES="x86 x86_64 arm" if [ $effectiveTargetArchitecture != x86_gcc2 ]; then # x86_gcc2 is fine as primary target architecture as long as we're building # for a different secondary architecture. From 2bc713298beb54dab88b77589cbe768e1674e7e9 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sat, 14 Jun 2014 14:12:19 +0000 Subject: [PATCH 19/27] x264: fixed recipe * not available for x86_gcc2 --- media-libs/x264/patches/x264-20120803.patch | 12 ----------- media-libs/x264/x264-20120803.recipe | 22 --------------------- media-libs/x264/x264-20140308.recipe | 12 ++++++++--- 3 files changed, 9 insertions(+), 37 deletions(-) delete mode 100644 media-libs/x264/patches/x264-20120803.patch delete mode 100644 media-libs/x264/x264-20120803.recipe diff --git a/media-libs/x264/patches/x264-20120803.patch b/media-libs/x264/patches/x264-20120803.patch deleted file mode 100644 index 6e48d2cc2..000000000 --- a/media-libs/x264/patches/x264-20120803.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- x264-snapshot-20120803-2245.orig/configure 2012-08-03 20:45:03.065273856 +0000 -+++ x264-snapshot-20120803-2245/configure 2012-08-04 12:56:56.527171584 +0000 -@@ -520,6 +520,9 @@ - fi - HAVE_GETOPT_LONG=0 - ;; -+ *haiku*) -+ SYS="haiku" -+ ;; - *) - die "Unknown system $host, edit the configure" - ;; diff --git a/media-libs/x264/x264-20120803.recipe b/media-libs/x264/x264-20120803.recipe deleted file mode 100644 index e0881ff35..000000000 --- a/media-libs/x264/x264-20120803.recipe +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION="x264 h.264/AVC encoder" -HOMEPAGE="http://www.videolan.org/developers/x264.html" -SRC_URI="ftp://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20120803-2245.tar.bz2" -CHECKSUM_MD5="0ce9048809a447b89aaecd7c8c8b2e0d" -REVISION="1" -MESSAGE="The port only builds with gcc4. Use 'setgcc gcc4' before building." -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd x264-snapshot-20120803-2245 - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL() -{ - cd x264-snapshot-20120803-2245 - make install-lib-static -} -LICENSE="GNU GPL v2" -COPYRIGHT="2003-2012 http://www.videolan.org/developers/x264.html" diff --git a/media-libs/x264/x264-20140308.recipe b/media-libs/x264/x264-20140308.recipe index 6d5fcdc7d..72e40505b 100644 --- a/media-libs/x264/x264-20140308.recipe +++ b/media-libs/x264/x264-20140308.recipe @@ -10,8 +10,13 @@ LICENSE="GNU GPL v2" SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20140308-2245.tar.bz2" CHECKSUM_SHA256="b179cb1e1d4f51418d292011a7494d5b62145571c05c22007f28d8fd89d2ebbe" REVISION="1" -ARCHITECTURES="?x86_gcc2 x86 !x86_64" -SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86" +ARCHITECTURES="x86 !x86_64" +if [ $effectiveTargetArchitecture != x86_gcc2 ]; then + # x86_gcc2 is fine as primary target architecture as long as we're building + # for a different secondary architecture. + ARCHITECTURES="$ARCHITECTURES x86_gcc2" +fi +SECONDARY_ARCHITECTURES="x86" PATCHES="x264-$portVersion.patchset" @@ -54,7 +59,8 @@ INSTALL() # devel package packageEntries devel \ - $developDir + $developDir +} # ----- devel package ------------------------------------------------------- From 241d18e763f4b84f014f4a96d5bc256aabe790d1 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Sun, 15 Jun 2014 23:26:48 +0200 Subject: [PATCH 20/27] Add recipe for buildbot_slave and all its dependencies. * add buildbot_slave-0.8.8.recipe * add python_twisted-13.2.0.recipe * add python_zope.interface-4.1.1.recipe * add python_mock-1.0.1.recipe --- .../buildbot_slave-0.8.8.recipe | 66 +++++++++++++++ dev-python/mock/python_mock-1.0.1.recipe | 51 ++++++++++++ .../twisted/python_twisted-13.2.0.recipe | 80 +++++++++++++++++++ dev-python/zope.interface/licenses/ZPL 2.1 | 44 ++++++++++ .../python_zope.interface-4.1.1.recipe | 46 +++++++++++ 5 files changed, 287 insertions(+) create mode 100644 dev-python/buildbot_slave/buildbot_slave-0.8.8.recipe create mode 100644 dev-python/mock/python_mock-1.0.1.recipe create mode 100644 dev-python/twisted/python_twisted-13.2.0.recipe create mode 100644 dev-python/zope.interface/licenses/ZPL 2.1 create mode 100644 dev-python/zope.interface/python_zope.interface-4.1.1.recipe diff --git a/dev-python/buildbot_slave/buildbot_slave-0.8.8.recipe b/dev-python/buildbot_slave/buildbot_slave-0.8.8.recipe new file mode 100644 index 000000000..f1211fc9a --- /dev/null +++ b/dev-python/buildbot_slave/buildbot_slave-0.8.8.recipe @@ -0,0 +1,66 @@ +SUMMARY="Python-based continuous integration testing framework." +DESCRIPTION=" +Buildbot is a continuous integration system designed to automate the \ +build/test cycle. By automatically rebuilding and testing the tree each time \ +something has changed, build problems are pinpointed quickly, before other \ +developers are inconvenienced by the failure. Features + +* Buildbot is easy to set up, but very extensible and customizable. It \ + supports arbitrary build processes, and is not limited to common build \ + processes for particular languages (e.g., autotools or ant) + +* Buildbot supports building and testing on a variety of platforms. \ + Developers, who do not have the facilities to test their changes everywhere \ + before committing, will know shortly afterwards whether they have broken the \ + build or not. + +* Buildbot has minimal requirements for slaves: using virtualenv, only a \ + Python installation is required. + +* Slaves can be run behind a NAT firewall and communicate with the master + +* Buildbot has a variety of status-reporting tools to get information about \ + builds in front of developers in a timely manner. + +This package contains the slave implementation, i.e. the part that is \ +executing builds and/or tests. +" +HOMEPAGE="http://www.buildbot.net" +SRC_URI="https://buildbot.googlecode.com/files/buildbot-slave-0.8.8.tar.gz" +CHECKSUM_SHA256="8b7532d4d34527aea41e353d1bc3c35291ec335d3224c27800d2cc0cfc9837cc" +LICENSE="GNU GPL v2" +COPYRIGHT="2005-2013 Bryan Warner and the Buildbot team members" +REVISION="1" + +ARCHITECTURES="any" + +SOURCE_DIR="buildbot-slave-$portVersion" + +PROVIDES=" + buildbot_slave = $portVersion + cmd:buildslave = $portVersion + " + +REQUIRES=" + haiku >= $haikuVersion + cmd:python + python_twisted + " + +BUILD_REQUIRES="" + +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:python + " + +BUILD() +{ + $portPackageLinksDir/cmd~python/bin/python setup.py build +} + +INSTALL() +{ + $portPackageLinksDir/cmd~python/bin/python setup.py install \ + --prefix=$prefix +} diff --git a/dev-python/mock/python_mock-1.0.1.recipe b/dev-python/mock/python_mock-1.0.1.recipe new file mode 100644 index 000000000..ba2d9764c --- /dev/null +++ b/dev-python/mock/python_mock-1.0.1.recipe @@ -0,0 +1,51 @@ +SUMMARY="A library for testing in Python" +DESCRIPTION=" +Mock allows you to replace parts of your system under test with mock objects \ +and make assertions about how they have been used. + +Mock provides a core 'MagicMock' class removing the need to create a host of \ +stubs throughout your test suite. After performing an action, you can make \ +assertions about which methods / attributes were used and arguments they were \ +called with. You can also specify return values and set needed attributes in \ +the normal way. + +The mock module also provides utility functions / objects to assist with \ +testing, particularly monkey patching. +" +HOMEPAGE="http://pypi.python.org/pypi/mock" +SRC_URI="https://pypi.python.org/packages/source/m/mock/mock-1.0.1.tar.gz" +CHECKSUM_SHA256="b839dd2d9c117c701430c149956918a423a9863b48b09c90e30a6013e7d2f44f" +LICENSE="BSD (2-clause)" +COPYRIGHT="2003-2012, Michael Foord" +REVISION="1" + +ARCHITECTURES="any" + +SOURCE_DIR="mock-$portVersion" + +PROVIDES=" + python_mock = $portVersion + " + +REQUIRES=" + haiku >= $haikuVersion + cmd:python + " + +BUILD_REQUIRES="" + +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:python + " + +BUILD() +{ + $portPackageLinksDir/cmd~python/bin/python setup.py build +} + +INSTALL() +{ + $portPackageLinksDir/cmd~python/bin/python setup.py install \ + --prefix=$prefix +} diff --git a/dev-python/twisted/python_twisted-13.2.0.recipe b/dev-python/twisted/python_twisted-13.2.0.recipe new file mode 100644 index 000000000..64dc3b0e3 --- /dev/null +++ b/dev-python/twisted/python_twisted-13.2.0.recipe @@ -0,0 +1,80 @@ +SUMMARY="An event-driven networking engine written in Python" +DESCRIPTION=" +Twisted is an event-based framework for internet applications. It includes \ +modules for many different purposes, including the following: + +- twisted.application + A "Service" system that allows you to organize your application in \ + hierarchies with well-defined startup and dependency semantics, + +- twisted.cred + A general credentials and authentication system that facilitates \ + pluggable authentication backends, + +- twisted.enterprise + Asynchronous database access, compatible with any Python DBAPI2.0 \ + modules, + +- twisted.internet + Low-level asynchronous networking APIs that allow you to define \ + your own protocols that run over certain transports, + +- twisted.manhole + A tool for remote debugging of your services which gives you a \ + Python interactive interpreter, + +- twisted.protocols + Basic protocol implementations and helpers for your own protocol \ + implementations, + +- twisted.python + A large set of utilities for Python tricks, reflection, text \ + processing, and anything else, + +- twisted.spread + A secure, fast remote object system, + +- twisted.trial + A unit testing framework that integrates well with Twisted-based code. +" +HOMEPAGE="http://twistedmatrix.com" +SRC_URI="https://twistedmatrix.com/Releases/Twisted/13.2/Twisted-13.2.0.tar.bz2" +CHECKSUM_SHA256="095175638c019ac7c0604f4c291724a16ff1acd062e181b01293bf4dcbc62cf3" +LICENSE="MIT" +COPYRIGHT="2001-2013 Twisted project members" +REVISION="1" + +ARCHITECTURES="x86 x86_gcc2 x86_64" + +SOURCE_DIR="Twisted-$portVersion" + +PROVIDES=" + python_twisted = $portVersion + " + +REQUIRES=" + haiku >= $haikuVersion + python_zope.interface >= 3.6.0 + cmd:python + " + +BUILD_REQUIRES=" + python_zope.interface >= 3.6.0 + " + +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:python + cmd:gcc + " + +BUILD() +{ + $portPackageLinksDir/cmd~python/bin/python setup.py build +} + +INSTALL() +{ + $portPackageLinksDir/cmd~python/bin/python setup.py install \ + --prefix=$prefix +} diff --git a/dev-python/zope.interface/licenses/ZPL 2.1 b/dev-python/zope.interface/licenses/ZPL 2.1 new file mode 100644 index 000000000..e1f9ad7b3 --- /dev/null +++ b/dev-python/zope.interface/licenses/ZPL 2.1 @@ -0,0 +1,44 @@ +Zope Public License (ZPL) Version 2.1 + +A copyright notice accompanies this license document that identifies the +copyright holders. + +This license has been certified as open source. It has also been designated as +GPL compatible by the Free Software Foundation (FSF). + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +1. Redistributions in source code must retain the accompanying copyright +notice, this list of conditions, and the following disclaimer. + +2. Redistributions in binary form must reproduce the accompanying copyright +notice, this list of conditions, and the following disclaimer in the +documentation and/or other materials provided with the distribution. + +3. Names of the copyright holders must not be used to endorse or promote +products derived from this software without prior written permission from the +copyright holders. + +4. The right to distribute this software or to use it for any purpose does not +give you the right to use Servicemarks (sm) or Trademarks (tm) of the +copyright +holders. Use of them is covered by separate agreement with the copyright +holders. + +5. If any files are modified, you must cause the modified files to carry +prominent notices stating that you changed the files and the date of any +change. + +Disclaimer + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY EXPRESSED +OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, +EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/dev-python/zope.interface/python_zope.interface-4.1.1.recipe b/dev-python/zope.interface/python_zope.interface-4.1.1.recipe new file mode 100644 index 000000000..b5c078533 --- /dev/null +++ b/dev-python/zope.interface/python_zope.interface-4.1.1.recipe @@ -0,0 +1,46 @@ +SUMMARY="Interfaces for Python" +DESCRIPTION=" +This package provides an implementation of 'object interfaces' for Python. \ +Interfaces are a mechanism for labeling objects as conforming to a given \ +API or contract. So, this package can be considered as implementation of the \ +Design By Contract methodology support in Python. + +For detailed documentation, please see http://docs.zope.org/zope.interface +" +HOMEPAGE="http://pypi.python.org/pypi/zope.interface" +SRC_URI="https://pypi.python.org/packages/source/z/zope.interface/zope.interface-4.1.1.tar.gz" +CHECKSUM_SHA256="91cba7b7cd7cb82f6f4e023fe77f94dc3df4ae5287fd55def2148dc232d0c7da" +LICENSE="ZPL 2.1" +COPYRIGHT="2004-2014 Zope Foundation and Contributors" +REVISION="1" + +ARCHITECTURES="any" + +SOURCE_DIR="zope.interface-$portVersion" + +PROVIDES=" + python_zope.interface = $portVersion + " + +REQUIRES=" + haiku >= $haikuVersion + cmd:python + " + +BUILD_REQUIRES="" + +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:python + " + +BUILD() +{ + $portPackageLinksDir/cmd~python/bin/python setup.py build +} + +INSTALL() +{ + $portPackageLinksDir/cmd~python/bin/python setup.py install \ + --prefix=$prefix +} From 353bbc3707d7d2286a5ed9c7cfeb289d70610651 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Mon, 16 Jun 2014 15:36:02 +0000 Subject: [PATCH 21/27] llvm: fix SOURCE_DIR for secondary arch. --- sys-devel/llvm/llvm-3.4.1.recipe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-devel/llvm/llvm-3.4.1.recipe b/sys-devel/llvm/llvm-3.4.1.recipe index d8610eef2..86f50f614 100644 --- a/sys-devel/llvm/llvm-3.4.1.recipe +++ b/sys-devel/llvm/llvm-3.4.1.recipe @@ -72,7 +72,7 @@ BUILD_PREREQUIRES=" PATCHES="llvm-3.4.1.patchset" -SOURCE_DIR="$portVersionedName.src" +SOURCE_DIR="llvm-$portVersion.src" BUILD() { From 3d34dc76f36629bcd57ced215173668c929cf030 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Mon, 16 Jun 2014 22:23:06 +0200 Subject: [PATCH 22/27] Add WIP recipe for gtk-doc. * Not working yet, added only because it exposes a bug in haikuporter. --- .../docbook_xml_dtd-4.3.recipe | 122 ++++++++++++++++++ .../docbook_xml_dtd-4.5.recipe | 122 ++++++++++++++++++ app-text/docbook_xml_dtd/licenses/Docbook | 26 ++++ .../docbook_xsl_stylesheets-1.78.1.recipe | 28 ++++ dev-util/gtk_doc/gtk_doc-1.15.recipe | 24 ---- dev-util/gtk_doc/gtk_doc-1.20.recipe | 43 ++++++ 6 files changed, 341 insertions(+), 24 deletions(-) create mode 100644 app-text/docbook_xml_dtd/docbook_xml_dtd-4.3.recipe create mode 100644 app-text/docbook_xml_dtd/docbook_xml_dtd-4.5.recipe create mode 100644 app-text/docbook_xml_dtd/licenses/Docbook delete mode 100644 dev-util/gtk_doc/gtk_doc-1.15.recipe create mode 100644 dev-util/gtk_doc/gtk_doc-1.20.recipe diff --git a/app-text/docbook_xml_dtd/docbook_xml_dtd-4.3.recipe b/app-text/docbook_xml_dtd/docbook_xml_dtd-4.3.recipe new file mode 100644 index 000000000..96ce90472 --- /dev/null +++ b/app-text/docbook_xml_dtd/docbook_xml_dtd-4.3.recipe @@ -0,0 +1,122 @@ +SUMMARY="Docbook DTD for XML." +DESCRIPTION=" +DocBook is an XML vocabulary that lets you create documents in a \ +presentation-neutral form that captures the logical structure of your content. + +DocBook is a schema (available in several languages including RELAX NG, \ +W3C XML Schemas, and XML DTDs) maintained by the DocBook Technical Committee \ +of OASIS. It is particularly well suited to books and papers about computer \ +hardware and software (though it is by no means limited to these applications). +" + +HOMEPAGE="http://www.docbook.org/schemas/4x.html" +SRC_URI="http://www.docbook.org/xml/$portVersion/docbook-xml-$portVersion.zip" +CHECKSUM_SHA256="23068a94ea6fd484b004c5a73ec36a66aa47ea8f0d6b62cc1695931f5c143464" + +REVISION="1" +ARCHITECTURES="any" + +LICENSE="Docbook" +COPYRIGHT=" + 19996-2006 HaL Computer Systems Inc., O'Reilly & Associates Inc, + ArborText Inc, Fujitsu Software Corporation, Norman Walsh, + Sun Microsystems Inc. and the Organization for the Advancement of + Structured Information Standards (OASIS) +" + +PROVIDES=" + docbook_xml_dtd = $portVersion + " + +BUILD_PREREQUIRES=" + cmd:xmlcatalog + cmd:find + " + +SOURCE_DIR="" +BUILD() +{ + true +} + +INSTALL() +{ + mkdir -p $dataDir/xml/docbook/xml-dtd-$portVersion + cp -v -af docbook.cat *.dtd ent/ *.mod \ + $dataDir/xml/docbook/xml-dtd-$portVersion + + mkdir -p $settingsDir/etc/xml/catalog + + CATALOG=$settingsDir/etc/xml/docbook + xmlcatalog --noout --create $CATALOG + + xmlcatalog --noout --add "public" \ + "-//OASIS//DTD DocBook XML V$portVersion//EN" \ + "http://www.oasis-open.org/docbook/xml/$portVersion/docbookx.dtd" \ + $CATALOG + xmlcatalog --noout --add "public" \ + "-//OASIS//DTD DocBook XML CALS Table Model V$portVersion//EN" \ + "file://$dataDir/xml/docbook/xml-dtd-$portVersion/calstblx.dtd" \ + $CATALOG + xmlcatalog --noout --add "public" \ + "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \ + "file://$dataDir/xml/docbook/xml-dtd-$portVersion/soextblx.dtd" \ + $CATALOG + xmlcatalog --noout --add "public" \ + "-//OASIS//ELEMENTS DocBook XML Information Pool V$portVersion//EN" \ + "file://$dataDir/xml/docbook/xml-dtd-$portVersion/dbpoolx.mod" \ + $CATALOG + xmlcatalog --noout --add "public" \ + "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V$portVersion//EN" \ + "file://$dataDir/xml/docbook/xml-dtd-$portVersion/dbhierx.mod" \ + $CATALOG + xmlcatalog --noout --add "public" \ + "-//OASIS//ELEMENTS DocBook XML HTML Tables V$portVersion//EN" \ + "file://$dataDir/xml/docbook/xml-dtd-$portVersion/htmltblx.mod" \ + $CATALOG + xmlcatalog --noout --add "public" \ + "-//OASIS//ENTITIES DocBook XML Notations V$portVersion//EN" \ + "file://$dataDir/xml/docbook/xml-dtd-$portVersion/dbnotnx.mod" \ + $CATALOG + xmlcatalog --noout --add "public" \ + "-//OASIS//ENTITIES DocBook XML Character Entities V$portVersion//EN" \ + "file://$dataDir/xml/docbook/xml-dtd-$portVersion/dbcentx.mod" \ + $CATALOG + xmlcatalog --noout --add "public" \ + "-//OASIS//ENTITIES DocBook XML Additional General Entities V$portVersion//EN" \ + "file://$dataDir/xml/docbook/xml-dtd-$portVersion/dbgenent.mod" \ + $CATALOG + xmlcatalog --noout --add "rewriteSystem" \ + "http://www.oasis-open.org/docbook/xml/$portVersion" \ + "file://$dataDir/xml/docbook/xml-dtd-$portVersion" \ + $CATALOG + xmlcatalog --noout --add "rewriteURI" \ + "http://www.oasis-open.org/docbook/xml/$portVersion" \ + "file://$dataDir/xml/docbook/xml-dtd-$portVersion" \ + $CATALOG + + CATALOG=$settingsDir/etc/xml/catalog/docbook-xml-dtd + xmlcatalog --noout --create $CATALOG + + xmlcatalog --noout --add "delegatePublic" \ + "-//OASIS//ENTITIES DocBook XML" \ + "file://$settingsDir/etc/xml/docbook" \ + $CATALOG + xmlcatalog --noout --add "delegatePublic" \ + "-//OASIS//DTD DocBook XML" \ + "file://$settingsDir/etc/xml/docbook" \ + $CATALOG + xmlcatalog --noout --add "delegateSystem" \ + "http://www.oasis-open.org/docbook/" \ + "file://$settingsDir/etc/xml/docbook" \ + $CATALOG + xmlcatalog --noout --add "delegateURI" \ + "http://www.oasis-open.org/docbook/" \ + "file://$settingsDir/etc/xml/docbook" \ + $CATALOG +} + +GLOBAL_WRITABLE_FILES=" + settings/etc/xml/catalog/docbook-xml-dtd keep-old + settings/etc/xml/docbook keep-old +" diff --git a/app-text/docbook_xml_dtd/docbook_xml_dtd-4.5.recipe b/app-text/docbook_xml_dtd/docbook_xml_dtd-4.5.recipe new file mode 100644 index 000000000..0d891ee12 --- /dev/null +++ b/app-text/docbook_xml_dtd/docbook_xml_dtd-4.5.recipe @@ -0,0 +1,122 @@ +SUMMARY="Docbook DTD for XML." +DESCRIPTION=" +DocBook is an XML vocabulary that lets you create documents in a \ +presentation-neutral form that captures the logical structure of your content. + +DocBook is a schema (available in several languages including RELAX NG, \ +W3C XML Schemas, and XML DTDs) maintained by the DocBook Technical Committee \ +of OASIS. It is particularly well suited to books and papers about computer \ +hardware and software (though it is by no means limited to these applications). +" + +HOMEPAGE="http://www.docbook.org/schemas/4x.html" +SRC_URI="http://www.docbook.org/xml/$portVersion/docbook-xml-$portVersion.zip" +CHECKSUM_SHA256="4e4e037a2b83c98c6c94818390d4bdd3f6e10f6ec62dd79188594e26190dc7b4" + +REVISION="1" +ARCHITECTURES="any" + +LICENSE="Docbook" +COPYRIGHT=" + 19996-2006 HaL Computer Systems Inc., O'Reilly & Associates Inc, + ArborText Inc, Fujitsu Software Corporation, Norman Walsh, + Sun Microsystems Inc. and the Organization for the Advancement of + Structured Information Standards (OASIS) +" + +PROVIDES=" + docbook_xml_dtd = $portVersion + " + +BUILD_PREREQUIRES=" + cmd:xmlcatalog + cmd:find + " + +SOURCE_DIR="" +BUILD() +{ + true +} + +INSTALL() +{ + mkdir -p $dataDir/xml/docbook/xml-dtd-$portVersion + cp -v -af docbook.cat *.dtd ent/ *.mod \ + $dataDir/xml/docbook/xml-dtd-$portVersion + + mkdir -p $settingsDir/etc/xml/catalog + + CATALOG=$settingsDir/etc/xml/docbook + xmlcatalog --noout --create $CATALOG + + xmlcatalog --noout --add "public" \ + "-//OASIS//DTD DocBook XML V$portVersion//EN" \ + "http://www.oasis-open.org/docbook/xml/$portVersion/docbookx.dtd" \ + $CATALOG + xmlcatalog --noout --add "public" \ + "-//OASIS//DTD DocBook XML CALS Table Model V$portVersion//EN" \ + "file://$dataDir/xml/docbook/xml-dtd-$portVersion/calstblx.dtd" \ + $CATALOG + xmlcatalog --noout --add "public" \ + "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \ + "file://$dataDir/xml/docbook/xml-dtd-$portVersion/soextblx.dtd" \ + $CATALOG + xmlcatalog --noout --add "public" \ + "-//OASIS//ELEMENTS DocBook XML Information Pool V$portVersion//EN" \ + "file://$dataDir/xml/docbook/xml-dtd-$portVersion/dbpoolx.mod" \ + $CATALOG + xmlcatalog --noout --add "public" \ + "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V$portVersion//EN" \ + "file://$dataDir/xml/docbook/xml-dtd-$portVersion/dbhierx.mod" \ + $CATALOG + xmlcatalog --noout --add "public" \ + "-//OASIS//ELEMENTS DocBook XML HTML Tables V$portVersion//EN" \ + "file://$dataDir/xml/docbook/xml-dtd-$portVersion/htmltblx.mod" \ + $CATALOG + xmlcatalog --noout --add "public" \ + "-//OASIS//ENTITIES DocBook XML Notations V$portVersion//EN" \ + "file://$dataDir/xml/docbook/xml-dtd-$portVersion/dbnotnx.mod" \ + $CATALOG + xmlcatalog --noout --add "public" \ + "-//OASIS//ENTITIES DocBook XML Character Entities V$portVersion//EN" \ + "file://$dataDir/xml/docbook/xml-dtd-$portVersion/dbcentx.mod" \ + $CATALOG + xmlcatalog --noout --add "public" \ + "-//OASIS//ENTITIES DocBook XML Additional General Entities V$portVersion//EN" \ + "file://$dataDir/xml/docbook/xml-dtd-$portVersion/dbgenent.mod" \ + $CATALOG + xmlcatalog --noout --add "rewriteSystem" \ + "http://www.oasis-open.org/docbook/xml/$portVersion" \ + "file://$dataDir/xml/docbook/xml-dtd-$portVersion" \ + $CATALOG + xmlcatalog --noout --add "rewriteURI" \ + "http://www.oasis-open.org/docbook/xml/$portVersion" \ + "file://$dataDir/xml/docbook/xml-dtd-$portVersion" \ + $CATALOG + + CATALOG=$settingsDir/etc/xml/catalog/docbook-xml-dtd + xmlcatalog --noout --create $CATALOG + + xmlcatalog --noout --add "delegatePublic" \ + "-//OASIS//ENTITIES DocBook XML" \ + "file://$settingsDir/etc/xml/docbook" \ + $CATALOG + xmlcatalog --noout --add "delegatePublic" \ + "-//OASIS//DTD DocBook XML" \ + "file://$settingsDir/etc/xml/docbook" \ + $CATALOG + xmlcatalog --noout --add "delegateSystem" \ + "http://www.oasis-open.org/docbook/" \ + "file://$settingsDir/etc/xml/docbook" \ + $CATALOG + xmlcatalog --noout --add "delegateURI" \ + "http://www.oasis-open.org/docbook/" \ + "file://$settingsDir/etc/xml/docbook" \ + $CATALOG +} + +GLOBAL_WRITABLE_FILES=" + settings/etc/xml/catalog/docbook-xml-dtd keep-old + settings/etc/xml/docbook keep-old +" diff --git a/app-text/docbook_xml_dtd/licenses/Docbook b/app-text/docbook_xml_dtd/licenses/Docbook new file mode 100644 index 000000000..a77b8d3e8 --- /dev/null +++ b/app-text/docbook_xml_dtd/licenses/Docbook @@ -0,0 +1,26 @@ +Copyright 1992-2006 HaL Computer Systems, Inc., +O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software +Corporation, Norman Walsh, Sun Microsystems, Inc., and the +Organization for the Advancement of Structured Information +Standards (OASIS). + +See also http://docbook.org/specs/ + +$Id: docbookx.dtd 6340 2006-10-03 13:23:24Z nwalsh $ + +Permission to use, copy, modify and distribute the DocBook XML DTD +and its accompanying documentation for any purpose and without fee +is hereby granted in perpetuity, provided that the above copyright +notice and this paragraph appear in all copies. The copyright +holders make no representation about the suitability of the DTD for +any purpose. It is provided "as is" without expressed or implied +warranty. + +If you modify the DocBook DTD in any way, except for declaring and +referencing additional sets of general entities and declaring +additional notations, label your DTD as a variant of DocBook. See +the maintenance documentation for more information. + +Please direct all questions, bug reports, or suggestions for +changes to the docbook@lists.oasis-open.org mailing list. For more +information, see http://www.oasis-open.org/docbook/. diff --git a/app-text/docbook_xsl_stylesheets/docbook_xsl_stylesheets-1.78.1.recipe b/app-text/docbook_xsl_stylesheets/docbook_xsl_stylesheets-1.78.1.recipe index d76ef5487..645406032 100644 --- a/app-text/docbook_xsl_stylesheets/docbook_xsl_stylesheets-1.78.1.recipe +++ b/app-text/docbook_xsl_stylesheets/docbook_xsl_stylesheets-1.78.1.recipe @@ -24,6 +24,7 @@ PROVIDES=" " BUILD_PREREQUIRES=" + cmd:xmlcatalog cmd:find " @@ -43,4 +44,31 @@ INSTALL() xhtml xhtml-1_1 $dataDir/xml/docbook/xsl-stylesheets-1.78.1 ln -s VERSION $dataDir/xml/docbook/xsl-stylesheets-1.78.1/VERSION.xsl + + mkdir -p $settingsDir/etc/xml/catalog + + CATALOG=$settingsDir/etc/xml/catalog/docbook-xsl + xmlcatalog --noout --create $CATALOG + + xmlcatalog --noout --add "rewriteSystem" \ + "http://docbook.sourceforge.net/release/xsl/1.78.1" \ + "$dataDir/xml/docbook/xsl-stylesheets-1.78.1" \ + $CATALOG + + xmlcatalog --noout --add "rewriteURI" \ + "http://docbook.sourceforge.net/release/xsl/1.78.1" \ + "$dataDir/xml/docbook/xsl-stylesheets-1.78.1" \ + $CATALOG + + xmlcatalog --noout --add "rewriteSystem" \ + "http://docbook.sourceforge.net/release/xsl/current" \ + "$dataDir/xml/docbook/xsl-stylesheets-1.78.1" \ + $CATALOG + + xmlcatalog --noout --add "rewriteURI" \ + "http://docbook.sourceforge.net/release/xsl/current" \ + "$dataDir/xml/docbook/xsl-stylesheets-1.78.1" \ + $CATALOG } + +GLOBAL_WRITABLE_FILES="settings/etc/xml/catalog/docbook-xsl keep-old" diff --git a/dev-util/gtk_doc/gtk_doc-1.15.recipe b/dev-util/gtk_doc/gtk_doc-1.15.recipe deleted file mode 100644 index 87f6e85b7..000000000 --- a/dev-util/gtk_doc/gtk_doc-1.15.recipe +++ /dev/null @@ -1,24 +0,0 @@ -DESCRIPTION="gtk-doc" -HOMEPAGE="http://www.gtk.org/gtk-doc/" -SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/1.15/gtk-doc-1.15.tar.bz2" -CHECKSUM_MD5="c022788b1fbbec30d55df4ccb34eeb90" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="pkgconfig >= 0.23 - dev-libs/libxslt >= 1.1.26" -BUILD() -{ - cd gtk-doc-1.15 - ./configure --prefix=`finddir B_COMMON_DIRECTORY` - make -} - -INSTALL() -{ - cd gtk-doc-1.15 - make install -} - -LICENSE="GNU GPL v2 - GNU FDL v1.1" -COPYRIGHT="2002-2010 Damon Chaplin and Owen Taylor" diff --git a/dev-util/gtk_doc/gtk_doc-1.20.recipe b/dev-util/gtk_doc/gtk_doc-1.20.recipe new file mode 100644 index 000000000..a0eca295e --- /dev/null +++ b/dev-util/gtk_doc/gtk_doc-1.20.recipe @@ -0,0 +1,43 @@ +SUMMARY="Generate documentation from C sources" +DESCRIPTION=" +GTK-Doc is a project which was started to generate API documentation from \ +comments added to C code. It is typically used to document the public API of \ +GTK+ and GNOME libraries, but it can also be used to document application code. +" +HOMEPAGE="http://www.gtk.org/gtk-doc/" +SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/$portVersion/gtk-doc-$portVersion.tar.xz" +CHECKSUM_SHA256="3e6ecf134dbf92a74c24d79848fea3a48e59ab95408a38c6405905d95a293011" +REVISION="1" +ARCHITECTURES="x86_gcc2" +PROVIDES=" + gtk_doc = $portVersion +" + +BUILD_REQUIRES=" + docbook_xml_dtd == 4.3 + docbook_xsl_stylesheets +" + +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:awk + cmd:gcc + cmd:perl + cmd:pkg_config + cmd:xsltproc +" + +SOURCE_DIR="gtk-doc-$portVersion" +BUILD() +{ + runConfigure ./configure + make +} + +INSTALL() +{ + make install +} + +LICENSE="GNU GPL v2" +COPYRIGHT="2002-2010 Damon Chaplin and Owen Taylor" From 711f8e4697efed037838196bf76878da25931c6b Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Mon, 16 Jun 2014 22:29:15 +0200 Subject: [PATCH 23/27] Libxml2: allow the default catalog to be a directory. This makes it easier for other packages to provide catalog entries. Used by docbook-xml and docbook-xslt. --- dev-libs/libxml2/libxml2-2.8.0.recipe | 2 +- .../libxml2/patches/libxml2-2.8.0.patchset | 59 +++++++++++++++++-- 2 files changed, 56 insertions(+), 5 deletions(-) diff --git a/dev-libs/libxml2/libxml2-2.8.0.recipe b/dev-libs/libxml2/libxml2-2.8.0.recipe index 7f87250bd..0e3e28ff3 100644 --- a/dev-libs/libxml2/libxml2-2.8.0.recipe +++ b/dev-libs/libxml2/libxml2-2.8.0.recipe @@ -4,7 +4,7 @@ LICENSE="MIT" COPYRIGHT="1998-2003 Daniel Veillard. All Rights Reserved." SRC_URI="ftp://xmlsoft.org/libxml2/libxml2-2.8.0.tar.gz" CHECKSUM_SHA256="f2e2d0e322685193d1affec83b21dc05d599e17a7306d7b90de95bb5b9ac622a" -REVISION="7" +REVISION="8" ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" diff --git a/dev-libs/libxml2/patches/libxml2-2.8.0.patchset b/dev-libs/libxml2/patches/libxml2-2.8.0.patchset index 04aea95d4..19e7c5d8c 100644 --- a/dev-libs/libxml2/patches/libxml2-2.8.0.patchset +++ b/dev-libs/libxml2/patches/libxml2-2.8.0.patchset @@ -1,4 +1,4 @@ -From 5f1f102b9ca68a60598e75acd2dfcc03eedf48f0 Mon Sep 17 00:00:00 2001 +From 6db1eb950d7c25695085ceba0688c0fda21aec99 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Fri, 9 Aug 2013 03:04:24 +0200 Subject: applying patch libxml2-2.8.0.patch @@ -60,7 +60,7 @@ index 2989325..162d348 100644 1.8.3.4 -From af85142e9157eec3acd0b5f6d171eeb63a5dd6c5 Mon Sep 17 00:00:00 2001 +From d06473f826da81a99d33142030378e2301ca358a Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Fri, 9 Aug 2013 20:15:20 +0200 Subject: configure.in: hack to find python directories on Haiku @@ -91,7 +91,7 @@ index a5f86ca..ade0cf8 100644 1.8.3.4 -From 077d229d4c92bbb11d5ce2dfa6ce9334b77c30db Mon Sep 17 00:00:00 2001 +From 0c143c7013080fdf83a863cf3bfbd730dbec1b6e Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Fri, 9 Aug 2013 23:00:24 +0200 Subject: python[/tests]/Makefile.am: $(datadir)/doc -> $(docdir) @@ -124,7 +124,7 @@ index 52c89fc..7549db9 100644 1.8.3.4 -From 020e1f1fb2f2234d0a7222e03c6077e9df06e8fb Mon Sep 17 00:00:00 2001 +From 3751469e256a007663bebb0b2206b1700d73d5c7 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Fri, 18 Oct 2013 23:51:10 +0200 Subject: Adjust libxml2 to use vendor-packages directory. @@ -150,3 +150,54 @@ index ade0cf8..522a2c0 100644 -- 1.8.3.4 + +From a7785e3256cfd57da9e21c11937cd6a4ab5b66a6 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Mon, 16 Jun 2014 22:26:17 +0200 +Subject: Allow XML_CATALOG_FILES to point to directories. + +These are then recursively explored. Makes it much easier for packages +to add stuff to the default catalogs + +diff --git a/catalog.c b/catalog.c +index fb586c1..cb74df0 100644 +--- a/catalog.c ++++ b/catalog.c +@@ -3149,6 +3149,7 @@ xmlInitializeCatalog(void) { + if (catal != NULL) { + /* the XML_CATALOG_FILES envvar is allowed to contain a + space-separated list of entries. */ ++ + cur = catalogs; + nextent = &catal->xml; + while (*cur != '\0') { +@@ -3160,10 +3161,26 @@ xmlInitializeCatalog(void) { + cur++; + path = (char *) xmlStrndup((const xmlChar *)paths, cur - paths); + if (path != NULL) { ++#if defined(HAIKU) ++ /* On Haiku, we allow directories in that list, as well as files. */ ++ int addCatalog(const char* path, const struct stat* sb, int typeflag) ++ { ++ if (typeflag == FTW_F) { ++ *nextent = xmlNewCatalogEntry(XML_CATA_CATALOG, NULL, ++ NULL, BAD_CAST path, xmlCatalogDefaultPrefer, NULL); ++ if (*nextent != NULL) ++ nextent = &((*nextent)->next); ++ } ++ ++ return 0; ++ } ++ ftw(path, addCatalog, 3); ++#else + *nextent = xmlNewCatalogEntry(XML_CATA_CATALOG, NULL, + NULL, BAD_CAST path, xmlCatalogDefaultPrefer, NULL); + if (*nextent != NULL) + nextent = &((*nextent)->next); ++#endif + xmlFree(path); + } + } +-- +1.8.3.4 + From 4ad70452447353664a5c51efa992432b431b76eb Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Wed, 18 Jun 2014 14:01:06 +0200 Subject: [PATCH 24/27] ruby 2.1.1: secondary arch support fixes. * Not really tested yet, but this is better on the repos than only on my hard disk. --- dev-lang/ruby/ruby-2.1.1.recipe | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/dev-lang/ruby/ruby-2.1.1.recipe b/dev-lang/ruby/ruby-2.1.1.recipe index 589540b52..b63c482c7 100644 --- a/dev-lang/ruby/ruby-2.1.1.recipe +++ b/dev-lang/ruby/ruby-2.1.1.recipe @@ -19,8 +19,13 @@ COPYRIGHT="1993-2014 Yukihiro Matsumoto" REVISION="1" -ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64" -SECONDARY_ARCHITECTURES="!x86" +ARCHITECTURES="?x86 ?x86_64" +if [ $effectiveTargetArchitecture != x86_gcc2 ]; then + # x86_gcc2 is fine as primary target architecture as long as we're building + # for a different secondary architecture. + ARCHITECTURES="$ARCHITECTURES x86_gcc2" +fi +SECONDARY_ARCHITECTURES="x86" PROVIDES=" ruby$secondaryArchSuffix = $portVersion compat >= 1.9 @@ -46,6 +51,7 @@ REQUIRES=" " BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion devel:libedit$secondaryArchSuffix devel:libz$secondaryArchSuffix devel:libcrypto$secondaryArchSuffix @@ -55,12 +61,12 @@ BUILD_REQUIRES=" " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion cmd:gcc$secondaryArchSuffix cmd:g++$secondaryArchSuffix cmd:autoconf cmd:make cmd:bison + cmd:git " PROVIDES_devel=" @@ -76,16 +82,15 @@ REQUIRES_devel=" BUILD() { - runConfigure ./configure --enable-shared + autoconf + runConfigure ./configure --enable-shared --disable-silent-rules # The build process needs to run ruby, and without this it fails to find # libruby.so. - export LIBRARY_PATH=$LIBRARY_PATH:%A make $jobArgs } INSTALL() { - export LIBRARY_PATH=$LIBRARY_PATH:%A make install prepareInstalledDevelLibs libruby-static libruby packageEntries devel $developDir From 01b166aa7c9b1c91256f7b6a3a0436aed6f6f0dc Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Wed, 18 Jun 2014 14:04:39 +0000 Subject: [PATCH 25/27] Python 2.7: re-add missed part from our 2.6.9 patches to make site- and vendor-packages work. User-packages still not working, the code for this was refactored in Python and my skills with the languages are too weak for me to adjust the patch. --- dev-lang/python/patches/python-2.7.6.patchset | 36 +++++++++++++++++-- dev-lang/python/python-2.7.6.recipe | 2 +- 2 files changed, 35 insertions(+), 3 deletions(-) diff --git a/dev-lang/python/patches/python-2.7.6.patchset b/dev-lang/python/patches/python-2.7.6.patchset index 22d516fe1..d518a0001 100644 --- a/dev-lang/python/patches/python-2.7.6.patchset +++ b/dev-lang/python/patches/python-2.7.6.patchset @@ -1,4 +1,4 @@ -From faaf6967e31a129b062c3a3a9b6752944aee865f Mon Sep 17 00:00:00 2001 +From 2e6d0a2e4c715dd9a3ef2ce19ae6389a6dd4e0c7 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Wed, 12 Mar 2014 21:17:06 +0000 Subject: initial Haiku patch @@ -759,7 +759,7 @@ index 40ad843..24621ef 100644 1.8.3.4 -From 6e1205e2b0b90002f678ed93a8a27ab567e8bd86 Mon Sep 17 00:00:00 2001 +From 077cde20cfcd287454dcc131e10c00a0c7bb6e2e Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sat, 5 Apr 2014 21:16:40 +0000 Subject: fix pyconfig.h path @@ -781,3 +781,35 @@ index cf75650..bb54b6f 100644 -- 1.8.3.4 + +From 6123b9d003eb7c5dd8f7cb468b8937061dc8f0dd Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Wed, 18 Jun 2014 12:19:13 +0000 +Subject: Import missed change from the 2.6.9 patches + +This makes our site- and vendor- packages work properly again. +It's sill missing the changes to addusersitepackages. This method was apparently refactored, and I don't have enough Python knowledge to redo our changes in the new code. User packages will not workas +expected with +this version of Python. + +diff --git a/Lib/site.py b/Lib/site.py +index f1b0ae8..c18a7dd 100644 +--- a/Lib/site.py ++++ b/Lib/site.py +@@ -287,6 +287,13 @@ def getsitepackages(): + + if sys.platform in ('os2emx', 'riscos'): + sitepackages.append(os.path.join(prefix, "Lib", "site-packages")) ++ elif sys.platform.startswith('haiku'): ++ sitepackages.append(os.path.join(prefix, "non-packaged", "lib", ++ "python" + sys.version[:3], ++ "site-packages")) ++ sitepackages.append(os.path.join(prefix, "lib", ++ "python" + sys.version[:3], ++ "vendor-packages")) + elif os.sep == '/': + sitepackages.append(os.path.join(prefix, "lib", + "python" + sys.version[:3], +-- +1.8.3.4 + diff --git a/dev-lang/python/python-2.7.6.recipe b/dev-lang/python/python-2.7.6.recipe index ada901e8a..58437c961 100644 --- a/dev-lang/python/python-2.7.6.recipe +++ b/dev-lang/python/python-2.7.6.recipe @@ -13,7 +13,7 @@ LICENSE="Python" COPYRIGHT="1990-2012, Python Software Foundation" SRC_URI="https://www.python.org/ftp/python/2.7.6/Python-2.7.6.tar.xz" CHECKSUM_SHA256="1fd68e81f8bf7386ff239b7faee9ba387129d2cf34eab13350bd8503a0bff6a1" -REVISION="2" +REVISION="3" ARCHITECTURES="!x86_gcc2 !x86 x86_64" PATCHES="python-2.7.6.patchset" From aba7deaf7993d6febf6d64d0ec7ac4e268a46a5a Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Wed, 18 Jun 2014 14:06:16 +0000 Subject: [PATCH 26/27] llvm: fix recipe. Set the installation paths by forcing the variable passed to make; as configure options are ignored. As a result; add a bunch of provides to match the now properly detected libraries which are installed in alace where people can use them. This makes the package build properly with haikuporter -S. --- sys-devel/llvm/llvm-3.4.1.recipe | 135 ++++++++++++++++++++- sys-devel/llvm/patches/llvm-3.4.1.patchset | 7 +- 2 files changed, 135 insertions(+), 7 deletions(-) diff --git a/sys-devel/llvm/llvm-3.4.1.recipe b/sys-devel/llvm/llvm-3.4.1.recipe index 86f50f614..e1ddd5a1c 100644 --- a/sys-devel/llvm/llvm-3.4.1.recipe +++ b/sys-devel/llvm/llvm-3.4.1.recipe @@ -44,6 +44,107 @@ PROVIDES=" cmd:llvm_tblgen cmd:macho_dump cmd:opt + lib:BugpointPasses + lib:LLVMHello + lib:libLTO + + devel:libLLVMAArch64AsmParser + devel:libLLVMAArch64AsmPrinter + devel:libLLVMAArch64CodeGen + devel:libLLVMAArch64Desc + devel:libLLVMAArch64Disassembler + devel:libLLVMAArch64Info + devel:libLLVMAArch64Utils + devel:libLLVMARMAsmParser + devel:libLLVMARMAsmPrinter + devel:libLLVMARMCodeGen + devel:libLLVMARMDesc + devel:libLLVMARMDisassembler + devel:libLLVMARMInfo + devel:libLLVMAnalysis + devel:libLLVMAsmParser + devel:libLLVMAsmPrinter + devel:libLLVMBitReader + devel:libLLVMBitWriter + devel:libLLVMCodeGen + devel:libLLVMCore + devel:libLLVMCppBackendCodeGen + devel:libLLVMCppBackendInfo + devel:libLLVMDebugInfo + devel:libLLVMExecutionEngine + devel:libLLVMHexagonAsmPrinter + devel:libLLVMHexagonCodeGen + devel:libLLVMHexagonDesc + devel:libLLVMHexagonInfo + devel:libLLVMIRReader + devel:libLLVMInstCombine + devel:libLLVMInstrumentation + devel:libLLVMInterpreter + devel:libLLVMJIT + devel:libLLVMLTO + devel:libLLVMLinker + devel:libLLVMMC + devel:libLLVMMCDisassembler + devel:libLLVMMCJIT + devel:libLLVMMCParser + devel:libLLVMMSP430AsmPrinter + devel:libLLVMMSP430CodeGen + devel:libLLVMMSP430Desc + devel:libLLVMMSP430Info + devel:libLLVMMipsAsmParser + devel:libLLVMMipsAsmPrinter + devel:libLLVMMipsCodeGen + devel:libLLVMMipsDesc + devel:libLLVMMipsDisassembler + devel:libLLVMMipsInfo + devel:libLLVMNVPTXAsmPrinter + devel:libLLVMNVPTXCodeGen + devel:libLLVMNVPTXDesc + devel:libLLVMNVPTXInfo + devel:libLLVMObjCARCOpts + devel:libLLVMObject + devel:libLLVMOption + devel:libLLVMPowerPCAsmParser + devel:libLLVMPowerPCAsmPrinter + devel:libLLVMPowerPCCodeGen + devel:libLLVMPowerPCDesc + devel:libLLVMPowerPCInfo + devel:libLLVMR600AsmPrinter + devel:libLLVMR600CodeGen + devel:libLLVMR600Desc + devel:libLLVMR600Info + devel:libLLVMRuntimeDyld + devel:libLLVMScalarOpts + devel:libLLVMSelectionDAG + devel:libLLVMSparcCodeGen + devel:libLLVMSparcDesc + devel:libLLVMSparcInfo + devel:libLLVMSupport + devel:libLLVMSystemZAsmParser + devel:libLLVMSystemZAsmPrinter + devel:libLLVMSystemZCodeGen + devel:libLLVMSystemZDesc + devel:libLLVMSystemZDisassembler + devel:libLLVMSystemZInfo + devel:libLLVMTableGen + devel:libLLVMTarget + devel:libLLVMTransformUtils + devel:libLLVMVectorize + devel:libLLVMX86AsmParser + devel:libLLVMX86AsmPrinter + devel:libLLVMX86CodeGen + devel:libLLVMX86Desc + devel:libLLVMX86Disassembler + devel:libLLVMX86Info + devel:libLLVMX86Utils + devel:libLLVMXCoreAsmPrinter + devel:libLLVMXCoreCodeGen + devel:libLLVMXCoreDesc + devel:libLLVMXCoreDisassembler + devel:libLLVMXCoreInfo + devel:libLLVMipa + devel:libLLVMipo + devel:libLTO " REQUIRES=" @@ -80,12 +181,42 @@ BUILD() # such as Mesa export REQUIRES_RTTI=1 runConfigure ./configure --enable-optimized - make $jobArgs + make $jobArgs PROJ_datadir=$dataDir PROJ_docsdir=$docDir \ + PROJ_mandir=$manDir PROJ_includedir=$includeDir PROJ_libdir=$libDir } INSTALL() { - make install + make install PROJ_datadir=$dataDir PROJ_docsdir=$docDir \ + PROJ_mandir=$manDir PROJ_includedir=$includeDir PROJ_libdir=$libDir + + prepareInstalledDevelLibs libLLVMAArch64AsmParser libLLVMAArch64Disassembler \ + libLLVMAArch64Utils + prepareInstalledDevelLibs libLLVMARMAsmParser libLLVMARMDisassembler + prepareInstalledDevelLibs libLLVMMipsAsmParser libLLVMMipsDisassembler + prepareInstalledDevelLibs libLLVMPowerPCAsmParser + prepareInstalledDevelLibs libLLVMSystemZAsmParser libLLVMSystemZDisassembler + prepareInstalledDevelLibs libLLVMX86AsmParser libLLVMX86Disassembler libLLVMX86Utils + prepareInstalledDevelLibs libLLVMXCoreDisassembler + + prepareInstalledDevelLibs libLLVMSparcCodeGen libLLVMSparcDesc libLLVMSparcInfo + + for arch in AArch64 ARM Hexagon Mips MSP430 NVPTX PowerPC R600 SystemZ X86 XCore + do + prepareInstalledDevelLibs libLLVM${arch}AsmPrinter \ + libLLVM${arch}CodeGen libLLVM${arch}Desc libLLVM${arch}Info + done + + prepareInstalledDevelLibs libLLVMAnalysis libLLVMAsmParser \ + libLLVMAsmPrinter libLLVMBitReader libLLVMBitWriter libLLVMCodeGen \ + libLLVMCore libLLVMCppBackendCodeGen libLLVMCppBackendInfo \ + libLLVMDebugInfo libLLVMExecutionEngine libLLVMIRReader \ + libLLVMInstCombine libLLVMInstrumentation libLLVMInterpreter libLLVMJIT \ + libLLVMLTO libLLVMLinker libLLVMMC libLLVMMCDisassembler libLLVMMCJIT \ + libLLVMMCParser libLLVMObjCARCOpts libLLVMObject libLLVMOption \ + libLLVMRuntimeDyld libLLVMScalarOpts libLLVMSelectionDAG libLLVMSupport \ + libLLVMTableGen libLLVMTarget libLLVMTransformUtils libLLVMVectorize \ + libLLVMipa libLLVMipo libLTO } TEST() diff --git a/sys-devel/llvm/patches/llvm-3.4.1.patchset b/sys-devel/llvm/patches/llvm-3.4.1.patchset index 9f14d94d8..0fa377b5f 100644 --- a/sys-devel/llvm/patches/llvm-3.4.1.patchset +++ b/sys-devel/llvm/patches/llvm-3.4.1.patchset @@ -1,11 +1,8 @@ -From 744634aa845c403f5a39b8257bbacd36dc1dd351 Mon Sep 17 00:00:00 2001 +From 8bf543218812e2419f65ac444edbb2d86bad1708 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Wed, 22 Jan 2014 05:04:31 +0000 -Subject: [PATCH] haiku: fix Host.h for endian.h +Subject: haiku: fix Host.h for endian.h ---- - include/llvm/Support/Host.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/llvm/Support/Host.h b/include/llvm/Support/Host.h index 28c4cc7..ab985a4 100644 From 667aa7e22af2282be04772c558d21ff709f90cdc Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Wed, 18 Jun 2014 15:35:04 +0000 Subject: [PATCH 27/27] Forgot to commit patches to llvm. Thanks to Diver for noticing. --- sys-devel/llvm/patches/llvm-3.4.1.patchset | 26 ++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/sys-devel/llvm/patches/llvm-3.4.1.patchset b/sys-devel/llvm/patches/llvm-3.4.1.patchset index 0fa377b5f..58bb71623 100644 --- a/sys-devel/llvm/patches/llvm-3.4.1.patchset +++ b/sys-devel/llvm/patches/llvm-3.4.1.patchset @@ -20,3 +20,29 @@ index 28c4cc7..ab985a4 100644 -- 1.8.3.4 + +From 64d6eca1a47b91ff89fc41d8f4eb20b64a0e68d6 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Wed, 18 Jun 2014 15:32:09 +0000 +Subject: llvm: add a soname to libLTO. + +This makes PrepareInstalledDevelLib happy. + +diff --git a/tools/lto/Makefile b/tools/lto/Makefile +index cedbee1..5ce530d 100644 +--- a/tools/lto/Makefile ++++ b/tools/lto/Makefile +@@ -22,6 +22,10 @@ ifdef LLVM_VERSION_INFO + CXX.Flags += -DLLVM_VERSION_INFO='"$(LLVM_VERSION_INFO)"' + endif + ++ifeq ($(HOST_OS),Haiku) ++ LLVMLibsOptions := $(LLVMLibsOptions) -Wl,-soname=$(SharedPrefix)LTO$(SHLIBEXT) ++endif ++ + ifeq ($(HOST_OS),Darwin) + # Special hack to allow libLTO to have an offset version number. + ifdef LLVM_LTO_VERSION_OFFSET +-- +1.8.3.4 +