Merge pull request #279 from Max-Might/master

De-lint recipes.
This commit is contained in:
gus knight
2015-08-03 17:45:25 -04:00
15 changed files with 112 additions and 485 deletions

View File

@@ -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"

View File

@@ -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

View File

@@ -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 <sys/ioctl.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <memory.h>
+#include <unistd.h>
+#include <errno.h>
+#include <math.h>
+
+#include "alMain.h"
+#include "AL/al.h"
+#include "AL/alc.h"
+
+#include <Application.h>
+#include <SoundPlayer.h>
+#include <signal.h>
+#include <OS.h>
+
+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 <SoundPlayer.h>
+ 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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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