[gentoo-commits] repo/gentoo:master commit in: media-libs/libgroove/files/, media-libs/libgroove/, profiles/
commit: 327069aff4a3186dacb7f5da192af2e8dc27f729 Author: Jakov Smolić gentoo org> AuthorDate: Thu Aug 25 13:03:51 2022 + Commit: Jakov Smolić gentoo org> CommitDate: Thu Aug 25 13:03:51 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=327069af media-libs/libgroove: treeclean Closes: https://bugs.gentoo.org/834383 Signed-off-by: Jakov Smolić gentoo.org> media-libs/libgroove/Manifest | 1 - .../files/libgroove-4.3.0_GNUInstallDirs.patch | 105 - .../libgroove/files/libgroove-4.3.0_cflags.patch | 43 - .../libgroove/files/libgroove-4.3.0_ffmpeg4.patch | 47 - .../files/libgroove-4.3.0_sdl2_include_dir.patch | 13 --- media-libs/libgroove/libgroove-4.3.0-r1.ebuild | 43 - media-libs/libgroove/metadata.xml | 21 - profiles/package.mask | 5 - 8 files changed, 278 deletions(-) diff --git a/media-libs/libgroove/Manifest b/media-libs/libgroove/Manifest deleted file mode 100644 index 07097eaad32f.. --- a/media-libs/libgroove/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST libgroove-4.3.0.tar.gz 48857 BLAKE2B 40659e84a00245791746c570ba667cb97ba61de2bf9c1e746aaacb02db4ef5d15a00561aed7001f9a9a7b20ad8645f74c12a836b8bd59ebbc1abbda045d558d0 SHA512 30d75a3b1b3efa9b33687bb146648b66f8f4c718551c0db2c24c0259f09cf355a7c7bbac40d60d7a97bbbd7f83401d09464c6ac2b18cdfcd6198220cefc8a705 diff --git a/media-libs/libgroove/files/libgroove-4.3.0_GNUInstallDirs.patch b/media-libs/libgroove/files/libgroove-4.3.0_GNUInstallDirs.patch deleted file mode 100644 index a4e77b87ce74.. --- a/media-libs/libgroove/files/libgroove-4.3.0_GNUInstallDirs.patch +++ /dev/null @@ -1,105 +0,0 @@ -From 8b741249fc17d7cf7d72a702fcdf7f07870b0b27 Mon Sep 17 00:00:00 2001 -From: hasufell -Date: Thu, 20 Aug 2015 14:30:16 +0200 -Subject: [PATCH] CMake: make installation directories more configurable - -We use GNUInstallDirs now to be able to control the following variables: - CMAKE_INSTALL_LIBDIR - CMAKE_INSTALL_INCLUDEDIR - -This fixes support for distribution that have a multi-arch setup. -Also see https://github.com/gentoo/gentoo/pull/22 - CMakeLists.txt | 26 ++ - 1 file changed, 14 insertions(+), 12 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f2029eb..49e150e 100644 a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,4 +1,6 @@ --cmake_minimum_required(VERSION 2.8) -+cmake_minimum_required(VERSION 2.8.5) -+ -+include(GNUInstallDirs) - - if(NOT CMAKE_BUILD_TYPE) - set(CMAKE_BUILD_TYPE "Debug" CACHE STRING -@@ -157,7 +159,7 @@ add_library(groove_static STATIC ${LIBGROOVE_SOURCES} ${LIBGROOVE_HEADERS}) - set_target_properties(groove_static PROPERTIES - OUTPUT_NAME groove - COMPILE_FLAGS "${LIB_CFLAGS} -fPIC") --install(TARGETS groove_static DESTINATION lib) -+install(TARGETS groove_static DESTINATION ${CMAKE_INSTALL_LIBDIR}) - - - install(FILES -@@ -165,7 +167,7 @@ install(FILES - "groove/queue.h" - "groove/encoder.h" - DESTINATION "include/groove") --install(TARGETS groove DESTINATION lib) -+install(TARGETS groove DESTINATION ${CMAKE_INSTALL_LIBDIR}) - - add_executable(metadata example/metadata.c) - set_target_properties(metadata PROPERTIES -@@ -207,8 +209,8 @@ else() - target_link_libraries(grooveplayer LINK_PRIVATE ${SDL2_LIBRARY}) - include_directories(${SDL2_INCLUDE_DIR}) - -- install(FILES "grooveplayer/player.h" DESTINATION "include/grooveplayer") -- install(TARGETS grooveplayer DESTINATION lib) -+ install(FILES "grooveplayer/player.h" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/grooveplayer") -+ install(TARGETS grooveplayer DESTINATION ${CMAKE_INSTALL_LIBDIR}) - - add_library(grooveplayer_static STATIC - ${LIBGROOVE_PLAYER_SOURCES} -@@ -216,7 +218,7 @@ else() - set_target_properties(grooveplayer_static PROPERTIES - OUTPUT_NAME grooveplayer - COMPILE_FLAGS "${LIB_CFLAGS} -fPIC") -- install(TARGETS grooveplayer_static DESTINATION lib) -+ install(TARGETS grooveplayer_static DESTINATION ${CMAKE_INSTALL_LIBDIR}) - - - add_executable(playlist example/playlist.c ${PROJECT_SOURCE_DIR}/grooveplayer/player.h) -@@ -242,8 +244,8 @@ else() - target_link_libraries(grooveloudness LINK_PRIVATE ${EBUR128_LIBRARY}) - include_directories(${EBUR128_INCLUDE_DIR}) - -- install(FILES "grooveloudness/loudness.h" DESTINATION "include/grooveloudness") -- install(TARGETS grooveloudness DESTINATION lib) -+ install(FILES "grooveloudness/loudness.h" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/grooveloudness") -+ install(TARGETS grooveloudness DESTINATION ${CMAKE_INSTALL_LIBDIR}) - - - add_library(grooveloudness_static STATIC -@@ -252,7 +254,7 @@ else() - set_target_properties(grooveloudness_static PROPERTIES - OUTPUT_NAME grooveloudness - COMPILE_FLAGS "${LIB_CFLAGS} -fPIC") -- install(TARGETS grooveloudness_static DESTINATION lib) -+ install(TARGETS
[gentoo-commits] repo/gentoo:master commit in: media-libs/libgroove/files/, media-libs/libgroove/
commit: acbfec2b102c3bfe316827043191cf623e8673c3 Author: Diogo Pereira gmail com> AuthorDate: Fri Sep 21 14:16:21 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Sep 21 14:48:16 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acbfec2b media-libs/libgroove: fix build with ffmpeg-4 Closes: https://bugs.gentoo.org/654330 Reported-by: Toralf Förster gentoo.org> Package-Manager: Portage-2.3.49, Repoman-2.3.10 Closes: https://github.com/gentoo/gentoo/pull/9935 .../libgroove/files/libgroove-4.3.0_ffmpeg4.patch | 47 ++ media-libs/libgroove/libgroove-4.3.0-r1.ebuild | 3 +- 2 files changed, 49 insertions(+), 1 deletion(-) diff --git a/media-libs/libgroove/files/libgroove-4.3.0_ffmpeg4.patch b/media-libs/libgroove/files/libgroove-4.3.0_ffmpeg4.patch new file mode 100644 index 000..eadc4d98a91 --- /dev/null +++ b/media-libs/libgroove/files/libgroove-4.3.0_ffmpeg4.patch @@ -0,0 +1,47 @@ +Description: Fix FTBFS with FFmpeg 4.0 +Author: James Cowgill +Bug-Debian: https://bugs.debian.org/888376 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/groove/encoder.c b/groove/encoder.c +@@ -616,7 +616,7 @@ int groove_encoder_attach(struct GrooveE + + e->sink->audio_format = encoder->actual_audio_format; + e->sink->buffer_size = encoder->sink_buffer_size; +-e->sink->buffer_sample_count = (codec->capabilities & CODEC_CAP_VARIABLE_FRAME_SIZE) ? ++e->sink->buffer_sample_count = (codec->capabilities & AV_CODEC_CAP_VARIABLE_FRAME_SIZE) ? + 0 : e->stream->codec->frame_size; + e->sink->gain = encoder->gain; + +--- a/groove/playlist.c b/groove/playlist.c +@@ -186,7 +186,7 @@ static int audio_decode_frame(struct Gro + + if (!got_frame) { + // stop sending empty packets if the decoder is finished +-if (!pkt_temp->data && dec->codec->capabilities & CODEC_CAP_DELAY) ++if (!pkt_temp->data && dec->codec->capabilities & AV_CODEC_CAP_DELAY) + return 0; + continue; + } +@@ -571,7 +571,7 @@ static int decode_one_frame(struct Groov + pthread_mutex_unlock(&f->seek_mutex); + + if (f->eof) { +-if (f->audio_st->codec->codec->capabilities & CODEC_CAP_DELAY) { ++if (f->audio_st->codec->codec->capabilities & AV_CODEC_CAP_DELAY) { + av_init_packet(pkt); + pkt->data = NULL; + pkt->size = 0; +--- a/groove/file.c b/groove/file.c +@@ -281,7 +281,7 @@ int groove_file_save(struct GrooveFile * + ocodec->rc_buffer_size = icodec->rc_buffer_size; + ocodec->field_order= icodec->field_order; + +-uint64_t extra_size = (uint64_t)icodec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE; ++uint64_t extra_size = (uint64_t)icodec->extradata_size + AV_INPUT_BUFFER_PADDING_SIZE; + if (extra_size > INT_MAX) { + cleanup_save(file); + av_log(NULL, AV_LOG_ERROR, "codec extra size too big\n"); diff --git a/media-libs/libgroove/libgroove-4.3.0-r1.ebuild b/media-libs/libgroove/libgroove-4.3.0-r1.ebuild index 2cfafff6dae..9aac876f1de 100644 --- a/media-libs/libgroove/libgroove-4.3.0-r1.ebuild +++ b/media-libs/libgroove/libgroove-4.3.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -23,6 +23,7 @@ RDEPEND="${DEPEND}" PATCHES=( "${FILESDIR}/${P}_cflags.patch" "${FILESDIR}/${P}_sdl2_include_dir.patch" + "${FILESDIR}/${P}_ffmpeg4.patch" "${FILESDIR}/${P}_GNUInstallDirs.patch" ) src_configure() {
[gentoo-commits] repo/gentoo:master commit in: media-libs/libgroove/files/, media-libs/libgroove/
commit: 69a81325c5375b158cbd9ca95fb865c50ffef773 Author: Diogo Pereira gmail com> AuthorDate: Sun Dec 10 01:22:13 2017 + Commit: Patrice Clement gentoo org> CommitDate: Tue Dec 12 20:01:11 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69a81325 media-libs/libgroove: fix build with libsdl2-2.0.6. Reported-by: Toralf Förster gentoo.org> Closes: https://bugs.gentoo.org/634470 Closes: https://github.com/gentoo/gentoo/pull/6496 Package-Manager: Portage-2.3.13, Repoman-2.3.3 .../libgroove/files/libgroove-4.3.0_sdl2_include_dir.patch | 13 + media-libs/libgroove/libgroove-4.3.0-r1.ebuild | 3 ++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/media-libs/libgroove/files/libgroove-4.3.0_sdl2_include_dir.patch b/media-libs/libgroove/files/libgroove-4.3.0_sdl2_include_dir.patch new file mode 100644 index 000..7967c23c973 --- /dev/null +++ b/media-libs/libgroove/files/libgroove-4.3.0_sdl2_include_dir.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a1e8541..80a96c2 100644 +--- a/CMakeLists.txt b/CMakeLists.txt +@@ -208,7 +208,7 @@ else() + endif() + add_dependencies(grooveplayer groove) + target_link_libraries(grooveplayer LINK_PRIVATE ${SDL2_LIBRARY}) +- include_directories(${SDL2_INCLUDE_DIR}) ++ include_directories(${SDL2_INCLUDE_DIR} "${SDL2_INCLUDE_DIR}/SDL2") + + install(FILES "grooveplayer/player.h" DESTINATION "include/grooveplayer") + install(TARGETS grooveplayer DESTINATION lib) diff --git a/media-libs/libgroove/libgroove-4.3.0-r1.ebuild b/media-libs/libgroove/libgroove-4.3.0-r1.ebuild index 2b555731b7e..2cfafff6dae 100644 --- a/media-libs/libgroove/libgroove-4.3.0-r1.ebuild +++ b/media-libs/libgroove/libgroove-4.3.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -22,6 +22,7 @@ DEPEND="libav? ( media-video/libav ) RDEPEND="${DEPEND}" PATCHES=( "${FILESDIR}/${P}_cflags.patch" + "${FILESDIR}/${P}_sdl2_include_dir.patch" "${FILESDIR}/${P}_GNUInstallDirs.patch" ) src_configure() {
[gentoo-commits] repo/gentoo:master commit in: media-libs/libgroove/files/, media-libs/libgroove/
commit: 99a5d239204d87bca54cc7404d299377c68d0b3e Author: Diogo Pereira gmail com> AuthorDate: Wed Aug 19 18:37:06 2015 + Commit: Julian Ospald gentoo org> CommitDate: Thu Aug 20 20:58:46 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99a5d239 media-libs/libgroove: new ebuild Gentoo-Bug: 558190 media-libs/libgroove/Manifest | 1 + .../files/libgroove-4.3.0_GNUInstallDirs.patch | 105 + .../libgroove/files/libgroove-4.3.0_cflags.patch | 43 + media-libs/libgroove/libgroove-4.3.0.ebuild| 43 + media-libs/libgroove/metadata.xml | 25 + 5 files changed, 217 insertions(+) diff --git a/media-libs/libgroove/Manifest b/media-libs/libgroove/Manifest new file mode 100644 index 000..b465c45 --- /dev/null +++ b/media-libs/libgroove/Manifest @@ -0,0 +1 @@ +DIST libgroove-4.3.0.tar.gz 48857 SHA256 76f68896f078a9613d420339ef887ca8293884ad2cd0fbc031d89a6af2993636 SHA512 30d75a3b1b3efa9b33687bb146648b66f8f4c718551c0db2c24c0259f09cf355a7c7bbac40d60d7a97bbbd7f83401d09464c6ac2b18cdfcd6198220cefc8a705 WHIRLPOOL 4040769723e7891b285318d538cf628203289aca7f7a655855716fe450f58712cd64b2fdc2abbd316bef6f80bf6b65ae6620b9ac339b3ebd5c7e091a36129040 diff --git a/media-libs/libgroove/files/libgroove-4.3.0_GNUInstallDirs.patch b/media-libs/libgroove/files/libgroove-4.3.0_GNUInstallDirs.patch new file mode 100644 index 000..a4e77b8 --- /dev/null +++ b/media-libs/libgroove/files/libgroove-4.3.0_GNUInstallDirs.patch @@ -0,0 +1,105 @@ +From 8b741249fc17d7cf7d72a702fcdf7f07870b0b27 Mon Sep 17 00:00:00 2001 +From: hasufell +Date: Thu, 20 Aug 2015 14:30:16 +0200 +Subject: [PATCH] CMake: make installation directories more configurable + +We use GNUInstallDirs now to be able to control the following variables: + CMAKE_INSTALL_LIBDIR + CMAKE_INSTALL_INCLUDEDIR + +This fixes support for distribution that have a multi-arch setup. +Also see https://github.com/gentoo/gentoo/pull/22 +--- + CMakeLists.txt | 26 ++ + 1 file changed, 14 insertions(+), 12 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f2029eb..49e150e 100644 +--- a/CMakeLists.txt b/CMakeLists.txt +@@ -1,4 +1,6 @@ +-cmake_minimum_required(VERSION 2.8) ++cmake_minimum_required(VERSION 2.8.5) ++ ++include(GNUInstallDirs) + + if(NOT CMAKE_BUILD_TYPE) + set(CMAKE_BUILD_TYPE "Debug" CACHE STRING +@@ -157,7 +159,7 @@ add_library(groove_static STATIC ${LIBGROOVE_SOURCES} ${LIBGROOVE_HEADERS}) + set_target_properties(groove_static PROPERTIES + OUTPUT_NAME groove + COMPILE_FLAGS "${LIB_CFLAGS} -fPIC") +-install(TARGETS groove_static DESTINATION lib) ++install(TARGETS groove_static DESTINATION ${CMAKE_INSTALL_LIBDIR}) + + + install(FILES +@@ -165,7 +167,7 @@ install(FILES + "groove/queue.h" + "groove/encoder.h" + DESTINATION "include/groove") +-install(TARGETS groove DESTINATION lib) ++install(TARGETS groove DESTINATION ${CMAKE_INSTALL_LIBDIR}) + + add_executable(metadata example/metadata.c) + set_target_properties(metadata PROPERTIES +@@ -207,8 +209,8 @@ else() + target_link_libraries(grooveplayer LINK_PRIVATE ${SDL2_LIBRARY}) + include_directories(${SDL2_INCLUDE_DIR}) + +- install(FILES "grooveplayer/player.h" DESTINATION "include/grooveplayer") +- install(TARGETS grooveplayer DESTINATION lib) ++ install(FILES "grooveplayer/player.h" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/grooveplayer") ++ install(TARGETS grooveplayer DESTINATION ${CMAKE_INSTALL_LIBDIR}) + + add_library(grooveplayer_static STATIC + ${LIBGROOVE_PLAYER_SOURCES} +@@ -216,7 +218,7 @@ else() + set_target_properties(grooveplayer_static PROPERTIES + OUTPUT_NAME grooveplayer + COMPILE_FLAGS "${LIB_CFLAGS} -fPIC") +- install(TARGETS grooveplayer_static DESTINATION lib) ++ install(TARGETS grooveplayer_static DESTINATION ${CMAKE_INSTALL_LIBDIR}) + + + add_executable(playlist example/playlist.c ${PROJECT_SOURCE_DIR}/grooveplayer/player.h) +@@ -242,8 +244,8 @@ else() + target_link_libraries(grooveloudness LINK_PRIVATE ${EBUR128_LIBRARY}) + include_directories(${EBUR128_INCLUDE_DIR}) + +- install(FILES "grooveloudness/loudness.h" DESTINATION "include/grooveloudness") +- install(TARGETS grooveloudness DESTINATION lib) ++ install(FILES "grooveloudness/loudness.h" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/grooveloudness") ++ install(TARGETS grooveloudness DESTINATION ${CMAKE_INSTALL_LIBDIR}) + + + add_library(grooveloudness_static STATIC +@@ -252,7 +254,7 @@ else() + set_target_properties(grooveloudness_static PROPERTIES + OUTPUT_NAME grooveloudness + COMPILE_FLAGS "${LIB_CFLAGS} -fPIC") +- install(TARGETS grooveloudness_static DESTINATION lib) ++ install(TARGETS grooveloudness_static DESTINATION ${CMAKE_INSTALL_LIBDIR}) + + + add_executable(replaygain example/replaygain.c) +@@ -278,8 +280,8 @@ else() + target_link_libraries(groovefingerprinter LINK_PRIV