From c12762cbf6ac12668d6851839bb05e189554ef0c2532c30052a7ee8cffa540be Mon Sep 17 00:00:00 2001 From: Dave Plater Date: Sat, 6 Apr 2019 11:04:05 +0000 Subject: [PATCH] Accepting request 691988 from home:plater Pre changes file OBS-URL: https://build.opensuse.org/request/show/691988 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/csound?expand=0&rev=26 --- csound-6.08-64-bit-plugin-path.patch | 40 -------- csound-6.08-fix-conflicts.patch | 118 ----------------------- csound.spec | 138 +++++++++++++++------------ 3 files changed, 78 insertions(+), 218 deletions(-) delete mode 100644 csound-6.08-64-bit-plugin-path.patch delete mode 100644 csound-6.08-fix-conflicts.patch diff --git a/csound-6.08-64-bit-plugin-path.patch b/csound-6.08-64-bit-plugin-path.patch deleted file mode 100644 index e8db155..0000000 --- a/csound-6.08-64-bit-plugin-path.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- CMakeLists.txt.orig 2017-02-04 22:30:16.670767865 +0200 -+++ CMakeLists.txt 2017-02-04 22:29:23.216953000 +0200 -@@ -35,11 +35,10 @@ message(STATUS "LIBRARY INSTALL DIR: ${L - - if(USE_DOUBLE) - message(STATUS "Building with 64-bit floats") -- set(PLUGIN_INSTALL_DIR "${LIBRARY_INSTALL_DIR}/csound/plugins64-${APIVERSION}") - else() - message(STATUS "Building with 32-bit floats") -- set(PLUGIN_INSTALL_DIR "${LIBRARY_INSTALL_DIR}/csound/plugins-${APIVERSION}") - endif() -+set(PLUGIN_INSTALL_DIR "${LIBRARY_INSTALL_DIR}/csound/plugins-${APIVERSION}") - - - execute_process ( ---- installer/misc/mkpackage.py.orig 2017-02-04 20:49:47.206563224 +0200 -+++ installer/misc/mkpackage.py 2017-02-04 20:50:43.818304341 +0200 -@@ -27,7 +27,7 @@ libDir2 = libDir + '/csound/lib' - # single precision plugin libraries - pluginDir32 = libDir + '/csound/plugins' - # double precision plugin libraries --pluginDir64 = libDir + '/csound/plugins64' -+pluginDir64 = libDir + '/csound/plugins' - # documentation - docDir = instPrefix + '/share/doc/csound' - # tclcsound.so ---- Top/csmodule.c.orig 2016-11-25 01:42:03.000000000 +0200 -+++ Top/csmodule.c 2017-02-04 20:52:48.869523561 +0200 -@@ -146,9 +146,9 @@ static const char *plugindir64_env - # define ENABLE_OPCODEDIR_WARNINGS 0 - # ifndef CS_DEFAULT_PLUGINDIR - # ifndef USE_DOUBLE --# define CS_DEFAULT_PLUGINDIR "/usr/local/lib/csound/plugins" -+# define CS_DEFAULT_PLUGINDIR "/usr/lib/csound/plugins" - # else --# define CS_DEFAULT_PLUGINDIR "/usr/local/lib/csound/plugins64" -+# define CS_DEFAULT_PLUGINDIR "/usr/lib64/csound/plugins" - # endif - # endif - #endif diff --git a/csound-6.08-fix-conflicts.patch b/csound-6.08-fix-conflicts.patch deleted file mode 100644 index 6860b3f..0000000 --- a/csound-6.08-fix-conflicts.patch +++ /dev/null @@ -1,118 +0,0 @@ ---- installer/linux/d32.sh.orig 2014-05-04 05:49:43.213736146 -0600 -+++ installer/linux/d32.sh 2014-05-05 20:15:00.000000000 -0600 -@@ -13,7 +13,7 @@ mkdir -p -m 0755 ../../../CSDIST/$DIR/lo - - rm ../../../CSDIST/$DIR/bin/* - --cp -pv ../../{linseg,lpanal,brkpt,lpc_export,lpc_import,cs,makecsd,csb64enc,cscore,csound,csound5gui,cvanal,dnoise,mixer,envext,extract,extractor,pvanal,pvlook,het_export,het_import,hetro,scale,scot,scsort,sdif2ad,srconv,tabdes,winsound,cstclsh,cswish,matrix.tk,pv_export,pv_import,atsa,sndinfo} ../../../CSDIST/$DIR/bin -+cp -pv ../../{linseg,lpanal,brkpt,lpc_export,lpc_import,cs,makecsd,csb64enc,cscore,csound,csound5gui,cvanal,dnoise,cs-mixer,cs-envext,cs-extract,cs-extractor,pvanal,pvlook,het_export,het_import,hetro,scale,cs-scot,scsort,sdif2ad,cs-srconv,tabdes,winsound,cstclsh,cswish,matrix.tk,pv_export,pv_import,atsa,cs-sndinfo} ../../../CSDIST/$DIR/bin - - strip ../../../CSDIST/$DIR/bin/* - ---- installer/linux/d64.sh.orig 2014-05-04 05:49:43.213736146 -0600 -+++ installer/linux/d64.sh 2014-05-05 20:15:00.000000000 -0600 -@@ -12,7 +12,7 @@ mkdir -p -m 0755 ../../../CSDIST/$DIR/lo - - rm ../../../CSDIST/$DIR/bin/* - --cp -pv ../../{linseg,lpanal,brkpt,lpc_export,lpc_import,cs,makecsd,csb64enc,cscore,csound,csound5gui,cvanal,dnoise,mixer,envext,extract,extractor,pvanal,pvlook,het_export,het_import,hetro,scale,scot,scsort,sdif2ad,srconv,tabdes,winsound,cstclsh,cswish,matrix.tk,pv_export,pv_import,atsa,sndinfo,cseditor} ../../../CSDIST/$DIR/bin -+cp -pv ../../{linseg,lpanal,brkpt,lpc_export,lpc_import,cs,makecsd,csb64enc,cscore,csound,csound5gui,cvanal,dnoise,mixer,cs-envext,cs-extract,cs-extractor,pvanal,pvlook,het_export,het_import,hetro,scale,cs-scot,scsort,sdif2ad,cs-srconv,tabdes,winsound,cstclsh,cswish,matrix.tk,pv_export,pv_import,atsa,cs-sndinfo,cseditor} ../../../CSDIST/$DIR/bin - - strip ../../../CSDIST/$DIR/bin/* - ---- installer/linux/f32.sh.orig 2014-05-04 05:49:43.213736146 -0600 -+++ installer/linux/f32.sh 2014-05-05 20:15:00.000000000 -0600 -@@ -12,7 +12,7 @@ mkdir -p -m 0755 ../../../CSDIST/$DIR/lo - - rm ../../../CSDIST/$DIR/bin/* - --cp -pv ../../{linseg,lpanal,brkpt,lpc_export,lpc_import,cs,makecsd,csb64enc,cscore,csound,csound5gui,cvanal,dnoise,mixer,envext,extract,extractor,pvanal,pvlook,het_export,het_import,hetro,scale,scot,scsort,sdif2ad,srconv,tabdes,winsound,cstclsh,cswish,matrix.tk,pv_export,pv_import,atsa,sndinfo} ../../../CSDIST/$DIR/bin -+cp -pv ../../{linseg,lpanal,brkpt,lpc_export,lpc_import,cs,makecsd,csb64enc,cscore,csound,csound5gui,cvanal,dnoise,cs-mixer,cs-envext,cs-extract,cs-extractor,pvanal,pvlook,het_export,het_import,hetro,scale,cs-scot,scsort,sdif2ad,cs-srconv,tabdes,winsound,cstclsh,cswish,matrix.tk,pv_export,pv_import,atsa,cs-sndinfo} ../../../CSDIST/$DIR/bin - - strip ../../../CSDIST/$DIR/bin/* - ---- installer/linux/f64.sh.orig 2014-05-04 05:49:43.213736146 -0600 -+++ installer/linux/f64.sh 2014-05-05 20:15:00.000000000 -0600 -@@ -12,7 +12,7 @@ mkdir -p -m 0755 ../../../CSDIST/$DIR/lo - - rm ../../../CSDIST/$DIR/bin/* - --cp -pv ../../{linseg,lpanal,brkpt,lpc_export,lpc_import,cs,makecsd,csb64enc,cscore,csound,csound5gui,cvanal,dnoise,mixer,envext,extract,extractor,pvanal,pvlook,het_export,het_import,hetro,scale,scot,scsort,sdif2ad,srconv,tabdes,winsound,cstclsh,cswish,matrix.tk,pv_export,pv_import,atsa,sndinfo,cseditor} ../../../CSDIST/$DIR/bin -+cp -pv ../../{linseg,lpanal,brkpt,lpc_export,lpc_import,cs,makecsd,csb64enc,cscore,csound,csound5gui,cvanal,dnoise,cs-mixer,cs-envext,cs-extract,cs-extractor,pvanal,pvlook,het_export,het_import,hetro,scale,cs-scot,scsort,sdif2ad,cs-srconv,tabdes,winsound,cstclsh,cswish,matrix.tk,pv_export,pv_import,atsa,cs-sndinfo,cseditor} ../../../CSDIST/$DIR/bin - - strip ../../../CSDIST/$DIR/bin/* - ---- installer/misc/mkpackage.py.orig 2014-05-05 17:00:10.347460267 -0600 -+++ installer/misc/mkpackage.py 2014-05-05 20:15:00.000000000 -0600 -@@ -71,13 +71,13 @@ headerFiles += ['interfaces/CppSound.hpp - headerFiles += ['interfaces/CsoundFile.hpp'] - - utils1 = ['csound', 'winsound', 'cstclsh', 'cswish', -- 'atsa', 'cvanal', 'dnoise', 'envext', 'extractor', -+ 'atsa', 'cvanal', 'dnoise', 'cs-envext', 'cs-extractor', - 'het_export', 'het_import', 'hetro', 'lpanal', -- 'lpc_export', 'lpc_import', 'mixer', 'pvanal', -- 'pvlook', 'pv_export', 'pv_import', 'scale', 'sndinfo', -- 'srconv', 'cseditor'] -+ 'lpc_export', 'lpc_import', 'cs-mixer', 'pvanal', -+ 'pvlook', 'pv_export', 'pv_import', 'cs-scale', 'cs-sndinfo', -+ 'cs-srconv', 'cseditor'] - --utils2 = ['scsort', 'extract', 'cs', 'csb64enc', 'makecsd', 'scot'] -+utils2 = ['scsort', 'cs-extract', 'cs', 'csb64enc', 'makecsd', 'cs-scot'] - - docFiles = ['COPYING', 'ChangeLog', 'INSTALL', 'readme-csound6.txt'] - ---- util1/CMakeLists.txt.orig 2014-05-04 05:49:44.284746142 -0600 -+++ util1/CMakeLists.txt 2014-05-05 20:15:00.000000000 -0600 -@@ -1,7 +1,7 @@ - #extra utilities - - make_utility(scsort sortex/smain.c) --make_utility(extract sortex/xmain.c) -+make_utility(cs-extract sortex/xmain.c) - - if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_CLANG) - if(HAVE_UNISTD_H) -@@ -19,6 +19,6 @@ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMP - - set(scot_SRCS - scot/scot_main.c scot/scot.c) -- make_utility(scot "${scot_SRCS}") -+ make_utility(cs-scot "${scot_SRCS}") - endif() - ---- util/CMakeLists.txt.orig 2016-11-25 01:42:03.000000000 +0200 -+++ util/CMakeLists.txt 2017-02-04 21:13:26.135024754 +0200 -@@ -23,15 +23,15 @@ if(BUILD_UTILITIES) - make_utility(csanalyze csanalyze.c) - make_utility(cvanal cvl_main.c) - make_utility(dnoise dnoise_main.c) -- make_utility(envext env_main.c) -- make_utility(extractor xtrc_main.c) -+ make_utility(cs-envext env_main.c) -+ make_utility(cs-extractor xtrc_main.c) - make_utility(het_export hetx_main.c) - make_utility(het_import heti_main.c) - make_utility(hetro het_main.c) - make_utility(lpanal lpc_main.c) - make_utility(lpc_export lpcx_main.c) - make_utility(lpc_import lpci_main.c) -- make_executable(mixer-bin mixer_main.c "${CSOUNDLIB}" mixer) -+ make_executable(mixer-bin mixer_main.c "${CSOUNDLIB}" cs-mixer) - if(LINUX) - target_link_libraries(mixer-bin m) - endif() -@@ -39,9 +39,9 @@ if(BUILD_UTILITIES) - make_utility(pvlook pvl_main.c) - make_utility(pv_export pvx_main.c) - make_utility(pv_import pvi_main.c) -- make_utility(scale scale_main.c) -- make_utility(sndinfo sndinfo_main.c) -- make_utility(srconv srconv_main.c) -+ make_utility(cs-scale scale_main.c) -+ make_utility(cs-sndinfo sndinfo_main.c) -+ make_utility(cs-srconv srconv_main.c) - - - find_library(LIBSNDFILE_LIBRARY sndfile) diff --git a/csound.spec b/csound.spec index 78646df..5287639 100644 --- a/csound.spec +++ b/csound.spec @@ -1,7 +1,7 @@ # # spec file for package csound # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,7 +16,9 @@ # +%define py3version %(pkg-config python3 --modversion) %define support_fltk 1 +%bcond_with python %define maj 6 %define min 0 @@ -24,29 +26,20 @@ Name: csound Version: 6.12.2 Release: 0 Summary: Computer Sound Synthesis and Composition Program -License: GFDL-1.2 and LGPL-2.1+ and MIT +License: GFDL-1.2-only AND LGPL-2.1-or-later AND MIT Group: Productivity/Multimedia/Sound/Utilities Url: http://www.csounds.com Source: https://github.com/%{name}/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz -Source1: README.SuSE +Source1: README.SUSE # Default to using pulseaudio instead of portaudio -Patch2: csound-6.08-default-pulse.patch +Patch2: csound-6.08-default-pulse.patch # Do not use SSE2 on non-x86_64 platforms -Patch3: csound-6.08-sse2.patch +Patch3: csound-6.08-sse2.patch # Use xdg-open to open a browser to view the manual -Patch4: csound-6.08-xdg-open.patch -# fixup library dirs to use rpm variables -#Patch5: csound-6.08-fix-library-dirs.patch -Patch6: fluidsynth2.patch -Patch0: csound-scons-on-py3.patch -BuildRequires: gcc-c++ +Patch4: csound-6.08-xdg-open.patch +Patch6: fluidsynth2.patch BuildRequires: alsa-devel BuildRequires: bison -BuildRequires: libboost_atomic-devel -BuildRequires: libboost_filesystem-devel -BuildRequires: libboost_locale-devel -BuildRequires: libboost_regex-devel -BuildRequires: libboost_thread-devel BuildRequires: cmake BuildRequires: doxygen BuildRequires: eigen3-devel @@ -54,20 +47,29 @@ BuildRequires: fdupes BuildRequires: flex BuildRequires: fluidsynth-devel BuildRequires: gcc-c++ +BuildRequires: gcc-c++ BuildRequires: jack-devel +BuildRequires: java-devel-openjdk +BuildRequires: libboost_atomic-devel +BuildRequires: libboost_filesystem-devel +BuildRequires: libboost_locale-devel +BuildRequires: libboost_regex-devel +BuildRequires: libboost_thread-devel BuildRequires: liblo-devel -#BuildRequires: lua-devel BuildRequires: libsndfile-devel +BuildRequires: lua-devel BuildRequires: portaudio-devel -BuildRequires: python3-devel -#BuildRequires: scons BuildRequires: swig +%if %{with python} +BuildRequires: python3-devel +%endif %if %support_fltk BuildRequires: fltk-devel BuildRequires: libjpeg-devel BuildRequires: libpng-devel BuildRequires: xorg-x11-devel %endif +Recommends: %{name}-lang BuildRoot: %{_tmppath}/%{name}-%{version}-build %global luaver %(lua -v | sed -r 's/Lua ([[:digit:]]+\\.[[:digit:]]+).*/\\1/') @@ -76,25 +78,25 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Csound is a software synthesis program. It is fully modular and supports an unlimited amount of oscillators and filters. -%package -n libcsnd6_%{maj}_%{min} -Summary: csound6 library +%package -n libcsnd6-%{maj}_%{min} +Summary: Csound6 library Group: System/Libraries -%description -n libcsnd6_%{maj}_%{min} +%description -n libcsnd6-%{maj}_%{min} Library for csound use -%package -n libcsnd64_%{maj}_%{min} -Summary: csound6 library +%package -n libcsound64-%{maj}_%{min} +Summary: Csound6 library Group: System/Libraries -%description -n libcsnd64_%{maj}_%{min} +%description -n libcsound64-%{maj}_%{min} Library for csound use -%package -n lib_jcsound6 -Summary: csound6 library +%package java-bindings +Summary: Csound6 library Group: System/Libraries -%description -n lib_jcsound6 +%description java-bindings Library for csound use %package plugins @@ -104,34 +106,27 @@ Group: Productivity/Multimedia/Other %description plugins Plugins for csound -%package python-bindings -Summary: Plugins -Group: Productivity/Multimedia/OtherBUILDROOT/ - -%description python-bindings -Plugins for csound - - %package devel Summary: Development files for Csound, a sound synthesis program Group: Development/Libraries/C and C++ -Requires: libcsnd6_%{maj}_%{min} = %{version} -Requires: libcsnd64_%{maj}_%{min} = %{version} Requires: lib_jcsound6 = %{version} +Requires: libcsnd6-%{maj}_%{min} = %{version} +Requires: libcsound64-%{maj}_%{min} = %{version} %description devel Development files for Csound. +%lang_package + %prep %setup -q %patch2 -p1 -b .default-pulse %ifnarch x86_64 -%patch3 -p1 -b .sse2 +%patch3 -p0 -b .sse2 %endif %patch4 -p1 -b .xdg-open #%%patch5 -p1 %patch6 -p1 - # remove __DATE__ from source files, causes unnecessary rebuilds sed -i 's:__DATE__:"":' Engine/musmon.c include/version.h Top/main.c # copy readme @@ -142,8 +137,11 @@ cp %{SOURCE1} . export CFLAGS="%{optflags} -lm" export CXXFLAGS="%{optflags} -std=c++11" -%cmake -DPYTHON_LIBRARY="%{_libdir}/libpython%{python_version}.so" \ - -DPYTHON_INCLUDE_DIR="%{_includedir}/python%{python_version}" \ +%cmake \ +%if %{with python} + -DPYTHON_LIBRARY="%{_libdir}/libpython$(pkg-config python3 --modversion)$(python3-config --abiflags).so" \ + -DPYTHON_INCLUDE_DIR="%{_includedir}/python$(pkg-config python3 --modversion)$(python3-config --abiflags)" \ +%endif -DNEED_PORTTIME:BOOL=OFF \ -DRPM_LUAVER:STRING=%{luaver} \ %if %{_lib} == "lib64" @@ -151,36 +149,56 @@ export CXXFLAGS="%{optflags} -std=c++11" %else -DUSE_LIB64:BOOL=OFF %endif -# -DRPM_PYTHON_SITEARCH:STRING=%%{python_sitelib} \ make %{_smp_mflags} %install %cmake_install +#python bindings are wip +rm -rf %{buildroot}root -%if %{_lib} == "lib64" -args="--word64" -%else -args="" -%endif -./install.py --prefix=%{_prefix} --instdir=%{buildroot} $args -rm -f %{buildroot}%{_prefix}/csound5-*.md5sums %{buildroot}%{_bindir}/uninstall-csound5 -rm -rf %{buildroot}%{_datadir}/doc/csound -# rename conflicting binary names -mv %{buildroot}%{_bindir}/sndinfo %{buildroot}%{_bindir}/csndinfo -mv %{buildroot}%{_bindir}/extract %{buildroot}%{_bindir}/csound-extract %fdupes -s %{buildroot} -%find_lang %{name}5 +%find_lang %{name}%{maj} -%files -f %{name}5.lang -%defattr(-,root,root) -%doc AUTHORS COPYING ChangeLog README README.SuSE +%post -n libcsnd6-%{maj}_%{min} -p /sbin/ldconfig +%postun -n libcsnd6-%{maj}_%{min} -p /sbin/ldconfig + +%post -n libcsound64-%{maj}_%{min} -p /sbin/ldconfig +%postun -n libcsound64-%{maj}_%{min} -p /sbin/ldconfig + +%post java-bindings -p /sbin/ldconfig +%postun java-bindings -p /sbin/ldconfig + +%files +%doc AUTHORS README.md README.SUSE Release_Notes +%license COPYING %{_bindir}/* + +%files -n libcsnd6-%{maj}_%{min} +%{_libdir}/libcsnd6.so.%{maj}.%{min} + +%files -n libcsound64-%{maj}_%{min} +%{_libdir}/libcsound64.so.%{maj}.%{min} + +%files java-bindings +%{_libdir}/lib_jcsound6.so +%{_libdir}/csnd6.jar + +%files plugins %{_libdir}/csound/ %files devel -%defattr(-,root,root) %{_includedir}/csound/ -%{_libdir}/libcsound.a +%{_libdir}/libcs*.so +%{_datadir}/cmake/Csound/ + +%files lang -f %{name}%{maj}.lang +%defattr(-,root,root) +%if 1 == 0 +-- Installing: /data/packages/BUILDROOT/csound-6.12.2-0.x86_64/root/.local/lib/python2.7/site-packages/_csnd6.so +-- Installing: /data/packages/BUILDROOT/csound-6.12.2-0.x86_64/root/.local/lib/python2.7/site-packages/csnd6.py +-- Installing: /data/packages/BUILDROOT/csound-6.12.2-0.x86_64/root/.local/lib/python2.7/site-packages/ctcsound.py + +%endif %changelog