[ekiga/gnome-2-26] [windows] Automatically use patches for ptlib, opal and ekiga during building

[Eugen Dedu <ededu src gnome org>]

commit b58a90a055ef4c2e38c17b21f09ec0ccf9d55837
Author: Eugen Dedu <Eugen Dedu pu-pm univ-fcomte fr>
Date:   Sun May 2 20:21:26 2010 +0200

    [windows] Automatically use patches for ptlib, opal and ekiga during building

 win32/Makefile    |   14 +++++++++++++-
 win32/diff/README |    8 ++++++++
 2 files changed, 21 insertions(+), 1 deletions(-)
---
diff --git a/win32/Makefile b/win32/Makefile
index 9701703..c8db98b 100644
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -82,7 +82,7 @@ endif
 endif
 EKIGA_PREFIX := $(TARGETDIR)/Ekiga
 EKIGA_INSTALLER := ekiga-setup-$(EKIGA_VER).exe
-EKIGA_WIN32_DIFF_DIR := $(CURDIR)/diff
+#EKIGA_WIN32_DIFF_DIR := $(CURDIR)/diff
 EKIGA_INSTALLER_DIR := $(EKIGA_DIR)/win32/nsisinstaller
 
 ifeq ($(RELEASE),1)
@@ -409,6 +409,10 @@ ifeq ($(RELEASE),1)
 else
 	$(CP) -r $(SRCDIR)/$(PTLIB_ARCHIVE) $(PTLIB_DIR)
 endif
+	# apply all ptlib_* patches
+	cd $(PTLIB_DIR); for i in $(EKIGA_DIR)/diff/ptlib_*; do \
+		test `basename $$i` != 'ptlib_*' && patch -p1 <$$i \
+	done
 	touch $@
 
 $(PTLIB_DIR)/config.status: binaries $(PTLIB_DIR)/configure
@@ -548,6 +552,10 @@ ifeq ($(RELEASE),1)
 else
 	$(CP) -r $(SRCDIR)/$(OPAL_ARCHIVE) $(OPAL_DIR)
 endif
+	# apply all opal_* patches
+	cd $(OPAL_DIR); for i in $(EKIGA_DIR)/diff/opal_*; do \
+		test `basename $$i` != 'opal_*' && patch -p1 <$$i \
+	done
 	touch $@
 
 $(OPAL_DIR)/config.status: binaries $(OPAL_DIR)/configure
@@ -700,6 +708,10 @@ else
 	$(CP) -r $(SRCDIR)/$(EKIGA_ARCHIVE) $(EKIGA_DIR)
 	cd $(EKIGA_DIR); NOCONFIGURE=1 ./autogen.sh  # generate configure
 endif
+	# apply all ekiga_* patches
+	cd $(EKIGA_DIR); for i in $(EKIGA_DIR)/diff/ekiga_*; do \
+		test `basename $$i` != 'ekiga_*' && patch -p1 <$$i \
+	done
 	touch $@
 
 $(EKIGA_DIR)/config.status: binaries $(EKIGA_DIR)/configure $(LIBDIR)/$(PTLIB_LIB) $(LIBDIR)/$(OPAL_LIB) \
diff --git a/win32/diff/README b/win32/diff/README
new file mode 100644
index 0000000..b43a8fa
--- /dev/null
+++ b/win32/diff/README
@@ -0,0 +1,8 @@
+This directory is for temporary patches of ptlib, opal and ekiga which
+wait to be finished and be integrated upstream.
+
+Each patch whose filename starts with ptlib_ will automatically be
+used before building ptlib (but you need to trigger manually ptlib
+building).  The same for opal and ekiga.
+
+Look for "patch" string in ../Makefile to have more information.