From 86a465afed75c9bb2da368233e65925804185935 Mon Sep 17 00:00:00 2001 From: Kostadin Damyanov Date: Mon, 3 Aug 2015 18:17:07 +0300 Subject: [PATCH] De-lint recipes. --- .../oricutron/oricutron-1.1_svn.recipe | 17 +- games-arcade/pachi/pachi-1.0.recipe | 6 +- games-simulation/openttd/openttd-1.5.1.recipe | 17 +- haiku-apps/paladin/paladin-1.3.recipe | 14 +- media-gfx/pngcrush/pngcrush-1.7.85.recipe | 23 +- media-libs/openal/openal-1.12.854.recipe | 25 -- media-libs/openal/openal-1.13.0.recipe | 21 +- .../openal/patches/openal-1.12.854.patch | 346 ------------------ media-libs/openexr/openexr-2.1.0.recipe | 15 +- media-libs/openexr/openexr-2.2.0.recipe | 10 +- media-libs/openjpeg/openjpeg-1.5.0.recipe | 18 +- media-libs/openjpeg/openjpeg-2.1.0.recipe | 18 +- media-libs/opus/opus-1.1.recipe | 14 +- media-sound/opensound/opensound-4.2.recipe | 30 +- .../opensound/opensound-4.2_git.recipe | 23 +- 15 files changed, 112 insertions(+), 485 deletions(-) delete mode 100644 media-libs/openal/openal-1.12.854.recipe delete mode 100644 media-libs/openal/patches/openal-1.12.854.patch diff --git a/app-emulation/oricutron/oricutron-1.1_svn.recipe b/app-emulation/oricutron/oricutron-1.1_svn.recipe index ae61f597a..a6423e2df 100644 --- a/app-emulation/oricutron/oricutron-1.1_svn.recipe +++ b/app-emulation/oricutron/oricutron-1.1_svn.recipe @@ -1,19 +1,15 @@ -SUMMARY="Oricutron is an emulator for the Oric series of computers" -DESCRIPTION=" -Oricutron is an emulator for the Oric series of computers. -" +SUMMARY="An emulator for the Oric series of computers" +DESCRIPTION="Oricutron is an emulator for the Oric series of computers." HOMEPAGE="http://code.google.com/p/oriculator/" -SOURCE_URI="svn+http://oriculator.googlecode.com/svn/trunk" -REVISION="1" -DEPEND="media-libs/libsdl >= 1.2.10" -#CHECKSUM_MD5="" COPYRIGHT="2009-2012 Peter Gordon" LICENSE="GNU GPL v2" +REVISION="1" +SOURCE_URI="svn+http://oriculator.googlecode.com/svn/trunk" +SOURCE_DIR="trunk" +DEPEND="media-libs/libsdl >= 1.2.10" ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" -SOURCE_DIR="trunk" - PROVIDES=" oricutron = $portVersion app:oricutron = $portVersion @@ -47,4 +43,3 @@ INSTALL() mimeset $prefix/apps/Oricutron/oricutron addAppDeskbarSymlink $prefix/apps/Oricutron/oricutron Oricutron } - diff --git a/games-arcade/pachi/pachi-1.0.recipe b/games-arcade/pachi/pachi-1.0.recipe index da16bc793..e7f84dfa6 100644 --- a/games-arcade/pachi/pachi-1.0.recipe +++ b/games-arcade/pachi/pachi-1.0.recipe @@ -1,6 +1,6 @@ -SUMMARY="Pachi el marciano is a cool 2D platforms game" -DESCRIPTION="Pachi el marciano is a cool 2D platforms game inspired in games like \ -Manic Miner, Jet set Willy and more from the 80s." +SUMMARY="A cool 2D platforming game" +DESCRIPTION="Pachi el marciano is a cool 2D platforming game inspired by games like \ +Manic Miner, Jet set Willy and more from the 80s." HOMEPAGE="http://dragontech.sourceforge.net/index.php?lang=en&main=about" COPYRIGHT="2004 Santiago Radeff, Nicolas Radeff, Peter Hajba" LICENSE="GNU GPL v2" diff --git a/games-simulation/openttd/openttd-1.5.1.recipe b/games-simulation/openttd/openttd-1.5.1.recipe index d8231d564..7c7d1e0f7 100644 --- a/games-simulation/openttd/openttd-1.5.1.recipe +++ b/games-simulation/openttd/openttd-1.5.1.recipe @@ -1,16 +1,16 @@ -SUMMARY="OpenTTD is a clone of Transport Tycoon Deluxe" -DESCRIPTION=" -OpenTTD is an open source simulation game based upon the popular Microprose \ +SUMMARY="A clone of Transport Tycoon Deluxe" +DESCRIPTION="OpenTTD is an open source simulation game based upon the popular Microprose \ game \"Transport Tycoon Deluxe\", written by Chris Sawyer. It attempts to \ mimic the original game as closely as possible while extending it with new \ -features. -" +features." HOMEPAGE="http://www.openttd.org" -SOURCE_URI="http://binaries.openttd.org/releases/$portVersion/openttd-$portVersion-source.tar.xz" -CHECKSUM_SHA256="c98e76e57de213c8d2ccafa4fa2e02b91c031b2487639ccf9b85c725c1428f49" COPYRIGHT="2005-2013 OpenTTD Team" LICENSE="GNU GPL v2" REVISION="1" +SOURCE_URI="http://binaries.openttd.org/releases/$portVersion/openttd-$portVersion-source.tar.xz" +CHECKSUM_SHA256="c98e76e57de213c8d2ccafa4fa2e02b91c031b2487639ccf9b85c725c1428f49" +PATCHES="openttd-$portVersion.patchset" + ARCHITECTURES="x86 x86_64" if [ $effectiveTargetArchitecture != x86_gcc2 ]; then # x86_gcc2 is fine as primary target architecture as long as we're building @@ -48,7 +48,6 @@ BUILD_PREREQUIRES=" cmd:pkg_config$secondaryArchSuffix " -PATCHES="openttd-$portVersion.patchset" BUILD() { export includeDir=/system/$relativeIncludeDir @@ -74,5 +73,3 @@ INSTALL() addAppDeskbarSymlink $appsDir/openttd "OpenTTD" } - -# no TEST script available diff --git a/haiku-apps/paladin/paladin-1.3.recipe b/haiku-apps/paladin/paladin-1.3.recipe index 2d52deb36..835359a57 100644 --- a/haiku-apps/paladin/paladin-1.3.recipe +++ b/haiku-apps/paladin/paladin-1.3.recipe @@ -1,14 +1,12 @@ -SUMMARY="Paladin is a open source integrated development environment (IDE)" -DESCRIPTION=" -Paladin is an open source integrated development environment (IDE) modeled \ -after BeOS' BeIDE. -" +SUMMARY="An open source integrated development environment (IDE)" +DESCRIPTION="Paladin is an open source integrated development environment (IDE) modeled \ +after BeOS' BeIDE." HOMEPAGE="http://paladin.sourceforge.net" +COPYRIGHT="2008-2010 DarkWyrm" +LICENSE="MIT" +REVISION="2" SOURCE_URI="http://sourceforge.net/projects/paladin/files/Paladin-1.3.src.zip/download" CHECKSUM_SHA256="5f804544f9cc489697d08eee5795b22de76961c62c3882af2cc15d095d7766f4" -REVISION="2" -LICENSE="MIT" -COPYRIGHT="2008-2010 DarkWyrm" ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" diff --git a/media-gfx/pngcrush/pngcrush-1.7.85.recipe b/media-gfx/pngcrush/pngcrush-1.7.85.recipe index 8c825e14c..46d2c903f 100644 --- a/media-gfx/pngcrush/pngcrush-1.7.85.recipe +++ b/media-gfx/pngcrush/pngcrush-1.7.85.recipe @@ -1,24 +1,21 @@ -SUMMARY="Pngcrush is an optimizer for PNG files" -DESCRIPTION=" -Pngcrush is an optimizer for PNG (Portable Network Graphics) files. It can be \ +SUMMARY="An optimizer for PNG files" +DESCRIPTION="Pngcrush is an optimizer for PNG (Portable Network Graphics) files. It can be \ run from a commandline in an MSDOS window, or from a UNIX or LINUX \ commandline. Its main purpose is to reduce the size of the PNG IDAT datastream \ by trying various compression levels and PNG filter methods. It also can be \ used to remove unwanted ancillary chunks, or to add certain chunks including \ -gAMA, tRNS, iCCP, and textual chunks. -" -HOMEPAGE="http://pmt.sourceforge.net/pngcrush/" -SOURCE_URI="http://sourceforge.net/projects/pmt/files/pngcrush/$portVersion/pngcrush-$portVersion-nolib.tar.xz" -CHECKSUM_SHA256="296cef699cac7b23c02f5458e4fd7fe3b07ee4748a69928c7d51743198f56cc3" -REVISION="1" -LICENSE="LibPNG" +gAMA, tRNS, iCCP, and textual chunks." +HOMEPAGE="http://pmt.sourceforge.net/pngcrush/" COPYRIGHT="1998-2009 Glenn Randers-Pehrson 2005 Greg Roelofs" -ARCHITECTURES="x86 x86_gcc2 x86_64" - +LICENSE="LibPNG" +REVISION="1" +SOURCE_URI="http://sourceforge.net/projects/pmt/files/pngcrush/$portVersion/pngcrush-$portVersion-nolib.tar.xz" +CHECKSUM_SHA256="296cef699cac7b23c02f5458e4fd7fe3b07ee4748a69928c7d51743198f56cc3" +SOURCE_DIR="pngcrush-${portVersion}-nolib" PATCHES="pngcrush-$portVersion.patch" -SOURCE_DIR="pngcrush-${portVersion}-nolib" +ARCHITECTURES="x86 x86_gcc2 x86_64" PROVIDES=" pngcrush = $portVersion compat >= 1.7 diff --git a/media-libs/openal/openal-1.12.854.recipe b/media-libs/openal/openal-1.12.854.recipe deleted file mode 100644 index 1a59f4292..000000000 --- a/media-libs/openal/openal-1.12.854.recipe +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION="OpenAL - A software implementation of the OpenAL 3D audio API" -HOMEPAGE="http://kcat.strangesoft.net/openal.html" -SOURCE_URI="http://kcat.strangesoft.net/openal-releases/openal-soft-1.12.854.tar.bz2" -CHECKSUM_MD5="fbf36451fdebd6466edbdc0ee7db9603" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="dev-util/cmake >= 2.8.0" - -BUILD() -{ - cd openal-soft-1.12.854 - cmake . - make -} - -INSTALL() -{ - cd openal-soft-1.12.854 - make install -} - -LICENSE="GNU LGPL v2.1" -COPYRIGHT="1999-2000 Loki Software - 2005-2010 OpenAL Soft team" - diff --git a/media-libs/openal/openal-1.13.0.recipe b/media-libs/openal/openal-1.13.0.recipe index e8fd531ec..2d8cfe474 100644 --- a/media-libs/openal/openal-1.13.0.recipe +++ b/media-libs/openal/openal-1.13.0.recipe @@ -1,19 +1,19 @@ SUMMARY="A software implementation of the OpenAL 3D audio API" -DESCRIPTION=" -OpenAL stands for (Open Audio Library), a cross-platform audio application \ +DESCRIPTION="OpenAL stands for (Open Audio Library), a cross-platform audio application \ programming interface written in C. It is an environmental 3D audio \ library that aims to provide a replacement for proprietary 3D audio systems \ such as EAX and A3D. Openal is designed for efficient rendering of \ multichannel 3D positional audio." -HOMEPAGE="http://kcat.strangesoft.net/openal.html" +HOMEPAGE="http://kcat.strangesoft.net/openal.html" +COPYRIGHT="1999-2000 Loki Software + 2005-2011 OpenAL Soft team" +LICENSE="GNU LGPL v2.1" +REVISION="2" SOURCE_URI="http://kcat.strangesoft.net/openal-releases/openal-soft-1.13.tar.bz2" CHECKSUM_SHA256="dc735b8b2ab21f6ec54b4262f150a7e0527ae42aa975a1965b9342df1520443c" -REVISION="2" -LICENSE="GNU LGPL v2.1" -COPYRIGHT=" - 1999-2000 Loki Software - 2005-2011 OpenAL Soft team - " +SOURCE_DIR="openal-soft-1.13" +PATCHES="openal-1.13.0.patchset" + ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" @@ -34,9 +34,6 @@ BUILD_PREREQUIRES=" cmd:make " -SOURCE_DIR="openal-soft-1.13" - -PATCHES="openal-1.13.0.patchset" BUILD() { cd build diff --git a/media-libs/openal/patches/openal-1.12.854.patch b/media-libs/openal/patches/openal-1.12.854.patch deleted file mode 100644 index cb41a564e..000000000 --- a/media-libs/openal/patches/openal-1.12.854.patch +++ /dev/null @@ -1,346 +0,0 @@ -diff -Naur openal-soft-1.12.854/Alc/ALc.c openal-soft-1.12.854-haiku/Alc/ALc.c ---- openal-soft-1.12.854/Alc/ALc.c 2010-03-30 05:00:12.029884416 +0000 -+++ openal-soft-1.12.854-haiku/Alc/ALc.c 2010-08-16 18:07:11.204472320 +0000 -@@ -60,6 +60,9 @@ - #ifdef HAVE_SOLARIS - { "solaris", alc_solaris_init, alc_solaris_deinit, alc_solaris_probe, EmptyFuncs }, - #endif -+#ifdef HAVE_HAIKU -+ { "haiku", alc_haiku_init, alc_haiku_deinit, alc_haiku_probe, EmptyFuncs }, -+#endif - #ifdef HAVE_DSOUND - { "dsound", alcDSoundInit, alcDSoundDeinit, alcDSoundProbe, EmptyFuncs }, - #endif -diff -Naur openal-soft-1.12.854/Alc/haiku.cxx openal-soft-1.12.854-haiku/Alc/haiku.cxx ---- openal-soft-1.12.854/Alc/haiku.cxx 1970-01-01 00:00:00.000000000 +0000 -+++ openal-soft-1.12.854-haiku/Alc/haiku.cxx 2010-08-16 18:06:36.999030784 +0000 -@@ -0,0 +1,242 @@ -+/** -+ * OpenAL cross platform audio library -+ * Copyright (C) 1999-2007 by authors. -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Library General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Library General Public License for more details. -+ * -+ * You should have received a copy of the GNU Library General Public -+ * License along with this library; if not, write to the -+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ * Boston, MA 02111-1307, USA. -+ * Or go to http://www.gnu.org/copyleft/lgpl.html -+ */ -+ -+#include "config.h" -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include "alMain.h" -+#include "AL/al.h" -+#include "AL/alc.h" -+ -+#include -+#include -+#include -+#include -+ -+static const ALCchar haiku_device[] = "Haiku Software"; -+ -+typedef struct { -+ BSoundPlayer *player; -+ ALCdevice *device; -+} haiku_data; -+ -+static void -+BufferProc(void *theCookie, void *buffer, size_t size, -+ const media_raw_audio_format &format) { -+ -+ haiku_data *data = (haiku_data *) theCookie; -+ -+ if (!data) { -+ memset(buffer, size, 0); // fill with silence cookie bad -+ return; -+ } -+ -+ if (!data->device) { -+ memset(buffer, size, 0); // fill with silence device not setup -+ return; -+ } -+ -+ if (data->device->Connected) { -+ if (data->device->UpdateSize >= size) { -+ // Now fill the buffer with sound! -+ aluMixData(data->device, buffer, size); -+ } else { -+ memset(buffer, size, 0); // fill with silence not enough data for a buffer -+ } -+ } else { -+ memset(buffer, size, 0); // fill with silence device not connected -+ } -+} -+ -+static ALCboolean haiku_open_playback(ALCdevice *device, const ALCchar *deviceName) -+{ -+ haiku_data *data; -+ -+ if (!deviceName) -+ deviceName = haiku_device; -+ else if (strcmp(deviceName, haiku_device) != 0) -+ return ALC_FALSE; -+ -+ data = (haiku_data*)calloc(1, sizeof(haiku_data)); -+ -+ data->device = device; -+ -+ device->szDeviceName = strdup(deviceName); -+ device->ExtraData = data; -+ -+ return ALC_TRUE; -+} -+ -+static void haiku_close_playback(ALCdevice *device) -+{ -+ haiku_data *data = (haiku_data*)device->ExtraData; -+ -+ data->device = NULL; -+ -+ if (data->player) { -+ data->player->Stop(); -+ delete data->player; -+ data->player = NULL; -+ } -+ -+ free(data); -+ device->ExtraData = NULL; -+} -+ -+static ALCboolean haiku_reset_playback(ALCdevice *device) -+{ -+ haiku_data *data = (haiku_data*)device->ExtraData; -+ ALuint frameSize; -+ int numChannels; -+ -+ numChannels = aluChannelsFromFormat(device->Format); -+ frameSize = numChannels * aluBytesFromFormat(device->Format); -+ -+ media_raw_audio_format format; -+ format = media_raw_audio_format::wildcard; -+ format.frame_rate = device->Frequency; -+ format.channel_count = numChannels; -+ -+ switch(aluBytesFromFormat(device->Format)) { -+ case 1: -+ format.format = media_raw_audio_format::B_AUDIO_UCHAR; // port audio suggests uchar -+ format.byte_order = B_MEDIA_LITTLE_ENDIAN; // Not relevant for single byte types -+ break; -+ case 2: -+ format.format = media_raw_audio_format::B_AUDIO_SHORT; -+ format.byte_order = B_MEDIA_LITTLE_ENDIAN; // Important here but this is a guess -+ break; -+ case 4: -+ format.format = media_raw_audio_format::B_AUDIO_FLOAT; -+ format.byte_order = B_MEDIA_LITTLE_ENDIAN; // Important here but this is a guess -+ break; -+ default: -+ return ALC_FALSE; -+ } -+ -+ format.buffer_size = device->UpdateSize * device->NumUpdates * frameSize; -+ -+ printf("Setup format of Rate(%.0f) Channels (%ld) ByteSize(%d) Buffer(%ld)\n", -+ format.frame_rate, format.channel_count, aluBytesFromFormat(device->Format), format.buffer_size); -+ -+ data->player = new BSoundPlayer(&format, "ALplayer", BufferProc, NULL, &data); -+ data->player->SetVolume(1.0); -+ data->player->SetHasData(true); -+ data->player->Start(); -+ -+ return ALC_TRUE; -+} -+ -+static void haiku_stop_playback(ALCdevice *device) -+{ -+ haiku_data *data = (haiku_data*)device->ExtraData; -+ -+ if (!data->player) -+ return; -+ -+ data->player->Stop(); -+ delete data->player; -+ data->player = NULL; -+} -+ -+ -+static ALCboolean haiku_open_capture(ALCdevice *device, const ALCchar *deviceName) -+{ -+ (void)device; -+ (void)deviceName; -+ return ALC_FALSE; -+} -+ -+static void haiku_close_capture(ALCdevice *device) -+{ -+ (void)device; -+} -+ -+static void haiku_start_capture(ALCdevice *pDevice) -+{ -+ (void)pDevice; -+} -+ -+static void haiku_stop_capture(ALCdevice *pDevice) -+{ -+ (void)pDevice; -+} -+ -+static void haiku_capture_samples(ALCdevice *pDevice, ALCvoid *pBuffer, ALCuint lSamples) -+{ -+ (void)pDevice; -+ (void)pBuffer; -+ (void)lSamples; -+} -+ -+static ALCuint haiku_available_samples(ALCdevice *pDevice) -+{ -+ (void)pDevice; -+ return 0; -+} -+ -+BackendFuncs haiku_funcs = { -+ haiku_open_playback, -+ haiku_close_playback, -+ haiku_reset_playback, -+ haiku_stop_playback, -+ haiku_open_capture, -+ haiku_close_capture, -+ haiku_start_capture, -+ haiku_stop_capture, -+ haiku_capture_samples, -+ haiku_available_samples -+}; -+ -+void alc_haiku_init(BackendFuncs *func_list) -+{ -+ /* BSoundPlayer requires a BApplication object */ -+ new BApplication("application/x-vnd.ALplayer"); -+ -+ *func_list = haiku_funcs; -+} -+ -+void alc_haiku_deinit(void) -+{ -+} -+ -+void alc_haiku_probe(int type) -+{ -+#ifdef HAVE_STAT -+ struct stat buf; -+ if(stat(GetConfigValue("haiku", "device", "/dev/audio"), &buf) != 0) -+ return; -+#endif -+ -+ if(type == DEVICE_PROBE) -+ AppendDeviceList(haiku_device); -+ else if(type == ALL_DEVICE_PROBE) -+ AppendAllDeviceList(haiku_device); -+} -diff -Naur openal-soft-1.12.854/CMakeLists.txt openal-soft-1.12.854-haiku/CMakeLists.txt ---- openal-soft-1.12.854/CMakeLists.txt 2010-03-30 05:03:34.024117248 +0000 -+++ openal-soft-1.12.854-haiku/CMakeLists.txt 2010-08-16 18:08:22.231211008 +0000 -@@ -13,13 +13,14 @@ - INCLUDE(CheckSharedLibraryExists) - INCLUDE(CheckIncludeFile) - INCLUDE(CheckIncludeFiles) -+INCLUDE(CheckCXXSourceCompiles) - INCLUDE(CheckSymbolExists) - INCLUDE(CheckCCompilerFlag) - INCLUDE(CheckCSourceCompiles) - INCLUDE(CheckTypeSize) - - --PROJECT(OpenAL C) -+PROJECT(OpenAL) - - - SET(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS TRUE) -@@ -28,6 +29,7 @@ - OPTION(ALSA "Check for ALSA backend" ON) - OPTION(OSS "Check for OSS backend" ON) - OPTION(SOLARIS "Check for Solaris backend" ON) -+OPTION(HAIKU "Check for Haiku backend" ON) - OPTION(DSOUND "Check for DirectSound backend" ON) - OPTION(WINMM "Check for Windows Multimedia backend" ON) - OPTION(PORTAUDIO "Check for PortAudio backend" ON) -@@ -347,6 +349,24 @@ - ENDIF() - ENDIF() - -+# Check Haiku backend -+IF(HAIKU) -+ CHECK_CXX_SOURCE_COMPILES("#include -+ int main(void) -+ { -+ BSoundPlayer *player; -+ return 0; -+ } -+ " HAVE_SOUND_PLAYER_H) -+ IF(HAVE_SOUND_PLAYER_H) -+ SET(HAVE_HAIKU 1) -+ SET(ALC_OBJS ${ALC_OBJS} Alc/haiku.cxx) -+ SET(BACKENDS "${BACKENDS} Haiku,") -+ SET(EXTRA_LIBS be ${EXTRA_LIBS}) -+ SET(EXTRA_LIBS media ${EXTRA_LIBS}) -+ ENDIF() -+ENDIF() -+ - # Check DSound/MMSystem backend - IF(DSOUND) - CHECK_INCLUDE_FILE(dsound.h HAVE_DSOUND_H) -diff -Naur openal-soft-1.12.854/OpenAL32/Include/alMain.h openal-soft-1.12.854-haiku/OpenAL32/Include/alMain.h ---- openal-soft-1.12.854/OpenAL32/Include/alMain.h 2010-03-26 01:36:26.025690112 +0000 -+++ openal-soft-1.12.854-haiku/OpenAL32/Include/alMain.h 2010-08-16 18:09:12.255328256 +0000 -@@ -209,6 +209,9 @@ - void alc_solaris_init(BackendFuncs *func_list); - void alc_solaris_deinit(void); - void alc_solaris_probe(int type); -+void alc_haiku_init(BackendFuncs *func_list); -+void alc_haiku_deinit(void); -+void alc_haiku_probe(int type); - void alcDSoundInit(BackendFuncs *func_list); - void alcDSoundDeinit(void); - void alcDSoundProbe(int type); -@@ -335,7 +338,7 @@ - - extern ALint RTPrioLevel; - --ALCvoid ReleaseALC(ALCvoid); -+ALCvoid ReleaseALC(void); - - void AppendDeviceList(const ALCchar *name); - void AppendAllDeviceList(const ALCchar *name); -diff -Naur openal-soft-1.12.854/config.h.in openal-soft-1.12.854-haiku/config.h.in ---- openal-soft-1.12.854/config.h.in 2010-03-08 05:55:13.023855104 +0000 -+++ openal-soft-1.12.854-haiku/config.h.in 2010-08-16 18:09:32.332922880 +0000 -@@ -13,6 +13,9 @@ - /* Define if we have the Solaris backend */ - #cmakedefine HAVE_SOLARIS - -+/* Define if we have the Haiku backend */ -+#cmakedefine HAVE_HAIKU -+ - /* Define if we have the DSound backend */ - #cmakedefine HAVE_DSOUND - diff --git a/media-libs/openexr/openexr-2.1.0.recipe b/media-libs/openexr/openexr-2.1.0.recipe index 21b5fc951..462785ef5 100644 --- a/media-libs/openexr/openexr-2.1.0.recipe +++ b/media-libs/openexr/openexr-2.1.0.recipe @@ -1,19 +1,18 @@ -DESCRIPTION=" -OpenEXR is a high dynamic-range (HDR) image file format developed \ +SUMMARY="A high dynamic-range (HDR) image file format" +DESCRIPTION="OpenEXR is a high dynamic-range (HDR) image file format developed \ by Industrial Light & Magic for use in computer imaging \ applications. OpenEXR is used by ILM on all motion pictures \ currently in production. The first movies to employ OpenEXR were \ Harry Potter and the Sorcerers Stone, Men in Black II, Gangs of \ New York, and Signs. Since then, OpenEXR has become ILM's main \ -image file format. -" -SUMMARY="OpenEXR is a high dynamic-range (HDR) image file format" +image file format." HOMEPAGE="http://www.openexr.com" -LICENSE="BSD (3-clause)" COPYRIGHT="2002-2011 Industrial Light & Magic" +LICENSE="BSD (3-clause)" +REVISION="1" SOURCE_URI="http://download.savannah.nongnu.org/releases/openexr/openexr-2.1.0.tar.gz" CHECKSUM_SHA256="54486b454073c1dcb5ae9892cf0f730ffefe62f38176325281505093fd218a14" -REVISION="1" +PATCHES="openexr-2.1.0.patch" ARCHITECTURES="x86 ?x86_64" if [ $effectiveTargetArchitecture != x86_gcc2 ]; then @@ -25,8 +24,6 @@ else fi SECONDARY_ARCHITECTURES="x86" -PATCHES="openexr-2.1.0.patch" - PROVIDES=" openexr$secondaryArchSuffix = $portVersion lib:libIlmImf$secondaryArchSuffix = $portVersion diff --git a/media-libs/openexr/openexr-2.2.0.recipe b/media-libs/openexr/openexr-2.2.0.recipe index 065cb6e83..ced0878f4 100644 --- a/media-libs/openexr/openexr-2.2.0.recipe +++ b/media-libs/openexr/openexr-2.2.0.recipe @@ -1,19 +1,17 @@ SUMMARY="A high dynamic-range (HDR) image file format" -DESCRIPTION=" -OpenEXR is a high dynamic-range (HDR) image file format developed \ +DESCRIPTION="OpenEXR is a high dynamic-range (HDR) image file format developed \ by Industrial Light & Magic for use in computer imaging \ applications. OpenEXR is used by ILM on all motion pictures \ currently in production. The first movies to employ OpenEXR were \ Harry Potter and the Sorcerers Stone, Men in Black II, Gangs of \ New York, and Signs. Since then, OpenEXR has become ILM's main \ -image file format. -" +image file format." HOMEPAGE="http://www.openexr.com" -LICENSE="BSD (3-clause)" COPYRIGHT="2002-2011 Industrial Light & Magic" +LICENSE="BSD (3-clause)" +REVISION="1" SOURCE_URI="http://download.savannah.nongnu.org/releases/openexr/openexr-$portVersion.tar.gz" CHECKSUM_SHA256="36a012f6c43213f840ce29a8b182700f6cf6b214bea0d5735594136b44914231" -REVISION="1" ARCHITECTURES="x86 x86_64" if [ $effectiveTargetArchitecture != x86_gcc2 ]; then diff --git a/media-libs/openjpeg/openjpeg-1.5.0.recipe b/media-libs/openjpeg/openjpeg-1.5.0.recipe index 49111214c..59998b945 100644 --- a/media-libs/openjpeg/openjpeg-1.5.0.recipe +++ b/media-libs/openjpeg/openjpeg-1.5.0.recipe @@ -1,14 +1,12 @@ -SUMMARY="OpenJPEG is an open-source C-Library for JPEG 2000" -DESCRIPTION=" -The OpenJPEG library is an open-source JPEG 2000 codec written in C language. \ +SUMMARY="An open-source C-Library for JPEG 2000" +DESCRIPTION="The OpenJPEG library is an open-source JPEG 2000 codec written in C language. \ It has been developed in order to promote the use of JPEG 2000, the new \ still-image compression standard from the Joint Photographic Experts Group \ (JPEG). In addition to the basic codec, various other features are under \ development, among them the JP2 and MJ2 (Motion JPEG 2000) file formats, an \ indexing tool useful for the JPIP protocol, JPWL-tools for error-resilience, \ -a Java-viewer for j2k-images, ... -" -LICENSE="BSD (2-clause)" +a Java-viewer for j2k-images." +HOMEPAGE="http://www.openjpeg.org/" COPYRIGHT="2002-2012, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium 2002-2012 Professor Benoit Macq 2003-2012 Antonin Descampe @@ -16,10 +14,12 @@ COPYRIGHT="2002-2012, Communications and Remote Sensing Laboratory, Universite c 2005 Herve Drolon, FreeImage Team 2002-2003 Yannick Verschueren 2001-2003 David Janssens" -HOMEPAGE="http://www.openjpeg.org/" +LICENSE="BSD (2-clause)" +REVISION="1" SOURCE_URI="http://openjpeg.googlecode.com/files/openjpeg-1.5.0.tar.gz" CHECKSUM_SHA256="c9908fab44432a2ed2550c457cb7e736da6d7c326f1203d23d1082d992364ace" -REVISION="1" +SOURCE_DIR="openjpeg-1.5.0" + ARCHITECTURES="x86 x86_64" if [ $effectiveTargetArchitecture != x86_gcc2 ]; then # x86_gcc2 is fine as primary target architecture as long as we're building @@ -84,8 +84,6 @@ REQUIRES_devel=" openjpeg$secondaryArchSuffix == $portVersion " -SOURCE_DIR="openjpeg-1.5.0" - BUILD() { ./bootstrap.sh diff --git a/media-libs/openjpeg/openjpeg-2.1.0.recipe b/media-libs/openjpeg/openjpeg-2.1.0.recipe index a072b5874..fecc9a1be 100644 --- a/media-libs/openjpeg/openjpeg-2.1.0.recipe +++ b/media-libs/openjpeg/openjpeg-2.1.0.recipe @@ -1,14 +1,12 @@ -SUMMARY="OpenJPEG is an open-source C-Library for JPEG 2000" -DESCRIPTION=" -The OpenJPEG library is an open-source JPEG 2000 codec written in C language. \ +SUMMARY="An open-source C-Library for JPEG 2000" +DESCRIPTION="The OpenJPEG library is an open-source JPEG 2000 codec written in C language. \ It has been developed in order to promote the use of JPEG 2000, the new \ still-image compression standard from the Joint Photographic Experts Group \ (JPEG). In addition to the basic codec, various other features are under \ development, among them the JP2 and MJ2 (Motion JPEG 2000) file formats, an \ indexing tool useful for the JPIP protocol, JPWL-tools for error-resilience, \ -a Java-viewer for j2k-images, ... -" -LICENSE="BSD (2-clause)" +a Java-viewer for j2k-images." +HOMEPAGE="http://www.openjpeg.org/" COPYRIGHT="2002-2012, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium 2002-2012 Professor Benoit Macq 2003-2012 Antonin Descampe @@ -16,10 +14,12 @@ COPYRIGHT="2002-2012, Communications and Remote Sensing Laboratory, Universite c 2005 Herve Drolon, FreeImage Team 2002-2003 Yannick Verschueren 2001-2003 David Janssens" -HOMEPAGE="http://www.openjpeg.org/" +LICENSE="BSD (2-clause)" +REVISION="2" SOURCE_URI="http://sourceforge.net/projects/openjpeg.mirror/files/$portVersion/openjpeg-$portVersion.tar.gz" CHECKSUM_SHA256="1232bb814fd88d8ed314c94f0bfebb03de8559583a33abbe8c64ef3fc0a8ff03" -REVISION="2" +PATCHES="openjpeg-2.1.0.patchset" + ARCHITECTURES="x86_gcc2 x86 x86_64" PROVIDES=" @@ -60,8 +60,6 @@ REQUIRES_devel=" openjpeg$secondaryArchSuffix == $portVersion " -PATCHES="openjpeg-2.1.0.patchset" - BUILD() { mkdir -p build diff --git a/media-libs/opus/opus-1.1.recipe b/media-libs/opus/opus-1.1.recipe index 37b3e2bd2..e6d4f992c 100644 --- a/media-libs/opus/opus-1.1.recipe +++ b/media-libs/opus/opus-1.1.recipe @@ -1,19 +1,19 @@ -SUMMARY="Opus Interactive Audio Codec" -DESCRIPTION=" -Opus is a totally open, royalty-free, highly versatile audio codec. Opus is \ +SUMMARY="An interactive audio codec" +DESCRIPTION="Opus is a totally open, royalty-free, highly versatile audio codec. Opus is \ unmatched for interactive speech and music transmission over the Internet, but\ is also intended for storage and streaming applications. It is standardized by\ the Internet Engineering Task Force (IETF) as RFC 6716 which incorporated\ -technology from Skype's SILK codec and Xiph.Org's CELT codec. -" +technology from Skype's SILK codec and Xiph.Org's CELT codec." HOMEPAGE="http://www.opus-codec.org" COPYRIGHT="2001-2014 Xiph.org" LICENSE="BSD (3-clause)" +REVISION="1" SOURCE_URI="http://downloads.xiph.org/releases/opus/opus-$portVersion.tar.gz" CHECKSUM_SHA256="b9727015a58affcf3db527322bf8c4d2fcf39f5f6b8f15dbceca20206cbe1d95" -REVISION="1" + ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" + PROVIDES=" opus$secondaryArchSuffix = $portVersion compat >= 1 lib:libopus$secondaryArchSuffix = 0.5.0 compat >= 0 @@ -21,6 +21,7 @@ PROVIDES=" REQUIRES=" haiku$secondaryArchSuffix " + BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel " @@ -37,6 +38,7 @@ BUILD() runConfigure ./configure make } + INSTALL() { make install diff --git a/media-sound/opensound/opensound-4.2.recipe b/media-sound/opensound/opensound-4.2.recipe index a9c86de5d..063ce4c83 100644 --- a/media-sound/opensound/opensound-4.2.recipe +++ b/media-sound/opensound/opensound-4.2.recipe @@ -1,10 +1,30 @@ -DESCRIPTION="Open Sound System - " -HOMEPAGE="http://developer.opensound.com/" -SOURCE_URI="http://www.4front-tech.com/developer/sources/stable/bsd/oss-v4.2-build2002-src-bsd.tar.bz2" +SUMMARY="An open sound system" +DESCRIPTION="Open Sound System (OSS) is the first attempt in unifying the \ +digital audio architecture for UNIX. OSS is a set of device drivers that \ +provide a uniform API across all the major UNIX architectures." +HOMEPAGE="http://developer.opensound.com/" +COPYRIGHT="1996-2009" +LICENSE="BSD (2-clause)" REVISION="1" +SOURCE_URI="http://www.4front-tech.com/developer/sources/stable/bsd/oss-v4.2-build2002-src-bsd.tar.bz2" +CHECKSUM_MD5="da28b1fea261554a1480fcd3c5509cb5" STATUS_HAIKU="stable" DEPEND="" -CHECKSUM_MD5="da28b1fea261554a1480fcd3c5509cb5" + +ARCHITECTURES="x86_gcc2 ?x86" + +PROVIDES=" + opensound$secondaryArchSuffix = $portVersion + cmd:ossplay$secondaryArchSuffix + cmd:ossinfo$secondaryArchSuffix + cmd:ossmix$secondaryArchSuffix + cmd:ossphone$secondaryArchSuffix + cmd:ossrecord$secondaryArchSuffix + cmd:osstest$secondaryArchSuffix + cmd:savemixer$secondaryArchSuffix + cmd:vmixctl$secondaryArchSuffix + " + BUILD() { cd oss-v4.2-build2002-src-bsd @@ -25,5 +45,3 @@ INSTALL() make install fi } -LICENSE="BSD (2-clause)" -COPYRIGHT="1996-2009" diff --git a/media-sound/opensound/opensound-4.2_git.recipe b/media-sound/opensound/opensound-4.2_git.recipe index 3c5836893..9fa68f4b4 100644 --- a/media-sound/opensound/opensound-4.2_git.recipe +++ b/media-sound/opensound/opensound-4.2_git.recipe @@ -1,13 +1,20 @@ -SUMMARY="Open Sound System" -DESCRIPTION="Open Sound System audio drivers" -HOMEPAGE="http://developer.opensound.com/" -LICENSE="BSD (2-clause)" +SUMMARY="An open sound system" +DESCRIPTION="Open Sound System (OSS) is the first attempt in unifying the \ +digital audio architecture for UNIX. OSS is a set of device drivers that \ +provide a uniform API across all the major UNIX architectures." +HOMEPAGE="http://developer.opensound.com/" COPYRIGHT="1996-2008 Hannu Savolainen and Dev Mazumdar" -SOURCE_URI="git://opensound.git.sourceforge.net/gitroot/opensound/opensound#f6048993e04bb50e8e98b7e4f4eadfae3e736fec" +LICENSE="BSD (2-clause)" REVISION="2" -#CHECKSUM_MD5="" +SOURCE_URI="git://opensound.git.sourceforge.net/gitroot/opensound/opensound#f6048993e04bb50e8e98b7e4f4eadfae3e736fec" +PATCHES="opensound-4.2_git.patchset" + ARCHITECTURES="x86_gcc2 ?x86" +GLOBAL_WRITABLE_FILES=" + settings/kernel/drivers directory keep-old + " + PROVIDES=" opensound$secondaryArchSuffix = $portVersion cmd:ossplay$secondaryArchSuffix @@ -33,10 +40,6 @@ BUILD_PREREQUIRES=" cmd:make " -PATCHES="opensound-4.2_git.patchset" - -GLOBAL_WRITABLE_FILES="settings/kernel/drivers directory keep-old" - BUILD() { mkdir -p build