- Sync with ports to fix runtime with faad

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@7294 df743ca5-7f9a-e211-a948-0013205c9059

3 files changed, 82 insertions, 1 deletions

diff --git a/multimedia/gstreamer-plugins-bad/files/patch-configure b/multimedia/gstreamer-plugins-bad/files/patch-configure
new file mode 100644
index 000000000..4ea746f00
--- /dev/null
+++ b/multimedia/gstreamer-plugins-bad/files/patch-configure
@@ -0,0 +1,55 @@
+--- configure.orig	Wed Sep 13 08:11:45 2006
++++ configure	Wed Sep 13 08:12:32 2006
+@@ -30382,9 +30382,9 @@
+ 
+   HAVE_FAAD="yes"
+ 
+-  echo "$as_me:$LINENO: checking for faacDecOpen in -lfaad" >&5
+-echo $ECHO_N "checking for faacDecOpen in -lfaad... $ECHO_C" >&6
+-if test "${ac_cv_lib_faad_faacDecOpen+set}" = set; then
++  echo "$as_me:$LINENO: checking for NeAACDecOpen in -lfaad" >&5
++echo $ECHO_N "checking for NeAACDecOpen in -lfaad... $ECHO_C" >&6
++if test "${ac_cv_lib_faad_NeAACDecOpen+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -30402,11 +30402,11 @@
+ #endif
+ /* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+-char faacDecOpen ();
++char NeAACDecOpen ();
+ int
+ main ()
+ {
+-faacDecOpen ();
++NeAACDecOpen ();
+   ;
+   return 0;
+ }
+@@ -30432,20 +30432,20 @@
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  ac_cv_lib_faad_faacDecOpen=yes
++  ac_cv_lib_faad_NeAACDecOpen=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_faad_faacDecOpen=no
++ac_cv_lib_faad_NeAACDecOpen=no
+ fi
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_faad_faacDecOpen" >&5
+-echo "${ECHO_T}$ac_cv_lib_faad_faacDecOpen" >&6
+-if test $ac_cv_lib_faad_faacDecOpen = yes; then
++echo "$as_me:$LINENO: result: $ac_cv_lib_faad_NeAACDecOpen" >&5
++echo "${ECHO_T}$ac_cv_lib_faad_NeAACDecOpen" >&6
++if test $ac_cv_lib_faad_NeAACDecOpen = yes; then
+   HAVE_FAAD=yes
+ else
+   HAVE_FAAD=no
diff --git a/multimedia/gstreamer-plugins-bad/files/patch-ext_faad_gstfaad.c b/multimedia/gstreamer-plugins-bad/files/patch-ext_faad_gstfaad.c
new file mode 100644
index 000000000..beed61fe5
--- /dev/null
+++ b/multimedia/gstreamer-plugins-bad/files/patch-ext_faad_gstfaad.c
@@ -0,0 +1,23 @@
+--- ext/faad/gstfaad.c.orig	Tue Sep 12 22:48:28 2006
++++ ext/faad/gstfaad.c	Wed Sep 13 06:32:15 2006
+@@ -38,15 +38,19 @@
+  * but not all, hence this Truly Evil Hack. This hack will need updating if
+  * upstream ever releases something with the new API.
+  */
++#include <neaacdec.h>
++#include "gstfaad.h"
++
++#if 0
+ #define faacDecInit faacDecInit_no_definition
+ #define faacDecInit2 faacDecInit2_no_definition
+-#include "gstfaad.h"
+ #undef faacDecInit
+ #undef faacDecInit2
+ 
+ extern long faacDecInit (faacDecHandle, guint8 *, guint32, guint32 *, guint8 *);
+ extern int8_t faacDecInit2 (faacDecHandle, guint8 *, guint32,
+     guint32 *, guint8 *);
++#endif
+ 
+ GST_DEBUG_CATEGORY_STATIC (faad_debug);
+ #define GST_CAT_DEFAULT faad_debug
diff --git a/multimedia/gstreamer-plugins/Makefile b/multimedia/gstreamer-plugins/Makefile
index 134f85519..3dbdbd013 100644
--- a/multimedia/gstreamer-plugins/Makefile
+++ b/multimedia/gstreamer-plugins/Makefile
@@ -3,7 +3,7 @@
 # Whom:			Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/multimedia/gstreamer-plugins/Makefile,v 1.97 2006/08/01 22:38:06 ahze Exp $
+#   $MCom: ports/multimedia/gstreamer-plugins/Makefile,v 1.98 2006/08/21 16:12:28 ahze Exp $
 #
 
 PORTNAME=	gstreamer
@@ -84,16 +84,19 @@ EXTRACT_ONLY=${BASE_DISTFILE}
 WRKSRC=${WRKDIR}/${BASE_DISTNAME}
 PORTVERSION=	${BASE_PORTVERSION}
 DISTFILES+=	${BASE_DISTFILE}:base
+PATCHDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins/files
 .elif ${DIST}=="bad"
 EXTRACT_ONLY=${BAD_DISTFILE}
 WRKSRC=${WRKDIR}/${BAD_DISTNAME}
 PORTVERSION=	${BAD_PORTVERSION}
 DISTFILES+=	${BAD_DISTFILE}:bad
+PATCHDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins-bad/files
 .elif ${DIST}=="ugly"
 EXTRACT_ONLY=${UGLY_DISTFILE}
 WRKSRC=${WRKDIR}/${UGLY_DISTNAME}
 PORTVERSION=	${UGLY_PORTVERSION}
 DISTFILES+=	${UGLY_DISTFILE}:ugly
+PATCHDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins-ugly/files
 .elif ${DIST}=="makesum"
 DISTFILES+=	${BASE_DISTFILE}:base ${BAD_DISTFILE}:bad \
 		${UGLY_DISTFILE}:ugly ${GOOD_DISTFILE}:good