rpm/csound
SHA256
1
0
Fork 0
forked from pool/csound
Code Pull Requests Activity

Accepting request 712080 from home:plater

Browse Source 
Renamed sndifo to csndinfo again to fix conflict with snd package using csound-rename-sndinfo.patch this time.

OBS-URL: https://build.opensuse.org/request/show/712080
OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/csound?expand=0&rev=35
This commit is contained in:
Dave Plater 2019-06-26 08:09:52 +00:00 committed by Git OBS Bridge
parent b7487367f5
commit 9966ad16f8
3 changed files with 137 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

129
csound-rename-sndinfo.patch Normal file
View File

@ -0,0 +1,129 @@
Index: csound-6.12.2/util/CMakeLists.txt
===================================================================
--- csound-6.12.2.orig/util/CMakeLists.txt 2018-11-07 16:05:23.000000000 +0200
+++ csound-6.12.2/util/CMakeLists.txt 2019-06-26 09:45:26.891391042 +0200
@@ -1,62 +1,62 @@
-# UTILITY PLUGIN AND PROGRAMS
-
-set(stdutil_SRCS
- atsa.c cvanal.c dnoise.c envext.c
- het_export.c het_import.c hetro.c lpanal.c
- lpc_export.c lpc_import.c mixer.c pvanal.c
- pv_export.c pv_import.c pvlook.c scale.c
- sndinfo.c srconv.c std_util.c xtrct.c
- SDIF/sdif.c)
-
-if(MSVC)
- make_plugin(stdutil "${stdutil_SRCS}" )
- target_link_libraries(stdutil ${LIBSNDFILE_LIBRARY} ${LIBSNDFILE_SUPPORT_LIBS})
-elseif(WIN32)
- make_plugin(stdutil "${stdutil_SRCS}" m
- ${LIBSNDFILE_LIBRARY} ${LIBSNDFILE_SUPPORT_LIBS})
-else()
- make_plugin(stdutil "${stdutil_SRCS}" m ${LIBSNDFILE_LIBRARY})
-endif()
-
-add_dependency_to_framework(stdutil ${LIBSNDFILE_LIBRARY})
-
-if(BUILD_UTILITIES)
- make_utility(atsa atsa_main.c)
- 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(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)
- if(LINUX)
- target_link_libraries(mixer-bin m)
- endif()
- make_utility(pvanal pvc_main.c)
- 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)
-
-
- #find_library(LIBSNDFILE_LIBRARY sndfile libsndfile-1)
- find_library(LIBSAMPLERATE_LIBRARY NAMES samplerate libsamplerate-0)
-
- if(LIBSNDFILE_LIBRARY AND LIBSAMPLERATE_LIBRARY)
- make_executable(src_conv new_srconv.c "${LIBSNDFILE_LIBRARY};${LIBSAMPLERATE_LIBRARY}")
- if(MSVC)
- target_link_libraries(src_conv ${LIBSNDFILE_SUPPORT_LIBS})
- endif()
- else()
- message(STATUS "Not building src_conv (libsndfile or libsamplerate not found).")
- endif()
-
-endif()
-add_subdirectory(SDIF)
+# UTILITY PLUGIN AND PROGRAMS
+
+set(stdutil_SRCS
+ atsa.c cvanal.c dnoise.c envext.c
+ het_export.c het_import.c hetro.c lpanal.c
+ lpc_export.c lpc_import.c mixer.c pvanal.c
+ pv_export.c pv_import.c pvlook.c scale.c
+ sndinfo.c srconv.c std_util.c xtrct.c
+ SDIF/sdif.c)
+
+if(MSVC)
+ make_plugin(stdutil "${stdutil_SRCS}" )
+ target_link_libraries(stdutil ${LIBSNDFILE_LIBRARY} ${LIBSNDFILE_SUPPORT_LIBS})
+elseif(WIN32)
+ make_plugin(stdutil "${stdutil_SRCS}" m
+ ${LIBSNDFILE_LIBRARY} ${LIBSNDFILE_SUPPORT_LIBS})
+else()
+ make_plugin(stdutil "${stdutil_SRCS}" m ${LIBSNDFILE_LIBRARY})
+endif()
+
+add_dependency_to_framework(stdutil ${LIBSNDFILE_LIBRARY})
+
+if(BUILD_UTILITIES)
+ make_utility(atsa atsa_main.c)
+ 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(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)
+ if(LINUX)
+ target_link_libraries(mixer-bin m)
+ endif()
+ make_utility(pvanal pvc_main.c)
+ 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(csndinfo sndinfo_main.c)
+ make_utility(srconv srconv_main.c)
+
+
+ #find_library(LIBSNDFILE_LIBRARY sndfile libsndfile-1)
+ find_library(LIBSAMPLERATE_LIBRARY NAMES samplerate libsamplerate-0)
+
+ if(LIBSNDFILE_LIBRARY AND LIBSAMPLERATE_LIBRARY)
+ make_executable(src_conv new_srconv.c "${LIBSNDFILE_LIBRARY};${LIBSAMPLERATE_LIBRARY}")
+ if(MSVC)
+ target_link_libraries(src_conv ${LIBSNDFILE_SUPPORT_LIBS})
+ endif()
+ else()
+ message(STATUS "Not building src_conv (libsndfile or libsamplerate not found).")
+ endif()
+
+endif()
+add_subdirectory(SDIF)

6
csound.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Jun 26 08:00:12 UTC 2019 - Dave Plater <davejplater@gmail.com>
- Renamed sndifo to csndinfo again to fix conflict with snd package
using csound-rename-sndinfo.patch this time.
-------------------------------------------------------------------
Wed Jun 5 13:57:01 UTC 2019 - Dave Plater <davejplater@gmail.com>

6
csound.spec
View File

@ -48,6 +48,7 @@ Patch2: csound-6.08-default-pulse.patch
# Use xdg-open to open a browser to view the manual
Patch4: csound-6.08-xdg-open.patch
Patch6: fluidsynth2.patch
Patch7: csound-rename-sndinfo.patch
BuildRequires: alsa-devel
BuildRequires: bison
BuildRequires: cmake
@ -136,10 +137,7 @@ Development files for Csound, a sound synthesis program.
%prep
%setup -q
%patch2 -p1 -b .default-pulse
%patch4 -p1 -b .xdg-open
#%%patch5 -p1
%patch6 -p1
%autopatch -p1
# remove __DATE__ from source files, causes unnecessary rebuilds
sed -i 's:__DATE__:"":' Engine/musmon.c include/version.h Top/main.c
# copy readme