From cadb509089178b751a5cfdc8ec52e7d24f750b6b Mon Sep 17 00:00:00 2001 From: casey langen Date: Sat, 13 Jan 2018 12:09:01 -0800 Subject: [PATCH] Backmerged build to master. --- CMakeLists.txt | 3 +-- musikcube.spec | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f1ab879ef..b6973818e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -103,12 +103,11 @@ endif() add_dependencies(taglibreader taglib) if (CMAKE_SYSTEM_NAME MATCHES "Linux") - # alsa, pulseuadio on by default. sndio off by default. add_subdirectory(src/plugins/alsaout) + add_subdirectory(src/plugins/pulseout) if (${ENABLE_SNDIO} MATCHES "true") add_subdirectory(src/plugins/sndioout) endif() - add_subdirectory(src/plugins/pulseout) elseif (CMAKE_SYSTEM_NAME MATCHES "FreeBSD") add_subdirectory(src/plugins/sndioout) if (${ENABLE_PULSEAUDIO} MATCHES "true") diff --git a/musikcube.spec b/musikcube.spec index cc61c92d7..7fa86d6fb 100644 --- a/musikcube.spec +++ b/musikcube.spec @@ -1,6 +1,6 @@ %define name musikcube %define build_timestamp %{lua: print(os.date("%Y%m%d"))} -%define version 0.35.0 +%define version 0.35.1 Name: %{name} Version: %{version} Release: %{dist} @@ -21,7 +21,7 @@ A cross-platform, terminal-based audio engine, library, player and server writte %build -cmake -D CMAKE_INSTALL_PREFIX:PATH=%{_prefix} . +cmake -D CMAKE_INSTALL_PREFIX:PATH=%{_prefix} -DCMAKE_BUILD_TYPE=Release . make -j2 cmake .