commit: 1bd8edba755a35857672c14524fb6d6544f84288 Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> AuthorDate: Tue Aug 20 17:42:49 2024 +0000 Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> CommitDate: Tue Aug 20 17:42:49 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bd8edba
media-video/raspberrypi-omxplayer: treeclean Closes: https://bugs.gentoo.org/936398 (pkgremoved) Closes: https://bugs.gentoo.org/908959 (pkgremoved) Closes: https://bugs.gentoo.org/908957 (pkgremoved) Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org> media-video/raspberrypi-omxplayer/Manifest | 1 - .../files/Makefile-0_p20160528.patch | 26 ---------- .../files/cross-0_p20160528.patch | 15 ------ .../raspberrypi-omxplayer/files/fonts-path.patch | 15 ------ media-video/raspberrypi-omxplayer/metadata.xml | 11 ---- .../raspberrypi-omxplayer-0_p20160528-r3.ebuild | 59 ---------------------- profiles/package.mask | 5 -- 7 files changed, 132 deletions(-) diff --git a/media-video/raspberrypi-omxplayer/Manifest b/media-video/raspberrypi-omxplayer/Manifest deleted file mode 100644 index be77ff186208..000000000000 --- a/media-video/raspberrypi-omxplayer/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST raspberrypi-omxplayer-0_p20160528.tar.gz 1207624 BLAKE2B 5b8f8973302718cd06f0b7527eb1cc59bddd4c98a58917c540853e54a5c6d6978b00eb790ac5d18cd2e1b90730543e51c3c6edc221b4df1d9482d5e89af5846b SHA512 c7b00908f52159745dda94f35b9150122ca1e4e97ad1578a89f6db917b1579a8ed94c4ef1592a7c2590240e0fd1e7e0617e3ee8dec7f532368205ee63ce42572 diff --git a/media-video/raspberrypi-omxplayer/files/Makefile-0_p20160528.patch b/media-video/raspberrypi-omxplayer/files/Makefile-0_p20160528.patch deleted file mode 100644 index d71e6b376080..000000000000 --- a/media-video/raspberrypi-omxplayer/files/Makefile-0_p20160528.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- 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 - --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 -lvchostif -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/cross-0_p20160528.patch b/media-video/raspberrypi-omxplayer/files/cross-0_p20160528.patch deleted file mode 100644 index bd35d6283d21..000000000000 --- a/media-video/raspberrypi-omxplayer/files/cross-0_p20160528.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -4,9 +4,11 @@ - - PKGS=freetype2 dbus-1 libavcodec libavutil libavformat libswresample libswscale libpcre - --LIBS+=-lrt -lpthread $(shell pkg-config --libs $(PKGS)) -L/opt/vc/lib -+PKG_CONFIG ?= pkg-config - --INCLUDES+=$(shell pkg-config --cflags $(PKGS)) -I/opt/vc/include -I. -Ilinux -+LIBS+=-lrt -lpthread $(shell $(PKG_CONFIG) --libs $(PKGS)) -L${SYSROOT}/opt/vc/lib -+ -+INCLUDES+=$(shell $(PKG_CONFIG) --cflags $(PKGS)) -I${SYSROOT}/opt/vc/include -I. -Ilinux - - DIST ?= omxplayer-dist diff --git a/media-video/raspberrypi-omxplayer/files/fonts-path.patch b/media-video/raspberrypi-omxplayer/files/fonts-path.patch deleted file mode 100644 index 6683145f6833..000000000000 --- a/media-video/raspberrypi-omxplayer/files/fonts-path.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/omxplayer.cpp b/omxplayer.cpp -index 0626e2e..8450bf2 100644 ---- a/omxplayer.cpp -+++ b/omxplayer.cpp -@@ -83,8 +83,8 @@ bool m_osd = true; - bool m_no_keys = false; - std::string m_external_subtitles_path; - bool m_has_external_subtitles = false; --std::string m_font_path = "/usr/share/fonts/truetype/freefont/FreeSans.ttf"; --std::string m_italic_font_path = "/usr/share/fonts/truetype/freefont/FreeSansOblique.ttf"; -+std::string m_font_path = "/usr/share/fonts/freefont/FreeSans.ttf"; -+std::string m_italic_font_path = "/usr/share/fonts/freefont/FreeSansOblique.ttf"; - std::string m_dbus_name = "org.mpris.MediaPlayer2.omxplayer"; - bool m_asked_for_font = false; - bool m_asked_for_italic_font = false; diff --git a/media-video/raspberrypi-omxplayer/metadata.xml b/media-video/raspberrypi-omxplayer/metadata.xml deleted file mode 100644 index a3222eacca00..000000000000 --- a/media-video/raspberrypi-omxplayer/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="person"> - <email>[email protected]</email> - <name>Miroslav Šulc</name> - </maintainer> - <upstream> - <remote-id type="github">popcornmix/omxplayer</remote-id> - </upstream> -</pkgmetadata> diff --git a/media-video/raspberrypi-omxplayer/raspberrypi-omxplayer-0_p20160528-r3.ebuild b/media-video/raspberrypi-omxplayer/raspberrypi-omxplayer-0_p20160528-r3.ebuild deleted file mode 100644 index 67b8ee489721..000000000000 --- a/media-video/raspberrypi-omxplayer/raspberrypi-omxplayer-0_p20160528-r3.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit flag-o-matic toolchain-funcs - -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/archive/${GIT_COMMIT}.tar.gz -> ${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" - -PATCHES=( - "${FILESDIR}"/Makefile-0_p20160528.patch - "${FILESDIR}"/fonts-path.patch - "${FILESDIR}"/cross-0_p20160528.patch -) - -DOCS=( README.md ) - -S="${WORKDIR}/popcornmix-omxplayer-${GIT_COMMIT}" - -src_prepare() { - default - cat > Makefile.include << EOF -LIBS=-lvchostif -lvchiq_arm -lvcos -lbcm_host -lEGL -lGLESv2 -lopenmaxil -lrt -lpthread -EOF - - tc-export CXX PKG_CONFIG -} - -src_compile() { - emake omxplayer.bin -} - -src_install() { - dobin omxplayer omxplayer.bin - einstalldocs -} diff --git a/profiles/package.mask b/profiles/package.mask index f8aa9667c474..fe01932af1e2 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -196,11 +196,6 @@ dev-util/cucumber-cucumber-expressions:16 dev-util/cucumber-gherking:22 dev-util/cucumber-html-formatter:20 -# Arthur Zamarin <[email protected]> (2024-07-20) -# EAPI=6, fails to apply patch during src_prepare. -# Removal on 2024-08-19. Bugs #936398, #908957, #908959. -media-video/raspberrypi-omxplayer - # Arthur Zamarin <[email protected]> (2024-07-19) # EAPI=6 games. Feel free to drop any package after bumping it's EAPI. # Removal on 2024-08-18. Bug #936299.
