[gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-core/, media-libs/avidemux-core/files/
commit: fa73e5fd23da1151eadc3e12abe14afbad98152d Author: Sam James gentoo org> AuthorDate: Thu Aug 10 04:06:15 2023 + Commit: Sam James gentoo org> CommitDate: Thu Aug 10 04:06:15 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa73e5fd media-libs/avidemux-core: fix build w/ binutils-2.41 Closes: https://bugs.gentoo.org/911986 Signed-off-by: Sam James gentoo.org> .../avidemux-core/avidemux-core-2.8.1-r1.ebuild| 5 +- .../files/avidemux-core-2.8.1-ffmpeg-2.41.patch| 84 ++ 2 files changed, 88 insertions(+), 1 deletion(-) diff --git a/media-libs/avidemux-core/avidemux-core-2.8.1-r1.ebuild b/media-libs/avidemux-core/avidemux-core-2.8.1-r1.ebuild index bc742a9bb980..617721f52e31 100644 --- a/media-libs/avidemux-core/avidemux-core-2.8.1-r1.ebuild +++ b/media-libs/avidemux-core/avidemux-core-2.8.1-r1.ebuild @@ -40,7 +40,10 @@ BDEPEND=" !system-ffmpeg? ( dev-lang/yasm[nls=] ) " -PATCHES=( "${FILESDIR}"/avidemux-core-2.7.6-ffmpeg-flags.patch ) +PATCHES=( + "${FILESDIR}"/avidemux-core-2.7.6-ffmpeg-flags.patch + "${FILESDIR}"/avidemux-core-2.8.1-ffmpeg-2.41.patch +) S="${WORKDIR}/avidemux2-${PV}" CMAKE_USE_DIR="${S}/${PN/-/_}" diff --git a/media-libs/avidemux-core/files/avidemux-core-2.8.1-ffmpeg-2.41.patch b/media-libs/avidemux-core/files/avidemux-core-2.8.1-ffmpeg-2.41.patch new file mode 100644 index ..da444e9e1c81 --- /dev/null +++ b/media-libs/avidemux-core/files/avidemux-core-2.8.1-ffmpeg-2.41.patch @@ -0,0 +1,84 @@ +diff --git a/avidemux_core/ffmpeg_package/patches/libavcodec_mathops.h_binutils_241.patch b/avidemux_core/ffmpeg_package/patches/libavcodec_mathops.h_binutils_241.patch +new file mode 100644 +index 000..633b4b6 +--- /dev/null b/avidemux_core/ffmpeg_package/patches/libavcodec_mathops.h_binutils_241.patch +@@ -0,0 +1,76 @@ ++https://bugs.gentoo.org/911582 ++https://trac.ffmpeg.org/ticket/10405 ++https://git.videolan.org/?p=ffmpeg.git;a=commit;h=25cd95a9dc3510c3cc0d7aad6f9d83f6a1078c7e ++https://sourceware.org/PR30578 ++https://gcc.gnu.org/PR108941 ++ ++From 25cd95a9dc3510c3cc0d7aad6f9d83f6a1078c7e Mon Sep 17 00:00:00 2001 ++From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= ++Date: Sun, 16 Jul 2023 18:18:02 +0300 ++Subject: [PATCH] avcodec/x86/mathops: clip constants used with shift ++ instructions within inline assembly ++ ++Fixes assembling with binutil as >= 2.41 ++ ++Signed-off-by: James Almer ++(cherry picked from commit effadce6c756247ea8bae32dc13bb3e6f464f0eb) ++--- libavcodec/x86/mathops.h + libavcodec/x86/mathops.h ++@@ -35,12 +35,20 @@ ++ static av_always_inline av_const int MULL(int a, int b, unsigned shift) ++ { ++ int rt, dummy; +++if (__builtin_constant_p(shift)) ++ __asm__ ( ++ "imull %3 \n\t" ++ "shrdl %4, %%edx, %%eax \n\t" ++ :"=a"(rt), "=d"(dummy) ++-:"a"(a), "rm"(b), "ci"((uint8_t)shift) +++:"a"(a), "rm"(b), "i"(shift & 0x1F) ++ ); +++else +++__asm__ ( +++"imull %3 \n\t" +++"shrdl %4, %%edx, %%eax \n\t" +++:"=a"(rt), "=d"(dummy) +++:"a"(a), "rm"(b), "c"((uint8_t)shift) +++); ++ return rt; ++ } ++ ++@@ -113,19 +121,31 @@ __asm__ volatile(\ ++ // avoid +32 for shift optimization (gcc should do that ...) ++ #define NEG_SSR32 NEG_SSR32 ++ static inline int32_t NEG_SSR32( int32_t a, int8_t s){ +++if (__builtin_constant_p(s)) ++ __asm__ ("sarl %1, %0\n\t" ++ : "+r" (a) ++- : "ic" ((uint8_t)(-s)) +++ : "i" (-s & 0x1F) ++ ); +++else +++__asm__ ("sarl %1, %0\n\t" +++ : "+r" (a) +++ : "c" ((uint8_t)(-s)) +++); ++ return a; ++ } ++ ++ #define NEG_USR32 NEG_USR32 ++ static inline uint32_t NEG_USR32(uint32_t a, int8_t s){ +++if (__builtin_constant_p(s)) ++ __asm__ ("shrl %1, %0\n\t" ++ : "+r" (a) ++- : "ic" ((uint8_t)(-s)) +++ : "i" (-s & 0x1F) ++ ); +++else +++__asm__ ("shrl %1, %0\n\t" +++ : "+r" (a) +++ : "c" ((uint8_t)(-s)) +++); ++ return a; ++ } ++ ++-- ++2.30.2 +-- +2.41.0
[gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-core/
commit: 9442a594090d26bdb67baeccf9d1e48913aafa60 Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Jan 27 21:54:12 2023 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Jan 28 11:48:47 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9442a594 media-libs/avidemux-core: drop 2.7.8 Signed-off-by: Andreas Sturmlechner gentoo.org> media-libs/avidemux-core/Manifest | 1 - .../avidemux-core/avidemux-core-2.7.8.ebuild | 98 -- 2 files changed, 99 deletions(-) diff --git a/media-libs/avidemux-core/Manifest b/media-libs/avidemux-core/Manifest index 5e1a60fccafb..49e9b54b3bbf 100644 --- a/media-libs/avidemux-core/Manifest +++ b/media-libs/avidemux-core/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-core/avidemux-core-2.7.8.ebuild b/media-libs/avidemux-core/avidemux-core-2.7.8.ebuild deleted file mode 100644 index 062fa0231f9c.. --- a/media-libs/avidemux-core/avidemux-core-2.7.8.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CMAKE_MAKEFILE_GENERATOR="emake" - -inherit cmake flag-o-matic toolchain-funcs - -DESCRIPTION="Core libraries for simple video cutting, filtering and encoding tasks" -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" -KEYWORDS="~amd64 ~x86" -IUSE="debug nls sdl system-ffmpeg vaapi vdpau xv" - -# Trying to use virtual; ffmpeg misses aac,cpudetection USE flags now though, are they needed? -DEPEND=" - dev-db/sqlite:3 - sdl? ( media-libs/libsdl:0 ) - system-ffmpeg? ( >=media-video/ffmpeg-9:0[mp3,theora] ) - vaapi? ( media-libs/libva:0= ) - vdpau? ( x11-libs/libvdpau:0 ) - xv? ( x11-libs/libXv:0 ) -" -RDEPEND=" - ${DEPEND} - !
[gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-core/
commit: bcdef46f12abd95afb297cdf9485de862d555e30 Author: Sam James gentoo org> AuthorDate: Tue Jan 10 08:56:42 2023 + Commit: Sam James gentoo org> CommitDate: Tue Jan 10 09:00:00 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bcdef46f media-libs/avidemux-core: add nvenc support Closes: https://bugs.gentoo.org/890332 Signed-off-by: Sam James gentoo.org> .../{avidemux-core-2.8.1.ebuild => avidemux-core-2.8.1-r1.ebuild} | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/media-libs/avidemux-core/avidemux-core-2.8.1.ebuild b/media-libs/avidemux-core/avidemux-core-2.8.1-r1.ebuild similarity index 94% rename from media-libs/avidemux-core/avidemux-core-2.8.1.ebuild rename to media-libs/avidemux-core/avidemux-core-2.8.1-r1.ebuild index eb19d053c01b..bc742a9bb980 100644 --- a/media-libs/avidemux-core/avidemux-core-2.8.1.ebuild +++ b/media-libs/avidemux-core/avidemux-core-2.8.1-r1.ebuild @@ -15,12 +15,13 @@ SRC_URI="https://github.com/mean00/avidemux2/archive/${PV}.tar.gz -> avidemux-${ LICENSE="GPL-2 MIT PSF-2 LGPL-2 OFL-1.1" SLOT="2.7" KEYWORDS="~amd64 ~x86" -IUSE="debug nls sdl system-ffmpeg vaapi vdpau xv" +IUSE="debug nls nvenc sdl system-ffmpeg vaapi vdpau xv" # Trying to use virtual; ffmpeg misses aac,cpudetection USE flags now though, are they needed? DEPEND=" dev-db/sqlite:3 sys-libs/zlib + nvenc? ( amd64? ( media-libs/nv-codec-headers ) ) sdl? ( media-libs/libsdl ) system-ffmpeg? ( >=media-video/ffmpeg-9:0[mp3,theora] ) vaapi? ( media-libs/libva:= ) @@ -81,6 +82,7 @@ src_configure() { -DNVENC=no -DSDL="$(usex sdl)" -DLIBVA="$(usex vaapi)" + -DNVENC="$(usex nvenc)" -DVDPAU="$(usex vdpau)" -DXVIDEO="$(usex xv)" )
[gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-core/
commit: c1a9af137c542159f3fe1c7782f454309163bbb6 Author: Sam James gentoo org> AuthorDate: Mon Jan 9 07:24:38 2023 + Commit: Sam James gentoo org> CommitDate: Mon Jan 9 07:26:51 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1a9af13 media-libs/avidemux-core: fix LICENSE Closes: https://bugs.gentoo.org/890040 Signed-off-by: Sam James gentoo.org> media-libs/avidemux-core/avidemux-core-2.8.1.ebuild | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/media-libs/avidemux-core/avidemux-core-2.8.1.ebuild b/media-libs/avidemux-core/avidemux-core-2.8.1.ebuild index 6dda81dfe7ae..eb19d053c01b 100644 --- a/media-libs/avidemux-core/avidemux-core-2.8.1.ebuild +++ b/media-libs/avidemux-core/avidemux-core-2.8.1.ebuild @@ -11,7 +11,8 @@ 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" +# See License.txt. +LICENSE="GPL-2 MIT PSF-2 LGPL-2 OFL-1.1" SLOT="2.7" KEYWORDS="~amd64 ~x86" IUSE="debug nls sdl system-ffmpeg vaapi vdpau xv"
[gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-core/
commit: fc1c6f99d95dd2e6004e1b07af6f1bd28c50bc31 Author: Sam James gentoo org> AuthorDate: Sat Jan 7 07:00:53 2023 + Commit: Sam James gentoo org> CommitDate: Sat Jan 7 07:17:22 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc1c6f99 media-libs/avidemux-core: add 2.8.1 Closes: https://bugs.gentoo.org/830464 Signed-off-by: Sam James gentoo.org> media-libs/avidemux-core/Manifest | 1 + .../avidemux-core/avidemux-core-2.8.1.ebuild | 98 ++ 2 files changed, 99 insertions(+) diff --git a/media-libs/avidemux-core/Manifest b/media-libs/avidemux-core/Manifest index f4c59a24eb9f..5e1a60fccafb 100644 --- a/media-libs/avidemux-core/Manifest +++ b/media-libs/avidemux-core/Manifest @@ -1 +1,2 @@ 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-core/avidemux-core-2.8.1.ebuild b/media-libs/avidemux-core/avidemux-core-2.8.1.ebuild new file mode 100644 index ..6dda81dfe7ae --- /dev/null +++ b/media-libs/avidemux-core/avidemux-core-2.8.1.ebuild @@ -0,0 +1,98 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CMAKE_MAKEFILE_GENERATOR="emake" +inherit cmake flag-o-matic toolchain-funcs + +DESCRIPTION="Core libraries for simple video cutting, filtering and encoding tasks" +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" +KEYWORDS="~amd64 ~x86" +IUSE="debug nls sdl system-ffmpeg vaapi vdpau xv" + +# Trying to use virtual; ffmpeg misses aac,cpudetection USE flags now though, are they needed? +DEPEND=" + dev-db/sqlite:3 + sys-libs/zlib + sdl? ( media-libs/libsdl ) + system-ffmpeg? ( >=media-video/ffmpeg-9:0[mp3,theora] ) + vaapi? ( media-libs/libva:= ) + vdpau? ( x11-libs/libvdpau ) + xv? ( x11-libs/libXv ) +" +RDEPEND=" + ${DEPEND} + !
[gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-core/
commit: 33373ca70bed174d18255f023f5404ac8351084a Author: Jakov Smolić gentoo org> AuthorDate: Sun Jun 19 08:56:41 2022 + Commit: Jakov Smolić gentoo org> CommitDate: Sun Jun 19 08:56:41 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33373ca7 media-libs/avidemux-core: Remove nvenc flag Signed-off-by: Jakov Smolić gentoo.org> media-libs/avidemux-core/avidemux-core-2.7.8.ebuild | 7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/media-libs/avidemux-core/avidemux-core-2.7.8.ebuild b/media-libs/avidemux-core/avidemux-core-2.7.8.ebuild index f1b9a125c6c1..7d5a2d52c24c 100644 --- a/media-libs/avidemux-core/avidemux-core-2.7.8.ebuild +++ b/media-libs/avidemux-core/avidemux-core-2.7.8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -15,12 +15,11 @@ SRC_URI="https://github.com/mean00/avidemux2/archive/${PV}.tar.gz -> avidemux-${ LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain" SLOT="2.7" KEYWORDS="~amd64 ~x86" -IUSE="debug nls nvenc sdl system-ffmpeg vaapi vdpau xv" +IUSE="debug nls sdl system-ffmpeg vaapi vdpau xv" # Trying to use virtual; ffmpeg misses aac,cpudetection USE flags now though, are they needed? DEPEND=" dev-db/sqlite:3 - nvenc? ( media-video/nvidia_video_sdk ) sdl? ( media-libs/libsdl:0 ) system-ffmpeg? ( >=media-video/ffmpeg-9:0[mp3,theora] ) vaapi? ( x11-libs/libva:0= ) @@ -78,7 +77,7 @@ src_configure() { local mycmakeargs=( -DAVIDEMUX_SOURCE_DIR='${S}' -DGETTEXT="$(usex nls)" - -DNVENC="$(usex nvenc)" + -DNVENC=no -DSDL="$(usex sdl)" -DLIBVA="$(usex vaapi)" -DVDPAU="$(usex vdpau)"
[gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-core/
commit: 30d1592af36a0bca5129e85a013caf7f2b492023 Author: Sam James gentoo org> AuthorDate: Wed Mar 9 12:28:27 2022 + Commit: Sam James gentoo org> CommitDate: Wed Mar 9 12:28:27 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30d1592a media-libs/avidemux-core: drop 2.7.6 Signed-off-by: Sam James gentoo.org> media-libs/avidemux-core/Manifest | 1 - .../avidemux-core/avidemux-core-2.7.6.ebuild | 102 - 2 files changed, 103 deletions(-) diff --git a/media-libs/avidemux-core/Manifest b/media-libs/avidemux-core/Manifest index 9fc07834baab..f4c59a24eb9f 100644 --- a/media-libs/avidemux-core/Manifest +++ b/media-libs/avidemux-core/Manifest @@ -1,2 +1 @@ -DIST avidemux-2.7.6.tar.gz 21963753 BLAKE2B 6ca343f90c37844ebfd61123badccefb7327cbf500723c031257cf26500a5b6d98955568c2a9c0d182af68f162e878459a51e6049485937f9b01b4439b32e5e0 SHA512 bc60c733168d40d5b39cc7dd1f74b3f1315e9727302478ef1621e18748bad3400bcfd4d5199862c3093ad9df51385b6b2a96f0f8fedf9bf1c00060327545fb0f DIST avidemux-2.7.8.tar.gz 22080267 BLAKE2B a1e56856f44d56afac6ea4015f206a3f9301c025b3c8da1528165bd4c139ccc971074ac21aa05b9b3dfd6d514eabcbb375e671c8df9c9e5cae74a0a6597577c4 SHA512 6cd5527ab34517a07bf73e46d01f15b7ff023ff34ed70ee54f1d7dbfb6cf57364a323b4ecb89bb9aadeb9bc05473aacb40d8c4eecc522840a3c1c4b3a8756d82 diff --git a/media-libs/avidemux-core/avidemux-core-2.7.6.ebuild b/media-libs/avidemux-core/avidemux-core-2.7.6.ebuild deleted file mode 100644 index 6f2b5d5eb4bf.. --- a/media-libs/avidemux-core/avidemux-core-2.7.6.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CMAKE_MAKEFILE_GENERATOR="emake" - -inherit cmake flag-o-matic toolchain-funcs - -DESCRIPTION="Core libraries for simple video cutting, filtering and encoding tasks" -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" -KEYWORDS="~amd64 ~x86" -IUSE="debug nls nvenc sdl system-ffmpeg vaapi vdpau xv" - -# Trying to use virtual; ffmpeg misses aac,cpudetection USE flags now though, are they needed? -DEPEND="dev-db/sqlite:3 - nvenc? ( media-video/nvidia_video_sdk ) - sdl? ( media-libs/libsdl:0 ) - system-ffmpeg? ( >=media-video/ffmpeg-9:0[mp3,theora] ) - vaapi? ( x11-libs/libva:0= ) - vdpau? ( x11-libs/libvdpau:0 ) - xv? ( x11-libs/libXv:0 ) -" -RDEPEND="${DEPEND} - !
[gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-core/
commit: 4f0450984b3a5827e10e3701c40e9f75b992a301 Author: Marco Scardovi scardovi com> AuthorDate: Sun Jun 20 18:21:00 2021 + Commit: Sam James gentoo org> CommitDate: Sun Nov 7 00:01:17 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f045098 media-libs/avidemux-core: bump to 2.7.8 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Marco Scardovi scardovi.com> Signed-off-by: Sam James gentoo.org> media-libs/avidemux-core/Manifest | 1 + .../avidemux-core/avidemux-core-2.7.8.ebuild | 99 ++ 2 files changed, 100 insertions(+) diff --git a/media-libs/avidemux-core/Manifest b/media-libs/avidemux-core/Manifest index d9b9b78a2a0..9fc07834baa 100644 --- a/media-libs/avidemux-core/Manifest +++ b/media-libs/avidemux-core/Manifest @@ -1 +1,2 @@ DIST avidemux-2.7.6.tar.gz 21963753 BLAKE2B 6ca343f90c37844ebfd61123badccefb7327cbf500723c031257cf26500a5b6d98955568c2a9c0d182af68f162e878459a51e6049485937f9b01b4439b32e5e0 SHA512 bc60c733168d40d5b39cc7dd1f74b3f1315e9727302478ef1621e18748bad3400bcfd4d5199862c3093ad9df51385b6b2a96f0f8fedf9bf1c00060327545fb0f +DIST avidemux-2.7.8.tar.gz 22080267 BLAKE2B a1e56856f44d56afac6ea4015f206a3f9301c025b3c8da1528165bd4c139ccc971074ac21aa05b9b3dfd6d514eabcbb375e671c8df9c9e5cae74a0a6597577c4 SHA512 6cd5527ab34517a07bf73e46d01f15b7ff023ff34ed70ee54f1d7dbfb6cf57364a323b4ecb89bb9aadeb9bc05473aacb40d8c4eecc522840a3c1c4b3a8756d82 diff --git a/media-libs/avidemux-core/avidemux-core-2.7.8.ebuild b/media-libs/avidemux-core/avidemux-core-2.7.8.ebuild new file mode 100644 index 000..f1b9a125c6c --- /dev/null +++ b/media-libs/avidemux-core/avidemux-core-2.7.8.ebuild @@ -0,0 +1,99 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +CMAKE_MAKEFILE_GENERATOR="emake" + +inherit cmake flag-o-matic toolchain-funcs + +DESCRIPTION="Core libraries for simple video cutting, filtering and encoding tasks" +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" +KEYWORDS="~amd64 ~x86" +IUSE="debug nls nvenc sdl system-ffmpeg vaapi vdpau xv" + +# Trying to use virtual; ffmpeg misses aac,cpudetection USE flags now though, are they needed? +DEPEND=" + dev-db/sqlite:3 + nvenc? ( media-video/nvidia_video_sdk ) + sdl? ( media-libs/libsdl:0 ) + system-ffmpeg? ( >=media-video/ffmpeg-9:0[mp3,theora] ) + vaapi? ( x11-libs/libva:0= ) + vdpau? ( x11-libs/libvdpau:0 ) + xv? ( x11-libs/libXv:0 ) +" +RDEPEND=" + ${DEPEND} + !
[gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-core/
commit: 17be1ab306e3682d789cad94c6195b8999af8acf Author: Andrew Savchenko gentoo org> AuthorDate: Sat May 22 04:24:20 2021 + Commit: Andrew Savchenko gentoo org> CommitDate: Sat May 22 04:27:12 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17be1ab3 media-libs/avidemux-core: fix build with gcc-11 Stay on C++14 stardard (GNU variant) Closes: https://bugs.gentoo.org/768210 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Andrew Savchenko gentoo.org> media-libs/avidemux-core/avidemux-core-2.7.6.ebuild | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/media-libs/avidemux-core/avidemux-core-2.7.6.ebuild b/media-libs/avidemux-core/avidemux-core-2.7.6.ebuild index a43ad8aca26..6f2b5d5eb4b 100644 --- a/media-libs/avidemux-core/avidemux-core-2.7.6.ebuild +++ b/media-libs/avidemux-core/avidemux-core-2.7.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -75,6 +75,8 @@ src_prepare() { src_configure() { # See bug 432322. use x86 && replace-flags -O0 -O1 + # Bug 768210 + append-cxxflags -std=gnu++14 local mycmakeargs=( -DAVIDEMUX_SOURCE_DIR='${S}'
[gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-core/
commit: 9dabe2ec1384260578dc7dad0c3fdb972873b9f5 Author: Michał Górny gentoo org> AuthorDate: Fri Jan 1 01:02:55 2021 + Commit: Michał Górny gentoo org> CommitDate: Fri Jan 1 01:02:55 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9dabe2ec media-libs/avidemux-core: Remove old (py3.6) Signed-off-by: Michał Górny gentoo.org> media-libs/avidemux-core/Manifest | 1 - .../avidemux-core/avidemux-core-2.7.4-r1.ebuild| 84 -- 2 files changed, 85 deletions(-) diff --git a/media-libs/avidemux-core/Manifest b/media-libs/avidemux-core/Manifest index 20c2b9ff2f2..d9b9b78a2a0 100644 --- a/media-libs/avidemux-core/Manifest +++ b/media-libs/avidemux-core/Manifest @@ -1,2 +1 @@ -DIST avidemux-2.7.4.tar.gz 23815808 BLAKE2B 3a7206f04f568f28dd4d5116c580dd780b057a59e94dd61a2abe5dadfa557291a0c50f917ad1926f9f9a82d01af065c06138f954320e2d9c174fda7583a6b265 SHA512 36d857837cd6a74039a414df16367cd8cbf615173bcc531e57dc0dbfc2e002b1c0c4a80cef73a0d8f25d305deca809af0b5cbcdbad8c311324fa2e64381fd10b DIST avidemux-2.7.6.tar.gz 21963753 BLAKE2B 6ca343f90c37844ebfd61123badccefb7327cbf500723c031257cf26500a5b6d98955568c2a9c0d182af68f162e878459a51e6049485937f9b01b4439b32e5e0 SHA512 bc60c733168d40d5b39cc7dd1f74b3f1315e9727302478ef1621e18748bad3400bcfd4d5199862c3093ad9df51385b6b2a96f0f8fedf9bf1c00060327545fb0f diff --git a/media-libs/avidemux-core/avidemux-core-2.7.4-r1.ebuild b/media-libs/avidemux-core/avidemux-core-2.7.4-r1.ebuild deleted file mode 100644 index b069b81af16..000 --- a/media-libs/avidemux-core/avidemux-core-2.7.4-r1.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CMAKE_MAKEFILE_GENERATOR="emake" - -inherit cmake flag-o-matic - -DESCRIPTION="Core libraries for simple video cutting, filtering and encoding tasks" -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" -KEYWORDS="~amd64 ~x86" -IUSE="debug nls nvenc sdl system-ffmpeg vaapi vdpau xv" - -# Trying to use virtual; ffmpeg misses aac,cpudetection USE flags now though, are they needed? -DEPEND="dev-db/sqlite:3 - nvenc? ( media-video/nvidia_video_sdk ) - sdl? ( media-libs/libsdl:0 ) - system-ffmpeg? ( >=media-video/ffmpeg-9:0[mp3,theora] ) - vaapi? ( x11-libs/libva:0= ) - vdpau? ( x11-libs/libvdpau:0 ) - xv? ( x11-libs/libXv:0 ) -" -RDEPEND="${DEPEND} - !
[gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-core/
commit: 9bc0b0d442d7f53ac7645f2047de5149ff17f7e7 Author: David Seifert gentoo org> AuthorDate: Sat Oct 31 11:11:11 2020 + Commit: David Seifert gentoo org> CommitDate: Sat Oct 31 11:11:11 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bc0b0d4 media-libs/avidemux-core: [QA] Inherit flag-o-matic.eclass explicitly Package-Manager: Portage-3.0.8, Repoman-3.0.2 Signed-off-by: David Seifert gentoo.org> media-libs/avidemux-core/avidemux-core-2.7.4-r1.ebuild | 2 +- media-libs/avidemux-core/avidemux-core-2.7.6.ebuild| 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/media-libs/avidemux-core/avidemux-core-2.7.4-r1.ebuild b/media-libs/avidemux-core/avidemux-core-2.7.4-r1.ebuild index 631c18906fe..b069b81af16 100644 --- a/media-libs/avidemux-core/avidemux-core-2.7.4-r1.ebuild +++ b/media-libs/avidemux-core/avidemux-core-2.7.4-r1.ebuild @@ -5,7 +5,7 @@ EAPI=7 CMAKE_MAKEFILE_GENERATOR="emake" -inherit cmake +inherit cmake flag-o-matic DESCRIPTION="Core libraries for simple video cutting, filtering and encoding tasks" HOMEPAGE="http://fixounet.free.fr/avidemux"; diff --git a/media-libs/avidemux-core/avidemux-core-2.7.6.ebuild b/media-libs/avidemux-core/avidemux-core-2.7.6.ebuild index ac6eace06eb..a43ad8aca26 100644 --- a/media-libs/avidemux-core/avidemux-core-2.7.6.ebuild +++ b/media-libs/avidemux-core/avidemux-core-2.7.6.ebuild @@ -5,7 +5,7 @@ EAPI=7 CMAKE_MAKEFILE_GENERATOR="emake" -inherit cmake toolchain-funcs +inherit cmake flag-o-matic toolchain-funcs DESCRIPTION="Core libraries for simple video cutting, filtering and encoding tasks" HOMEPAGE="http://fixounet.free.fr/avidemux";
[gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-core/, media-libs/avidemux-core/files/
commit: 8e0f752f7311788876c687958328c72ecccaff64 Author: Thomas Deutschmann gentoo org> AuthorDate: Tue Aug 11 22:19:57 2020 + Commit: Thomas Deutschmann gentoo org> CommitDate: Tue Aug 11 23:10:06 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e0f752f media-libs/avidemux-core: bump to v2.7.6 Package-Manager: Portage-3.0.2, Repoman-2.3.23 Signed-off-by: Thomas Deutschmann gentoo.org> media-libs/avidemux-core/Manifest | 1 + .../avidemux-core/avidemux-core-2.7.6.ebuild | 100 + .../files/avidemux-core-2.7.6-ffmpeg-flags.patch | 8 ++ 3 files changed, 109 insertions(+) diff --git a/media-libs/avidemux-core/Manifest b/media-libs/avidemux-core/Manifest index 81a3ad8e8a8..20c2b9ff2f2 100644 --- a/media-libs/avidemux-core/Manifest +++ b/media-libs/avidemux-core/Manifest @@ -1 +1,2 @@ DIST avidemux-2.7.4.tar.gz 23815808 BLAKE2B 3a7206f04f568f28dd4d5116c580dd780b057a59e94dd61a2abe5dadfa557291a0c50f917ad1926f9f9a82d01af065c06138f954320e2d9c174fda7583a6b265 SHA512 36d857837cd6a74039a414df16367cd8cbf615173bcc531e57dc0dbfc2e002b1c0c4a80cef73a0d8f25d305deca809af0b5cbcdbad8c311324fa2e64381fd10b +DIST avidemux-2.7.6.tar.gz 21963753 BLAKE2B 6ca343f90c37844ebfd61123badccefb7327cbf500723c031257cf26500a5b6d98955568c2a9c0d182af68f162e878459a51e6049485937f9b01b4439b32e5e0 SHA512 bc60c733168d40d5b39cc7dd1f74b3f1315e9727302478ef1621e18748bad3400bcfd4d5199862c3093ad9df51385b6b2a96f0f8fedf9bf1c00060327545fb0f diff --git a/media-libs/avidemux-core/avidemux-core-2.7.6.ebuild b/media-libs/avidemux-core/avidemux-core-2.7.6.ebuild new file mode 100644 index 000..ac6eace06eb --- /dev/null +++ b/media-libs/avidemux-core/avidemux-core-2.7.6.ebuild @@ -0,0 +1,100 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +CMAKE_MAKEFILE_GENERATOR="emake" + +inherit cmake toolchain-funcs + +DESCRIPTION="Core libraries for simple video cutting, filtering and encoding tasks" +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" +KEYWORDS="~amd64 ~x86" +IUSE="debug nls nvenc sdl system-ffmpeg vaapi vdpau xv" + +# Trying to use virtual; ffmpeg misses aac,cpudetection USE flags now though, are they needed? +DEPEND="dev-db/sqlite:3 + nvenc? ( media-video/nvidia_video_sdk ) + sdl? ( media-libs/libsdl:0 ) + system-ffmpeg? ( >=media-video/ffmpeg-9:0[mp3,theora] ) + vaapi? ( x11-libs/libva:0= ) + vdpau? ( x11-libs/libvdpau:0 ) + xv? ( x11-libs/libXv:0 ) +" +RDEPEND="${DEPEND} + !
[gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-core/, media-libs/avidemux-core/files/
commit: 1a0d283aac7962bf749e58c577c05f09c6fe95bf Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Aug 7 20:24:32 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Aug 7 23:23:26 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a0d283a media-libs/avidemux-core: Drop 2.7.3-r1 Package-Manager: Portage-3.0.1, Repoman-2.3.23 Signed-off-by: Andreas Sturmlechner gentoo.org> media-libs/avidemux-core/Manifest | 1 - .../avidemux-core/avidemux-core-2.7.3-r1.ebuild| 88 -- .../files/avidemux-core-2.7.3-permissions.patch| 28 --- 3 files changed, 117 deletions(-) diff --git a/media-libs/avidemux-core/Manifest b/media-libs/avidemux-core/Manifest index 7d6012ce4fc..81a3ad8e8a8 100644 --- a/media-libs/avidemux-core/Manifest +++ b/media-libs/avidemux-core/Manifest @@ -1,2 +1 @@ -DIST avidemux-2.7.3.tar.gz 23772654 BLAKE2B f946c267140bc8aebda2ce027ed8cb7c84a98a401255d3e0cdaf7498680e8bd9c78a33c122cb177d397ed2dd6bc3c29d7508578028c2964c2897279bf860b62d SHA512 d7761de1c40de1b824efbcf24173ea738a2e0ba7fa41cefa09e7bac3ec97f3af4b04201e36f9de50ade2b09e394aa99ed1d4907f90bb132f9896e8f1b5e82d7a DIST avidemux-2.7.4.tar.gz 23815808 BLAKE2B 3a7206f04f568f28dd4d5116c580dd780b057a59e94dd61a2abe5dadfa557291a0c50f917ad1926f9f9a82d01af065c06138f954320e2d9c174fda7583a6b265 SHA512 36d857837cd6a74039a414df16367cd8cbf615173bcc531e57dc0dbfc2e002b1c0c4a80cef73a0d8f25d305deca809af0b5cbcdbad8c311324fa2e64381fd10b diff --git a/media-libs/avidemux-core/avidemux-core-2.7.3-r1.ebuild b/media-libs/avidemux-core/avidemux-core-2.7.3-r1.ebuild deleted file mode 100644 index 1b987f4d1e1..000 --- a/media-libs/avidemux-core/avidemux-core-2.7.3-r1.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CMAKE_MAKEFILE_GENERATOR="emake" - -inherit cmake - -DESCRIPTION="Core libraries for simple video cutting, filtering and encoding tasks" -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" -KEYWORDS="~amd64 ~x86" -IUSE="debug nls nvenc sdl system-ffmpeg vaapi vdpau xv" - -# Trying to use virtual; ffmpeg misses aac,cpudetection USE flags now though, are they needed? -DEPEND="dev-db/sqlite:3 - nvenc? ( media-video/nvidia_video_sdk ) - sdl? ( media-libs/libsdl:0 ) - system-ffmpeg? ( >=media-video/ffmpeg-9:0[mp3,theora] ) - vaapi? ( x11-libs/libva:0= ) - vdpau? ( x11-libs/libvdpau:0 ) - xv? ( x11-libs/libXv:0 ) -" -RDEPEND="${DEPEND} - ! -Date: Wed, 14 Aug 2019 03:35:01 +0300 -Subject: [PATCH] [cmake] Fix library permissions - -Upstream-Status: Submitted -[https://github.com/mean00/avidemux2/pull/179] -Signed-off-by: Stefan Strogin - cmake/admInstallDir.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cmake/admInstallDir.cmake b/cmake/admInstallDir.cmake -index ab16f283d..5af762626 100644 a/cmake/admInstallDir.cmake -+++ b/cmake/admInstallDir.cmake -@@ -55,7 +55,7 @@ ENDMACRO(ADM_INSTALL_LIB ) - MACRO (ADM_INSTALL_LIB_FILES files) - INSTALL(FILES ${files} - DESTINATION ${AVIDEMUX_LIB_DIR} --PERMISSIONS WORLD_READ WORLD_EXECUTE OWNER_WRITE OWNER_READ OWNER_EXECUTE -+PERMISSIONS WORLD_READ WORLD_EXECUTE GROUP_READ GROUP_EXECUTE OWNER_WRITE OWNER_READ OWNER_EXECUTE - COMPONENT runtime - ) - ENDMACRO (ADM_INSTALL_LIB_FILES) --- -2.22.0 -
[gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-core/
commit: ac05f0348703769c529991fb5bfcebeeb700c6a7 Author: David Seifert gentoo org> AuthorDate: Sun Apr 26 10:34:50 2020 + Commit: David Seifert gentoo org> CommitDate: Sun Apr 26 10:34:50 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac05f034 media-libs/avidemux-core: Replace virtual/ffmpeg Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: David Seifert gentoo.org> .../{avidemux-core-2.7.3.ebuild => avidemux-core-2.7.3-r1.ebuild} | 4 ++-- .../{avidemux-core-2.7.4.ebuild => avidemux-core-2.7.4-r1.ebuild} | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/media-libs/avidemux-core/avidemux-core-2.7.3.ebuild b/media-libs/avidemux-core/avidemux-core-2.7.3-r1.ebuild similarity index 95% rename from media-libs/avidemux-core/avidemux-core-2.7.3.ebuild rename to media-libs/avidemux-core/avidemux-core-2.7.3-r1.ebuild index 1ed1591e1a5..1b987f4d1e1 100644 --- a/media-libs/avidemux-core/avidemux-core-2.7.3.ebuild +++ b/media-libs/avidemux-core/avidemux-core-2.7.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -21,7 +21,7 @@ IUSE="debug nls nvenc sdl system-ffmpeg vaapi vdpau xv" DEPEND="dev-db/sqlite:3 nvenc? ( media-video/nvidia_video_sdk ) sdl? ( media-libs/libsdl:0 ) - system-ffmpeg? ( >=virtual/ffmpeg-9:0[mp3,theora] ) + system-ffmpeg? ( >=media-video/ffmpeg-9:0[mp3,theora] ) vaapi? ( x11-libs/libva:0= ) vdpau? ( x11-libs/libvdpau:0 ) xv? ( x11-libs/libXv:0 ) diff --git a/media-libs/avidemux-core/avidemux-core-2.7.4.ebuild b/media-libs/avidemux-core/avidemux-core-2.7.4-r1.ebuild similarity index 95% rename from media-libs/avidemux-core/avidemux-core-2.7.4.ebuild rename to media-libs/avidemux-core/avidemux-core-2.7.4-r1.ebuild index 1143e35d737..631c18906fe 100644 --- a/media-libs/avidemux-core/avidemux-core-2.7.4.ebuild +++ b/media-libs/avidemux-core/avidemux-core-2.7.4-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -21,7 +21,7 @@ IUSE="debug nls nvenc sdl system-ffmpeg vaapi vdpau xv" DEPEND="dev-db/sqlite:3 nvenc? ( media-video/nvidia_video_sdk ) sdl? ( media-libs/libsdl:0 ) - system-ffmpeg? ( >=virtual/ffmpeg-9:0[mp3,theora] ) + system-ffmpeg? ( >=media-video/ffmpeg-9:0[mp3,theora] ) vaapi? ( x11-libs/libva:0= ) vdpau? ( x11-libs/libvdpau:0 ) xv? ( x11-libs/libXv:0 )
[gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-core/
commit: 6a14be60dab509d0a717c2e1b36293becb55fea7 Author: Stefan Strogin gentoo org> AuthorDate: Sun Aug 25 20:46:09 2019 + Commit: Stefan Strogin gentoo org> CommitDate: Sun Aug 25 20:50:55 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a14be60 media-libs/avidemux-core: drop old 2.7.0 Package-Manager: Portage-2.3.73, Repoman-2.3.17 Signed-off-by: Stefan Strogin gentoo.org> media-libs/avidemux-core/Manifest | 1 - .../avidemux-core/avidemux-core-2.7.0.ebuild | 99 -- 2 files changed, 100 deletions(-) diff --git a/media-libs/avidemux-core/Manifest b/media-libs/avidemux-core/Manifest index 4113f7cd25d..7d6012ce4fc 100644 --- a/media-libs/avidemux-core/Manifest +++ b/media-libs/avidemux-core/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-core/avidemux-core-2.7.0.ebuild b/media-libs/avidemux-core/avidemux-core-2.7.0.ebuild deleted file mode 100644 index d1169d3d75c..000 --- a/media-libs/avidemux-core/avidemux-core-2.7.0.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -if [[ ${PV} == ** ]] ; 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 -inherit cmake-utils - -DESCRIPTION="Core libraries for simple video 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.7" -IUSE="debug nls nvenc sdl system-ffmpeg vaapi vdpau xv" - -# Trying to use virtual; ffmpeg misses aac,cpudetection USE flags now though, are they needed? -COMMON_DEPEND=" - dev-db/sqlite:3 - nvenc? ( media-video/nvidia_video_sdk ) - sdl? ( media-libs/libsdl:0 ) - system-ffmpeg? ( >=virtual/ffmpeg-9:0[mp3,theora] ) - vaapi? ( x11-libs/libva:0= ) - vdpau? ( x11-libs/libvdpau:0 ) - xv? ( x11-libs/libXv:0 ) -" -RDEPEND="${COMMON_DEPEND} - !
[gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-core/
commit: 91dcea3172562b6c0d2e0194ab2f2b0d83033777 Author: Stefan Strogin gentoo org> AuthorDate: Sun Aug 25 20:18:10 2019 + Commit: Stefan Strogin gentoo org> CommitDate: Sun Aug 25 20:50:54 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91dcea31 media-libs/avidemux-core: bump version to 2.7.4 Package-Manager: Portage-2.3.73, Repoman-2.3.17 Signed-off-by: Stefan Strogin gentoo.org> media-libs/avidemux-core/Manifest | 1 + .../avidemux-core/avidemux-core-2.7.4.ebuild | 84 ++ 2 files changed, 85 insertions(+) diff --git a/media-libs/avidemux-core/Manifest b/media-libs/avidemux-core/Manifest index 7e55a202857..4113f7cd25d 100644 --- a/media-libs/avidemux-core/Manifest +++ b/media-libs/avidemux-core/Manifest @@ -1,2 +1,3 @@ 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-core/avidemux-core-2.7.4.ebuild b/media-libs/avidemux-core/avidemux-core-2.7.4.ebuild new file mode 100644 index 000..b47c3bc0164 --- /dev/null +++ b/media-libs/avidemux-core/avidemux-core-2.7.4.ebuild @@ -0,0 +1,84 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +CMAKE_MAKEFILE_GENERATOR="emake" + +inherit cmake-utils + +DESCRIPTION="Core libraries for simple video cutting, filtering and encoding tasks" +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" +KEYWORDS="~amd64 ~x86" +IUSE="debug nls nvenc sdl system-ffmpeg vaapi vdpau xv" + +# Trying to use virtual; ffmpeg misses aac,cpudetection USE flags now though, are they needed? +DEPEND="dev-db/sqlite:3 + nvenc? ( media-video/nvidia_video_sdk ) + sdl? ( media-libs/libsdl:0 ) + system-ffmpeg? ( >=virtual/ffmpeg-9:0[mp3,theora] ) + vaapi? ( x11-libs/libva:0= ) + vdpau? ( x11-libs/libvdpau:0 ) + xv? ( x11-libs/libXv:0 ) +" +RDEPEND="${DEPEND} + !
[gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-core/
commit: 60841897def5a15300ce3887adc351148e2cf1fb Author: Stefan Strogin gentoo org> AuthorDate: Wed Aug 14 04:13:38 2019 + Commit: Stefan Strogin gentoo org> CommitDate: Wed Aug 14 04:34:26 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60841897 media-libs/avidemux-core: fix bad tarball filename Package-Manager: Portage-2.3.71, Repoman-2.3.17 Signed-off-by: Stefan Strogin gentoo.org> media-libs/avidemux-core/Manifest | 2 +- media-libs/avidemux-core/avidemux-core-2.7.3.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/media-libs/avidemux-core/Manifest b/media-libs/avidemux-core/Manifest index e9ad4687cc9..7e55a202857 100644 --- a/media-libs/avidemux-core/Manifest +++ b/media-libs/avidemux-core/Manifest @@ -1,2 +1,2 @@ -DIST 2.7.3.tar.gz 23772654 BLAKE2B f946c267140bc8aebda2ce027ed8cb7c84a98a401255d3e0cdaf7498680e8bd9c78a33c122cb177d397ed2dd6bc3c29d7508578028c2964c2897279bf860b62d SHA512 d7761de1c40de1b824efbcf24173ea738a2e0ba7fa41cefa09e7bac3ec97f3af4b04201e36f9de50ade2b09e394aa99ed1d4907f90bb132f9896e8f1b5e82d7a +DIST avidemux-2.7.3.tar.gz 23772654 BLAKE2B f946c267140bc8aebda2ce027ed8cb7c84a98a401255d3e0cdaf7498680e8bd9c78a33c122cb177d397ed2dd6bc3c29d7508578028c2964c2897279bf860b62d SHA512 d7761de1c40de1b824efbcf24173ea738a2e0ba7fa41cefa09e7bac3ec97f3af4b04201e36f9de50ade2b09e394aa99ed1d4907f90bb132f9896e8f1b5e82d7a DIST avidemux_2.7.0.tar.gz 21474504 BLAKE2B c6e55a0b5220d6d3746fa06162bf11253145fd28f2f6f744702d5e0342fba85e546a28883eb847139eadd34c94037ebc7d68f5576e7505a85288556468d14b96 SHA512 7c92213d3bd2849dbdb5a1aff2acd6da231fd76c561b756fbf4a1d5a41e9705d609d7a35b6ca6b77ceb3bf5138f861cd24ed16d8fcec4fd713f09a2ff07e9015 diff --git a/media-libs/avidemux-core/avidemux-core-2.7.3.ebuild b/media-libs/avidemux-core/avidemux-core-2.7.3.ebuild index f8fec3c0f4e..5f88c831da3 100644 --- a/media-libs/avidemux-core/avidemux-core-2.7.3.ebuild +++ b/media-libs/avidemux-core/avidemux-core-2.7.3.ebuild @@ -9,7 +9,7 @@ inherit cmake-utils DESCRIPTION="Core libraries for simple video cutting, filtering and encoding tasks" HOMEPAGE="http://fixounet.free.fr/avidemux"; -SRC_URI="https://github.com/mean00/avidemux2/archive/${PV}.tar.gz"; +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"
[gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-core/files/, media-libs/avidemux-core/
commit: cb6a366cc2dc907d197cfe9e2f454dea6530e545 Author: Stefan Strogin gentoo org> AuthorDate: Tue Aug 13 19:26:13 2019 + Commit: Stefan Strogin gentoo org> CommitDate: Wed Aug 14 01:59:52 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb6a366c media-libs/avidemux-core: bump version to 2.7.3 - EAPI=7. - Add patch to fix libraries permissions. Bug: https://bugs.gentoo.org/657386 Package-Manager: Portage-2.3.71, Repoman-2.3.17 Signed-off-by: Stefan Strogin gentoo.org> media-libs/avidemux-core/Manifest | 1 + .../avidemux-core/avidemux-core-2.7.3.ebuild | 88 ++ .../files/avidemux-core-2.7.3-permissions.patch| 28 +++ media-libs/avidemux-core/metadata.xml | 2 +- 4 files changed, 118 insertions(+), 1 deletion(-) diff --git a/media-libs/avidemux-core/Manifest b/media-libs/avidemux-core/Manifest index 281d961cf75..e9ad4687cc9 100644 --- a/media-libs/avidemux-core/Manifest +++ b/media-libs/avidemux-core/Manifest @@ -1 +1,2 @@ +DIST 2.7.3.tar.gz 23772654 BLAKE2B f946c267140bc8aebda2ce027ed8cb7c84a98a401255d3e0cdaf7498680e8bd9c78a33c122cb177d397ed2dd6bc3c29d7508578028c2964c2897279bf860b62d SHA512 d7761de1c40de1b824efbcf24173ea738a2e0ba7fa41cefa09e7bac3ec97f3af4b04201e36f9de50ade2b09e394aa99ed1d4907f90bb132f9896e8f1b5e82d7a DIST avidemux_2.7.0.tar.gz 21474504 BLAKE2B c6e55a0b5220d6d3746fa06162bf11253145fd28f2f6f744702d5e0342fba85e546a28883eb847139eadd34c94037ebc7d68f5576e7505a85288556468d14b96 SHA512 7c92213d3bd2849dbdb5a1aff2acd6da231fd76c561b756fbf4a1d5a41e9705d609d7a35b6ca6b77ceb3bf5138f861cd24ed16d8fcec4fd713f09a2ff07e9015 diff --git a/media-libs/avidemux-core/avidemux-core-2.7.3.ebuild b/media-libs/avidemux-core/avidemux-core-2.7.3.ebuild new file mode 100644 index 000..f8fec3c0f4e --- /dev/null +++ b/media-libs/avidemux-core/avidemux-core-2.7.3.ebuild @@ -0,0 +1,88 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +CMAKE_MAKEFILE_GENERATOR="emake" + +inherit cmake-utils + +DESCRIPTION="Core libraries for simple video cutting, filtering and encoding tasks" +HOMEPAGE="http://fixounet.free.fr/avidemux"; +SRC_URI="https://github.com/mean00/avidemux2/archive/${PV}.tar.gz"; + +# Multiple licenses because of all the bundled stuff. +LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain" +SLOT="2.7" +KEYWORDS="~amd64 ~x86" +IUSE="debug nls nvenc sdl system-ffmpeg vaapi vdpau xv" + +# Trying to use virtual; ffmpeg misses aac,cpudetection USE flags now though, are they needed? +DEPEND="dev-db/sqlite:3 + nvenc? ( media-video/nvidia_video_sdk ) + sdl? ( media-libs/libsdl:0 ) + system-ffmpeg? ( >=virtual/ffmpeg-9:0[mp3,theora] ) + vaapi? ( x11-libs/libva:0= ) + vdpau? ( x11-libs/libvdpau:0 ) + xv? ( x11-libs/libXv:0 ) +" +RDEPEND="${DEPEND} + ! +Date: Wed, 14 Aug 2019 03:35:01 +0300 +Subject: [PATCH] [cmake] Fix library permissions + +Upstream-Status: Submitted +[https://github.com/mean00/avidemux2/pull/179] +Signed-off-by: Stefan Strogin +--- + cmake/admInstallDir.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cmake/admInstallDir.cmake b/cmake/admInstallDir.cmake +index ab16f283d..5af762626 100644 +--- a/cmake/admInstallDir.cmake b/cmake/admInstallDir.cmake +@@ -55,7 +55,7 @@ ENDMACRO(ADM_INSTALL_LIB ) + MACRO (ADM_INSTALL_LIB_FILES files) + INSTALL(FILES ${files} + DESTINATION ${AVIDEMUX_LIB_DIR} +-PERMISSIONS WORLD_READ WORLD_EXECUTE OWNER_WRITE OWNER_READ OWNER_EXECUTE ++PERMISSIONS WORLD_READ WORLD_EXECUTE GROUP_READ GROUP_EXECUTE OWNER_WRITE OWNER_READ OWNER_EXECUTE + COMPONENT runtime + ) + ENDMACRO (ADM_INSTALL_LIB_FILES) +-- +2.22.0 + diff --git a/media-libs/avidemux-core/metadata.xml b/media-libs/avidemux-core/metadata.xml index efad95d3100..1f4fd12a3a7 100644 --- a/media-libs/avidemux-core/metadata.xml +++ b/media-libs/avidemux-core/metadata.xml @@ -10,6 +10,6 @@ Use the ffmpeg provided by the system. -avidemux +mean00/avidemux2
[gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-core/
commit: a8d947695fd76ec9d8a9a0d7b2a41ae0dfdac285 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Jul 6 09:07:21 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Jul 6 10:22:48 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8d94769 media-libs/avidemux-core: No one is maintaining this, drop Bug: https://bugs.gentoo.org/689342 Package-Manager: Portage-2.3.68, Repoman-2.3.16 Signed-off-by: Andreas Sturmlechner gentoo.org> media-libs/avidemux-core/avidemux-core-.ebuild | 99 -- 1 file changed, 99 deletions(-) diff --git a/media-libs/avidemux-core/avidemux-core-.ebuild b/media-libs/avidemux-core/avidemux-core-.ebuild deleted file mode 100644 index d1169d3d75c..000 --- a/media-libs/avidemux-core/avidemux-core-.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -if [[ ${PV} == ** ]] ; 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 -inherit cmake-utils - -DESCRIPTION="Core libraries for simple video 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.7" -IUSE="debug nls nvenc sdl system-ffmpeg vaapi vdpau xv" - -# Trying to use virtual; ffmpeg misses aac,cpudetection USE flags now though, are they needed? -COMMON_DEPEND=" - dev-db/sqlite:3 - nvenc? ( media-video/nvidia_video_sdk ) - sdl? ( media-libs/libsdl:0 ) - system-ffmpeg? ( >=virtual/ffmpeg-9:0[mp3,theora] ) - vaapi? ( x11-libs/libva:0= ) - vdpau? ( x11-libs/libvdpau:0 ) - xv? ( x11-libs/libXv:0 ) -" -RDEPEND="${COMMON_DEPEND} - !
[gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-core/files/, media-libs/avidemux-core/
commit: 8233a5b744d1ecda160cc671ff5b4e04d16d6bae Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Jul 6 09:10:42 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Jul 6 10:22:49 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8233a5b7 media-libs/avidemux-core: Drop 2.6.20-r2 Package-Manager: Portage-2.3.68, Repoman-2.3.16 Signed-off-by: Andreas Sturmlechner gentoo.org> media-libs/avidemux-core/Manifest | 1 - .../avidemux-core/avidemux-core-2.6.20-r2.ebuild | 101 - .../files/avidemux-core-2.6.20-fix-cmake.patch | 18 3 files changed, 120 deletions(-) diff --git a/media-libs/avidemux-core/Manifest b/media-libs/avidemux-core/Manifest index c86d53e23df..281d961cf75 100644 --- a/media-libs/avidemux-core/Manifest +++ b/media-libs/avidemux-core/Manifest @@ -1,2 +1 @@ -DIST avidemux_2.6.20.tar.gz 20172362 BLAKE2B d458749e470e60b133a177ddf97ee04a665da3f7b2c52e8cc51f907aa5b51d11338ddab9306603b615170b5cf75ec2d3444bd648756bdb724aa442abf7044553 SHA512 d01d0fc24a3004770bd3923c2debc4fa2752eb71df08cfe423746b9c44a2562ca01d82965ed2563b99572a4bed8034b79487199ce330208b51a3b7f87ccf7103 DIST avidemux_2.7.0.tar.gz 21474504 BLAKE2B c6e55a0b5220d6d3746fa06162bf11253145fd28f2f6f744702d5e0342fba85e546a28883eb847139eadd34c94037ebc7d68f5576e7505a85288556468d14b96 SHA512 7c92213d3bd2849dbdb5a1aff2acd6da231fd76c561b756fbf4a1d5a41e9705d609d7a35b6ca6b77ceb3bf5138f861cd24ed16d8fcec4fd713f09a2ff07e9015 diff --git a/media-libs/avidemux-core/avidemux-core-2.6.20-r2.ebuild b/media-libs/avidemux-core/avidemux-core-2.6.20-r2.ebuild deleted file mode 100644 index 1fad3f21b9f..000 --- a/media-libs/avidemux-core/avidemux-core-2.6.20-r2.ebuild +++ /dev/null @@ -1,101 +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 xv" - -if [[ ${PV} == ** ]] ; 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 ) -" -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/-/_}" - -PATCHES=("${FILESDIR}"/${P}-fix-cmake.patch ) - -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}" - 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)" - -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/files/avidemux-core-2.6.20-fix-cmake.patch b/media-libs/avidemux-core/files/avidemux-core-2.6.20-fix-cmake.patch deleted file mode 100644 index d7df42d31b5..00
[gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-core/
commit: c253f112ec169460f0f7a9c51becedbe3bfdc0f0 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Jan 9 16:36:00 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Jan 9 17:28:57 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c253f112 media-libs/avidemux-core: 2.7.0 version bump Add x11-libs/libva slot operator. Closes: https://bugs.gentoo.org/641636 Package-Manager: Portage-2.3.19, Repoman-2.3.6 media-libs/avidemux-core/Manifest | 1 + .../{avidemux-core-.ebuild => avidemux-core-2.7.0.ebuild} | 4 ++-- media-libs/avidemux-core/avidemux-core-.ebuild| 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/media-libs/avidemux-core/Manifest b/media-libs/avidemux-core/Manifest index ae61dc9d907..c86d53e23df 100644 --- a/media-libs/avidemux-core/Manifest +++ b/media-libs/avidemux-core/Manifest @@ -1 +1,2 @@ DIST avidemux_2.6.20.tar.gz 20172362 BLAKE2B d458749e470e60b133a177ddf97ee04a665da3f7b2c52e8cc51f907aa5b51d11338ddab9306603b615170b5cf75ec2d3444bd648756bdb724aa442abf7044553 SHA512 d01d0fc24a3004770bd3923c2debc4fa2752eb71df08cfe423746b9c44a2562ca01d82965ed2563b99572a4bed8034b79487199ce330208b51a3b7f87ccf7103 +DIST avidemux_2.7.0.tar.gz 21474504 BLAKE2B c6e55a0b5220d6d3746fa06162bf11253145fd28f2f6f744702d5e0342fba85e546a28883eb847139eadd34c94037ebc7d68f5576e7505a85288556468d14b96 SHA512 7c92213d3bd2849dbdb5a1aff2acd6da231fd76c561b756fbf4a1d5a41e9705d609d7a35b6ca6b77ceb3bf5138f861cd24ed16d8fcec4fd713f09a2ff07e9015 diff --git a/media-libs/avidemux-core/avidemux-core-.ebuild b/media-libs/avidemux-core/avidemux-core-2.7.0.ebuild similarity index 98% copy from media-libs/avidemux-core/avidemux-core-.ebuild copy to media-libs/avidemux-core/avidemux-core-2.7.0.ebuild index b99cdefa450..92f9f8ec068 100644 --- a/media-libs/avidemux-core/avidemux-core-.ebuild +++ b/media-libs/avidemux-core/avidemux-core-2.7.0.ebuild @@ -20,7 +20,7 @@ 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" +SLOT="2.7" IUSE="debug nls nvenc sdl system-ffmpeg vaapi vdpau xv" # Trying to use virtual; ffmpeg misses aac,cpudetection USE flags now though, are they needed? @@ -29,7 +29,7 @@ COMMON_DEPEND=" nvenc? ( media-video/nvidia_video_sdk ) sdl? ( media-libs/libsdl:0 ) system-ffmpeg? ( >=virtual/ffmpeg-9:0[mp3,theora] ) - vaapi? ( x11-libs/libva:0 ) + vaapi? ( x11-libs/libva:0= ) vdpau? ( x11-libs/libvdpau:0 ) xv? ( x11-libs/libXv:0 ) " diff --git a/media-libs/avidemux-core/avidemux-core-.ebuild b/media-libs/avidemux-core/avidemux-core-.ebuild index b99cdefa450..92f9f8ec068 100644 --- a/media-libs/avidemux-core/avidemux-core-.ebuild +++ b/media-libs/avidemux-core/avidemux-core-.ebuild @@ -20,7 +20,7 @@ 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" +SLOT="2.7" IUSE="debug nls nvenc sdl system-ffmpeg vaapi vdpau xv" # Trying to use virtual; ffmpeg misses aac,cpudetection USE flags now though, are they needed? @@ -29,7 +29,7 @@ COMMON_DEPEND=" nvenc? ( media-video/nvidia_video_sdk ) sdl? ( media-libs/libsdl:0 ) system-ffmpeg? ( >=virtual/ffmpeg-9:0[mp3,theora] ) - vaapi? ( x11-libs/libva:0 ) + vaapi? ( x11-libs/libva:0= ) vdpau? ( x11-libs/libvdpau:0 ) xv? ( x11-libs/libXv:0 ) "
[gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-core/
commit: d4c7e46a79cb8e529a2512e22852a0750392c595 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Jan 7 23:06:56 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Jan 9 17:28:07 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4c7e46a media-libs/avidemux-core: Sorting, fix DESCRIPTION Package-Manager: Portage-2.3.19, Repoman-2.3.6 media-libs/avidemux-core/avidemux-core-.ebuild | 39 +++--- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/media-libs/avidemux-core/avidemux-core-.ebuild b/media-libs/avidemux-core/avidemux-core-.ebuild index 6d3d4eb7d5f..b99cdefa450 100644 --- a/media-libs/avidemux-core/avidemux-core-.ebuild +++ b/media-libs/avidemux-core/avidemux-core-.ebuild @@ -1,22 +1,11 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 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 xv" - if [[ ${PV} == ** ]] ; then EGIT_REPO_URI="https://github.com/mean00/avidemux2.git"; EGIT_CHECKOUT_DIR=${WORKDIR} - inherit git-r3 else MY_PN="${PN/-core/}" @@ -24,6 +13,15 @@ else SRC_URI="mirror://sourceforge/${MY_PN}/${MY_PN}/${PV}/${MY_P}.tar.gz" KEYWORDS="~amd64 ~x86" fi +inherit cmake-utils + +DESCRIPTION="Core libraries for simple video 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 xv" # Trying to use virtual; ffmpeg misses aac,cpudetection USE flags now though, are they needed? COMMON_DEPEND=" @@ -52,13 +50,16 @@ 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}" + # Preparations to support the system ffmpeg. Currently fails because + # it depends on files the system ffmpeg doesn't install. + local error="Failed to remove bundled ffmpeg." + + rm -r cmake/admFFmpeg* cmake/ffmpeg* avidemux_core/ffmpeg_package \ + buildCore/ffmpeg || die "${error}" + sed -e 's/include(admFFmpegUtil)//g' -e '/registerFFmpeg/d' \ + -i avidemux/commonCmakeApplication.cmake || die "${error}" + sed -e 's/include(admFFmpegBuild)//g' \ + -i avidemux_core/CMakeLists.txt || die "${error}" fi }
[gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-core/
commit: 299c8310d117049c68b636fbd21d4e9340995d11 Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Dec 8 17:38:16 2017 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Dec 8 18:30:40 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=299c8310 media-libs/avidemux-core: Sort and fix DEPENDs Package-Manager: Portage-2.3.17, Repoman-2.3.6 media-libs/avidemux-core/avidemux-core-.ebuild | 18 -- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/media-libs/avidemux-core/avidemux-core-.ebuild b/media-libs/avidemux-core/avidemux-core-.ebuild index 9b4fbca2cef..6d3d4eb7d5f 100644 --- a/media-libs/avidemux-core/avidemux-core-.ebuild +++ b/media-libs/avidemux-core/avidemux-core-.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=6 inherit cmake-utils @@ -26,22 +26,20 @@ else fi # Trying to use virtual; ffmpeg misses aac,cpudetection USE flags now though, are they needed? -DEPEND=" - !
[gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-core/
commit: ef4acc928833734f894dff8713ca92e3bdeee100 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Oct 28 23:01:34 2017 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Oct 29 09:34:21 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef4acc92 media-libs/avidemux-core: Drop 2.6.20 (r0) Package-Manager: Portage-2.3.13, Repoman-2.3.4 .../avidemux-core/avidemux-core-2.6.20.ebuild | 108 - 1 file changed, 108 deletions(-) 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 3a7af781cc1..000 --- 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} == ** ]] ; 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 -}
[gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-core/files/, media-libs/avidemux-core/
commit: a5d748fe480198bbef91213212d99fa36c4d0c08 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Oct 28 22:58:26 2017 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Oct 29 09:34:20 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5d748fe media-libs/avidemux-core: Drop 2.6.8 Package-Manager: Portage-2.3.13, Repoman-2.3.4 media-libs/avidemux-core/Manifest | 1 - .../avidemux-core/avidemux-core-2.6.8.ebuild | 111 - .../files/avidemux-core-2.6.8-gcc6.patch | 50 -- 3 files changed, 162 deletions(-) diff --git a/media-libs/avidemux-core/Manifest b/media-libs/avidemux-core/Manifest index 6f017f59f92..4bf6be8c5b5 100644 --- a/media-libs/avidemux-core/Manifest +++ b/media-libs/avidemux-core/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-core/avidemux-core-2.6.8.ebuild b/media-libs/avidemux-core/avidemux-core-2.6.8.ebuild deleted file mode 100644 index c47717b8c3d..000 --- 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} == ** ]] ; 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 GETTE
[gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-core/
commit: 358d2b6e9d337e814e8027796e37f60947f34218 Author: Peter Levine gmail com> AuthorDate: Sat Oct 7 21:39:00 2017 + Commit: Alexis Ballier gentoo org> CommitDate: Sun Oct 8 10:24:02 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=358d2b6e media-libs/avidemux-core: Revbump needed for PR-5835 Bug: https://bugs.gentoo.org/625930 Package-Manager: Portage-2.3.10, Repoman-2.3.3 .../{avidemux-core-2.6.20-r1.ebuild => avidemux-core-2.6.20-r2.ebuild}| 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/media-libs/avidemux-core/avidemux-core-2.6.20-r1.ebuild b/media-libs/avidemux-core/avidemux-core-2.6.20-r2.ebuild similarity index 100% rename from media-libs/avidemux-core/avidemux-core-2.6.20-r1.ebuild rename to media-libs/avidemux-core/avidemux-core-2.6.20-r2.ebuild
[gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-core/, media-libs/avidemux-core/files/
commit: fff114915bdd5c1de5c27bc0e07e9790c53f3285 Author: Peter Levine gmail com> AuthorDate: Sun Oct 1 06:10:33 2017 + Commit: Alexis Ballier gentoo org> CommitDate: Wed Oct 4 08:01:42 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fff11491 media-libs/avidemux-core: Fix building avidemux-plugins with >=cmake-3.9.0 Bug: https://bugs.gentoo.org/625930 Package-Manager: Portage-2.3.10, Repoman-2.3.3 .../avidemux-core/avidemux-core-2.6.20-r1.ebuild | 2 ++ .../files/avidemux-core-2.6.20-fix-cmake.patch | 18 ++ 2 files changed, 20 insertions(+) diff --git a/media-libs/avidemux-core/avidemux-core-2.6.20-r1.ebuild b/media-libs/avidemux-core/avidemux-core-2.6.20-r1.ebuild index 16e22ff152f..64d78546cff 100644 --- a/media-libs/avidemux-core/avidemux-core-2.6.20-r1.ebuild +++ b/media-libs/avidemux-core/avidemux-core-2.6.20-r1.ebuild @@ -54,6 +54,8 @@ DEPEND=" S="${WORKDIR}/${MY_P}" CMAKE_USE_DIR="${S}/${PN/-/_}" +PATCHES=("${FILESDIR}"/${P}-fix-cmake.patch ) + src_prepare() { cmake-utils_src_prepare diff --git a/media-libs/avidemux-core/files/avidemux-core-2.6.20-fix-cmake.patch b/media-libs/avidemux-core/files/avidemux-core-2.6.20-fix-cmake.patch new file mode 100644 index 000..d7df42d31b5 --- /dev/null +++ b/media-libs/avidemux-core/files/avidemux-core-2.6.20-fix-cmake.patch @@ -0,0 +1,18 @@ +Bug: https://bugs.gentoo.org/625930 +Backported from https://github.com/mean00/avidemux2/commit/c5edc6cf7b3768ac1409c6cef69ab5980a86596a + +diff -Naur a/cmake/admCheckX264.cmake b/cmake/admCheckX264.cmake +--- a/cmake/admCheckX264.cmake 2017-04-28 05:22:27.0 -0400 b/cmake/admCheckX264.cmake 2017-10-01 01:38:33.249996381 -0400 +@@ -20,9 +20,9 @@ + ELSE (x264_version LESS 67) + IF (x264_version GREATER 73) + FIND_HEADER_AND_LIB(X264 x264.h x264 x264_encoder_open_${x264_version}) ++ELSE (x264_version GREATER 73) ++ FIND_HEADER_AND_LIB(X264 x264.h x264 x264_encoder_open) + ENDIF (x264_version GREATER 73) +- ELSE (x264_version LESS 67) +- FIND_HEADER_AND_LIB(X264 x264.h x264 x264_encoder_open) + ENDIF (x264_version LESS 67) + IF(X264_FOUND) + SET(USE_X264 True CACHE BOOL "")
[gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-core/
commit: 4f43b26cd4c4eb0414ad67ab25f976201b1165e8 Author: Peter Levine gmail com> AuthorDate: Sun Oct 1 08:38:08 2017 + Commit: Alexis Ballier gentoo org> CommitDate: Wed Oct 4 08:01:42 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f43b26c media-libs/avidemux-core: Remove support for x11-drivers/ati-drivers Package-Manager: Portage-2.3.10, Repoman-2.3.3 media-libs/avidemux-core/avidemux-core-2.6.20-r1.ebuild | 7 +-- media-libs/avidemux-core/avidemux-core-.ebuild | 7 +-- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/media-libs/avidemux-core/avidemux-core-2.6.20-r1.ebuild b/media-libs/avidemux-core/avidemux-core-2.6.20-r1.ebuild index 64d78546cff..1fad3f21b9f 100644 --- a/media-libs/avidemux-core/avidemux-core-2.6.20-r1.ebuild +++ b/media-libs/avidemux-core/avidemux-core-2.6.20-r1.ebuild @@ -11,7 +11,7 @@ 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" +IUSE="debug nls nvenc sdl system-ffmpeg vaapi vdpau xv" if [[ ${PV} == ** ]] ; then EGIT_REPO_URI="https://github.com/mean00/avidemux2.git"; @@ -35,10 +35,6 @@ DEPEND=" 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 @@ -85,7 +81,6 @@ src_configure() { -DSDL="$(usex sdl)" -DLIBVA="$(usex vaapi)" -DVDPAU="$(usex vdpau)" - -DXVBA="$(usex video_cards_fglrx)" -DXVIDEO="$(usex xv)" -DNVENC="$(usex nvenc)" ) diff --git a/media-libs/avidemux-core/avidemux-core-.ebuild b/media-libs/avidemux-core/avidemux-core-.ebuild index 16e22ff152f..9b4fbca2cef 100644 --- a/media-libs/avidemux-core/avidemux-core-.ebuild +++ b/media-libs/avidemux-core/avidemux-core-.ebuild @@ -11,7 +11,7 @@ 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" +IUSE="debug nls nvenc sdl system-ffmpeg vaapi vdpau xv" if [[ ${PV} == ** ]] ; then EGIT_REPO_URI="https://github.com/mean00/avidemux2.git"; @@ -35,10 +35,6 @@ DEPEND=" 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 @@ -83,7 +79,6 @@ src_configure() { -DSDL="$(usex sdl)" -DLIBVA="$(usex vaapi)" -DVDPAU="$(usex vdpau)" - -DXVBA="$(usex video_cards_fglrx)" -DXVIDEO="$(usex xv)" -DNVENC="$(usex nvenc)" )
[gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-core/
commit: 5f54c512e72cd0a101fbe1b90feaed4f47e6c013 Author: Peter Levine gmail com> AuthorDate: Sat Jun 24 05:39:30 2017 + Commit: Alexis Ballier gentoo org> CommitDate: Fri Jun 30 05:22:04 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f54c512 media-libs/avidemux-core: Undo changes from bug #461496 Undo the hardcoding of the build path in an installable cmake module. Causes failure in the configure phase of media-video/avidemux-2.6.20 and doesn't appear to be neccesary anymore. Revbump avidemux-core-2.6.20. Package-Manager: Portage-2.3.6, Repoman-2.3.2 .../{avidemux-core-.ebuild => avidemux-core-2.6.20-r1.ebuild} | 4 media-libs/avidemux-core/avidemux-core-.ebuild| 4 2 files changed, 8 deletions(-) diff --git a/media-libs/avidemux-core/avidemux-core-.ebuild b/media-libs/avidemux-core/avidemux-core-2.6.20-r1.ebuild similarity index 89% copy from media-libs/avidemux-core/avidemux-core-.ebuild copy to media-libs/avidemux-core/avidemux-core-2.6.20-r1.ebuild index 3a7af781cc1..16e22ff152f 100644 --- a/media-libs/avidemux-core/avidemux-core-.ebuild +++ b/media-libs/avidemux-core/avidemux-core-2.6.20-r1.ebuild @@ -65,10 +65,6 @@ src_prepare() { 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 } diff --git a/media-libs/avidemux-core/avidemux-core-.ebuild b/media-libs/avidemux-core/avidemux-core-.ebuild index 3a7af781cc1..16e22ff152f 100644 --- a/media-libs/avidemux-core/avidemux-core-.ebuild +++ b/media-libs/avidemux-core/avidemux-core-.ebuild @@ -65,10 +65,6 @@ src_prepare() { 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 }
[gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-core/
commit: 15d683f464769a7be6172c6ca7412b40b77c68e6 Author: Peter Levine gmail com> AuthorDate: Sat Jun 24 04:57:33 2017 + Commit: Alexis Ballier gentoo org> CommitDate: Fri Jun 30 05:22:03 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15d683f4 media-libs/avidemux-core: nvenc use flag requires media-video/nvidia_video_sdk Package-Manager: Portage-2.3.6, Repoman-2.3.2 media-libs/avidemux-core/avidemux-core-2.6.20.ebuild | 1 + media-libs/avidemux-core/avidemux-core-.ebuild | 1 + 2 files changed, 2 insertions(+) diff --git a/media-libs/avidemux-core/avidemux-core-2.6.20.ebuild b/media-libs/avidemux-core/avidemux-core-2.6.20.ebuild index e09688e05bf..3a7af781cc1 100644 --- a/media-libs/avidemux-core/avidemux-core-2.6.20.ebuild +++ b/media-libs/avidemux-core/avidemux-core-2.6.20.ebuild @@ -34,6 +34,7 @@ DEPEND=" 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 ) diff --git a/media-libs/avidemux-core/avidemux-core-.ebuild b/media-libs/avidemux-core/avidemux-core-.ebuild index e09688e05bf..3a7af781cc1 100644 --- a/media-libs/avidemux-core/avidemux-core-.ebuild +++ b/media-libs/avidemux-core/avidemux-core-.ebuild @@ -34,6 +34,7 @@ DEPEND=" 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 )
[gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-core/
commit: 22d22cfbd076474406f5068ac6c79da78336395a Author: Peter Levine gmail com> AuthorDate: Fri Jun 2 02:45:59 2017 + Commit: Alexis Ballier gentoo org> CommitDate: Fri Jun 23 05:35:35 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22d22cfb media-libs/avidemux-core: Declare 'mycmakeargs' as an array Package-Manager: Portage-2.3.6, Repoman-2.3.2 media-libs/avidemux-core/avidemux-core-2.6.8.ebuild | 6 +++--- media-libs/avidemux-core/avidemux-core-.ebuild | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/media-libs/avidemux-core/avidemux-core-2.6.8.ebuild b/media-libs/avidemux-core/avidemux-core-2.6.8.ebuild index 7f039651d76..c47717b8c3d 100644 --- a/media-libs/avidemux-core/avidemux-core-2.6.8.ebuild +++ b/media-libs/avidemux-core/avidemux-core-2.6.8.ebuild @@ -85,7 +85,7 @@ src_prepare() { } src_configure() { - local mycmakeargs=" + local mycmakeargs=( -DAVIDEMUX_SOURCE_DIR='${S}' $(cmake-utils_use nls GETTEXT) $(cmake-utils_use sdl SDL) @@ -93,10 +93,10 @@ src_configure() { $(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" + mycmakeargs+=( -DVERBOSE=1 -DCMAKE_BUILD_TYPE=Debug -DADM_DEBUG=1 ) fi CMAKE_USE_DIR="${S}"/avidemux_core cmake-utils_src_configure diff --git a/media-libs/avidemux-core/avidemux-core-.ebuild b/media-libs/avidemux-core/avidemux-core-.ebuild index ce548ea31ba..420ac6ab9db 100644 --- a/media-libs/avidemux-core/avidemux-core-.ebuild +++ b/media-libs/avidemux-core/avidemux-core-.ebuild @@ -85,7 +85,7 @@ src_prepare() { } src_configure() { - local mycmakeargs=" + local mycmakeargs=( -DAVIDEMUX_SOURCE_DIR='${S}' $(cmake-utils_use nls GETTEXT) $(cmake-utils_use sdl SDL) @@ -93,10 +93,10 @@ src_configure() { $(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" + mycmakeargs+=( -DVERBOSE=1 -DCMAKE_BUILD_TYPE=Debug -DADM_DEBUG=1 ) fi CMAKE_USE_DIR="${S}"/avidemux_core cmake-utils_src_configure
[gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-core/files/, media-libs/avidemux-core/
commit: 0b9deda9488d7ea978a43f5cf3d49c4319468af6 Author: Peter Levine gmail com> AuthorDate: Mon May 29 03:38:43 2017 + Commit: Alexis Ballier gentoo org> CommitDate: Fri Jun 23 05:35:34 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b9deda9 media-libs/avidemux-core: Fix building with GCC-6 Bug: https://bugs.gentoo.org/show_bug.cgi?id=594902 Package-Manager: Portage-2.3.6, Repoman-2.3.2 .../avidemux-core/avidemux-core-2.6.8.ebuild | 3 +- .../files/avidemux-core-2.6.8-gcc6.patch | 50 ++ 2 files changed, 52 insertions(+), 1 deletion(-) diff --git a/media-libs/avidemux-core/avidemux-core-2.6.8.ebuild b/media-libs/avidemux-core/avidemux-core-2.6.8.ebuild index 713066eac7f..f7dde42a475 100644 --- a/media-libs/avidemux-core/avidemux-core-2.6.8.ebuild +++ b/media-libs/avidemux-core/avidemux-core-2.6.8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -53,6 +53,7 @@ DEPEND=" S="${WORKDIR}/${MY_P}" BUILD_DIR="${S}/buildCore" +PATCHES=( "${FILESDIR}"/${P}-gcc6.patch ) DOCS=( AUTHORS README ) src_prepare() { 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 new file mode 100644 index 000..dbdf8ff93a8 --- /dev/null +++ b/media-libs/avidemux-core/files/avidemux-core-2.6.8-gcc6.patch @@ -0,0 +1,50 @@ +--- 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; +- floatmin; +- floatmax; ++ doublemin; ++ doublemax; + }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); \ + } \ + } +
[gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-core/
commit: b33b8402e02ad3d4e0a92ef77e4105e11a1c79cb Author: Peter Levine gmail com> AuthorDate: Fri Jun 2 04:41:16 2017 + Commit: Alexis Ballier gentoo org> CommitDate: Fri Jun 23 05:35:35 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b33b8402 media-libs/avidemux-core: Add avidemux-core-2.6.20 Upgrade avidemux-core- to EAPI 6 and add an ebuild for avidemux-core-2.6.20. Package-Manager: Portage-2.3.6, Repoman-2.3.2 media-libs/avidemux-core/Manifest | 1 + ...ore-.ebuild => avidemux-core-2.6.20.ebuild} | 45 ++ media-libs/avidemux-core/avidemux-core-.ebuild | 45 ++ 3 files changed, 41 insertions(+), 50 deletions(-) diff --git a/media-libs/avidemux-core/Manifest b/media-libs/avidemux-core/Manifest index 418a7523584..6f017f59f92 100644 --- a/media-libs/avidemux-core/Manifest +++ b/media-libs/avidemux-core/Manifest @@ -1 +1,2 @@ +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-core/avidemux-core-.ebuild b/media-libs/avidemux-core/avidemux-core-2.6.20.ebuild similarity index 78% copy from media-libs/avidemux-core/avidemux-core-.ebuild copy to media-libs/avidemux-core/avidemux-core-2.6.20.ebuild index 3a659ab182e..e09688e05bf 100644 --- a/media-libs/avidemux-core/avidemux-core-.ebuild +++ b/media-libs/avidemux-core/avidemux-core-2.6.20.ebuild @@ -1,29 +1,28 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI="6" -inherit cmake-utils eutils flag-o-matic - -SLOT="2.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" -KEYWORDS="~amd64 ~x86" -MY_PN="${PN/-core/}" if [[ ${PV} == ** ]] ; then - KEYWORDS="" EGIT_REPO_URI="https://github.com/mean00/avidemux2.git"; + EGIT_CHECKOUT_DIR=${WORKDIR} - inherit git-2 + 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? @@ -52,13 +51,9 @@ DEPEND=" " S="${WORKDIR}/${MY_P}" -BUILD_DIR="${S}/buildCore" - -DOCS=( AUTHORS README ) +CMAKE_USE_DIR="${S}/${PN/-/_}" src_prepare() { - mkdir "${BUILD_DIR}" || die "Can't create build folder." - cmake-utils_src_prepare if use system-ffmpeg ; then @@ -71,10 +66,12 @@ src_prepare() { 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 \ + 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 @@ -82,25 +79,23 @@ src_prepare() { # 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) - $(cmake-utils_use nvenc NVENC) + -DGETTEXT="$(usex nls)" +
[gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-core/
commit: 9c931322fcf42e5aea876defa760a82cef7afeb2 Author: Peter Levine gmail com> AuthorDate: Fri Jun 2 02:18:34 2017 + Commit: Alexis Ballier gentoo org> CommitDate: Fri Jun 23 05:35:34 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c931322 media-libs/avidemux-core: Update EGIT_REPO_URI to GitHub Gitorious is dead. The project appears to have moved to GitHub. Package-Manager: Portage-2.3.6, Repoman-2.3.2 media-libs/avidemux-core/avidemux-core-2.6.8.ebuild | 2 +- media-libs/avidemux-core/avidemux-core-.ebuild | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/media-libs/avidemux-core/avidemux-core-2.6.8.ebuild b/media-libs/avidemux-core/avidemux-core-2.6.8.ebuild index f7dde42a475..7f039651d76 100644 --- a/media-libs/avidemux-core/avidemux-core-2.6.8.ebuild +++ b/media-libs/avidemux-core/avidemux-core-2.6.8.ebuild @@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~x86" MY_PN="${PN/-core/}" if [[ ${PV} == ** ]] ; 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"; + EGIT_REPO_URI="https://github.com/mean00/avidemux2.git"; inherit git-2 else diff --git a/media-libs/avidemux-core/avidemux-core-.ebuild b/media-libs/avidemux-core/avidemux-core-.ebuild index 914e5acbb15..ce548ea31ba 100644 --- a/media-libs/avidemux-core/avidemux-core-.ebuild +++ b/media-libs/avidemux-core/avidemux-core-.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~x86" MY_PN="${PN/-core/}" if [[ ${PV} == ** ]] ; 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"; + EGIT_REPO_URI="https://github.com/mean00/avidemux2.git"; inherit git-2 else
[gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-core/
commit: 8cfb17422ddbf5abd3184f4b1f0152057bb8be59 Author: Peter Levine gmail com> AuthorDate: Fri Jun 2 03:13:07 2017 + Commit: Alexis Ballier gentoo org> CommitDate: Fri Jun 23 05:35:35 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cfb1742 media-libs/avidemux-core: Add support for NVIDIA Encoder (NVENC) media-video/ffmpeg already uses it and latest media-libs/avidemux-core now supports it. Package-Manager: Portage-2.3.6, Repoman-2.3.2 media-libs/avidemux-core/avidemux-core-.ebuild | 3 ++- media-libs/avidemux-core/metadata.xml | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/media-libs/avidemux-core/avidemux-core-.ebuild b/media-libs/avidemux-core/avidemux-core-.ebuild index 420ac6ab9db..3a659ab182e 100644 --- a/media-libs/avidemux-core/avidemux-core-.ebuild +++ b/media-libs/avidemux-core/avidemux-core-.ebuild @@ -12,7 +12,7 @@ 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" +IUSE="debug nls nvenc sdl system-ffmpeg vaapi vdpau video_cards_fglrx xv" KEYWORDS="~amd64 ~x86" MY_PN="${PN/-core/}" @@ -93,6 +93,7 @@ src_configure() { $(cmake-utils_use vdpau VDPAU) $(cmake-utils_use video_cards_fglrx XVBA) $(cmake-utils_use xv XVIDEO) + $(cmake-utils_use nvenc NVENC) ) if use debug ; then diff --git a/media-libs/avidemux-core/metadata.xml b/media-libs/avidemux-core/metadata.xml index 422c7c72ff3..efad95d3100 100644 --- a/media-libs/avidemux-core/metadata.xml +++ b/media-libs/avidemux-core/metadata.xml @@ -6,6 +6,7 @@ Gentoo Video project +Adds support for NVIDIA Encoder (NVENC) API for hardware accelerated encoding on NVIDIA cards. Use the ffmpeg provided by the system.
[gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-core/
commit: caa47959e3295d1e0ad2a48233bec617b076b65d Author: Patrick Lauer gentoo org> AuthorDate: Fri May 6 07:42:02 2016 + Commit: Patrick Lauer gentoo org> CommitDate: Fri May 6 07:49:47 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=caa47959 media-libs/avidemux-core: Remove unneeded useflag descriptions from metadata.xml Package-Manager: portage-2.2.28 media-libs/avidemux-core/metadata.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/media-libs/avidemux-core/metadata.xml b/media-libs/avidemux-core/metadata.xml index 851c183..422c7c7 100644 --- a/media-libs/avidemux-core/metadata.xml +++ b/media-libs/avidemux-core/metadata.xml @@ -6,8 +6,6 @@ Gentoo Video project -Enable A/52 (AC-3) audio encoder support. -Enable Adaptive Multi-Rate format support via media-libs/opencore-amr. Use the ffmpeg provided by the system.
[gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-core/, media-video/avidemux/, media-libs/avidemux-plugins/, ...
commit: 8bede8f34e19c76fbfdc0e56558d9f706cffb36b Author: Michał Górny gentoo org> AuthorDate: Thu May 5 19:43:30 2016 + Commit: Michał Górny gentoo org> CommitDate: Thu May 5 19:48:12 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8bede8f3 media-video/avidemux, media-libs/avidemux*: remove old versions media-libs/avidemux-core/Manifest | 5 - .../avidemux-core/avidemux-core-2.6.2-r1.ebuild| 117 -- .../avidemux-core/avidemux-core-2.6.3.ebuild | 100 .../avidemux-core/avidemux-core-2.6.4.ebuild | 99 .../avidemux-core/avidemux-core-2.6.5.ebuild | 111 - .../avidemux-core/avidemux-core-2.6.7.ebuild | 111 - media-libs/avidemux-plugins/Manifest | 5 - .../avidemux-plugins-2.6.2-r2.ebuild | 93 --- .../avidemux-plugins/avidemux-plugins-2.6.3.ebuild | 126 --- .../avidemux-plugins-2.6.4-r1.ebuild | 141 - .../avidemux-plugins/avidemux-plugins-2.6.4.ebuild | 126 --- .../avidemux-plugins-2.6.5-r1.ebuild | 143 - .../avidemux-plugins/avidemux-plugins-2.6.5.ebuild | 143 - .../avidemux-plugins/avidemux-plugins-2.6.7.ebuild | 145 - media-video/avidemux/Manifest | 6 - media-video/avidemux/avidemux-2.5.6-r2.ebuild | 172 - media-video/avidemux/avidemux-2.6.2-r1.ebuild | 122 --- media-video/avidemux/avidemux-2.6.3.ebuild | 118 -- media-video/avidemux/avidemux-2.6.4.ebuild | 118 -- media-video/avidemux/avidemux-2.6.5-r1.ebuild | 134 media-video/avidemux/avidemux-2.6.5.ebuild | 129 media-video/avidemux/avidemux-2.6.7.ebuild | 129 .../files/avidemux-2.5.4-build-plugins-fix.patch | 13 -- .../avidemux-2.5.6-ffmpeg-symbol-visibility.patch | 20 --- 24 files changed, 2426 deletions(-) diff --git a/media-libs/avidemux-core/Manifest b/media-libs/avidemux-core/Manifest index 2938f20..418a752 100644 --- a/media-libs/avidemux-core/Manifest +++ b/media-libs/avidemux-core/Manifest @@ -1,6 +1 @@ -DIST avidemux_2.6.2.tar.gz 17009420 SHA256 67c5676692152094033fbab490fbea24af27d8744496578d1c77957ab103fdb6 SHA512 1ba6f1c751732eec9fdceb2b0728122005ceab4c74ac09d213ebeff4c2af2a0b6ce8737d88e7c43970d1b9ca80cb36ad925efc9e4a487c4f463f1435aee328b3 WHIRLPOOL 0c95e87293251fffb773c8a1996ac015ba0d6f9d36d4f5ae01313c0532d2cf020a3ba0704d0f607347bbf0444e10857d7508fcbd968d62e889d7b62b36b85df7 -DIST avidemux_2.6.3.tar.gz 17025710 SHA256 78972b46c6ef1eb52fc012cafdeb2b6275913b968a49053016fb91ef0e9e5137 SHA512 a51e3cd95695a8500f1355c7a76b8313ae3fe68855b8eb9351038c00cd3d05bbf3ada3b75bf9d817fcddf1786a55c1c09cdbc4fe774974c5e4484c12ccd0a8fc WHIRLPOOL 899c5135e92cd3a830c84b1701ac6bfaf73d7417fa869ab26dd16b3754e5b71c5e667b30d747c5f19b902e1a8d53679447e86f9c6403f32a31554e551929e2bf -DIST avidemux_2.6.4.tar.gz 17109929 SHA256 2937c6c09248445942ac7e71b100ff8f7e272c4ad9c38e7d8c519ce4a11cec44 SHA512 1b80f65ac5a1da844b521a82bab8976d01c81923460004dc76ed0f6994f95da0ad9a836c90ffa1595ad060f0d6f27ce30add0204ca9d5295084a62e79dd484c9 WHIRLPOOL a1cbfcfeafa163ed24881edb085126a69eca3e0e8eaee50091ceadb993105a0cb43068b7725fa54871bc04b20ca5b51650ac536688b1d1f8d5b0a2d7356459ef -DIST avidemux_2.6.5.tar.gz 17322253 SHA256 428e1f6d99e2d854ccdcb68f2260d853c47c809eee6bd92f151cb298d98b1861 SHA512 e7f8be29812ca787a1ec2cfddb1c611e1032ed94f24f41c0684f106970085bb6d219c822f3e713c472508a3f7b306540d2cabeb665bdbac061a49bccf8c23a80 WHIRLPOOL 192ce60afe4634319567cd7a1440ba212d83e02c054d6625ad738955fde02d0e722eba948c60932f520bb5e76c46ebbab0001230c1da50d893fb99a18f1da76f -DIST avidemux_2.6.7.tar.gz 17337193 SHA256 d28202273d23be85c748c12d6e4df5e013bb861ea52b9bac7e0f90ba3d23249f SHA512 deea9811a0b6f618fab2ecf63c675b37dac12ea0ab09136a6b251e13601cd62cdc1c97d032762ea54f38e07275380106026541243bc87e230ce302fb821f2e5c WHIRLPOOL a41c338fc51e14d2c900dcef86a3887f94164548e8b904945d47915a78db907d152fda4ae53e5c37bf368348ff9912b529005a271f85d993776f042b5b997553 DIST avidemux_2.6.8.tar.gz 17380534 SHA256 02998c235a89894d184d745c94cac37b78bc20e9eb44b318ee2bb83f2507e682 SHA512 57a4042f1a9d46462850871d36950215c5ffb5b66ce2f2cde09d747e946c05adb7a550ac7763c96f4c1bcb2c39881407d9d88bc64c93053741091751495ba0b0 WHIRLPOOL 29f8a6039d82e686e8dfbfc7b23658921834238a4cc6c4de338afdfdc032a9a7cba1c8236789aa6dbcab318ec14c344c19563f153e6cbd63cd265c5fb15b44b6 diff --git a/media-libs/avidemux-core/avidemux-core-2.6.2-r1.ebuild b/media-libs/avidemux-core/avidemux-core-2.6.2-r1.ebuild deleted file mode 100644 index 789884b..000 --- a/media-libs/avidemux-core/avidemux-core-2.6.2-r1.ebuild +++ /dev/null @@ -1,117 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General