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

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

6
audio/audacious-plugins/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.7 2007/06/26 17:11:39 steven Exp $ # $OpenBSD: Makefile,v 1.8 2007/06/29 06:05:46 jakemsr Exp $
SHARED_ONLY= Yes SHARED_ONLY= Yes
@ -7,7 +7,7 @@ COMMENT-arts= "arts helper and plugin for audacious"
V= 1.3.5 V= 1.3.5
DISTNAME= audacious-plugins-$V DISTNAME= audacious-plugins-$V
PKGNAME-main= ${DISTNAME} PKGNAME-main= ${DISTNAME}p1
PKGNAME-arts= audacious-arts-$V PKGNAME-arts= audacious-arts-$V
CATEGORIES= audio multimedia CATEGORIES= audio multimedia
@ -51,7 +51,7 @@ RUN_DEPENDS-main= :audacious->=1.2:audio/audacious
RUN_DEPENDS-arts= ::audio/audacious-plugins,-main RUN_DEPENDS-arts= ::audio/audacious-plugins,-main
LIB_DEPENDS-main= tag.>=6:taglib->=1.4:audio/taglib \ LIB_DEPENDS-main= tag.>=6:taglib->=1.4:audio/taglib \
faad,mp4ff::audio/faad \ faad.>=1,mp4ff::audio/faad \
audiofile::devel/libaudiofile \ audiofile::devel/libaudiofile \
curl.>=5::net/curl \ curl.>=5::net/curl \
SDL.>=6::devel/sdl \ SDL.>=6::devel/sdl \

52
audio/audacious-plugins/patches/patch-src_aac_src_libmp4_c Normal file
View File

@ -0,0 +1,52 @@
$OpenBSD: patch-src_aac_src_libmp4_c,v 1.1 2007/06/29 06:05:46 jakemsr Exp $
--- src/aac/src/libmp4.c.orig Thu May 31 17:12:45 2007
+++ src/aac/src/libmp4.c Thu May 31 17:20:57 2007
@@ -388,13 +388,13 @@ static TitleInput *mp4_get_song_tuple(char *fn)
gint mp4track= getAACTrack(mp4file);
gint numSamples = mp4ff_num_samples(mp4file, mp4track);
guint framesize = 1024;
- gulong samplerate;
- guchar channels;
+ guint32 samplerate;
+ guint8 channels;
gint msDuration;
mp4AudioSpecificConfig mp4ASC;
gchar *tmpval;
- guchar *buffer = NULL;
- guint bufferSize = 0;
+ guint8 *buffer = NULL;
+ guint32 bufferSize = 0;
faacDecHandle decoder;
if (mp4track == -1)
@@ -525,10 +525,10 @@ static int my_decode_mp4( InputPlayback *playback, cha
gint mp4track= getAACTrack(mp4file);
faacDecHandle decoder;
mp4AudioSpecificConfig mp4ASC;
- guchar *buffer = NULL;
- guint bufferSize = 0;
- gulong samplerate;
- guchar channels;
+ guint8 *buffer = NULL;
+ guint32 bufferSize = 0;
+ guint32 samplerate;
+ guint8 channels;
gulong msDuration;
gulong numSamples;
gulong sampleID = 1;
@@ -674,11 +674,11 @@ static int my_decode_mp4( InputPlayback *playback, cha
void my_decode_aac( InputPlayback *playback, char *filename, VFSFile *file )
{
faacDecHandle decoder = 0;
- guchar streambuffer[BUFFER_SIZE];
+ guint8 streambuffer[BUFFER_SIZE];
gulong bufferconsumed = 0;
- gulong samplerate = 0;
- guchar channels;
- gulong buffervalid = 0;
+ guint32 samplerate = 0;
+ guint8 channels;
+ guint32 buffervalid = 0;
TitleInput* input;
gchar *ttemp = NULL, *stemp = NULL;
gchar *temp = g_strdup(filename);