Merge branch 'master' into projectm

clementine-player · Jan 7, 2025 · dc9b262 · dc9b262
2 parents fb3d5ad + fe3599c
commit dc9b262
Show file tree

Hide file tree

Showing 23 changed files with 1,223 additions and 1,281 deletions.
diff --git a/.github/workflows/all.yml b/.github/workflows/all.yml
diff --git a/3rdparty/libprojectm/CMakeLists.txt b/3rdparty/libprojectm/CMakeLists.txt
@@ -24,8 +24,6 @@ set(BUILD_PROJECTM_STATIC ON)
 set(DISABLE_NATIVE_PRESETS ON)
 set(DISABLE_MILKDROP_PRESETS OFF)
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-
 pkg_check_modules(GLEW glew)
 
 if(DISABLE_NATIVE_PRESETS)

diff --git a/3rdparty/qtsingleapplication/CMakeLists.txt b/3rdparty/qtsingleapplication/CMakeLists.txt
@@ -1,5 +1,4 @@
 cmake_minimum_required(VERSION 3.0.0)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++0x")
 
 set(SINGLEAPP-SOURCES
     qtlocalpeer.cpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0.0)
+cmake_minimum_required(VERSION 3.13.0)
 project(clementine)
 
 cmake_policy(SET CMP0053 OLD)
@@ -15,13 +15,14 @@ include(cmake/Format.cmake)
 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON CACHE INTERNAL "")
 
+set(CMAKE_CXX_STANDARD 17)
+
 if (CMAKE_CXX_COMPILER MATCHES ".*clang")
   set(CMAKE_COMPILER_IS_CLANGXX 1)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-uninitialized")
-endif ()
-
-if (APPLE)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --stdlib=libc++")
+  if (APPLE)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --stdlib=libc++")
+  endif ()
 endif ()
 
 find_program(CCACHE_EXECUTABLE NAMES ccache)
@@ -46,7 +47,10 @@ endif(OPENGL_FOUND)
 find_package(Boost REQUIRED)
 find_package(Gettext REQUIRED)
 find_package(PkgConfig REQUIRED)
-find_package(Protobuf REQUIRED)
+find_package(protobuf)
+if(NOT protobuf_FOUND)
+  find_package(Protobuf REQUIRED)
+endif()
 find_package(FFTW3)
 find_package(ALSA)
 if (NOT APPLE)

diff --git a/README.md b/README.md
@@ -41,7 +41,7 @@ Compile and install:
 
     cd bin
     cmake ..
-    make -j8
+    make -j$(nproc)
     sudo make install
 
 See the Wiki for more instructions and a list of dependencies:

diff --git a/dist/clementine.spec.in b/dist/clementine.spec.in
@@ -30,7 +30,6 @@ BuildRequires:  pkgconfig(protobuf)
 BuildRequires:  pkgconfig(sqlite3) >= 3.7
 BuildRequires:  pkgconfig(taglib) >= 1.11
 BuildRequires:  pkgconfig(glew)
-BuildRequires:  pkgconfig(cryptopp)
 BuildRequires:  pkgconfig(Qt5Core)
 BuildRequires:  pkgconfig(Qt5Gui)
 BuildRequires:  pkgconfig(Qt5Widgets)
@@ -47,12 +46,13 @@ BuildRequires:  pkgconfig(gstreamer-app-1.0)
 BuildRequires:  pkgconfig(gstreamer-audio-1.0)
 BuildRequires:  pkgconfig(gstreamer-base-1.0)
 BuildRequires:  pkgconfig(gstreamer-tag-1.0)
-BuildRequires:  pkgconfig(libpulse)
 BuildRequires:  pkgconfig(libcdio)
 BuildRequires:  pkgconfig(libchromaprint)
+BuildRequires:  pkgconfig(libcryptopp)
 BuildRequires:  pkgconfig(libgpod-1.0)
 BuildRequires:  pkgconfig(libmtp)
 BuildRequires:  pkgconfig(libnotify)
+BuildRequires:  pkgconfig(libpulse)
 BuildRequires:  pkgconfig(libudf)
 
 # GStreamer codec dependencies

diff --git a/ext/libclementine-common/CMakeLists.txt b/ext/libclementine-common/CMakeLists.txt
@@ -2,8 +2,6 @@ include_directories(${PROTOBUF_INCLUDE_DIRS})
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++0x")
-
 set(SOURCES
   core/closure.cpp
   core/latch.cpp

diff --git a/ext/libclementine-remote/CMakeLists.txt b/ext/libclementine-remote/CMakeLists.txt
@@ -1,19 +1,17 @@
 include_directories(${PROTOBUF_INCLUDE_DIRS})
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++0x")
-
 set(MESSAGES
   remotecontrolmessages.proto
 )
 
-protobuf_generate_cpp(PROTO_SOURCES PROTO_HEADERS ${MESSAGES})
-
 add_library(libclementine-remote STATIC
-  ${PROTO_SOURCES}
+  ${MESSAGES}
 )
 
+protobuf_generate(TARGET libclementine-remote LANGUAGE cpp)
+
 target_link_libraries(libclementine-remote
-  ${PROTOBUF_LIBRARY}
   libclementine-common
+  protobuf::libprotobuf
 )
 
diff --git a/ext/libclementine-tagreader/CMakeLists.txt b/ext/libclementine-tagreader/CMakeLists.txt
@@ -3,8 +3,6 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 include_directories(${CMAKE_SOURCE_DIR}/ext/libclementine-common)
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++0x")
-
 set(MESSAGES
   tagreadermessages.proto
 )
@@ -28,16 +26,16 @@ optional_source(HAVE_GOOGLE_DRIVE
 
 qt5_wrap_cpp(MOC ${HEADERS})
 
-protobuf_generate_cpp(PROTO_SOURCES PROTO_HEADERS ${MESSAGES})
-
 add_library(libclementine-tagreader STATIC
-  ${PROTO_SOURCES}
+  ${MESSAGES}
   ${SOURCES}
   ${MOC}
 )
 
+protobuf_generate(TARGET libclementine-tagreader LANGUAGE cpp)
+
 target_link_libraries(libclementine-tagreader
-  ${PROTOBUF_LIBRARY}
   libclementine-common
+  protobuf::libprotobuf
 )
 
diff --git a/gst/moodbar/CMakeLists.txt b/gst/moodbar/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.0.0)
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Woverloaded-virtual -Wall --std=c++0x")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Woverloaded-virtual -Wall")
 
 include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})