diff --git a/baselibs.conf b/baselibs.conf index a6f31d9..bd93661 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,2 +1,2 @@ -libwebrtc_audio_processing1-3 -libwebrtc_audio_coding1-3 +libwebrtc-audio-processing-1-3 +libwebrtc-audio-coding-1-3 diff --git a/reduce-meson-dep.patch b/reduce-meson-dep.patch new file mode 100644 index 0000000..b190dff --- /dev/null +++ b/reduce-meson-dep.patch @@ -0,0 +1,12 @@ +Index: webrtc-audio-processing-1.3/meson.build +=================================================================== +--- webrtc-audio-processing-1.3.orig/meson.build ++++ webrtc-audio-processing-1.3/meson.build +@@ -1,6 +1,6 @@ + project('webrtc-audio-processing', 'c', 'cpp', + version : '1.3', +- meson_version : '>= 0.63', ++ meson_version : '>= 0.59.4', + default_options : [ 'warning_level=1', + 'buildtype=debugoptimized', + 'c_std=c11', diff --git a/webrtc-audio-processing.changes b/webrtc-audio-processing.changes index 201908d..7a84916 100644 --- a/webrtc-audio-processing.changes +++ b/webrtc-audio-processing.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Wed Sep 20 09:04:13 UTC 2023 - Antonio Larrosa + +- Rename the generated library package names to add a dash between + the name and soname (libwebrtc*-1-3 instead of libwebrtc*1-3) +- Rename the generated packages to use dashes instead of underscores +- Change baselibs.conf accordingly +- Add patch to reduce the required meson version so the package + builds in Leap 15.4/15.5: + * reduce-meson-dep.patch + ------------------------------------------------------------------- Fri Sep 08 10:40:12 UTC 2023 - alarrosa@suse.com diff --git a/webrtc-audio-processing.spec b/webrtc-audio-processing.spec index 11f81f6..9d43499 100644 --- a/webrtc-audio-processing.spec +++ b/webrtc-audio-processing.spec @@ -40,12 +40,14 @@ Patch3: fix-i586.patch # PATCH-FIX-OPENSUSE webrtc-(ppc64|s390x|aarch64).patch Patch100: webrtc-ppc64.patch Patch101: webrtc-s390x.patch +# PATCH-FIX-OPENSUSE reduce-meson-dep.patch +Patch102: reduce-meson-dep.patch BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: glibc-devel BuildRequires: libtool BuildRequires: make -BuildRequires: meson >= 0.63 +BuildRequires: meson >= 0.59.4 BuildRequires: pkgconfig BuildRequires: xz BuildRequires: cmake(absl) @@ -57,70 +59,70 @@ components have been optimized to best serve this purpose. WebRTC implements the W3C's proposal for video conferencing on the web. -%package -n libwebrtc_audio_processing%{pkg_soname} +%package -n libwebrtc-audio-processing-%{pkg_soname} Summary: Real-Time Communication Library for Web Browsers Group: System/Libraries -%description -n libwebrtc_audio_processing%{pkg_soname} +%description -n libwebrtc-audio-processing-%{pkg_soname} WebRTC is an open source project that enables web browsers with Real-Time Communications (RTC) capabilities via simple Javascript APIs. The WebRTC components have been optimized to best serve this purpose. WebRTC implements the W3C's proposal for video conferencing on the web. -%package -n libwebrtc_audio_processing-devel +%package -n libwebrtc-audio-processing-devel Summary: Real-Time Communication Library for Web Browsers Group: Development/Libraries/C and C++ Requires: libwebrtc_audio_processing%{pkg_soname} = %{version} -%description -n libwebrtc_audio_processing-devel +%description -n libwebrtc-audio-processing-devel WebRTC is an open source project that enables web browsers with Real-Time Communications (RTC) capabilities via simple Javascript APIs. The WebRTC components have been optimized to best serve this purpose. WebRTC implements the W3C's proposal for video conferencing on the web. -%package -n libwebrtc_audio_processing-devel-static +%package -n libwebrtc-audio-processing-devel-static Summary: Real-Time Communication Library for Web Browsers Group: Development/Libraries/C and C++ Requires: libwebrtc_audio_processing-devel = %{version} -%description -n libwebrtc_audio_processing-devel-static +%description -n libwebrtc-audio-processing-devel-static WebRTC is an open source project that enables web browsers with Real-Time Communications (RTC) capabilities via simple Javascript APIs. The WebRTC components have been optimized to best serve this purpose. WebRTC implements the W3C's proposal for video conferencing on the web. -%package -n libwebrtc_audio_coding%{pkg_soname} +%package -n libwebrtc-audio-coding-%{pkg_soname} Summary: Real-Time Communication Library for Web Browsers Group: System/Libraries -%description -n libwebrtc_audio_coding%{pkg_soname} +%description -n libwebrtc-audio-coding-%{pkg_soname} WebRTC is an open source project that enables web browsers with Real-Time Communications (RTC) capabilities via simple Javascript APIs. The WebRTC components have been optimized to best serve this purpose. WebRTC implements the W3C's proposal for video conferencing on the web. -%package -n libwebrtc_audio_coding-devel +%package -n libwebrtc-audio-coding-devel Summary: Real-Time Communication Library for Web Browsers Group: Development/Libraries/C and C++ Requires: libwebrtc_audio_coding%{pkg_soname} = %{version} -%description -n libwebrtc_audio_coding-devel +%description -n libwebrtc-audio-coding-devel WebRTC is an open source project that enables web browsers with Real-Time Communications (RTC) capabilities via simple Javascript APIs. The WebRTC components have been optimized to best serve this purpose. WebRTC implements the W3C's proposal for video conferencing on the web. -%package -n libwebrtc_audio_coding-devel-static +%package -n libwebrtc-audio-coding-devel-static Summary: Real-Time Communication Library for Web Browsers Group: Development/Libraries/C and C++ Requires: libwebrtc_audio_coding-devel = %{version} -%description -n libwebrtc_audio_coding-devel-static +%description -n libwebrtc-audio-coding-devel-static WebRTC is an open source project that enables web browsers with Real-Time Communications (RTC) capabilities via simple Javascript APIs. The WebRTC components have been optimized to best serve this purpose. @@ -136,11 +138,12 @@ sed -i 's/\r$//' AUTHORS %patch3 -p1 %patch100 -p1 %patch101 -p1 +%patch102 -p1 %build %global _lto_cflags %{_lto_cflags} -ffat-lto-objects %meson \ - -Dc_std=gnu17 \ + -Dc_std=gnu11 \ -Dcpp_std=gnu++17 \ -Ddefault_library=both \ -Dc_args="${CFLAGS} ${LDFLAGS}" \ @@ -153,34 +156,34 @@ sed -i 's/\r$//' AUTHORS find %{buildroot} -type f -name "*.la" -delete -print -%post -n libwebrtc_audio_processing%{pkg_soname} -p /sbin/ldconfig -%postun -n libwebrtc_audio_processing%{pkg_soname} -p /sbin/ldconfig -%post -n libwebrtc_audio_coding%{pkg_soname} -p /sbin/ldconfig -%postun -n libwebrtc_audio_coding%{pkg_soname} -p /sbin/ldconfig +%post -n libwebrtc-audio-processing-%{pkg_soname} -p /sbin/ldconfig +%postun -n libwebrtc-audio-processing-%{pkg_soname} -p /sbin/ldconfig +%post -n libwebrtc-audio-coding-%{pkg_soname} -p /sbin/ldconfig +%postun -n libwebrtc-audio-coding-%{pkg_soname} -p /sbin/ldconfig -%files -n libwebrtc_audio_processing%{pkg_soname} +%files -n libwebrtc-audio-processing-%{pkg_soname} %license COPYING %doc AUTHORS NEWS README.md UPDATING.md %{_libdir}/libwebrtc-audio-processing-1.so.%{soname}* -%files -n libwebrtc_audio_processing-devel +%files -n libwebrtc-audio-processing-devel %{_includedir}/webrtc-audio-processing-1 %{_libdir}/libwebrtc-audio-processing-1.so %{_libdir}/pkgconfig/webrtc-audio-processing-1.pc -%files -n libwebrtc_audio_processing-devel-static +%files -n libwebrtc-audio-processing-devel-static %{_libdir}/libwebrtc-audio-processing-1.a -%files -n libwebrtc_audio_coding%{pkg_soname} +%files -n libwebrtc-audio-coding-%{pkg_soname} %license COPYING %doc AUTHORS NEWS README.md UPDATING.md %{_libdir}/libwebrtc-audio-coding-1.so.%{soname}* -%files -n libwebrtc_audio_coding-devel +%files -n libwebrtc-audio-coding-devel %{_libdir}/libwebrtc-audio-coding-1.so %{_libdir}/pkgconfig/webrtc-audio-coding-1.pc -%files -n libwebrtc_audio_coding-devel-static +%files -n libwebrtc-audio-coding-devel-static %{_libdir}/libwebrtc-audio-coding-1.a %changelog