From 25e9cea2b7309a3ee09f9c1800d2fa1d531a6dd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A2=D1=80=D0=B0=D1=86=D0=B5=D0=B2=D1=81=D0=BA=D0=B8?= =?UTF-8?q?=D0=B9=20=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80?= Date: Fri, 12 Mar 2021 17:35:57 +0300 Subject: [PATCH] media-libs/oyranos, media-sound/apulse: Removed --- media-libs/oyranos/Manifest | 2 - media-libs/oyranos/oyranos-0.9.6.ebuild | 115 ------------------ media-sound/apulse/Manifest | 1 - .../apulse/apulse-0.1.12_p20180803.ebuild | 63 ---------- media-sound/apulse/apulse-9999.ebuild | 42 ------- media-sound/apulse/files/apulse | 14 --- media-sound/apulse/files/sdk.patch | 103 ---------------- profiles/default/package.keywords/depends | 1 + 8 files changed, 1 insertion(+), 340 deletions(-) delete mode 100644 media-libs/oyranos/Manifest delete mode 100644 media-libs/oyranos/oyranos-0.9.6.ebuild delete mode 100644 media-sound/apulse/Manifest delete mode 100644 media-sound/apulse/apulse-0.1.12_p20180803.ebuild delete mode 100644 media-sound/apulse/apulse-9999.ebuild delete mode 100755 media-sound/apulse/files/apulse delete mode 100644 media-sound/apulse/files/sdk.patch diff --git a/media-libs/oyranos/Manifest b/media-libs/oyranos/Manifest deleted file mode 100644 index 0423bce58..000000000 --- a/media-libs/oyranos/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST oyranos-0.9.6-patches.tar.xz 11680 BLAKE2B 2e082ce2bd091dcb59a92662ec813504fbacf03d452f54260434c3abcd63523b1c718055bb0ea2576202b3f85b4af2b36975902163991e4fe82e8e52f714cf5a SHA512 3c99296188cac1dedbf597208ecf2a3e50a3717b305e0919894d633b2ee4ac7ad9c72daae54535c6f81f49f650db4f2367c4d810156a7a3c9d71f1ccfbfbe493 -DIST oyranos-0.9.6.tar.gz 2247841 BLAKE2B b086104e2de949ec08a452fbab16c219daf36a69771f766fafeccffcdb45b74ff9b4d7754f45896c04d04f3fa78fb1faa1ae898b0594d172dd5e6355ca58af9b SHA512 593aa8ae24e4834fae8fceb72540a9334469c0ed977877da1c359613be7d77053d07fdbff3075380c8af425c8877171f126217b3a91ec511daaaac4ce4a3d111 diff --git a/media-libs/oyranos/oyranos-0.9.6.ebuild b/media-libs/oyranos/oyranos-0.9.6.ebuild deleted file mode 100644 index d71e0603f..000000000 --- a/media-libs/oyranos/oyranos-0.9.6.ebuild +++ /dev/null @@ -1,115 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -if [[ ${PV} = *9999 ]]; then - GITECLASS="git-r3" - EGIT_REPO_URI="https://github.com/${PN}-cms/${PN}.git" -fi -inherit cmake-multilib flag-o-matic ${GITECLASS} -unset GITECLASS - -DESCRIPTION="Colour management system allowing to share settings across apps and services" -HOMEPAGE="http://www.oyranos.org/" -[[ ${PV} != *9999 ]] && \ -SRC_URI="https://github.com/${PN}-cms/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz - https://dev.gentoo.org/~asturm/${P}-patches.tar.xz" - -KEYWORDS="~amd64 ~x86" -LICENSE="BSD" -SLOT="0" -IUSE="X cairo cups doc examples exif fltk jpeg qt5 raw scanner static-libs test tiff" - -REQUIRED_USE="qt5? ( X ) test? ( static-libs )" - -#OY_LINGUAS="cs;de;eo;eu;fr;ru" #TODO - -COMMON_DEPEND=" - >=app-admin/elektra-0.8.4:0[${MULTILIB_USEDEP}] - dev-libs/libxml2[${MULTILIB_USEDEP}] - >=dev-libs/yajl-2.0.4-r1[${MULTILIB_USEDEP}] - media-libs/lcms:2[${MULTILIB_USEDEP}] - media-libs/libpng:0=[${MULTILIB_USEDEP}] - >=media-libs/libXcm-0.5.4[${MULTILIB_USEDEP}] - media-libs/openicc[${MULTILIB_USEDEP}] - cairo? ( x11-libs/cairo[${MULTILIB_USEDEP}] ) - cups? ( net-print/cups[${MULTILIB_USEDEP}] ) - exif? ( media-gfx/exiv2:=[${MULTILIB_USEDEP}] ) - fltk? ( x11-libs/fltk:1 ) - jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - dev-qt/qtxml:5 - ) - raw? ( media-libs/libraw[${MULTILIB_USEDEP}] ) - scanner? ( media-gfx/sane-backends[${MULTILIB_USEDEP}] ) - tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] ) - X? ( - x11-libs/libX11[${MULTILIB_USEDEP}] - x11-libs/libXfixes[${MULTILIB_USEDEP}] - x11-libs/libXinerama[${MULTILIB_USEDEP}] - x11-libs/libXmu[${MULTILIB_USEDEP}] - x11-libs/libXrandr[${MULTILIB_USEDEP}] - x11-libs/libXxf86vm[${MULTILIB_USEDEP}] - ) -" -DEPEND="${COMMON_DEPEND} - doc? ( - app-doc/doxygen - media-gfx/graphviz - )" -RDEPEND="${COMMON_DEPEND} - media-libs/icc-profiles-basiccolor-printing2009 - media-libs/icc-profiles-openicc" - -DOCS=( {AUTHORS,ChangeLog,README}.md ) -RESTRICT="test" - -MULTILIB_CHOST_TOOLS=( - /usr/bin/oyranos-config -) -MULTILIB_WRAPPED_HEADERS=( - /usr/include/oyranos/oyranos_version.h -) - -CMAKE_REMOVE_MODULES_LIST="${CMAKE_REMOVE_MODULES_LIST} FindXcm FindCUPS" - -PATCHES=( "${WORKDIR}/patches" ) - -src_prepare() { - einfo remove bundled libs - rm -r libxcm openicc yajl || die - cmake-utils_src_prepare -} - -multilib_src_configure() { - local mycmakeargs=( - -DCMAKE_INSTALL_DOCDIR=share/doc/${PF} - -DUSE_SYSTEM_ELEKTRA=ON - -DUSE_SYSTEM_LIBXCM=ON - -DUSE_SYSTEM_OPENICC=ON - -DUSE_SYSTEM_YAJL=ON - -DCMAKE_DISABLE_FIND_PACKAGE_Qt4=ON - -DCMAKE_DISABLE_FIND_PACKAGE_Cairo=$(usex '!cairo') - -DCMAKE_DISABLE_FIND_PACKAGE_Cups=$(usex '!cups') - -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=$(multilib_native_usex doc OFF ON) - -DENABLE_EXAMPLES=$(usex examples) - -DCMAKE_DISABLE_FIND_PACKAGE_Exif2=$(usex '!exif') - -DCMAKE_DISABLE_FIND_PACKAGE_FLTK=$(multilib_native_usex fltk OFF ON) - -DCMAKE_DISABLE_FIND_PACKAGE_JPEG=$(usex '!jpeg') - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5=$(multilib_native_usex qt5 OFF ON) - -DCMAKE_DISABLE_FIND_PACKAGE_LibRaw=$(usex '!raw') - -DCMAKE_DISABLE_FIND_PACKAGE_Sane=$(usex '!scanner') - -DENABLE_STATIC_LIBS=$(usex static-libs) - -DENABLE_TESTS=$(usex test) - -DCMAKE_DISABLE_FIND_PACKAGE_TIFF=$(usex '!tiff') - -DCMAKE_DISABLE_FIND_PACKAGE_X11=$(usex '!X') - ) - - cmake-utils_src_configure -} diff --git a/media-sound/apulse/Manifest b/media-sound/apulse/Manifest deleted file mode 100644 index 8b15eda47..000000000 --- a/media-sound/apulse/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST apulse-0.1.12_p20180803.zip 176549 BLAKE2B 98303ea951f15e78090c6e3c7c7174a2770f3c9a59d4f226d6d2ad5e222b7d6056b4b90a9e4f8b5b6569f7387c699c8107aadc25190babc4013083e182fa70fd SHA512 a292140e9d254d8987b468741c9c46c358708b0ed1391a00ed7248b837d31c403ffb063d8ac0243e65c0bfdf9fdbae9ff2cf6684e24c94aaf10e080d6cd1e4fc diff --git a/media-sound/apulse/apulse-0.1.12_p20180803.ebuild b/media-sound/apulse/apulse-0.1.12_p20180803.ebuild deleted file mode 100644 index 0b79f5428..000000000 --- a/media-sound/apulse/apulse-0.1.12_p20180803.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit multilib cmake-multilib - -COMMIT="bcd55c85365aff30668f17e2ed6ba86d5d235ce3" - -DESCRIPTION="PulseAudio emulation for ALSA" -HOMEPAGE="https://github.com/i-rinat/apulse" -SRC_URI="https://codeload.github.com/i-rinat/${PN}/zip/${COMMIT} -> ${P}.zip" - -LICENSE="MIT LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 x86" - -IUSE="debug sdk test" - -DEPEND="dev-libs/glib:2[${MULTILIB_USEDEP}] - media-libs/alsa-lib[${MULTILIB_USEDEP}] - sdk? ( !media-sound/pulseaudio ) " -RDEPEND="${DEPEND}" - -PATCHES=( "${FILESDIR}/sdk.patch" ) - -S="${WORKDIR}/${PN}-${COMMIT}" - -src_prepare() { - cmake-utils_src_prepare - - if ! use sdk; then - # Ensure all relevant libdirs are added, to support all ABIs - DIRS= - _add_dir() { DIRS="${EPREFIX}/usr/$(get_libdir)/apulse${DIRS:+:${DIRS}}"; } - multilib_foreach_abi _add_dir - sed -e "s#@@DIRS@@#${DIRS}#g" "${FILESDIR}"/apulse > "${T}"/apulse || die - fi -} - -multilib_src_configure() { - local mycmakeargs=( - "-DINSTALL_SDK=$(usex sdk)" - "-DLOG_TO_STDERR=$(usex debug)" - "-DWITH_TRACE=$(usex debug)" - ) - cmake-utils_src_configure -} - -multilib_src_test() { - emake check -} - -multilib_src_install_all() { - # Do not use deprecated MULTILIB_CHOST_TOOLS - if ! use sdk; then - unset BUILD_DIR - _install_wrapper() { newbin "${BUILD_DIR}/apulse" "${CHOST}-apulse"; } - multilib_foreach_abi _install_wrapper - dobin "${T}/apulse" - fi - einstalldocs -} diff --git a/media-sound/apulse/apulse-9999.ebuild b/media-sound/apulse/apulse-9999.ebuild deleted file mode 100644 index c21e4ee3d..000000000 --- a/media-sound/apulse/apulse-9999.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit multilib cmake-multilib git-r3 - -DESCRIPTION="PulseAudio emulation for ALSA" -HOMEPAGE="https://github.com/i-rinat/apulse" - -EGIT_REPO_URI="https://github.com/i-rinat/apulse.git" - -LICENSE="MIT LGPL-2.1" -SLOT="0" -KEYWORDS="" - -DEPEND="dev-libs/glib:2[${MULTILIB_USEDEP}] - media-libs/alsa-lib[${MULTILIB_USEDEP}]" -RDEPEND="${DEPEND}" - -MULTILIB_CHOST_TOOLS=( /usr/bin/apulse ) - -src_prepare() { - cmake-utils_src_prepare - - # Ensure all relevant libdirs are added, to support all ABIs - DIRS= - _add_dir() { DIRS="${EPREFIX}/usr/$(get_libdir)/apulse${DIRS:+:${DIRS}}"; } - multilib_foreach_abi _add_dir - sed -e "s#@@DIRS@@#${DIRS}#g" "${FILESDIR}"/apulse > "${T}"/apulse || die -} - -multilib_src_configure() { - local mycmakeargs=("-DAPULSEPATH=${EPREFIX}/usr/$(get_libdir)/apulse") - cmake-utils_src_configure -} - -multilib_src_install_all() { - cmake-utils_src_install - einstalldocs - dobin "${T}"/apulse -} diff --git a/media-sound/apulse/files/apulse b/media-sound/apulse/files/apulse deleted file mode 100755 index 32633b2d9..000000000 --- a/media-sound/apulse/files/apulse +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh -# Author: Daniel Campbell -# License: Creative Commons Public Domain Dedication (CC0 1.0) -# - -# apulse needs at least one argument -if [ $# -lt 1 ]; then - echo "Usage: apulse [options]" - exit -fi - -# Set library path for the application so it'll use apulse. DIRS is -# replaced by the ebuild to include the correct paths -LD_LIBRARY_PATH=@@DIRS@@${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} exec "$@" diff --git a/media-sound/apulse/files/sdk.patch b/media-sound/apulse/files/sdk.patch deleted file mode 100644 index bc12090b7..000000000 --- a/media-sound/apulse/files/sdk.patch +++ /dev/null @@ -1,103 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 072f3b1..5fe6bcd 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,5 +1,6 @@ - project(apulse) - cmake_minimum_required (VERSION 2.8) -+include(GNUInstallDirs) - - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -Wall -fPIC -fvisibility=hidden") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror=implicit-function-declaration") -@@ -28,6 +29,8 @@ else() - include_directories(${PA_INCLUDE_DIRECTORIES}) - endif() - -+set(INSTALL_SDK 0 CACHE BOOLEAN "Install SDK files to build applications with apulse (Pulse Audio headers and pkg-config files) instead of system ones") -+ - link_directories(${REQ_LIBRARY_DIRS}) - - add_library(trace-helper STATIC -@@ -72,12 +75,30 @@ target_link_libraries(pulse-simple ${SYMBOLMAP} trace-helper ${REQ_LIBRARIES}) - - add_subdirectory(tests) - --set(APULSEPATH "${CMAKE_INSTALL_PREFIX}/lib/apulse" CACHE PATH "library installation directory") --set(APULSE_SEARCH_PATHS "${APULSEPATH}" CACHE PATH "directory list for LD_LIBRARY_PATH") --configure_file("${CMAKE_CURRENT_SOURCE_DIR}/src/apulse.template" -- "${CMAKE_CURRENT_BINARY_DIR}/apulse" @ONLY) -+if (${INSTALL_SDK}) -+ set(APULSEPATH "${CMAKE_INSTALL_LIBDIR}" CACHE PATH "library installation directory") -+ -+ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/pkgconfig/libpulse.pc.in" -+ "${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/libpulse.pc" @ONLY) -+ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/pkgconfig/libpulse-simple.pc.in" -+ "${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/libpulse-simple.pc" @ONLY) -+ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/pkgconfig/libpulse-mainloop-glib.pc.in" -+ "${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/libpulse-mainloop-glib.pc" @ONLY) -+else() -+ set(APULSEPATH "${CMAKE_INSTALL_LIBDIR}/apulse" CACHE PATH "library installation directory") -+ set(APULSE_SEARCH_PATHS "${CMAKE_INSTALL_PREFIX}/${APULSEPATH}" CACHE PATH "directory list for LD_LIBRARY_PATH") -+ -+ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/src/apulse.template" -+ "${CMAKE_CURRENT_BINARY_DIR}/apulse" @ONLY) -+endif() - --install(FILES "${CMAKE_CURRENT_BINARY_DIR}/apulse" DESTINATION bin -- PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) - install(TARGETS pulse-simple pulse pulse-mainloop-glib DESTINATION "${APULSEPATH}") --install(FILES "${CMAKE_SOURCE_DIR}/man/apulse.1" DESTINATION share/man/man1) -+ -+if (${INSTALL_SDK}) -+ install(DIRECTORY "${CMAKE_SOURCE_DIR}/3rdparty/pulseaudio-headers/pulse" DESTINATION include) -+ install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/pkgconfig" DESTINATION "${CMAKE_INSTALL_LIBDIR}") -+else() -+ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/apulse" DESTINATION bin -+ PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) -+ install(FILES "${CMAKE_SOURCE_DIR}/man/apulse.1" DESTINATION share/man/man1) -+endif() -diff --git a/pkgconfig/libpulse-mainloop-glib.pc.in b/pkgconfig/libpulse-mainloop-glib.pc.in -new file mode 100644 -index 0000000..957e3b2 ---- /dev/null -+++ b/pkgconfig/libpulse-mainloop-glib.pc.in -@@ -0,0 +1,9 @@ -+libdir=@CMAKE_INSTALL_FULL_LIBDIR@ -+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ -+ -+Name: libpulse-mainloop-glib -+Description: PulseAudio GLib 2.0 Main Loop Wrapper (apulse) -+Version: 5.0 -+Libs: -L${libdir} -lpulse-mainloop-glib -pthread -+Cflags: -I${includedir} -+Requires: glib-2.0 -diff --git a/pkgconfig/libpulse-simple.pc.in b/pkgconfig/libpulse-simple.pc.in -new file mode 100644 -index 0000000..57d917f ---- /dev/null -+++ b/pkgconfig/libpulse-simple.pc.in -@@ -0,0 +1,9 @@ -+libdir=@CMAKE_INSTALL_FULL_LIBDIR@ -+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ -+ -+Name: libpulse-simple -+Description: PulseAudio Simplified Synchronous Client Interface (apulse) -+Version: 5.0 -+Libs: -L${libdir} -lpulse-simple -pthread -+Cflags: -I${includedir} -+Requires: glib-2.0 -diff --git a/pkgconfig/libpulse.pc.in b/pkgconfig/libpulse.pc.in -new file mode 100644 -index 0000000..edcbbd8 ---- /dev/null -+++ b/pkgconfig/libpulse.pc.in -@@ -0,0 +1,9 @@ -+libdir=@CMAKE_INSTALL_FULL_LIBDIR@ -+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ -+ -+Name: libpulse -+Description: PulseAudio Client Interface (apulse) -+Version: 5.0 -+Libs: -L${libdir} -lpulse -pthread -+Cflags: -I${includedir} -+Requires: glib-2.0 alsa diff --git a/profiles/default/package.keywords/depends b/profiles/default/package.keywords/depends index 053f2831a..2a3cf0c25 100644 --- a/profiles/default/package.keywords/depends +++ b/profiles/default/package.keywords/depends @@ -418,6 +418,7 @@ ~media-libs/libXcm-0.5.4 amd64 ~media-libs/openicc-0.1.0 amd64 =media-libs/oyranos-0.9.6 amd64 +~media-libs/oyranos-0.9.6 amd64 ~media-libs/qhull-2015.2 amd64 ~media-libs/sdl-pango-0.1.2 amd64 ~media-libs/speex-1.2.0 amd64