From 02e2208f46f4e2c00fb9743cbc47350bdd233bfa Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 16 Jan 2018 17:34:21 +0000 Subject: gentoo resync : 16.01.2018 --- media-libs/Manifest.gz | Bin 66641 -> 66621 bytes media-libs/babl/Manifest | 2 +- media-libs/babl/babl-0.1.38.ebuild | 2 +- media-libs/ctl/Manifest | 4 +- media-libs/ctl/ctl-1.5.2-r1.ebuild | 27 ++ media-libs/ctl/ctl-1.5.2.ebuild | 27 -- ...-GNUInstallDirs-and-fix-PkgConfig-files-1.patch | 399 +++++++++++++++++++++ ...se-GNUInstallDirs-and-fix-PkgConfig-files.patch | 399 --------------------- media-libs/gegl/Manifest | 2 +- media-libs/gegl/gegl-0.3.26.ebuild | 2 +- media-libs/imlib/Manifest | 1 - media-libs/imlib/imlib-1.9.15-r4.ebuild | 68 ---- media-libs/libdvdcss/Manifest | 7 +- media-libs/libdvdcss/libdvdcss-1.2.13-r1.ebuild | 30 -- media-libs/libdvdcss/libdvdcss-1.2.13.ebuild | 30 -- media-libs/libdvdcss/libdvdcss-1.3.99.ebuild | 30 -- media-libs/libdvdcss/libdvdcss-1.4.1.ebuild | 30 ++ media-libs/libv4l/Manifest | 3 + .../libv4l/files/libv4l-1.14.1-sysmacros.patch | 26 ++ media-libs/libv4l/libv4l-1.14.1.ebuild | 64 ++++ media-libs/openal/Manifest | 6 +- media-libs/openal/openal-1.17.2.ebuild | 61 ---- media-libs/openal/openal-1.18.1.ebuild | 61 ---- media-libs/openal/openal-1.18.2-r1.ebuild | 65 ++++ media-libs/openal/openal-1.18.2.ebuild | 61 ---- media-libs/opencolorio/Manifest | 6 +- .../files/opencolorio-1.0.9-cmake-fixes-v1.patch | 150 -------- .../files/opencolorio-1.1.0-cmake-fixes.patch | 173 +++++++++ .../opencolorio/opencolorio-1.0.9_p20170719.ebuild | 86 ----- media-libs/opencolorio/opencolorio-1.1.0.ebuild | 85 +++++ media-libs/openh264/Manifest | 7 +- media-libs/openh264/openh264-1.4.0-r1.ebuild | 93 ----- media-libs/openh264/openh264-1.5.0.ebuild | 95 ----- media-libs/openh264/openh264-1.7.0-r1.ebuild | 103 ++++++ media-libs/openh264/openh264-1.7.0.ebuild | 95 ----- media-libs/simage/Manifest | 2 +- media-libs/simage/simage-1.7.0-r1.ebuild | 2 +- media-libs/vips/Manifest | 2 +- media-libs/xine-lib/Manifest | 4 +- media-libs/xine-lib/xine-lib-1.2.9.ebuild | 230 ++++++++++++ media-libs/xine-lib/xine-lib-1.2.9999.ebuild | 149 ++++---- 41 files changed, 1298 insertions(+), 1391 deletions(-) create mode 100644 media-libs/ctl/ctl-1.5.2-r1.ebuild delete mode 100644 media-libs/ctl/ctl-1.5.2.ebuild create mode 100644 media-libs/ctl/files/ctl-1.5.2-Use-GNUInstallDirs-and-fix-PkgConfig-files-1.patch delete mode 100644 media-libs/ctl/files/ctl-1.5.2-Use-GNUInstallDirs-and-fix-PkgConfig-files.patch delete mode 100644 media-libs/imlib/imlib-1.9.15-r4.ebuild delete mode 100644 media-libs/libdvdcss/libdvdcss-1.2.13-r1.ebuild delete mode 100644 media-libs/libdvdcss/libdvdcss-1.2.13.ebuild delete mode 100644 media-libs/libdvdcss/libdvdcss-1.3.99.ebuild create mode 100644 media-libs/libdvdcss/libdvdcss-1.4.1.ebuild create mode 100644 media-libs/libv4l/files/libv4l-1.14.1-sysmacros.patch create mode 100644 media-libs/libv4l/libv4l-1.14.1.ebuild delete mode 100644 media-libs/openal/openal-1.17.2.ebuild delete mode 100644 media-libs/openal/openal-1.18.1.ebuild create mode 100644 media-libs/openal/openal-1.18.2-r1.ebuild delete mode 100644 media-libs/openal/openal-1.18.2.ebuild delete mode 100644 media-libs/opencolorio/files/opencolorio-1.0.9-cmake-fixes-v1.patch create mode 100644 media-libs/opencolorio/files/opencolorio-1.1.0-cmake-fixes.patch delete mode 100644 media-libs/opencolorio/opencolorio-1.0.9_p20170719.ebuild create mode 100644 media-libs/opencolorio/opencolorio-1.1.0.ebuild delete mode 100644 media-libs/openh264/openh264-1.4.0-r1.ebuild delete mode 100644 media-libs/openh264/openh264-1.5.0.ebuild create mode 100644 media-libs/openh264/openh264-1.7.0-r1.ebuild delete mode 100644 media-libs/openh264/openh264-1.7.0.ebuild create mode 100644 media-libs/xine-lib/xine-lib-1.2.9.ebuild (limited to 'media-libs') diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz index 3b12d86be482..f02907fe8fc0 100644 Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ diff --git a/media-libs/babl/Manifest b/media-libs/babl/Manifest index 90704941441f..2bd8eb9e4cbc 100644 --- a/media-libs/babl/Manifest +++ b/media-libs/babl/Manifest @@ -13,6 +13,6 @@ EBUILD babl-0.1.22.ebuild 1470 BLAKE2B ed22d82d070011f4ea7b74287354d7a24fa3d678c EBUILD babl-0.1.24.ebuild 1470 BLAKE2B d57126777551602316904cf91ee2fef8fcc0816aa507e465cf53848145f981d7ca2437d6f70e8f5b789381d6c32fbe9229aa2df72aeb32a59d54300c08134d5a SHA512 136b249c012baec7e26867d8d226182f8f97606d5140c3157c9f5d85d9f91e14aea9ec86e527e112a1b1ad3e56d461b2272c9bfadd2f2f6f8aac8a561aea6d7c EBUILD babl-0.1.26.ebuild 1470 BLAKE2B d57126777551602316904cf91ee2fef8fcc0816aa507e465cf53848145f981d7ca2437d6f70e8f5b789381d6c32fbe9229aa2df72aeb32a59d54300c08134d5a SHA512 136b249c012baec7e26867d8d226182f8f97606d5140c3157c9f5d85d9f91e14aea9ec86e527e112a1b1ad3e56d461b2272c9bfadd2f2f6f8aac8a561aea6d7c EBUILD babl-0.1.30.ebuild 1470 BLAKE2B d57126777551602316904cf91ee2fef8fcc0816aa507e465cf53848145f981d7ca2437d6f70e8f5b789381d6c32fbe9229aa2df72aeb32a59d54300c08134d5a SHA512 136b249c012baec7e26867d8d226182f8f97606d5140c3157c9f5d85d9f91e14aea9ec86e527e112a1b1ad3e56d461b2272c9bfadd2f2f6f8aac8a561aea6d7c -EBUILD babl-0.1.38.ebuild 1470 BLAKE2B d57126777551602316904cf91ee2fef8fcc0816aa507e465cf53848145f981d7ca2437d6f70e8f5b789381d6c32fbe9229aa2df72aeb32a59d54300c08134d5a SHA512 136b249c012baec7e26867d8d226182f8f97606d5140c3157c9f5d85d9f91e14aea9ec86e527e112a1b1ad3e56d461b2272c9bfadd2f2f6f8aac8a561aea6d7c +EBUILD babl-0.1.38.ebuild 1469 BLAKE2B e3a02df1c8226f53efa3e9e799868150892178d10713cf4b1fe204425063e83edaee61693fe02938c69e1821b5219b1cf1862659388cfd7d5bb9fad2fa0e5e8b SHA512 e0f24471cb2196d70991f0a9f50cb9e47659d20b65ab0ed83bb65e0076791ded6f2eb291a9a339ecc7bc703633f5e92e6f1b94b1ef34fb5c99f80b9cb37d79ab EBUILD babl-9999.ebuild 1470 BLAKE2B d57126777551602316904cf91ee2fef8fcc0816aa507e465cf53848145f981d7ca2437d6f70e8f5b789381d6c32fbe9229aa2df72aeb32a59d54300c08134d5a SHA512 136b249c012baec7e26867d8d226182f8f97606d5140c3157c9f5d85d9f91e14aea9ec86e527e112a1b1ad3e56d461b2272c9bfadd2f2f6f8aac8a561aea6d7c MISC metadata.xml 307 BLAKE2B 95a78257a39aec8fdf8c1c1c1fa0a6f2d911f6c7f22021021f3d1457d7beffad0a47b0f0131926e988340fccc4ca8ef49d086940e0e17acb89d4f3c6845b79f4 SHA512 a86588c27e62fec9d8474d9ba5edd9d235a6ffd1251d5ba729593ba7bdffdb272020567a7db2d596f17bba9c2a39a75eed9ac5eee5e0ba73af081a05fcb1af9e diff --git a/media-libs/babl/babl-0.1.38.ebuild b/media-libs/babl/babl-0.1.38.ebuild index 2fbd15d67afb..7a87189aa52b 100644 --- a/media-libs/babl/babl-0.1.38.ebuild +++ b/media-libs/babl/babl-0.1.38.ebuild @@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then SRC_URI="" else SRC_URI="http://ftp.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" fi DESCRIPTION="A dynamic, any to any, pixel format conversion library" diff --git a/media-libs/ctl/Manifest b/media-libs/ctl/Manifest index 56d885f3323b..6b3aff3f18e0 100644 --- a/media-libs/ctl/Manifest +++ b/media-libs/ctl/Manifest @@ -1,8 +1,8 @@ AUX ctl-1.4.1-gcc43.patch 2696 BLAKE2B 628ad07e0a8fdf1677cdf01dc47400ed8e9437b90ec382511686fd5edabf155478a4e23e3b2ef62dd302eaac47cc0b63f16fd528b7a977dc5555c55af0193cf6 SHA512 dfceeb1ab50299c1f8b09e118d28c81307bca5a28691994e4a7e413f8e1e508b4efd06084857dcfcfa7605fa304f312495d354a8d33748858cb77c02ac4933ba AUX ctl-1.4.1-gcc47.patch 302 BLAKE2B 8cbf57d3e0068e8527f82f426f7128d66ff096c24ec602ab7630e1c119cc83e8972161f4a0679b75b8ab887e4ffec253dd888125e28209aa50fa15bd282ba488 SHA512 40f2afde912a9d35703b755f569c9d42f8c90f957e1acecea4eed6b55d514fee1252acbf1f229b23e69ea9d5e47c73311e0a293af801af2e61e3981566258c93 -AUX ctl-1.5.2-Use-GNUInstallDirs-and-fix-PkgConfig-files.patch 16825 BLAKE2B 3faabaff992059e8193c9b74c2c78a6a4fb56d7bc3c1ce6cfb1f83f34cdcb3aff0404be3ff85b4106726a8fb64a72ecc8d4c45219949fa844b6a9dd262757388 SHA512 0d568a75131a2412881cfc64c66c0ea1d5119dea1b46fa65f63fa34d7b30685575e1eb6969c82e28c5c5f8bbaf7501bf9efefc928f6526a05bd1b223df9c83ca +AUX ctl-1.5.2-Use-GNUInstallDirs-and-fix-PkgConfig-files-1.patch 16825 BLAKE2B 4a732a2b461e81016d0d3e165d998b19904fbd9a77af4cc041b29a6c785beaedec109fe33ddcc6cb05c08f3001231b1e832a687dfccf96fbef70c4e517737fb0 SHA512 53df4449eb0acca2f20a42cf9945870e580de3be6be416c52428e300aca1833eda081d6fc17024aa61f1ecd0886098958d187249a9189fb6d1e62c82d0964afb DIST ctl-1.4.1.tar.gz 996923 BLAKE2B 20dba7a3cb93e89ecb656a6ee34b35e1a35c3c4cda63bafe2162de15afca4b8e32f2156a0b1b2268d59bc5923c1687817433c41031be07b810762f9feea36fc8 SHA512 671efbdef287c69b416462d479be58c6cfba331b5b6faa1a694ece162aa2ee966482423babb49c61de3d5046499a81110e4cd30824d9d36a3d6b69068b075063 DIST ctl-1.5.2.tar.gz 1411871 BLAKE2B 223740aa8b68630f449b65e17470c76b2825a77eead040724b65e9e69752a696f642ae6755116046e188305a7d043c4def7cb8a773ad08d51fba35e9273b3a71 SHA512 c92af23e897f30f96ecb27b4b865e2fe1a1e33c8616797fc18f68e7fcc89210ce8ae70a003169b2f449bfd5f90d192734f1e8038b1d3e03c5f48c81587c871c6 EBUILD ctl-1.4.1.ebuild 746 BLAKE2B 95436778c6f9687dacc3969eda2530510b401e4c498e41c80b035d7a261caa2daee22f8f5ed5b0941c5b5c36a05d03f49cd6fe0105f811347b347703da753998 SHA512 f4e82d25b87b3704d60cc3701a4dbb91c0eb47716d33444a1fb2cdf5961d2b4e6e4d7b7666c51456bc2b2019f13afbfd3b239e4671085bce5d5723f2fa845802 -EBUILD ctl-1.5.2.ebuild 686 BLAKE2B 82e8289849bc9c22d14a251e97ebad528d6cdc6a2e4b477dd5c4cb978f6ecdbd1408eab2989c7801cdfe4a750d658e4d158ebfb0b2c1b99cfcbe7289f57cf56c SHA512 369f0ff3b956b723df5d239d7d382d6d664d51bdbd3d1f095734407b172bae021f0bc144acfa7c052cdc66d7b14accdbbdfe21b3de1e72b7b532ed64318034e4 +EBUILD ctl-1.5.2-r1.ebuild 688 BLAKE2B 5391c6bf83c3a7f1ecf5717020fffbdc0583b9a43fff3051c23efea6f6b0b60ea28822907bc2095df347895327a3068f2acc8e6b99e11182d6374a0df3b69cb9 SHA512 8b0f01a45f4a61de31e03aff05a641292e67f7309664c574838af1c5a5c9a515fbfefb27aaf8504558a77cef7f9df4c07ff350810f587569c6787881aa962b5c MISC metadata.xml 297 BLAKE2B 773f2836e68b0405f210dc51fac01e9c40845d34e4d7ed036916af8f8d63bebcd91bbd672bf84e4dac6ab84135915db85914c07a8bdecdb1ce3c3ff1b5f6408b SHA512 e437384a215b9cd38ecc3e4721bb47c6acf9b8c17d6bc348ddb1272b899428cf7835371a3fca39e6b66f49f1760996fccc336bf15f6d4e36783bd12db84afe49 diff --git a/media-libs/ctl/ctl-1.5.2-r1.ebuild b/media-libs/ctl/ctl-1.5.2-r1.ebuild new file mode 100644 index 000000000000..55acc2744c99 --- /dev/null +++ b/media-libs/ctl/ctl-1.5.2-r1.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit cmake-utils + +DESCRIPTION="AMPAS' Color Transformation Language" +HOMEPAGE="https://github.com/ampas/CTL" +SRC_URI="${HOMEPAGE}/archive/ctl-${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="AMPAS" +SLOT="0" +KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" + +RDEPEND="media-libs/ilmbase:= + media-libs/openexr:= + media-libs/tiff:= + !media-libs/openexr_ctl" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +S="${WORKDIR}/CTL-ctl-${PV}" + +PATCHES=( "${FILESDIR}/${P}-Use-GNUInstallDirs-and-fix-PkgConfig-files-1.patch" ) + +mycmakeargs=( -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}" ) diff --git a/media-libs/ctl/ctl-1.5.2.ebuild b/media-libs/ctl/ctl-1.5.2.ebuild deleted file mode 100644 index ada618aa9569..000000000000 --- a/media-libs/ctl/ctl-1.5.2.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils - -DESCRIPTION="AMPAS' Color Transformation Language" -HOMEPAGE="https://github.com/ampas/CTL" -SRC_URI="${HOMEPAGE}/archive/ctl-${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="AMPAS" -SLOT="0" -KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" - -RDEPEND="media-libs/ilmbase:= - media-libs/openexr:= - media-libs/tiff:= - !media-libs/openexr_ctl" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -S="${WORKDIR}/CTL-ctl-${PV}" - -PATCHES=( "${FILESDIR}/${P}-Use-GNUInstallDirs-and-fix-PkgConfig-files.patch" ) - -mycmakeargs=( -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}" ) diff --git a/media-libs/ctl/files/ctl-1.5.2-Use-GNUInstallDirs-and-fix-PkgConfig-files-1.patch b/media-libs/ctl/files/ctl-1.5.2-Use-GNUInstallDirs-and-fix-PkgConfig-files-1.patch new file mode 100644 index 000000000000..e4fadf1aa05c --- /dev/null +++ b/media-libs/ctl/files/ctl-1.5.2-Use-GNUInstallDirs-and-fix-PkgConfig-files-1.patch @@ -0,0 +1,399 @@ +From db1cccd9cee830f8822521f2c401ea74ad161360 Mon Sep 17 00:00:00 2001 +From: Jonathan Scruggs +Date: Mon, 25 Sep 2017 17:41:26 +0100 +Subject: [PATCH] CTL: Use GNUInstallDirs and fix PkgConfig files + +* GNUInstallDirs are variables set by each distro and OS, so we + don't need to define them manually. They can also be set manually + during the configure phase. The code to define custom directories can + be removed and replaced with the equivalent GNUInstallDirs variable. +* Pkg-Config is used to find IlmBase and OpenEXR, but isn't fully + utilized everywhere. This makes Pkg-Config a hard dependency so that + the libraries and directories can be found easily. This will use the + correct libraries no matter how they are named, so this is compatible + with both pre-2.0 and post 2.0 naming schemes. +* The Pkg-Config files had several errors that are now fixed. + +Upstream PR: https://github.com/ampas/CTL/pull/67 +--- + CMakeLists.txt | 36 ++++++++--------------------- + OpenEXR_CTL/CMakeLists.txt | 2 +- + OpenEXR_CTL/CtlModules/CMakeLists.txt | 2 +- + OpenEXR_CTL/exr_ctl_exr/CMakeLists.txt | 4 ++-- + OpenEXR_CTL/exrdpx/CMakeLists.txt | 4 ++-- + config/CTL.pc.in | 8 +++---- + config/OpenEXR_CTL.pc.in | 15 ++++++------- + configure.cmake | 41 ++++++++++++++++------------------ + ctlrender/CMakeLists.txt | 20 ++++++++--------- + doc/CMakeLists.txt | 2 +- + lib/IlmCtl/CMakeLists.txt | 4 ++-- + lib/IlmCtlMath/CMakeLists.txt | 4 ++-- + lib/IlmCtlSimd/CMakeLists.txt | 6 ++--- + lib/IlmImfCtl/CMakeLists.txt | 6 ++--- + lib/dpx/CMakeLists.txt | 1 + + 15 files changed, 66 insertions(+), 89 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 01f622c..35e9a48 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,22 +1,14 @@ + cmake_minimum_required(VERSION 2.8) + project( CTL ) + ++INCLUDE ( GNUInstallDirs ) ++ + set( CTL_MAJOR_VERSION 1 ) + set( CTL_MINOR_VERSION 5 ) +-set( CTL_PATCH_VERSION 0 ) ++set( CTL_PATCH_VERSION 2 ) + set( CTL_VERSION ${CTL_MAJOR_VERSION}.${CTL_MINOR_VERSION}.${CTL_PATCH_VERSION} ) + +-## Make install directories overrideable +-set( INSTALL_LIB_DIR lib CACHE PATH "Install directory for libraries" ) +-set( INSTALL_BIN_DIR bin CACHE PATH "Install directory for executable binaries" ) +-set( INSTALL_INCLUDE_DIR include CACHE PATH "Install directory for public header files" ) +-set( INSTALL_DOC_DIR doc CACHE PATH "Install directory for documentation" ) +-if( WIN32 AND NOT CYGWIN ) +- set(DEF_INSTALL_CMAKE_DIR CMake) +-else() +- set(DEF_INSTALL_CMAKE_DIR lib/CMake/CTL) +-endif() +-set(INSTALL_CMAKE_DIR ${DEF_INSTALL_CMAKE_DIR} CACHE PATH "Install directory for project CMake files" ) ++set(INSTALL_CMAKE_DIR ${CMAKE_INSTALL_FULL_LIBDIR}/cmake/CTL CACHE PATH "Install directory for project CMake files" ) + + # use, i.e. don't skip the full RPATH for the build tree + SET(CMAKE_SKIP_BUILD_RPATH FALSE) +@@ -28,20 +20,11 @@ SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) + # which point to directories outside the build tree to the install RPATH + SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) + # the RPATH to be used when installing, but only if it's not a system directory +-LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/lib" isSystemDir) ++LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_FULL_LIBDIR}" isSystemDir) + IF("${isSystemDir}" STREQUAL "-1") +- SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib") ++ SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_FULL_LIBDIR}") + ENDIF("${isSystemDir}" STREQUAL "-1") + +- +-## convert install paths to absolute +-foreach( p LIB BIN INCLUDE CMAKE DOC) +- set( var INSTALL_${p}_DIR ) +- if( NOT IS_ABSOLUTE "${${var}}" ) +- set( ${var} "${CMAKE_INSTALL_PREFIX}/${${var}}" ) +- endif() +-endforeach() +- + option(ENABLE_SHARED "Enable Shared Libraries" ON) + + if ( ENABLE_SHARED ) +@@ -70,20 +53,19 @@ export( TARGETS IlmCtl IlmCtlMath IlmCtlSimd FILE "${PROJECT_BINARY_DIR}/CTLLibr + export(PACKAGE CTL) + + # Create a CTLBuildTreeSettings.cmake file for the use from the build tree +-file(RELATIVE_PATH CONF_REL_INCLUDE_DIR "${INSTALL_CMAKE_DIR}" "${INSTALL_INCLUDE_DIR}") ++file(RELATIVE_PATH CONF_REL_INCLUDE_DIR "${INSTALL_CMAKE_DIR}" "${CMAKE_INSTALL_FULL_INCLUDEDIR}") + configure_file(config/CTLBuildTreeSettings.cmake.in "${PROJECT_BINARY_DIR}/CTLBuildTreeSettings.cmake" @ONLY) + configure_file(config/CTLConfig.cmake.in "${PROJECT_BINARY_DIR}/CTLConfig.cmake" @ONLY) + configure_file(config/CTLConfigVersion.cmake.in "${PROJECT_BINARY_DIR}/CTLConfigVersion.cmake" @ONLY) + + if ( PKG_CONFIG_FOUND ) + configure_file(config/CTL.pc.in "${PROJECT_BINARY_DIR}/CTL.pc" @ONLY) +-install( FILES "${PROJECT_BINARY_DIR}/CTL.pc" DESTINATION lib/pkgconfig COMPONENT dev ) ++install( FILES "${PROJECT_BINARY_DIR}/CTL.pc" DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig COMPONENT dev ) + endif() + + install( FILES + "${PROJECT_BINARY_DIR}/CTLConfig.cmake" + "${PROJECT_BINARY_DIR}/CTLConfigVersion.cmake" ++ "${PROJECT_BINARY_DIR}/CTLLibraryDepends.cmake" + DESTINATION "${INSTALL_CMAKE_DIR}" COMPONENT dev) +-install(FILES "${PROJECT_BINARY_DIR}/CTLLibraryDepends.cmake" DESTINATION +- "${INSTALL_CMAKE_DIR}" COMPONENT dev) + +diff --git a/OpenEXR_CTL/CMakeLists.txt b/OpenEXR_CTL/CMakeLists.txt +index c1ca53e..3f19dd4 100644 +--- a/OpenEXR_CTL/CMakeLists.txt ++++ b/OpenEXR_CTL/CMakeLists.txt +@@ -13,7 +13,7 @@ add_custom_target( OpenEXR_CTL DEPENDS CtlModules exrdpx exr_ctl_exr ) + + if ( PKG_CONFIG_FOUND ) + configure_file(../config/OpenEXR_CTL.pc.in "${PROJECT_BINARY_DIR}/OpenEXR_CTL.pc" @ONLY) +-install( FILES "${PROJECT_BINARY_DIR}/OpenEXR_CTL.pc" DESTINATION lib/pkgconfig COMPONENT dev ) ++install( FILES "${PROJECT_BINARY_DIR}/OpenEXR_CTL.pc" DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig COMPONENT dev ) + endif() + + # TODO CMake config +diff --git a/OpenEXR_CTL/CtlModules/CMakeLists.txt b/OpenEXR_CTL/CtlModules/CMakeLists.txt +index c63c22e..9c9e5b8 100644 +--- a/OpenEXR_CTL/CtlModules/CMakeLists.txt ++++ b/OpenEXR_CTL/CtlModules/CMakeLists.txt +@@ -2,6 +2,6 @@ install( + FILES + utilities.ctl + DESTINATION +- ${INSTALL_LIB_DIR}/CTL ++ ${CMAKE_INSTALL_LIBDIR}/CTL + ) + +diff --git a/OpenEXR_CTL/exr_ctl_exr/CMakeLists.txt b/OpenEXR_CTL/exr_ctl_exr/CMakeLists.txt +index e396ec5..1f0eea0 100644 +--- a/OpenEXR_CTL/exr_ctl_exr/CMakeLists.txt ++++ b/OpenEXR_CTL/exr_ctl_exr/CMakeLists.txt +@@ -20,6 +20,6 @@ target_link_libraries( exr_ctl_exr IlmCtlSimd IlmCtlMath IlmCtl IlmImfCtl ) + target_link_libraries( exr_ctl_exr ${IlmBase_LIBRARIES} ${IlmBase_LDFLAGS_OTHER} ) + target_link_libraries( exr_ctl_exr ${OpenEXR_LIBRARIES} ${OpenEXR_LDFLAGS_OTHER} ) + +-install( TARGETS exr_ctl_exr DESTINATION ${INSTALL_BIN_DIR} ) ++install( TARGETS exr_ctl_exr DESTINATION ${CMAKE_INSTALL_BINDIR} ) + +-install( FILES change_saturation.ctl DESTINATION ${INSTALL_LIB_DIR}/CTL ) ++install( FILES change_saturation.ctl DESTINATION ${CMAKE_INSTALL_LIBDIR}/CTL ) +diff --git a/OpenEXR_CTL/exrdpx/CMakeLists.txt b/OpenEXR_CTL/exrdpx/CMakeLists.txt +index 50bd116..d9eadd8 100644 +--- a/OpenEXR_CTL/exrdpx/CMakeLists.txt ++++ b/OpenEXR_CTL/exrdpx/CMakeLists.txt +@@ -20,8 +20,8 @@ target_link_libraries( exrdpx IlmCtlSimd IlmCtlMath IlmCtl IlmImfCtl ) + target_link_libraries( exrdpx ${IlmBase_LIBRARIES} ${IlmBase_LDFLAGS_OTHER} ) + target_link_libraries( exrdpx ${OpenEXR_LIBRARIES} ${OpenEXR_LDFLAGS_OTHER} ) + +-install( TARGETS exrdpx DESTINATION ${INSTALL_BIN_DIR} ) ++install( TARGETS exrdpx DESTINATION ${CMAKE_INSTALL_BINDIR} ) + +-install( FILES transform_DPX_EXR.ctl transform_EXR_DPX.ctl DESTINATION ${INSTALL_LIB_DIR}/CTL ) ++install( FILES transform_DPX_EXR.ctl transform_EXR_DPX.ctl DESTINATION ${CMAKE_INSTALL_LIBDIR}/CTL ) + + +diff --git a/config/CTL.pc.in b/config/CTL.pc.in +index 6d6e732..9b212a4 100644 +--- a/config/CTL.pc.in ++++ b/config/CTL.pc.in +@@ -1,8 +1,6 @@ +-prefix=@CMAKE_INSTALL_PREFIX@ +-exec_prefix=@INSTALL_BIN_DIR@ +-libdir=@INSTALL_LIB_DIR@ +-includedir=@INSTALL_INCLUDE_DIR@ +-CTL_includedir=@INSTALL_INCLUDE_DIR@/CTL ++libdir=@CMAKE_INSTALL_FULL_LIBDIR@ ++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ ++CTL_includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@/CTL + + Name: CTL + Description: CTL interpreter library +diff --git a/config/OpenEXR_CTL.pc.in b/config/OpenEXR_CTL.pc.in +index 4cef5c6..39a1a3f 100644 +--- a/config/OpenEXR_CTL.pc.in ++++ b/config/OpenEXR_CTL.pc.in +@@ -1,11 +1,10 @@ +-prefix=@prefix@ +-exec_prefix=@exec_prefix@ +-libdir=@libdir@ +-includedir=@includedir@ +-OpenEXR_includedir=@includedir@/OpenEXR ++libdir=@CMAKE_INSTALL_FULL_LIBDIR@ ++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ ++OpenEXR_includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@/OpenEXR + + Name: OpenEXR_CTL + Description: Simplified OpenEXR interface to CTL +-Version: @OPENEXR_CTL_VERSION@ +-Libs: -L${libdir} -lIlmImfCtl @OPENEXR_LDFLAGS@ @CTL_LDFLAGS@ +-Cflags: @CTL_CXXFLAGS_PC@ @OPENEXR_CXXFLAGS@ -I${OpenEXR_includedir} ++Version: @CTL_VERSION@ ++Libs: -L${libdir} -lIlmImfCtl ++Cflags: -I${OpenEXR_includedir} ++Requires: CTL,OpenEXR +diff --git a/configure.cmake b/configure.cmake +index 1817071..eb7e14e 100644 +--- a/configure.cmake ++++ b/configure.cmake +@@ -1,10 +1,7 @@ +-# Until we get some of these modules into the upstream packages, put them here +-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules/") +-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_INSTALL_PREFIX}/share/CMake") ++# Make Pkg-Config required. ++find_package( PkgConfig ) + +-find_package( PkgConfig QUIET ) +- +-find_package( IlmBase QUIET ) ++PKG_CHECK_MODULES ( IlmBase REQUIRED IlmBase ) + if(IlmBase_FOUND) + message( STATUS "found IlmBase, version ${IlmBase_VERSION}" ) + ### +@@ -13,11 +10,11 @@ if(IlmBase_FOUND) + ### + include_directories( ${IlmBase_INCLUDE_DIRS} ) + link_directories( ${IlmBase_LIBRARY_DIRS} ) +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${IlmBase_CFLAGS}" ) +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${IlmBase_CFLAGS}" ) +- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${IlmBase_LDFLAGS}" ) +- set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${IlmBase_LDFLAGS}" ) +- set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${IlmBase_LDFLAGS}" ) ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${IlmBase_CFLAGS_OTHER}" ) ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${IlmBase_CFLAGS_OTHER}" ) ++ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${IlmBase_LDFLAGS_OTHER}" ) ++ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${IlmBase_LDFLAGS_OTHER}" ) ++ set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${IlmBase_LDFLAGS_OTHER}" ) + else() + message( SEND_ERROR "IlmBase not found, please set the include and library paths manually" ) + endif() +@@ -39,20 +36,20 @@ else() + endif() + endif() + +-find_package( OpenEXR QUIET ) ++PKG_CHECK_MODULES ( OpenEXR REQUIRED OpenEXR ) + if (OpenEXR_FOUND) + message( STATUS "Found OpenEXR, version ${OpenEXR_VERSION}" ) + else() + message( WARNING "Unable to find OpenEXR libraries, disabling" ) + endif() + +-find_package( AcesContainer ) +-if (AcesContainer_FOUND) +- message( STATUS "Found AcesContainer, version ${AcesContainer_VERSION}" ) +-else() +- if ( PKG_CONFIG_FOUND ) +- pkg_check_modules( AcesContainer AcesContainer ) +- else() +- message( WARNING "Unable to find AcesContainer libraries, disabling" ) +- endif() +-endif() ++find_package( AcesContainer ) ++ if (AcesContainer_FOUND) ++ message( STATUS "Found AcesContainer, version ${AcesContainer_VERSION}" ) ++ else() ++ if ( PKG_CONFIG_FOUND ) ++ pkg_check_modules( AcesContainer AcesContainer ) ++ else() ++ message( WARNING "Unable to find AcesContainer libraries, disabling" ) ++ endif() ++ endif() +diff --git a/ctlrender/CMakeLists.txt b/ctlrender/CMakeLists.txt +index 9fced14..d97093d 100644 +--- a/ctlrender/CMakeLists.txt ++++ b/ctlrender/CMakeLists.txt +@@ -11,12 +11,12 @@ include_directories( ${OpenEXR_INCLUDE_DIRS} ) + link_directories( ${OpenEXR_LIBRARY_DIRS} ) + endif() + +-if ( AcesContainer_FOUND ) +-add_definitions( -DHAVE_ACESFILE=1 ) +-include_directories( ${AcesContainer_INCLUDE_DIRS} ) +-link_directories( ${AcesContainer_LIBRARY_DIRS} ) +-endif() +- ++if ( AcesContainer_FOUND ) ++add_definitions( -DHAVE_ACESFILE=1 ) ++include_directories( ${AcesContainer_INCLUDE_DIRS} ) ++link_directories( ${AcesContainer_LIBRARY_DIRS} ) ++endif() ++ + include_directories( "${CMAKE_CURRENT_SOURCE_DIR}" "${PROJECT_SOURCE_DIR}/lib/IlmCtl" "${PROJECT_SOURCE_DIR}/lib/IlmCtlMath" "${PROJECT_SOURCE_DIR}/lib/IlmCtlSimd" "${PROJECT_SOURCE_DIR}/lib/dpx" ) + + add_executable( ctlrender +@@ -41,9 +41,9 @@ if (OpenEXR_FOUND) + target_link_libraries( ctlrender ${OpenEXR_LIBRARIES} ) + target_link_libraries( ctlrender ${OpenEXR_LDFLAGS_OTHER} ) + endif() +-if (AcesContainer_FOUND) +-target_link_libraries( ctlrender ${AcesContainer_LIBRARIES} ) +-target_link_libraries( ctlrender ${AcesContainer_LDFLAGS_OTHER} ) ++if (AcesContainer_FOUND) ++target_link_libraries( ctlrender ${AcesContainer_LIBRARIES} ) ++target_link_libraries( ctlrender ${AcesContainer_LDFLAGS_OTHER} ) + endif() + +-install( TARGETS ctlrender DESTINATION bin ) ++install( TARGETS ctlrender DESTINATION ${CMAKE_INSTALL_BINDIR} ) +diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt +index 0b123d0..9776205 100644 +--- a/doc/CMakeLists.txt ++++ b/doc/CMakeLists.txt +@@ -1 +1 @@ +-install( FILES CtlManual.pdf CtlManual.doc DESTINATION doc/CTL ) ++install( FILES CtlManual.pdf CtlManual.doc DESTINATION ${CMAKE_INSTALL_DOCDIR} ) +diff --git a/lib/IlmCtl/CMakeLists.txt b/lib/IlmCtl/CMakeLists.txt +index 3672a43..ef301bd 100644 +--- a/lib/IlmCtl/CMakeLists.txt ++++ b/lib/IlmCtl/CMakeLists.txt +@@ -22,7 +22,7 @@ add_library( IlmCtl ${DO_SHARED} + ) + + target_link_libraries( IlmCtl ${IlmBase_LDFLAGS_OTHER} ) +-target_link_libraries( IlmCtl Iex IlmThread Half ) ++target_link_libraries( IlmCtl ${IlmBase_LIBRARIES} ) + + set_target_properties( IlmCtl PROPERTIES + VERSION ${CTL_VERSION} +@@ -50,4 +50,4 @@ install( FILES + CtlVersion.h + DESTINATION include/CTL ) + +-install( TARGETS IlmCtl DESTINATION lib ) ++install( TARGETS IlmCtl DESTINATION ${CMAKE_INSTALL_LIBDIR} ) +diff --git a/lib/IlmCtlMath/CMakeLists.txt b/lib/IlmCtlMath/CMakeLists.txt +index 96738cf..6997c74 100644 +--- a/lib/IlmCtlMath/CMakeLists.txt ++++ b/lib/IlmCtlMath/CMakeLists.txt +@@ -18,8 +18,8 @@ install( FILES + CtlLookupTable.h + CtlRbfInterpolator.h + CtlSparseMatrix.h +- DESTINATION include/CTL ) ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/CTL ) + +-install( TARGETS IlmCtlMath DESTINATION lib ) ++install( TARGETS IlmCtlMath DESTINATION ${CMAKE_INSTALL_LIBDIR} ) + + # TODO Add Imath and Iex libadd dependency and version info +diff --git a/lib/IlmCtlSimd/CMakeLists.txt b/lib/IlmCtlSimd/CMakeLists.txt +index 2ba792a..5eaf87d 100644 +--- a/lib/IlmCtlSimd/CMakeLists.txt ++++ b/lib/IlmCtlSimd/CMakeLists.txt +@@ -1,7 +1,7 @@ + include_directories( "${CMAKE_CURRENT_SOURCE_DIR}" "${PROJECT_SOURCE_DIR}/lib/IlmCtl" "${PROJECT_SOURCE_DIR}/lib/IlmCtlMath" ) + + add_executable( halfExpLogTable halfExpLogTable.cpp ) +-target_link_libraries( halfExpLogTable Half ) ++target_link_libraries( halfExpLogTable ${IlmBase_LIBRARIES} ) + + add_custom_command( OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/halfExpLogTable.h" + COMMAND halfExpLogTable "${CMAKE_CURRENT_BINARY_DIR}/halfExpLogTable.h" "${CMAKE_CURRENT_BINARY_DIR}/halfExpLog.h" +@@ -40,6 +40,6 @@ set_target_properties( IlmCtlSimd PROPERTIES + SOVERSION ${CTL_VERSION} + ) + +-install( FILES CtlSimdInterpreter.h DESTINATION include/CTL ) ++install( FILES CtlSimdInterpreter.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/CTL ) + +-install( TARGETS IlmCtlSimd DESTINATION lib ) ++install( TARGETS IlmCtlSimd DESTINATION ${CMAKE_INSTALL_LIBDIR} ) +diff --git a/lib/IlmImfCtl/CMakeLists.txt b/lib/IlmImfCtl/CMakeLists.txt +index 47563df..784e27f 100644 +--- a/lib/IlmImfCtl/CMakeLists.txt ++++ b/lib/IlmImfCtl/CMakeLists.txt +@@ -7,10 +7,10 @@ add_library( IlmImfCtl ${DO_SHARED} + ImfCtlCopyFunctionArg.cpp + ) + +-target_link_libraries( IlmImfCtl IlmCtl IlmImf Iex IlmThread Half ) ++target_link_libraries( IlmImfCtl IlmCtl ${OpenEXR_LIBRARIES} ${IlmBase_LIBRARIES} ) + +-install( FILES ImfCtlApplyTransforms.h DESTINATION include/OpenEXR ) ++install( FILES ImfCtlApplyTransforms.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/OpenEXR ) + + export( TARGETS IlmImfCtl IlmCtl FILE "${PROJECT_BINARY_DIR}/CTLLibraryDepends.cmake" ) + +-install( TARGETS IlmImfCtl DESTINATION lib ) ++install( TARGETS IlmImfCtl DESTINATION ${CMAKE_INSTALL_LIBDIR} ) +diff --git a/lib/dpx/CMakeLists.txt b/lib/dpx/CMakeLists.txt +index c8be26e..918890e 100644 +--- a/lib/dpx/CMakeLists.txt ++++ b/lib/dpx/CMakeLists.txt +@@ -11,3 +11,4 @@ add_library( ctldpx + dpx_rw.cc + ) + ++target_link_libraries( ctldpx ${IlmBase_LIBRARIES} ) diff --git a/media-libs/ctl/files/ctl-1.5.2-Use-GNUInstallDirs-and-fix-PkgConfig-files.patch b/media-libs/ctl/files/ctl-1.5.2-Use-GNUInstallDirs-and-fix-PkgConfig-files.patch deleted file mode 100644 index 98ea2fd6da56..000000000000 --- a/media-libs/ctl/files/ctl-1.5.2-Use-GNUInstallDirs-and-fix-PkgConfig-files.patch +++ /dev/null @@ -1,399 +0,0 @@ -From db1cccd9cee830f8822521f2c401ea74ad161360 Mon Sep 17 00:00:00 2001 -From: Jonathan Scruggs -Date: Mon, 25 Sep 2017 17:41:26 +0100 -Subject: [PATCH] CTL: Use GNUInstallDirs and fix PkgConfig files - -* GNUInstallDirs are variables set by each distro and OS, so we - don't need to define them manually. They can also be set manually - during the configure phase. The code to define custom directories can - be removed and replaced with the equivalent GNUInstallDirs variable. -* Pkg-Config is used to find IlmBase and OpenEXR, but isn't fully - utilized everywhere. This makes Pkg-Config a hard dependency so that - the libraries and directories can be found easily. This will use the - correct libraries no matter how they are named, so this is compatible - with both pre-2.0 and post 2.0 naming schemes. -* The Pkg-Config files had several errors that are now fixed. - -Upstream PR: https://github.com/ampas/CTL/pull/67 ---- - CMakeLists.txt | 36 ++++++++--------------------- - OpenEXR_CTL/CMakeLists.txt | 2 +- - OpenEXR_CTL/CtlModules/CMakeLists.txt | 2 +- - OpenEXR_CTL/exr_ctl_exr/CMakeLists.txt | 4 ++-- - OpenEXR_CTL/exrdpx/CMakeLists.txt | 4 ++-- - config/CTL.pc.in | 8 +++---- - config/OpenEXR_CTL.pc.in | 15 ++++++------- - configure.cmake | 41 ++++++++++++++++------------------ - ctlrender/CMakeLists.txt | 20 ++++++++--------- - doc/CMakeLists.txt | 2 +- - lib/IlmCtl/CMakeLists.txt | 4 ++-- - lib/IlmCtlMath/CMakeLists.txt | 4 ++-- - lib/IlmCtlSimd/CMakeLists.txt | 6 ++--- - lib/IlmImfCtl/CMakeLists.txt | 6 ++--- - lib/dpx/CMakeLists.txt | 1 + - 15 files changed, 66 insertions(+), 89 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 01f622c..35e9a48 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,22 +1,14 @@ - cmake_minimum_required(VERSION 2.8) - project( CTL ) - -+INCLUDE ( GNUInstallDirs ) -+ - set( CTL_MAJOR_VERSION 1 ) - set( CTL_MINOR_VERSION 5 ) --set( CTL_PATCH_VERSION 0 ) -+set( CTL_PATCH_VERSION 2 ) - set( CTL_VERSION ${CTL_MAJOR_VERSION}.${CTL_MINOR_VERSION}.${CTL_PATCH_VERSION} ) - --## Make install directories overrideable --set( INSTALL_LIB_DIR lib CACHE PATH "Install directory for libraries" ) --set( INSTALL_BIN_DIR bin CACHE PATH "Install directory for executable binaries" ) --set( INSTALL_INCLUDE_DIR include CACHE PATH "Install directory for public header files" ) --set( INSTALL_DOC_DIR doc CACHE PATH "Install directory for documentation" ) --if( WIN32 AND NOT CYGWIN ) -- set(DEF_INSTALL_CMAKE_DIR CMake) --else() -- set(DEF_INSTALL_CMAKE_DIR lib/CMake/CTL) --endif() --set(INSTALL_CMAKE_DIR ${DEF_INSTALL_CMAKE_DIR} CACHE PATH "Install directory for project CMake files" ) -+set(INSTALL_CMAKE_DIR ${CMAKE_INSTALL_FULL_LIBDIR}/CMake/CTL CACHE PATH "Install directory for project CMake files" ) - - # use, i.e. don't skip the full RPATH for the build tree - SET(CMAKE_SKIP_BUILD_RPATH FALSE) -@@ -28,20 +20,11 @@ SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) - # which point to directories outside the build tree to the install RPATH - SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) - # the RPATH to be used when installing, but only if it's not a system directory --LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/lib" isSystemDir) -+LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_FULL_LIBDIR}" isSystemDir) - IF("${isSystemDir}" STREQUAL "-1") -- SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib") -+ SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_FULL_LIBDIR}") - ENDIF("${isSystemDir}" STREQUAL "-1") - -- --## convert install paths to absolute --foreach( p LIB BIN INCLUDE CMAKE DOC) -- set( var INSTALL_${p}_DIR ) -- if( NOT IS_ABSOLUTE "${${var}}" ) -- set( ${var} "${CMAKE_INSTALL_PREFIX}/${${var}}" ) -- endif() --endforeach() -- - option(ENABLE_SHARED "Enable Shared Libraries" ON) - - if ( ENABLE_SHARED ) -@@ -70,20 +53,19 @@ export( TARGETS IlmCtl IlmCtlMath IlmCtlSimd FILE "${PROJECT_BINARY_DIR}/CTLLibr - export(PACKAGE CTL) - - # Create a CTLBuildTreeSettings.cmake file for the use from the build tree --file(RELATIVE_PATH CONF_REL_INCLUDE_DIR "${INSTALL_CMAKE_DIR}" "${INSTALL_INCLUDE_DIR}") -+file(RELATIVE_PATH CONF_REL_INCLUDE_DIR "${INSTALL_CMAKE_DIR}" "${CMAKE_INSTALL_FULL_INCLUDEDIR}") - configure_file(config/CTLBuildTreeSettings.cmake.in "${PROJECT_BINARY_DIR}/CTLBuildTreeSettings.cmake" @ONLY) - configure_file(config/CTLConfig.cmake.in "${PROJECT_BINARY_DIR}/CTLConfig.cmake" @ONLY) - configure_file(config/CTLConfigVersion.cmake.in "${PROJECT_BINARY_DIR}/CTLConfigVersion.cmake" @ONLY) - - if ( PKG_CONFIG_FOUND ) - configure_file(config/CTL.pc.in "${PROJECT_BINARY_DIR}/CTL.pc" @ONLY) --install( FILES "${PROJECT_BINARY_DIR}/CTL.pc" DESTINATION lib/pkgconfig COMPONENT dev ) -+install( FILES "${PROJECT_BINARY_DIR}/CTL.pc" DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig COMPONENT dev ) - endif() - - install( FILES - "${PROJECT_BINARY_DIR}/CTLConfig.cmake" - "${PROJECT_BINARY_DIR}/CTLConfigVersion.cmake" -+ "${PROJECT_BINARY_DIR}/CTLLibraryDepends.cmake" - DESTINATION "${INSTALL_CMAKE_DIR}" COMPONENT dev) --install(FILES "${PROJECT_BINARY_DIR}/CTLLibraryDepends.cmake" DESTINATION -- "${INSTALL_CMAKE_DIR}" COMPONENT dev) - -diff --git a/OpenEXR_CTL/CMakeLists.txt b/OpenEXR_CTL/CMakeLists.txt -index c1ca53e..3f19dd4 100644 ---- a/OpenEXR_CTL/CMakeLists.txt -+++ b/OpenEXR_CTL/CMakeLists.txt -@@ -13,7 +13,7 @@ add_custom_target( OpenEXR_CTL DEPENDS CtlModules exrdpx exr_ctl_exr ) - - if ( PKG_CONFIG_FOUND ) - configure_file(../config/OpenEXR_CTL.pc.in "${PROJECT_BINARY_DIR}/OpenEXR_CTL.pc" @ONLY) --install( FILES "${PROJECT_BINARY_DIR}/OpenEXR_CTL.pc" DESTINATION lib/pkgconfig COMPONENT dev ) -+install( FILES "${PROJECT_BINARY_DIR}/OpenEXR_CTL.pc" DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig COMPONENT dev ) - endif() - - # TODO CMake config -diff --git a/OpenEXR_CTL/CtlModules/CMakeLists.txt b/OpenEXR_CTL/CtlModules/CMakeLists.txt -index c63c22e..9c9e5b8 100644 ---- a/OpenEXR_CTL/CtlModules/CMakeLists.txt -+++ b/OpenEXR_CTL/CtlModules/CMakeLists.txt -@@ -2,6 +2,6 @@ install( - FILES - utilities.ctl - DESTINATION -- ${INSTALL_LIB_DIR}/CTL -+ ${CMAKE_INSTALL_LIBDIR}/CTL - ) - -diff --git a/OpenEXR_CTL/exr_ctl_exr/CMakeLists.txt b/OpenEXR_CTL/exr_ctl_exr/CMakeLists.txt -index e396ec5..1f0eea0 100644 ---- a/OpenEXR_CTL/exr_ctl_exr/CMakeLists.txt -+++ b/OpenEXR_CTL/exr_ctl_exr/CMakeLists.txt -@@ -20,6 +20,6 @@ target_link_libraries( exr_ctl_exr IlmCtlSimd IlmCtlMath IlmCtl IlmImfCtl ) - target_link_libraries( exr_ctl_exr ${IlmBase_LIBRARIES} ${IlmBase_LDFLAGS_OTHER} ) - target_link_libraries( exr_ctl_exr ${OpenEXR_LIBRARIES} ${OpenEXR_LDFLAGS_OTHER} ) - --install( TARGETS exr_ctl_exr DESTINATION ${INSTALL_BIN_DIR} ) -+install( TARGETS exr_ctl_exr DESTINATION ${CMAKE_INSTALL_BINDIR} ) - --install( FILES change_saturation.ctl DESTINATION ${INSTALL_LIB_DIR}/CTL ) -+install( FILES change_saturation.ctl DESTINATION ${CMAKE_INSTALL_LIBDIR}/CTL ) -diff --git a/OpenEXR_CTL/exrdpx/CMakeLists.txt b/OpenEXR_CTL/exrdpx/CMakeLists.txt -index 50bd116..d9eadd8 100644 ---- a/OpenEXR_CTL/exrdpx/CMakeLists.txt -+++ b/OpenEXR_CTL/exrdpx/CMakeLists.txt -@@ -20,8 +20,8 @@ target_link_libraries( exrdpx IlmCtlSimd IlmCtlMath IlmCtl IlmImfCtl ) - target_link_libraries( exrdpx ${IlmBase_LIBRARIES} ${IlmBase_LDFLAGS_OTHER} ) - target_link_libraries( exrdpx ${OpenEXR_LIBRARIES} ${OpenEXR_LDFLAGS_OTHER} ) - --install( TARGETS exrdpx DESTINATION ${INSTALL_BIN_DIR} ) -+install( TARGETS exrdpx DESTINATION ${CMAKE_INSTALL_BINDIR} ) - --install( FILES transform_DPX_EXR.ctl transform_EXR_DPX.ctl DESTINATION ${INSTALL_LIB_DIR}/CTL ) -+install( FILES transform_DPX_EXR.ctl transform_EXR_DPX.ctl DESTINATION ${CMAKE_INSTALL_LIBDIR}/CTL ) - - -diff --git a/config/CTL.pc.in b/config/CTL.pc.in -index 6d6e732..9b212a4 100644 ---- a/config/CTL.pc.in -+++ b/config/CTL.pc.in -@@ -1,8 +1,6 @@ --prefix=@CMAKE_INSTALL_PREFIX@ --exec_prefix=@INSTALL_BIN_DIR@ --libdir=@INSTALL_LIB_DIR@ --includedir=@INSTALL_INCLUDE_DIR@ --CTL_includedir=@INSTALL_INCLUDE_DIR@/CTL -+libdir=@CMAKE_INSTALL_FULL_LIBDIR@ -+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ -+CTL_includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@/CTL - - Name: CTL - Description: CTL interpreter library -diff --git a/config/OpenEXR_CTL.pc.in b/config/OpenEXR_CTL.pc.in -index 4cef5c6..39a1a3f 100644 ---- a/config/OpenEXR_CTL.pc.in -+++ b/config/OpenEXR_CTL.pc.in -@@ -1,11 +1,10 @@ --prefix=@prefix@ --exec_prefix=@exec_prefix@ --libdir=@libdir@ --includedir=@includedir@ --OpenEXR_includedir=@includedir@/OpenEXR -+libdir=@CMAKE_INSTALL_FULL_LIBDIR@ -+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ -+OpenEXR_includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@/OpenEXR - - Name: OpenEXR_CTL - Description: Simplified OpenEXR interface to CTL --Version: @OPENEXR_CTL_VERSION@ --Libs: -L${libdir} -lIlmImfCtl @OPENEXR_LDFLAGS@ @CTL_LDFLAGS@ --Cflags: @CTL_CXXFLAGS_PC@ @OPENEXR_CXXFLAGS@ -I${OpenEXR_includedir} -+Version: @CTL_VERSION@ -+Libs: -L${libdir} -lIlmImfCtl -+Cflags: -I${OpenEXR_includedir} -+Requires: CTL,OpenEXR -diff --git a/configure.cmake b/configure.cmake -index 1817071..eb7e14e 100644 ---- a/configure.cmake -+++ b/configure.cmake -@@ -1,10 +1,7 @@ --# Until we get some of these modules into the upstream packages, put them here --set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules/") --set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_INSTALL_PREFIX}/share/CMake") -+# Make Pkg-Config required. -+find_package( PkgConfig ) - --find_package( PkgConfig QUIET ) -- --find_package( IlmBase QUIET ) -+PKG_CHECK_MODULES ( IlmBase REQUIRED IlmBase ) - if(IlmBase_FOUND) - message( STATUS "found IlmBase, version ${IlmBase_VERSION}" ) - ### -@@ -13,11 +10,11 @@ if(IlmBase_FOUND) - ### - include_directories( ${IlmBase_INCLUDE_DIRS} ) - link_directories( ${IlmBase_LIBRARY_DIRS} ) -- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${IlmBase_CFLAGS}" ) -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${IlmBase_CFLAGS}" ) -- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${IlmBase_LDFLAGS}" ) -- set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${IlmBase_LDFLAGS}" ) -- set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${IlmBase_LDFLAGS}" ) -+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${IlmBase_CFLAGS_OTHER}" ) -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${IlmBase_CFLAGS_OTHER}" ) -+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${IlmBase_LDFLAGS_OTHER}" ) -+ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${IlmBase_LDFLAGS_OTHER}" ) -+ set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${IlmBase_LDFLAGS_OTHER}" ) - else() - message( SEND_ERROR "IlmBase not found, please set the include and library paths manually" ) - endif() -@@ -39,20 +36,20 @@ else() - endif() - endif() - --find_package( OpenEXR QUIET ) -+PKG_CHECK_MODULES ( OpenEXR REQUIRED OpenEXR ) - if (OpenEXR_FOUND) - message( STATUS "Found OpenEXR, version ${OpenEXR_VERSION}" ) - else() - message( WARNING "Unable to find OpenEXR libraries, disabling" ) - endif() - --find_package( AcesContainer ) --if (AcesContainer_FOUND) -- message( STATUS "Found AcesContainer, version ${AcesContainer_VERSION}" ) --else() -- if ( PKG_CONFIG_FOUND ) -- pkg_check_modules( AcesContainer AcesContainer ) -- else() -- message( WARNING "Unable to find AcesContainer libraries, disabling" ) -- endif() --endif() -+find_package( AcesContainer ) -+ if (AcesContainer_FOUND) -+ message( STATUS "Found AcesContainer, version ${AcesContainer_VERSION}" ) -+ else() -+ if ( PKG_CONFIG_FOUND ) -+ pkg_check_modules( AcesContainer AcesContainer ) -+ else() -+ message( WARNING "Unable to find AcesContainer libraries, disabling" ) -+ endif() -+ endif() -diff --git a/ctlrender/CMakeLists.txt b/ctlrender/CMakeLists.txt -index 9fced14..d97093d 100644 ---- a/ctlrender/CMakeLists.txt -+++ b/ctlrender/CMakeLists.txt -@@ -11,12 +11,12 @@ include_directories( ${OpenEXR_INCLUDE_DIRS} ) - link_directories( ${OpenEXR_LIBRARY_DIRS} ) - endif() - --if ( AcesContainer_FOUND ) --add_definitions( -DHAVE_ACESFILE=1 ) --include_directories( ${AcesContainer_INCLUDE_DIRS} ) --link_directories( ${AcesContainer_LIBRARY_DIRS} ) --endif() -- -+if ( AcesContainer_FOUND ) -+add_definitions( -DHAVE_ACESFILE=1 ) -+include_directories( ${AcesContainer_INCLUDE_DIRS} ) -+link_directories( ${AcesContainer_LIBRARY_DIRS} ) -+endif() -+ - include_directories( "${CMAKE_CURRENT_SOURCE_DIR}" "${PROJECT_SOURCE_DIR}/lib/IlmCtl" "${PROJECT_SOURCE_DIR}/lib/IlmCtlMath" "${PROJECT_SOURCE_DIR}/lib/IlmCtlSimd" "${PROJECT_SOURCE_DIR}/lib/dpx" ) - - add_executable( ctlrender -@@ -41,9 +41,9 @@ if (OpenEXR_FOUND) - target_link_libraries( ctlrender ${OpenEXR_LIBRARIES} ) - target_link_libraries( ctlrender ${OpenEXR_LDFLAGS_OTHER} ) - endif() --if (AcesContainer_FOUND) --target_link_libraries( ctlrender ${AcesContainer_LIBRARIES} ) --target_link_libraries( ctlrender ${AcesContainer_LDFLAGS_OTHER} ) -+if (AcesContainer_FOUND) -+target_link_libraries( ctlrender ${AcesContainer_LIBRARIES} ) -+target_link_libraries( ctlrender ${AcesContainer_LDFLAGS_OTHER} ) - endif() - --install( TARGETS ctlrender DESTINATION bin ) -+install( TARGETS ctlrender DESTINATION ${CMAKE_INSTALL_BINDIR} ) -diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt -index 0b123d0..9776205 100644 ---- a/doc/CMakeLists.txt -+++ b/doc/CMakeLists.txt -@@ -1 +1 @@ --install( FILES CtlManual.pdf CtlManual.doc DESTINATION doc/CTL ) -+install( FILES CtlManual.pdf CtlManual.doc DESTINATION ${CMAKE_INSTALL_DOCDIR} ) -diff --git a/lib/IlmCtl/CMakeLists.txt b/lib/IlmCtl/CMakeLists.txt -index 3672a43..ef301bd 100644 ---- a/lib/IlmCtl/CMakeLists.txt -+++ b/lib/IlmCtl/CMakeLists.txt -@@ -22,7 +22,7 @@ add_library( IlmCtl ${DO_SHARED} - ) - - target_link_libraries( IlmCtl ${IlmBase_LDFLAGS_OTHER} ) --target_link_libraries( IlmCtl Iex IlmThread Half ) -+target_link_libraries( IlmCtl ${IlmBase_LIBRARIES} ) - - set_target_properties( IlmCtl PROPERTIES - VERSION ${CTL_VERSION} -@@ -50,4 +50,4 @@ install( FILES - CtlVersion.h - DESTINATION include/CTL ) - --install( TARGETS IlmCtl DESTINATION lib ) -+install( TARGETS IlmCtl DESTINATION ${CMAKE_INSTALL_LIBDIR} ) -diff --git a/lib/IlmCtlMath/CMakeLists.txt b/lib/IlmCtlMath/CMakeLists.txt -index 96738cf..6997c74 100644 ---- a/lib/IlmCtlMath/CMakeLists.txt -+++ b/lib/IlmCtlMath/CMakeLists.txt -@@ -18,8 +18,8 @@ install( FILES - CtlLookupTable.h - CtlRbfInterpolator.h - CtlSparseMatrix.h -- DESTINATION include/CTL ) -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/CTL ) - --install( TARGETS IlmCtlMath DESTINATION lib ) -+install( TARGETS IlmCtlMath DESTINATION ${CMAKE_INSTALL_LIBDIR} ) - - # TODO Add Imath and Iex libadd dependency and version info -diff --git a/lib/IlmCtlSimd/CMakeLists.txt b/lib/IlmCtlSimd/CMakeLists.txt -index 2ba792a..5eaf87d 100644 ---- a/lib/IlmCtlSimd/CMakeLists.txt -+++ b/lib/IlmCtlSimd/CMakeLists.txt -@@ -1,7 +1,7 @@ - include_directories( "${CMAKE_CURRENT_SOURCE_DIR}" "${PROJECT_SOURCE_DIR}/lib/IlmCtl" "${PROJECT_SOURCE_DIR}/lib/IlmCtlMath" ) - - add_executable( halfExpLogTable halfExpLogTable.cpp ) --target_link_libraries( halfExpLogTable Half ) -+target_link_libraries( halfExpLogTable ${IlmBase_LIBRARIES} ) - - add_custom_command( OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/halfExpLogTable.h" - COMMAND halfExpLogTable "${CMAKE_CURRENT_BINARY_DIR}/halfExpLogTable.h" "${CMAKE_CURRENT_BINARY_DIR}/halfExpLog.h" -@@ -40,6 +40,6 @@ set_target_properties( IlmCtlSimd PROPERTIES - SOVERSION ${CTL_VERSION} - ) - --install( FILES CtlSimdInterpreter.h DESTINATION include/CTL ) -+install( FILES CtlSimdInterpreter.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/CTL ) - --install( TARGETS IlmCtlSimd DESTINATION lib ) -+install( TARGETS IlmCtlSimd DESTINATION ${CMAKE_INSTALL_LIBDIR} ) -diff --git a/lib/IlmImfCtl/CMakeLists.txt b/lib/IlmImfCtl/CMakeLists.txt -index 47563df..784e27f 100644 ---- a/lib/IlmImfCtl/CMakeLists.txt -+++ b/lib/IlmImfCtl/CMakeLists.txt -@@ -7,10 +7,10 @@ add_library( IlmImfCtl ${DO_SHARED} - ImfCtlCopyFunctionArg.cpp - ) - --target_link_libraries( IlmImfCtl IlmCtl IlmImf Iex IlmThread Half ) -+target_link_libraries( IlmImfCtl IlmCtl ${OpenEXR_LIBRARIES} ${IlmBase_LIBRARIES} ) - --install( FILES ImfCtlApplyTransforms.h DESTINATION include/OpenEXR ) -+install( FILES ImfCtlApplyTransforms.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/OpenEXR ) - - export( TARGETS IlmImfCtl IlmCtl FILE "${PROJECT_BINARY_DIR}/CTLLibraryDepends.cmake" ) - --install( TARGETS IlmImfCtl DESTINATION lib ) -+install( TARGETS IlmImfCtl DESTINATION ${CMAKE_INSTALL_LIBDIR} ) -diff --git a/lib/dpx/CMakeLists.txt b/lib/dpx/CMakeLists.txt -index c8be26e..918890e 100644 ---- a/lib/dpx/CMakeLists.txt -+++ b/lib/dpx/CMakeLists.txt -@@ -11,3 +11,4 @@ add_library( ctldpx - dpx_rw.cc - ) - -+target_link_libraries( ctldpx ${IlmBase_LIBRARIES} ) diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest index f3b25a2727bd..b3776ddac5d1 100644 --- a/media-libs/gegl/Manifest +++ b/media-libs/gegl/Manifest @@ -21,7 +21,7 @@ EBUILD gegl-0.3.0-r1.ebuild 5372 BLAKE2B 843c8bb6c10947cc0378be51d6b269ae866840f EBUILD gegl-0.3.0.ebuild 5290 BLAKE2B eb698fbe621dead0979582fa83a47c0cdab26a556194778375045b25b6774dc72375b9fe19dfda8b6ce64ad024a5ee69cb26aea51fd3693f3e80b13a78d812a6 SHA512 eae35de6ca10d0fee700ce98bcf4fe8ba4af0ec43325fb097f67d2934bc951cc356f9e07ad0b81f07e8d715ba3fba9c50babc27ba6b2670c2e23056d6108e41b EBUILD gegl-0.3.20.ebuild 5182 BLAKE2B 97e2103ba355c528511106181c826feffeb7a2956521212d4973167ea088e39e90ff8d01af17f2e46becbfbebbe8b72a0847a5a20ec5b466c9e1721023ef9bc1 SHA512 ce8f8bb01a6469f1a5cefc6bc2b127f6ba38e8492496bae712b811ce7227c2c6102d2ab84e0da2c25dbb8a4b48ced1b00e0fb173b54d3e325d2445249841c13e EBUILD gegl-0.3.24.ebuild 5227 BLAKE2B fa9df9507e86249d5ea604dd879b86aa8fcd323401ed2f34b1f172ebf82df88ac9618457c11da08f821de1bb013c5b85f660da7ed52f6e1069e45765ce27267a SHA512 ff2b34a6fda2bd47c38203010140988bdf6b7565638b3edb8a71a8c4e26318c028cc121ee99ab4d974c077ea2d7242498f6e98dcb38e57a9d10f0d68b250142d -EBUILD gegl-0.3.26.ebuild 5227 BLAKE2B a65581b6ab154e674a00803c866f8db812e2e4c788ef0707c418fb173d3a749c2a43eb957a713e5e519a5c8adadc0b7cb5a5960314b0a12383de67d6053d2a71 SHA512 cdb77ce41224b968c74186680f05ba727c1bfbb36bb0b72777f5f04ddd0ced8c26f8384a12e78aef2c1c8c4392f178b52ee5322c42c832e82b666bbc9def0e9c +EBUILD gegl-0.3.26.ebuild 5226 BLAKE2B df1eb6cc2d5f33463d291913eec095e3cff981acd5db18fc5f64dfa1eb157201c0a392711146c3a7cf76ea93497f489eab7808d347af043d1b5c0ab3cf3401cf SHA512 5994a999e7e78bde427c40189b7988c37ae53aa7df9b016498bd569cd79d96c0082fdce7619f246a0424d70c79c7942fa6850ac567c3792bc75049dd1fe4d6cb EBUILD gegl-0.3.8-r1.ebuild 5299 BLAKE2B 413dfe970b595bef38e51dd2e749b10b014952ff00d609587c23f61135864e4640e2ccefc7d2faba02cfa8769c00d46cdd48bf5b9197ff79be89a6f34d86fbe9 SHA512 9a53f0b3633c4374c696a6be3d69226ae6e2116eb5d7f3c1a5362353e840e6507aa189aeae89c178b2b8ba896fdbfb1a929d3e478060a0fd906e27db65a48501 EBUILD gegl-0.3.8.ebuild 5219 BLAKE2B 093e9816058f439e3b18308256d8c00acdb7dd2fc3a6595df03a04f26ab4b13830160783a0c745a544a277ffa7b2e9290332d89bd93685cfe94157462a88ba9a SHA512 66deb4d2c45850c9ac870d741419c16bf84a20c14cd936f90aebf626f6d9a45471aa65d3f632c617c78d9717206b0418424614b9edc3e8643ec1f61c93c3ac42 EBUILD gegl-9999.ebuild 4921 BLAKE2B c5e2f1513eb418db2b725759bee29b5c97cd3be89b020d7b86eac4edf56b295d93b3dfbc8b7d2766411b3dcd4fb3c618ed44e9ed5a27ed38b844e530465b6acf SHA512 c6acfcfa7e2c50aa64b1ad31dda9c52d530a886e4ef477f06c56d32eab809215bc018ccf0180175abd81745b4432b8f9563e51ec6e1df72cf0a6125c95635478 diff --git a/media-libs/gegl/gegl-0.3.26.ebuild b/media-libs/gegl/gegl-0.3.26.ebuild index fb8a39197884..f1024965079b 100644 --- a/media-libs/gegl/gegl-0.3.26.ebuild +++ b/media-libs/gegl/gegl-0.3.26.ebuild @@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then SRC_URI="" else SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" fi DESCRIPTION="A graph based image processing framework" diff --git a/media-libs/imlib/Manifest b/media-libs/imlib/Manifest index f42e5b4f0435..9adde2247374 100644 --- a/media-libs/imlib/Manifest +++ b/media-libs/imlib/Manifest @@ -10,6 +10,5 @@ AUX imlib-1.9.15.patch 2253 BLAKE2B 8ab175dd3c22790dadde804d6de2f78497a1553a0b6c AUX imlib-security.patch 13040 BLAKE2B 65eb4e5435dea0bba755ae21548fd7c25cc65a0f5ac7130905cf064c2f59b3dbe21d1cdd90de25e9f7e27fa1905bb51a38845b8ec92cff86cff6fbed789309d4 SHA512 a75537267e9e276920fbc0360cd4832f727c6c9857401889bdb1466f3088c98e5ea2ef84a94a5873a3c12dda0b9aed36a5e2039fece87e51154a3b773d97aa5c DIST gtk-1-for-imlib.m4.bz2 2742 BLAKE2B af16f586cbfb53522bb53b55d551d21ddf765e06694bebe93637b24c31bfdfff95f7ef250e66b784d7371bb309e4939c7db40c0ba1f1b1d73526e16cf745a93f SHA512 83708af1c7d7cf10960463b785bad096d77e985be5907dd59c73c2cb86c4b89fb5453a02ffddca1519185b91d205dbd96c4c4c1df4da4b67e64bad413cd8a40e DIST imlib-1.9.15.tar.bz2 683242 BLAKE2B 16cc11d2ddc69af7201215454c465d104354b63b4e0b1d8aadd07daf889368478dce28ea8ecf6b16daef3019891fcf7a794abccf02b236d1a6c737b0e9db08d3 SHA512 f50d9141b3c54b44921aa09c0a5ea848aefaa904efdd6da132dace42604671f8dbd3e4b71a596f054f0db4525ba2002864b5e5b21f8805cf1b5514b661ac254a -EBUILD imlib-1.9.15-r4.ebuild 2098 BLAKE2B 818f6a88989140005f2cc16f4879d7aa10681225bd724457e86deade33f86a12499035188808ec8cdc5e51a20cb7d34094f28aa1ea68775441c0d7be9d5eb3d8 SHA512 57b6c5a17dcdcba92096d3bdd130e5eec737d01e85884934440957e60c5c43c3060d540082ec070a342148d508f920dbf05b6843b2123bb72dabce3cacaa7e4e EBUILD imlib-1.9.15-r5.ebuild 2153 BLAKE2B 35363265a87d45b2f888edd4b66e693bc70a5699cdd83b717b8cad4fe52c31384bcb3a60d9d2c1c8fbf4145759ae6411f762d6874b933bf18e340074fe722b2d SHA512 6850be17155da958d736adf291cf3f571b49b5997ff4940891cff3f6899147e7f7384edb34dfc9943db1d6893c3a9a250f8728be5a57779380b05307bb1305d6 MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f diff --git a/media-libs/imlib/imlib-1.9.15-r4.ebuild b/media-libs/imlib/imlib-1.9.15-r4.ebuild deleted file mode 100644 index e01eca215528..000000000000 --- a/media-libs/imlib/imlib-1.9.15-r4.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 -inherit autotools eutils multilib-minimal - -PVP=(${PV//[-\._]/ }) -DESCRIPTION="Image loading and rendering library" -HOMEPAGE="http://ftp.acc.umu.se/pub/GNOME/sources/imlib/1.9/" -SRC_URI="mirror://gnome/sources/${PN}/${PVP[0]}.${PVP[1]}/${P}.tar.bz2 - mirror://gentoo/gtk-1-for-imlib.m4.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd" -IUSE="doc static-libs" - -RDEPEND=">=media-libs/tiff-3.9.7-r1[${MULTILIB_USEDEP}] - >=media-libs/giflib-4.1.6-r3[${MULTILIB_USEDEP}] - >=media-libs/libpng-1.2.51[${MULTILIB_USEDEP}] - >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] - >=x11-libs/libICE-1.0.8-r1[${MULTILIB_USEDEP}] - >=x11-libs/libSM-1.2.1-r1[${MULTILIB_USEDEP}] - >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] - abi_x86_32? ( - !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] - !<=app-emulation/emul-linux-x86-gtklibs-20140406 - )" -DEPEND="${RDEPEND}" - -src_prepare() { - # Fix aclocal underquoted definition warnings. - # Conditionalize gdk functions for bug 40453. - # Fix imlib-config for bug 3425. - epatch "${FILESDIR}"/${P}.patch - epatch "${FILESDIR}"/${PN}-security.patch #security #72681 - epatch "${FILESDIR}"/${P}-bpp16-CVE-2007-3568.patch # security #201887 - epatch "${FILESDIR}"/${P}-fix-rendering.patch #197489 - epatch "${FILESDIR}"/${P}-asneeded.patch #207638 - epatch "${FILESDIR}"/${P}-libpng15.patch #357167 - epatch "${FILESDIR}"/${P}-underlinking-test.patch #367645 - epatch "${FILESDIR}"/${P}-no-LDFLAGS-in-pc.patch - - mkdir m4 && cp "${WORKDIR}"/gtk-1-for-imlib.m4 m4 - - AT_M4DIR="m4" eautoreconf -} - -multilib_src_configure() { - ECONF_SOURCE="${S}" econf \ - --sysconfdir=/etc/imlib \ - $(use_enable static-libs static) \ - --disable-gdk \ - --disable-gtktest -} - -multilib_src_install() { - emake DESTDIR="${D}" install || die -} - -multilib_src_install_all() { - dodoc AUTHORS ChangeLog README - use doc && dohtml doc/* - - # Punt unused files - rm -f "${D}"/usr/lib*/pkgconfig/imlibgdk.pc - find "${D}" -name '*.la' -exec rm -f {} + -} diff --git a/media-libs/libdvdcss/Manifest b/media-libs/libdvdcss/Manifest index 6313468459a4..2353c20cc21c 100644 --- a/media-libs/libdvdcss/Manifest +++ b/media-libs/libdvdcss/Manifest @@ -1,10 +1,7 @@ -DIST libdvdcss-1.2.13.tar.bz2 338588 BLAKE2B 325fefaa44b5a7d516c856ab2288eaa949d49ac8e66691dc385ec91392a4242bc90f59ee1285e931c804c7405c5187cbf13d396ae4abcf8efc849691d5d85633 SHA512 b7d912ef87854bca052c2f38709d49eeb72be9148b6598a7f71f9ccb1ad7f43a521f9533821fbd8d7ef16e2c36fe140209c9183f5ca91e8f806150cc16645717 DIST libdvdcss-1.3.0.tar.bz2 355417 BLAKE2B 33fa609f8131f7b53d579805fcfcd4aa821f9d9d434f4f34720a4b9a8421bf64206609801da1ca6e36aed63db6c97103cf2303e4b83fbd4a563bf8bbe13147bf SHA512 f3254cb882f03d24e9fbe70fa9aa32ac34c104b57b3ad43727e26a4ab930bddd75de8d9a0e4ba68cdac23e1828f38c2b276679f5386f296cf20db46828836a3d -DIST libdvdcss-1.3.99.tar.bz2 377167 BLAKE2B 9032bb6ba2595143079fb80bc8dce4197f80a45ba6f1d34b42a09db8f244cd22d4b9b41edb899a927be93a632dc9597dd49ba5b26d6c981091b091cf4a38ecda SHA512 d81ac96d81181dae4e6d63a11fa56fd4ff1ce1ee58c49a1354c10315eb5f9e743475d7e3896bac4dc7ea3ed35e52a964dd337a9b3f32f9ff9e37d11fcd4292b1 DIST libdvdcss-1.4.0.tar.bz2 364373 BLAKE2B bad4bfaa17df33ff665684000d54b91c37b5d924b4b707a47756a2ef9b468256eff966379ab30f0c4d7650c0cd5617f70413a8508fa2279485a14b6b44c38680 SHA512 ad4503a37f47a9563da0b9e387ca3e812f6cdfbf109b8d92f8eccdd879b4270e5b0ee79041d7fb4c86698d72748f7bbf0257db8da6bb1c889dd4f78645e3371b -EBUILD libdvdcss-1.2.13-r1.ebuild 796 BLAKE2B ece289e199e2ab568f3b16808e2f57e152c74f8aac752e757dfe2f08f80b77096a67fc5f4ebd106eeec24697764ac8f11592d610945c86096ae212ed5bb717e7 SHA512 b71400b39330a86ff5608e925152ae0f7d0d3274967c03b4762c8036d9f0af6f008f34facd04520e0106e02e7aca55bac7ad427969284a9cfa007b2de77550a1 -EBUILD libdvdcss-1.2.13.ebuild 789 BLAKE2B 44c7165710e77905983c593605e7791616f87eca0e229524e75feb9065ae4863687a583c7f41440947b3b44dce98677cadbec0db32a138381a406df7c329d852 SHA512 8e6e027ab816374665944ca300b67eca583e7c3c71afcbd6118e6375c4512571168fbb6f41708ee330521afbfd566f7b5a2f6606230636b369a9585e79984511 +DIST libdvdcss-1.4.1.tar.bz2 366169 BLAKE2B 54d3f8ccd76286a5b7082abdc8d134fb47d192bb62ee8d58b04f5eb387b804bdde4ec5c7a48627b9afebbb8d3a783a23189886e50277cf855a819fdd08eefd5e SHA512 4456ebcf8b53a8aaee97643261a14a05c929e9e9120cbe5fc6839ddf62be3dcfe7313fca3ee57c00bea43ddf623dc3d61fff7c2f6316338495df95c9c422f39e EBUILD libdvdcss-1.3.0.ebuild 796 BLAKE2B 46c60fc09583d30961b1526990b8d6f583b9d63acc4c1b2cca1ae44b621d964783ede275c2612f64bea635c2a32e1ad26294282e132e056e551db046883a0498 SHA512 84baa330a130ffd7f0246815ab3c987c9df2f26e59929f8413ea36b0208e5aca607f3865788632a348039cb5f7bcfdf179e5a2f12163ecbfc942007c100094f2 -EBUILD libdvdcss-1.3.99.ebuild 810 BLAKE2B 6be3006ba20bb7c453f20eb7a8788bbe45cab2a4fbb8f3635e827d8caa7c6046e9688a4b6d3b3fc370533e2063112d84eafa26fca139146e2db2993874c157cc SHA512 ee0a2d34aace87e88074cbd1349165fd9df6623af29f29d649b40bd69a31287457f88f3c1932cb90ed2c59f766dca1abbe822146836fc31c50e966cfe8f3ec21 EBUILD libdvdcss-1.4.0.ebuild 809 BLAKE2B 176d9562c52261563c14a6d0f8e94fff5abca7ad7d1cffa6746f3083b81a5d9e44f7d918717246843bc99d04a99934048ee30040e9734cdbbccdac5f29d139b7 SHA512 62967a8f03b58cee3ebac30fced2da26c9218baad8f3695f4846ab03b5c2d06eb6dfc617ff3043192f231748b23160cf4c4cea7c0c837dc2185c00cefc778c68 +EBUILD libdvdcss-1.4.1.ebuild 817 BLAKE2B 3ec859850660f9f526587a76c993d1b00fc67624a97d6b88997dd44b201ab8e1f9120080cb2b38e8efe22ca2c996a426cfab1cbd19bde146859de2c5ff2d8f3b SHA512 5b264785c8051592e78c67f00a2bc8c1b3eab7a7d0f330ecdbfdee58f3a43e01c983cbef603ba0f43ad70ced2a40118a64c05c2551f1a2ad82eaa9f03919c2c2 MISC metadata.xml 219 BLAKE2B bca5749b6f2d3541ba2d2635b59056f9ecdc46553991dec3ee5a7bc9f26393bdae62755418850d3cbda0eeb65b7f72029ddf09d4f088b21c84d407d0e6eaa098 SHA512 24793c7fd0e2cef8fa5a0efd9bd55fed1e62ff6810199a969d4c0b869bac9b9ec79b288105b73b1b99734320bb13569a8ee00516b5452dd67d91d14dd17038e2 diff --git a/media-libs/libdvdcss/libdvdcss-1.2.13-r1.ebuild b/media-libs/libdvdcss/libdvdcss-1.2.13-r1.ebuild deleted file mode 100644 index 10e07d63a383..000000000000 --- a/media-libs/libdvdcss/libdvdcss-1.2.13-r1.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit autotools-multilib - -DESCRIPTION="A portable abstraction library for DVD decryption" -HOMEPAGE="https://www.videolan.org/developers/libdvdcss.html" -SRC_URI="https://www.videolan.org/pub/${PN}/${PV}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="1.2" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" -IUSE="doc static-libs" - -RDEPEND="" -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen )" - -#DOCS=( AUTHORS ChangeLog NEWS README ) - -src_configure() { - local myeconfargs=( - $(use_enable doc) - --htmldir=/usr/share/doc/${PF}/html - ) - - autotools-multilib_src_configure -} diff --git a/media-libs/libdvdcss/libdvdcss-1.2.13.ebuild b/media-libs/libdvdcss/libdvdcss-1.2.13.ebuild deleted file mode 100644 index 71650c57d155..000000000000 --- a/media-libs/libdvdcss/libdvdcss-1.2.13.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit autotools-utils - -DESCRIPTION="A portable abstraction library for DVD decryption" -HOMEPAGE="https://www.videolan.org/developers/libdvdcss.html" -SRC_URI="https://www.videolan.org/pub/${PN}/${PV}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="1.2" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" -IUSE="doc static-libs" - -RDEPEND="" -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen )" - -#DOCS=( AUTHORS ChangeLog NEWS README ) - -src_configure() { - local myeconfargs=( - $(use_enable doc) - --htmldir=/usr/share/doc/${PF}/html - ) - - autotools-utils_src_configure -} diff --git a/media-libs/libdvdcss/libdvdcss-1.3.99.ebuild b/media-libs/libdvdcss/libdvdcss-1.3.99.ebuild deleted file mode 100644 index 048034b19a11..000000000000 --- a/media-libs/libdvdcss/libdvdcss-1.3.99.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit autotools-multilib - -DESCRIPTION="A portable abstraction library for DVD decryption" -HOMEPAGE="https://www.videolan.org/developers/libdvdcss.html" -SRC_URI="https://download.videolan.org/pub/${PN}/${PV}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="1.2" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" -IUSE="doc static-libs" - -RDEPEND="" -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen )" - -#DOCS=( AUTHORS ChangeLog NEWS README ) - -src_configure() { - local myeconfargs=( - $(use_enable doc) - --htmldir=/usr/share/doc/${PF}/html - ) - - autotools-multilib_src_configure -} diff --git a/media-libs/libdvdcss/libdvdcss-1.4.1.ebuild b/media-libs/libdvdcss/libdvdcss-1.4.1.ebuild new file mode 100644 index 000000000000..bda143969dff --- /dev/null +++ b/media-libs/libdvdcss/libdvdcss-1.4.1.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +inherit autotools-multilib + +DESCRIPTION="A portable abstraction library for DVD decryption" +HOMEPAGE="https://www.videolan.org/developers/libdvdcss.html" +SRC_URI="https://download.videolan.org/pub/${PN}/${PV}/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="1.2" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" +IUSE="doc static-libs" + +RDEPEND="" +DEPEND="${RDEPEND} + doc? ( app-doc/doxygen )" + +#DOCS=( AUTHORS ChangeLog NEWS README ) + +src_configure() { + local myeconfargs=( + $(use_enable doc) + --htmldir=/usr/share/doc/${PF}/html + ) + + autotools-multilib_src_configure +} diff --git a/media-libs/libv4l/Manifest b/media-libs/libv4l/Manifest index 3869cf7a3806..8677fc02fbfc 100644 --- a/media-libs/libv4l/Manifest +++ b/media-libs/libv4l/Manifest @@ -1,12 +1,15 @@ +AUX libv4l-1.14.1-sysmacros.patch 808 BLAKE2B 1dc608e836120e65140ffed8f9f4d19868eafbfb2e729665ad553fc44da4386d2197eb327f3f36ffafe8af45bea7adff72808d7cd7890e05c7fe5f3ba570ff8c SHA512 593f53b92ce947b1c2f75e7e1090b3f1e9ff3c39a69fcb96c4a6f1825db947b92bf4d45b93dc14eef7f439104d4a4090ef1823a38bd5e39687587afd6657671a AUX libv4l-1.6.2-sysmacros.patch 1821 BLAKE2B 9242ec9dccf2b14ab4d3ebc1246035ec3a1816d0b0389577638949cf8e493074132b7c13db6c1ca360ad5e2a2de271166126110d2f237d068185aeb2c3293c4b SHA512 ff6addf5d8e8da4f8502f1af8f21de60c9579da11b3aa3145d42030387bdcdd7c6263d5b6cdcba302ea8b8b3a578dbd17d75e11250d4074df2b6ca59d6de1d55 DIST v4l-utils-1.10.0.tar.bz2 1335798 BLAKE2B 80e44a4e9681b3add4a96bb6040991029fe7f85cfc4871407690c370fbeb6fd8311ae2042acbf934717b34ff60cfcf25f426c4caaf38cfd1f55b23d9ffb4f4db SHA512 1c9d70c7a6c4eddd72951786b76d69b6bed682763a33d1a4ffd393e1589add353124af51fa976e4c362f98e8d5baba9e8fa8d50b27e99cd0363fc5c8e57d7a73 DIST v4l-utils-1.10.1.tar.bz2 1352235 BLAKE2B 7ececae8ad5ebd999070b0c3626fdf5b0a4bc81562d2c2a712ff9625025d3e6c4ff664ba85998dedaa1ee77295d3cea39306305c20573c07156a07ec0ac8d10a SHA512 524bfd4e93e82f2dd55f0baa3e8be5850d4675b46fd0197b6d1287fc0d502c6b5c64bdf461af9630345f2d847d6aa5b6dc483693cee452da0b6729f156a5d98d DIST v4l-utils-1.12.3.tar.bz2 1588049 BLAKE2B 1f76e6cd76781119beb01a1d570599cd2710a4c00ea18c380e576cb8281bab07e09cb6c1469201d0fba53b8bb5f4c4fa812dcda06203d83566216272e9abe3b0 SHA512 6d0269d900c5dad08499ee551ce1507b8b750895f48423ccd534db51cf68794b59a279743fd22dc6da0c092ca31ef744aa564f26b6d6252cbbc7a62e2e1c714a DIST v4l-utils-1.12.5.tar.bz2 1588944 BLAKE2B b87c24c6fdaf3e80407dd28b047c27420ff70007e12200e69395021def3abb74eec3565337a6484cf44b5a5cc7678d9bc718876424fa58d6d16d0e0c37ab59cf SHA512 ed2e7545a728360b9684db68330885b498a3a5611f49b80e54da72109d9ba2aa75e85f89f085ff0a6f077b17c880101fa5b78c9dff8a0df2eac1866bd80a04ea +DIST v4l-utils-1.14.1.tar.bz2 1672480 BLAKE2B bc5c50fa0b339c79439b54e54f0c0e3847068931e34831a05e214e785fe4063764ef0d76838ca3216a46db072003dc5d86dd2c563fbb73d237a6b5059df93f5a SHA512 78b863f2cba409138efd6744895e6b1e730ec7cd5dfd0bd6088dd1336572a5f6d0b422fb4ec6577c6038192d0a3b28ae91d7402d5733904913749eff263c2eb1 DIST v4l-utils-1.6.2.tar.bz2 1148309 BLAKE2B 8153a1e3803b9e59eae064f2c88e4b865a56193788a8cb204dc34e9ae50e66794ba7f020ad4b0ff9af995f57d9b9a9e0225e0f8a09eeefae42d063131d7e549a SHA512 e14442e1b3660d0cb0844f1a5a88f855bc8532df9e72e1b2afd348a7c077ad25657f832d0fd47d3f567bfd399fd82c5a749d075ac9ecb911ea462685e31aa0b2 EBUILD libv4l-1.10.0.ebuild 1395 BLAKE2B 9137b578723257d586092a1f3fd81f8ea552d93f0e50ac7d7ec8c447925c4d5a50dd4cabc46066cad5c4036c5cfe9850ffeddbfe7a1451209916ecd788c0326c SHA512 4daf5f65f9b587107864e86f5108f194c103fd3af8a1c645fcc09700021289460b3ba5aa3bedfc4c70380d454c1e8ee3fb837a01379e769c14286fdf19f8a611 EBUILD libv4l-1.10.1.ebuild 1398 BLAKE2B 0da4472606ac09cb6101835663157e07be64b89937563e1eeccf1878a27272c8d5489209a89c7da439ec8ea7fef8c57ceb23db43ac1309ee7c4cef451368fc98 SHA512 ceebbb892834d2b93310e5f855e93f3eaa70b2b6d3d4dfb0b05d7bc50f9ed0d7dc16d96356e948d6ca7f4a1956ed44216cb5d1d67c715c3f766ded9c52689074 EBUILD libv4l-1.12.3.ebuild 1321 BLAKE2B ab3ff5aaaba94331523ca23db44a3103864a5b6014a025fabc1aa59c593217760bf2d3dbd65840113a4b8fec1c7b8be123193a72a64b03b7a07f7a28287eb0d4 SHA512 c08dc4720cd7fb7a3713c62b0cfd083e379cb015473f1b0455dbe2c63a2005523edc445aa925f42160e2dbba52f13442f3b7c8e59d648f5b4c78267abbf06788 EBUILD libv4l-1.12.5.ebuild 1370 BLAKE2B b122ee457e5e0879d2d1e584b4165e2a9b49cdded83229d60b7a89f18f5ae5721158c698027672f7b7cd294e8f41a05aa7fce3cff9b40930412bf68853a09b2d SHA512 beb1632e4619a33c3c02f370bcc0c94ac53ea666fb8782da769379d541088f23b2034248f8f5c089fa1a8b1d5cc0a834871090ff3358c5bbb8519cccb993477e +EBUILD libv4l-1.14.1.ebuild 1434 BLAKE2B 3fc61c41c012477e5b736b6ee488c99f5fc73c466b87228625ecd1822fd9d60f0999354a16eeae28394c5d9939c83a6cde15b14b9afd9ce6fe582d9f7661b504 SHA512 8d9bc01f3a6c3d27a8a896db01471d30dd0f56b65c5c6f60dd992171e4ba746089e9c6983646424fc3e449d6e1f725bcc7bfa8185dbdea8ba6075e496f10f209 EBUILD libv4l-1.6.2.ebuild 1498 BLAKE2B ef70dd87b249c185fbb64ab82754bb51aa5915880dfd7c3516962796bcead440b5fea62e58c601266adb138cfdd98923eb1851d3679c9f6f9390de10a79f529a SHA512 5181a3fd3b3405f3809315cf922f0850b5c36cf0668fdbc774ca712c661b98a3d0555dbd75c34792317ec1775b019ca8b75d955e652f8018664cbdc2b8a528a7 MISC metadata.xml 1125 BLAKE2B 3404da3f65f90eb87682c99c24feacf97f03616c55caf36c71538fb2f2da424be0ba5cd36b017872268d0efa34441440bcba95a482c0723c0b79ccf6a96a6e65 SHA512 5594f9030eb7da8b32c90e1710ebe6370339ef4fbb3a1b23a99024e9c0ef5bbbde31e421e3c9e23edf5e44709970fa1a60523c8fa615b90ce16437b28d5714c7 diff --git a/media-libs/libv4l/files/libv4l-1.14.1-sysmacros.patch b/media-libs/libv4l/files/libv4l-1.14.1-sysmacros.patch new file mode 100644 index 000000000000..b8190507fc7d --- /dev/null +++ b/media-libs/libv4l/files/libv4l-1.14.1-sysmacros.patch @@ -0,0 +1,26 @@ +Index: v4l-utils-1.14.1/lib/libv4lconvert/control/libv4lcontrol.c +=================================================================== +--- v4l-utils-1.14.1.orig/lib/libv4lconvert/control/libv4lcontrol.c ++++ v4l-utils-1.14.1/lib/libv4lconvert/control/libv4lcontrol.c +@@ -20,9 +20,7 @@ + */ + + #include +-#if defined(MAJOR_IN_SYSMACROS) + #include +-#endif + #include + #include + #include +Index: v4l-utils-1.14.1/utils/v4l2-ctl/v4l2-ctl.cpp +=================================================================== +--- v4l-utils-1.14.1.orig/utils/v4l2-ctl/v4l2-ctl.cpp ++++ v4l-utils-1.14.1/utils/v4l2-ctl/v4l2-ctl.cpp +@@ -21,6 +21,7 @@ + */ + + #include ++#include + #include + #include + #include diff --git a/media-libs/libv4l/libv4l-1.14.1.ebuild b/media-libs/libv4l/libv4l-1.14.1.ebuild new file mode 100644 index 000000000000..4ab5d3552591 --- /dev/null +++ b/media-libs/libv4l/libv4l-1.14.1.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +inherit eutils libtool linux-info multilib-minimal + +MY_P="v4l-utils-${PV}" + +DESCRIPTION="Separate libraries ebuild from upstream v4l-utils package" +HOMEPAGE="https://git.linuxtv.org/v4l-utils.git" +SRC_URI="https://linuxtv.org/downloads/v4l-utils/${MY_P}.tar.bz2" + +LICENSE="LGPL-2.1+" +SLOT="0/0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="jpeg" + +# The libraries only link to -ljpeg, therefore multilib depend only for virtual/jpeg. +RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] ) + virtual/libudev + !media-tv/v4l2-ctl + ! PYTHONPATH=XXX CMD' +- # on windows, it becomes '> set PYTHONPATH=XXX \n call CMD' +- # '\n' is here because '\\&' does not work. +- set(PYT_PRE_CMD set PYTHONPATH=${PYTHONPATH} "\n" call ) +- # Unfortunately some windows tools require to have +- # the paths with the '\' (not working with '//'). +- set(PYT_LIB_OUTPUT ${EXTDIST_ROOT}) +- string(REGEX REPLACE "/" "\\\\" PYT_LIB_OUTPUT ${PYT_LIB_OUTPUT}) +- set(PYT_EXTDIST_BINPATH ${EXTDIST_BINPATH}) +- string(REGEX REPLACE "/" "\\\\" PYT_EXTDIST_BINPATH ${PYT_EXTDIST_BINPATH}) +-else() +- set(PYT_PRE_CMD PYTHONPATH=${PYTHONPATH}) +- set(PYT_LIB_OUTPUT ${EXTDIST_ROOT}) +- set(PYT_EXTDIST_BINPATH ${EXTDIST_BINPATH}) +-endif() +- +-# setuptools +-# https://pypi.python.org/pypi/setuptools +-set(SETUPTOOLS_VERSION 1.1.6) +- +-ExternalProject_Add(setuptools +- URL ${CMAKE_SOURCE_DIR}/ext/setuptools-${SETUPTOOLS_VERSION}.tar.gz +- BUILD_IN_SOURCE 1 +- CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH} +- BUILD_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py build +- INSTALL_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py install --prefix=${PYT_LIB_OUTPUT} +- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/setuptools-prefix/src/setuptools +-) +- +-# docutils +-# https://pypi.python.org/pypi/docutils +-set(DOCUTILS_VERSION 0.11) +-ExternalProject_Add(docutils +- DEPENDS setuptools +- URL ${CMAKE_SOURCE_DIR}/ext/docutils-${DOCUTILS_VERSION}.tar.gz +- BUILD_IN_SOURCE 1 +- CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH} +- BUILD_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py build +- INSTALL_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py install --prefix=${PYT_LIB_OUTPUT} +- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/docutils-prefix/src/docutils +-) +- +-# jinja2 +-# https://pypi.python.org/pypi/Jinja2 +-set(JINJA2_VERSION 2.7.1) +-ExternalProject_Add(Jinja2 +- DEPENDS setuptools +- URL ${CMAKE_SOURCE_DIR}/ext/Jinja2-${JINJA2_VERSION}.tar.gz +- BUILD_IN_SOURCE 1 +- CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH} +- BUILD_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py build +- INSTALL_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py install --prefix=${PYT_LIB_OUTPUT} +- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Jinja2-prefix/src/Jinja2 +-) +- +-# Pygments +-# https://pypi.python.org/pypi/Pygments +-set(PYGMENTS_VERSION 1.6) +-ExternalProject_Add(Pygments +- DEPENDS setuptools +- URL ${CMAKE_SOURCE_DIR}/ext/Pygments-${PYGMENTS_VERSION}.tar.gz +- BUILD_IN_SOURCE 1 +- CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH} +- BUILD_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py build +- INSTALL_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py install --prefix=${PYT_LIB_OUTPUT} +- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Pygments-prefix/src/Pygments +-) +- +-# sphinx +-# https://pypi.python.org/pypi/Sphinx +-set(SPHINX_VERSION 1.2b3) +-ExternalProject_Add(Sphinx +- DEPENDS setuptools docutils Jinja2 Pygments +- URL ${CMAKE_SOURCE_DIR}/ext/Sphinx-${SPHINX_VERSION}.tar.gz +- PATCH_COMMAND patch -p1 < ${CMAKE_SOURCE_DIR}/ext/Sphinx-${SPHINX_VERSION}.patch +- BUILD_IN_SOURCE 1 +- CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH} +- BUILD_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py build +- INSTALL_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py install --prefix=${PYT_LIB_OUTPUT} --install-scripts=${PYT_EXTDIST_BINPATH} +- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Sphinx-prefix/src/Sphinx +-) +- +-############################################################################### + ### Create Doc Targets ### + + message(STATUS "Create sphinx conf.py from conf.py.in") +@@ -122,7 +36,7 @@ else() + endif() + + add_custom_target(doc ALL +- COMMAND ${PYT_PRE_CMD} ${EXTDIST_BINPATH}/sphinx-build -b html . ${CMAKE_CURRENT_BINARY_DIR}/build-html ++ COMMAND sphinx-build -b html . ${CMAKE_CURRENT_BINARY_DIR}/build-html + DEPENDS + ${DEPLIBS} + ${CMAKE_BINARY_DIR}/docs/conf.py +@@ -133,20 +47,18 @@ add_custom_target(doc ALL + COMMENT "Building html docs" + SOURCES ${DOCFILES}) + +-# note: ExternalProject will not build when added to a add_custom_target this +-# works around this problem. This seems to be fixed in the cmake ^HEAD +-add_dependencies(doc Sphinx) +- + install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build-html/ +- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/html ++ DESTINATION ${CMAKE_INSTALL_DOCDIR}/html + PATTERN .* EXCLUDE + ) + ++if(OCIO_BUILD_PDF_DOCS) ++ + find_package(LATEX) + if(PDFLATEX_COMPILER) + + add_custom_target(latex +- COMMAND ${PYT_PRE_CMD} ${EXTDIST_BINPATH}/sphinx-build -b latex . ${CMAKE_CURRENT_BINARY_DIR}/build-latex ++ COMMAND sphinx-build -b latex . ${CMAKE_CURRENT_BINARY_DIR}/build-latex + DEPENDS + OpenColorIO + ${CMAKE_BINARY_DIR}/docs/conf.py +@@ -156,7 +68,6 @@ if(PDFLATEX_COMPILER) + ${RSTDOC_OUTPUT} + COMMENT "Building latex doc" + SOURCES ${DOCFILES}) +- add_dependencies(latex Sphinx) + + add_custom_target(pdf ALL + COMMAND ${PDFLATEX_COMPILER} OpenColorIO.tex +@@ -166,6 +77,8 @@ if(PDFLATEX_COMPILER) + add_dependencies(pdf latex) + + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/build-latex/OpenColorIO.pdf +- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/) ++ DESTINATION ${CMAKE_INSTALL_DOCDIR}) + + endif() ++ ++endif() diff --git a/media-libs/opencolorio/opencolorio-1.0.9_p20170719.ebuild b/media-libs/opencolorio/opencolorio-1.0.9_p20170719.ebuild deleted file mode 100644 index cfcbd93bf47f..000000000000 --- a/media-libs/opencolorio/opencolorio-1.0.9_p20170719.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -# Compatibility with Python 3 is declared by upstream, but it is broken in fact, check on bump -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) - -inherit cmake-utils python-single-r1 vcs-snapshot - -DESCRIPTION="A color management framework for visual effects and animation" -HOMEPAGE="http://opencolorio.org/" - -MY_GIT_COMMIT="7e7f10afce97254cdc1295a3594ddd5e6fb555d6" -SRC_URI="https://github.com/imageworks/OpenColorIO/archive/${MY_GIT_COMMIT}.tar.gz \ - -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc opengl pdf python cpu_flags_x86_sse2 test" -REQUIRED_USE=" - doc? ( python ) - python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND=" - opengl? ( - media-libs/lcms:2 - media-libs/openimageio - media-libs/glew:= - media-libs/freeglut - virtual/opengl - ) - python? ( ${PYTHON_DEPS} ) - >=dev-cpp/yaml-cpp-0.5 - dev-libs/tinyxml" - -DEPEND="${RDEPEND} - virtual/pkgconfig - doc? ( - pdf? ( dev-python/sphinx[latex,${PYTHON_USEDEP}] ) - !pdf? ( dev-python/sphinx[${PYTHON_USEDEP}] ) - )" - -# Restricting tests, bugs #439790 and #447908 -RESTRICT="test" - -PATCHES=( "${FILESDIR}/${PN}-1.0.9-cmake-fixes-v1.patch" ) - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - cmake-utils_src_prepare - - use python && python_fix_shebang . -} - -src_configure() { - # Missing features: - # - Truelight and Nuke are not in portage for now, so their support are disabled - # - Java bindings was not tested, so disabled - # Notes: - # - OpenImageIO is required for building ociodisplay and ocioconvert (USE opengl) - # - OpenGL, GLUT and GLEW is required for building ociodisplay (USE opengl) - local mycmakeargs=( - -DOCIO_BUILD_JNIGLUE=OFF - -DOCIO_BUILD_NUKE=OFF - -DOCIO_BUILD_SHARED=ON - -DOCIO_BUILD_STATIC=OFF - -DOCIO_STATIC_JNIGLUE=OFF - -DOCIO_BUILD_TRUELIGHT=OFF - -DUSE_EXTERNAL_LCMS=ON - -DUSE_EXTERNAL_TINYXML=ON - -DUSE_EXTERNAL_YAML=ON - -DOCIO_BUILD_DOCS="$(usex doc)" - -DOCIO_BUILD_APPS="$(usex opengl)" - -DOCIO_BUILD_PDF_DOCS="$(usex pdf)" - -DOCIO_BUILD_PYGLUE="$(usex python)" - -DOCIO_USE_SSE="$(usex cpu_flags_x86_sse2)" - -DOCIO_BUILD_TESTS="$(usex test)" - -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}" - ) - cmake-utils_src_configure -} diff --git a/media-libs/opencolorio/opencolorio-1.1.0.ebuild b/media-libs/opencolorio/opencolorio-1.1.0.ebuild new file mode 100644 index 000000000000..c1504ae4a464 --- /dev/null +++ b/media-libs/opencolorio/opencolorio-1.1.0.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +# Compatibility with Python 3 is declared by upstream, but it is broken in fact, check on bump +PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) + +inherit cmake-utils python-single-r1 vcs-snapshot + +DESCRIPTION="A color management framework for visual effects and animation" +HOMEPAGE="http://opencolorio.org/" + +SRC_URI="https://github.com/imageworks/OpenColorIO/archive/v${PV}.tar.gz \ + -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc opengl pdf python cpu_flags_x86_sse2 test" +REQUIRED_USE=" + doc? ( python ) + python? ( ${PYTHON_REQUIRED_USE} )" + +RDEPEND=" + opengl? ( + media-libs/lcms:2 + media-libs/openimageio + media-libs/glew:= + media-libs/freeglut + virtual/opengl + ) + python? ( ${PYTHON_DEPS} ) + >=dev-cpp/yaml-cpp-0.5 + dev-libs/tinyxml" + +DEPEND="${RDEPEND} + virtual/pkgconfig + doc? ( + pdf? ( dev-python/sphinx[latex,${PYTHON_USEDEP}] ) + !pdf? ( dev-python/sphinx[${PYTHON_USEDEP}] ) + )" + +# Restricting tests, bugs #439790 and #447908 +RESTRICT="test" + +PATCHES=( "${FILESDIR}/${P}-cmake-fixes.patch" ) + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + cmake-utils_src_prepare + + use python && python_fix_shebang . +} + +src_configure() { + # Missing features: + # - Truelight and Nuke are not in portage for now, so their support are disabled + # - Java bindings was not tested, so disabled + # Notes: + # - OpenImageIO is required for building ociodisplay and ocioconvert (USE opengl) + # - OpenGL, GLUT and GLEW is required for building ociodisplay (USE opengl) + local mycmakeargs=( + -DOCIO_BUILD_JNIGLUE=OFF + -DOCIO_BUILD_NUKE=OFF + -DOCIO_BUILD_SHARED=ON + -DOCIO_BUILD_STATIC=OFF + -DOCIO_STATIC_JNIGLUE=OFF + -DOCIO_BUILD_TRUELIGHT=OFF + -DUSE_EXTERNAL_LCMS=ON + -DUSE_EXTERNAL_TINYXML=ON + -DUSE_EXTERNAL_YAML=ON + -DOCIO_BUILD_DOCS="$(usex doc)" + -DOCIO_BUILD_APPS="$(usex opengl)" + -DOCIO_BUILD_PDF_DOCS="$(usex pdf)" + -DOCIO_BUILD_PYGLUE="$(usex python)" + -DOCIO_USE_SSE="$(usex cpu_flags_x86_sse2)" + -DOCIO_BUILD_TESTS="$(usex test)" + -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}" + ) + cmake-utils_src_configure +} diff --git a/media-libs/openh264/Manifest b/media-libs/openh264/Manifest index fb724a28b6d2..6f60a0e3f220 100644 --- a/media-libs/openh264/Manifest +++ b/media-libs/openh264/Manifest @@ -2,12 +2,7 @@ AUX openh264-1.5.0-pkgconfig-pathfix.patch 1903 BLAKE2B e1287e4f3bb2453c170c1fb2 AUX openh264-1.7.0-pkgconfig-pathfix.patch 1921 BLAKE2B 22d3ab7bd9cbe4c0ac638760a0c2b947eb6749a18d61cd3aca22ac84647af24d6dced048f9eae2ae9e9ee9b0813a255a6d1c8a1ff04e3e6ae2bdc1d508c82d7b SHA512 4545c9c2a696d9ceaf463fe74f391614ba41abc51ce00c32b285baf37e34d8e8bc55f2c3288309a2b44a4ff420ed7d1bc2aa26f2214abe65576d267488dd0849 AUX pkgconfig-pathfix.patch 1921 BLAKE2B 1f807eeca318dd8e78033291e3465f0da92c156b42f3aa848b2af81be4ac5d1980b791e63da41947a9c7ffc3df3eb9b39cb248b61efb49222554c21e9b378126 SHA512 b080d65385e384ea0402d829dabd38959f10b7f0880d3fb3f5611593493e2a2c5679c7f37a48c58c0cbccce04bffdc58a359fd5262614d5c98e98c491c5807d8 AUX pkgconfig_install.patch 711 BLAKE2B c75f750f3c4419323a34acc4c8490525a1dc6b1c628ea1233a124e4689c6ac1ef4338c5786cc040b9a87fd446708cbbc338fe37b2edfc16298391bdd7c66fe7a SHA512 1d3a38b35ac73cc3af6ae24d9bd537712d66f99faa9687bb8c26b3a45d559ccad6917ea1aff11030ff61c9b4c4e89701584d72e35b80b52c514e5f4e56516fe0 -DIST gmp-api-Firefox38.tar.gz 16209 BLAKE2B 688aceb707ca0c5bacbce6dca6d039b31634d4ea21973103fb147e6a9f7abf019166ecf8326a707ff87fe48774111b2b77cc02d33bc31b33eb16537348ddb368 SHA512 9aecbc84b1ba2fcfcb10c56680d92a72dd55f7ef7b8a68a3950dbce65fb7eb2c5e6a211149889f618bef2468ba1f3f8c01dc63e86e0a30d9295b019b75657eb8 DIST gmp-api-Firefox39.tar.gz 16363 BLAKE2B dd92d851c4f09476f1e394fd42c5e40ea707ac6dcabc3ceee62400eb998f1c98c781fbde581253ddd8f45b7447a0c7fdc61e74ef60b6fc3397cd4bf8995154ab SHA512 da6f05c5f0540be8d4f48d25b947b21214d34a6eed365ee5fa4a38c69f77325add4be902e0dcd9d06be43914a3518ded7e4f2289dab034a24325f0bff201692a -DIST openh264-1.4.0.tar.gz 37681189 BLAKE2B 273389f39bec341d9509521b5910b9e0fce6b092623c531a6117060ab5bdd21e0de17c4f3e6770b987a267ba136f101b8e0b9a4bec911fcf48bb3b9b13aa6e3b SHA512 8192494698cb5557331be56ecbe2b7b143e0ed95739a69a88bdb34a58f66710ef1cd9234f1e98c9b16432a41a3243634e6ca63c58119315f2f9360cb2959e42b -DIST openh264-1.5.0.tar.gz 37851166 BLAKE2B 90e25d87248bdcf5d2a0b2eaa87e104d6045b4b69859c96301c519ddded9c383d7fb32bcbc4ad39e38374b51754bb1d28fb7f9e4293b37a75f83ef7de1fd23bc SHA512 30599fed5e928af7dfec079d101a22885e52874c1d7db91ff289b989a9a20548b6bbd5d25e4e546efedd4e5aba97cbc42b1e847970b93116d86efc7af394aeaf DIST openh264-1.7.0.tar.gz 38681895 BLAKE2B 2e0e88bd446fdbea29ea4e863eb391dce1cc271c289165233aa1375e10ce6e60f7be7307eeb7acedd459c3170b57fbc5c7a0e9b6bd0c355be6447fb036192f35 SHA512 3e30584d6adb69c162f5b044f49155c22d44ab8e399f6bf09194593df84475b49979406f3e461d25ef1e4422c2721b975c58bc64d40a143d8493d45380ad96aa -EBUILD openh264-1.4.0-r1.ebuild 2619 BLAKE2B b671ea8d2c6078ca7bd6054667fbd8c7f026c4408a0b8f5788fe256d84baaf6c9f209201c71f9aa76da27ebda00d307f9080573d6cb3538f64ad3c51aa3084e1 SHA512 1cdd4d436f1f83b8c42dfc0c313b41a765b2d3a77afaf0e9f6c5123f25364deb3e6f0eb1cf6b2c3140e14770cf40cbf55e1e5c4db730d9309d65333de0d2e682 -EBUILD openh264-1.5.0.ebuild 2689 BLAKE2B 39f4ead0d19f2502e02492eec5486091e8991465d0310ea814e75ccd55712e5fb3a88786b86fa75380202e248b29b91b0f948524282be35ad823e6589aeeae0b SHA512 14c727969ea3471a6038e65c323d62f2cda602e32da8d99196e7e333c4f5ffa328c7e287e1e98eb1255a855387ffd983f97ce138bcb0c0be60f6af749387a109 -EBUILD openh264-1.7.0.ebuild 2703 BLAKE2B 309c7dac407b9bb49a67153f4e4a7fd028f3dd4e4127fdb2d7b168d223a6ce3a07a04730c8fbec3820d20055311f3872751d24f7a38148a2379c8a09bd7ddb96 SHA512 67205997297e88013b810cf67f1bf0bcf9001c99671888be1c19559c5ac3faabdb4b5abaf25588efd745c6860808cdfacce2b371e4136c1c85bc1abd3fa542ac +EBUILD openh264-1.7.0-r1.ebuild 2929 BLAKE2B 9e72b4b26c0748f1d8293943a1bae1fc90346ed78474e508d7c265dcd86366b8a737ea556b9f58cf9516bb5b91e153402b371af4f2a34813388bf2e93a594d89 SHA512 dd008099e9cea12ad28f5ab1b447cca9308e3cdb3f859818eb5889b540241d7ef7e460fca4d9fd00b964cc65119cd6e5b764e4b0f3902ab42576b06851ed17cd MISC metadata.xml 595 BLAKE2B 9d5fd608235086cb070457016516be296db695e67d50e8b3c0958133bff3cfa24a87c9abb42c043d94d5d64ba6fb3e9d485b4c9d07042054a9eb25e6ee73ad4b SHA512 8fc3fa7f260a188f7ebf43d85da27a49a924a2ce0835fd37f0db356caa401102eee0ade0fa414303d8a0681ddb4b10abd4da5a9bb5cf79ea31f5b96199897220 diff --git a/media-libs/openh264/openh264-1.4.0-r1.ebuild b/media-libs/openh264/openh264-1.4.0-r1.ebuild deleted file mode 100644 index 9a705d5dd6f7..000000000000 --- a/media-libs/openh264/openh264-1.4.0-r1.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit nsplugins multilib-minimal - -MOZVER=38 -DESCRIPTION="Cisco OpenH264 library and Gecko Media Plugin for Mozilla packages" -HOMEPAGE="http://www.openh264.org/" -SRC_URI="https://github.com/cisco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://github.com/mozilla/gmp-api/archive/Firefox${MOZVER}.tar.gz -> gmp-api-Firefox${MOZVER}.tar.gz" -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="+plugin utils" - -RESTRICT="bindist" - -RDEPEND="!"${T}"/98-moz-gmp-${PN} - doenvd "${T}"/98-moz-gmp-${PN} - - cat <"${T}"/${P}.js -pref("media.gmp-gmp${PN}.autoupdate", false); -pref("media.gmp-gmp${PN}.version", "system-installed"); -PREFEOF - - insinto /usr/$(get_libdir)/firefox/defaults/pref - doins "${T}"/${P}.js - - insinto /usr/$(get_libdir)/seamonkey/defaults/pref - doins "${T}"/${P}.js - fi -} - -pkg_postinst() { - if use plugin; then - if [[ -z ${REPLACING_VERSIONS} ]]; then - elog "Please restart your login session, in order for the session's environment" - elog "to include the new MOZ_GMP_PATH variable." - elog "" - fi - elog "This package attempts to override the Mozilla GMPInstaller auto-update process," - elog "however even if it is not successful in doing so the profile-installed plugin" - elog "will not be used unless this package is removed. This package will take precedence" - elog "over any gmp-gmpopenh264 that may be installed in a user's profile." - elog "" - fi -} diff --git a/media-libs/openh264/openh264-1.5.0.ebuild b/media-libs/openh264/openh264-1.5.0.ebuild deleted file mode 100644 index aab9349bbcfe..000000000000 --- a/media-libs/openh264/openh264-1.5.0.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit nsplugins multilib-minimal - -MOZVER=39 -DESCRIPTION="Cisco OpenH264 library and Gecko Media Plugin for Mozilla packages" -HOMEPAGE="http://www.openh264.org/" -SRC_URI="https://github.com/cisco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://github.com/mozilla/gmp-api/archive/Firefox${MOZVER}.tar.gz -> gmp-api-Firefox${MOZVER}.tar.gz" -LICENSE="BSD" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 x86" -IUSE="+plugin utils" - -RESTRICT="bindist" - -RDEPEND="!"${T}"/98-moz-gmp-${PN} - doenvd "${T}"/98-moz-gmp-${PN} - - cat <"${T}"/${P}.js -pref("media.gmp-gmp${PN}.autoupdate", false); -pref("media.gmp-gmp${PN}.version", "system-installed"); -PREFEOF - - insinto /usr/$(get_libdir)/firefox/defaults/pref - doins "${T}"/${P}.js - - insinto /usr/$(get_libdir)/seamonkey/defaults/pref - doins "${T}"/${P}.js - fi -} - -pkg_postinst() { - if use plugin; then - if [[ -z ${REPLACING_VERSIONS} ]]; then - elog "Please restart your login session, in order for the session's environment" - elog "to include the new MOZ_GMP_PATH variable." - elog "" - fi - elog "This package attempts to override the Mozilla GMPInstaller auto-update process," - elog "however even if it is not successful in doing so the profile-installed plugin" - elog "will not be used unless this package is removed. This package will take precedence" - elog "over any gmp-gmpopenh264 that may be installed in a user's profile." - elog "" - fi -} diff --git a/media-libs/openh264/openh264-1.7.0-r1.ebuild b/media-libs/openh264/openh264-1.7.0-r1.ebuild new file mode 100644 index 000000000000..ef0c663fca56 --- /dev/null +++ b/media-libs/openh264/openh264-1.7.0-r1.ebuild @@ -0,0 +1,103 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +inherit nsplugins multilib-minimal + +MOZVER=39 +DESCRIPTION="Cisco OpenH264 library and Gecko Media Plugin for Mozilla packages" +HOMEPAGE="http://www.openh264.org/" +SRC_URI="https://github.com/cisco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz + https://github.com/mozilla/gmp-api/archive/Firefox${MOZVER}.tar.gz -> gmp-api-Firefox${MOZVER}.tar.gz" +LICENSE="BSD" +SLOT="0" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 x86" +IUSE="+plugin utils" + +RESTRICT="bindist" + +RDEPEND="!"${T}"/98-moz-gmp-${PN} + doenvd "${T}"/98-moz-gmp-${PN} + + cat <"${T}"/${P}.js +pref("media.gmp-gmp${PN}.autoupdate", false); +pref("media.gmp-gmp${PN}.version", "system-installed"); +PREFEOF + + insinto /usr/$(get_libdir)/firefox/defaults/pref + doins "${T}"/${P}.js + + insinto /usr/$(get_libdir)/seamonkey/defaults/pref + doins "${T}"/${P}.js + fi +} + +pkg_postinst() { + if use plugin; then + if [[ -z ${REPLACING_VERSIONS} ]]; then + elog "Please restart your login session, in order for the session's environment" + elog "to include the new MOZ_GMP_PATH variable." + elog "" + fi + elog "This package attempts to override the Mozilla GMPInstaller auto-update process," + elog "however even if it is not successful in doing so the profile-installed plugin" + elog "will not be used unless this package is removed. This package will take precedence" + elog "over any gmp-gmpopenh264 that may be installed in a user's profile." + elog "" + fi + if use utils; then + elog "Utilities h264enc and h264dec are installed as openh264enc and openh264dec" + elog "to avoid file collisions with media-video/h264enc" + elog "" + fi +} diff --git a/media-libs/openh264/openh264-1.7.0.ebuild b/media-libs/openh264/openh264-1.7.0.ebuild deleted file mode 100644 index 1c42837a9727..000000000000 --- a/media-libs/openh264/openh264-1.7.0.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit nsplugins multilib-minimal - -MOZVER=39 -DESCRIPTION="Cisco OpenH264 library and Gecko Media Plugin for Mozilla packages" -HOMEPAGE="http://www.openh264.org/" -SRC_URI="https://github.com/cisco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://github.com/mozilla/gmp-api/archive/Firefox${MOZVER}.tar.gz -> gmp-api-Firefox${MOZVER}.tar.gz" -LICENSE="BSD" -SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 x86" -IUSE="+plugin utils" - -RESTRICT="bindist" - -RDEPEND="!"${T}"/98-moz-gmp-${PN} - doenvd "${T}"/98-moz-gmp-${PN} - - cat <"${T}"/${P}.js -pref("media.gmp-gmp${PN}.autoupdate", false); -pref("media.gmp-gmp${PN}.version", "system-installed"); -PREFEOF - - insinto /usr/$(get_libdir)/firefox/defaults/pref - doins "${T}"/${P}.js - - insinto /usr/$(get_libdir)/seamonkey/defaults/pref - doins "${T}"/${P}.js - fi -} - -pkg_postinst() { - if use plugin; then - if [[ -z ${REPLACING_VERSIONS} ]]; then - elog "Please restart your login session, in order for the session's environment" - elog "to include the new MOZ_GMP_PATH variable." - elog "" - fi - elog "This package attempts to override the Mozilla GMPInstaller auto-update process," - elog "however even if it is not successful in doing so the profile-installed plugin" - elog "will not be used unless this package is removed. This package will take precedence" - elog "over any gmp-gmpopenh264 that may be installed in a user's profile." - elog "" - fi -} diff --git a/media-libs/simage/Manifest b/media-libs/simage/Manifest index a43fc7c102fd..1bce0b9ace79 100644 --- a/media-libs/simage/Manifest +++ b/media-libs/simage/Manifest @@ -1,6 +1,6 @@ AUX simage-1.7.0-libpng15.patch 572 BLAKE2B 7f4eacdd5aac3e6634fd26824d0dfb7ec779fcf6be86e642f2870c62b1f0bd86b1ef767e19034e05fd62cba9904ef45e13a85be7657e00133febb67b0469c337 SHA512 0a867187b0dbc644182784e56dfd26b51f48c9355b01228fe3386fab05cee084e0066d4b18eb3f63110a25c0d2abf8f8b214d9b94e2e7dc7438e90308653e4e8 AUX simage-1.7.0-pkgconfig-partial.patch 467 BLAKE2B a2957c1d5fc6939df7ecb1bb15743253294142a87f98d4043368f189dc4f5ee302de16e84572a69e3ea5755124326fb075b2e45d3574a1759c899d9e96eaf828 SHA512 791db9c02fc0dc7526ed43b340ab6f92baea91a5bf9005099f6adf1550a7ab73ef36790d2e761f0b50b88098e9124f3035ff21149cca00d819c2262d8e180618 DIST simage-1.7.0.tar.gz 752602 BLAKE2B feca31f8d41ae67271e43c9c664243d872985068ffc8496d43c9b59a47ae5c3067956acced3ff9abbdc5a360aec662e3972a93d8523a704a72ac9d12dd4cfaa0 SHA512 944ec009dd7041692073ddd9795fdd633fe3bc9101f1c1234e8be3746487a9431aecf52abde01563e719153fbe1ca7d29f9b64042e4a64ea08d6cb14666dd89f -EBUILD simage-1.7.0-r1.ebuild 1821 BLAKE2B e780549328c705454166eaa1b3bf0517fed5dc24700154f42c49f4bf6511e389cf5c40f3e01346d6ec87d7a1d8c4152b98980fec6abada6931734c685d85e100 SHA512 9ba3e0eb866e5cf75786ade61de8b6aa64ed453ce5da78bc79aa0739aa18e66472c72e07c18b6260b64ff1d42b166cb9bf78932b4d4ea87f2be2c93401cc9da5 +EBUILD simage-1.7.0-r1.ebuild 1820 BLAKE2B 6042cc61c5c2a1663617519b3220cdef11b6439b1aab26279c74f0add1583014f9e5c130135e5e1000012a526b666e1478eb104bd01f9c085083e846ac3ca8a9 SHA512 5ba19751344b39d929d779d42b533ab58728930749f201bb3713383ef214f749bfa4eb8fd0e666c86d27963f2afad1245373b8187d91524e5090aad12a50bb6a EBUILD simage-1.7.0.ebuild 1797 BLAKE2B a59ec07def228a517d059b4b7bcb1ee1ec177feb681220c3bfc072ae73e3d431760b1b04c3cdeb75bac6d5840233a8ce7725ba243408be6bf659b0de5b421f49 SHA512 fee38faec0e6671220b7eda84c5639be3ea66d88384bda168296de2184e8cc38b45555801ab0c6988fc737af0b60c3d78a34984f48faad99c0236a3baf6182c3 MISC metadata.xml 298 BLAKE2B 312f7a48552438ce1231a58486f19aca02bbb281b72733645ffad42a3f82df778145bfc66a61c1216e47bd68e54668725fe08274482be7fb3997c99bf3089fdc SHA512 b72572413e5e40d55658049b4624de687dd1011553fc384deb0c837830b6f82d060b6356ad25e803f27d3be697b07a8c3fbc45932d20d89e4d9918ed6fecd84a diff --git a/media-libs/simage/simage-1.7.0-r1.ebuild b/media-libs/simage/simage-1.7.0-r1.ebuild index 5cf1e9156c36..7d2ebd4d9581 100644 --- a/media-libs/simage/simage-1.7.0-r1.ebuild +++ b/media-libs/simage/simage-1.7.0-r1.ebuild @@ -8,7 +8,7 @@ HOMEPAGE="https://bitbucket.org/Coin3D/simage" SRC_URI="https://bitbucket.org/Coin3D/coin/downloads/${P}.tar.gz" LICENSE="public-domain mpeg2enc" -KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86" SLOT="0" IUSE="debug gif jpeg jpeg2k png sndfile static-libs tiff vorbis zlib" RESTRICT="mirror bindist" #465086 diff --git a/media-libs/vips/Manifest b/media-libs/vips/Manifest index e899fb1079b5..ed6fdb76d604 100644 --- a/media-libs/vips/Manifest +++ b/media-libs/vips/Manifest @@ -1,3 +1,3 @@ -DIST vips-7.38.5.tar.gz 3447505 SHA256 495dc8ca70910eca33a867f0a7e6903b076d6dd9fbdf2ddbb2ffd4270f0fe00e SHA512 99b3a3efb32a976d17e5ce7d7d79e8bb708c148e981f866a8997a07f641866ba237cd677de9f7cafab30afb182a5bde7cc130368c8ff5d8f413d38801a24ed37 WHIRLPOOL a40d38956a476e74669288ba14f6a5c49f5485221c90e8455702bbfde411a871a5f31cfdeefa1329a17f773a14668af187e92189e4f592dba459a0b20a3c16ba +DIST vips-7.38.5.tar.gz 3447505 BLAKE2B e0db7357054969618a7bc226a652425ee2cd2b0a4964ed5e575f62c7659796d7ba71439ec2a01efc10f615eb748119edbf66bf23b2b807b54fef49fc469f1efd SHA512 99b3a3efb32a976d17e5ce7d7d79e8bb708c148e981f866a8997a07f641866ba237cd677de9f7cafab30afb182a5bde7cc130368c8ff5d8f413d38801a24ed37 EBUILD vips-7.38.5-r1.ebuild 1989 BLAKE2B 4b33f697032f3e888234f04dbf76496a225ab98a6c884284cb775dc279a0b1925307b175eb09a3b2ac6a4e7cba88a5b817724a20e4f6488fcc3b7e2f6094ace4 SHA512 ae4e4ceb744a3fb3065b412f32ef97a772ef8ecc4762d0953de5796f0626a6e288f6194f96e3eb4463f8a70ded2cfa428bdaebe7a9810118d68b8f9cc19f0a7d MISC metadata.xml 566 BLAKE2B ab76f070f1f02b13cf430c389b015b1c05af226ef4385108dabdafc75c78cee43ff1ec5ef29460bb35388ae145cfc01d5b1d12e4cf064e9c20dbf0d69372fbc1 SHA512 ec9f48afdc5c9dc261e4b6732c80d8fac42f579070bfb26ef1a83e0af90a40914424a7a30b7f3688e6455b2c089ded67fab4093248d378b6a7acb78b3d635d30 diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest index c8657fa8a9c6..fccfd8fc54bc 100644 --- a/media-libs/xine-lib/Manifest +++ b/media-libs/xine-lib/Manifest @@ -4,7 +4,9 @@ AUX xine-lib-1.2.6-libxcb-1.12.patch 1304 BLAKE2B e60d0d5ee86fc7cd9e9d7f846d0666 AUX xine-lib-1.2.6-sysmacros.patch 425 BLAKE2B df1e3569716777e15737248b30be7491eae9099d8e0126e71eca6fd7622b128b1600c212f2a481117ac780ce11ab74032fb15089aab51753b5a2e80f00f1bae1 SHA512 fed191b8d1c4d1a4b4c5f399a720f07065feda2962f760b7b03bbfc7c19dfbd92e5a621172b84ee6776a55c052b79ecf06707a6d406417796c5f08adced79fe0 DIST xine-lib-1.2.6.tar.xz 5020964 BLAKE2B 832a05897b233773569d74caf5320b5a11fddf6290310b51ab68e61f329faa2aeed2e3410ebc0aee8f4584ef441d97c279522eabca052e96783e389a5bdc4dd7 SHA512 ed4b1bc29daf85021cb83393d010ddca0ce9da508a8ddb9fec554f18eda1d156fc08f0aeaabeb7afe93fc445f049f84057e0708e6c87cd123c5cd2b20f8a25fd DIST xine-lib-1.2.8.tar.xz 5151580 BLAKE2B e0b62aa74545aa40737673e8fb4b6f493f65cbb14f059aaafdeab52f0ad6a34832558b0e1f6cad3bc288e584594de3a4e842d1e770dbc1244247431bb5bd1829 SHA512 ef7cdf1090f4e113f441055963dce9751b548398ff1a4da5e45b7fea45d4f8b5443622e675d343984ec956f3fc054ff9214a2aee3edd3a79d8ddb77afc3e17b2 +DIST xine-lib-1.2.9.tar.xz 5180452 BLAKE2B 43d977d31bf2fcabd896c806e56d5cd12cf579951a4e0df5451df7323fb43cff2770fb2bf1b65b9041e761ec9e9e68d55f761e18522c787aa643f71bb73bd0b7 SHA512 bc672b32d6d72e6fa5641319e0bd15d721ea4b65e6d025e3cdbf6ba3655a7b2c714809d919a53fca8a908a7ce37541a341c13dd8a336799c2e942d5f86b84d3c EBUILD xine-lib-1.2.6-r2.ebuild 5726 BLAKE2B 47bc92135d960c6d94970e86c3e02b7e325feb5aa2ba73cf62c43d4a15b0b87c3fec03978f5345c043b12482383668e7b86c968298fb87d51ea8e31da8fe35b2 SHA512 5b92b1712da307acd84b3e0afa091cbb395e169d434b640cb3b44e4b02fae0d7c48e8296511124679e1e478a948b8a261933b27f8ce64d4f669bdc3ed445bd79 EBUILD xine-lib-1.2.8.ebuild 5697 BLAKE2B d8baf5cd1478665d092e74da71f23bf23e598545c1f3c32b62a5e667f84ec66e7a26735688598fcd6fbf9d80b297ce5e42d93b2f220f8db5a200548790c99dec SHA512 c25ea834cada0b68d19adacfc8e338608e4f855693b989913900f9ddc86c56b386825f399a830ddfd19eadfbf255c81be61da30d8dbc213848f7c85bbbecb7f2 -EBUILD xine-lib-1.2.9999.ebuild 5648 BLAKE2B 3d6d44b476327453c2ba711d53103d9b72b8fe820e0454e1c78e286f85e623fabcdacfebc16a3f16b388e0f0d17d1473ea0353d17dd3f181bd00de610f3f0cf8 SHA512 fc3bbe13f66ae98f08ce3d8a60970adbf15fd36b461b23cb22a1dbe51413d1cb97d06a22b0fea6145bd7dd58882ead91b95de52436123c2b37416f654f97f2d1 +EBUILD xine-lib-1.2.9.ebuild 5565 BLAKE2B 6e5ca0d27be4dae22f23dbc822e849c2b24696ebfbc2dd788b1391470cea49c9ad5ee5ebc44b2c76c55c94e256e80cf1c95d8d91d630a933eb1b4ddee2bfbf05 SHA512 7cd31a34ec4cb49b0faf0c56a3b6e672b5d602f50a3d732ddcab8934808531599f49bce3ef599bb72fef30b2b4a7de735f43b53f996d3671590aafe1fffd4763 +EBUILD xine-lib-1.2.9999.ebuild 5449 BLAKE2B 03d41975b7a68c73c3331f5be5086042f514a55f28eb16b62117afdab1657909281af440b4ff9a87e950ef6cd7e0f9b9e0bc8b7e29acc0b1a3e44cf37e69cd15 SHA512 7996e99e79a9bd761ce4fe8e0694ab53e8f9c3ea394953489ee0f64906b374a6883d8487e9b0f3229e2f3e1dfd9c6a6663b574ae64475b75023e84c3e4fd993c MISC metadata.xml 2668 BLAKE2B 64956b27b10284478ae15509a1aa4a1408104c1e98263ac7e1ea376cbb8e596f532e049f4b3381c51f86d4cd4187784be6ad481177ffc62aef0964c90094d6b1 SHA512 17263da5cdc28752dc9344b9806665d236d8a5d3ccad7b19209912a3510b17c9d6587fd1aa847e509a3c4accd53cc96c7d1fc476f6adf9aa63c90b7eed45183b diff --git a/media-libs/xine-lib/xine-lib-1.2.9.ebuild b/media-libs/xine-lib/xine-lib-1.2.9.ebuild new file mode 100644 index 000000000000..993b8a7a53ec --- /dev/null +++ b/media-libs/xine-lib/xine-lib-1.2.9.ebuild @@ -0,0 +1,230 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit flag-o-matic libtool multilib + +if [[ ${PV} == *9999* ]]; then + EHG_REPO_URI="http://hg.debian.org/hg/xine-lib/xine-lib-1.2" + inherit autotools mercurial + unset NLS_IUSE + NLS_DEPEND="sys-devel/gettext" + NLS_RDEPEND="virtual/libintl" +else + KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd" + SRC_URI="mirror://sourceforge/xine/${P}.tar.xz" + NLS_IUSE="nls" + NLS_DEPEND="nls? ( sys-devel/gettext )" + NLS_RDEPEND="nls? ( virtual/libintl )" +fi + +DESCRIPTION="Core libraries for Xine movie player" +HOMEPAGE="http://xine.sourceforge.net/" + +LICENSE="GPL-2" +SLOT="1" +IUSE="a52 aac aalib +alsa altivec bluray +css directfb dts dvb dxr3 fbcon flac fusionsound gtk imagemagick ipv6 jack jpeg libav libcaca mad +mmap mng modplug musepack opengl oss pulseaudio samba sdl speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack +X +xcb xinerama +xv xvmc ${NLS_IUSE}" + +RDEPEND="${NLS_RDEPEND} + dev-libs/libxdg-basedir + media-libs/libdvdnav + sys-libs/zlib + virtual/libiconv + a52? ( media-libs/a52dec ) + aac? ( media-libs/faad2 ) + aalib? ( media-libs/aalib ) + alsa? ( media-libs/alsa-lib ) + bluray? ( >=media-libs/libbluray-0.2.1:= ) + css? ( >=media-libs/libdvdcss-1.2.10 ) + directfb? ( dev-libs/DirectFB ) + dts? ( media-libs/libdca ) + dxr3? ( media-libs/libfame ) + flac? ( media-libs/flac ) + fusionsound? ( >=dev-libs/DirectFB-1.7.1[fusionsound] ) + gtk? ( x11-libs/gdk-pixbuf:2 ) + imagemagick? ( virtual/imagemagick-tools ) + jack? ( >=media-sound/jack-audio-connection-kit-0.100 ) + jpeg? ( virtual/jpeg:0 ) + !libav? ( media-video/ffmpeg:0= ) + libav? ( + media-libs/libpostproc:0= + media-video/libav:0= + ) + libcaca? ( media-libs/libcaca ) + mad? ( media-libs/libmad ) + mng? ( media-libs/libmng ) + modplug? ( >=media-libs/libmodplug-0.8.8.1 ) + musepack? ( >=media-sound/musepack-tools-444 ) + opengl? ( + virtual/glu + virtual/opengl + ) + pulseaudio? ( media-sound/pulseaudio ) + samba? ( net-fs/samba ) + sdl? ( media-libs/libsdl ) + speex? ( + media-libs/libogg + media-libs/speex + ) + theora? ( + media-libs/libogg + media-libs/libtheora + ) + truetype? ( + media-libs/fontconfig + media-libs/freetype:2 + ) + v4l? ( media-libs/libv4l ) + vaapi? ( x11-libs/libva[X,opengl] ) + vcd? ( + >=media-video/vcdimager-0.7.23 + dev-libs/libcdio:0=[-minimal] + ) + vdpau? ( x11-libs/libvdpau ) + vorbis? ( + media-libs/libogg + media-libs/libvorbis + ) + vpx? ( media-libs/libvpx:0= ) + wavpack? ( media-sound/wavpack ) + X? ( + x11-libs/libX11 + x11-libs/libXext + ) + xcb? ( x11-libs/libxcb ) + xinerama? ( x11-libs/libXinerama ) + xv? ( x11-libs/libXv ) + xvmc? ( x11-libs/libXvMC )" +DEPEND="${RDEPEND} + ${NLS_DEPEND} + app-arch/xz-utils + virtual/pkgconfig + >=sys-devel/libtool-2.2.6b + oss? ( virtual/os-headers ) + v4l? ( virtual/os-headers ) + X? ( + x11-libs/libXt + x11-proto/xf86vidmodeproto + x11-proto/xproto + ) + xv? ( x11-proto/videoproto ) + xvmc? ( x11-proto/videoproto ) + xinerama? ( x11-proto/xineramaproto )" +REQUIRED_USE="vidix? ( || ( X fbcon ) ) + xv? ( X ) + xinerama? ( X )" + +src_prepare() { + default + + if has_version '>=media-gfx/imagemagick-7.0.1.0' ; then + eapply "${FILESDIR}/${PN}-1.2.6-imagemagick7.patch" + fi + + sed -i -e '/define VDR_ABS_FIFO_DIR/s|".*"|"/var/vdr/xine"|' src/vdr/input_vdr.c || die + + if [[ "${PV}" = *9999* ]] ; then + eautoreconf + else + elibtoolize + fi + + local x + for x in 0 1 2 3; do + sed -i -e "/^O${x}_CFLAGS=\"-O${x}\"/d" configure || die + done +} + +src_configure() { + [[ ${CHOST} == i?86-* ]] && append-flags -fomit-frame-pointer #422519 + + local win32dir #197236 + if has_multilib_profile; then + win32dir=/usr/$(ABI="x86" get_libdir)/win32 + else + win32dir=/usr/$(get_libdir)/win32 + fi + + local myconf=( + --disable-gnomevfs + --disable-optimizations + --disable-real-codecs + --disable-v4l + --disable-w32dll + --with-external-dvdnav + --with-real-codecs-path=/usr/$(get_libdir)/codecs + --with-w32-path=${win32dir} + --with-xv-path=/usr/$(get_libdir) + --without-esound + $(use_enable a52 a52dec) + $(use_enable aac faad) + $(use_enable aalib) + $(use_enable altivec) + $(use_enable bluray) + $(use_enable directfb) + $(use_enable dts) + $(use_enable dvb) + $(use_enable dxr3) + $(use_enable fbcon fb) + $(use_enable gtk gdkpixbuf) + $(use_enable ipv6) + $(use_enable jpeg libjpeg) + $(use_enable mad) + $(use_enable mmap) + $(use_enable mng) + $(use_enable modplug) + $(use_enable musepack) + $(use_enable opengl) + $(use_enable opengl glu) + $(use_enable oss) + $(use_enable samba) + $(use_enable v4l libv4l) + $(use_enable v4l v4l2) + $(use_enable vaapi) + $(use_enable vdpau) + $(use_enable vis) + $(use_enable vidix) + $(use_enable xinerama) + $(use_enable xvmc) + $(use_enable vcd) + $(use_enable vdr) + $(use_enable vpx) + $(use_with alsa) + $(use_with flac libflac) + $(use_with fusionsound) + $(use_with imagemagick) + $(use_with jack) + $(use_with libcaca caca) + $(use_with pulseaudio) + $(use_with sdl) + $(use_with speex) + $(use_with theora) + $(use_with truetype fontconfig) + $(use_with truetype freetype) + $(use_with vorbis) + $(use_with wavpack) + $(use_with X x) + $(use_with xcb) + ) + [[ ${PV} == *9999* ]] || myconf+=( $(use_enable nls) ) + + if ! use libav && has_version '>=media-video/ffmpeg-2.2:0'; then + myconf+=( --enable-avformat ) #507474 + fi + + econf "${myconf[@]}" +} + +src_compile() { + # enable verbose building, bug #448140 + emake V=1 +} + +src_install() { + emake DESTDIR="${D}" install + + rm -f \ + "${ED%/}"usr/lib*/libxine*.la \ + "${ED%/}"usr/share/doc/${PF}/COPYING +} diff --git a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild b/media-libs/xine-lib/xine-lib-1.2.9999.ebuild index a7d83b367faa..8e2f4aec7966 100644 --- a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild +++ b/media-libs/xine-lib/xine-lib-1.2.9999.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=6 @@ -7,7 +7,7 @@ inherit flag-o-matic libtool multilib if [[ ${PV} == *9999* ]]; then EHG_REPO_URI="http://hg.debian.org/hg/xine-lib/xine-lib-1.2" - inherit autotools mercurial eutils + inherit autotools mercurial unset NLS_IUSE NLS_DEPEND="sys-devel/gettext" NLS_RDEPEND="virtual/libintl" @@ -30,11 +30,6 @@ RDEPEND="${NLS_RDEPEND} dev-libs/libxdg-basedir media-libs/libdvdnav sys-libs/zlib - !libav? ( media-video/ffmpeg:0= ) - libav? ( - media-libs/libpostproc:0= - media-video/libav:0= - ) virtual/libiconv a52? ( media-libs/a52dec ) aac? ( media-libs/faad2 ) @@ -51,6 +46,11 @@ RDEPEND="${NLS_RDEPEND} imagemagick? ( virtual/imagemagick-tools ) jack? ( >=media-sound/jack-audio-connection-kit-0.100 ) jpeg? ( virtual/jpeg:0 ) + !libav? ( media-video/ffmpeg:0= ) + libav? ( + media-libs/libpostproc:0= + media-video/libav:0= + ) libcaca? ( media-libs/libcaca ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng ) @@ -120,8 +120,7 @@ src_prepare() { sed -i -e '/define VDR_ABS_FIFO_DIR/s|".*"|"/var/vdr/xine"|' src/vdr/input_vdr.c || die - if [[ ${PV} == *9999* ]]; then - epatch_user + if [[ "${PV}" = *9999* ]] ; then eautoreconf else elibtoolize @@ -143,70 +142,74 @@ src_configure() { win32dir=/usr/$(get_libdir)/win32 fi - local myconf=() - [[ ${PV} == *9999* ]] || myconf=( $(use_enable nls) ) + local myconf=( + --disable-gnomevfs + --disable-optimizations + --disable-real-codecs + --disable-v4l + --disable-w32dll + --with-external-dvdnav + --with-real-codecs-path=/usr/$(get_libdir)/codecs + --with-w32-path=${win32dir} + --with-xv-path=/usr/$(get_libdir) + --without-esound + $(use_enable a52 a52dec) + $(use_enable aac faad) + $(use_enable aalib) + $(use_enable altivec) + $(use_enable bluray) + $(use_enable directfb) + $(use_enable dts) + $(use_enable dvb) + $(use_enable dxr3) + $(use_enable fbcon fb) + $(use_enable gtk gdkpixbuf) + $(use_enable ipv6) + $(use_enable jpeg libjpeg) + $(use_enable mad) + $(use_enable mmap) + $(use_enable mng) + $(use_enable modplug) + $(use_enable musepack) + $(use_enable opengl) + $(use_enable opengl glu) + $(use_enable oss) + $(use_enable samba) + $(use_enable v4l libv4l) + $(use_enable v4l v4l2) + $(use_enable vaapi) + $(use_enable vdpau) + $(use_enable vis) + $(use_enable vidix) + $(use_enable xinerama) + $(use_enable xvmc) + $(use_enable vcd) + $(use_enable vdr) + $(use_enable vpx) + $(use_with alsa) + $(use_with flac libflac) + $(use_with fusionsound) + $(use_with imagemagick) + $(use_with jack) + $(use_with libcaca caca) + $(use_with pulseaudio) + $(use_with sdl) + $(use_with speex) + $(use_with theora) + $(use_with truetype fontconfig) + $(use_with truetype freetype) + $(use_with vorbis) + $(use_with wavpack) + $(use_with X x) + $(use_with xcb) + ) + [[ ${PV} == *9999* ]] || myconf+=( $(use_enable nls) ) if ! use libav && has_version '>=media-video/ffmpeg-2.2:0'; then myconf+=( --enable-avformat ) #507474 fi - econf \ - $(use_enable ipv6) \ - $(use_enable altivec) \ - $(use_enable vis) \ - --disable-optimizations \ - $(use_enable mmap) \ - $(use_enable oss) \ - $(use_enable aalib) \ - $(use_enable directfb) \ - $(use_enable dxr3) \ - $(use_enable fbcon fb) \ - $(use_enable opengl) $(use_enable opengl glu) \ - $(use_enable vidix) \ - $(use_enable xinerama) \ - $(use_enable xvmc) \ - $(use_enable vdpau) \ - $(use_enable vaapi) \ - $(use_enable dvb) \ - --disable-gnomevfs \ - $(use_enable samba) \ - --disable-v4l $(use_enable v4l v4l2) $(use_enable v4l libv4l) \ - $(use_enable vcd) \ - $(use_enable vdr) \ - $(use_enable bluray) \ - $(use_enable a52 a52dec) \ - $(use_enable aac faad) \ - $(use_enable gtk gdkpixbuf) \ - $(use_enable jpeg libjpeg) \ - $(use_enable dts) \ - $(use_enable mad) \ - $(use_enable modplug) \ - $(use_enable musepack) \ - $(use_enable mng) \ - --disable-real-codecs \ - --disable-w32dll \ - $(use_enable vpx) \ - $(use_with truetype freetype) $(use_with truetype fontconfig) \ - $(use_with X x) \ - $(use_with alsa) \ - --without-esound \ - $(use_with fusionsound) \ - $(use_with jack) \ - $(use_with pulseaudio) \ - $(use_with libcaca caca) \ - $(use_with sdl) \ - $(use_with xcb) \ - --with-xv-path=/usr/$(get_libdir) \ - $(use_with imagemagick) \ - --with-external-dvdnav \ - $(use_with flac libflac) \ - $(use_with speex) \ - $(use_with theora) \ - $(use_with vorbis) \ - --with-real-codecs-path=/usr/$(get_libdir)/codecs \ - --with-w32-path=${win32dir} \ - $(use_with wavpack) \ - "${myconf[@]}" + econf "${myconf[@]}" } src_compile() { @@ -215,13 +218,9 @@ src_compile() { } src_install() { - emake \ - DESTDIR="${D}" \ - docdir="/usr/share/doc/${PF}" \ - htmldir="/usr/share/doc/${PF}/html" \ - install + emake DESTDIR="${D}" install rm -f \ - "${ED}"usr/lib*/libxine*.la \ - "${ED}"usr/share/doc/${PF}/COPYING + "${ED%/}"usr/lib*/libxine*.la \ + "${ED%/}"usr/share/doc/${PF}/COPYING } -- cgit v1.2.3