summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Bingner <sam@bingner.com>2018-08-15 12:12:07 -1000
committerSam Bingner <sam@bingner.com>2018-08-15 12:12:07 -1000
commitd38d69ca792cb0b7f46d823cd46d6e473aec610e (patch)
tree62356a1e20bec5fbae4d7d2506129ba9aedea760
parenta2919fd867a7d32adcb7a5af3bed6430553c7208 (diff)
Update lame to 3.100
l---------data/lame/_metadata/ncurses.dep1
-rw-r--r--data/lame/_metadata/version2
-rw-r--r--data/lame/lame-3.100.tar.gzbin0 -> 1524133 bytes
-rw-r--r--data/lame/lame-3.98b8.tar.gzbin1394709 -> 0 bytes
-rw-r--r--data/lame/lame_init_old.diff9
-rw-r--r--data/lame/timestamp.diff107
6 files changed, 39 insertions, 80 deletions
diff --git a/data/lame/_metadata/ncurses.dep b/data/lame/_metadata/ncurses.dep
new file mode 120000
index 000000000..a395fad08
--- /dev/null
+++ b/data/lame/_metadata/ncurses.dep
@@ -0,0 +1 @@
+../../ncurses \ No newline at end of file
diff --git a/data/lame/_metadata/version b/data/lame/_metadata/version
index eb52ff7c8..748d07b56 100644
--- a/data/lame/_metadata/version
+++ b/data/lame/_metadata/version
@@ -1 +1 @@
-3.98b8
+3.100
diff --git a/data/lame/lame-3.100.tar.gz b/data/lame/lame-3.100.tar.gz
new file mode 100644
index 000000000..32336a6d3
--- /dev/null
+++ b/data/lame/lame-3.100.tar.gz
Binary files differ
diff --git a/data/lame/lame-3.98b8.tar.gz b/data/lame/lame-3.98b8.tar.gz
deleted file mode 100644
index 8fd700952..000000000
--- a/data/lame/lame-3.98b8.tar.gz
+++ /dev/null
Binary files differ
diff --git a/data/lame/lame_init_old.diff b/data/lame/lame_init_old.diff
new file mode 100644
index 000000000..155340bab
--- /dev/null
+++ b/data/lame/lame_init_old.diff
@@ -0,0 +1,9 @@
+diff -ur lame-3.100/include/libmp3lame.sym lame-3.100+iPhone/include/libmp3lame.sym
+--- lame-3.100/include/libmp3lame.sym 2017-09-06 09:33:35.000000000 -1000
++++ lame-3.100+iPhone/include/libmp3lame.sym 2018-07-27 22:59:41.000000000 -1000
+@@ -1,5 +1,4 @@
+ lame_init
+-lame_init_old
+ lame_set_num_samples
+ lame_get_num_samples
+ lame_set_in_samplerate
diff --git a/data/lame/timestamp.diff b/data/lame/timestamp.diff
index d9188f5f5..c828ad740 100644
--- a/data/lame/timestamp.diff
+++ b/data/lame/timestamp.diff
@@ -1,70 +1,19 @@
-diff -ru lame-3.98b8/ACM/main.cpp lame-3.98b8+iPhone/ACM/main.cpp
---- lame-3.98b8/ACM/main.cpp 2006-12-25 21:37:34.000000000 +0000
-+++ lame-3.98b8+iPhone/ACM/main.cpp 2008-06-19 04:41:12.000000000 +0000
-@@ -155,8 +155,8 @@
- // nothing to do
+diff -ur lame-3.100/ACM/main.cpp lame-3.100+iPhone/ACM/main.cpp
+--- lame-3.100/ACM/main.cpp 2006-12-25 11:37:34.000000000 -1000
++++ lame-3.100+iPhone/ACM/main.cpp 2018-07-27 22:55:45.000000000 -1000
+@@ -156,7 +156,7 @@
if (debug != NULL)
{
--// debug->OutPut(DEBUG_LEVEL_MSG, "DRV_LOAD, version %s %s %s", ACM_VERSION, __DATE__, __TIME__);
+ // debug->OutPut(DEBUG_LEVEL_MSG, "DRV_LOAD, version %s %s %s", ACM_VERSION, __DATE__, __TIME__);
- debug->OutPut(DEBUG_LEVEL_MSG, "DRV_LOAD, %s %s", __DATE__, __TIME__);
-+// debug->OutPut(DEBUG_LEVEL_MSG, "DRV_LOAD, version %s", ACM_VERSION);
+ debug->OutPut(DEBUG_LEVEL_MSG, "DRV_LOAD");
}
return 1L;
}
-diff -ru lame-3.98b8/Dll/BladeMP3EncDLL.c lame-3.98b8+iPhone/Dll/BladeMP3EncDLL.c
---- lame-3.98b8/Dll/BladeMP3EncDLL.c 2008-03-09 17:13:23.000000000 +0000
-+++ lame-3.98b8+iPhone/Dll/BladeMP3EncDLL.c 2008-06-19 04:43:31.000000000 +0000
-@@ -621,8 +621,6 @@
- __declspec(dllexport) VOID beVersion(PBE_VERSION pbeVersion)
- {
- // DLL Release date
-- char lpszDate[20] = { '\0', };
-- char lpszTemp[5] = { '\0', };
- lame_version_t lv = { 0, };
-
-
-@@ -646,33 +644,14 @@
-
- memset( pbeVersion->btReserved, 0, sizeof( pbeVersion->btReserved ) );
-
-- // Get compilation date
-- strcpy(lpszDate,__DATE__);
--
- // Get the first three character, which is the month
-- strncpy(lpszTemp,lpszDate,3);
-- lpszTemp[3] = '\0';
-- pbeVersion->byMonth=1;
--
-- // Set month
-- if (strcmp(lpszTemp,"Jan")==0) pbeVersion->byMonth = 1;
-- if (strcmp(lpszTemp,"Feb")==0) pbeVersion->byMonth = 2;
-- if (strcmp(lpszTemp,"Mar")==0) pbeVersion->byMonth = 3;
-- if (strcmp(lpszTemp,"Apr")==0) pbeVersion->byMonth = 4;
-- if (strcmp(lpszTemp,"May")==0) pbeVersion->byMonth = 5;
-- if (strcmp(lpszTemp,"Jun")==0) pbeVersion->byMonth = 6;
-- if (strcmp(lpszTemp,"Jul")==0) pbeVersion->byMonth = 7;
-- if (strcmp(lpszTemp,"Aug")==0) pbeVersion->byMonth = 8;
-- if (strcmp(lpszTemp,"Sep")==0) pbeVersion->byMonth = 9;
-- if (strcmp(lpszTemp,"Oct")==0) pbeVersion->byMonth = 10;
-- if (strcmp(lpszTemp,"Nov")==0) pbeVersion->byMonth = 11;
-- if (strcmp(lpszTemp,"Dec")==0) pbeVersion->byMonth = 12;
-+ pbeVersion->byMonth=0;
-
- // Get day of month string (char [4..5])
-- pbeVersion->byDay=atoi( lpszDate + 4 );
-+ pbeVersion->byDay=0;
-
- // Get year of compilation date (char [7..10])
-- pbeVersion->wYear = atoi( lpszDate + 7 );
-+ pbeVersion->wYear = 0;
-
- memset( pbeVersion->zHomepage, 0x00, BE_MAX_HOMEPAGE );
-
-diff -ru lame-3.98b8/frontend/gtkanal.c lame-3.98b8+iPhone/frontend/gtkanal.c
---- lame-3.98b8/frontend/gtkanal.c 2007-07-24 17:46:09.000000000 +0000
-+++ lame-3.98b8+iPhone/frontend/gtkanal.c 2008-06-19 04:41:53.000000000 +0000
-@@ -1119,11 +1119,11 @@
+diff -ur lame-3.100/frontend/gtkanal.c lame-3.100+iPhone/frontend/gtkanal.c
+--- lame-3.100/frontend/gtkanal.c 2017-09-06 09:33:35.000000000 -1000
++++ lame-3.100+iPhone/frontend/gtkanal.c 2018-07-27 22:56:05.000000000 -1000
+@@ -1128,11 +1128,11 @@
#if MP3X_ALPHA_VERSION > 0
static /*@observer@ */ const char *const str =
XSTR(MP3X_MAJOR_VERSION) "." XSTR(MP3X_MINOR_VERSION)
@@ -78,34 +27,34 @@ diff -ru lame-3.98b8/frontend/gtkanal.c lame-3.98b8+iPhone/frontend/gtkanal.c
#else
static /*@observer@ */ const char *const str =
XSTR(MP3X_MAJOR_VERSION) "." XSTR(MP3X_MINOR_VERSION);
-diff -ru lame-3.98b8/libmp3lame/version.c lame-3.98b8+iPhone/libmp3lame/version.c
---- lame-3.98b8/libmp3lame/version.c 2008-02-22 02:38:46.000000000 +0000
-+++ lame-3.98b8+iPhone/libmp3lame/version.c 2008-06-19 04:42:10.000000000 +0000
-@@ -62,11 +62,11 @@
+diff -ur lame-3.100/libmp3lame/version.c lame-3.100+iPhone/libmp3lame/version.c
+--- lame-3.100/libmp3lame/version.c 2011-11-17 23:51:02.000000000 -1000
++++ lame-3.100+iPhone/libmp3lame/version.c 2018-07-27 22:55:08.000000000 -1000
+@@ -58,11 +58,11 @@
#if LAME_ALPHA_VERSION
static /*@observer@ */ const char *const str =
- XSTR(LAME_MAJOR_VERSION) "." XSTR(LAME_MINOR_VERSION) " "
-- "(alpha " XSTR(LAME_PATCH_VERSION) ", " __DATE__ " " __TIME__ ")";
-+ "(alpha " XSTR(LAME_PATCH_VERSION) ")";
+ STR(LAME_MAJOR_VERSION) "." STR(LAME_MINOR_VERSION) " "
+- "(alpha " STR(LAME_PATCH_VERSION) ", " __DATE__ " " __TIME__ ")";
++ "(alpha " STR(LAME_PATCH_VERSION)")";
#elif LAME_BETA_VERSION
static /*@observer@ */ const char *const str =
- XSTR(LAME_MAJOR_VERSION) "." XSTR(LAME_MINOR_VERSION) " "
-- "(beta " XSTR(LAME_PATCH_VERSION) ", " __DATE__ ")";
-+ "(beta " XSTR(LAME_PATCH_VERSION) ")";
+ STR(LAME_MAJOR_VERSION) "." STR(LAME_MINOR_VERSION) " "
+- "(beta " STR(LAME_PATCH_VERSION) ", " __DATE__ ")";
++ "(beta " STR(LAME_PATCH_VERSION) ")";
#elif LAME_RELEASE_VERSION && (LAME_PATCH_VERSION > 0)
static /*@observer@ */ const char *const str =
- XSTR(LAME_MAJOR_VERSION) "." XSTR(LAME_MINOR_VERSION) "." XSTR(LAME_PATCH_VERSION);
-@@ -150,11 +150,11 @@
+ STR(LAME_MAJOR_VERSION) "." STR(LAME_MINOR_VERSION) "." STR(LAME_PATCH_VERSION);
+@@ -165,11 +165,11 @@
#if PSY_ALPHA_VERSION > 0
static /*@observer@ */ const char *const str =
- XSTR(PSY_MAJOR_VERSION) "." XSTR(PSY_MINOR_VERSION)
-- " (alpha " XSTR(PSY_ALPHA_VERSION) ", " __DATE__ " " __TIME__ ")";
-+ " (alpha " XSTR(PSY_ALPHA_VERSION) ")";
+ STR(PSY_MAJOR_VERSION) "." STR(PSY_MINOR_VERSION)
+- " (alpha " STR(PSY_ALPHA_VERSION) ", " __DATE__ " " __TIME__ ")";
++ " (alpha " STR(PSY_ALPHA_VERSION) ")";
#elif PSY_BETA_VERSION > 0
static /*@observer@ */ const char *const str =
- XSTR(PSY_MAJOR_VERSION) "." XSTR(PSY_MINOR_VERSION)
-- " (beta " XSTR(PSY_BETA_VERSION) ", " __DATE__ ")";
-+ " (beta " XSTR(PSY_BETA_VERSION) ")";
+ STR(PSY_MAJOR_VERSION) "." STR(PSY_MINOR_VERSION)
+- " (beta " STR(PSY_BETA_VERSION) ", " __DATE__ ")";
++ " (beta " STR(PSY_BETA_VERSION) ")";
#else
static /*@observer@ */ const char *const str =
- XSTR(PSY_MAJOR_VERSION) "." XSTR(PSY_MINOR_VERSION);
+ STR(PSY_MAJOR_VERSION) "." STR(PSY_MINOR_VERSION);