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 
- move libfaad from WANTLIB to LIB_DEPENDS and LIB_DEPEND
  libfaad >= 1.0
- bump PKGNAME

libfaad move from WANTLIB to LIB_DEPENDS OK ajacoutot@ (MAINTAINER)
OK naddy@
This commit is contained in:
jakemsr 2007-06-29 06:19:46 +00:00
parent e0c0b71afd
commit 73366c6ce5
2 changed files with 41 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
multimedia/avidemux/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.8 2007/06/01 00:36:43 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.9 2007/06/29 06:19:46 jakemsr Exp $
COMMENT= "free video editor"
V= 2.3.0
DISTNAME= avidemux_${V}
PKGNAME= avidemux-${V}p2
PKGNAME= avidemux-${V}p3
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_BERLIOS:=avidemux/}
@ -19,7 +19,7 @@ PERMIT_DISTFILES_CDROM= yes
PERMIT_DISTFILES_FTP= yes
WANTLIB= X11 Xau Xcursor Xdmcp Xext Xfixes Xi Xinerama Xrandr \
Xrender Xv atk-1.0 c cairo expat faad fontconfig \
Xrender Xv atk-1.0 c cairo expat fontconfig \
freetype glib-2.0 glitz gmodule-2.0 gobject-2.0 \
gthread-2.0 m ogg pango-1.0 pangocairo-1.0 \
pangoft2-1.0 png pthread stdc++ z ossaudio
@ -28,6 +28,7 @@ MODULES= devel/gettext
LIB_DEPENDS= gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 \
faac::audio/faac \
faad.>=1::audio/faad \
js.>=1::lang/spidermonkey \
mp3lame::audio/lame \
vorbis.>=5,vorbisenc.>=2::audio/libvorbis \

37
multimedia/avidemux/patches/patch-avidemux_ADM_audiocodec_ADM_codecfaad_cpp Normal file
View File

@ -0,0 +1,37 @@
$OpenBSD: patch-avidemux_ADM_audiocodec_ADM_codecfaad_cpp,v 1.1 2007/06/29 06:19:46 jakemsr Exp $
--- avidemux/ADM_audiocodec/ADM_codecfaad.cpp.orig Thu May 31 22:55:01 2007
+++ avidemux/ADM_audiocodec/ADM_codecfaad.cpp Thu May 31 23:02:00 2007
@@ -34,11 +34,11 @@ ADM_faad::ADM_faad( uint32_t fourcc ,WAVHeader *info,u
{
faacDecConfigurationPtr conf;
#ifdef OLD_FAAD_PROTO
-unsigned long int srate;
+uint32_t srate;
#else
uint32_t srate;
#endif
-unsigned char chan;
+uint8_t chan;
_inited=0;
_instance=NULL;
_inbuffer=0;
@@ -108,16 +108,16 @@ uint8_t ADM_faad::endDecompress( void )
uint8_t ADM_faad::run(uint8_t *inptr, uint32_t nbIn, float *outptr, uint32_t *nbOut)
{
uint32_t xin;
-long int res;
+int32_t res;
void *outbuf;
faacDecFrameInfo info;
int max=0;
#ifdef OLD_FAAD_PROTO
-unsigned long int srate;
+uint32_t srate;
#else
uint32_t srate;
#endif
-unsigned char chan=0;
+uint8_t chan=0;
uint8_t first=0;