Changes of Revision 8
| [-] | Changed | wengophone.spec |
|
x 1 2 3 # norootforbuild4 5 -# Packmangroup: Multimedia6 -# Packmanpackagename: Wengophone7 -# Packman: Andreas Schneider8 -9 %define _releaseversion 2.1.210 +%define _with_portaudio 011 12 BuildRequires: SDL-devel boost-devel cmake curl-devel doxygen e2fsprogs-devel13 BuildRequires: gcc-c++ gnutls-devel kdebase3-devel libqt4-devel libsamplerate-devel14 -BuildRequires: libsndfile-devel openssl-devel portaudio-devel speex-devel libjack-devel15 -BuildRequires: update-desktop-files xorg-x11-devel amrwb-devel16 +BuildRequires: libsndfile-devel openssl-devel speex-devel17 +BuildRequires: update-desktop-files xorg-x11-devel18 +#%if %{_with_portaudio}19 +BuildRequires: portaudio-devel20 +#%endif21 22 -BuildRequires: libffmpeg0-devel23 +#BuildRequires: libffmpeg0-devel24 25 Name: wengophone26 URL: http://www.openwengo.org/27 License: GPL28 Group: Productivity/Telephony/H323/Clients29 Summary: SIP Softphone with video and chat features30 -Version: 2.1.231 -Release: 132 +Version: 2.1.133 +Release: 0.pm.434 Source: %{name}-%{_releaseversion}.tar.bz235 -Requires: libqt4 >= 4.1.4 libffmpeg036 +#Patch: wengophone_qt4_crashes.patch37 +#Patch1: owautoconf.diff38 +#Patch2: owffmpeg-internal.diff39 +#Requires: libqt4 >= 4.2 libffmpeg040 +Requires: libqt4 >= 4.241 BuildRoot: %{_tmppath}/%{name}-%{version}-build42 43 %description44 45 %debug_package46 %prep47 %setup -q -n %{name}-%{_releaseversion}48 +#%patch -p449 +#%patch1 -p050 +#%patch2 -p051 52 %build53 pushd build54 CFLAGS="%{optflags}" \55 CXXFLAGS="%{optflags}" \56 cmake \57 + -DCMAKE_SKIP_RPATH=ON \58 -DCMAKE_BUILD_TYPE=None \59 -DCMAKE_INSTALL_PREFIX=%{_prefix} \60 - -DCMAKE_EXE_LINKER_FLAGS=-L%{_libdir} \61 - -DCMAKE_MODULE_LINKER_FLAGS=-L%{_libdir} \62 - -DCMAKE_SHARED_LINKER_FLAGS=-L%{_libdir} \63 - -DCMAKE_CXX_FLAGS=-L%{_libdir} \64 %if %{_lib} == lib6465 -DLIB_SUFFIX=64 \66 %endif67 +%if %{_with_portaudio}68 + -DOWSOUND_PORTAUDIO_SUPPORT=ON \69 +%else70 + -DOWSOUND_PORTAUDIO_SUPPORT=OFF \71 +%endif72 -DPORTAUDIO_INTERNAL=OFF \73 - -DFFMPEG_INTERNAL=OFF \74 + -DFFMPEG_INTERNAL=ON \75 -DSPEEX_INTERNAL=OFF \76 -DSAMPLERATE_INTERNAL=OFF \77 -DCURL_INTERNAL=OFF \78 79 %suse_update_desktop_file -r %{name} Network Telephony80 %endif81 82 +%__install -d "%{buildroot}%{_sysconfdir}/ld.so.conf.d"83 +echo "%{_libdir}/wengophone" > "%{buildroot}%{_sysconfdir}/ld.so.conf.d/wengophone.conf"84 +85 %clean86 %{__rm} -rf %{buildroot}87 88 +%post89 +%{run_ldconfig}90 +91 %files92 %defattr(-,root,root)93 %{_bindir}/qtwengophone94 %{_libdir}/wengophone/libowwebcam.so95 +%{_libdir}/wengophone/libcoredumper.so96 %{_libdir}/wengophone/libphapi.so97 +%{_libdir}/wengophone/libphapiutil.so98 %{_libdir}/wengophone/libphamrplugin.so99 %{_libdir}/wengophone/libphspeexplugin.so100 %{_libdir}/wengophone/libsfp-plugin.so101 %{_datadir}/wengophone102 %{_datadir}/icons/hicolor103 %{_datadir}/applications/wengophone.desktop104 +%{_sysconfdir}/ld.so.conf.d/wengophone.conf105 106 %changelog -n wengophone107 |
||
| [+] | Added | owautoconf.diff ^ |
| @@ -0,0 +1,32 @@ +------------------------------------------------------------------------ +r12195 | gladiac | 2007-08-03 16:26:59 +0200 (Fri, 03 Aug 2007) | 2 lines + +* (feature) support configure options + +------------------------------------------------------------------------ +Index: owbuild/owbuild/OWAutoconf.cmake +=================================================================== +--- owbuild/owbuild/OWAutoconf.cmake (revision 12194) ++++ owbuild/owbuild/OWAutoconf.cmake (revision 12195) +@@ -13,18 +13,18 @@ + # For details see the accompanying COPYING file. + + +-macro (ow_autoconf configureCommand makeCommand) ++macro (ow_autoconf _configureCommand _configureOptions _makeCommand) + + execute_process( + COMMAND +- ${configureCommand} ++ ${_configureCommand} ${_configureOptions} + WORKING_DIRECTORY + ${CMAKE_CURRENT_SOURCE_DIR} + ) + + execute_process( + COMMAND +- ${makeCommand} ++ ${_makeCommand} + WORKING_DIRECTORY + ${CMAKE_CURRENT_SOURCE_DIR} + ) | ||
| [+] | Added | owffmpeg-internal.diff ^ |
| @@ -0,0 +1,26 @@ +------------------------------------------------------------------------ +r12196 | gladiac | 2007-08-03 16:27:30 +0200 (Fri, 03 Aug 2007) | 2 lines + +* (bugfix) fix compilation on x86_64 and add options + +Index: libs/3rdparty/ffmpeg/CMakeLists-internal-unix.txt +=================================================================== +--- libs/3rdparty/ffmpeg/CMakeLists-internal-unix.txt.orig ++++ libs/3rdparty/ffmpeg/CMakeLists-internal-unix.txt +@@ -10,12 +10,14 @@ ow_add_public_include_dirs( + ) + + set(configure "./configure") ++set(configureOptions "--extra-cflags=") + + if (CMAKE_SIZEOF_VOID_P MATCHES "8") + ow_check_cxx_compiler_flag("-fPIC" WITH_FPIC) + if (WITH_FPIC) +- set(configure "./configure -fPIC") ++ set(configure "./configure") ++ set(configureOptions "--extra-cflags=-fPIC") + endif (WITH_FPIC) + endif (CMAKE_SIZEOF_VOID_P MATCHES "8") + +-ow_autoconf(${configure} "make") ++ow_autoconf(${configure} ${configureOptions} "make") | ||
| [+] | Added | wengophone_qt4_crashes.patch ^ |
| @@ -0,0 +1,20 @@ +Index: /wengophone-ng/branches/wengophone-2.1/libs/qtutil/src/QObjectThreadSafe.cpp +=================================================================== +--- /wengophone-ng/branches/wengophone-2.1/libs/qtutil/src/QObjectThreadSafe.cpp (revision 7175) ++++ /wengophone-ng/branches/wengophone-2.1/libs/qtutil/src/QObjectThreadSafe.cpp (revision 11804) +@@ -21,8 +21,14 @@ + + #include <QtCore/QCoreApplication> ++#include <QtCore/QThread> + + QObjectThreadSafe::QObjectThreadSafe(QObject * parent) + : QObject(parent) { +- ++ // If an object has a parent, its thread must be the current one. See ++ // http://doc.trolltech.com/4.3/qobject.html#moveToThread for more info. ++ assert(!parent || parent->thread() == QThread::currentThread()); ++ if(!parent) { ++ moveToThread(QCoreApplication::instance()->thread()); ++ } + _blockEvents = false; + } | ||
| Added | wengophone-2.1.1.tar.bz2 ^ | |