diff options
Diffstat (limited to 'media-tv')
42 files changed, 465 insertions, 1061 deletions
diff --git a/media-tv/channeleditor/metadata.xml b/media-tv/channeleditor/metadata.xml index 4cd923f21fcf..42b559cd6a0b 100644 --- a/media-tv/channeleditor/metadata.xml +++ b/media-tv/channeleditor/metadata.xml @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>billie@gentoo.org</email> - <name>Daniel Pielmeier</name> - </maintainer> - <upstream> - <remote-id type="sourceforge">channeleditor</remote-id> - </upstream> -</pkgmetadata> + <maintainer type="person"> + <email>billie@gentoo.org</email> + <name>Daniel Pielmeier</name> + </maintainer> + <upstream> + <remote-id type="sourceforge">channeleditor</remote-id> + </upstream> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/media-tv/dtv-scan-tables/metadata.xml b/media-tv/dtv-scan-tables/metadata.xml index 54be7ff7e5d6..6ad3061728be 100644 --- a/media-tv/dtv-scan-tables/metadata.xml +++ b/media-tv/dtv-scan-tables/metadata.xml @@ -1,8 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>chewi@gentoo.org</email> - <name>James Le Cuirot</name> - </maintainer> -</pkgmetadata> + <maintainer type="person"> + <email>chewi@gentoo.org</email> + <name>James Le Cuirot</name> + </maintainer> + + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/media-tv/dvbstream/metadata.xml b/media-tv/dvbstream/metadata.xml index 55c5124b9172..6000757a80e2 100644 --- a/media-tv/dvbstream/metadata.xml +++ b/media-tv/dvbstream/metadata.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> - <upstream> - <remote-id type="sourceforge">dvbtools</remote-id> - </upstream> -</pkgmetadata> + <upstream> + <remote-id type="sourceforge">dvbtools</remote-id> + </upstream> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/media-tv/dvbtune/metadata.xml b/media-tv/dvbtune/metadata.xml index 55c5124b9172..6000757a80e2 100644 --- a/media-tv/dvbtune/metadata.xml +++ b/media-tv/dvbtune/metadata.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> - <upstream> - <remote-id type="sourceforge">dvbtools</remote-id> - </upstream> -</pkgmetadata> + <upstream> + <remote-id type="sourceforge">dvbtools</remote-id> + </upstream> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/media-tv/gentoo-vdr-scripts/metadata.xml b/media-tv/gentoo-vdr-scripts/metadata.xml index 984a01fab265..aa1fc8ccb8a9 100644 --- a/media-tv/gentoo-vdr-scripts/metadata.xml +++ b/media-tv/gentoo-vdr-scripts/metadata.xml @@ -1,8 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>vdr@gentoo.org</email> - <name>Gentoo VDR Project</name> - </maintainer> -</pkgmetadata> + <maintainer type="project"> + <email>vdr@gentoo.org</email> + <name>Gentoo VDR Project</name> + </maintainer> + + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/media-tv/gtk-v4l/metadata.xml b/media-tv/gtk-v4l/metadata.xml index 7a38bb900964..83d00b14c8d4 100644 --- a/media-tv/gtk-v4l/metadata.xml +++ b/media-tv/gtk-v4l/metadata.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> -</pkgmetadata> + + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/media-tv/ivtv-utils/metadata.xml b/media-tv/ivtv-utils/metadata.xml index 1b2becffa26c..83d00b14c8d4 100644 --- a/media-tv/ivtv-utils/metadata.xml +++ b/media-tv/ivtv-utils/metadata.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> -</pkgmetadata> + + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/media-tv/ivtvplayer/metadata.xml b/media-tv/ivtvplayer/metadata.xml index 72a393cd3ce7..1bc7c02dc5f5 100644 --- a/media-tv/ivtvplayer/metadata.xml +++ b/media-tv/ivtvplayer/metadata.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> - <upstream> - <remote-id type="sourceforge">ivtvplayer</remote-id> - </upstream> -</pkgmetadata> + <upstream> + <remote-id type="sourceforge">ivtvplayer</remote-id> + </upstream> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest index 7c14777976ce..714383d1da34 100644 --- a/media-tv/kodi/Manifest +++ b/media-tv/kodi/Manifest @@ -1,5 +1,5 @@ DIST ffmpeg-kodi-4.3.1-Matrix-Beta1.tar.gz 13477440 BLAKE2B 49415f76fd2a888b0efadb19597bd89db65c3d9e1224ab529ff0d73ab5734a23982b4d4905ddeb105ce59a816c4642cdb9f5568b0c39c29f5fb9431f9623d4ec SHA512 ce43390e816dabeed4ca231f5f7adade6c721c38e17996a57810fb6025ea49b812133c2a6e29aac7c674d4e4af3a21dbd7e605d85fb966935a01bda983b884ac -DIST kodi-19.0RC1.tar.gz 52332966 BLAKE2B 305793e2a5f16f07853a82e8f1953a56baa4159c9eee762aee40e8b6692c317cb83e7713d99cbb767cff0c1ac2a2d8bfc3837525d8ad4c854f114f900ebdb294 SHA512 c00d73d46f949eace856f762f9bd2b854e4c8db271366a54c26e18a9b960e04b26f2d4344656be18c79cfa42dfdffc6cd75e4df941268ca9bcfa17f4a987fc81 +DIST kodi-19.0.tar.gz 52311355 BLAKE2B 543936b8fb607d1d629a8f2abd9cd0cb3bf6114aa93647c7e8ccee2f99ff1f84a2740bb57f0cbf675b3efa5914e98c57effb28ecd8e9df83a39d67ee708280a2 SHA512 d6c9fe7414b64d33d919d6c3de1ddb4800e36b786a460d2d2f5c1e5346cd4819487e54f212c37778103d44dd051f7df6c74e0a98a0b21d1e4dc9bedaa8570422 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 diff --git a/media-tv/kodi/kodi-19.0_rc1-r2.ebuild b/media-tv/kodi/kodi-19.0.ebuild index 4f0fe6d0541a..f84a305d64fb 100644 --- a/media-tv/kodi/kodi-19.0_rc1-r2.ebuild +++ b/media-tv/kodi/kodi-19.0.ebuild @@ -17,6 +17,7 @@ SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_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 )" if [[ ${PV} == *9999 ]] ; then EGIT_REPO_URI="https://github.com/xbmc/xbmc.git" + EGIT_BRANCH="Matrix" inherit git-r3 else MY_PV=${PV/_p/_r} @@ -39,11 +40,10 @@ 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 dav1d dbus dvd gbm gles lcms libressl libusb lirc mariadb mysql nfs +opengl power-control pulseaudio raspberry-pi samba +system-ffmpeg test udf udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf" +IUSE="airplay alsa bluetooth bluray caps cec +css dav1d dbus eventclients gbm gles lcms libressl libusb lirc mariadb mysql nfs +optical power-control pulseaudio raspberry-pi samba +system-ffmpeg test udf udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf" IUSE="${IUSE} cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_arm_neon" REQUIRED_USE=" ${PYTHON_REQUIRED_USE} - || ( gles opengl ) || ( gbm wayland X ) ?? ( mariadb mysql ) bluray? ( udf ) @@ -51,10 +51,22 @@ REQUIRED_USE=" udisks? ( dbus ) upower? ( dbus ) power-control? ( dbus ) + vdpau? ( + X + !gles + !gbm + ) + zeroconf? ( dbus ) " RESTRICT="!test? ( test )" -COMMON_DEPEND="${PYTHON_DEPS} +COMMON_DEPEND=" + >=dev-libs/lzo-2.04 + >=dev-libs/flatbuffers-1.11.0 + >=media-libs/libjpeg-turbo-2.0.4:= + >=media-libs/libpng-1.6.26:0= +" +COMMON_TARGET_DEPEND="${PYTHON_DEPS} airplay? ( >=app-pda/libplist-2.0.0 net-libs/shairplay @@ -65,14 +77,10 @@ COMMON_DEPEND="${PYTHON_DEPS} caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite - dev-libs/expat - >=dev-libs/flatbuffers-1.11.0 + dev-libs/crossguid >=dev-libs/fribidi-1.0.5 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/spdlog-1.5.0:= dev-libs/tinyxml[stl] $(python_gen_cond_dep ' @@ -82,7 +90,11 @@ COMMON_DEPEND="${PYTHON_DEPS} >=dev-libs/libcdio-2.1.0[cxx] >=dev-libs/libfmt-6.1.2 dev-libs/libfstrcmp - gbm? ( media-libs/mesa[gbm] ) + gbm? ( + >=dev-libs/libinput-1.10.5 + media-libs/mesa[gbm] + x11-libs/libxkbcommon + ) gles? ( !raspberry-pi? ( media-libs/mesa[gles2] ) ) @@ -90,7 +102,6 @@ COMMON_DEPEND="${PYTHON_DEPS} libusb? ( virtual/libusb:1 ) virtual/ttf-fonts media-fonts/roboto - >=media-libs/fontconfig-2.13.1 >=media-libs/freetype-2.10.1 >=media-libs/libass-0.13.4 !raspberry-pi? ( media-libs/mesa[egl] ) @@ -100,12 +111,15 @@ COMMON_DEPEND="${PYTHON_DEPS} libressl? ( media-video/ffmpeg[libressl,-openssl] ) !libressl? ( media-video/ffmpeg[-libressl,openssl] ) ) - !system-ffmpeg? ( dav1d? ( media-libs/dav1d ) ) + !system-ffmpeg? ( + app-arch/bzip2 + dav1d? ( media-libs/dav1d ) + ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= ) >=net-misc/curl-7.68.0[http2] nfs? ( >=net-fs/libnfs-2.0.0:= ) - opengl? ( media-libs/glu ) + !gles? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2l:0= ) libressl? ( dev-libs/libressl:0= ) raspberry-pi? ( @@ -118,7 +132,7 @@ COMMON_DEPEND="${PYTHON_DEPS} udev? ( virtual/udev ) vaapi? ( x11-libs/libva:= - opengl? ( x11-libs/libva[opengl] ) + !gles? ( x11-libs/libva[opengl] ) system-ffmpeg? ( media-video/ffmpeg[vaapi] ) vdpau? ( x11-libs/libva[vdpau] ) wayland? ( x11-libs/libva[wayland] ) @@ -133,41 +147,43 @@ COMMON_DEPEND="${PYTHON_DEPS} >=dev-cpp/waylandpp-0.2.3:= media-libs/mesa[wayland] >=dev-libs/wayland-protocols-1.7 + >=x11-libs/libxkbcommon-0.4.1 ) webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] ) X? ( media-libs/mesa[X] + !gles? ( media-libs/libglvnd[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 ) + xslt? ( + dev-libs/libxslt + >=dev-libs/libxml2-2.9.4 + ) zeroconf? ( net-dns/avahi[dbus] ) " -RDEPEND="${COMMON_DEPEND} +RDEPEND="${COMMON_DEPEND} ${COMMON_TARGET_DEPEND} lirc? ( app-misc/lirc ) power-control? ( || ( sys-apps/systemd sys-auth/elogind ) ) 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 +DEPEND="${COMMON_DEPEND} ${COMMON_TARGET_DEPEND} dev-libs/rapidjson + test? ( >=dev-cpp/gtest-1.10.0 ) +" +BDEPEND="${COMMON_DEPEND} + dev-lang/swig dev-util/cmake - dev-util/gperf media-libs/giflib + >=dev-libs/flatbuffers-1.11.0 >=media-libs/libjpeg-turbo-2.0.4:= >=media-libs/libpng-1.6.26:0= - test? ( >=dev-cpp/gtest-1.10.0 ) virtual/pkgconfig virtual/jre - x86? ( dev-lang/nasm ) " CONFIG_CHECK="~IP_MULTICAST" @@ -242,10 +258,14 @@ src_configure() { -DENABLE_BLUETOOTH=$(usex bluetooth) -DENABLE_BLURAY=$(usex bluray) -DENABLE_CCACHE=OFF - -DENABLE_ISO9660PP=ON + -DENABLE_CLANGFORMAT=OFF + -DENABLE_CLANGTIDY=OFF + -DENABLE_CPPCHECK=OFF + -DENABLE_ISO9660PP=$(usex optical) -DENABLE_CEC=$(usex cec) -DENABLE_DBUS=$(usex dbus) -DENABLE_DVDCSS=$(usex css) + -DENABLE_EVENTCLIENTS=ON # alway enable to have 'kodi-send' and filter extra staff in 'src_install()' -DENABLE_INTERNAL_CROSSGUID=OFF -DENABLE_INTERNAL_RapidJSON=OFF -DENABLE_INTERNAL_FMT=OFF @@ -265,8 +285,8 @@ src_configure() { -DENABLE_MYSQLCLIENT=$(usex mysql) -DENABLE_NFS=$(usex nfs) -DENABLE_OPENGLES=$(usex gles) - -DENABLE_OPENGL=$(usex opengl) - -DENABLE_OPTICAL=$(usex dvd) + -DENABLE_OPENGL=$(usex !gles) + -DENABLE_OPTICAL=$(usex optical) -DENABLE_PLIST=$(usex airplay) -DENABLE_PULSEAUDIO=$(usex pulseaudio) -DENABLE_SMBCLIENT=$(usex samba) @@ -283,11 +303,13 @@ 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)" + -DAPP_RENDER_SYSTEM="$(usex gles gles gl)" -DCORE_PLATFORM_NAME="${core_platform_name}" ) - use libusb && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) ) + use !udev && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) ) + + use X && use !gles && mycmakeargs+=( -DENABLE_GLX=ON ) if use system-ffmpeg; then mycmakeargs+=( -DWITH_FFMPEG="yes" ) @@ -323,6 +345,13 @@ src_install() { 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 + if use !eventclients ; then + rm -f "${ED}"/usr/bin/kodi-ps3remote || die + rm -f "${D}"$(python_get_sitedir)/kodi/ps3_remote.py || die + rm -rf "${D}"$(python_get_sitedir)/kodi/ps3 || die + rm -rf "${D}"$(python_get_sitedir)/kodi/bt || die + rm -rf "${ED}"/usr/share/doc/${PF}/kodi-eventclients-dev || die + fi + + python_optimize "${D}$(python_get_sitedir)" } diff --git a/media-tv/kodi/kodi-19.9999.ebuild b/media-tv/kodi/kodi-19.9999.ebuild index 4f0fe6d0541a..f84a305d64fb 100644 --- a/media-tv/kodi/kodi-19.9999.ebuild +++ b/media-tv/kodi/kodi-19.9999.ebuild @@ -17,6 +17,7 @@ SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_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 )" if [[ ${PV} == *9999 ]] ; then EGIT_REPO_URI="https://github.com/xbmc/xbmc.git" + EGIT_BRANCH="Matrix" inherit git-r3 else MY_PV=${PV/_p/_r} @@ -39,11 +40,10 @@ 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 dav1d dbus dvd gbm gles lcms libressl libusb lirc mariadb mysql nfs +opengl power-control pulseaudio raspberry-pi samba +system-ffmpeg test udf udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf" +IUSE="airplay alsa bluetooth bluray caps cec +css dav1d dbus eventclients gbm gles lcms libressl libusb lirc mariadb mysql nfs +optical power-control pulseaudio raspberry-pi samba +system-ffmpeg test udf udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf" IUSE="${IUSE} cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_arm_neon" REQUIRED_USE=" ${PYTHON_REQUIRED_USE} - || ( gles opengl ) || ( gbm wayland X ) ?? ( mariadb mysql ) bluray? ( udf ) @@ -51,10 +51,22 @@ REQUIRED_USE=" udisks? ( dbus ) upower? ( dbus ) power-control? ( dbus ) + vdpau? ( + X + !gles + !gbm + ) + zeroconf? ( dbus ) " RESTRICT="!test? ( test )" -COMMON_DEPEND="${PYTHON_DEPS} +COMMON_DEPEND=" + >=dev-libs/lzo-2.04 + >=dev-libs/flatbuffers-1.11.0 + >=media-libs/libjpeg-turbo-2.0.4:= + >=media-libs/libpng-1.6.26:0= +" +COMMON_TARGET_DEPEND="${PYTHON_DEPS} airplay? ( >=app-pda/libplist-2.0.0 net-libs/shairplay @@ -65,14 +77,10 @@ COMMON_DEPEND="${PYTHON_DEPS} caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite - dev-libs/expat - >=dev-libs/flatbuffers-1.11.0 + dev-libs/crossguid >=dev-libs/fribidi-1.0.5 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/spdlog-1.5.0:= dev-libs/tinyxml[stl] $(python_gen_cond_dep ' @@ -82,7 +90,11 @@ COMMON_DEPEND="${PYTHON_DEPS} >=dev-libs/libcdio-2.1.0[cxx] >=dev-libs/libfmt-6.1.2 dev-libs/libfstrcmp - gbm? ( media-libs/mesa[gbm] ) + gbm? ( + >=dev-libs/libinput-1.10.5 + media-libs/mesa[gbm] + x11-libs/libxkbcommon + ) gles? ( !raspberry-pi? ( media-libs/mesa[gles2] ) ) @@ -90,7 +102,6 @@ COMMON_DEPEND="${PYTHON_DEPS} libusb? ( virtual/libusb:1 ) virtual/ttf-fonts media-fonts/roboto - >=media-libs/fontconfig-2.13.1 >=media-libs/freetype-2.10.1 >=media-libs/libass-0.13.4 !raspberry-pi? ( media-libs/mesa[egl] ) @@ -100,12 +111,15 @@ COMMON_DEPEND="${PYTHON_DEPS} libressl? ( media-video/ffmpeg[libressl,-openssl] ) !libressl? ( media-video/ffmpeg[-libressl,openssl] ) ) - !system-ffmpeg? ( dav1d? ( media-libs/dav1d ) ) + !system-ffmpeg? ( + app-arch/bzip2 + dav1d? ( media-libs/dav1d ) + ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= ) >=net-misc/curl-7.68.0[http2] nfs? ( >=net-fs/libnfs-2.0.0:= ) - opengl? ( media-libs/glu ) + !gles? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2l:0= ) libressl? ( dev-libs/libressl:0= ) raspberry-pi? ( @@ -118,7 +132,7 @@ COMMON_DEPEND="${PYTHON_DEPS} udev? ( virtual/udev ) vaapi? ( x11-libs/libva:= - opengl? ( x11-libs/libva[opengl] ) + !gles? ( x11-libs/libva[opengl] ) system-ffmpeg? ( media-video/ffmpeg[vaapi] ) vdpau? ( x11-libs/libva[vdpau] ) wayland? ( x11-libs/libva[wayland] ) @@ -133,41 +147,43 @@ COMMON_DEPEND="${PYTHON_DEPS} >=dev-cpp/waylandpp-0.2.3:= media-libs/mesa[wayland] >=dev-libs/wayland-protocols-1.7 + >=x11-libs/libxkbcommon-0.4.1 ) webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] ) X? ( media-libs/mesa[X] + !gles? ( media-libs/libglvnd[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 ) + xslt? ( + dev-libs/libxslt + >=dev-libs/libxml2-2.9.4 + ) zeroconf? ( net-dns/avahi[dbus] ) " -RDEPEND="${COMMON_DEPEND} +RDEPEND="${COMMON_DEPEND} ${COMMON_TARGET_DEPEND} lirc? ( app-misc/lirc ) power-control? ( || ( sys-apps/systemd sys-auth/elogind ) ) 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 +DEPEND="${COMMON_DEPEND} ${COMMON_TARGET_DEPEND} dev-libs/rapidjson + test? ( >=dev-cpp/gtest-1.10.0 ) +" +BDEPEND="${COMMON_DEPEND} + dev-lang/swig dev-util/cmake - dev-util/gperf media-libs/giflib + >=dev-libs/flatbuffers-1.11.0 >=media-libs/libjpeg-turbo-2.0.4:= >=media-libs/libpng-1.6.26:0= - test? ( >=dev-cpp/gtest-1.10.0 ) virtual/pkgconfig virtual/jre - x86? ( dev-lang/nasm ) " CONFIG_CHECK="~IP_MULTICAST" @@ -242,10 +258,14 @@ src_configure() { -DENABLE_BLUETOOTH=$(usex bluetooth) -DENABLE_BLURAY=$(usex bluray) -DENABLE_CCACHE=OFF - -DENABLE_ISO9660PP=ON + -DENABLE_CLANGFORMAT=OFF + -DENABLE_CLANGTIDY=OFF + -DENABLE_CPPCHECK=OFF + -DENABLE_ISO9660PP=$(usex optical) -DENABLE_CEC=$(usex cec) -DENABLE_DBUS=$(usex dbus) -DENABLE_DVDCSS=$(usex css) + -DENABLE_EVENTCLIENTS=ON # alway enable to have 'kodi-send' and filter extra staff in 'src_install()' -DENABLE_INTERNAL_CROSSGUID=OFF -DENABLE_INTERNAL_RapidJSON=OFF -DENABLE_INTERNAL_FMT=OFF @@ -265,8 +285,8 @@ src_configure() { -DENABLE_MYSQLCLIENT=$(usex mysql) -DENABLE_NFS=$(usex nfs) -DENABLE_OPENGLES=$(usex gles) - -DENABLE_OPENGL=$(usex opengl) - -DENABLE_OPTICAL=$(usex dvd) + -DENABLE_OPENGL=$(usex !gles) + -DENABLE_OPTICAL=$(usex optical) -DENABLE_PLIST=$(usex airplay) -DENABLE_PULSEAUDIO=$(usex pulseaudio) -DENABLE_SMBCLIENT=$(usex samba) @@ -283,11 +303,13 @@ 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)" + -DAPP_RENDER_SYSTEM="$(usex gles gles gl)" -DCORE_PLATFORM_NAME="${core_platform_name}" ) - use libusb && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) ) + use !udev && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) ) + + use X && use !gles && mycmakeargs+=( -DENABLE_GLX=ON ) if use system-ffmpeg; then mycmakeargs+=( -DWITH_FFMPEG="yes" ) @@ -323,6 +345,13 @@ src_install() { 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 + if use !eventclients ; then + rm -f "${ED}"/usr/bin/kodi-ps3remote || die + rm -f "${D}"$(python_get_sitedir)/kodi/ps3_remote.py || die + rm -rf "${D}"$(python_get_sitedir)/kodi/ps3 || die + rm -rf "${D}"$(python_get_sitedir)/kodi/bt || die + rm -rf "${ED}"/usr/share/doc/${PF}/kodi-eventclients-dev || die + fi + + python_optimize "${D}$(python_get_sitedir)" } diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild index 4f0fe6d0541a..05abd5399e72 100644 --- a/media-tv/kodi/kodi-9999.ebuild +++ b/media-tv/kodi/kodi-9999.ebuild @@ -39,11 +39,10 @@ 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 dav1d dbus dvd gbm gles lcms libressl libusb lirc mariadb mysql nfs +opengl power-control pulseaudio raspberry-pi samba +system-ffmpeg test udf udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf" +IUSE="airplay alsa bluetooth bluray caps cec +css dav1d dbus eventclients gbm gles lcms libressl libusb lirc mariadb mysql nfs +optical power-control pulseaudio raspberry-pi samba +system-ffmpeg test udf udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf" IUSE="${IUSE} cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_arm_neon" REQUIRED_USE=" ${PYTHON_REQUIRED_USE} - || ( gles opengl ) || ( gbm wayland X ) ?? ( mariadb mysql ) bluray? ( udf ) @@ -51,10 +50,22 @@ REQUIRED_USE=" udisks? ( dbus ) upower? ( dbus ) power-control? ( dbus ) + vdpau? ( + X + !gles + !gbm + ) + zeroconf? ( dbus ) " RESTRICT="!test? ( test )" -COMMON_DEPEND="${PYTHON_DEPS} +COMMON_DEPEND=" + >=dev-libs/lzo-2.04 + >=dev-libs/flatbuffers-1.11.0 + >=media-libs/libjpeg-turbo-2.0.4:= + >=media-libs/libpng-1.6.26:0= +" +COMMON_TARGET_DEPEND="${PYTHON_DEPS} airplay? ( >=app-pda/libplist-2.0.0 net-libs/shairplay @@ -65,14 +76,10 @@ COMMON_DEPEND="${PYTHON_DEPS} caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite - dev-libs/expat - >=dev-libs/flatbuffers-1.11.0 + dev-libs/crossguid >=dev-libs/fribidi-1.0.5 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/spdlog-1.5.0:= dev-libs/tinyxml[stl] $(python_gen_cond_dep ' @@ -82,7 +89,11 @@ COMMON_DEPEND="${PYTHON_DEPS} >=dev-libs/libcdio-2.1.0[cxx] >=dev-libs/libfmt-6.1.2 dev-libs/libfstrcmp - gbm? ( media-libs/mesa[gbm] ) + gbm? ( + >=dev-libs/libinput-1.10.5 + media-libs/mesa[gbm] + x11-libs/libxkbcommon + ) gles? ( !raspberry-pi? ( media-libs/mesa[gles2] ) ) @@ -90,7 +101,6 @@ COMMON_DEPEND="${PYTHON_DEPS} libusb? ( virtual/libusb:1 ) virtual/ttf-fonts media-fonts/roboto - >=media-libs/fontconfig-2.13.1 >=media-libs/freetype-2.10.1 >=media-libs/libass-0.13.4 !raspberry-pi? ( media-libs/mesa[egl] ) @@ -100,12 +110,15 @@ COMMON_DEPEND="${PYTHON_DEPS} libressl? ( media-video/ffmpeg[libressl,-openssl] ) !libressl? ( media-video/ffmpeg[-libressl,openssl] ) ) - !system-ffmpeg? ( dav1d? ( media-libs/dav1d ) ) + !system-ffmpeg? ( + app-arch/bzip2 + dav1d? ( media-libs/dav1d ) + ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= ) >=net-misc/curl-7.68.0[http2] nfs? ( >=net-fs/libnfs-2.0.0:= ) - opengl? ( media-libs/glu ) + !gles? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2l:0= ) libressl? ( dev-libs/libressl:0= ) raspberry-pi? ( @@ -118,7 +131,7 @@ COMMON_DEPEND="${PYTHON_DEPS} udev? ( virtual/udev ) vaapi? ( x11-libs/libva:= - opengl? ( x11-libs/libva[opengl] ) + !gles? ( x11-libs/libva[opengl] ) system-ffmpeg? ( media-video/ffmpeg[vaapi] ) vdpau? ( x11-libs/libva[vdpau] ) wayland? ( x11-libs/libva[wayland] ) @@ -133,41 +146,43 @@ COMMON_DEPEND="${PYTHON_DEPS} >=dev-cpp/waylandpp-0.2.3:= media-libs/mesa[wayland] >=dev-libs/wayland-protocols-1.7 + >=x11-libs/libxkbcommon-0.4.1 ) webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] ) X? ( media-libs/mesa[X] + !gles? ( media-libs/libglvnd[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 ) + xslt? ( + dev-libs/libxslt + >=dev-libs/libxml2-2.9.4 + ) zeroconf? ( net-dns/avahi[dbus] ) " -RDEPEND="${COMMON_DEPEND} +RDEPEND="${COMMON_DEPEND} ${COMMON_TARGET_DEPEND} lirc? ( app-misc/lirc ) power-control? ( || ( sys-apps/systemd sys-auth/elogind ) ) 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 +DEPEND="${COMMON_DEPEND} ${COMMON_TARGET_DEPEND} dev-libs/rapidjson + test? ( >=dev-cpp/gtest-1.10.0 ) +" +BDEPEND="${COMMON_DEPEND} + dev-lang/swig dev-util/cmake - dev-util/gperf media-libs/giflib + >=dev-libs/flatbuffers-1.11.0 >=media-libs/libjpeg-turbo-2.0.4:= >=media-libs/libpng-1.6.26:0= - test? ( >=dev-cpp/gtest-1.10.0 ) virtual/pkgconfig virtual/jre - x86? ( dev-lang/nasm ) " CONFIG_CHECK="~IP_MULTICAST" @@ -242,10 +257,14 @@ src_configure() { -DENABLE_BLUETOOTH=$(usex bluetooth) -DENABLE_BLURAY=$(usex bluray) -DENABLE_CCACHE=OFF - -DENABLE_ISO9660PP=ON + -DENABLE_CLANGFORMAT=OFF + -DENABLE_CLANGTIDY=OFF + -DENABLE_CPPCHECK=OFF + -DENABLE_ISO9660PP=$(usex optical) -DENABLE_CEC=$(usex cec) -DENABLE_DBUS=$(usex dbus) -DENABLE_DVDCSS=$(usex css) + -DENABLE_EVENTCLIENTS=ON # alway enable to have 'kodi-send' and filter extra staff in 'src_install()' -DENABLE_INTERNAL_CROSSGUID=OFF -DENABLE_INTERNAL_RapidJSON=OFF -DENABLE_INTERNAL_FMT=OFF @@ -265,8 +284,8 @@ src_configure() { -DENABLE_MYSQLCLIENT=$(usex mysql) -DENABLE_NFS=$(usex nfs) -DENABLE_OPENGLES=$(usex gles) - -DENABLE_OPENGL=$(usex opengl) - -DENABLE_OPTICAL=$(usex dvd) + -DENABLE_OPENGL=$(usex !gles) + -DENABLE_OPTICAL=$(usex optical) -DENABLE_PLIST=$(usex airplay) -DENABLE_PULSEAUDIO=$(usex pulseaudio) -DENABLE_SMBCLIENT=$(usex samba) @@ -283,11 +302,13 @@ 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)" + -DAPP_RENDER_SYSTEM="$(usex gles gles gl)" -DCORE_PLATFORM_NAME="${core_platform_name}" ) - use libusb && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) ) + use !udev && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) ) + + use X && use !gles && mycmakeargs+=( -DENABLE_GLX=ON ) if use system-ffmpeg; then mycmakeargs+=( -DWITH_FFMPEG="yes" ) @@ -323,6 +344,13 @@ src_install() { 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 + if use !eventclients ; then + rm -f "${ED}"/usr/bin/kodi-ps3remote || die + rm -f "${D}"$(python_get_sitedir)/kodi/ps3_remote.py || die + rm -rf "${D}"$(python_get_sitedir)/kodi/ps3 || die + rm -rf "${D}"$(python_get_sitedir)/kodi/bt || die + rm -rf "${ED}"/usr/share/doc/${PF}/kodi-eventclients-dev || die + fi + + python_optimize "${D}$(python_get_sitedir)" } diff --git a/media-tv/kodi/metadata.xml b/media-tv/kodi/metadata.xml index a30254b912a9..d79438461452 100644 --- a/media-tv/kodi/metadata.xml +++ b/media-tv/kodi/metadata.xml @@ -1,33 +1,38 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>candrews@gentoo.org</email> - <name>Craig Andrews</name> - </maintainer> - <use> - <flag name="airplay">enable AirPlay support</flag> - <flag name="bluray">Enable playback of Blu-ray filesystems</flag> - <flag name="caps">Use <pkg>sys-libs/libcap</pkg> to bind to privileged ports as non-root</flag> - <flag name="cec">Enable support for HDMI-CEC devices via libcec</flag> - <flag name="gbm">Use the Graphics Buffer Manager for EGL on KMS.</flag> - <flag name="gles">Enable support for GLES</flag> - <flag name="lirc">Enable support for IR remote controls using <pkg>app-misc/lirc</pkg></flag> - <flag name="mariadb">Add MariaDB support</flag> - <flag name="dav1d">Enables AV1 decoding via <pkg>media-libs/dav1d</pkg></flag> - <flag name="nfs">Enable NFS client support</flag> - <flag name="dvd">Enable optical (CD/DVD drive) support</flag> - <flag name="power-control">Enable control of shutdown, reboot, suspend, and hibernate</flag> - <flag name="raspberry-pi">Enable support for the Raspberry Pi</flag> - <flag name="system-ffmpeg">Use system ffmpeg instead of the bundled one</flag> - <flag name="libusb">Use <pkg>virtual/libusb</pkg> for usb device hotplug support. This flag should only be enabled if you're running a non-Linux kernel or you don't want to use <pkg>sys-fs/udev</pkg>.</flag> - <flag name="udf">Enable UDF support. Required for playing blurays.</flag> - <flag name="udev">Use <pkg>sys-fs/udev</pkg> rules to handle devices' permissions and hotplug support. Unless you know what you're doing do not disable this flag on Linux kernels. This is provided as an option for completeness.</flag> - <flag name="webserver">Enable internal webserver</flag> - <flag name="xslt">Enable XSLT support using <pkg>dev-libs/libxslt</pkg></flag> - </use> - <upstream> - <bugs-to>https://trac.kodi.tv/</bugs-to> - <remote-id type="github">xbmc/xbmc</remote-id> - </upstream> -</pkgmetadata> + <maintainer type="person"> + <email>candrews@gentoo.org</email> + <name>Craig Andrews</name> + </maintainer> + <upstream> + <remote-id type="github">xbmc/xbmc</remote-id> + <bugs-to>https://trac.kodi.tv/</bugs-to> + </upstream> + <use> + <flag name="airplay">enable AirPlay support</flag> + <flag name="bluray">Enable playback of Blu-ray filesystems</flag> + <flag name="bluetooth">Enable JSON-RPC over BT for remote control connected via bluetooth</flag> + <flag name="caps">Use <pkg>sys-libs/libcap</pkg> to bind to privileged ports as non-root</flag> + <flag name="cec">Enable support for HDMI-CEC devices via libcec</flag> + <flag name="eventclients">Install full set of Kodi python evenclients and evenclients examples</flag> + <flag name="gbm">Use the Graphics Buffer Manager for EGL on KMS.</flag> + <flag name="gles">Use simplified OpenGLES instead of full-scale OpenGL</flag> + <flag name="lirc">Enable support for IR remote controls using <pkg>app-misc/lirc</pkg></flag> + <flag name="mariadb">Enable support store of media library metadata on local or remote MariaDB</flag> + <flag name="mysql">Enable support store of media library metadata on local or remote MySQL</flag> + <flag name="dav1d">Enables AV1 decoding via <pkg>media-libs/dav1d</pkg></flag> + <flag name="nfs">Enable NFS client support</flag> + <flag name="optical">Enable Audio CD playback, optical disks detection and reading (CD-ROM, Video CD, and others), and ISO optical disk images direct reading. DVD disks may require additional 'udf' flag.</flag> + <flag name="power-control">Enable control of shutdown, reboot, suspend, and hibernate</flag> + <flag name="raspberry-pi">Enable support for the Raspberry Pi</flag> + <flag name="system-ffmpeg">Use system ffmpeg instead of the bundled one</flag> + <flag name="libusb">Use <pkg>virtual/libusb</pkg> for usb device hotplug support. This flag should only be enabled if you're running a non-Linux kernel or you don't want to use <pkg>sys-fs/udev</pkg>.</flag> + <flag name="udf">Enable UDF support. Required for playing blurays.</flag> + <flag name="udev">Use <pkg>sys-fs/udev</pkg> rules to handle devices' permissions and hotplug support. Unless you know what you're doing do not disable this flag on Linux kernels. This is provided as an option for completeness.</flag> + <flag name="upower">Use <pkg>sys-power/upower</pkg> to get battery level and active power source</flag> + <flag name="webserver">Enable internal webserver</flag> + <flag name="xslt">Enable metadata XSLT scrapers support with <pkg>dev-libs/libxslt</pkg></flag> + </use> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/media-tv/linuxtv-dvb-apps/metadata.xml b/media-tv/linuxtv-dvb-apps/metadata.xml index dba6ee3e4a56..aaa9c146dbe3 100644 --- a/media-tv/linuxtv-dvb-apps/metadata.xml +++ b/media-tv/linuxtv-dvb-apps/metadata.xml @@ -1,8 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> -<!-- maintainer-needed --> -<use> - <flag name="alevt">Build videotext decoder</flag> -</use> -</pkgmetadata> + + <use> + <flag name="alevt">Build videotext decoder</flag> + </use> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/media-tv/mythtv-status/metadata.xml b/media-tv/mythtv-status/metadata.xml index 7a38bb900964..83d00b14c8d4 100644 --- a/media-tv/mythtv-status/metadata.xml +++ b/media-tv/mythtv-status/metadata.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> -</pkgmetadata> + + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/media-tv/mythtv/files/mythbackend.init-r2 b/media-tv/mythtv/files/mythbackend.init-r2 deleted file mode 100644 index dc063030d47c..000000000000 --- a/media-tv/mythtv/files/mythbackend.init-r2 +++ /dev/null @@ -1,72 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -description="MythTV backend recording daemon" -extra_started_commands="resched upnprebuild" -description_resched="Forces the recording scheduler to update" -description_upnprebuild="Rebuilds the UPnP media cache" - -MYTHBACKEND_OPTS=${MYTHBACKEND_OPTS:-"${MYTHBACKEND_OPTS}"} -MYTHBACKEND_VERBOSE=${MYTHBACKEND_VERBOSE:-"general"} -MYTHBACKEND_LOGGING=${MYTHBACKEND_LOGGING:-"files"} - -name="MythTV backend" -command="/usr/bin/mythbackend" -pidfile="/run/mythtv/mythbackend.pid" -start_stop_daemon_args="--pidfile ${pidfile} --user mythtv:video" -command_args="--daemon --pidfile ${pidfile} --verbose ${MYTHBACKEND_VERBOSE} ${MYTHBACKEND_OPTS}" - -depend() { - # mythbackend doesn't need to run on the same machine that - # mysql runs on. so its use for that reason - use logger net.lo mysql LCDd -} - -start_pre() { - case "${MYTHBACKEND_LOGGING}" in - database) logging="--enable-dblog" ;; - syslog\ *) logging="--${MYTHBACKEND_LOGGING}" ;; - files) logging="--logpath /var/log/mythtv" ;; - console) logging="--nologserver" ;; - *) - eerror "Invalid MYTHBACKEND_LOGGING value" - exit 1 - ;; - esac - - #fixes for bug #101308 - unset DISPLAY - unset SESSION_MANAGER - - # Work around any strange permissions that may be on these files. - [ "x${MYTHBACKEND_LOGGING}" = "xfiles" ] && \ - checkpath --directory --owner mythtv:video --mode 0755 /var/log/mythtv - checkpath --directory --owner mythtv:video --mode 0775 /home/mythtv - checkpath --directory --owner mythtv:video --mode 0750 /run/mythtv -} - -start() { - ebegin "Starting ${name}" - start-stop-daemon --start ${start_stop_daemon_args} --exec ${command} \ - -- ${command_args} ${logging} - eend $? -} - -stop() { - ebegin "Stopping ${name}" - start-stop-daemon --stop --retry 10 --progress --pidfile ${pidfile} - eend $? -} - -resched() { - ebegin "Updating the recording scheduler" - ${command} --resched - eend $? -} - -upnprebuild() { - ebegin "Rebuilding UPnP media cache" - ${command} --upnprebuild - eend $? -} diff --git a/media-tv/mythtv/metadata.xml b/media-tv/mythtv/metadata.xml index 0de2e5e50fa6..3f0555f4e327 100644 --- a/media-tv/mythtv/metadata.xml +++ b/media-tv/mythtv/metadata.xml @@ -1,41 +1,42 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>thebitpit@austincustomerrands.com</email> - <name>Wilson Michaels</name> - </maintainer> - <maintainer type="project"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> - <use> - <flag name="alsa">Allows MythTV to directly output sound to ALSA devices</flag> - <flag name="asi">Support for DVEO ASI recorder</flag> - <flag name="autostart">Use a custom autostart configuration</flag> - <flag name="bluray">Use the system libbluray for BluRay support</flag> - <flag name="cec">Allows control of CEC enabled TVs via HDMI</flag> - <flag name="ceton">Ceton InfiniTV 4 a CableCARD-enabled tuner support</flag> - <flag name="debug">Instructs Qt to use the 'debug' target</flag> - <flag name="egl">EGL video output support</flag> - <flag name="fftw">Support visualizations via <pkg>sci-libs/fftw</pkg></flag> - <flag name="hdhomerun">Silicondust USA Inc.network-attached tuner support</flag> - <flag name="hdpvr">Hauppauge HD-PVR?</flag> - <flag name="ieee1394">Firewire enabled Cable boxe support</flag> - <flag name="ivtv">Support kernel driver for the iTVC15 family of MPEG codecs</flag> - <flag name="jack">Allows MythTV to use JACK as your sound output device</flag> - <flag name="java">BD-J support for Blu-ray discs</flag> - <flag name="lcd">Enable use of <pkg>app-misc/lcdproc</pkg> data display</flag> - <flag name="lirc">LIRC remote control device support</flag> - <flag name="nvdec">Enable NVDEC (NVCUVID) hardware accelerated video decoding</flag> - <flag name="perl">Build the perl bindings for MythTV</flag> - <flag name="vbox">V@Box Communications network-attached tuner devices support</flag> - <flag name="vpx">Enable VP8/VP9 support for <pkg>media-libs/libvpx</pkg></flag> - <flag name="wrapper">Use Ubuntu mythtfrontend wrapper</flag> - <flag name="x265">Enable h265 encoding using x265</flag> - <flag name="xmltv">Support <pkg>media-tv/xmltv</pkg> TV listing - not used by Schedules Direct]</flag> - </use> - <upstream> - <remote-id type="github">MythTV/mythtv</remote-id> - </upstream> -</pkgmetadata> + <maintainer type="person"> + <email>thebitpit@austincustomerrands.com</email> + <name>Wilson Michaels</name> + </maintainer> + <maintainer type="project"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <upstream> + <remote-id type="github">MythTV/mythtv</remote-id> + </upstream> + <use> + <flag name="alsa">Allows MythTV to directly output sound to ALSA devices</flag> + <flag name="asi">Support for DVEO ASI recorder</flag> + <flag name="autostart">Use a custom autostart configuration</flag> + <flag name="bluray">Use the system libbluray for BluRay support</flag> + <flag name="cec">Allows control of CEC enabled TVs via HDMI</flag> + <flag name="ceton">Ceton InfiniTV 4 a CableCARD-enabled tuner support</flag> + <flag name="debug">Instructs Qt to use the 'debug' target</flag> + <flag name="egl">EGL video output support</flag> + <flag name="fftw">Support visualizations via <pkg>sci-libs/fftw</pkg></flag> + <flag name="hdhomerun">Silicondust USA Inc.network-attached tuner support</flag> + <flag name="hdpvr">Hauppauge HD-PVR?</flag> + <flag name="ieee1394">Firewire enabled Cable boxe support</flag> + <flag name="ivtv">Support kernel driver for the iTVC15 family of MPEG codecs</flag> + <flag name="jack">Allows MythTV to use JACK as your sound output device</flag> + <flag name="java">BD-J support for Blu-ray discs</flag> + <flag name="lcd">Enable use of <pkg>app-misc/lcdproc</pkg> data display</flag> + <flag name="lirc">LIRC remote control device support</flag> + <flag name="nvdec">Enable NVDEC (NVCUVID) hardware accelerated video decoding</flag> + <flag name="perl">Build the perl bindings for MythTV</flag> + <flag name="vbox">V@Box Communications network-attached tuner devices support</flag> + <flag name="vpx">Enable VP8/VP9 support for <pkg>media-libs/libvpx</pkg></flag> + <flag name="wrapper">Use Ubuntu mythtfrontend wrapper</flag> + <flag name="x265">Enable h265 encoding using x265</flag> + <flag name="xmltv">Support <pkg>media-tv/xmltv</pkg> TV listing - not used by Schedules Direct]</flag> + </use> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/media-tv/nvtv/metadata.xml b/media-tv/nvtv/metadata.xml index ca1f8c56f268..0c8e97fa176d 100644 --- a/media-tv/nvtv/metadata.xml +++ b/media-tv/nvtv/metadata.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> - <upstream> - <remote-id type="sourceforge">nv-tv-out</remote-id> - </upstream> -</pkgmetadata> + <upstream> + <remote-id type="sourceforge">nv-tv-out</remote-id> + </upstream> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/media-tv/shoutcast2vdr/metadata.xml b/media-tv/shoutcast2vdr/metadata.xml index 27f419c289c3..aa1fc8ccb8a9 100644 --- a/media-tv/shoutcast2vdr/metadata.xml +++ b/media-tv/shoutcast2vdr/metadata.xml @@ -1,8 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> -<email>vdr@gentoo.org</email> -<name>Gentoo VDR Project</name> -</maintainer> -</pkgmetadata> + <maintainer type="project"> + <email>vdr@gentoo.org</email> + <name>Gentoo VDR Project</name> + </maintainer> + + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/media-tv/tvbrowser-bin/metadata.xml b/media-tv/tvbrowser-bin/metadata.xml index e65cdcf0aee5..89f4f1888cee 100644 --- a/media-tv/tvbrowser-bin/metadata.xml +++ b/media-tv/tvbrowser-bin/metadata.xml @@ -1,15 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>h.judt@gmx.at</email> - <name>Harald Judt</name> - </maintainer> - <maintainer type="project"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> - <upstream> - <remote-id type="sourceforge">tvbrowser</remote-id> - </upstream> -</pkgmetadata> + <maintainer type="person"> + <email>h.judt@gmx.at</email> + <name>Harald Judt</name> + </maintainer> + <maintainer type="project"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <upstream> + <remote-id type="sourceforge">tvbrowser</remote-id> + </upstream> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/media-tv/tvheadend/metadata.xml b/media-tv/tvheadend/metadata.xml index d995e88d8e83..e83c4c68c427 100644 --- a/media-tv/tvheadend/metadata.xml +++ b/media-tv/tvheadend/metadata.xml @@ -1,29 +1,30 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>chewi@gentoo.org</email> - <name>James Le Cuirot</name> - </maintainer> - <use> - <flag name="capmt">Enable support for capmt (dvbapi) protocol</flag> - <flag name="constcw">Enable support for the constcw protocol</flag> - <flag name="cwc">Enable support for the cwc (newcamd) protocol</flag> - <flag name="ddci">Enable support for DDCI hardware</flag> - <flag name="dvbcsa">Enable decryption of the DVB Common Scrambling Algorithm</flag> - <flag name="dvben50221">Enable support for hardware CAM</flag> - <flag name="hdhomerun">Enable support for the HDHomeRun device</flag> - <flag name="imagecache">Enable support for image caching</flag> - <flag name="iptv">Enable support for Internet Protocol TV</flag> - <flag name="satip">Enable support for IP-based Satellite TV</flag> - <flag name="timeshift">Enable TimeShift support</flag> - <flag name="uriparser">Use <pkg>dev-libs/uriparser</pkg></flag> - <flag name="vpx">Enable transcoding with the VP8/VP9 video codecs</flag> - <flag name="x264">Enable transcoding with the H.264 video codec</flag> - <flag name="x265">Enable transcoding with the HEVC video codec</flag> - <flag name="xmltv">Use <pkg>media-tv/xmltv</pkg></flag> - </use> - <upstream> - <remote-id type="github">tvheadend/tvheadend</remote-id> - </upstream> -</pkgmetadata> + <maintainer type="person"> + <email>chewi@gentoo.org</email> + <name>James Le Cuirot</name> + </maintainer> + <upstream> + <remote-id type="github">tvheadend/tvheadend</remote-id> + </upstream> + <use> + <flag name="capmt">Enable support for capmt (dvbapi) protocol</flag> + <flag name="constcw">Enable support for the constcw protocol</flag> + <flag name="cwc">Enable support for the cwc (newcamd) protocol</flag> + <flag name="ddci">Enable support for DDCI hardware</flag> + <flag name="dvbcsa">Enable decryption of the DVB Common Scrambling Algorithm</flag> + <flag name="dvben50221">Enable support for hardware CAM</flag> + <flag name="hdhomerun">Enable support for the HDHomeRun device</flag> + <flag name="imagecache">Enable support for image caching</flag> + <flag name="iptv">Enable support for Internet Protocol TV</flag> + <flag name="satip">Enable support for IP-based Satellite TV</flag> + <flag name="timeshift">Enable TimeShift support</flag> + <flag name="uriparser">Use <pkg>dev-libs/uriparser</pkg></flag> + <flag name="vpx">Enable transcoding with the VP8/VP9 video codecs</flag> + <flag name="x264">Enable transcoding with the H.264 video codec</flag> + <flag name="x265">Enable transcoding with the HEVC video codec</flag> + <flag name="xmltv">Use <pkg>media-tv/xmltv</pkg></flag> + </use> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/media-tv/tvnamer/metadata.xml b/media-tv/tvnamer/metadata.xml index a602ac66d0a1..2018dc1be35c 100644 --- a/media-tv/tvnamer/metadata.xml +++ b/media-tv/tvnamer/metadata.xml @@ -1,12 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>thev00d00@gentoo.org</email> - <name>Ian Whyman</name> - </maintainer> - <upstream> - <remote-id type="pypi">tvnamer</remote-id> - <remote-id type="github">dbr/tvnamer</remote-id> - </upstream> -</pkgmetadata> + <maintainer type="person"> + <email>thev00d00@gentoo.org</email> + <name>Ian Whyman</name> + </maintainer> + <upstream> + <remote-id type="pypi">tvnamer</remote-id> + <remote-id type="github">dbr/tvnamer</remote-id> + </upstream> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/media-tv/v4l-dvb-saa716x/Manifest b/media-tv/v4l-dvb-saa716x/Manifest index 26fb9fae7268..c7e634919b31 100644 --- a/media-tv/v4l-dvb-saa716x/Manifest +++ b/media-tv/v4l-dvb-saa716x/Manifest @@ -1,2 +1 @@ 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 diff --git a/media-tv/v4l-dvb-saa716x/files/OSD_RAW_CMD_patch_2.diff b/media-tv/v4l-dvb-saa716x/files/OSD_RAW_CMD_patch_2.diff deleted file mode 100644 index 7f09a1d60f1a..000000000000 --- a/media-tv/v4l-dvb-saa716x/files/OSD_RAW_CMD_patch_2.diff +++ /dev/null @@ -1,27 +0,0 @@ ---- linux/drivers/media/common/saa716x/saa716x_ff_cmd.h.orig 2011-11-12 14:46:51.175700236 +0100 -+++ 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); diff --git a/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-3.19-set_gpio.patch b/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-3.19-set_gpio.patch deleted file mode 100644 index 895caa4449e0..000000000000 --- a/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-3.19-set_gpio.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- v4l-dvb-saa716x-d7e98fc59230-orig/linux/drivers/media/common/saa716x/saa716x_budget.c 2014-11-09 15:44:55.000000000 +0100 -+++ v4l-dvb-saa716x-d7e98fc59230/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; - diff --git a/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.10-fix-compile.patch b/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.10-fix-compile.patch deleted file mode 100644 index 4086da102b80..000000000000 --- a/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.10-fix-compile.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- 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) diff --git a/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.14.0-fix-compile.patch b/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.14.0-fix-compile.patch deleted file mode 100644 index fce2d5177985..000000000000 --- a/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.14.0-fix-compile.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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-4.15-fix-autorepeat.patch b/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.15-fix-autorepeat.patch deleted file mode 100644 index e3a3a737663f..000000000000 --- a/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.15-fix-autorepeat.patch +++ /dev/null @@ -1,107 +0,0 @@ -# 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; diff --git a/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.15-fix-timers.patch b/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.15-fix-timers.patch deleted file mode 100644 index 841c32e0515a..000000000000 --- a/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.15-fix-timers.patch +++ /dev/null @@ -1,41 +0,0 @@ -# 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) diff --git a/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.16-fix-compile.patch b/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.16-fix-compile.patch deleted file mode 100644 index d6e63ef3b5a0..000000000000 --- a/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.16-fix-compile.patch +++ /dev/null @@ -1,49 +0,0 @@ -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 diff --git a/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.17-define-AUDIO_GET_PTS.patch b/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.17-define-AUDIO_GET_PTS.patch deleted file mode 100644 index 8e418c82868e..000000000000 --- a/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.17-define-AUDIO_GET_PTS.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- 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-4.2-fix-compile.patch b/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.2-fix-compile.patch deleted file mode 100644 index 392ef2583075..000000000000 --- a/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.2-fix-compile.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -urN powARman-v4l-dvb-saa716x-d7e98fc59230/linux/drivers/media/common/saa716x/saa716x_budget.c v4l-dvb-saa716x-0.0.1_p20141109-r1/work/powARman-v4l-dvb-saa716x-d7e98fc59230/linux/drivers/media/common/saa716x/saa716x_budget.c ---- powARman-v4l-dvb-saa716x-d7e98fc59230/linux/drivers/media/common/saa716x/saa716x_budget.c 2015-09-03 00:30:08.662553247 +0200 -+++ v4l-dvb-saa716x-0.0.1_p20141109-r1/work/powARman-v4l-dvb-saa716x-d7e98fc59230/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; - -diff -urN powARman-v4l-dvb-saa716x-d7e98fc59230/linux/drivers/media/common/saa716x/saa716x_hybrid.c v4l-dvb-saa716x-0.0.1_p20141109-r1/work/powARman-v4l-dvb-saa716x-d7e98fc59230/linux/drivers/media/common/saa716x/saa716x_hybrid.c ---- powARman-v4l-dvb-saa716x-d7e98fc59230/linux/drivers/media/common/saa716x/saa716x_hybrid.c 2014-11-09 15:44:55.000000000 +0100 -+++ v4l-dvb-saa716x-0.0.1_p20141109-r1/work/powARman-v4l-dvb-saa716x-d7e98fc59230/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; - -diff -urN powARman-v4l-dvb-saa716x-d7e98fc59230/linux/drivers/media/common/saa716x/saa716x_pci.c v4l-dvb-saa716x-0.0.1_p20141109-r1/work/powARman-v4l-dvb-saa716x-d7e98fc59230/linux/drivers/media/common/saa716x/saa716x_pci.c ---- powARman-v4l-dvb-saa716x-d7e98fc59230/linux/drivers/media/common/saa716x/saa716x_pci.c 2014-11-09 15:44:55.000000000 +0100 -+++ v4l-dvb-saa716x-0.0.1_p20141109-r1/work/powARman-v4l-dvb-saa716x-d7e98fc59230/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-4.5.2-fix-compile.patch b/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.5.2-fix-compile.patch deleted file mode 100644 index ac499acdccbc..000000000000 --- a/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.5.2-fix-compile.patch +++ /dev/null @@ -1,13 +0,0 @@ -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> diff --git a/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.6.0-fix-compile.patch b/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.6.0-fix-compile.patch deleted file mode 100644 index 5aeaabd29af1..000000000000 --- a/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.6.0-fix-compile.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- 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; diff --git a/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.9-fix-warnings.patch b/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.9-fix-warnings.patch deleted file mode 100644 index a32ab60868a6..000000000000 --- a/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.9-fix-warnings.patch +++ /dev/null @@ -1,146 +0,0 @@ ---- 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/files/v4l-dvb-saa716x-Makefilepatch-2.diff b/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-Makefilepatch-2.diff deleted file mode 100644 index 78ba021fb4fe..000000000000 --- a/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-Makefilepatch-2.diff +++ /dev/null @@ -1,8 +0,0 @@ ---- 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+ diff --git a/media-tv/v4l-dvb-saa716x/metadata.xml b/media-tv/v4l-dvb-saa716x/metadata.xml index 953cd1bea14f..604d7cb0bbca 100644 --- a/media-tv/v4l-dvb-saa716x/metadata.xml +++ b/media-tv/v4l-dvb-saa716x/metadata.xml @@ -1,18 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>martin.dummer@gmx.net</email> - <name>Martin Dummer</name> - </maintainer> - <maintainer type="project"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> - <use> - <flag name="firmware">Install firmware</flag> - </use> - <upstream> - <remote-id type="bitbucket">powARman/v4l-dvb-saa716x</remote-id> - </upstream> -</pkgmetadata> + <maintainer type="person"> + <email>martin.dummer@gmx.net</email> + <name>Martin Dummer</name> + </maintainer> + <maintainer type="project"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <upstream> + <remote-id type="bitbucket">powARman/v4l-dvb-saa716x</remote-id> + </upstream> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20170225-r3.ebuild b/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20170225-r3.ebuild deleted file mode 100644 index 331af00aebdc..000000000000 --- a/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20170225-r3.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -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/overview" - -HG_REVISION="3b9fce66666a" -HG_REVISION_DATE="20160322" - -SRC_URI="https://bitbucket.org/powARman/v4l-dvb-saa716x/get/${HG_REVISION}.tar.gz --> v4l-dvb-saa716x-0.0.1_p${HG_REVISION_DATE}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~x86" -IUSE="+firmware" - -DEPEND="" -RDEPEND="${DEPEND} - firmware? ( sys-firmware/tt-s2-6400-firmware )" - -S="${WORKDIR}/powARman-v4l-dvb-saa716x-${HG_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 - - eapply -p0 "${FILESDIR}/OSD_RAW_CMD_patch_2.diff" - eapply "${FILESDIR}/v4l-dvb-saa716x-Makefilepatch-2.diff" - kernel_is ge 3 19 0 && eapply "${FILESDIR}/v4l-dvb-saa716x-3.19-set_gpio.patch" - kernel_is ge 4 2 0 && eapply "${FILESDIR}/v4l-dvb-saa716x-4.2-fix-compile.patch" - kernel_is ge 4 5 2 && eapply "${FILESDIR}/v4l-dvb-saa716x-4.5.2-fix-compile.patch" - kernel_is ge 4 6 0 && eapply "${FILESDIR}/v4l-dvb-saa716x-4.6.0-fix-compile.patch" - kernel_is ge 4 9 0 && eapply "${FILESDIR}/v4l-dvb-saa716x-4.9-fix-warnings.patch" - kernel_is ge 4 10 0 && eapply "${FILESDIR}/v4l-dvb-saa716x-4.10-fix-compile.patch" -} - -src_compile() { - BUILD_PARAMS="SUBDIRS=${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/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20170225-r4.ebuild b/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20170225-r4.ebuild deleted file mode 100644 index 01a1f825cf79..000000000000 --- a/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20170225-r4.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 2019-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" -IUSE="+firmware" - -DEPEND="" -RDEPEND="${DEPEND} - firmware? ( 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 - - eapply -p0 "${FILESDIR}/OSD_RAW_CMD_patch_2.diff" - eapply "${FILESDIR}/v4l-dvb-saa716x-Makefilepatch-2.diff" - kernel_is ge 3 19 0 && eapply "${FILESDIR}/v4l-dvb-saa716x-3.19-set_gpio.patch" - kernel_is ge 4 2 0 && eapply "${FILESDIR}/v4l-dvb-saa716x-4.2-fix-compile.patch" - kernel_is ge 4 5 2 && eapply "${FILESDIR}/v4l-dvb-saa716x-4.5.2-fix-compile.patch" - kernel_is ge 4 6 0 && eapply "${FILESDIR}/v4l-dvb-saa716x-4.6.0-fix-compile.patch" - kernel_is ge 4 9 0 && eapply "${FILESDIR}/v4l-dvb-saa716x-4.9-fix-warnings.patch" - kernel_is ge 4 10 0 && eapply "${FILESDIR}/v4l-dvb-saa716x-4.10-fix-compile.patch" - kernel_is ge 4 14 0 && eapply "${FILESDIR}/v4l-dvb-saa716x-4.14.0-fix-compile.patch" - kernel_is ge 4 15 0 && eapply "${FILESDIR}/v4l-dvb-saa716x-4.15-fix-autorepeat.patch" - kernel_is ge 4 15 0 && eapply "${FILESDIR}/v4l-dvb-saa716x-4.15-fix-timers.patch" - kernel_is ge 4 16 0 && eapply "${FILESDIR}/v4l-dvb-saa716x-4.16-fix-compile.patch" - kernel_is ge 4 17 0 && eapply "${FILESDIR}/v4l-dvb-saa716x-4.17-define-AUDIO_GET_PTS.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/v4l-utils/metadata.xml b/media-tv/v4l-utils/metadata.xml index 676378917cd1..2155bf95f086 100644 --- a/media-tv/v4l-utils/metadata.xml +++ b/media-tv/v4l-utils/metadata.xml @@ -1,11 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>chewi@gentoo.org</email> - <name>James Le Cuirot</name> - </maintainer> -<use> - <flag name="bpf">Enables support for IR BPF decoders.</flag> -</use> -</pkgmetadata> + <maintainer type="person"> + <email>chewi@gentoo.org</email> + <name>James Le Cuirot</name> + </maintainer> + + <use> + <flag name="bpf">Enables support for IR BPF decoders.</flag> + </use> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/media-tv/w_scan/metadata.xml b/media-tv/w_scan/metadata.xml index 7a38bb900964..83d00b14c8d4 100644 --- a/media-tv/w_scan/metadata.xml +++ b/media-tv/w_scan/metadata.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> -</pkgmetadata> + + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file diff --git a/media-tv/xmltv/metadata.xml b/media-tv/xmltv/metadata.xml index 0a5d27cb0548..d53969f26b78 100644 --- a/media-tv/xmltv/metadata.xml +++ b/media-tv/xmltv/metadata.xml @@ -1,52 +1,52 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>thebitpit@austincustomerrands.com</email> - <name>Wilson Michaels</name> - </maintainer> - <maintainer type="project"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> - <use> - <flag name="ar">Argentina tv listing grabber</flag> - <flag name="ch-search">Grabber for Switzerland</flag> - <flag name="dk">Denmark tv listing grabber</flag> - <flag name="dtvla">Latin America digital tv listing grabber</flag> - <flag name="es-laguiatv">Spain alternative grabber</flag> - <flag name="eu-dotmedia">Grabber for Europe (xmltv.se / dotmedia)</flag> - <flag name="eu-epg">EPG grabber for some European countries.</flag> - <flag name="eu-epgdata">include fanart URLs for some European countries.</flag> - <flag name="eu-xmltvse">Grabbber for Europe [replaces eu-dotmedia and se-tvzon]</flag> - <flag name="fi">Finland tv listing grabber (0.6.1 add ampparit telsu)</flag> - <flag name="fi-sv">Grabber for Finland (Swedish)</flag> - <flag name="fr">France tv listing grabber</flag> - <flag name="fr-kazer">France (Kazer) tv listing grabber</flag> - <flag name="huro">Hungarian tv listing grabber</flag> - <flag name="il">Israel tv listing grabber</flag> - <flag name="is">Iceland tv listing grabber</flag> - <flag name="it">Italy tv listing grabber (RUV)</flag> - <flag name="na-dd">North America tv listing grabber</flag> - <flag name="na-dtv">North America Direct TV grabber</flag> - <flag name="na-tvmedia">Grabber for North America (TVMedia)</flag> - <flag name="nl">Netherlands tv listing grabber [REMOVED 0.6.1]</flag> - <flag name="no-gf">Norway Gfeed tv listing grabber</flag> - <flag name="pt-meo">Grabber for Portugal (MEO)</flag> - <flag name="pt-vodafone">Grabber for Portugal (Vodafone)</flag> - <flag name="se-swedb">Sweden tv listing grabber</flag> - <flag name="se-tvzon">Sweden (tvzon.se) tv listing grabber</flag> - <flag name="tr">Turkey (Digiturk) tv listing grabber</flag> - <flag name="tv-check">enable GUI checking</flag> - <flag name="tv-combiner">enable grabbers combiner</flag> - <flag name="tv-pick-cgi">enable CGI support</flag> - <flag name="uk-bleb">Britain tv listing grabber</flag> - <flag name="uk-tvguide">UK and Ireland tv listing grabber using TV Guide website</flag> - <flag name="zz-sdjson">Grabber for schedulesDirect.org SD-JSON service (many countries)</flag> - <flag name="zz-sdjson-sqlite">Grabber for schedulesDirect.org SD-JSON service (sqlite DB)</flag> - </use> - <upstream> - <remote-id type="github">XMLTV/xmltv</remote-id> - </upstream> -</pkgmetadata> - + <maintainer type="person"> + <email>thebitpit@austincustomerrands.com</email> + <name>Wilson Michaels</name> + </maintainer> + <maintainer type="project"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <upstream> + <remote-id type="github">XMLTV/xmltv</remote-id> + </upstream> + <use> + <flag name="ar">Argentina tv listing grabber</flag> + <flag name="ch-search">Grabber for Switzerland</flag> + <flag name="dk">Denmark tv listing grabber</flag> + <flag name="dtvla">Latin America digital tv listing grabber</flag> + <flag name="es-laguiatv">Spain alternative grabber</flag> + <flag name="eu-dotmedia">Grabber for Europe (xmltv.se / dotmedia)</flag> + <flag name="eu-epg">EPG grabber for some European countries.</flag> + <flag name="eu-epgdata">include fanart URLs for some European countries.</flag> + <flag name="eu-xmltvse">Grabbber for Europe [replaces eu-dotmedia and se-tvzon]</flag> + <flag name="fi">Finland tv listing grabber (0.6.1 add ampparit telsu)</flag> + <flag name="fi-sv">Grabber for Finland (Swedish)</flag> + <flag name="fr">France tv listing grabber</flag> + <flag name="fr-kazer">France (Kazer) tv listing grabber</flag> + <flag name="huro">Hungarian tv listing grabber</flag> + <flag name="il">Israel tv listing grabber</flag> + <flag name="is">Iceland tv listing grabber</flag> + <flag name="it">Italy tv listing grabber (RUV)</flag> + <flag name="na-dd">North America tv listing grabber</flag> + <flag name="na-dtv">North America Direct TV grabber</flag> + <flag name="na-tvmedia">Grabber for North America (TVMedia)</flag> + <flag name="nl">Netherlands tv listing grabber [REMOVED 0.6.1]</flag> + <flag name="no-gf">Norway Gfeed tv listing grabber</flag> + <flag name="pt-meo">Grabber for Portugal (MEO)</flag> + <flag name="pt-vodafone">Grabber for Portugal (Vodafone)</flag> + <flag name="se-swedb">Sweden tv listing grabber</flag> + <flag name="se-tvzon">Sweden (tvzon.se) tv listing grabber</flag> + <flag name="tr">Turkey (Digiturk) tv listing grabber</flag> + <flag name="tv-check">enable GUI checking</flag> + <flag name="tv-combiner">enable grabbers combiner</flag> + <flag name="tv-pick-cgi">enable CGI support</flag> + <flag name="uk-bleb">Britain tv listing grabber</flag> + <flag name="uk-tvguide">UK and Ireland tv listing grabber using TV Guide website</flag> + <flag name="zz-sdjson">Grabber for schedulesDirect.org SD-JSON service (many countries)</flag> + <flag name="zz-sdjson-sqlite">Grabber for schedulesDirect.org SD-JSON service (sqlite DB)</flag> + </use> + <origin>gentoo-staging</origin> +</pkgmetadata>
\ No newline at end of file |