diff options
Diffstat (limited to 'media-libs')
-rw-r--r-- | media-libs/Manifest.gz | bin | 67069 -> 67056 bytes | |||
-rw-r--r-- | media-libs/gmmlib/Manifest | 4 | ||||
-rw-r--r-- | media-libs/gmmlib/gmmlib-22.3.0.ebuild | 35 | ||||
-rw-r--r-- | media-libs/gmmlib/gmmlib-9999.ebuild | 2 | ||||
-rw-r--r-- | media-libs/libva-intel-media-driver/Manifest | 2 | ||||
-rw-r--r-- | media-libs/libva-intel-media-driver/libva-intel-media-driver-22.6.1.ebuild | 54 | ||||
-rw-r--r-- | media-libs/phonon-gstreamer/Manifest | 2 | ||||
-rw-r--r-- | media-libs/phonon-gstreamer/files/phonon-gstreamer-4.10.0-wayland.patch | 46 | ||||
-rw-r--r-- | media-libs/phonon-gstreamer/phonon-gstreamer-4.10.0-r1.ebuild | 43 | ||||
-rw-r--r-- | media-libs/pulseaudio-qt/Manifest | 2 | ||||
-rw-r--r-- | media-libs/pulseaudio-qt/files/pulseaudio-qt-1.3-no-crash-if-no-server-response.patch | 44 | ||||
-rw-r--r-- | media-libs/pulseaudio-qt/pulseaudio-qt-1.3-r3.ebuild | 36 |
12 files changed, 268 insertions, 2 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz Binary files differindex 07dab6f5f345..1152a9400ef3 100644 --- a/media-libs/Manifest.gz +++ b/media-libs/Manifest.gz diff --git a/media-libs/gmmlib/Manifest b/media-libs/gmmlib/Manifest index 6e6c4f68e9e9..67eced32b454 100644 --- a/media-libs/gmmlib/Manifest +++ b/media-libs/gmmlib/Manifest @@ -3,7 +3,9 @@ AUX gmmlib-20.3.2_cmake_project.patch 145 BLAKE2B f42306b41a0c62ea9d3d5bfe3d1e1f AUX gmmlib-22.1.1_custom_cflags.patch 2963 BLAKE2B af9979ee3c7977c93288b6afd0c0a65451f6f06cffbb00d32d53541410beded1feb6212bb0a5b7820e4ba8c4ee03656f274b94a26e0688e90e0ad140b37ee4a2 SHA512 933a9234f178ec566ca88fd3b48d746ac869936acfd5541d8b6b3cac3125c029054fe385101d734e5e35eeb9393f1609be96c9bcc2f1e0bb79a7295ccdd6c292 DIST intel-gmmlib-22.1.8.tar.gz 818360 BLAKE2B 5a7dadaead925eddfe52770c73eea92b8f071b498a2ed8d23928c93ba3d0284d9046339b7eb641918b17bf13bbcffc071ba71ba47cc53760258b1bb39f175e17 SHA512 4520105c7ceaae30e592acce7bae65841ecdb5d74c888cf03a2308a94a63d998941665794933c8247dbae841d13386ee99b365de0c6a5676acc960386c19ca2c DIST intel-gmmlib-22.2.1.tar.gz 820241 BLAKE2B 64eed8c1863d85355f47b3bfdd2740d2472f256a679189520d284c635a1ad722ed090d503b9e224ac262498091872e686cb1732be135627d7ec8170c946a6f80 SHA512 d3a68de83946319d582ff2d7785adaf007ea744fba6b1e9e2c53023f0b01b506f500aae3c4305c01bb97ce9176d39ae884fa306b1a075b1f2758faad3a1e0462 +DIST intel-gmmlib-22.3.0.tar.gz 843176 BLAKE2B 8874012deec80f5639a4fd1e0f7d94f9b683ad02fb140a4bc365ba1369bf2996ed19e4ccd45832e513017aedaaf34e76d88fd46838a02e15cb93921f70d414f6 SHA512 461057be96ecb6b5e84bfa55e486ee898133305ee65d31006aaf4509500da5a3ca7bbd8a7fbb77dee934e0eee97bd0edfc66d7d8dafcb55cc114f3b4d0ccc583 EBUILD gmmlib-22.1.8.ebuild 795 BLAKE2B 6bcec2581a34ec5a169eaa3508c8d7e6085865b6df1d2746db4c114eeebfd082636a3bb1aad3c6f72bc00a87effc4e32921f8d315ee58db95d71a495be00afcc SHA512 d366ef04a77026dbb3d1cae5d4e4bf74846cb6a4b7842c218f04889d0e0a0450d3ad28016a3492f5ff723dff4ac16bfd00e2d618bfb7e3400a4e841451d6c7f8 EBUILD gmmlib-22.2.1.ebuild 795 BLAKE2B 88959d7c98aba9bf4e9d1ac3cd7ab4520b547be03b21d7d341522d6f4440f2693c2e4e1f2f42dd58162edf564d3f0727bcccfc720ec36f50ef3c152fe6ad6251 SHA512 c616582ac1a65fab06d8bb4ff8119a263b46d41887d06012ab84999da0d309c004170eb4f354b821b4d06be23e195beede809c1b0a5b6da61b2a812054aa30c2 -EBUILD gmmlib-9999.ebuild 875 BLAKE2B e3b152fddf160615a384564528294e34a3e974cbca2c449c5f0c8eb35be42b0a5effca7c5f5206e0e557f1b3e97631285da731dededed27e61581bb0994236aa SHA512 c5c5798eb82b6ad5872c0b52888cb2ee3effd989b0aa1fa8b3c000c3f9842d8789e350b718d2a78c9ca465b63b90b2873eadae0528ebda3a9435b1729388b849 +EBUILD gmmlib-22.3.0.ebuild 796 BLAKE2B f5c333307a819ae40fe15abc1db665f1553bdd5010739fc05a2cbcb6022eb1b7f722a26276476d75a4efcddee50de10c2f749e59d26aa8abbe22e60cb3d0a2a4 SHA512 a23619b88f583d312fbf316dde75d8a84ad2c9266566404a631159ad8b216d67488e093bd595101c96b81f755f7cb18b2151354ce298e4d74a56f225251881a4 +EBUILD gmmlib-9999.ebuild 875 BLAKE2B 7023f9e4f92483e48cd0f7ca9395739df74d4ccc104fb45a76cdcb5ca74ccf75445e14a87355d302cc290108a0bf4c0bdae4a7831f1bba30c40b3e7872767c4e SHA512 815c3eb892de44f887c66f33ea54e19634871b9e147e5c6ab75d73e46b3500935656c04a3c46305ae921afc3fb6bdfeabfecc87e27c5b573a906be693985c609 MISC metadata.xml 401 BLAKE2B b8c3f2935afa450ec0eeedd745e91b14ed18386a87edc77d17894db4764b681cf1c1b80bac714662f506a9092813525f2365aad31d01b64dd8709da2df6c07f4 SHA512 ce6959033b6682ab01f830b869c972fcb774d241bca62faed86f6e1705eb2f6a7615f8781c7c75118ac5fd6bae096c08cf6a2e965429bbdcbe9f598ae67f91f7 diff --git a/media-libs/gmmlib/gmmlib-22.3.0.ebuild b/media-libs/gmmlib/gmmlib-22.3.0.ebuild new file mode 100644 index 000000000000..a09ea1013a10 --- /dev/null +++ b/media-libs/gmmlib/gmmlib-22.3.0.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CMAKE_BUILD_TYPE="Release" + +inherit cmake + +DESCRIPTION="Intel Graphics Memory Management Library" +HOMEPAGE="https://github.com/intel/gmmlib" +SRC_URI="https://github.com/intel/gmmlib/archive/intel-${P}.tar.gz" +S="${WORKDIR}/${PN}-intel-${P}" + +KEYWORDS="~amd64" +LICENSE="MIT" +SLOT="0/12.3" +IUSE="+custom-cflags test" +RESTRICT="!test? ( test )" + +PATCHES=( + "${FILESDIR}"/${PN}-20.2.2_conditional_testing.patch + "${FILESDIR}"/${PN}-20.3.2_cmake_project.patch + "${FILESDIR}"/${PN}-22.1.1_custom_cflags.patch +) + +src_configure() { + local mycmakeargs=( + -DBUILD_TESTING="$(usex test)" + -DBUILD_TYPE="Release" + -DOVERRIDE_COMPILER_FLAGS="$(usex !custom-cflags)" + ) + + cmake_src_configure +} diff --git a/media-libs/gmmlib/gmmlib-9999.ebuild b/media-libs/gmmlib/gmmlib-9999.ebuild index 07dd695c5ff3..7042078bafaa 100644 --- a/media-libs/gmmlib/gmmlib-9999.ebuild +++ b/media-libs/gmmlib/gmmlib-9999.ebuild @@ -20,7 +20,7 @@ HOMEPAGE="https://github.com/intel/gmmlib" SRC_URI="" LICENSE="MIT" -SLOT="0/12.2" +SLOT="0/12.3" IUSE="test +custom-cflags" RESTRICT="!test? ( test )" diff --git a/media-libs/libva-intel-media-driver/Manifest b/media-libs/libva-intel-media-driver/Manifest index 35efb33a5cfe..6ddda8649ac7 100644 --- a/media-libs/libva-intel-media-driver/Manifest +++ b/media-libs/libva-intel-media-driver/Manifest @@ -5,9 +5,11 @@ DIST intel-media-22.4.4.tar.gz 27437439 BLAKE2B 63bee317ff12c34e7a2da9f5dce51ebb DIST intel-media-22.5.3.1.tar.gz 27492012 BLAKE2B e300eba764dde8f2d6c07f4768bca253a21ae5f3bcfd829257541fb26c8a997390011a8bfdfab964eafe37fcece5db4826700bccda672ef51b2f62de2ea94d17 SHA512 aab70004aa3bd91ced7b147e4cd4bd662fe0813b2deeaa90e61f4d692d43a302a1e18dad502bbedb5102593f21f9710a56e202f0ba70a58afed139df3bf2bb78 DIST intel-media-22.5.3.tar.gz 27488655 BLAKE2B 90d79ac8e7ab8cb97941d37fe81ce4524cef45e49e4b64e57931f00927cb2065c0b6f8b4fff5aba58cb9ea64548337261e37df13a53ba07c8ab81db160990e6e SHA512 987ca85ed95272945fd8c23a388ca68481ff5fdf74737a04659304e58c6d131c00db03ee134fc3549225a9fc33b874632335f1182d1e0c6d90fbc5ea290b486d DIST intel-media-22.5.4.tar.gz 27493483 BLAKE2B ac6a93e06eec33edd823b1fd4310cd635f20229ce1ba1d52eb36a11b8fcaf484c836261cb5e8437889208e9b268f29f78a241867629eb517fbada28a314bb4dc SHA512 9e7e4d7f33d0248f3d2288239ca121cd8c748a98587384e69c92aeedf4b9ce7ff585cac06b260713f9cd95936d270c36e6981bc500c2a6bee7276d0e238f4b74 +DIST intel-media-22.6.1.tar.gz 27578189 BLAKE2B 733168dab6f218814564eaa7315c25e64305e7b8717364da74d1e4a3261e6a008aa325459b593c5df37e2b88d6ddc0dcff40359bbce2b2b920ec4afe04df5764 SHA512 068b3e928b69fc61c13bcba68c985aabc66f8cc4fa6373cbf00f6bef949822c297d2dd9014dc454a99322e0dd150210affdafbdf0e918776f78f3fdda6462ddb EBUILD libva-intel-media-driver-22.4.4.ebuild 1371 BLAKE2B f39c670b03e589f23277ff4c0416ecce09637ee0323e70a1d71c97ccb319b2fb1b47a218ae7f006c7cbace0085ed21d70d38e91e9f27e5fbee42bdbe0553f796 SHA512 b1217cfb4ba440520664d839bd5d5e0193c6b9107167a2dfd264015a0a38900a4e36e0326e459feb3a5ced5b10e54f9583f32bfe40540100eaec66c52412823b EBUILD libva-intel-media-driver-22.5.3.1.ebuild 1349 BLAKE2B 0bd3d76f5d3f7d9ec48ab77a424d3ef24c902484be12b3549f0d2dffe3857c49c09f08bdc3b48ad27aece6dddaff5de25cb7597a602dd1097f48bd2466c86a36 SHA512 125bac3e4dabaf97c8c4a6e1ac6fbde226adb6bce69942bbe2d03807a533bd518b71e000461810674aeec67038d7ffa5e9447ec89581dfe28380528f2a1a36a9 EBUILD libva-intel-media-driver-22.5.3.ebuild 1349 BLAKE2B 0bd3d76f5d3f7d9ec48ab77a424d3ef24c902484be12b3549f0d2dffe3857c49c09f08bdc3b48ad27aece6dddaff5de25cb7597a602dd1097f48bd2466c86a36 SHA512 125bac3e4dabaf97c8c4a6e1ac6fbde226adb6bce69942bbe2d03807a533bd518b71e000461810674aeec67038d7ffa5e9447ec89581dfe28380528f2a1a36a9 EBUILD libva-intel-media-driver-22.5.4.ebuild 1348 BLAKE2B 06e45d9018fdfd720c9e2251d179cfb28db544595ef2daede5bce4c37e35c5e22b7a335fb19f7d239c5ed017362b91601144aa00efc836470c42ff88c21aef22 SHA512 5525f59567a4cba6ae9ed1d0db84c01445e349a2c9bb8040a08b503d98533a45559d7c128b895fdd9e6479ceb0ead7e71d95f9f899257166df59931d0ceacbdf +EBUILD libva-intel-media-driver-22.6.1.ebuild 1349 BLAKE2B 0bd3d76f5d3f7d9ec48ab77a424d3ef24c902484be12b3549f0d2dffe3857c49c09f08bdc3b48ad27aece6dddaff5de25cb7597a602dd1097f48bd2466c86a36 SHA512 125bac3e4dabaf97c8c4a6e1ac6fbde226adb6bce69942bbe2d03807a533bd518b71e000461810674aeec67038d7ffa5e9447ec89581dfe28380528f2a1a36a9 EBUILD libva-intel-media-driver-9999.ebuild 1372 BLAKE2B a48874cc6d1cff79803390c8f1ff2651ddb6464f21365d74a2f0b7bc97e392ad0eefa0002f659feda8db7b3424d66938db48be1a238c8bbd76eed220fd241507 SHA512 d6414971a1487d155214b8cfdc053b4657364e547aeafdc3d18d8f16bea241a2b775616f614a4c5320c6c52f119e20ae3ea208f23af684ee712f90bc006ef487 MISC metadata.xml 416 BLAKE2B 749876c200cd1ef9b1ecb850c8fc0c208ec2f51f7ea521621758f6e08851beb536efb8f042057eeb8289ffc46bd5ca2ed3b1117c581be28b7bc5c0b78b23236a SHA512 0acedef15e1a7f39639116b9fa911433ecd024bb404de211fab032c56f105690fbb5ee82bf66afb324760d548230727aa273c4f77396ac3e7029bebc2d0e53f7 diff --git a/media-libs/libva-intel-media-driver/libva-intel-media-driver-22.6.1.ebuild b/media-libs/libva-intel-media-driver/libva-intel-media-driver-22.6.1.ebuild new file mode 100644 index 000000000000..92a6257bc1b1 --- /dev/null +++ b/media-libs/libva-intel-media-driver/libva-intel-media-driver-22.6.1.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +if [[ ${PV} == *9999 ]] ; then + : ${EGIT_REPO_URI:="https://github.com/intel/media-driver"} + if [[ ${PV%9999} != "" ]] ; then + : ${EGIT_BRANCH:="release/${PV%.9999}"} + fi + inherit git-r3 +else + MY_PV="${PV%_pre}" + SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${MY_PV}.tar.gz" + S="${WORKDIR}/media-driver-intel-media-${MY_PV}" + if [[ ${PV} != *_pre* ]] ; then + KEYWORDS="~amd64" + fi +fi + +DESCRIPTION="Intel Media Driver for VA-API (iHD)" +HOMEPAGE="https://github.com/intel/media-driver" + +LICENSE="MIT BSD redistributable? ( no-source-code )" +SLOT="0" +IUSE="+redistributable test X" + +RESTRICT="!test? ( test )" + +DEPEND=">=media-libs/gmmlib-22.1.8:= + >=media-libs/libva-2.14.0[X?] +" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}"/${PN}-21.4.2-Remove-unwanted-CFLAGS.patch + "${FILESDIR}"/${PN}-20.4.5_testing_in_src_test.patch +) + +src_configure() { + local mycmakeargs=( + -DMEDIA_BUILD_FATAL_WARNINGS=OFF + -DMEDIA_RUN_TEST_SUITE=$(usex test) + -DBUILD_TYPE=Release + -DPLATFORM=linux + -DCMAKE_DISABLE_FIND_PACKAGE_X11=$(usex !X) + -DENABLE_NONFREE_KERNELS=$(usex redistributable) + -DLATEST_CPP_NEEDED=ON # Seems to be the best option for now + ) + local CMAKE_BUILD_TYPE="Release" + cmake_src_configure +} diff --git a/media-libs/phonon-gstreamer/Manifest b/media-libs/phonon-gstreamer/Manifest index 06fe13f631f9..0a83ebe3d617 100644 --- a/media-libs/phonon-gstreamer/Manifest +++ b/media-libs/phonon-gstreamer/Manifest @@ -1,3 +1,5 @@ +AUX phonon-gstreamer-4.10.0-wayland.patch 2179 BLAKE2B e596a9c542f24eb5cb0e5f724627f7950aff5946eb502cc61e9e674f0e5adaa6cf15747c815e0bc6e86125ecbcbdc39743fc810d365b7007ea939b53a3771639 SHA512 4c5817d048ea3b07d12ef64330e8329390e9a6683f9804072183487d13d860eafab8c21646784dce8b36a021b592a41c64b5ae61d6da2fcaf58a29da16f123ab DIST phonon-backend-gstreamer-4.10.0.tar.xz 98532 BLAKE2B b9182a50810536c46999266bd40996bb59ac982e44d2066c2afd897d3a2feb99e5570e36dcc869098f5b171018f4c339a2e3b8df124eaeb88236073245069859 SHA512 3beaba9ea3a332a6908ebdaa966958e8e8056d79cfb210e82a8edaf08f0a8bacbf8094e91b1b1b936406aa634dabb962e6c1468e4dde3febd9efac1a63ea70a4 +EBUILD phonon-gstreamer-4.10.0-r1.ebuild 1045 BLAKE2B 206393dabe1511af48efb2ef50c341171660587e0519f73858967b48edff563050e57944f8861bcceff60b84bea372e6326f0638bcbb42dbb2a689f2f8548761 SHA512 269095a2b1a2a0a29fddfa247b80fd883adcdc3e328803a5e6818f37723581b5416d26acb03efafa91ed1b2d503e93a2805ec7ac9d154354522e2a4d27274c2c EBUILD phonon-gstreamer-4.10.0.ebuild 979 BLAKE2B 0cef7a1f785270d80d3255526e78618b120942818175eaae72ef8006213d1746b516b1ed02544eaf70f373a434599405718fdf9548094a2e242f2e6ab3d0d2f0 SHA512 42bda195ff29dfa471169b9f0e2c5f97523f7fd6be32fcb5eca234fe677253347b28f142f14751ba8fd42e660a5ae58056fa76e47bbb742d8292ceec5c1bafad MISC metadata.xml 408 BLAKE2B 07776659b5c1bb14bd28befa8caf94e3b2d46da3f71576aac663b01aa0a49ab3344245784e0091bb2ddc651011831e3a607e0bd75c295e9ccd9bea41f00ada24 SHA512 dc126debed190c51ffd8448d379dfa4a3268a800f70bb2356c0139b50de40dde6392db66d17d00a7cef91622ec0dfb99bf4bf54565bcaf62e76ea57edb7db1f7 diff --git a/media-libs/phonon-gstreamer/files/phonon-gstreamer-4.10.0-wayland.patch b/media-libs/phonon-gstreamer/files/phonon-gstreamer-4.10.0-wayland.patch new file mode 100644 index 000000000000..ef1697a8395a --- /dev/null +++ b/media-libs/phonon-gstreamer/files/phonon-gstreamer-4.10.0-wayland.patch @@ -0,0 +1,46 @@ +From bbbb160f30a394655cff9398d17961142388b0f2 Mon Sep 17 00:00:00 2001 +From: David Edmundson <kde@davidedmundson.co.uk> +Date: Wed, 17 Nov 2021 15:20:08 +0000 +Subject: [PATCH] Only create window handles for actual windows + +winId() creates a platform window for the given widget. This makes sense +for the topmost widget in a tree, we can't assume the parent widget is +the topmost widget. + +Doing this on XCB is confusing and wrong, but apparently harmless. Doing +this on wayland causes issues as we promote the parent window to a +subsurface but never show that window leaving things in a bizarre +corrupt state that leads to content not updating. + +BUG: 445196 +--- + gstreamer/videowidget.cpp | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/gstreamer/videowidget.cpp b/gstreamer/videowidget.cpp +index bd27b21f..83fa9b9e 100644 +--- a/gstreamer/videowidget.cpp ++++ b/gstreamer/videowidget.cpp +@@ -158,7 +158,7 @@ void VideoWidget::setupVideoBin() + gst_object_unref(videopad); + QWidget *parentWidget = qobject_cast<QWidget*>(parent()); + if (parentWidget) { +- parentWidget->winId(); // Due to some existing issues with alien in 4.4, ++ parentWidget->window()->winId(); // Due to some existing issues with alien in 4.4, + // we must currently force the creation of a parent widget. + } + m_isValid = true; //initialization ok, accept input +@@ -171,8 +171,8 @@ void VideoWidget::setupVideoBin() + gst_object_unref(videopad); + QWidget *parentWidget = qobject_cast<QWidget*>(parent()); + if (parentWidget) { +- parentWidget->winId(); // Due to some existing issues with alien in 4.4, +- // we must currently force the creation of a parent widget. ++ parentWidget->window()->winId(); // Due to some existing issues with alien in 4.4, ++ // we must currently force the creation of a parent widget's window + } + m_isValid = true; //initialization ok, accept input + } +-- +GitLab + diff --git a/media-libs/phonon-gstreamer/phonon-gstreamer-4.10.0-r1.ebuild b/media-libs/phonon-gstreamer/phonon-gstreamer-4.10.0-r1.ebuild new file mode 100644 index 000000000000..3b0a28563e2d --- /dev/null +++ b/media-libs/phonon-gstreamer/phonon-gstreamer-4.10.0-r1.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PN="phonon-backend-gstreamer" +inherit ecm kde.org + +DESCRIPTION="GStreamer backend for the Phonon multimedia library" +HOMEPAGE="https://community.kde.org/Phonon" + +if [[ ${KDE_BUILD_TYPE} = release ]]; then + SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/${MY_PN}-${PV}.tar.xz" + S="${WORKDIR}/${MY_PN}-${PV}" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" +fi + +LICENSE="LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )" +SLOT="0" +IUSE="alsa debug +network" + +DEPEND=" + dev-libs/glib:2 + dev-libs/libxml2:2 + dev-qt/qtgui:5 + dev-qt/qtopengl:5 + dev-qt/qtwidgets:5 + dev-qt/qtx11extras:5 + media-libs/gst-plugins-base:1.0 + media-libs/gstreamer:1.0 + >=media-libs/phonon-4.10.60 + media-plugins/gst-plugins-meta:1.0[alsa?,ogg,vorbis] + virtual/opengl +" +RDEPEND="${DEPEND} + network? ( media-plugins/gst-plugins-soup:1.0 ) +" +BDEPEND=" + dev-qt/linguist-tools:5 + virtual/pkgconfig +" + +PATCHES=( "${FILESDIR}/${P}-wayland.patch" ) # KDE-bug 445196 diff --git a/media-libs/pulseaudio-qt/Manifest b/media-libs/pulseaudio-qt/Manifest index b077dbbf4759..f66d0ddb032b 100644 --- a/media-libs/pulseaudio-qt/Manifest +++ b/media-libs/pulseaudio-qt/Manifest @@ -1,3 +1,5 @@ +AUX pulseaudio-qt-1.3-no-crash-if-no-server-response.patch 1523 BLAKE2B c13e9cae9bfbae785efc63828244aaa60ae2c4d8360db235e045ba7a1a9e5a6873f282599af82b6048b9495be75c9aef66f5e9cd2dad639e9ca31dda78b44d90 SHA512 0d0c6cea82a34f3a756b1d72787426d9b0cb32f0bddd6696f3f2f26c75290fa986893a4fcac6fed64250aef2fe083c91d556f99f367dbf2e64e8db5cd46aa262 DIST pulseaudio-qt-1.3.tar.xz 34148 BLAKE2B f283c369fcbeaf57537fe28d6f8aa02c34d7567ab8260ec8ba05edf8320b65e29e6ac88489ff0b49ae57b0bc8b8a49da83886f50ed9641850c84939a979e930c SHA512 2326277fd37327db29a5984056949fcf935c36e7b39184d1307a5d0a891efed4f0e4f32e783f3f7da2c7e6b7409eb908b2521064c6d24a28561ed38db9f8d4e8 EBUILD pulseaudio-qt-1.3-r2.ebuild 705 BLAKE2B 21ca48a8e6e657d32c76aec1f95599ab309e76f14a7677aa166549dc62153bc72cc06b25d61ee01002d4ca8be05aa3e88cd4b96c5c28673f83ec758547ff29fa SHA512 9a760b6734c677f5f846f967780339215b4007ac2fc6d18460e36dfb1f3ee01b7bda35069316f946632e7f25ae5da5fa2aefcd9f559a1cfc39aa6ef1b699f1ce +EBUILD pulseaudio-qt-1.3-r3.ebuild 794 BLAKE2B e6021e2c685c7bd39311a39509aed29f00ad97d6eccb8422f25edc8db414e72335fc0dc5211fc5bd8b9eb08124193ef36e5541676cafdc39aa546e081f647525 SHA512 0982fa7cf1f3631a913095cbd7602c5d68883fd4b845b452d23f85a2332fa211ea52a6e2a35170a1c6abe601bfbfd74e56c3a6c97ff5fa80c190fa62dba7ac05 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6 diff --git a/media-libs/pulseaudio-qt/files/pulseaudio-qt-1.3-no-crash-if-no-server-response.patch b/media-libs/pulseaudio-qt/files/pulseaudio-qt-1.3-no-crash-if-no-server-response.patch new file mode 100644 index 000000000000..459319aa49b8 --- /dev/null +++ b/media-libs/pulseaudio-qt/files/pulseaudio-qt-1.3-no-crash-if-no-server-response.patch @@ -0,0 +1,44 @@ +From f6b02f21a9131bafc4965ebb64acf01a4505ce04 Mon Sep 17 00:00:00 2001 +From: Harald Sitter <sitter@kde.org> +Date: Mon, 10 Oct 2022 16:06:20 +0200 +Subject: [PATCH] don't crash when the server doesn't respond + +inside libpulse a non-reply (e.g. caused by a timeout) results in info +being a nullptr. when that happens simply skip over the callback. when +this happens chances are the server crashed or is otherwise defunct so +we won't be able to do much about this anyway + +easy to test by attaching to both plasmashell and pulseaudio and +interrupting the latter when the former calls +pa_context_get_server_info. this results in the reply timeout getting +hit -> nullptr callback. + +it is unclear if we can somehow recover from this but in lieu of a +reliable real world test case for this we at least shouldn't crash on +nullptr access. + +BUG: 454647 +--- + src/context.cpp | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/src/context.cpp b/src/context.cpp +index 604364f..c5a0f10 100644 +--- a/src/context.cpp ++++ b/src/context.cpp +@@ -161,6 +161,12 @@ static void server_cb(pa_context *context, const pa_server_info *info, void *dat + { + Q_ASSERT(context); + Q_ASSERT(data); ++ if (!info) { ++ // info may be nullptr when e.g. the server doesn't reply in time (e.g. it is stuck) ++ // https://bugs.kde.org/show_bug.cgi?id=454647 ++ qCWarning(PULSEAUDIOQT) << "server_cb() called without info!"; ++ return; ++ } + static_cast<ContextPrivate *>(data)->serverCallback(info); + } + +-- +GitLab + diff --git a/media-libs/pulseaudio-qt/pulseaudio-qt-1.3-r3.ebuild b/media-libs/pulseaudio-qt/pulseaudio-qt-1.3-r3.ebuild new file mode 100644 index 000000000000..07b4aa658b02 --- /dev/null +++ b/media-libs/pulseaudio-qt/pulseaudio-qt-1.3-r3.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="forceoptional" +ECM_QTHELP="true" +ECM_TEST="optional" +QTMIN=5.15.2 +inherit ecm kde.org + +DESCRIPTION="Qt bindings for libpulse" +HOMEPAGE="https://invent.kde.org/libraries/pulseaudio-qt" + +if [[ ${KDE_BUILD_TYPE} = release ]]; then + SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz" + KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" +fi + +LICENSE="LGPL-2.1" +SLOT="0/3" + +RDEPEND=" + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + media-libs/libpulse +" +DEPEND="${RDEPEND} + test? ( + >=dev-qt/qtdeclarative-${QTMIN}:5 + >=dev-qt/qtquickcontrols2-${QTMIN}:5 + ) +" +BDEPEND="virtual/pkgconfig" + +PATCHES=( "${FILESDIR}/${P}-no-crash-if-no-server-response.patch" ) # KDE-bug 454647 |