diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-11-25 22:39:15 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-11-25 22:39:15 +0000 |
| commit | d934827bf44b7cfcf6711964418148fa60877668 (patch) | |
| tree | 0625f358789b5e015e49db139cc1dbc9be00428f /media-tv | |
| parent | 2e34d110f164bf74d55fced27fe0000201b3eec5 (diff) | |
gentoo resync : 25.11.2020
Diffstat (limited to 'media-tv')
42 files changed, 697 insertions, 2190 deletions
diff --git a/media-tv/Manifest.gz b/media-tv/Manifest.gz Binary files differindex 2a9f10047277..106e2e5b97b1 100644 --- a/media-tv/Manifest.gz +++ b/media-tv/Manifest.gz diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest index e46357dafce0..f08dae08115e 100644 --- a/media-tv/kodi/Manifest +++ b/media-tv/kodi/Manifest @@ -1,17 +1,9 @@ -AUX kodi-18-remove-useless-test.patch 1295 BLAKE2B 36c6408ee1ef404539f097822952fa4000b4913ed5b54526bb4f2b452a553335eb3935e5a6cbcec0b1e497eed86d5417784016404596d31a063d608ca1f44d51 SHA512 73c50bf728d04117ad1493505bea561ade6c49e2e58de24a453374946d0931e11e094b749bad9d90ea48197521808a12b87c42e496acb6091380f4953b959567 -AUX kodi-18.5-cassert.patch 1402 BLAKE2B 02f2b63856cf1fd75749d78a0f9cf37cac55b20fc22302846011781c56e8902312a10e71c3e1b21f44aaa362efba2acefb73c5ae68643b569c541508f44d97bd SHA512 fbaa126dd647559749944c09e5424a76dccdaa5d8dc6299a52cb6215f20af29f3cf8d0596280f335e8a9be1ffe556fa47b33c9d28b22c2b47f51d738219aeb8c -DIST ffmpeg-kodi-4.0.4-Leia-18.4.tar.gz 12430413 BLAKE2B 6de6fde2c16264f851466b46f87c23c34e7d503203f69d47342d46034f153860190d196da51221f866315405c8a33325b2160283333256ee5d5e293336afae99 SHA512 c6dd75dbff7119adeeda246cfb640b5e8d3b4c242ef83e5ba070207b60f0c715c3fe3cb328d87687b70a133f122a03aba990f0e95f3aac7d5dbcee25bec59078 -DIST ffmpeg-kodi-4.3.1-Matrix-Alpha1-2.tar.gz 13477450 BLAKE2B c33a2aad8b895be3ea5be76de238680284487d38a8c22ce57f17c3944a6ba214c0dfa9ef1e4717244ff8f70f6dd640b36715842d61ddaed65867a6c096470283 SHA512 7f614d0dd2b319414cb31853be9cd52e5e81b780a4049e36470f992e78e52bcd65e99bfd268df5f8781ad030bb60f99d15bd5e8c4d7c2fd9a4011b55a3efc40c -DIST kodi-18-libmicrohttpd-0.9.71.patch 84981 BLAKE2B e07c7df63bdfbaf9dfc5d0989adf96eb663a8c99ea11c42dfc585d8b91343a3445e9bc2f1797e845b0895e79568526e8e594a76e8cb3d7b591153a0ad45ce807 SHA512 286a1466174d847eac460b2a7a1b66b082148f2a3e91c4f5f881b909a59b8fdb2037eda074bd3c6e5dbe6a65dc2bef9f1d6746d7db2cb78d285c4b7750c366c2 -DIST kodi-18.7.tar.gz 51051040 BLAKE2B 7ff04cd0ddcf74e46eef4318cf870662b9e076b362322958a6b8019d49134e37981f7ca21b5806e38b942adc4c29ea2b25a19f46e5da3d469613cf19a29f4e8c SHA512 7e5678f5e23e8af929056a49b0ce0b992a1f53a1fe970a149610c5a24adb591085bb06cc405e8bdc6040eef853d23e99df660d7006fc1ea4e79afd3a697875c5 -DIST kodi-18.8.tar.gz 51052219 BLAKE2B 6e49b08b5e2bfe778dafb687658e82b90226a9f1c1a7827a4290d601fe4c98e5cbaabaa39563c19a2956b83ce3a76640f081a56a41dfea4d65fb8b503c6f37b0 SHA512 242eaa9144ba0d9b15f02ab41282295de76d375cf66d595e7f6687d47c996133fcf5647448dcd06759df9f30bd86cdba239720b9bdd8b57827b6f261c08c4aaa -DIST kodi-19.0_alpha1_p20200920.tar.gz 52094020 BLAKE2B 15d580cbbcf20023ae6b715b38eb3755ba0872fa388815f5cc617cac7f430198dd636c04bbd979140cc224a22057d796f2074bea7110a2d7684e3580b7a2083d SHA512 0f8cf2e0e430fe91526980cb17bc504cca43e1eef48b7834aead90e7b60b274e9445dee0696b7ba2331f9388b6211386bbe050b07166024cea77f9dae3b889eb +DIST ffmpeg-kodi-4.3.1-Matrix-Beta1.tar.gz 13477440 BLAKE2B 49415f76fd2a888b0efadb19597bd89db65c3d9e1224ab529ff0d73ab5734a23982b4d4905ddeb105ce59a816c4642cdb9f5568b0c39c29f5fb9431f9623d4ec SHA512 ce43390e816dabeed4ca231f5f7adade6c721c38e17996a57810fb6025ea49b812133c2a6e29aac7c674d4e4af3a21dbd7e605d85fb966935a01bda983b884ac +DIST kodi-19.0b1.tar.gz 52314501 BLAKE2B 35090e969160f7ea6619d6c720f92a3ecf97391d12548927fcfd03ccc15091132f795f4636a4c4b8c15b2a623ee8b892c4b395e2e4e811152c63ffc19474ff90 SHA512 51a5a060c9ee51dd05303259cf59164bf273b05430f0987998a90879dfb52c1e95669e1c432476df65247fb70e920058119713a627ed7e12bf8dcd13645ffc40 DIST libdvdcss-1.4.2-Leia-Beta-5.tar.gz 101068 BLAKE2B 283aa2cec0a2200d3569bc280cb9659e9224a6b3a77db8a35b269cd8caf1337ac9d8b92b806df66f63ef7458a46bd6261f0b8b14678b10e26644a79dcbeea5da SHA512 5185dbdbeb1bd13ea9d8723f1f4ab599d6f3102f5ba1096cd085aa1cda252c045f327c719227bba8e1b742352ade5e335106c8d0c1637a5a6b93ce661620dd7e DIST libdvdnav-6.0.0-Leia-Alpha-3.tar.gz 137942 BLAKE2B 7573434a0ae8e8ccabf48173f81fcde29074eb138e119a2ae9156cde3c3d8bfd716f5d0e605b97f2dcac21f570781137c8533c5ae306b51e3905822fda318355 SHA512 11c93eaacd156f8fd7dec7c43d366438b201f31ad55b2870463a9e286912b6ada08882319a021fb7992190f87b909a49f2b83e0321cc17aedc29f7fe5898fa72 DIST libdvdread-6.0.0-Leia-Alpha-3.tar.gz 130649 BLAKE2B 0c206acdaf0776841ab792c74e023af07d9539eb72e03ae164382a31ed950f60e5e15f1d055979d28f1398924471b294d11f064b11b8373353b3962a3777ff3c SHA512 b3419ba0a1a2dd70f1bb6236afdfe1c6e88c9ad4264198b289e3bba9375e077cecf7f89848c7b09debaa445327f3507101f3d157e692f7a7163b2bb52643e1e7 -EBUILD kodi-18.7.ebuild 9762 BLAKE2B ed5b1e0bba1ae29387f59acc9f454872abdae8506b19570fa4df7ceda32a3551f684bc3f7be2b8426f4041d24a3bed830076d76c897a310c79d87773b7e3c566 SHA512 f0b4362ef5665ebb17618b09f6f25179423526cd9244c585d333349f8894a6d5543a76ccb181f0b0445de50305ce1813998720a8c5c1ac245ca5872b20bcc67f -EBUILD kodi-18.8.ebuild 9624 BLAKE2B f2fb687517e5fc0fc6ed480fda971fa5316f6699762df338392d8b9a9df68531fd38468e9667d23567352ce797fc4c790c1340c06fb0e5d5274cfe7c2883f760 SHA512 0de173c95440f2b5901f5a83649153fd791f678cc88606a41180df5a75a3bcd23d183fd38260e99f642ee1d9a201fa6c4b2a630c1991e50b218063e6390f489c -EBUILD kodi-19.0_alpha1_p20200920.ebuild 9316 BLAKE2B 01614bb96a15834de2986b40e4ce98694a6e469e46a7fcb8ac06b9606de82d50c5d5e3eef6ed8832389c528623f9556f8343903f327d1f499951a9594a1193a9 SHA512 ae7ac8276373cd743502e05b0668d6f944fd4fddfcdc321e603eb5e651a36d6d86eed9957d985fd16c2e9e69e443e6a372005fa8d4dbbfc35ad1a326288a7d6b -EBUILD kodi-19.9999.ebuild 9380 BLAKE2B 66211917196a787d232e005250020ef890754a7f5c5ddda1f4c7582c70bdb85744f6d5db133b057cc6532e178a9af620361bdbc0c20a4c55e30c3dc9d503bea7 SHA512 32a271ab2799d691ee9fe35a3cd801b1b4e8b1581d24ebdee086982b0b1b8b6f56d1fc34c8c5f6ddda9da1249b9292fa42a85823aa4a59a33f070c590ee634c2 -EBUILD kodi-9999.ebuild 9380 BLAKE2B 66211917196a787d232e005250020ef890754a7f5c5ddda1f4c7582c70bdb85744f6d5db133b057cc6532e178a9af620361bdbc0c20a4c55e30c3dc9d503bea7 SHA512 32a271ab2799d691ee9fe35a3cd801b1b4e8b1581d24ebdee086982b0b1b8b6f56d1fc34c8c5f6ddda9da1249b9292fa42a85823aa4a59a33f070c590ee634c2 +EBUILD kodi-19.0_beta1-r1.ebuild 9173 BLAKE2B 7dc5c2e5b1dd25c84d375f89785923c7d8cb968fa53bc0799af95ebf454cf6a349e7a78e39e6de8a8f3133c246bc3b88d28673a6e899f81c1835a59f3b432776 SHA512 75a50ad6336947ccaf73e61268a7c715b7b73207f5b664150a5fffddef3ad3ba3ae747d7ac50559f79360bb75ffd11f679b78a0f5490b46492aac476538b0479 +EBUILD kodi-19.9999.ebuild 9173 BLAKE2B 7dc5c2e5b1dd25c84d375f89785923c7d8cb968fa53bc0799af95ebf454cf6a349e7a78e39e6de8a8f3133c246bc3b88d28673a6e899f81c1835a59f3b432776 SHA512 75a50ad6336947ccaf73e61268a7c715b7b73207f5b664150a5fffddef3ad3ba3ae747d7ac50559f79360bb75ffd11f679b78a0f5490b46492aac476538b0479 +EBUILD kodi-9999.ebuild 9173 BLAKE2B 7dc5c2e5b1dd25c84d375f89785923c7d8cb968fa53bc0799af95ebf454cf6a349e7a78e39e6de8a8f3133c246bc3b88d28673a6e899f81c1835a59f3b432776 SHA512 75a50ad6336947ccaf73e61268a7c715b7b73207f5b664150a5fffddef3ad3ba3ae747d7ac50559f79360bb75ffd11f679b78a0f5490b46492aac476538b0479 MISC metadata.xml 1796 BLAKE2B da81fcbb0abedc4f78e82fa6f9453e4ffe824b1cedefcc9a1261dc09e0bd43482a7bd03e908f959d1a3033c284188d79644a1a9bca5064836eb3d0908b7d0d7f SHA512 d76d9f8d4683df4ab488dd30852437649810d0b093f0590db8f95404445f25aca7efdaa9d706d3222d67104cb2c4b02896154fcd7df1173b0bfe7e2557d73847 diff --git a/media-tv/kodi/files/kodi-18-remove-useless-test.patch b/media-tv/kodi/files/kodi-18-remove-useless-test.patch deleted file mode 100644 index 144626718b60..000000000000 --- a/media-tv/kodi/files/kodi-18-remove-useless-test.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 6cf1d4aaf9807a209f19e0aea97b44a7ae617f27 Mon Sep 17 00:00:00 2001 -From: Craig Andrews <candrews@integralblue.com> -Date: Tue, 23 Jun 2020 14:30:29 -0400 -Subject: [PATCH] [test] TestCPUInfo: remove useless test as we cannot - guarantee that they exist - ---- - xbmc/utils/test/TestCPUInfo.cpp | 30 ------------------------------ - 1 file changed, 30 deletions(-) - -diff --git a/xbmc/utils/test/TestCPUInfo.cpp b/xbmc/utils/test/TestCPUInfo.cpp -index fab473891356..df74ca3ee995 100644 ---- a/xbmc/utils/test/TestCPUInfo.cpp -+++ b/xbmc/utils/test/TestCPUInfo.cpp -@@ -73,36 +73,6 @@ TEST(TestCPUInfo, getTemperature) - } - #endif - --TEST(TestCPUInfo, getCPUModel) --{ -- std::string s = g_cpuInfo.getCPUModel(); -- EXPECT_STRNE("", s.c_str()); --} -- --TEST(TestCPUInfo, getCPUBogoMips) --{ -- std::string s = g_cpuInfo.getCPUBogoMips(); -- EXPECT_STRNE("", s.c_str()); --} -- --TEST(TestCPUInfo, getCPUHardware) --{ -- std::string s = g_cpuInfo.getCPUHardware(); -- EXPECT_STRNE("", s.c_str()); --} -- --TEST(TestCPUInfo, getCPURevision) --{ -- std::string s = g_cpuInfo.getCPURevision(); -- EXPECT_STRNE("", s.c_str()); --} -- --TEST(TestCPUInfo, getCPUSerial) --{ -- std::string s = g_cpuInfo.getCPUSerial(); -- EXPECT_STRNE("", s.c_str()); --} -- - TEST(TestCPUInfo, CoreInfo) - { - ASSERT_TRUE(g_cpuInfo.HasCoreId(0)); diff --git a/media-tv/kodi/files/kodi-18.5-cassert.patch b/media-tv/kodi/files/kodi-18.5-cassert.patch deleted file mode 100644 index 9558baa9e18c..000000000000 --- a/media-tv/kodi/files/kodi-18.5-cassert.patch +++ /dev/null @@ -1,42 +0,0 @@ -https://github.com/xbmc/xbmc/pull/17000 - -From bbfc36f06c191d3bdea19cacc498afb86bd25404 Mon Sep 17 00:00:00 2001 -From: Craig Andrews <candrews@integralblue.com> -Date: Thu, 5 Dec 2019 14:49:50 -0500 -Subject: [PATCH] Add missing cassert includes -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Without these includes, ‘assert’ was not declared in this scope errors -occur. ---- - xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp | 1 + - xbmc/windowing/GraphicContext.cpp | 2 ++ - 2 files changed, 3 insertions(+) - -diff --git a/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp b/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp -index 1303d894478c..aa85d95b3234 100644 ---- a/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp -+++ b/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp -@@ -31,6 +31,7 @@ - #include "utils/Variant.h" - #include "utils/log.h" - -+#include <cassert> - #include <utility> - - #define SETTING_PROFILE_NAME "profile.name" -diff --git a/xbmc/windowing/GraphicContext.cpp b/xbmc/windowing/GraphicContext.cpp -index b47bafba57dc..75b333ea6daa 100644 ---- a/xbmc/windowing/GraphicContext.cpp -+++ b/xbmc/windowing/GraphicContext.cpp -@@ -25,6 +25,8 @@ - #include "settings/lib/Setting.h" - #include "utils/log.h" - -+#include <cassert> -+ - using namespace KODI::MESSAGING; - - CGraphicContext::CGraphicContext(void) = default; diff --git a/media-tv/kodi/kodi-18.7.ebuild b/media-tv/kodi/kodi-18.7.ebuild deleted file mode 100644 index af2df1256278..000000000000 --- a/media-tv/kodi/kodi-18.7.ebuild +++ /dev/null @@ -1,324 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_REQ_USE="libressl?,sqlite,ssl" -LIBDVDCSS_VERSION="1.4.2-Leia-Beta-5" -LIBDVDREAD_VERSION="6.0.0-Leia-Alpha-3" -LIBDVDNAV_VERSION="6.0.0-Leia-Alpha-3" -FFMPEG_VERSION="4.0.4" -CODENAME="Leia" -FFMPEG_KODI_VERSION="18.4" -SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_VERSION}.tar.gz -> libdvdcss-${LIBDVDCSS_VERSION}.tar.gz - https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_VERSION}.tar.gz -> libdvdread-${LIBDVDREAD_VERSION}.tar.gz - https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_VERSION}.tar.gz -> libdvdnav-${LIBDVDNAV_VERSION}.tar.gz - !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz ) - https://dev.gentoo.org/~candrews/kodi-18-libmicrohttpd-0.9.71.patch" -PATCHES=( - "${FILESDIR}/${PN}-18.5-cassert.patch" - "${FILESDIR}/${PN}-18-remove-useless-test.patch" - "${DISTDIR}/${PN}-18-libmicrohttpd-0.9.71.patch" -) - -if [[ ${PV} == *9999 ]] ; then - PYTHON_COMPAT=( python2_7 python3_{6,7} ) - EGIT_REPO_URI="https://github.com/xbmc/xbmc.git" - inherit git-r3 -else - PYTHON_COMPAT=( python2_7 ) - MY_PV=${PV/_p/_r} - MY_PV=${MY_PV/_alpha/a} - MY_PV=${MY_PV/_beta/b} - MY_PV=${MY_PV/_rc/rc} - MY_P="${PN}-${MY_PV}" - SRC_URI+=" https://github.com/xbmc/xbmc/archive/${MY_PV}-${CODENAME}.tar.gz -> ${MY_P}.tar.gz" - KEYWORDS="amd64 x86" - S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME} -fi - -inherit autotools cmake desktop linux-info pax-utils python-single-r1 xdg - -DESCRIPTION="A free and open source media-player and entertainment hub" -HOMEPAGE="https://kodi.tv/ https://kodi.wiki/" - -LICENSE="GPL-2+" -SLOT="0" -# use flag is called libusb so that it doesn't fool people in thinking that -# it is _required_ for USB support. Otherwise they'll disable udev and -# that's going to be worse. -IUSE="airplay alsa bluetooth bluray caps cec +css dbus dvd gbm gles lcms libressl libusb lirc mariadb mysql nfs +opengl pulseaudio raspberry-pi samba systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf" -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - || ( gles opengl ) - ^^ ( gbm raspberry-pi wayland X ) - ?? ( mariadb mysql ) - udev? ( !libusb ) - udisks? ( dbus ) - upower? ( dbus ) -" -RESTRICT="!test? ( test )" - -COMMON_DEPEND="${PYTHON_DEPS} - airplay? ( - >=app-pda/libplist-2.0.0 - net-libs/shairplay - ) - alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) - bluetooth? ( net-wireless/bluez ) - bluray? ( >=media-libs/libbluray-1.0.2 ) - caps? ( sys-libs/libcap ) - dbus? ( sys-apps/dbus ) - dev-db/sqlite - dev-libs/expat - dev-libs/flatbuffers - >=dev-libs/fribidi-0.19.7 - cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] ) - dev-libs/libpcre[cxx] - >=dev-libs/libinput-1.10.5 - >=dev-libs/libxml2-2.9.4 - >=dev-libs/lzo-2.04 - dev-libs/tinyxml[stl] - $(python_gen_cond_dep 'dev-python/pillow[${PYTHON_MULTI_USEDEP}]') - $(python_gen_cond_dep 'dev-python/pycryptodome[${PYTHON_MULTI_USEDEP}]' 'python3*') - >=dev-libs/libcdio-0.94 - >=dev-libs/libfmt-3.0.1 - dev-libs/libfstrcmp - gbm? ( media-libs/mesa[gbm] ) - gles? ( - !raspberry-pi? ( media-libs/mesa[gles2] ) - ) - lcms? ( media-libs/lcms:2 ) - libusb? ( virtual/libusb:1 ) - virtual/ttf-fonts - media-fonts/roboto - >=media-libs/fontconfig-2.12.4 - >=media-libs/freetype-2.8 - >=media-libs/libass-0.13.4 - !raspberry-pi? ( media-libs/mesa[egl,X(+)] ) - >=media-libs/taglib-1.11.1 - system-ffmpeg? ( - >=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,postproc] - libressl? ( media-video/ffmpeg[libressl,-openssl] ) - !libressl? ( media-video/ffmpeg[-libressl,openssl] ) - ) - mysql? ( dev-db/mysql-connector-c:= ) - mariadb? ( dev-db/mariadb-connector-c:= ) - >=net-misc/curl-7.56.1[http2] - nfs? ( >=net-fs/libnfs-2.0.0:= ) - opengl? ( media-libs/glu ) - !libressl? ( >=dev-libs/openssl-1.0.2l:0= ) - libressl? ( dev-libs/libressl:0= ) - raspberry-pi? ( - || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl,gles2,video_cards_vc4] ) - ) - pulseaudio? ( media-sound/pulseaudio ) - samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) - >=sys-libs/zlib-1.2.11 - udev? ( virtual/udev ) - vaapi? ( - x11-libs/libva:= - opengl? ( x11-libs/libva[opengl] ) - system-ffmpeg? ( media-video/ffmpeg[vaapi] ) - vdpau? ( x11-libs/libva[vdpau] ) - wayland? ( x11-libs/libva[wayland] ) - X? ( x11-libs/libva[X] ) - ) - virtual/libiconv - vdpau? ( - || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) - system-ffmpeg? ( media-video/ffmpeg[vdpau] ) - ) - wayland? ( - >=dev-cpp/waylandpp-0.2.3:= - media-libs/mesa[wayland] - >=dev-libs/wayland-protocols-1.7 - ) - webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] ) - X? ( - x11-libs/libX11 - x11-libs/libXrandr - x11-libs/libXrender - system-ffmpeg? ( media-video/ffmpeg[X] ) - ) - x11-libs/libdrm - >=x11-libs/libxkbcommon-0.4.1 - xslt? ( dev-libs/libxslt ) - zeroconf? ( net-dns/avahi[dbus] ) -" -RDEPEND="${COMMON_DEPEND} - lirc? ( app-misc/lirc ) - !media-tv/xbmc - udisks? ( sys-fs/udisks:2 ) - upower? ( sys-power/upower ) -" -DEPEND="${COMMON_DEPEND} - app-arch/bzip2 - app-arch/xz-utils - dev-lang/swig - dev-libs/crossguid - dev-libs/rapidjson - dev-util/cmake - dev-util/gperf - media-libs/giflib - >=media-libs/libjpeg-turbo-1.5.1:= - >=media-libs/libpng-1.6.26:0= - test? ( dev-cpp/gtest ) - virtual/pkgconfig - virtual/jre - x86? ( dev-lang/nasm ) -" - -CONFIG_CHECK="~IP_MULTICAST" -ERROR_IP_MULTICAST=" -In some cases Kodi needs to access multicast addresses. -Please consider enabling IP_MULTICAST under Networking options. -" - -pkg_setup() { - check_extra_config - python-single-r1_pkg_setup -} - -src_unpack() { - if [[ ${PV} == *9999 ]] ; then - if python_is_python3; then - EGIT_BRANCH="feature_python3" - ewarn "Using the experimental Python 3 branch!" - ewarn "See https://kodi.wiki/view/Migration_to_Python_3 for more information." - ewarn "To use the non-experimental Python 2 version:" - ewarn "echo '~${CATEGORY}/${P} PYTHON_TARGETS: -* python2_7 PYTHON_SINGLE_TARGET: -* python2_7' >> /etc/portage/package.use" - ewarn "then re-merge using: emerge -a =${CATEGORY}/${PF}" - fi - git-r3_src_unpack - else - default - fi -} - -src_prepare() { - cmake_src_prepare - - # avoid long delays when powerkit isn't running #348580 - sed -i \ - -e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \ - xbmc/platform/linux/*.cpp || die - - # Prepare tools and libs witch are configured with autotools during compile time - AUTOTOOLS_DIRS=( - "${S}"/lib/cpluff - "${S}"/tools/depends/native/TexturePacker/src - "${S}"/tools/depends/native/JsonSchemaBuilder/src - ) - - local d - for d in "${AUTOTOOLS_DIRS[@]}" ; do - pushd ${d} >/dev/null || die - AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" eautoreconf - popd >/dev/null || die - done - elibtoolize - - # Prevent autoreconf rerun - sed -e 's/autoreconf -vif/echo "autoreconf already done in src_prepare()"/' -i \ - "${S}"/cmake/modules/FindCpluff.cmake \ - "${S}"/tools/depends/native/TexturePacker/src/autogen.sh \ - "${S}"/tools/depends/native/JsonSchemaBuilder/src/autogen.sh \ - || die -} - -src_configure() { - local mycmakeargs=( - -Ddocdir="${EPREFIX}/usr/share/doc/${PF}" - -DENABLE_LDGOLD=OFF # https://bugs.gentoo.org/show_bug.cgi?id=606124 - -DENABLE_ALSA=$(usex alsa) - -DENABLE_AIRTUNES=$(usex airplay) - -DENABLE_AVAHI=$(usex zeroconf) - -DENABLE_BLUETOOTH=$(usex bluetooth) - -DENABLE_BLURAY=$(usex bluray) - -DENABLE_CCACHE=OFF - -DENABLE_CEC=$(usex cec) - -DENABLE_DBUS=$(usex dbus) - -DENABLE_DVDCSS=$(usex css) - -DENABLE_INTERNAL_CROSSGUID=OFF - -DENABLE_INTERNAL_FFMPEG="$(usex !system-ffmpeg)" - -DENABLE_INTERNAL_FSTRCMP=OFF - -DENABLE_CAP=$(usex caps) - -DENABLE_LCMS2=$(usex lcms) - -DENABLE_LIRCCLIENT=$(usex lirc) - -DENABLE_MARIADBCLIENT=$(usex mariadb) - -DENABLE_MICROHTTPD=$(usex webserver) - -DENABLE_MYSQLCLIENT=$(usex mysql) - -DENABLE_NFS=$(usex nfs) - -DENABLE_OPENGLES=$(usex gles) - -DENABLE_OPENGL=$(usex opengl) - -DENABLE_OPTICAL=$(usex dvd) - -DENABLE_PLIST=$(usex airplay) - -DENABLE_PULSEAUDIO=$(usex pulseaudio) - -DENABLE_SMBCLIENT=$(usex samba) - -DENABLE_UDEV=$(usex udev) - -DENABLE_UPNP=$(usex upnp) - -DENABLE_VAAPI=$(usex vaapi) - -DENABLE_VDPAU=$(usex vdpau) - -DENABLE_XSLT=$(usex xslt) - -Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_VERSION}.tar.gz" - -Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_VERSION}.tar.gz" - -Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_VERSION}.tar.gz" - ) - - use libusb && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) ) - - if use system-ffmpeg; then - mycmakeargs+=( -DWITH_FFMPEG="yes" ) - else - mycmakeargs+=( -DFFMPEG_URL="${DISTDIR}/ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz" ) - fi - - if use gbm; then - mycmakeargs+=( - -DCORE_PLATFORM_NAME="gbm" - -DGBM_RENDER_SYSTEM="$(usex opengl gl gles)" - ) - fi - - if use wayland; then - mycmakeargs+=( - -DCORE_PLATFORM_NAME="wayland" - -DWAYLAND_RENDER_SYSTEM="$(usex opengl gl gles)" - ) - fi - - if use raspberry-pi; then - mycmakeargs+=( -DCORE_PLATFORM_NAME="rbpi" ) - fi - - if use X; then - mycmakeargs+=( -DCORE_PLATFORM_NAME="x11" ) - fi - - cmake_src_configure -} - -src_compile() { - cmake_src_compile all -} - -src_test() { - # see https://github.com/xbmc/xbmc/issues/17860#issuecomment-630120213 - KODI_HOME="${BUILD_DIR}" cmake_build check -} - -src_install() { - cmake_src_install - - pax-mark Em "${ED}"/usr/$(get_libdir)/${PN}/${PN}.bin - - newicon media/icon48x48.png kodi.png - - rm "${ED}"/usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf || die - dosym ../../../../fonts/roboto/Roboto-Thin.ttf \ - usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf - - python_domodule tools/EventClients/lib/python/xbmcclient.py - python_newscript "tools/EventClients/Clients/KodiSend/kodi-send.py" kodi-send -} diff --git a/media-tv/kodi/kodi-18.8.ebuild b/media-tv/kodi/kodi-18.8.ebuild deleted file mode 100644 index 4311cb82d79d..000000000000 --- a/media-tv/kodi/kodi-18.8.ebuild +++ /dev/null @@ -1,319 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_REQ_USE="libressl?,sqlite,ssl" -LIBDVDCSS_VERSION="1.4.2-Leia-Beta-5" -LIBDVDREAD_VERSION="6.0.0-Leia-Alpha-3" -LIBDVDNAV_VERSION="6.0.0-Leia-Alpha-3" -FFMPEG_VERSION="4.0.4" -CODENAME="Leia" -FFMPEG_KODI_VERSION="18.4" -SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_VERSION}.tar.gz -> libdvdcss-${LIBDVDCSS_VERSION}.tar.gz - https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_VERSION}.tar.gz -> libdvdread-${LIBDVDREAD_VERSION}.tar.gz - https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_VERSION}.tar.gz -> libdvdnav-${LIBDVDNAV_VERSION}.tar.gz - !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz ) - https://dev.gentoo.org/~candrews/kodi-18-libmicrohttpd-0.9.71.patch" - -if [[ ${PV} == *9999 ]] ; then - PYTHON_COMPAT=( python2_7 python3_{6,7} ) - EGIT_REPO_URI="https://github.com/xbmc/xbmc.git" - inherit git-r3 -else - PYTHON_COMPAT=( python2_7 ) - MY_PV=${PV/_p/_r} - MY_PV=${MY_PV/_alpha/a} - MY_PV=${MY_PV/_beta/b} - MY_PV=${MY_PV/_rc/rc} - MY_P="${PN}-${MY_PV}" - SRC_URI+=" https://github.com/xbmc/xbmc/archive/${MY_PV}-${CODENAME}.tar.gz -> ${MY_P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~x86" - S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME} -fi - -inherit autotools cmake desktop linux-info pax-utils python-single-r1 xdg - -DESCRIPTION="A free and open source media-player and entertainment hub" -HOMEPAGE="https://kodi.tv/ https://kodi.wiki/" - -LICENSE="GPL-2+" -SLOT="0" -# use flag is called libusb so that it doesn't fool people in thinking that -# it is _required_ for USB support. Otherwise they'll disable udev and -# that's going to be worse. -IUSE="airplay alsa bluetooth bluray caps cec +css dbus dvd gbm gles lcms libressl libusb lirc mariadb mysql nfs +opengl pulseaudio raspberry-pi samba systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf" -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - || ( gles opengl ) - ^^ ( gbm raspberry-pi wayland X ) - ?? ( mariadb mysql ) - udev? ( !libusb ) - udisks? ( dbus ) - upower? ( dbus ) -" -RESTRICT="!test? ( test )" - -COMMON_DEPEND="${PYTHON_DEPS} - airplay? ( - >=app-pda/libplist-2.0.0 - net-libs/shairplay - ) - alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) - bluetooth? ( net-wireless/bluez ) - bluray? ( >=media-libs/libbluray-1.0.2 ) - caps? ( sys-libs/libcap ) - dbus? ( sys-apps/dbus ) - dev-db/sqlite - dev-libs/expat - dev-libs/flatbuffers - >=dev-libs/fribidi-0.19.7 - cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] ) - dev-libs/libpcre[cxx] - >=dev-libs/libinput-1.10.5 - >=dev-libs/libxml2-2.9.4 - >=dev-libs/lzo-2.04 - dev-libs/tinyxml[stl] - $(python_gen_cond_dep 'dev-python/pillow[${PYTHON_MULTI_USEDEP}]') - $(python_gen_cond_dep 'dev-python/pycryptodome[${PYTHON_MULTI_USEDEP}]' 'python3*') - >=dev-libs/libcdio-0.94 - >=dev-libs/libfmt-3.0.1 - dev-libs/libfstrcmp - gbm? ( media-libs/mesa[gbm] ) - gles? ( - !raspberry-pi? ( media-libs/mesa[gles2] ) - ) - lcms? ( media-libs/lcms:2 ) - libusb? ( virtual/libusb:1 ) - virtual/ttf-fonts - media-fonts/roboto - >=media-libs/fontconfig-2.12.4 - >=media-libs/freetype-2.8 - >=media-libs/libass-0.13.4 - !raspberry-pi? ( media-libs/mesa[egl,X(+)] ) - >=media-libs/taglib-1.11.1 - system-ffmpeg? ( - >=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,postproc] - libressl? ( media-video/ffmpeg[libressl,-openssl] ) - !libressl? ( media-video/ffmpeg[-libressl,openssl] ) - ) - mysql? ( dev-db/mysql-connector-c:= ) - mariadb? ( dev-db/mariadb-connector-c:= ) - >=net-misc/curl-7.56.1[http2] - nfs? ( >=net-fs/libnfs-2.0.0:= ) - opengl? ( media-libs/glu ) - !libressl? ( >=dev-libs/openssl-1.0.2l:0= ) - libressl? ( dev-libs/libressl:0= ) - raspberry-pi? ( - || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl,gles2,video_cards_vc4] ) - ) - pulseaudio? ( media-sound/pulseaudio ) - samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) - >=sys-libs/zlib-1.2.11 - udev? ( virtual/udev ) - vaapi? ( - x11-libs/libva:= - opengl? ( x11-libs/libva[opengl] ) - system-ffmpeg? ( media-video/ffmpeg[vaapi] ) - vdpau? ( x11-libs/libva[vdpau] ) - wayland? ( x11-libs/libva[wayland] ) - X? ( x11-libs/libva[X] ) - ) - virtual/libiconv - vdpau? ( - || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) - system-ffmpeg? ( media-video/ffmpeg[vdpau] ) - ) - wayland? ( - >=dev-cpp/waylandpp-0.2.3:= - media-libs/mesa[wayland] - >=dev-libs/wayland-protocols-1.7 - ) - webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] ) - X? ( - x11-libs/libX11 - x11-libs/libXrandr - x11-libs/libXrender - system-ffmpeg? ( media-video/ffmpeg[X] ) - ) - x11-libs/libdrm - >=x11-libs/libxkbcommon-0.4.1 - xslt? ( dev-libs/libxslt ) - zeroconf? ( net-dns/avahi[dbus] ) -" -RDEPEND="${COMMON_DEPEND} - lirc? ( app-misc/lirc ) - !media-tv/xbmc - udisks? ( sys-fs/udisks:2 ) - upower? ( sys-power/upower ) -" -DEPEND="${COMMON_DEPEND} - app-arch/bzip2 - app-arch/xz-utils - dev-lang/swig - dev-libs/crossguid - dev-libs/rapidjson - dev-util/cmake - dev-util/gperf - media-libs/giflib - >=media-libs/libjpeg-turbo-1.5.1:= - >=media-libs/libpng-1.6.26:0= - test? ( dev-cpp/gtest ) - virtual/pkgconfig - virtual/jre - x86? ( dev-lang/nasm ) -" - -CONFIG_CHECK="~IP_MULTICAST" -ERROR_IP_MULTICAST=" -In some cases Kodi needs to access multicast addresses. -Please consider enabling IP_MULTICAST under Networking options. -" - -pkg_setup() { - check_extra_config - python-single-r1_pkg_setup -} - -src_unpack() { - if [[ ${PV} == *9999 ]] ; then - if python_is_python3; then - EGIT_BRANCH="feature_python3" - ewarn "Using the experimental Python 3 branch!" - ewarn "See https://kodi.wiki/view/Migration_to_Python_3 for more information." - ewarn "To use the non-experimental Python 2 version:" - ewarn "echo '~${CATEGORY}/${P} PYTHON_TARGETS: -* python2_7 PYTHON_SINGLE_TARGET: -* python2_7' >> /etc/portage/package.use" - ewarn "then re-merge using: emerge -a =${CATEGORY}/${PF}" - fi - git-r3_src_unpack - else - default - fi -} - -src_prepare() { - cmake_src_prepare - - # avoid long delays when powerkit isn't running #348580 - sed -i \ - -e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \ - xbmc/platform/linux/*.cpp || die - - # Prepare tools and libs witch are configured with autotools during compile time - AUTOTOOLS_DIRS=( - "${S}"/lib/cpluff - "${S}"/tools/depends/native/TexturePacker/src - "${S}"/tools/depends/native/JsonSchemaBuilder/src - ) - - local d - for d in "${AUTOTOOLS_DIRS[@]}" ; do - pushd ${d} >/dev/null || die - AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" eautoreconf - popd >/dev/null || die - done - elibtoolize - - # Prevent autoreconf rerun - sed -e 's/autoreconf -vif/echo "autoreconf already done in src_prepare()"/' -i \ - "${S}"/cmake/modules/FindCpluff.cmake \ - "${S}"/tools/depends/native/TexturePacker/src/autogen.sh \ - "${S}"/tools/depends/native/JsonSchemaBuilder/src/autogen.sh \ - || die -} - -src_configure() { - local mycmakeargs=( - -Ddocdir="${EPREFIX}/usr/share/doc/${PF}" - -DENABLE_LDGOLD=OFF # https://bugs.gentoo.org/show_bug.cgi?id=606124 - -DENABLE_ALSA=$(usex alsa) - -DENABLE_AIRTUNES=$(usex airplay) - -DENABLE_AVAHI=$(usex zeroconf) - -DENABLE_BLUETOOTH=$(usex bluetooth) - -DENABLE_BLURAY=$(usex bluray) - -DENABLE_CCACHE=OFF - -DENABLE_CEC=$(usex cec) - -DENABLE_DBUS=$(usex dbus) - -DENABLE_DVDCSS=$(usex css) - -DENABLE_INTERNAL_CROSSGUID=OFF - -DENABLE_INTERNAL_FFMPEG="$(usex !system-ffmpeg)" - -DENABLE_INTERNAL_FSTRCMP=OFF - -DENABLE_CAP=$(usex caps) - -DENABLE_LCMS2=$(usex lcms) - -DENABLE_LIRCCLIENT=$(usex lirc) - -DENABLE_MARIADBCLIENT=$(usex mariadb) - -DENABLE_MICROHTTPD=$(usex webserver) - -DENABLE_MYSQLCLIENT=$(usex mysql) - -DENABLE_NFS=$(usex nfs) - -DENABLE_OPENGLES=$(usex gles) - -DENABLE_OPENGL=$(usex opengl) - -DENABLE_OPTICAL=$(usex dvd) - -DENABLE_PLIST=$(usex airplay) - -DENABLE_PULSEAUDIO=$(usex pulseaudio) - -DENABLE_SMBCLIENT=$(usex samba) - -DENABLE_UDEV=$(usex udev) - -DENABLE_UPNP=$(usex upnp) - -DENABLE_VAAPI=$(usex vaapi) - -DENABLE_VDPAU=$(usex vdpau) - -DENABLE_XSLT=$(usex xslt) - -Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_VERSION}.tar.gz" - -Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_VERSION}.tar.gz" - -Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_VERSION}.tar.gz" - ) - - use libusb && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) ) - - if use system-ffmpeg; then - mycmakeargs+=( -DWITH_FFMPEG="yes" ) - else - mycmakeargs+=( -DFFMPEG_URL="${DISTDIR}/ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz" ) - fi - - if use gbm; then - mycmakeargs+=( - -DCORE_PLATFORM_NAME="gbm" - -DGBM_RENDER_SYSTEM="$(usex opengl gl gles)" - ) - fi - - if use wayland; then - mycmakeargs+=( - -DCORE_PLATFORM_NAME="wayland" - -DWAYLAND_RENDER_SYSTEM="$(usex opengl gl gles)" - ) - fi - - if use raspberry-pi; then - mycmakeargs+=( -DCORE_PLATFORM_NAME="rbpi" ) - fi - - if use X; then - mycmakeargs+=( -DCORE_PLATFORM_NAME="x11" ) - fi - - cmake_src_configure -} - -src_compile() { - cmake_src_compile all -} - -src_test() { - # see https://github.com/xbmc/xbmc/issues/17860#issuecomment-630120213 - KODI_HOME="${BUILD_DIR}" cmake_build check -} - -src_install() { - cmake_src_install - - pax-mark Em "${ED}"/usr/$(get_libdir)/${PN}/${PN}.bin - - newicon media/icon48x48.png kodi.png - - rm "${ED}"/usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf || die - dosym ../../../../fonts/roboto/Roboto-Thin.ttf \ - usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf - - python_domodule tools/EventClients/lib/python/xbmcclient.py - python_newscript "tools/EventClients/Clients/KodiSend/kodi-send.py" kodi-send -} diff --git a/media-tv/kodi/kodi-19.0_alpha1_p20200920.ebuild b/media-tv/kodi/kodi-19.0_beta1-r1.ebuild index 196abde81971..db37201ab5ac 100644 --- a/media-tv/kodi/kodi-19.0_alpha1_p20200920.ebuild +++ b/media-tv/kodi/kodi-19.0_beta1-r1.ebuild @@ -9,7 +9,7 @@ LIBDVDREAD_VERSION="6.0.0-Leia-Alpha-3" LIBDVDNAV_VERSION="6.0.0-Leia-Alpha-3" FFMPEG_VERSION="4.3.1" CODENAME="Matrix" -FFMPEG_KODI_VERSION="Alpha1-2" +FFMPEG_KODI_VERSION="Beta1" PYTHON_COMPAT=( python3_{6,7,8,9} ) SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_VERSION}.tar.gz -> libdvdcss-${LIBDVDCSS_VERSION}.tar.gz https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_VERSION}.tar.gz -> libdvdread-${LIBDVDREAD_VERSION}.tar.gz @@ -19,10 +19,14 @@ if [[ ${PV} == *9999 ]] ; then EGIT_REPO_URI="https://github.com/xbmc/xbmc.git" inherit git-r3 else - GIT_COMMIT="7f6bf8fdddaabcf911786099024ecc45df35c8bd" - SRC_URI+=" https://github.com/xbmc/xbmc/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz" + MY_PV=${PV/_p/_r} + MY_PV=${MY_PV/_alpha/a} + MY_PV=${MY_PV/_beta/b} + MY_PV=${MY_PV/_rc/rc} + MY_P="${PN}-${MY_PV}" + SRC_URI+=" https://github.com/xbmc/xbmc/archive/${MY_PV}-${CODENAME}.tar.gz -> ${MY_P}.tar.gz" KEYWORDS="~amd64 ~arm ~arm64 ~x86" - S=${WORKDIR}/xbmc-${GIT_COMMIT} + S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME} fi inherit autotools cmake desktop linux-info pax-utils python-single-r1 xdg @@ -39,7 +43,7 @@ IUSE="airplay alsa bluetooth bluray caps cec +css dbus dvd gbm gles lcms libress REQUIRED_USE=" ${PYTHON_REQUIRED_USE} || ( gles opengl ) - ^^ ( gbm raspberry-pi wayland X ) + || ( gbm wayland X ) ?? ( mariadb mysql ) bluray? ( udf ) udev? ( !libusb ) @@ -212,6 +216,11 @@ src_prepare() { } src_configure() { + local platform=() + use gbm && platform+=( gbm ) + use wayland && platform+=( wayland ) + use X && platform+=( x11 ) + local core_platform_name="${platform[@]}" local mycmakeargs=( -Ddocdir="${EPREFIX}/usr/share/doc/${PF}" -DENABLE_LDGOLD=OFF # https://bugs.gentoo.org/show_bug.cgi?id=606124 @@ -254,6 +263,8 @@ src_configure() { -Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_VERSION}.tar.gz" -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" -DPYTHON_LIBRARY="$(python_get_library_path)" + -DAPP_RENDER_SYSTEM="$(usex opengl gl gles)" + -DCORE_PLATFORM_NAME="${core_platform_name}" ) use libusb && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) ) @@ -264,31 +275,6 @@ src_configure() { mycmakeargs+=( -DFFMPEG_URL="${DISTDIR}/ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz" ) fi - if use gbm; then - mycmakeargs+=( - -DCORE_PLATFORM_NAME="gbm" - -DGBM_RENDER_SYSTEM="$(usex opengl gl gles)" - ) - fi - - if use wayland; then - mycmakeargs+=( - -DCORE_PLATFORM_NAME="wayland" - -DWAYLAND_RENDER_SYSTEM="$(usex opengl gl gles)" - ) - fi - - if use raspberry-pi; then - mycmakeargs+=( -DCORE_PLATFORM_NAME="rbpi" ) - fi - - if use X; then - mycmakeargs+=( - -DCORE_PLATFORM_NAME="x11" - -DX11_RENDER_SYSTEM="$(usex opengl gl gles)" - ) - fi - cmake_src_configure } diff --git a/media-tv/kodi/kodi-19.9999.ebuild b/media-tv/kodi/kodi-19.9999.ebuild index 0857f7cb2309..db37201ab5ac 100644 --- a/media-tv/kodi/kodi-19.9999.ebuild +++ b/media-tv/kodi/kodi-19.9999.ebuild @@ -9,7 +9,7 @@ LIBDVDREAD_VERSION="6.0.0-Leia-Alpha-3" LIBDVDNAV_VERSION="6.0.0-Leia-Alpha-3" FFMPEG_VERSION="4.3.1" CODENAME="Matrix" -FFMPEG_KODI_VERSION="Alpha1-2" +FFMPEG_KODI_VERSION="Beta1" PYTHON_COMPAT=( python3_{6,7,8,9} ) SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_VERSION}.tar.gz -> libdvdcss-${LIBDVDCSS_VERSION}.tar.gz https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_VERSION}.tar.gz -> libdvdread-${LIBDVDREAD_VERSION}.tar.gz @@ -25,7 +25,7 @@ else MY_PV=${MY_PV/_rc/rc} MY_P="${PN}-${MY_PV}" SRC_URI+=" https://github.com/xbmc/xbmc/archive/${MY_PV}-${CODENAME}.tar.gz -> ${MY_P}.tar.gz" - KEYWORDS="~amd64 ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME} fi @@ -43,7 +43,7 @@ IUSE="airplay alsa bluetooth bluray caps cec +css dbus dvd gbm gles lcms libress REQUIRED_USE=" ${PYTHON_REQUIRED_USE} || ( gles opengl ) - ^^ ( gbm raspberry-pi wayland X ) + || ( gbm wayland X ) ?? ( mariadb mysql ) bluray? ( udf ) udev? ( !libusb ) @@ -216,6 +216,11 @@ src_prepare() { } src_configure() { + local platform=() + use gbm && platform+=( gbm ) + use wayland && platform+=( wayland ) + use X && platform+=( x11 ) + local core_platform_name="${platform[@]}" local mycmakeargs=( -Ddocdir="${EPREFIX}/usr/share/doc/${PF}" -DENABLE_LDGOLD=OFF # https://bugs.gentoo.org/show_bug.cgi?id=606124 @@ -258,6 +263,8 @@ src_configure() { -Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_VERSION}.tar.gz" -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" -DPYTHON_LIBRARY="$(python_get_library_path)" + -DAPP_RENDER_SYSTEM="$(usex opengl gl gles)" + -DCORE_PLATFORM_NAME="${core_platform_name}" ) use libusb && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) ) @@ -268,31 +275,6 @@ src_configure() { mycmakeargs+=( -DFFMPEG_URL="${DISTDIR}/ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz" ) fi - if use gbm; then - mycmakeargs+=( - -DCORE_PLATFORM_NAME="gbm" - -DGBM_RENDER_SYSTEM="$(usex opengl gl gles)" - ) - fi - - if use wayland; then - mycmakeargs+=( - -DCORE_PLATFORM_NAME="wayland" - -DWAYLAND_RENDER_SYSTEM="$(usex opengl gl gles)" - ) - fi - - if use raspberry-pi; then - mycmakeargs+=( -DCORE_PLATFORM_NAME="rbpi" ) - fi - - if use X; then - mycmakeargs+=( - -DCORE_PLATFORM_NAME="x11" - -DX11_RENDER_SYSTEM="$(usex opengl gl gles)" - ) - fi - cmake_src_configure } diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild index 0857f7cb2309..db37201ab5ac 100644 --- a/media-tv/kodi/kodi-9999.ebuild +++ b/media-tv/kodi/kodi-9999.ebuild @@ -9,7 +9,7 @@ LIBDVDREAD_VERSION="6.0.0-Leia-Alpha-3" LIBDVDNAV_VERSION="6.0.0-Leia-Alpha-3" FFMPEG_VERSION="4.3.1" CODENAME="Matrix" -FFMPEG_KODI_VERSION="Alpha1-2" +FFMPEG_KODI_VERSION="Beta1" PYTHON_COMPAT=( python3_{6,7,8,9} ) SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_VERSION}.tar.gz -> libdvdcss-${LIBDVDCSS_VERSION}.tar.gz https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_VERSION}.tar.gz -> libdvdread-${LIBDVDREAD_VERSION}.tar.gz @@ -25,7 +25,7 @@ else MY_PV=${MY_PV/_rc/rc} MY_P="${PN}-${MY_PV}" SRC_URI+=" https://github.com/xbmc/xbmc/archive/${MY_PV}-${CODENAME}.tar.gz -> ${MY_P}.tar.gz" - KEYWORDS="~amd64 ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME} fi @@ -43,7 +43,7 @@ IUSE="airplay alsa bluetooth bluray caps cec +css dbus dvd gbm gles lcms libress REQUIRED_USE=" ${PYTHON_REQUIRED_USE} || ( gles opengl ) - ^^ ( gbm raspberry-pi wayland X ) + || ( gbm wayland X ) ?? ( mariadb mysql ) bluray? ( udf ) udev? ( !libusb ) @@ -216,6 +216,11 @@ src_prepare() { } src_configure() { + local platform=() + use gbm && platform+=( gbm ) + use wayland && platform+=( wayland ) + use X && platform+=( x11 ) + local core_platform_name="${platform[@]}" local mycmakeargs=( -Ddocdir="${EPREFIX}/usr/share/doc/${PF}" -DENABLE_LDGOLD=OFF # https://bugs.gentoo.org/show_bug.cgi?id=606124 @@ -258,6 +263,8 @@ src_configure() { -Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_VERSION}.tar.gz" -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" -DPYTHON_LIBRARY="$(python_get_library_path)" + -DAPP_RENDER_SYSTEM="$(usex opengl gl gles)" + -DCORE_PLATFORM_NAME="${core_platform_name}" ) use libusb && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) ) @@ -268,31 +275,6 @@ src_configure() { mycmakeargs+=( -DFFMPEG_URL="${DISTDIR}/ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz" ) fi - if use gbm; then - mycmakeargs+=( - -DCORE_PLATFORM_NAME="gbm" - -DGBM_RENDER_SYSTEM="$(usex opengl gl gles)" - ) - fi - - if use wayland; then - mycmakeargs+=( - -DCORE_PLATFORM_NAME="wayland" - -DWAYLAND_RENDER_SYSTEM="$(usex opengl gl gles)" - ) - fi - - if use raspberry-pi; then - mycmakeargs+=( -DCORE_PLATFORM_NAME="rbpi" ) - fi - - if use X; then - mycmakeargs+=( - -DCORE_PLATFORM_NAME="x11" - -DX11_RENDER_SYSTEM="$(usex opengl gl gles)" - ) - fi - cmake_src_configure } diff --git a/media-tv/linuxtv-dvb-apps/Manifest b/media-tv/linuxtv-dvb-apps/Manifest index ce4416e8ee4f..961b5ad3a491 100644 --- a/media-tv/linuxtv-dvb-apps/Manifest +++ b/media-tv/linuxtv-dvb-apps/Manifest @@ -1,9 +1,9 @@ AUX linuxtv-dvb-apps-1.1.1.20100223-alevt.patch 1418 BLAKE2B e8501fc28ae0e2288ad1ebb7f56e7dd61d979294d332fe1df6cb08ba0d3ebd1835dd60b31ffe5e350659080ca75cf0297921ad5a3cd0e4dfe08e12dcfc081fcb SHA512 7490d18c3408bc412a3f3a3bb54544885f863ee146176dd8f9caae624043b5ad797f9fe9edc1ae627fd82b0fdb392e6f458d814e68a11ef4efa253c1add4016d AUX linuxtv-dvb-apps-1.1.1.20100223-ldflags.patch 607 BLAKE2B ea2f229d1ab2d0f5df3541b85a90caa06c25e7296b5d77dfb572ac5b261efd4b61e4022ca0ee80fe31be7046b47090ea2e7457710e762ad2eecbc5165db2996b SHA512 abaf61336531e33148a8a0d5d4dfa545a607b077430e6e9ae363a667524fcf3d41e5fec1112e795dcf6be5160a8ef57049b224dac42b1211d3ea3b9f865dba48 AUX linuxtv-dvb-apps-1.1.1.20100223-perl526.patch 519 BLAKE2B 1546d43af3d337062d1a454e79be0d70349c91950e55ce66e84e75092277d50a7c327eef48bd85239ccb86c8284a6393cd77b173b895956e66af17d625a767d3 SHA512 73fea472e484f41d9c3eb676628dc2765081c92202823c03489d866534cdfef81559205cdb7f0e4578f217e0b0102ee94ed1faf56b7c3a3eb8c4c7d9dfc1b1e8 +AUX linuxtv-dvb-apps-1.1.1.20140321-gcc10.patch 413 BLAKE2B 0d66160c487ef9f952e1870541c71a3c6c81fdd72dd0bbe16c9495fc618357aef78de0a390953aa80cbbb5e17d89b226eb92a8892a4375ba033f7a43b1af2f69 SHA512 eec40d8917ef2a67fbe3888b0cf44154b1af8fad5363578df87ca3f3bd7a2536c05017c2889676ee5150ae810d71ee6fe156813aa97af0d74dde82ca0ea2a18e AUX linuxtv-dvb-apps-glibc-2.31.patch 291 BLAKE2B b03833abf623175e9697a2745e9d99c7510b34e3823b42e4a394739d39a534cb4781a076879c85794fc4f9f703ded73778695b8334324186c4bafb3285d0dbb7 SHA512 efd1e8aa91cdcdff7f17856f13bb8689d3eb0288e2ff45c05bc55b44b32a137854c194cb3ee477a243b5377b44f221481e3323c9caa0065eb551cddf37a89c41 AUX linuxtv-dvb-apps-no-ca_set_pid.patch 1004 BLAKE2B 36ab3817546d5a832473f4d69a2ce97642f3a6d7d8b17cb036d8976398274c4c9e040cb60a909e8f28f1ff25e6cfbb990dfe0b44b4c729b7e8abe30e645704bc SHA512 1cef92aee99ee03255115e1979b0342bbf9b45bd55c6f9ff6a8529edaf6f3a36c172a145c01706341486aae5d6e0a3fde52b535af97e020cb7009d23e0c9cf72 DIST linuxtv-dvb-apps-1.1.1.20140321.tar.bz2 368759 BLAKE2B 5ef1bc4ee4f0ab167cda8d87a73c83566b40005e16fbaa79525af4fb0b117dec19a4883eedad8bcfedd269c2e295dd7f9e055f905dff5f39dffe1ff052e87547 SHA512 ceb057f760fa0b3902e6824e74b9392be9a7bd3318a1a83f206c99672da17904060ffdc35e84c89d3b8af60ac29d4427acad44e9ae16797baaeb5738e2ab1bf5 -EBUILD linuxtv-dvb-apps-1.1.1.20140321-r1.ebuild 2197 BLAKE2B cb1b0548cba008ff25916ad12fe7eea67019f44c30b155d24c26824487a661c26ea6657accb562501306dba83bb2cf8cdd5bd3303332ff2b3721a73582f7383b SHA512 82a944c5cef64499ba5fbede59d020f9499ba2d7f375ae9bd1efda0294becd7a8231f2501227277b8a2e7f2d3b110b5e979af46a0743e7bb70c26d256411675d -EBUILD linuxtv-dvb-apps-1.1.1.20140321.ebuild 2152 BLAKE2B 0e1886a393669ffd430bfe4036f1ea9862a6ad24fc7930873426856ea27b4551a3f02efd628c72edef6533a750ee335f7381b411d5fd430585053fd559c74654 SHA512 6d7462b31af1d4db0b5380c2e2ca8d86574aced20ff2a2a6d6763025f4fbb10ff7946a0055c181e9b3ea5b5ce3371818e6c952e9732bac90a8236ee3ea971a5a +EBUILD linuxtv-dvb-apps-1.1.1.20140321-r1.ebuild 2255 BLAKE2B 0f6ba014c7aaeac0a91bc2fd451d50a71bc07b1ec0c00b7c5323a669f725c35e888ddc3976369c64bb46bfc8017beffdd436f9375d70e7e40f62a44e38e04746 SHA512 cf5b128c399f142099427efb5b7c307f386c726cbb10492fb78b5aa0bdc1d4804ac8a2811f58e6b6d036d0cdcd76e3c63e2e78f2b1edd4d40307cb9b4397c5a9 MISC metadata.xml 230 BLAKE2B b1572b7d9c8d7cfb1ad670feba63226e05f2aa6d2de71ad3be92798dc2d1a21678aae2f8f9af6314e2a9fdc5fb1ac9fcac993d9b75a9afa457853888c94b0943 SHA512 1aaabf344edf8981ded68904e05257b579370a589c86b1ea8984378ad6a8ed3daf91c5e9069c07d207d47cf1f70a8039c644dbf6108557ed2053cba9769723ed diff --git a/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-1.1.1.20140321-gcc10.patch b/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-1.1.1.20140321-gcc10.patch new file mode 100644 index 000000000000..d218183be147 --- /dev/null +++ b/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-1.1.1.20140321-gcc10.patch @@ -0,0 +1,11 @@ +https://723420.bugs.gentoo.org/attachment.cgi?id=639692 +--- a/util/alevt/vbi.c ++++ b/util/alevt/vbi.c +@@ -35,7 +35,6 @@ + + static u8 *rawbuf; // one common buffer for raw vbi data + static int rawbuf_size; // its current size +-u_int16_t sid; + static char *vbi_names[] + = { "/dev/vbi", "/dev/vbi0", "/dev/video0", "/dev/dvb/adapter0/demux0", + NULL }; // default device names if none was given at the command line diff --git a/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20140321-r1.ebuild b/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20140321-r1.ebuild index e0dddee3f36c..821333cff38e 100644 --- a/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20140321-r1.ebuild +++ b/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20140321-r1.ebuild @@ -38,6 +38,7 @@ PATCHES=( "${FILESDIR}"/${PN}-1.1.1.20100223-perl526.patch "${FILESDIR}"/${PN}-no-ca_set_pid.patch "${FILESDIR}"/${PN}-glibc-2.31.patch + "${FILESDIR}"/${PN}-1.1.1.20140321-gcc10.patch ) src_prepare() { @@ -89,5 +90,5 @@ src_install() { } pkg_postinst() { - elog "/usr/bin/scan has been installed as scan-dvb." + elog "${EPREFIX}/usr/bin/scan has been installed as scan-dvb." } diff --git a/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20140321.ebuild b/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20140321.ebuild deleted file mode 100644 index 616e5095aba8..000000000000 --- a/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20140321.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs vcs-snapshot - -HOMEPAGE="https://www.linuxtv.org/" -DESCRIPTION="Small utils for DVB to scan, zap, view signal strength" -SRC_URI="https://www.linuxtv.org/hg/dvb-apps/archive/3d43b280298c.tar.bz2 -> ${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm ppc x86" -IUSE="alevt usb" - -RDEPEND=" - alevt? ( - !media-video/alevt - media-libs/libpng:0= - media-libs/zvbi[v4l] - sys-libs/zlib - x11-libs/libX11 - ) - usb? ( virtual/libusb:0 ) -" -DEPEND="${RDEPEND} - dev-lang/perl - virtual/linuxtv-dvb-headers -" -RDEPEND+=" - media-tv/dtv-scan-tables -" - -PATCHES=( - "${FILESDIR}"/${PN}-1.1.1.20100223-ldflags.patch - "${FILESDIR}"/${PN}-1.1.1.20100223-alevt.patch - "${FILESDIR}"/${PN}-1.1.1.20100223-perl526.patch - "${FILESDIR}"/${PN}-no-ca_set_pid.patch -) - -src_prepare() { - default - - # do not compile test-progs, incompatible with videodev2.h - sed -i '/-C test/d' Makefile || die - - # remove copy of header-files - rm -rv "${S}"/include/ || die -} - -src_compile() { - emake V=1 CC=$(tc-getCC) $(usex usb "ttusb_dec_reset=1" "") - use alevt && emake -C util/alevt CC=$(tc-getCC) OPT="${CFLAGS}" -} - -src_install() { - emake V=1 prefix="${EPREFIX}/usr" libdir="${EPREFIX}/usr/$(get_libdir)" \ - $(usex usb "ttusb_dec_reset=1" "") \ - DESTDIR="${D}" INSTDIR="${T}" install - - if use alevt ; then - dodir /usr/share/{applications,man/man1} - emake -C util/alevt DESTDIR="${D}" install - fi - - # rename scan to scan-dvb - mv "${ED}"/usr/bin/scan{,-dvb} || die - - # install zap-files - local dir="" - for dir in dvb-{s,c,t} atsc ; do - insinto /usr/share/dvb/zap/${dir} - doins "${S}"/util/szap/channels-conf/${dir}/* - done - - # install remote-key files - insinto /usr/share/dvb/av7110_loadkeys - doins util/av7110_loadkeys/*.rc* - - # install Documentation - dodoc README - newdoc util/scan/README README.scan-dvb - newdoc util/szap/README README.zap - newdoc util/av7110_loadkeys/README README.av7110_loadkeys - - use usb && newdoc util/ttusb_dec_reset/README README.ttusb_dec_reset -} - -pkg_postinst() { - elog "/usr/bin/scan has been installed as scan-dvb." -} diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest index f54cc13c2d1e..4c42b387377b 100644 --- a/media-tv/mythtv/Manifest +++ b/media-tv/mythtv/Manifest @@ -8,14 +8,14 @@ AUX mythfrontend.wrapper 794 BLAKE2B f4f8cf24665f75d38d932551534c14d3d9367338471 AUX mythtv-29.1-Fix_create_webbrowser_window.patch 1564 BLAKE2B aa1eeb57d2943c95a5e46a024c16fee91e6d473881a670a9ac07993d141c3d1062c769a82a616a6cb35dafe01d0fe19553c9664b211e6d14c66e7a2172210cc6 SHA512 645f4bd29d67cbb2b2e9f00a273111c9d9dbcaab42273938cecc41cf4f2088310cb3b70477192dd9b0434db02f23ca3a0ff9128defa63453317ec9005b1e0b49 AUX mythtv-30.0_p20190808-Fix_Dereferencing_type-punned_pointer.patch 1913 BLAKE2B b5ea6ec46961ded89331b041434a5bcb861bac632475611986e1fd1db9b186392249a770f634a7a4a97847f9b36fbabd3a1edc5447068a79fcee41131908ef55 SHA512 51d66f7044e15adad7bad94dac89eaeb6bc8c42d793c57565c48061359ec4486ca754471a64bee0dc36d5da0346a462488ad24c2cb7a74b82d22acf8103a3c64 AUX mythtv-30.0_p20190808-Fix_unitialized_variables.patch 659 BLAKE2B ff947ef9e669cb47c2e7ec9081963e855596843ca0da9e248e3ec0c2111a50dd1fd1b38f700b0c31d7281959e05219c1548ec6b631347e22583b96b083fe5715 SHA512 e92bd3b13a0ded212d10423063c228fffc24fad6401d8ee371cd766f73e23832b6cdc7e46d729362b4d1ba8ce4704cb7d4a841ad7a0560a297e7e5b8b3944aa6 -AUX mythtv-30.0_p20190808-cast_constants_to_short.patch 24201 BLAKE2B d76e519666914f6c9a510fb0aec493e361e857f51e56bd7d120657f350b0bf5da329a89eb58c9789f8f030c6d08bfe0171750690b76d8c2add807942aa686d59 SHA512 c2724ad248222ac4190412cf68e54ee0b265fdde128996e68a2e178e6debe0180c23f9c7d1878466f9a5689fab8172370c6b31c90aa9a096fb5919ec6e8960fe AUX mythtv-30.0_p20190808-respect_LDFLAGS.patch 334 BLAKE2B 1e0ab12773e49fb349aa0b1c243f8d740ec9783e845307ded5763cf7872e090fbe19d74506e5dbea346c099a84fa395ac4c63dc45a03d20a04372b62bb39e3c1 SHA512 90cf1d4809df7859e611502590cbb1c2bdaea23e6f0a47351042be6287e2b5030ef0645e22f722bec5a029701fd3c2227c5dfb3509a2322b56a1aef60bcb2c33 AUX mythtv-31.0-Include_QPainterPath.patch 404 BLAKE2B 226a49e58457d8a23cd0cb45aebb3e469a1732c79f979e7f558a85eac28129c5a5f363ec15cc0784fef1db4f0f4b897ce49f934a8c6ed2ea669d2e5ef5b1908d SHA512 e0fd7a3e897a94b5077814adc951e649de0792c1f0d3d9d10e002b31dc5e11c09ed110994397e69e66419fb0f648bc8a6de4155a43cd05947605cbdcf9390f8c AUX mythtv-31.0-Remove_ldconfig.patch 399 BLAKE2B 26b480b30ccb779523a06fc81ec6535a3f2a5c7660d86d6a31ab64975b83339ea9c175fdcffdf96942315c30f6bf3b33bb348e5bba4695d1805810f046e629ed SHA512 7460f8e5a4981b16f07c4be6b227da62c3106fa7da499a12348309538a57f6d271998de75503941d91afadefbc975c3870195123c5a9856ce779360a9636f1a4 AUX mythtv.logrotate.d-r4 235 BLAKE2B 4f6df360f5191aaf4a2b55bd3edc7bc4aab92c46dbd7b7bc1295371b7ef451056f902d92e3209654463850d2cbca579c60d25c1f9065ac80ce3e57fa1fe8e661 SHA512 8dd8936599acabfa55ad7efb870de431e03cb86c3c96156c2c0eee6675962dcc527391260f2ba66e3d54c1d41373001ef25c9d2421e83940c686d14b5f29fff7 AUX xinitrc-r1 234 BLAKE2B 0227ea065f1c43e1b2f1583bcbc798db76e9a08d345bbd8ed8837a6ba424b187c814e3ff0d7690d2d9f7a7617f4fbcce20df926e43bc6e89aec3e352aab6de8f SHA512 885adfe395fe553f6d5cf518856be7be9a6bf6073888f8e055271ed7c3d9ad85a162e9e9ff95a68e54047948ac280796c69ef55d0b4e549eb0beabbf0fec1188 +DIST mythtv-30.0_p20190808-cast_constants_to_short.patch 24201 BLAKE2B d76e519666914f6c9a510fb0aec493e361e857f51e56bd7d120657f350b0bf5da329a89eb58c9789f8f030c6d08bfe0171750690b76d8c2add807942aa686d59 SHA512 c2724ad248222ac4190412cf68e54ee0b265fdde128996e68a2e178e6debe0180c23f9c7d1878466f9a5689fab8172370c6b31c90aa9a096fb5919ec6e8960fe DIST mythtv-30.0_p20190808.tar.gz 101208060 BLAKE2B af8966dd6353fc514c9a95083f28e8b7b19f16e1bd5a4f7590a946c306bf16a09f0028c76da975e423136834f8f06d7f2a570b43957ef4ae5e42ee241b579f0a SHA512 c02371c0b2162556e40a560a0fd9cb121f46f2ccedbc2ca74cd03aa9caf2b7ea4bbaa09ae6320eb782f932190f449e7fdd274a6d6ba9676e5fd9b7f5432632a2 DIST mythtv-31.0.tar.gz 102552136 BLAKE2B b09b41230eb2cae19d770c3cc59151863e0a56e95a86627473d52613e62f0acf3bd0c4bb37afb340ab874c222899f9d3c219ded470785d27960db9b39d784ceb SHA512 d53817231409934ef37d12739c38cf6936f04f816b0ba1c9738ce99b5b4ff387c70b683ccd84f649ff2f74992b2158829f5f1d1ffe06c8768da1922b90439f6e -EBUILD mythtv-30.0_p20190808-r3.ebuild 12593 BLAKE2B 4b147dc08cb1b1113536e6c95d3e07f683f7d3e750b3e9871d60ff8b784306573d6c7e1e226ac52d0b0f984ad90e400e1051973f5b73f5ac66ebb8fa6c5f2e6a SHA512 11b498e4664204ccbd15210cdb7a5790930111bfee2ca54cd2457380b3a041c55706d9ee67fd6f8d8297e8a2fc729291e952326302e4e74d58451ed410e43557 +EBUILD mythtv-30.0_p20190808-r3.ebuild 12691 BLAKE2B 4fd603369eca68ba6fc5525faac4a0c8c61e2d2443f470881322e29fb7c066fdc8105d8379ecd9d2e64030ab11fc0c3593af70f053fef33aaa2f9d2234f79f28 SHA512 de4804b6ed4d713671d569bf7950c028f896e6064057e04198e60c756ae176cbaa8e5266831f1d026e3a1aa2a17006642a321b56577b353888f1f7777382781d EBUILD mythtv-31.0-r3.ebuild 12429 BLAKE2B dc865772d4db73c2378c70e179e03e99c371f0996fedd7f62e1ca0ac9bb527051ca3d0387abba599c6299c5a1c50b438b49aadcf35b52f2e355a004271f55389 SHA512 8d3df7c1daf3d561b52620328f31126420efea81bc7e384b4b28c3bca32994a59754686edeb2450b8f5ea25c64e03b3f958d3d08919504cfc1fc627973ed4893 -MISC metadata.xml 2285 BLAKE2B cbc924af3ac54973580a7ab7f73669d24da3b1da9edfc8717fb1996ee59193337b1490a909ef0ab8ef400e323120dedab938d79564b306d196c167ca22a9476c SHA512 8bd3b71213ebf3bced2aa83cc85d3117e200138b64217eb40d8c73c84290c00c0fca7f6b18801fbc7a07f9d55234dfd01da33a47b2ea5b561329200260284983 +MISC metadata.xml 2295 BLAKE2B 8c68aa90049846e866bc16a4c0512011e110ce853fc4cf35e6b4c380face9e6cbf620aa044162dd62a337894f0408c26da56c414641ae43c166719f387fe300e SHA512 0e621c55dfb72be00eeb00b6cd033ad7be99c3383a5273f2af03904ead91220bac03faa5a4a6e2b0520dc53796485d3911e879e6202ae4abc9cbc440bb271c3c diff --git a/media-tv/mythtv/files/mythtv-30.0_p20190808-cast_constants_to_short.patch b/media-tv/mythtv/files/mythtv-30.0_p20190808-cast_constants_to_short.patch deleted file mode 100644 index 572f4e2b7574..000000000000 --- a/media-tv/mythtv/files/mythtv-30.0_p20190808-cast_constants_to_short.patch +++ /dev/null @@ -1,365 +0,0 @@ ---- a/libs/libmyth/test/test_audioutils/test_audioutils.h -+++ b/libs/libmyth/test/test_audioutils/test_audioutils.h -@@ -204,42 +204,48 @@ class TestAudioUtils: public QObject - arrays1[i] = j; - } - -- uint32_t pattern = 0xbcbcbcbc; -- arrays2[offsetshort-4] = *(short*)&pattern; -- arrays2[offsetshort-3] = *(short*)&pattern; -- arrays2[offsetshort-2] = *(short*)&pattern; -- arrays2[offsetshort-1] = *(short*)&pattern; -- arrayf[offsetfloat-4] = *(float*)&pattern; -- arrayf[offsetfloat-3] = *(float*)&pattern; -- arrayf[offsetfloat-2] = *(float*)&pattern; -- arrayf[offsetfloat-1] = *(float*)&pattern; -- arrays2[SAMPLES+offsetshort+0] = *(short*)&pattern; -- arrays2[SAMPLES+offsetshort+1] = *(short*)&pattern; -- arrays2[SAMPLES+offsetshort+2] = *(short*)&pattern; -- arrays2[SAMPLES+offsetshort+3] = *(short*)&pattern; -- arrayf[SAMPLES+offsetfloat+0] = *(float*)&pattern; -- arrayf[SAMPLES+offsetfloat+1] = *(float*)&pattern; -- arrayf[SAMPLES+offsetfloat+2] = *(float*)&pattern; -- arrayf[SAMPLES+offsetfloat+3] = *(float*)&pattern; -+ const union -+ { -+ uint32_t pattern; -+ short shortpattern; -+ float floatpattern; -+ } pattern = { .pattern = 0xbcbcbcbc }; -+ -+ arrays2[offsetshort-4] = *&pattern.shortpattern; -+ arrays2[offsetshort-3] = *&pattern.shortpattern; -+ arrays2[offsetshort-2] = *&pattern.shortpattern; -+ arrays2[offsetshort-1] = *&pattern.shortpattern; -+ arrayf[offsetfloat-4] = *(float*)&pattern.floatpattern; -+ arrayf[offsetfloat-3] = *(float*)&pattern.floatpattern; -+ arrayf[offsetfloat-2] = *(float*)&pattern.floatpattern; -+ arrayf[offsetfloat-1] = *(float*)&pattern.floatpattern; -+ arrays2[SAMPLES+offsetshort+0] = *&pattern.shortpattern; -+ arrays2[SAMPLES+offsetshort+1] = *&pattern.shortpattern; -+ arrays2[SAMPLES+offsetshort+2] = *&pattern.shortpattern; -+ arrays2[SAMPLES+offsetshort+3] = *&pattern.shortpattern; -+ arrayf[SAMPLES+offsetfloat+0] = *(float*)&pattern.floatpattern; -+ arrayf[SAMPLES+offsetfloat+1] = *(float*)&pattern.floatpattern; -+ arrayf[SAMPLES+offsetfloat+2] = *(float*)&pattern.floatpattern; -+ arrayf[SAMPLES+offsetfloat+3] = *(float*)&pattern.floatpattern; - - // sanity tests - QCOMPARE(SAMPLES*2, SAMPLES * ISIZEOF(arrays1[0])); -- QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-4],pattern); -- QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-3],pattern); -- QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-2],pattern); -- QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-1],pattern); -- QCOMPARE(*(uint32_t*)&arrayf[SAMPLES+offsetfloat+0],pattern); -- QCOMPARE(*(uint32_t*)&arrayf[SAMPLES+offsetfloat+1],pattern); -- QCOMPARE(*(uint32_t*)&arrayf[SAMPLES+offsetfloat+2],pattern); -- QCOMPARE(*(uint32_t*)&arrayf[SAMPLES+offsetfloat+3],pattern); -- QCOMPARE(*(short*)&arrays2[offsetshort-4],*(short*)&pattern); -- QCOMPARE(*(short*)&arrays2[offsetshort-3],*(short*)&pattern); -- QCOMPARE(*(short*)&arrays2[offsetshort-2],*(short*)&pattern); -- QCOMPARE(*(short*)&arrays2[offsetshort-1],*(short*)&pattern); -- QCOMPARE(*(short*)&arrays2[SAMPLES+offsetshort+0],*(short*)&pattern); -- QCOMPARE(*(short*)&arrays2[SAMPLES+offsetshort+1],*(short*)&pattern); -- QCOMPARE(*(short*)&arrays2[SAMPLES+offsetshort+2],*(short*)&pattern); -- QCOMPARE(*(short*)&arrays2[SAMPLES+offsetshort+3],*(short*)&pattern); -+ QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-4],*(uint32_t*)&pattern.pattern); -+ QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-3],*(uint32_t*)&pattern.pattern); -+ QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-2],*(uint32_t*)&pattern.pattern); -+ QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-1],*(uint32_t*)&pattern.pattern); -+ QCOMPARE(*(uint32_t*)&arrayf[SAMPLES+offsetfloat+0],*(uint32_t*)&pattern.pattern); -+ QCOMPARE(*(uint32_t*)&arrayf[SAMPLES+offsetfloat+1],*(uint32_t*)&pattern.pattern); -+ QCOMPARE(*(uint32_t*)&arrayf[SAMPLES+offsetfloat+2],*(uint32_t*)&pattern.pattern); -+ QCOMPARE(*(uint32_t*)&arrayf[SAMPLES+offsetfloat+3],*(uint32_t*)&pattern.pattern); -+ QCOMPARE(*(short*)&arrays2[offsetshort-4],*&pattern.shortpattern); -+ QCOMPARE(*(short*)&arrays2[offsetshort-3],*&pattern.shortpattern); -+ QCOMPARE(*(short*)&arrays2[offsetshort-2],*&pattern.shortpattern); -+ QCOMPARE(*(short*)&arrays2[offsetshort-1],*&pattern.shortpattern); -+ QCOMPARE(*(short*)&arrays2[SAMPLES+offsetshort+0],*&pattern.shortpattern); -+ QCOMPARE(*(short*)&arrays2[SAMPLES+offsetshort+1],*&pattern.shortpattern); -+ QCOMPARE(*(short*)&arrays2[SAMPLES+offsetshort+2],*&pattern.shortpattern); -+ QCOMPARE(*(short*)&arrays2[SAMPLES+offsetshort+3],*&pattern.shortpattern); - QCOMPARE(arrayf+4,&arrayf[4]); - QCOMPARE(arrays2+4,&arrays2[4]); - -@@ -248,22 +254,22 @@ class TestAudioUtils: public QObject - int val2 = AudioOutputUtil::fromFloat(FORMAT_S16, arrays2+offsetshort, arrayf+offsetfloat, SAMPLES * ISIZEOF(float)); - QCOMPARE(val2, SAMPLES * ISIZEOF(short)); - -- QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-4],pattern); -- QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-3],pattern); -- QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-2],pattern); -- QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-1],pattern); -- QCOMPARE(*(uint32_t*)&arrayf[SAMPLES+offsetfloat+0],pattern); -- QCOMPARE(*(uint32_t*)&arrayf[SAMPLES+offsetfloat+1],pattern); -- QCOMPARE(*(uint32_t*)&arrayf[SAMPLES+offsetfloat+2],pattern); -- QCOMPARE(*(uint32_t*)&arrayf[SAMPLES+offsetfloat+3],pattern); -- QCOMPARE(*(short*)&arrays2[offsetshort-4],*(short*)&pattern); -- QCOMPARE(*(short*)&arrays2[offsetshort-3],*(short*)&pattern); -- QCOMPARE(*(short*)&arrays2[offsetshort-2],*(short*)&pattern); -- QCOMPARE(*(short*)&arrays2[offsetshort-1],*(short*)&pattern); -- QCOMPARE(*(short*)&arrays2[SAMPLES+offsetshort+0],*(short*)&pattern); -- QCOMPARE(*(short*)&arrays2[SAMPLES+offsetshort+1],*(short*)&pattern); -- QCOMPARE(*(short*)&arrays2[SAMPLES+offsetshort+2],*(short*)&pattern); -- QCOMPARE(*(short*)&arrays2[SAMPLES+offsetshort+3],*(short*)&pattern); -+ QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-4],*(uint32_t*)&pattern.pattern); -+ QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-3],*(uint32_t*)&pattern.pattern); -+ QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-2],*(uint32_t*)&pattern.pattern); -+ QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-1],*(uint32_t*)&pattern.pattern); -+ QCOMPARE(*(uint32_t*)&arrayf[SAMPLES+offsetfloat+0],*(uint32_t*)&pattern.pattern); -+ QCOMPARE(*(uint32_t*)&arrayf[SAMPLES+offsetfloat+1],*(uint32_t*)&pattern.pattern); -+ QCOMPARE(*(uint32_t*)&arrayf[SAMPLES+offsetfloat+2],*(uint32_t*)&pattern.pattern); -+ QCOMPARE(*(uint32_t*)&arrayf[SAMPLES+offsetfloat+3],*(uint32_t*)&pattern.pattern); -+ QCOMPARE(*(short*)&arrays2[offsetshort-4],*&pattern.shortpattern); -+ QCOMPARE(*(short*)&arrays2[offsetshort-3],*&pattern.shortpattern); -+ QCOMPARE(*(short*)&arrays2[offsetshort-2],*&pattern.shortpattern); -+ QCOMPARE(*(short*)&arrays2[offsetshort-1],*&pattern.shortpattern); -+ QCOMPARE(*(short*)&arrays2[SAMPLES+offsetshort+0],*&pattern.shortpattern); -+ QCOMPARE(*(short*)&arrays2[SAMPLES+offsetshort+1],*&pattern.shortpattern); -+ QCOMPARE(*(short*)&arrays2[SAMPLES+offsetshort+2],*&pattern.shortpattern); -+ QCOMPARE(*(short*)&arrays2[SAMPLES+offsetshort+3],*&pattern.shortpattern); - - av_free(arrays1); - av_free(arrays2); -@@ -505,42 +511,48 @@ class TestAudioUtils: public QObject - arrays1[i] = j; - } - -- uint32_t pattern = 0xbcbcbcbc; -- arrays2[offsetuchar-4] = *(uchar*)&pattern; -- arrays2[offsetuchar-3] = *(uchar*)&pattern; -- arrays2[offsetuchar-2] = *(uchar*)&pattern; -- arrays2[offsetuchar-1] = *(uchar*)&pattern; -- arrayf[offsetfloat-4] = *(float*)&pattern; -- arrayf[offsetfloat-3] = *(float*)&pattern; -- arrayf[offsetfloat-2] = *(float*)&pattern; -- arrayf[offsetfloat-1] = *(float*)&pattern; -- arrays2[SIZEARRAY+offsetuchar+0] = *(uchar*)&pattern; -- arrays2[SIZEARRAY+offsetuchar+1] = *(uchar*)&pattern; -- arrays2[SIZEARRAY+offsetuchar+2] = *(uchar*)&pattern; -- arrays2[SIZEARRAY+offsetuchar+3] = *(uchar*)&pattern; -- arrayf[SIZEARRAY+offsetfloat+0] = *(float*)&pattern; -- arrayf[SIZEARRAY+offsetfloat+1] = *(float*)&pattern; -- arrayf[SIZEARRAY+offsetfloat+2] = *(float*)&pattern; -- arrayf[SIZEARRAY+offsetfloat+3] = *(float*)&pattern; -+ const union -+ { -+ uint32_t pattern; -+ uchar ucharpattern; -+ float floatpattern; -+ } pattern = { .pattern = 0xbcbcbcbc }; -+ -+ arrays2[offsetuchar-4] = *(uchar*)&pattern.ucharpattern; -+ arrays2[offsetuchar-3] = *(uchar*)&pattern.ucharpattern; -+ arrays2[offsetuchar-2] = *(uchar*)&pattern.ucharpattern; -+ arrays2[offsetuchar-1] = *(uchar*)&pattern.ucharpattern; -+ arrayf[offsetfloat-4] = *(float*)&pattern.floatpattern; -+ arrayf[offsetfloat-3] = *(float*)&pattern.floatpattern; -+ arrayf[offsetfloat-2] = *(float*)&pattern.floatpattern; -+ arrayf[offsetfloat-1] = *(float*)&pattern.floatpattern; -+ arrays2[SIZEARRAY+offsetuchar+0] = *(uchar*)&pattern.ucharpattern; -+ arrays2[SIZEARRAY+offsetuchar+1] = *(uchar*)&pattern.ucharpattern; -+ arrays2[SIZEARRAY+offsetuchar+2] = *(uchar*)&pattern.ucharpattern; -+ arrays2[SIZEARRAY+offsetuchar+3] = *(uchar*)&pattern.ucharpattern; -+ arrayf[SIZEARRAY+offsetfloat+0] = *(float*)&pattern.floatpattern; -+ arrayf[SIZEARRAY+offsetfloat+1] = *(float*)&pattern.floatpattern; -+ arrayf[SIZEARRAY+offsetfloat+2] = *(float*)&pattern.floatpattern; -+ arrayf[SIZEARRAY+offsetfloat+3] = *(float*)&pattern.floatpattern; - - // sanity tests - QCOMPARE(SIZEARRAY*1, SIZEARRAY * ISIZEOF(arrays1[0])); -- QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-4],pattern); -- QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-3],pattern); -- QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-2],pattern); -- QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-1],pattern); -- QCOMPARE(*(uint32_t*)&arrayf[SIZEARRAY+offsetfloat+0],pattern); -- QCOMPARE(*(uint32_t*)&arrayf[SIZEARRAY+offsetfloat+1],pattern); -- QCOMPARE(*(uint32_t*)&arrayf[SIZEARRAY+offsetfloat+2],pattern); -- QCOMPARE(*(uint32_t*)&arrayf[SIZEARRAY+offsetfloat+3],pattern); -- QCOMPARE(*(uchar*)&arrays2[offsetuchar-4],*(uchar*)&pattern); -- QCOMPARE(*(uchar*)&arrays2[offsetuchar-3],*(uchar*)&pattern); -- QCOMPARE(*(uchar*)&arrays2[offsetuchar-2],*(uchar*)&pattern); -- QCOMPARE(*(uchar*)&arrays2[offsetuchar-1],*(uchar*)&pattern); -- QCOMPARE(*(uchar*)&arrays2[SIZEARRAY+offsetuchar+0],*(uchar*)&pattern); -- QCOMPARE(*(uchar*)&arrays2[SIZEARRAY+offsetuchar+1],*(uchar*)&pattern); -- QCOMPARE(*(uchar*)&arrays2[SIZEARRAY+offsetuchar+2],*(uchar*)&pattern); -- QCOMPARE(*(uchar*)&arrays2[SIZEARRAY+offsetuchar+3],*(uchar*)&pattern); -+ QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-4],*(uint32_t*)&pattern.pattern); -+ QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-3],*(uint32_t*)&pattern.pattern); -+ QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-2],*(uint32_t*)&pattern.pattern); -+ QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-1],*(uint32_t*)&pattern.pattern); -+ QCOMPARE(*(uint32_t*)&arrayf[SIZEARRAY+offsetfloat+0],*(uint32_t*)&pattern.pattern); -+ QCOMPARE(*(uint32_t*)&arrayf[SIZEARRAY+offsetfloat+1],*(uint32_t*)&pattern.pattern); -+ QCOMPARE(*(uint32_t*)&arrayf[SIZEARRAY+offsetfloat+2],*(uint32_t*)&pattern.pattern); -+ QCOMPARE(*(uint32_t*)&arrayf[SIZEARRAY+offsetfloat+3],*(uint32_t*)&pattern.pattern); -+ QCOMPARE(*(uchar*)&arrays2[offsetuchar-4],*(uchar*)&pattern.ucharpattern); -+ QCOMPARE(*(uchar*)&arrays2[offsetuchar-3],*(uchar*)&pattern.ucharpattern); -+ QCOMPARE(*(uchar*)&arrays2[offsetuchar-2],*(uchar*)&pattern.ucharpattern); -+ QCOMPARE(*(uchar*)&arrays2[offsetuchar-1],*(uchar*)&pattern.ucharpattern); -+ QCOMPARE(*(uchar*)&arrays2[SIZEARRAY+offsetuchar+0],*(uchar*)&pattern.ucharpattern); -+ QCOMPARE(*(uchar*)&arrays2[SIZEARRAY+offsetuchar+1],*(uchar*)&pattern.ucharpattern); -+ QCOMPARE(*(uchar*)&arrays2[SIZEARRAY+offsetuchar+2],*(uchar*)&pattern.ucharpattern); -+ QCOMPARE(*(uchar*)&arrays2[SIZEARRAY+offsetuchar+3],*(uchar*)&pattern.ucharpattern); - QCOMPARE(arrayf+4,&arrayf[4]); - QCOMPARE(arrays2+4,&arrays2[4]); - -@@ -549,22 +561,22 @@ class TestAudioUtils: public QObject - int val2 = AudioOutputUtil::fromFloat(FORMAT_U8, arrays2+offsetuchar, arrayf+offsetfloat, SIZEARRAY * ISIZEOF(float)); - QCOMPARE(val2, SIZEARRAY * ISIZEOF(uchar)); - -- QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-4],pattern); -- QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-3],pattern); -- QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-2],pattern); -- QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-1],pattern); -- QCOMPARE(*(uint32_t*)&arrayf[SIZEARRAY+offsetfloat+0],pattern); -- QCOMPARE(*(uint32_t*)&arrayf[SIZEARRAY+offsetfloat+1],pattern); -- QCOMPARE(*(uint32_t*)&arrayf[SIZEARRAY+offsetfloat+2],pattern); -- QCOMPARE(*(uint32_t*)&arrayf[SIZEARRAY+offsetfloat+3],pattern); -- QCOMPARE(*(uchar*)&arrays2[offsetuchar-4],*(uchar*)&pattern); -- QCOMPARE(*(uchar*)&arrays2[offsetuchar-3],*(uchar*)&pattern); -- QCOMPARE(*(uchar*)&arrays2[offsetuchar-2],*(uchar*)&pattern); -- QCOMPARE(*(uchar*)&arrays2[offsetuchar-1],*(uchar*)&pattern); -- QCOMPARE(*(uchar*)&arrays2[SIZEARRAY+offsetuchar+0],*(uchar*)&pattern); -- QCOMPARE(*(uchar*)&arrays2[SIZEARRAY+offsetuchar+1],*(uchar*)&pattern); -- QCOMPARE(*(uchar*)&arrays2[SIZEARRAY+offsetuchar+2],*(uchar*)&pattern); -- QCOMPARE(*(uchar*)&arrays2[SIZEARRAY+offsetuchar+3],*(uchar*)&pattern); -+ QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-4],*(uint32_t*)&pattern.pattern); -+ QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-3],*(uint32_t*)&pattern.pattern); -+ QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-2],*(uint32_t*)&pattern.pattern); -+ QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-1],*(uint32_t*)&pattern.pattern); -+ QCOMPARE(*(uint32_t*)&arrayf[SIZEARRAY+offsetfloat+0],*(uint32_t*)&pattern.pattern); -+ QCOMPARE(*(uint32_t*)&arrayf[SIZEARRAY+offsetfloat+1],*(uint32_t*)&pattern.pattern); -+ QCOMPARE(*(uint32_t*)&arrayf[SIZEARRAY+offsetfloat+2],*(uint32_t*)&pattern.pattern); -+ QCOMPARE(*(uint32_t*)&arrayf[SIZEARRAY+offsetfloat+3],*(uint32_t*)&pattern.pattern); -+ QCOMPARE(*(uchar*)&arrays2[offsetuchar-4],*(uchar*)&pattern.ucharpattern); -+ QCOMPARE(*(uchar*)&arrays2[offsetuchar-3],*(uchar*)&pattern.ucharpattern); -+ QCOMPARE(*(uchar*)&arrays2[offsetuchar-2],*(uchar*)&pattern.ucharpattern); -+ QCOMPARE(*(uchar*)&arrays2[offsetuchar-1],*(uchar*)&pattern.ucharpattern); -+ QCOMPARE(*(uchar*)&arrays2[SIZEARRAY+offsetuchar+0],*(uchar*)&pattern.ucharpattern); -+ QCOMPARE(*(uchar*)&arrays2[SIZEARRAY+offsetuchar+1],*(uchar*)&pattern.ucharpattern); -+ QCOMPARE(*(uchar*)&arrays2[SIZEARRAY+offsetuchar+2],*(uchar*)&pattern.ucharpattern); -+ QCOMPARE(*(uchar*)&arrays2[SIZEARRAY+offsetuchar+3],*(uchar*)&pattern.ucharpattern); - - av_free(arrays1); - av_free(arrays2); -@@ -686,42 +698,48 @@ class TestAudioUtils: public QObject - arrays1[i] = j; - } - -- uint32_t pattern = 0xbcbcbcbc; -- arrays2[offsetint32_t-4] = *(int32_t*)&pattern; -- arrays2[offsetint32_t-3] = *(int32_t*)&pattern; -- arrays2[offsetint32_t-2] = *(int32_t*)&pattern; -- arrays2[offsetint32_t-1] = *(int32_t*)&pattern; -- arrayf[offsetfloat-4] = *(float*)&pattern; -- arrayf[offsetfloat-3] = *(float*)&pattern; -- arrayf[offsetfloat-2] = *(float*)&pattern; -- arrayf[offsetfloat-1] = *(float*)&pattern; -- arrays2[SIZEARRAY+offsetint32_t+0] = *(int32_t*)&pattern; -- arrays2[SIZEARRAY+offsetint32_t+1] = *(int32_t*)&pattern; -- arrays2[SIZEARRAY+offsetint32_t+2] = *(int32_t*)&pattern; -- arrays2[SIZEARRAY+offsetint32_t+3] = *(int32_t*)&pattern; -- arrayf[SIZEARRAY+offsetfloat+0] = *(float*)&pattern; -- arrayf[SIZEARRAY+offsetfloat+1] = *(float*)&pattern; -- arrayf[SIZEARRAY+offsetfloat+2] = *(float*)&pattern; -- arrayf[SIZEARRAY+offsetfloat+3] = *(float*)&pattern; -+ const union -+ { -+ uint32_t pattern; -+ int32_t int32pattern; -+ float floatpattern; -+ } pattern = { .pattern = 0xbcbcbcbc }; -+ -+ arrays2[offsetint32_t-4] = *(int32_t*)&pattern.int32pattern; -+ arrays2[offsetint32_t-3] = *(int32_t*)&pattern.int32pattern; -+ arrays2[offsetint32_t-2] = *(int32_t*)&pattern.int32pattern; -+ arrays2[offsetint32_t-1] = *(int32_t*)&pattern.int32pattern; -+ arrayf[offsetfloat-4] = *(float*)&pattern.floatpattern; -+ arrayf[offsetfloat-3] = *(float*)&pattern.floatpattern; -+ arrayf[offsetfloat-2] = *(float*)&pattern.floatpattern; -+ arrayf[offsetfloat-1] = *(float*)&pattern.floatpattern; -+ arrays2[SIZEARRAY+offsetint32_t+0] = *(int32_t*)&pattern.int32pattern; -+ arrays2[SIZEARRAY+offsetint32_t+1] = *(int32_t*)&pattern.int32pattern; -+ arrays2[SIZEARRAY+offsetint32_t+2] = *(int32_t*)&pattern.int32pattern; -+ arrays2[SIZEARRAY+offsetint32_t+3] = *(int32_t*)&pattern.int32pattern; -+ arrayf[SIZEARRAY+offsetfloat+0] = *(float*)&pattern.floatpattern; -+ arrayf[SIZEARRAY+offsetfloat+1] = *(float*)&pattern.floatpattern; -+ arrayf[SIZEARRAY+offsetfloat+2] = *(float*)&pattern.floatpattern; -+ arrayf[SIZEARRAY+offsetfloat+3] = *(float*)&pattern.floatpattern; - - // sanity tests - QCOMPARE(SIZEARRAY*4, SIZEARRAY * ISIZEOF(arrays1[0])); -- QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-4],pattern); -- QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-3],pattern); -- QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-2],pattern); -- QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-1],pattern); -- QCOMPARE(*(uint32_t*)&arrayf[SIZEARRAY+offsetfloat+0],pattern); -- QCOMPARE(*(uint32_t*)&arrayf[SIZEARRAY+offsetfloat+1],pattern); -- QCOMPARE(*(uint32_t*)&arrayf[SIZEARRAY+offsetfloat+2],pattern); -- QCOMPARE(*(uint32_t*)&arrayf[SIZEARRAY+offsetfloat+3],pattern); -- QCOMPARE(*(int32_t*)&arrays2[offsetint32_t-4],*(int32_t*)&pattern); -- QCOMPARE(*(int32_t*)&arrays2[offsetint32_t-3],*(int32_t*)&pattern); -- QCOMPARE(*(int32_t*)&arrays2[offsetint32_t-2],*(int32_t*)&pattern); -- QCOMPARE(*(int32_t*)&arrays2[offsetint32_t-1],*(int32_t*)&pattern); -- QCOMPARE(*(int32_t*)&arrays2[SIZEARRAY+offsetint32_t+0],*(int32_t*)&pattern); -- QCOMPARE(*(int32_t*)&arrays2[SIZEARRAY+offsetint32_t+1],*(int32_t*)&pattern); -- QCOMPARE(*(int32_t*)&arrays2[SIZEARRAY+offsetint32_t+2],*(int32_t*)&pattern); -- QCOMPARE(*(int32_t*)&arrays2[SIZEARRAY+offsetint32_t+3],*(int32_t*)&pattern); -+ QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-4],*(uint32_t*)&pattern.pattern); -+ QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-3],*(uint32_t*)&pattern.pattern); -+ QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-2],*(uint32_t*)&pattern.pattern); -+ QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-1],*(uint32_t*)&pattern.pattern); -+ QCOMPARE(*(uint32_t*)&arrayf[SIZEARRAY+offsetfloat+0],*(uint32_t*)&pattern.pattern); -+ QCOMPARE(*(uint32_t*)&arrayf[SIZEARRAY+offsetfloat+1],*(uint32_t*)&pattern.pattern); -+ QCOMPARE(*(uint32_t*)&arrayf[SIZEARRAY+offsetfloat+2],*(uint32_t*)&pattern.pattern); -+ QCOMPARE(*(uint32_t*)&arrayf[SIZEARRAY+offsetfloat+3],*(uint32_t*)&pattern.pattern); -+ QCOMPARE(*(int32_t*)&arrays2[offsetint32_t-4],*(int32_t*)&pattern.int32pattern); -+ QCOMPARE(*(int32_t*)&arrays2[offsetint32_t-3],*(int32_t*)&pattern.int32pattern); -+ QCOMPARE(*(int32_t*)&arrays2[offsetint32_t-2],*(int32_t*)&pattern.int32pattern); -+ QCOMPARE(*(int32_t*)&arrays2[offsetint32_t-1],*(int32_t*)&pattern.int32pattern); -+ QCOMPARE(*(int32_t*)&arrays2[SIZEARRAY+offsetint32_t+0],*(int32_t*)&pattern.int32pattern); -+ QCOMPARE(*(int32_t*)&arrays2[SIZEARRAY+offsetint32_t+1],*(int32_t*)&pattern.int32pattern); -+ QCOMPARE(*(int32_t*)&arrays2[SIZEARRAY+offsetint32_t+2],*(int32_t*)&pattern.int32pattern); -+ QCOMPARE(*(int32_t*)&arrays2[SIZEARRAY+offsetint32_t+3],*(int32_t*)&pattern.int32pattern); - QCOMPARE(arrayf+4,&arrayf[4]); - QCOMPARE(arrays2+4,&arrays2[4]); - -@@ -730,22 +748,22 @@ class TestAudioUtils: public QObject - int val2 = AudioOutputUtil::fromFloat(FORMAT_S32, arrays2+offsetint32_t, arrayf+offsetfloat, SIZEARRAY * ISIZEOF(float)); - QCOMPARE(val2, SIZEARRAY * ISIZEOF(int32_t)); - -- QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-4],pattern); -- QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-3],pattern); -- QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-2],pattern); -- QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-1],pattern); -- QCOMPARE(*(uint32_t*)&arrayf[SIZEARRAY+offsetfloat+0],pattern); -- QCOMPARE(*(uint32_t*)&arrayf[SIZEARRAY+offsetfloat+1],pattern); -- QCOMPARE(*(uint32_t*)&arrayf[SIZEARRAY+offsetfloat+2],pattern); -- QCOMPARE(*(uint32_t*)&arrayf[SIZEARRAY+offsetfloat+3],pattern); -- QCOMPARE(*(int32_t*)&arrays2[offsetint32_t-4],*(int32_t*)&pattern); -- QCOMPARE(*(int32_t*)&arrays2[offsetint32_t-3],*(int32_t*)&pattern); -- QCOMPARE(*(int32_t*)&arrays2[offsetint32_t-2],*(int32_t*)&pattern); -- QCOMPARE(*(int32_t*)&arrays2[offsetint32_t-1],*(int32_t*)&pattern); -- QCOMPARE(*(int32_t*)&arrays2[SIZEARRAY+offsetint32_t+0],*(int32_t*)&pattern); -- QCOMPARE(*(int32_t*)&arrays2[SIZEARRAY+offsetint32_t+1],*(int32_t*)&pattern); -- QCOMPARE(*(int32_t*)&arrays2[SIZEARRAY+offsetint32_t+2],*(int32_t*)&pattern); -- QCOMPARE(*(int32_t*)&arrays2[SIZEARRAY+offsetint32_t+3],*(int32_t*)&pattern); -+ QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-4],*(uint32_t*)&pattern.pattern); -+ QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-3],*(uint32_t*)&pattern.pattern); -+ QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-2],*(uint32_t*)&pattern.pattern); -+ QCOMPARE(*(uint32_t*)&arrayf[offsetfloat-1],*(uint32_t*)&pattern.pattern); -+ QCOMPARE(*(uint32_t*)&arrayf[SIZEARRAY+offsetfloat+0],*(uint32_t*)&pattern.pattern); -+ QCOMPARE(*(uint32_t*)&arrayf[SIZEARRAY+offsetfloat+1],*(uint32_t*)&pattern.pattern); -+ QCOMPARE(*(uint32_t*)&arrayf[SIZEARRAY+offsetfloat+2],*(uint32_t*)&pattern.pattern); -+ QCOMPARE(*(uint32_t*)&arrayf[SIZEARRAY+offsetfloat+3],*(uint32_t*)&pattern.pattern); -+ QCOMPARE(*(int32_t*)&arrays2[offsetint32_t-4],*(int32_t*)&pattern.int32pattern); -+ QCOMPARE(*(int32_t*)&arrays2[offsetint32_t-3],*(int32_t*)&pattern.int32pattern); -+ QCOMPARE(*(int32_t*)&arrays2[offsetint32_t-2],*(int32_t*)&pattern.int32pattern); -+ QCOMPARE(*(int32_t*)&arrays2[offsetint32_t-1],*(int32_t*)&pattern.int32pattern); -+ QCOMPARE(*(int32_t*)&arrays2[SIZEARRAY+offsetint32_t+0],*(int32_t*)&pattern.int32pattern); -+ QCOMPARE(*(int32_t*)&arrays2[SIZEARRAY+offsetint32_t+1],*(int32_t*)&pattern.int32pattern); -+ QCOMPARE(*(int32_t*)&arrays2[SIZEARRAY+offsetint32_t+2],*(int32_t*)&pattern.int32pattern); -+ QCOMPARE(*(int32_t*)&arrays2[SIZEARRAY+offsetint32_t+3],*(int32_t*)&pattern.int32pattern); - - av_free(arrays1); - av_free(arrays2); diff --git a/media-tv/mythtv/metadata.xml b/media-tv/mythtv/metadata.xml index 73a0226c88a5..24e993307ee8 100644 --- a/media-tv/mythtv/metadata.xml +++ b/media-tv/mythtv/metadata.xml @@ -2,7 +2,7 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>thebitpit@earthlink.net</email> + <email>thebitpit@austincustomerrands.com</email> <name>Wilson Michaels</name> </maintainer> <maintainer type="project"> diff --git a/media-tv/mythtv/mythtv-30.0_p20190808-r3.ebuild b/media-tv/mythtv/mythtv-30.0_p20190808-r3.ebuild index 820145e65378..4809398bba76 100644 --- a/media-tv/mythtv/mythtv-30.0_p20190808-r3.ebuild +++ b/media-tv/mythtv/mythtv-30.0_p20190808-r3.ebuild @@ -16,7 +16,8 @@ MYTHTV_BRANCH="fixes/${P%.*}" DESCRIPTION="Open Source DVR and media center hub" HOMEPAGE="https://www.mythtv.org" -SRC_URI="https://github.com/MythTV/mythtv/archive/${BACKPORTS}.tar.gz -> ${P}.tar.gz" +SRC_URI="https://github.com/MythTV/mythtv/archive/${BACKPORTS}.tar.gz -> ${P}.tar.gz + https://dev.gentoo.org/~juippis/distfiles/tmp/mythtv-30.0_p20190808-cast_constants_to_short.patch" LICENSE="GPL-2+" KEYWORDS="~amd64 ~x86" @@ -143,7 +144,7 @@ BDEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}/${P}-respect_LDFLAGS.patch" - "${FILESDIR}/${P}-cast_constants_to_short.patch" + "${DISTDIR}/${P}-cast_constants_to_short.patch" "${FILESDIR}/${P}-Fix_Dereferencing_type-punned_pointer.patch" "${FILESDIR}/${P}-Fix_unitialized_variables.patch" "${FILESDIR}/${PN}-29.1-Fix_create_webbrowser_window.patch" diff --git a/media-tv/plex-media-server/Manifest b/media-tv/plex-media-server/Manifest deleted file mode 100644 index c5f39128b9a3..000000000000 --- a/media-tv/plex-media-server/Manifest +++ /dev/null @@ -1,25 +0,0 @@ -AUX add_gentoo_profile_as_platform_version.patch 616 BLAKE2B 5331ad91139aa69944aa5c263609985c87315a67f3d5633e8f3976aa010f39f50e563d0b3b5259ebd1ce3437560ba8d95a71e304712a35bb8150ac0684a56107 SHA512 53e99d8a24a23f0c530ab955f5a4a9938c4e06056d3107f899883094690dd9426d0951ea695628351afa3e971a4f59827b6c8dcae323718d24450c74bd78769a -AUX conf.d/plex-media-server 216 BLAKE2B 094d0f6f7cdfa696ae47d7879c7459be5755dfe02a12c3ee986c1078ae0a46d974adc25dce252a49c3fd72e0dfe1ba65c49d575e12036fba44ce9b0390da64ec SHA512 d3d68fa58a1c1064803a9607708123302890571e823e5bc26de741bb15bd51db19234636672ff01757cbbcdb984c60663545689fa915761c78c3cf49e6da0f95 -AUX etc-plexmediaserver 831 BLAKE2B f4e7f5265b415f64124c8a3dca5a20dcc3cf2b11efb659e3917d24292c21b6314c83af28c6f7659802e92c4aa41234c9579762d313d33303a2de1c3bb2c2d6f0 SHA512 e833cd4507646d45debe0b352d67f2276a767693081331625df241ddbd4055905d66b0fe2c14838ed1ba25f8cfc6a514ba9d27bafe8aa9322df43a20284a28c7 -AUX init.d/plex-media-server 413 BLAKE2B f60fe9f653c591cddaf77a0ebcb47218681a63235e82bc016c7d2ee9180df7f6ff24f3784216ea370bdc2d493531492f196200b6ec56ff8b303e69adaa0f108d SHA512 aeb873a00081f20abd27cc76d395908ae0643bd8aa665557adafef2ed97edbe93c18b55818b49227746f9c3ce4b7a81ceb9132f07d8d873bc7b5a932b944a402 -AUX plexmediamanager.desktop.new.patch 350 BLAKE2B f52186623be0ee3e4e1414639c69a39cd83f4a45af4854a6bf2c4f6e3d51dab3d16539d554f80dbb432dcb97f6171097677ae9e24486167802d2cf93fe4c2f63 SHA512 e7e97ef8d39ff0e9220026d282febaa2613f8cc96253a9f801f1f2af5c60c3780391cdada98f921cf0226156a2347db982cf814e6aa446b07e9ae6b1b96c9525 -AUX plexmediaserver.service.patch 818 BLAKE2B aa86ab75f500fbfc50cf607f75511664675e3180ef23c78690f982e9a284c2ae21420e95e91befd74c12d81eee6c65994323c59def3f56672bc42e1a5cb503d9 SHA512 18930ad1f610c63ede0df0c53beb39d21d762a09e6427493aa47293c595b96660ace9c780891ce1f49fcbece2324ddec6b0b431c4f82ac32be85fae8e7cd1600 -AUX start_pms 1742 BLAKE2B 82e5929186fecef32c653127524cff316c6576607649aa5ad7d973879b2f084140a75e41b35f5aa39f6599b7181a0cf5880be9d084494847566ead259828cea3 SHA512 c21739f8904f2ca82427f0c62a7305ab079f697205ad44ea4071e97d82fd56924abaaec0b4b056fbdf1c047491b7b46c1a711e4339c6bf0d482829185996367d -AUX systemd/plex-media-server.service 159 BLAKE2B d4988890f6424e0b9160e90df0125fbcb32e86443c5b869f66ac6e28c3701fdaa3dd819823edd0c8675792bf4e24e7fcf3bb8894e55539ad8fc5eb9ac9a550fc SHA512 9066840efa43b127dd0d4b26ea0552894db97bf48f89003258095986e7d4728e05bee2f49de856777ed3d0b5ec41654c14505bc9867b227b754aeecd0529abd6 -AUX virtualenv_start_pms_2019.patch 430 BLAKE2B 397f059ab4a401bb92dc71a763a3c2ce385bcb0d3fc001629b5b9c2a740b862c086bb9d62592897e39e9fa8849671a2b961b8653de27d8c80e66c4b749a34982 SHA512 e6611cf2831701dabba08c4e9cdb8a8689da4cabcc720d4236b8c193ef7bd97e68451c82573f062cd0fdfd8d758cb0f4b7be5f09514b5e08313001e4ad68489b -DIST plexmediaserver_1.18.3.2156-349e9837e_amd64.deb 87197768 BLAKE2B 1dfb42a0258c5a4ff93ac38ab4abad5c17ba3c0a26db85554fa43c72ad46416bcd15bea2a33114a17ed59a73c1b4b74953560f15db3df7eb8e00f3aeb090d4d4 SHA512 82920a25b6a73d929ee2dc776ae025d427248513b1590cef80224a2173c70f6354ec32a27d3e8e49d5f67ff3c77c57531a55d031a03fbd82034c301aa99a71ac -DIST plexmediaserver_1.18.3.2156-349e9837e_i386.deb 74116200 BLAKE2B fd5b152704c9c646fce9e2a139c0ac9d500d2514e2fc050d788bd5a65df55df4d7db8b17b0160623738add3f8ca29d3566741cf3c47866d09ac96f4e035e9fa0 SHA512 4a489b807e5f6b0624a879e29eac6816a3dbd31eb8286c76263904c59c7be481dfd6754a5e14ba6ee2247c851cfd0762ca3e4a3004ca5b343bf53a5a1e143552 -DIST plexmediaserver_1.18.4.2171-ac2afe5f8_amd64.deb 86833802 BLAKE2B a59b1ff4f4475b87464e6a7fe441258c95e19db86649bfb5110a1f1a2a5382c847a9d146dec48b726bd8d34622da04dfc31d460f9c91f44f551ab5a87e8ff4ec SHA512 b2106a43996ebbddd179101ab7c054ca7576f6cd60892c78354106875a13e22283fdcddfe39041acc2dc60690a40029edd213651938b04f002fe3680da13d707 -DIST plexmediaserver_1.18.4.2171-ac2afe5f8_i386.deb 73659238 BLAKE2B 3be12b14359f0e7f46f40328414855ece7c36d4cdd0c01dc30cf225ec3e7aef06504b8c2117f634e4ea0960aa387e2d2cfacb2e697d788befa1b76bc973aebf8 SHA512 9641ff170ea3379cf0b6351167206b2923194e831868b1c2245da7bd3a63af12f17ba27c42bd4b4cb8f00bb844e1be6b7427912d1f06096c6e701f579f918d66 -DIST plexmediaserver_1.19.1.2645-ccb6eb67e_amd64.deb 90963992 BLAKE2B 470e0217bf42ce835b35fe08c7589f3b45ba90bc4281f549486e716b948dec88cade474ec969acc360358e778debd863fec7eef2bd5a1c53c2f2d723bceef4e2 SHA512 4bfff09efb8c0fc3832a50755b11a4be96fe642c50beaaf833bfb4689c8645428769ebb5c68f92bed82b89c61332f179cd2ca0c5b83424615a2738083da5843c -DIST plexmediaserver_1.19.1.2645-ccb6eb67e_i386.deb 74806258 BLAKE2B 092ec3020c6d895f08804c9938508ae0f3009cf195263b0b2ee977044a194a93823b61ff58581b3e5c0312edf829fb8e88e13ea7345fb9a6afde7e7dfb77fb68 SHA512 5ec858a79e6211931459d116efcc7b6d372404713b74d68366fc03f4ae9bc30566d28190d32ef9c444ae994f67f5f86930967508611b335085854071f91e4c48 -DIST plexmediaserver_1.19.2.2737-b69929dab_amd64.deb 91102918 BLAKE2B 44deeac4ba1922dbb8d1b3504447681db1ca6e56e1545e3dcc0f3a15812f9316d40456f0d95ad52e18d680dba7318f44fef20fb4f77e85e8a74de6645477fedc SHA512 4fb5fb617b56612cc00c181bc9cdf757c9df5c725975345d20adb3f656152b556c0120a48e7223c7a042663cbbd1b9da7e3ccf32cf2dfea4cc76ea5bc1b9893c -DIST plexmediaserver_1.19.2.2737-b69929dab_i386.deb 74970900 BLAKE2B a29b6db4d21615458c4693f0bc560f552ad5e930a4b65c0b7c48055da3c092fdb3a65862a14fc82f92f117d5c03eecce9a74750704ce3dd976e4b1632490e226 SHA512 c48364f683d8a98c6fa70f1a7f16eb0a67313439670f981d54d107983c3ccc4358ddc2c45bc0e1bcdb70cd095f53c53df4625886dee3e050b0d7cccc96d6b8ca -DIST plexmediaserver_1.19.5.3112-b23ab3896_amd64.deb 80018962 BLAKE2B 6f242149bf901a135881d849b0d7f2875fcbd05e96d428261f2d1f7bc06b495d3774bc079c62f17d5a15c584b384c8911f3b489397250e751eed715aea9092af SHA512 be79dbee6c95703a84ea7db61888a3ce7f07ed2d1ac0d9ccaa79148014a27489e400b52ed24d5a91aefcd1e2e6da4966a3ba41f59e6126753c84a89266d7324c -DIST plexmediaserver_1.19.5.3112-b23ab3896_i386.deb 73443668 BLAKE2B 6d80712597df4e1a033ab1d91e358a42b5fb4fd2533be235358546e3a1e147094612321b8b30b0162e437470839f9b92630cd0ac6ea935aaa3c4a330218c03c9 SHA512 25a3a6b6dd5f74966de2e54ddb99dcaf7ecf88045bab5df91c465c9db422a8c6d68783ad0a53ba9e78d5fb911c675ba022f1e4869cd427d2e955e9dedda3ab56 -EBUILD plex-media-server-1.18.3.ebuild 4471 BLAKE2B eccc5c50e3776b2a75f3b9e5e39fbf173b9810296bb1ab9a3d8ebbf55de1352a93f625f1db8b7af6fcca5e266d07e8eae551388546823cd9c26fdedcb16a485e SHA512 2e250e2a7679bb20dabe8aa25ddd8c864f0de3878b97303901e400824250d64b8c26deab08c4ae9b811951efff600d7af463fa570cf70c9f785f5caf59b30605 -EBUILD plex-media-server-1.18.4-r1.ebuild 4445 BLAKE2B 7f5e55277cf0703b563a9d50badd9cb6471e0149c4d28d777eb6b8d44cc8a1ad7e46a3a78b3397dc57ef00ed0605561b7b5c67056f64cde88b5df668351c033d SHA512 81a87902ac81041faa53a4ce280cb1b035c8a8d32d26bcf3b3d21292c460b39f6cbe40693845f61c3c25ef4fbc424b7d8f9c1d8ed78f9bb71ab11057e1015314 -EBUILD plex-media-server-1.19.1.ebuild 4341 BLAKE2B be66c3be68a0a033594417527c39f3a468c48efde72e5791d1bb596838829f8e32613256192ba6ba370676b4b578cd3e21e4c59022a54d7aaa08476c49c8317a SHA512 dc9d311b9082169167eb4f46bf941efeb943371516d78db1ad71766f235c1489747fba4073eb6fe6e94fb584ccafa95fda026018d5252fa76f90639ea10de320 -EBUILD plex-media-server-1.19.2.ebuild 4341 BLAKE2B 04e5d06ebea929a20f8fe2b9ffe1319c8ff185451f571e90899fbcc6d11e189df80eddf3ede2b6ea919c537994dd0f28c2f911dddde53f116c18f9a55a72f248 SHA512 40b3936233ad9827de5bb71197a6c9f9852319293261f8866c88c24bd7d0b1dbe8f8d8758a43489d851a8dccf9b4340b1e9f2384d8a007347045654fe5243910 -EBUILD plex-media-server-1.19.5.ebuild 4341 BLAKE2B 68372882a47707ea0802f70e8a72002962f152e06c2e2ba3a99ac595878a0e8cc5fd1a64f791f5307953b904969f0c81ea3d7c890a8e94ddbc168c16a18765dc SHA512 da142a15014e0f2d1a1e6e616286aaa5380295ff4f09c7e15befd1ecf965af155e9cc44c5701aae563e002eea2524379323deecb1afb1b55b6534742f944489b -MISC metadata.xml 367 BLAKE2B 0d52124daec02b05aa2c729fcc943a29b74d871de0dccf8cafb9947908a4eea58b2d893a454cb76230d1a24eecdd4b9ef752c40d52961488bd5722dfba57f2c8 SHA512 9feb86f493b8ba2cf3a3bf8c146e55bbd7701e58bf62ab576a71fecdac0ad0522bfe45650d84f6b0ec94be2fbf07c6db143cce5c69e80a32101084e372e86eb0 diff --git a/media-tv/plex-media-server/files/add_gentoo_profile_as_platform_version.patch b/media-tv/plex-media-server/files/add_gentoo_profile_as_platform_version.patch deleted file mode 100644 index eaf49067bf2c..000000000000 --- a/media-tv/plex-media-server/files/add_gentoo_profile_as_platform_version.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/usr/sbin/start_pms -+++ b/usr/sbin/start_pms -@@ -4,7 +4,8 @@ - export PLEX_MEDIA_SERVER_INFO_VENDOR="$(grep ^NAME= /etc/os-release|awk -F= '{print $2}'|tr -d \" )" - export PLEX_MEDIA_SERVER_INFO_DEVICE="PC" - export PLEX_MEDIA_SERVER_INFO_MODEL="$(uname -m)" --export PLEX_MEDIA_SERVER_INFO_PLATFORM_VERSION="$(grep ^VERSION= /etc/os-release|awk -F= '{print $2}'|tr -d \" )" -+GENTOO_PROFILE="`readlink /etc/portage/make.profile`" -+export PLEX_MEDIA_SERVER_INFO_PLATFORM_VERSION="${GENTOO_PROFILE#.*/profiles/}" - - # change these parameters in /etc/plex/plexmediaserver - export PLEX_MEDIA_SERVER_MAX_PLUGIN_PROCS=6 diff --git a/media-tv/plex-media-server/files/conf.d/plex-media-server b/media-tv/plex-media-server/files/conf.d/plex-media-server deleted file mode 100644 index 7fe754fb1d81..000000000000 --- a/media-tv/plex-media-server/files/conf.d/plex-media-server +++ /dev/null @@ -1,7 +0,0 @@ -# Config file for /etc/init.d/plex-media-server - -PLEX_PIDFILE="/var/run/plex-media-server.pid" -PLEX_OUTLOG="/var/log/pms/out.log" -PLEX_ERRLOG="/var/log/pms/err.log" -PLEX_USER="plex" -PLEX_SCRIPT="/usr/sbin/start_pms" diff --git a/media-tv/plex-media-server/files/etc-plexmediaserver b/media-tv/plex-media-server/files/etc-plexmediaserver deleted file mode 100644 index 51709fc84999..000000000000 --- a/media-tv/plex-media-server/files/etc-plexmediaserver +++ /dev/null @@ -1,23 +0,0 @@ -# default script for Plex Media Server - -# the number of plugins that can run at the same time -export PLEX_MEDIA_SERVER_MAX_PLUGIN_PROCS=6 - -# ulimit -s $PLEX_MEDIA_SERVER_MAX_STACK_SIZE -export PLEX_MEDIA_SERVER_MAX_STACK_SIZE=3000 - -# where the mediaserver should store the transcodes -export PLEX_MEDIA_SERVER_TMPDIR=/tmp - -# uncomment to set it to something else -# export PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR="${HOME}/Library/Application Support" - -# the user that PMS should run as, defaults to 'plex' -# note that if you change this you might need to move -# the Application Support directory to not lose your -# media library (match what is in /etc/passwd) -export PLEX_MEDIA_SERVER_USER=plex - -# Uncomment this to use syslog for logging instead of -# sending logs to Plex Media Server.log -#export PLEX_MEDIA_SERVER_USE_SYSLOG=true diff --git a/media-tv/plex-media-server/files/init.d/plex-media-server b/media-tv/plex-media-server/files/init.d/plex-media-server deleted file mode 100644 index 102ac80c287c..000000000000 --- a/media-tv/plex-media-server/files/init.d/plex-media-server +++ /dev/null @@ -1,20 +0,0 @@ -#!/sbin/openrc-run - -depend() { - need avahi-daemon -} - -start() { - ebegin "Starting Plex Media Server" - start-stop-daemon -S -m -p ${PLEX_PIDFILE} -1 ${PLEX_OUTLOG} -2 ${PLEX_ERRLOG} --quiet -u ${PLEX_USER} -N -5 -b --exec ${PLEX_SCRIPT} - eend $? -} - -stop() { - ebegin "Stopping Plex Media Server" - kill -- -`cat ${PLEX_PIDFILE}` - - # Remove stale pid file since this is a dirty solution - rm ${PLEX_PIDFILE} - eend $? -} diff --git a/media-tv/plex-media-server/files/plexmediamanager.desktop.new.patch b/media-tv/plex-media-server/files/plexmediamanager.desktop.new.patch deleted file mode 100644 index a7f86de369ae..000000000000 --- a/media-tv/plex-media-server/files/plexmediamanager.desktop.new.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- ./usr/share/applications/plexmediaserver.desktop 2019-01-02 13:53:51.000000000 +0100 -+++ ./usr/share/applications/plexmediaserver.desktop 2019-01-04 07:52:25.910331212 +0100 -@@ -6,4 +6,4 @@ - Icon=plexmediaserver - Terminal=false - Type=Application --Categories=Audio;Music;Video;Player;Media; -+Categories=Audio;Music;Video;Player;AudioVideo;X-Media diff --git a/media-tv/plex-media-server/files/plexmediaserver.service.patch b/media-tv/plex-media-server/files/plexmediaserver.service.patch deleted file mode 100644 index c45124029811..000000000000 --- a/media-tv/plex-media-server/files/plexmediaserver.service.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- ./usr/lib/plexmediaserver/lib/plexmediaserver.service.old 2020-01-29 08:50:39.856491924 +0100 -+++ ./usr/lib/plexmediaserver/lib/plexmediaserver.service 2020-01-29 08:51:49.068249688 +0100 -@@ -12,7 +12,8 @@ - export PLEX_MEDIA_SERVER_INFO_VENDOR="$(grep ^NAME= /etc/os-release | awk -F= "{print \\$2}" | tr -d \\" )"; \ - export PLEX_MEDIA_SERVER_INFO_DEVICE="PC"; \ - export PLEX_MEDIA_SERVER_INFO_MODEL="$(uname -m)"; \ --export PLEX_MEDIA_SERVER_INFO_PLATFORM_VERSION="$(grep ^VERSION= /etc/os-release | awk -F= "{print \\$2}" | tr -d \\" )"; \ -+export GENTOO_PROFILE="`readlink /etc/portage/make.profile`"; \ -+export PLEX_MEDIA_SERVER_INFO_PLATFORM_VERSION="$${GENTOO_PROFILE#.*/profiles/}"; \ - export LD_LIBRARY_PATH=/usr/lib/plexmediaserver/lib; \ - exec "/usr/lib/plexmediaserver/Plex Media Server"' - Type=simple diff --git a/media-tv/plex-media-server/files/start_pms b/media-tv/plex-media-server/files/start_pms deleted file mode 100644 index 9735a9e8bd40..000000000000 --- a/media-tv/plex-media-server/files/start_pms +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/sh -# -# Plex Media Server - Manual start script. -# - -# Set Crash Reporting identification variables -export PLEX_MEDIA_SERVER_INFO_VENDOR="$(grep ^NAME= /etc/os-release|awk -F= '{print $2}'|tr -d \" )" -export PLEX_MEDIA_SERVER_INFO_DEVICE="PC" -export PLEX_MEDIA_SERVER_INFO_MODEL="$(uname -m)" -GENTOO_PROFILE="`readlink /etc/portage/make.profile`" -export PLEX_MEDIA_SERVER_INFO_PLATFORM_VERSION="${GENTOO_PROFILE#.*/profiles/}" - -# Change these parameters in /etc/plex/plexmediaserver -export PLEX_MEDIA_SERVER_USER=plex -export PLEX_MEDIA_SERVER_MAX_PLUGIN_PROCS=6 -export PLEX_MEDIA_SERVER_HOME=/usr/lib/plexmediaserver -export PLEX_MEDIA_SERVER_MAX_STACK_SIZE=3000 -export PLEX_MEDIA_SERVER_TMPDIR=/tmp -export PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR="${HOME}/Library/Application Support" - -if [ -f /etc/default/locale ]; then - export LANG="$(cat /etc/default/locale|awk -F '=' '/LANG=/{print $2}'|sed 's/"//g')" - export LC_ALL="$LANG" -fi - -test -f /etc/plex/plexmediaserver && . /etc/plex/plexmediaserver - -# Silently support PLEX_USER if provided as override -if [ "$PLEX_USER" != "" ]; then - export PLEX_MEDIA_SERVER_USER="$PLEX_USER" -fi - -# Activate python virtualenv -. "${PLEX_MEDIA_SERVER_HOME}"/Resources/Python/bin/activate - -# Create AppSuppDir if not present -if [ ! -d "$PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR" ]; then - mkdir -p "$PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR" - if [ ! $? -eq 0 ]; then - echo "ERROR: Couldn't create $PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR " - exit 1 - fi -fi - -export LD_LIBRARY_PATH="${PLEX_MEDIA_SERVER_HOME}/lib":"${PLEX_MEDIA_SERVER_HOME}" -export TMPDIR="${PLEX_MEDIA_SERVER_TMPDIR}" - -ulimit -s $PLEX_MEDIA_SERVER_MAX_STACK_SIZE - -(cd /usr/lib/plexmediaserver; exec ./Plex\ Media\ Server) diff --git a/media-tv/plex-media-server/files/systemd/plex-media-server.service b/media-tv/plex-media-server/files/systemd/plex-media-server.service deleted file mode 100644 index 12412a844860..000000000000 --- a/media-tv/plex-media-server/files/systemd/plex-media-server.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Plex Media Server -After=network.target - -[Service] -Type=simple -User=plex -ExecStart=/usr/sbin/start_pms - -[Install] -WantedBy=multi-user.target diff --git a/media-tv/plex-media-server/files/virtualenv_start_pms_2019.patch b/media-tv/plex-media-server/files/virtualenv_start_pms_2019.patch deleted file mode 100644 index c68178bcb1c5..000000000000 --- a/media-tv/plex-media-server/files/virtualenv_start_pms_2019.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/usr/sbin/start_pms 2019-08-08 01:07:58.239646635 +0200 -+++ b/usr/sbin/start_pms 2019-08-08 01:09:39.828649755 +0200 -@@ -20,6 +20,9 @@ - - test -f /etc/default/plexmediaserver && . /etc/default/plexmediaserver - -+# Activate python virtualenv -+. "${PLEX_MEDIA_SERVER_HOME}"/Resources/Python/bin/activate -+ - if [ ! -d "$PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR" ] - then - mkdir -p "$PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR" diff --git a/media-tv/plex-media-server/metadata.xml b/media-tv/plex-media-server/metadata.xml deleted file mode 100644 index 8815e575c0e3..000000000000 --- a/media-tv/plex-media-server/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>ss23@ss23.geek.nz</email> - <name>Stephen Shkardoon</name> - </maintainer> - <maintainer type="project"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> -</pkgmetadata> diff --git a/media-tv/plex-media-server/plex-media-server-1.18.3.ebuild b/media-tv/plex-media-server/plex-media-server-1.18.3.ebuild deleted file mode 100644 index 8f2e0be664e2..000000000000 --- a/media-tv/plex-media-server/plex-media-server-1.18.3.ebuild +++ /dev/null @@ -1,138 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python2_7 ) -inherit eutils systemd unpacker pax-utils python-single-r1 - -MINOR_VERSION="2156-349e9837e" - -_APPNAME="plexmediaserver" -_USERNAME="plex" -_SHORTNAME="${_USERNAME}" -_FULL_VERSION="${PV}.${MINOR_VERSION}" - -URI="https://downloads.plex.tv/plex-media-server-new" - -DESCRIPTION="A free media library that is intended for use with a plex client" -HOMEPAGE="https://www.plex.tv/" -SRC_URI=" - amd64? ( ${URI}/${_FULL_VERSION}/debian/plexmediaserver_${_FULL_VERSION}_amd64.deb ) - x86? ( ${URI}/${_FULL_VERSION}/debian/plexmediaserver_${_FULL_VERSION}_i386.deb ) -" -SLOT="0" -LICENSE="Plex" -RESTRICT="bindist strip" -KEYWORDS="-* ~amd64 ~x86" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -DEPEND=" - $(python_gen_cond_dep ' - dev-python/virtualenv[${PYTHON_MULTI_USEDEP}] - ')" -BDEPEND="dev-util/patchelf" - -RDEPEND=" - acct-group/plex - acct-user/plex - net-dns/avahi - ${PYTHON_DEPS}" - -QA_DESKTOP_FILE="usr/share/applications/plexmediamanager.desktop" -QA_PREBUILT="*" -QA_MULTILIB_PATHS=( - "usr/lib/${_APPNAME}/.*" - "usr/lib/${_APPNAME}/Resources/Python/lib/python2.7/.*" -) - -BINS_TO_PAX_MARK=( - "${ED}/usr/lib/plexmediaserver/Plex Script Host" - "${ED}/usr/lib/plexmediaserver/Plex Media Scanner" -) - -S="${WORKDIR}" -PATCHES=( - "${FILESDIR}/virtualenv_start_pms_2019.patch" - "${FILESDIR}/plexmediamanager.desktop.new.patch" - "${FILESDIR}/add_gentoo_profile_as_platform_version.patch" -) - -src_unpack() { - unpack_deb ${A} -} - -src_install() { - # Move the config to the correct place - local config_vanilla="/etc/default/plexmediaserver" - local config_path="/etc/${_SHORTNAME}" - dodir "${config_path}" - insinto "${config_path}" - doins "${config_vanilla#/}" - sed -e "s#${config_vanilla}#${config_path}/${_APPNAME}#g" -i "${S}"/usr/sbin/start_pms || die - - # Remove Debian specific files - rm -r "usr/share/doc" || die - - # Copy main files over to image and preserve permissions so it is portable - cp -rp usr/ "${ED}"/ || die - - # Make sure the logging directory is created - local logging_dir="/var/log/pms" - dodir "${logging_dir}" - fowners "${_USERNAME}":"${_USERNAME}" "${logging_dir}" - keepdir "${logging_dir}" - - # Create default library folder with correct permissions - local default_library_dir="/var/lib/${_APPNAME}" - dodir "${default_library_dir}" - fowners "${_USERNAME}":"${_USERNAME}" "${default_library_dir}" - keepdir "${default_library_dir}" - - # Install the OpenRC init/conf files - doinitd "${FILESDIR}/init.d/${PN}" - doconfd "${FILESDIR}/conf.d/${PN}" - - # Mask Plex libraries so that revdep-rebuild doesn't try to rebuild them. - # Plex has its own precompiled libraries. - _mask_plex_libraries_revdep - - # Fix RPATH - patchelf --force-rpath --set-rpath '$ORIGIN:$ORIGIN/../../../../../../lib' "${ED}"/usr/lib/plexmediaserver/Resources/Python/lib/python2.7/lib-dynload/_codecs_kr.so || die - - # Install systemd service file - systemd_newunit "${FILESDIR}/systemd/${PN}.service" "${PN}.service" - - # Add pax markings to some binaries so that they work on hardened setup - for f in "${BINS_TO_PAX_MARK[@]}"; do - pax-mark m "${f}" - done - - einfo "Configuring virtualenv" - virtualenv -v --no-pip --no-setuptools --no-wheel "${ED}"/usr/lib/plexmediaserver/Resources/Python || die - pushd "${ED}"/usr/lib/plexmediaserver/Resources/Python &>/dev/null || die - find . -type f -exec sed -i -e "s#${D}##g" {} + || die - popd &>/dev/null || die -} - -pkg_postinst() { - elog "Plex Media Server is now installed. Please check the configuration" - elog "file in /etc/${_SHORTNAME}/${_APPNAME}" - elog "to verify the default settings." - elog "To start the Plex Server, run 'rc-config start plex-media-server'," - elog "you will then be able to access your library at" - elog "http://<ip>:32400/web/" -} - -# Adds the precompiled plex libraries to the revdep-rebuild's mask list -# so it doesn't try to rebuild libraries that can't be rebuilt. -_mask_plex_libraries_revdep() { - dodir /etc/revdep-rebuild/ - - # Bug: 659702. The upstream plex binary installs its precompiled package to /usr/lib. - # Due to profile 17.1 splitting /usr/lib and /usr/lib64, we can no longer rely - # on the implicit symlink automatically satisfying our revdep requirement when we use $(get_libdir). - # Thus we will match upstream's directory automatically. If upstream switches their location, - # then so should we. - echo "SEARCH_DIRS_MASK=\"${EPREFIX}/usr/lib/plexmediaserver\"" > "${ED}"/etc/revdep-rebuild/80plexmediaserver -} diff --git a/media-tv/plex-media-server/plex-media-server-1.18.4-r1.ebuild b/media-tv/plex-media-server/plex-media-server-1.18.4-r1.ebuild deleted file mode 100644 index 97beb63deae3..000000000000 --- a/media-tv/plex-media-server/plex-media-server-1.18.4-r1.ebuild +++ /dev/null @@ -1,137 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python2_7 ) -inherit eutils systemd unpacker pax-utils python-single-r1 - -MINOR_VERSION="2171-ac2afe5f8" - -_APPNAME="plexmediaserver" -_USERNAME="plex" -_SHORTNAME="${_USERNAME}" -_FULL_VERSION="${PV}.${MINOR_VERSION}" - -URI="https://downloads.plex.tv/plex-media-server-new" - -DESCRIPTION="A free media library that is intended for use with a plex client" -HOMEPAGE="https://www.plex.tv/" -SRC_URI=" - amd64? ( ${URI}/${_FULL_VERSION}/debian/plexmediaserver_${_FULL_VERSION}_amd64.deb ) - x86? ( ${URI}/${_FULL_VERSION}/debian/plexmediaserver_${_FULL_VERSION}_i386.deb ) -" -SLOT="0" -LICENSE="Plex" -RESTRICT="bindist strip" -KEYWORDS="-* amd64 x86" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -DEPEND=" - $(python_gen_cond_dep ' - dev-python/virtualenv[${PYTHON_MULTI_USEDEP}] - ')" -BDEPEND="dev-util/patchelf" - -RDEPEND=" - acct-group/plex - acct-user/plex - net-dns/avahi - ${PYTHON_DEPS}" - -QA_DESKTOP_FILE="usr/share/applications/plexmediamanager.desktop" -QA_PREBUILT="*" -QA_MULTILIB_PATHS=( - "usr/lib/${_APPNAME}/.*" - "usr/lib/${_APPNAME}/Resources/Python/lib/python2.7/.*" -) - -BINS_TO_PAX_MARK=( - "${ED}/usr/lib/plexmediaserver/Plex Script Host" - "${ED}/usr/lib/plexmediaserver/Plex Media Scanner" -) - -S="${WORKDIR}" -PATCHES=( - "${FILESDIR}/virtualenv_start_pms_2019.patch" - "${FILESDIR}/plexmediamanager.desktop.new.patch" - "${FILESDIR}/add_gentoo_profile_as_platform_version.patch" -) - -src_unpack() { - unpack_deb ${A} -} - -src_install() { - # Move the config to the correct place - local config_vanilla="/etc/default/plexmediaserver" - local config_path="/etc/${_SHORTNAME}" - insinto "${config_path}" - doins "${config_vanilla#/}" - sed -e "s#${config_vanilla}#${config_path}/${_APPNAME}#g" -i "${S}"/usr/sbin/start_pms || die - - # Remove Debian specific files - rm -r "usr/share/doc" || die - - # Copy main files over to image and preserve permissions so it is portable - cp -rp usr/ "${ED}"/ || die - - # Make sure the logging directory is created - local logging_dir="/var/log/pms" - dodir "${logging_dir}" - fowners "${_USERNAME}":"${_USERNAME}" "${logging_dir}" - keepdir "${logging_dir}" - - # Create default library folder with correct permissions - local default_library_dir="/var/lib/${_APPNAME}" - dodir "${default_library_dir}" - fowners "${_USERNAME}":"${_USERNAME}" "${default_library_dir}" - keepdir "${default_library_dir}" - - # Install the OpenRC init/conf files - doinitd "${FILESDIR}/init.d/${PN}" - doconfd "${FILESDIR}/conf.d/${PN}" - - # Mask Plex libraries so that revdep-rebuild doesn't try to rebuild them. - # Plex has its own precompiled libraries. - _mask_plex_libraries_revdep - - # Fix RPATH - patchelf --force-rpath --set-rpath '$ORIGIN:$ORIGIN/../../../../../../lib' "${ED}"/usr/lib/plexmediaserver/Resources/Python/lib/python2.7/lib-dynload/_codecs_kr.so || die - - # Install systemd service file - systemd_newunit "${FILESDIR}/systemd/${PN}.service" "${PN}.service" - - # Add pax markings to some binaries so that they work on hardened setup - for f in "${BINS_TO_PAX_MARK[@]}"; do - pax-mark m "${f}" - done - - einfo "Configuring virtualenv" - virtualenv -v --no-pip --no-setuptools --no-wheel "${ED}"/usr/lib/plexmediaserver/Resources/Python || die - pushd "${ED}"/usr/lib/plexmediaserver/Resources/Python &>/dev/null || die - find . -type f -exec sed -i -e "s#${D}##g" {} + || die - popd &>/dev/null || die -} - -pkg_postinst() { - elog "Plex Media Server is now installed. Please check the configuration" - elog "file in /etc/${_SHORTNAME}/${_APPNAME}" - elog "to verify the default settings." - elog "To start the Plex Server, run 'rc-config start plex-media-server'," - elog "you will then be able to access your library at" - elog "http://<ip>:32400/web/" -} - -# Adds the precompiled plex libraries to the revdep-rebuild's mask list -# so it doesn't try to rebuild libraries that can't be rebuilt. -_mask_plex_libraries_revdep() { - dodir /etc/revdep-rebuild/ - - # Bug: 659702. The upstream plex binary installs its precompiled package to /usr/lib. - # Due to profile 17.1 splitting /usr/lib and /usr/lib64, we can no longer rely - # on the implicit symlink automatically satisfying our revdep requirement when we use $(get_libdir). - # Thus we will match upstream's directory automatically. If upstream switches their location, - # then so should we. - echo "SEARCH_DIRS_MASK=\"${EPREFIX}/usr/lib/plexmediaserver\"" > "${ED}"/etc/revdep-rebuild/80plexmediaserver -} diff --git a/media-tv/plex-media-server/plex-media-server-1.19.1.ebuild b/media-tv/plex-media-server/plex-media-server-1.19.1.ebuild deleted file mode 100644 index d8eee52154c6..000000000000 --- a/media-tv/plex-media-server/plex-media-server-1.19.1.ebuild +++ /dev/null @@ -1,140 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python2_7 ) -inherit eutils systemd unpacker pax-utils python-single-r1 - -MINOR_VERSION="2645-ccb6eb67e" - -_APPNAME="plexmediaserver" -_USERNAME="plex" -_SHORTNAME="${_USERNAME}" -_FULL_VERSION="${PV}.${MINOR_VERSION}" - -URI="https://downloads.plex.tv/plex-media-server-new" - -DESCRIPTION="A free media library that is intended for use with a plex client" -HOMEPAGE="https://www.plex.tv/" -SRC_URI=" - amd64? ( ${URI}/${_FULL_VERSION}/debian/plexmediaserver_${_FULL_VERSION}_amd64.deb ) - x86? ( ${URI}/${_FULL_VERSION}/debian/plexmediaserver_${_FULL_VERSION}_i386.deb ) -" -SLOT="0" -LICENSE="Plex" -RESTRICT="bindist strip" -KEYWORDS="-* ~amd64 ~x86" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -DEPEND=" - $(python_gen_cond_dep ' - dev-python/virtualenv[${PYTHON_MULTI_USEDEP}] - ')" -BDEPEND="dev-util/patchelf" - -RDEPEND=" - acct-group/plex - acct-user/plex - net-dns/avahi - ${PYTHON_DEPS}" - -QA_DESKTOP_FILE="usr/share/applications/plexmediamanager.desktop" -QA_PREBUILT="*" -QA_MULTILIB_PATHS=( - "usr/lib/${_APPNAME}/.*" - "usr/lib/${_APPNAME}/Resources/Python/lib/python2.7/.*" -) - -BINS_TO_PAX_MARK=( - "${ED}/usr/lib/plexmediaserver/Plex Script Host" - "${ED}/usr/lib/plexmediaserver/Plex Media Scanner" -) - -S="${WORKDIR}" -PATCHES=( - "${FILESDIR}/plexmediamanager.desktop.new.patch" - "${FILESDIR}/plexmediaserver.service.patch" -) - -src_unpack() { - unpack_deb ${A} -} - -src_install() { - # Install base config file - insinto "/etc/plex/" - newins "${FILESDIR}/etc-plexmediaserver" "plexmediaserver" - - # Remove Debian apt repo files - rm -r "etc/apt" || die - - # Remove Debian specific files - rm -r "usr/share/doc" || die - - # Copy main files over to image and preserve permissions so it is portable - cp -rp usr/ "${ED}"/ || die - - # Make sure the logging directory is created - local logging_dir="/var/log/pms" - dodir "${logging_dir}" - fowners "${_USERNAME}":"${_USERNAME}" "${logging_dir}" - keepdir "${logging_dir}" - - # Create default library folder with correct permissions - local default_library_dir="/var/lib/${_APPNAME}" - dodir "${default_library_dir}" - fowners "${_USERNAME}":"${_USERNAME}" "${default_library_dir}" - keepdir "${default_library_dir}" - - # Install the OpenRC init/conf files - doinitd "${FILESDIR}/init.d/${PN}" - doconfd "${FILESDIR}/conf.d/${PN}" - - # Mask Plex libraries so that revdep-rebuild doesn't try to rebuild them. - # Plex has its own precompiled libraries. - _mask_plex_libraries_revdep - - # Fix RPATH - patchelf --force-rpath --set-rpath '$ORIGIN:$ORIGIN/../../../../../../lib' "${ED}"/usr/lib/plexmediaserver/Resources/Python/lib/python2.7/lib-dynload/_codecs_kr.so || die - - # Install systemd service file - systemd_newunit "${FILESDIR}/systemd/${PN}.service" "${PN}.service" - - # Add pax markings to some binaries so that they work on hardened setup - for f in "${BINS_TO_PAX_MARK[@]}"; do - pax-mark m "${f}" - done - - # Install start_pms script - into /usr - dosbin "${FILESDIR}/start_pms" - - einfo "Configuring virtualenv" - virtualenv -v --no-pip --no-setuptools --no-wheel "${ED}"/usr/lib/plexmediaserver/Resources/Python || die - pushd "${ED}"/usr/lib/plexmediaserver/Resources/Python &>/dev/null || die - find . -type f -exec sed -i -e "s#${D}##g" {} + || die - popd &>/dev/null || die -} - -pkg_postinst() { - elog "Plex Media Server is now installed. Please check the configuration" - elog "file in /etc/${_SHORTNAME}/${_APPNAME}" - elog "to verify the default settings." - elog "To start the Plex Server, run 'rc-config start plex-media-server'," - elog "you will then be able to access your library at" - elog "http://<ip>:32400/web/" -} - -# Adds the precompiled plex libraries to the revdep-rebuild's mask list -# so it doesn't try to rebuild libraries that can't be rebuilt. -_mask_plex_libraries_revdep() { - dodir /etc/revdep-rebuild/ - - # Bug: 659702. The upstream plex binary installs its precompiled package to /usr/lib. - # Due to profile 17.1 splitting /usr/lib and /usr/lib64, we can no longer rely - # on the implicit symlink automatically satisfying our revdep requirement when we use $(get_libdir). - # Thus we will match upstream's directory automatically. If upstream switches their location, - # then so should we. - echo "SEARCH_DIRS_MASK=\"${EPREFIX}/usr/lib/plexmediaserver\"" > "${ED}"/etc/revdep-rebuild/80plexmediaserver -} diff --git a/media-tv/plex-media-server/plex-media-server-1.19.2.ebuild b/media-tv/plex-media-server/plex-media-server-1.19.2.ebuild deleted file mode 100644 index 5c818884733e..000000000000 --- a/media-tv/plex-media-server/plex-media-server-1.19.2.ebuild +++ /dev/null @@ -1,140 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python2_7 ) -inherit eutils systemd unpacker pax-utils python-single-r1 - -MINOR_VERSION="2737-b69929dab" - -_APPNAME="plexmediaserver" -_USERNAME="plex" -_SHORTNAME="${_USERNAME}" -_FULL_VERSION="${PV}.${MINOR_VERSION}" - -URI="https://downloads.plex.tv/plex-media-server-new" - -DESCRIPTION="A free media library that is intended for use with a plex client" -HOMEPAGE="https://www.plex.tv/" -SRC_URI=" - amd64? ( ${URI}/${_FULL_VERSION}/debian/plexmediaserver_${_FULL_VERSION}_amd64.deb ) - x86? ( ${URI}/${_FULL_VERSION}/debian/plexmediaserver_${_FULL_VERSION}_i386.deb ) -" -SLOT="0" -LICENSE="Plex" -RESTRICT="bindist strip" -KEYWORDS="-* ~amd64 ~x86" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -DEPEND=" - $(python_gen_cond_dep ' - dev-python/virtualenv[${PYTHON_MULTI_USEDEP}] - ')" -BDEPEND="dev-util/patchelf" - -RDEPEND=" - acct-group/plex - acct-user/plex - net-dns/avahi - ${PYTHON_DEPS}" - -QA_DESKTOP_FILE="usr/share/applications/plexmediamanager.desktop" -QA_PREBUILT="*" -QA_MULTILIB_PATHS=( - "usr/lib/${_APPNAME}/.*" - "usr/lib/${_APPNAME}/Resources/Python/lib/python2.7/.*" -) - -BINS_TO_PAX_MARK=( - "${ED}/usr/lib/plexmediaserver/Plex Script Host" - "${ED}/usr/lib/plexmediaserver/Plex Media Scanner" -) - -S="${WORKDIR}" -PATCHES=( - "${FILESDIR}/plexmediamanager.desktop.new.patch" - "${FILESDIR}/plexmediaserver.service.patch" -) - -src_unpack() { - unpack_deb ${A} -} - -src_install() { - # Install base config file - insinto "/etc/plex/" - newins "${FILESDIR}/etc-plexmediaserver" "plexmediaserver" - - # Remove Debian apt repo files - rm -r "etc/apt" || die - - # Remove Debian specific files - rm -r "usr/share/doc" || die - - # Copy main files over to image and preserve permissions so it is portable - cp -rp usr/ "${ED}"/ || die - - # Make sure the logging directory is created - local logging_dir="/var/log/pms" - dodir "${logging_dir}" - fowners "${_USERNAME}":"${_USERNAME}" "${logging_dir}" - keepdir "${logging_dir}" - - # Create default library folder with correct permissions - local default_library_dir="/var/lib/${_APPNAME}" - dodir "${default_library_dir}" - fowners "${_USERNAME}":"${_USERNAME}" "${default_library_dir}" - keepdir "${default_library_dir}" - - # Install the OpenRC init/conf files - doinitd "${FILESDIR}/init.d/${PN}" - doconfd "${FILESDIR}/conf.d/${PN}" - - # Mask Plex libraries so that revdep-rebuild doesn't try to rebuild them. - # Plex has its own precompiled libraries. - _mask_plex_libraries_revdep - - # Fix RPATH - patchelf --force-rpath --set-rpath '$ORIGIN:$ORIGIN/../../../../../../lib' "${ED}"/usr/lib/plexmediaserver/Resources/Python/lib/python2.7/lib-dynload/_codecs_kr.so || die - - # Install systemd service file - systemd_newunit "${FILESDIR}/systemd/${PN}.service" "${PN}.service" - - # Add pax markings to some binaries so that they work on hardened setup - for f in "${BINS_TO_PAX_MARK[@]}"; do - pax-mark m "${f}" - done - - # Install start_pms script - into /usr - dosbin "${FILESDIR}/start_pms" - - einfo "Configuring virtualenv" - virtualenv -v --no-pip --no-setuptools --no-wheel "${ED}"/usr/lib/plexmediaserver/Resources/Python || die - pushd "${ED}"/usr/lib/plexmediaserver/Resources/Python &>/dev/null || die - find . -type f -exec sed -i -e "s#${D}##g" {} + || die - popd &>/dev/null || die -} - -pkg_postinst() { - elog "Plex Media Server is now installed. Please check the configuration" - elog "file in /etc/${_SHORTNAME}/${_APPNAME}" - elog "to verify the default settings." - elog "To start the Plex Server, run 'rc-config start plex-media-server'," - elog "you will then be able to access your library at" - elog "http://<ip>:32400/web/" -} - -# Adds the precompiled plex libraries to the revdep-rebuild's mask list -# so it doesn't try to rebuild libraries that can't be rebuilt. -_mask_plex_libraries_revdep() { - dodir /etc/revdep-rebuild/ - - # Bug: 659702. The upstream plex binary installs its precompiled package to /usr/lib. - # Due to profile 17.1 splitting /usr/lib and /usr/lib64, we can no longer rely - # on the implicit symlink automatically satisfying our revdep requirement when we use $(get_libdir). - # Thus we will match upstream's directory automatically. If upstream switches their location, - # then so should we. - echo "SEARCH_DIRS_MASK=\"${EPREFIX}/usr/lib/plexmediaserver\"" > "${ED}"/etc/revdep-rebuild/80plexmediaserver -} diff --git a/media-tv/plex-media-server/plex-media-server-1.19.5.ebuild b/media-tv/plex-media-server/plex-media-server-1.19.5.ebuild deleted file mode 100644 index af164258e591..000000000000 --- a/media-tv/plex-media-server/plex-media-server-1.19.5.ebuild +++ /dev/null @@ -1,140 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python2_7 ) -inherit eutils systemd unpacker pax-utils python-single-r1 - -MINOR_VERSION="3112-b23ab3896" - -_APPNAME="plexmediaserver" -_USERNAME="plex" -_SHORTNAME="${_USERNAME}" -_FULL_VERSION="${PV}.${MINOR_VERSION}" - -URI="https://downloads.plex.tv/plex-media-server-new" - -DESCRIPTION="A free media library that is intended for use with a plex client" -HOMEPAGE="https://www.plex.tv/" -SRC_URI=" - amd64? ( ${URI}/${_FULL_VERSION}/debian/plexmediaserver_${_FULL_VERSION}_amd64.deb ) - x86? ( ${URI}/${_FULL_VERSION}/debian/plexmediaserver_${_FULL_VERSION}_i386.deb ) -" -SLOT="0" -LICENSE="Plex" -RESTRICT="bindist strip" -KEYWORDS="-* ~amd64 ~x86" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -DEPEND=" - $(python_gen_cond_dep ' - dev-python/virtualenv[${PYTHON_MULTI_USEDEP}] - ')" -BDEPEND="dev-util/patchelf" - -RDEPEND=" - acct-group/plex - acct-user/plex - net-dns/avahi - ${PYTHON_DEPS}" - -QA_DESKTOP_FILE="usr/share/applications/plexmediamanager.desktop" -QA_PREBUILT="*" -QA_MULTILIB_PATHS=( - "usr/lib/${_APPNAME}/.*" - "usr/lib/${_APPNAME}/Resources/Python/lib/python2.7/.*" -) - -BINS_TO_PAX_MARK=( - "${ED}/usr/lib/plexmediaserver/Plex Script Host" - "${ED}/usr/lib/plexmediaserver/Plex Media Scanner" -) - -S="${WORKDIR}" -PATCHES=( - "${FILESDIR}/plexmediamanager.desktop.new.patch" - "${FILESDIR}/plexmediaserver.service.patch" -) - -src_unpack() { - unpack_deb ${A} -} - -src_install() { - # Install base config file - insinto "/etc/plex/" - newins "${FILESDIR}/etc-plexmediaserver" "plexmediaserver" - - # Remove Debian apt repo files - rm -r "etc/apt" || die - - # Remove Debian specific files - rm -r "usr/share/doc" || die - - # Copy main files over to image and preserve permissions so it is portable - cp -rp usr/ "${ED}"/ || die - - # Make sure the logging directory is created - local logging_dir="/var/log/pms" - dodir "${logging_dir}" - fowners "${_USERNAME}":"${_USERNAME}" "${logging_dir}" - keepdir "${logging_dir}" - - # Create default library folder with correct permissions - local default_library_dir="/var/lib/${_APPNAME}" - dodir "${default_library_dir}" - fowners "${_USERNAME}":"${_USERNAME}" "${default_library_dir}" - keepdir "${default_library_dir}" - - # Install the OpenRC init/conf files - doinitd "${FILESDIR}/init.d/${PN}" - doconfd "${FILESDIR}/conf.d/${PN}" - - # Mask Plex libraries so that revdep-rebuild doesn't try to rebuild them. - # Plex has its own precompiled libraries. - _mask_plex_libraries_revdep - - # Fix RPATH - patchelf --force-rpath --set-rpath '$ORIGIN:$ORIGIN/../../../../../../lib' "${ED}"/usr/lib/plexmediaserver/Resources/Python/lib/python2.7/lib-dynload/_codecs_kr.so || die - - # Install systemd service file - systemd_newunit "${FILESDIR}/systemd/${PN}.service" "${PN}.service" - - # Add pax markings to some binaries so that they work on hardened setup - for f in "${BINS_TO_PAX_MARK[@]}"; do - pax-mark m "${f}" - done - - # Install start_pms script - into /usr - dosbin "${FILESDIR}/start_pms" - - einfo "Configuring virtualenv" - virtualenv -v --no-pip --no-setuptools --no-wheel "${ED}"/usr/lib/plexmediaserver/Resources/Python || die - pushd "${ED}"/usr/lib/plexmediaserver/Resources/Python &>/dev/null || die - find . -type f -exec sed -i -e "s#${D}##g" {} + || die - popd &>/dev/null || die -} - -pkg_postinst() { - elog "Plex Media Server is now installed. Please check the configuration" - elog "file in /etc/${_SHORTNAME}/${_APPNAME}" - elog "to verify the default settings." - elog "To start the Plex Server, run 'rc-config start plex-media-server'," - elog "you will then be able to access your library at" - elog "http://<ip>:32400/web/" -} - -# Adds the precompiled plex libraries to the revdep-rebuild's mask list -# so it doesn't try to rebuild libraries that can't be rebuilt. -_mask_plex_libraries_revdep() { - dodir /etc/revdep-rebuild/ - - # Bug: 659702. The upstream plex binary installs its precompiled package to /usr/lib. - # Due to profile 17.1 splitting /usr/lib and /usr/lib64, we can no longer rely - # on the implicit symlink automatically satisfying our revdep requirement when we use $(get_libdir). - # Thus we will match upstream's directory automatically. If upstream switches their location, - # then so should we. - echo "SEARCH_DIRS_MASK=\"${EPREFIX}/usr/lib/plexmediaserver\"" > "${ED}"/etc/revdep-rebuild/80plexmediaserver -} diff --git a/media-tv/v4l-dvb-saa716x/Manifest b/media-tv/v4l-dvb-saa716x/Manifest index b9a1b9b0c0d5..8c92fe50ab36 100644 --- a/media-tv/v4l-dvb-saa716x/Manifest +++ b/media-tv/v4l-dvb-saa716x/Manifest @@ -10,9 +10,15 @@ AUX v4l-dvb-saa716x-4.2-fix-compile.patch 2397 BLAKE2B f6b82c6441524d5045971e3b1 AUX v4l-dvb-saa716x-4.5.2-fix-compile.patch 498 BLAKE2B 584300132b72ef0385c3e0b430df36788b57ff49884ee874b610d15fba024a949a81a014883c24b5ac4de77393bbc645715d68b55ec44139d8d5c6006421c9ed SHA512 3c94389b3ffb380a585d51b7e27e3fdf36b053524983fd58531e1d00b1ade2680759822df41363fa2e2ef279570f364178c7f4870c9c6b2fb52124f83eb4afb1 AUX v4l-dvb-saa716x-4.6.0-fix-compile.patch 692 BLAKE2B f3dd9279abafc087f38233f8285409e3d6f4991e3fdd0b7593b5ec816f737ff2d2fc3e457ae6370efa6396e844af314de6986902e0e7de90cf294ff839b31e48 SHA512 64b03e316d938a3830b7aad3c6b6431a9360202470e62d3c696c4203ee98b15595be3bda727468b28a6f43b539931530a408582aab6fe280b8a0200224f2b96f AUX v4l-dvb-saa716x-4.9-fix-warnings.patch 6368 BLAKE2B 178bb6bf0c391ce3c2a9e2a69c2b1938ebb6137891eab2d18e3bda42547efbfdea98677a4175bb610b21a45c4b3d543166791b517b8d116ea1361b645d612170 SHA512 e697a87b14727d8877ecc78622050bb9d8e5b0d964796c5c3275a8d72359712ec85a578e2189a102b23eedcdb17381533de9641a22103982ad5b0c9702e77901 +AUX v4l-dvb-saa716x-5.6-fix-compile.patch 2085 BLAKE2B 117b7bb63174dcf49e33b1a4b350736c3ba7223f591265aa159a2c286049350aedf514bda0b5aff3aae84e6754311f47b3148acad88220984f8991c7893bce16 SHA512 53e27d1893d391a942af25b6032d9b4f0a49e6bd32186aac71c665ac80e78d608ae3e8e4ef8d0dc7436f7737de262cd5700ee6647f09698608bb75043da97c9e AUX v4l-dvb-saa716x-Makefilepatch-2.diff 562 BLAKE2B 77adb5d5c67e14dddfce8462a98d565bc092b4e2f4dc48016602dfe0f1fa98d87e2c1317c0c3db1d1d1de8b91076e84cdd50d5b86350c060400fc2dd7ae9e5c1 SHA512 e0ff1c5a79f7b02323eff281bf6dc6ebb7a8fe7a43eb83ebd4a7379468924d3992790899bfabbbf2ee411cda6366ad6a677d8ad004a306e14b55d891f6f69dc0 +AUX v4l-dvb-saa716x-up-to-4.14.patch 1182 BLAKE2B c8712113bdd071689820139fe026bba4464d392c055cd44b9aaabcc40d61f9dbdc42d5cd354db053ca69acd42bd25994dbdc486979856d3b8c11b182e39d186e SHA512 2865922c53c701aa8ef334c54b6ef4f55765bff054c3ab5a10eff6c4f550d3f9573696a845e830c9a6ee172e1fbd604c18c6d13a73ed2ba0ca60359c718fb702 +AUX v4l-dvb-saa716x-up-to-4.17.patch 7545 BLAKE2B f213886abd2a30e61a7220785213d873d6a475ee71b308bde0415cd6ea437a3ddfdf5d57a74c4151977e3a9e871cb1663a3a01364595238c3f324812c6edec0a SHA512 c506bd0b1f54141b1df087cec234ef9496f8b67fd9105b8365029c40557638283811cf4c8a25c47dc621fc1ded700caa3ce48d96799c2348ba3dbf40768678b8 +AUX v4l-dvb-saa716x-up-to-4.4.patch 3627 BLAKE2B a33f468400d820911782428375fe634fe9dfd47f09e71866d85a6988ae2c3ad973854ea9e6f390b33485fd8924649a1f4c9758728b28aa7bb196fbdb1f164f45 SHA512 181a835b475847548355621d284cb820c808d8652e8be2b50b9363720c2acf305e9a06237ecb04bae3931d1e3cdb6b50134339b50154130efe92680e0ba4290f +AUX v4l-dvb-saa716x-up-to-4.9.patch 7704 BLAKE2B 3798312ef3938f2f162164c9891c251745570bca69704316b366bfecab9b6cc6c6c1c853091636e348d4a9646d874528f67f25c755dc219492347006c6c3f443 SHA512 efac2cf501f4cf0f3831f88cba184ae3bab367c3426adedeec8ee0f0efd3f2921c8c1bd840a2e6a45058b8c5228459bf6c95be0efceeaa4c6f7705e752b0e898 DIST v4l-dvb-saa716x-0.0.1_p20160322.tar.bz2 4070134 BLAKE2B 2c03d11ecd1f527ad066b2b14fcd2539e50fd07cefe2060be1bce96fd932d9ae83529f65b658ac550886f0c1f2b69a64d910011c80746353ffaed062865f1d6f SHA512 2ffb2acf00818b61af37a557e3b95a96b129b34ef80d24084483adfa35c0bb853b0abb626dbbf68bd9aa443c7436034542666274246fd47a603642a8e75ec83e DIST v4l-dvb-saa716x-0.0.1_p20160322.tar.gz 5028181 BLAKE2B 6d0917e7c72a7c77ff376b1bb1e55a36421568cc7b9221f4724c9e24a9bb6334c201d99f48c92965365ada2cd085b22ca9758e55ca621deb5eb65de3ef3e9a38 SHA512 94a41467688a0363586c654102e35366071218432042bc324d041298ad4812139201f8df17eadb37ebb9baf2b097447fc0859270bcc4e8e0c73b17e0b8045343 EBUILD v4l-dvb-saa716x-0.0.1_p20170225-r3.ebuild 2014 BLAKE2B 00761e3d2f40454ea374b33dc42c57f237f730ccbe4c7147e4f397c97b20ef95f70446cef5ea00b9f62874cb74178c4d30692a0a89dd41c29370566889a670ae SHA512 27de01b280bddc3c330f37176ec6b2b10789ae04a10387553812cfbd081f03e5aafdf634ef026c0e213203a68ef1d80bade167a7b8c2d1577d918b6b4451ef02 EBUILD v4l-dvb-saa716x-0.0.1_p20170225-r4.ebuild 2474 BLAKE2B 86781a21de92635dc96d811423062ec87025055b74650262657ce1f07f5d957c2ef50769ee98d3babb0c362e085c9a509c6f40143feb3ff24a55b2682a25ba74 SHA512 5c33f05cd604f14dad0795c845964313829e34ac2c2cc7a39b2eb9ee52afc5d9a993da109e23489c8959a97df694f8b77d0faa8b535d60963a4e7a0334759a7d +EBUILD v4l-dvb-saa716x-0.0.1_p20170225-r5.ebuild 1766 BLAKE2B 677b9311aef8627e830c2582301fa95f24180fc5e7c78f733a99a75f1113b5417f73c1c5e68d51e9ea515b20ef6a9bbf2eb8ea85dfcf574007662a45c71e6ca2 SHA512 00a2edf06078166185b3f745b0132e64656b87eb4e8b388feeebea917df456667c07d5579e2df72cfed005e9f6a8fa3582bb010c481f8a3bb3ae3439108dd260 MISC metadata.xml 522 BLAKE2B 4fac71b04452341c84053cf601897155086cbe2d50bd0f04287ecae47ab06fb6b613197296ded88ebc8ac50230caa9d343449172eb73847d5ea763141bb6e3ba SHA512 651ce09fe8afac13810b4733051ccd326e8a468fae099c2a600fab0afac1071b2bba26837122fad5db235ddad25c80d56825d11b47e03eac8b0ca30dab1b3a61 diff --git a/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-5.6-fix-compile.patch b/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-5.6-fix-compile.patch new file mode 100644 index 000000000000..6a72c06ae55e --- /dev/null +++ b/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-5.6-fix-compile.patch @@ -0,0 +1,38 @@ +diff -Naur powARman-v4l-dvb-saa716x-83f3bfd93a95.orig/linux/drivers/media/common/saa716x/saa716x_ff_phi.c powARman-v4l-dvb-saa716x-83f3bfd93a95/linux/drivers/media/common/saa716x/saa716x_ff_phi.c +--- powARman-v4l-dvb-saa716x-83f3bfd93a95.orig/linux/drivers/media/common/saa716x/saa716x_ff_phi.c 2015-12-29 19:40:55.000000000 +0100 ++++ powARman-v4l-dvb-saa716x-83f3bfd93a95/linux/drivers/media/common/saa716x/saa716x_ff_phi.c 2020-10-04 11:40:59.830329660 +0200 +@@ -41,7 +41,7 @@ + } + + /* skip first PHI window as it is already mapped */ +- sti7109->mmio_uc = ioremap_nocache(phi1_start + 0x10000, 0x30000); ++ sti7109->mmio_uc = ioremap(phi1_start + 0x10000, 0x30000); + if (!sti7109->mmio_uc) { + dprintk(SAA716x_ERROR, 1, "Mem PHI1 remap failed"); + err = -ENODEV; +diff -Naur powARman-v4l-dvb-saa716x-83f3bfd93a95.orig/linux/drivers/media/common/saa716x/saa716x_pci.c powARman-v4l-dvb-saa716x-83f3bfd93a95/linux/drivers/media/common/saa716x/saa716x_pci.c +--- powARman-v4l-dvb-saa716x-83f3bfd93a95.orig/linux/drivers/media/common/saa716x/saa716x_pci.c 2020-10-04 11:38:55.811653278 +0200 ++++ powARman-v4l-dvb-saa716x-83f3bfd93a95/linux/drivers/media/common/saa716x/saa716x_pci.c 2020-10-04 11:40:34.557784199 +0200 +@@ -185,7 +185,7 @@ + goto fail2; + } + +- saa716x->mmio = ioremap_nocache(pci_resource_start(pdev, 0), 0x30000); ++ saa716x->mmio = ioremap(pci_resource_start(pdev, 0), 0x30000); + if (!saa716x->mmio) { + dprintk(SAA716x_ERROR, 1, "Mem 0 remap failed"); + ret = -ENODEV; +diff -Naur powARman-v4l-dvb-saa716x-83f3bfd93a95.orig/v4l/compat.h powARman-v4l-dvb-saa716x-83f3bfd93a95/v4l/compat.h +--- powARman-v4l-dvb-saa716x-83f3bfd93a95.orig/v4l/compat.h 2015-12-29 19:40:55.000000000 +0100 ++++ powARman-v4l-dvb-saa716x-83f3bfd93a95/v4l/compat.h 2020-10-04 11:41:58.379593434 +0200 +@@ -571,8 +571,8 @@ + + #ifdef NEED_PCI_IOREMAP_BAR + #define pci_ioremap_bar(pdev, bar) \ +- ioremap_nocache(pci_resource_start(pdev, bar), \ +- pci_resource_len(pdev, bar)) ++ ioremap(pci_resource_start(pdev, bar), \ ++ pci_resource_len(pdev, bar)) + #endif + + #ifdef NEED_POLL_SCHEDULE diff --git a/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-up-to-4.14.patch b/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-up-to-4.14.patch new file mode 100644 index 000000000000..8abe888ff0e2 --- /dev/null +++ b/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-up-to-4.14.patch @@ -0,0 +1,32 @@ +# file v4l-dvb-saa716x-4.10-fix-compile.patch +--- a/linux/drivers/media/common/saa716x/saa716x_ff.h ++++ b/linux/drivers/media/common/saa716x/saa716x_ff.h +@@ -1,7 +1,6 @@ + #ifndef __SAA716x_FF_H + #define __SAA716x_FF_H + +-#include "dvb_filter.h" + #include "dvb_ringbuffer.h" + #include <linux/version.h> + #include <linux/workqueue.h> +@@ -95,6 +94,7 @@ + #define MAX_RESULT_LEN 256 + #define MAX_DATA_LEN (1024 * 1024) + ++#define TS_SIZE 188 + #define TSOUT_LEN (1024 * TS_SIZE) + #define TSOUT_LEVEL_FILL (350 * TS_SIZE) + #define TSOUT_LEVEL_HIGH (30 * TS_SIZE) + +# file v4l-dvb-saa716x-4.14.0-fix-compile.patch +--- a/linux/drivers/media/common/saa716x/saa716x_pci.c 2018-03-24 11:39:20.777643694 +0100 ++++ b/linux/drivers/media/common/saa716x/saa716x_pci.c 2018-03-24 11:41:02.135696671 +0100 +@@ -39,7 +39,7 @@ + for (i = 0; i < SAA716x_MSI_MAX_VECTORS; i++) + saa716x->msix_entries[i].entry = i; + +- ret = pci_enable_msix(pdev, saa716x->msix_entries, SAA716x_MSI_MAX_VECTORS); ++ ret = pci_enable_msix_range(pdev, saa716x->msix_entries, SAA716x_MSI_MAX_VECTORS, SAA716x_MSI_MAX_VECTORS); + if (ret < 0) + dprintk(SAA716x_ERROR, 1, "MSI-X request failed <%d>", ret); + if (ret > 0) diff --git a/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-up-to-4.17.patch b/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-up-to-4.17.patch new file mode 100644 index 000000000000..58bae509ec85 --- /dev/null +++ b/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-up-to-4.17.patch @@ -0,0 +1,217 @@ +# file v4l-dvb-saa716x-4.15-fix-autorepeat.patch + +# Source: https://github.com/s-moch/linux-saa716x/commit/0b2276ee2e6383ad577fce5c694f8c4062d5334b.patch + +From 0b2276ee2e6383ad577fce5c694f8c4062d5334b Mon Sep 17 00:00:00 2001 +From: Soeren Moch <smoch@web.de> +Date: Sat, 2 Dec 2017 20:51:10 +0100 +Subject: [PATCH] saa716x_ff: Remove autorepeat handling + +Let the input layer handle autorepeat for the IR remote. +So no repeat_key timer is required anymore. + +Signed-off-by: Soeren Moch <smoch@web.de> +--- + drivers/media/common/saa716x/saa716x_ff_ir.c | 45 ++++++++-------------------- + 1 file changed, 12 insertions(+), 33 deletions(-) + +diff --git a/drivers/media/common/saa716x/saa716x_ff_ir.c b/drivers/media/common/saa716x/saa716x_ff_ir.c +index 35624789aa862..ad6f38611026c 100644 +--- a/linux/drivers/media/common/saa716x/saa716x_ff_ir.c ++++ b/linux/drivers/media/common/saa716x/saa716x_ff_ir.c +@@ -40,7 +40,7 @@ struct infrared { + u8 protocol; + u16 last_key; + u16 last_toggle; +- bool delay_timer_finished; ++ bool key_pressed; + }; + + #define IR_RC5 0 +@@ -52,11 +52,12 @@ static void ir_emit_keyup(unsigned long parm) + { + struct infrared *ir = (struct infrared *) parm; + +- if (!ir || !test_bit(ir->last_key, ir->input_dev->key)) ++ if (!ir || !ir->key_pressed) + return; + + input_report_key(ir->input_dev, ir->last_key, 0); + input_sync(ir->input_dev); ++ ir->key_pressed = false; + } + + +@@ -114,28 +115,18 @@ static void ir_emit_key(unsigned long parm) + return; + } + +- if (timer_pending(&ir->keyup_timer)) { +- del_timer(&ir->keyup_timer); +- if (ir->last_key != keycode || toggle != ir->last_toggle) { +- ir->delay_timer_finished = false; +- input_event(ir->input_dev, EV_KEY, ir->last_key, 0); +- input_event(ir->input_dev, EV_KEY, keycode, 1); +- input_sync(ir->input_dev); +- } else if (ir->delay_timer_finished) { +- input_event(ir->input_dev, EV_KEY, keycode, 2); +- input_sync(ir->input_dev); +- } +- } else { +- ir->delay_timer_finished = false; +- input_event(ir->input_dev, EV_KEY, keycode, 1); +- input_sync(ir->input_dev); +- } ++ if (ir->key_pressed && ++ (ir->last_key != keycode || toggle != ir->last_toggle)) ++ input_event(ir->input_dev, EV_KEY, ir->last_key, 0); + ++ input_event(ir->input_dev, EV_KEY, keycode, 1); ++ input_sync(ir->input_dev); ++ ++ ir->key_pressed = true; + ir->last_key = keycode; + ir->last_toggle = toggle; + +- ir->keyup_timer.expires = jiffies + UP_TIMEOUT; +- add_timer(&ir->keyup_timer); ++ mod_timer(&ir->keyup_timer, jiffies + UP_TIMEOUT); + + } + +@@ -166,16 +157,6 @@ static void ir_register_keys(struct infrared *ir) + ir->input_dev->keycodemax = ARRAY_SIZE(ir->key_map); + } + +- +-/* called by the input driver after rep[REP_DELAY] ms */ +-static void ir_repeat_key(unsigned long parm) +-{ +- struct infrared *ir = (struct infrared *) parm; +- +- ir->delay_timer_finished = true; +-} +- +- + /* interrupt handler */ + void saa716x_ir_handler(struct saa716x_dev *saa716x, u32 ir_cmd) + { +@@ -236,9 +217,7 @@ int saa716x_ir_init(struct saa716x_dev *saa716x) + ir->key_map[i] = i+1; + ir_register_keys(ir); + +- /* override repeat timer */ +- input_dev->timer.function = ir_repeat_key; +- input_dev->timer.data = (unsigned long) ir; ++ input_enable_softrepeat(input_dev, 800, 200); + + tasklet_init(&ir->tasklet, ir_emit_key, (unsigned long) saa716x); + saa716x->ir_priv = ir; + +# file v4l-dvb-saa716x-4.15-fix-timers.patch +# Source: https://github.com/s-moch/linux-saa716x/commit/1002d79c4ba60de0dbeacba0f289119556d7450d.patch + +From 1002d79c4ba60de0dbeacba0f289119556d7450d Mon Sep 17 00:00:00 2001 +From: Soeren Moch <smoch@web.de> +Date: Sat, 2 Dec 2017 21:23:34 +0100 +Subject: [PATCH] saa716x_ff: Convert to new timer API + +Convert to new timer API in linux-4.15. + +Signed-off-by: Soeren Moch <smoch@web.de> +--- + drivers/media/common/saa716x/saa716x_ff_ir.c | 8 +++----- + 1 file changed, 3 insertions(+), 5 deletions(-) + +diff --git a/drivers/media/common/saa716x/saa716x_ff_ir.c b/drivers/media/common/saa716x/saa716x_ff_ir.c +index ad6f38611026c..7894adff4d4f6 100644 +--- a/linux/drivers/media/common/saa716x/saa716x_ff_ir.c ++++ b/linux/drivers/media/common/saa716x/saa716x_ff_ir.c +@@ -48,9 +48,9 @@ struct infrared { + + + /* key-up timer */ +-static void ir_emit_keyup(unsigned long parm) ++static void ir_emit_keyup(struct timer_list *t) + { +- struct infrared *ir = (struct infrared *) parm; ++ struct infrared *ir = from_timer(ir, t, keyup_timer); + + if (!ir || !ir->key_pressed) + return; +@@ -184,9 +184,7 @@ int saa716x_ir_init(struct saa716x_dev *saa716x) + if (!ir) + return -ENOMEM; + +- init_timer(&ir->keyup_timer); +- ir->keyup_timer.function = ir_emit_keyup; +- ir->keyup_timer.data = (unsigned long) ir; ++ timer_setup(&ir->keyup_timer, ir_emit_keyup, 0); + + input_dev = input_allocate_device(); + if (!input_dev) + +# file v4l-dvb-saa716x-4.16-fix-compile.patch +diff -Naur powARman-v4l-dvb-saa716x-3b9fce66666a.orig/linux/drivers/media/common/saa716x/saa716x_adap.c powARman-v4l-dvb-saa716x-3b9fce66666a/linux/drivers/media/common/saa716x/saa716x_adap.c +--- powARman-v4l-dvb-saa716x-3b9fce66666a.orig/linux/drivers/media/common/saa716x/saa716x_adap.c 2018-04-04 08:24:59.454708009 +0200 ++++ powARman-v4l-dvb-saa716x-3b9fce66666a/linux/drivers/media/common/saa716x/saa716x_adap.c 2018-04-04 08:25:36.263560559 +0200 +@@ -1,9 +1,9 @@ + #include <linux/bitops.h> + +-#include "dmxdev.h" +-#include "dvbdev.h" +-#include "dvb_demux.h" +-#include "dvb_frontend.h" ++#include <media/dmxdev.h> ++#include <media/dvbdev.h> ++#include <media/dvb_demux.h> ++#include <media/dvb_frontend.h> + + #include "saa716x_mod.h" + #include "saa716x_spi.h" +diff -Naur powARman-v4l-dvb-saa716x-3b9fce66666a.orig/linux/drivers/media/common/saa716x/saa716x_ff.h powARman-v4l-dvb-saa716x-3b9fce66666a/linux/drivers/media/common/saa716x/saa716x_ff.h +--- powARman-v4l-dvb-saa716x-3b9fce66666a.orig/linux/drivers/media/common/saa716x/saa716x_ff.h 2018-04-04 08:24:59.458708101 +0200 ++++ powARman-v4l-dvb-saa716x-3b9fce66666a/linux/drivers/media/common/saa716x/saa716x_ff.h 2018-04-04 08:25:36.263560559 +0200 +@@ -1,7 +1,7 @@ + #ifndef __SAA716x_FF_H + #define __SAA716x_FF_H + +-#include "dvb_ringbuffer.h" ++#include <media/dvb_ringbuffer.h> + #include <linux/version.h> + #include <linux/workqueue.h> + +diff -Naur powARman-v4l-dvb-saa716x-3b9fce66666a.orig/linux/drivers/media/common/saa716x/saa716x_priv.h powARman-v4l-dvb-saa716x-3b9fce66666a/linux/drivers/media/common/saa716x/saa716x_priv.h +--- powARman-v4l-dvb-saa716x-3b9fce66666a.orig/linux/drivers/media/common/saa716x/saa716x_priv.h 2018-04-04 08:24:59.458708101 +0200 ++++ powARman-v4l-dvb-saa716x-3b9fce66666a/linux/drivers/media/common/saa716x/saa716x_priv.h 2018-04-04 08:25:36.263560559 +0200 +@@ -18,11 +18,11 @@ + #include "saa716x_spi.h" + #include "saa716x_vip.h" + +-#include "dvbdev.h" +-#include "dvb_demux.h" +-#include "dmxdev.h" +-#include "dvb_frontend.h" +-#include "dvb_net.h" ++#include <media/dvbdev.h> ++#include <media/dvb_demux.h> ++#include <media/dmxdev.h> ++#include <media/dvb_frontend.h> ++#include <media/dvb_net.h> + + #define SAA716x_ERROR 0 + #define SAA716x_NOTICE 1 + +# file v4l-dvb-saa716x-4.17-define-AUDIO_GET_PTS.patch +--- a/linux/drivers/media/common/saa716x/saa716x_ff.h 2018-11-08 15:44:10.479886225 +0100 ++++ b/linux/drivers/media/common/saa716x/saa716x_ff.h 2018-11-08 15:45:19.981237523 +0100 +@@ -108,6 +108,9 @@ + #define VIDEO_CAPTURE_OFF 0 + #define VIDEO_CAPTURE_ONE_SHOT 1 + ++#ifndef AUDIO_GET_PTS ++#define AUDIO_GET_PTS _IOR('o', 19, __u64) ++#endif + + /* place to store all the necessary device information */ + struct sti7109_dev { diff --git a/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-up-to-4.4.patch b/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-up-to-4.4.patch new file mode 100644 index 000000000000..e719f4d629e2 --- /dev/null +++ b/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-up-to-4.4.patch @@ -0,0 +1,97 @@ +# file OSD_RAW_CMD_patch_2.diff +--- a/linux/drivers/media/common/saa716x/saa716x_ff_cmd.h.orig 2011-11-12 14:46:51.175700236 +0100 ++++ b/linux/drivers/media/common/saa716x/saa716x_ff_cmd.h 2011-11-12 14:45:10.103702959 +0100 +@@ -1,6 +1,24 @@ + #ifndef __SAA716x_FF_CMD_H + #define __SAA716x_FF_CMD_H + ++#if !defined OSD_RAW_CMD ++typedef struct osd_raw_cmd_s { ++ const void *cmd_data; ++ int cmd_len; ++ void *result_data; ++ int result_len; ++} osd_raw_cmd_t; ++ ++typedef struct osd_raw_data_s { ++ const void *data_buffer; ++ int data_length; ++ int data_handle; ++} osd_raw_data_t; ++ ++#define OSD_RAW_CMD _IOWR('o', 162, osd_raw_cmd_t) ++#define OSD_RAW_DATA _IOWR('o', 163, osd_raw_data_t) ++#endif ++ + extern int sti7109_cmd_init(struct sti7109_dev *sti7109); + extern int sti7109_raw_cmd(struct sti7109_dev * sti7109, + osd_raw_cmd_t * cmd); + +# file v4l-dvb-saa716x-Makefilepatch-2.diff +--- v4l-dvb-saa716x-cfa4b4faab67/linux/drivers/media/common/saa716x/Makefile.orig 2013-03-02 07:44:51.112642592 +0100 ++++ v4l-dvb-saa716x-cfa4b4faab67/linux/drivers/media/common/saa716x/Makefile 2013-03-02 07:46:56.703138542 +0100 +@@ -24,3 +24,5 @@ + obj-$(CONFIG_DVB_SAA716X_FF) += saa716x_ff.o + + EXTRA_CFLAGS = -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/ -Idrivers/media/dvb-core/ -Idrivers/media/dvb-frontends/ ++EXTRA_CFLAGS += -Idrivers/media/common/tuners/ # up to kernel 3.6 ++EXTRA_CFLAGS += -Idrivers/media/tuners/ # kernel 3.7+ + + +# file v4l-dvb-saa716x-3.19-set_gpio.patch +--- a/linux/drivers/media/common/saa716x/saa716x_budget.c 2014-11-09 15:44:55.000000000 +0100 ++++ b/linux/drivers/media/common/saa716x/saa716x_budget.c 2015-02-28 13:58:01.258743639 +0100 +@@ -497,10 +497,10 @@ + break; + } + +- err = stv090x_set_gpio(fe, 2, 0, en, 0); ++ err = skystar2_stv090x_config.set_gpio(fe, 2, 0, en, 0); + if (err < 0) + goto exit; +- err = stv090x_set_gpio(fe, 3, 0, sel, 0); ++ err = skystar2_stv090x_config.set_gpio(fe, 3, 0, sel, 0); + if (err < 0) + goto exit; + +@@ -519,7 +519,7 @@ + else + value = 0; + +- err = stv090x_set_gpio(fe, 4, 0, value, 0); ++ err = skystar2_stv090x_config.set_gpio(fe, 4, 0, value, 0); + if (err < 0) + goto exit; + +# file v4l-dvb-saa716x-4.2-fix-compile.patch +--- a/linux/drivers/media/common/saa716x/saa716x_budget.c 2015-09-03 00:30:08.662553247 +0200 ++++ b/linux/drivers/media/common/saa716x/saa716x_budget.c 2015-09-03 00:31:03.899206845 +0200 +@@ -306,7 +306,7 @@ + #define SAA716x_MODEL_TWINHAN_VP1028 "Twinhan/Azurewave VP-1028" + #define SAA716x_DEV_TWINHAN_VP1028 "DVB-S" + +-static int vp1028_dvbs_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t voltage) ++static int vp1028_dvbs_set_voltage(struct dvb_frontend *fe, enum fe_sec_voltage voltage) + { + struct saa716x_dev *saa716x = fe->dvb->priv; + +--- a/linux/drivers/media/common/saa716x/saa716x_hybrid.c 2014-11-09 15:44:55.000000000 +0100 ++++ b/linux/drivers/media/common/saa716x/saa716x_hybrid.c 2015-09-03 00:31:03.899206845 +0200 +@@ -321,7 +321,7 @@ + .request_firmware = tda1004x_vp6090_request_firmware, + }; + +-static int vp6090_dvbs_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t voltage) ++static int vp6090_dvbs_set_voltage(struct dvb_frontend *fe, enum fe_sec_voltage voltage) + { + struct saa716x_dev *saa716x = fe->dvb->priv; + +--- a/linux/drivers/media/common/saa716x/saa716x_pci.c 2014-11-09 15:44:55.000000000 +0100 ++++ b/linux/drivers/media/common/saa716x/saa716x_pci.c 2015-09-03 00:31:03.900206839 +0200 +@@ -1,3 +1,5 @@ ++#include <asm/atomic.h> ++#include <linux/spinlock_types.h> + #include <asm/io.h> + #include <asm/pgtable.h> + #include <asm/page.h> + diff --git a/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-up-to-4.9.patch b/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-up-to-4.9.patch new file mode 100644 index 000000000000..72c27974bfd2 --- /dev/null +++ b/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-up-to-4.9.patch @@ -0,0 +1,192 @@ +# file v4l-dvb-saa716x-4.5.2-fix-compile.patch +fix compile with kernel >= 4.5.2 +wrt bug 581450 +Signed-of-by: Joerg Bornkessel <hd_brummy@gentoo.org> 2016/05/05 +--- a/linux/drivers/media/common/saa716x/saa716x_pci.c.old 2016-04-27 20:59:51.000000000 +0200 ++++ b/linux/drivers/media/common/saa716x/saa716x_pci.c 2016-04-27 21:19:03.117822874 +0200 +@@ -1,6 +1,7 @@ + #include <asm/atomic.h> + #include <linux/spinlock_types.h> + #include <asm/io.h> ++#include <asm/processor.h> + #include <asm/pgtable.h> + #include <asm/page.h> + #include <linux/kmod.h> + + + +# file v4l-dvb-saa716x-4.6.0-fix-compile.patch +--- a/linux/drivers/media/common/saa716x/saa716x_pci.c 2017-02-26 18:48:27.196949325 +0100 ++++ b/linux/drivers/media/common/saa716x/saa716x_pci.c 2017-02-26 18:50:28.149283794 +0100 +@@ -1,9 +1,6 @@ + #include <asm/atomic.h> + #include <linux/spinlock_types.h> +-#include <asm/io.h> + #include <asm/processor.h> +-#include <asm/pgtable.h> +-#include <asm/page.h> + #include <linux/kmod.h> + #include <linux/vmalloc.h> + #include <linux/init.h> +@@ -20,11 +17,6 @@ + + #define DRIVER_NAME "SAA716x Core" + +-static irqreturn_t saa716x_msi_handler(int irq, void *dev_id) +-{ +- return IRQ_HANDLED; +-} +- + static int saa716x_enable_msi(struct saa716x_dev *saa716x) + { + struct pci_dev *pdev = saa716x->pdev; + + + +# file v4l-dvb-saa716x-4.9-fix-warnings.patch +--- a/linux/drivers/media/common/saa716x/saa716x_rom.c 2015-12-29 19:40:55.000000000 +0100 ++++ a/linux/drivers/media/common/saa716x/saa716x_rom.c 2017-07-11 00:51:19.149941914 +0200 +@@ -113,7 +113,7 @@ + memcpy(rom_header, &buf[*offset], sizeof (struct saa716x_romhdr)); + if (rom_header->header_size != sizeof (struct saa716x_romhdr)) { + dprintk(SAA716x_ERROR, 1, +- "ERROR: Header size mismatch! Read size=%d bytes, Expected=%d", ++ "ERROR: Header size mismatch! Read size=%zd bytes, Expected=%d", + sizeof (struct saa716x_romhdr), + rom_header->header_size); + +@@ -237,7 +237,7 @@ + saa716x_descriptor_dbg(saa716x, buf, offset, header.size, header.ext_data); + if (header.size != sizeof (struct saa716x_decoder_hdr)) { + dprintk(SAA716x_ERROR, 1, +- "ERROR: Header size mismatch! Read size=%d bytes, Expected=%d", ++ "ERROR: Header size mismatch! Read size=%d bytes, Expected=%zd", + header.size, + sizeof (struct saa716x_decoder_hdr)); + +@@ -268,7 +268,7 @@ + saa716x_descriptor_dbg(saa716x, buf, offset, header.size, header.ext_data); + if (header.size != sizeof (struct saa716x_gpio_hdr)) { + dprintk(SAA716x_ERROR, 1, +- "ERROR: Header size mismatch! Read size=%d bytes, Expected=%d", ++ "ERROR: Header size mismatch! Read size=%d bytes, Expected=%zd", + header.size, + sizeof (struct saa716x_gpio_hdr)); + +@@ -305,7 +305,7 @@ + saa716x_descriptor_dbg(saa716x, buf, offset, header.size, header.ext_data); + if (header.size != sizeof (struct saa716x_video_decoder_hdr)) { + dprintk(SAA716x_ERROR, 1, +- "ERROR: Header size mismatch! Read size=%d bytes, Expected=%d", ++ "ERROR: Header size mismatch! Read size=%d bytes, Expected=%zd", + header.size, + sizeof (struct saa716x_video_decoder_hdr)); + +@@ -386,7 +386,7 @@ + saa716x_descriptor_dbg(saa716x, buf, offset, header.size, header.ext_data); + if (header.size != sizeof (struct saa716x_audio_decoder_hdr)) { + dprintk(SAA716x_ERROR, 1, +- "ERROR: Header size mismatch! Read size=%d bytes, Expected=%d", ++ "ERROR: Header size mismatch! Read size=%d bytes, Expected=%zd", + header.size, + sizeof (struct saa716x_audio_decoder_hdr)); + +@@ -417,7 +417,7 @@ + saa716x_descriptor_dbg(saa716x, buf, offset, header.size, header.ext_data); + if (header.size != sizeof (struct saa716x_evsrc_hdr)) { + dprintk(SAA716x_ERROR, 1, +- "ERROR: Header size mismatch! Read size=%d bytes, Expected=%d", ++ "ERROR: Header size mismatch! Read size=%d bytes, Expected=%zd", + header.size, + sizeof (struct saa716x_evsrc_hdr)); + +@@ -448,7 +448,7 @@ + saa716x_descriptor_dbg(saa716x, buf, offset, header.size, header.ext_data); + if (header.size != sizeof (struct saa716x_xbar_hdr)) { + dprintk(SAA716x_ERROR, 1, +- "ERROR: Header size mismatch! Read size=%d bytes, Expected=%d", ++ "ERROR: Header size mismatch! Read size=%d bytes, Expected=%zd", + header.size, + sizeof (struct saa716x_xbar_hdr)); + +@@ -486,7 +486,7 @@ + saa716x_descriptor_dbg(saa716x, buf, offset, header.size, header.ext_data); + if (header.size != sizeof (struct saa716x_tuner_hdr)) { + dprintk(SAA716x_ERROR, 1, +- "ERROR: Header size mismatch! Read size=%d bytes, Expected=%d", ++ "ERROR: Header size mismatch! Read size=%d bytes, Expected=%zd", + header.size, + sizeof (struct saa716x_tuner_hdr)); + +@@ -516,7 +516,7 @@ + saa716x_descriptor_dbg(saa716x, buf, offset, header.size, header.ext_data); + if (header.size != sizeof (struct saa716x_pll_hdr)) { + dprintk(SAA716x_ERROR, 1, +- "ERROR: Header size mismatch! Read size=%d bytes, Expected=%d", ++ "ERROR: Header size mismatch! Read size=%d bytes, Expected=%zd", + header.size, + sizeof (struct saa716x_pll_hdr)); + +@@ -546,7 +546,7 @@ + saa716x_descriptor_dbg(saa716x, buf, offset, header.size, header.ext_data); + if (header.size != sizeof (struct saa716x_channel_decoder_hdr)) { + dprintk(SAA716x_ERROR, 1, +- "ERROR: Header size mismatch! Read size=%d bytes, Expected=%d", ++ "ERROR: Header size mismatch! Read size=%d bytes, Expected=%zd", + header.size, + sizeof (struct saa716x_channel_decoder_hdr)); + +@@ -576,7 +576,7 @@ + saa716x_descriptor_dbg(saa716x, buf, offset, header.size, header.ext_data); + if (header.size != sizeof (struct saa716x_encoder_hdr)) { + dprintk(SAA716x_ERROR, 1, +- "ERROR: Header size mismatch! Read size=%d bytes, Expected=%d", ++ "ERROR: Header size mismatch! Read size=%d bytes, Expected=%zd", + header.size, + sizeof (struct saa716x_encoder_hdr)); + +@@ -606,7 +606,7 @@ + saa716x_descriptor_dbg(saa716x, buf, offset, header.size, header.ext_data); + if (header.size != sizeof (struct saa716x_ir_hdr)) { + dprintk(SAA716x_ERROR, 1, +- "ERROR: Header size mismatch! Read size=%d bytes, Expected=%d", ++ "ERROR: Header size mismatch! Read size=%d bytes, Expected=%zd", + header.size, + sizeof (struct saa716x_ir_hdr)); + +@@ -637,7 +637,7 @@ + saa716x_descriptor_dbg(saa716x, buf, offset, header.size, header.ext_data); + if (header.size != sizeof (struct saa716x_eeprom_hdr)) { + dprintk(SAA716x_ERROR, 1, +- "ERROR: Header size mismatch! Read size=%d bytes, Expected=%d", ++ "ERROR: Header size mismatch! Read size=%d bytes, Expected=%zd", + header.size, + sizeof (struct saa716x_eeprom_hdr)); + +@@ -668,7 +668,7 @@ + saa716x_descriptor_dbg(saa716x, buf, offset, header.size, header.ext_data); + if (header.size != sizeof (struct saa716x_filter_hdr)) { + dprintk(SAA716x_ERROR, 1, +- "ERROR: Header size mismatch! Read size=%d bytes, Expected=%d", ++ "ERROR: Header size mismatch! Read size=%d bytes, Expected=%zd", + header.size, + sizeof (struct saa716x_filter_hdr)); + +@@ -699,7 +699,7 @@ + saa716x_descriptor_dbg(saa716x, buf, offset, header.size, header.ext_data); + if (header.size != sizeof (struct saa716x_streamdev_hdr)) { + dprintk(SAA716x_ERROR, 1, +- "ERROR: Header size mismatch! Read size=%d bytes, Expected=%d", ++ "ERROR: Header size mismatch! Read size=%d bytes, Expected=%zd", + header.size, + sizeof (struct saa716x_streamdev_hdr)); + +@@ -789,7 +789,7 @@ + + memcpy(device, &buf[*offset], sizeof (struct saa716x_devinfo)); + if (device->struct_size != sizeof (struct saa716x_devinfo)) { +- dprintk(SAA716x_ERROR, 1, "ERROR: Device size mismatch! Read=%d bytes, expected=%d bytes", ++ dprintk(SAA716x_ERROR, 1, "ERROR: Device size mismatch! Read=%d bytes, expected=%zd bytes", + device->struct_size, + sizeof (struct saa716x_devinfo)); + diff --git a/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20170225-r5.ebuild b/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20170225-r5.ebuild new file mode 100644 index 000000000000..66903db98d13 --- /dev/null +++ b/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20170225-r5.ebuild @@ -0,0 +1,50 @@ +# Copyright 2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit linux-info linux-mod + +DESCRIPTION="driver for saa716x based dvb cards like TT S2-6400 or Skystar 2 eXpress HD" +HOMEPAGE="https://bitbucket.org/powARman/v4l-dvb-saa716x" + +REVISION="83f3bfd93a95" +REVISION_DATE="20160322" + +SRC_URI="https://bitbucket.org/powARman/v4l-dvb-saa716x/get/${REVISION}.tar.bz2 +-> v4l-dvb-saa716x-0.0.1_p${REVISION_DATE}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND="sys-firmware/tt-s2-6400-firmware" + +S="${WORKDIR}/powARman-v4l-dvb-saa716x-${REVISION}" + +BUILD_TARGETS="modules" +MODULE_NAMES=" + saa716x_ff(misc:${EROOT}/usr/src/linux:${S}/linux/drivers/media/common/saa716x) + saa716x_core(misc:${EROOT}/usr/src/linux:${S}/linux/drivers/media/common/saa716x) + saa716x_budget(misc:${EROOT}/usr/src/linux:${S}/linux/drivers/media/common/saa716x) + saa716x_hybrid(misc:${EROOT}/usr/src/linux:${S}/linux/drivers/media/common/saa716x)" + +CONFIG_CHECK="DVB_CORE DVB_STV6110x DVB_STV090x" + +src_prepare() { + default + + kernel_is ge 4 4 0 && eapply "${FILESDIR}/v4l-dvb-saa716x-up-to-4.4.patch" + kernel_is ge 4 9 0 && eapply "${FILESDIR}/v4l-dvb-saa716x-up-to-4.9.patch" + kernel_is ge 4 14 0 && eapply "${FILESDIR}/v4l-dvb-saa716x-up-to-4.14.patch" + kernel_is ge 4 17 0 && eapply "${FILESDIR}/v4l-dvb-saa716x-up-to-4.17.patch" + kernel_is ge 5 6 0 && eapply "${FILESDIR}/v4l-dvb-saa716x-5.6-fix-compile.patch" +} + +src_compile() { + kernel_is le 5 0 && BUILD_PARAMS="SUBDIRS" || BUILD_PARAMS="M" + BUILD_PARAMS+="=${S}/linux/drivers/media/common/saa716x CONFIG_SAA716X_CORE=m \ + CONFIG_DVB_SAA716X_FF=m CONFIG_DVB_SAA716X_BUDGET=m CONFIG_DVB_SAA716X_HYBRID=m" + addpredict "${EROOT}"/usr/src/linux/ + linux-mod_src_compile +} diff --git a/media-tv/xmltv/Manifest b/media-tv/xmltv/Manifest index eb351b470067..09bed8c58c1b 100644 --- a/media-tv/xmltv/Manifest +++ b/media-tv/xmltv/Manifest @@ -2,4 +2,4 @@ DIST xmltv-0.5.70.tar.bz2 1274164 BLAKE2B 4a6cbf6bc2f8f113a91fc579afbfc69fc04aec DIST xmltv-0.6.1.tar.gz 838051 BLAKE2B d4011ee31b56096ae275647e0cbd85b11c2edbc3d150208aa619900c9741ac3bed2a1255d778622883b3d24a32ce3b803f5719fdd2273549bafa31ebdcb1a887 SHA512 137dad875c6f7f77fb986b4662b411766424676df0a2422f3dc123c8cec4e1dff123ea68577add65c0e5bcf2d0bdf89d7fba0ed423502ec27e2aa82ec6b10bc2 EBUILD xmltv-0.5.70.ebuild 5268 BLAKE2B 46bed06ca83a46fbd2833eadfc549411578b390258fbeb1a10438e6de47cc7a2475c996c23aa9ffea7a04ea48948067546024bc52a183bc91ad0e2383cde85b6 SHA512 c0a326722ffe4b180a5c81627556a80213fbf3c8da80083145089f464c10983fe8f22db0e6f2632f2284b1763e1a05dbdfec07acbe137b559ea7d593dd0a657e EBUILD xmltv-0.6.1.ebuild 5931 BLAKE2B a1db08d09698f7f735f9041676101b7910b5861205be317fe0271218bf791e1195625456e9cfd920f5c86873bc886f58cf827cd2abd4d2817af917e56ee8f67e SHA512 3f7c0700591f99fbbbf338354d8657ea1ce71e27ced12848c2c6a5edc2b310bc3e7c1d7ba89d7e40042e396df65c4f7f85ffaa3bca32a8cafe07e35077e4e9df -MISC metadata.xml 2676 BLAKE2B d7e8c1166118a7622f365c05b7408c8ac8725c5f98b26d792bf89e430dcb6f671e397f6f6f92f7d55a2f4a0756f6ce2e62ea08a8e7f74182ac23b806788aaedf SHA512 52b5419e2c2737c94dd99cad4d412666db10c217dd68e65f9422532d57bcf5c836fa7e94938eb8876739add027477bde8b3a5f269dbc69493c930ae5aaf69a41 +MISC metadata.xml 2686 BLAKE2B 20ece7bd3a0654f3d4010a700a3416fc7fd1a9eaf03adf8bfbe61c317a230a558071690906889bb6f9a6be1e7492dca011bb5a091da90fbfc115826628bcbd5f SHA512 52c7b95cd06948c5220f9edf9a48678ddd5ee0c3e819c01ea8cae1fd9f67e2654b264585c969c60f0bcad9891ded36968a86839a9ffe01ccb87833b998a2a1f1 diff --git a/media-tv/xmltv/metadata.xml b/media-tv/xmltv/metadata.xml index 92e9a4fd8f98..0a5d27cb0548 100644 --- a/media-tv/xmltv/metadata.xml +++ b/media-tv/xmltv/metadata.xml @@ -2,7 +2,7 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>thebitpit@earthlink.net</email> + <email>thebitpit@austincustomerrands.com</email> <name>Wilson Michaels</name> </maintainer> <maintainer type="project"> |