Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package rem for openSUSE:Factory checked in
at 2022-12-12 17:39:25
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rem (Old)
and /work/SRC/openSUSE:Factory/.rem.new.1835 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rem"
Mon Dec 12 17:39:25 2022 rev:5 rq:1042209 version:2.8.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/rem/rem.changes 2022-09-07 11:06:07.228419313
+0200
+++ /work/SRC/openSUSE:Factory/.rem.new.1835/rem.changes 2022-12-12
17:41:30.693729537 +0100
@@ -1,0 +2,8 @@
+Sat Oct 1 08:56:45 UTC 2022 - Martin Hauke <mar...@gmx.de>
+
+- Update to release 2.8.0
+ * No high level changelog provided, see packaged CHANGELOG.md for
+ details.
+- Use CMake for the build
+
+-------------------------------------------------------------------
Old:
----
rem-2.6.0.tar.gz
New:
----
rem-2.8.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rem.spec ++++++
--- /var/tmp/diff_new_pack.1dw3dU/_old 2022-12-12 17:41:31.129731989 +0100
+++ /var/tmp/diff_new_pack.1dw3dU/_new 2022-12-12 17:41:31.137732034 +0100
@@ -19,15 +19,18 @@
%global sover 3
%global libname lib%{name}%{sover}
Name: rem
-Version: 2.6.0
+Version: 2.8.0
Release: 0
Summary: Audio and Video processing media library
License: BSD-3-Clause
Group: Development/Libraries/C and C++
URL: https://github.com/baresip/rem
Source: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
+BuildRequires: cmake
+BuildRequires: openssl-devel
BuildRequires: pkgconfig
BuildRequires: pkgconfig(libre) >= 2.4.0
+BuildRequires: pkgconfig(zlib)
%description
Librem is a generic library for real-time audio
@@ -66,24 +69,21 @@
applications that want to make use of librem.
%prep
-%autosetup -p1
-sed -e 's|@$(CC)|$(CC)|g' \
- -e 's|@$(LD)|$(LD)|g' \
- -e 's|@$(AR)|$(AR)|g' \
- -e 's|@rm -rf|rm -rf|g' -i Makefile
+%setup -q
%build
-CFLAGS="%optflags" %make_build RELEASE=1
+%cmake
+%cmake_build
%install
-%make_install LIBDIR=%{_libdir}
-rm %{buildroot}/%{_libdir}/librem.a
+%cmake_install
+rm -v %{buildroot}/%{_libdir}/librem.a
%post -n %{libname} -p /sbin/ldconfig
%postun -n %{libname} -p /sbin/ldconfig
%files -n %{libname}
-%license docs/COPYING
+%license LICENSE
%doc CHANGELOG.md README.md
%{_libdir}/librem.so.%{sover}*
++++++ rem-2.6.0.tar.gz -> rem-2.8.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rem-2.6.0/.github/workflows/build.yml
new/rem-2.8.0/.github/workflows/build.yml
--- old/rem-2.6.0/.github/workflows/build.yml 2022-07-29 16:23:47.000000000
+0200
+++ new/rem-2.8.0/.github/workflows/build.yml 2022-10-01 10:24:59.000000000
+0200
@@ -9,7 +9,7 @@
strategy:
matrix:
compiler: [gcc, clang]
- os: [ubuntu-18.04, ubuntu-20.04, macos-latest]
+ os: [ubuntu-20.04, macos-latest]
exclude:
- os: macos-latest
compiler: gcc
@@ -42,5 +42,5 @@
run: |
cd ..
make -C re libre.a
- make -C rem EXTRA_CFLAGS=-Werror CCACHE= librem.a
- cd retest && make STATIC=1 LIBRE_SO=../re && ./retest -r
+ cmake -S rem -B rem/build && cmake --build rem/build
+ cd retest && cmake . && make && ./retest -r
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rem-2.6.0/CHANGELOG.md new/rem-2.8.0/CHANGELOG.md
--- old/rem-2.6.0/CHANGELOG.md 2022-07-29 16:23:47.000000000 +0200
+++ new/rem-2.8.0/CHANGELOG.md 2022-10-01 10:24:59.000000000 +0200
@@ -5,13 +5,48 @@
The format is based on [Keep a
Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic
Versioning](https://semver.org/spec/v2.0.0.html).
-## [Unreleased]
+
+## [v2.8.0] - 2022-10-01
+
+* cmake: bump min. version 3.10 by @sreimers in
https://github.com/baresip/rem/pull/79
+* auframe: auframe\_bytes\_to\_timestamp use uint64\_t by @cspiel1 in
https://github.com/baresip/rem/pull/80
+* ci: migrate from make to CMake by @alfredh in
https://github.com/baresip/rem/pull/81
+* cmake: install improvements by @sreimers in
https://github.com/baresip/rem/pull/83
+* cmake: add static and shared targets by @sreimers in
https://github.com/baresip/rem/pull/84
+* cmake: add win32 linklibs by @sreimers in
https://github.com/baresip/rem/pull/85
+* debian: use dh-cmake by @sreimers in https://github.com/baresip/rem/pull/86
+* vid/frame: fix possbile overflow multiplication by @sreimers in
https://github.com/baresip/rem/pull/87
+* cmake: add pkgconfig (fixes #90) by @robert-scheck in
https://github.com/baresip/rem/pull/91
+* cmake: fix shared API soversion (aligned with make) by @robert-scheck in
https://github.com/baresip/rem/pull/89
+
+**Full Changelog**: https://github.com/baresip/rem/compare/v2.7.0...v2.8.0
+
+---
+
+## [v2.7.0] - 2022-09-01
+
+* cmake: add FindRE and use re-config.cmake for definitions by @sreimers in
https://github.com/baresip/rem/pull/76
+* Fixed prefix in Debian librem.pc by @juha-h in
https://github.com/baresip/rem/pull/77
+
+**Full Changelog**: https://github.com/baresip/rem/compare/v2.6.0...v2.7.0
+
+---
+
+## [v2.6.0] - 2022-08-01
+
+* Make possible to use CMake --target install for library installation by
@widgetii in https://github.com/baresip/rem/pull/68
+* thread: thrd_error fixes by @sreimers in
https://github.com/baresip/rem/pull/71
+* ci/misc: bump pr-dependency-action@v0.5 by @sreimers in
https://github.com/baresip/rem/pull/72
+* aubuf: the ajb mode should respect wish size by @cspiel1 in
https://github.com/baresip/rem/pull/73
+* make aubuf usage simpler by @cspiel1 in
https://github.com/baresip/rem/pull/74
+* aubuf: prevent faulty timestamps by @cspiel1 in
https://github.com/baresip/rem/pull/75
+
+**Full Changelog**: https://github.com/baresip/rem/compare/v2.5.0...v2.6.0
---
## [v2.5.0] - 2022-07-01
-## What's Changed
* ci/build: fix macOS openssl path by @sreimers in
https://github.com/baresip/rem/pull/59
* vidmix: use C11 mutex by @alfredh in https://github.com/baresip/rem/pull/58
* aubuf: fix possible data race warning by @cspiel1 in
https://github.com/baresip/rem/pull/61
@@ -24,7 +59,6 @@
## [v2.4.0] - 2022-06-01
-### What's Changed
* aubuf overruns on startup by @cspiel1 in
https://github.com/baresip/rem/pull/44
* h265: move from rem to re by @alfredh in
https://github.com/baresip/rem/pull/45
* aubuf: do not drop frames if max size was not set by @cspiel1 in
https://github.com/baresip/rem/pull/47
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rem-2.6.0/CMakeLists.txt new/rem-2.8.0/CMakeLists.txt
--- old/rem-2.6.0/CMakeLists.txt 2022-07-29 16:23:47.000000000 +0200
+++ new/rem-2.8.0/CMakeLists.txt 2022-10-01 10:24:59.000000000 +0200
@@ -9,18 +9,28 @@
# Versioning
#
-cmake_minimum_required(VERSION 3.7)
+cmake_minimum_required(VERSION 3.10)
-project(rem VERSION 2.6.0 LANGUAGES C)
+project(rem
+ VERSION 2.8.0
+ LANGUAGES C
+ HOMEPAGE_URL https://github.com/baresip/rem
+ DESCRIPTION "Audio and video processing media library"
+)
set(PROJECT_SOVERSION 3) # bump if ABI breaks
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/cmake)
+
##############################################################################
#
# Module Includes
#
+include(GNUInstallDirs)
include(CheckIncludeFile)
+find_package(RE REQUIRED)
+
##############################################################################
#
# Compile options
@@ -28,38 +38,34 @@
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
set(CMAKE_C_STANDARD 11)
+set(CMAKE_C_EXTENSIONS OFF)
-if(NOT MSVC)
+if(MSVC)
+ add_compile_options("/W3")
+else()
add_compile_options(
- -Waggregate-return
+ -pedantic
-Wall
-Wbad-function-cast
-Wcast-align
- -Wdeclaration-after-statement
-Wextra
-Wmissing-declarations
-Wmissing-prototypes
-Wnested-externs
+ -Wno-strict-aliasing
-Wold-style-definition
- -Wshadow
+ -Wshadow -Waggregate-return
-Wstrict-prototypes
+ -Wuninitialized
-Wvla
)
endif()
-check_include_file(unistd.h HAVE_UNISTD_H)
-if(HAVE_UNISTD_H)
- add_definitions(-DHAVE_UNISTD_H)
+if(CMAKE_C_COMPILER_ID MATCHES "Clang")
+ add_compile_options(-Wshorten-64-to-32 -Watomic-implicit-seq-cst)
endif()
-include_directories(
- include
- ../re/include
- /usr/local/include
- /usr/local/include/re
-)
-link_directories(/usr/local/lib)
-add_definitions(-DVERSION="${PROJECT_VERSION}")
+find_package(re CONFIG REQUIRED HINTS ../re/cmake)
set(SRCS
src/aac/aac.c
@@ -113,19 +119,104 @@
include/rem_vidmix.h
)
-add_library(${PROJECT_NAME}
- ${SRCS}
- ${HEADERS}
-)
+##############################################################################
+#
+# Linking LIBS
+#
+
+set(LINKLIBS ${RE_LIBRARIES} Threads::Threads)
+
+if(WIN32)
+ list(APPEND LINKLIBS qwave iphlpapi wsock32 ws2_32)
+else()
+ list(APPEND LINKLIBS -lm)
+endif()
+
##############################################################################
#
# Main target object
#
-target_link_libraries(${PROJECT_NAME} re -lpthread -lm)
-set_target_properties(${PROJECT_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON)
-set_target_properties(${PROJECT_NAME} PROPERTIES SOVERSION
${PROJECT_SOVERSION})
+add_library(rem-objs OBJECT ${SRCS} ${HEADERS})
+
+set_target_properties(rem-objs PROPERTIES POSITION_INDEPENDENT_CODE ON)
+
+target_compile_definitions(rem-objs PRIVATE ${RE_DEFINITIONS})
+
+target_link_libraries(rem-objs ${LINKLIBS})
+target_include_directories(rem-objs
+ PUBLIC include
+ PRIVATE ${RE_INCLUDE_DIRS} ${OPENSSL_INCLUDE_DIR}
+)
+
+
+##############################################################################
+#
+# Shared target librem.[so|dll|dylib]
+#
+
+add_library(rem-shared SHARED $<TARGET_OBJECTS:rem-objs>)
+target_link_libraries(rem-shared PRIVATE ${LINKLIBS})
+set_target_properties(rem-shared PROPERTIES VERSION
+ ${PROJECT_SOVERSION}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH})
+set_target_properties(rem-shared PROPERTIES SOVERSION ${PROJECT_SOVERSION})
+set_target_properties(rem-shared PROPERTIES OUTPUT_NAME "rem")
+
+
+##############################################################################
+#
+# Static target librem.a
+#
+add_library(rem STATIC $<TARGET_OBJECTS:rem-objs>)
+target_link_libraries(rem PUBLIC ${LINKLIBS})
+target_include_directories(rem PUBLIC include)
set_target_properties(rem PROPERTIES PUBLIC_HEADER "${HEADERS}")
-install(TARGETS rem LIBRARY)
+
+if(MSVC)
+set_target_properties(rem PROPERTIES OUTPUT_NAME "rem-static")
+endif()
+
+
+##############################################################################
+#
+# Packaging section
+#
+
+if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
+ add_subdirectory(packaging)
+endif()
+
+configure_file(packaging/librem.pc.in librem.pc @ONLY)
+
+
+##############################################################################
+#
+# Install section
+#
+
+install(TARGETS rem-shared rem
+ LIBRARY
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ COMPONENT Libraries
+ NAMELINK_SKIP
+ ARCHIVE
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ COMPONENT Development
+ PUBLIC_HEADER
+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/rem
+ COMPONENT Development
+)
+
+install(TARGETS rem-shared
+ LIBRARY
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ NAMELINK_ONLY
+ COMPONENT Development
+)
+
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/librem.pc
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
+ COMPONENT Development
+)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rem-2.6.0/LICENSE new/rem-2.8.0/LICENSE
--- old/rem-2.6.0/LICENSE 1970-01-01 01:00:00.000000000 +0100
+++ new/rem-2.8.0/LICENSE 2022-10-01 10:24:59.000000000 +0200
@@ -0,0 +1,32 @@
+Copyright (C) 2020 - 2022, Baresip Foundation (https://github.com/baresip)
+Copyright (c) 2010 - 2022, Alfred E. Heggestad
+Copyright (c) 2010 - 2020, Richard Aas
+Copyright (c) 2010 - 2020, Creytiv.com
+All rights reserved.
+
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors
+ may be used to endorse or promote products derived from this software
+ without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rem-2.6.0/Makefile new/rem-2.8.0/Makefile
--- old/rem-2.6.0/Makefile 2022-07-29 16:23:47.000000000 +0200
+++ new/rem-2.8.0/Makefile 2022-10-01 10:24:59.000000000 +0200
@@ -6,7 +6,7 @@
# Main version number
VER_MAJOR := 2
-VER_MINOR := 6
+VER_MINOR := 8
VER_PATCH := 0
# Development version, comment out on a release
@@ -26,7 +26,7 @@
VERSION := $(VER_MAJOR).$(VER_MINOR).$(VER_PATCH)-$(VER_PRE)
endif
OPT_SPEED := 1
-LIBRE_MIN := 2.6.0
+LIBRE_MIN := 2.8.0
ifndef LIBRE_MK
LIBRE_MK := $(shell [ -f ../re/mk/re.mk ] && \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rem-2.6.0/README.md new/rem-2.8.0/README.md
--- old/rem-2.6.0/README.md 2022-07-29 16:23:47.000000000 +0200
+++ new/rem-2.8.0/README.md 2022-10-01 10:24:59.000000000 +0200
@@ -5,7 +5,7 @@
librem is a Audio and video processing media library
- Copyright (C) 2010 - 2019 Creytiv.com
-- Copyright (C) 2020 - 2021 Baresip Foundation (https://github.com/baresip)
+- Copyright (C) 2020 - 2022 Baresip Foundation (https://github.com/baresip)
[](https://github.com/baresip/rem/actions/workflows/build.yml)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rem-2.6.0/cmake/FindRE.cmake
new/rem-2.8.0/cmake/FindRE.cmake
--- old/rem-2.6.0/cmake/FindRE.cmake 1970-01-01 01:00:00.000000000 +0100
+++ new/rem-2.8.0/cmake/FindRE.cmake 2022-10-01 10:24:59.000000000 +0200
@@ -0,0 +1,17 @@
+find_package(PkgConfig QUIET)
+pkg_check_modules(PC_LIBRE QUIET libre)
+
+find_path(RE_INCLUDE_DIR re.h
+ HINTS ../re/include ${PC_LIBRE_INCLUDEDIR} ${PC_LIBRE_INCLUDE_DIRS})
+
+find_library(RE_LIBRARY NAMES re libre re-static
+ HINTS ../re ../re/build ../re/build/Debug
+ ${PC_LIBRE_LIBDIR} ${PC_LIBRE_LIBRARY_DIRS})
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(RE DEFAULT_MSG RE_LIBRARY RE_INCLUDE_DIR)
+
+mark_as_advanced(RE_INCLUDE_DIR RE_LIBRARY)
+
+set(RE_INCLUDE_DIRS ${RE_INCLUDE_DIR})
+set(RE_LIBRARIES ${RE_LIBRARY})
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rem-2.6.0/debian/changelog
new/rem-2.8.0/debian/changelog
--- old/rem-2.6.0/debian/changelog 2022-07-29 16:23:47.000000000 +0200
+++ new/rem-2.8.0/debian/changelog 2022-10-01 10:24:59.000000000 +0200
@@ -1,3 +1,15 @@
+librem (2.8.0) unstable; urgency=medium
+
+ * version 2.8.0
+
+ -- Christian Spielberger <c.spielber...@commend.com> Sat, 1 Oct 2022
08:00:00 +0200
+
+librem (2.7.0) unstable; urgency=medium
+
+ * version 2.7.0
+
+ -- Sebastian Reimers <sebastian.reim...@gmail.com> Thu, 1 Sep 2022 08:00:00
+0200
+
librem (2.5.0) unstable; urgency=medium
* version 2.5.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rem-2.6.0/debian/compat new/rem-2.8.0/debian/compat
--- old/rem-2.6.0/debian/compat 2022-07-29 16:23:47.000000000 +0200
+++ new/rem-2.8.0/debian/compat 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-10
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rem-2.6.0/debian/control new/rem-2.8.0/debian/control
--- old/rem-2.6.0/debian/control 2022-07-29 16:23:47.000000000 +0200
+++ new/rem-2.8.0/debian/control 2022-10-01 10:24:59.000000000 +0200
@@ -2,14 +2,14 @@
Section: comm
Priority: optional
Maintainer: Alfred E. Heggestad <a...@db.org>
-Standards-Version: 3.9.5
-Build-Depends: debhelper (>= 9.20120311), libre-dev (>= 1.1.0)
-Homepage: http://www.creytiv.com/
+Standards-Version: 4.1.5
+Build-Depends: cmake, dh-cmake, dh-cmake-compat (= 1), dh-sequence-cmake,
debhelper-compat (= 12)
+Homepage: https://github.com/baresip/rem
Package: librem
Architecture: any
Section: libs
-Depends: libre (>= 1.1.0), ${shlibs:Depends}, ${misc:Depends}
+Depends: libre (>= 2.7.0), ${shlibs:Depends}, ${misc:Depends}
Description: Audio and video processing media library
Audio mixer, resampler, tone generator, G.711 codec
Video mixer, pixel converter
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rem-2.6.0/debian/copyright
new/rem-2.8.0/debian/copyright
--- old/rem-2.6.0/debian/copyright 2022-07-29 16:23:47.000000000 +0200
+++ new/rem-2.8.0/debian/copyright 2022-10-01 10:24:59.000000000 +0200
@@ -1,11 +1,7 @@
-This package was debianized by Alfred E. Heggestad <a...@db.org>
-
-It was downloaded from http://www.creytiv.com/
-
-
-Copyright (c) 2010 - 2014, Alfred E. Heggestad
-Copyright (c) 2010 - 2014, Richard Aas
-Copyright (c) 2010 - 2014, Creytiv.com
+Copyright (C) 2020 - 2022, Baresip Foundation (https://github.com/baresip)
+Copyright (c) 2010 - 2022, Alfred E. Heggestad
+Copyright (c) 2010 - 2020, Richard Aas
+Copyright (c) 2010 - 2020, Creytiv.com
All rights reserved.
@@ -20,18 +16,17 @@
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
-3. Neither the name of the Creytiv.com nor the names of its contributors
+3. Neither the name of the copyright holder nor the names of its contributors
may be used to endorse or promote products derived from this software
without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rem-2.6.0/debian/librem-dev.cmake-components
new/rem-2.8.0/debian/librem-dev.cmake-components
--- old/rem-2.6.0/debian/librem-dev.cmake-components 1970-01-01
01:00:00.000000000 +0100
+++ new/rem-2.8.0/debian/librem-dev.cmake-components 2022-10-01
10:24:59.000000000 +0200
@@ -0,0 +1 @@
+Development
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rem-2.6.0/debian/librem-dev.dirs
new/rem-2.8.0/debian/librem-dev.dirs
--- old/rem-2.6.0/debian/librem-dev.dirs 2022-07-29 16:23:47.000000000
+0200
+++ new/rem-2.8.0/debian/librem-dev.dirs 1970-01-01 01:00:00.000000000
+0100
@@ -1,2 +0,0 @@
-usr/include
-usr/lib
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rem-2.6.0/debian/librem-dev.files
new/rem-2.8.0/debian/librem-dev.files
--- old/rem-2.6.0/debian/librem-dev.files 2022-07-29 16:23:47.000000000
+0200
+++ new/rem-2.8.0/debian/librem-dev.files 1970-01-01 01:00:00.000000000
+0100
@@ -1,3 +0,0 @@
-usr/include
-usr/lib/librem.a
-usr/lib/pkgconfig/librem.pc
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rem-2.6.0/debian/librem.cmake-components
new/rem-2.8.0/debian/librem.cmake-components
--- old/rem-2.6.0/debian/librem.cmake-components 1970-01-01
01:00:00.000000000 +0100
+++ new/rem-2.8.0/debian/librem.cmake-components 2022-10-01
10:24:59.000000000 +0200
@@ -0,0 +1 @@
+Libraries
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rem-2.6.0/debian/librem.dirs
new/rem-2.8.0/debian/librem.dirs
--- old/rem-2.6.0/debian/librem.dirs 2022-07-29 16:23:47.000000000 +0200
+++ new/rem-2.8.0/debian/librem.dirs 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-usr/lib
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rem-2.6.0/debian/librem.files
new/rem-2.8.0/debian/librem.files
--- old/rem-2.6.0/debian/librem.files 2022-07-29 16:23:47.000000000 +0200
+++ new/rem-2.8.0/debian/librem.files 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-/usr/lib/librem.so*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rem-2.6.0/debian/rules new/rem-2.8.0/debian/rules
--- old/rem-2.6.0/debian/rules 2022-07-29 16:23:47.000000000 +0200
+++ new/rem-2.8.0/debian/rules 2022-10-01 10:24:59.000000000 +0200
@@ -1,98 +1,7 @@
#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+%:
+ dh $@ --buildsystem=cmake
-
-EXTRA_CFLAGS:="$(shell dpkg-buildflags --get CFLAGS | sed -e 's/-O2//')"
-EXTRA_LFLAGS:="$(shell dpkg-buildflags --get LDFLAGS)"
-
-
-configure: configure-stamp
-configure-stamp:
- dh_testdir
- # Add here commands to configure the package.
-
- touch configure-stamp
-
-
-build: build-stamp
-build-stamp: configure-stamp
- dh_testdir
-
- # Add here commands to compile the package.
- $(MAKE) RELEASE=1 \
- EXTRA_CFLAGS=$(EXTRA_CFLAGS) \
- EXTRA_LFLAGS=$(EXTRA_LFLAGS)
-
- touch $@
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp configure-stamp
-
- # Add here commands to clean up after the build process.
- $(MAKE) clean
-
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_prep
- dh_installdirs
-
- # Add here commands to install the package into debian/tmp
- mkdir $(CURDIR)/debian/tmp
- $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-
- dh_movefiles
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs
- dh_installdocs
- dh_installexamples
-# dh_install
-# dh_installmenu
-# dh_installdebconf
-# dh_installlogrotate
-# dh_installemacsen
-# dh_installpam
-# dh_installmime
-# dh_installinit
-# dh_installcron
-# dh_installinfo
- dh_installman
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
-# dh_perl
-# dh_python
- dh_makeshlibs
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-build-arch: build
-
-build-indep: build
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+override_dh_auto_configure:
+ dh_auto_configure -- -DCMAKE_BUILD_TYPE=Release
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rem-2.6.0/debian/source/format
new/rem-2.8.0/debian/source/format
--- old/rem-2.6.0/debian/source/format 2022-07-29 16:23:47.000000000 +0200
+++ new/rem-2.8.0/debian/source/format 2022-10-01 10:24:59.000000000 +0200
@@ -1 +1 @@
-1.0
+3.0 (native)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rem-2.6.0/docs/COPYING new/rem-2.8.0/docs/COPYING
--- old/rem-2.6.0/docs/COPYING 2022-07-29 16:23:47.000000000 +0200
+++ new/rem-2.8.0/docs/COPYING 1970-01-01 01:00:00.000000000 +0100
@@ -1,32 +0,0 @@
-Copyright (c) 2010 - 2019, Alfred E. Heggestad
-Copyright (c) 2010 - 2019, Richard Aas
-Copyright (c) 2010 - 2019, Creytiv.com
-All rights reserved.
-
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-
-3. Neither the name of the Creytiv.com nor the names of its contributors
- may be used to endorse or promote products derived from this software
- without specific prior written permission.
-
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rem-2.6.0/include/rem_auframe.h
new/rem-2.8.0/include/rem_auframe.h
--- old/rem-2.6.0/include/rem_auframe.h 2022-07-29 16:23:47.000000000 +0200
+++ new/rem-2.8.0/include/rem_auframe.h 2022-10-01 10:24:59.000000000 +0200
@@ -44,4 +44,4 @@
size_t auframe_size(const struct auframe *af);
void auframe_mute(struct auframe *af);
double auframe_level(struct auframe *af);
-size_t auframe_bytes_to_timestamp(const struct auframe *af, size_t n);
+uint64_t auframe_bytes_to_timestamp(const struct auframe *af, size_t n);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rem-2.6.0/packaging/CMakeLists.txt
new/rem-2.8.0/packaging/CMakeLists.txt
--- old/rem-2.6.0/packaging/CMakeLists.txt 1970-01-01 01:00:00.000000000
+0100
+++ new/rem-2.8.0/packaging/CMakeLists.txt 2022-10-01 10:24:59.000000000
+0200
@@ -0,0 +1,12 @@
+set(CPACK_PACKAGE_NAME librem)
+set(CPACK_PACKAGE_VENDOR baresip)
+set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Audio and video processing media
library")
+set(CPACK_PACKAGE_INSTALL_DIRECTORY ${CPACK_PACKAGE_NAME})
+set(CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_VERSION_MAJOR})
+set(CPACK_PACKAGE_VERSION_MINOR ${PROJECT_VERSION_MINOR})
+set(CPACK_PACKAGE_VERSION_PATCH ${PROJECT_VERSION_PATCH})
+set(CPACK_VERBATIM_VARIABLES YES)
+set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE")
+set(CPACK_RESOURCE_FILE_README "${CMAKE_SOURCE_DIR}/README.md")
+
+include(CPack)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rem-2.6.0/packaging/librem.pc.in
new/rem-2.8.0/packaging/librem.pc.in
--- old/rem-2.6.0/packaging/librem.pc.in 1970-01-01 01:00:00.000000000
+0100
+++ new/rem-2.8.0/packaging/librem.pc.in 2022-10-01 10:24:59.000000000
+0200
@@ -0,0 +1,11 @@
+prefix="@CMAKE_INSTALL_PREFIX@"
+exec_prefix=${prefix}
+libdir={$prefix}/lib
+includedir=${prefix}/include/rem
+
+Name: librem
+Description: @CMAKE_PROJECT_DESCRIPTION@
+Version: @PROJECT_VERSION@
+URL: @CMAKE_PROJECT_HOMEPAGE_URL@
+Libs: -L${libdir} -lrem -lre
+Cflags: -I${includedir}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rem-2.6.0/src/auframe/auframe.c
new/rem-2.8.0/src/auframe/auframe.c
--- old/rem-2.6.0/src/auframe/auframe.c 2022-07-29 16:23:47.000000000 +0200
+++ new/rem-2.8.0/src/auframe/auframe.c 2022-10-01 10:24:59.000000000 +0200
@@ -103,9 +103,10 @@
}
-size_t auframe_bytes_to_timestamp(const struct auframe *af, size_t n)
+uint64_t auframe_bytes_to_timestamp(const struct auframe *af, size_t n)
{
size_t sample_size = aufmt_sample_size(af->fmt);
- return n * AUDIO_TIMEBASE / (af->srate * af->ch * sample_size);
+ return ((uint64_t) n) * AUDIO_TIMEBASE /
+ (af->srate * af->ch * sample_size);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rem-2.6.0/src/aumix/aumix.c
new/rem-2.8.0/src/aumix/aumix.c
--- old/rem-2.6.0/src/aumix/aumix.c 2022-07-29 16:23:47.000000000 +0200
+++ new/rem-2.8.0/src/aumix/aumix.c 2022-10-01 10:24:59.000000000 +0200
@@ -223,14 +223,14 @@
mix->srate = srate;
mix->ch = ch;
- err = mtx_init(&mix->mutex, mtx_plain);
- if (err != thrd_success) {
+ err = mtx_init(&mix->mutex, mtx_plain) != thrd_success;
+ if (err) {
err = ENOMEM;
goto out;
}
- err = cnd_init(&mix->cond);
- if (err != thrd_success) {
+ err = cnd_init(&mix->cond) != thrd_success;
+ if (err) {
err = ENOMEM;
goto out;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rem-2.6.0/src/vid/frame.c
new/rem-2.8.0/src/vid/frame.c
--- old/rem-2.6.0/src/vid/frame.c 2022-07-29 16:23:47.000000000 +0200
+++ new/rem-2.8.0/src/vid/frame.c 2022-10-01 10:24:59.000000000 +0200
@@ -24,15 +24,15 @@
switch (fmt) {
- case VID_FMT_YUV420P: return sz->w * sz->h * 3 / 2;
- case VID_FMT_YUYV422: return sz->w * sz->h * 2;
- case VID_FMT_UYVY422: return sz->w * sz->h * 2;
- case VID_FMT_RGB32: return sz->w * sz->h * 4;
- case VID_FMT_ARGB: return sz->w * sz->h * 4;
- case VID_FMT_RGB565: return sz->w * sz->h * 2;
- case VID_FMT_NV12: return sz->w * sz->h * 3 / 2;
- case VID_FMT_NV21: return sz->w * sz->h * 3 / 2;
- case VID_FMT_YUV444P: return sz->w * sz->h * 3;
+ case VID_FMT_YUV420P: return (size_t)sz->w * sz->h * 3 / 2;
+ case VID_FMT_YUYV422: return (size_t)sz->w * sz->h * 2;
+ case VID_FMT_UYVY422: return (size_t)sz->w * sz->h * 2;
+ case VID_FMT_RGB32: return (size_t)sz->w * sz->h * 4;
+ case VID_FMT_ARGB: return (size_t)sz->w * sz->h * 4;
+ case VID_FMT_RGB565: return (size_t)sz->w * sz->h * 2;
+ case VID_FMT_NV12: return (size_t)sz->w * sz->h * 3 / 2;
+ case VID_FMT_NV21: return (size_t)sz->w * sz->h * 3 / 2;
+ case VID_FMT_YUV444P: return (size_t)sz->w * sz->h * 3;
default:
return 0;
}
@@ -186,7 +186,8 @@
void vidframe_fill(struct vidframe *vf, uint32_t r, uint32_t g, uint32_t b)
{
uint8_t *p;
- unsigned h, i, x;
+ size_t h;
+ unsigned i, x;
int u, v;
if (!vf)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rem-2.6.0/src/vidmix/vidmix.c
new/rem-2.8.0/src/vidmix/vidmix.c
--- old/rem-2.6.0/src/vidmix/vidmix.c 2022-07-29 16:23:47.000000000 +0200
+++ new/rem-2.8.0/src/vidmix/vidmix.c 2022-10-01 10:24:59.000000000 +0200
@@ -334,8 +334,8 @@
if (!mix)
return ENOMEM;
- err = mtx_init(&mix->rwlock, mtx_plain);
- if (err != thrd_success) {
+ err = mtx_init(&mix->rwlock, mtx_plain) != thrd_success;
+ if (err) {
err = ENOMEM;
goto out;
}
@@ -385,8 +385,8 @@
src->fh = fh;
src->arg = arg;
- err = mtx_init(&src->mutex, mtx_plain);
- if (err != thrd_success) {
+ err = mtx_init(&src->mutex, mtx_plain) != thrd_success;
+ if (err) {
err = ENOMEM;
goto out;
}
