gentoo resync : 28.04.2021

6 files changed, 5 insertions, 188 deletions

diff --git a/media-video/raspberrypi-omxplayer/Manifest b/media-video/raspberrypi-omxplayer/Manifest
index 9d97afa63731..5d28613d2a35 100644
--- a/media-video/raspberrypi-omxplayer/Manifest
+++ b/media-video/raspberrypi-omxplayer/Manifest
@@ -1,11 +1,6 @@
-AUX Makefile-0_p20160217.patch 1567 BLAKE2B 6e305549a07794ea4e3f97131577e5cb97c8e73b60e75b8a4bbe99feeb683a63f8106c35cc4a92957c2d4ed169e4d6ca75cb7b6a8c28e22fe0094262b43ae9f7 SHA512 c32de32fbbe39b004c428aee9bd65574704c02cd5a7470ceaeba5a039ffb1b78f288f6394a2aa2a544072704ee6d1d2eff10689d15ea16ba8350c6c71bba11eb
-AUX Makefile-0_p20160528.patch 1578 BLAKE2B d0df4c085c06ae76a54bd8fc8db9251054787eb2cfacddfbca0c2110e6992efe10d090ae2ace6d5da2e1f55f4ca9f43596ab8555cb8a3fa4cb5917f0878b161b SHA512 6831719329d6900dd65c7fa6961790300bb8c204b59b81f2d0c6c31e6410bbf89f206d852cd5fb364e2945f36d6fc6be9f25f34158d1c1831581ff05162f900b
+AUX Makefile-0_p20160528.patch 1558 BLAKE2B 46ac6fc78241cef74e05b560c7a75d8367f8e191066f40a801b760688c99cd39b36d36ad56c73979bdef988a01906576169232bcf08d8ff0584510018ef28468 SHA512 0774d69992a1a19c4caf7edd17dfb41f5670ad1f8c4a86834064ce1a9fe88db01814b4c6eb8e8c118b94280e5af908bc8806831252617613dbdc745acd99ccc4
 AUX cross-0_p20160528.patch 520 BLAKE2B d7c69d51a04cf7c458ed97e3911ea6732dd7e51c1cec42787de9c5f77bde1e6312c83fc5317c838e2e8d684f22cd2ac7fbc56c36551421b7468868eb811e9688 SHA512 7ac3f7b3cda31ff6277da792d49e18b792646108faa28154bbad719f0181187e22d9ac7065a685edfcbc28076fc8a37d95b9381cc68e39a469a15c85622dec58
 AUX fonts-path.patch 881 BLAKE2B 3d95639c3aa0bc2d724b44477edc3f9699d627822df12504cf0a3e7beed7fc80a1d1b8a30d2dc4012a2ba0c9869dea5f8801610685b472a4a50b9a0d91748440 SHA512 995e9b5850a240e07814697054178fc19e94483d51b11a3786b8eff6c609619be2d7caa97c63ebdc1d194acb1d24a85b8acd34bbb4d5c0c7cc92a14da7b368dd
-DIST raspberrypi-omxplayer-0_p20160217.tar.gz 1204486 BLAKE2B 4c6739f9cf3f8c401966581a84634aa2187d00110a2a7a5b9077cf1b9efafb1a21c03c4cfaaad4f225b7f2f2d1bb6c777d6d01c1268c14049a2eb03cabf60dbb SHA512 5137ba534ce3b0698c6ace8f570594c97ef978aaa97e6cc902f7895412c5d0282c7c4fa1f7b03f043d5281f0a282caf494602e45aae6a12d6d35bc26aaa4000f
 DIST raspberrypi-omxplayer-0_p20160528.tar.gz 1207624 BLAKE2B 5b8f8973302718cd06f0b7527eb1cc59bddd4c98a58917c540853e54a5c6d6978b00eb790ac5d18cd2e1b90730543e51c3c6edc221b4df1d9482d5e89af5846b SHA512 c7b00908f52159745dda94f35b9150122ca1e4e97ad1578a89f6db917b1579a8ed94c4ef1592a7c2590240e0fd1e7e0617e3ee8dec7f532368205ee63ce42572
-EBUILD raspberrypi-omxplayer-0_p20160217-r1.ebuild 1068 BLAKE2B 1fb694b3a2487b33c751e72dfe6d33cbfbc54c64627a85b113a703bb50f5ccbcbb72ba7eb3ddd9d61c641b78327a963a84e6c8836d2045a5c66364e57314bbb9 SHA512 85f57873b23a94e04b238b65df974ef7dc1339761b1be19f9be376e2bc944cb683f063e88e36de49f2ffcf939d942fa0719d3f58903722637fbf4bf4669962af
-EBUILD raspberrypi-omxplayer-0_p20160528-r2.ebuild 1130 BLAKE2B f5bf083c0f2aa4591fb6453a6708979487dd99b2791e4d687e20bf97288a6d799e130e4dc923313b4c7790344ceb8fee908e6846c930cb26287d56ce7d7b6a50 SHA512 46e9e58f8fbc17adf465ca5cf18056f8f461ec849b91176f9ed96cf4c1a785ec2fcbfeb3d9961aa9cef96616fc03fb3c17c3e34403dabe8d7ca83aad084baed9
 EBUILD raspberrypi-omxplayer-0_p20160528-r3.ebuild 1201 BLAKE2B 82f21e01576c9ec997d464f1e29fc93dd46895e074896f84cf25b1c03cd8070036b1cd937ffdeb6cd5f4bfcbd65303dc1c4a0f6e3d085612115d5a2d9b494ea8 SHA512 289f39d62a0a3d4ac0534d2060c91284709f15ac05ce889e7edeca7bfa9d2de5618a8bd948443605fc531bbb1766876b708198bae913903528304f31bc93c336
-EBUILD raspberrypi-omxplayer-9999.ebuild 1023 BLAKE2B f5e6889287bf8f4c571ac856eb0dde6a34300b43507e66e79a6158e92b814ffd5f244bd11afe2436f9080e2e5438832c779fcb19871d0224a48cc594993fa78a SHA512 7e1a47f4931183b411b09b4db4d9e517c7b087545410673aef0851421a04e75cefb1d2f6f9ae7c062d6df4bd39d288ff1313d63b3f1dc449157881f54d56e191
 MISC metadata.xml 334 BLAKE2B 15d5f7c9703eadfceff441baeb65825f2424949cd0d0c1181615c65bc7b7411e5988aaffbdd3c11d3c82a798e44f0c567b7ac004b5e9e501ec49b8cb2fcad4cb SHA512 e11d2fffe221a77abeb9d7921240732d0f531ab24f0c7663fed7d36a4450a806e97f27329ab7cb63eec9803f377fbe6e757d7bfd50fbb584640e92ed942d9320
diff --git a/media-video/raspberrypi-omxplayer/files/Makefile-0_p20160217.patch b/media-video/raspberrypi-omxplayer/files/Makefile-0_p20160217.patch
deleted file mode 100644
index c6f945209b95..000000000000
--- a/media-video/raspberrypi-omxplayer/files/Makefile-0_p20160217.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- omxplayer-9999/Makefile
-+++ omxplayer-9999/Makefile
-@@ -2,9 +2,11 @@
- 
- CFLAGS+=-std=c++0x -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -DTARGET_POSIX -DTARGET_LINUX -fPIC -DPIC -D_REENTRANT -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DHAVE_CMAKE_CONFIG -D__VIDEOCORE4__ -U_FORTIFY_SOURCE -Wall -DHAVE_OMXLIB -DUSE_EXTERNAL_FFMPEG  -DHAVE_LIBAVCODEC_AVCODEC_H -DHAVE_LIBAVUTIL_OPT_H -DHAVE_LIBAVUTIL_MEM_H -DHAVE_LIBAVUTIL_AVUTIL_H -DHAVE_LIBAVFORMAT_AVFORMAT_H -DHAVE_LIBAVFILTER_AVFILTER_H -DHAVE_LIBSWRESAMPLE_SWRESAMPLE_H -DOMX -DOMX_SKIP64BIT -ftree-vectorize -DUSE_EXTERNAL_OMX -DTARGET_RASPBERRY_PI -DUSE_EXTERNAL_LIBBCM_HOST
- 
--LDFLAGS+=-L./ -Lffmpeg_compiled/usr/local/lib/ -lc -lWFC -lGLESv2 -lEGL -lbcm_host -lopenmaxil -lfreetype -lz
-+PKGS=freetype2 dbus-1 libavcodec libavutil libavformat libswresample libswscale libpcre
-+
-+LIBS+=-lrt -lpthread $(shell pkg-config --libs $(PKGS)) -L/opt/vc/lib
- 
--INCLUDES+=-I./ -Ilinux -Iffmpeg_compiled/usr/local/include/ -I /usr/include/dbus-1.0 -I /usr/lib/arm-linux-gnueabihf/dbus-1.0/include
-+INCLUDES+=$(shell pkg-config --cflags $(PKGS)) -I/opt/vc/include -I. -Ilinux
- 
- DIST ?= omxplayer-dist
- 
-@@ -51,8 +47,7 @@
- 	bash gen_version.sh > version.h 
- 
- omxplayer.bin: version $(OBJS)
--	$(CXX) $(LDFLAGS) -o omxplayer.bin $(OBJS) -lvchiq_arm -lvcos -ldbus-1 -lrt -lpthread -lavutil -lavcodec -lavformat -lswscale -lswresample -lpcre
--	$(STRIP) omxplayer.bin
-+	$(CXX) $(LDFLAGS) -o omxplayer.bin $(OBJS) $(LIBS)
- 
- help.h: README.md Makefile
- 	awk '/SYNOPSIS/{p=1;print;next} p&&/KEY BINDINGS/{p=0};p' $< \
diff --git a/media-video/raspberrypi-omxplayer/files/Makefile-0_p20160528.patch b/media-video/raspberrypi-omxplayer/files/Makefile-0_p20160528.patch
index eb65f5d7ad70..d71e6b376080 100644
--- a/media-video/raspberrypi-omxplayer/files/Makefile-0_p20160528.patch
+++ b/media-video/raspberrypi-omxplayer/files/Makefile-0_p20160528.patch
@@ -1,5 +1,5 @@
---- omxplayer-9999/Makefile
-+++ omxplayer-9999/Makefile
+--- a/Makefile
++++ b/Makefile
 @@ -2,9 +2,11 @@
  
  CFLAGS+=-std=c++0x -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -DTARGET_POSIX -DTARGET_LINUX -fPIC -DPIC -D_REENTRANT -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DHAVE_CMAKE_CONFIG -D__VIDEOCORE4__ -U_FORTIFY_SOURCE -Wall -DHAVE_OMXLIB -DUSE_EXTERNAL_FFMPEG  -DHAVE_LIBAVCODEC_AVCODEC_H -DHAVE_LIBAVUTIL_OPT_H -DHAVE_LIBAVUTIL_MEM_H -DHAVE_LIBAVUTIL_AVUTIL_H -DHAVE_LIBAVFORMAT_AVFORMAT_H -DHAVE_LIBAVFILTER_AVFILTER_H -DHAVE_LIBSWRESAMPLE_SWRESAMPLE_H -DOMX -DOMX_SKIP64BIT -ftree-vectorize -DUSE_EXTERNAL_OMX -DTARGET_RASPBERRY_PI -DUSE_EXTERNAL_LIBBCM_HOST
@@ -7,10 +7,10 @@
 -LDFLAGS+=-L./ -Lffmpeg_compiled/usr/local/lib/ -lc -lWFC -lGLESv2 -lEGL -lbcm_host -lopenmaxil -lfreetype -lz
 +PKGS=freetype2 dbus-1 libavcodec libavutil libavformat libswresample libswscale libpcre
 +
-+LIBS+=-lrt -lpthread $(shell pkg-config --libs $(PKGS)) -L/opt/vc/lib
++LIBS+=-lrt -lpthread $(shell ${PKG_CONFIG} --libs $(PKGS)) -L/opt/vc/lib
  
 -INCLUDES+=-I./ -Ilinux -Iffmpeg_compiled/usr/local/include/ -I /usr/include/dbus-1.0 -I /usr/lib/arm-linux-gnueabihf/dbus-1.0/include
-+INCLUDES+=$(shell pkg-config --cflags $(PKGS)) -I/opt/vc/include -I. -Ilinux
++INCLUDES+=$(shell ${PKG_CONFIG} --cflags $(PKGS)) -I/opt/vc/include -I. -Ilinux
  
  DIST ?= omxplayer-dist
  
diff --git a/media-video/raspberrypi-omxplayer/raspberrypi-omxplayer-0_p20160217-r1.ebuild b/media-video/raspberrypi-omxplayer/raspberrypi-omxplayer-0_p20160217-r1.ebuild
deleted file mode 100644
index 862d38275e34..000000000000
--- a/media-video/raspberrypi-omxplayer/raspberrypi-omxplayer-0_p20160217-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs flag-o-matic
-
-GIT_COMMIT="15a490b"
-DESCRIPTION="Command line media player for the Raspberry Pi"
-HOMEPAGE="https://github.com/popcornmix/omxplayer"
-SRC_URI="https://github.com/popcornmix/omxplayer/tarball/${GIT_COMMIT} -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~arm"
-IUSE=""
-
-RDEPEND="dev-libs/libpcre
-	media-fonts/freefont
-	|| ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin )
-	sys-apps/dbus
-	sys-apps/fbset
-	media-video/ffmpeg
-	x11-apps/xrefresh
-	x11-apps/xset"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/popcornmix-omxplayer-${GIT_COMMIT}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/Makefile-0_p20160217.patch \
-		"${FILESDIR}"/fonts-path.patch
-
-	cat > Makefile.include << EOF
-LIBS=-lvchiq_arm -lvcos -lbcm_host -lEGL -lGLESv2 -lopenmaxil -lrt -lpthread
-EOF
-
-	tc-export CXX
-}
-
-src_compile() {
-	emake omxplayer.bin
-}
-
-src_install() {
-	dobin omxplayer omxplayer.bin
-	dodoc README.md
-}
diff --git a/media-video/raspberrypi-omxplayer/raspberrypi-omxplayer-0_p20160528-r2.ebuild b/media-video/raspberrypi-omxplayer/raspberrypi-omxplayer-0_p20160528-r2.ebuild
deleted file mode 100644
index a5a79ed5c0b2..000000000000
--- a/media-video/raspberrypi-omxplayer/raspberrypi-omxplayer-0_p20160528-r2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs flag-o-matic
-
-GIT_COMMIT="791d7df"
-DESCRIPTION="Command line media player for the Raspberry Pi"
-HOMEPAGE="https://github.com/popcornmix/omxplayer"
-SRC_URI="https://github.com/popcornmix/omxplayer/tarball/${GIT_COMMIT} -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~arm"
-IUSE="X"
-
-RDEPEND="dev-libs/libpcre
-	media-fonts/freefont
-	|| ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin )
-	sys-apps/dbus
-	sys-apps/fbset
-	media-video/ffmpeg
-	dev-libs/boost
-	media-libs/freetype:2
-	X? (
-		x11-apps/xrefresh
-		x11-apps/xset
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/popcornmix-omxplayer-${GIT_COMMIT}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/Makefile-0_p20160528.patch \
-		"${FILESDIR}"/fonts-path.patch
-
-	cat > Makefile.include << EOF
-LIBS=-lvchostif -lvchiq_arm -lvcos -lbcm_host -lEGL -lGLESv2 -lopenmaxil -lrt -lpthread
-EOF
-
-	tc-export CXX
-}
-
-src_compile() {
-	emake omxplayer.bin
-}
-
-src_install() {
-	dobin omxplayer omxplayer.bin
-	dodoc README.md
-}
diff --git a/media-video/raspberrypi-omxplayer/raspberrypi-omxplayer-9999.ebuild b/media-video/raspberrypi-omxplayer/raspberrypi-omxplayer-9999.ebuild
deleted file mode 100644
index 3cefa5dab0e0..000000000000
--- a/media-video/raspberrypi-omxplayer/raspberrypi-omxplayer-9999.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils git-r3 toolchain-funcs flag-o-matic
-
-DESCRIPTION="Command line media player for the Raspberry Pi"
-HOMEPAGE="https://github.com/popcornmix/omxplayer"
-EGIT_REPO_URI="https://github.com/popcornmix/omxplayer.git"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="X"
-
-RDEPEND="dev-libs/libpcre
-	media-fonts/freefont
-	|| ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin )
-	sys-apps/dbus
-	sys-apps/fbset
-	media-video/ffmpeg
-	dev-libs/boost
-	media-libs/freetype:2
-	X? (
-		x11-apps/xrefresh
-		x11-apps/xset
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/Makefile-0_p20160217.patch \
-		"${FILESDIR}"/fonts-path.patch
-
-	cat > Makefile.include << EOF
-LIBS=-lvchiq_arm -lvcos -lbcm_host -lEGL -lGLESv2 -lopenmaxil -lrt -lpthread
-EOF
-
-	tc-export CXX
-}
-
-src_compile() {
-	emake omxplayer.bin
-}
-
-src_install() {
-	dobin omxplayer omxplayer.bin
-	dodoc README.md
-}