From ef89e12d3986ab87064b84e073b2a4a11f32c91c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 25 Aug 2022 14:49:58 +0100 Subject: gentoo auto-resync : 25:08:2022 - 14:49:58 --- media-libs/Manifest.gz | Bin 66116 -> 65960 bytes media-libs/libgroove/Manifest | 7 -- .../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 ----- 8 files changed, 279 deletions(-) delete mode 100644 media-libs/libgroove/Manifest delete mode 100644 media-libs/libgroove/files/libgroove-4.3.0_GNUInstallDirs.patch delete mode 100644 media-libs/libgroove/files/libgroove-4.3.0_cflags.patch delete mode 100644 media-libs/libgroove/files/libgroove-4.3.0_ffmpeg4.patch delete mode 100644 media-libs/libgroove/files/libgroove-4.3.0_sdl2_include_dir.patch delete mode 100644 media-libs/libgroove/libgroove-4.3.0-r1.ebuild delete mode 100644 media-libs/libgroove/metadata.xml (limited to 'media-libs') diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz index 9f2272accdfe..7eb569b14acf 100644 Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ diff --git a/media-libs/libgroove/Manifest b/media-libs/libgroove/Manifest deleted file mode 100644 index 06713388e857..000000000000 --- a/media-libs/libgroove/Manifest +++ /dev/null @@ -1,7 +0,0 @@ -AUX libgroove-4.3.0_GNUInstallDirs.patch 4199 BLAKE2B bd9e58dad55660c24fd272af50b41bed8b427d3b6901e882dc2348e1b507b60369c8122e424d3e7ba982833807fc403fbf8ee9321016bd43b170a332306b0233 SHA512 e7e2458cfc10f41afe163fda4f54fd1c9a3305c0cbe351b2954c64b066eb8fe529e83a4c333c4eb54ebc24edb39fcda4127c7f60011cbcfa2926f55f29725dea -AUX libgroove-4.3.0_cflags.patch 1872 BLAKE2B 87a696b844394659d29bf586231519064e5b79c772c93f8a7eeeeb91d9c892586434811ee9b675ec60970569a0318c9b4811b82b4d62b75dfd4753a5e2f9d98c SHA512 d0ab678d4bf0bac17493fbf7de51273bc918ef141a9951f6bae94362e8e142131e6098b68a2955b22e73b4c159940cd94630d5a6e6b6ae82e84bb18648770cc1 -AUX libgroove-4.3.0_ffmpeg4.patch 2037 BLAKE2B 851cf22e93e2e5700b30c023d24b00db0852b36dd30665d655cdb3402c9d0ee1e286bc1a19988f992d8913560f6f943890cb7c993e2fdb798b23df4a1b0801da SHA512 834f760a7c7b51abda55f65d6fad1ce771d293ace9c7e4e39aaf5bfbc6763f9e3750e0aa3e8e6548893593b5c776bce357d557080b946b3425339367f21f2790 -AUX libgroove-4.3.0_sdl2_include_dir.patch 507 BLAKE2B d96df15e5378f8ab7d2f473c0fe05a210959eeb0ec4548bf7b03b3be701cce263d3c5d91c85834b18b2426e1c3de7845abc5eb069e226429a4d7ae67809f156c SHA512 5c9954680369c9e90a5acda70da36a57ea64ce8f44fcb5a0f962636cbf710ddd968c7c7bff18819671b6b89dc68a0b9513b8223ac7ba9bedf8f005b4485272ac -DIST libgroove-4.3.0.tar.gz 48857 BLAKE2B 40659e84a00245791746c570ba667cb97ba61de2bf9c1e746aaacb02db4ef5d15a00561aed7001f9a9a7b20ad8645f74c12a836b8bd59ebbc1abbda045d558d0 SHA512 30d75a3b1b3efa9b33687bb146648b66f8f4c718551c0db2c24c0259f09cf355a7c7bbac40d60d7a97bbbd7f83401d09464c6ac2b18cdfcd6198220cefc8a705 -EBUILD libgroove-4.3.0-r1.ebuild 1034 BLAKE2B 51ff73ff9ca7beb103c59ec0fa2ec93d3f5ebfcfabe90856635fc4646b1872a498d236b7d816e03037a6512eababa1ca30d2ff4afbd1c1462d27d0607cf51966 SHA512 b3bdb7c215e049b88341244b7b2458869ef949fa9e039008fa561696b2057c38686954852a217674279e5ffc2626181cf9b4fefafe12cd2078727d028906a8df -MISC metadata.xml 1012 BLAKE2B 6484365a3e695db09f305f8a4a8f04ee08947c17fb397a2657e4c839afd30ce01424a35c0716228fc3b836cdb68b57227ec93c135f2f168068c068d08e3ccc5c SHA512 ea0dc25acb9d66d9b22bd684216c20eb22892fa6caf63dcba6179687bcde45b4289de544509ee014f2c52ab8bc94bd8299a93bb5bd2f2393527b799fe359a1fb 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..000000000000 --- 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 grooveloudness_static DESTINATION ${CMAKE_INSTALL_LIBDIR}) - - - add_executable(replaygain example/replaygain.c) -@@ -278,8 +280,8 @@ else() - target_link_libraries(groovefingerprinter LINK_PRIVATE ${CHROMAPRINT_LIBRARY}) - include_directories(${CHROMAPRINT_INCLUDE_DIR}) - -- install(FILES "groovefingerprinter/fingerprinter.h" DESTINATION "include/groovefingerprinter") -- install(TARGETS groovefingerprinter DESTINATION lib) -+ install(FILES "groovefingerprinter/fingerprinter.h" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/groovefingerprinter") -+ install(TARGETS groovefingerprinter DESTINATION ${CMAKE_INSTALL_LIBDIR}) - - - add_library(groovefingerprinter_static STATIC -@@ -288,7 +290,7 @@ else() - set_target_properties(groovefingerprinter_static PROPERTIES - OUTPUT_NAME groovefingerprinter - COMPILE_FLAGS "${LIB_CFLAGS} -fPIC") -- install(TARGETS groovefingerprinter_static DESTINATION lib) -+ install(TARGETS groovefingerprinter_static DESTINATION ${CMAKE_INSTALL_LIBDIR}) - - - add_executable(fingerprint example/fingerprint.c) diff --git a/media-libs/libgroove/files/libgroove-4.3.0_cflags.patch b/media-libs/libgroove/files/libgroove-4.3.0_cflags.patch deleted file mode 100644 index c7d21cbe2de4..000000000000 --- a/media-libs/libgroove/files/libgroove-4.3.0_cflags.patch +++ /dev/null @@ -1,43 +0,0 @@ -From e5af72acd284db1ee2b79aeeb06714770d1ad5c3 Mon Sep 17 00:00:00 2001 -From: Diogo Pereira -Date: Thu, 20 Aug 2015 15:05:25 +0100 -Subject: [PATCH] Remove -Werror, -pedantic and -g from CFLAGS - -Based on upstream commits: -0b619fa build: -Werror and -pedantic in debug mode only -856c260 build: remove redundant -Werror and -pedantic - -https://github.com/andrewrk/libgroove/compare/44aa5db96cfe45e56fa1f7d762fb032ca178a35c...856c26013e4356d4fc078da980083bc4d002771d ---- - CMakeLists.txt | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a1e8541..14aca44 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -135,8 +135,11 @@ configure_file ( - "${PROJECT_BINARY_DIR}/config.h" - ) - --set(LIB_CFLAGS "${C99_C_FLAGS} -pedantic -Werror -Wall -Werror=strict-prototypes -Werror=old-style-definition -Werror=missing-prototypes -D_REENTRANT -D_POSIX_C_SOURCE=200809L") --set(EXAMPLE_CFLAGS "${C99_C_FLAGS} -pedantic -Werror -Wall -g") -+set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -Wno-unused-variable") -+set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Werror -pedantic") -+ -+set(LIB_CFLAGS "-std=c99 -Wall -Werror=strict-prototypes -Werror=old-style-definition -Werror=missing-prototypes -D_REENTRANT -D_POSIX_C_SOURCE=200809L") -+set(EXAMPLE_CFLAGS "-std=c99 -Wall") - set(EXAMPLE_INCLUDES "${PROJECT_SOURCE_DIR}") - - add_library(groove SHARED ${LIBGROOVE_SOURCES} ${LIBGROOVE_HEADERS}) -@@ -306,6 +309,7 @@ message("\n" - "Installation Summary\n" - "--------------------\n" - "* Install Directory : ${CMAKE_INSTALL_PREFIX}\n" -+"* Build Type : ${CMAKE_BUILD_TYPE}\n" - "* Build libgroove : ${LIBGROOVE_STATUS}\n" - "* Build libgrooveplayer : ${LIBGROOVE_PLAYER_STATUS}\n" - "* Build libgrooveloudness : ${LIBGROOVE_LOUDNESS_STATUS}\n" --- -2.5.0 - diff --git a/media-libs/libgroove/files/libgroove-4.3.0_ffmpeg4.patch b/media-libs/libgroove/files/libgroove-4.3.0_ffmpeg4.patch deleted file mode 100644 index eadc4d98a913..000000000000 --- a/media-libs/libgroove/files/libgroove-4.3.0_ffmpeg4.patch +++ /dev/null @@ -1,47 +0,0 @@ -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/files/libgroove-4.3.0_sdl2_include_dir.patch b/media-libs/libgroove/files/libgroove-4.3.0_sdl2_include_dir.patch deleted file mode 100644 index 7967c23c973e..000000000000 --- a/media-libs/libgroove/files/libgroove-4.3.0_sdl2_include_dir.patch +++ /dev/null @@ -1,13 +0,0 @@ -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 deleted file mode 100644 index 2b45f178d15b..000000000000 --- a/media-libs/libgroove/libgroove-4.3.0-r1.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -DESCRIPTION="Streaming audio processing library" -HOMEPAGE="https://github.com/andrewrk/libgroove" -SRC_URI="https://github.com/andrewrk/libgroove/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0/4" -KEYWORDS="~amd64" -IUSE="+chromaprint +loudness +sound" - -DEPEND=" - media-video/ffmpeg:= - chromaprint? ( media-libs/chromaprint:= ) - loudness? ( media-libs/libebur128:=[speex(+)] ) - sound? ( media-libs/libsdl2[sound] )" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/${P}_cflags.patch" - "${FILESDIR}/${P}_sdl2_include_dir.patch" - "${FILESDIR}/${P}_ffmpeg4.patch" - "${FILESDIR}/${P}_GNUInstallDirs.patch" -) - -src_configure() { - local mycmakeargs=( - -DDISABLE_FINGERPRINTER=$(usex !chromaprint) - -DDISABLE_LOUDNESS=$(usex !loudness) - -DDISABLE_PLAYER=$(usex !sound) - ) - cmake_src_configure -} - -src_install() { - cmake_src_install - rm "${ED}"/usr/$(get_libdir)/*.a || die "failed to remove static libs" -} diff --git a/media-libs/libgroove/metadata.xml b/media-libs/libgroove/metadata.xml deleted file mode 100644 index 59a78738e302..000000000000 --- a/media-libs/libgroove/metadata.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - This library provides decoding and encoding of audio on a playlist. It is intended to be used as a backend for music player applications. That said, it is also generic enough to be used as a backend for any streaming audio processing utility. - - - Enable audio fingerprinting using media-libs/chromaprint. - Enable loudness detection according to the EBU R128 standard using media-libs/libebur128. - Enable audio playing. - - - - superjoe30@gmail.com - Andrew Kelley - - andrewrk/libgroove - https://github.com/andrewrk/libgroove/issues - - -- cgit v1.2.3