From f1af93971b7490792d8541bc790e0d8c6d787059 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 6 Sep 2019 10:28:05 +0100 Subject: gentoo resync : 06.08.2019 --- media-libs/avidemux-plugins/Manifest | 5 +- .../avidemux-plugins/avidemux-plugins-2.7.0.ebuild | 182 --------------------- .../avidemux-plugins/avidemux-plugins-2.7.4.ebuild | 161 ++++++++++++++++++ .../files/avidemux-plugins-2.7.0-qt-5.11.patch | 48 ------ 4 files changed, 163 insertions(+), 233 deletions(-) delete mode 100644 media-libs/avidemux-plugins/avidemux-plugins-2.7.0.ebuild create mode 100644 media-libs/avidemux-plugins/avidemux-plugins-2.7.4.ebuild delete mode 100644 media-libs/avidemux-plugins/files/avidemux-plugins-2.7.0-qt-5.11.patch (limited to 'media-libs/avidemux-plugins') diff --git a/media-libs/avidemux-plugins/Manifest b/media-libs/avidemux-plugins/Manifest index d50777dc1a24..fb487b504620 100644 --- a/media-libs/avidemux-plugins/Manifest +++ b/media-libs/avidemux-plugins/Manifest @@ -1,7 +1,6 @@ AUX avidemux-plugins-2.6.20-optional-pulse.patch 743 BLAKE2B e60a7433e539d49d5bff7dea62bfda984866dd72b93158827ee5ed785d77174db3fbde9e67c9c3fdc8d652485d8e704c075811c65848ef48f78490c6a3061b7f SHA512 dcec29c63aa7eb828fc1aaf4b54edb76290e3c7655b00002efa8036f0572b1c0111c30e873b925bb606e8e672e177ba8d103100b1fb55dcc830b83e4a5556710 -AUX avidemux-plugins-2.7.0-qt-5.11.patch 1664 BLAKE2B 080497a678e869e143eb350ecdca2b77d5e5906a8a469e24f16fc58853665791dbbd94880418b492df6816b8f420d54ee7ecd06c805b0aab16e8d05ab43f545d SHA512 49186e7648db60e081f78e1257ea788313cac6e991c995249701189ab344744f0c410203b39b49e5530a8dd33de937582099eb8b615d19fe7d0e3731254d535c DIST avidemux-2.7.3.tar.gz 23772654 BLAKE2B f946c267140bc8aebda2ce027ed8cb7c84a98a401255d3e0cdaf7498680e8bd9c78a33c122cb177d397ed2dd6bc3c29d7508578028c2964c2897279bf860b62d SHA512 d7761de1c40de1b824efbcf24173ea738a2e0ba7fa41cefa09e7bac3ec97f3af4b04201e36f9de50ade2b09e394aa99ed1d4907f90bb132f9896e8f1b5e82d7a -DIST avidemux_2.7.0.tar.gz 21474504 BLAKE2B c6e55a0b5220d6d3746fa06162bf11253145fd28f2f6f744702d5e0342fba85e546a28883eb847139eadd34c94037ebc7d68f5576e7505a85288556468d14b96 SHA512 7c92213d3bd2849dbdb5a1aff2acd6da231fd76c561b756fbf4a1d5a41e9705d609d7a35b6ca6b77ceb3bf5138f861cd24ed16d8fcec4fd713f09a2ff07e9015 -EBUILD avidemux-plugins-2.7.0.ebuild 4871 BLAKE2B ba2b03b69c02011be5930397b2229e4d51d3f8b350a31a12f923d50f11ba1008ce7d6ccac62d25d787fed704c1af2c08a4847c5fad8faa9fce14787bb09bb359 SHA512 99945e92b65aa422c701818763aee164fba1e3ab0b345f29266b8151d159d9b636ae8e0b23393fb6cba7fa5f81bed6e6e413e9da56ece76d94d641b73078cf18 +DIST avidemux-2.7.4.tar.gz 23815808 BLAKE2B 3a7206f04f568f28dd4d5116c580dd780b057a59e94dd61a2abe5dadfa557291a0c50f917ad1926f9f9a82d01af065c06138f954320e2d9c174fda7583a6b265 SHA512 36d857837cd6a74039a414df16367cd8cbf615173bcc531e57dc0dbfc2e002b1c0c4a80cef73a0d8f25d305deca809af0b5cbcdbad8c311324fa2e64381fd10b EBUILD avidemux-plugins-2.7.3.ebuild 4351 BLAKE2B 04bdb03c46a5856ff9ba97d71f89c1d6c1caa7387696875169124420e69cb93538791e6249d8e9362f1f84a04d9600e947f430f736bac0bf6889357528d64cc4 SHA512 1b1e071e03002acf313dabfde1da4a367b78892a215ec98f7d8b27e1259870e3ca40748bd7b45c0b51333b3fbe8f1956f77158ca298b5e49542f0f65d11e6edd +EBUILD avidemux-plugins-2.7.4.ebuild 4267 BLAKE2B 8575dac5383482f1560e627cdef936d1ce34411103adc74b45ae80826bcab3aab782f2540e6f7d1b0571207cbb9c9715f80561abba7a36148c02bf70218eb6f6 SHA512 04c83316ac5252303ff346c150eb3935c753b7827c3d084c0725f3710e1ad0dc22aa2f7a82f54cbf8d88f77083d296c2445bcfc2770729fa81cbeaef8614cfcb MISC metadata.xml 1313 BLAKE2B 931af633c34ab1bf1f45705ac5b6e2fd6ea3b3fa86dc870c404d29e7fbdb723f1f3d1bf60f051fd9ab30ac8ee83142c1082d0ca3994019d527c3b2f66884ed20 SHA512 26aa4c4bb69ea3d2b41c2f6b8147019b79d8b740690ac7381f28abbc51232e9340b007a53562e4b74ff8a46cbbdb6d9091b2d1981720f4bfe89656cbde28fb3d diff --git a/media-libs/avidemux-plugins/avidemux-plugins-2.7.0.ebuild b/media-libs/avidemux-plugins/avidemux-plugins-2.7.0.ebuild deleted file mode 100644 index a2730251a4a4..000000000000 --- a/media-libs/avidemux-plugins/avidemux-plugins-2.7.0.ebuild +++ /dev/null @@ -1,182 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -if [[ ${PV} == *9999* ]] ; then - EGIT_REPO_URI="https://github.com/mean00/avidemux2.git" - EGIT_CHECKOUT_DIR=${WORKDIR} - inherit git-r3 -else - MY_PN="${PN/-plugins/}" - MY_P="${MY_PN}_${PV}" - SRC_URI="mirror://sourceforge/${MY_PN}/${MY_PN}/${PV}/${MY_P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi -PYTHON_COMPAT=( python2_7 ) -inherit cmake-utils python-single-r1 - -DESCRIPTION="Plugins for the video editor media-video/avidemux" -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.7" -IUSE="a52 aac aften alsa amr dcaenc debug dts fdk fontconfig fribidi jack lame libsamplerate cpu_flags_x86_mmx nvenc opengl opus oss pulseaudio qt5 truetype twolame vdpau vorbis vpx x264 x265 xv xvid" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -COMMON_DEPEND="${PYTHON_DEPS} - ~media-libs/avidemux-core-${PV}:${SLOT}[vdpau?] - ~media-video/avidemux-${PV}:${SLOT}[opengl?,qt5?] - >=dev-lang/spidermonkey-1.5-r2:0= - dev-libs/libxml2:2 - media-libs/a52dec:0 - media-libs/libass:0= - media-libs/libmad:0 - media-libs/libmp4v2:0 - media-libs/libpng:0= - virtual/libiconv:0 - aac? ( - >=media-libs/faac-1.29.9.2:0 - media-libs/faad2:0 - ) - aften? ( media-libs/aften:0 ) - alsa? ( >=media-libs/alsa-lib-1.0.3b-r2:0 ) - amr? ( media-libs/opencore-amr:0 ) - dcaenc? ( media-sound/dcaenc:0 ) - dts? ( media-libs/libdca:0 ) - fdk? ( media-libs/fdk-aac:0= ) - fontconfig? ( media-libs/fontconfig:1.0 ) - fribidi? ( dev-libs/fribidi:0 ) - jack? ( - media-sound/jack-audio-connection-kit:0 - libsamplerate? ( media-libs/libsamplerate:0 ) - ) - lame? ( media-sound/lame:0 ) - nvenc? ( amd64? ( media-video/nvidia_video_sdk:0 ) ) - opus? ( media-libs/opus:0 ) - pulseaudio? ( media-sound/pulseaudio:0 ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - ) - truetype? ( media-libs/freetype:2 ) - twolame? ( media-sound/twolame:0 ) - vorbis? ( media-libs/libvorbis:0 ) - vpx? ( media-libs/libvpx:0= ) - x264? ( media-libs/x264:0= ) - x265? ( media-libs/x265:0= ) - xv? ( - x11-libs/libX11:0 - x11-libs/libXext:0 - x11-libs/libXv:0 - ) - xvid? ( media-libs/xvid:0 ) -" -DEPEND="${COMMON_DEPEND} - oss? ( virtual/os-headers:0 ) -" -RDEPEND="${COMMON_DEPEND} - ! /dev/null || die - grep '^preinstall/fast' Makefile && emake DESTDIR="${D}" preinstall/fast - grep '^install/fast' Makefile && emake DESTDIR="${D}" install/fast - popd > /dev/null || die - done -} diff --git a/media-libs/avidemux-plugins/avidemux-plugins-2.7.4.ebuild b/media-libs/avidemux-plugins/avidemux-plugins-2.7.4.ebuild new file mode 100644 index 000000000000..2a7b0e7ee510 --- /dev/null +++ b/media-libs/avidemux-plugins/avidemux-plugins-2.7.4.ebuild @@ -0,0 +1,161 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +CMAKE_MAKEFILE_GENERATOR="emake" +PYTHON_COMPAT=( python{2_7,3_6} ) + +inherit cmake-utils python-single-r1 + +DESCRIPTION="Plugins for the video editor media-video/avidemux" +HOMEPAGE="http://fixounet.free.fr/avidemux" +SRC_URI="https://github.com/mean00/avidemux2/archive/${PV}.tar.gz -> avidemux-${PV}.tar.gz" + +# Multiple licenses because of all the bundled stuff. +LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain" +SLOT="2.7" +IUSE="a52 aac aften alsa amr dcaenc debug dts fdk fontconfig fribidi jack lame libsamplerate cpu_flags_x86_mmx nvenc opengl opus oss pulseaudio qt5 truetype twolame vdpau vorbis vpx x264 x265 xv xvid" +KEYWORDS="~amd64 ~x86" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +COMMON_DEPEND="${PYTHON_DEPS} + ~media-libs/avidemux-core-${PV}:${SLOT}[vdpau?] + ~media-video/avidemux-${PV}:${SLOT}[opengl?,qt5?] + dev-lang/spidermonkey:0= + dev-libs/libxml2:2 + media-libs/a52dec + media-libs/libass:0= + media-libs/libmad + media-libs/libmp4v2 + media-libs/libpng:0= + virtual/libiconv + aac? ( + media-libs/faac + media-libs/faad2 + ) + aften? ( media-libs/aften ) + alsa? ( media-libs/alsa-lib ) + amr? ( media-libs/opencore-amr ) + dcaenc? ( media-sound/dcaenc ) + dts? ( media-libs/libdca ) + fdk? ( media-libs/fdk-aac:0= ) + fontconfig? ( media-libs/fontconfig:1.0 ) + fribidi? ( dev-libs/fribidi ) + jack? ( + media-sound/jack-audio-connection-kit + libsamplerate? ( media-libs/libsamplerate ) + ) + lame? ( media-sound/lame ) + nvenc? ( amd64? ( media-video/nvidia_video_sdk ) ) + opus? ( media-libs/opus ) + pulseaudio? ( media-sound/pulseaudio ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + ) + truetype? ( media-libs/freetype:2 ) + twolame? ( media-sound/twolame ) + vorbis? ( media-libs/libvorbis ) + vpx? ( media-libs/libvpx:0= ) + x264? ( media-libs/x264:0= ) + x265? ( media-libs/x265:0= ) + xv? ( + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXv + ) + xvid? ( media-libs/xvid ) +" +DEPEND="${COMMON_DEPEND} + oss? ( virtual/os-headers ) +" +RDEPEND="${COMMON_DEPEND} + ! -Date: Wed, 30 May 2018 07:31:03 +0200 -Subject: [PATCH] [Qt] Compatibilty patch with newer qt (>=5.11), patch by - Chris Clayton - ---- - avidemux/qt4/ADM_jobs/src/ADM_jobControl.cpp | 1 + - avidemux/qt4/ADM_jobs/src/ADM_jobs.cpp | 1 + - avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp | 1 + - 3 files changed, 3 insertions(+) - -diff --git a/avidemux/qt4/ADM_jobs/src/ADM_jobControl.cpp b/avidemux/qt4/ADM_jobs/src/ADM_jobControl.cpp -index 256f69d5e..54b0ac639 100644 ---- a/avidemux/qt4/ADM_jobs/src/ADM_jobControl.cpp -+++ b/avidemux/qt4/ADM_jobs/src/ADM_jobControl.cpp -@@ -17,6 +17,7 @@ - #include "ADM_coreJobs.h" - #include "DIA_coreToolkit.h" - #include -+#include - - extern void loadTranslator(void); - extern void initTranslator(void); -diff --git a/avidemux/qt4/ADM_jobs/src/ADM_jobs.cpp b/avidemux/qt4/ADM_jobs/src/ADM_jobs.cpp -index 85cec5f9a..f537995ca 100644 ---- a/avidemux/qt4/ADM_jobs/src/ADM_jobs.cpp -+++ b/avidemux/qt4/ADM_jobs/src/ADM_jobs.cpp -@@ -21,6 +21,7 @@ - #include "ADM_memsupport.h" - #include "ADM_crashdump.h" - #include "ADM_win32.h" -+#include - - void onexit( void ); - -diff --git a/avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp b/avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp -index 94bdd577e..b2a01e54b 100644 ---- a/avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp -+++ b/avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp -@@ -17,6 +17,7 @@ - #include "Q_eq2.h" - #include "ADM_toolkitQt.h" - #include -+#include - - // - // Video is in YV12 Colorspace \ No newline at end of file -- cgit v1.2.3