From bc22a1677d844ed517d781da667190f97b100ab7 Mon Sep 17 00:00:00 2001 From: Sam Bingner Date: Wed, 3 Apr 2019 23:49:15 -1000 Subject: Begin standardizing lib packages used by ffmpeg --- data/lame/_metadata/description | 2 +- data/lame/_metadata/libmp3lame0.dep | 1 + data/lame/_metadata/libmp3lame0.ver.iphoneos-arm | 1 + data/lame/_metadata/version | 2 +- data/lame/lame-3.100.tar.gz | Bin 1524133 -> 0 bytes data/lame/lame_init_old.diff | 9 ---- data/lame/make.sh | 6 +-- data/lame/timestamp.diff | 60 ----------------------- 8 files changed, 6 insertions(+), 75 deletions(-) create mode 120000 data/lame/_metadata/libmp3lame0.dep create mode 120000 data/lame/_metadata/libmp3lame0.ver.iphoneos-arm mode change 100644 => 120000 data/lame/_metadata/version delete mode 100644 data/lame/lame-3.100.tar.gz delete mode 100644 data/lame/lame_init_old.diff delete mode 100644 data/lame/timestamp.diff (limited to 'data/lame') diff --git a/data/lame/_metadata/description b/data/lame/_metadata/description index df8c84c02..eeeb13241 100644 --- a/data/lame/_metadata/description +++ b/data/lame/_metadata/description @@ -1 +1 @@ -open source (lgpl) mp3 encoder +MP3 encoding library (frontend) diff --git a/data/lame/_metadata/libmp3lame0.dep b/data/lame/_metadata/libmp3lame0.dep new file mode 120000 index 000000000..6699d2958 --- /dev/null +++ b/data/lame/_metadata/libmp3lame0.dep @@ -0,0 +1 @@ +../../libmp3lame0 \ No newline at end of file diff --git a/data/lame/_metadata/libmp3lame0.ver.iphoneos-arm b/data/lame/_metadata/libmp3lame0.ver.iphoneos-arm new file mode 120000 index 000000000..5ba0ce5f0 --- /dev/null +++ b/data/lame/_metadata/libmp3lame0.ver.iphoneos-arm @@ -0,0 +1 @@ +../../libmp3lame0/_metadata/version \ No newline at end of file diff --git a/data/lame/_metadata/version b/data/lame/_metadata/version deleted file mode 100644 index 748d07b56..000000000 --- a/data/lame/_metadata/version +++ /dev/null @@ -1 +0,0 @@ -3.100 diff --git a/data/lame/_metadata/version b/data/lame/_metadata/version new file mode 120000 index 000000000..09d02d1c7 --- /dev/null +++ b/data/lame/_metadata/version @@ -0,0 +1 @@ +../../_lame/_metadata/version \ No newline at end of file diff --git a/data/lame/lame-3.100.tar.gz b/data/lame/lame-3.100.tar.gz deleted file mode 100644 index 32336a6d3..000000000 Binary files a/data/lame/lame-3.100.tar.gz and /dev/null differ diff --git a/data/lame/lame_init_old.diff b/data/lame/lame_init_old.diff deleted file mode 100644 index 155340bab..000000000 --- a/data/lame/lame_init_old.diff +++ /dev/null @@ -1,9 +0,0 @@ -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/make.sh b/data/lame/make.sh index 452a4bfd5..c9c892170 100644 --- a/data/lame/make.sh +++ b/data/lame/make.sh @@ -1,4 +1,2 @@ -pkg:setup -pkg:configure -make -pkg:install +pkg: mkdir -p /usr/bin +cp -a "$(PKG_DEST_ _lame)"/usr/bin/* "${PKG_DEST}"/usr/bin diff --git a/data/lame/timestamp.diff b/data/lame/timestamp.diff deleted file mode 100644 index c828ad740..000000000 --- a/data/lame/timestamp.diff +++ /dev/null @@ -1,60 +0,0 @@ -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, %s %s", __DATE__, __TIME__); -+ debug->OutPut(DEBUG_LEVEL_MSG, "DRV_LOAD"); - } - return 1L; - } -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) -- " (alpha " XSTR(MP3X_ALPHA_VERSION) ", " __DATE__ " " __TIME__ ")"; -+ " (alpha " XSTR(MP3X_ALPHA_VERSION) ")"; - #elif MP3X_BETA_VERSION > 0 - static /*@observer@ */ const char *const str = - XSTR(MP3X_MAJOR_VERSION) "." XSTR(MP3X_MINOR_VERSION) -- " (beta " XSTR(MP3X_BETA_VERSION) ", " __DATE__ ")"; -+ " (beta " XSTR(MP3X_BETA_VERSION) ")"; - #else - static /*@observer@ */ const char *const str = - XSTR(MP3X_MAJOR_VERSION) "." XSTR(MP3X_MINOR_VERSION); -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 = - 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 = - 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 = - 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 = - 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 = - 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 = - STR(PSY_MAJOR_VERSION) "." STR(PSY_MINOR_VERSION); -- cgit v1.2.3