Merge branch 'jbonjean'

sflphone-common/libs/pjproject/build.mak.in

@@ -10,8 +10,8 @@ export LINUX_POLL := @ac_linux_poll@
 LIB_SUFFIX = $(TARGET_NAME).a
 
 # Determine which party libraries to use
-export APP_THIRD_PARTY_LIBS := -lresample-$(TARGET_NAME) -lmilenage-$(TARGET_NAME) -lsrtp-$(TARGET_NAME)
-export APP_THIRD_PARTY_LIB_FILES = $(PJ_DIR)/third_party/lib/libresample-$(LIB_SUFFIX) $(PJ_DIR)/third_party/lib/libmilenage-$(LIB_SUFFIX) $(PJ_DIR)/third_party/lib/libsrtp-$(LIB_SUFFIX)
+export APP_THIRD_PARTY_LIBS := -lresample-$(TARGET_NAME) -lsrtp-$(TARGET_NAME)
+export APP_THIRD_PARTY_LIB_FILES = $(PJ_DIR)/third_party/lib/libresample-$(LIB_SUFFIX) $(PJ_DIR)/third_party/lib/libsrtp-$(LIB_SUFFIX)
 
 ifneq (@ac_no_gsm_codec@,1)
 APP_THIRD_PARTY_LIBS += -lgsmcodec-$(TARGET_NAME)

sflphone-common/libs/pjproject/pjmedia/build/os-auto.mak

-# pjmedia/build/os-auto.mak.  Generated from os-auto.mak.in by configure.
-
-# PJMEDIA features exclusion
-export CFLAGS +=   
-
-# Define the desired sound device backend
-# Valid values are:
-#   - pa_unix:	    	PortAudio on Unix (OSS or ALSA)
-#   - pa_darwinos:  	PortAudio on MacOSX (CoreAudio)
-#   - pa_old_darwinos:  PortAudio on MacOSX (old CoreAudio, for OSX 10.2)
-#   - pa_win32:	    	PortAudio on Win32 (WMME)
-#   - ds:	    	Win32 DirectSound (dsound.c)
-#   - null:	    	Null sound device (nullsound.c)
-#   - external:		Link with no sounddev (app will provide)
-AC_PJMEDIA_SND=pa_unix
-
-# For Unix, specify if ALSA should be supported
-AC_PA_USE_ALSA=1
-
-# Additional PortAudio CFLAGS are in  -DHAVE_SYS_SOUNDCARD_H -DHAVE_LINUX_SOUNDCARD_H -DPA_LITTLE_ENDIAN
-
-#
-# Codecs
-#
-AC_NO_G711_CODEC=
-AC_NO_L16_CODEC=
-AC_NO_GSM_CODEC=
-AC_NO_SPEEX_CODEC=
-AC_NO_ILBC_CODEC=
-AC_NO_G722_CODEC=
-AC_NO_G7221_CODEC=
-
-export CODEC_OBJS=
-
-ifeq ($(AC_NO_G711_CODEC),1)
-export CFLAGS += -DPJMEDIA_HAS_G711_CODEC=0
-else
-export CODEC_OBJS +=
-endif
-
-ifeq ($(AC_NO_L16_CODEC),1)
-export CFLAGS += -DPJMEDIA_HAS_L16_CODEC=0
-else
-export CODEC_OBJS += l16.o
-endif
-
-ifeq ($(AC_NO_GSM_CODEC),1)
-export CFLAGS += -DPJMEDIA_HAS_GSM_CODEC=0
-else
-export CODEC_OBJS += gsm.o
-endif
-
-ifeq ($(AC_NO_SPEEX_CODEC),1)
-export CFLAGS += -DPJMEDIA_HAS_SPEEX_CODEC=0
-else
-export CFLAGS += -I$(THIRD_PARTY)/build/speex -I$(THIRD_PARTY)/speex/include
-export CODEC_OBJS += speex_codec.o
-
-ifneq (,1)
-export PJMEDIA_OBJS += echo_speex.o
-endif
-
-endif
-
-ifeq ($(AC_NO_ILBC_CODEC),1)
-export CFLAGS += -DPJMEDIA_HAS_ILBC_CODEC=0
-else
-export CODEC_OBJS += ilbc.o
-endif
-
-ifeq ($(AC_NO_G722_CODEC),1)
-export CFLAGS += -DPJMEDIA_HAS_G722_CODEC=0
-else
-export CODEC_OBJS += g722.o g722/g722_enc.o g722/g722_dec.o
-endif
-
-ifeq ($(AC_NO_G7221_CODEC),1)
-export CFLAGS += -DPJMEDIA_HAS_G7221_CODEC=0
-else
-export CODEC_OBJS += g7221.o
-export G7221_CFLAGS += -I$(THIRD_PARTY)
-endif
-
-
-#
-# PortAudio
-#
-ifneq ($(findstring pa,$(AC_PJMEDIA_SND)),)
-export CFLAGS += -I$(THIRD_PARTY)/build/portaudio -I$(THIRD_PARTY)/portaudio/include -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=1
-endif
-
-#
-# Windows specific
-#
-ifneq ($(findstring win32,$(AC_PJMEDIA_SND)),)
-export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_WMME=1
-else
-export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_WMME=0
-endif
-
-#
-# Null sound device
-#
-ifeq ($(AC_PJMEDIA_SND),null)
-export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=0 -DPJMEDIA_AUDIO_DEV_HAS_WMME=0
-endif
-
-#
-# External sound device
-#
-ifeq ($(AC_PJMEDIA_SND),external)
-export CFLAGS += -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=0 -DPJMEDIA_AUDIO_DEV_HAS_WMME=0
-endif
-
-

sflphone-common/libs/pjproject/pjmedia/include/pjmedia-codec/config_auto.h

-/* pjmedia/include/pjmedia-codec/config_auto.h.  Generated from config_auto.h.in by configure.  */
-/* $Id: config_auto.h.in 2601 2009-04-15 14:45:41Z nanang $ */
-/*
- * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com)
- * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-#ifndef __PJMEDIA_CODEC_CONFIG_AUTO_H_
-#define __PJMEDIA_CODEC_CONFIG_AUTO_H_
-
-/**
- * @file config_auto.h
- * @brief PJMEDIA-CODEC configuration as set by autoconf script
- */
-
-/*
- * Note:
- *	The configuration in config_site.h overrides any other settings,
- *	including the setting as detected by autoconf. 
- */
- 
-/* L16 codec */
-#ifndef PJMEDIA_HAS_L16_CODEC
-/* #undef PJMEDIA_HAS_L16_CODEC */
-#endif
-
-
-/* GSM codec */
-#ifndef PJMEDIA_HAS_GSM_CODEC
-/* #undef PJMEDIA_HAS_GSM_CODEC */
-#endif
-
-
-/* Speex codec */
-#ifndef PJMEDIA_HAS_SPEEX_CODEC
-/* #undef PJMEDIA_HAS_SPEEX_CODEC */
-#endif
-
-
-/* iLBC codec */
-#ifndef PJMEDIA_HAS_ILBC_CODEC
-/* #undef PJMEDIA_HAS_ILBC_CODEC */
-#endif
-
-
-/* G722 codec */
-#ifndef PJMEDIA_HAS_G722_CODEC
-/* #undef PJMEDIA_HAS_G722_CODEC */
-#endif
-
-/* G7221 codec */
-#ifndef PJMEDIA_HAS_G7221_CODEC
-/* #undef PJMEDIA_HAS_G7221_CODEC */
-#endif
-
-
-#endif	/* __PJMEDIA_CODEC_CONFIG_AUTO_H_ */
-
-

sflphone-common/libs/pjproject/third_party/build/os-auto.mak

-
-ifneq (,1)
-DIRS += gsm
-endif
-
-ifneq (,1)
-DIRS += ilbc
-endif
-
-ifneq (,1)
-DIRS += speex
-endif
-
-ifneq (,1)
-DIRS += g7221
-endif
-
-ifneq ($(findstring pa,pa_unix),)
-DIRS += portaudio
-endif
-

tools/build-system/build-osc.sh

@@ -18,11 +18,12 @@ WORKING_DIR="${ROOT_DIR}/sflphone-build-repository/tools/build-system"
 OSC_DIR="${WORKING_DIR}/osc"
 
 LAUNCHPAD_PACKAGES=( "sflphone-client-gnome" "sflphone-common" )
-LAUNCHPAD_PACKAGES=( "sflphone-client-gnome" )
+#LAUNCHPAD_PACKAGES=( "sflphone-client-gnome" )
+#LAUNCHPAD_PACKAGES=( "sflphone-common" )
 
 REFERENCE_REPOSITORY="${ROOT_DIR}/sflphone-source-repository"
 
-SOFTWARE_VERSION="0.9.8~beta"
+SOFTWARE_VERSION="0.9.7.beta"
 
 VERSION_INDEX=1
 
@@ -36,7 +37,7 @@ do
 
 	cp -r ${REFERENCE_REPOSITORY}/${LAUNCHPAD_PACKAGE} ${LAUNCHPAD_PACKAGE}-${SOFTWARE_VERSION}
 
-	cp ${OSC_DIR}/${LAUNCHPAD_PACKAGE}.spec .
+	cp ${OSC_DIR}/${LAUNCHPAD_PACKAGE}* .
 
 	sed -i -e "s/VERSION_INDEX/${VERSION_INDEX}/g" -e "s/VERSION/${SOFTWARE_VERSION}/g" ${LAUNCHPAD_PACKAGE}.spec
 
@@ -45,6 +46,8 @@ do
 	rm -rf ${LAUNCHPAD_PACKAGE}-${SOFTWARE_VERSION} 
 	
 	osc add ${LAUNCHPAD_PACKAGE}-${SOFTWARE_VERSION}.tar.gz
+	osc add *.patch
+
 	yes | osc commit --force -m "Version ${SOFTWARE_VERSION}"
 done
 

tools/build-system/osc/sflphone-client-gnome.spec

@@ -64,10 +64,18 @@ Requires:	dbus-1-glib
 Requires:	gtk2
 Requires:	glib2
 Requires:	libnotify
+Requires:	libsexy
+
+%if %{defined suse_version}
 Requires:	librsvg
 Requires:	liblog4c3
-Requires:	libsexy
-# gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders
+%endif
+
+%if %{defined fedora_version}
+Requires:	librsvg2
+Requires:	log4c
+%endif
+
 Conflicts:	sflphone
 Prefix:		%{_prefix}
 

tools/build-system/osc/sflphone-common-dbus-service-in-libdir.patch

+diff --git sflphone-common/src/dbus/Makefile.am sflphone-common/src/dbus/Makefile.am
+index 5a2745e..5ca2e42 100644
+--- sflphone-common/src/dbus/Makefile.am
++++ sflphone-common/src/dbus/Makefile.am
+@@ -38,7 +38,7 @@ service_DATA = $(service_in_files:.service.in=.service)
+ 
+ # Rule to make the service file with bindir expanded
+ $(service_DATA): $(service_in_files) Makefile
+-	sed -e "s|libexec|$(prefix)/lib/sflphone|" $<> $@
++	sed -e "s|libexec|$(libdir)/sflphone|" $<> $@
+ 
+ EXTRA_DIST = *.xml README
+ 
+

tools/build-system/osc/sflphone-common.spec

@@ -19,9 +19,9 @@ URL:            http://www.sflphone.org/
 Vendor:         Savoir-faire Linux
 Packager:	Julien Bonjean <julien.bonjean@savoirfairelinux.com>
 
-Group:          Applications/Communications
 BuildRoot:      %{_tmppath}/%{name}
 Source0:        sflphone-common-%{version}.tar.gz
+Patch0:		sflphone-common-dbus-service-in-libdir.patch
 BuildRequires:	speex-devel
 BuildRequires:	gcc-c++
 BuildRequires:	expat
@@ -55,19 +55,35 @@ BuildRequires:	gsm-devel
 %endif
 
 Requires:	libsamplerate
-Requires:	libexpat1
 Requires:	commoncpp2
-Requires:	libgsm1
-Requires:	libspeex
 Requires:	dbus-1
 Requires:	dbus-1-x11
-Requires:	xorg-x11
+
+%if %{defined suse_version}
+Requires:	libgsm1
+Requires:	libexpat1
+Requires:	libspeex
 Requires:	libasound2
 Requires:	libpulse0
 Requires:	libccrtp1
+%endif
+
+%if %{defined fedora_version}
+Requires:	gsm
+Requires:	expat
+Requires:	compat-expat1
+Requires:	speex
+Requires:	alsa-lib
+Requires:	pulseaudio-libs
+Requires:	ccrtp
+Requires:	libzrtpcpp
+%endif
+
 Conflicts:      sflphone
 Prefix:		%{_prefix}
 
+Group:          Applications/Communications
+
 %description
 SFLphone is meant to be a robust enterprise-class desktop phone.
  SFLphone is released under the GNU General Public License.
@@ -84,13 +100,13 @@ Authors:
 %build
 cd libs/pjproject
 ./autogen.sh
-./configure --prefix=%{_prefix}
+./configure --prefix=%{_prefix} --libdir=%{_libdir}
 make dep
 make clean
 make
 cd -
 ./autogen.sh
-./configure --prefix=%{_prefix} 
+./configure --prefix=%{_prefix} --libdir=%{_libdir}
 make -j
 
 %install
@@ -106,17 +122,17 @@ make clean
 %files
 %defattr(-, root, root)
 %doc AUTHORS COPYING README TODO
-%dir %{_prefix}/lib/sflphone
-%dir %{_prefix}/lib/sflphone/codecs
-%dir %{_prefix}/lib/sflphone/plugins
+%dir %{_libdir}/sflphone
+%dir %{_libdir}/sflphone/codecs
+%dir %{_libdir}/sflphone/plugins
 %dir %{_prefix}/share/sflphone
 %dir %{_prefix}/share/sflphone/ringtones
-%{_prefix}/lib/libdbus-*
-%{_prefix}/lib/sflphone/codecs/*
-%{_prefix}/lib/sflphone/plugins/*
+%{_libdir}/libdbus-*
+%{_libdir}/sflphone/codecs/*
+%{_libdir}/sflphone/plugins/*
 %{_prefix}/share/dbus-1/services/org.sflphone.*
 %{_prefix}/share/sflphone/ringtones/*
-%{_prefix}/lib/sflphone/sflphoned
+%{_libdir}/sflphone/sflphoned
 %doc %{_prefix}/share/man/man1/sflphoned.1.gz
 
 %changelog