summaryrefslogtreecommitdiffstats
path: root/contrib/lame
diff options
context:
space:
mode:
authorkonablend <[email protected]>2009-03-01 17:03:11 +0000
committerkonablend <[email protected]>2009-03-01 17:03:11 +0000
commit4dbce6b69967c1e14092637aa95b6c31855a81fc (patch)
tree516c17095967698eeb419c70ce72dbd2c11bf754 /contrib/lame
parentc47939541ccec1e5e57753b16b28baed2613f586 (diff)
BuildSystem: conversion from jam-based to make-based system.
KNOWN ISSUES: 1. OSX + Xcode builds do not support parallel builds; attempting to use them may cause unbounded number of jobs. However, disabling via configure --disable-xcode avoids the issue. 2. OSX ppc binary produces binary which has audio-scan problems. 3. OSX ppc64 binary has not been runtime tested. ADDED: 00-BuildUserGuide.txt contrib/*/module.* doc/ make/ libhb/module.* test/module.* macos/module.* gtk/module.* DROPPED: BUILD BuildContribDarwin.sh DownloadMacOsXContribBinaries.sh Jamfile Jamrules MacOsXContribBinariesVersion.txt Makefile Makefile.config jam libhb/Jamefile libhb/Makefile test/BUILDSHARED test/Makefile contrib/Jamfile contrib/Makefile contrib/patch-ffmpeg.patch contrib/patch-x264-idr.patch contrib/patch-x264-linux.patch RENAMED: contrib/*.patch -> contrib/MODULE/[AP]??-*.patch macosx/HandBrake.plist -> macosx/Info.plist MODIFIED: libhb/decavcodec.c Patched to use cleaner include "libavcodec/audioconvert". Second part to support this cleanup is ffmpeg A02-audioconvert.patch . MODIFIED: libhb/hb.c MODIFIED: libhb/hb.h MODIFIED: libhb/muxmkv.c MODIFIED: libhb/muxmp4.c MODIFIED: libhb/update.c Patched to use "project.h" for project metadata. Renamed HB_BUILD -> HB_PROJECT_BUILD. Renamed HB_VERSION -> HB_PROJECT_VERSION. MODIFIED: test/test.c: Patched HandBrakeCLI to support I/O on Mac OS X ZFS filesystems. Reference r1803 as similar patch for HandBrake.app . Unpatched behavior is crash/buserror when using ZFS. MODIFIED: macosx/Growl.framework/ Upgraded 0.7.6 (i386,ppc) -> 1.1.2 (i386,x86_64,ppc,ppc64). New architectures facilitate x86_64 and ppc64 builds. MODIFIED: macosx/HandBrake.xcodeproj/ Bumped compatibilty mode from 2.4 -> 3.1 . Dumped old configurations Deployment, Developer. Added configurations standard, sebug as replacements. Added standard.i386, standard.x86_64, standard.ppc, standard.ppc64 . for explicit architecture build. All configurations settings cleaned up and normalized. Build output directories adjusted to support new build system. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2180 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'contrib/lame')
-rw-r--r--contrib/lame/P00-darwin-xmmintrin.patch28
-rw-r--r--contrib/lame/module.defs5
-rw-r--r--contrib/lame/module.rules2
3 files changed, 35 insertions, 0 deletions
diff --git a/contrib/lame/P00-darwin-xmmintrin.patch b/contrib/lame/P00-darwin-xmmintrin.patch
new file mode 100644
index 000000000..de19e55ba
--- /dev/null
+++ b/contrib/lame/P00-darwin-xmmintrin.patch
@@ -0,0 +1,28 @@
+diff -Naur lame.orig/configure lame/configure
+--- lame.orig/configure 2008-06-29 17:40:05.000000000 -0400
++++ lame/configure 2008-10-14 05:01:29.000000000 -0400
+@@ -21031,7 +21031,14 @@
+
+
+
+-
++case $host_cpu in
++powerpc*)
++ 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
new file mode 100644
index 000000000..dd89cd683
--- /dev/null
+++ b/contrib/lame/module.defs
@@ -0,0 +1,5 @@
+$(eval $(call import.MODULE.defs,LAME,lame))
+$(eval $(call import.CONTRIB.defs,LAME))
+
+LAME.FETCH.url = http://download.m0k.org/handbrake/contrib/lame-3.98.tar.gz
+LAME.EXTRACT.tarbase = lame
diff --git a/contrib/lame/module.rules b/contrib/lame/module.rules
new file mode 100644
index 000000000..058bc7b56
--- /dev/null
+++ b/contrib/lame/module.rules
@@ -0,0 +1,2 @@
+$(eval $(call import.MODULE.rules,LAME))
+$(eval $(call import.CONTRIB.rules,LAME))