* [gentoo-commits] repo/gentoo:master commit in: media-video/x264-encoder/
@ 2019-07-28 11:24 Andreas Sturmlechner
0 siblings, 0 replies; 36+ messages in thread
From: Andreas Sturmlechner @ 2019-07-28 11:24 UTC (permalink / raw
To: gentoo-commits
commit: 8544f30e250fdd6a265f34bfaef9592f5ae3c419
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 28 11:10:37 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jul 28 11:23:31 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8544f30e
media-video/x264-encoder: Drop 0.0.20170701
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-video/x264-encoder/Manifest | 1 -
media-video/x264-encoder/metadata.xml | 1 -
.../x264-encoder/x264-encoder-0.0.20170701.ebuild | 73 ----------------------
3 files changed, 75 deletions(-)
diff --git a/media-video/x264-encoder/Manifest b/media-video/x264-encoder/Manifest
index ab3b20f2392..9e07ce682c0 100644
--- a/media-video/x264-encoder/Manifest
+++ b/media-video/x264-encoder/Manifest
@@ -1,2 +1 @@
-DIST x264-snapshot-20170701-2245.tar.bz2 750527 BLAKE2B ccf276da31383ab4b4a1ac48866bc49b4b2bc5913361c933fa2359de4d6e90cca091dd4aba781f3735a5b28d6ce006aa9d4e149ba48745b80cb971c2952ca867 SHA512 28fc9850c36ac385fced6dec9a0f68a5605a68805e1ef7b8cedcd78917eaa1ad6e47e57fe5a74fee0a6e482f3a33de6011f675e6c77b5db94c8fe01d5c5f3e9f
DIST x264-snapshot-20190214-2245.tar.bz2 770462 BLAKE2B d90a3bafb88febe12526b225617616a62c32fa3d3eacf410267e1fbd7e0fafaadca7c146172c08fc525bce8791d81c7d87dc27b06d61a6a44bf2ad92f6c1def6 SHA512 c8b1b46d4e6c0ef653dab35083a454c635ebf72c6a5255ce30bbb5d9d6bb8e23fca0e6cc197ea99f3c702fbfec096587df6fa82dec338d8bd45e35fa89c43039
diff --git a/media-video/x264-encoder/metadata.xml b/media-video/x264-encoder/metadata.xml
index b78e7f5a76e..cdf2dbfca75 100644
--- a/media-video/x264-encoder/metadata.xml
+++ b/media-video/x264-encoder/metadata.xml
@@ -5,7 +5,6 @@
<email>media-video@gentoo.org</email>
</maintainer>
<use>
- <flag name="10bit">Set output bit depth to 10</flag>
<flag name="avs">enable AvxSynth support in the AviSynth input module</flag>
<flag name="ffmpegsource">Enable ffmpegsource aka ffms support, disables lavf</flag>
<flag name="interlaced">Enable interlaced encoding support, this can decrease encoding speed by up to 2%</flag>
diff --git a/media-video/x264-encoder/x264-encoder-0.0.20170701.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20170701.ebuild
deleted file mode 100644
index 05428fbc201..00000000000
--- a/media-video/x264-encoder/x264-encoder-0.0.20170701.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="A free commandline encoder for X264/AVC streams"
-HOMEPAGE="https://www.videolan.org/developers/x264.html"
-if [[ ${PV} == 9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://code.videolan.org/videolan/x264.git"
- SRC_URI=""
-else
- inherit versionator
- MY_P="x264-snapshot-$(get_version_component_range 3)-2245"
- SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
- KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
- S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="10bit avs custom-cflags ffmpeg ffmpegsource +interlaced mp4 +threads"
-
-REQUIRED_USE="ffmpegsource? ( ffmpeg )"
-
-RDEPEND="
- ~media-libs/x264-${PV}[10bit=,interlaced=,threads=]
- ffmpeg? ( virtual/ffmpeg )
- ffmpegsource? ( media-libs/ffmpegsource )
- mp4? ( >=media-video/gpac-0.5.2:= )"
-
-ASM_DEP=">=dev-lang/nasm-2.13"
-DEPEND="${RDEPEND}
- amd64? ( ${ASM_DEP} )
- x86? ( ${ASM_DEP} )
- x86-fbsd? ( ${ASM_DEP} )
- virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}/gpac.patch" )
-
-src_configure() {
- tc-export CC
-
- # let upstream pick the optimization level by default
- use custom-cflags || filter-flags -O?
-
- ./configure \
- --prefix="${EPREFIX}"/usr \
- --libdir="${EPREFIX}"/usr/$(get_libdir) \
- --system-libx264 \
- --host="${CHOST}" \
- --disable-lsmash \
- $(usex 10bit "--bit-depth=10" "") \
- $(usex avs "" "--disable-avs") \
- $(usex ffmpeg "" "--disable-lavf --disable-swscale") \
- $(usex ffmpegsource "" "--disable-ffms") \
- $(usex interlaced "" "--disable-interlaced") \
- $(usex mp4 "" "--disable-gpac") \
- $(usex threads "" "--disable-thread") || die
-
- # this is a nasty workaround for bug #376925 for x264 that also applies
- # here, needed because as upstream doesn't like us fiddling with their CFLAGS
- if use custom-cflags; then
- local cflags
- cflags="$(grep "^CFLAGS=" config.mak | sed 's/CFLAGS=//')"
- cflags="${cflags//$(get-flag O)/}"
- cflags="${cflags//-O? /$(get-flag O) }"
- cflags="${cflags//-g /}"
- sed -i "s:^CFLAGS=.*:CFLAGS=${cflags//:/\\:}:" config.mak
- fi
-}
^ permalink raw reply related [flat|nested] 36+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/x264-encoder/
@ 2024-08-25 18:03 Sam James
0 siblings, 0 replies; 36+ messages in thread
From: Sam James @ 2024-08-25 18:03 UTC (permalink / raw
To: gentoo-commits
commit: c6e62c78a2a7f419f820280294e952b136c93a82
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 25 17:58:42 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Aug 25 18:03:01 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6e62c78
media-video/x264-encoder: add 0.0.20240513
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-video/x264-encoder/Manifest | 1 +
.../{x264-encoder-9999.ebuild => x264-encoder-0.0.20240513.ebuild} | 4 ++--
media-video/x264-encoder/x264-encoder-9999.ebuild | 4 ++--
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/media-video/x264-encoder/Manifest b/media-video/x264-encoder/Manifest
index b95b528c7338..df3438c35d15 100644
--- a/media-video/x264-encoder/Manifest
+++ b/media-video/x264-encoder/Manifest
@@ -1,2 +1,3 @@
DIST x264-0.0.20220222.tar.bz2 777236 BLAKE2B 45e57c48b4b889f5c7b4ce87d1442d26d907aac47fb7c586b34239317a8b74bb93eac3058eed766728fbca6370656d9a6f070e8992643984a89560e28edf206d SHA512 1cf864059f83731ac47008c1af1d9ac06d06283439cf883a020f8a76e0c7efc3b525791d11efe8784d0e39ded68dd03794f0502fa64cc07df2f2de064a55e1d9
DIST x264-0.0.20231114.tar.bz2 833229 BLAKE2B e8e60767d16ea11e55f9dd56f1c74535a06b07a498b91d4372872925915563b67fb917c5856e2e40e1f58acbab3142509d036cae8d56820bef0e16ee7bc35196 SHA512 7705c2827c6b280afc7403bce206f82ee94c1ba76c582d3e6ae017b9c4f08c4475ac70373f8a0bcda73046221456efc3f338c57aaf03c11f4d8e63f69bb94db5
+DIST x264-0.0.20240513.tar.bz2 841594 BLAKE2B fe88195c52d90e635a0aedef7d18886160147ba41cd1a692ae9a661b76608ac11e05aa5bc4628030f833d6a822cee187f3fbc4c015e094eb1b30c96783147124 SHA512 6d0d9e079d6c7650abb5c00ad60cf3cfe72a220b3ee7cd030d4daeefdd9feeb4d056cf2e01b2f8d2fb0a66ccc15cdde860237f8ac5eac42ede6e5444a81346f8
diff --git a/media-video/x264-encoder/x264-encoder-9999.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20240513.ebuild
similarity index 95%
copy from media-video/x264-encoder/x264-encoder-9999.ebuild
copy to media-video/x264-encoder/x264-encoder-0.0.20240513.ebuild
index f688e3cb2d4e..488b1f76ddb7 100644
--- a/media-video/x264-encoder/x264-encoder-9999.ebuild
+++ b/media-video/x264-encoder/x264-encoder-0.0.20240513.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://code.videolan.org/videolan/x264.git"
else
- X264_COMMIT="c196240409e4d7c01b47448d93b1f9683aaa7cf7"
+ X264_COMMIT="4613ac3c15fd75cebc4b9f65b7fb95e70a3acce1"
SRC_URI="https://code.videolan.org/videolan/x264/-/archive/${X264_COMMIT}/x264-${X264_COMMIT}.tar.bz2 -> ${P/-encoder}.tar.bz2"
KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
S="${WORKDIR}/${PN/-encoder}-${X264_COMMIT}"
diff --git a/media-video/x264-encoder/x264-encoder-9999.ebuild b/media-video/x264-encoder/x264-encoder-9999.ebuild
index f688e3cb2d4e..488b1f76ddb7 100644
--- a/media-video/x264-encoder/x264-encoder-9999.ebuild
+++ b/media-video/x264-encoder/x264-encoder-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://code.videolan.org/videolan/x264.git"
else
- X264_COMMIT="c196240409e4d7c01b47448d93b1f9683aaa7cf7"
+ X264_COMMIT="4613ac3c15fd75cebc4b9f65b7fb95e70a3acce1"
SRC_URI="https://code.videolan.org/videolan/x264/-/archive/${X264_COMMIT}/x264-${X264_COMMIT}.tar.bz2 -> ${P/-encoder}.tar.bz2"
KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
S="${WORKDIR}/${PN/-encoder}-${X264_COMMIT}"
^ permalink raw reply related [flat|nested] 36+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/x264-encoder/
@ 2024-03-18 4:45 Sam James
0 siblings, 0 replies; 36+ messages in thread
From: Sam James @ 2024-03-18 4:45 UTC (permalink / raw
To: gentoo-commits
commit: 868d3c02f10b7c817c2d92e659592cc6bda18413
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 18 04:45:16 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 18 04:45:16 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=868d3c02
media-video/x264-encoder: Stabilize 0.0.20231114 x86, #926282
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-video/x264-encoder/x264-encoder-0.0.20231114.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-video/x264-encoder/x264-encoder-0.0.20231114.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20231114.ebuild
index 9b097b18437b..14aa1ea30410 100644
--- a/media-video/x264-encoder/x264-encoder-0.0.20231114.ebuild
+++ b/media-video/x264-encoder/x264-encoder-0.0.20231114.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]]; then
else
X264_COMMIT="c196240409e4d7c01b47448d93b1f9683aaa7cf7"
SRC_URI="https://code.videolan.org/videolan/x264/-/archive/${X264_COMMIT}/x264-${X264_COMMIT}.tar.bz2 -> ${P/-encoder}.tar.bz2"
- KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+ KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
S="${WORKDIR}/${PN/-encoder}-${X264_COMMIT}"
fi
^ permalink raw reply related [flat|nested] 36+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/x264-encoder/
@ 2024-03-17 19:29 Arthur Zamarin
0 siblings, 0 replies; 36+ messages in thread
From: Arthur Zamarin @ 2024-03-17 19:29 UTC (permalink / raw
To: gentoo-commits
commit: cc353b76fe1cfbaecb6656280d27e6d90ae6d79b
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 17 19:29:24 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Mar 17 19:29:24 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc353b76
media-video/x264-encoder: Stabilize 0.0.20231114 amd64, #926282
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
media-video/x264-encoder/x264-encoder-0.0.20231114.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-video/x264-encoder/x264-encoder-0.0.20231114.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20231114.ebuild
index f688e3cb2d4e..9b097b18437b 100644
--- a/media-video/x264-encoder/x264-encoder-0.0.20231114.ebuild
+++ b/media-video/x264-encoder/x264-encoder-0.0.20231114.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]]; then
else
X264_COMMIT="c196240409e4d7c01b47448d93b1f9683aaa7cf7"
SRC_URI="https://code.videolan.org/videolan/x264/-/archive/${X264_COMMIT}/x264-${X264_COMMIT}.tar.bz2 -> ${P/-encoder}.tar.bz2"
- KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+ KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
S="${WORKDIR}/${PN/-encoder}-${X264_COMMIT}"
fi
^ permalink raw reply related [flat|nested] 36+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/x264-encoder/
@ 2023-12-26 21:39 Sam James
0 siblings, 0 replies; 36+ messages in thread
From: Sam James @ 2023-12-26 21:39 UTC (permalink / raw
To: gentoo-commits
commit: b587936743bfa53e48390e51c1dac049cd2b2b66
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 26 21:32:53 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Dec 26 21:32:53 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5879367
media-video/x264-encoder: add 0.0.20231114
Bug: https://bugs.gentoo.org/920559
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-video/x264-encoder/Manifest | 1 +
...999.ebuild => x264-encoder-0.0.20231114.ebuild} | 25 ++++++++++++----------
media-video/x264-encoder/x264-encoder-9999.ebuild | 25 ++++++++++++----------
3 files changed, 29 insertions(+), 22 deletions(-)
diff --git a/media-video/x264-encoder/Manifest b/media-video/x264-encoder/Manifest
index 4b11d2ba0042..b95b528c7338 100644
--- a/media-video/x264-encoder/Manifest
+++ b/media-video/x264-encoder/Manifest
@@ -1 +1,2 @@
DIST x264-0.0.20220222.tar.bz2 777236 BLAKE2B 45e57c48b4b889f5c7b4ce87d1442d26d907aac47fb7c586b34239317a8b74bb93eac3058eed766728fbca6370656d9a6f070e8992643984a89560e28edf206d SHA512 1cf864059f83731ac47008c1af1d9ac06d06283439cf883a020f8a76e0c7efc3b525791d11efe8784d0e39ded68dd03794f0502fa64cc07df2f2de064a55e1d9
+DIST x264-0.0.20231114.tar.bz2 833229 BLAKE2B e8e60767d16ea11e55f9dd56f1c74535a06b07a498b91d4372872925915563b67fb917c5856e2e40e1f58acbab3142509d036cae8d56820bef0e16ee7bc35196 SHA512 7705c2827c6b280afc7403bce206f82ee94c1ba76c582d3e6ae017b9c4f08c4475ac70373f8a0bcda73046221456efc3f338c57aaf03c11f4d8e63f69bb94db5
diff --git a/media-video/x264-encoder/x264-encoder-9999.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20231114.ebuild
similarity index 82%
copy from media-video/x264-encoder/x264-encoder-9999.ebuild
copy to media-video/x264-encoder/x264-encoder-0.0.20231114.ebuild
index f9d72081e46e..f688e3cb2d4e 100644
--- a/media-video/x264-encoder/x264-encoder-9999.ebuild
+++ b/media-video/x264-encoder/x264-encoder-0.0.20231114.ebuild
@@ -1,39 +1,42 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
+
+# Bump with media-libs/x264
inherit flag-o-matic toolchain-funcs
DESCRIPTION="A free commandline encoder for X264/AVC streams"
HOMEPAGE="https://www.videolan.org/developers/x264.html"
+
if [[ ${PV} == 9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://code.videolan.org/videolan/x264.git"
- SRC_URI=""
else
- # Download https://code.videolan.org/videolan/x264/-/archive/master/x264-master.tar.bz2
- SRC_URI="https://dev.gentoo.org/~aballier/distfiles/x264-${PV}.tar.bz2"
+ X264_COMMIT="c196240409e4d7c01b47448d93b1f9683aaa7cf7"
+ SRC_URI="https://code.videolan.org/videolan/x264/-/archive/${X264_COMMIT}/x264-${X264_COMMIT}.tar.bz2 -> ${P/-encoder}.tar.bz2"
KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
- S="${WORKDIR}/x264-master"
+ S="${WORKDIR}/${PN/-encoder}-${X264_COMMIT}"
fi
LICENSE="GPL-2"
SLOT="0"
IUSE="avs custom-cflags ffmpeg ffmpegsource +interlaced mp4 +threads"
-
REQUIRED_USE="ffmpegsource? ( ffmpeg )"
RDEPEND="
~media-libs/x264-${PV}[interlaced=,threads=]
ffmpeg? ( media-video/ffmpeg:= )
ffmpegsource? ( media-libs/ffmpegsource )
- mp4? ( >=media-video/gpac-0.5.2:= )"
-
+ mp4? ( >=media-video/gpac-0.5.2:= )
+"
ASM_DEP=">=dev-lang/nasm-2.13"
-DEPEND="${RDEPEND}
+DEPEND="
+ ${RDEPEND}
amd64? ( ${ASM_DEP} )
- x86? ( ${ASM_DEP} )"
+ x86? ( ${ASM_DEP} )
+"
BDEPEND="virtual/pkgconfig"
src_configure() {
diff --git a/media-video/x264-encoder/x264-encoder-9999.ebuild b/media-video/x264-encoder/x264-encoder-9999.ebuild
index f9d72081e46e..f688e3cb2d4e 100644
--- a/media-video/x264-encoder/x264-encoder-9999.ebuild
+++ b/media-video/x264-encoder/x264-encoder-9999.ebuild
@@ -1,39 +1,42 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
+
+# Bump with media-libs/x264
inherit flag-o-matic toolchain-funcs
DESCRIPTION="A free commandline encoder for X264/AVC streams"
HOMEPAGE="https://www.videolan.org/developers/x264.html"
+
if [[ ${PV} == 9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://code.videolan.org/videolan/x264.git"
- SRC_URI=""
else
- # Download https://code.videolan.org/videolan/x264/-/archive/master/x264-master.tar.bz2
- SRC_URI="https://dev.gentoo.org/~aballier/distfiles/x264-${PV}.tar.bz2"
+ X264_COMMIT="c196240409e4d7c01b47448d93b1f9683aaa7cf7"
+ SRC_URI="https://code.videolan.org/videolan/x264/-/archive/${X264_COMMIT}/x264-${X264_COMMIT}.tar.bz2 -> ${P/-encoder}.tar.bz2"
KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
- S="${WORKDIR}/x264-master"
+ S="${WORKDIR}/${PN/-encoder}-${X264_COMMIT}"
fi
LICENSE="GPL-2"
SLOT="0"
IUSE="avs custom-cflags ffmpeg ffmpegsource +interlaced mp4 +threads"
-
REQUIRED_USE="ffmpegsource? ( ffmpeg )"
RDEPEND="
~media-libs/x264-${PV}[interlaced=,threads=]
ffmpeg? ( media-video/ffmpeg:= )
ffmpegsource? ( media-libs/ffmpegsource )
- mp4? ( >=media-video/gpac-0.5.2:= )"
-
+ mp4? ( >=media-video/gpac-0.5.2:= )
+"
ASM_DEP=">=dev-lang/nasm-2.13"
-DEPEND="${RDEPEND}
+DEPEND="
+ ${RDEPEND}
amd64? ( ${ASM_DEP} )
- x86? ( ${ASM_DEP} )"
+ x86? ( ${ASM_DEP} )
+"
BDEPEND="virtual/pkgconfig"
src_configure() {
^ permalink raw reply related [flat|nested] 36+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/x264-encoder/
@ 2022-11-12 17:48 Matt Turner
0 siblings, 0 replies; 36+ messages in thread
From: Matt Turner @ 2022-11-12 17:48 UTC (permalink / raw
To: gentoo-commits
commit: dcecde9f569ef3a9e836d1f44c2994db8936f7d5
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 12 17:30:30 2022 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Nov 12 17:32:54 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcecde9f
media-video/x264-encoder: Drop old versions
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
media-video/x264-encoder/Manifest | 1 -
.../x264-encoder/x264-encoder-0.0.20190903.ebuild | 76 ----------------------
2 files changed, 77 deletions(-)
diff --git a/media-video/x264-encoder/Manifest b/media-video/x264-encoder/Manifest
index 1cedc164b43d..4b11d2ba0042 100644
--- a/media-video/x264-encoder/Manifest
+++ b/media-video/x264-encoder/Manifest
@@ -1,2 +1 @@
DIST x264-0.0.20220222.tar.bz2 777236 BLAKE2B 45e57c48b4b889f5c7b4ce87d1442d26d907aac47fb7c586b34239317a8b74bb93eac3058eed766728fbca6370656d9a6f070e8992643984a89560e28edf206d SHA512 1cf864059f83731ac47008c1af1d9ac06d06283439cf883a020f8a76e0c7efc3b525791d11efe8784d0e39ded68dd03794f0502fa64cc07df2f2de064a55e1d9
-DIST x264-snapshot-20190903-2245.tar.bz2 774515 BLAKE2B 0b19fc1d3cedea32bfac9c5247bce7b3c04dead35458d61f3b5c0694040dc852b0110b620faf4118ed265a5605aafce3c49d468d38fb91e4c515b2860c486920 SHA512 c357c9025ffdf653c974eb7ccc2e9a4de86c02881372a6a8270ae59ce948c284da48a2aba37763bd29359d2a6dfc76ea56a52fed6082f8483912c8f948488a2d
diff --git a/media-video/x264-encoder/x264-encoder-0.0.20190903.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20190903.ebuild
deleted file mode 100644
index cb6f65632011..000000000000
--- a/media-video/x264-encoder/x264-encoder-0.0.20190903.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="A free commandline encoder for X264/AVC streams"
-HOMEPAGE="https://www.videolan.org/developers/x264.html"
-if [[ ${PV} == 9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://code.videolan.org/videolan/x264.git"
- SRC_URI=""
-else
- MY_P="x264-snapshot-$(ver_cut 3)-2245"
- SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
- KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
- S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="avs custom-cflags ffmpeg ffmpegsource +interlaced mp4 +threads"
-
-REQUIRED_USE="ffmpegsource? ( ffmpeg )"
-
-RDEPEND="
- ~media-libs/x264-${PV}[interlaced=,threads=]
- ffmpeg? ( media-video/ffmpeg:= )
- ffmpegsource? ( media-libs/ffmpegsource )
- mp4? ( >=media-video/gpac-0.5.2:= )"
-
-ASM_DEP=">=dev-lang/nasm-2.13"
-DEPEND="${RDEPEND}
- amd64? ( ${ASM_DEP} )
- x86? ( ${ASM_DEP} )"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}/gpac.patch" )
-
-src_configure() {
- tc-export CC
-
- if [[ ${ABI} == x86 || ${ABI} == amd64 ]]; then
- export AS="nasm"
- else
- export AS="${CC}"
- fi
-
- # let upstream pick the optimization level by default
- use custom-cflags || filter-flags -O?
-
- ./configure \
- --prefix="${EPREFIX}"/usr \
- --libdir="${EPREFIX}"/usr/$(get_libdir) \
- --system-libx264 \
- --host="${CHOST}" \
- --disable-lsmash \
- $(usex avs "" "--disable-avs") \
- $(usex ffmpeg "" "--disable-lavf --disable-swscale") \
- $(usex ffmpegsource "" "--disable-ffms") \
- $(usex interlaced "" "--disable-interlaced") \
- $(usex mp4 "" "--disable-gpac") \
- $(usex threads "" "--disable-thread") || die
-
- # this is a nasty workaround for bug #376925 for x264 that also applies
- # here, needed because as upstream doesn't like us fiddling with their CFLAGS
- if use custom-cflags; then
- local cflags
- cflags="$(grep "^CFLAGS=" config.mak | sed 's/CFLAGS=//')"
- cflags="${cflags//$(get-flag O)/}"
- cflags="${cflags//-O? /$(get-flag O) }"
- cflags="${cflags//-g /}"
- sed -i "s:^CFLAGS=.*:CFLAGS=${cflags//:/\\:}:" config.mak
- fi
-}
^ permalink raw reply related [flat|nested] 36+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/x264-encoder/
@ 2022-09-03 5:27 Sam James
0 siblings, 0 replies; 36+ messages in thread
From: Sam James @ 2022-09-03 5:27 UTC (permalink / raw
To: gentoo-commits
commit: 8390cafbae56beddbf5382cc05feb819c842860a
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 3 05:26:39 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Sep 3 05:26:39 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8390cafb
media-video/x264-encoder: Stabilize 0.0.20220222 amd64, #868030
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-video/x264-encoder/x264-encoder-0.0.20220222.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-video/x264-encoder/x264-encoder-0.0.20220222.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20220222.ebuild
index 775f1a205278..7be6d065c869 100644
--- a/media-video/x264-encoder/x264-encoder-0.0.20220222.ebuild
+++ b/media-video/x264-encoder/x264-encoder-0.0.20220222.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then
else
# Download https://code.videolan.org/videolan/x264/-/archive/master/x264-master.tar.bz2
SRC_URI="https://dev.gentoo.org/~aballier/distfiles/x264-${PV}.tar.bz2"
- KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc x86"
+ KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
S="${WORKDIR}/x264-master"
fi
^ permalink raw reply related [flat|nested] 36+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/x264-encoder/
@ 2022-09-03 5:27 Sam James
0 siblings, 0 replies; 36+ messages in thread
From: Sam James @ 2022-09-03 5:27 UTC (permalink / raw
To: gentoo-commits
commit: 91e9b122abf58a3f7b68ef127ed7442bf1cfb405
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 3 05:26:25 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Sep 3 05:26:25 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91e9b122
media-video/x264-encoder: Stabilize 0.0.20220222 x86, #868030
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-video/x264-encoder/x264-encoder-0.0.20220222.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-video/x264-encoder/x264-encoder-0.0.20220222.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20220222.ebuild
index f9d72081e46e..775f1a205278 100644
--- a/media-video/x264-encoder/x264-encoder-0.0.20220222.ebuild
+++ b/media-video/x264-encoder/x264-encoder-0.0.20220222.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then
else
# Download https://code.videolan.org/videolan/x264/-/archive/master/x264-master.tar.bz2
SRC_URI="https://dev.gentoo.org/~aballier/distfiles/x264-${PV}.tar.bz2"
- KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc x86"
S="${WORKDIR}/x264-master"
fi
^ permalink raw reply related [flat|nested] 36+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/x264-encoder/
@ 2022-03-10 12:45 Alexis Ballier
0 siblings, 0 replies; 36+ messages in thread
From: Alexis Ballier @ 2022-03-10 12:45 UTC (permalink / raw
To: gentoo-commits
commit: a18f61aa3eb0265173119372ae385905b8468de8
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 10 12:11:26 2022 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Thu Mar 10 12:45:08 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a18f61aa
media-video/x264-encoder: bump to latest
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
media-video/x264-encoder/Manifest | 1 +
...{x264-encoder-9999.ebuild => x264-encoder-0.0.20220222.ebuild} | 8 +++-----
media-video/x264-encoder/x264-encoder-9999.ebuild | 8 +++-----
3 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/media-video/x264-encoder/Manifest b/media-video/x264-encoder/Manifest
index c1e5f3cbddf9..1cedc164b43d 100644
--- a/media-video/x264-encoder/Manifest
+++ b/media-video/x264-encoder/Manifest
@@ -1 +1,2 @@
+DIST x264-0.0.20220222.tar.bz2 777236 BLAKE2B 45e57c48b4b889f5c7b4ce87d1442d26d907aac47fb7c586b34239317a8b74bb93eac3058eed766728fbca6370656d9a6f070e8992643984a89560e28edf206d SHA512 1cf864059f83731ac47008c1af1d9ac06d06283439cf883a020f8a76e0c7efc3b525791d11efe8784d0e39ded68dd03794f0502fa64cc07df2f2de064a55e1d9
DIST x264-snapshot-20190903-2245.tar.bz2 774515 BLAKE2B 0b19fc1d3cedea32bfac9c5247bce7b3c04dead35458d61f3b5c0694040dc852b0110b620faf4118ed265a5605aafce3c49d468d38fb91e4c515b2860c486920 SHA512 c357c9025ffdf653c974eb7ccc2e9a4de86c02881372a6a8270ae59ce948c284da48a2aba37763bd29359d2a6dfc76ea56a52fed6082f8483912c8f948488a2d
diff --git a/media-video/x264-encoder/x264-encoder-9999.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20220222.ebuild
similarity index 91%
copy from media-video/x264-encoder/x264-encoder-9999.ebuild
copy to media-video/x264-encoder/x264-encoder-0.0.20220222.ebuild
index 2596cb3a87e1..f9d72081e46e 100644
--- a/media-video/x264-encoder/x264-encoder-9999.ebuild
+++ b/media-video/x264-encoder/x264-encoder-0.0.20220222.ebuild
@@ -12,10 +12,10 @@ if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://code.videolan.org/videolan/x264.git"
SRC_URI=""
else
- MY_P="x264-snapshot-$(ver_cut 3)-2245"
- SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
+ # Download https://code.videolan.org/videolan/x264/-/archive/master/x264-master.tar.bz2
+ SRC_URI="https://dev.gentoo.org/~aballier/distfiles/x264-${PV}.tar.bz2"
KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
- S="${WORKDIR}/${MY_P}"
+ S="${WORKDIR}/x264-master"
fi
LICENSE="GPL-2"
@@ -36,8 +36,6 @@ DEPEND="${RDEPEND}
x86? ( ${ASM_DEP} )"
BDEPEND="virtual/pkgconfig"
-PATCHES=( "${FILESDIR}/gpac.patch" )
-
src_configure() {
tc-export CC
diff --git a/media-video/x264-encoder/x264-encoder-9999.ebuild b/media-video/x264-encoder/x264-encoder-9999.ebuild
index 2596cb3a87e1..f9d72081e46e 100644
--- a/media-video/x264-encoder/x264-encoder-9999.ebuild
+++ b/media-video/x264-encoder/x264-encoder-9999.ebuild
@@ -12,10 +12,10 @@ if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://code.videolan.org/videolan/x264.git"
SRC_URI=""
else
- MY_P="x264-snapshot-$(ver_cut 3)-2245"
- SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
+ # Download https://code.videolan.org/videolan/x264/-/archive/master/x264-master.tar.bz2
+ SRC_URI="https://dev.gentoo.org/~aballier/distfiles/x264-${PV}.tar.bz2"
KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
- S="${WORKDIR}/${MY_P}"
+ S="${WORKDIR}/x264-master"
fi
LICENSE="GPL-2"
@@ -36,8 +36,6 @@ DEPEND="${RDEPEND}
x86? ( ${ASM_DEP} )"
BDEPEND="virtual/pkgconfig"
-PATCHES=( "${FILESDIR}/gpac.patch" )
-
src_configure() {
tc-export CC
^ permalink raw reply related [flat|nested] 36+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/x264-encoder/
@ 2022-01-05 10:01 David Seifert
0 siblings, 0 replies; 36+ messages in thread
From: David Seifert @ 2022-01-05 10:01 UTC (permalink / raw
To: gentoo-commits
commit: a8cfcf2d125ed83b292f31134dd4a59d4dd7e15a
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 5 10:01:28 2022 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed Jan 5 10:01:28 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8cfcf2d
media-video/x264-encoder: remove x86-fbsd
Signed-off-by: David Seifert <soap <AT> gentoo.org>
media-video/x264-encoder/x264-encoder-0.0.20190903.ebuild | 5 ++---
media-video/x264-encoder/x264-encoder-9999.ebuild | 5 ++---
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/media-video/x264-encoder/x264-encoder-0.0.20190903.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20190903.ebuild
index 8c3910308498..cb6f65632011 100644
--- a/media-video/x264-encoder/x264-encoder-0.0.20190903.ebuild
+++ b/media-video/x264-encoder/x264-encoder-0.0.20190903.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
@@ -33,8 +33,7 @@ RDEPEND="
ASM_DEP=">=dev-lang/nasm-2.13"
DEPEND="${RDEPEND}
amd64? ( ${ASM_DEP} )
- x86? ( ${ASM_DEP} )
- x86-fbsd? ( ${ASM_DEP} )"
+ x86? ( ${ASM_DEP} )"
BDEPEND="virtual/pkgconfig"
PATCHES=( "${FILESDIR}/gpac.patch" )
diff --git a/media-video/x264-encoder/x264-encoder-9999.ebuild b/media-video/x264-encoder/x264-encoder-9999.ebuild
index 13b167268ffb..2596cb3a87e1 100644
--- a/media-video/x264-encoder/x264-encoder-9999.ebuild
+++ b/media-video/x264-encoder/x264-encoder-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -33,8 +33,7 @@ RDEPEND="
ASM_DEP=">=dev-lang/nasm-2.13"
DEPEND="${RDEPEND}
amd64? ( ${ASM_DEP} )
- x86? ( ${ASM_DEP} )
- x86-fbsd? ( ${ASM_DEP} )"
+ x86? ( ${ASM_DEP} )"
BDEPEND="virtual/pkgconfig"
PATCHES=( "${FILESDIR}/gpac.patch" )
^ permalink raw reply related [flat|nested] 36+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/x264-encoder/
@ 2021-01-07 19:04 Sam James
0 siblings, 0 replies; 36+ messages in thread
From: Sam James @ 2021-01-07 19:04 UTC (permalink / raw
To: gentoo-commits
commit: 0c54d2d7b5ecfa6087a0125e3337d9489b5bef22
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 7 19:02:23 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jan 7 19:02:23 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c54d2d7
media-video/x264-encoder: cleanup old
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-video/x264-encoder/Manifest | 1 -
.../x264-encoder/x264-encoder-0.0.20190214.ebuild | 77 ----------------------
2 files changed, 78 deletions(-)
diff --git a/media-video/x264-encoder/Manifest b/media-video/x264-encoder/Manifest
index fd3a9926450..c1e5f3cbddf 100644
--- a/media-video/x264-encoder/Manifest
+++ b/media-video/x264-encoder/Manifest
@@ -1,2 +1 @@
-DIST x264-snapshot-20190214-2245.tar.bz2 770462 BLAKE2B d90a3bafb88febe12526b225617616a62c32fa3d3eacf410267e1fbd7e0fafaadca7c146172c08fc525bce8791d81c7d87dc27b06d61a6a44bf2ad92f6c1def6 SHA512 c8b1b46d4e6c0ef653dab35083a454c635ebf72c6a5255ce30bbb5d9d6bb8e23fca0e6cc197ea99f3c702fbfec096587df6fa82dec338d8bd45e35fa89c43039
DIST x264-snapshot-20190903-2245.tar.bz2 774515 BLAKE2B 0b19fc1d3cedea32bfac9c5247bce7b3c04dead35458d61f3b5c0694040dc852b0110b620faf4118ed265a5605aafce3c49d468d38fb91e4c515b2860c486920 SHA512 c357c9025ffdf653c974eb7ccc2e9a4de86c02881372a6a8270ae59ce948c284da48a2aba37763bd29359d2a6dfc76ea56a52fed6082f8483912c8f948488a2d
diff --git a/media-video/x264-encoder/x264-encoder-0.0.20190214.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20190214.ebuild
deleted file mode 100644
index 1c576fa216e..00000000000
--- a/media-video/x264-encoder/x264-encoder-0.0.20190214.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="A free commandline encoder for X264/AVC streams"
-HOMEPAGE="https://www.videolan.org/developers/x264.html"
-if [[ ${PV} == 9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://code.videolan.org/videolan/x264.git"
- SRC_URI=""
-else
- MY_P="x264-snapshot-$(ver_cut 3)-2245"
- SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
- KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
- S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="avs custom-cflags ffmpeg ffmpegsource +interlaced mp4 +threads"
-
-REQUIRED_USE="ffmpegsource? ( ffmpeg )"
-
-RDEPEND="
- ~media-libs/x264-${PV}[interlaced=,threads=]
- ffmpeg? ( media-video/ffmpeg:= )
- ffmpegsource? ( media-libs/ffmpegsource )
- mp4? ( >=media-video/gpac-0.5.2:= )"
-
-ASM_DEP=">=dev-lang/nasm-2.13"
-DEPEND="${RDEPEND}
- amd64? ( ${ASM_DEP} )
- x86? ( ${ASM_DEP} )
- x86-fbsd? ( ${ASM_DEP} )"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}/gpac.patch" )
-
-src_configure() {
- tc-export CC
-
- if [[ ${ABI} == x86 || ${ABI} == amd64 ]]; then
- export AS="nasm"
- else
- export AS="${CC}"
- fi
-
- # let upstream pick the optimization level by default
- use custom-cflags || filter-flags -O?
-
- ./configure \
- --prefix="${EPREFIX}"/usr \
- --libdir="${EPREFIX}"/usr/$(get_libdir) \
- --system-libx264 \
- --host="${CHOST}" \
- --disable-lsmash \
- $(usex avs "" "--disable-avs") \
- $(usex ffmpeg "" "--disable-lavf --disable-swscale") \
- $(usex ffmpegsource "" "--disable-ffms") \
- $(usex interlaced "" "--disable-interlaced") \
- $(usex mp4 "" "--disable-gpac") \
- $(usex threads "" "--disable-thread") || die
-
- # this is a nasty workaround for bug #376925 for x264 that also applies
- # here, needed because as upstream doesn't like us fiddling with their CFLAGS
- if use custom-cflags; then
- local cflags
- cflags="$(grep "^CFLAGS=" config.mak | sed 's/CFLAGS=//')"
- cflags="${cflags//$(get-flag O)/}"
- cflags="${cflags//-O? /$(get-flag O) }"
- cflags="${cflags//-g /}"
- sed -i "s:^CFLAGS=.*:CFLAGS=${cflags//:/\\:}:" config.mak
- fi
-}
^ permalink raw reply related [flat|nested] 36+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/x264-encoder/
@ 2021-01-04 3:31 Sam James
0 siblings, 0 replies; 36+ messages in thread
From: Sam James @ 2021-01-04 3:31 UTC (permalink / raw
To: gentoo-commits
commit: 2f5b6560465b10ac0f45727450c8741b19b03864
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 4 03:29:47 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jan 4 03:29:47 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f5b6560
media-video/x264-encoder: Stabilize 0.0.20190903 amd64, #763390
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-video/x264-encoder/x264-encoder-0.0.20190903.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-video/x264-encoder/x264-encoder-0.0.20190903.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20190903.ebuild
index 13b167268ff..7152350a414 100644
--- a/media-video/x264-encoder/x264-encoder-0.0.20190903.ebuild
+++ b/media-video/x264-encoder/x264-encoder-0.0.20190903.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
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then
else
MY_P="x264-snapshot-$(ver_cut 3)-2245"
SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
- KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+ KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
S="${WORKDIR}/${MY_P}"
fi
^ permalink raw reply related [flat|nested] 36+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/x264-encoder/
@ 2020-09-15 18:34 Mike Gilbert
0 siblings, 0 replies; 36+ messages in thread
From: Mike Gilbert @ 2020-09-15 18:34 UTC (permalink / raw
To: gentoo-commits
commit: 97aa0cb3357e3ce8bdd346f450772468d8b0c936
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Mon Sep 14 13:00:00 2020 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue Sep 15 18:33:40 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97aa0cb3
media-video/x264-encoder: Set special value of AS to fix build failure.
Closes: https://bugs.gentoo.org/740566
Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org>
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
media-video/x264-encoder/x264-encoder-0.0.20190214.ebuild | 6 ++++++
media-video/x264-encoder/x264-encoder-0.0.20190903.ebuild | 6 ++++++
media-video/x264-encoder/x264-encoder-9999.ebuild | 6 ++++++
3 files changed, 18 insertions(+)
diff --git a/media-video/x264-encoder/x264-encoder-0.0.20190214.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20190214.ebuild
index 893ddce8fed..1c576fa216e 100644
--- a/media-video/x264-encoder/x264-encoder-0.0.20190214.ebuild
+++ b/media-video/x264-encoder/x264-encoder-0.0.20190214.ebuild
@@ -42,6 +42,12 @@ PATCHES=( "${FILESDIR}/gpac.patch" )
src_configure() {
tc-export CC
+ if [[ ${ABI} == x86 || ${ABI} == amd64 ]]; then
+ export AS="nasm"
+ else
+ export AS="${CC}"
+ fi
+
# let upstream pick the optimization level by default
use custom-cflags || filter-flags -O?
diff --git a/media-video/x264-encoder/x264-encoder-0.0.20190903.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20190903.ebuild
index 18dccd367cb..13b167268ff 100644
--- a/media-video/x264-encoder/x264-encoder-0.0.20190903.ebuild
+++ b/media-video/x264-encoder/x264-encoder-0.0.20190903.ebuild
@@ -42,6 +42,12 @@ PATCHES=( "${FILESDIR}/gpac.patch" )
src_configure() {
tc-export CC
+ if [[ ${ABI} == x86 || ${ABI} == amd64 ]]; then
+ export AS="nasm"
+ else
+ export AS="${CC}"
+ fi
+
# let upstream pick the optimization level by default
use custom-cflags || filter-flags -O?
diff --git a/media-video/x264-encoder/x264-encoder-9999.ebuild b/media-video/x264-encoder/x264-encoder-9999.ebuild
index 18dccd367cb..13b167268ff 100644
--- a/media-video/x264-encoder/x264-encoder-9999.ebuild
+++ b/media-video/x264-encoder/x264-encoder-9999.ebuild
@@ -42,6 +42,12 @@ PATCHES=( "${FILESDIR}/gpac.patch" )
src_configure() {
tc-export CC
+ if [[ ${ABI} == x86 || ${ABI} == amd64 ]]; then
+ export AS="nasm"
+ else
+ export AS="${CC}"
+ fi
+
# let upstream pick the optimization level by default
use custom-cflags || filter-flags -O?
^ permalink raw reply related [flat|nested] 36+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/x264-encoder/
@ 2020-04-25 19:14 Mikle Kolyada
0 siblings, 0 replies; 36+ messages in thread
From: Mikle Kolyada @ 2020-04-25 19:14 UTC (permalink / raw
To: gentoo-commits
commit: a2acd65de316841c480baba672aee6b98df02d7e
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 25 19:14:08 2020 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sat Apr 25 19:14:08 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2acd65d
media-video/x264-encoder: migrate from libav
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
media-video/x264-encoder/x264-encoder-0.0.20190214.ebuild | 9 +++------
media-video/x264-encoder/x264-encoder-0.0.20190903.ebuild | 9 +++------
media-video/x264-encoder/x264-encoder-9999.ebuild | 9 +++------
3 files changed, 9 insertions(+), 18 deletions(-)
diff --git a/media-video/x264-encoder/x264-encoder-0.0.20190214.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20190214.ebuild
index a597d419a81..893ddce8fed 100644
--- a/media-video/x264-encoder/x264-encoder-0.0.20190214.ebuild
+++ b/media-video/x264-encoder/x264-encoder-0.0.20190214.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
@@ -20,16 +20,13 @@ fi
LICENSE="GPL-2"
SLOT="0"
-IUSE="avs custom-cflags ffmpeg ffmpegsource +interlaced libav mp4 +threads"
+IUSE="avs custom-cflags ffmpeg ffmpegsource +interlaced mp4 +threads"
REQUIRED_USE="ffmpegsource? ( ffmpeg )"
RDEPEND="
~media-libs/x264-${PV}[interlaced=,threads=]
- ffmpeg? (
- !libav? ( media-video/ffmpeg:= )
- libav? ( media-video/libav:= )
- )
+ ffmpeg? ( media-video/ffmpeg:= )
ffmpegsource? ( media-libs/ffmpegsource )
mp4? ( >=media-video/gpac-0.5.2:= )"
diff --git a/media-video/x264-encoder/x264-encoder-0.0.20190903.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20190903.ebuild
index 6ad1f8d7a6c..18dccd367cb 100644
--- a/media-video/x264-encoder/x264-encoder-0.0.20190903.ebuild
+++ b/media-video/x264-encoder/x264-encoder-0.0.20190903.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
@@ -20,16 +20,13 @@ fi
LICENSE="GPL-2"
SLOT="0"
-IUSE="avs custom-cflags ffmpeg ffmpegsource +interlaced libav mp4 +threads"
+IUSE="avs custom-cflags ffmpeg ffmpegsource +interlaced mp4 +threads"
REQUIRED_USE="ffmpegsource? ( ffmpeg )"
RDEPEND="
~media-libs/x264-${PV}[interlaced=,threads=]
- ffmpeg? (
- !libav? ( media-video/ffmpeg:= )
- libav? ( media-video/libav:= )
- )
+ ffmpeg? ( media-video/ffmpeg:= )
ffmpegsource? ( media-libs/ffmpegsource )
mp4? ( >=media-video/gpac-0.5.2:= )"
diff --git a/media-video/x264-encoder/x264-encoder-9999.ebuild b/media-video/x264-encoder/x264-encoder-9999.ebuild
index 6ad1f8d7a6c..18dccd367cb 100644
--- a/media-video/x264-encoder/x264-encoder-9999.ebuild
+++ b/media-video/x264-encoder/x264-encoder-9999.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
@@ -20,16 +20,13 @@ fi
LICENSE="GPL-2"
SLOT="0"
-IUSE="avs custom-cflags ffmpeg ffmpegsource +interlaced libav mp4 +threads"
+IUSE="avs custom-cflags ffmpeg ffmpegsource +interlaced mp4 +threads"
REQUIRED_USE="ffmpegsource? ( ffmpeg )"
RDEPEND="
~media-libs/x264-${PV}[interlaced=,threads=]
- ffmpeg? (
- !libav? ( media-video/ffmpeg:= )
- libav? ( media-video/libav:= )
- )
+ ffmpeg? ( media-video/ffmpeg:= )
ffmpegsource? ( media-libs/ffmpegsource )
mp4? ( >=media-video/gpac-0.5.2:= )"
^ permalink raw reply related [flat|nested] 36+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/x264-encoder/
@ 2019-09-04 14:46 Alexis Ballier
0 siblings, 0 replies; 36+ messages in thread
From: Alexis Ballier @ 2019-09-04 14:46 UTC (permalink / raw
To: gentoo-commits
commit: ce1f5e238698b62cf94c3d78c740105da90ec573
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 4 14:45:58 2019 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Wed Sep 4 14:46:46 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce1f5e23
media-video/x264-encoder: bump a new snapshot
Package-Manager: Portage-2.3.75, Repoman-2.3.17
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
media-video/x264-encoder/Manifest | 1 +
.../x264-encoder/x264-encoder-0.0.20190903.ebuild | 74 ++++++++++++++++++++++
2 files changed, 75 insertions(+)
diff --git a/media-video/x264-encoder/Manifest b/media-video/x264-encoder/Manifest
index 9e07ce682c0..fd3a9926450 100644
--- a/media-video/x264-encoder/Manifest
+++ b/media-video/x264-encoder/Manifest
@@ -1 +1,2 @@
DIST x264-snapshot-20190214-2245.tar.bz2 770462 BLAKE2B d90a3bafb88febe12526b225617616a62c32fa3d3eacf410267e1fbd7e0fafaadca7c146172c08fc525bce8791d81c7d87dc27b06d61a6a44bf2ad92f6c1def6 SHA512 c8b1b46d4e6c0ef653dab35083a454c635ebf72c6a5255ce30bbb5d9d6bb8e23fca0e6cc197ea99f3c702fbfec096587df6fa82dec338d8bd45e35fa89c43039
+DIST x264-snapshot-20190903-2245.tar.bz2 774515 BLAKE2B 0b19fc1d3cedea32bfac9c5247bce7b3c04dead35458d61f3b5c0694040dc852b0110b620faf4118ed265a5605aafce3c49d468d38fb91e4c515b2860c486920 SHA512 c357c9025ffdf653c974eb7ccc2e9a4de86c02881372a6a8270ae59ce948c284da48a2aba37763bd29359d2a6dfc76ea56a52fed6082f8483912c8f948488a2d
diff --git a/media-video/x264-encoder/x264-encoder-0.0.20190903.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20190903.ebuild
new file mode 100644
index 00000000000..207434fe1c3
--- /dev/null
+++ b/media-video/x264-encoder/x264-encoder-0.0.20190903.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="A free commandline encoder for X264/AVC streams"
+HOMEPAGE="https://www.videolan.org/developers/x264.html"
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://code.videolan.org/videolan/x264.git"
+ SRC_URI=""
+else
+ MY_P="x264-snapshot-$(ver_cut 3)-2245"
+ SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
+ KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+ S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="avs custom-cflags ffmpeg ffmpegsource +interlaced libav mp4 +threads"
+
+REQUIRED_USE="ffmpegsource? ( ffmpeg )"
+
+RDEPEND="
+ ~media-libs/x264-${PV}[interlaced=,threads=]
+ ffmpeg? (
+ !libav? ( media-video/ffmpeg:= )
+ libav? ( media-video/libav:= )
+ )
+ ffmpegsource? ( media-libs/ffmpegsource )
+ mp4? ( >=media-video/gpac-0.5.2:= )"
+
+ASM_DEP=">=dev-lang/nasm-2.13"
+DEPEND="${RDEPEND}
+ amd64? ( ${ASM_DEP} )
+ x86? ( ${ASM_DEP} )
+ x86-fbsd? ( ${ASM_DEP} )"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}/gpac.patch" )
+
+src_configure() {
+ tc-export CC
+
+ # let upstream pick the optimization level by default
+ use custom-cflags || filter-flags -O?
+
+ ./configure \
+ --prefix="${EPREFIX}"/usr \
+ --libdir="${EPREFIX}"/usr/$(get_libdir) \
+ --system-libx264 \
+ --host="${CHOST}" \
+ --disable-lsmash \
+ $(usex avs "" "--disable-avs") \
+ $(usex ffmpeg "" "--disable-lavf --disable-swscale") \
+ $(usex ffmpegsource "" "--disable-ffms") \
+ $(usex interlaced "" "--disable-interlaced") \
+ $(usex mp4 "" "--disable-gpac") \
+ $(usex threads "" "--disable-thread") || die
+
+ # this is a nasty workaround for bug #376925 for x264 that also applies
+ # here, needed because as upstream doesn't like us fiddling with their CFLAGS
+ if use custom-cflags; then
+ local cflags
+ cflags="$(grep "^CFLAGS=" config.mak | sed 's/CFLAGS=//')"
+ cflags="${cflags//$(get-flag O)/}"
+ cflags="${cflags//-O? /$(get-flag O) }"
+ cflags="${cflags//-g /}"
+ sed -i "s:^CFLAGS=.*:CFLAGS=${cflags//:/\\:}:" config.mak
+ fi
+}
^ permalink raw reply related [flat|nested] 36+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/x264-encoder/
@ 2019-07-02 10:33 Agostino Sarubbo
0 siblings, 0 replies; 36+ messages in thread
From: Agostino Sarubbo @ 2019-07-02 10:33 UTC (permalink / raw
To: gentoo-commits
commit: 8277cdb12750cf23825e51d431a47f0cd24a9204
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 2 10:32:39 2019 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Jul 2 10:32:39 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8277cdb1
media-video/x264-encoder: amd64 stable wrt bug #688712
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
RepoMan-Options: --include-arches="amd64"
media-video/x264-encoder/x264-encoder-0.0.20190214.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-video/x264-encoder/x264-encoder-0.0.20190214.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20190214.ebuild
index 1b388f29833..83503e08e45 100644
--- a/media-video/x264-encoder/x264-encoder-0.0.20190214.ebuild
+++ b/media-video/x264-encoder/x264-encoder-0.0.20190214.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then
else
MY_P="x264-snapshot-$(ver_cut 3)-2245"
SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
- KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+ KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
S="${WORKDIR}/${MY_P}"
fi
^ permalink raw reply related [flat|nested] 36+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/x264-encoder/
@ 2019-07-01 19:23 Thomas Deutschmann
0 siblings, 0 replies; 36+ messages in thread
From: Thomas Deutschmann @ 2019-07-01 19:23 UTC (permalink / raw
To: gentoo-commits
commit: c255bc999cad548940154ddf3b86701a963d89d6
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 1 19:19:57 2019 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Jul 1 19:19:57 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c255bc99
media-video/x264-encoder: x86 stable (bug #688712)
Package-Manager: Portage-2.3.68, Repoman-2.3.16
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
media-video/x264-encoder/x264-encoder-0.0.20190214.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-video/x264-encoder/x264-encoder-0.0.20190214.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20190214.ebuild
index 207434fe1c3..1b388f29833 100644
--- a/media-video/x264-encoder/x264-encoder-0.0.20190214.ebuild
+++ b/media-video/x264-encoder/x264-encoder-0.0.20190214.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then
else
MY_P="x264-snapshot-$(ver_cut 3)-2245"
SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
- KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+ KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
S="${WORKDIR}/${MY_P}"
fi
^ permalink raw reply related [flat|nested] 36+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/x264-encoder/
@ 2019-05-05 19:05 Mike Gilbert
0 siblings, 0 replies; 36+ messages in thread
From: Mike Gilbert @ 2019-05-05 19:05 UTC (permalink / raw
To: gentoo-commits
commit: 354d7beac6c291d1683a66b7977cab9eac229df1
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Sun May 5 03:10:32 2019 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun May 5 19:04:03 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=354d7bea
media-video/x264-encoder: Update EGIT_REPO_URI.
Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org>
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
media-video/x264-encoder/x264-encoder-0.0.20170701.ebuild | 4 ++--
media-video/x264-encoder/x264-encoder-0.0.20190214.ebuild | 2 +-
media-video/x264-encoder/x264-encoder-9999.ebuild | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/media-video/x264-encoder/x264-encoder-0.0.20170701.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20170701.ebuild
index 56e61327598..05428fbc201 100644
--- a/media-video/x264-encoder/x264-encoder-0.0.20170701.ebuild
+++ b/media-video/x264-encoder/x264-encoder-0.0.20170701.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,7 +9,7 @@ DESCRIPTION="A free commandline encoder for X264/AVC streams"
HOMEPAGE="https://www.videolan.org/developers/x264.html"
if [[ ${PV} == 9999 ]]; then
inherit git-r3
- EGIT_REPO_URI="https://git.videolan.org/git/x264.git"
+ EGIT_REPO_URI="https://code.videolan.org/videolan/x264.git"
SRC_URI=""
else
inherit versionator
diff --git a/media-video/x264-encoder/x264-encoder-0.0.20190214.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20190214.ebuild
index ae007c71112..207434fe1c3 100644
--- a/media-video/x264-encoder/x264-encoder-0.0.20190214.ebuild
+++ b/media-video/x264-encoder/x264-encoder-0.0.20190214.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="A free commandline encoder for X264/AVC streams"
HOMEPAGE="https://www.videolan.org/developers/x264.html"
if [[ ${PV} == 9999 ]]; then
inherit git-r3
- EGIT_REPO_URI="https://git.videolan.org/git/x264.git"
+ EGIT_REPO_URI="https://code.videolan.org/videolan/x264.git"
SRC_URI=""
else
MY_P="x264-snapshot-$(ver_cut 3)-2245"
diff --git a/media-video/x264-encoder/x264-encoder-9999.ebuild b/media-video/x264-encoder/x264-encoder-9999.ebuild
index ae007c71112..207434fe1c3 100644
--- a/media-video/x264-encoder/x264-encoder-9999.ebuild
+++ b/media-video/x264-encoder/x264-encoder-9999.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="A free commandline encoder for X264/AVC streams"
HOMEPAGE="https://www.videolan.org/developers/x264.html"
if [[ ${PV} == 9999 ]]; then
inherit git-r3
- EGIT_REPO_URI="https://git.videolan.org/git/x264.git"
+ EGIT_REPO_URI="https://code.videolan.org/videolan/x264.git"
SRC_URI=""
else
MY_P="x264-snapshot-$(ver_cut 3)-2245"
^ permalink raw reply related [flat|nested] 36+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/x264-encoder/
@ 2019-02-15 12:36 Alexis Ballier
0 siblings, 0 replies; 36+ messages in thread
From: Alexis Ballier @ 2019-02-15 12:36 UTC (permalink / raw
To: gentoo-commits
commit: 16094f381e62c5086d77a2de8e3325da580e454b
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 15 11:46:49 2019 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Fri Feb 15 12:35:53 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16094f38
media-video/x264-encoder: bump a new snapshot
Bug: https://bugs.gentoo.org/676596
Package-Manager: Portage-2.3.60, Repoman-2.3.12
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
media-video/x264-encoder/Manifest | 1 +
.../x264-encoder/x264-encoder-0.0.20190214.ebuild | 74 ++++++++++++++++++++++
2 files changed, 75 insertions(+)
diff --git a/media-video/x264-encoder/Manifest b/media-video/x264-encoder/Manifest
index 0a6d8558016..ab3b20f2392 100644
--- a/media-video/x264-encoder/Manifest
+++ b/media-video/x264-encoder/Manifest
@@ -1 +1,2 @@
DIST x264-snapshot-20170701-2245.tar.bz2 750527 BLAKE2B ccf276da31383ab4b4a1ac48866bc49b4b2bc5913361c933fa2359de4d6e90cca091dd4aba781f3735a5b28d6ce006aa9d4e149ba48745b80cb971c2952ca867 SHA512 28fc9850c36ac385fced6dec9a0f68a5605a68805e1ef7b8cedcd78917eaa1ad6e47e57fe5a74fee0a6e482f3a33de6011f675e6c77b5db94c8fe01d5c5f3e9f
+DIST x264-snapshot-20190214-2245.tar.bz2 770462 BLAKE2B d90a3bafb88febe12526b225617616a62c32fa3d3eacf410267e1fbd7e0fafaadca7c146172c08fc525bce8791d81c7d87dc27b06d61a6a44bf2ad92f6c1def6 SHA512 c8b1b46d4e6c0ef653dab35083a454c635ebf72c6a5255ce30bbb5d9d6bb8e23fca0e6cc197ea99f3c702fbfec096587df6fa82dec338d8bd45e35fa89c43039
diff --git a/media-video/x264-encoder/x264-encoder-0.0.20190214.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20190214.ebuild
new file mode 100644
index 00000000000..ae007c71112
--- /dev/null
+++ b/media-video/x264-encoder/x264-encoder-0.0.20190214.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="A free commandline encoder for X264/AVC streams"
+HOMEPAGE="https://www.videolan.org/developers/x264.html"
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://git.videolan.org/git/x264.git"
+ SRC_URI=""
+else
+ MY_P="x264-snapshot-$(ver_cut 3)-2245"
+ SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
+ KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+ S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="avs custom-cflags ffmpeg ffmpegsource +interlaced libav mp4 +threads"
+
+REQUIRED_USE="ffmpegsource? ( ffmpeg )"
+
+RDEPEND="
+ ~media-libs/x264-${PV}[interlaced=,threads=]
+ ffmpeg? (
+ !libav? ( media-video/ffmpeg:= )
+ libav? ( media-video/libav:= )
+ )
+ ffmpegsource? ( media-libs/ffmpegsource )
+ mp4? ( >=media-video/gpac-0.5.2:= )"
+
+ASM_DEP=">=dev-lang/nasm-2.13"
+DEPEND="${RDEPEND}
+ amd64? ( ${ASM_DEP} )
+ x86? ( ${ASM_DEP} )
+ x86-fbsd? ( ${ASM_DEP} )"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}/gpac.patch" )
+
+src_configure() {
+ tc-export CC
+
+ # let upstream pick the optimization level by default
+ use custom-cflags || filter-flags -O?
+
+ ./configure \
+ --prefix="${EPREFIX}"/usr \
+ --libdir="${EPREFIX}"/usr/$(get_libdir) \
+ --system-libx264 \
+ --host="${CHOST}" \
+ --disable-lsmash \
+ $(usex avs "" "--disable-avs") \
+ $(usex ffmpeg "" "--disable-lavf --disable-swscale") \
+ $(usex ffmpegsource "" "--disable-ffms") \
+ $(usex interlaced "" "--disable-interlaced") \
+ $(usex mp4 "" "--disable-gpac") \
+ $(usex threads "" "--disable-thread") || die
+
+ # this is a nasty workaround for bug #376925 for x264 that also applies
+ # here, needed because as upstream doesn't like us fiddling with their CFLAGS
+ if use custom-cflags; then
+ local cflags
+ cflags="$(grep "^CFLAGS=" config.mak | sed 's/CFLAGS=//')"
+ cflags="${cflags//$(get-flag O)/}"
+ cflags="${cflags//-O? /$(get-flag O) }"
+ cflags="${cflags//-g /}"
+ sed -i "s:^CFLAGS=.*:CFLAGS=${cflags//:/\\:}:" config.mak
+ fi
+}
^ permalink raw reply related [flat|nested] 36+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/x264-encoder/
@ 2019-01-17 2:47 Andreas Sturmlechner
0 siblings, 0 replies; 36+ messages in thread
From: Andreas Sturmlechner @ 2019-01-17 2:47 UTC (permalink / raw
To: gentoo-commits
commit: 0cc6977833961d39dd68ef2040878d26ec441615
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 17 02:41:26 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jan 17 02:47:22 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cc69778
media-video/x264-encoder: Switch virtual/ffmpeg -> USE ffmpeg/libav
Package-Manager: Portage-2.3.56, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-video/x264-encoder/x264-encoder-9999.ebuild | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/media-video/x264-encoder/x264-encoder-9999.ebuild b/media-video/x264-encoder/x264-encoder-9999.ebuild
index 8c3b410528a..3a0cdc8541f 100644
--- a/media-video/x264-encoder/x264-encoder-9999.ebuild
+++ b/media-video/x264-encoder/x264-encoder-9999.ebuild
@@ -21,13 +21,16 @@ fi
LICENSE="GPL-2"
SLOT="0"
-IUSE="avs custom-cflags ffmpeg ffmpegsource +interlaced mp4 +threads"
+IUSE="avs custom-cflags ffmpeg ffmpegsource +interlaced libav mp4 +threads"
REQUIRED_USE="ffmpegsource? ( ffmpeg )"
RDEPEND="
~media-libs/x264-${PV}[interlaced=,threads=]
- ffmpeg? ( virtual/ffmpeg )
+ ffmpeg? (
+ !libav? ( media-video/ffmpeg:= )
+ libav? ( media-video/libav:= )
+ )
ffmpegsource? ( media-libs/ffmpegsource )
mp4? ( >=media-video/gpac-0.5.2:= )"
^ permalink raw reply related [flat|nested] 36+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/x264-encoder/
@ 2019-01-17 2:47 Andreas Sturmlechner
0 siblings, 0 replies; 36+ messages in thread
From: Andreas Sturmlechner @ 2019-01-17 2:47 UTC (permalink / raw
To: gentoo-commits
commit: a8928d86d6e8ce4e4b81e4dcd04760525aba7381
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 17 02:37:52 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jan 17 02:47:22 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8928d86
media-video/x264-encoder: Drop USE 10bit
Closes: https://bugs.gentoo.org/644114
Package-Manager: Portage-2.3.56, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-video/x264-encoder/x264-encoder-9999.ebuild | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/media-video/x264-encoder/x264-encoder-9999.ebuild b/media-video/x264-encoder/x264-encoder-9999.ebuild
index 4958c30688e..8c3b410528a 100644
--- a/media-video/x264-encoder/x264-encoder-9999.ebuild
+++ b/media-video/x264-encoder/x264-encoder-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -21,12 +21,12 @@ fi
LICENSE="GPL-2"
SLOT="0"
-IUSE="10bit avs custom-cflags ffmpeg ffmpegsource +interlaced mp4 +threads"
+IUSE="avs custom-cflags ffmpeg ffmpegsource +interlaced mp4 +threads"
REQUIRED_USE="ffmpegsource? ( ffmpeg )"
RDEPEND="
- ~media-libs/x264-${PV}[10bit=,interlaced=,threads=]
+ ~media-libs/x264-${PV}[interlaced=,threads=]
ffmpeg? ( virtual/ffmpeg )
ffmpegsource? ( media-libs/ffmpegsource )
mp4? ( >=media-video/gpac-0.5.2:= )"
@@ -52,7 +52,6 @@ src_configure() {
--system-libx264 \
--host="${CHOST}" \
--disable-lsmash \
- $(usex 10bit "--bit-depth=10" "") \
$(usex avs "" "--disable-avs") \
$(usex ffmpeg "" "--disable-lavf --disable-swscale") \
$(usex ffmpegsource "" "--disable-ffms") \
^ permalink raw reply related [flat|nested] 36+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/x264-encoder/
@ 2019-01-17 2:47 Andreas Sturmlechner
0 siblings, 0 replies; 36+ messages in thread
From: Andreas Sturmlechner @ 2019-01-17 2:47 UTC (permalink / raw
To: gentoo-commits
commit: 460ca8f587c7f197273db7057f27ad2d16adb487
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 17 02:43:34 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jan 17 02:47:22 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=460ca8f5
media-video/x264-encoder: EAPI-7 bump
Package-Manager: Portage-2.3.56, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-video/x264-encoder/x264-encoder-9999.ebuild | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/media-video/x264-encoder/x264-encoder-9999.ebuild b/media-video/x264-encoder/x264-encoder-9999.ebuild
index 3a0cdc8541f..ae007c71112 100644
--- a/media-video/x264-encoder/x264-encoder-9999.ebuild
+++ b/media-video/x264-encoder/x264-encoder-9999.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit flag-o-matic toolchain-funcs
@@ -12,8 +12,7 @@ if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://git.videolan.org/git/x264.git"
SRC_URI=""
else
- inherit versionator
- MY_P="x264-snapshot-$(get_version_component_range 3)-2245"
+ MY_P="x264-snapshot-$(ver_cut 3)-2245"
SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
S="${WORKDIR}/${MY_P}"
@@ -38,8 +37,8 @@ ASM_DEP=">=dev-lang/nasm-2.13"
DEPEND="${RDEPEND}
amd64? ( ${ASM_DEP} )
x86? ( ${ASM_DEP} )
- x86-fbsd? ( ${ASM_DEP} )
- virtual/pkgconfig"
+ x86-fbsd? ( ${ASM_DEP} )"
+BDEPEND="virtual/pkgconfig"
PATCHES=( "${FILESDIR}/gpac.patch" )
^ permalink raw reply related [flat|nested] 36+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/x264-encoder/
@ 2018-05-20 20:17 Andreas Sturmlechner
0 siblings, 0 replies; 36+ messages in thread
From: Andreas Sturmlechner @ 2018-05-20 20:17 UTC (permalink / raw
To: gentoo-commits
commit: 21fdd48f8137fc9fa8bdc0644d9ecdbfd4549419
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun May 20 20:16:01 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun May 20 20:17:23 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21fdd48f
media-video/x264-encoder: Drop old
Package-Manager: Portage-2.3.38, Repoman-2.3.9
media-video/x264-encoder/Manifest | 1 -
.../x264-encoder/x264-encoder-0.0.20160712.ebuild | 74 ----------------------
2 files changed, 75 deletions(-)
diff --git a/media-video/x264-encoder/Manifest b/media-video/x264-encoder/Manifest
index a63f222091d..0a6d8558016 100644
--- a/media-video/x264-encoder/Manifest
+++ b/media-video/x264-encoder/Manifest
@@ -1,2 +1 @@
-DIST x264-snapshot-20160712-2245.tar.bz2 730644 BLAKE2B 3d80d831c5a13ab95f9a4ba269f959e36aa35f4f2914d435b9e9817fcbe40105f44881b0dbb92cad4b9c41e25536194ff2b7c35925bff9016ebca5e38b16c54e SHA512 ac97730611e6194701a891a7e73c739696664de2411a7937ab0c36a3ce843f22bf2bd2defe053c2506d95652842b99a905b6f16a2f016a9d73059c2c75b71963
DIST x264-snapshot-20170701-2245.tar.bz2 750527 BLAKE2B ccf276da31383ab4b4a1ac48866bc49b4b2bc5913361c933fa2359de4d6e90cca091dd4aba781f3735a5b28d6ce006aa9d4e149ba48745b80cb971c2952ca867 SHA512 28fc9850c36ac385fced6dec9a0f68a5605a68805e1ef7b8cedcd78917eaa1ad6e47e57fe5a74fee0a6e482f3a33de6011f675e6c77b5db94c8fe01d5c5f3e9f
diff --git a/media-video/x264-encoder/x264-encoder-0.0.20160712.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20160712.ebuild
deleted file mode 100644
index 0f3b0b91384..00000000000
--- a/media-video/x264-encoder/x264-encoder-0.0.20160712.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit flag-o-matic multilib toolchain-funcs eutils
-
-DESCRIPTION="A free commandline encoder for X264/AVC streams"
-HOMEPAGE="http://www.videolan.org/developers/x264.html"
-if [[ ${PV} == 9999 ]]; then
- inherit git-2
- EGIT_REPO_URI="git://git.videolan.org/x264.git"
- SRC_URI=""
-else
- inherit versionator
- MY_P="x264-snapshot-$(get_version_component_range 3)-2245"
- SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
- KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
- S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="10bit avs custom-cflags ffmpeg ffmpegsource +interlaced mp4 +threads"
-
-REQUIRED_USE="ffmpegsource? ( ffmpeg )"
-
-RDEPEND="ffmpeg? ( virtual/ffmpeg )
- ~media-libs/x264-${PV}[10bit=,interlaced=,threads=]
- ffmpegsource? ( media-libs/ffmpegsource )
- mp4? ( >=media-video/gpac-0.5.2 )"
-
-ASM_DEP=">=dev-lang/yasm-1.2.0"
-DEPEND="${RDEPEND}
- amd64? ( ${ASM_DEP} )
- x86? ( ${ASM_DEP} )
- x86-fbsd? ( ${ASM_DEP} )
- virtual/pkgconfig"
-
-src_prepare() {
- epatch "${FILESDIR}/gpac.patch"
-}
-
-src_configure() {
- tc-export CC
-
- # let upstream pick the optimization level by default
- use custom-cflags || filter-flags -O?
-
- ./configure \
- --prefix="${EPREFIX}"/usr \
- --libdir="${EPREFIX}"/usr/$(get_libdir) \
- --system-libx264 \
- --host="${CHOST}" \
- --disable-lsmash \
- $(usex 10bit "--bit-depth=10" "") \
- $(usex avs "" "--disable-avs") \
- $(usex ffmpeg "" "--disable-lavf --disable-swscale") \
- $(usex ffmpegsource "" "--disable-ffms") \
- $(usex interlaced "" "--disable-interlaced") \
- $(usex mp4 "" "--disable-gpac") \
- $(usex threads "" "--disable-thread") || die
-
- # this is a nasty workaround for bug #376925 for x264 that also applies
- # here, needed because as upstream doesn't like us fiddling with their CFLAGS
- if use custom-cflags; then
- local cflags
- cflags="$(grep "^CFLAGS=" config.mak | sed 's/CFLAGS=//')"
- cflags="${cflags//$(get-flag O)/}"
- cflags="${cflags//-O? /$(get-flag O) }"
- cflags="${cflags//-g /}"
- sed -i "s:^CFLAGS=.*:CFLAGS=${cflags//:/\\:}:" config.mak
- fi
-}
^ permalink raw reply related [flat|nested] 36+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/x264-encoder/
@ 2018-02-26 14:25 Jason Zaman
0 siblings, 0 replies; 36+ messages in thread
From: Jason Zaman @ 2018-02-26 14:25 UTC (permalink / raw
To: gentoo-commits
commit: c2c53a8d653e7bea4d8b6d4d8674cab5e7f533c3
Author: Jason Zaman <perfinion <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 26 14:21:44 2018 +0000
Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Mon Feb 26 14:21:44 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2c53a8d
media-video/x264-encoder: amd64 stable
Gentoo-bug: 648078
Package-Manager: Portage-2.3.19, Repoman-2.3.6
media-video/x264-encoder/x264-encoder-0.0.20170701.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-video/x264-encoder/x264-encoder-0.0.20170701.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20170701.ebuild
index 705e8063e25..56e61327598 100644
--- a/media-video/x264-encoder/x264-encoder-0.0.20170701.ebuild
+++ b/media-video/x264-encoder/x264-encoder-0.0.20170701.ebuild
@@ -15,7 +15,7 @@ else
inherit versionator
MY_P="x264-snapshot-$(get_version_component_range 3)-2245"
SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
- KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+ KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
S="${WORKDIR}/${MY_P}"
fi
^ permalink raw reply related [flat|nested] 36+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/x264-encoder/
@ 2018-02-25 20:16 Thomas Deutschmann
0 siblings, 0 replies; 36+ messages in thread
From: Thomas Deutschmann @ 2018-02-25 20:16 UTC (permalink / raw
To: gentoo-commits
commit: 6c3ca5b02ef89fd1ef2e3c97518b15f34ef033f3
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 25 20:16:07 2018 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Feb 25 20:16:39 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c3ca5b0
media-video/x264-encoder: x86 stable (bug #648078)
Package-Manager: Portage-2.3.24, Repoman-2.3.6
media-video/x264-encoder/x264-encoder-0.0.20170701.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-video/x264-encoder/x264-encoder-0.0.20170701.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20170701.ebuild
index 4958c30688e..705e8063e25 100644
--- a/media-video/x264-encoder/x264-encoder-0.0.20170701.ebuild
+++ b/media-video/x264-encoder/x264-encoder-0.0.20170701.ebuild
@@ -15,7 +15,7 @@ else
inherit versionator
MY_P="x264-snapshot-$(get_version_component_range 3)-2245"
SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
- KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+ KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
S="${WORKDIR}/${MY_P}"
fi
^ permalink raw reply related [flat|nested] 36+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/x264-encoder/
@ 2018-02-25 19:41 Andreas Sturmlechner
0 siblings, 0 replies; 36+ messages in thread
From: Andreas Sturmlechner @ 2018-02-25 19:41 UTC (permalink / raw
To: gentoo-commits
commit: 0e7fbcdb423e8e0bafb13474a5d01c7abc132ec8
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 25 19:30:03 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 25 19:41:44 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e7fbcdb
media-video/x264-encoder: EAPI 6, git-r3, https
Package-Manager: Portage-2.3.24, Repoman-2.3.6
.../x264-encoder/x264-encoder-0.0.20170701.ebuild | 19 +++++++++----------
media-video/x264-encoder/x264-encoder-9999.ebuild | 19 +++++++++----------
2 files changed, 18 insertions(+), 20 deletions(-)
diff --git a/media-video/x264-encoder/x264-encoder-0.0.20170701.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20170701.ebuild
index 96667a601b4..4958c30688e 100644
--- a/media-video/x264-encoder/x264-encoder-0.0.20170701.ebuild
+++ b/media-video/x264-encoder/x264-encoder-0.0.20170701.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
-inherit flag-o-matic multilib toolchain-funcs eutils
+inherit flag-o-matic toolchain-funcs
DESCRIPTION="A free commandline encoder for X264/AVC streams"
-HOMEPAGE="http://www.videolan.org/developers/x264.html"
+HOMEPAGE="https://www.videolan.org/developers/x264.html"
if [[ ${PV} == 9999 ]]; then
- inherit git-2
- EGIT_REPO_URI="git://git.videolan.org/x264.git"
+ inherit git-r3
+ EGIT_REPO_URI="https://git.videolan.org/git/x264.git"
SRC_URI=""
else
inherit versionator
@@ -25,8 +25,9 @@ IUSE="10bit avs custom-cflags ffmpeg ffmpegsource +interlaced mp4 +threads"
REQUIRED_USE="ffmpegsource? ( ffmpeg )"
-RDEPEND="ffmpeg? ( virtual/ffmpeg )
+RDEPEND="
~media-libs/x264-${PV}[10bit=,interlaced=,threads=]
+ ffmpeg? ( virtual/ffmpeg )
ffmpegsource? ( media-libs/ffmpegsource )
mp4? ( >=media-video/gpac-0.5.2:= )"
@@ -37,9 +38,7 @@ DEPEND="${RDEPEND}
x86-fbsd? ( ${ASM_DEP} )
virtual/pkgconfig"
-src_prepare() {
- epatch "${FILESDIR}/gpac.patch"
-}
+PATCHES=( "${FILESDIR}/gpac.patch" )
src_configure() {
tc-export CC
diff --git a/media-video/x264-encoder/x264-encoder-9999.ebuild b/media-video/x264-encoder/x264-encoder-9999.ebuild
index 96667a601b4..4958c30688e 100644
--- a/media-video/x264-encoder/x264-encoder-9999.ebuild
+++ b/media-video/x264-encoder/x264-encoder-9999.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
-inherit flag-o-matic multilib toolchain-funcs eutils
+inherit flag-o-matic toolchain-funcs
DESCRIPTION="A free commandline encoder for X264/AVC streams"
-HOMEPAGE="http://www.videolan.org/developers/x264.html"
+HOMEPAGE="https://www.videolan.org/developers/x264.html"
if [[ ${PV} == 9999 ]]; then
- inherit git-2
- EGIT_REPO_URI="git://git.videolan.org/x264.git"
+ inherit git-r3
+ EGIT_REPO_URI="https://git.videolan.org/git/x264.git"
SRC_URI=""
else
inherit versionator
@@ -25,8 +25,9 @@ IUSE="10bit avs custom-cflags ffmpeg ffmpegsource +interlaced mp4 +threads"
REQUIRED_USE="ffmpegsource? ( ffmpeg )"
-RDEPEND="ffmpeg? ( virtual/ffmpeg )
+RDEPEND="
~media-libs/x264-${PV}[10bit=,interlaced=,threads=]
+ ffmpeg? ( virtual/ffmpeg )
ffmpegsource? ( media-libs/ffmpegsource )
mp4? ( >=media-video/gpac-0.5.2:= )"
@@ -37,9 +38,7 @@ DEPEND="${RDEPEND}
x86-fbsd? ( ${ASM_DEP} )
virtual/pkgconfig"
-src_prepare() {
- epatch "${FILESDIR}/gpac.patch"
-}
+PATCHES=( "${FILESDIR}/gpac.patch" )
src_configure() {
tc-export CC
^ permalink raw reply related [flat|nested] 36+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/x264-encoder/
@ 2017-07-29 10:06 Alexis Ballier
0 siblings, 0 replies; 36+ messages in thread
From: Alexis Ballier @ 2017-07-29 10:06 UTC (permalink / raw
To: gentoo-commits
commit: 33701ff96828e2b1de5d5bb627c23e3975444f57
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 28 08:30:59 2017 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Sat Jul 29 10:05:37 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33701ff9
media-video/x264-encoder: add := dep on gpac
Package-Manager: Portage-2.3.6, Repoman-2.3.3
media-video/x264-encoder/x264-encoder-0.0.20170701.ebuild | 2 +-
media-video/x264-encoder/x264-encoder-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-video/x264-encoder/x264-encoder-0.0.20170701.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20170701.ebuild
index 292bca0ee5b..96667a601b4 100644
--- a/media-video/x264-encoder/x264-encoder-0.0.20170701.ebuild
+++ b/media-video/x264-encoder/x264-encoder-0.0.20170701.ebuild
@@ -28,7 +28,7 @@ REQUIRED_USE="ffmpegsource? ( ffmpeg )"
RDEPEND="ffmpeg? ( virtual/ffmpeg )
~media-libs/x264-${PV}[10bit=,interlaced=,threads=]
ffmpegsource? ( media-libs/ffmpegsource )
- mp4? ( >=media-video/gpac-0.5.2 )"
+ mp4? ( >=media-video/gpac-0.5.2:= )"
ASM_DEP=">=dev-lang/nasm-2.13"
DEPEND="${RDEPEND}
diff --git a/media-video/x264-encoder/x264-encoder-9999.ebuild b/media-video/x264-encoder/x264-encoder-9999.ebuild
index 292bca0ee5b..96667a601b4 100644
--- a/media-video/x264-encoder/x264-encoder-9999.ebuild
+++ b/media-video/x264-encoder/x264-encoder-9999.ebuild
@@ -28,7 +28,7 @@ REQUIRED_USE="ffmpegsource? ( ffmpeg )"
RDEPEND="ffmpeg? ( virtual/ffmpeg )
~media-libs/x264-${PV}[10bit=,interlaced=,threads=]
ffmpegsource? ( media-libs/ffmpegsource )
- mp4? ( >=media-video/gpac-0.5.2 )"
+ mp4? ( >=media-video/gpac-0.5.2:= )"
ASM_DEP=">=dev-lang/nasm-2.13"
DEPEND="${RDEPEND}
^ permalink raw reply related [flat|nested] 36+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/x264-encoder/
@ 2017-07-02 10:04 Alexis Ballier
0 siblings, 0 replies; 36+ messages in thread
From: Alexis Ballier @ 2017-07-02 10:04 UTC (permalink / raw
To: gentoo-commits
commit: 5fd5a078f753ec5d55a2530246295b592f803876
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 2 09:42:26 2017 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Sun Jul 2 10:04:41 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fd5a078
media-video/x264-encoder: bump a new snapshot
Package-Manager: Portage-2.3.6, Repoman-2.3.2
media-video/x264-encoder/Manifest | 1 +
.../x264-encoder/x264-encoder-0.0.20170701.ebuild | 74 ++++++++++++++++++++++
2 files changed, 75 insertions(+)
diff --git a/media-video/x264-encoder/Manifest b/media-video/x264-encoder/Manifest
index a8c41735ff3..5343ed75b11 100644
--- a/media-video/x264-encoder/Manifest
+++ b/media-video/x264-encoder/Manifest
@@ -1 +1,2 @@
DIST x264-snapshot-20160712-2245.tar.bz2 730644 SHA256 d5033882bbc7e2908f74970931c7dc2044191cc9fa7c7435dc85ad334f23078e SHA512 ac97730611e6194701a891a7e73c739696664de2411a7937ab0c36a3ce843f22bf2bd2defe053c2506d95652842b99a905b6f16a2f016a9d73059c2c75b71963 WHIRLPOOL d42459a93e8ff1b69d16f7adecaf3486d102e6fe4ee0d8dd991cdbb7a233bb9975faabc79ff7d2dfd2f67fa1f69a729e617ae868ee127cc0306dfc897db7053b
+DIST x264-snapshot-20170701-2245.tar.bz2 750527 SHA256 6ca4863cda3c7c24923ebd2c062c001a05283d50922292ee55dfda7811782380 SHA512 28fc9850c36ac385fced6dec9a0f68a5605a68805e1ef7b8cedcd78917eaa1ad6e47e57fe5a74fee0a6e482f3a33de6011f675e6c77b5db94c8fe01d5c5f3e9f WHIRLPOOL 063c0d3685d961b96101c98110345d1b283dbfe2b2098be51b4cb55f9d0551e80d01d449a2622ebba457a5a8374f5c2783351e2e1f0bfabf150be27dbcc07965
diff --git a/media-video/x264-encoder/x264-encoder-0.0.20170701.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20170701.ebuild
new file mode 100644
index 00000000000..292bca0ee5b
--- /dev/null
+++ b/media-video/x264-encoder/x264-encoder-0.0.20170701.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit flag-o-matic multilib toolchain-funcs eutils
+
+DESCRIPTION="A free commandline encoder for X264/AVC streams"
+HOMEPAGE="http://www.videolan.org/developers/x264.html"
+if [[ ${PV} == 9999 ]]; then
+ inherit git-2
+ EGIT_REPO_URI="git://git.videolan.org/x264.git"
+ SRC_URI=""
+else
+ inherit versionator
+ MY_P="x264-snapshot-$(get_version_component_range 3)-2245"
+ SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
+ KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+ S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="10bit avs custom-cflags ffmpeg ffmpegsource +interlaced mp4 +threads"
+
+REQUIRED_USE="ffmpegsource? ( ffmpeg )"
+
+RDEPEND="ffmpeg? ( virtual/ffmpeg )
+ ~media-libs/x264-${PV}[10bit=,interlaced=,threads=]
+ ffmpegsource? ( media-libs/ffmpegsource )
+ mp4? ( >=media-video/gpac-0.5.2 )"
+
+ASM_DEP=">=dev-lang/nasm-2.13"
+DEPEND="${RDEPEND}
+ amd64? ( ${ASM_DEP} )
+ x86? ( ${ASM_DEP} )
+ x86-fbsd? ( ${ASM_DEP} )
+ virtual/pkgconfig"
+
+src_prepare() {
+ epatch "${FILESDIR}/gpac.patch"
+}
+
+src_configure() {
+ tc-export CC
+
+ # let upstream pick the optimization level by default
+ use custom-cflags || filter-flags -O?
+
+ ./configure \
+ --prefix="${EPREFIX}"/usr \
+ --libdir="${EPREFIX}"/usr/$(get_libdir) \
+ --system-libx264 \
+ --host="${CHOST}" \
+ --disable-lsmash \
+ $(usex 10bit "--bit-depth=10" "") \
+ $(usex avs "" "--disable-avs") \
+ $(usex ffmpeg "" "--disable-lavf --disable-swscale") \
+ $(usex ffmpegsource "" "--disable-ffms") \
+ $(usex interlaced "" "--disable-interlaced") \
+ $(usex mp4 "" "--disable-gpac") \
+ $(usex threads "" "--disable-thread") || die
+
+ # this is a nasty workaround for bug #376925 for x264 that also applies
+ # here, needed because as upstream doesn't like us fiddling with their CFLAGS
+ if use custom-cflags; then
+ local cflags
+ cflags="$(grep "^CFLAGS=" config.mak | sed 's/CFLAGS=//')"
+ cflags="${cflags//$(get-flag O)/}"
+ cflags="${cflags//-O? /$(get-flag O) }"
+ cflags="${cflags//-g /}"
+ sed -i "s:^CFLAGS=.*:CFLAGS=${cflags//:/\\:}:" config.mak
+ fi
+}
^ permalink raw reply related [flat|nested] 36+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/x264-encoder/
@ 2017-07-02 10:04 Alexis Ballier
0 siblings, 0 replies; 36+ messages in thread
From: Alexis Ballier @ 2017-07-02 10:04 UTC (permalink / raw
To: gentoo-commits
commit: 52b9dcbc53eb10c9d9ea702e7c2ffdb68ed82fb0
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 2 09:26:43 2017 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Sun Jul 2 10:04:38 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52b9dcbc
media-video/x264-encoder: fix asm deps (nasm 2.13 is required now)
Package-Manager: Portage-2.3.6, Repoman-2.3.2
media-video/x264-encoder/x264-encoder-9999.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-video/x264-encoder/x264-encoder-9999.ebuild b/media-video/x264-encoder/x264-encoder-9999.ebuild
index 5ca8ce76dc2..292bca0ee5b 100644
--- a/media-video/x264-encoder/x264-encoder-9999.ebuild
+++ b/media-video/x264-encoder/x264-encoder-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -30,7 +30,7 @@ RDEPEND="ffmpeg? ( virtual/ffmpeg )
ffmpegsource? ( media-libs/ffmpegsource )
mp4? ( >=media-video/gpac-0.5.2 )"
-ASM_DEP=">=dev-lang/yasm-1.2.0"
+ASM_DEP=">=dev-lang/nasm-2.13"
DEPEND="${RDEPEND}
amd64? ( ${ASM_DEP} )
x86? ( ${ASM_DEP} )
^ permalink raw reply related [flat|nested] 36+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/x264-encoder/
@ 2017-01-31 14:04 Alexis Ballier
0 siblings, 0 replies; 36+ messages in thread
From: Alexis Ballier @ 2017-01-31 14:04 UTC (permalink / raw
To: gentoo-commits
commit: e3788098925bc1bd40b01361768cf1067b316610
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 31 14:02:59 2017 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Jan 31 14:04:20 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3788098
media-video/x264-encoder: remove old
Package-Manager: Portage-2.3.3, Repoman-2.3.1
media-video/x264-encoder/Manifest | 3 -
.../x264-encoder/x264-encoder-0.0.20140308.ebuild | 71 --------------------
.../x264-encoder/x264-encoder-0.0.20151011.ebuild | 75 ----------------------
.../x264-encoder/x264-encoder-0.0.20160523.ebuild | 75 ----------------------
4 files changed, 224 deletions(-)
diff --git a/media-video/x264-encoder/Manifest b/media-video/x264-encoder/Manifest
index 8359baf..a8c4173 100644
--- a/media-video/x264-encoder/Manifest
+++ b/media-video/x264-encoder/Manifest
@@ -1,4 +1 @@
-DIST x264-snapshot-20140308-2245.tar.bz2 624712 SHA256 b179cb1e1d4f51418d292011a7494d5b62145571c05c22007f28d8fd89d2ebbe SHA512 42dc8183aa7af2bd4c360edc0349193cf69a119450880af0c1586e8f27490d7c6784c464b29c9f07ae972aaf661672ab4f2094a46a3d19b6df35be1f9d9a1629 WHIRLPOOL b1ac3341647d9d8d8ff6177f179ee8b5d6a49a38a48791748c24d5cd3c53858758785a0d21d42fbe373ec74465d947b69526a487da15fbca1a1f9aa50064288c
-DIST x264-snapshot-20151011-2245.tar.bz2 725627 SHA256 80a4075ea12a81ec3b6c493e03529c5b7c1afb34c6e91d86bb078bc2ead2ccf0 SHA512 a326d724f5a28268a6dca2e75f39d10f0d9cd137e6477cb8c1be377a8c3fe9de384f74498f7c6b785377bb43024526e72ff8363b67a7e17717b176e5249df5e3 WHIRLPOOL 520dd79b2f3dfdd9e4629bd810fe8560205f4e3581d03854bd2aea35fbac565520cec336f214da688428c320bab3dea0d692a9cb816f9f53fc89520b54e200e3
-DIST x264-snapshot-20160523-2245.tar.bz2 729952 SHA256 1176c018e4896a440bf0b18ed76e3d92de7a7ce5b1e28a7efd5f6e54bf1d6860 SHA512 71cce21acec300842a8323ef8999e655520e2d47288fe983631e0d6fa180155badd9026d58057edebfd73b002f79c9c0011439e8ee9878b3bf0574e8a16fdff9 WHIRLPOOL fb844e07752a9e48ed2ccd75f34730528c60c22f9a17791c0e002f1c7d25224b814af288e6f6a9563da832bb2fc9a0fed6c92e60bb102e244ee0de24eee40b24
DIST x264-snapshot-20160712-2245.tar.bz2 730644 SHA256 d5033882bbc7e2908f74970931c7dc2044191cc9fa7c7435dc85ad334f23078e SHA512 ac97730611e6194701a891a7e73c739696664de2411a7937ab0c36a3ce843f22bf2bd2defe053c2506d95652842b99a905b6f16a2f016a9d73059c2c75b71963 WHIRLPOOL d42459a93e8ff1b69d16f7adecaf3486d102e6fe4ee0d8dd991cdbb7a233bb9975faabc79ff7d2dfd2f67fa1f69a729e617ae868ee127cc0306dfc897db7053b
diff --git a/media-video/x264-encoder/x264-encoder-0.0.20140308.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20140308.ebuild
deleted file mode 100644
index 1f30d4e..00000000
--- a/media-video/x264-encoder/x264-encoder-0.0.20140308.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="A free commandline encoder for X264/AVC streams"
-HOMEPAGE="http://www.videolan.org/developers/x264.html"
-if [[ ${PV} == 9999 ]]; then
- inherit git-2
- EGIT_REPO_URI="git://git.videolan.org/x264.git"
- SRC_URI=""
-else
- inherit versionator
- MY_P="x264-snapshot-$(get_version_component_range 3)-2245"
- SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
- KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
- S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="10bit avs custom-cflags ffmpeg ffmpegsource +interlaced mp4 +threads"
-
-REQUIRED_USE="ffmpegsource? ( ffmpeg )"
-
-RDEPEND="ffmpeg? ( virtual/ffmpeg )
- ~media-libs/x264-${PV}[10bit=,interlaced=,threads=]
- ffmpegsource? ( media-libs/ffmpegsource )
- mp4? ( >=media-video/gpac-0.4.1_pre20060122 )"
-
-ASM_DEP=">=dev-lang/yasm-1.2.0"
-DEPEND="${RDEPEND}
- amd64? ( ${ASM_DEP} )
- x86? ( ${ASM_DEP} )
- x86-fbsd? ( ${ASM_DEP} )
- virtual/pkgconfig"
-
-src_configure() {
- tc-export CC
-
- # let upstream pick the optimization level by default
- use custom-cflags || filter-flags -O?
-
- ./configure \
- --prefix="${EPREFIX}"/usr \
- --libdir="${EPREFIX}"/usr/$(get_libdir) \
- --system-libx264 \
- --host="${CHOST}" \
- --disable-lsmash \
- $(usex 10bit "--bit-depth=10" "") \
- $(usex avs "" "--disable-avs") \
- $(usex ffmpeg "" "--disable-lavf --disable-swscale") \
- $(usex ffmpegsource "" "--disable-ffms") \
- $(usex interlaced "" "--disable-interlaced") \
- $(usex mp4 "" "--disable-gpac") \
- $(usex threads "" "--disable-thread") || die
-
- # this is a nasty workaround for bug #376925 for x264 that also applies
- # here, needed because as upstream doesn't like us fiddling with their CFLAGS
- if use custom-cflags; then
- local cflags
- cflags="$(grep "^CFLAGS=" config.mak | sed 's/CFLAGS=//')"
- cflags="${cflags//$(get-flag O)/}"
- cflags="${cflags//-O? /$(get-flag O) }"
- cflags="${cflags//-g /}"
- sed -i "s:^CFLAGS=.*:CFLAGS=${cflags//:/\\:}:" config.mak
- fi
-}
diff --git a/media-video/x264-encoder/x264-encoder-0.0.20151011.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20151011.ebuild
deleted file mode 100644
index 71259d7..00000000
--- a/media-video/x264-encoder/x264-encoder-0.0.20151011.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit flag-o-matic multilib toolchain-funcs eutils
-
-DESCRIPTION="A free commandline encoder for X264/AVC streams"
-HOMEPAGE="http://www.videolan.org/developers/x264.html"
-if [[ ${PV} == 9999 ]]; then
- inherit git-2
- EGIT_REPO_URI="git://git.videolan.org/x264.git"
- SRC_URI=""
-else
- inherit versionator
- MY_P="x264-snapshot-$(get_version_component_range 3)-2245"
- SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
- KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
- S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="10bit avs custom-cflags ffmpeg ffmpegsource +interlaced mp4 +threads"
-
-REQUIRED_USE="ffmpegsource? ( ffmpeg )"
-
-RDEPEND="ffmpeg? ( virtual/ffmpeg )
- ~media-libs/x264-${PV}[10bit=,interlaced=,threads=]
- ffmpegsource? ( media-libs/ffmpegsource )
- mp4? ( >=media-video/gpac-0.5.2 )"
-
-ASM_DEP=">=dev-lang/yasm-1.2.0"
-DEPEND="${RDEPEND}
- amd64? ( ${ASM_DEP} )
- x86? ( ${ASM_DEP} )
- x86-fbsd? ( ${ASM_DEP} )
- virtual/pkgconfig"
-
-src_prepare() {
- epatch "${FILESDIR}/gpac.patch"
-}
-
-src_configure() {
- tc-export CC
-
- # let upstream pick the optimization level by default
- use custom-cflags || filter-flags -O?
-
- ./configure \
- --prefix="${EPREFIX}"/usr \
- --libdir="${EPREFIX}"/usr/$(get_libdir) \
- --system-libx264 \
- --host="${CHOST}" \
- --disable-lsmash \
- $(usex 10bit "--bit-depth=10" "") \
- $(usex avs "" "--disable-avs") \
- $(usex ffmpeg "" "--disable-lavf --disable-swscale") \
- $(usex ffmpegsource "" "--disable-ffms") \
- $(usex interlaced "" "--disable-interlaced") \
- $(usex mp4 "" "--disable-gpac") \
- $(usex threads "" "--disable-thread") || die
-
- # this is a nasty workaround for bug #376925 for x264 that also applies
- # here, needed because as upstream doesn't like us fiddling with their CFLAGS
- if use custom-cflags; then
- local cflags
- cflags="$(grep "^CFLAGS=" config.mak | sed 's/CFLAGS=//')"
- cflags="${cflags//$(get-flag O)/}"
- cflags="${cflags//-O? /$(get-flag O) }"
- cflags="${cflags//-g /}"
- sed -i "s:^CFLAGS=.*:CFLAGS=${cflags//:/\\:}:" config.mak
- fi
-}
diff --git a/media-video/x264-encoder/x264-encoder-0.0.20160523.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20160523.ebuild
deleted file mode 100644
index 02e46dd..00000000
--- a/media-video/x264-encoder/x264-encoder-0.0.20160523.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit flag-o-matic multilib toolchain-funcs eutils
-
-DESCRIPTION="A free commandline encoder for X264/AVC streams"
-HOMEPAGE="http://www.videolan.org/developers/x264.html"
-if [[ ${PV} == 9999 ]]; then
- inherit git-2
- EGIT_REPO_URI="git://git.videolan.org/x264.git"
- SRC_URI=""
-else
- inherit versionator
- MY_P="x264-snapshot-$(get_version_component_range 3)-2245"
- SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
- KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
- S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="10bit avs custom-cflags ffmpeg ffmpegsource +interlaced mp4 +threads"
-
-REQUIRED_USE="ffmpegsource? ( ffmpeg )"
-
-RDEPEND="ffmpeg? ( virtual/ffmpeg )
- ~media-libs/x264-${PV}[10bit=,interlaced=,threads=]
- ffmpegsource? ( media-libs/ffmpegsource )
- mp4? ( >=media-video/gpac-0.5.2 )"
-
-ASM_DEP=">=dev-lang/yasm-1.2.0"
-DEPEND="${RDEPEND}
- amd64? ( ${ASM_DEP} )
- x86? ( ${ASM_DEP} )
- x86-fbsd? ( ${ASM_DEP} )
- virtual/pkgconfig"
-
-src_prepare() {
- epatch "${FILESDIR}/gpac.patch"
-}
-
-src_configure() {
- tc-export CC
-
- # let upstream pick the optimization level by default
- use custom-cflags || filter-flags -O?
-
- ./configure \
- --prefix="${EPREFIX}"/usr \
- --libdir="${EPREFIX}"/usr/$(get_libdir) \
- --system-libx264 \
- --host="${CHOST}" \
- --disable-lsmash \
- $(usex 10bit "--bit-depth=10" "") \
- $(usex avs "" "--disable-avs") \
- $(usex ffmpeg "" "--disable-lavf --disable-swscale") \
- $(usex ffmpegsource "" "--disable-ffms") \
- $(usex interlaced "" "--disable-interlaced") \
- $(usex mp4 "" "--disable-gpac") \
- $(usex threads "" "--disable-thread") || die
-
- # this is a nasty workaround for bug #376925 for x264 that also applies
- # here, needed because as upstream doesn't like us fiddling with their CFLAGS
- if use custom-cflags; then
- local cflags
- cflags="$(grep "^CFLAGS=" config.mak | sed 's/CFLAGS=//')"
- cflags="${cflags//$(get-flag O)/}"
- cflags="${cflags//-O? /$(get-flag O) }"
- cflags="${cflags//-g /}"
- sed -i "s:^CFLAGS=.*:CFLAGS=${cflags//:/\\:}:" config.mak
- fi
-}
^ permalink raw reply related [flat|nested] 36+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/x264-encoder/
@ 2016-12-06 12:21 Agostino Sarubbo
0 siblings, 0 replies; 36+ messages in thread
From: Agostino Sarubbo @ 2016-12-06 12:21 UTC (permalink / raw
To: gentoo-commits
commit: 7fee60dc713515eeea9e970541b70250c7eb8730
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 6 12:21:35 2016 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Dec 6 12:21:35 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7fee60dc
media-video/x264-encoder: x86 stable wrt bug #579642
Package-Manager: portage-2.3.0
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
media-video/x264-encoder/x264-encoder-0.0.20160712.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-video/x264-encoder/x264-encoder-0.0.20160712.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20160712.ebuild
index c809a81..62cba21 100644
--- a/media-video/x264-encoder/x264-encoder-0.0.20160712.ebuild
+++ b/media-video/x264-encoder/x264-encoder-0.0.20160712.ebuild
@@ -16,7 +16,7 @@ else
inherit versionator
MY_P="x264-snapshot-$(get_version_component_range 3)-2245"
SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
- KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+ KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
S="${WORKDIR}/${MY_P}"
fi
^ permalink raw reply related [flat|nested] 36+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/x264-encoder/
@ 2016-12-06 12:21 Agostino Sarubbo
0 siblings, 0 replies; 36+ messages in thread
From: Agostino Sarubbo @ 2016-12-06 12:21 UTC (permalink / raw
To: gentoo-commits
commit: 118fd575a9852a33bad09789c53d4a333ae78283
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 6 12:21:01 2016 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Dec 6 12:21:01 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=118fd575
media-video/x264-encoder: amd64 stable wrt bug #579642
Package-Manager: portage-2.3.0
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
media-video/x264-encoder/x264-encoder-0.0.20160712.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-video/x264-encoder/x264-encoder-0.0.20160712.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20160712.ebuild
index 02e46dd..c809a81 100644
--- a/media-video/x264-encoder/x264-encoder-0.0.20160712.ebuild
+++ b/media-video/x264-encoder/x264-encoder-0.0.20160712.ebuild
@@ -16,7 +16,7 @@ else
inherit versionator
MY_P="x264-snapshot-$(get_version_component_range 3)-2245"
SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
- KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+ KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
S="${WORKDIR}/${MY_P}"
fi
^ permalink raw reply related [flat|nested] 36+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/x264-encoder/
@ 2016-07-13 13:24 Alexis Ballier
0 siblings, 0 replies; 36+ messages in thread
From: Alexis Ballier @ 2016-07-13 13:24 UTC (permalink / raw
To: gentoo-commits
commit: abad6fefc8749365a5367c8960a460342475fa24
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 13 13:24:00 2016 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Wed Jul 13 13:24:00 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abad6fef
media-video/x264-encoder: bump a new snapshot
Package-Manager: portage-2.3.0
media-video/x264-encoder/Manifest | 1 +
.../x264-encoder/x264-encoder-0.0.20160712.ebuild | 75 ++++++++++++++++++++++
2 files changed, 76 insertions(+)
diff --git a/media-video/x264-encoder/Manifest b/media-video/x264-encoder/Manifest
index 7e88eb8..8359baf 100644
--- a/media-video/x264-encoder/Manifest
+++ b/media-video/x264-encoder/Manifest
@@ -1,3 +1,4 @@
DIST x264-snapshot-20140308-2245.tar.bz2 624712 SHA256 b179cb1e1d4f51418d292011a7494d5b62145571c05c22007f28d8fd89d2ebbe SHA512 42dc8183aa7af2bd4c360edc0349193cf69a119450880af0c1586e8f27490d7c6784c464b29c9f07ae972aaf661672ab4f2094a46a3d19b6df35be1f9d9a1629 WHIRLPOOL b1ac3341647d9d8d8ff6177f179ee8b5d6a49a38a48791748c24d5cd3c53858758785a0d21d42fbe373ec74465d947b69526a487da15fbca1a1f9aa50064288c
DIST x264-snapshot-20151011-2245.tar.bz2 725627 SHA256 80a4075ea12a81ec3b6c493e03529c5b7c1afb34c6e91d86bb078bc2ead2ccf0 SHA512 a326d724f5a28268a6dca2e75f39d10f0d9cd137e6477cb8c1be377a8c3fe9de384f74498f7c6b785377bb43024526e72ff8363b67a7e17717b176e5249df5e3 WHIRLPOOL 520dd79b2f3dfdd9e4629bd810fe8560205f4e3581d03854bd2aea35fbac565520cec336f214da688428c320bab3dea0d692a9cb816f9f53fc89520b54e200e3
DIST x264-snapshot-20160523-2245.tar.bz2 729952 SHA256 1176c018e4896a440bf0b18ed76e3d92de7a7ce5b1e28a7efd5f6e54bf1d6860 SHA512 71cce21acec300842a8323ef8999e655520e2d47288fe983631e0d6fa180155badd9026d58057edebfd73b002f79c9c0011439e8ee9878b3bf0574e8a16fdff9 WHIRLPOOL fb844e07752a9e48ed2ccd75f34730528c60c22f9a17791c0e002f1c7d25224b814af288e6f6a9563da832bb2fc9a0fed6c92e60bb102e244ee0de24eee40b24
+DIST x264-snapshot-20160712-2245.tar.bz2 730644 SHA256 d5033882bbc7e2908f74970931c7dc2044191cc9fa7c7435dc85ad334f23078e SHA512 ac97730611e6194701a891a7e73c739696664de2411a7937ab0c36a3ce843f22bf2bd2defe053c2506d95652842b99a905b6f16a2f016a9d73059c2c75b71963 WHIRLPOOL d42459a93e8ff1b69d16f7adecaf3486d102e6fe4ee0d8dd991cdbb7a233bb9975faabc79ff7d2dfd2f67fa1f69a729e617ae868ee127cc0306dfc897db7053b
diff --git a/media-video/x264-encoder/x264-encoder-0.0.20160712.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20160712.ebuild
new file mode 100644
index 0000000..02e46dd
--- /dev/null
+++ b/media-video/x264-encoder/x264-encoder-0.0.20160712.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit flag-o-matic multilib toolchain-funcs eutils
+
+DESCRIPTION="A free commandline encoder for X264/AVC streams"
+HOMEPAGE="http://www.videolan.org/developers/x264.html"
+if [[ ${PV} == 9999 ]]; then
+ inherit git-2
+ EGIT_REPO_URI="git://git.videolan.org/x264.git"
+ SRC_URI=""
+else
+ inherit versionator
+ MY_P="x264-snapshot-$(get_version_component_range 3)-2245"
+ SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
+ KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+ S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="10bit avs custom-cflags ffmpeg ffmpegsource +interlaced mp4 +threads"
+
+REQUIRED_USE="ffmpegsource? ( ffmpeg )"
+
+RDEPEND="ffmpeg? ( virtual/ffmpeg )
+ ~media-libs/x264-${PV}[10bit=,interlaced=,threads=]
+ ffmpegsource? ( media-libs/ffmpegsource )
+ mp4? ( >=media-video/gpac-0.5.2 )"
+
+ASM_DEP=">=dev-lang/yasm-1.2.0"
+DEPEND="${RDEPEND}
+ amd64? ( ${ASM_DEP} )
+ x86? ( ${ASM_DEP} )
+ x86-fbsd? ( ${ASM_DEP} )
+ virtual/pkgconfig"
+
+src_prepare() {
+ epatch "${FILESDIR}/gpac.patch"
+}
+
+src_configure() {
+ tc-export CC
+
+ # let upstream pick the optimization level by default
+ use custom-cflags || filter-flags -O?
+
+ ./configure \
+ --prefix="${EPREFIX}"/usr \
+ --libdir="${EPREFIX}"/usr/$(get_libdir) \
+ --system-libx264 \
+ --host="${CHOST}" \
+ --disable-lsmash \
+ $(usex 10bit "--bit-depth=10" "") \
+ $(usex avs "" "--disable-avs") \
+ $(usex ffmpeg "" "--disable-lavf --disable-swscale") \
+ $(usex ffmpegsource "" "--disable-ffms") \
+ $(usex interlaced "" "--disable-interlaced") \
+ $(usex mp4 "" "--disable-gpac") \
+ $(usex threads "" "--disable-thread") || die
+
+ # this is a nasty workaround for bug #376925 for x264 that also applies
+ # here, needed because as upstream doesn't like us fiddling with their CFLAGS
+ if use custom-cflags; then
+ local cflags
+ cflags="$(grep "^CFLAGS=" config.mak | sed 's/CFLAGS=//')"
+ cflags="${cflags//$(get-flag O)/}"
+ cflags="${cflags//-O? /$(get-flag O) }"
+ cflags="${cflags//-g /}"
+ sed -i "s:^CFLAGS=.*:CFLAGS=${cflags//:/\\:}:" config.mak
+ fi
+}
^ permalink raw reply related [flat|nested] 36+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/x264-encoder/
@ 2016-05-24 14:12 Alexis Ballier
0 siblings, 0 replies; 36+ messages in thread
From: Alexis Ballier @ 2016-05-24 14:12 UTC (permalink / raw
To: gentoo-commits
commit: 766f549b0ed131910864316c8e5a53839936b529
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue May 24 14:12:19 2016 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue May 24 14:12:19 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=766f549b
media-video/x264-encoder: bump a new snapshot
Package-Manager: portage-2.3.0_rc1
media-video/x264-encoder/Manifest | 1 +
.../x264-encoder/x264-encoder-0.0.20160523.ebuild | 75 ++++++++++++++++++++++
2 files changed, 76 insertions(+)
diff --git a/media-video/x264-encoder/Manifest b/media-video/x264-encoder/Manifest
index 91c698a..7e88eb8 100644
--- a/media-video/x264-encoder/Manifest
+++ b/media-video/x264-encoder/Manifest
@@ -1,2 +1,3 @@
DIST x264-snapshot-20140308-2245.tar.bz2 624712 SHA256 b179cb1e1d4f51418d292011a7494d5b62145571c05c22007f28d8fd89d2ebbe SHA512 42dc8183aa7af2bd4c360edc0349193cf69a119450880af0c1586e8f27490d7c6784c464b29c9f07ae972aaf661672ab4f2094a46a3d19b6df35be1f9d9a1629 WHIRLPOOL b1ac3341647d9d8d8ff6177f179ee8b5d6a49a38a48791748c24d5cd3c53858758785a0d21d42fbe373ec74465d947b69526a487da15fbca1a1f9aa50064288c
DIST x264-snapshot-20151011-2245.tar.bz2 725627 SHA256 80a4075ea12a81ec3b6c493e03529c5b7c1afb34c6e91d86bb078bc2ead2ccf0 SHA512 a326d724f5a28268a6dca2e75f39d10f0d9cd137e6477cb8c1be377a8c3fe9de384f74498f7c6b785377bb43024526e72ff8363b67a7e17717b176e5249df5e3 WHIRLPOOL 520dd79b2f3dfdd9e4629bd810fe8560205f4e3581d03854bd2aea35fbac565520cec336f214da688428c320bab3dea0d692a9cb816f9f53fc89520b54e200e3
+DIST x264-snapshot-20160523-2245.tar.bz2 729952 SHA256 1176c018e4896a440bf0b18ed76e3d92de7a7ce5b1e28a7efd5f6e54bf1d6860 SHA512 71cce21acec300842a8323ef8999e655520e2d47288fe983631e0d6fa180155badd9026d58057edebfd73b002f79c9c0011439e8ee9878b3bf0574e8a16fdff9 WHIRLPOOL fb844e07752a9e48ed2ccd75f34730528c60c22f9a17791c0e002f1c7d25224b814af288e6f6a9563da832bb2fc9a0fed6c92e60bb102e244ee0de24eee40b24
diff --git a/media-video/x264-encoder/x264-encoder-0.0.20160523.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20160523.ebuild
new file mode 100644
index 0000000..02e46dd
--- /dev/null
+++ b/media-video/x264-encoder/x264-encoder-0.0.20160523.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit flag-o-matic multilib toolchain-funcs eutils
+
+DESCRIPTION="A free commandline encoder for X264/AVC streams"
+HOMEPAGE="http://www.videolan.org/developers/x264.html"
+if [[ ${PV} == 9999 ]]; then
+ inherit git-2
+ EGIT_REPO_URI="git://git.videolan.org/x264.git"
+ SRC_URI=""
+else
+ inherit versionator
+ MY_P="x264-snapshot-$(get_version_component_range 3)-2245"
+ SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
+ KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+ S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="10bit avs custom-cflags ffmpeg ffmpegsource +interlaced mp4 +threads"
+
+REQUIRED_USE="ffmpegsource? ( ffmpeg )"
+
+RDEPEND="ffmpeg? ( virtual/ffmpeg )
+ ~media-libs/x264-${PV}[10bit=,interlaced=,threads=]
+ ffmpegsource? ( media-libs/ffmpegsource )
+ mp4? ( >=media-video/gpac-0.5.2 )"
+
+ASM_DEP=">=dev-lang/yasm-1.2.0"
+DEPEND="${RDEPEND}
+ amd64? ( ${ASM_DEP} )
+ x86? ( ${ASM_DEP} )
+ x86-fbsd? ( ${ASM_DEP} )
+ virtual/pkgconfig"
+
+src_prepare() {
+ epatch "${FILESDIR}/gpac.patch"
+}
+
+src_configure() {
+ tc-export CC
+
+ # let upstream pick the optimization level by default
+ use custom-cflags || filter-flags -O?
+
+ ./configure \
+ --prefix="${EPREFIX}"/usr \
+ --libdir="${EPREFIX}"/usr/$(get_libdir) \
+ --system-libx264 \
+ --host="${CHOST}" \
+ --disable-lsmash \
+ $(usex 10bit "--bit-depth=10" "") \
+ $(usex avs "" "--disable-avs") \
+ $(usex ffmpeg "" "--disable-lavf --disable-swscale") \
+ $(usex ffmpegsource "" "--disable-ffms") \
+ $(usex interlaced "" "--disable-interlaced") \
+ $(usex mp4 "" "--disable-gpac") \
+ $(usex threads "" "--disable-thread") || die
+
+ # this is a nasty workaround for bug #376925 for x264 that also applies
+ # here, needed because as upstream doesn't like us fiddling with their CFLAGS
+ if use custom-cflags; then
+ local cflags
+ cflags="$(grep "^CFLAGS=" config.mak | sed 's/CFLAGS=//')"
+ cflags="${cflags//$(get-flag O)/}"
+ cflags="${cflags//-O? /$(get-flag O) }"
+ cflags="${cflags//-g /}"
+ sed -i "s:^CFLAGS=.*:CFLAGS=${cflags//:/\\:}:" config.mak
+ fi
+}
^ permalink raw reply related [flat|nested] 36+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/x264-encoder/
@ 2015-10-12 7:57 Alexis Ballier
0 siblings, 0 replies; 36+ messages in thread
From: Alexis Ballier @ 2015-10-12 7:57 UTC (permalink / raw
To: gentoo-commits
commit: 1ff4d04abb3a67c103719b116e451f3b5c682ebe
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 12 07:55:07 2015 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Mon Oct 12 07:56:54 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ff4d04a
media-video/x264-encoder: bump to latest snapshot.
Package-Manager: portage-2.2.23
media-video/x264-encoder/Manifest | 1 +
.../x264-encoder/x264-encoder-0.0.20151011.ebuild | 75 ++++++++++++++++++++++
2 files changed, 76 insertions(+)
diff --git a/media-video/x264-encoder/Manifest b/media-video/x264-encoder/Manifest
index 203faf6..c8c49eb 100644
--- a/media-video/x264-encoder/Manifest
+++ b/media-video/x264-encoder/Manifest
@@ -1,2 +1,3 @@
DIST x264-snapshot-20140308-2245.tar.bz2 624712 SHA256 b179cb1e1d4f51418d292011a7494d5b62145571c05c22007f28d8fd89d2ebbe SHA512 42dc8183aa7af2bd4c360edc0349193cf69a119450880af0c1586e8f27490d7c6784c464b29c9f07ae972aaf661672ab4f2094a46a3d19b6df35be1f9d9a1629 WHIRLPOOL b1ac3341647d9d8d8ff6177f179ee8b5d6a49a38a48791748c24d5cd3c53858758785a0d21d42fbe373ec74465d947b69526a487da15fbca1a1f9aa50064288c
DIST x264-snapshot-20150820-2245.tar.bz2 718209 SHA256 0ea86849d1a9b0a5b88fe6e0281359d7f5675c68fb83f6397b3e02896ccd77e3 SHA512 6b85f96f7cc85e1e938dad06c01b777aaf866796fb1763a02b4b7fa9c44f70bf15fc1bef123f7b24bb2c58b23f7276d4eb2b8f99b2e4fef3c716ed7f66d66e44 WHIRLPOOL daf5a63dbe2cb77a496a3eec1b1687ef6c4a008328064c46bd0e90139d328a6ff4e7dbd17b8dad57c357717c0b665293c86883213b483e85d25a06ec93c81024
+DIST x264-snapshot-20151011-2245.tar.bz2 725627 SHA256 80a4075ea12a81ec3b6c493e03529c5b7c1afb34c6e91d86bb078bc2ead2ccf0 SHA512 a326d724f5a28268a6dca2e75f39d10f0d9cd137e6477cb8c1be377a8c3fe9de384f74498f7c6b785377bb43024526e72ff8363b67a7e17717b176e5249df5e3 WHIRLPOOL 520dd79b2f3dfdd9e4629bd810fe8560205f4e3581d03854bd2aea35fbac565520cec336f214da688428c320bab3dea0d692a9cb816f9f53fc89520b54e200e3
diff --git a/media-video/x264-encoder/x264-encoder-0.0.20151011.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20151011.ebuild
new file mode 100644
index 0000000..71259d7
--- /dev/null
+++ b/media-video/x264-encoder/x264-encoder-0.0.20151011.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit flag-o-matic multilib toolchain-funcs eutils
+
+DESCRIPTION="A free commandline encoder for X264/AVC streams"
+HOMEPAGE="http://www.videolan.org/developers/x264.html"
+if [[ ${PV} == 9999 ]]; then
+ inherit git-2
+ EGIT_REPO_URI="git://git.videolan.org/x264.git"
+ SRC_URI=""
+else
+ inherit versionator
+ MY_P="x264-snapshot-$(get_version_component_range 3)-2245"
+ SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
+ KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+ S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="10bit avs custom-cflags ffmpeg ffmpegsource +interlaced mp4 +threads"
+
+REQUIRED_USE="ffmpegsource? ( ffmpeg )"
+
+RDEPEND="ffmpeg? ( virtual/ffmpeg )
+ ~media-libs/x264-${PV}[10bit=,interlaced=,threads=]
+ ffmpegsource? ( media-libs/ffmpegsource )
+ mp4? ( >=media-video/gpac-0.5.2 )"
+
+ASM_DEP=">=dev-lang/yasm-1.2.0"
+DEPEND="${RDEPEND}
+ amd64? ( ${ASM_DEP} )
+ x86? ( ${ASM_DEP} )
+ x86-fbsd? ( ${ASM_DEP} )
+ virtual/pkgconfig"
+
+src_prepare() {
+ epatch "${FILESDIR}/gpac.patch"
+}
+
+src_configure() {
+ tc-export CC
+
+ # let upstream pick the optimization level by default
+ use custom-cflags || filter-flags -O?
+
+ ./configure \
+ --prefix="${EPREFIX}"/usr \
+ --libdir="${EPREFIX}"/usr/$(get_libdir) \
+ --system-libx264 \
+ --host="${CHOST}" \
+ --disable-lsmash \
+ $(usex 10bit "--bit-depth=10" "") \
+ $(usex avs "" "--disable-avs") \
+ $(usex ffmpeg "" "--disable-lavf --disable-swscale") \
+ $(usex ffmpegsource "" "--disable-ffms") \
+ $(usex interlaced "" "--disable-interlaced") \
+ $(usex mp4 "" "--disable-gpac") \
+ $(usex threads "" "--disable-thread") || die
+
+ # this is a nasty workaround for bug #376925 for x264 that also applies
+ # here, needed because as upstream doesn't like us fiddling with their CFLAGS
+ if use custom-cflags; then
+ local cflags
+ cflags="$(grep "^CFLAGS=" config.mak | sed 's/CFLAGS=//')"
+ cflags="${cflags//$(get-flag O)/}"
+ cflags="${cflags//-O? /$(get-flag O) }"
+ cflags="${cflags//-g /}"
+ sed -i "s:^CFLAGS=.*:CFLAGS=${cflags//:/\\:}:" config.mak
+ fi
+}
^ permalink raw reply related [flat|nested] 36+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/x264-encoder/
@ 2015-08-21 13:51 Alexis Ballier
0 siblings, 0 replies; 36+ messages in thread
From: Alexis Ballier @ 2015-08-21 13:51 UTC (permalink / raw
To: gentoo-commits
commit: 36c01700498b3b61d12f07102e4e8bea16f072a5
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 21 13:50:44 2015 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Fri Aug 21 13:51:19 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36c01700
media-video/x264-encoder: bump a new snapshot
Package-Manager: portage-2.2.20.1
media-video/x264-encoder/Manifest | 1 +
.../x264-encoder/x264-encoder-0.0.20150820.ebuild | 71 ++++++++++++++++++++++
2 files changed, 72 insertions(+)
diff --git a/media-video/x264-encoder/Manifest b/media-video/x264-encoder/Manifest
index 3d91188..203faf6 100644
--- a/media-video/x264-encoder/Manifest
+++ b/media-video/x264-encoder/Manifest
@@ -1 +1,2 @@
DIST x264-snapshot-20140308-2245.tar.bz2 624712 SHA256 b179cb1e1d4f51418d292011a7494d5b62145571c05c22007f28d8fd89d2ebbe SHA512 42dc8183aa7af2bd4c360edc0349193cf69a119450880af0c1586e8f27490d7c6784c464b29c9f07ae972aaf661672ab4f2094a46a3d19b6df35be1f9d9a1629 WHIRLPOOL b1ac3341647d9d8d8ff6177f179ee8b5d6a49a38a48791748c24d5cd3c53858758785a0d21d42fbe373ec74465d947b69526a487da15fbca1a1f9aa50064288c
+DIST x264-snapshot-20150820-2245.tar.bz2 718209 SHA256 0ea86849d1a9b0a5b88fe6e0281359d7f5675c68fb83f6397b3e02896ccd77e3 SHA512 6b85f96f7cc85e1e938dad06c01b777aaf866796fb1763a02b4b7fa9c44f70bf15fc1bef123f7b24bb2c58b23f7276d4eb2b8f99b2e4fef3c716ed7f66d66e44 WHIRLPOOL daf5a63dbe2cb77a496a3eec1b1687ef6c4a008328064c46bd0e90139d328a6ff4e7dbd17b8dad57c357717c0b665293c86883213b483e85d25a06ec93c81024
diff --git a/media-video/x264-encoder/x264-encoder-0.0.20150820.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20150820.ebuild
new file mode 100644
index 0000000..64e7ddc
--- /dev/null
+++ b/media-video/x264-encoder/x264-encoder-0.0.20150820.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit flag-o-matic multilib toolchain-funcs
+
+DESCRIPTION="A free commandline encoder for X264/AVC streams"
+HOMEPAGE="http://www.videolan.org/developers/x264.html"
+if [[ ${PV} == 9999 ]]; then
+ inherit git-2
+ EGIT_REPO_URI="git://git.videolan.org/x264.git"
+ SRC_URI=""
+else
+ inherit versionator
+ MY_P="x264-snapshot-$(get_version_component_range 3)-2245"
+ SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
+ KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+ S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="10bit avs custom-cflags ffmpeg ffmpegsource +interlaced mp4 +threads"
+
+REQUIRED_USE="ffmpegsource? ( ffmpeg )"
+
+RDEPEND="ffmpeg? ( virtual/ffmpeg )
+ ~media-libs/x264-${PV}[10bit=,interlaced=,threads=]
+ ffmpegsource? ( media-libs/ffmpegsource )
+ mp4? ( >=media-video/gpac-0.4.1_pre20060122 )"
+
+ASM_DEP=">=dev-lang/yasm-1.2.0"
+DEPEND="${RDEPEND}
+ amd64? ( ${ASM_DEP} )
+ x86? ( ${ASM_DEP} )
+ x86-fbsd? ( ${ASM_DEP} )
+ virtual/pkgconfig"
+
+src_configure() {
+ tc-export CC
+
+ # let upstream pick the optimization level by default
+ use custom-cflags || filter-flags -O?
+
+ ./configure \
+ --prefix="${EPREFIX}"/usr \
+ --libdir="${EPREFIX}"/usr/$(get_libdir) \
+ --system-libx264 \
+ --host="${CHOST}" \
+ --disable-lsmash \
+ $(usex 10bit "--bit-depth=10" "") \
+ $(usex avs "" "--disable-avs") \
+ $(usex ffmpeg "" "--disable-lavf --disable-swscale") \
+ $(usex ffmpegsource "" "--disable-ffms") \
+ $(usex interlaced "" "--disable-interlaced") \
+ $(usex mp4 "" "--disable-gpac") \
+ $(usex threads "" "--disable-thread") || die
+
+ # this is a nasty workaround for bug #376925 for x264 that also applies
+ # here, needed because as upstream doesn't like us fiddling with their CFLAGS
+ if use custom-cflags; then
+ local cflags
+ cflags="$(grep "^CFLAGS=" config.mak | sed 's/CFLAGS=//')"
+ cflags="${cflags//$(get-flag O)/}"
+ cflags="${cflags//-O? /$(get-flag O) }"
+ cflags="${cflags//-g /}"
+ sed -i "s:^CFLAGS=.*:CFLAGS=${cflags//:/\\:}:" config.mak
+ fi
+}
^ permalink raw reply related [flat|nested] 36+ messages in thread
end of thread, other threads:[~2024-08-25 18:03 UTC | newest]
Thread overview: 36+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-07-28 11:24 [gentoo-commits] repo/gentoo:master commit in: media-video/x264-encoder/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2024-08-25 18:03 Sam James
2024-03-18 4:45 Sam James
2024-03-17 19:29 Arthur Zamarin
2023-12-26 21:39 Sam James
2022-11-12 17:48 Matt Turner
2022-09-03 5:27 Sam James
2022-09-03 5:27 Sam James
2022-03-10 12:45 Alexis Ballier
2022-01-05 10:01 David Seifert
2021-01-07 19:04 Sam James
2021-01-04 3:31 Sam James
2020-09-15 18:34 Mike Gilbert
2020-04-25 19:14 Mikle Kolyada
2019-09-04 14:46 Alexis Ballier
2019-07-02 10:33 Agostino Sarubbo
2019-07-01 19:23 Thomas Deutschmann
2019-05-05 19:05 Mike Gilbert
2019-02-15 12:36 Alexis Ballier
2019-01-17 2:47 Andreas Sturmlechner
2019-01-17 2:47 Andreas Sturmlechner
2019-01-17 2:47 Andreas Sturmlechner
2018-05-20 20:17 Andreas Sturmlechner
2018-02-26 14:25 Jason Zaman
2018-02-25 20:16 Thomas Deutschmann
2018-02-25 19:41 Andreas Sturmlechner
2017-07-29 10:06 Alexis Ballier
2017-07-02 10:04 Alexis Ballier
2017-07-02 10:04 Alexis Ballier
2017-01-31 14:04 Alexis Ballier
2016-12-06 12:21 Agostino Sarubbo
2016-12-06 12:21 Agostino Sarubbo
2016-07-13 13:24 Alexis Ballier
2016-05-24 14:12 Alexis Ballier
2015-10-12 7:57 Alexis Ballier
2015-08-21 13:51 Alexis Ballier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox