From c3f0d27165d029749d40ba3dfdb29ec9c34f6c15 Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Wed, 14 Mar 2018 00:39:16 +0100 Subject: [PATCH] Remove files. --- CMakeLists.txt | 6 -- cmake/Deb.cmake | 9 --- cmake/FindFFTW3.cmake | 133 ---------------------------------------- cmake/Format.cmake | 6 -- dist/strawberry.spec.in | 5 +- 5 files changed, 2 insertions(+), 157 deletions(-) delete mode 100644 cmake/Deb.cmake delete mode 100644 cmake/FindFFTW3.cmake delete mode 100644 cmake/Format.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 70f9dd01f..84f0d7582 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,7 +30,6 @@ include(cmake/Summary.cmake) include(cmake/Version.cmake) include(cmake/Rpm.cmake) include(cmake/OptionalSource.cmake) -include(cmake/Format.cmake) #set(CMAKE_BUILD_TYPE Debug) set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake) @@ -380,11 +379,6 @@ add_subdirectory(ext/libstrawberry-common) add_subdirectory(ext/libstrawberry-tagreader) add_subdirectory(ext/strawberry-tagreader) -option(WITH_DEBIAN OFF) -if(WITH_DEBIAN) - add_subdirectory(debian) -endif(WITH_DEBIAN) - # Uninstall support configure_file( "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in" diff --git a/cmake/Deb.cmake b/cmake/Deb.cmake deleted file mode 100644 index 672392c55..000000000 --- a/cmake/Deb.cmake +++ /dev/null @@ -1,9 +0,0 @@ -set(DEB_ARCH amd64 CACHE STRING "Architecture of the deb file") -set(DEB_DIST "unstable" CACHE STRING "Distribution to set in the .deb changelog") - -add_custom_target(deb - COMMAND dpkg-buildpackage -b -d -uc -us - COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/../strawberry_${STRAWBERRY_VERSION_DEB}~${DEB_DIST}_${DEB_ARCH}.deb - ${CMAKE_BINARY_DIR}/strawberry_${STRAWBERRY_VERSION_DEB}~${DEB_DIST}_${DEB_ARCH}.deb - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} -) diff --git a/cmake/FindFFTW3.cmake b/cmake/FindFFTW3.cmake deleted file mode 100644 index e711dd3ab..000000000 --- a/cmake/FindFFTW3.cmake +++ /dev/null @@ -1,133 +0,0 @@ -# -# Try to find FFTW3 library -# (see www.fftw.org) -# Once run this will define: -# -# FFTW3_FOUND -# FFTW3_INCLUDE_DIR -# FFTW3_LIBRARIES -# FFTW3_LINK_DIRECTORIES -# -# You may set one of these options before including this file: -# FFTW3_USE_SSE2 -# -# TODO: _F_ versions. -# -# Jan Woetzel 05/2004 -# www.mip.informatik.uni-kiel.de -# -------------------------------- - - FIND_PATH(FFTW3_INCLUDE_DIR fftw3.h - ${FFTW3_DIR}/include - ${FFTW3_HOME}/include - ${FFTW3_DIR} - ${FFTW3_HOME} - $ENV{FFTW3_DIR}/include - $ENV{FFTW3_HOME}/include - $ENV{FFTW3_DIR} - $ENV{FFTW3_HOME} - /usr/include - /usr/local/include - $ENV{SOURCE_DIR}/fftw3 - $ENV{SOURCE_DIR}/fftw3/include - $ENV{SOURCE_DIR}/fftw - $ENV{SOURCE_DIR}/fftw/include - ) -#MESSAGE("DBG FFTW3_INCLUDE_DIR=${FFTW3_INCLUDE_DIR}") - - -SET(FFTW3_POSSIBLE_LIBRARY_PATH - ${FFTW3_DIR}/lib - ${FFTW3_HOME}/lib - ${FFTW3_DIR} - ${FFTW3_HOME} - $ENV{FFTW3_DIR}/lib - $ENV{FFTW3_HOME}/lib - $ENV{FFTW3_DIR} - $ENV{FFTW3_HOME} - /usr/lib - /usr/local/lib - $ENV{SOURCE_DIR}/fftw3 - $ENV{SOURCE_DIR}/fftw3/lib - $ENV{SOURCE_DIR}/fftw - $ENV{SOURCE_DIR}/fftw/lib -) - - -# the lib prefix is containe din filename onf W32, unfortuantely. JW -# teh "general" lib: -FIND_LIBRARY(FFTW3_FFTW_LIBRARY - NAMES fftw3 libfftw libfftw3 libfftw3-3 - PATHS - ${FFTW3_POSSIBLE_LIBRARY_PATH} - ) -#MESSAGE("DBG FFTW3_FFTW_LIBRARY=${FFTW3_FFTW_LIBRARY}") - -FIND_LIBRARY(FFTW3_FFTWF_LIBRARY - NAMES fftwf3 fftw3f fftwf libfftwf libfftwf3 libfftw3f-3 - PATHS - ${FFTW3_POSSIBLE_LIBRARY_PATH} - ) -#MESSAGE("DBG FFTW3_FFTWF_LIBRARY=${FFTW3_FFTWF_LIBRARY}") - -FIND_LIBRARY(FFTW3_FFTWL_LIBRARY - NAMES fftwl3 fftw3l fftwl libfftwl libfftwl3 libfftw3l-3 - PATHS - ${FFTW3_POSSIBLE_LIBRARY_PATH} - ) -#MESSAGE("DBG FFTW3_FFTWF_LIBRARY=${FFTW3_FFTWL_LIBRARY}") - - -FIND_LIBRARY(FFTW3_FFTW_SSE2_LIBRARY - NAMES fftw_sse2 fftw3_sse2 libfftw_sse2 libfftw3_sse2 - PATHS - ${FFTW3_POSSIBLE_LIBRARY_PATH} - ) -#MESSAGE("DBG FFTW3_FFTW_SSE2_LIBRARY=${FFTW3_FFTW_SSE2_LIBRARY}") - -FIND_LIBRARY(FFTW3_FFTWF_SSE_LIBRARY - NAMES fftwf_sse fftwf3_sse libfftwf_sse libfftwf3_sse - PATHS - ${FFTW3_POSSIBLE_LIBRARY_PATH} - ) -#MESSAGE("DBG FFTW3_FFTWF_SSE_LIBRARY=${FFTW3_FFTWF_SSE_LIBRARY}") - - -# -------------------------------- -# select one of the above -# default: -IF (FFTW3_FFTW_LIBRARY) - SET(FFTW3_LIBRARIES ${FFTW3_FFTW_LIBRARY}) -ENDIF (FFTW3_FFTW_LIBRARY) -# specialized: -IF (FFTW3_USE_SSE2 AND FFTW3_FFTW_SSE2_LIBRARY) - SET(FFTW3_LIBRARIES ${FFTW3_FFTW_SSE2_LIBRARY}) -ENDIF (FFTW3_USE_SSE2 AND FFTW3_FFTW_SSE2_LIBRARY) - -# -------------------------------- - -IF(FFTW3_LIBRARIES) - IF (FFTW3_INCLUDE_DIR) - - # OK, found all we need - SET(FFTW3_FOUND TRUE) - GET_FILENAME_COMPONENT(FFTW3_LINK_DIRECTORIES ${FFTW3_LIBRARIES} PATH) - - ELSE (FFTW3_INCLUDE_DIR) - MESSAGE("FFTW3 include dir not found. Set FFTW3_DIR to find it.") - ENDIF(FFTW3_INCLUDE_DIR) -ELSE(FFTW3_LIBRARIES) - MESSAGE("FFTW3 lib not found. Set FFTW3_DIR to find it.") -ENDIF(FFTW3_LIBRARIES) - - -MARK_AS_ADVANCED( - FFTW3_INCLUDE_DIR - FFTW3_LIBRARIES - FFTW3_FFTW_LIBRARY - FFTW3_FFTW_SSE2_LIBRARY - FFTW3_FFTWF_LIBRARY - FFTW3_FFTWF_SSE_LIBRARY - FFTW3_FFTWL_LIBRARY - FFTW3_LINK_DIRECTORIES -) diff --git a/cmake/Format.cmake b/cmake/Format.cmake deleted file mode 100644 index 1f7dba026..000000000 --- a/cmake/Format.cmake +++ /dev/null @@ -1,6 +0,0 @@ -add_custom_target(format-diff - #COMMAND python ${CMAKE_SOURCE_DIR}/dist/format.py) - COMMAND python2 ${CMAKE_SOURCE_DIR}/dist/format.py) -add_custom_target(format - #COMMAND python ${CMAKE_SOURCE_DIR}/dist/format.py -i) - COMMAND python2 ${CMAKE_SOURCE_DIR}/dist/format.py -i) diff --git a/dist/strawberry.spec.in b/dist/strawberry.spec.in index 4519a89ab..9e53e46a6 100644 --- a/dist/strawberry.spec.in +++ b/dist/strawberry.spec.in @@ -14,10 +14,10 @@ BuildRequires: qt5-devel boost-devel gcc-c++ glew-devel libgpod-devel BuildRequires: cmake gstreamer-devel gstreamer-plugins-base-devel BuildRequires: libimobiledevice-devel libplist-devel usbmuxd-devel BuildRequires: libmtp-devel protobuf-devel protobuf-compiler libcdio-devel -BuildRequires: qjson-devel qca2-devel fftw-devel sparsehash-devel +BuildRequires: qca2-devel sparsehash-devel BuildRequires: libchromaprint-devel -Requires: libgpod protobuf-lite libcdio qjson qca-ossl sqlite +Requires: libgpod protobuf-lite libcdio qca-ossl sqlite # GStreamer codec dependencies Requires: gstreamer-plugins-ugly @@ -60,7 +60,6 @@ make %{?_smp_mflags} %install cd bin make install DESTDIR=$RPM_BUILD_ROOT -rm -f $RPM_BUILD_ROOT/usr/share/icons/ubuntu-mono-{dark,light}/apps/24/strawberry-panel*.png %clean cd bin