From bd7908c6630f38067350d396ac5d18c3cc2434a0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 29 Oct 2017 11:22:34 +0000 Subject: gentoo resync : 29.10.2017 --- media-libs/avidemux-core/Manifest | 4 - .../avidemux-core/avidemux-core-2.6.20.ebuild | 108 -------------------- .../avidemux-core/avidemux-core-2.6.8.ebuild | 111 --------------------- .../files/avidemux-core-2.6.8-gcc6.patch | 50 ---------- 4 files changed, 273 deletions(-) delete mode 100644 media-libs/avidemux-core/avidemux-core-2.6.20.ebuild delete mode 100644 media-libs/avidemux-core/avidemux-core-2.6.8.ebuild delete mode 100644 media-libs/avidemux-core/files/avidemux-core-2.6.8-gcc6.patch (limited to 'media-libs/avidemux-core') diff --git a/media-libs/avidemux-core/Manifest b/media-libs/avidemux-core/Manifest index ffc9ebd7357a..a558bd81b02b 100644 --- a/media-libs/avidemux-core/Manifest +++ b/media-libs/avidemux-core/Manifest @@ -1,10 +1,6 @@ AUX avidemux-core-2.6.20-fix-cmake.patch 1020 SHA256 a0c99d111a0463af8591711f3c4dd5d56c7becfac1d3acfc71bb34d3396e760a SHA512 82f4a5c3328d593bc5b2dbabc339eb19ceb6bc295984ca1fda4efbfd0f0a3687d39d07f36cf4338230396db849012f3d8ea053404f78317712741571cf060f0e WHIRLPOOL cd238f29eeb2efdc6e142eac16b50ab02cb4896442700707363949b38c0b4d31f4cabe589090bd63bf9ebe4b1b1c99060967a3af222ba31c87a4be432331c49b -AUX avidemux-core-2.6.8-gcc6.patch 2442 SHA256 23fa42b51424b0bc5f193ffae4674c37260fdef10057e8927c3263887019c79f SHA512 96de07011cb52f1cc49a2f7490ded579be16365b3c0d1b075d84968acd4838c6661a4587f75441d19e0caa95ff506510f3834fac105a8a946cf983c2f6a86a7b WHIRLPOOL ae07b7ad7b398ee31afa17aa92a0227cb70f267acd319b162b728d8d61d59465a86d4b4d4230207eb071d53b2793c207a626b7c0be094d057f732354aaaeaf04 DIST avidemux_2.6.20.tar.gz 20172362 SHA256 03c6cb7fc9eb74688b4fcd5eb654ed7b9c4ffc717a72cc09b08a2d10cdc7ef9f SHA512 d01d0fc24a3004770bd3923c2debc4fa2752eb71df08cfe423746b9c44a2562ca01d82965ed2563b99572a4bed8034b79487199ce330208b51a3b7f87ccf7103 WHIRLPOOL 2e2dc21bed49eeb0cdfefe75fe51f6a84226e7e8e80b063bc0b3d8711a6b91db710611dc0ec06575be69ec8e24f2f9e5b5eb363b9c095267729e85e162a4ce38 -DIST avidemux_2.6.8.tar.gz 17380534 SHA256 02998c235a89894d184d745c94cac37b78bc20e9eb44b318ee2bb83f2507e682 SHA512 57a4042f1a9d46462850871d36950215c5ffb5b66ce2f2cde09d747e946c05adb7a550ac7763c96f4c1bcb2c39881407d9d88bc64c93053741091751495ba0b0 WHIRLPOOL 29f8a6039d82e686e8dfbfc7b23658921834238a4cc6c4de338afdfdc032a9a7cba1c8236789aa6dbcab318ec14c344c19563f153e6cbd63cd265c5fb15b44b6 EBUILD avidemux-core-2.6.20-r2.ebuild 2592 SHA256 3243878267f5983c2654057afc06aa02a240d46507e68ebced6b5432a2c00359 SHA512 3e0c2cbb97f734a7ee9d386241bda083fe41d9f0777bad50db6f017fca121aa0cbe4e699d28a6499d7f94b0238da6fa7bc96f9f0bef359a64f000b27b562efad WHIRLPOOL e67cd3046fee8471178d6a44b56ff487cb1327c59e2989a33fe4b0e3ff902cbee9b835d4bafdf00f27d5af1fcaadb606ee3262f39ebf59a8c142ce9a5f54edef -EBUILD avidemux-core-2.6.20.ebuild 3021 SHA256 c83445c6c508376598db70f75b92162a7d1b2ca5ea53d97ae10d3b5d8f5b42ad SHA512 88b85a8458345567fb6529af137fed0c5d445452a5fb58e8bed434ae8b8cfd821368eb04e0901976701b364c34be3adadd393bdafe890459b95214039ceaa321 WHIRLPOOL 4adb3f40ce95de30b9c9a58da30928c540fb45b3f5615ee234c998a0773db88c6ac2f68002ceb7e952b7696cd6e7c3fa68f1696a91eae80512a5b333667cfb98 -EBUILD avidemux-core-2.6.8.ebuild 3165 SHA256 dada7c05d9a9a312fef405c172d26bc4a861b58ab05df6ca859df37e3796b09d SHA512 cf13c426ff523b899d8c1cbc0d1458f8210f41fc2c7fa1e7962b941a0aebcd5586ccaef68c65cfefb8d868662cf4c31a91d95281c573870fd63350081384b581 WHIRLPOOL 6de28aa915516da1fdeff1e7e0f386aa0abdcf4a1af5f2577f896780170856ada7e9a562a4d5b5b216435d0e23abf9e3ee705805dae7558bc2839f68eeb3a83a EBUILD avidemux-core-9999.ebuild 2544 SHA256 da29bc162f9ca6c9cf6011b19c3b9020b130d31d6754ee7cad3493b4d74e3567 SHA512 de9308bc45c70d19d14d0751131027f3f4443bedc7bcbd1f1de8823448ae38684f7c4f8fb107e65db00a402cb4e72327a8d47283218be920cafda97a6fc7cb3a WHIRLPOOL ee3f3385530b6b9bdd74d229edabef4ca62ff902f45e9c24a0450273245b7b529673fb3845807b84d1cee22e4bbff101d0362107e66add3700db74f155d9e76c MISC ChangeLog 3269 SHA256 c1934934c5c1b2a768e73ebda234d4e209a7f3a734dbda75e6fee5bcda70397b SHA512 9d29abd3feb4c042d8f3316b15fa15f8f28642f2c8f63063d7828cccb7efff3225d3c4515fc3dc26fd6f2babba277e48e7c9e1adf453146f25b66742e44fb103 WHIRLPOOL b8cb1cacf19021d8a0891ce41676bcbd6e5ed21d209af42f0603a3c12a8d2c78a4a522f2ad6c6180f66ee440a9b37d56e87a767050efd1ebcfcfc0955ed2d3af MISC ChangeLog-2015 4820 SHA256 40f82912cf09dcfc5ab20cbe992fafce6cf8dd376a4346f40b7b9383c1a8d5ce SHA512 c1a1eb6d72c1b0c2e7340338b6cc4e33adb3885015e6c837776bba225a868b1660de061fd9e2f11409011a17420e6109e9a375222d59cd775d2243f1b73245db WHIRLPOOL 88117b9d06f4c718d3a7716526d6be4d88ca519a89a5d3ad88ffdd4949b9aa159e5d76d5bddbba650126015eac9003440bfd1bbb2605b24040d230452d839f35 diff --git a/media-libs/avidemux-core/avidemux-core-2.6.20.ebuild b/media-libs/avidemux-core/avidemux-core-2.6.20.ebuild deleted file mode 100644 index 3a7af781cc14..000000000000 --- a/media-libs/avidemux-core/avidemux-core-2.6.20.ebuild +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit cmake-utils - -DESCRIPTION="Core libraries for a video editor designed for simple cutting, filtering and encoding tasks" -HOMEPAGE="http://fixounet.free.fr/avidemux" - -# Multiple licenses because of all the bundled stuff. -LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain" -SLOT="2.6" -IUSE="debug nls nvenc sdl system-ffmpeg vaapi vdpau video_cards_fglrx xv" - -if [[ ${PV} == *9999* ]] ; then - EGIT_REPO_URI="https://github.com/mean00/avidemux2.git" - EGIT_CHECKOUT_DIR=${WORKDIR} - - inherit git-r3 -else - MY_PN="${PN/-core/}" - MY_P="${MY_PN}_${PV}" - SRC_URI="mirror://sourceforge/${MY_PN}/${MY_PN}/${PV}/${MY_P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -# Trying to use virtual; ffmpeg misses aac,cpudetection USE flags now though, are they needed? -DEPEND=" - !=virtual/ffmpeg-9:0[mp3,theora] ) - xv? ( x11-libs/libXv:0 ) - vaapi? ( x11-libs/libva:0 ) - vdpau? ( x11-libs/libvdpau:0 ) - nvenc? ( media-video/nvidia_video_sdk ) - video_cards_fglrx? ( - || ( >=x11-drivers/ati-drivers-14.12-r3 - x11-libs/xvba-video:0 ) - ) -" -RDEPEND=" - $DEPEND - nls? ( virtual/libintl:0 ) -" -DEPEND=" - $DEPEND - virtual/pkgconfig - nls? ( sys-devel/gettext ) - !system-ffmpeg? ( dev-lang/yasm[nls=] ) -" - -S="${WORKDIR}/${MY_P}" -CMAKE_USE_DIR="${S}/${PN/-/_}" - -src_prepare() { - cmake-utils_src_prepare - - if use system-ffmpeg ; then - # Preparations to support the system ffmpeg. Currently fails because it depends on files the system ffmpeg doesn't install. - local error="Failed to remove ffmpeg." - - rm -rf cmake/admFFmpeg* cmake/ffmpeg* avidemux_core/ffmpeg_package buildCore/ffmpeg || die "${error}" - sed -i -e 's/include(admFFmpegUtil)//g' avidemux/commonCmakeApplication.cmake || die "${error}" - sed -i -e '/registerFFmpeg/d' avidemux/commonCmakeApplication.cmake || die "${error}" - sed -i -e 's/include(admFFmpegBuild)//g' avidemux_core/CMakeLists.txt || die "${error}" - else - # Avoid existing avidemux installations from making the build process fail, bug #461496. - sed -i -e "s:getFfmpegLibNames(\"\${sourceDir}\"):getFfmpegLibNames(\"${WORKDIR}/${P}_build/ffmpeg/source/\"):g" cmake/admFFmpegUtil.cmake \ - || die "Failed to avoid existing avidemux installation from making the build fail." - fi -} - -src_configure() { - # Add lax vector typing for PowerPC. - if use ppc || use ppc64 ; then - append-cflags -flax-vector-conversions - fi - - # See bug 432322. - use x86 && replace-flags -O0 -O1 - - local mycmakeargs=( - -DAVIDEMUX_SOURCE_DIR='${S}' - -DGETTEXT="$(usex nls)" - -DSDL="$(usex sdl)" - -DLIBVA="$(usex vaapi)" - -DVDPAU="$(usex vdpau)" - -DXVBA="$(usex video_cards_fglrx)" - -DXVIDEO="$(usex xv)" - -DNVENC="$(usex nvenc)" - ) - - if use debug ; then - mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 ) - fi - - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile -j1 -} - -src_install() { - cmake-utils_src_install -j1 -} diff --git a/media-libs/avidemux-core/avidemux-core-2.6.8.ebuild b/media-libs/avidemux-core/avidemux-core-2.6.8.ebuild deleted file mode 100644 index c47717b8c3d8..000000000000 --- a/media-libs/avidemux-core/avidemux-core-2.6.8.ebuild +++ /dev/null @@ -1,111 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit cmake-utils eutils flag-o-matic - -SLOT="2.6" - -DESCRIPTION="Core libraries for a video editor designed for simple cutting, filtering and encoding tasks" -HOMEPAGE="http://fixounet.free.fr/avidemux" - -# Multiple licenses because of all the bundled stuff. -LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain" -IUSE="debug nls sdl system-ffmpeg vaapi vdpau video_cards_fglrx xv" -KEYWORDS="~amd64 ~x86" - -MY_PN="${PN/-core/}" -if [[ ${PV} == *9999* ]] ; then - KEYWORDS="" - EGIT_REPO_URI="https://github.com/mean00/avidemux2.git" - - inherit git-2 -else - MY_P="${MY_PN}_${PV}" - SRC_URI="mirror://sourceforge/${MY_PN}/${MY_PN}/${PV}/${MY_P}.tar.gz" -fi - -# Trying to use virtual; ffmpeg misses aac,cpudetection USE flags now though, are they needed? -DEPEND=" - !=virtual/ffmpeg-9:0[mp3,theora] ) - xv? ( x11-libs/libXv:0 ) - vaapi? ( x11-libs/libva:0 ) - vdpau? ( x11-libs/libvdpau:0 ) - video_cards_fglrx? ( - || ( >=x11-drivers/ati-drivers-14.12-r3 - x11-libs/xvba-video:0 ) - )" -RDEPEND=" - $DEPEND - nls? ( virtual/libintl:0 ) -" -DEPEND=" - $DEPEND - virtual/pkgconfig - nls? ( sys-devel/gettext ) - !system-ffmpeg? ( dev-lang/yasm[nls=] ) -" - -S="${WORKDIR}/${MY_P}" -BUILD_DIR="${S}/buildCore" - -PATCHES=( "${FILESDIR}"/${P}-gcc6.patch ) -DOCS=( AUTHORS README ) - -src_prepare() { - mkdir "${BUILD_DIR}" || die "Can't create build folder." - - cmake-utils_src_prepare - - if use system-ffmpeg ; then - # Preparations to support the system ffmpeg. Currently fails because it depends on files the system ffmpeg doesn't install. - local error="Failed to remove ffmpeg." - - rm -rf cmake/admFFmpeg* cmake/ffmpeg* avidemux_core/ffmpeg_package buildCore/ffmpeg || die "${error}" - sed -i -e 's/include(admFFmpegUtil)//g' avidemux/commonCmakeApplication.cmake || die "${error}" - sed -i -e '/registerFFmpeg/d' avidemux/commonCmakeApplication.cmake || die "${error}" - sed -i -e 's/include(admFFmpegBuild)//g' avidemux_core/CMakeLists.txt || die "${error}" - else - # Avoid existing avidemux installations from making the build process fail, bug #461496. - sed -i -e "s:getFfmpegLibNames(\"\${sourceDir}\"):getFfmpegLibNames(\"${S}/buildCore/ffmpeg/source/\"):g" cmake/admFFmpegUtil.cmake \ - || die "Failed to avoid existing avidemux installation from making the build fail." - fi - - # Add lax vector typing for PowerPC. - if use ppc || use ppc64 ; then - append-cflags -flax-vector-conversions - fi - - # See bug 432322. - use x86 && replace-flags -O0 -O1 -} - -src_configure() { - local mycmakeargs=( - -DAVIDEMUX_SOURCE_DIR='${S}' - $(cmake-utils_use nls GETTEXT) - $(cmake-utils_use sdl SDL) - $(cmake-utils_use vaapi LIBVA) - $(cmake-utils_use vdpau VDPAU) - $(cmake-utils_use video_cards_fglrx XVBA) - $(cmake-utils_use xv XVIDEO) - ) - - if use debug ; then - mycmakeargs+=( -DVERBOSE=1 -DCMAKE_BUILD_TYPE=Debug -DADM_DEBUG=1 ) - fi - - CMAKE_USE_DIR="${S}"/avidemux_core cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile -j1 -} - -src_install() { - cmake-utils_src_install -j1 -} diff --git a/media-libs/avidemux-core/files/avidemux-core-2.6.8-gcc6.patch b/media-libs/avidemux-core/files/avidemux-core-2.6.8-gcc6.patch deleted file mode 100644 index dbdf8ff93a8d..000000000000 --- a/media-libs/avidemux-core/files/avidemux-core-2.6.8-gcc6.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- a/avidemux_core/ADM_coreUtils/src/prefs.cpp -+++ b/avidemux_core/ADM_coreUtils/src/prefs.cpp -@@ -44,8 +44,8 @@ - const char *name2; - ADM_paramType type; - const char *defaultValue; -- float min; -- float max; -+ double min; -+ double max; - }optionDesc; - - #include "prefs2_pref.h" ---- a/avidemux_core/ADM_coreAudio/src/ADM_audioStreamBuffered.cpp -+++ b/avidemux_core/ADM_coreAudio/src/ADM_audioStreamBuffered.cpp -@@ -46,7 +46,7 @@ - // By construction, the error should be minimal - if(newDts!=ADM_AUDIO_NO_DTS) - { -- if( abs(newDts-lastDts)>ADM_MAX_SKEW) -+ if( labs((int64_t)newDts-lastDts)>ADM_MAX_SKEW) - { - printf("[AudioStream] Warning skew in dts =%"PRId64", \n",(int64_t)newDts-(uint64_t)lastDts); - printf("[AudioStream] Warning skew lastDts=%s \n",ADM_us2plain(lastDts)); ---- a/avidemux_core/ADM_coreVideoCodec/src/ADM_ffmp43.cpp -+++ b/avidemux_core/ADM_coreVideoCodec/src/ADM_ffmp43.cpp -@@ -30,19 +30,19 @@ - #define WRAP_Open_Template(funcz,argz,display,codecid) \ - {\ - AVCodec *codec=funcz(argz);\ --if(!codec) {GUI_Error_HIG("Codec",QT_TR_NOOP("Internal error finding codec"display));ADM_assert(0);} \ -+if(!codec) {GUI_Error_HIG("Codec",QT_TR_NOOP("Internal error finding codec" display));ADM_assert(0);} \ - codecId=codecid; \ - _context->workaround_bugs=1*FF_BUG_AUTODETECT +0*FF_BUG_NO_PADDING; \ - _context->error_concealment=3; \ - if (avcodec_open(_context, codec) < 0) \ - { \ -- printf("[lavc] Decoder init: "display" video decoder failed!\n"); \ -- GUI_Error_HIG("Codec","Internal error opening "display); \ -+ printf("[lavc] Decoder init: " display " video decoder failed!\n"); \ -+ GUI_Error_HIG("Codec","Internal error opening " display); \ - ADM_assert(0); \ - } \ - else \ - { \ -- printf("[lavc] Decoder init: "display" video decoder initialized! (%s)\n",codec->long_name); \ -+ printf("[lavc] Decoder init: " display " video decoder initialized! (%s)\n",codec->long_name); \ - } \ - } - -- cgit v1.2.3