GNOME.org
 

ekiga r6126 - in trunk: . lib/engine/audioinput/skel lib/engine/audiooutput/skel lib/engine/hal/skel win32

Author: mschneid
Date: Sun Apr  6 10:07:26 2008
New Revision: 6126
URL: http://svn.gnome.org/viewvc/ekiga?rev=6126&view=rev

Log:
Some fixes for the win32 build.


Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/lib/engine/audioinput/skel/audioinput-core.cpp
   trunk/lib/engine/audiooutput/skel/audiooutput-core.cpp
   trunk/lib/engine/hal/skel/hal-core.cpp
   trunk/lib/engine/hal/skel/hal-core.h
   trunk/win32/Makefile

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Sun Apr  6 10:07:26 2008
@@ -469,8 +469,8 @@
   if test "x${V4L}" != "xdisabled"; then
     AC_DEFINE(HAVE_V4L,1,[V4L support])
   fi
-  AM_CONDITIONAL(HAVE_V4L, test "x${V4L}" != "xdisabled")
 fi
+AM_CONDITIONAL(HAVE_V4L, test "x${V4L}" != "xdisabled")
 
 dnl ###############################
 dnl   Avahi / mDNS Support

Modified: trunk/lib/engine/audioinput/skel/audioinput-core.cpp
==============================================================================
--- trunk/lib/engine/audioinput/skel/audioinput-core.cpp	(original)
+++ trunk/lib/engine/audioinput/skel/audioinput-core.cpp	Sun Apr  6 10:07:26 2008
@@ -36,6 +36,7 @@
 
 #include <iostream>
 #include <sstream>
+#include <math.h>
 
 #include "audioinput-core.h"
 #include "audioinput-manager.h"

Modified: trunk/lib/engine/audiooutput/skel/audiooutput-core.cpp
==============================================================================
--- trunk/lib/engine/audiooutput/skel/audiooutput-core.cpp	(original)
+++ trunk/lib/engine/audiooutput/skel/audiooutput-core.cpp	Sun Apr  6 10:07:26 2008
@@ -36,6 +36,7 @@
 #include "audiooutput-core.h"
 #include "audiooutput-manager.h"
 #include <algorithm>
+#include <math.h>
 
 #define FALLBACK_DEVICE_TYPE "NULL"
 #define FALLBACK_DEVICE_SOURCE "NULL"

Modified: trunk/lib/engine/hal/skel/hal-core.cpp
==============================================================================
--- trunk/lib/engine/hal/skel/hal-core.cpp	(original)
+++ trunk/lib/engine/hal/skel/hal-core.cpp	Sun Apr  6 10:07:26 2008
@@ -110,10 +110,10 @@
   audio_output_device_removed.emit (sink, device, manager);
 }
 
-void HalCore::on_network_interface_up (std::string & interface, std::string & ip4_address, HalManager* manager) {
-  network_interface_up.emit (interface, ip4_address, manager);
+void HalCore::on_network_interface_up (std::string & interface_name, std::string & ip4_address, HalManager* manager) {
+  network_interface_up.emit (interface_name, ip4_address, manager);
 }
 
-void HalCore::on_network_interface_down (std::string & interface, std::string & ip4_address, HalManager* manager) {
-  network_interface_down.emit (interface,ip4_address, manager);
+void HalCore::on_network_interface_down (std::string & interface_name, std::string & ip4_address, HalManager* manager) {
+  network_interface_down.emit (interface_name,ip4_address, manager);
 }

Modified: trunk/lib/engine/hal/skel/hal-core.h
==============================================================================
--- trunk/lib/engine/hal/skel/hal-core.h	(original)
+++ trunk/lib/engine/hal/skel/hal-core.h	Sun Apr  6 10:07:26 2008
@@ -128,8 +128,8 @@
       void on_audio_output_device_added (std::string & sink, std::string & device, HalManager* manager);
       void on_audio_output_device_removed (std::string & sink, std::string & device, HalManager* manager);
 
-      void on_network_interface_up (std::string & interface, std::string & ip4_address, HalManager* manager);
-      void on_network_interface_down (std::string & interface, std::string & ip4_address, HalManager* manager);
+      void on_network_interface_up (std::string & interface_name, std::string & ip4_address, HalManager* manager);
+      void on_network_interface_down (std::string & interface_name, std::string & ip4_address, HalManager* manager);
 
       std::set<HalManager *> managers;
 

Modified: trunk/win32/Makefile
==============================================================================
--- trunk/win32/Makefile	(original)
+++ trunk/win32/Makefile	Sun Apr  6 10:07:26 2008
@@ -58,24 +58,28 @@
 export PATH:=$(BINDIR):$(PATH)
 
 
-EKIGA_VER = cvs-$(shell date +"%Y%m%d")
+EKIGA_VER = 2.9
+EKIGA_REV = HEAD
+EKIGA_URL = http://svn.gnome.org/svn/ekiga/trunk
+EKIGA_ARCHIVE := ekiga
 EKIGA_DIR = $(BUILDROOT)/ekiga
 EKIGA_PREFIX:= $(TARGETDIR)/Ekiga
-EKIGA_ARCHIVE := ekiga-snapshot.tar.gz
 EKIGA_WIN32_DIR := $(CURDIR)
 EKIGA_WIN32_DIFF_DIR := $(EKIGA_WIN32_DIR)/diff
 EKIGA_INSTALLER_DIR := $(BUILDROOT)/nsisinstaller
 EKIGA_INSTALLER := ekiga-setup-${EKIGA_VER}.exe
-EKIGA_URL1 := http://snapshots.buildserver.net/cvs
-EKIGA_URL2 := http://snapshots.voxgratia.org/cvs
 
-OPAL_VER:= 3.1.3
+OPAL_VER:= 3.3.0
+OPAL_REV:= HEAD
+OPAL_URL:= https://opalvoip.svn.sourceforge.net/svnroot/opalvoip/opal/trunk
+OPAL_ARCHIVE := opal
 OPAL_DIR:= $(BUILDROOT)/opal
-OPAL_ARCHIVE := opal-snapshot.tar.gz
 
-PTLIB_VER:= 2.1.3
+PTLIB_VER:= 2.3.0
+PTLIB_REV:= HEAD
+PTLIB_URL:= https://opalvoip.svn.sourceforge.net/svnroot/opalvoip/ptlib/trunk
 PTLIB_DIR:= $(BUILDROOT)/ptlib
-PTLIB_ARCHIVE := ptlib-snapshot.tar.gz
+PTLIB_ARCHIVE := ptlib
 
 OPENLDAP_VER := 2.3.28
 OPENLDAP_DIR := $(BUILDROOT)/openldap-$(OPENLDAP_VER)
@@ -155,7 +159,7 @@
 FFMPEG_ARCHIVE := ffmpeg
 
 X264_VER := 676
-X264_URL := svn://svn.videolan.org/x264/trunk
+X264_URL := git://git.videolan.org/x264.git
 X264_DIR := $(BUILDROOT)/x264
 X264_ARCHIVE := x264
 
@@ -175,6 +179,8 @@
 CP:=cp
 MV:=mv
 SVN:=svn
+GIT:=git
+ACLOCAL:=aclocal-1.9
 
 DOC_LINGUAS=bg de es fr pt_BR sv uk
 
@@ -219,7 +225,7 @@
 binaries:
 	echo Checking prerequisites...
 	hash $(REALCC) $(REALCXX) $(LD) $(NM) $(AR) $(RANLIB) $(DLLTOOL) $(DLLWRAP) $(OBJDUMP) $(WINDRES) $(AS)||(echo You need to install mingw32;exit 1)
-	hash tar unzip zip wget aclocal-1.9 autoheader libtoolize automake-1.9 autoconf pkg-config gnome-autogen.sh bison gdk-pixbuf-csource||(echo we need more binaries ;exit 1)
+	hash tar unzip zip wget $(ACLOCAL) autoheader libtoolize automake-1.9 autoconf pkg-config gnome-autogen.sh bison gdk-pixbuf-csource||(echo we need more binaries ;exit 1)
 	[ -f /usr/share/gnome-doc-utils/gnome-doc-utils.make ]||(echo gnome-doc-tools not installed;exit 1)
 	[ -f /usr/lib/pkgconfig/gconf-2.0.pc ]||(echo libgconf2-dev not installed;exit 1)
 	[ -f /usr/lib/pkgconfig/avahi-glib.pc ]||(echo libavahi-glib-dev not installed;exit 1)
@@ -324,14 +330,18 @@
 
 ### PTLib
 update-sources:: 
-	echo --- Getting PTLib $(PTLIB_VER) ...
-	$(WGET) -P src $(EKIGA_URL1)/$(PTLIB_ARCHIVE) || \
-	$(WGET) -P src $(EKIGA_URL2)/$(PTLIB_ARCHIVE)
+	echo --- Getting PTLib $(PTLIB_REV) ...
+ifneq ("$(shell $(SVN) co $(PTLIB_URL) $(SRCDIR)/$(PTLIB_ARCHIVE) -r $(PTLIB_REV) | cut -c1-7 | head -n1 )", "Checked")
+	echo "Updated to revision $(PTLIB_REV)"
+	touch $(SRCDIR)/$(PTLIB_ARCHIVE)
+else
+	echo "Already at revision $(PTLIB_REV)"
+endif
 
 $(PTLIB_DIR)/configure: binaries $(LIBDIR)/libldap.dll $(INCLUDEDIR)/directx/dsound.h $(LIBDIR)/libogg.a $(LIBDIR)/libspeex.a $(SRCDIR)/$(PTLIB_ARCHIVE) $(EKIGA_WIN32_DIFF_DIR)/ptlib_Makefile.am $(LIBDIR)/libexpat.a $(EKIGA_WIN32_DIFF_DIR)/ptlib_configure.ac $(EKIGA_WIN32_DIFF_DIR)/ptlib_ptlib.pc.in
 	rm -f $(LIBDIR)/libpt.a
 	rm -rf $(PTLIB_DIR)
-	tar xfz $(SRCDIR)/$(PTLIB_ARCHIVE) -C $(BUILDROOT)
+	cp -r $(SRCDIR)/$(PTLIB_ARCHIVE) $(PTLIB_DIR)
 	$(RM) -f $(PTLIB_DIR)/configure.exe $(PTLIB_DIR)/configure $(PTLIB_DIR)/configure.ac $(PTLIB_DIR)/Makefile.in
 	$(CP) -fl $(EKIGA_WIN32_DIFF_DIR)/ptlib_configure.ac $(PTLIB_DIR)/configure.ac
 	$(CP) -fl $(EKIGA_WIN32_DIFF_DIR)/ptlib_Makefile.am $(PTLIB_DIR)/Makefile.am
@@ -341,7 +351,7 @@
 	(cd $(PTLIB_DIR); \
 	sed -i "s#\$${buildroot}#${BUILDROOT}#" ptlib.pc.in; \
 	sed -i "s/\$${PTLIB_VER}/${PTLIB_VER}/" configure.ac; \
-	aclocal-1.9; autoheader; libtoolize --force; \
+	$(ACLOCAL); autoheader; libtoolize --force; \
 	touch NEWS README AUTHORS ChangeLog unused.h.in; \
 	automake-1.9 -a -c; autoconf; \
 	)
@@ -419,12 +429,13 @@
 ### x264
 update-sources:: 
 	echo --- Getting x264 ---
-ifneq ("$(shell $(SVN) co $(X264_URL) $(SRCDIR)/$(X264_ARCHIVE) -r $(X264_VER) | cut -c1-7 | head -n1 )", "Checked")
+#ifneq ("$(shell $(SVN) co $(X264_URL) $(SRCDIR)/$(X264_ARCHIVE) -r $(X264_VER) | cut -c1-7 | head -n1 )", "Checked")
+	$(GIT) clone $(X264_URL) $(SRCDIR)/$(X264_ARCHIVE)
 	echo "Updated to revision $(X264_VER)"
 	touch $(SRCDIR)/$(X264_ARCHIVE)
-else
-	echo "Already at revision $(X264_VER)"
-endif
+#else
+#	echo "Already at revision $(X264_VER)"
+#endif
 
 $(X264_DIR)/config.status: $(SRCDIR)/$(X264_ARCHIVE)
 	rm -rf $(X264_DIR)
@@ -433,9 +444,7 @@
 	CC=$(REALCC) ./configure $(confx264); \
 	sed -i -e 's#ranlib#$(RANLIB)#g' $(X264_DIR)/Makefile; \
 	sed -i -e 's#strip#$(STRIP)#g' $(X264_DIR)/Makefile; \
-	sed -i -e 's#ar #$(AR) #g' $(X264_DIR)/Makefile; \
-	sed -i -e 's#install: x264#install: x264$$(EXE)#g' $(X264_DIR)/Makefile; \
-	sed -i -e 's#install x264#install x264$$(EXE)#g' $(X264_DIR)/Makefile	)
+	sed -i -e 's#ar #$(AR) #g' $(X264_DIR)/Makefile )
 	touch $@
 
 $(LIBDIR)/libx264.a: $(X264_DIR)/config.status
@@ -444,7 +453,7 @@
 	touch $@
 
 ### theora
-update-sources:: 
+update-sources::
 	echo --- Getting theora ---
 ifneq ("$(shell $(SVN) co $(THEORA_URL) $(SRCDIR)/$(THEORA_ARCHIVE) -r $(THEORA_VER) | cut -c1-7 | head -n1 )", "Checked")
 	echo "Updated to revision $(THEORA_VER)"
@@ -468,20 +477,24 @@
 
 ### OPAL
 update-sources::
-	echo --- Getting OPAL $(OPAL_VER)...
-	$(WGET) -P src $(EKIGA_URL1)/$(OPAL_ARCHIVE) || \
-	$(WGET) -P src $(EKIGA_URL2)/$(OPAL_ARCHIVE)
+	echo --- Getting OPAL $(OPAL_REV)...
+ifneq ("$(shell $(SVN) co $(OPAL_URL) $(SRCDIR)/$(OPAL_ARCHIVE) -r $(OPAL_REV) | cut -c1-7 | head -n1 )", "Checked")
+	echo "Updated to revision $(OPAL_REV)"
+	touch $(SRCDIR)/$(OPAL_ARCHIVE)
+else
+	echo "Already at revision $(OPAL_REV)"
+endif
 
 $(OPAL_DIR)/configure: binaries $(LIBDIR)/libogg.a $(LIBDIR)/libspeex.a $(LIBDIR)/libpt.a $(SRCDIR)/$(OPAL_ARCHIVE) $(EKIGA_WIN32_DIFF_DIR)/opal_configure.ac $(EKIGA_WIN32_DIFF_DIR)/opal_Makefile.am $(EKIGA_WIN32_DIFF_DIR)/opal_opal.pc.in $(BINDIR)/avcodec.dll $(LIBDIR)/libx264.a $(LIBDIR)/libtheora.a
 	rm -rf $(OPAL_DIR) $(LIBDIR)/libopal.a
-	tar xfz $(SRCDIR)/$(OPAL_ARCHIVE) -C $(BUILDROOT)
+	cp -r $(SRCDIR)/$(OPAL_ARCHIVE) $(OPAL_DIR)
 	$(RM) -f $(OPAL_DIR)/configure.exe $(OPAL_DIR)/configure $(OPAL_DIR)/configure.ac $(OPAL_DIR)/Makefile.in
 	$(CP) -fl $(EKIGA_WIN32_DIFF_DIR)/opal_configure.ac $(OPAL_DIR)/configure.ac
 	$(CP) -fl $(EKIGA_WIN32_DIFF_DIR)/opal_Makefile.am $(OPAL_DIR)/Makefile.am
 	$(CP) -fl $(EKIGA_WIN32_DIFF_DIR)/opal_opal.pc.in $(OPAL_DIR)/opal.pc.in
 	(cd opal; \
 	sed -i "s/\$${OPAL_VER}/${OPAL_VER}/" configure.ac; \
-	aclocal-1.9; autoheader; libtoolize --force; \
+	$(ACLOCAL); autoheader; libtoolize --force; \
 	touch NEWS README AUTHORS ChangeLog unused.h.in; \
 	automake-1.9 -a -c; autoconf )
 
@@ -624,13 +637,17 @@
 
 ### GnomeMeeting / Ekiga
 update-sources::
-	echo --- Getting Ekiga-CVS ...
-	$(WGET) -P src $(EKIGA_URL1)/$(EKIGA_ARCHIVE)||\
-	$(WGET) -P src $(EKIGA_URL2)/$(EKIGA_ARCHIVE)
+	echo --- Getting Ekiga $(EKIGA_REV)...
+ifneq ("$(shell $(SVN) co $(EKIGA_URL) $(SRCDIR)/$(EKIGA_ARCHIVE) -r $(EKIGA_REV) | cut -c1-7 | head -n1 )", "Checked")
+	echo "Updated to revision $(EKIGA_REV)"
+	touch $(SRCDIR)/$(EKIGA_ARCHIVE)
+else
+	echo "Already at revision $(EKIGA_REV)"
+endif
 
 $(EKIGA_DIR)/autogen.sh: binaries $(SRCDIR)/$(EKIGA_ARCHIVE)
 	rm -rf $(EKIGA_DIR)
-	tar xfz $(SRCDIR)/$(EKIGA_ARCHIVE)
+	cp -r $(SRCDIR)/$(EKIGA_ARCHIVE) $(EKIGA_DIR)
 	touch $@
 
 $(EKIGA_DIR)/config.status: binaries $(EKIGA_DIR)/autogen.sh $(LIBDIR)/libpt.a $(LIBDIR)/libopal.a \
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]