Accepting request 604598 from multimedia:libs

OBS-URL: https://build.opensuse.org/request/show/604598
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/fluidsynth?expand=0&rev=38
This commit is contained in:
Dominique Leuenberger 2018-05-08 11:32:36 +00:00 committed by Git OBS Bridge
commit 6246d83619
5 changed files with 18 additions and 44 deletions

View File

@ -1,38 +0,0 @@
From c98e050515718d9e46c36921407f0d4cf036dd94 Mon Sep 17 00:00:00 2001
From: Christophe Giboudeaux <krop@users.noreply.github.com>
Date: Tue, 6 Mar 2018 17:21:15 +0100
Subject: [PATCH] Fix pkgconfig file for absolute paths (#347)
When building fluidsynth, we can use relative or absolute paths for LIB_INSTALL_DIR and INCLUDE_INSTALL_DIR. Check whether the two vars were defined absolute before writing fluidsynth.pc.
Fixes https://bugzilla.opensuse.org/1084081
---
CMakeLists.txt | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 975eb83..07d64e5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -461,8 +461,16 @@ add_subdirectory ( doc )
# pkg-config support
set ( prefix "${CMAKE_INSTALL_PREFIX}" )
set ( exec_prefix "\${prefix}" )
-set ( libdir "\${exec_prefix}/${LIB_INSTALL_DIR}" )
-set ( includedir "\${prefix}/${INCLUDE_INSTALL_DIR}" )
+if ( IS_ABSOLUTE "${LIB_INSTALL_DIR}" )
+ set ( libdir "${LIB_INSTALL_DIR}" )
+else ()
+ set ( libdir "\${exec_prefix}/${LIB_INSTALL_DIR}" )
+endif ()
+if ( IS_ABSOLUTE "${INCLUDE_INSTALL_DIR}" )
+ set ( includedir "${INCLUDE_INSTALL_DIR}" )
+else ()
+ set ( includedir "\${prefix}/${INCLUDE_INSTALL_DIR}" )
+endif ()
configure_file ( fluidsynth.pc.in
${CMAKE_BINARY_DIR}/fluidsynth.pc IMMEDIATE @ONLY )
install ( FILES ${CMAKE_BINARY_DIR}/fluidsynth.pc
--
2.13.6

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b74801d0fdd726c4555149bf075b76dc4074658ec0a8f7a3753f4a64589e5300
size 633628

3
fluidsynth-1.1.11.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:da8878ff374d12392eecf87e96bad8711b8e76a154c25a571dd8614d1af80de8
size 634566

View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Sun May 6 06:55:29 UTC 2018 - tom.mbrt@googlemail.com
- Update to 1.1.11:
* fix pkgconfig file for absolute paths
* add a cmake option for OSS support
* fix broken enable-midishare cmake option
* fix double free in fluid_midi_router
* prevent malicious soundfonts from causing buffer overflows
* avoid SF3 files to be loaded incorrectly
* fix an endless loop in fast file renderer
- remove 0001-Fix-pkgconfig-file-for-absolute-paths-347.patch
-------------------------------------------------------------------
Tue Mar 6 16:09:17 UTC 2018 - tom.mbrt@googlemail.com

View File

@ -24,7 +24,7 @@
%endif
Name: fluidsynth
Version: 1.1.10
Version: 1.1.11
Release: 0
Summary: A Real-Time Software Synthesizer That Uses Soundfont(tm)
License: LGPL-2.1+
@ -32,7 +32,6 @@ Group: Productivity/Multimedia/Sound/Midi
Url: http://www.fluidsynth.org/
Source: https://github.com/FluidSynth/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
Source1000: baselibs.conf
Patch1: 0001-Fix-pkgconfig-file-for-absolute-paths-347.patch
BuildRequires: cmake >= 3.0.2
BuildRequires: ladspa-devel
BuildRequires: pkgconfig
@ -71,7 +70,6 @@ This package contains the shared library for Fluidsynth.
%prep
%setup -q
%patch1 -p1
%build
%cmake \