I did a test bulk with this, the diff I am using is below (merged from
the two posted diffs). Most things were OK but libquicktime fails:
----
configure:17628: checking for faad.h usability for faad2
configure:17657: cc -o conftest -O2 -pipe -I/usr/local/include -I/usr/X11R6/in
clude -L/usr/local/lib -L/usr/X11R6/lib conftest.c -lpthread -lm -lz -lfaad -
lm >&5
In file included from conftest.c:60:
/usr/local/include/faad.h:32:9: warning: please update faad2 include filename
and function names! [-W#pragma-messages]
#pragma message("please update faad2 include filename and function names!")
^
----
Index: Makefile
===================================================================
RCS file: /cvs/ports/audio/faad/Makefile,v
retrieving revision 1.62
diff -u -p -r1.62 Makefile
--- Makefile 11 Mar 2022 18:20:09 -0000 1.62
+++ Makefile 3 Aug 2022 13:03:10 -0000
@@ -3,23 +3,23 @@ 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/
# GPLv2+
PERMIT_PACKAGE= Yes
-WANTLIB= c m
+WANTLIB= c m mp4v2
# bootstrap checks for libtoolize
BUILD_DEPENDS+= ${MODGNU_AUTOCONF_DEPENDS} \
@@ -27,16 +27,13 @@ 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
+CONFIGURE_ARGS+=--with-mpeg4ip
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
-post-extract:
- @mv ${WRKSRC}/frontend/faad.man ${WRKSRC}/frontend/faad.1
-
-post-patch:
- @cd ${WRKSRC} && ${AUTOCONF_ENV} sh bootstrap
+LIB_DEPENDS = multimedia/libmp4v2
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/audio/faad/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo 18 Jan 2015 03:12:40 -0000 1.7
+++ distinfo 3 Aug 2022 13:02:40 -0000
@@ -1,2 +1,2 @@
-SHA256 (faad2-2.7.tar.bz2) = FFYbXWvEV+glv9OSGuUKZkjzd6k5bq8W1LBXs5o/Y7U=
-SIZE (faad2-2.7.tar.bz2) = 901043
+SHA256 (faad2-2_10_0.tar.gz) = DG2WNslvlcfXNvCX1BiCnO2OxtvYmcxsyCtyhICoS/s=
+SIZE (faad2-2_10_0.tar.gz) = 803225
Index: patches/patch-common_mp4ff_Makefile_am
===================================================================
RCS file: /cvs/ports/audio/faad/patches/patch-common_mp4ff_Makefile_am,v
retrieving revision 1.3
diff -u -p -r1.3 patch-common_mp4ff_Makefile_am
--- patches/patch-common_mp4ff_Makefile_am 11 Mar 2022 18:20:09 -0000
1.3
+++ patches/patch-common_mp4ff_Makefile_am 3 Aug 2022 13:02:40 -0000
@@ -1,13 +0,0 @@
---- common/mp4ff/Makefile.am.orig Fri Feb 6 09:24:21 2009
-+++ common/mp4ff/Makefile.am Thu May 10 19:02:20 2012
-@@ -1,7 +1,7 @@
--lib_LIBRARIES = libmp4ff.a
-+lib_LTLIBRARIES = libmp4ff.la
- include_HEADERS = mp4ff.h mp4ffint.h
-
--libmp4ff_a_CFLAGS = -DUSE_TAGGING=1
-+libmp4ff_la_CFLAGS = -DUSE_TAGGING=1
-
--libmp4ff_a_SOURCES = mp4ff.c mp4atom.c mp4meta.c mp4sample.c mp4util.c \
-+libmp4ff_la_SOURCES = mp4ff.c mp4atom.c mp4meta.c mp4sample.c mp4util.c \
- mp4tagupdate.c mp4ff.h mp4ffint.h mp4ff_int_types.h
Index: patches/patch-common_mp4ff_mp4ff_h
===================================================================
RCS file: /cvs/ports/audio/faad/patches/patch-common_mp4ff_mp4ff_h,v
retrieving revision 1.2
diff -u -p -r1.2 patch-common_mp4ff_mp4ff_h
--- patches/patch-common_mp4ff_mp4ff_h 11 Mar 2022 18:20:09 -0000 1.2
+++ patches/patch-common_mp4ff_mp4ff_h 3 Aug 2022 13:02:40 -0000
@@ -1,14 +0,0 @@
---- common/mp4ff/mp4ff.h.orig Mon May 14 17:05:03 2012
-+++ common/mp4ff/mp4ff.h Mon May 14 17:05:27 2012
-@@ -35,11 +35,7 @@
- extern "C" {
- #endif /* __cplusplus */
-
--#ifdef HAVE_STDINT_H
- #include <stdint.h>
--#else
--#include "mp4ff_int_types.h"
--#endif
-
- /* file callback structure */
- typedef struct
Index: patches/patch-common_mp4ff_mp4ffint_h
===================================================================
RCS file: /cvs/ports/audio/faad/patches/patch-common_mp4ff_mp4ffint_h,v
retrieving revision 1.2
diff -u -p -r1.2 patch-common_mp4ff_mp4ffint_h
--- patches/patch-common_mp4ff_mp4ffint_h 11 Mar 2022 18:20:09 -0000
1.2
+++ patches/patch-common_mp4ff_mp4ffint_h 3 Aug 2022 13:02:40 -0000
@@ -1,11 +0,0 @@
---- common/mp4ff/mp4ffint.h.orig Mon May 14 17:06:54 2012
-+++ common/mp4ff/mp4ffint.h Mon May 14 17:07:25 2012
-@@ -35,7 +35,7 @@
- extern "C" {
- #endif /* __cplusplus */
-
--#include "mp4ff_int_types.h"
-+#include <stdint.h>
- #include <stdlib.h>
-
- #define MAX_TRACKS 1024
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 3 Aug 2022 13:03:10 -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")
Index: patches/patch-frontend_Makefile_am
===================================================================
RCS file: /cvs/ports/audio/faad/patches/patch-frontend_Makefile_am,v
retrieving revision 1.5
diff -u -p -r1.5 patch-frontend_Makefile_am
--- patches/patch-frontend_Makefile_am 11 Mar 2022 18:20:09 -0000 1.5
+++ patches/patch-frontend_Makefile_am 3 Aug 2022 13:02:40 -0000
@@ -1,18 +0,0 @@
---- frontend/Makefile.am.orig Fri Feb 6 11:03:37 2009
-+++ frontend/Makefile.am Mon May 14 16:55:55 2012
-@@ -1,12 +1,11 @@
- bin_PROGRAMS = faad
--man_MANS = faad.man
-+man_MANS = faad.1
-
- INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/common/faad \
- -I$(top_srcdir)/common/mp4ff
-
- faad_LDADD = $(top_builddir)/libfaad/libfaad.la \
-- $(top_builddir)/common/mp4ff/libmp4ff.a
-+ $(top_builddir)/common/mp4ff/libmp4ff.la
-
- faad_SOURCES = main.c \
-- audio.c audio.h \
-- $(top_srcdir)/common/faad/getopt.c
-+ audio.c audio.h
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/audio/faad/pkg/PLIST,v
retrieving revision 1.10
diff -u -p -r1.10 PLIST
--- pkg/PLIST 11 Mar 2022 18:20:09 -0000 1.10
+++ pkg/PLIST 3 Aug 2022 13:02:40 -0000
@@ -5,13 +5,12 @@
@pkgpath audio/faad,-xmms
@bin bin/faad
include/faad.h
-include/mp4ff.h
-include/mp4ffint.h
include/neaacdec.h
-lib/libfaad.a
+@static-lib lib/libfaad.a
lib/libfaad.la
@lib lib/libfaad.so.${LIBfaad_VERSION}
-lib/libmp4ff.a
-lib/libmp4ff.la
-@lib lib/libmp4ff.so.${LIBmp4ff_VERSION}
+@static-lib lib/libfaad_drm.a
+lib/libfaad_drm.la
+@lib lib/libfaad_drm.so.${LIBfaad_drm_VERSION}
+lib/pkgconfig/faad2.pc
@man man/man1/faad.1
