| 1 |
commit: b33b8402e02ad3d4e0a92ef77e4105e11a1c79cb |
| 2 |
Author: Peter Levine <plevine457 <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Fri Jun 2 04:41:16 2017 +0000 |
| 4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jun 23 05:35:35 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b33b8402 |
| 7 |
|
| 8 |
media-libs/avidemux-core: Add avidemux-core-2.6.20 |
| 9 |
|
| 10 |
Upgrade avidemux-core-9999 to EAPI 6 and add an ebuild for avidemux-core-2.6.20. |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.6, Repoman-2.3.2 |
| 13 |
|
| 14 |
media-libs/avidemux-core/Manifest | 1 + |
| 15 |
...ore-9999.ebuild => avidemux-core-2.6.20.ebuild} | 45 ++++++++++------------ |
| 16 |
media-libs/avidemux-core/avidemux-core-9999.ebuild | 45 ++++++++++------------ |
| 17 |
3 files changed, 41 insertions(+), 50 deletions(-) |
| 18 |
|
| 19 |
diff --git a/media-libs/avidemux-core/Manifest b/media-libs/avidemux-core/Manifest |
| 20 |
index 418a7523584..6f017f59f92 100644 |
| 21 |
--- a/media-libs/avidemux-core/Manifest |
| 22 |
+++ b/media-libs/avidemux-core/Manifest |
| 23 |
@@ -1 +1,2 @@ |
| 24 |
+DIST avidemux_2.6.20.tar.gz 20172362 SHA256 03c6cb7fc9eb74688b4fcd5eb654ed7b9c4ffc717a72cc09b08a2d10cdc7ef9f SHA512 d01d0fc24a3004770bd3923c2debc4fa2752eb71df08cfe423746b9c44a2562ca01d82965ed2563b99572a4bed8034b79487199ce330208b51a3b7f87ccf7103 WHIRLPOOL 2e2dc21bed49eeb0cdfefe75fe51f6a84226e7e8e80b063bc0b3d8711a6b91db710611dc0ec06575be69ec8e24f2f9e5b5eb363b9c095267729e85e162a4ce38 |
| 25 |
DIST avidemux_2.6.8.tar.gz 17380534 SHA256 02998c235a89894d184d745c94cac37b78bc20e9eb44b318ee2bb83f2507e682 SHA512 57a4042f1a9d46462850871d36950215c5ffb5b66ce2f2cde09d747e946c05adb7a550ac7763c96f4c1bcb2c39881407d9d88bc64c93053741091751495ba0b0 WHIRLPOOL 29f8a6039d82e686e8dfbfc7b23658921834238a4cc6c4de338afdfdc032a9a7cba1c8236789aa6dbcab318ec14c344c19563f153e6cbd63cd265c5fb15b44b6 |
| 26 |
|
| 27 |
diff --git a/media-libs/avidemux-core/avidemux-core-9999.ebuild b/media-libs/avidemux-core/avidemux-core-2.6.20.ebuild |
| 28 |
similarity index 78% |
| 29 |
copy from media-libs/avidemux-core/avidemux-core-9999.ebuild |
| 30 |
copy to media-libs/avidemux-core/avidemux-core-2.6.20.ebuild |
| 31 |
index 3a659ab182e..e09688e05bf 100644 |
| 32 |
--- a/media-libs/avidemux-core/avidemux-core-9999.ebuild |
| 33 |
+++ b/media-libs/avidemux-core/avidemux-core-2.6.20.ebuild |
| 34 |
@@ -1,29 +1,28 @@ |
| 35 |
# Copyright 1999-2017 Gentoo Foundation |
| 36 |
# Distributed under the terms of the GNU General Public License v2 |
| 37 |
|
| 38 |
-EAPI="5" |
| 39 |
+EAPI="6" |
| 40 |
|
| 41 |
-inherit cmake-utils eutils flag-o-matic |
| 42 |
- |
| 43 |
-SLOT="2.6" |
| 44 |
+inherit cmake-utils |
| 45 |
|
| 46 |
DESCRIPTION="Core libraries for a video editor designed for simple cutting, filtering and encoding tasks" |
| 47 |
HOMEPAGE="http://fixounet.free.fr/avidemux" |
| 48 |
|
| 49 |
# Multiple licenses because of all the bundled stuff. |
| 50 |
LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain" |
| 51 |
+SLOT="2.6" |
| 52 |
IUSE="debug nls nvenc sdl system-ffmpeg vaapi vdpau video_cards_fglrx xv" |
| 53 |
-KEYWORDS="~amd64 ~x86" |
| 54 |
|
| 55 |
-MY_PN="${PN/-core/}" |
| 56 |
if [[ ${PV} == *9999* ]] ; then |
| 57 |
- KEYWORDS="" |
| 58 |
EGIT_REPO_URI="https://github.com/mean00/avidemux2.git" |
| 59 |
+ EGIT_CHECKOUT_DIR=${WORKDIR} |
| 60 |
|
| 61 |
- inherit git-2 |
| 62 |
+ inherit git-r3 |
| 63 |
else |
| 64 |
+ MY_PN="${PN/-core/}" |
| 65 |
MY_P="${MY_PN}_${PV}" |
| 66 |
SRC_URI="mirror://sourceforge/${MY_PN}/${MY_PN}/${PV}/${MY_P}.tar.gz" |
| 67 |
+ KEYWORDS="~amd64 ~x86" |
| 68 |
fi |
| 69 |
|
| 70 |
# Trying to use virtual; ffmpeg misses aac,cpudetection USE flags now though, are they needed? |
| 71 |
@@ -52,13 +51,9 @@ DEPEND=" |
| 72 |
" |
| 73 |
|
| 74 |
S="${WORKDIR}/${MY_P}" |
| 75 |
-BUILD_DIR="${S}/buildCore" |
| 76 |
- |
| 77 |
-DOCS=( AUTHORS README ) |
| 78 |
+CMAKE_USE_DIR="${S}/${PN/-/_}" |
| 79 |
|
| 80 |
src_prepare() { |
| 81 |
- mkdir "${BUILD_DIR}" || die "Can't create build folder." |
| 82 |
- |
| 83 |
cmake-utils_src_prepare |
| 84 |
|
| 85 |
if use system-ffmpeg ; then |
| 86 |
@@ -71,10 +66,12 @@ src_prepare() { |
| 87 |
sed -i -e 's/include(admFFmpegBuild)//g' avidemux_core/CMakeLists.txt || die "${error}" |
| 88 |
else |
| 89 |
# Avoid existing avidemux installations from making the build process fail, bug #461496. |
| 90 |
- sed -i -e "s:getFfmpegLibNames(\"\${sourceDir}\"):getFfmpegLibNames(\"${S}/buildCore/ffmpeg/source/\"):g" cmake/admFFmpegUtil.cmake \ |
| 91 |
+ sed -i -e "s:getFfmpegLibNames(\"\${sourceDir}\"):getFfmpegLibNames(\"${WORKDIR}/${P}_build/ffmpeg/source/\"):g" cmake/admFFmpegUtil.cmake \ |
| 92 |
|| die "Failed to avoid existing avidemux installation from making the build fail." |
| 93 |
fi |
| 94 |
+} |
| 95 |
|
| 96 |
+src_configure() { |
| 97 |
# Add lax vector typing for PowerPC. |
| 98 |
if use ppc || use ppc64 ; then |
| 99 |
append-cflags -flax-vector-conversions |
| 100 |
@@ -82,25 +79,23 @@ src_prepare() { |
| 101 |
|
| 102 |
# See bug 432322. |
| 103 |
use x86 && replace-flags -O0 -O1 |
| 104 |
-} |
| 105 |
|
| 106 |
-src_configure() { |
| 107 |
local mycmakeargs=( |
| 108 |
-DAVIDEMUX_SOURCE_DIR='${S}' |
| 109 |
- $(cmake-utils_use nls GETTEXT) |
| 110 |
- $(cmake-utils_use sdl SDL) |
| 111 |
- $(cmake-utils_use vaapi LIBVA) |
| 112 |
- $(cmake-utils_use vdpau VDPAU) |
| 113 |
- $(cmake-utils_use video_cards_fglrx XVBA) |
| 114 |
- $(cmake-utils_use xv XVIDEO) |
| 115 |
- $(cmake-utils_use nvenc NVENC) |
| 116 |
+ -DGETTEXT="$(usex nls)" |
| 117 |
+ -DSDL="$(usex sdl)" |
| 118 |
+ -DLIBVA="$(usex vaapi)" |
| 119 |
+ -DVDPAU="$(usex vdpau)" |
| 120 |
+ -DXVBA="$(usex video_cards_fglrx)" |
| 121 |
+ -DXVIDEO="$(usex xv)" |
| 122 |
+ -DNVENC="$(usex nvenc)" |
| 123 |
) |
| 124 |
|
| 125 |
if use debug ; then |
| 126 |
- mycmakeargs+=( -DVERBOSE=1 -DCMAKE_BUILD_TYPE=Debug -DADM_DEBUG=1 ) |
| 127 |
+ mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 ) |
| 128 |
fi |
| 129 |
|
| 130 |
- CMAKE_USE_DIR="${S}"/avidemux_core cmake-utils_src_configure |
| 131 |
+ cmake-utils_src_configure |
| 132 |
} |
| 133 |
|
| 134 |
src_compile() { |
| 135 |
|
| 136 |
diff --git a/media-libs/avidemux-core/avidemux-core-9999.ebuild b/media-libs/avidemux-core/avidemux-core-9999.ebuild |
| 137 |
index 3a659ab182e..e09688e05bf 100644 |
| 138 |
--- a/media-libs/avidemux-core/avidemux-core-9999.ebuild |
| 139 |
+++ b/media-libs/avidemux-core/avidemux-core-9999.ebuild |
| 140 |
@@ -1,29 +1,28 @@ |
| 141 |
# Copyright 1999-2017 Gentoo Foundation |
| 142 |
# Distributed under the terms of the GNU General Public License v2 |
| 143 |
|
| 144 |
-EAPI="5" |
| 145 |
+EAPI="6" |
| 146 |
|
| 147 |
-inherit cmake-utils eutils flag-o-matic |
| 148 |
- |
| 149 |
-SLOT="2.6" |
| 150 |
+inherit cmake-utils |
| 151 |
|
| 152 |
DESCRIPTION="Core libraries for a video editor designed for simple cutting, filtering and encoding tasks" |
| 153 |
HOMEPAGE="http://fixounet.free.fr/avidemux" |
| 154 |
|
| 155 |
# Multiple licenses because of all the bundled stuff. |
| 156 |
LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain" |
| 157 |
+SLOT="2.6" |
| 158 |
IUSE="debug nls nvenc sdl system-ffmpeg vaapi vdpau video_cards_fglrx xv" |
| 159 |
-KEYWORDS="~amd64 ~x86" |
| 160 |
|
| 161 |
-MY_PN="${PN/-core/}" |
| 162 |
if [[ ${PV} == *9999* ]] ; then |
| 163 |
- KEYWORDS="" |
| 164 |
EGIT_REPO_URI="https://github.com/mean00/avidemux2.git" |
| 165 |
+ EGIT_CHECKOUT_DIR=${WORKDIR} |
| 166 |
|
| 167 |
- inherit git-2 |
| 168 |
+ inherit git-r3 |
| 169 |
else |
| 170 |
+ MY_PN="${PN/-core/}" |
| 171 |
MY_P="${MY_PN}_${PV}" |
| 172 |
SRC_URI="mirror://sourceforge/${MY_PN}/${MY_PN}/${PV}/${MY_P}.tar.gz" |
| 173 |
+ KEYWORDS="~amd64 ~x86" |
| 174 |
fi |
| 175 |
|
| 176 |
# Trying to use virtual; ffmpeg misses aac,cpudetection USE flags now though, are they needed? |
| 177 |
@@ -52,13 +51,9 @@ DEPEND=" |
| 178 |
" |
| 179 |
|
| 180 |
S="${WORKDIR}/${MY_P}" |
| 181 |
-BUILD_DIR="${S}/buildCore" |
| 182 |
- |
| 183 |
-DOCS=( AUTHORS README ) |
| 184 |
+CMAKE_USE_DIR="${S}/${PN/-/_}" |
| 185 |
|
| 186 |
src_prepare() { |
| 187 |
- mkdir "${BUILD_DIR}" || die "Can't create build folder." |
| 188 |
- |
| 189 |
cmake-utils_src_prepare |
| 190 |
|
| 191 |
if use system-ffmpeg ; then |
| 192 |
@@ -71,10 +66,12 @@ src_prepare() { |
| 193 |
sed -i -e 's/include(admFFmpegBuild)//g' avidemux_core/CMakeLists.txt || die "${error}" |
| 194 |
else |
| 195 |
# Avoid existing avidemux installations from making the build process fail, bug #461496. |
| 196 |
- sed -i -e "s:getFfmpegLibNames(\"\${sourceDir}\"):getFfmpegLibNames(\"${S}/buildCore/ffmpeg/source/\"):g" cmake/admFFmpegUtil.cmake \ |
| 197 |
+ sed -i -e "s:getFfmpegLibNames(\"\${sourceDir}\"):getFfmpegLibNames(\"${WORKDIR}/${P}_build/ffmpeg/source/\"):g" cmake/admFFmpegUtil.cmake \ |
| 198 |
|| die "Failed to avoid existing avidemux installation from making the build fail." |
| 199 |
fi |
| 200 |
+} |
| 201 |
|
| 202 |
+src_configure() { |
| 203 |
# Add lax vector typing for PowerPC. |
| 204 |
if use ppc || use ppc64 ; then |
| 205 |
append-cflags -flax-vector-conversions |
| 206 |
@@ -82,25 +79,23 @@ src_prepare() { |
| 207 |
|
| 208 |
# See bug 432322. |
| 209 |
use x86 && replace-flags -O0 -O1 |
| 210 |
-} |
| 211 |
|
| 212 |
-src_configure() { |
| 213 |
local mycmakeargs=( |
| 214 |
-DAVIDEMUX_SOURCE_DIR='${S}' |
| 215 |
- $(cmake-utils_use nls GETTEXT) |
| 216 |
- $(cmake-utils_use sdl SDL) |
| 217 |
- $(cmake-utils_use vaapi LIBVA) |
| 218 |
- $(cmake-utils_use vdpau VDPAU) |
| 219 |
- $(cmake-utils_use video_cards_fglrx XVBA) |
| 220 |
- $(cmake-utils_use xv XVIDEO) |
| 221 |
- $(cmake-utils_use nvenc NVENC) |
| 222 |
+ -DGETTEXT="$(usex nls)" |
| 223 |
+ -DSDL="$(usex sdl)" |
| 224 |
+ -DLIBVA="$(usex vaapi)" |
| 225 |
+ -DVDPAU="$(usex vdpau)" |
| 226 |
+ -DXVBA="$(usex video_cards_fglrx)" |
| 227 |
+ -DXVIDEO="$(usex xv)" |
| 228 |
+ -DNVENC="$(usex nvenc)" |
| 229 |
) |
| 230 |
|
| 231 |
if use debug ; then |
| 232 |
- mycmakeargs+=( -DVERBOSE=1 -DCMAKE_BUILD_TYPE=Debug -DADM_DEBUG=1 ) |
| 233 |
+ mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 ) |
| 234 |
fi |
| 235 |
|
| 236 |
- CMAKE_USE_DIR="${S}"/avidemux_core cmake-utils_src_configure |
| 237 |
+ cmake-utils_src_configure |
| 238 |
} |
| 239 |
|
| 240 |
src_compile() { |
Archives