diff options
4 files changed, 83 insertions, 1 deletions
diff --git a/audio/gstreamer-plugins-faad/Makefile b/audio/gstreamer-plugins-faad/Makefile index 2e98f8b78af7..59d61efcb7df 100644 --- a/audio/gstreamer-plugins-faad/Makefile +++ b/audio/gstreamer-plugins-faad/Makefile @@ -5,7 +5,7 @@ # $FreeBSD$ # -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio COMMENT= Gstreamer MPEG-2 and MPEG-4 AAC decoder plugin diff --git a/multimedia/gstreamer-plugins-bad/files/patch-configure b/multimedia/gstreamer-plugins-bad/files/patch-configure new file mode 100644 index 000000000000..4ea746f00336 --- /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 000000000000..beed61fe590f --- /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.common b/multimedia/gstreamer-plugins/Makefile.common index d1a447ee245c..d2973c0739f8 100644 --- a/multimedia/gstreamer-plugins/Makefile.common +++ b/multimedia/gstreamer-plugins/Makefile.common @@ -397,16 +397,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 @@ -415,6 +418,7 @@ EXTRACT_ONLY=${GOOD_DISTFILE} WRKSRC=${WRKDIR}/${GOOD_DISTNAME} PORTVERSION= ${GOOD_PORTVERSION} DISTFILES+= ${GOOD_DISTFILE}:good +PATCHDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins-good/files .endif .if !defined(NO_GSTREAMER_COMMON) |