From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0FA11158020 for ; Tue, 15 Nov 2022 18:17:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 840A3E0ABB; Tue, 15 Nov 2022 18:17:07 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 68F57E0ABB for ; Tue, 15 Nov 2022 18:17:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2049F340F37 for ; Tue, 15 Nov 2022 18:17:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7CD3E75E for ; Tue, 15 Nov 2022 18:17:03 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1668536216.6f2e180a97ba9b89e5a10a1c9bff69b1a3999c9d.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-tv/mythtv/, media-tv/mythtv/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-tv/mythtv/Manifest media-tv/mythtv/files/mythtv-31.0-Include_QPainterPath.patch media-tv/mythtv/files/mythtv-31.0-Remove_ldconfig.patch media-tv/mythtv/mythtv-31.0-r7.ebuild X-VCS-Directories: media-tv/mythtv/files/ media-tv/mythtv/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 6f2e180a97ba9b89e5a10a1c9bff69b1a3999c9d X-VCS-Branch: master Date: Tue, 15 Nov 2022 18:17:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1241631f-2169-499f-8d4f-b855710d38d1 X-Archives-Hash: fea4c78af7b2a8589923d82f3ce97738 commit: 6f2e180a97ba9b89e5a10a1c9bff69b1a3999c9d Author: Michał Górny gentoo org> AuthorDate: Tue Nov 15 18:09:00 2022 +0000 Commit: Michał Górny gentoo org> CommitDate: Tue Nov 15 18:16:56 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f2e180a media-tv/mythtv: Remove py3.8-only versions Signed-off-by: Michał Górny gentoo.org> media-tv/mythtv/Manifest | 1 - .../files/mythtv-31.0-Include_QPainterPath.patch | 15 - .../mythtv/files/mythtv-31.0-Remove_ldconfig.patch | 13 - media-tv/mythtv/mythtv-31.0-r7.ebuild | 437 --------------------- 4 files changed, 466 deletions(-) diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest index 8f45d129c78d..4ecb2ca1f93c 100644 --- a/media-tv/mythtv/Manifest +++ b/media-tv/mythtv/Manifest @@ -1,3 +1,2 @@ -DIST mythtv-31.0.tar.gz 102552136 BLAKE2B b09b41230eb2cae19d770c3cc59151863e0a56e95a86627473d52613e62f0acf3bd0c4bb37afb340ab874c222899f9d3c219ded470785d27960db9b39d784ceb SHA512 d53817231409934ef37d12739c38cf6936f04f816b0ba1c9738ce99b5b4ff387c70b683ccd84f649ff2f74992b2158829f5f1d1ffe06c8768da1922b90439f6e DIST mythtv-31.0_p20210731.tar.gz 102637029 BLAKE2B 0ca6124d20d428c8b9999813c819c01a97c4806fbd2f70f5b50d698c5f9c3cafd3141ee1379b2b63510705e2083109d91362c3fcc6277f58d461f2138d1604fd SHA512 e262ce91fd8a523daa772d13675ff6639f95202f66be67b2a405e9ea9204d6663128621c5142752f2a889e25cbc8be6d92b3759508767e94207326343a91f092 DIST mythtv-32.0.tar.gz 115960698 BLAKE2B 3be4106fa2c4fcb95fd5414b347fd6256658566bbb9775ed32cb9686e4a61ecf89e7c684db8d3408292c3737ae6090771862aa65ac0d5d467e90c3a110484898 SHA512 6a1472c954b929319a570d76769ababad43d086d53b6679c9d6da91446677f04b71918b326bb4ff0fc16fbaf7d9a447a86f623a6f1399f9ed29ca86a9782396c diff --git a/media-tv/mythtv/files/mythtv-31.0-Include_QPainterPath.patch b/media-tv/mythtv/files/mythtv-31.0-Include_QPainterPath.patch deleted file mode 100644 index f0f09a5c4517..000000000000 --- a/media-tv/mythtv/files/mythtv-31.0-Include_QPainterPath.patch +++ /dev/null @@ -1,15 +0,0 @@ -# Change in upstream master after release mythtv-31.0 - -diff --git a/mythtv/libs/libmythui/mythpainter.cpp b/mythtv/libs/libmythui/mythpainter.cpp -index 639ea41b30..221a7fe2b7 100644 ---- a/libs/libmythui/mythpainter.cpp -+++ b/libs/libmythui/mythpainter.cpp -@@ -5,6 +5,7 @@ - // QT headers - #include - #include -+#include - - // libmythbase headers - #include "mythlogging.h" - diff --git a/media-tv/mythtv/files/mythtv-31.0-Remove_ldconfig.patch b/media-tv/mythtv/files/mythtv-31.0-Remove_ldconfig.patch deleted file mode 100644 index 7182f4e69f86..000000000000 --- a/media-tv/mythtv/files/mythtv-31.0-Remove_ldconfig.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/mythtv/programs/mythfrontend/mythfrontend.pro b/mythtv/programs/mythfrontend/mythfrontend.pro -index 82c9ea1bb6..cd6894dcbc 100644 ---- a/programs/mythfrontend/mythfrontend.pro -+++ b/programs/mythfrontend/mythfrontend.pro -@@ -21,7 +21,6 @@ INSTALLS = target - - setting.path = $${PREFIX}/share/mythtv/ - setting.files += MFEXML_scpd.xml --setting.extra = -ldconfig - - INSTALLS += setting - - diff --git a/media-tv/mythtv/mythtv-31.0-r7.ebuild b/media-tv/mythtv/mythtv-31.0-r7.ebuild deleted file mode 100644 index ae6bd247778e..000000000000 --- a/media-tv/mythtv/mythtv-31.0-r7.ebuild +++ /dev/null @@ -1,437 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8} ) - -MY_P=${P%_p*} -MY_PV=${PV%_p*} - -inherit eutils flag-o-matic python-any-r1 qmake-utils readme.gentoo-r1 systemd user-info - -MYTHTV_BRANCH="fixes/${P%.*}" - -DESCRIPTION="Open Source DVR and media center hub" -HOMEPAGE="https://www.mythtv.org https://github.com/MythTV/mythtv" -SRC_URI="https://github.com/MythTV/mythtv/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2+" -KEYWORDS="~amd64 ~x86" -SLOT="0" - -IUSE_INPUT_DEVICES="input_devices_joystick" -IUSE_VIDEO_CAPTURE_DEVICES="v4l ivtv ieee1394 hdpvr hdhomerun vbox ceton" -IUSE="alsa asi autostart bluray cdda cdr cec cpu_flags_ppc_altivec debug dvd dvb egl exif fftw jack java - +lame lcd libass lirc nvdec +opengl oss perl pulseaudio python raw systemd vaapi vdpau vpx - +wrapper x264 x265 +xml xmltv +xvid +X zeroconf - ${IUSE_INPUT_DEVICES} ${IUSE_VIDEO_CAPTURE_DEVICES}" - -REQUIRED_USE=" - bluray? ( xml ) - cdr? ( cdda ) -" -RDEPEND=" - acct-user/mythtv - dev-libs/glib:2 - dev-libs/lzo - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5[jpeg] - dev-qt/qtnetwork:5 - dev-qt/qtscript:5 - dev-qt/qtsql:5[mysql] - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - media-fonts/corefonts - media-fonts/dejavu - media-fonts/liberation-fonts - media-fonts/tex-gyre - media-gfx/exiv2:= - "${S}"/VERSION -# echo "BRANCH=\"${MYTHTV_BRANCH}\"" >> "${S}"/VERSION -# echo "SOURCE_VERSION=\"${BACKPORTS}\"" > "${S}"/EXPORTED_VERSION -# echo "BRANCH=\"${MYTHTV_BRANCH}\"" >> "${S}"/EXPORTED_VERSION -} - -src_configure() { - local -a myconf - - # Setup paths - myconf+=(--prefix="${EPREFIX}"/usr) - myconf+=(--libdir="${EPREFIX}"/usr/$(get_libdir)) - myconf+=(--libdir-name=$(get_libdir)) - myconf+=(--mandir="${EPREFIX}"/usr/share/man) - - if use debug; then - myconf+=(--compile-type=debug) - myconf+=(--disable-stripping) # FIXME: does not disable for all files, only for some - myconf+=(--enable-valgrind) # disables timeouts for valgrind memory debugging - else - myconf+=(--compile-type=release) - fi - - # Build boosters - has ccache "${FEATURES}" || myconf+=(--disable-ccache) - has distcc "${FEATURES}" || myconf+=(--disable-distcc) - - # CPU settings - # Mythtv's configure is borrowed from ffmpeg, - # Bug #172723 - # Try to get cpu type based on CFLAGS. - # We need to do this so that features of that CPU will be better used - # If they contain an unknown CPU it will not hurt since ffmpeg's configure - # will just ignore it. - for i in $(get-flag march) $(get-flag mcpu) $(get-flag mtune) ; do - [ "${i}" = "native" ] && i="host" # bug #273421 - myconf+=(--cpu="${i}") - break - done - myconf+=($(use_enable cpu_flags_ppc_altivec altivec)) - - # Sound Output Support - myconf+=( - $(use_enable oss audio-oss) - $(use_enable alsa audio-alsa) - $(use_enable jack audio-jack) - $(use_enable pulseaudio audio-pulseoutput) - ) - - # Input Support - myconf+=( - $(use_enable lirc) - $(use_enable input_devices_joystick joystick-menu) - $(use_enable cec libcec) - $(use_enable ieee1394 firewire) - $(use_enable hdhomerun) - $(use_enable vbox) - $(use_enable ceton) - $(use_enable v4l v4l2) - $(use_enable ivtv) - $(use_enable hdpvr) - $(use_enable dvb) - $(use_enable asi) - ) - - # Video Output Support - myconf+=( - $(use_enable X x11) - $(use_enable X xrandr) - ) - - # Hardware accellerators - myconf+=( - $(use_enable nvdec) - $(use_enable vaapi) - $(use_enable vdpau) - $(use_enable opengl) - $(use_enable libass) - ) - - # System tools - myconf+=( - $(use_enable systemd systemd_notify) - $(use_enable systemd systemd_journal) - $(use_enable xml libxml2) - $(use_enable zeroconf libdns-sd) - ) - - # Bindings - if use perl && use python; then - myconf+=(--with-bindings=perl,python) - elif use perl; then - myconf+=(--without-bindings=python) - myconf+=(--with-bindings=perl) - elif use python; then - myconf+=(--without-bindings=perl) - myconf+=(--with-bindings=python) - else - myconf+=(--without-bindings=perl,python) - fi - use python && myconf+=(--python="${EPYTHON}") - myconf+=($(use_enable java bdjava)) - - # External codec library options (used for mythffmpeg and streaming transcode) - # lame is required for some broadcasts for silence detection of commercials - # default enable in IUSE with +lame - myconf+=( - $(use_enable lame libmp3lame) - $(use_enable xvid libxvid) - $(use_enable x264 libx264) - $(use_enable x265 libx265) - $(use_enable vpx libvpx) - ) - - # Clean up DSO load times and other compiler bits - myconf+=(--enable-symbol-visibility) - myconf+=(--enable-pic) - - if tc-is-cross-compiler ; then - myconf+=(--enable-cross-compile --arch=$(tc-arch-kernel)) - myconf+=(--cross-prefix="${CHOST}"-) - fi - - myconf+=($(use_enable bluray libbluray_external)) - - # econf sets these options that are not handled by configure: - # --build --host --infodir --localstatedir --sysconfdir - - einfo "Running ./configure ${myconf[@]} - THIS MAY TAKE A WHILE." - ./configure \ - --prefix="${EPREFIX}/usr" \ - --cc="$(tc-getCC)" \ - --cxx="$(tc-getCXX)" \ - --ar="$(tc-getAR)" \ - --optflags="${CFLAGS}" \ - --extra-cflags="${CFLAGS}" \ - --extra-cxxflags="${CXXFLAGS}" \ - --extra-ldflags="${LDFLAGS}" \ - --qmake=$(qt5_get_bindir)/qmake \ - "${myconf[@]}" -} - -src_install() { - emake STRIP="true" INSTALL_ROOT="${D}" install - use python && python_optimize # does all packages by default - dodoc AUTHORS UPGRADING README - readme.gentoo_create_doc - - insinto /usr/share/mythtv/database - doins database/* - - newinitd "${FILESDIR}"/mythbackend.init-r3 mythbackend - newconfd "${FILESDIR}"/mythbackend.conf-r1 mythbackend - if use systemd; then - systemd_newunit "${FILESDIR}"/mythbackend.service-28 mythbackend.service - fi - - dodoc keys.txt - - keepdir /etc/mythtv - fowners -R mythtv /etc/mythtv - keepdir /var/log/mythtv - fowners -R mythtv /var/log/mythtv - - insinto /etc/logrotate.d - newins "${FILESDIR}"/mythtv.logrotate.d-r4 mythtv - - insinto /usr/share/mythtv/contrib - # Ensure we don't install scripts needing the perl bindings (bug #516968) Finding none is OK. - if ! use perl; then - find contrib/ -name '*.pl' -exec rm {} \; - fi - # Ensure we don't install scripts needing the python bindings (bug #516968) Finding none is OK. - if ! use python; then - find contrib/ -name '*.py' -exec rm {} \; - fi - doins -r contrib/* - - # Install our mythfrontend wrapper which is similar to Mythbuntu's - if use wrapper; then - mv "${ED}/usr/bin/mythfrontend" "${ED}/usr/bin/mythfrontend.real" || die "Failed to install mythfrontend.real" - newbin "${FILESDIR}"/mythfrontend.wrapper mythfrontend - newconfd "${FILESDIR}"/mythfrontend.conf mythfrontend - fi - - if use autostart; then - newenvd - 95mythtv <<- _EOF_ - CONFIG_PROTECT=\"$(egethome mythtv)\" - _EOF_ - insinto $(egethome mythtv) - newins "${FILESDIR}"/bash_profile .bash_profile - newins "${FILESDIR}"/xinitrc-r1 .xinitrc - fi - - # Make Python files executable but not files named "__init__.py" - find "${ED}/usr/share/mythtv" -type f -name '*.py' -exec expr \( {} : '.*__init__.py' \) = 0 \; \ - -exec chmod a+x {} \; || die "Failed to make python file $(basename ${file}) executable" - - # Ensure that Python scripts are executed by Python 2 - use python && python_fix_shebang "${ED}/usr/share/mythtv" - - # Make shell & perl scripts executable - find "${ED}" -type f \( -name '*.sh' -o -name '*.pl' \) -exec chmod a+x {} \; || die "Failed to make script executable" -} - -pkg_postinst() { - readme.gentoo_print_elog -} - -pkg_info() { - return -} - -pkg_config() { - if [[ -e "${EROOT}"/usr/bin/mysql ]]; then - "${EROOT}"/usr/bin/mysql -u root -p < "${EROOT}"/usr/share/mythtv/database/mc.sql - fi -}