Update to latest SV8 version (#1014468)

This commit is contained in:
Yaakov Selkowitz 2023-03-12 14:51:17 -04:00
parent 029c7211ca
commit 8ada6dac0b
4 changed files with 69 additions and 23 deletions

1
.gitignore vendored
View File

@ -1,2 +1,3 @@
libmpcdec-1.2.2.tar.bz2 libmpcdec-1.2.2.tar.bz2
libmpcdec-1.2.6.tar.bz2 libmpcdec-1.2.6.tar.bz2
/musepack_src_r475.tar.gz

View File

@ -1,17 +1,22 @@
%global svn_release 475
# code does not compile with -fno-common
%global _legacy_common_support 1
Summary: Musepack audio decoding library Summary: Musepack audio decoding library
Name: libmpcdec Name: libmpcdec
Version: 1.2.6 Version: 1.3.0
Release: 31%{?dist} Release: 0.1.20110810svn%{svn_release}%{?dist}
License: BSD License: BSD
URL: http://www.musepack.net/ URL: https://www.musepack.net/
Source0: http://files.musepack.net/source/libmpcdec-%{version}.tar.bz2 Source0: https://files.musepack.net/source/musepack_src_r%{svn_release}.tar.gz
Patch0: r475-cmake.patch
BuildRequires: gcc-c++
BuildRequires: gcc BuildRequires: gcc
BuildRequires: sed BuildRequires: sed
BuildRequires: make BuildRequires: cmake
BuildRequires: libcuefile-devel
BuildRequires: libreplaygain-devel
%description %description
Musepack is an audio compression format with a strong emphasis on high quality. Musepack is an audio compression format with a strong emphasis on high quality.
@ -28,40 +33,49 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%description devel %description devel
%{summary}. %{summary}.
%package -n musepack-tools
Summary: Musepack audio decoding and encoding tools
Requires: %{name}%{?_isa} = %{version}-%{release}
%description -n musepack-tools
%{summary}.
%prep %prep
%setup -q %autosetup -p1 -n musepack_src_r%{svn_release}
#hack out hard-coded undesirable compiler flags # Correct permissions and end of line
sed -i.cflags -e 's|-O3 -fomit-frame-pointer||g' configure find -type f -exec chmod 0644 '{}' +
sed -ibackup 's/\r$//' libwavformat/*
%build %build
%configure --disable-static %cmake -Wno-dev .
%cmake_build
%make_build
%install %install
%make_install %cmake_install
#Unpackaged files
rm -fv $RPM_BUILD_ROOT%{_libdir}/lib*.la
%ldconfig_scriptlets
%files %files
%doc AUTHORS ChangeLog README %doc libmpcdec/AUTHORS libmpcdec/ChangeLog libmpcdec/README
%license COPYING %license libmpcdec/COPYING
%{_libdir}/libmpcdec.so.5* %{_libdir}/libmpcdec.so.6{,.*}
%files devel %files devel
%{_includedir}/mpcdec/ %{_includedir}/mpc/
%{_libdir}/libmpcdec.so %{_libdir}/libmpcdec.so
%files -n musepack-tools
%license libmpcdec/COPYING
%{_bindir}/mpc*
%{_bindir}/wavcmp
%changelog %changelog
* Tue Feb 07 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 1.3.0-0.1.20110810svn475
- Update to latest SV8 version (#1014468)
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.6-31 * Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.6-31
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild

31
r475-cmake.patch Normal file
View File

@ -0,0 +1,31 @@
diff -ur musepack_src_r475.orig/CMakeLists.txt musepack_src_r475/CMakeLists.txt
--- musepack_src_r475.orig/CMakeLists.txt 2010-07-13 07:15:24.000000000 -0400
+++ musepack_src_r475/CMakeLists.txt 2023-02-07 11:02:43.230330382 -0500
@@ -15,9 +15,6 @@
add_definitions(-DFAST_MATH -DCVD_FASTLOG)
-if(NOT MSVC)
- set(CMAKE_C_FLAGS "-O3 -Wall -fomit-frame-pointer -pipe")
-endif(NOT MSVC)
add_subdirectory(libmpcdec)
add_subdirectory(libmpcpsy)
diff -ur musepack_src_r475.orig/include/CMakeLists.txt musepack_src_r475/include/CMakeLists.txt
--- musepack_src_r475.orig/include/CMakeLists.txt 2009-08-03 05:44:13.000000000 -0400
+++ musepack_src_r475/include/CMakeLists.txt 2023-02-07 11:02:59.430391038 -0500
@@ -1 +1 @@
-INSTALL(DIRECTORY mpc DESTINATION include)
+INSTALL(DIRECTORY mpc DESTINATION include PATTERN ".svn" EXCLUDE)
diff -ur musepack_src_r475.orig/libmpcdec/CMakeLists.txt musepack_src_r475/libmpcdec/CMakeLists.txt
--- musepack_src_r475.orig/libmpcdec/CMakeLists.txt 2010-08-21 11:55:01.000000000 -0400
+++ musepack_src_r475/libmpcdec/CMakeLists.txt 2023-02-07 11:03:43.119554606 -0500
@@ -1,6 +1,8 @@
include_directories(${libmpc_SOURCE_DIR}/include)
if(SHARED)
add_library(mpcdec SHARED huffman mpc_decoder mpc_reader streaminfo mpc_bits_reader mpc_demux requant synth_filter ${libmpc_SOURCE_DIR}/common/crc32)
+ set_target_properties(mpcdec PROPERTIES SOVERSION 6 VERSION 6.0.0)
+ install(TARGETS mpcdec DESTINATION "lib${LIB_SUFFIX}")
else(SHARED)
add_library(mpcdec_static STATIC huffman mpc_decoder mpc_reader streaminfo mpc_bits_reader mpc_demux requant synth_filter ${libmpc_SOURCE_DIR}/common/crc32)
endif(SHARED)

View File

@ -1 +1 @@
7f7a060e83b4278acf4b77d7a7b9d2c0 libmpcdec-1.2.6.tar.bz2 SHA512 (musepack_src_r475.tar.gz) = 23aa16152b27ba99ff7f4672b8f91562ee9ad829bbe1ee066693eabf69844ee9f8e4b3eebf1bac78e6994119fbb53b034479a1b996576aeecbfba7d797f130b0