From 9966ad16f8f1643e603377f88f4fe1d6353f741729b31ee4a6dc0607f167e4d3 Mon Sep 17 00:00:00 2001 From: Dave Plater Date: Wed, 26 Jun 2019 08:09:52 +0000 Subject: [PATCH] Accepting request 712080 from home:plater 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 --- csound-rename-sndinfo.patch | 129 ++++++++++++++++++++++++++++++++++++ csound.changes | 6 ++ csound.spec | 6 +- 3 files changed, 137 insertions(+), 4 deletions(-) create mode 100644 csound-rename-sndinfo.patch diff --git a/csound-rename-sndinfo.patch b/csound-rename-sndinfo.patch new file mode 100644 index 0000000..6d6d6e0 --- /dev/null +++ b/csound-rename-sndinfo.patch @@ -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) diff --git a/csound.changes b/csound.changes index cb125a4..1d62221 100644 --- a/csound.changes +++ b/csound.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jun 26 08:00:12 UTC 2019 - Dave Plater + +- 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 diff --git a/csound.spec b/csound.spec index 7ce9a6d..c04355c 100644 --- a/csound.spec +++ b/csound.spec @@ -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