Update faad to 2.8.8

5 files changed, 25 insertions, 59 deletions

diff --git a/data/faad/_metadata/version b/data/faad/_metadata/version
index 6a6a3d8e3..80803faf1 100644
--- a/data/faad/_metadata/version
+++ b/data/faad/_metadata/version
@@ -1 +1 @@
-2.6.1
+2.8.8
diff --git a/data/faad/faad2-2.6.1.tar.gz b/data/faad/faad2-2.6.1.tar.gz
deleted file mode 100644
index 58b28f09d..000000000
--- a/data/faad/faad2-2.6.1.tar.gz
+++ /dev/null
diff --git a/data/faad/faad2-2.8.8.tar.gz b/data/faad/faad2-2.8.8.tar.gz
new file mode 100644
index 000000000..acc42372a
--- /dev/null
+++ b/data/faad/faad2-2.8.8.tar.gz
diff --git a/data/faad/make.sh b/data/faad/make.sh
index 8325cc734..452a4bfd5 100644
--- a/data/faad/make.sh
+++ b/data/faad/make.sh
@@ -1,5 +1,4 @@
 pkg:setup
-./bootstrap
 pkg:configure
 make
 pkg:install
diff --git a/data/faad/timestamp.diff b/data/faad/timestamp.diff
index b5b0d9cf0..ba844fa35 100644
--- a/data/faad/timestamp.diff
+++ b/data/faad/timestamp.diff
@@ -1,63 +1,30 @@
-diff -ru faad2/frontend/main.c faad2+iPhone/frontend/main.c
---- faad2/frontend/main.c	2007-11-01 12:33:29.000000000 +0000
-+++ faad2+iPhone/frontend/main.c	2008-06-19 04:37:40.000000000 +0000
-@@ -1167,7 +1167,6 @@
+diff -ur faad2-2.8.8/frontend/main.c faad2-2.8.8+iPhone/frontend/main.c
+--- faad2-2.8.8/frontend/main.c	2017-12-17 06:17:36.000000000 -1000
++++ faad2-2.8.8+iPhone/frontend/main.c	2018-07-27 22:48:22.000000000 -1000
+@@ -1202,7 +1202,7 @@
+     NeAACDecGetVersion(&faad_id_string, &faad_copyright_string);
  
- 
-     faad_fprintf(stderr, " *********** Ahead Software MPEG-4 AAC Decoder V%s ******************\n\n", FAAD2_VERSION);
+     faad_fprintf(stderr, " *********** Ahead Software MPEG-4 AAC Decoder V%s ******************\n\n", faad_id_string);
 -    faad_fprintf(stderr, " Build: %s\n", __DATE__);
-     faad_fprintf(stderr, " Copyright 2002-2004: Ahead Software AG\n");
-     faad_fprintf(stderr, " http://www.audiocoding.com\n");
++    faad_fprintf(stderr, " Build: 2.8.8\n");
+     faad_fprintf(stderr, "%s", faad_copyright_string);
      if (cap & FIXED_POINT_CAP)
-diff -ru faad2/plugins/in_mp4/in_mp4.c faad2+iPhone/plugins/in_mp4/in_mp4.c
---- faad2/plugins/in_mp4/in_mp4.c	2004-10-19 18:02:10.000000000 +0000
-+++ faad2+iPhone/plugins/in_mp4/in_mp4.c	2008-06-19 04:37:55.000000000 +0000
-@@ -1219,7 +1219,7 @@
- void about(HWND hwndParent)
- {
-     MessageBox(hwndParent,
--        "AudioCoding.com MPEG-4 AAC player " FAAD2_VERSION " compiled on " __DATE__ ".\n"
-+        "AudioCoding.com MPEG-4 AAC player " FAAD2_VERSION ".\n"
-         "Visit the website for more info.\n"
-         "Copyright 2002-2004 AudioCoding.com",
-         "About",
-@@ -2563,7 +2563,7 @@
- static In_Module module =
- {
-     IN_VER,
--    "AudioCoding.com MPEG-4 AAC player: " FAAD2_VERSION " compiled on " __DATE__,
-+    "AudioCoding.com MPEG-4 AAC player: " FAAD2_VERSION,
-     0,  // hMainWindow
-     0,  // hDllInstance
-     NULL,
-diff -ru faad2/plugins/QCD/QCDFAAD.c faad2+iPhone/plugins/QCD/QCDFAAD.c
---- faad2/plugins/QCD/QCDFAAD.c	2003-04-28 19:04:35.000000000 +0000
-+++ faad2+iPhone/plugins/QCD/QCDFAAD.c	2008-06-19 04:37:40.000000000 +0000
-@@ -349,7 +349,7 @@
- {
- 	static RECT rcLOGO, rcMail1, rcMail2/*, rcMail3*/;
- 	POINT ptMouse;
--	static char szPluginVer[] = "QCD FAAD Input Plug-in v1.0b\nCompiled on " __TIME__ ", " __DATE__;
-+	static char szPluginVer[] = "QCD FAAD Input Plug-in v1.0b;
- 	static char szFLACVer[] = "Using: FAAD2 v "FAAD2_VERSION" by";
- 
- 	switch (uMsg)
-@@ -1027,4 +1027,4 @@
- 	{
-         return 0;
-     }
+         faad_fprintf(stderr, " Fixed point version\n");
+@@ -1361,4 +1361,4 @@
+ #else
+ 	return faad_main(argc, argv);
+ #endif
 -}
 \ No newline at end of file
 +}
-diff -ru faad2/plugins/QCDMp4/QCDMp4.c faad2+iPhone/plugins/QCDMp4/QCDMp4.c
---- faad2/plugins/QCDMp4/QCDMp4.c	2003-12-06 04:24:17.000000000 +0000
-+++ faad2+iPhone/plugins/QCDMp4/QCDMp4.c	2008-06-19 04:37:40.000000000 +0000
-@@ -1304,7 +1304,7 @@
- void About(int flags)
- {
- 	MessageBox(module.hMainWindow,
--        "AudioCoding.com MPEG-4 General Audio player " FAAD2_VERSION " compiled on " __DATE__ ".\n"
-+        "AudioCoding.com MPEG-4 General Audio player " FAAD2_VERSION ".\n"
-         "Visit the website for more info.\n"
- 		"Ported to QCD by Shao Hao.\n"
-         "Copyright 2002-2003 AudioCoding.com",
+diff -ur faad2-2.8.8/utils/win32/ac2ver.c faad2-2.8.8+iPhone/utils/win32/ac2ver.c
+--- faad2-2.8.8/utils/win32/ac2ver.c	2017-12-17 06:17:36.000000000 -1000
++++ faad2-2.8.8+iPhone/utils/win32/ac2ver.c	2018-07-27 22:49:02.000000000 -1000
+@@ -94,7 +94,6 @@
+ 	{
+ 		wchar_t file_name[_MAX_FNAME], file_ext[_MAX_EXT];
+ 		_wsplitpath(argv[0], NULL, NULL, file_name, file_ext);
+-		fprintf(stderr, "AC2VER [%s]\n\n", __DATE__);
+ 		fprintf(stderr, "Usage: %S%S <lib_name> <path/to/configure.ac>\n\n", file_name, file_ext);
+ 		return EXIT_FAILURE;
+ 	}