summaryrefslogtreecommitdiffstats
path: root/contrib/lame
diff options
context:
space:
mode:
authorBradley Sepos <[email protected]>2017-07-10 16:34:29 -0400
committerBradley Sepos <[email protected]>2017-07-22 14:08:11 -0400
commitc9718c79ac6666533ffe4c79a0856b0d15be263a (patch)
tree1875275502f42cb017509a462d5f015ee1313c48 /contrib/lame
parent0068a3de2fb07cad89962a45b239ba5620afd8ab (diff)
contrib: Update to LAME 3.99.5.
Diffstat (limited to 'contrib/lame')
-rw-r--r--contrib/lame/A00-xmmintrin.patch28
-rw-r--r--contrib/lame/module.defs16
2 files changed, 3 insertions, 41 deletions
diff --git a/contrib/lame/A00-xmmintrin.patch b/contrib/lame/A00-xmmintrin.patch
deleted file mode 100644
index 0b5237162..000000000
--- a/contrib/lame/A00-xmmintrin.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -Naur lame.orig/configure lame/configure
---- lame.orig/configure 2015-02-08 17:37:18.000000000 -0500
-+++ lame/configure 2015-02-08 17:38:32.000000000 -0500
-@@ -21031,7 +21031,14 @@
-
-
-
--
-+case $host_cpu in
-+powerpc*|i686*)
-+ check_xmmintrin=
-+ ;;
-+*)
-+ check_xmmintrin="xmmintrin.h"
-+ ;;
-+esac
-
- for ac_header in \
- errno.h \
-@@ -21042,7 +21049,7 @@
- sys/soundcard.h \
- sys/time.h \
- unistd.h \
-- xmmintrin.h \
-+ $check_xmmintrin \
- linux/soundcard.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
diff --git a/contrib/lame/module.defs b/contrib/lame/module.defs
index 1184efa43..b6bca0f70 100644
--- a/contrib/lame/module.defs
+++ b/contrib/lame/module.defs
@@ -1,19 +1,9 @@
$(eval $(call import.MODULE.defs,LAME,lame))
$(eval $(call import.CONTRIB.defs,LAME))
-LAME.FETCH.url = https://download.handbrake.fr/handbrake/contrib/lame-3.98.tar.gz
-LAME.FETCH.sha256 = 40235e84dfe4760ad3f352590a64b7bda1502a386c97d06229df356426e37686
-LAME.EXTRACT.tarbase = lame
-
-# TODO: Upstream archive differs
-#LAME.FETCH.url = https://sourceforge.net/projects/lame/files/lame/3.98/lame-398.tar.gz
-#LAME.FETCH.sha256 = 8396bcb425ddcbfb8027d5712fa8878a2257006ccbe3ac7a772e1652e43d19b1
-#LAME.FETCH.distfile = lame-3.98.tar.gz
-#LAME.EXTRACT.tarbase = lame
-#
-# TODO: lame >= 3.99.5, tarbase unnecessary
-#LAME.FETCH.url = https://sourceforge.net/projects/lame/files/lame/3.99/lame-3.99.5.tar.gz
-#LAME.FETCH.sha256 = 24346b4158e4af3bd9f2e194bb23eb473c75fb7377011523353196b19b9a23ff
+LAME.FETCH.url = https://download.handbrake.fr/handbrake/contrib/lame-3.99.5.tar.gz
+LAME.FETCH.url += https://sourceforge.net/projects/lame/files/lame/3.99/lame-3.99.5.tar.gz
+LAME.FETCH.sha256 = 24346b4158e4af3bd9f2e194bb23eb473c75fb7377011523353196b19b9a23ff
ifneq (none,$(FFMPEG.GCC.g))
LAME.CONFIGURE.extra += --enable-debug