Cygwin: updated patch to support faac-1.26 -> 1.28 bump.

BuildSystem: cleanup some makefile debug residuals and fix module bzip2 always-out-of-date condition.

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

diff --git a/contrib/bzip2/module.defs b/contrib/bzip2/module.defs
index 4384f83f7ae73e25c56b698945d4786707adb336..7c9c5528bdd3b8946f38d7f93b261de92ebb4ce9 100644 (file)
--- a/contrib/bzip2/module.defs
+++ b/contrib/bzip2/module.defs
@@ -3,7 +3,7 @@ $(eval $(call import.CONTRIB.defs,BZIP2))
 
 BZIP2.FETCH.url = http://download.m0k.org/handbrake/contrib/bzip2-1.0.5.tar.gz
 BZIP2.EXTRACT.tarbase = bzip2
-BZIP2.CONFIGURE =
+BZIP2.CONFIGURE = $(TOUCH.exe) $@
 
 BZIP2.BUILD.extra = \
     CC=$(BZIP2.GCC.gcc) \

diff --git a/contrib/faac/P00-cygwin.patch b/contrib/faac/P00-cygwin.patch
index d54b08d020640803d05c6a841b26762e37ca69da..a5da42d879543aacc9ddc1a3ef24ed1010205dc5 100644 (file)
--- a/contrib/faac/P00-cygwin.patch
+++ b/contrib/faac/P00-cygwin.patch
@@ -1,12 +1,12 @@
-diff -Naur faac2/include/faac.h faac3/include/faac.h
---- faac/include/faac.h        2004-07-04 13:12:06.000000000 +0100
-+++ faac/include/faac.h        2008-08-17 19:56:29.734375000 +0100
+diff -Naur faac-1.28.orig/include/faac.h faac-1.28/include/faac.h
+--- faac-1.28.orig/include/faac.h      2009-01-25 13:50:32.000000000 -0500
++++ faac-1.28/include/faac.h   2009-03-20 03:31:46.000000000 -0400
 @@ -50,7 +50,7 @@
  typedef void *faacEncHandle;
  
  #ifndef HAVE_INT32_T
--typedef int int32_t;
-+//typedef int int32_t;
+-typedef signed int int32_t;
++//typedef signed int int32_t;
  #endif
  
  /*

diff --git a/libhb/module.rules b/libhb/module.rules
index 6408700e499583a8a6b294ad0821d32de4236ab2..8f63a143f01680ec81771b193613775fe3badc37 100644 (file)
--- a/libhb/module.rules
+++ b/libhb/module.rules
@@ -38,7 +38,3 @@ endif
 
 clean: libhb.clean
 build: libhb.build
-
-xmike:
-       @echo $(LIBHB.yasm.asm)
-       @echo $(LIBHB.yasm.o)