* [gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-plugins/files/, media-libs/avidemux-plugins/
@ 2017-10-29 9:34 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2017-10-29 9:34 UTC (permalink / raw
To: gentoo-commits
commit: 6aa27f33d47ecb9cdbcbe78b1122143ea505d3b8
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 28 22:56:03 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Oct 29 09:34:16 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6aa27f33
media-libs/avidemux-plugins: Drop 2.6.8
Package-Manager: Portage-2.3.13, Repoman-2.3.4
media-libs/avidemux-plugins/Manifest | 1 -
.../avidemux-plugins/avidemux-plugins-2.6.8.ebuild | 145 ---------------------
.../avidemux-plugins-2.6.4-optional-pulse.patch | 21 ---
3 files changed, 167 deletions(-)
diff --git a/media-libs/avidemux-plugins/Manifest b/media-libs/avidemux-plugins/Manifest
index 6f017f59f92..4bf6be8c5b5 100644
--- a/media-libs/avidemux-plugins/Manifest
+++ b/media-libs/avidemux-plugins/Manifest
@@ -1,2 +1 @@
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
diff --git a/media-libs/avidemux-plugins/avidemux-plugins-2.6.8.ebuild b/media-libs/avidemux-plugins/avidemux-plugins-2.6.8.ebuild
deleted file mode 100644
index 215b8e16ef2..00000000000
--- a/media-libs/avidemux-plugins/avidemux-plugins-2.6.8.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils eutils flag-o-matic python-single-r1
-
-SLOT="2.6"
-
-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"
-IUSE="aac aften a52 alsa amr debug dts fontconfig fribidi jack lame libsamplerate cpu_flags_x86_mmx opengl oss pulseaudio qt4 vorbis truetype twolame xv xvid x264 vdpau vpx"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="~amd64 ~x86"
-
-MY_PN="${PN/-plugins/}"
-if [[ ${PV} == *9999* ]] ; then
- KEYWORDS=""
- EGIT_REPO_URI="git://gitorious.org/${MY_PN}2-6/${MY_PN}2-6.git https://git.gitorious.org/${MY_PN}2-6/${MY_PN}2-6.git"
-
- inherit git-2
-else
- MY_P="${MY_PN}_${PV}"
- SRC_URI="mirror://sourceforge/${MY_PN}/${MY_PN}/${PV}/${MY_P}.tar.gz"
-fi
-
-RDEPEND="
- ~media-libs/avidemux-core-${PV}:${SLOT}[vdpau?]
- ~media-video/avidemux-${PV}:${SLOT}[opengl?,qt4?]
- >=dev-lang/spidermonkey-1.5-r2:0=
- dev-libs/libxml2:2
- media-libs/libpng:0=
- virtual/libiconv:0
- aac? (
- media-libs/faac: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 )
- dts? ( media-libs/libdca: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 )
- pulseaudio? ( media-sound/pulseaudio:0 )
- truetype? ( media-libs/freetype:2 )
- twolame? ( media-sound/twolame:0 )
- x264? ( media-libs/x264:0= )
- xv? (
- x11-libs/libX11:0
- x11-libs/libXext:0
- x11-libs/libXv:0
- )
- xvid? ( media-libs/xvid:0 )
- vorbis? ( media-libs/libvorbis:0 )
- vpx? ( media-libs/libvpx:0 )
- ${PYTHON_DEPS}
-"
-DEPEND="${RDEPEND}
- oss? ( virtual/os-headers:0 )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.6.4-optional-pulse.patch )
-
-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
-
- processes="buildPluginsCommon:avidemux_plugins
- buildPluginsCLI:avidemux_plugins"
- use qt4 && processes+=" buildPluginsQt4:avidemux_plugins"
-
- for process in ${processes} ; do
- local build="${process%%:*}"
-
- local mycmakeargs="
- -DAVIDEMUX_SOURCE_DIR='${S}'
- -DPLUGIN_UI=$(echo ${build/buildPlugins/} | tr '[:lower:]' '[:upper:]')
- $(cmake-utils_use aac FAAC)
- $(cmake-utils_use aac FAAD)
- $(cmake-utils_use alsa)
- $(cmake-utils_use aften)
- $(cmake-utils_use amr OPENCORE_AMRWB)
- $(cmake-utils_use amr OPENCORE_AMRNB)
- $(cmake-utils_use dts LIBDCA)
- $(cmake-utils_use fontconfig)
- $(cmake-utils_use jack)
- $(cmake-utils_use lame)
- $(cmake-utils_use oss)
- $(cmake-utils_use pulseaudio PULSEAUDIOSIMPLE)
- $(cmake-utils_use qt4)
- $(cmake-utils_use truetype FREETYPE2)
- $(cmake-utils_use twolame)
- $(cmake-utils_use x264)
- $(cmake-utils_use xv XVIDEO)
- $(cmake-utils_use xvid)
- $(cmake-utils_use vdpau)
- $(cmake-utils_use vorbis)
- $(cmake-utils_use vorbis LIBVORBIS)
- $(cmake-utils_use vpx VPXDEC)
- "
-
- if use debug ; then
- mycmakeargs+=" -DVERBOSE=1 -DCMAKE_BUILD_TYPE=Debug -DADM_DEBUG=1"
- fi
-
- mkdir "${S}"/${build} || die "Can't create build folder."
-
- CMAKE_USE_DIR="${S}"/${process#*:} BUILD_DIR="${S}"/${build} cmake-utils_src_configure
- done
-}
-
-src_compile() {
- for process in ${processes} ; do
- BUILD_DIR="${S}/${process%%:*}" cmake-utils_src_compile
- done
-}
-
-src_install() {
- for process in ${processes} ; do
- # cmake-utils_src_install doesn't respect BUILD_DIR
- # and there sometimes is a preinstall phase present.
- pushd "${S}/${process%%:*}" > /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
-
- python_fix_shebang "${D}"
-}
diff --git a/media-libs/avidemux-plugins/files/avidemux-plugins-2.6.4-optional-pulse.patch b/media-libs/avidemux-plugins/files/avidemux-plugins-2.6.4-optional-pulse.patch
deleted file mode 100644
index 78650aaa7c0..00000000000
--- a/media-libs/avidemux-plugins/files/avidemux-plugins-2.6.4-optional-pulse.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/cmake/admCheckAudioDeviceLibs.cmake
-+++ b/cmake/admCheckAudioDeviceLibs.cmake
-@@ -158,6 +158,8 @@
-
- MESSAGE(STATUS "Checking for PULSEAUDIOSIMPLE")
- MESSAGE(STATUS "*****************************")
-+
-+ IF (PULSEAUDIOSIMPLE)
- IF (PULSEAUDIOSIMPLE_INCLUDE_DIR AND PULSEAUDIOSIMPLE_LIBRARIES)
- # in cache already
- SET(PULSEAUDIOSIMPLE_FIND_QUIETLY TRUE)
-@@ -198,6 +200,9 @@
- MARK_AS_ADVANCED(PULSEAUDIOSIMPLE_INCLUDE_DIR PULSEAUDIOSIMPLE_LIBRARIES)
-
- APPEND_SUMMARY_LIST("Audio Device" "PulseAudio" "${USE_PULSE_SIMPLE}")
-+ ELSE (PULSEAUDIOSIMPLE)
-+ MESSAGE("${MSG_DISABLE_OPTION}")
-+ ENDIF (PULSEAUDIOSIMPLE)
- ELSE (UNIX AND NOT APPLE)
- SET(PULSEAUDIOSIMPLE_CAPABLE FALSE)
- ENDIF (UNIX AND NOT APPLE)
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-plugins/files/, media-libs/avidemux-plugins/
@ 2018-08-17 22:04 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2018-08-17 22:04 UTC (permalink / raw
To: gentoo-commits
commit: 3fded280bebd469895db6adefa8b2394309eddca
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 17 21:15:29 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Aug 17 22:02:02 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fded280
media-libs/avidemux-plugins: Fix build with Qt 5.11
Closes: https://bugs.gentoo.org/659330
Package-Manager: Portage-2.3.46, Repoman-2.3.10
.../avidemux-plugins/avidemux-plugins-2.7.0.ebuild | 5 ++-
.../files/avidemux-plugins-2.7.0-qt-5.11.patch | 48 ++++++++++++++++++++++
2 files changed, 52 insertions(+), 1 deletion(-)
diff --git a/media-libs/avidemux-plugins/avidemux-plugins-2.7.0.ebuild b/media-libs/avidemux-plugins/avidemux-plugins-2.7.0.ebuild
index 2556ab1d6c6..1c70e135cbf 100644
--- a/media-libs/avidemux-plugins/avidemux-plugins-2.7.0.ebuild
+++ b/media-libs/avidemux-plugins/avidemux-plugins-2.7.0.ebuild
@@ -83,7 +83,10 @@ RDEPEND="${COMMON_DEPEND}
S="${WORKDIR}/${MY_P}"
-PATCHES=( "${FILESDIR}"/${PN}-2.6.20-optional-pulse.patch )
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.6.20-optional-pulse.patch
+ "${FILESDIR}"/${P}-qt-5.11.patch
+)
src_prepare() {
default
diff --git a/media-libs/avidemux-plugins/files/avidemux-plugins-2.7.0-qt-5.11.patch b/media-libs/avidemux-plugins/files/avidemux-plugins-2.7.0-qt-5.11.patch
new file mode 100644
index 00000000000..8ac9bbc3b4a
--- /dev/null
+++ b/media-libs/avidemux-plugins/files/avidemux-plugins-2.7.0-qt-5.11.patch
@@ -0,0 +1,48 @@
+From ba667da44fcb88ee660339e52859bb90dc1b00d3 Mon Sep 17 00:00:00 2001
+From: mean <fixounet@free.fr>
+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 <QtCore/QDir>
++#include <QAction>
+
+ 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 <QAction>
+
+ 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 <QSignalMapper>
++#include <QAction>
+
+ //
+ // Video is in YV12 Colorspace
\ No newline at end of file
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-plugins/files/, media-libs/avidemux-plugins/
@ 2019-08-25 20:52 Stefan Strogin
0 siblings, 0 replies; 4+ messages in thread
From: Stefan Strogin @ 2019-08-25 20:52 UTC (permalink / raw
To: gentoo-commits
commit: 143f1356e02d6f4c1e3e239fd19806d9f5e1b6e1
Author: Stefan Strogin <steils <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 25 20:49:27 2019 +0000
Commit: Stefan Strogin <steils <AT> gentoo <DOT> org>
CommitDate: Sun Aug 25 20:50:55 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=143f1356
media-libs/avidemux-plugins: drop old 2.7.0
Package-Manager: Portage-2.3.73, Repoman-2.3.17
Signed-off-by: Stefan Strogin <steils <AT> gentoo.org>
media-libs/avidemux-plugins/Manifest | 1 -
.../avidemux-plugins/avidemux-plugins-2.7.0.ebuild | 182 ---------------------
.../files/avidemux-plugins-2.7.0-qt-5.11.patch | 48 ------
3 files changed, 231 deletions(-)
diff --git a/media-libs/avidemux-plugins/Manifest b/media-libs/avidemux-plugins/Manifest
index 4113f7cd25d..7d6012ce4fc 100644
--- a/media-libs/avidemux-plugins/Manifest
+++ b/media-libs/avidemux-plugins/Manifest
@@ -1,3 +1,2 @@
DIST avidemux-2.7.3.tar.gz 23772654 BLAKE2B f946c267140bc8aebda2ce027ed8cb7c84a98a401255d3e0cdaf7498680e8bd9c78a33c122cb177d397ed2dd6bc3c29d7508578028c2964c2897279bf860b62d SHA512 d7761de1c40de1b824efbcf24173ea738a2e0ba7fa41cefa09e7bac3ec97f3af4b04201e36f9de50ade2b09e394aa99ed1d4907f90bb132f9896e8f1b5e82d7a
DIST avidemux-2.7.4.tar.gz 23815808 BLAKE2B 3a7206f04f568f28dd4d5116c580dd780b057a59e94dd61a2abe5dadfa557291a0c50f917ad1926f9f9a82d01af065c06138f954320e2d9c174fda7583a6b265 SHA512 36d857837cd6a74039a414df16367cd8cbf615173bcc531e57dc0dbfc2e002b1c0c4a80cef73a0d8f25d305deca809af0b5cbcdbad8c311324fa2e64381fd10b
-DIST avidemux_2.7.0.tar.gz 21474504 BLAKE2B c6e55a0b5220d6d3746fa06162bf11253145fd28f2f6f744702d5e0342fba85e546a28883eb847139eadd34c94037ebc7d68f5576e7505a85288556468d14b96 SHA512 7c92213d3bd2849dbdb5a1aff2acd6da231fd76c561b756fbf4a1d5a41e9705d609d7a35b6ca6b77ceb3bf5138f861cd24ed16d8fcec4fd713f09a2ff07e9015
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 a2730251a4a..00000000000
--- 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}
- !<media-libs/avidemux-plugins-${PV}
-"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.6.20-optional-pulse.patch
- "${FILESDIR}"/${P}-qt-5.11.patch
-)
-
-src_prepare() {
- default
-
- # Don't reapply PATCHES during cmake-utils_src_prepare
- unset PATCHES
-
- processes="buildPluginsCommon:avidemux_plugins
- buildPluginsCLI:avidemux_plugins"
- use qt5 && processes+=" buildPluginsQt4:avidemux_plugins"
-
- for process in ${processes} ; do
- CMAKE_USE_DIR="${S}"/${process#*:} cmake-utils_src_prepare
- done
-}
-
-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
-
- for process in ${processes} ; do
- local build="${WORKDIR}/${P}_build/${process%%:*}"
-
- local mycmakeargs=(
- -DAVIDEMUX_SOURCE_DIR='${S}'
- -DPLUGIN_UI=$(echo ${build/buildPlugins/} | tr '[:lower:]' '[:upper:]')
- -DFAAC="$(usex aac)"
- -DFAAD="$(usex aac)"
- -DALSA="$(usex alsa)"
- -DAFTEN="$(usex aften)"
- -DDCAENC="$(usex dcaenc)"
- -DFDK_AAC="$(usex fdk)"
- -DOPENCORE_AMRWB="$(usex amr)"
- -DOPENCORE_AMRNB="$(usex amr)"
- -DLIBDCA="$(usex dts)"
- -DFONTCONFIG="$(usex fontconfig)"
- -DJACK="$(usex jack)"
- -DLAME="$(usex lame)"
- -DNVENC="$(usex nvenc)"
- -DOPUS="$(usex opus)"
- -DOSS="$(usex oss)"
- -DPULSEAUDIOSIMPLE="$(usex pulseaudio)"
- -DQT4=OFF
- -DFREETYPE2="$(usex truetype)"
- -DTWOLAME="$(usex twolame)"
- -DX264="$(usex x264)"
- -DX265="$(usex x265)"
- -DXVIDEO="$(usex xv)"
- -DXVID="$(usex xvid)"
- -DVDPAU="$(usex vdpau)"
- -DVORBIS="$(usex vorbis)"
- -DLIBVORBIS="$(usex vorbis)"
- -DVPXDEC="$(usex vpx)"
- -DUSE_EXTERNAL_LIBA52=yes
- -DUSE_EXTERNAL_LIBASS=yes
- -DUSE_EXTERNAL_LIBMAD=yes
- -DUSE_EXTERNAL_LIBMP4V2=yes
- )
-
- if use qt5 ; then
- mycmakeargs+=( -DENABLE_QT5=True )
- fi
-
- if use debug ; then
- mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 )
- fi
-
- CMAKE_USE_DIR="${S}"/${process#*:} BUILD_DIR="${build}" cmake-utils_src_configure
- done
-}
-
-src_compile() {
- for process in ${processes} ; do
- local build="${WORKDIR}/${P}_build/${process%%:*}"
- BUILD_DIR="${build}" cmake-utils_src_compile
- done
-}
-
-src_install() {
- for process in ${processes} ; do
- # cmake-utils_src_install doesn't respect BUILD_DIR
- # and there sometimes is a preinstall phase present.
- pushd "${WORKDIR}/${P}_build/${process%%:*}" > /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/files/avidemux-plugins-2.7.0-qt-5.11.patch b/media-libs/avidemux-plugins/files/avidemux-plugins-2.7.0-qt-5.11.patch
deleted file mode 100644
index 8ac9bbc3b4a..00000000000
--- a/media-libs/avidemux-plugins/files/avidemux-plugins-2.7.0-qt-5.11.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From ba667da44fcb88ee660339e52859bb90dc1b00d3 Mon Sep 17 00:00:00 2001
-From: mean <fixounet@free.fr>
-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 <QtCore/QDir>
-+#include <QAction>
-
- 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 <QAction>
-
- 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 <QSignalMapper>
-+#include <QAction>
-
- //
- // Video is in YV12 Colorspace
\ No newline at end of file
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-plugins/files/, media-libs/avidemux-plugins/
@ 2023-01-28 11:49 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2023-01-28 11:49 UTC (permalink / raw
To: gentoo-commits
commit: 94a63c19f3793c06897092a5713cf951f429fe59
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 27 21:53:47 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jan 28 11:48:47 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94a63c19
media-libs/avidemux-plugins: drop 2.7.8
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-libs/avidemux-plugins/Manifest | 1 -
.../avidemux-plugins/avidemux-plugins-2.7.8.ebuild | 164 ---------------------
.../avidemux-plugins-2.6.20-optional-pulse.patch | 20 ---
3 files changed, 185 deletions(-)
diff --git a/media-libs/avidemux-plugins/Manifest b/media-libs/avidemux-plugins/Manifest
index 5e1a60fccafb..49e9b54b3bbf 100644
--- a/media-libs/avidemux-plugins/Manifest
+++ b/media-libs/avidemux-plugins/Manifest
@@ -1,2 +1 @@
-DIST avidemux-2.7.8.tar.gz 22080267 BLAKE2B a1e56856f44d56afac6ea4015f206a3f9301c025b3c8da1528165bd4c139ccc971074ac21aa05b9b3dfd6d514eabcbb375e671c8df9c9e5cae74a0a6597577c4 SHA512 6cd5527ab34517a07bf73e46d01f15b7ff023ff34ed70ee54f1d7dbfb6cf57364a323b4ecb89bb9aadeb9bc05473aacb40d8c4eecc522840a3c1c4b3a8756d82
DIST avidemux-2.8.1.tar.gz 23207741 BLAKE2B 766ae9b159d2e48a3d14bdfccf9c665b95ed056831b515d53837bf2bae20baf9b01d15d551b62fb96f3c0cf50b0138448a133bc62e6202af744de558e0fbfe4f SHA512 e7105e555e04dd6768336bdb246037e91045de2e1f572ae362d985424def65499c7f25d92d376ea98af09b436d89e9eb4a5424e93b11df14f2d67ac35661a8a3
diff --git a/media-libs/avidemux-plugins/avidemux-plugins-2.7.8.ebuild b/media-libs/avidemux-plugins/avidemux-plugins-2.7.8.ebuild
deleted file mode 100644
index 78b9cd9f9345..000000000000
--- a/media-libs/avidemux-plugins/avidemux-plugins-2.7.8.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit cmake flag-o-matic 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 opengl opus oss pulseaudio qt5 truetype twolame vdpau vorbis vpx x264 x265 xv xvid"
-KEYWORDS="~amd64 ~x86"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# dev-lang/spidermonkey is not required anymore
-# see https://github.com/mean00/avidemux2/blob/master/avidemux_plugins/ADM_scriptEngines/CMakeLists.txt
-COMMON_DEPEND="
- ${PYTHON_DEPS}
- ~media-libs/avidemux-core-${PV}:${SLOT}[vdpau?]
- ~media-video/avidemux-${PV}:${SLOT}[opengl?,qt5?]
- 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? (
- virtual/jack
- libsamplerate? ( media-libs/libsamplerate )
- )
- lame? ( media-sound/lame )
- 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}
- !<media-libs/avidemux-plugins-${PV}
-"
-
-S="${WORKDIR}/avidemux2-${PV}"
-
-PATCHES=( "${FILESDIR}/${PN}-2.6.20-optional-pulse.patch" )
-
-src_prepare() {
- default
-
- # Don't reapply PATCHES during cmake_src_prepare
- unset PATCHES
-
- processes="buildPluginsCommon:avidemux_plugins
- buildPluginsCLI:avidemux_plugins"
- use qt5 && processes+=" buildPluginsQt4:avidemux_plugins"
-
- for process in ${processes} ; do
- CMAKE_USE_DIR="${S}"/${process#*:} cmake_src_prepare
- done
-}
-
-src_configure() {
- # See bug 432322.
- use x86 && replace-flags -O0 -O1
-
- for process in ${processes} ; do
- local build="${WORKDIR}/${P}_build/${process%%:*}"
-
- local mycmakeargs=(
- -DAVIDEMUX_SOURCE_DIR='${S}'
- -DPLUGIN_UI=$(echo ${build/buildPlugins/} | tr '[:lower:]' '[:upper:]')
- -DFAAC="$(usex aac)"
- -DFAAD="$(usex aac)"
- -DALSA="$(usex alsa)"
- -DAFTEN="$(usex aften)"
- -DDCAENC="$(usex dcaenc)"
- -DFDK_AAC="$(usex fdk)"
- -DOPENCORE_AMRWB="$(usex amr)"
- -DOPENCORE_AMRNB="$(usex amr)"
- -DLIBDCA="$(usex dts)"
- -DFONTCONFIG="$(usex fontconfig)"
- -DJACK="$(usex jack)"
- -DLAME="$(usex lame)"
- -DNVENC=no
- -DOPENGL="$(usex opengl)"
- -DOPUS="$(usex opus)"
- -DOSS="$(usex oss)"
- -DPULSEAUDIOSIMPLE="$(usex pulseaudio)"
- -DQT4=OFF
- -DFREETYPE2="$(usex truetype)"
- -DTWOLAME="$(usex twolame)"
- -DX264="$(usex x264)"
- -DX265="$(usex x265)"
- -DXVIDEO="$(usex xv)"
- -DXVID="$(usex xvid)"
- -DVDPAU="$(usex vdpau)"
- -DVORBIS="$(usex vorbis)"
- -DLIBVORBIS="$(usex vorbis)"
- -DVPXDEC="$(usex vpx)"
- -DUSE_EXTERNAL_LIBA52=yes
- -DUSE_EXTERNAL_LIBASS=yes
- -DUSE_EXTERNAL_LIBMAD=yes
- -DUSE_EXTERNAL_LIBMP4V2=yes
- )
-
- use qt5 && mycmakeargs+=( -DENABLE_QT5=True )
- use debug && mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 )
-
- CMAKE_USE_DIR="${S}"/${process#*:} BUILD_DIR="${build}" cmake_src_configure
- done
-}
-
-src_compile() {
- for process in ${processes} ; do
- local build="${WORKDIR}/${P}_build/${process%%:*}"
- BUILD_DIR="${build}" cmake_src_compile
- done
-}
-
-src_install() {
- for process in ${processes} ; do
- local build="${WORKDIR}/${P}_build/${process%%:*}"
- BUILD_DIR="${build}" cmake_src_install
- done
-}
diff --git a/media-libs/avidemux-plugins/files/avidemux-plugins-2.6.20-optional-pulse.patch b/media-libs/avidemux-plugins/files/avidemux-plugins-2.6.20-optional-pulse.patch
deleted file mode 100644
index a75f12952353..000000000000
--- a/media-libs/avidemux-plugins/files/avidemux-plugins-2.6.20-optional-pulse.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/cmake/admCheckAudioDeviceLibs.cmake
-+++ b/cmake/admCheckAudioDeviceLibs.cmake
-@@ -158,6 +158,7 @@
-
- MESSAGE(STATUS "Checking for PULSEAUDIOSIMPLE")
- MESSAGE(STATUS "*****************************")
-+ IF (PULSEAUDIOSIMPLE)
- IF (PULSEAUDIOSIMPLE_INCLUDE_DIR AND PULSEAUDIOSIMPLE_LIBRARIES)
- # in cache already
- SET(PULSEAUDIOSIMPLE_FIND_QUIETLY TRUE)
-@@ -191,6 +192,9 @@
- MARK_AS_ADVANCED(PULSEAUDIOSIMPLE_INCLUDE_DIR PULSEAUDIOSIMPLE_LIBRARIES)
-
- APPEND_SUMMARY_LIST("Audio Device" "PulseAudio" "${USE_PULSE_SIMPLE}")
-+ ELSE (PULSEAUDIOSIMPLE)
-+ MESSAGE("${MSG_DISABLE_OPTION}")
-+ ENDIF (PULSEAUDIOSIMPLE)
- ELSE (UNIX AND NOT APPLE)
- SET(PULSEAUDIOSIMPLE_CAPABLE FALSE)
- ENDIF (UNIX AND NOT APPLE)
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-01-28 11:49 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-08-17 22:04 [gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-plugins/files/, media-libs/avidemux-plugins/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2023-01-28 11:49 Andreas Sturmlechner
2019-08-25 20:52 Stefan Strogin
2017-10-29 9:34 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox