Rafael Sadowski <raf...@sizeofvoid.org> wrote:
> Please find below an update diff for faad2.
>
> All consumers tested. OK?
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/audio/faad/Makefile,v
> retrieving revision 1.62
> diff -u -p -u -p -r1.62 Makefile
> --- Makefile 11 Mar 2022 18:20:09 -0000 1.62
> +++ Makefile 6 Jul 2022 06:04:56 -0000
> @@ -3,16 +3,16 @@ NOT_FOR_ARCHS= ${GCC3_ARCHS}
>
> COMMENT= MPEG-2 and MPEG-4 AAC decoder
>
> -V= 2.7
> -DISTNAME= faad2-${V}
> -PKGNAME= faad-${V}
> -REVISION= 2
> -CATEGORIES= audio
> -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=faac/}
> -EXTRACT_SUFX= .tar.bz2
> +GH_ACCOUNT= knik0
> +GH_PROJECT= faad2
> +GH_TAGNAME= 2_10_0
>
> -SHARED_LIBS= faad 3.0 \
> - mp4ff 2.0
> +PKGNAME= faad-${GH_TAGNAME:S/_/./g}
> +
> +CATEGORIES= audio
> +
> +SHARED_LIBS += faad 4.0 # 2.0
> +SHARED_LIBS += faad_drm 0.0 # 2.0
>
> HOMEPAGE= http://www.audiocoding.com/
>
> @@ -27,16 +27,12 @@ BUILD_DEPENDS+= ${MODGNU_AUTOCONF_DEPEND
> devel/libtool
>
> USE_GMAKE= Yes
> -CONFIGURE_STYLE= gnu
> -AUTOCONF_VERSION= 2.61
> -AUTOMAKE_VERSION= 1.9
> +CONFIGURE_STYLE= autoreconf
> +AUTOCONF_VERSION= 2.71
> +AUTOMAKE_VERSION= 1.16
> +AUTORECONF= ./bootstrap
The default autoreconf spell seems to work, so you may drop this.
> +CONFIGURE_ARGS += --with-mpeg4ip
The configure fails to pick up libmp4v2 which is required for this
plugin.
I don't use faad so no idea if it's important to keep or not, but it's
easy to correct the configure script.
--- Makefile.orig Sun Jul 10 19:45:18 2022
+++ Makefile Sun Jul 10 20:03:03 2022
@@ -19,7 +19,7 @@
# GPLv2+
PERMIT_PACKAGE= Yes
-WANTLIB= c m
+WANTLIB= c m mp4v2
# bootstrap checks for libtoolize
BUILD_DEPENDS+= ${MODGNU_AUTOCONF_DEPENDS} \
@@ -30,9 +30,10 @@
CONFIGURE_STYLE= autoreconf
AUTOCONF_VERSION= 2.71
AUTOMAKE_VERSION= 1.16
-AUTORECONF= ./bootstrap
-CONFIGURE_ARGS += --with-mpeg4ip
+CONFIGURE_ARGS+=--with-mpeg4ip
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
+
+LIB_DEPENDS = multimedia/libmp4v2
.include <bsd.port.mk>
Index: patches/patch-configure_ac
===================================================================
RCS file: patches/patch-configure_ac
diff -N patches/patch-configure_ac
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-configure_ac 10 Jul 2022 18:00:37 -0000
@@ -0,0 +1,26 @@
+fix libmp4v2 detection
+
+Index: configure.ac
+--- configure.ac.orig
++++ configure.ac
+@@ -122,16 +122,11 @@ MY_CHECK_TYPEDEF_FROM_INCLUDE([float32_t temp],
+
+ AC_CHECK_FUNCS(strsep)
+
+-AC_CHECK_PROG(external_mp4v2, mpeg4ip-config, yes, no)
+ AM_CONDITIONAL(HAVE_MPEG4IP_PLUG, false)
+-if test x$WITHMPEG4IP = xyes; then
+- if test x$external_mp4v2 = xyes; then
+- AM_CONDITIONAL(HAVE_MPEG4IP_PLUG, true)
+- AC_MSG_NOTICE("Building MPEG4IP plugin")
+- else
+- AC_MSG_NOTICE("MPEG4IP libmp4v2 is required for MPEG4IP plugin")
+- fi
+-fi
++AC_CHECK_LIB(mp4v2, MP4Info, [],
++ [AM_CONDITIONAL(HAVE_MPEG4IP_PLUG, true)
++ AC_MSG_NOTICE("Building MPEG4IP plugin")]
++ [AC_MSG_NOTICE("MPEG4IP libmp4v2 is required for MPEG4IP plugin")])
+
+ if test x$WITHXMMS = xyes; then
+ AC_CHECK_PROGS(XMMS_CONFIG, xmms-config,"not_found")
