From nobody Sun Dec 31 00:07:41 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T2fZP4nCfz55bv0; Sun, 31 Dec 2023 00:07:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T2fZP2Zvdz4tCr; Sun, 31 Dec 2023 00:07:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703981261; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5e2T86skx+KaTbiG1+HTdhtLH+85SL1NfYE1zKG7mR4=; b=CyfcPmiIb/Y4CLxxv9Jy8VQ1rbSJMGAg0hlJ6Pa0jwAhzwtU1je1DL1w9pPe+qqJDr6Rx2 y73b6h/XGJ0eDBdyQslV5iQgBJB1GmzrBRTMQG2n/xadNtbpSarPtlh4MHH2PHfq24t+rj 0n351PLF8qJ2QbuUvIe/9FacR9at7tqFJ2HQI/Oe6aYm6YG+J48/PF6M37nT9BbD3bD48J bJphZSTAJH6McEyxgbvj/Gs9l2+4mmzEJGd6cfraVbC3BIvqQc1DNUx9yy45ogFgRlMv4G Oe86XtG4q4H9oOkt22+n4FoBdgukHStNx9V17R9lBi5j5vBJmUh/U1mpaGeUEw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703981261; a=rsa-sha256; cv=none; b=hOYS9GTvTaxgsHhKpQ3FFzLshZqOL//70MWUsXmuf8+7FsMwpY+77kfwLmmxMizsPipEFo wADx8gjYClcUICZ0bBnLS2AkETQi8h+qGbsMm80j6VC+2NIGUCQZSC52nO8dEIw7iux8WC zVCcMY5quykmxQGnw7gnFZjnEaL+afIpjGQ2eCO4eN3trJRG0ewwaB9zuRZXs9wxBCiUyX +GezAcMh7NaSCq37YXrJDhh7PLTCylVoDAcOOXBqlwCDkM6ofJYzYltI6wc6uJN1xLaKTz 5taVYZoNm/+qTzkCzZoymuqTbgiiSuB3+K51Jn3GqAcwtAt4rJdCxlmCsoeV9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703981261; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5e2T86skx+KaTbiG1+HTdhtLH+85SL1NfYE1zKG7mR4=; b=OccbkAoBZZpm8HUezP8FVkdm7g8kst5eku9FsG2LtWe1EoXzy1VIeOMbsYOiwY05whz1KZ WfuDd8Ilbfa68qZLHho+eXnwviWeJGjvVgMgFExQH/rWMCMwyzLDRJCOfgsnGzM3yezdI6 L7TXlosDTr415xVmSOOgj8+VlaPAMtDB2bMBDsqOH3juSztPW1JEQn81/hvgu9Nm5IqJZd ffurQ/rjceML2b9Q14ezsL/2W9qrP2phjSPoWtrjtwCsOOcQEy2VlhnXux5w62PKsVj2NH YEKrdAiKcPyZ9NOAvCzpmkbLAFpf81jBGh/MgmePi/DGPl670RHThH3Atxv2aQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T2fZP1hRYz19dl; Sun, 31 Dec 2023 00:07:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BV07fLn094389; Sun, 31 Dec 2023 00:07:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BV07fZa094386; Sun, 31 Dec 2023 00:07:41 GMT (envelope-from git) Date: Sun, 31 Dec 2023 00:07:41 GMT Message-Id: <202312310007.3BV07fZa094386@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 78deb945ebe4 - main - multimedia/omxplayer: Remove expired port List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 78deb945ebe418c3734fcf6438e05b8b5c3adc32 Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=78deb945ebe418c3734fcf6438e05b8b5c3adc32 commit 78deb945ebe418c3734fcf6438e05b8b5c3adc32 Author: Muhammad Moinur Rahman AuthorDate: 2023-12-29 21:55:22 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2023-12-31 00:06:18 +0000 multimedia/omxplayer: Remove expired port 2023-12-31 multimedia/omxplayer: Depends on legacy APIs and interfaces, functionality is being in integrated into VLC --- MOVED | 1 + multimedia/Makefile | 1 - multimedia/omxplayer/Makefile | 60 -------------------- multimedia/omxplayer/distinfo | 5 -- multimedia/omxplayer/files/patch-Keyboard.cpp | 64 ---------------------- multimedia/omxplayer/files/patch-Keyboard.h | 11 ---- multimedia/omxplayer/files/patch-Makefile | 28 ---------- multimedia/omxplayer/files/patch-Makefile.include | 46 ---------------- .../omxplayer/files/patch-linux_PlatformDefs.h | 29 ---------- multimedia/omxplayer/files/patch-omxplayer.cpp | 13 ----- .../omxplayer/files/patch-utils_variant-impl.hpp | 27 --------- multimedia/omxplayer/pkg-descr | 3 - 12 files changed, 1 insertion(+), 287 deletions(-) diff --git a/MOVED b/MOVED index 62b54ccd0538..30e51f9043ad 100644 --- a/MOVED +++ b/MOVED @@ -8214,3 +8214,4 @@ mail/trojita||2023-12-31|Has expired: Depends on deprecated www/qt5-webkit games/springlobby||2023-12-31|Has expired: Depends on expired games/spring graphics/libgfx||2023-12-31|Has expired: unmaintained upstream since sep 2005 devel/cook||2023-12-31|Has expired: Upstream last release was in 2008 +multimedia/omxplayer||2023-12-31|Has expired: Depends on legacy APIs and interfaces, functionality is being in integrated into VLC diff --git a/multimedia/Makefile b/multimedia/Makefile index 730eb9f67877..b511a4d32270 100644 --- a/multimedia/Makefile +++ b/multimedia/Makefile @@ -264,7 +264,6 @@ SUBDIR += ogmrip SUBDIR += ogmtools SUBDIR += olive - SUBDIR += omxplayer SUBDIR += onevpl SUBDIR += openh264 SUBDIR += openshot diff --git a/multimedia/omxplayer/Makefile b/multimedia/omxplayer/Makefile deleted file mode 100644 index 2c30b3a057c0..000000000000 --- a/multimedia/omxplayer/Makefile +++ /dev/null @@ -1,60 +0,0 @@ -PORTNAME= omxplayer -PORTVERSION= 20161004 -PORTREVISION= 20 -CATEGORIES= multimedia - -PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ -PATCHFILES= 96800576209b.patch:-p1 - -MAINTAINER= ports@FreeBSD.org -COMMENT= Raspberry Pi video player -WWW= https://github.com/popcornmix/omxplayer - -LICENSE= GPLv2 -LICENSE_FILE= ${WRKSRC}/COPYING - -DEPRECATED= Depends on legacy APIs and interfaces, functionality is being in integrated into VLC -EXPIRATION_DATE=2023-12-31 - -LIB_DEPENDS= libasound.so:audio/alsa-lib \ - libboost_thread.so:devel/boost-libs \ - libdbus-1.so:devel/dbus \ - libpcre.so:devel/pcre \ - libEGL.so:misc/raspberrypi-userland \ - libavcodec.so:multimedia/ffmpeg \ - libfreetype.so:print/freetype2 -RUN_DEPENDS= bash:shells/bash \ - ${LOCALBASE}/share/fonts/freefont-ttf/FreeSans.ttf:x11-fonts/freefont-ttf - -ONLY_FOR_ARCHS= armv6 armv7 - -CFLAGS+= -Dfopen64=fopen -Dfseeko64=fseeko -Dftello64=ftello -ALL_TARGET= omxplayer.bin - -USE_GITHUB= yes -GH_ACCOUNT= popcornmix -GH_TAGNAME= 12b472e - -USES= gmake shebangfix -SHEBANG_FILES= omxplayer - -PLIST_FILES= bin/omxplayer bin/omxplayer.bin -PORTDOCS= README.md - -OPTIONS_DEFINE= DOCS - -post-patch: - @${REINPLACE_CMD} -e \ - 's|LOCALBASE|${LOCALBASE}|g' ${WRKSRC}/omxplayer.cpp - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/omxplayer.bin ${STAGEDIR}${PREFIX}/bin - ${INSTALL_SCRIPT} ${WRKSRC}/omxplayer ${STAGEDIR}${PREFIX}/bin - -do-install-DOCS-on: - @${MKDIR} ${STAGEDIR}${DOCSDIR} -.for i in ${PORTDOCS} - ${INSTALL_DATA} -p ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} -.endfor - -.include diff --git a/multimedia/omxplayer/distinfo b/multimedia/omxplayer/distinfo deleted file mode 100644 index 91ea039be541..000000000000 --- a/multimedia/omxplayer/distinfo +++ /dev/null @@ -1,5 +0,0 @@ -TIMESTAMP = 1483038468 -SHA256 (popcornmix-omxplayer-20161004-12b472e_GH0.tar.gz) = 8aabcc8a1665686dfb72e74b30b6f755a72b5e5577e235dad6c1c6d28dc79637 -SIZE (popcornmix-omxplayer-20161004-12b472e_GH0.tar.gz) = 1218679 -SHA256 (96800576209b.patch) = d1bdcf27c4f4ab9b9d85ee26d126b3eb62af827498860d3e9c430f111708bb8e -SIZE (96800576209b.patch) = 3484 diff --git a/multimedia/omxplayer/files/patch-Keyboard.cpp b/multimedia/omxplayer/files/patch-Keyboard.cpp deleted file mode 100644 index c5d3de9204a3..000000000000 --- a/multimedia/omxplayer/files/patch-Keyboard.cpp +++ /dev/null @@ -1,64 +0,0 @@ ---- Keyboard.cpp.orig 2015-10-24 12:09:14 UTC -+++ Keyboard.cpp -@@ -23,7 +23,6 @@ Keyboard::Keyboard() - new_termios = orig_termios; - new_termios.c_lflag &= ~(ICANON | ECHO | ECHOCTL | ECHONL); - new_termios.c_cflag |= HUPCL; -- new_termios.c_cc[VMIN] = 0; - - tcsetattr(STDIN_FILENO, TCSANOW, &new_termios); - } -@@ -74,13 +73,20 @@ void Keyboard::restore_term() - } - } - --void Keyboard::Sleep(unsigned int dwMilliSeconds) -+int Keyboard::Hit() - { -- struct timespec req; -- req.tv_sec = dwMilliSeconds / 1000; -- req.tv_nsec = (dwMilliSeconds % 1000) * 1000000; -+ struct timeval timeo; -+ fd_set fds; - -- while ( nanosleep(&req, &req) == -1 && errno == EINTR && (req.tv_nsec > 0 || req.tv_sec > 0)); -+ timeo.tv_sec = 0; -+ timeo.tv_usec = 200000; -+ -+ FD_ZERO(&fds); -+ FD_SET(STDIN_FILENO, &fds); -+ -+ select(FD_SETSIZE, &fds, NULL, NULL, &timeo); -+ -+ return FD_ISSET(STDIN_FILENO, &fds); - } - - void Keyboard::Process() -@@ -90,9 +96,16 @@ void Keyboard::Process() - if (conn) - dbus_connection_read_write_dispatch(conn, 0); - int ch[8]; -- int chnum = 0; -+ int chnum, nb; - -- while ((ch[chnum] = getchar()) != EOF) chnum++; -+ if (Hit() == 0) -+ continue; -+ -+ ioctl(STDIN_FILENO, FIONREAD, &nb); -+ -+ for (chnum = 0; chnum < nb && chnum < 8; chnum++) { -+ ch[chnum] = getchar(); -+ } - - if (chnum > 1) ch[0] = ch[chnum - 1] | (ch[chnum - 2] << 8); - -@@ -101,8 +114,6 @@ void Keyboard::Process() - - if (m_keymap[ch[0]] != 0) - send_action(m_keymap[ch[0]]); -- else -- Sleep(20); - } - } - diff --git a/multimedia/omxplayer/files/patch-Keyboard.h b/multimedia/omxplayer/files/patch-Keyboard.h deleted file mode 100644 index f1e97c42328c..000000000000 --- a/multimedia/omxplayer/files/patch-Keyboard.h +++ /dev/null @@ -1,11 +0,0 @@ ---- Keyboard.h.orig 2015-10-24 12:09:14 UTC -+++ Keyboard.h -@@ -21,7 +21,7 @@ - void Process(); - void setKeymap(std::map keymap); - void setDbusName(std::string dbus_name); -- void Sleep(unsigned int dwMilliSeconds); -+ int Hit(); - int getEvent(); - private: - void restore_term(); diff --git a/multimedia/omxplayer/files/patch-Makefile b/multimedia/omxplayer/files/patch-Makefile deleted file mode 100644 index bdea4a3d2637..000000000000 --- a/multimedia/omxplayer/files/patch-Makefile +++ /dev/null @@ -1,28 +0,0 @@ ---- Makefile.orig 2016-09-14 UTC -+++ Makefile -@@ -2,9 +2,9 @@ include Makefile.include - - 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 -lasound -+LDFLAGS+=-L./ -L$(LOCALBASE)/share/vc/lib -lWFC -lGLESv2 -lEGL -lbcm_host -lopenmaxil -lfreetype -lz -lasound - --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+=-I./ -Ilinux -I$(LOCALBASE)/share/vc/include -I$(LOCALBASE)/include/dbus-1.0 -I$(LOCALBASE)/include/dbus-1.0/include -I$(LOCALBASE)/include/freetype2 -I$(LOCALBASE)/include/ffmpeg - - DIST ?= omxplayer-dist - -@@ -49,11 +49,10 @@ all: dist - omxplayer.o: help.h keys.h - - version: -- bash gen_version.sh > version.h -+ sh 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) $(CFLAGS) $(LDFLAGS) -o omxplayer.bin $(OBJS) -lvchiq_arm -lvcos -ldbus-1 -lrt -lthr -lavutil -lavcodec -lavformat -lswscale -lswresample -lpcre - - help.h: README.md Makefile - awk '/SYNOPSIS/{p=1;print;next} p&&/KEY BINDINGS/{p=0};p' $< \ diff --git a/multimedia/omxplayer/files/patch-Makefile.include b/multimedia/omxplayer/files/patch-Makefile.include deleted file mode 100644 index 1baaafde3eea..000000000000 --- a/multimedia/omxplayer/files/patch-Makefile.include +++ /dev/null @@ -1,46 +0,0 @@ ---- Makefile.include.orig 2017-01-03 14:55:21 UTC -+++ Makefile.include -@@ -1,40 +1,3 @@ --USE_BUILDROOT=0 --FLOAT=hard -- --ifeq ($(USE_BUILDROOT), 1) --BUILDROOT :=/opt/xbmc-bcm/buildroot --SDKSTAGE :=$(BUILDROOT)/output/staging --TARGETFS :=$(BUILDROOT)/output/target --TOOLCHAIN :=$(BUILDROOT)/output/host/usr/ --HOST :=arm-unknown-linux-gnueabi --SYSROOT :=$(BUILDROOT)/output/host/usr/arm-unknown-linux-gnueabi/sysroot --else --BUILDROOT :=/opt/bcm-rootfs --SDKSTAGE :=/opt/bcm-rootfs --TARGETFS :=/opt/bcm-rootfs --TOOLCHAIN :=/home/dc4/tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian/ --HOST :=arm-linux-gnueabihf --#SYSROOT :=$(TOOLCHAIN)/arm-bcm2708hardfp-linux-gnueabi/sysroot --SYSROOT :=/opt/bcm-rootfs --endif -- --JOBS=7 -- --CFLAGS := -isystem$(PREFIX)/include --CXXFLAGS := $(CFLAGS) --CPPFLAGS := $(CFLAGS) --LDFLAGS := -L$(BUILDROOT)/lib --LD := $(TOOLCHAIN)/bin/$(HOST)-ld --sysroot=$(SYSROOT) --CC := $(TOOLCHAIN)/bin/$(HOST)-gcc --sysroot=$(SYSROOT) --CXX := $(TOOLCHAIN)/bin/$(HOST)-g++ --sysroot=$(SYSROOT) --OBJDUMP := $(TOOLCHAIN)/bin/$(HOST)-objdump --RANLIB := $(TOOLCHAIN)/bin/$(HOST)-ranlib --STRIP := $(TOOLCHAIN)/bin/$(HOST)-strip --AR := $(TOOLCHAIN)/bin/$(HOST)-ar --CXXCP := $(CXX) -E --PATH := $(PREFIX)/bin:$(BUILDROOT)/output/host/usr/bin:$(PATH) -- --CFLAGS += -pipe -mfloat-abi=$(FLOAT) -mcpu=arm1176jzf-s -fomit-frame-pointer -mabi=aapcs-linux -mtune=arm1176jzf-s -mfpu=vfp -Wno-psabi -mno-apcs-stack-check -g -mstructure-size-boundary=32 -mno-sched-prolog --LDFLAGS += -L$(SDKSTAGE)/lib -L$(SDKSTAGE)/usr/lib -L$(SDKSTAGE)/opt/vc/lib/ -Lpcre/build --#INCLUDES += -isystem$(SDKSTAGE)/usr/include -isystem$(SDKSTAGE)/opt/vc/include -isystem$(SYSROOT)/usr/include -isystem$(SDKSTAGE)/opt/vc/include/interface/vcos/pthreads -isystem$(SDKSTAGE)/usr/include/freetype2 --INCLUDES += -isystem$(SDKSTAGE)/opt/vc/include -isystem$(SYSROOT)/usr/include -isystem$(SDKSTAGE)/opt/vc/include/interface/vcos/pthreads -Ipcre/build -Iboost-trunk -Ifreetype2/include -+CFLAGS += -fomit-frame-pointer -+LDFLAGS += -L$(LOCALBASE)/share/vc/lib -L$(LOCALBASE)/lib -L$(LOCALBASE)/lib/ffmpeg -+INCLUDES += -I$(LOCALBASE)/share/vc/include -I$(LOCALBASE)/include -I$(LOCALBASE)/share/vc/include/interface/vcos/pthreads -I$(LOCALBASE)/share/vc/include/interface/vmcs_host/linux -I$(LOCALBASE)/lib/dbus-1.0/include diff --git a/multimedia/omxplayer/files/patch-linux_PlatformDefs.h b/multimedia/omxplayer/files/patch-linux_PlatformDefs.h deleted file mode 100644 index 90d1aceeb448..000000000000 --- a/multimedia/omxplayer/files/patch-linux_PlatformDefs.h +++ /dev/null @@ -1,29 +0,0 @@ ---- linux/PlatformDefs.h.orig 2015-10-24 12:09:14 UTC -+++ linux/PlatformDefs.h -@@ -39,11 +39,11 @@ - #include - #include - #include --#ifdef __APPLE__ -+#if defined(__APPLE__) - #include - #include - #include --#else -+#elif defined(__linux__) - #include - #endif - #include -@@ -416,8 +416,12 @@ typedef struct _SECURITY_ATTRIBUTES { - #define FILE_CURRENT 1 - #define FILE_END 2 - -+#ifndef _S_IFREG - #define _S_IFREG S_IFREG -+#endif -+#ifndef _S_IFDIR - #define _S_IFDIR S_IFDIR -+#endif - #define MAX_PATH PATH_MAX - - #define _stat stat diff --git a/multimedia/omxplayer/files/patch-omxplayer.cpp b/multimedia/omxplayer/files/patch-omxplayer.cpp deleted file mode 100644 index 7970c3d1bb35..000000000000 --- a/multimedia/omxplayer/files/patch-omxplayer.cpp +++ /dev/null @@ -1,13 +0,0 @@ ---- omxplayer.cpp.orig 2015-10-24 12:09:14 UTC -+++ omxplayer.cpp -@@ -84,8 +86,8 @@ bool m_osd - 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 = "LOCALBASE/share/fonts/freefont-ttf/FreeSans.ttf"; -+std::string m_italic_font_path = "LOCALBASE/share/fonts/freefont-ttf/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/multimedia/omxplayer/files/patch-utils_variant-impl.hpp b/multimedia/omxplayer/files/patch-utils_variant-impl.hpp deleted file mode 100644 index f98dd32303f5..000000000000 --- a/multimedia/omxplayer/files/patch-utils_variant-impl.hpp +++ /dev/null @@ -1,27 +0,0 @@ ---- utils/variant-impl.hpp.orig 2017-01-02 19:30:30 UTC -+++ utils/variant-impl.hpp -@@ -306,12 +306,12 @@ struct get_index(); - static const bool is_relaxed_match = relaxed_same(); -- static const bool is_variant = is_variant::value; -+ static const bool is_variant_match = is_variant::value; - static const bool is_ud_match = Checker::value; -- static const bool is_strict_ud_match = is_ud_match && !is_variant; -+ static const bool is_strict_ud_match = is_ud_match && !is_variant_match; - - typedef typename get_index_of_variant::type variant_indices; -- static const int var_quality = is_variant ? variant_indices::quality - 2 : 0; -+ static const int var_quality = is_variant_match ? variant_indices::quality - 2 : 0; - - // Match quality: - // exact > su > rel > strict_ud > ud -@@ -335,7 +335,7 @@ struct get_index