- Fix AAC (faad) playback on amd64 [1]

- Enable and support libcaca

PR:		ports/72087 [1]
Submitted by:	Arjan van Leeuwen <avleeuwen@piwebs.com>
Approved by:	maintainer

2 files changed, 109 insertions, 4 deletions

diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile
index 6bb1e053658f..132968a8be70 100644
--- a/multimedia/mplayer/Makefile
+++ b/multimedia/mplayer/Makefile
@@ -146,6 +146,9 @@
 # WITH_CDPARANOIA
 # default: autodetect
 #
+# WITH_LIBCACA
+# default: autodetect
+#
 # WITH_LIBDV
 # default: autodetect
 #
@@ -163,7 +166,7 @@
 #
 # WITH_TREMOR
 # default: autodetect
-# By setting this option mplayer will use libtremor (integer only vorbis 
+# By setting this option mplayer will use libtremor (integer only vorbis
 # decoding lib) instead of libvorbis even if libvorbis is installed.
 # Note: This is disabled at the moment due to unresolved build problems
 #
@@ -228,7 +231,7 @@
 
 PORTNAME=	mplayer
 PORTVERSION=	0.99.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia audio ipv6
 MASTER_SITES=	http://www1.mplayerhq.hu/MPlayer/releases/ \
 		http://www2.mplayerhq.hu/MPlayer/releases/ \
@@ -268,7 +271,6 @@ CONFIGURE_ARGS=	--with-extralibdir=${LOCALBASE}/lib \
 		--disable-libfame \
 		--disable-external-faad \
 		--disable-tv-v4l \
-		--disable-caca \
 		--disable-tremor
 
 .if defined(WITH_LANG)
@@ -316,6 +318,10 @@ WITH_ARTS=	yes
 WITH_CDPARANOIA=	yes
 .endif
 
+.if exists(${LOCALBASE}/lib/libcaca.a)
+WITH_LIBCACA=		yes
+.endif
+
 .if exists(${LOCALBASE}/lib/libdv.so.4)
 WITH_LIBDV=	yes
 .endif
@@ -478,6 +484,12 @@ LIB_DEPENDS+=	cdda_paranoia.0:${PORTSDIR}/audio/cdparanoia
 CONFIGURE_ARGS+=	--disable-cdparanoia
 .endif
 
+.if defined(WITH_LIBCACA)
+BUILD_DEPENDS+=	${LOCALBASE}/lib/libcaca.a:${PORTSDIR}/graphics/libcaca
+.else
+CONFIGURE_ARGS+=	--disable-caca
+.endif
+
 .if defined(WITH_LIBUNGIF)
 LIB_DEPENDS+=	ungif.5:${PORTSDIR}/graphics/libungif
 #CONFIGURE_ARGS+=	--enable-gif
@@ -504,7 +516,6 @@ CONFIGURE_ARGS+=	--disable-mad
 
 .if defined(WITH_MATROSKA)
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libmatroska.a:${PORTSDIR}/multimedia/libmatroska
-
 CONFIGURE_ARGS+=	--enable-external-matroska
 .else
 CONFIGURE_ARGS+=	--disable-external-matroska
diff --git a/multimedia/mplayer/files/patch-libfaad2-structs.h b/multimedia/mplayer/files/patch-libfaad2-structs.h
new file mode 100644
index 000000000000..982f9b43bbf6
--- /dev/null
+++ b/multimedia/mplayer/files/patch-libfaad2-structs.h
@@ -0,0 +1,94 @@
+--- libfaad2/structs.h.orig	Sat Sep 25 19:19:19 2004
++++ libfaad2/structs.h	Sat Sep 25 19:22:32 2004
+@@ -309,58 +309,58 @@
+ typedef struct mp4AudioSpecificConfig
+ {
+     /* Audio Specific Info */
+-    uint8_t objectTypeIndex;
+-    uint8_t samplingFrequencyIndex;
+-    uint32_t samplingFrequency;
+-    uint8_t channelsConfiguration;
++    unsigned char objectTypeIndex;
++    unsigned char samplingFrequencyIndex;
++    unsigned long samplingFrequency;
++    unsigned char channelsConfiguration;
+ 
+     /* GA Specific Info */
+-    uint8_t frameLengthFlag;
+-    uint8_t dependsOnCoreCoder;
+-    uint16_t coreCoderDelay;
+-    uint8_t extensionFlag;
+-    uint8_t aacSectionDataResilienceFlag;
+-    uint8_t aacScalefactorDataResilienceFlag;
+-    uint8_t aacSpectralDataResilienceFlag;
+-    uint8_t epConfig;
++    unsigned char frameLengthFlag;
++    unsigned char dependsOnCoreCoder;
++    unsigned short coreCoderDelay;
++    unsigned char extensionFlag;
++    unsigned char aacSectionDataResilienceFlag;
++    unsigned char aacScalefactorDataResilienceFlag;
++    unsigned char aacSpectralDataResilienceFlag;
++    unsigned char epConfig;
+ 
+-    int8_t sbr_present_flag;
+-    int8_t forceUpSampling;
++    char sbr_present_flag;
++    char forceUpSampling;
+ } mp4AudioSpecificConfig;
+ 
+ typedef struct faacDecConfiguration
+ {
+-    uint8_t defObjectType;
+-    uint32_t defSampleRate;
+-    uint8_t outputFormat;
+-    uint8_t downMatrix;
+-    uint8_t useOldADTSFormat;
+-    uint8_t dontUpSampleImplicitSBR;
++    unsigned char defObjectType;
++    unsigned long defSampleRate;
++    unsigned char outputFormat;
++    unsigned char downMatrix;
++    unsigned char useOldADTSFormat;
++    unsigned char dontUpSampleImplicitSBR;
+ } faacDecConfiguration, *faacDecConfigurationPtr;
+ 
+ typedef struct faacDecFrameInfo
+ {
+-    uint32_t bytesconsumed;
+-    uint32_t samples;
+-    uint8_t channels;
+-    uint8_t error;
+-    uint32_t samplerate;
++    unsigned long bytesconsumed;
++    unsigned long samples;
++    unsigned char channels;
++    unsigned char error;
++    unsigned long samplerate;
+ 
+     /* SBR: 0: off, 1: on; normal, 2: on; downsampled */
+-    uint8_t sbr;
++    unsigned char sbr;
+ 
+     /* MPEG-4 ObjectType */
+-    uint8_t object_type;
++    unsigned char object_type;
+ 
+     /* AAC header type; MP4 will be signalled as RAW also */
+-    uint8_t header_type;
++    unsigned char header_type;
+ 
+     /* multichannel configuration */
+-    uint8_t num_front_channels;
+-    uint8_t num_side_channels;
+-    uint8_t num_back_channels;
+-    uint8_t num_lfe_channels;
+-    uint8_t channel_position[MAX_CHANNELS];
++    unsigned char num_front_channels;
++    unsigned char num_side_channels;
++    unsigned char num_back_channels;
++    unsigned char num_lfe_channels;
++    unsigned char channel_position[MAX_CHANNELS];
+ } faacDecFrameInfo;
+ 
+ typedef struct