diff options
| author |   civil@gentoo.org <civil@gentoo.org> | 2016-03-30 01:18:56 +0200 |
|---|---|---|
| committer |   Johannes Huber <johu@gentoo.org> | 2016-05-04 09:14:35 +0200 |
| commit | 06f9b9bb9f1ef48268fe62845c5dd8816cb3b58f (patch) | |
| tree | af8151e740f35bd14848404014c73413fb4c0853 /media-sound/cantata/files | |
| parent | dev-libs/openssl: Stable for amd64 (bug #581234) (diff) | |
| download | gentoo-06f9b9bb9f1ef48268fe62845c5dd8816cb3b58f.tar.gz gentoo-06f9b9bb9f1ef48268fe62845c5dd8816cb3b58f.tar.bz2 gentoo-06f9b9bb9f1ef48268fe62845c5dd8816cb3b58f.zip | |
media-sound/cantata: version bump 2.0.0
Gentoo-bug: 544734
Package-Manager: portage-2.2.28
Signed-off-by: Johannes Huber <johu@gentoo.org>
Diffstat (limited to 'media-sound/cantata/files')
| -rw-r--r-- | media-sound/cantata/files/cantata-2.0.0-ffmpeg-3.0.patch | 12 | ||||
| -rw-r--r-- | media-sound/cantata/files/cantata-2.0.0-gcc5.patch | 15 |
2 files changed, 27 insertions, 0 deletions
diff --git a/media-sound/cantata/files/cantata-2.0.0-ffmpeg-3.0.patch b/media-sound/cantata/files/cantata-2.0.0-ffmpeg-3.0.patch new file mode 100644 index 000000000000..c0f3455944b7 --- /dev/null +++ b/media-sound/cantata/files/cantata-2.0.0-ffmpeg-3.0.patch @@ -0,0 +1,12 @@ +diff --git a/replaygain/ffmpeginput.cpp b/replaygain/ffmpeginput.cpp +index 375448d..ab07d5b 100644 +--- a/replaygain/ffmpeginput.cpp ++++ b/replaygain/ffmpeginput.cpp +@@ -21,7 +21,6 @@ extern "C" { + #include <libavcodec/avcodec.h> + #include <libavformat/avformat.h> + #if LIBAVFORMAT_VERSION_MAJOR >= 54 +-#include <libavutil/audioconvert.h> + #include <libavutil/channel_layout.h> + #endif + #ifdef __cplusplus diff --git a/media-sound/cantata/files/cantata-2.0.0-gcc5.patch b/media-sound/cantata/files/cantata-2.0.0-gcc5.patch new file mode 100644 index 000000000000..bebe3feef5b9 --- /dev/null +++ b/media-sound/cantata/files/cantata-2.0.0-gcc5.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 48dd61c..1fe516a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -279,7 +279,9 @@ if (ENABLE_QT5) + set(QTINCLUDES ${Qt5Widgets_INCLUDE_DIRS} ${Qt5Network_INCLUDE_DIRS} ${Qt5Xml_INCLUDE_DIRS} ${Qt5Core_INCLUDE_DIRS} ${Qt5Concurrent_INCLUDE_DIRS} + ${Qt5Svg_INCLUDE_DIRS} ${Qt5Sql_INCLUDE_DIRS}) + add_definitions(${Qt5Widgets_DEFINITIONS} ${Qt5Network_DEFINITIONS} ${Qt5Xml_DEFINITIONS} ${Qt5Concurrent_DEFINITIONS} ${Qt5Svg_DEFINITIONS} ${Qt5Sql_DEFINITIONS}) +- set(CMAKE_CXX_FLAGS "${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}") ++ if (Qt5_POSITION_INDEPENDENT_CODE) ++ set(CMAKE_POSITION_INDEPENDENT_CODE ON) ++ endif (Qt5_POSITION_INDEPENDENT_CODE) + if (NOT ENABLE_UBUNTU AND NOT APPLE AND NOT WIN32) + # Does Ubuntu/Touch version need DBus? + find_package(Qt5DBus) |