diff --git a/baselibs.conf b/baselibs.conf index eff5854..c28f8a5 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1 +1 @@ -libinstpatch-1_0-1 +libinstpatch-1_0-2 diff --git a/libinstpatch-1.1.0.tar.gz b/libinstpatch-1.1.0.tar.gz deleted file mode 100644 index 732fcdb..0000000 --- a/libinstpatch-1.1.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1f74ffe286fd527df788205abe7568575ff42f1b8a50b05ab3ce84111e96fb3f -size 513398 diff --git a/libinstpatch-1.1.3.tar.gz b/libinstpatch-1.1.3.tar.gz new file mode 100644 index 0000000..2f7451a --- /dev/null +++ b/libinstpatch-1.1.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8fcc4e60745539d17f10de1ed0e3d02329509e814c0c672d686d6e972113142b +size 513462 diff --git a/libinstpatch-cmake-fixes.patch b/libinstpatch-cmake-fixes.patch deleted file mode 100644 index ec91494..0000000 --- a/libinstpatch-cmake-fixes.patch +++ /dev/null @@ -1,53 +0,0 @@ -Index: libinstpatch-1.1.0/CMakeLists.txt -=================================================================== ---- libinstpatch-1.1.0.orig/CMakeLists.txt -+++ libinstpatch-1.1.0/CMakeLists.txt -@@ -176,19 +176,19 @@ set (INSTPATCH_INSTALL_TARGET "libinstpa - # pkg-config support - if ( UNIX OR MINGW OR WIN32) - set ( prefix "${CMAKE_INSTALL_PREFIX}" ) -- set ( exec_prefix "\${prefix}" ) -- set ( libdir "\${exec_prefix}/${LIB_INSTALL_DIR}${LIB_SUFFIX}" ) -- set ( includedir "\${prefix}/${INCLUDE_INSTALL_DIR}/${INSTPATCH_INSTALL_TARGET}" ) -+ set ( exec_prefix "${CMAKE_INSTALL_PREFIX}" ) -+ set ( libdir "${LIB_INSTALL_DIR}" ) -+ set ( includedir "${INCLUDE_INSTALL_DIR}/${INSTPATCH_INSTALL_TARGET}" ) - # stamp library name with version current value (for Windows only) - if(MINGW OR WIN32) - set ( lib_output_name ${INSTPATCH_INSTALL_TARGET} ) - else(MINGW OR WIN32) -- set ( lib_output_name instpatch ) -+ set ( lib_output_name instpatch-1.0 ) - endif(MINGW OR WIN32) - configure_file ( libinstpatch-1.0.pc.in - ${CMAKE_BINARY_DIR}/libinstpatch-1.0.pc IMMEDIATE @ONLY ) - install ( FILES ${CMAKE_BINARY_DIR}/libinstpatch-1.0.pc -- DESTINATION ${LIB_INSTALL_DIR}${LIB_SUFFIX}/pkgconfig ) -+ DESTINATION ${LIB_INSTALL_DIR}/pkgconfig ) - endif ( UNIX OR MINGW OR WIN32) - - # Extra targets for Unix build environments -Index: libinstpatch-1.1.0/libinstpatch/CMakeLists.txt -=================================================================== ---- libinstpatch-1.1.0.orig/libinstpatch/CMakeLists.txt -+++ libinstpatch-1.1.0/libinstpatch/CMakeLists.txt -@@ -353,7 +353,7 @@ else( MINGW OR WIN32 ) - set_target_properties ( libinstpatch - PROPERTIES - PREFIX "" -- OUTPUT_NAME "libinstpatch" -+ OUTPUT_NAME "libinstpatch-1.0" - VERSION ${LIB_VERSION_INFO} - SOVERSION ${LIB_VERSION_CURRENT} - ) -@@ -366,8 +366,8 @@ endif ( IPATCH_CPPFLAGS ) - - install ( TARGETS libinstpatch - RUNTIME DESTINATION ${BIN_INSTALL_DIR} -- LIBRARY DESTINATION ${LIB_INSTALL_DIR}${LIB_SUFFIX} -- ARCHIVE DESTINATION ${LIB_INSTALL_DIR}${LIB_SUFFIX} -+ LIBRARY DESTINATION ${LIB_INSTALL_DIR} -+ ARCHIVE DESTINATION ${LIB_INSTALL_DIR} - FRAMEWORK DESTINATION ${FRAMEWORK_INSTALL_DIR} - BUNDLE DESTINATION ${BUNDLE_INSTALL_DIR} - ) diff --git a/libinstpatch.changes b/libinstpatch.changes index 6f283f6..fdcbbfc 100644 --- a/libinstpatch.changes +++ b/libinstpatch.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Thu Feb 20 17:16:57 UTC 2020 - Tom Mbrt + +- Update to version 1.1.3 + * respect user-defined CFLGAS + * fix cross-compiling with MinGW under Linux +- Update to version 1.1.2 + * fix a SWAMI related UI bug + * fix inconsistent licensing in some file headers +- Update to version 1.1.1 + * a bug in the public API was discovered, making another SOVERSION + bump necessary + * library name and pkgconfig filename have been unified + * build on ARM has been fixed +- Remove libinstpatch-cmake-fixes.patch as it was fixed in 1.1.1 +- Add a variable for the soversion + ------------------------------------------------------------------- Fri Jan 10 12:58:20 UTC 2020 - Dominique Leuenberger diff --git a/libinstpatch.spec b/libinstpatch.spec index f910811..a87f5ae 100644 --- a/libinstpatch.spec +++ b/libinstpatch.spec @@ -16,8 +16,10 @@ # +%define sover 2 + Name: libinstpatch -Version: 1.1.0 +Version: 1.1.3 Release: 0 Summary: MIDI instrument patch library License: LGPL-2.1-only @@ -27,8 +29,6 @@ URL: http://www.swamiproject.org/ # sh libinstpatch-snapshot.sh latest Source0: libinstpatch-%{version}.tar.gz Source99: baselibs.conf -# .pc file fixes. Patch sent upstream via their mailing list -Patch0: libinstpatch-cmake-fixes.patch BuildRequires: cmake BuildRequires: pkgconfig BuildRequires: pkgconfig(glib-2.0) @@ -38,11 +38,11 @@ BuildRequires: pkgconfig(sndfile) libInstPatch is a library for processing digital sample based MIDI instrument "patch" files. -%package -n libinstpatch-1_0-1 +%package -n libinstpatch-1_0-%{sover} Summary: Libinstpatch library Group: System/Libraries -%description -n libinstpatch-1_0-1 +%description -n libinstpatch-1_0-%{sover} libInstPatch stands for lib-Instrument-Patch and is a library for processing digital sample based MIDI instrument "patch" files. The types of files libInstPatch supports are used for creating instrument sounds for wavetable @@ -54,14 +54,13 @@ This package contains the library of %{name}. %package devel Summary: Development package for %{name} Group: Development/Languages/C and C++ -Requires: libinstpatch-1_0-1 = %{version} +Requires: libinstpatch-1_0-%{sover} = %{version} %description devel This package includes the header files for %{name}. %prep %setup -q -%patch0 -p1 -b .pkgconfig -F24 %build %cmake @@ -70,10 +69,10 @@ make %{?_smp_mflags} %install %cmake_install -%post -n libinstpatch-1_0-1 -p /sbin/ldconfig -%postun -n libinstpatch-1_0-1 -p /sbin/ldconfig +%post -n libinstpatch-1_0-%{sover} -p /sbin/ldconfig +%postun -n libinstpatch-1_0-%{sover} -p /sbin/ldconfig -%files -n libinstpatch-1_0-1 +%files -n libinstpatch-1_0-%{sover} %defattr(-,root,root) %doc COPYING %{_libdir}/%{name}*.so.*