Excises xvid from libhb because it's not worthy. Having two different MPEG-4 Part 2 encoders is superfluous and when choosing between ffmpeg and xvid, xvid is the clear loser since we need to keep ffmpeg around for other functions and xvid constantly requires attention to ensure it compiles.

MacGui: Removes some stray references to the codec and unlinks it from the Xcode project.
CLI: Removes references to the codec and removes it as a dependency.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2448 b64f7644-9d1e-0410-96f1-a4d463321fa5

5 files changed, 0 insertions, 90 deletions

diff --git a/contrib/xvidcore/A00-libtool.patch b/contrib/xvidcore/A00-libtool.patch
deleted file mode 100644
index 0ae50dbbb..000000000
--- a/contrib/xvidcore/A00-libtool.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naurw xvidcore-20090311.orig/build/generic/bootstrap.sh xvidcore-20090311/build/generic/bootstrap.sh
---- xvidcore-20090311.orig/build/generic/bootstrap.sh	2005-05-23 05:29:43.000000000 -0400
-+++ xvidcore-20090311/build/generic/bootstrap.sh	2009-04-15 13:13:54.000000000 -0400
-@@ -75,7 +75,7 @@
- $AUTOMAKE -c -a 1>/dev/null 2>&1
- 
- echo "Copying files provided by libtool"
--$LIBTOOLIZE -f -c 1>/dev/null 2>&1
-+$LIBTOOLIZE -f -c -i 1>/dev/null 2>&1
- 
- echo "Removing files that are not needed"
- rm -rf autom4* 1>/dev/null 2>&1 
diff --git a/contrib/xvidcore/P00-darwin.patch b/contrib/xvidcore/P00-darwin.patch
deleted file mode 100644
index 12bc8dac0..000000000
--- a/contrib/xvidcore/P00-darwin.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -Naur xvidcore-20090311.orig/build/generic/configure.in xvidcore-20090311/build/generic/configure.in
---- xvidcore-20090311.orig/build/generic/configure.in	2008-12-05 05:18:52.000000000 -0500
-+++ xvidcore-20090311/build/generic/configure.in	2009-04-14 11:30:04.000000000 -0400
-@@ -427,8 +427,13 @@
- 	       MARK_FUNCS=""
-                ;;
-            *darwin*)
--               AC_MSG_RESULT([macho])
--               NASM_FORMAT="macho"
-+               if test "$ARCHITECTURE" = "X86_64" ; then
-+                   AC_MSG_RESULT([macho64])
-+                   NASM_FORMAT="macho64"
-+               else
-+                   AC_MSG_RESULT([macho])
-+                   NASM_FORMAT="macho"
-+               fi
-                PREFIX="-DPREFIX"
-                MARK_FUNCS=""
-                ;;
-diff -Naur xvidcore-20090311.orig/src/nasm.inc xvidcore-20090311/src/nasm.inc
---- xvidcore-20090311.orig/src/nasm.inc	2008-12-05 05:15:02.000000000 -0500
-+++ xvidcore-20090311/src/nasm.inc	2009-04-14 12:13:37.000000000 -0400
-@@ -177,6 +177,8 @@
- %macro TEXT 0
- %ifidn __OUTPUT_FORMAT__,macho
-       SECTION .text align=SECTION_ALIGN
-+%elifidn __OUTPUT_FORMAT__,macho64
-+      SECTION .text align=SECTION_ALIGN
- %else
-       SECTION .rotext align=SECTION_ALIGN
- %endif
diff --git a/contrib/xvidcore/P01-cygwin.patch b/contrib/xvidcore/P01-cygwin.patch
deleted file mode 100644
index 20afce260..000000000
--- a/contrib/xvidcore/P01-cygwin.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -Naur xvidcore-20090311.orig/build/generic/configure.in xvidcore-20090311/build/generic/configure.in
---- xvidcore-20090311.orig/build/generic/configure.in	2008-12-05 05:18:52.000000000 -0500
-+++ xvidcore-20090311/build/generic/configure.in	2009-04-14 13:18:23.034051500 -0400
-@@ -282,10 +282,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
deleted file mode 100644
index 5a76e0911..000000000
--- a/contrib/xvidcore/module.defs
+++ /dev/null
@@ -1,28 +0,0 @@
-$(eval $(call import.MODULE.defs,XVIDCORE,xvidcore))
-$(eval $(call import.CONTRIB.defs,XVIDCORE))
-
-XVIDCORE.FETCH.url = http://download.m0k.org/handbrake/contrib/xvidcore-20090311.tar.gz
-
-XVIDCORE.CONFIGURE.static =
-XVIDCORE.CONFIGURE.shared =
-XVIDCORE.CONFIGURE.deps =
-XVIDCORE.CONFIGURE.dir = $(XVIDCORE.EXTRACT.dir/)build/generic/
-XVIDCORE.CONFIGURE.bootstrap = ./bootstrap.sh;
-
-XVIDCORE.BUILD.dir      = $(XVIDCORE.EXTRACT.dir/)build/generic/
-XVIDCORE.BUILD.extra    = STATIC_LIB=libxvidcore.a
-XVIDCORE.BUILD.ntargets = libxvidcore.a
-
-XVIDCORE.CLEAN.dir = $(XVIDCORE.EXTRACT.dir/)build/generic/
-
-define XVIDCORE.INSTALL
-    $(CP.exe) $(XVIDCORE.EXTRACT.dir/)build/generic/=build/libxvidcore.a $(CONTRIB.build/)lib/
-    $(CP.exe) $(XVIDCORE.EXTRACT.dir/)src/xvid.h $(CONTRIB.build/)include/
-    $(TOUCH.exe) $@
-endef
-
-define XVIDCORE.UNINSTALL
-    $(RM.exe) -f $(CONTRIB.build/)lib/libxvidcore.a
-    $(RM.exe) -f $(CONTRIB.build/)include/xvid.h
-    $(RM.exe) -f $(XVIDCORE.INSTALL.target)
-endef
diff --git a/contrib/xvidcore/module.rules b/contrib/xvidcore/module.rules
deleted file mode 100644
index 76600608e..000000000
--- a/contrib/xvidcore/module.rules
+++ /dev/null
@@ -1,2 +0,0 @@
-$(eval $(call import.MODULE.rules,XVIDCORE))
-$(eval $(call import.CONTRIB.rules,XVIDCORE))