gentoo resync : 29.01.2021

4 files changed, 67 insertions, 7 deletions

diff --git a/media-libs/libmpeg2/Manifest b/media-libs/libmpeg2/Manifest
index 356775a86ff4..ebbf041652d4 100644
--- a/media-libs/libmpeg2/Manifest
+++ b/media-libs/libmpeg2/Manifest
@@ -1,7 +1,8 @@
-AUX libmpeg2-0.5.1-altivec.patch 688 BLAKE2B af134d34d30b1c090f9437171b2493c5c9e3b661ae3aa8f9acde681a2ebd019296784ea5c7765923e6fea2935fadcaee142696b2cf6954b8cc25360bfd0fead4 SHA512 4b8166c5c1cea6e62a78808cf5d86baa7dd10688f8fbaf89a0f78904ef0e69d4dc9a31afb33b9eddf011fd077edf4205707544f71e407eef4b2078ac1cefef51
+AUX libmpeg2-0.5.1-altivec.patch 616 BLAKE2B 29a1501c28d708e756ef5d96a09cd8f4c9804b5e63ff45958bef365b7e0971d34a43763878be54b9f1b284efec8474416018977289e85ee469c5f3c4d31ef2dc SHA512 574b7667c9498d612af906aa35a6f6c52011c1ca47f1ac83c29db69389f948782b555c319e50ea520e43f96a93d79143c7e4fe3671d3874417d5b71f7b216b53
 AUX libmpeg2-0.5.1-arm-private-symbols.patch 1222 BLAKE2B d4f3102461c76167286cbfdde4dd616369eeed807fc072e7acafdf3ff978c4274b698b6af0063991e99d1d022cae7dfe1068f0777849992bd14a0110cd5403c4 SHA512 334e4e0b1e2877311503d2907f4f65c26d6a83ee79308c49697b2f3d2b8da9ac665e19ab419d85a944eaa34e1d43f512d1418a372cd444381d66f71df2a92c83
-AUX libmpeg2-0.5.1-armv4l.patch 749 BLAKE2B 205d8f512eda9b357f0c2902aa8799d897a42a6cdcc131aa6f1d746c6af3c264dd17a2f9e86c6b1c0b9c8bd8f49599f8b99b85f761e64f328a37e9d68e02be01 SHA512 d11fb2196ba5c4a08b28693e069146b69f2a1034606b14981db9ca8d4ed09fd92ab99c9656950cc5d3a547177cd9dd7413698a50bd6b8f69080bcf10e8463e66
+AUX libmpeg2-0.5.1-armv4l.patch 566 BLAKE2B 3c3c87dac145bb4f447cc0657da3eb703c61c8be2cc84623808b6ec48f9a4a3d334cfa92b53c4fccc7fa09fb0960518a350c8ca354af0cdd450f4aac1e0ad22b SHA512 3705438a1aed3a5f30cb04f4a5b6c128b22b9e4d6af949c6ad1244ec26e2302807c99e81866d08349ee2056ec66ce820747d265bd41cd0e300cd5ef667dfd53a
 AUX libmpeg2-0.5.1-global-symbol-test.patch 1931 BLAKE2B cc9ace2ef9d6b9f6fa8d0918b627a4f6dc47e5a5d1ed05d60e8a6b9a01451e33be5c5a2732a2aaf1e1ee97eb61590e1f2b0cf568919fc379ac974ec7a849ca55 SHA512 a9425f3cc3a3d6c660bd5c780906927827cdaad27a9526fa57d9026a100ba44b99aeea34c9467d1373316164cd7b36f8357c9aec2c46fa5c8b4557fab5cba2eb
 DIST libmpeg2-0.5.1.tar.gz 524776 BLAKE2B 29b71740fa601c668a8f5b0a43aa763bda2fc66587f5bff847d4bc6d03dd831abe46428616b770aaaabf2d42877daad8c305ab4dd988cc91a4c90decfcc19c9a SHA512 3648a2b3d7e2056d5adb328acd2fb983a1fa9a05ccb6f9388cc686c819445421811f42e8439418a0491a13080977f074a0d8bf8fa6bc101ff245ddea65a46fbc
 EBUILD libmpeg2-0.5.1-r2.ebuild 1479 BLAKE2B 71e2d52780f78bf9718f0f9b4912bd90b8f8a69073abb6f09acfb221653f24e17e2033a64127fa28a8b25150535cec04964e0daa37abad2c85d60cc02c1ff0f9 SHA512 6f4b0fd8d2554e94820016584308247c32a17d311feacf5527b708af22876bf47ae6e336cc84ac4211528300b1d93abfa5fc76f77fa9a0641199901d9769792b
+EBUILD libmpeg2-0.5.1-r3.ebuild 1320 BLAKE2B 3936f3938d686c569f52c05414f38a44cfe0d1d92744fe1f15f69d1b18570327c775469fbb79ea7b4147517f206980dabe116aaac1c99e2b6a6a5a0419e099b9 SHA512 0e24bf88a4d4a5eb40042e52d73f01a70193a1d192569ce9ed83f0058c7556f3189960ecdfedde127254f1d96caabc76d941df59747857f600455651f00cbb35
 MISC metadata.xml 301 BLAKE2B 4d9999b8b7aa1066cb76987da82251084f2fb73a2891392a1b3686119454f7c19ef34d3f5e362bff0db40050790c819606c79fffc74cee1bb780d3edeb7afa8c SHA512 ae5643be12156110bdfe381eef32d7586350eb5d70ee8b431f34a19a1b45dfa2cd1ee28d5b0101fef05f90b5d72ed767163051ce91cc1e9107c23432a29a1b46
diff --git a/media-libs/libmpeg2/files/libmpeg2-0.5.1-altivec.patch b/media-libs/libmpeg2/files/libmpeg2-0.5.1-altivec.patch
index 617fe7509951..42fb201eb424 100644
--- a/media-libs/libmpeg2/files/libmpeg2-0.5.1-altivec.patch
+++ b/media-libs/libmpeg2/files/libmpeg2-0.5.1-altivec.patch
@@ -1,5 +1,5 @@
---- configure.ac.bak	2010-05-25 17:12:14.756245990 +0000
-+++ configure.ac	2010-05-25 17:11:51.629581723 +0000
+--- a/configure.ac
++++ b/configure.ac
 @@ -79,11 +79,10 @@
  		 CFLAGS="$OPT_CFLAGS $TRY_CFLAGS $CFLAGS"
  		 AC_MSG_CHECKING([if <altivec.h> is needed])
diff --git a/media-libs/libmpeg2/files/libmpeg2-0.5.1-armv4l.patch b/media-libs/libmpeg2/files/libmpeg2-0.5.1-armv4l.patch
index bd9561e0c46f..48b1648f49c3 100644
--- a/media-libs/libmpeg2/files/libmpeg2-0.5.1-armv4l.patch
+++ b/media-libs/libmpeg2/files/libmpeg2-0.5.1-armv4l.patch
@@ -1,6 +1,5 @@
-diff -urNp libmpeg2.orig/libmpeg2/motion_comp_arm_s.S libmpeg2/libmpeg2/motion_comp_arm_s.S
---- libmpeg2.orig/libmpeg2/motion_comp_arm_s.S	2008-07-09 21:16:05.000000000 +0200
-+++ libmpeg2/libmpeg2/motion_comp_arm_s.S	2009-11-20 19:55:22.000000000 +0100
+--- a/libmpeg2/motion_comp_arm_s.S
++++ b/libmpeg2/motion_comp_arm_s.S
 @@ -19,6 +19,16 @@
  @ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  
diff --git a/media-libs/libmpeg2/libmpeg2-0.5.1-r3.ebuild b/media-libs/libmpeg2/libmpeg2-0.5.1-r3.ebuild
new file mode 100644
index 000000000000..19f464944a6b
--- /dev/null
+++ b/media-libs/libmpeg2/libmpeg2-0.5.1-r3.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="Library for decoding mpeg-2 and mpeg-1 video"
+HOMEPAGE="https://libmpeg2.sourceforge.io/"
+SRC_URI="http://libmpeg2.sourceforge.net/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+IUSE="sdl X"
+
+RDEPEND="
+	sdl? ( media-libs/libsdl )
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libXt
+		x11-libs/libXv
+	)
+"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-altivec.patch
+	"${FILESDIR}"/${P}-arm-private-symbols.patch
+	"${FILESDIR}"/${P}-armv4l.patch
+	"${FILESDIR}"/${P}-global-symbol-test.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		--disable-static \
+		--enable-shared \
+		$(multilib_native_use_enable sdl) \
+		$(multilib_native_use_with X x)
+
+	# remove useless subdirs
+	multilib_is_native_abi || sed -i -e 's/ libvo src//' Makefile || die
+}
+
+multilib_src_compile() {
+	emake {MPEG2DEC,OPT}_CFLAGS="${CFLAGS}" LIBMPEG2_CFLAGS=
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name '*.la' -delete || die
+}