cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- use exact width data types for libfaad interaction

Browse Source 
- LIB_DEPENDS libfaad >= 1.0
- bump PKGNAME

OK naddy@
This commit is contained in:
jakemsr 2007-06-29 06:08:12 +00:00
parent 37d3a8fab0
commit 6ff93d9b44
3 changed files with 66 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
audio/mpd/Makefile
View File

@ -1,7 +1,8 @@
# $OpenBSD: Makefile,v 1.6 2007/06/22 11:42:14 jasper Exp $
# $OpenBSD: Makefile,v 1.7 2007/06/29 06:08:12 jakemsr Exp $
COMMENT= "Music Player Daemon"
DISTNAME= mpd-0.13.0
PKGNAME= ${DISTNAME}p0
CATEGORIES= audio
HOMEPAGE= http://www.musicpd.org/
MAINTAINER= Tobias Ulmer <tobiasu@tmux.org>
@ -21,7 +22,7 @@ MODULES= converters/libiconv
LIB_DEPENDS= audiofile::devel/libaudiofile \
ao::audio/libao \
samplerate::audio/libsamplerate \
faad::audio/faad \
faad.>=1::audio/faad \
id3tag::audio/libid3tag \
mad::audio/libmad \
mikmod::audio/libmikmod \

45
audio/mpd/patches/patch-src_inputPlugins_aac_plugin_c Normal file
View File

@ -0,0 +1,45 @@
$OpenBSD: patch-src_inputPlugins_aac_plugin_c,v 1.1 2007/06/29 06:08:12 jakemsr Exp $
--- src/inputPlugins/aac_plugin.c.orig Mon May 28 06:19:30 2007
+++ src/inputPlugins/aac_plugin.c Thu Jun 28 21:30:21 2007
@@ -37,10 +37,10 @@
/* all code here is either based on or copied from FAAD2's frontend code */
typedef struct {
InputStream *inStream;
- long bytesIntoBuffer;
- long bytesConsumed;
- long fileOffset;
- unsigned char *buffer;
+ uint32_t bytesIntoBuffer;
+ uint32_t bytesConsumed;
+ uint32_t fileOffset;
+ uint8_t *buffer;
int atEof;
} AacBuffer;
@@ -237,10 +237,10 @@ static float getAacFloatTotalTime(char *file)
size_t fileread, tagsize;
faacDecHandle decoder;
faacDecConfigurationPtr config;
- unsigned long sampleRate;
- unsigned char channels;
+ uint32_t sampleRate;
+ uint8_t channels;
InputStream inStream;
- long bread;
+ int32_t bread;
if (openInputStream(&inStream, file) < 0)
return -1;
@@ -292,9 +292,9 @@ static int aac_decode(OutputBuffer * cb, DecoderContro
faacDecHandle decoder;
faacDecFrameInfo frameInfo;
faacDecConfigurationPtr config;
- long bread;
- unsigned long sampleRate;
- unsigned char channels;
+ int32_t bread;
+ uint32_t sampleRate;
+ uint8_t channels;
int eof = 0;
unsigned int sampleCount;
char *sampleBuffer;

18
audio/mpd/patches/patch-src_inputPlugins_mp4_plugin_c Normal file
View File

@ -0,0 +1,18 @@
$OpenBSD: patch-src_inputPlugins_mp4_plugin_c,v 1.1 2007/06/29 06:08:12 jakemsr Exp $
--- src/inputPlugins/mp4_plugin.c.orig Mon May 28 06:19:30 2007
+++ src/inputPlugins/mp4_plugin.c Thu Jun 28 21:34:04 2007
@@ -98,10 +98,10 @@ static int mp4_decode(OutputBuffer * cb, DecoderContro
faacDecHandle decoder;
faacDecFrameInfo frameInfo;
faacDecConfigurationPtr config;
- unsigned char *mp4Buffer;
- unsigned int mp4BufferSize;
- unsigned long sampleRate;
- unsigned char channels;
+ uint8_t *mp4Buffer;
+ uint32_t mp4BufferSize;
+ uint32_t sampleRate;
+ uint8_t channels;
long sampleId;
long numSamples;
int eof = 0;