commit: 95839274ef7c289570c1c7c7549f3ed5439b9b98 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Fri Oct 1 00:00:18 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Oct 1 00:00:39 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95839274
media-video/pipewire: add 0.3.38 Signed-off-by: Sam James <sam <AT> gentoo.org> media-video/pipewire/Manifest | 1 + .../files/pipewire-0.3.38-find-readline.patch | 36 +++++++++++ .../files/pipewire-0.3.38-fix-arm-build.patch | 18 ++++++ .../pipewire-0.3.38-libcamera-null-deref.patch | 70 ++++++++++++++++++++++ ...pipewire-9999.ebuild => pipewire-0.3.38.ebuild} | 5 ++ media-video/pipewire/pipewire-9999.ebuild | 1 + 6 files changed, 131 insertions(+) diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest index 3e2400ff6d7..a76808c0197 100644 --- a/media-video/pipewire/Manifest +++ b/media-video/pipewire/Manifest @@ -5,3 +5,4 @@ DIST pipewire-0.3.34.tar.gz 1682396 BLAKE2B 1a3524a833bde6facf637071f905bb0237f3 DIST pipewire-0.3.35.tar.gz 1704419 BLAKE2B 5c0debd19b29a9488be26125794f04e57e8b3cd3842654cb935decae18ffefc4137927d969448f60f1c1c2985d54db139fc3dcf07e36e81014021d63490096d8 SHA512 08a2e305fe4e9d3c3f4533c163b725dd32d26513e51a9f476bd18d6157ebf67e97e48b8df9595d45c81599f416e6b3f76e90df575dd460a8d26fe951db30e0f6 DIST pipewire-0.3.36.tar.gz 1708209 BLAKE2B 20fce0d7f88347fe594491d4fae7b6a8edee67ff7749f1a40b807a5d5094d792e61e3efd05dca2221f781c263e34ff0a50ad3c162231911d4b1d87704df6c775 SHA512 f0fc68ea005018b420a4f65a24dc9c85eb6263c24e66852a7ce2b03f966990d62487b388c7d73ff5adfc10c80c439b1200ae876e41d78f91db190036a1799a14 DIST pipewire-0.3.37.tar.gz 1716320 BLAKE2B ce98b28015de69a0c91953a4839d5f86a29cfa19e2058ba0a2476a75a03b782ae67239b418306e4ed7dab81fe7e77928a417b966ff3c72ac552006cea66e3218 SHA512 3f4cf1ac66117a56a7a264262e2e238a54060457da6a986bd9227f51cc7e8d1a8fd282aef8462c096819282c5baec22779d2025c2e1918bbfb3d6ff75829aea6 +DIST pipewire-0.3.38.tar.gz 1727371 BLAKE2B dac7f3e1992b9690195df1dbc04575d386d21d06d1727b004b851e300709b3707806b7b20d36c1e74225d91a2df5428c913376903b286592f87083857347e53e SHA512 c3c6c822bf4e5e77fed8d6ef09059d3e43195957692ab7baddc349af3d759d892a9af0e7802d389e2a9a15e5fece4c08ec963ac42df931233eec6057bad67eb6 diff --git a/media-video/pipewire/files/pipewire-0.3.38-find-readline.patch b/media-video/pipewire/files/pipewire-0.3.38-find-readline.patch new file mode 100644 index 00000000000..6b56304f5d1 --- /dev/null +++ b/media-video/pipewire/files/pipewire-0.3.38-find-readline.patch @@ -0,0 +1,36 @@ +https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/ddfbd684e78e2b8b9ad40bedb4612ea0197d231a.patch + +From: Joshua Strobl <jos...@streambits.io> +Date: Thu, 30 Sep 2021 23:11:50 +0300 +Subject: [PATCH] Fix readline detection by allowing fallback to cc + find_library + +--- a/meson.build ++++ b/meson.build +@@ -326,6 +326,11 @@ dbus_dep = dependency('dbus-1') + sdl_dep = dependency('sdl2', required : get_option('sdl2')) + summary({'SDL 2': sdl_dep.found()}, bool_yn: true, section: 'Misc dependencies') + readline_dep = dependency('readline', required : false) ++ ++if not readline_dep.found() ++ readline_dep = cc.find_library('readline', required: false) ++endif ++ + summary({'readline (for pw-cli)': readline_dep.found()}, bool_yn: true, section: 'Misc dependencies') + ncurses_dep = dependency('ncursesw', required : false) + sndfile_dep = dependency('sndfile', version : '>= 1.0.20', required : get_option('sndfile')) +@@ -406,7 +411,12 @@ libinotify_dep = (build_machine.system() == 'freebsd' + : dependency('', required: false)) + + # On FreeBSD, libintl library is required for gettext +-libintl_dep = cc.find_library('intl', required: false) ++libintl_dep = dependency('intl', required: false) ++ ++if not libintl_dep.found() ++ libintl_dep = cc.find_library('intl', required: false) ++endif ++summary({'intl support': libintl_dep.found()}, bool_yn: true) + + need_alsa = get_option('pipewire-alsa').enabled() or get_option('session-managers').contains('media-session') + alsa_dep = dependency('alsa', version : '>=1.1.7', required: need_alsa) +GitLab diff --git a/media-video/pipewire/files/pipewire-0.3.38-fix-arm-build.patch b/media-video/pipewire/files/pipewire-0.3.38-fix-arm-build.patch new file mode 100644 index 00000000000..222aa58cce1 --- /dev/null +++ b/media-video/pipewire/files/pipewire-0.3.38-fix-arm-build.patch @@ -0,0 +1,18 @@ +https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/f8817b439433798bd7217dc4ae72197887b0fc96.patch + +From: Wim Taymans <wtaym...@redhat.com> +Date: Thu, 30 Sep 2021 11:12:27 +0200 +Subject: [PATCH] cpu: fix compilation on ARM + +--- a/spa/plugins/support/cpu-arm.c ++++ b/spa/plugins/support/cpu-arm.c +@@ -80,7 +80,7 @@ arm_init(struct impl *impl) + int arch; + + if (!(cpuinfo = get_cpuinfo())) { +- spa_log_warn(impl->log, NAME " %p: Can't read cpuinfo", impl); ++ spa_log_warn(impl->log, "%p: Can't read cpuinfo", impl); + return 1; + } + +GitLab diff --git a/media-video/pipewire/files/pipewire-0.3.38-libcamera-null-deref.patch b/media-video/pipewire/files/pipewire-0.3.38-libcamera-null-deref.patch new file mode 100644 index 00000000000..beabd1a3029 --- /dev/null +++ b/media-video/pipewire/files/pipewire-0.3.38-libcamera-null-deref.patch @@ -0,0 +1,70 @@ +https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/d71a10b7fa9b5c560485b6bbde409c10d3fdd114.patch + +From: Wim Taymans <wtaym...@redhat.com> +Date: Thu, 30 Sep 2021 12:54:29 +0200 +Subject: [PATCH] libcamera: handle failure gracefully + +Don't try to access NULL pointers +--- a/spa/plugins/libcamera/libcamera-client.c ++++ b/spa/plugins/libcamera/libcamera-client.c +@@ -210,10 +210,10 @@ impl_init(const struct spa_handle_factory *factory, + SPA_DEVICE_CHANGE_MASK_PROPS; + this->info.flags = 0; + +- if(this->dev.camera == NULL) { ++ if(this->dev.camera == NULL) + this->dev.camera = (LibCamera*)newLibCamera(); ++ if(this->dev.camera != NULL) + libcamera_set_log(this->dev.camera, this->dev.log); +- } + + return 0; + } +--- a/spa/plugins/libcamera/libcamera-source.c ++++ b/spa/plugins/libcamera/libcamera-source.c +@@ -994,10 +994,10 @@ impl_init(const struct spa_handle_factory *factory, + port->dev.log = this->log; + port->dev.fd = -1; + +- if(port->dev.camera == NULL) { ++ if(port->dev.camera == NULL) + port->dev.camera = (LibCamera*)newLibCamera(); ++ if(port->dev.camera != NULL) + libcamera_set_log(port->dev.camera, port->dev.log); +- } + + if (info && (str = spa_dict_lookup(info, SPA_KEY_API_LIBCAMERA_PATH))) { + strncpy(this->props.device, str, 63); +--- a/spa/plugins/libcamera/libcamera_wrapper.cpp ++++ b/spa/plugins/libcamera/libcamera_wrapper.cpp +@@ -540,7 +540,8 @@ extern "C" { + } + + void LibCamera::close() { +- this->cam_->release(); ++ if (this->cam_) ++ this->cam_->release(); + } + + void LibCamera::connect() +@@ -775,6 +776,9 @@ extern "C" { + std::unique_ptr<CameraManager> cm = std::make_unique<CameraManager>(); + LibCamera* camera = new LibCamera(); + ++ pthread_mutexattr_init(&attr); ++ pthread_mutex_init(&camera->lock, &attr); ++ + ret = cm->start(); + if (ret) { + deleteLibCamera(camera); +@@ -794,9 +798,6 @@ extern "C" { + return nullptr; + } + +- pthread_mutexattr_init(&attr); +- pthread_mutex_init(&camera->lock, &attr); +- + camera->ring_buffer_init(); + + return camera; +GitLab diff --git a/media-video/pipewire/pipewire-9999.ebuild b/media-video/pipewire/pipewire-0.3.38.ebuild similarity index 97% copy from media-video/pipewire/pipewire-9999.ebuild copy to media-video/pipewire/pipewire-0.3.38.ebuild index 7725dfa300f..9b2951c0793 100644 --- a/media-video/pipewire/pipewire-9999.ebuild +++ b/media-video/pipewire/pipewire-0.3.38.ebuild @@ -47,6 +47,7 @@ RDEPEND=" acct-group/audio media-libs/alsa-lib sys-apps/dbus[${MULTILIB_USEDEP}] + sys-libs/readline:= sys-libs/ncurses:=[unicode(+)] virtual/libintl[${MULTILIB_USEDEP}] virtual/libudev[${MULTILIB_USEDEP}] @@ -96,6 +97,10 @@ DOCS=( {README,INSTALL}.md NEWS ) PATCHES=( "${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch + # Upstream + "${FILESDIR}"/${P}-fix-arm-build.patch + "${FILESDIR}"/${P}-libcamera-null-deref.patch # (we don't have it in ::gentoo but let's be nice) + "${FILESDIR}"/${P}-find-readline.patch # just in case ) # limitsdfile related code taken from =sys-auth/realtime-base-0.1 diff --git a/media-video/pipewire/pipewire-9999.ebuild b/media-video/pipewire/pipewire-9999.ebuild index 7725dfa300f..b6c000cf8a5 100644 --- a/media-video/pipewire/pipewire-9999.ebuild +++ b/media-video/pipewire/pipewire-9999.ebuild @@ -47,6 +47,7 @@ RDEPEND=" acct-group/audio media-libs/alsa-lib sys-apps/dbus[${MULTILIB_USEDEP}] + sys-libs/readline:= sys-libs/ncurses:=[unicode(+)] virtual/libintl[${MULTILIB_USEDEP}] virtual/libudev[${MULTILIB_USEDEP}]
