Download raw body.
UPDATE: clementine-1.4.1 (taglib update)
This diff is from my series to update taglib to version 2.
Simple update clementine-1.4.1 (44). Tested on amd64. OK?
Cheers Rafael
diff --git a/audio/clementine/Makefile b/audio/clementine/Makefile
index 43b9569b24a..8d8f5d1ba27 100644
--- a/audio/clementine/Makefile
+++ b/audio/clementine/Makefile
@@ -1,10 +1,12 @@
COMMENT = music player
+VERSION = 1.4.1
GH_ACCOUNT = clementine-player
GH_PROJECT = Clementine
-GH_TAGNAME = 1.4.1
-EPOCH = 0
-PKGNAME = clementine-${GH_TAGNAME}
+GH_TAGNAME = ${VERSION}-44-g41bcdca7f
+PKGNAME = clementine-${VERSION}
+EPOCH = 0
+REVISION = 0
CATEGORIES = audio x11
@@ -15,11 +17,39 @@ PERMIT_PACKAGE = Yes
WANTLIB += ${COMPILER_LIBCXX} GL GLEW GLU Qt5Concurrent Qt5Core
WANTLIB += Qt5DBus Qt5Gui Qt5Network Qt5OpenGL Qt5Sql Qt5Widgets
-WANTLIB += Qt5X11Extras Qt5Xml X11 Xext Xi Xmu c cdio chromaprint
-WANTLIB += execinfo fftw3 gio-2.0 glib-2.0 gobject-2.0
-WANTLIB += gpod gstapp-1.0 gstaudio-1.0 gstbase-1.0 gstpbutils-1.0
-WANTLIB += gstreamer-1.0 gsttag-1.0 gstvideo-1.0 iconv intl lastfm5
-WANTLIB += m mtp mygpo-qt5 protobuf pulse sqlite3 tag z
+WANTLIB += Qt5X11Extras Qt5Xml X11 Xext Xi Xmu absl_base absl_city
+WANTLIB += absl_civil_time absl_cord absl_cord_internal absl_cordz_functions
+WANTLIB += absl_cordz_handle absl_cordz_info absl_crc32c absl_crc_cord_state
+WANTLIB += absl_crc_cpu_detect absl_crc_internal absl_debugging_internal
+WANTLIB += absl_decode_rust_punycode absl_demangle_internal absl_demangle_rust
+WANTLIB += absl_die_if_null absl_examine_stack absl_exponential_biased
+WANTLIB += absl_flags_commandlineflag absl_flags_commandlineflag_internal
+WANTLIB += absl_flags_config absl_flags_internal absl_flags_marshalling
+WANTLIB += absl_flags_private_handle_accessor absl_flags_program_name
+WANTLIB += absl_flags_reflection absl_graphcycles_internal absl_hash
+WANTLIB += absl_hashtablez_sampler absl_int128 absl_kernel_timeout_internal
+WANTLIB += absl_leak_check absl_log_globals absl_log_initialize
+WANTLIB += absl_log_internal_check_op absl_log_internal_conditions
+WANTLIB += absl_log_internal_fnmatch absl_log_internal_format
+WANTLIB += absl_log_internal_globals absl_log_internal_log_sink_set
+WANTLIB += absl_log_internal_message absl_log_internal_nullguard
+WANTLIB += absl_log_internal_proto absl_log_internal_structured_proto
+WANTLIB += absl_log_severity absl_log_sink absl_low_level_hash
+WANTLIB += absl_malloc_internal absl_random_distributions absl_random_internal_entropy_pool
+WANTLIB += absl_random_internal_platform absl_random_internal_randen
+WANTLIB += absl_random_internal_randen_hwaes absl_random_internal_randen_hwaes_impl
+WANTLIB += absl_random_internal_randen_slow absl_random_internal_seed_material
+WANTLIB += absl_random_seed_gen_exception absl_random_seed_sequences
+WANTLIB += absl_raw_hash_set absl_raw_logging_internal absl_spinlock_wait
+WANTLIB += absl_stacktrace absl_status absl_statusor absl_str_format_internal
+WANTLIB += absl_strerror absl_string_view absl_strings absl_strings_internal
+WANTLIB += absl_symbolize absl_synchronization absl_throw_delegate
+WANTLIB += absl_time absl_time_zone absl_tracing_internal absl_utf8_for_code_point
+WANTLIB += absl_vlog_config_internal c cdio chromaprint execinfo
+WANTLIB += fftw3 gio-2.0 glib-2.0 gobject-2.0 gpod gstapp-1.0
+WANTLIB += gstaudio-1.0 gstbase-1.0 gstpbutils-1.0 gstreamer-1.0
+WANTLIB += gsttag-1.0 gstvideo-1.0 iconv intl lastfm5 m mtp mygpo-qt5
+WANTLIB += protobuf pulse sqlite3 tag z
# C++17
COMPILER = base-clang ports-gcc
@@ -42,7 +72,7 @@ LIB_DEPENDS = audio/chromaprint \
audio/libgpod \
audio/liblastfm>=1.1.0 \
audio/pulseaudio \
- audio/taglib \
+ audio/taglib>=2.0.2 \
devel/libmtp \
devel/protobuf \
graphics/glew \
@@ -58,18 +88,17 @@ TEST_DEPENDS = ${MODPY_BUILD_DEPENDS}
CONFIGURE_ARGS = -DENABLE_SPOTIFY_BLOB=OFF
# stupidity
-CONFIGURE_ARGS += -DBUILD_WERROR=ON
+CONFIGURE_ARGS += -DBUILD_WERROR=ON \
+ -DUSE_SYSTEM_TAGLIB=ON
# XXX Builds tend to sometimes omit projectM presets when this option
# is missing. To be investigated.
CONFIGURE_ARGS += -DBUNDLE_PROJECTM_PRESETS=ON
-# prevent picking up ccache:
-# ccache: error: Failed to create directory /clementine-1.4.0rc2_writes_to_HOME/.cache/ccache/tmp: Permission denied
-CONFIGURE_ARGS += -DCCACHE_EXECUTABLE:BOOL=OFF
-
MODCMAKE_LDFLAGS = -L${LOCALBASE}/lib
+#CXXFLAGS+=" -Wno-error=cpp"
+
post-extract:
cp ${FILESDIR}/config.h.in ${WRKSRC}/ext/libclementine-common/
diff --git a/audio/clementine/distinfo b/audio/clementine/distinfo
index 30e716bb70a..9c7907f6e14 100644
--- a/audio/clementine/distinfo
+++ b/audio/clementine/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Clementine-1.4.1.tar.gz) = 5EBRBkLZz9Ek4957i57kFpZ01vHetGLWWx3eBQaKAFQ=
-SIZE (Clementine-1.4.1.tar.gz) = 7594196
+SHA256 (Clementine-1.4.1-44-g41bcdca7f.tar.gz) = 3a/+5Qz/x1zR6CGWbU5w1fFueUfkJiJJoRRit2ht9MA=
+SIZE (Clementine-1.4.1-44-g41bcdca7f.tar.gz) = 7600668
diff --git a/audio/clementine/patches/patch-3rdparty_libprojectm_CMakeLists_txt b/audio/clementine/patches/patch-3rdparty_libprojectm_CMakeLists_txt
index 89c715a5d56..0fc4440be97 100644
--- a/audio/clementine/patches/patch-3rdparty_libprojectm_CMakeLists_txt
+++ b/audio/clementine/patches/patch-3rdparty_libprojectm_CMakeLists_txt
@@ -1,7 +1,15 @@
Index: 3rdparty/libprojectm/CMakeLists.txt
--- 3rdparty/libprojectm/CMakeLists.txt.orig
+++ 3rdparty/libprojectm/CMakeLists.txt
-@@ -17,7 +17,7 @@ set(USE_FBO ON)
+@@ -11,13 +11,15 @@ if (CMAKE_VERSION VERSION_GREATER "2.8.3")
+ cmake_policy(SET CMP0017 OLD)
+ endif (CMAKE_VERSION VERSION_GREATER "2.8.3")
+
++set(CMAKE_CXX_STANDARD 14)
+
++
+ set(USE_DEVIL OFF)
+ set(USE_FBO ON)
set(USE_FTGL OFF)
set(USE_GLES1 OFF)
set(USE_THREADS OFF)
@@ -10,7 +18,7 @@ Index: 3rdparty/libprojectm/CMakeLists.txt
set(USE_NATIVE_GLEW OFF)
set(USE_CG OFF)
set(BUILD_PROJECTM_STATIC ON)
-@@ -168,7 +168,7 @@ CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/libproject
+@@ -166,7 +168,7 @@ CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/libproject
CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/config.inp.in" "${CMAKE_CURRENT_SOURCE_DIR}/config.inp" @ONLY)
if(BUNDLE_PROJECTM_PRESETS)
diff --git a/audio/clementine/patches/patch-ext_libclementine-common_CMakeLists_txt b/audio/clementine/patches/patch-ext_libclementine-common_CMakeLists_txt
index 71863b22032..06a94e2bf90 100644
--- a/audio/clementine/patches/patch-ext_libclementine-common_CMakeLists_txt
+++ b/audio/clementine/patches/patch-ext_libclementine-common_CMakeLists_txt
@@ -1,30 +1,17 @@
-1. Respect CXXFLAGS
-2. Switch Clementine to FindBacktrace.cmake
-
+Switch Clementine to FindBacktrace.cmake
Index: ext/libclementine-common/CMakeLists.txt
--- ext/libclementine-common/CMakeLists.txt.orig
+++ ext/libclementine-common/CMakeLists.txt
-@@ -2,7 +2,7 @@ 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(CMAKE_CXX_FLAGS "--std=c++0x ${CMAKE_CXX_FLAGS}")
-
- set(SOURCES
- core/closure.cpp
-@@ -39,6 +39,14 @@ target_link_libraries(libclementine-common
- ${TAGLIB_LIBRARIES}
- ${CMAKE_THREAD_LIBS_INIT}
+@@ -39,4 +39,11 @@ target_link_libraries(libclementine-common
)
-+
-+find_package(Backtrace)
+
+ find_package(Backtrace)
+-configure_file(core/conf_backtrace.h.in conf_backtrace.h)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in
+ ${CMAKE_CURRENT_BINARY_DIR}/config.h)
+if(Backtrace_FOUND)
+ include_directories(${Backtrace_INCLUDE_DIRS})
+ target_link_libraries(libclementine-common ${Backtrace_LIBRARIES})
++ configure_file(core/conf_backtrace.h.in conf_backtrace.h)
+endif(Backtrace_FOUND)
-
- find_package(Backtrace)
- configure_file(core/conf_backtrace.h.in conf_backtrace.h)
++
diff --git a/audio/clementine/patches/patch-ext_libclementine-remote_CMakeLists_txt b/audio/clementine/patches/patch-ext_libclementine-remote_CMakeLists_txt
deleted file mode 100644
index c7c847b67f3..00000000000
--- a/audio/clementine/patches/patch-ext_libclementine-remote_CMakeLists_txt
+++ /dev/null
@@ -1,13 +0,0 @@
-abseil-cpp requires at least C++14
-
-Index: ext/libclementine-remote/CMakeLists.txt
---- ext/libclementine-remote/CMakeLists.txt.orig
-+++ ext/libclementine-remote/CMakeLists.txt
-@@ -1,6 +1,6 @@
- include_directories(${PROTOBUF_INCLUDE_DIRS})
-
--set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++0x")
-+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++17")
-
- set(MESSAGES
- remotecontrolmessages.proto
diff --git a/audio/clementine/patches/patch-ext_libclementine-tagreader_CMakeLists_txt b/audio/clementine/patches/patch-ext_libclementine-tagreader_CMakeLists_txt
deleted file mode 100644
index cee677dd46e..00000000000
--- a/audio/clementine/patches/patch-ext_libclementine-tagreader_CMakeLists_txt
+++ /dev/null
@@ -1,14 +0,0 @@
-abseil-cpp requires at least C++14
-
-Index: ext/libclementine-tagreader/CMakeLists.txt
---- ext/libclementine-tagreader/CMakeLists.txt.orig
-+++ ext/libclementine-tagreader/CMakeLists.txt
-@@ -3,7 +3,7 @@ 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(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++17")
-
- set(MESSAGES
- tagreadermessages.proto
diff --git a/audio/clementine/patches/patch-src_CMakeLists_txt b/audio/clementine/patches/patch-src_CMakeLists_txt
index 611834b0ad9..1cf912c1b2e 100644
--- a/audio/clementine/patches/patch-src_CMakeLists_txt
+++ b/audio/clementine/patches/patch-src_CMakeLists_txt
@@ -6,8 +6,8 @@ Index: src/CMakeLists.txt
@@ -1,6 +1,6 @@
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
--set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Woverloaded-virtual -Wall -Wno-sign-compare -Wno-deprecated-declarations -Wno-unused-local-typedefs -Wno-unused-private-field -Wno-unknown-warning-option")
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Woverloaded-virtual -Wall -Wno-sign-compare -Wno-deprecated-declarations -Wno-unused-local-typedefs -Wno-maybe-uninitialized")
+set(CMAKE_CXX_FLAGS "-Woverloaded-virtual -Wall -Wno-sign-compare -Wno-deprecated-declarations -Wno-unused-local-typedefs ${CMAKE_CXX_FLAGS}")
- option(BUILD_WERROR "Build with -Werror" ON)
-
+ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+ # using regular Clang or AppleClang
UPDATE: clementine-1.4.1 (taglib update)