gentoo auto-resync : 10:12:2024 - 02:01:16

5 files changed, 5 insertions, 142 deletions

diff --git a/media-libs/xvid/Manifest b/media-libs/xvid/Manifest
index 0dbed6b51998..7475af63600e 100644
--- a/media-libs/xvid/Manifest
+++ b/media-libs/xvid/Manifest
@@ -1,5 +1,3 @@
 DIST xvidcore-1.3.7.tar.bz2 698615 BLAKE2B 19bea63226c2223e74e5202d3b671c5b292c03ce5de240df7d8ce34101de4036b28fad516b2a56712a099819b905e68922fa83a01fbe4f200dc880ca56c10a96 SHA512 e2b22e7a7e103af7adcc999d95484f991a0a33df02b912fe042b2e23d2af07381c737d23158dbf0fad770ee680572f86fbe04ab2ef33c81e2e0180ead2acc8ed
-EBUILD xvid-1.3.7-r1.ebuild 1627 BLAKE2B 4208e0743aa6063bf759ef626a7731fdfa9b3c262a70fb8cad57355c1efed03fbd434d5baf64967ee9bbeffce96750135bf5d07c6fceff69d457143e679f259e SHA512 8d9e81cbdc474d609bcf34a7be7205b2fbe9d7900e034648000fc0d216072cefb656ce3b8188270d0e1772b79bfa9246aee2958a3726c1d242c81e7bfe3e1b02
-EBUILD xvid-1.3.7-r2.ebuild 1627 BLAKE2B e5bffa56851ca8bb1cd4591e23010e231309e4e502a58ab2908fd15344472a1cbcb05684ceb7ef523e73ad0931a205f7b30f4d335ead144f627d5c352eed4965 SHA512 c9d43f706fdf64dd50b8d5fb589467ddedf66bb95dd1b2de104e10a8c7cf1d465c9617ee1e70a0cf95c8ffa12d638ca8b8abe158f1bf581b556b39b239778885
-EBUILD xvid-1.3.7.ebuild 1638 BLAKE2B 0113e47b0a93699214200d45b2dd9bc384192e1b707ca1b166a61524347cf2253b45f226aad44989cc2791e9ba070c8c6033b87e0804c88eed2f9b28b7d227e6 SHA512 bf3fab88e99581fd2915a7e6bfebec0cb561f45a5ed638a8b04e0c74f37997d492b6a10ab6d816192d12e5ffdaf0d6a8f884fc6c79fc8f49b7c0a53bc90b43b8
-MISC metadata.xml 322 BLAKE2B 841709000ce38ec97e44a9223e6458abf57618d1f858f31d2a31ac190495fa558f4b7d9220b11566dfd927643480001bd14dda9497fe3fc1f8aeba38ce4f3822 SHA512 a9ce57b28bae87e53a402ac2ff8ac3dc6c8011fd72d528c371b4b9107613a81829986646940140862e0ff7ce475773b35da771a5fa043e0ced9a34111204891e
+EBUILD xvid-1.3.7-r2.ebuild 1669 BLAKE2B 1358707d6c163692dab45ab87ce24ed9a088669a0911c263f69471d9aa8caaed0120b312c7e46f7aeb6c91a653768a74edc5ae43956859aea685de8247b6519d SHA512 4e8094dafd43595f44661a96262870fb319aaa60ee0b0dde2cc34e6b0885c94917c823dafc451263c41febfab783c379a85a646e78744e3769bc8521f92393b3
+MISC metadata.xml 224 BLAKE2B a8fa831654345ddf74b54f53fdc27d128ff6896378c8aa2dcb27139a4382f63efd0cac17f94ee420932e2855042c94e32fe534c99a977698953aaab4c51c31d0 SHA512 0b59f17151d352f25e3b073a3ee388d0189e1caddf0d97142851a19df433d082e3eead9f5aae07f4beb247861d90f02ae217514d02445703b95ee6ff62d967b8
diff --git a/media-libs/xvid/metadata.xml b/media-libs/xvid/metadata.xml
index a12998a66dd6..c7e80df04d05 100644
--- a/media-libs/xvid/metadata.xml
+++ b/media-libs/xvid/metadata.xml
@@ -4,7 +4,4 @@
 	<maintainer type="project">
 		<email>media-video@gentoo.org</email>
 	</maintainer>
-	<use>
-		<flag name="pic">disable optimized assembly code that is not PIC friendly</flag>
-	</use>
 </pkgmetadata>
diff --git a/media-libs/xvid/xvid-1.3.7-r1.ebuild b/media-libs/xvid/xvid-1.3.7-r1.ebuild
deleted file mode 100644
index ffd1a7e39754..000000000000
--- a/media-libs/xvid/xvid-1.3.7-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN="${PN}core"
-MY_P="${MY_PN}-${PV}"
-inherit flag-o-matic multilib-minimal
-
-DESCRIPTION="High performance/quality MPEG-4 video de-/encoding solution"
-HOMEPAGE="https://labs.xvid.com/source/ https://www.xvid.org/"
-SRC_URI="https://downloads.xvid.com/downloads/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="examples pic"
-
-NASM=">=dev-lang/nasm-2"
-YASM=">=dev-lang/yasm-1"
-
-BDEPEND="sys-apps/grep"
-DEPEND="amd64? ( || ( ${YASM} ${NASM} ) )
-	x86? ( || ( ${YASM} ${NASM} ) )
-	x64-macos? ( ${NASM} )"
-
-S="${WORKDIR}/${MY_PN}/build/generic"
-
-src_prepare() {
-	default
-
-	# make build verbose
-	sed \
-		-e 's/@$(CC)/$(CC)/' \
-		-e 's/@$(AS)/$(AS)/' \
-		-e 's/@$(RM)/$(RM)/' \
-		-e 's/@$(INSTALL)/$(INSTALL)/' \
-		-e 's/@cd/cd/' \
-		-e '/\$(libdir)\/\$(STATIC_LIB)/d' \
-		-e 's/\$(BUILD_DIR)\/\$(STATIC_LIB)//g' \
-		-e 's/info \$(STATIC_LIB)/info/g' \
-		-i Makefile || die
-	# Since only the build system is in $S, this will only copy it but not the
-	# entire sources.
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	use sparc && append-cflags -mno-vis #357149
-
-	local myconf=(
-		--enable-pthread
-	)
-
-	if use pic || [[ ${ABI} == "x32" ]] ; then #421841
-		myconf+=( --disable-assembly )
-	fi
-
-	econf "${myconf[@]}"
-}
-
-multilib_src_install_all() {
-	dodoc "${S}"/../../{AUTHORS,ChangeLog*,CodingStyle,README,TODO}
-
-	if use examples; then
-		insinto /usr/share/${PN}
-		doins -r "${S}"/../../examples
-	fi
-}
diff --git a/media-libs/xvid/xvid-1.3.7-r2.ebuild b/media-libs/xvid/xvid-1.3.7-r2.ebuild
index e34e6c0c9adb..5b80dd5ac7a3 100644
--- a/media-libs/xvid/xvid-1.3.7-r2.ebuild
+++ b/media-libs/xvid/xvid-1.3.7-r2.ebuild
@@ -49,6 +49,9 @@ src_prepare() {
 multilib_src_configure() {
 	use sparc && append-cflags -mno-vis #357149
 
+	# bug #943748
+	append-cflags -std=gnu17
+
 	local myconf=(
 		--enable-pthread
 		# On x86, only available for mmx+sse2 and non-PIC.
diff --git a/media-libs/xvid/xvid-1.3.7.ebuild b/media-libs/xvid/xvid-1.3.7.ebuild
deleted file mode 100644
index b5e83cf121c2..000000000000
--- a/media-libs/xvid/xvid-1.3.7.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="${PN}core"
-MY_P="${MY_PN}-${PV}"
-inherit flag-o-matic multilib-minimal
-
-DESCRIPTION="High performance/quality MPEG-4 video de-/encoding solution"
-HOMEPAGE="https://labs.xvid.com/source/ https://www.xvid.org/"
-SRC_URI="https://downloads.xvid.com/downloads/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="examples pic +threads"
-
-NASM=">=dev-lang/nasm-2"
-YASM=">=dev-lang/yasm-1"
-
-BDEPEND="sys-apps/grep"
-DEPEND="amd64? ( || ( ${YASM} ${NASM} ) )
-	x86? ( || ( ${YASM} ${NASM} ) )
-	x64-macos? ( ${NASM} )"
-
-S="${WORKDIR}/${MY_PN}/build/generic"
-
-src_prepare() {
-	default
-
-	# make build verbose
-	sed \
-		-e 's/@$(CC)/$(CC)/' \
-		-e 's/@$(AS)/$(AS)/' \
-		-e 's/@$(RM)/$(RM)/' \
-		-e 's/@$(INSTALL)/$(INSTALL)/' \
-		-e 's/@cd/cd/' \
-		-e '/\$(libdir)\/\$(STATIC_LIB)/d' \
-		-e 's/\$(BUILD_DIR)\/\$(STATIC_LIB)//g' \
-		-e 's/info \$(STATIC_LIB)/info/g' \
-		-i Makefile || die
-	# Since only the build system is in $S, this will only copy it but not the
-	# entire sources.
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	use sparc && append-cflags -mno-vis #357149
-
-	local myconf=( $(use_enable threads pthread) )
-	if use pic || [[ ${ABI} == "x32" ]] ; then #421841
-		myconf+=( --disable-assembly )
-	fi
-
-	econf "${myconf[@]}"
-}
-
-multilib_src_install_all() {
-	dodoc "${S}"/../../{AUTHORS,ChangeLog*,CodingStyle,README,TODO}
-
-	if use examples; then
-		insinto /usr/share/${PN}
-		doins -r "${S}"/../../examples
-	fi
-}