Stuart Henderson <s...@spacehopper.org> wrote:
> 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!")
> ^
> ----
well, this is weird :)
libquicktime configure scripts does a sscanf on FAAD_VERSION expecting
something like %d.%d. FAAD_VERSION now is "unknown".
Index: Makefile
===================================================================
RCS file: /home/cvs/ports/multimedia/libquicktime/Makefile,v
retrieving revision 1.65
diff -u -p -r1.65 Makefile
--- Makefile 31 Mar 2022 16:45:26 -0000 1.65
+++ Makefile 7 Aug 2022 14:09:14 -0000
@@ -1,7 +1,7 @@
COMMENT= library for reading and writing QuickTime files
DISTNAME= libquicktime-1.2.4
-REVISION= 16
+REVISION= 17
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libquicktime/}
@@ -17,7 +17,7 @@ WANTLIB += Xdmcp Xext Xfixes Xi Xinerama
WANTLIB += Xt Xv Xxf86vm avcodec avutil c cairo drm dv expat faad
WANTLIB += ffi fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0
WANTLIB += gio-2.0 glapi glib-2.0 gmodule-2.0 gobject-2.0 graphite2
-WANTLIB += gsm gthread-2.0 gtk-x11-2.0 harfbuzz iconv intl jpeg m mp3lame
+WANTLIB += gsm gtk-x11-2.0 harfbuzz iconv intl jpeg m mp3lame mp4v2
WANTLIB += ogg opus pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre
WANTLIB += pixman-1 png pthread sndio speex ${COMPILER_LIBCXX}
WANTLIB += swresample swscale vorbisenc vorbisfile vpx x264 x265
Index: patches/patch-configure
===================================================================
RCS file: /home/cvs/ports/multimedia/libquicktime/patches/patch-configure,v
retrieving revision 1.14
diff -u -p -r1.14 patch-configure
--- patches/patch-configure 11 Mar 2022 19:39:21 -0000 1.14
+++ patches/patch-configure 7 Aug 2022 14:06:05 -0000
@@ -1,5 +1,8 @@
---- configure.orig Thu Mar 29 15:45:15 2012
-+++ configure Mon Apr 2 19:49:37 2012
+FAAD2_VERSION is "unknown" now, the sscanf test fails.
+
+Index: configure
+--- configure.orig
++++ configure
@@ -14951,7 +14951,7 @@ fi
VORBIS_LIBS="-L$prefix/lib"
fi
@@ -21,3 +24,16 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for lame" >&5
+@@ -17592,12 +17588,8 @@ else
+ #include <stdio.h>
+ main()
+ {
+- int faad_major;
+- int faad_minor;
+ faacDecHandle dec;
+
+- if(sscanf(FAAD2_VERSION, "%d.%d", &faad_major, &faad_minor) < 2)
+- return -1;
+ dec = faacDecOpen();
+ if(!dec)
+ return -1;
