Hello community, here is the log from the commit of package mediastreamer2 for openSUSE:Factory checked in at 2017-08-29 11:38:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mediastreamer2 (Old) and /work/SRC/openSUSE:Factory/.mediastreamer2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mediastreamer2" Tue Aug 29 11:38:39 2017 rev:22 rq:511963 version:2.16.1 Changes: -------- --- /work/SRC/openSUSE:Factory/mediastreamer2/mediastreamer2.changes 2017-06-28 10:34:58.370527092 +0200 +++ /work/SRC/openSUSE:Factory/.mediastreamer2.new/mediastreamer2.changes 2017-08-29 11:38:41.485868848 +0200 @@ -1,0 +2,12 @@ +Fri Jul 21 13:30:37 UTC 2017 - sor.alexei@meowr.ru + +- Update to version 2.16.1 (changes since 2.15.1): + * Add sound card driven ticker. + * Sound card flow control improvements. +- Enable documentation installation. +- Switch from building with autotools to cmake. +- Add mediastreamer2-fix-pkgconfig.patch: Install mediastreamer.pc. +- Add mediastreamer2-fix-xv.patch: Fix Xv by linking with Xext. +- Build with optional TurboJpeg and Bcg729 dependencies. + +------------------------------------------------------------------- Old: ---- mediastreamer-2.15.1.tar.gz New: ---- mediastreamer-2.16.1.tar.gz mediastreamer2-fix-pkgconfig.patch mediastreamer2-fix-xv.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mediastreamer2.spec ++++++ --- /var/tmp/diff_new_pack.vyiBSL/_old 2017-08-29 11:38:42.953662623 +0200 +++ /var/tmp/diff_new_pack.vyiBSL/_new 2017-08-29 11:38:42.957662062 +0200 @@ -19,10 +19,10 @@ %define _name mediastreamer %define sobase libmediastreamer_base %define sovoip libmediastreamer_voip -%define sover 7 +%define sover 10 %bcond_without ffmpeg Name: mediastreamer2 -Version: 2.15.1 +Version: 2.16.1 Release: 0 Summary: Audio/Video real-time streaming License: GPL-2.0+ @@ -30,35 +30,43 @@ Url: https://linphone.org/technical-corner/mediastreamer2/overview Source: https://linphone.org/releases/sources/%{_name}/%{_name}-%{version}.tar.gz Source99: baselibs.conf -BuildRequires: autoconf -BuildRequires: automake +# PATCH-FIX-OPENSUSE mediastreamer2-fix-pkgconfig.patch sor.alexei@meowr.ru -- Install mediastreamer.pc. +Patch0: mediastreamer2-fix-pkgconfig.patch +# PATCH-FIX-OPENSUSE mediastreamer2-fix-xv.patch sor.alexei@meowr.ru -- Fix Xv by linking with Xext. +Patch1: mediastreamer2-fix-xv.patch +BuildRequires: bcmatroska2-devel +BuildRequires: cmake +BuildRequires: doxygen BuildRequires: gawk BuildRequires: gcc-c++ -BuildRequires: intltool +BuildRequires: graphviz BuildRequires: libgsm-devel BuildRequires: libpcap-devel BuildRequires: libsrtp-devel -BuildRequires: libtool BuildRequires: libv4l-devel BuildRequires: libvpx-devel BuildRequires: pkgconfig +BuildRequires: python BuildRequires: spandsp-devel BuildRequires: vim BuildRequires: pkgconfig(alsa) -BuildRequires: pkgconfig(bctoolbox) -BuildRequires: pkgconfig(libbzrtp) >= 1.0.4 -BuildRequires: pkgconfig(libebml) -BuildRequires: pkgconfig(libmatroska) +BuildRequires: pkgconfig(bctoolbox) >= 0.6.0 +BuildRequires: pkgconfig(libbcg729) +BuildRequires: pkgconfig(libbzrtp) >= 1.0.6 BuildRequires: pkgconfig(libpulse) BuildRequires: pkgconfig(libupnp) BuildRequires: pkgconfig(opus) -BuildRequires: pkgconfig(ortp) >= 1.0.0 +BuildRequires: pkgconfig(ortp) >= 1.0.2 BuildRequires: pkgconfig(speex) BuildRequires: pkgconfig(speexdsp) BuildRequires: pkgconfig(theora) BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(xext) BuildRequires: pkgconfig(xv) -Recommends: %{name}-lang +Obsoletes: %{name}-lang +%if 0%{?suse_version} > 1320 +BuildRequires: libjpeg-devel +%endif %if %{with ffmpeg} BuildRequires: pkgconfig(glew) BuildRequires: pkgconfig(glu) @@ -71,8 +79,6 @@ real-time streaming and processing. Written in pure C, it is based upon the oRTP library. -%lang_package - %package -n %{sobase}%{sover} Summary: Audio/video real-time streaming library, base part Group: System/Libraries @@ -97,6 +103,7 @@ Requires: %{name} = %{version} Requires: %{sobase}%{sover} = %{version} Requires: %{sovoip}%{sover} = %{version} +Requires: bcmatroska2-devel %description devel Mediastreamer2 is a GPL licensed library to make audio and video @@ -108,25 +115,28 @@ %prep %setup -q -n %{_name}-%{version} +%patch0 -p1 +%patch1 -p1 %build -NOCONFIGURE=1 ./autogen.sh -%configure \ - --enable-external-ortp \ - --enable-zrtp \ -%if %{without ffmpeg} - --disable-non-free-codecs \ - --disable-video \ +%cmake \ +%if %{with ffmpeg} + -DCMAKE_INCLUDE_PATH=%{_includedir}/ffmpeg \ +%else + -DENABLE_NON_FREE_CODECS=OFF \ + -DENABLE_VIDEO=OFF \ %endif - --disable-strict \ - --disable-static + -DENABLE_ZRTP=ON \ + -DENABLE_STRICT=OFF \ + -DENABLE_STATIC=OFF make %{?_smp_mflags} V=1 %install -%make_install +%cmake_install -%find_lang %{_name} -find %{buildroot} -type f -name "*.la" -delete -print +mkdir -p %{buildroot}%{_docdir}/%{name}/ +mv -T %{buildroot}%{_datadir}/doc/%{name}-%{version}/ \ + %{buildroot}%{_docdir}/%{name}/ %post -n %{sobase}%{sover} -p /sbin/ldconfig @@ -137,29 +147,26 @@ %postun -n %{sovoip}%{sover} -p /sbin/ldconfig %files -%defattr(-,root,root) -%doc AUTHORS COPYING NEWS README.md +%doc %{_docdir}/%{name}/ +%if 0%{?suse_version} > 1320 || 0%{?sle_version} >= 120000 %{_bindir}/mediastream -%{_bindir}/msaudiocmp -%{_bindir}/pcap_playback +%{_bindir}/mkvstream %dir %{_datadir}/images/ %{_datadir}/images/nowebcamCIF.jpg - -%files lang -f %{_name}.lang -%defattr(-,root,root) +%endif %files -n %{sobase}%{sover} -%defattr(-,root,root) %{_libdir}/%{sobase}.so.%{sover}* %files -n %{sovoip}%{sover} -%defattr(-,root,root) %{_libdir}/%{sovoip}.so.%{sover}* %files devel -%defattr(-,root,root) %{_includedir}/mediastreamer2/ +%{_bindir}/mediastreamer2_tester %{_libdir}/libmediastreamer_*.so -%{_libdir}/pkgconfig/mediastreamer.pc +%{_datadir}/mediastreamer2_tester/ +%{_datadir}/Mediastreamer2/ +%{_libdir}/pkgconfig/%{_name}.pc %changelog ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.vyiBSL/_old 2017-08-29 11:38:43.129637899 +0200 +++ /var/tmp/diff_new_pack.vyiBSL/_new 2017-08-29 11:38:43.133637337 +0200 @@ -1,2 +1,2 @@ -libmediastreamer_base7 -libmediastreamer_voip7 +libmediastreamer_base10 +libmediastreamer_voip10 ++++++ mediastreamer-2.15.1.tar.gz -> mediastreamer-2.16.1.tar.gz ++++++ /work/SRC/openSUSE:Factory/mediastreamer2/mediastreamer-2.15.1.tar.gz /work/SRC/openSUSE:Factory/.mediastreamer2.new/mediastreamer-2.16.1.tar.gz differ: char 5, line 1 ++++++ mediastreamer2-fix-pkgconfig.patch ++++++ --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -556,6 +556,27 @@ if(MEDIASTREAMER2_CPPFLAGS) add_definitions(${MEDIASTREAMER2_CPPFLAGS}) endif() + +set(MS_PUBLIC_PACKAGES "ortp bctoolbox") +if(ENABLE_ZRTP) + set(MS_PRIVATE_PACKAGES "${MS_PRIVATE_PACKAGES} libbzrtp") +endif() +if(ENABLE_FFMPEG) + set(MS_PRIVATE_PACKAGES "${MS_PRIVATE_PACKAGES} libavcodec libavutil libswscale") +endif() +if(ENABLE_FIXED_POINT) + set(MS_PUBLIC_CFLAGS "-DMS_FIXED_POINT") +else(ENABLE_FIXED_POINT) + set(MS_PUBLIC_CFLAGS ) +endif() +set(prefix ${CMAKE_INSTALL_PREFIX}) +set(exec_prefix ${prefix}/bin) +set(libdir ${CMAKE_INSTALL_LIBDIR}) +set(includedir ${prefix}/include) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/mediastreamer.pc.in ${CMAKE_CURRENT_BINARY_DIR}/mediastreamer.pc) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/mediastreamer.pc DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") + + set(STRICT_OPTIONS_CPP ) set(STRICT_OPTIONS_C ) set(STRICT_OPTIONS_OBJC "-Wno-error") --- a/mediastreamer.pc.in +++ b/mediastreamer.pc.in @@ -5,7 +5,8 @@ includedir=@includedir@ Name: mediastreamer Description: A mediastreaming library for telephony applications -Requires: ortp bctoolbox +Requires: @MS_PUBLIC_PACKAGES@ +Requires.private: @MS_PRIVATE_PACKAGES@ Version: @MEDIASTREAMER_VERSION@ Libs: -L@libdir@ -lmediastreamer_base -lmediastreamer_voip Cflags: -I@includedir@ @MS_PUBLIC_CFLAGS@ ++++++ mediastreamer2-fix-xv.patch ++++++ --- a/cmake/FindXext.cmake +++ b/cmake/FindXext.cmake @@ -0,0 +1,48 @@ +############################################################################ +# FindXext.txt +# Copyright (C) 2014 Belledonne Communications, Grenoble France +# +############################################################################ +# +# 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +############################################################################ +# +# - Find the Xext include file and library +# +# XEXT_FOUND - system has Xext +# XEXT_INCLUDE_DIRS - the Xext include directory +# XEXT_LIBRARIES - The libraries needed to use Xext + +find_path(XEXT_INCLUDE_DIRS + NAMES X11/extensions/Xext.h + PATH_SUFFIXES include +) +if(XEXT_INCLUDE_DIRS) + set(HAVE_X11_EXTENSIONS_XEXT_H 1) +endif() + +find_library(XEXT_LIBRARIES + NAMES Xext + PATH_SUFFIXES lib +) + +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(XEXT + DEFAULT_MSG + XEXT_INCLUDE_DIRS XEXT_LIBRARIES HAVE_X11_EXTENSIONS_XEXT_H +) + +mark_as_advanced(XEXT_INCLUDE_DIRS XEXT_LIBRARIES HAVE_X11_EXTENSIONS_XEXT_H) --- a/cmake/FindXv.cmake +++ b/cmake/FindXv.cmake @@ -30,6 +30,7 @@ include(CheckIncludeFile) include(CheckSymbolExists) find_package(X11 REQUIRED) +find_package(Xext REQUIRED) set(_XV_ROOT_PATHS ${CMAKE_INSTALL_PREFIX} @@ -55,7 +56,7 @@ if(XV_H_INCLUDE_DIR AND XVLIB_H_INCLUDE_ set(XV_INCLUDE_DIRS ${XV_H_INCLUDE_DIR} ${XVLIB_H_INCLUDE_DIR}) endif() -set(XV_INCLUDE_DIRS ${XV_INCLUDE_DIRS} ${X11_INCLUDE_DIRS}) +set(XV_INCLUDE_DIRS ${XV_INCLUDE_DIRS} ${XEXT_INCLUDE_DIRS} ${X11_INCLUDE_DIRS}) list(REMOVE_DUPLICATES XV_INCLUDE_DIRS) find_library(XV_LIBRARIES @@ -72,7 +73,7 @@ if(XV_LIBRARIES) cmake_pop_check_state() endif() -set(XV_LIBRARIES ${XV_LIBRARIES} ${X11_LIBRARIES}) +set(XV_LIBRARIES ${XV_LIBRARIES} ${XEXT_LIBRARIES} ${X11_LIBRARIES}) list(REMOVE_DUPLICATES XV_LIBRARIES) include(FindPackageHandleStandardArgs)