From bd71377a2356f1b7a1b017358bcee74645ed7e1d Mon Sep 17 00:00:00 2001 From: miqlas Date: Mon, 26 Dec 2016 19:55:57 +0100 Subject: [PATCH 1/7] mplayer: bump version, updated patchset (#960) --- ...ayer-1.1.1.recipe => mplayer-1.3.0.recipe} | 91 ++++++--- ....1.patchset => mplayer_x86-1.3.0.patchset} | 183 +++++++++--------- 2 files changed, 151 insertions(+), 123 deletions(-) rename media-video/mplayer/{mplayer-1.1.1.recipe => mplayer-1.3.0.recipe} (63%) rename media-video/mplayer/patches/{mplayer_x86-1.1.1.patchset => mplayer_x86-1.3.0.patchset} (91%) diff --git a/media-video/mplayer/mplayer-1.1.1.recipe b/media-video/mplayer/mplayer-1.3.0.recipe similarity index 63% rename from media-video/mplayer/mplayer-1.1.1.recipe rename to media-video/mplayer/mplayer-1.3.0.recipe index 72a1ae97b..c72aafc73 100644 --- a/media-video/mplayer/mplayer-1.1.1.recipe +++ b/media-video/mplayer/mplayer-1.3.0.recipe @@ -19,98 +19,127 @@ European/ISO 8859-1,2 (Hungarian, English, Czech, etc), Cyrillic and Korean \ fonts are supported along with 12 subtitle formats (MicroDVD, SubRip, OGM, \ SubViewer, Sami, VPlayer, RT, SSA, AQTitle, JACOsub, PJS and our own: MPsub). \ DVD subtitles (SPU streams, VOBsub and Closed Captions) are supported as well." -HOMEPAGE="http://www.mplayerhq.hu" -COPYRIGHT="2001-2013 The MPlayer Team" +HOMEPAGE="http://www.mplayerhq.hu/" +COPYRIGHT="2001-2016 The MPlayer Team" LICENSE="GNU LGPL v2.1" -REVISION="3" -SOURCE_URI="http://www.mplayerhq.hu/MPlayer/releases/MPlayer-1.1.1.tar.xz" -CHECKSUM_SHA256="ce8fc7c3179e6a57eb3a58cb7d1604388756b8a61764cc93e095e7aff3798c76" -SOURCE_DIR="MPlayer-1.1.1" -PATCHES="mplayer_x86-1.1.1.patchset" +REVISION="1" +SOURCE_URI="http://www.mplayerhq.hu/MPlayer/releases/MPlayer-$portVersion.tar.xz" +CHECKSUM_SHA256="3ad0846c92d89ab2e4e6fb83bf991ea677e7aa2ea775845814cbceb608b09843" +SOURCE_DIR="MPlayer-$portVersion" +PATCHES="mplayer_x86-1.3.0.patchset" -ARCHITECTURES="x86_gcc2 x86" +ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" PROVIDES=" mplayer$secondaryArchSuffix = $portVersion - cmd:mplayer cmd:mencoder + cmd:mplayer " REQUIRES=" haiku$secondaryArchSuffix + ffmpeg$secondaryArchSuffix + cdrtools$secondaryArchSuffix + #lib:live555$secondaryArchSuffix lib:liba52$secondaryArchSuffix lib:libbz2$secondaryArchSuffix + lib:libcaca$secondaryArchSuffix + #lib:libcddb$secondaryArchSuffix + lib:libcdio$secondaryArchSuffix lib:libdca$secondaryArchSuffix lib:libdv$secondaryArchSuffix lib:libdvdcss$secondaryArchSuffix lib:libdvdnav$secondaryArchSuffix lib:libdvdread$secondaryArchSuffix + lib:libfaac$secondaryArchSuffix lib:libfaad$secondaryArchSuffix + lib:libflac$secondaryArchSuffix + lib:libfontconfig$secondaryArchSuffix lib:libfreetype$secondaryArchSuffix lib:libfribidi$secondaryArchSuffix - lib:libfontconfig$secondaryArchSuffix + lib:libgif$secondaryArchSuffix + lib:libgl$secondaryArchSuffix + lib:libgnutls$secondaryArchSuffix lib:libiconv$secondaryArchSuffix - lib:libGL$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix lib:liblzo2$secondaryArchSuffix lib:libmad$secondaryArchSuffix lib:libmng$secondaryArchSuffix lib:libmp3lame$secondaryArchSuffix + #lib:libmpcdec$secondaryArchSuffix + lib:libmpeg2$secondaryArchSuffix lib:libmpg123$secondaryArchSuffix + lib:libncursesw$secondaryArchSuffix + lib:libogg$secondaryArchSuffix lib:libopenal$secondaryArchSuffix + #lib:libopenjp2$secondaryArchSuffix + lib:libopus$secondaryArchSuffix lib:libpng$secondaryArchSuffix -# lib:libsdl_1.2$secondaryArchSuffix + #lib:libschroedinger_1.0$secondaryArchSuffix + #lib:libsdl$secondaryArchSuffix + lib:libsmbclient$secondaryArchSuffix lib:libspeex$secondaryArchSuffix + lib:libtheora$secondaryArchSuffix lib:libtwolame$secondaryArchSuffix + lib:libvorbis$secondaryArchSuffix lib:libvpx$secondaryArchSuffix + lib:libx264$secondaryArchSuffix lib:libz$secondaryArchSuffix " BUILD_REQUIRES=" + ffmpeg${secondaryArchSuffix}_devel + #devel:live555$secondaryArchSuffix devel:liba52$secondaryArchSuffix devel:libbz2$secondaryArchSuffix -# devel:libcaca$secondaryArchSuffix -# devel:libcdio$secondaryArchSuffix + devel:libcaca$secondaryArchSuffix + #devel:libcddb$secondaryArchSuffix + devel:libcdio$secondaryArchSuffix devel:libdca$secondaryArchSuffix devel:libdv$secondaryArchSuffix devel:libdvdcss$secondaryArchSuffix devel:libdvdnav$secondaryArchSuffix devel:libdvdread$secondaryArchSuffix -# devel:libfaac$secondaryArchSuffix + devel:libfaac$secondaryArchSuffix devel:libfaad$secondaryArchSuffix devel:libflac$secondaryArchSuffix devel:libfontconfig$secondaryArchSuffix devel:libfreetype$secondaryArchSuffix devel:libfribidi$secondaryArchSuffix -# devel:libgif$secondaryArchSuffix + devel:libgif$secondaryArchSuffix devel:libgl$secondaryArchSuffix + devel:libgnutls$secondaryArchSuffix devel:libiconv$secondaryArchSuffix devel:libjpeg$secondaryArchSuffix devel:liblzo2$secondaryArchSuffix devel:libmad$secondaryArchSuffix devel:libmng$secondaryArchSuffix devel:libmp3lame$secondaryArchSuffix -# devel:libmpcdec$secondaryArchSuffix + #devel:libmpcdec$secondaryArchSuffix + devel:libmpeg2$secondaryArchSuffix devel:libmpg123$secondaryArchSuffix + devel:libncursesw$secondaryArchSuffix devel:libogg$secondaryArchSuffix devel:libopenal$secondaryArchSuffix - devel:libopenjp2$secondaryArchSuffix -# devel:libparanoia$secondaryArchSuffix + #devel:libopenjp2$secondaryArchSuffix + devel:libopus$secondaryArchSuffix + devel:libparanoia$secondaryArchSuffix devel:libpng$secondaryArchSuffix -# devel:libschroedinger$secondaryArchSuffix - devel:libsdl$secondaryArchSuffix -# devel:libsmbclient$secondaryArchSuffix + #devel:libschroedinger_1.0$secondaryArchSuffix + #devel:libsdl$secondaryArchSuffix + devel:libsmbclient$secondaryArchSuffix devel:libspeex$secondaryArchSuffix + devel:libtheora$secondaryArchSuffix devel:libtwolame$secondaryArchSuffix devel:libvorbis$secondaryArchSuffix devel:libvpx$secondaryArchSuffix -# devel:libx264$secondaryArchSuffix + devel:libx264$secondaryArchSuffix devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" haiku${secondaryArchSuffix}_devel cmd:gcc$secondaryArchSuffix - cmd:libtoolize + cmd:libtoolize$secondaryArchSuffix cmd:make cmd:pkg_config$secondaryArchSuffix cmd:yasm @@ -118,17 +147,21 @@ BUILD_PREREQUIRES=" BUILD() { + export CFLAGS="-D_BSD_SOURCE" + export LDFLAGS="-lnetwork -lbsd" + libtoolize --force --copy --install configure --prefix=$prefix --datadir=$dataDir \ --confdir=$settingsDir/mplayer --mandir=$manDir \ - --disable-x264 --disable-x264-lavc --disable-dvdread-internal \ - --enable-dvdread --extra-libs=-ldvdcss --disable-mp3lib --enable-menu \ - --enable-haiku --disable-sdl --enable-runtime-cpudetection - #--disable-ffmpeg_a --enable-ffmpeg_so --enable-smb - make + --enable-dvdread --extra-libs="-ldvdcss -ldvdnav -ldvdread" --enable-menu \ + --enable-haiku --disable-sdl --enable-runtime-cpudetection \ + --enable-smb + #--disable-ffmpeg_a --enable-ffmpeg_so + make $jobArgs } INSTALL() { make install + strip $binDir/* } diff --git a/media-video/mplayer/patches/mplayer_x86-1.1.1.patchset b/media-video/mplayer/patches/mplayer_x86-1.3.0.patchset similarity index 91% rename from media-video/mplayer/patches/mplayer_x86-1.1.1.patchset rename to media-video/mplayer/patches/mplayer_x86-1.3.0.patchset index bff364ebc..046b5b12d 100644 --- a/media-video/mplayer/patches/mplayer_x86-1.1.1.patchset +++ b/media-video/mplayer/patches/mplayer_x86-1.3.0.patchset @@ -1,14 +1,50 @@ -From 8a689c685def90b00d11f471fecf2a0d7d8375f8 Mon Sep 17 00:00:00 2001 -From: Sergei Reznikov -Date: Thu, 12 Mar 2015 14:26:35 +0300 -Subject: Haiku: configure fixes +From 683eb6964591da827fe9f7c7827507d999a12696 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= +Date: Mon, 26 Dec 2016 17:18:13 +0100 +Subject: [PATCH] Haiku supporting code from Sergei Reznikov +--- + Makefile | 3 + + configure | 42 ++++++- + libao2/ao_haiku.cpp | 195 +++++++++++++++++++++++++++++++ + libao2/audio_out.c | 7 ++ + libvo/haiku_common.cpp | 304 +++++++++++++++++++++++++++++++++++++++++++++++++ + libvo/haiku_common.h | 69 +++++++++++ + libvo/haiku_view.cpp | 171 ++++++++++++++++++++++++++++ + libvo/haiku_view.h | 36 ++++++ + libvo/haiku_window.cpp | 125 ++++++++++++++++++++ + libvo/haiku_window.h | 31 +++++ + libvo/video_out.c | 4 + + libvo/vo_haiku.cpp | 201 ++++++++++++++++++++++++++++++++ + 12 files changed, 1185 insertions(+), 3 deletions(-) + create mode 100644 libao2/ao_haiku.cpp + create mode 100644 libvo/haiku_common.cpp + create mode 100644 libvo/haiku_common.h + create mode 100644 libvo/haiku_view.cpp + create mode 100644 libvo/haiku_view.h + create mode 100644 libvo/haiku_window.cpp + create mode 100644 libvo/haiku_window.h + create mode 100644 libvo/vo_haiku.cpp +diff --git a/Makefile b/Makefile +index f59f635..3d422c3 100644 +--- a/Makefile ++++ b/Makefile +@@ -544,6 +544,9 @@ SRCS_MPLAYER-$(S3FB) += libvo/vo_s3fb.c + SRCS_MPLAYER-$(SDL) += libao2/ao_sdl.c \ + libvo/vo_sdl.c \ + libvo/sdl_common.c ++SRCS_MPLAYER-$(HAIKU) += libao2/ao_haiku.cpp \ ++ libvo/vo_haiku.cpp \ ++ libvo/haiku_common.cpp + SRCS_MPLAYER-$(SGIAUDIO) += libao2/ao_sgi.c + SRCS_MPLAYER-$(SNDIO) += libao2/ao_sndio.c + SRCS_MPLAYER-$(SUNAUDIO) += libao2/ao_sun.c diff --git a/configure b/configure -index 722b8a4..5b5d52e 100755 +index d18543d..02f2004 100755 --- a/configure +++ b/configure -@@ -242,6 +242,7 @@ qnx() { issystem "QNX"; } +@@ -228,6 +228,7 @@ qnx() { issystem "QNX"; } sunos() { issystem "SunOS"; } wine() { issystem "Wine"; } win32() { cygwin || mingw32 || wine; } @@ -16,7 +52,7 @@ index 722b8a4..5b5d52e 100755 # arch test boolean functions # x86/x86pc is used by QNX -@@ -486,6 +487,7 @@ Video output: +@@ -469,6 +470,7 @@ Video output: --enable-vesa enable VESA video output [autodetect] --enable-svga enable SVGAlib video output [autodetect] --enable-sdl enable SDL video output [autodetect] @@ -24,15 +60,15 @@ index 722b8a4..5b5d52e 100755 --enable-kva enable KVA video output [autodetect] --enable-aa enable AAlib video output [autodetect] --enable-caca enable CACA video output [autodetect] -@@ -696,6 +698,7 @@ _xv=auto - _xvmc=no #auto when complete +@@ -678,6 +680,7 @@ _xvmc=no #auto when complete + _vda=auto _vdpau=auto _sdl=auto +_haiku=auto _kva=auto _direct3d=auto _directx=auto -@@ -1039,6 +1042,8 @@ for ac_option do +@@ -1028,6 +1031,8 @@ for ac_option do --disable-vdpau) _vdpau=no ;; --enable-sdl) _sdl=yes ;; --disable-sdl) _sdl=no ;; @@ -41,55 +77,7 @@ index 722b8a4..5b5d52e 100755 --enable-kva) _kva=yes ;; --disable-kva) _kva=no ;; --enable-direct3d) _direct3d=yes ;; -@@ -1513,14 +1518,15 @@ if test -z "$_target" ; then - - # host's CPU/instruction set - case "$(uname -m 2>&1)" in -- x86_64|amd64|i[3-9]86*|i86pc|x86|x86pc|k5|k6|k6_2|k6_3|k6-2|k6-3|pentium*|athlon*|i586_i686|i586-i686) host_arch=i386 ;; -+ x86_64|amd64|i[3-9]86*|i86pc|x86|x86pc|k5|k6|k6_2|k6_3|k6-2|k6-3|pentium*|athlon*|i586_i686|i586-i686|BePC) host_arch=i386 ;; - ia64) host_arch=ia64 ;; - macppc|ppc*|Power*) host_arch=ppc ;; - alpha) host_arch=alpha ;; - sun4*|sparc*) host_arch=sparc ;; - parisc*|hppa*|9000*) host_arch=hppa ;; -- arm*|zaurus|cats) host_arch=arm ;; -- sh3|sh4|sh4a) host_arch=sh ;; -+ arm*|zaurus|cats|evbarm) host_arch=arm ;; -+ sh3*) host_arch=sh ;; -+ sh4|sh4a) host_arch=sh4 ;; - s390) host_arch=s390 ;; - s390x) host_arch=s390x ;; - *mips*) host_arch=mips ;; -@@ -1545,6 +1551,7 @@ else # if test -z "$_target" - amigaos) system_name=AmigaOS ;; - mingw32*) system_name=MINGW32 ;; - wine) system_name=Wine ;; -+ haiku) system_name=Haiku ;; - esac - done - # We need to convert underscores so that values like k6-2 and pentium-mmx can be passed -@@ -1555,7 +1562,7 @@ else # if test -z "$_target" - fi - - extra_cflags="-I. -Iffmpeg $extra_cflags" --extra_ldflags="-lm $extra_ldflags" -+extra_ldflags="$extra_ldflags" - _timer=timer-linux.c - _getch=getch2.c - -@@ -1619,6 +1626,11 @@ if wine ; then - extra_cflags="-fno-pic -UWIN32 -U_WIN32 -U__WIN32 -U__WIN32__ -DWINE_NOWINSOCK -Dstricmp=strcasecmp $extra_cflags" - fi - -+if haiku ; then -+ extra_ldflags="$extra_ldflags -lbe -lmedia -lsupc++" -+ extra_cflags="-fno-pic $extra_cflags" -+fi -+ - for tmpdir in "$TMPDIR" "$TEMPDIR" "/tmp" ; do - test "$tmpdir" && break - done -@@ -1674,7 +1686,7 @@ else +@@ -1640,7 +1645,7 @@ else cc_name=$cc_name_tmp echocheck "$_cc version" cc_vendor=gnu @@ -98,7 +86,36 @@ index 722b8a4..5b5d52e 100755 case $cc_version in 2.96*) cc_fail=yes -@@ -5393,6 +5405,29 @@ fi +@@ -1710,7 +1715,7 @@ if test -z "$_target" ; then + # host's CPU/instruction set + set_host_arch() { + case "$1" in +- x86_64|amd64|i[3-9]86*|i86pc|x86|x86pc|k5|k6|k6_2|k6_3|k6-2|k6-3|pentium*|athlon*|i586_i686|i586-i686) host_arch=i386 ;; ++ x86_64|amd64|i[3-9]86*|i86pc|x86|x86pc|k5|k6|k6_2|k6_3|k6-2|k6-3|pentium*|athlon*|i586_i686|i586-i686|BePC) host_arch=i386 ;; + ia64) host_arch=ia64 ;; + macppc|ppc*|Power*) host_arch=ppc ;; + alpha) host_arch=alpha ;; +@@ -1749,6 +1754,7 @@ else # if test -z "$_target" + amigaos) system_name=AmigaOS ;; + mingw32*) system_name=MINGW32 ;; + wine) system_name=Wine ;; ++ haiku) system_name=Haiku ;; + esac + done + # We need to convert underscores so that values like k6-2 and pentium-mmx can be passed +@@ -1825,6 +1831,11 @@ if wine ; then + extra_cflags="-fno-pic -UWIN32 -U_WIN32 -U__WIN32 -U__WIN32__ -DWINE_NOWINSOCK $extra_cflags" + fi + ++if haiku ; then ++ extra_ldflags="$extra_ldflags -lbe -lmedia -lsupc++" ++ extra_cflags="-fno-pic $extra_cflags" ++fi ++ + if darwin && test "$cc_vendor" != "clang" ; then + extra_cflags="-falign-loops=16 -shared-libgcc $extra_cflags" + fi +@@ -5766,6 +5777,29 @@ fi echores "$_v4l2" @@ -128,7 +145,7 @@ index 722b8a4..5b5d52e 100755 ######### # AUDIO # -@@ -7639,7 +7674,7 @@ fi +@@ -8005,7 +8039,7 @@ fi # (FIXME: 'echocheck "dynamic linking"' above and modify here accordingly) ld_dl_dynamic='' freebsd || netbsd || openbsd || dragonfly || bsdos && ld_dl_dynamic='-rdynamic' @@ -137,15 +154,15 @@ index 722b8a4..5b5d52e 100755 ld_dl_dynamic='-rdynamic' fi -@@ -8150,6 +8185,7 @@ RADIO_CAPTURE=$_radio_capture +@@ -8498,6 +8532,7 @@ RADIO_CAPTURE=$_radio_capture REAL_CODECS = $_real S3FB = $_s3fb SDL = $_sdl +HAIKU = $_haiku + SDL_IMAGE = $sdl_image SPEEX = $_speex STREAM_CACHE = $_stream_cache - SGIAUDIO = $_sgiaudio -@@ -8647,6 +8683,7 @@ $def_quartz +@@ -9080,6 +9115,7 @@ $def_quartz $def_s3fb $def_sdl $def_sdl_sdl_h @@ -153,28 +170,6 @@ index 722b8a4..5b5d52e 100755 $def_svga $def_tdfxfb $def_tdfxvid --- -2.2.2 - - -From 1e10d843d1128b9d6a9084b44bf2211299b0f3d5 Mon Sep 17 00:00:00 2001 -From: Gerasim Troeglazov <3deyes@gmail.com> -Date: Thu, 12 Mar 2015 14:27:24 +0300 -Subject: Haiku: add native audio/video output modules - - -diff --git a/Makefile b/Makefile -index 940d43b..ec1163e 100644 ---- a/Makefile -+++ b/Makefile -@@ -591,6 +591,7 @@ SRCS_MPLAYER-$(PULSE) += libao2/ao_pulse.c - SRCS_MPLAYER-$(QUARTZ) += libvo/vo_quartz.c libvo/osx_common.c - SRCS_MPLAYER-$(S3FB) += libvo/vo_s3fb.c - SRCS_MPLAYER-$(SDL) += libao2/ao_sdl.c libvo/vo_sdl.c libvo/sdl_common.c -+SRCS_MPLAYER-$(HAIKU) += libao2/ao_haiku.cpp libvo/vo_haiku.cpp libvo/haiku_common.cpp - SRCS_MPLAYER-$(SGIAUDIO) += libao2/ao_sgi.c - SRCS_MPLAYER-$(SUNAUDIO) += libao2/ao_sun.c - SRCS_MPLAYER-$(SVGA) += libvo/vo_svga.c diff --git a/libao2/ao_haiku.cpp b/libao2/ao_haiku.cpp new file mode 100644 index 0000000..e201f17 @@ -377,18 +372,18 @@ index 0000000..e201f17 + return (float)(buffered + ao_data.buffersize)/(float)ao_data.bps; +} diff --git a/libao2/audio_out.c b/libao2/audio_out.c -index 6021ae1..2fa6bd8 100644 +index 197a63b..7f7baff 100644 --- a/libao2/audio_out.c +++ b/libao2/audio_out.c -@@ -42,6 +42,7 @@ extern const ao_functions_t audio_out_null; - extern const ao_functions_t audio_out_alsa; +@@ -43,6 +43,7 @@ extern const ao_functions_t audio_out_alsa; + extern const ao_functions_t audio_out_sndio; extern const ao_functions_t audio_out_nas; extern const ao_functions_t audio_out_sdl; +extern const ao_functions_t audio_out_haiku; extern const ao_functions_t audio_out_sun; extern const ao_functions_t audio_out_sgi; extern const ao_functions_t audio_out_win32; -@@ -104,6 +105,12 @@ const ao_functions_t* const audio_out_drivers[] = +@@ -108,6 +109,12 @@ const ao_functions_t* const audio_out_drivers[] = #ifdef CONFIG_SDL &audio_out_sdl, #endif @@ -1174,10 +1169,10 @@ index 0000000..34513df + + diff --git a/libvo/video_out.c b/libvo/video_out.c -index 813de7f..281ee3f 100644 +index bcf5174..c797ae8 100644 --- a/libvo/video_out.c +++ b/libvo/video_out.c -@@ -102,6 +102,7 @@ extern const vo_functions_t video_out_gl2; +@@ -109,6 +109,7 @@ extern const vo_functions_t video_out_gl_tiled; extern const vo_functions_t video_out_matrixview; extern const vo_functions_t video_out_dga; extern const vo_functions_t video_out_sdl; @@ -1185,7 +1180,7 @@ index 813de7f..281ee3f 100644 extern const vo_functions_t video_out_3dfx; extern const vo_functions_t video_out_tdfxfb; extern const vo_functions_t video_out_s3fb; -@@ -204,6 +205,9 @@ const vo_functions_t* const video_out_drivers[] = +@@ -211,6 +212,9 @@ const vo_functions_t* const video_out_drivers[] = #ifdef CONFIG_SDL &video_out_sdl, #endif @@ -1403,5 +1398,5 @@ index 0000000..614c8ff + + -- -2.2.2 +2.10.2 From 614b01f74b50946577134211124cd0a9b846a80a Mon Sep 17 00:00:00 2001 From: miqlas Date: Mon, 26 Dec 2016 20:11:40 +0100 Subject: [PATCH 2/7] mpd: version bump (#961) --- media-sound/mpd/{mpd-0.19.19.recipe => mpd-0.19.21.recipe} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename media-sound/mpd/{mpd-0.19.19.recipe => mpd-0.19.21.recipe} (96%) diff --git a/media-sound/mpd/mpd-0.19.19.recipe b/media-sound/mpd/mpd-0.19.21.recipe similarity index 96% rename from media-sound/mpd/mpd-0.19.19.recipe rename to media-sound/mpd/mpd-0.19.21.recipe index 0f8373890..0599319b4 100644 --- a/media-sound/mpd/mpd-0.19.19.recipe +++ b/media-sound/mpd/mpd-0.19.21.recipe @@ -8,8 +8,8 @@ COPYRIGHT="2003-2014 The Music Player Daemon Project" LICENSE="GNU GPL v2" REVISION="1" SOURCE_URI="http://www.musicpd.org/download/mpd/0.19/mpd-$portVersion.tar.xz" -CHECKSUM_SHA256="bc856cda4136403446d53d11576f86990b61d1fe4668f6008e9eae47450d4e1d" -PATCHES="mpd-$portVersion.patchset" +CHECKSUM_SHA256="8305b8bc026f4b6bde28b8dd09bfdddbe5590acf36358eed4d083a396e301730" +PATCHES="mpd-0.19.19.patchset" ARCHITECTURES="!x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" From 30fffe67d3c05d9166ca3b4efade383b14e1c811 Mon Sep 17 00:00:00 2001 From: miqlas Date: Mon, 26 Dec 2016 20:23:10 +0100 Subject: [PATCH 3/7] R-lang : new recipe (#959) --- dev-lang/r/r-3.3.2.recipe | 119 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 119 insertions(+) create mode 100644 dev-lang/r/r-3.3.2.recipe diff --git a/dev-lang/r/r-3.3.2.recipe b/dev-lang/r/r-3.3.2.recipe new file mode 100644 index 000000000..7111ac1c3 --- /dev/null +++ b/dev-lang/r/r-3.3.2.recipe @@ -0,0 +1,119 @@ +SUMMARY="A programming language primarily for statistics and numerical analysis" +DESCRIPTION="R is GNU S, a system for statistical computation and graphics. \ +It consists of a language plus a run-time environment with graphics, a \ +debugger, access to certain system functions, and the ability to run programs \ +stored in script files. The core of R is an interpreted computer language \ +which allows branching and looping as well as modular programming using \ +functions. The R distribution contains functionality for a large number of \ +statistical procedures such as: linear and generalized linear models, \ +nonlinear regression models, time series analysis, classical parametric and \ +nonparametric tests, clustering, smoothing and graphical data \ +representations. Additional modules ('add-on packages') are available for a \ +variety of specific purposes but are not distributed with this package." +HOMEPAGE="http://www.r-project.org/" +COPYRIGHT="1993-2016 The R Core Team" +LICENSE="GNU GPL v2" +REVISION="1" +SOURCE_URI="https://cloud.r-project.org/src/base/R-3/R-$portVersion.tar.gz" +CHECKSUM_SHA256="d294ad21e9f574fb4828ebb3a94b8cb34f4f304a41687a994be00dd41a4e514c" +SOURCE_DIR="R-$portVersion" + +ARCHITECTURES="!x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="!x86_gcc2 x86" + +PROVIDES=" + r$secondaryArchSuffix = $portVersion + cmd:r$secondaryArchSuffix + cmd:rscript$secondaryArchSuffix + " +REQUIRES=" + haiku$secondaryArchSuffix + #lib:libcairo$secondaryArchSuffix + lib:libcurl$secondaryArchSuffix + lib:libgettextpo$secondaryArchSuffix + lib:libiconv$secondaryArchSuffix + lib:libicui18n$secondaryArchSuffix + lib:libintl$secondaryArchSuffix + lib:libjpeg$secondaryArchSuffix + lib:libncursesw$secondaryArchSuffix + lib:libpaper$secondaryArchSuffix + lib:libpcre$secondaryArchSuffix + lib:libpng16$secondaryArchSuffix + lib:libreadline$secondaryArchSuffix + lib:libtcl8.5$secondaryArchSuffix + lib:libtiff$secondaryArchSuffix + lib:libbz2$secondaryArchSuffix + lib:liblzma$secondaryArchSuffix + lib:libz$secondaryArchSuffix + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + #devel:libblas$secondaryArchSuffix + #devel:liblapack$secondaryArchSuffix + #devel:libcairo$secondaryArchSuffix + devel:libcurl$secondaryArchSuffix + devel:libgettextpo$secondaryArchSuffix + devel:libiconv$secondaryArchSuffix + devel:libicui18n$secondaryArchSuffix + devel:libintl$secondaryArchSuffix + devel:libjpeg$secondaryArchSuffix + devel:libpaper$secondaryArchSuffix + devel:libpcre$secondaryArchSuffix + devel:libpng16$secondaryArchSuffix + devel:libreadline$secondaryArchSuffix + devel:libtclstub8.5$secondaryArchSuffix + devel:libtiff$secondaryArchSuffix + devel:libbz2$secondaryArchSuffix + devel:liblzma$secondaryArchSuffix + devel:libz$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + cmd:autoconf + cmd:aclocal + cmd:autoheader + cmd:awk + cmd:bison + cmd:gcc$secondaryArchSuffix + cmd:gfortran$secondaryArchSuffix + cmd:grep + #cmd:kpsewhich #texlive + cmd:ld$secondaryArchSuffix + cmd:less + cmd:libtoolize$secondaryArchSuffix + cmd:make + #cmd:makeindex #texlive + #cmd:pdflatex #texlive + #cmd:pdftex #texlive + cmd:pkg_config$secondaryArchSuffix + cmd:pwd + cmd:sed + cmd:texi2any + cmd:yacc + cmd:which + " + +BUILD() +{ + export CFLAGS="-D_BSD_SOURCE" + export LDFLAGS="-lnetwork -lbsd" + + runConfigure --omit-dirs sysconfdir ./configure \ + --with-x=no \ + --sysconfdir="$settingsDir/R" \ + rdocdir="$docDir" \ + rincludedir=$includeDir \ + rsharedir="$dataDir/R" + + make $jobArgs +} + +INSTALL() +{ + make install +} + +TEST() +{ + make check +} From e9f70a5d2f896872e8ce9d71b36f712963b89bb7 Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Mon, 26 Dec 2016 20:25:18 +0100 Subject: [PATCH 4/7] lua, bump version (#953) --- dev-lang/lua/lua-5.3.3.recipe | 96 ++++++++++++++++ dev-lang/lua/patches/lua-5.3.3.gcc2.patchset | 24 ++++ dev-lang/lua/patches/lua-5.3.3.patchset | 113 +++++++++++++++++++ 3 files changed, 233 insertions(+) create mode 100644 dev-lang/lua/lua-5.3.3.recipe create mode 100644 dev-lang/lua/patches/lua-5.3.3.gcc2.patchset create mode 100644 dev-lang/lua/patches/lua-5.3.3.patchset diff --git a/dev-lang/lua/lua-5.3.3.recipe b/dev-lang/lua/lua-5.3.3.recipe new file mode 100644 index 000000000..180e6a13a --- /dev/null +++ b/dev-lang/lua/lua-5.3.3.recipe @@ -0,0 +1,96 @@ +SUMMARY="A powerful, fast, light-weight, embeddable scripting language" +DESCRIPTION="Lua combines simple procedural syntax with powerful data \ +description constructs based on associative arrays and extensible semantics. \ +Lua is dynamically typed, runs by interpreting bytecode for a register-based \ +virtual machine, and has automatic memory management with incremental garbage \ +collection, making it ideal for configuration, scripting, and rapid prototyping." +HOMEPAGE="https://www.lua.org/" +COPYRIGHT="1994-2016 Roberto Ierusalimschy, Waldemar Celes, Luiz Henrique de \ +Figueiredo" +LICENSE="MIT" +REVISION="1" +SOURCE_URI="https://www.lua.org/ftp/lua-$portVersion.tar.gz" +CHECKSUM_SHA256="5113c06884f7de453ce57702abaac1d618307f33f6789fa870e87a59d772aca2" +PATCHES="lua-$portVersion.patchset" +if [ $effectiveTargetArchitecture = x86_gcc2 ]; then + PATCHES+=" + lua-$portVersion.gcc2.patchset + " +fi + +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +PROVIDES=" + lua$secondaryArchSuffix = $portVersion compat >= 5.3 + cmd:lua$secondaryArchSuffix = $portVersion compat >= 5.3 + cmd:lua5.3$secondaryArchSuffix = $portVersion compat >= 5.3 + cmd:luac$secondaryArchSuffix = $portVersion compat >= 5.3 + cmd:luac5.3$secondaryArchSuffix = $portVersion compat >= 5.3 + lib:liblua$secondaryArchSuffix = $portVersion compat >= 5.3 + " +REQUIRES=" + haiku$secondaryArchSuffix + " + +PROVIDES_devel=" + lua${secondaryArchSuffix}_devel = $portVersion compat >= 5.3 + devel:liblua$secondaryArchSuffix = $portVersion compat >= 5.3 + " +REQUIRES_devel=" + lua$secondaryArchSuffix == $portVersion base + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + " +BUILD_PREREQUIRES=" + cmd:make + cmd:gcc$secondaryArchSuffix + " + +BUILD() +{ + make haiku MYCFLAGS="-DLUA_COMPAT_5_1 -DLUA_ROOT='\"$prefix/\"' -DLUA_LDIR='\"$dataDir/lua/5.3/\"'" \ + LUA_T="lua5.3" LUAC_T="luac5.3" LUA_SO="liblua.so.5.3" +} + +INSTALL() +{ + make install INSTALL_TOP="$prefix" INSTALL_MAN="$manDir/man1" \ + INSTALL_INC="$includeDir/lua53" INSTALL_LMOD="$dataDir/lua/5.3" \ + INSTALL_LIB="$libDir" INSTALL_BIN="$binDir" TO_BIN="lua5.3 luac5.3" \ + TO_LIB="liblua.a liblua.so.5.3" + + ln -s lua5.3 $binDir/lua + ln -s luac5.3 $binDir/luac + ln -s liblua.so.5.3 $libDir/liblua.so + + rm -r $dataDir #empty directory + + mkdir -p $developLibDir/pkgconfig + cat > $developLibDir/pkgconfig/lua.pc << EOF +V=5.3 +R=5.3.3 + +INSTALL_BIN=$binDir +INSTALL_INC=$includeDir +INSTALL_LIB=$libDir +INSTALL_MAN=$manDir +INSTALL_LMOD=${dataDir}/lua/\${V} +INSTALL_CMOD=${libDir}/lua/\${V} +exec_prefix=$prefix +libdir=$libDir +includedir=$includeDir + +Name: Lua +Description: An Extensible Extension Language +Version: \${R} +Requires: +Libs: -L\${libdir} -llua +Cflags: -I\${includedir}/lua53 +EOF + + prepareInstalledDevelLib liblua + packageEntries devel $developDir +} diff --git a/dev-lang/lua/patches/lua-5.3.3.gcc2.patchset b/dev-lang/lua/patches/lua-5.3.3.gcc2.patchset new file mode 100644 index 000000000..204e8ee18 --- /dev/null +++ b/dev-lang/lua/patches/lua-5.3.3.gcc2.patchset @@ -0,0 +1,24 @@ +From 3baf23b0432d26f7e68dbeae519e7567d3a05f84 Mon Sep 17 00:00:00 2001 +From: begasus +Date: Sat, 24 Dec 2016 16:15:39 +0100 +Subject: gcc2 patch + + +diff --git a/src/Makefile b/src/Makefile +index d71c75c..e33a907 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -6,8 +6,8 @@ + # Your platform. See PLATS for possible values. + PLAT= none + +-CC= gcc -std=gnu99 +-CFLAGS= -O2 -Wall -Wextra -DLUA_COMPAT_5_2 $(SYSCFLAGS) $(MYCFLAGS) ++CC= gcc ++CFLAGS= -O2 -Wall -DLUA_COMPAT_5_2 $(SYSCFLAGS) $(MYCFLAGS) + LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS) + LIBS= -lm $(SYSLIBS) $(MYLIBS) + +-- +2.7.0 + diff --git a/dev-lang/lua/patches/lua-5.3.3.patchset b/dev-lang/lua/patches/lua-5.3.3.patchset new file mode 100644 index 000000000..2b7954be2 --- /dev/null +++ b/dev-lang/lua/patches/lua-5.3.3.patchset @@ -0,0 +1,113 @@ +From b1db2db24aca8b1f8a59949f78cc2cbe0d01bfb8 Mon Sep 17 00:00:00 2001 +From: begasus +Date: Sat, 24 Dec 2016 15:45:36 +0100 +Subject: import patches from 5.2.1 + + +diff --git a/Makefile b/Makefile +index c795dd7..98d7529 100644 +--- a/Makefile ++++ b/Makefile +@@ -36,12 +36,12 @@ RM= rm -f + # == END OF USER SETTINGS -- NO NEED TO CHANGE ANYTHING BELOW THIS LINE ======= + + # Convenience platforms targets. +-PLATS= aix bsd c89 freebsd generic linux macosx mingw posix solaris ++PLATS= aix bsd c89 freebsd generic haiku linux macosx mingw posix solaris + + # What to install. + TO_BIN= lua luac + TO_INC= lua.h luaconf.h lualib.h lauxlib.h lua.hpp +-TO_LIB= liblua.a ++TO_LIB= liblua.a liblua.so + TO_MAN= lua.1 luac.1 + + # Lua version and release. +@@ -52,7 +52,7 @@ R= $V.3 + all: $(PLAT) + + $(PLATS) clean: +- cd src && $(MAKE) $@ ++ cd src && $(MAKE) V=$(V) $@ + + test: dummy + src/lua -v +diff --git a/src/Makefile b/src/Makefile +index d71c75c..d9b39fb 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -26,9 +26,10 @@ MYOBJS= + + # == END OF USER SETTINGS -- NO NEED TO CHANGE ANYTHING BELOW THIS LINE ======= + +-PLATS= aix bsd c89 freebsd generic linux macosx mingw posix solaris ++PLATS= aix bsd c89 freebsd generic haiku linux macosx mingw posix solaris + + LUA_A= liblua.a ++LUA_SO= liblua.so + CORE_O= lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o \ + lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o \ + ltm.o lundump.o lvm.o lzio.o +@@ -43,7 +44,7 @@ LUAC_T= luac + LUAC_O= luac.o + + ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O) +-ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) ++ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) $(LUA_SO) + ALL_A= $(LUA_A) + + # Targets start here. +@@ -65,6 +66,9 @@ $(LUA_T): $(LUA_O) $(LUA_A) + $(LUAC_T): $(LUAC_O) $(LUA_A) + $(CC) -o $@ $(LDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS) + ++$(LUA_SO): $(CORE_O) $(LIB_O) ++ $(CC) -o $@ -shared -fPIC -Wl,-soname=liblua.so.$(V) $(LDFLAGS) $? $(LIBS) ++ + clean: + $(RM) $(ALL_T) $(ALL_O) + +@@ -106,6 +110,9 @@ freebsd: + + generic: $(ALL) + ++haiku: ++ $(MAKE) all SYSCFLAGS="-DLUA_USE_HAIKU" LIBS= ++ + linux: + $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_LINUX" SYSLIBS="-Wl,-E -ldl -lreadline" + +diff --git a/src/luaconf.h b/src/luaconf.h +index fd447cc..367f1e7 100644 +--- a/src/luaconf.h ++++ b/src/luaconf.h +@@ -81,7 +81,12 @@ + #define LUA_C89_NUMBERS + #endif + +- ++#if defined(LUA_USE_HAIKU) ++#define LUA_USE_MKSTEMP ++#define LUA_USE_ISATTY ++#define LUA_USE_POPEN ++#define LUA_USE_DLOPEN ++#endif + + /* + @@ LUAI_BITSINT defines the (minimum) number of bits in an 'int'. +@@ -188,8 +193,12 @@ + + #else /* }{ */ + ++#ifndef LUA_ROOT + #define LUA_ROOT "/usr/local/" ++#endif ++#ifndef LUA_LIBDIR + #define LUA_LDIR LUA_ROOT "share/lua/" LUA_VDIR "/" ++#endif + #define LUA_CDIR LUA_ROOT "lib/lua/" LUA_VDIR "/" + #define LUA_PATH_DEFAULT \ + LUA_LDIR"?.lua;" LUA_LDIR"?/init.lua;" \ +-- +2.7.0 + From 4b29b0a56bc30570b1df43cb8e27a9879b1b2f4d Mon Sep 17 00:00:00 2001 From: miqlas Date: Mon, 26 Dec 2016 21:23:44 +0100 Subject: [PATCH 5/7] MSGPACK-C-CPP recipe (#836) * Msgpack recipe Squashed msgpack recipe MSGPACK-C-CPP recipe Boost Licence Recipe fix Hash fix Fixed recipe, thanks for fbrosson * Update msgpack_c_cpp-2.0.0.recipe --- dev-libs/msgpack_c_cpp/licenses/Boost v1.0 | 23 +++++ .../msgpack_c_cpp/msgpack_c_cpp-2.0.0.recipe | 94 +++++++++++++++++++ 2 files changed, 117 insertions(+) create mode 100644 dev-libs/msgpack_c_cpp/licenses/Boost v1.0 create mode 100644 dev-libs/msgpack_c_cpp/msgpack_c_cpp-2.0.0.recipe diff --git a/dev-libs/msgpack_c_cpp/licenses/Boost v1.0 b/dev-libs/msgpack_c_cpp/licenses/Boost v1.0 new file mode 100644 index 000000000..36b7cd93c --- /dev/null +++ b/dev-libs/msgpack_c_cpp/licenses/Boost v1.0 @@ -0,0 +1,23 @@ +Boost Software License - Version 1.0 - August 17th, 2003 + +Permission is hereby granted, free of charge, to any person or organization +obtaining a copy of the software and accompanying documentation covered by +this license (the "Software") to use, reproduce, display, distribute, +execute, and transmit the Software, and to prepare derivative works of the +Software, and to permit third-parties to whom the Software is furnished to +do so, all subject to the following: + +The copyright notices in the Software and this entire statement, including +the above license grant, this restriction and the following disclaimer, +must be included in all copies of the Software, in whole or in part, and +all derivative works of the Software, unless such copies or derivative +works are solely in the form of machine-executable object code generated by +a source language processor. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT +SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. diff --git a/dev-libs/msgpack_c_cpp/msgpack_c_cpp-2.0.0.recipe b/dev-libs/msgpack_c_cpp/msgpack_c_cpp-2.0.0.recipe new file mode 100644 index 000000000..eda5d39af --- /dev/null +++ b/dev-libs/msgpack_c_cpp/msgpack_c_cpp-2.0.0.recipe @@ -0,0 +1,94 @@ +SUMMARY="A serialization library" +DESCRIPTION="An efficient binary serialization format, which lets you exchange \ +data among multiple languages like JSON, except that it's faster and smaller. \ +Small integers are encoded into a single byte while typical short strings \ +require only one extra byte in addition to the strings themselves." +HOMEPAGE="http://msgpack.org/" +COPYRIGHT="2010-2016 MessagePack Developers" +LICENSE="Boost v1.0" +REVISION="1" +SOURCE_URI="https://github.com/msgpack/msgpack-c/archive/cpp-$portVersion.tar.gz" +SOURCE_DIR="msgpack-c-cpp-$portVersion" +CHECKSUM_SHA256="eb20b4bf15f20bad149ec82fffac74f16de2a8a797e321a3f8189d63263a511e" + +ARCHITECTURES="x86_gcc2 x86 ?x86_64" +SECONDARY_ARCHITECTURES="x86" + +PROVIDES=" + msgpack_c_cpp$secondaryArchSuffix = $portVersion + lib:libmsgpackc$secondaryArchSuffix = $portVersion + " +REQUIRES=" + haiku$secondaryArchSuffix + lib:libz$secondaryArchSuffix + " + +PROVIDES_devel=" + msgpack_c_cpp${secondaryArchSuffix}_devel = $portVersion + devel:libmsgpackc$secondaryArchSuffix = $portVersion + " +REQUIRES_devel=" + msgpack_c_cpp$secondaryArchSuffix == $portVersion + devel:libz${secondaryArchSuffix} + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + devel:libz${secondaryArchSuffix} + " +BUILD_PREREQUIRES=" + cmd:cmake + cmd:doxygen + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:libtoolize$secondaryArchSuffix + cmd:make + cmd:pkg_config$secondaryArchSuffix + cmd:sed + " + +PATCH() +{ + sed -i 's/-pthread/-lroot/g' example/cpp03/CMakeLists.txt +} + +BUILD() +{ + export LDFLAGS="-lnetwork -lbsd" + export CFLAGS="-D_BSD_SOURCE" + + mkdir -p build && cd build + cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$prefix \ + -DCMAKE_SKIP_RPATH=YES \ + .. + + make $jobArgs +} + +INSTALL() +{ + mkdir -p $includeDir + mkdir -p $libDir + + cd build + make install + + mv $libDir/../libmsgpackc.* $libDir + mv $libDir/../pkgconfig $libDir + mv $prefix/include/* $includeDir + rm -rf $prefix/include + + rm -f $libDir/*.la + + prepareInstalledDevelLib libmsgpackc + + fixPkgconfig + + packageEntries devel \ + $developDir +} + +TEST() +{ + make check +} From 6661b5eb6f8988b3fd5c16f444c326d35a5310ee Mon Sep 17 00:00:00 2001 From: miqlas Date: Mon, 26 Dec 2016 21:53:48 +0100 Subject: [PATCH 6/7] Mutt: new recipe (#699) --- mail-client/mutt/mutt-1.7.2.recipe | 97 ++++++++++++++++++++ mail-client/mutt/patches/mutt-1.7.2.patchset | 27 ++++++ 2 files changed, 124 insertions(+) create mode 100644 mail-client/mutt/mutt-1.7.2.recipe create mode 100644 mail-client/mutt/patches/mutt-1.7.2.patchset diff --git a/mail-client/mutt/mutt-1.7.2.recipe b/mail-client/mutt/mutt-1.7.2.recipe new file mode 100644 index 000000000..dec87cc8d --- /dev/null +++ b/mail-client/mutt/mutt-1.7.2.recipe @@ -0,0 +1,97 @@ +SUMMARY="Small but very powerful text-based mail client" +DESCRIPTION="A text-based email client for Unix-like systems. \ +It was originally written by Michael Elkins in 1995 and released \ +under the GNU General Public License version 2 or any later version. + +The Mutt slogan is All mail clients suck. This one just sucks less." +HOMEPAGE="http://www.mutt.org/" +COPYRIGHT="1996-2016 Michael R. Elkins + 1996-2002 Brandon Long + 1997-2009 Thomas Roessler + 1998-2005 Werner Koch + 1999-2014 Brendan Cully + 1999-2002 Tommi Komulainen + 2000-2004 Edmund Grimley Evans + 2006-2009 Rocco Rutte + 2014-2015 Kevin J. McCarthy" +LICENSE="GNU GPL v2" +REVISION="1" +SOURCE_URI="ftp://ftp.mutt.org/pub/mutt/mutt-$portVersion.tar.gz" +CHECKSUM_SHA256="1553501687cd22d5b8aaee4dc5a7d9dcf6cc61d7956f6aabaadd252d10cd5ff9" +PATCHES="mutt-$portVersion.patchset" + +ARCHITECTURES="?x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="?x86_gcc2 x86 x86_64" + +PROVIDES=" + mutt$secondaryArchSuffix = $portVersion + cmd:mutt$secondaryArchSuffix = $portVersion + cmd:flea$secondaryArchSuffix = $portVersion + cmd:muttbug$secondaryArchSuffix = $portVersion + cmd:pgpewrap$secondaryArchSuffix = $portVersion + cmd:pgpring$secondaryArchSuffix = $portVersion + cmd:smime_keys$secondaryArchSuffix = $portVersion + " +REQUIRES=" + haiku$secondaryArchSuffix + lib:libgpgme$secondaryArchSuffix + lib:libncurses$secondaryArchSuffix + lib:libiconv$secondaryArchSuffix + lib:libgpgme$secondaryArchSuffix + lib:libgpg_error$secondaryArch >= 0 + lib:libgettextpo$secondaryArch + lib:libassuan$secondaryArch + lib:libintl$secondaryArch + lib:libassuan$secondaryArchSuffix + " + +BUILD_REQUIRES=" + devel:libncurses$secondaryArchSuffix + devel:libiconv$secondaryArchSuffix + devel:libgpgme$secondaryArchSuffix + devel:libgpg_error$secondaryArchSuffix + devel:libgettextlib$secondaryArchSuffix + devel:libassuan$secondaryArchSuffix + " +BUILD_PREREQUIRES=" + haiku${secondaryArchSuffix}_devel + cmd:autoreconf + cmd:bison + cmd:gawk + cmd:gcc$secondaryArchSuffix + cmd:gpgme_config$secondaryArchSuffix + cmd:libtoolize$secondaryArchSuffix + cmd:make + cmd:m4 + " + +GLOBAL_WRITABLE_FILES=" + settings/Muttrc keep-old + settings/Muttrc.dist keep-old + settings/mime.types keep-old + settings/mime.types.dist keep-old + " + +BUILD() +{ + export CFLAGS="-D_BSD_SOURCE" + export LDFLAGS="-lnetwork -lbsd" + + libtoolize --force --copy --install + autoreconf -vfi + + runConfigure configure \ + --enable-gpgme \ + --enable-pop \ + --enable-imap \ + --enable-smtp \ + --with-regex \ + --with-mailpath=/boot/home/mail/mutt + + make $jobArgs +} + +INSTALL() +{ + make install +} diff --git a/mail-client/mutt/patches/mutt-1.7.2.patchset b/mail-client/mutt/patches/mutt-1.7.2.patchset new file mode 100644 index 000000000..7a1800437 --- /dev/null +++ b/mail-client/mutt/patches/mutt-1.7.2.patchset @@ -0,0 +1,27 @@ +From 71de919e2ba5b93d8004047e32adc0186241827b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= +Date: Mon, 26 Dec 2016 21:43:34 +0100 +Subject: [PATCH] Haiku patch + +--- + getdomain.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/getdomain.c b/getdomain.c +index 15803af..8abd415 100644 +--- a/getdomain.c ++++ b/getdomain.c +@@ -28,6 +28,10 @@ + + #include "mutt.h" + ++#ifdef __HAIKU__ ++#define _SC_HOST_NAME_MAX 72 ++#endif ++ + + int getdnsdomainname (char *d, size_t len) + { +-- +2.10.2 + From 3b25ed3172ec9d532a3bdcfaa7c85ac20984fa5e Mon Sep 17 00:00:00 2001 From: Stephanie Fu Date: Mon, 26 Dec 2016 17:17:37 -0600 Subject: [PATCH 7/7] Unprintable chars removed (#958) New line --- .../additional-files/rocksndiamonds.iom | Bin 0 -> 15712 bytes .../additional-files/rocksndiamonds.rdef.in | 38 ++++++++++++++++++ .../patches/rocksndiamonds-3.3.1.2.patchset | 23 +++++++++++ .../rocksndiamonds-3.3.1.2.recipe | 17 ++++++++ 4 files changed, 78 insertions(+) create mode 100644 games-arcade/rocksndiamonds/additional-files/rocksndiamonds.iom create mode 100644 games-arcade/rocksndiamonds/additional-files/rocksndiamonds.rdef.in diff --git a/games-arcade/rocksndiamonds/additional-files/rocksndiamonds.iom b/games-arcade/rocksndiamonds/additional-files/rocksndiamonds.iom new file mode 100644 index 0000000000000000000000000000000000000000..92e8dbf1772b496c4eb48d8cb127ff24d2ee1865 GIT binary patch literal 15712 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 aKTksVaVE+Qeh_*=+$>3;GnAzh;pX1~oJN=c literal 0 HcmV?d00001 diff --git a/games-arcade/rocksndiamonds/additional-files/rocksndiamonds.rdef.in b/games-arcade/rocksndiamonds/additional-files/rocksndiamonds.rdef.in new file mode 100644 index 000000000..1d114af2d --- /dev/null +++ b/games-arcade/rocksndiamonds/additional-files/rocksndiamonds.rdef.in @@ -0,0 +1,38 @@ +// Rocks 'n' Diamonds icon by Stephanie Fu + +resource app_signature "application/x-vnd.Artsoft-rocksndiamonds"; + +resource app_flags B_EXCLUSIVE_LAUNCH; + +resource app_version { + major = @MAJOR@, + middle = @MIDDLE@, + minor = @MINOR@, + variety = B_APPV_DEVELOPMENT, + internal = @INTERNAL@, + short_info = "Rocks'n'Diamonds", + long_info = "Rocks'n'Diamonds, an arcade style game.\nCopyright 2001-2013 Artsoft Entertainment" +}; + +resource file_types message; + +resource vector_icon array { + $"6E6369660B03C6630203904902020004025AD37E28FFAB6115030065FE03A9CB" + $"FE033287FE05FE0300307E05FF04016303010000100A04243E3A483A5E24540A" + $"043A48503E50543A5E0A04243E3A48503E3A340A043C404440473739370A0339" + $"37402647370A0439373432373B3C400A033432402639370A0347374C3444400A" + $"03402647374C340607FE1B312EBA85B854BA1CB8A4BAA5B83BBAC5B7A8BACAB7" + $"E5BABFB77033B72233B75233B6D4BA1FB6BCBA5FB6E7B999B6BC30292D060C9A" + $"BFAA3035B86DBAAAB57C31273428B9ED28BB772935B6D533B66FBBA0B6F7BB84" + $"B83ABBB7B7FABB2AB8ACBAC5B929BBF0BCE933BC3D3231302F0608AFF9382FBC" + $"F0B7D737323532BC4DB9DC323333332F3526322535243225BBBEB4773927BC43" + $"B51F39B6FD06096BEE0335273628BACDB5393328B9E9B660B9C43530362FBA32" + $"2F36B743BBF2B80E362A382A362A362A362A38290608F22F3A59474C57C328C9" + $"89C4A6C8DC5356C6E1C8B7535655545554C840C7A85553C7FCC76155535D4D50" + $"0A06243B24513A5B5051503B3A310A062E313A2546333E3F363F313A0E0A0901" + $"0D2020220A00010020201D0A01010120201D0A02010220201D0A0A010E100117" + $"8200040A0A010F1001178400040A030103201A1F0A040104201A1F0A05010520" + $"1A1F0A060106201A1F0A070107201A1F0A050108201A1F0A0802090A201D3C0A" + $"08020B0C20323F" +}; + diff --git a/games-arcade/rocksndiamonds/patches/rocksndiamonds-3.3.1.2.patchset b/games-arcade/rocksndiamonds/patches/rocksndiamonds-3.3.1.2.patchset index b7c633931..9a741afa1 100644 --- a/games-arcade/rocksndiamonds/patches/rocksndiamonds-3.3.1.2.patchset +++ b/games-arcade/rocksndiamonds/patches/rocksndiamonds-3.3.1.2.patchset @@ -84,3 +84,26 @@ index aaa3a5b..03723fb 100644 -- 1.8.3.4 + +From 6953f4b742475f5d8befe8fcc9d9f5db5c7bc6c9 Mon Sep 17 00:00:00 2001 +From: begasus +Date: Sun, 25 Dec 2016 10:12:22 +0100 +Subject: gcc5 patch + + +diff --git a/src/init.c b/src/init.c +index a7ad871..34e7ec2 100644 +--- a/src/init.c ++++ b/src/init.c +@@ -257,7 +257,7 @@ void InitGadgets() + gadgets_initialized = TRUE; + } + +-inline void InitElementSmallImagesScaledUp(int graphic) ++inline static void InitElementSmallImagesScaledUp(int graphic) + { + #if 0 + struct FileInfo *fi = getImageListEntryFromImageID(graphic); +-- +2.7.0 + diff --git a/games-arcade/rocksndiamonds/rocksndiamonds-3.3.1.2.recipe b/games-arcade/rocksndiamonds/rocksndiamonds-3.3.1.2.recipe index 0111afa9b..63aed020d 100644 --- a/games-arcade/rocksndiamonds/rocksndiamonds-3.3.1.2.recipe +++ b/games-arcade/rocksndiamonds/rocksndiamonds-3.3.1.2.recipe @@ -15,6 +15,7 @@ REVISION="2" SOURCE_URI="http://www.artsoft.org/RELEASES/unix/rocksndiamonds/rocksndiamonds-3.3.1.2.tar.gz" CHECKSUM_SHA256="c117c20026299c6c935bd531ef9b0dc767731f600881d12ceb80c831483755f3" PATCHES="rocksndiamonds-$portVersion.patchset" +ADDITIONAL_FILES="rocksndiamonds.rdef.in" ARCHITECTURES="!x86_gcc2 x86" SECONDARY_ARCHITECTURES="x86" @@ -59,5 +60,21 @@ INSTALL() destdir=$appsDir/"Rocks'n'Diamonds" mkdir -p $destdir cp -r rocksndiamonds sounds graphics levels music $destdir + + local MAJOR="`echo "$portVersion" | cut -d. -f1`" + local MIDDLE="`echo "$portVersion" | cut -d. -f2`" + local MINOR="`echo "$portVersion" | cut -d. -f3`" + local INTERNAL="`echo "$portVersion" | cut -d. -f4`" + sed \ + -e "s|@MAJOR@|$MAJOR|" \ + -e "s|@MIDDLE@|$MIDDLE|" \ + -e "s|@MINOR@|$MINOR|" \ + -e "s|@INTERNAL@|$INTERNAL|" \ + $portDir/additional-files/rocksndiamonds.rdef.in > rocksndiamonds.rdef + + addResourcesToBinaries rocksndiamonds.rdef \ + $destdir/rocksndiamonds + addAppDeskbarSymlink $destdir/rocksndiamonds "Rocks'n'Diamonds" } +