GNOME.org
 

[Ekiga-devel-list] [Win32] Makefile from 669 version

 Hi,
I tested (and use it now) the new Makefile for Win32 cross compiling. I adapted some things to use ffmpeg, x264, opal and ptlib HEAD versions. I put the diff file in attachment. 
I noticed that patch system doesn't work for me.
I also noticed that loudmouth is removed : is moudmouth necessary or not?
There is a trouble with ekiga.nsi. It is necessary to add a line to handle opal. Naming is libopal.dll.3.9-beta0 and is not handled by nsi file. 

Best regards

Th. Simonnet

--- src/ekiga/win32/Makefile    2010-08-11 07:48:00.000000000 +0200
+++ Makefile_OFFICIEL   2010-08-12 16:33:45.000000000 +0200
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f

 # RELEASE: 0=from git/svn, 1=release (tar.gz) for ekiga, ptlib and opal
-RELEASE   := 1
+RELEASE   := 0
 # DEBUG: 0=release, 1=debug version
 DEBUG     := 0

@@ -94,17 +94,17 @@
        OPAL_ARCHIVE := opal-$(OPAL_VER).tar.gz
        OPAL_DIR := $(BUILDROOT)/opal-$(OPAL_VER)
 else
-       OPAL_VER := 3.8-beta3
+       OPAL_VER := 3.9-beta0
        # OPAL_REV: HEAD or revision number
        OPAL_REV := HEAD
-       OPAL_URL := https://opalvoip.svn.sourceforge.net/svnroot/opalvoip/opal/branches/v3_8
+       OPAL_URL := https://opalvoip.svn.sourceforge.net/svnroot/opalvoip/opal/trunk
        OPAL_ARCHIVE := opal
        OPAL_DIR := $(BUILDROOT)/opal
 endif
 ifeq ($(DEBUG),1)
        OPAL_LIB := libopal_d.$(OPAL_VER).dll
 else
-       OPAL_LIB := libopal.$(OPAL_VER).dll
+       OPAL_LIB := libopal.dll.$(OPAL_VER)
 endif

 ifeq ($(RELEASE),1)
@@ -113,10 +113,10 @@
        PTLIB_ARCHIVE := ptlib-$(PTLIB_VER).tar.gz
        PTLIB_DIR := $(BUILDROOT)/ptlib-$(PTLIB_VER)
 else
-       PTLIB_VER := 2.8-beta3
+       PTLIB_VER := 2.9-beta0
        # PTLIB_REV: HEAD or revision number
        PTLIB_REV := HEAD
-       PTLIB_URL := https://opalvoip.svn.sourceforge.net/svnroot/opalvoip/ptlib/branches/v2_8
+       PTLIB_URL := https://opalvoip.svn.sourceforge.net/svnroot/opalvoip/ptlib/trunk
        PTLIB_ARCHIVE := ptlib
        PTLIB_DIR := $(BUILDROOT)/ptlib
 endif
@@ -126,6 +126,11 @@
        PTLIB_LIB := libpt.$(PTLIB_VER).dll
 endif

+LOUDMOUTH_VER := 1.4.3
+LOUDMOUTH_DIR := $(BUILDROOT)/loudmouth
+LOUDMOUTH_ARCHIVE := loudmouth-$(LOUDMOUTH_VER)-win.zip
+LOUDMOUTH_URL := http://loudmouth-dev.googlegroups.com/web/
+
 OPENLDAP_VER := 2.4.22
 OPENLDAP_DIR := $(BUILDROOT)/openldap-$(OPENLDAP_VER)
 OPENLDAP_ARCHIVE := openldap-$(OPENLDAP_VER).tgz
@@ -153,23 +158,23 @@
 # this is an installer, not a zip of files to be manually installed
 # see http://gtk-win.sourceforge.net for more information
 GTK_BIN_VER := 2.20
-GTK_INSTALLER_URL := #http://www.pateam.org/archive/tmp/ekiga-win32/trunk
+GTK_INSTALLER_URL := http://www.pateam.org/archive/tmp/ekiga-win32/trunk
 GTK_BIN_EXE := gtk2-runtime-2.20-2010-04-30-ts.exe

-GLIB_VER := 2.18.4-1
-GLIB_URL := http://ftp.gnome.org/pub/gnome/binaries/win32/glib/2.18
+GLIB_VER := 2.24.1-1
+GLIB_URL := http://ftp.gnome.org/pub/gnome/binaries/win32/glib/2.24
 GLIB_ARCHIVE := glib-dev_$(GLIB_VER)_win32.zip

-ATK_VER := 1.24.0-1
-ATK_URL := http://ftp.gnome.org/pub/gnome/binaries/win32/atk/1.24
+ATK_VER := 1.30.0-1
+ATK_URL := http://ftp.gnome.org/pub/gnome/binaries/win32/atk/1.30
 ATK_ARCHIVE := atk-dev_$(ATK_VER)_win32.zip

-CAIRO_VER := 1.8.6-1
+CAIRO_VER := 1.8.10-3
 CAIRO_URL := http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies
 CAIRO_ARCHIVE := cairo-dev_$(CAIRO_VER)_win32.zip

-PANGO_VER := 1.24.5-2
-PANGO_URL := http://ftp.gnome.org/pub/gnome/binaries/win32/pango/1.24
+PANGO_VER := 1.28.0-1
+PANGO_URL := http://ftp.gnome.org/pub/gnome/binaries/win32/pango/1.28
 PANGO_ARCHIVE := pango-dev_$(PANGO_VER)_win32.zip

 XML2_VER := 2.7.7
@@ -205,12 +210,18 @@
 ICONV_ARCHIVE := libiconv-$(ICONV_VER)-bin.zip

 # use date for FFMPEG_VER, because it has two "repositories"
-FFMPEG_VER := {2009-04-14}
-FFMPEG_URL := svn://svn.mplayerhq.hu/ffmpeg/trunk
+#FFMPEG_VER := {2009-04-14}
+#FFMPEG_URL := svn://svn.mplayerhq.hu/ffmpeg/trunk
+FFMPEG_REV := HEAD
+FFMPEG_REV2 := HEAD
+FFMPEG_URL := git://git.ffmpeg.org/ffmpeg/
+FFMPEG_URL2 := git://git.ffmpeg.org/libswscale/
 FFMPEG_DIR := $(BUILDROOT)/ffmpeg
 FFMPEG_ARCHIVE := ffmpeg
+FFMPEG_ARCHIVE2 := ffmpeg/libswscale

-X264_VER := d2e1e1c35c43ea9c90c9211be
+X264_VER := HEAD
+#X264_VER := d2e1e1c35c43ea9c90c9211be
 X264_URL := git://git.videolan.org/x264.git
 X264_DIR := $(BUILDROOT)/x264
 X264_ARCHIVE := x264
@@ -250,7 +261,7 @@
        --disable-qos --disable-vidfile --disable-alsa --disable-esd --disable-oss --disable-sunaudio --disable-shmaudio \
        --disable-v4l --disable-v4l2 --disable-bsdvideo --disable-avc --disable-dc

-confopal := $(confflags) --with-ffmpeg-dir=$(FFMPEG_DIR) --disable-t38 --disable-fax
+confopal := $(confflags) --with-ffmpeg-dir=$(FFMPEG_DIR) --disable-t38 --disable-fax --disable-mixer

 confekiga:= $(confflags) \
        --with-directx-dir=$(EKIGA_DIR)/win32/directx --prefix=$(EKIGA_PREFIX) \
@@ -270,7 +281,8 @@
        --libdir=$(LIBDIR) --extra-ldflags=-Wl,-static
 #      --disable-network

-confx264 := $(confflags) --disable-avs-input
+#confx264 := $(confflags) --disable-avs-input
+confx264 := $(confflags) --disable-avs

 confcelt := $(confflags) --disable-oggtest

@@ -470,17 +482,36 @@
        $(MAKE) -C $(SPEEX_DIR) install

 ### ffmpeg
-update-sources::
-       @echo --- Getting FFMPEG ...
+##update-sources::
+##     @echo --- Getting FFMPEG ...
 # ffmpeg has two "repositories" (ffmpeg and libswscale) into their
 # repository, so process them separately
-ifeq ($(wildcard $(SRCDIR)/$(FFMPEG_ARCHIVE)),)
-       $(SVN) co $(FFMPEG_URL) $(SRCDIR)/$(FFMPEG_ARCHIVE) -r $(FFMPEG_VER)
+##ifeq ($(wildcard $(SRCDIR)/$(FFMPEG_ARCHIVE)),)
+##     $(SVN) co $(FFMPEG_URL) $(SRCDIR)/$(FFMPEG_ARCHIVE) -r $(FFMPEG_VER)
+##else
+##     cd $(SRCDIR)/$(FFMPEG_ARCHIVE); $(SVN) up --ignore-externals -r $(FFMPEG_VER)
+##endif
+##     cd $(SRCDIR)/$(FFMPEG_ARCHIVE); $(SVN) up -r $(FFMPEG_VER) libswscale
+##TS
+ifeq ($(wildcard $(SRCDIR)/$(FFMPEG_ARCHIVE)), )
+update-sources::
+        echo --- Getting $(FFMPEG_ARCHIVE) master...
+        $(GIT) clone $(FFMPEG_URL) $(SRCDIR)/$(FFMPEG_ARCHIVE)
 else
-       cd $(SRCDIR)/$(FFMPEG_ARCHIVE); $(SVN) up --ignore-externals -r $(FFMPEG_VER)
+update-sources::
+       echo --- Updating $(FFMPEG_ARCHIVE) master...
+       (cd $(SRCDIR)/$(FFMPEG_ARCHIVE); $(GIT) pull )
 endif
-       cd $(SRCDIR)/$(FFMPEG_ARCHIVE); $(SVN) up -r $(FFMPEG_VER) libswscale
-
+ifeq ($(wildcard $(SRCDIR)/$(FFMPEG_ARCHIVE2)), )
+update-sources::
+       echo --- Getting $(FFMPEG_ARCHIVE2) master...
+       (cd $(SRCDIR)/$(FFMPEG_ARCHIVE); $(GIT) clone $(FFMPEG_URL2) )
+else
+update-sources::
+       echo --- Updating $(FFMPEG_ARCHIVE2) master...
+       (cd $(SRCDIR)/$(FFMPEG_ARCHIVE2); $(GIT) pull )
+endif
+##TS
 $(FFMPEG_DIR)/config.status: $(SRCDIR)/$(FFMPEG_ARCHIVE)
        rm -rf $(FFMPEG_DIR)
        $(CP) -r $(SRCDIR)/$(FFMPEG_ARCHIVE) $(FFMPEG_DIR)
@@ -562,6 +593,7 @@
        tar xfz $(SRCDIR)/$(OPAL_ARCHIVE) -C $(BUILDROOT)
 else
        $(CP) -r $(SRCDIR)/$(OPAL_ARCHIVE) $(OPAL_DIR)
+       patch -p1 < diff/opal_h264frame.diff
 endif
        # apply all opal_* patches
        cd $(OPAL_DIR); for i in $(EKIGA_DIR)/win32/diff/opal_*; do \
@@ -696,6 +728,19 @@
        $(MAKE) $(MAKEOPTS) -C $(XML2_DIR)
        $(MAKE) $(MAKEOPTS) -C $(XML2_DIR) install

+### Loudmouth
+update-sources::
+       echo --- Getting Loudmouth...
+       cp $(LOUDMOUTH_ARCHIVE) $(SRCDIR)/$(LOUDMOUTH_ARCHIVE)
+#      $(WGET) -P $(SRCDIR) $(LOUDMOUTH_URL)/$(LOUDMOUTH_ARCHIVE)?gda=yx00PEkAAAAK7-b-onAaoEb5hV0E3nJV_bsiDriJQctkEYNMmHSa0Ag_T2Kkurcc1X3I3CbY38EmSx9tkRQjzhN2K5vIABaYhAioEG5q2hncZWbpWmJ7IQ
+#      mv $(SRCDIR)/$(LOUDMOUTH_ARCHIVE)?gda=yx00PEkAAAAK7-b-onAaoEb5hV0E3nJV_bsiDriJQctkEYNMmHSa0Ag_T2Kkurcc1X3I3CbY38EmSx9tkRQjzhN2K5vIABaYhAioEG5q2hncZWbpWmJ7IQ $(SRCDIR)/$(LOUDMOUTH_ARCHIVE)
+
+$(LIBDIR)/libloudmouth.a: binaries $(SRCDIR)/$(LOUDMOUTH_ARCHIVE)
+       rm -rf LOUDMOUTH_DIR $(LIBDIR)/libloudmouth.a $(INCLUDEDIR)/loudmouth*
+       unzip -u $(SRCDIR)/$(LOUDMOUTH_ARCHIVE) -d $(BUILDROOT)
+       cp -r $(LOUDMOUTH_DIR)/include/loudmouth* $(INCLUDEDIR)
+       cp $(LOUDMOUTH_DIR)/lib/loudmouth.lib $(LIBDIR)/libloudmouth.a
+
 ### ekiga
 update-sources::
        @echo --- Getting Ekiga ...
@@ -728,7 +773,7 @@ $(EKIGA_DIR)/config.status: binaries $(EKIGA_DIR)/configure $(LIBDIR)/$(PTLIB_LIB) $(LIBDIR)/$(OPAL_LIB) \
        $(LIBDIR)/pkgconfig/gtk+-2.0.pc $(LIBDIR)/pkgconfig/atk-2.0.pc $(LIBDIR)/pkgconfig/glib-2.0.pc \
        $(LIBDIR)/libpng.a $(LIBDIR)/pkgconfig/pango32.pc $(LIBDIR)/pkgconfig/cairo.pc $(LIBDIR)/libxml2.a \
-       $(LIBDIR)/libintl.a $(LIBDIR)/libiconv.a $(LIBDIR)/libboost_signals.dll $(LIBDIR)/libsasl2.a
+       $(LIBDIR)/libintl.a $(LIBDIR)/libiconv.a $(LIBDIR)/libboost_signals.dll $(LIBDIR)/libsasl2.a $(LIBDIR)/libloudmouth.a
        rm -f $(EKIGA_DIR)/src/ekiga.exe
 ifeq ($(DEBUG),1)
        cd $(EKIGA_DIR); ACLOCAL_FLAGS="-I $(BUILDROOT)/share/aclocal" LDFLAGS="$(LDFLAGS) -Wl,-subsystem,windows" ./configure $(confekiga) --enable-opal-debug
@@ -759,6 +804,7 @@
                install -m 755 $(BINDIR)/$$lib $(EKIGA_PREFIX) ;\
        done        
        cd $(EKIGA_PREFIX); cp /usr/share/doc/mingw32-runtime/mingwm10.dll.gz . && gunzip mingwm10.dll.gz
+
 ifeq ($(DEBUG),0)
        $(STRIP) $(EKIGA_PREFIX)/*.dll
        $(STRIP) $(EKIGA_PREFIX)/*.exe
@@ -767,6 +813,7 @@
 endif        # we cannot strip MS compiled dlls
        install -m 755 $(LIBSASL2_DIR)/bin/libsasl.dll $(EKIGA_PREFIX)
+       install -m 755  $(LOUDMOUTH_DIR)/bin/loudmouth.dll $(EKIGA_PREFIX)
        # for RELEASE=0 ekiga.xml files do not exist, so create them
        for lc in C $(DOC_LINGUAS); do \
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]