summaryrefslogtreecommitdiffstats
path: root/contrib/xvidcore
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/xvidcore
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/xvidcore')
-rw-r--r--contrib/xvidcore/A00-nasm.patch13
-rw-r--r--contrib/xvidcore/A01-fdct.patch8
-rw-r--r--contrib/xvidcore/P00-darwin.patch31
-rw-r--r--contrib/xvidcore/P01-cygwin.patch34
-rw-r--r--contrib/xvidcore/module.defs20
-rw-r--r--contrib/xvidcore/module.rules2
6 files changed, 108 insertions, 0 deletions
diff --git a/contrib/xvidcore/A00-nasm.patch b/contrib/xvidcore/A00-nasm.patch
new file mode 100644
index 000000000..44242ace4
--- /dev/null
+++ b/contrib/xvidcore/A00-nasm.patch
@@ -0,0 +1,13 @@
+diff -ruN xvidcore-orig/build/generic/configure xvidcore/build/generic/configure
+--- xvidcore-orig/build/generic/configure 2006-11-01 03:39:36.000000000 -0700
++++ xvidcore/build/generic/configure 2008-01-30 20:19:48.000000000 -0700
+@@ -4016,7 +4016,7 @@
+ if test "$ac_nasm" = "yes" ; then
+ echo "$as_me:$LINENO: checking for nasm patch version" >&5
+ echo $ECHO_N "checking for nasm patch version... $ECHO_C" >&6
+- nasm_patch=`$nasm_prog -r | cut -d '.' -f 3 | cut -d ' ' -f 1`
++ nasm_patch=`($nasm_prog -r || $nasm_prog -v) | cut -d '.' -f 3 | cut -d ' ' -f 1`
+ if test -z $nasm_patch ; then
+- nasm_patch=-1
++ nasm_patch=45
+ fi
diff --git a/contrib/xvidcore/A01-fdct.patch b/contrib/xvidcore/A01-fdct.patch
new file mode 100644
index 000000000..1fc90b689
--- /dev/null
+++ b/contrib/xvidcore/A01-fdct.patch
@@ -0,0 +1,8 @@
+--- xvidcore/src/dct/x86_asm/fdct_sse2_skal.asm.orig 2008-02-22 10:28:13.000000000 -0800
++++ xvidcore/src/dct/x86_asm/fdct_sse2_skal.asm 2008-02-22 11:08:52.000000000 -0800
+@@ -620,3 +620,5 @@
+ ret
+ .endfunc
+
++ALIGN 16
++ times 8 dw 0
diff --git a/contrib/xvidcore/P00-darwin.patch b/contrib/xvidcore/P00-darwin.patch
new file mode 100644
index 000000000..51cb94c6d
--- /dev/null
+++ b/contrib/xvidcore/P00-darwin.patch
@@ -0,0 +1,31 @@
+diff -ru xvidcore-1.1.0/build/generic/configure xvidcore-1.1.0-patched/build/generic/configure
+--- xvidcore-1.1.0/build/generic/configure 2005-12-30 15:45:30.000000000 +0100
++++ xvidcore-1.1.0-patched/build/generic/configure 2006-01-16 22:06:10.000000000 +0100
+@@ -4052,6 +4071,12 @@
+ PREFIX="-DPREFIX"
+ MARK_FUNCS=""
+ ;;
++ *darwin*)
++ echo "$as_me:$LINENO: result: macho" >&5
++echo "${ECHO_T}macho" >&6
++ NASM_FORMAT="macho"
++ PREFIX="-DPREFIX"
++ MARK_FUNCS=""
+ esac
+
+ AS="$chosen_asm_prog"
+diff -ru xvidcore-1.1.0/build/generic/configure.in xvidcore-1.1.0-patched/build/generic/configure.in
+--- xvidcore-1.1.0/build/generic/configure.in 2005-12-30 15:45:30.000000000 +0100
++++ xvidcore-1.1.0-patched/build/generic/configure.in 2006-01-16 22:06:04.000000000 +0100
+@@ -397,6 +397,11 @@
+ PREFIX="-DPREFIX"
+ MARK_FUNCS=""
+ ;;
++ *darwin*)
++ AC_MSG_RESULT([macho])
++ NASM_FORMAT="macho"
++ PREFIX="-DPREFIX"
++ MARK_FUNCS=""
+ esac
+
+ AS="$chosen_asm_prog"
diff --git a/contrib/xvidcore/P01-cygwin.patch b/contrib/xvidcore/P01-cygwin.patch
new file mode 100644
index 000000000..7b60510d0
--- /dev/null
+++ b/contrib/xvidcore/P01-cygwin.patch
@@ -0,0 +1,34 @@
+diff -Naur xvidcore/build/generic/configure xvidcore-patched/build/generic/configure
+--- xvidcore/build/generic/configure 2005-12-30 09:45:30.000000000 -0500
++++ xvidcore-patched/build/generic/configure 2007-01-01 18:43:27.953125000 -0500
+@@ -3844,10 +3844,9 @@
+ [cC][yY][gG][wW][iI][nN]*|mingw32*|mks*)
+ echo "$as_me:$LINENO: result: ok" >&5
+ echo "${ECHO_T}ok" >&6
+- STATIC_LIB="xvidcore.\$(STATIC_EXTENSION)"
+- SHARED_LIB="xvidcore.\$(SHARED_EXTENSION)"
+- SPECIFIC_LDFLAGS="-mno-cygwin -shared -Wl,--dll,--out-implib,\[email protected] libxvidcore.def"
+- SPECIFIC_CFLAGS="-mno-cygwin"
++ STATIC_LIB="libxvidcore.\$(STATIC_EXTENSION)"
++ SHARED_LIB="libxvidcore.\$(SHARED_EXTENSION)"
++ SPECIFIC_LDFLAGS="-shared -Wl,--dll,--out-implib,\[email protected] libxvidcore.def"
+ ;;
+ darwin*|raphsody*)
+ STATIC_LIB="libxvidcore.\$(STATIC_EXTENSION)"
+diff -Naur xvidcore/build/generic/configure.in xvidcore-patched/build/generic/configure.in
+--- xvidcore/build/generic/configure.in 2005-12-30 09:45:30.000000000 -0500
++++ xvidcore-patched/build/generic/configure.in 2007-01-01 18:43:11.453125000 -0500
+@@ -281,10 +281,9 @@
+ ;;
+ [[cC]][[yY]][[gG]][[wW]][[iI]][[nN]]*|mingw32*|mks*)
+ AC_MSG_RESULT([ok])
+- STATIC_LIB="xvidcore.\$(STATIC_EXTENSION)"
+- SHARED_LIB="xvidcore.\$(SHARED_EXTENSION)"
+- SPECIFIC_LDFLAGS="-mno-cygwin -shared -Wl,--dll,--out-implib,\[email protected] libxvidcore.def"
+- SPECIFIC_CFLAGS="-mno-cygwin"
++ STATIC_LIB="libxvidcore.\$(STATIC_EXTENSION)"
++ SHARED_LIB="libxvidcore.\$(SHARED_EXTENSION)"
++ SPECIFIC_LDFLAGS="-shared -Wl,--dll,--out-implib,\[email protected] libxvidcore.def"
+ ;;
+ darwin*|raphsody*)
+ STATIC_LIB="libxvidcore.\$(STATIC_EXTENSION)"
diff --git a/contrib/xvidcore/module.defs b/contrib/xvidcore/module.defs
new file mode 100644
index 000000000..0ec291a24
--- /dev/null
+++ b/contrib/xvidcore/module.defs
@@ -0,0 +1,20 @@
+$(eval $(call import.MODULE.defs,XVIDCORE,xvidcore))
+$(eval $(call import.CONTRIB.defs,XVIDCORE))
+
+XVIDCORE.FETCH.url = http://download.m0k.org/handbrake/contrib/xvidcore-1.1.3.tar.gz
+XVIDCORE.EXTRACT.tarbase = xvidcore
+
+XVIDCORE.CONFIGURE.dir = $(XVIDCORE.EXTRACT.target/)build/generic/
+
+XVIDCORE.BUILD.dir = $(XVIDCORE.EXTRACT.target/)build/generic/
+XVIDCORE.BUILD.ntargets = libxvidcore.a
+
+define XVIDCORE.INSTALL
+ cp $(XVIDCORE.EXTRACT.target/)build/generic/=build/libxvidcore.a $(CONTRIB.build/)lib/
+ cp $(XVIDCORE.EXTRACT.target/)src/xvid.h $(CONTRIB.build/)include/
+endef
+
+define XVIDCORE.UNINSTALL
+ rm $(CONTRIB.build/)lib/libxvidcore.a
+ rm $(CONTRIB.build/)include/xvid.h
+endef
diff --git a/contrib/xvidcore/module.rules b/contrib/xvidcore/module.rules
new file mode 100644
index 000000000..76600608e
--- /dev/null
+++ b/contrib/xvidcore/module.rules
@@ -0,0 +1,2 @@
+$(eval $(call import.MODULE.rules,XVIDCORE))
+$(eval $(call import.CONTRIB.rules,XVIDCORE))