[-- Attachment #1: Type: text/plain, Size: 1775 bytes --] There is a new pull request by UsernameRandomlyGenerated against master on the void-packages repository https://github.com/UsernameRandomlyGenerated/void-packages bomi https://github.com/void-linux/void-packages/pull/32368 bomi: remove package Unmaintaned and broken. <!-- Mark items with [x] where applicable --> #### General - [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements) #### Have the results of the proposed changes been tested? - [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me - [x] I generally don't use the affected packages but briefly tested this PR <!-- If GitHub CI cannot be used to validate the build result (for example, if the build is likely to take several hours), make sure to [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration). When skipping CI, uncomment and fill out the following section. Note: for builds that are likely to complete in less than 2 hours, it is not acceptable to skip CI. --> <!-- #### Does it build and run successfully? (Please choose at least one native build and, if supported, at least one cross build. More are better.) - [ ] I built this PR locally for my native architecture, (ARCH-LIBC) - [ ] I built this PR locally for these architectures (if supported. mark crossbuilds): - [ ] aarch64-musl - [ ] armv7l - [ ] armv6l-musl --> The UI doesn't load for me (saw a similar issue on bomi github page), last release was 6 years ago and it's not maintained anymore. A patch file from https://github.com/void-linux/void-packages/pull/32368.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-bomi-32368.patch --] [-- Type: text/x-diff, Size: 17233 bytes --] From 637ef5e685b96fc280057a735f44e7c43e5acd5c Mon Sep 17 00:00:00 2001 From: UsernameRandomlyGenerated <coredavid@tutanota.com> Date: Fri, 6 Aug 2021 19:47:45 +0200 Subject: [PATCH] bomi: remove package Unmaintaned and broken. --- srcpkgs/bomi/patches/ffmpeg3.x.patch | 32 ---- srcpkgs/bomi/patches/ffmpeg4.patch | 195 ------------------------ srcpkgs/bomi/patches/fix-cxx14.patch | 67 -------- srcpkgs/bomi/patches/fix-sysctl_h.patch | 22 --- srcpkgs/bomi/template | 35 ----- srcpkgs/removed-packages/template | 1 + 6 files changed, 1 insertion(+), 351 deletions(-) delete mode 100644 srcpkgs/bomi/patches/ffmpeg3.x.patch delete mode 100644 srcpkgs/bomi/patches/ffmpeg4.patch delete mode 100644 srcpkgs/bomi/patches/fix-cxx14.patch delete mode 100644 srcpkgs/bomi/patches/fix-sysctl_h.patch delete mode 100644 srcpkgs/bomi/template diff --git a/srcpkgs/bomi/patches/ffmpeg3.x.patch b/srcpkgs/bomi/patches/ffmpeg3.x.patch deleted file mode 100644 index 3b224fd76a73..000000000000 --- a/srcpkgs/bomi/patches/ffmpeg3.x.patch +++ /dev/null @@ -1,32 +0,0 @@ -libavutil/audioconvert.h is gone in ffmpeg3.x - ---- a/src/mpv/audio/filter/af_lavcac3enc.c 2015-05-20 11:31:58.000000000 +0200 -+++ b/src/mpv/audio/filter/af_lavcac3enc.c 2016-09-22 19:52:47.730132367 +0200 -@@ -26,7 +26,6 @@ - #include <assert.h> - - #include <libavcodec/avcodec.h> --#include <libavutil/audioconvert.h> - #include <libavutil/intreadwrite.h> - #include <libavutil/common.h> - #include <libavutil/bswap.h> ---- a/src/mpv/audio/out/ao_lavc.c 2015-05-20 11:31:58.000000000 +0200 -+++ b/src/mpv/audio/out/ao_lavc.c 2016-09-22 19:54:50.291163189 +0200 -@@ -25,7 +25,6 @@ - #include <limits.h> - - #include <libavutil/common.h> --#include <libavutil/audioconvert.h> - - #include "config.h" - #include "options/options.h" ---- a/src/mpv/audio/filter/af_lavrresample.c 2015-05-20 11:31:58.000000000 +0200 -+++ b/src/mpv/audio/filter/af_lavrresample.c 2016-09-22 19:57:13.539200765 +0200 -@@ -28,7 +28,6 @@ - #include <assert.h> - - #include <libavutil/opt.h> --#include <libavutil/audioconvert.h> - #include <libavutil/common.h> - #include <libavutil/samplefmt.h> - #include <libavutil/mathematics.h> diff --git a/srcpkgs/bomi/patches/ffmpeg4.patch b/srcpkgs/bomi/patches/ffmpeg4.patch deleted file mode 100644 index fefd786df654..000000000000 --- a/srcpkgs/bomi/patches/ffmpeg4.patch +++ /dev/null @@ -1,195 +0,0 @@ -source: https://github.com/d-s-x/bomi/commit/c1473b38bf92e9ac858fd58588a9d45fe717edfa - -diff --git a/src/bomi/video/ffmpegfilters.hpp b/src/bomi/video/ffmpegfilters.hpp -index 77b1df41c5..5365525c48 100644 ---- a/src/bomi/video/ffmpegfilters.hpp -+++ b/src/bomi/video/ffmpegfilters.hpp -@@ -6,7 +6,7 @@ - extern "C" { - #include <video/mp_image_pool.h> - #include <video/img_format.h> --#include <libavfilter/avfiltergraph.h> -+#include <libavfilter/avfilter.h> - #include <libpostproc/postprocess.h> - } - #include "enum/deintmethod.hpp" -diff --git a/src/mpv/audio/out/ao_lavc.c b/src/mpv/audio/out/ao_lavc.c -index b322982566..d1991e1d37 100644 ---- a/src/mpv/audio/out/ao_lavc.c -+++ b/src/mpv/audio/out/ao_lavc.c -@@ -156,8 +156,8 @@ static int init(struct ao *ao) - ac->buffer_size = - ac->aframesize * ac->sample_size * ao->channels.num * 2 + 200; - } -- if (ac->buffer_size < FF_MIN_BUFFER_SIZE) -- ac->buffer_size = FF_MIN_BUFFER_SIZE; -+ if (ac->buffer_size < AV_INPUT_BUFFER_MIN_SIZE) -+ ac->buffer_size = AV_INPUT_BUFFER_MIN_SIZE; - ac->buffer = talloc_size(ac, ac->buffer_size); - - // enough frames for at least 0.25 seconds -diff --git a/src/mpv/common/av_common.c b/src/mpv/common/av_common.c -index 05c694702d..fb6206bc01 100644 ---- a/src/mpv/common/av_common.c -+++ b/src/mpv/common/av_common.c -@@ -36,7 +36,7 @@ int mp_lavc_set_extradata(AVCodecContext *avctx, void *ptr, int size) - if (size) { - av_free(avctx->extradata); - avctx->extradata_size = 0; -- avctx->extradata = av_mallocz(size + FF_INPUT_BUFFER_PADDING_SIZE); -+ avctx->extradata = av_mallocz(size + AV_INPUT_BUFFER_PADDING_SIZE); - if (!avctx->extradata) - return -1; - avctx->extradata_size = size; -@@ -67,7 +67,7 @@ void mp_copy_lav_codec_headers(AVCodecContext *avctx, AVCodecContext *st) - avctx->channel_layout = st->channel_layout; - avctx->bits_per_coded_sample = st->bits_per_coded_sample; - // Required in FFmpeg 2.5.x / Libav 11, deprecated afterwards. -- avctx->stream_codec_tag = st->stream_codec_tag; -+ avctx->codec_tag = st->codec_tag; - } - - // We merely pass-through our PTS/DTS as an int64_t; libavcodec won't use it. -diff --git a/src/mpv/common/encode_lavc.c b/src/mpv/common/encode_lavc.c -index 2a01bee380..9c97c97a88 100644 ---- a/src/mpv/common/encode_lavc.c -+++ b/src/mpv/common/encode_lavc.c -@@ -476,7 +476,7 @@ static void encode_2pass_prepare(struct encode_lavc_context *ctx, - if (!(*bytebuf = stream_open(buf, ctx->global))) { - MP_WARN(ctx, "%s: could not open '%s', " - "disabling 2-pass encoding at pass 2\n", prefix, buf); -- stream->codec->flags &= ~CODEC_FLAG_PASS2; -+ stream->codec->flags &= ~AV_CODEC_FLAG_PASS2; - set_to_avdictionary(ctx, dictp, "flags", "-pass2"); - } else { - struct bstr content = stream_read_complete(*bytebuf, NULL, -@@ -680,7 +680,7 @@ int encode_lavc_open_codec(struct encode_lavc_context *ctx, AVStream *stream) - MP_INFO(ctx, "Opening video encoder: %s [%s]\n", - ctx->vc->long_name, ctx->vc->name); - -- if (ctx->vc->capabilities & CODEC_CAP_EXPERIMENTAL) { -+ if (ctx->vc->capabilities & AV_CODEC_CAP_EXPERIMENTAL) { - stream->codec->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL; - MP_WARN(ctx, "\n\n" - " ********************************************\n" -@@ -715,7 +715,7 @@ int encode_lavc_open_codec(struct encode_lavc_context *ctx, AVStream *stream) - MP_INFO(ctx, "Opening audio encoder: %s [%s]\n", - ctx->ac->long_name, ctx->ac->name); - -- if (ctx->ac->capabilities & CODEC_CAP_EXPERIMENTAL) { -+ if (ctx->ac->capabilities & AV_CODEC_CAP_EXPERIMENTAL) { - stream->codec->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL; - MP_WARN(ctx, "\n\n" - " ********************************************\n" -diff --git a/src/mpv/demux/demux_lavf.c b/src/mpv/demux/demux_lavf.c -index 943fb1d8af..6f438249ad 100644 ---- a/src/mpv/demux/demux_lavf.c -+++ b/src/mpv/demux/demux_lavf.c -@@ -318,7 +318,7 @@ static int lavf_check_file(demuxer_t *demuxer, enum demux_check check) - // Disable file-extension matching with normal checks - .filename = check <= DEMUX_CHECK_REQUEST ? priv->filename : "", - .buf_size = 0, -- .buf = av_mallocz(PROBE_BUF_SIZE + FF_INPUT_BUFFER_PADDING_SIZE), -+ .buf = av_mallocz(PROBE_BUF_SIZE + AV_INPUT_BUFFER_PADDING_SIZE), - }; - if (!avpd.buf) - return -1; -diff --git a/src/mpv/demux/packet.c b/src/mpv/demux/packet.c -index 22b111b0ce..62cd90ef7e 100644 ---- a/src/mpv/demux/packet.c -+++ b/src/mpv/demux/packet.c -@@ -92,7 +92,7 @@ void demux_packet_shorten(struct demux_packet *dp, size_t len) - { - assert(len <= dp->len); - dp->len = len; -- memset(dp->buffer + dp->len, 0, FF_INPUT_BUFFER_PADDING_SIZE); -+ memset(dp->buffer + dp->len, 0, AV_INPUT_BUFFER_PADDING_SIZE); - } - - void free_demux_packet(struct demux_packet *dp) -diff --git a/src/mpv/video/decode/vd_lavc.c b/src/mpv/video/decode/vd_lavc.c -index ffd56350b6..2589faf4ec 100644 ---- a/src/mpv/video/decode/vd_lavc.c -+++ b/src/mpv/video/decode/vd_lavc.c -@@ -377,15 +377,15 @@ static void init_avctx(struct dec_video *vd, const char *decoder, - mp_set_avcodec_threads(vd->log, avctx, lavc_param->threads); - } - -- avctx->flags |= lavc_param->bitexact ? CODEC_FLAG_BITEXACT : 0; -- avctx->flags2 |= lavc_param->fast ? CODEC_FLAG2_FAST : 0; -+ avctx->flags |= lavc_param->bitexact ? AV_CODEC_FLAG_BITEXACT : 0; -+ avctx->flags2 |= lavc_param->fast ? AV_CODEC_FLAG2_FAST : 0; - - if (lavc_param->show_all) { --#ifdef CODEC_FLAG2_SHOW_ALL -- avctx->flags2 |= CODEC_FLAG2_SHOW_ALL; // ffmpeg only? -+#ifdef AV_CODEC_FLAG2_SHOW_ALL -+ avctx->flags2 |= AV_CODEC_FLAG2_SHOW_ALL; // ffmpeg only? - #endif --#ifdef CODEC_FLAG_OUTPUT_CORRUPT -- avctx->flags |= CODEC_FLAG_OUTPUT_CORRUPT; // added with Libav 10 -+#ifdef AV_CODEC_FLAG_OUTPUT_CORRUPT -+ avctx->flags |= AV_CODEC_FLAG_OUTPUT_CORRUPT; // added with Libav 10 - #endif - } - -diff --git a/src/mpv/video/out/vo_lavc.c b/src/mpv/video/out/vo_lavc.c -index 3a6903b7fd..895e0952a5 100644 ---- a/src/mpv/video/out/vo_lavc.c -+++ b/src/mpv/video/out/vo_lavc.c -@@ -166,8 +166,8 @@ static int reconfig(struct vo *vo, struct mp_image_params *params, int flags) - goto error; - - vc->buffer_size = 6 * width * height + 200; -- if (vc->buffer_size < FF_MIN_BUFFER_SIZE) -- vc->buffer_size = FF_MIN_BUFFER_SIZE; -+ if (vc->buffer_size < AV_INPUT_BUFFER_MIN_SIZE) -+ vc->buffer_size = AV_INPUT_BUFFER_MIN_SIZE; - if (vc->buffer_size < sizeof(AVPicture)) - vc->buffer_size = sizeof(AVPicture); - -@@ -253,30 +253,19 @@ static void write_packet(struct vo *vo, int size, AVPacket *packet) - static int encode_video(struct vo *vo, AVFrame *frame, AVPacket *packet) - { - struct priv *vc = vo->priv; -- if (encode_lavc_oformat_flags(vo->encode_lavc_ctx) & AVFMT_RAWPICTURE) { -- if (!frame) -- return 0; -- memcpy(vc->buffer, frame, sizeof(AVPicture)); -- MP_DBG(vo, "got pts %f\n", -- frame->pts * (double) vc->stream->codec->time_base.num / -- (double) vc->stream->codec->time_base.den); -- packet->size = sizeof(AVPicture); -- return packet->size; -- } else { -- int got_packet = 0; -- int status = avcodec_encode_video2(vc->stream->codec, packet, -- frame, &got_packet); -- int size = (status < 0) ? status : got_packet ? packet->size : 0; -- -- if (frame) -- MP_DBG(vo, "got pts %f; out size: %d\n", -- frame->pts * (double) vc->stream->codec->time_base.num / -- (double) vc->stream->codec->time_base.den, size); -- -- if (got_packet) -- encode_lavc_write_stats(vo->encode_lavc_ctx, vc->stream); -- return size; -- } -+ int got_packet = 0; -+ int status = avcodec_encode_video2(vc->stream->codec, packet, -+ frame, &got_packet); -+ int size = (status < 0) ? status : got_packet ? packet->size : 0; -+ -+ if (frame) -+ MP_DBG(vo, "got pts %f; out size: %d\n", -+ frame->pts * (double) vc->stream->codec->time_base.num / -+ (double) vc->stream->codec->time_base.den, size); -+ -+ if (got_packet) -+ encode_lavc_write_stats(vo->encode_lavc_ctx, vc->stream); -+ return size; - } - - static void draw_image_unlocked(struct vo *vo, mp_image_t *mpi) - diff --git a/srcpkgs/bomi/patches/fix-cxx14.patch b/srcpkgs/bomi/patches/fix-cxx14.patch deleted file mode 100644 index b953146e2571..000000000000 --- a/srcpkgs/bomi/patches/fix-cxx14.patch +++ /dev/null @@ -1,67 +0,0 @@ ---- a/src/bomi/bomi.pro 2015-05-20 11:31:58.000000000 +0200 -+++ b/src/bomi/bomi.pro 2016-09-22 20:03:57.452315214 +0200 -@@ -19,6 +19,7 @@ - } - - QMAKE_CXXFLAGS_CXX11 = -std=c++1y -+CONFIG += c++14 - - contains(QMAKE_CXX, clang++) { - QMAKE_CXXFLAGS += -Wno-missing-braces ---- a/src/bomi/misc/filenamegenerator.cpp 2015-05-20 11:31:58.000000000 +0200 -+++ b/src/bomi/misc/filenamegenerator.cpp 2016-09-22 20:06:10.523355518 +0200 -@@ -51,8 +51,8 @@ - }; - get[u"%MEDIA_DISPLAY_NAME%"_q] = [] (const FileNameGenerator *g) { return g->mediaName; }; - -- get[u"%UNIX%"_q] = [] (const FileNameGenerator *g) { return _N(g->unix / 1000llu); }; -- get[u"%UNIX_MS%"_q] = [] (const FileNameGenerator *g) { return _N(g->unix); }; -+ get[u"%UNIX%"_q] = [] (const FileNameGenerator *g) { return _N(g->_unix / 1000llu); }; -+ get[u"%UNIX_MS%"_q] = [] (const FileNameGenerator *g) { return _N(g->_unix); }; - return get; - }(); - auto ret = func.value(ph); ---- a/src/bomi/misc/filenamegenerator.hpp 2015-05-20 11:31:58.000000000 +0200 -+++ b/src/bomi/misc/filenamegenerator.hpp 2016-09-22 20:07:13.762375106 +0200 -@@ -11,7 +11,7 @@ - QTime start, end; - QString mediaName; - Mrl mrl; -- quint64 unix = 0; -+ quint64 _unix = 0; - }; - - #endif // FILENAMEGENERATOR_HPP ---- a/src/bomi/player/mainwindow_p.cpp 2015-05-20 11:31:58.000000000 +0200 -+++ b/src/bomi/player/mainwindow_p.cpp 2016-09-22 20:08:20.590396090 +0200 -@@ -910,7 +910,7 @@ - g.dateTime = QDateTime::currentDateTime(); - g.start = QTime::fromMSecsSinceStartOfDay(e.time()); - g.end = end.isNull() ? g.start : end; -- g.unix = QDateTime::currentMSecsSinceEpoch(); -+ g._unix = QDateTime::currentMSecsSinceEpoch(); - g.mrl = e.mrl(); - g.mediaName = e.media()->name(); - return g; ---- a/src/bomi/player/mainwindow_p.hpp 2015-05-20 11:31:58.000000000 +0200 -+++ b/src/bomi/player/mainwindow_p.hpp 2016-09-22 20:09:18.003414361 +0200 -@@ -101,7 +101,7 @@ - - struct { - QDate date; QTime time, position; -- quint64 unix = 0; -+ quint64 _unix = 0; - QMap<QString, std::function<QString(void)>> get; - } ph; - QTimer waiter, hider, dialogWorkaround; ---- a/src/bomi/dialog/encoderdialog.cpp 2015-05-20 11:31:58.000000000 +0200 -+++ b/src/bomi/dialog/encoderdialog.cpp 2016-09-22 20:05:18.684339670 +0200 -@@ -255,7 +255,7 @@ - { - if (d->size.isEmpty()) - return tr("No video stream exists."); -- d->g.unix = QDateTime::currentMSecsSinceEpoch(); -+ d->g._unix = QDateTime::currentMSecsSinceEpoch(); - d->g.dateTime = QDateTime::currentDateTime(); - d->g.start = d->ui.a->time(); - d->g.end = d->ui.b->time(); diff --git a/srcpkgs/bomi/patches/fix-sysctl_h.patch b/srcpkgs/bomi/patches/fix-sysctl_h.patch deleted file mode 100644 index 1de63a16b819..000000000000 --- a/srcpkgs/bomi/patches/fix-sysctl_h.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/src/bomi/os/mac.mm 2015-05-20 11:31:58.000000000 +0200 -+++ b/src/bomi/os/mac.mm 2021-01-16 10:51:12.701668482 +0100 -@@ -274,7 +274,7 @@ - - - #ifdef Q_OS_MAC --#include <sys/sysctl.h> -+#include <linux/sysctl.h> - #include <mach/mach_host.h> - #include <mach/task.h> - #include <libproc.h> ---- a/src/bomi/os/x11.cpp 2015-05-20 11:31:58.000000000 +0200 -+++ b/src/bomi/os/x11.cpp 2021-01-16 10:51:04.559292267 +0100 -@@ -15,7 +15,7 @@ - #include <fcntl.h> - #include <time.h> - #include <sys/time.h> --#include <sys/sysctl.h> -+#include <linux/sysctl.h> - #include <sys/types.h> - #include <xcb/xcb.h> - #include <xcb/randr.h> diff --git a/srcpkgs/bomi/template b/srcpkgs/bomi/template deleted file mode 100644 index 4cab853148a5..000000000000 --- a/srcpkgs/bomi/template +++ /dev/null @@ -1,35 +0,0 @@ -# Template file for 'bomi' -pkgname=bomi -version=0.9.11 -revision=17 -build_style=configure -configure_args="--disable-systemd --release --prefix=/usr" -# does not build using py3.8 because of waf issues -hostmakedepends="python pkg-config curl perl which" -makedepends="qt5-devel MesaLib-devel ffmpeg-devel mpg123-devel libass-devel - libdvdread-devel libdvdnav-devel libbluray-devel icu-devel libxcb-devel - xcb-util-wm-devel libva-devel libva-glx-devel alsa-lib-devel libvdpau-devel - qt5-tools-devel qt5-declarative-devel qt5-svg-devel qt5-x11extras-devel - fribidi-devel libcdio-devel libcdio-paranoia-devel pulseaudio-devel - samba-devel libchardet-devel" -depends="qt5-quickcontrols" -short_desc="Powerful and easy-to-use Qt5 multimedia player" -maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>" -license="GPL-2.0-or-later" -homepage="https://bomi-player.github.io/" -changelog="https://raw.githubusercontent.com/xylosper/bomi/master/CHANGES.txt" -distfiles="https://github.com/xylosper/bomi/archive/v${version}.tar.gz" -checksum=c76ac45733cdafa7003bbc178e5a90a683df9aec30cd85f188bb17c7af9e282e -nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/1382/steps/shell_3/logs/stdio - -pre_configure() { - case "$XBPS_TARGET_MACHINE" in - *-musl) # There is no <sys/sysctl.h> in musl libc - sed -e "s;<sys/sysctl\.h>;<linux/sysctl.h>;" \ - -i ${wrksrc}/src/bomi/os/x11.cpp - ;; - esac -} -do_install() { - make DEST_DIR=${DESTDIR} install -} diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index a4a0c532cad2..318ac98a4742 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -21,6 +21,7 @@ replaces=" avogadro<=1.2.0_8 avogadro-devel<=1.2.0_8 bokken<=1.8_3 + bomi<=0.9.11_17 burp-server<=1.4.40_13 burp-client<=1.4.40_13 bzr<=2.7.0_1
[-- Attachment #1: Type: text/plain, Size: 154 bytes --] New comment by paper42 on void-packages repository https://github.com/void-linux/void-packages/pull/32368#issuecomment-894423040 Comment: Closes #11287
[-- Attachment #1: Type: text/plain, Size: 238 bytes --] New comment by ericonr on void-packages repository https://github.com/void-linux/void-packages/pull/32368#issuecomment-894429654 Comment: @skrzyp ok? And please mention in the commit how it was broken, since it could still be built.
[-- Attachment #1: Type: text/plain, Size: 1780 bytes --] There is an updated pull request by UsernameRandomlyGenerated against master on the void-packages repository https://github.com/UsernameRandomlyGenerated/void-packages bomi https://github.com/void-linux/void-packages/pull/32368 bomi: remove package Unmaintaned and broken. <!-- Mark items with [x] where applicable --> #### General - [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements) #### Have the results of the proposed changes been tested? - [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me - [x] I generally don't use the affected packages but briefly tested this PR <!-- If GitHub CI cannot be used to validate the build result (for example, if the build is likely to take several hours), make sure to [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration). When skipping CI, uncomment and fill out the following section. Note: for builds that are likely to complete in less than 2 hours, it is not acceptable to skip CI. --> <!-- #### Does it build and run successfully? (Please choose at least one native build and, if supported, at least one cross build. More are better.) - [ ] I built this PR locally for my native architecture, (ARCH-LIBC) - [ ] I built this PR locally for these architectures (if supported. mark crossbuilds): - [ ] aarch64-musl - [ ] armv7l - [ ] armv6l-musl --> The UI doesn't load for me (saw a similar issue on bomi github page), last release was 6 years ago and it's not maintained anymore. A patch file from https://github.com/void-linux/void-packages/pull/32368.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-bomi-32368.patch --] [-- Type: text/x-diff, Size: 17250 bytes --] From 0be514dda071b7562651820e0118de144bcb00cb Mon Sep 17 00:00:00 2001 From: UsernameRandomlyGenerated <coredavid@tutanota.com> Date: Fri, 6 Aug 2021 19:47:45 +0200 Subject: [PATCH] bomi: remove package Unmaintaned and broken, UI doesn't work. --- srcpkgs/bomi/patches/ffmpeg3.x.patch | 32 ---- srcpkgs/bomi/patches/ffmpeg4.patch | 195 ------------------------ srcpkgs/bomi/patches/fix-cxx14.patch | 67 -------- srcpkgs/bomi/patches/fix-sysctl_h.patch | 22 --- srcpkgs/bomi/template | 35 ----- srcpkgs/removed-packages/template | 1 + 6 files changed, 1 insertion(+), 351 deletions(-) delete mode 100644 srcpkgs/bomi/patches/ffmpeg3.x.patch delete mode 100644 srcpkgs/bomi/patches/ffmpeg4.patch delete mode 100644 srcpkgs/bomi/patches/fix-cxx14.patch delete mode 100644 srcpkgs/bomi/patches/fix-sysctl_h.patch delete mode 100644 srcpkgs/bomi/template diff --git a/srcpkgs/bomi/patches/ffmpeg3.x.patch b/srcpkgs/bomi/patches/ffmpeg3.x.patch deleted file mode 100644 index 3b224fd76a73..000000000000 --- a/srcpkgs/bomi/patches/ffmpeg3.x.patch +++ /dev/null @@ -1,32 +0,0 @@ -libavutil/audioconvert.h is gone in ffmpeg3.x - ---- a/src/mpv/audio/filter/af_lavcac3enc.c 2015-05-20 11:31:58.000000000 +0200 -+++ b/src/mpv/audio/filter/af_lavcac3enc.c 2016-09-22 19:52:47.730132367 +0200 -@@ -26,7 +26,6 @@ - #include <assert.h> - - #include <libavcodec/avcodec.h> --#include <libavutil/audioconvert.h> - #include <libavutil/intreadwrite.h> - #include <libavutil/common.h> - #include <libavutil/bswap.h> ---- a/src/mpv/audio/out/ao_lavc.c 2015-05-20 11:31:58.000000000 +0200 -+++ b/src/mpv/audio/out/ao_lavc.c 2016-09-22 19:54:50.291163189 +0200 -@@ -25,7 +25,6 @@ - #include <limits.h> - - #include <libavutil/common.h> --#include <libavutil/audioconvert.h> - - #include "config.h" - #include "options/options.h" ---- a/src/mpv/audio/filter/af_lavrresample.c 2015-05-20 11:31:58.000000000 +0200 -+++ b/src/mpv/audio/filter/af_lavrresample.c 2016-09-22 19:57:13.539200765 +0200 -@@ -28,7 +28,6 @@ - #include <assert.h> - - #include <libavutil/opt.h> --#include <libavutil/audioconvert.h> - #include <libavutil/common.h> - #include <libavutil/samplefmt.h> - #include <libavutil/mathematics.h> diff --git a/srcpkgs/bomi/patches/ffmpeg4.patch b/srcpkgs/bomi/patches/ffmpeg4.patch deleted file mode 100644 index fefd786df654..000000000000 --- a/srcpkgs/bomi/patches/ffmpeg4.patch +++ /dev/null @@ -1,195 +0,0 @@ -source: https://github.com/d-s-x/bomi/commit/c1473b38bf92e9ac858fd58588a9d45fe717edfa - -diff --git a/src/bomi/video/ffmpegfilters.hpp b/src/bomi/video/ffmpegfilters.hpp -index 77b1df41c5..5365525c48 100644 ---- a/src/bomi/video/ffmpegfilters.hpp -+++ b/src/bomi/video/ffmpegfilters.hpp -@@ -6,7 +6,7 @@ - extern "C" { - #include <video/mp_image_pool.h> - #include <video/img_format.h> --#include <libavfilter/avfiltergraph.h> -+#include <libavfilter/avfilter.h> - #include <libpostproc/postprocess.h> - } - #include "enum/deintmethod.hpp" -diff --git a/src/mpv/audio/out/ao_lavc.c b/src/mpv/audio/out/ao_lavc.c -index b322982566..d1991e1d37 100644 ---- a/src/mpv/audio/out/ao_lavc.c -+++ b/src/mpv/audio/out/ao_lavc.c -@@ -156,8 +156,8 @@ static int init(struct ao *ao) - ac->buffer_size = - ac->aframesize * ac->sample_size * ao->channels.num * 2 + 200; - } -- if (ac->buffer_size < FF_MIN_BUFFER_SIZE) -- ac->buffer_size = FF_MIN_BUFFER_SIZE; -+ if (ac->buffer_size < AV_INPUT_BUFFER_MIN_SIZE) -+ ac->buffer_size = AV_INPUT_BUFFER_MIN_SIZE; - ac->buffer = talloc_size(ac, ac->buffer_size); - - // enough frames for at least 0.25 seconds -diff --git a/src/mpv/common/av_common.c b/src/mpv/common/av_common.c -index 05c694702d..fb6206bc01 100644 ---- a/src/mpv/common/av_common.c -+++ b/src/mpv/common/av_common.c -@@ -36,7 +36,7 @@ int mp_lavc_set_extradata(AVCodecContext *avctx, void *ptr, int size) - if (size) { - av_free(avctx->extradata); - avctx->extradata_size = 0; -- avctx->extradata = av_mallocz(size + FF_INPUT_BUFFER_PADDING_SIZE); -+ avctx->extradata = av_mallocz(size + AV_INPUT_BUFFER_PADDING_SIZE); - if (!avctx->extradata) - return -1; - avctx->extradata_size = size; -@@ -67,7 +67,7 @@ void mp_copy_lav_codec_headers(AVCodecContext *avctx, AVCodecContext *st) - avctx->channel_layout = st->channel_layout; - avctx->bits_per_coded_sample = st->bits_per_coded_sample; - // Required in FFmpeg 2.5.x / Libav 11, deprecated afterwards. -- avctx->stream_codec_tag = st->stream_codec_tag; -+ avctx->codec_tag = st->codec_tag; - } - - // We merely pass-through our PTS/DTS as an int64_t; libavcodec won't use it. -diff --git a/src/mpv/common/encode_lavc.c b/src/mpv/common/encode_lavc.c -index 2a01bee380..9c97c97a88 100644 ---- a/src/mpv/common/encode_lavc.c -+++ b/src/mpv/common/encode_lavc.c -@@ -476,7 +476,7 @@ static void encode_2pass_prepare(struct encode_lavc_context *ctx, - if (!(*bytebuf = stream_open(buf, ctx->global))) { - MP_WARN(ctx, "%s: could not open '%s', " - "disabling 2-pass encoding at pass 2\n", prefix, buf); -- stream->codec->flags &= ~CODEC_FLAG_PASS2; -+ stream->codec->flags &= ~AV_CODEC_FLAG_PASS2; - set_to_avdictionary(ctx, dictp, "flags", "-pass2"); - } else { - struct bstr content = stream_read_complete(*bytebuf, NULL, -@@ -680,7 +680,7 @@ int encode_lavc_open_codec(struct encode_lavc_context *ctx, AVStream *stream) - MP_INFO(ctx, "Opening video encoder: %s [%s]\n", - ctx->vc->long_name, ctx->vc->name); - -- if (ctx->vc->capabilities & CODEC_CAP_EXPERIMENTAL) { -+ if (ctx->vc->capabilities & AV_CODEC_CAP_EXPERIMENTAL) { - stream->codec->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL; - MP_WARN(ctx, "\n\n" - " ********************************************\n" -@@ -715,7 +715,7 @@ int encode_lavc_open_codec(struct encode_lavc_context *ctx, AVStream *stream) - MP_INFO(ctx, "Opening audio encoder: %s [%s]\n", - ctx->ac->long_name, ctx->ac->name); - -- if (ctx->ac->capabilities & CODEC_CAP_EXPERIMENTAL) { -+ if (ctx->ac->capabilities & AV_CODEC_CAP_EXPERIMENTAL) { - stream->codec->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL; - MP_WARN(ctx, "\n\n" - " ********************************************\n" -diff --git a/src/mpv/demux/demux_lavf.c b/src/mpv/demux/demux_lavf.c -index 943fb1d8af..6f438249ad 100644 ---- a/src/mpv/demux/demux_lavf.c -+++ b/src/mpv/demux/demux_lavf.c -@@ -318,7 +318,7 @@ static int lavf_check_file(demuxer_t *demuxer, enum demux_check check) - // Disable file-extension matching with normal checks - .filename = check <= DEMUX_CHECK_REQUEST ? priv->filename : "", - .buf_size = 0, -- .buf = av_mallocz(PROBE_BUF_SIZE + FF_INPUT_BUFFER_PADDING_SIZE), -+ .buf = av_mallocz(PROBE_BUF_SIZE + AV_INPUT_BUFFER_PADDING_SIZE), - }; - if (!avpd.buf) - return -1; -diff --git a/src/mpv/demux/packet.c b/src/mpv/demux/packet.c -index 22b111b0ce..62cd90ef7e 100644 ---- a/src/mpv/demux/packet.c -+++ b/src/mpv/demux/packet.c -@@ -92,7 +92,7 @@ void demux_packet_shorten(struct demux_packet *dp, size_t len) - { - assert(len <= dp->len); - dp->len = len; -- memset(dp->buffer + dp->len, 0, FF_INPUT_BUFFER_PADDING_SIZE); -+ memset(dp->buffer + dp->len, 0, AV_INPUT_BUFFER_PADDING_SIZE); - } - - void free_demux_packet(struct demux_packet *dp) -diff --git a/src/mpv/video/decode/vd_lavc.c b/src/mpv/video/decode/vd_lavc.c -index ffd56350b6..2589faf4ec 100644 ---- a/src/mpv/video/decode/vd_lavc.c -+++ b/src/mpv/video/decode/vd_lavc.c -@@ -377,15 +377,15 @@ static void init_avctx(struct dec_video *vd, const char *decoder, - mp_set_avcodec_threads(vd->log, avctx, lavc_param->threads); - } - -- avctx->flags |= lavc_param->bitexact ? CODEC_FLAG_BITEXACT : 0; -- avctx->flags2 |= lavc_param->fast ? CODEC_FLAG2_FAST : 0; -+ avctx->flags |= lavc_param->bitexact ? AV_CODEC_FLAG_BITEXACT : 0; -+ avctx->flags2 |= lavc_param->fast ? AV_CODEC_FLAG2_FAST : 0; - - if (lavc_param->show_all) { --#ifdef CODEC_FLAG2_SHOW_ALL -- avctx->flags2 |= CODEC_FLAG2_SHOW_ALL; // ffmpeg only? -+#ifdef AV_CODEC_FLAG2_SHOW_ALL -+ avctx->flags2 |= AV_CODEC_FLAG2_SHOW_ALL; // ffmpeg only? - #endif --#ifdef CODEC_FLAG_OUTPUT_CORRUPT -- avctx->flags |= CODEC_FLAG_OUTPUT_CORRUPT; // added with Libav 10 -+#ifdef AV_CODEC_FLAG_OUTPUT_CORRUPT -+ avctx->flags |= AV_CODEC_FLAG_OUTPUT_CORRUPT; // added with Libav 10 - #endif - } - -diff --git a/src/mpv/video/out/vo_lavc.c b/src/mpv/video/out/vo_lavc.c -index 3a6903b7fd..895e0952a5 100644 ---- a/src/mpv/video/out/vo_lavc.c -+++ b/src/mpv/video/out/vo_lavc.c -@@ -166,8 +166,8 @@ static int reconfig(struct vo *vo, struct mp_image_params *params, int flags) - goto error; - - vc->buffer_size = 6 * width * height + 200; -- if (vc->buffer_size < FF_MIN_BUFFER_SIZE) -- vc->buffer_size = FF_MIN_BUFFER_SIZE; -+ if (vc->buffer_size < AV_INPUT_BUFFER_MIN_SIZE) -+ vc->buffer_size = AV_INPUT_BUFFER_MIN_SIZE; - if (vc->buffer_size < sizeof(AVPicture)) - vc->buffer_size = sizeof(AVPicture); - -@@ -253,30 +253,19 @@ static void write_packet(struct vo *vo, int size, AVPacket *packet) - static int encode_video(struct vo *vo, AVFrame *frame, AVPacket *packet) - { - struct priv *vc = vo->priv; -- if (encode_lavc_oformat_flags(vo->encode_lavc_ctx) & AVFMT_RAWPICTURE) { -- if (!frame) -- return 0; -- memcpy(vc->buffer, frame, sizeof(AVPicture)); -- MP_DBG(vo, "got pts %f\n", -- frame->pts * (double) vc->stream->codec->time_base.num / -- (double) vc->stream->codec->time_base.den); -- packet->size = sizeof(AVPicture); -- return packet->size; -- } else { -- int got_packet = 0; -- int status = avcodec_encode_video2(vc->stream->codec, packet, -- frame, &got_packet); -- int size = (status < 0) ? status : got_packet ? packet->size : 0; -- -- if (frame) -- MP_DBG(vo, "got pts %f; out size: %d\n", -- frame->pts * (double) vc->stream->codec->time_base.num / -- (double) vc->stream->codec->time_base.den, size); -- -- if (got_packet) -- encode_lavc_write_stats(vo->encode_lavc_ctx, vc->stream); -- return size; -- } -+ int got_packet = 0; -+ int status = avcodec_encode_video2(vc->stream->codec, packet, -+ frame, &got_packet); -+ int size = (status < 0) ? status : got_packet ? packet->size : 0; -+ -+ if (frame) -+ MP_DBG(vo, "got pts %f; out size: %d\n", -+ frame->pts * (double) vc->stream->codec->time_base.num / -+ (double) vc->stream->codec->time_base.den, size); -+ -+ if (got_packet) -+ encode_lavc_write_stats(vo->encode_lavc_ctx, vc->stream); -+ return size; - } - - static void draw_image_unlocked(struct vo *vo, mp_image_t *mpi) - diff --git a/srcpkgs/bomi/patches/fix-cxx14.patch b/srcpkgs/bomi/patches/fix-cxx14.patch deleted file mode 100644 index b953146e2571..000000000000 --- a/srcpkgs/bomi/patches/fix-cxx14.patch +++ /dev/null @@ -1,67 +0,0 @@ ---- a/src/bomi/bomi.pro 2015-05-20 11:31:58.000000000 +0200 -+++ b/src/bomi/bomi.pro 2016-09-22 20:03:57.452315214 +0200 -@@ -19,6 +19,7 @@ - } - - QMAKE_CXXFLAGS_CXX11 = -std=c++1y -+CONFIG += c++14 - - contains(QMAKE_CXX, clang++) { - QMAKE_CXXFLAGS += -Wno-missing-braces ---- a/src/bomi/misc/filenamegenerator.cpp 2015-05-20 11:31:58.000000000 +0200 -+++ b/src/bomi/misc/filenamegenerator.cpp 2016-09-22 20:06:10.523355518 +0200 -@@ -51,8 +51,8 @@ - }; - get[u"%MEDIA_DISPLAY_NAME%"_q] = [] (const FileNameGenerator *g) { return g->mediaName; }; - -- get[u"%UNIX%"_q] = [] (const FileNameGenerator *g) { return _N(g->unix / 1000llu); }; -- get[u"%UNIX_MS%"_q] = [] (const FileNameGenerator *g) { return _N(g->unix); }; -+ get[u"%UNIX%"_q] = [] (const FileNameGenerator *g) { return _N(g->_unix / 1000llu); }; -+ get[u"%UNIX_MS%"_q] = [] (const FileNameGenerator *g) { return _N(g->_unix); }; - return get; - }(); - auto ret = func.value(ph); ---- a/src/bomi/misc/filenamegenerator.hpp 2015-05-20 11:31:58.000000000 +0200 -+++ b/src/bomi/misc/filenamegenerator.hpp 2016-09-22 20:07:13.762375106 +0200 -@@ -11,7 +11,7 @@ - QTime start, end; - QString mediaName; - Mrl mrl; -- quint64 unix = 0; -+ quint64 _unix = 0; - }; - - #endif // FILENAMEGENERATOR_HPP ---- a/src/bomi/player/mainwindow_p.cpp 2015-05-20 11:31:58.000000000 +0200 -+++ b/src/bomi/player/mainwindow_p.cpp 2016-09-22 20:08:20.590396090 +0200 -@@ -910,7 +910,7 @@ - g.dateTime = QDateTime::currentDateTime(); - g.start = QTime::fromMSecsSinceStartOfDay(e.time()); - g.end = end.isNull() ? g.start : end; -- g.unix = QDateTime::currentMSecsSinceEpoch(); -+ g._unix = QDateTime::currentMSecsSinceEpoch(); - g.mrl = e.mrl(); - g.mediaName = e.media()->name(); - return g; ---- a/src/bomi/player/mainwindow_p.hpp 2015-05-20 11:31:58.000000000 +0200 -+++ b/src/bomi/player/mainwindow_p.hpp 2016-09-22 20:09:18.003414361 +0200 -@@ -101,7 +101,7 @@ - - struct { - QDate date; QTime time, position; -- quint64 unix = 0; -+ quint64 _unix = 0; - QMap<QString, std::function<QString(void)>> get; - } ph; - QTimer waiter, hider, dialogWorkaround; ---- a/src/bomi/dialog/encoderdialog.cpp 2015-05-20 11:31:58.000000000 +0200 -+++ b/src/bomi/dialog/encoderdialog.cpp 2016-09-22 20:05:18.684339670 +0200 -@@ -255,7 +255,7 @@ - { - if (d->size.isEmpty()) - return tr("No video stream exists."); -- d->g.unix = QDateTime::currentMSecsSinceEpoch(); -+ d->g._unix = QDateTime::currentMSecsSinceEpoch(); - d->g.dateTime = QDateTime::currentDateTime(); - d->g.start = d->ui.a->time(); - d->g.end = d->ui.b->time(); diff --git a/srcpkgs/bomi/patches/fix-sysctl_h.patch b/srcpkgs/bomi/patches/fix-sysctl_h.patch deleted file mode 100644 index 1de63a16b819..000000000000 --- a/srcpkgs/bomi/patches/fix-sysctl_h.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/src/bomi/os/mac.mm 2015-05-20 11:31:58.000000000 +0200 -+++ b/src/bomi/os/mac.mm 2021-01-16 10:51:12.701668482 +0100 -@@ -274,7 +274,7 @@ - - - #ifdef Q_OS_MAC --#include <sys/sysctl.h> -+#include <linux/sysctl.h> - #include <mach/mach_host.h> - #include <mach/task.h> - #include <libproc.h> ---- a/src/bomi/os/x11.cpp 2015-05-20 11:31:58.000000000 +0200 -+++ b/src/bomi/os/x11.cpp 2021-01-16 10:51:04.559292267 +0100 -@@ -15,7 +15,7 @@ - #include <fcntl.h> - #include <time.h> - #include <sys/time.h> --#include <sys/sysctl.h> -+#include <linux/sysctl.h> - #include <sys/types.h> - #include <xcb/xcb.h> - #include <xcb/randr.h> diff --git a/srcpkgs/bomi/template b/srcpkgs/bomi/template deleted file mode 100644 index 4cab853148a5..000000000000 --- a/srcpkgs/bomi/template +++ /dev/null @@ -1,35 +0,0 @@ -# Template file for 'bomi' -pkgname=bomi -version=0.9.11 -revision=17 -build_style=configure -configure_args="--disable-systemd --release --prefix=/usr" -# does not build using py3.8 because of waf issues -hostmakedepends="python pkg-config curl perl which" -makedepends="qt5-devel MesaLib-devel ffmpeg-devel mpg123-devel libass-devel - libdvdread-devel libdvdnav-devel libbluray-devel icu-devel libxcb-devel - xcb-util-wm-devel libva-devel libva-glx-devel alsa-lib-devel libvdpau-devel - qt5-tools-devel qt5-declarative-devel qt5-svg-devel qt5-x11extras-devel - fribidi-devel libcdio-devel libcdio-paranoia-devel pulseaudio-devel - samba-devel libchardet-devel" -depends="qt5-quickcontrols" -short_desc="Powerful and easy-to-use Qt5 multimedia player" -maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>" -license="GPL-2.0-or-later" -homepage="https://bomi-player.github.io/" -changelog="https://raw.githubusercontent.com/xylosper/bomi/master/CHANGES.txt" -distfiles="https://github.com/xylosper/bomi/archive/v${version}.tar.gz" -checksum=c76ac45733cdafa7003bbc178e5a90a683df9aec30cd85f188bb17c7af9e282e -nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/1382/steps/shell_3/logs/stdio - -pre_configure() { - case "$XBPS_TARGET_MACHINE" in - *-musl) # There is no <sys/sysctl.h> in musl libc - sed -e "s;<sys/sysctl\.h>;<linux/sysctl.h>;" \ - -i ${wrksrc}/src/bomi/os/x11.cpp - ;; - esac -} -do_install() { - make DEST_DIR=${DESTDIR} install -} diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index a4a0c532cad2..318ac98a4742 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -21,6 +21,7 @@ replaces=" avogadro<=1.2.0_8 avogadro-devel<=1.2.0_8 bokken<=1.8_3 + bomi<=0.9.11_17 burp-server<=1.4.40_13 burp-client<=1.4.40_13 bzr<=2.7.0_1
[-- Attachment #1: Type: text/plain, Size: 231 bytes --] New comment by paper42 on void-packages repository https://github.com/void-linux/void-packages/pull/32368#issuecomment-894432276 Comment: @ericonr bomi is the last dependant of libchardet, but libchardet is still being developed
[-- Attachment #1: Type: text/plain, Size: 349 bytes --] New comment by skrzyp on void-packages repository https://github.com/void-linux/void-packages/pull/32368#issuecomment-894463851 Comment: > @skrzyp ok? > > And please mention in the commit how it was broken, since it could still be built. ok for me, I was thinking about purging these unmaintained programs on my own so feel free to proceed
[-- Attachment #1: Type: text/plain, Size: 212 bytes --] New comment by ericonr on void-packages repository https://github.com/void-linux/void-packages/pull/32368#issuecomment-894471442 Comment: @paper42 no reason to remove libchardet yet, but thanks for the notice.
[-- Attachment #1: Type: text/plain, Size: 1762 bytes --] There is an updated pull request by ericonr against master on the void-packages repository https://github.com/UsernameRandomlyGenerated/void-packages bomi https://github.com/void-linux/void-packages/pull/32368 bomi: remove package Unmaintaned and broken. <!-- Mark items with [x] where applicable --> #### General - [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements) #### Have the results of the proposed changes been tested? - [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me - [x] I generally don't use the affected packages but briefly tested this PR <!-- If GitHub CI cannot be used to validate the build result (for example, if the build is likely to take several hours), make sure to [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration). When skipping CI, uncomment and fill out the following section. Note: for builds that are likely to complete in less than 2 hours, it is not acceptable to skip CI. --> <!-- #### Does it build and run successfully? (Please choose at least one native build and, if supported, at least one cross build. More are better.) - [ ] I built this PR locally for my native architecture, (ARCH-LIBC) - [ ] I built this PR locally for these architectures (if supported. mark crossbuilds): - [ ] aarch64-musl - [ ] armv7l - [ ] armv6l-musl --> The UI doesn't load for me (saw a similar issue on bomi github page), last release was 6 years ago and it's not maintained anymore. A patch file from https://github.com/void-linux/void-packages/pull/32368.patch is attached [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: github-pr-bomi-32368.patch --] [-- Type: text/x-diff, Size: 17824 bytes --] From 8d9947f4e481ee2da71939d4edaf7442a713bca5 Mon Sep 17 00:00:00 2001 From: UsernameRandomlyGenerated <coredavid@tutanota.com> Date: Fri, 6 Aug 2021 19:47:45 +0200 Subject: [PATCH 1/2] bomi: remove package. Unmaintaned and broken, UI doesn't work. Upstream issue: https://github.com/ashinan/bomi/issues/540 --- srcpkgs/bomi/patches/ffmpeg3.x.patch | 32 ---- srcpkgs/bomi/patches/ffmpeg4.patch | 195 ------------------------ srcpkgs/bomi/patches/fix-cxx14.patch | 67 -------- srcpkgs/bomi/patches/fix-sysctl_h.patch | 22 --- srcpkgs/bomi/template | 35 ----- 5 files changed, 351 deletions(-) delete mode 100644 srcpkgs/bomi/patches/ffmpeg3.x.patch delete mode 100644 srcpkgs/bomi/patches/ffmpeg4.patch delete mode 100644 srcpkgs/bomi/patches/fix-cxx14.patch delete mode 100644 srcpkgs/bomi/patches/fix-sysctl_h.patch delete mode 100644 srcpkgs/bomi/template diff --git a/srcpkgs/bomi/patches/ffmpeg3.x.patch b/srcpkgs/bomi/patches/ffmpeg3.x.patch deleted file mode 100644 index 3b224fd76a73..000000000000 --- a/srcpkgs/bomi/patches/ffmpeg3.x.patch +++ /dev/null @@ -1,32 +0,0 @@ -libavutil/audioconvert.h is gone in ffmpeg3.x - ---- a/src/mpv/audio/filter/af_lavcac3enc.c 2015-05-20 11:31:58.000000000 +0200 -+++ b/src/mpv/audio/filter/af_lavcac3enc.c 2016-09-22 19:52:47.730132367 +0200 -@@ -26,7 +26,6 @@ - #include <assert.h> - - #include <libavcodec/avcodec.h> --#include <libavutil/audioconvert.h> - #include <libavutil/intreadwrite.h> - #include <libavutil/common.h> - #include <libavutil/bswap.h> ---- a/src/mpv/audio/out/ao_lavc.c 2015-05-20 11:31:58.000000000 +0200 -+++ b/src/mpv/audio/out/ao_lavc.c 2016-09-22 19:54:50.291163189 +0200 -@@ -25,7 +25,6 @@ - #include <limits.h> - - #include <libavutil/common.h> --#include <libavutil/audioconvert.h> - - #include "config.h" - #include "options/options.h" ---- a/src/mpv/audio/filter/af_lavrresample.c 2015-05-20 11:31:58.000000000 +0200 -+++ b/src/mpv/audio/filter/af_lavrresample.c 2016-09-22 19:57:13.539200765 +0200 -@@ -28,7 +28,6 @@ - #include <assert.h> - - #include <libavutil/opt.h> --#include <libavutil/audioconvert.h> - #include <libavutil/common.h> - #include <libavutil/samplefmt.h> - #include <libavutil/mathematics.h> diff --git a/srcpkgs/bomi/patches/ffmpeg4.patch b/srcpkgs/bomi/patches/ffmpeg4.patch deleted file mode 100644 index fefd786df654..000000000000 --- a/srcpkgs/bomi/patches/ffmpeg4.patch +++ /dev/null @@ -1,195 +0,0 @@ -source: https://github.com/d-s-x/bomi/commit/c1473b38bf92e9ac858fd58588a9d45fe717edfa - -diff --git a/src/bomi/video/ffmpegfilters.hpp b/src/bomi/video/ffmpegfilters.hpp -index 77b1df41c5..5365525c48 100644 ---- a/src/bomi/video/ffmpegfilters.hpp -+++ b/src/bomi/video/ffmpegfilters.hpp -@@ -6,7 +6,7 @@ - extern "C" { - #include <video/mp_image_pool.h> - #include <video/img_format.h> --#include <libavfilter/avfiltergraph.h> -+#include <libavfilter/avfilter.h> - #include <libpostproc/postprocess.h> - } - #include "enum/deintmethod.hpp" -diff --git a/src/mpv/audio/out/ao_lavc.c b/src/mpv/audio/out/ao_lavc.c -index b322982566..d1991e1d37 100644 ---- a/src/mpv/audio/out/ao_lavc.c -+++ b/src/mpv/audio/out/ao_lavc.c -@@ -156,8 +156,8 @@ static int init(struct ao *ao) - ac->buffer_size = - ac->aframesize * ac->sample_size * ao->channels.num * 2 + 200; - } -- if (ac->buffer_size < FF_MIN_BUFFER_SIZE) -- ac->buffer_size = FF_MIN_BUFFER_SIZE; -+ if (ac->buffer_size < AV_INPUT_BUFFER_MIN_SIZE) -+ ac->buffer_size = AV_INPUT_BUFFER_MIN_SIZE; - ac->buffer = talloc_size(ac, ac->buffer_size); - - // enough frames for at least 0.25 seconds -diff --git a/src/mpv/common/av_common.c b/src/mpv/common/av_common.c -index 05c694702d..fb6206bc01 100644 ---- a/src/mpv/common/av_common.c -+++ b/src/mpv/common/av_common.c -@@ -36,7 +36,7 @@ int mp_lavc_set_extradata(AVCodecContext *avctx, void *ptr, int size) - if (size) { - av_free(avctx->extradata); - avctx->extradata_size = 0; -- avctx->extradata = av_mallocz(size + FF_INPUT_BUFFER_PADDING_SIZE); -+ avctx->extradata = av_mallocz(size + AV_INPUT_BUFFER_PADDING_SIZE); - if (!avctx->extradata) - return -1; - avctx->extradata_size = size; -@@ -67,7 +67,7 @@ void mp_copy_lav_codec_headers(AVCodecContext *avctx, AVCodecContext *st) - avctx->channel_layout = st->channel_layout; - avctx->bits_per_coded_sample = st->bits_per_coded_sample; - // Required in FFmpeg 2.5.x / Libav 11, deprecated afterwards. -- avctx->stream_codec_tag = st->stream_codec_tag; -+ avctx->codec_tag = st->codec_tag; - } - - // We merely pass-through our PTS/DTS as an int64_t; libavcodec won't use it. -diff --git a/src/mpv/common/encode_lavc.c b/src/mpv/common/encode_lavc.c -index 2a01bee380..9c97c97a88 100644 ---- a/src/mpv/common/encode_lavc.c -+++ b/src/mpv/common/encode_lavc.c -@@ -476,7 +476,7 @@ static void encode_2pass_prepare(struct encode_lavc_context *ctx, - if (!(*bytebuf = stream_open(buf, ctx->global))) { - MP_WARN(ctx, "%s: could not open '%s', " - "disabling 2-pass encoding at pass 2\n", prefix, buf); -- stream->codec->flags &= ~CODEC_FLAG_PASS2; -+ stream->codec->flags &= ~AV_CODEC_FLAG_PASS2; - set_to_avdictionary(ctx, dictp, "flags", "-pass2"); - } else { - struct bstr content = stream_read_complete(*bytebuf, NULL, -@@ -680,7 +680,7 @@ int encode_lavc_open_codec(struct encode_lavc_context *ctx, AVStream *stream) - MP_INFO(ctx, "Opening video encoder: %s [%s]\n", - ctx->vc->long_name, ctx->vc->name); - -- if (ctx->vc->capabilities & CODEC_CAP_EXPERIMENTAL) { -+ if (ctx->vc->capabilities & AV_CODEC_CAP_EXPERIMENTAL) { - stream->codec->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL; - MP_WARN(ctx, "\n\n" - " ********************************************\n" -@@ -715,7 +715,7 @@ int encode_lavc_open_codec(struct encode_lavc_context *ctx, AVStream *stream) - MP_INFO(ctx, "Opening audio encoder: %s [%s]\n", - ctx->ac->long_name, ctx->ac->name); - -- if (ctx->ac->capabilities & CODEC_CAP_EXPERIMENTAL) { -+ if (ctx->ac->capabilities & AV_CODEC_CAP_EXPERIMENTAL) { - stream->codec->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL; - MP_WARN(ctx, "\n\n" - " ********************************************\n" -diff --git a/src/mpv/demux/demux_lavf.c b/src/mpv/demux/demux_lavf.c -index 943fb1d8af..6f438249ad 100644 ---- a/src/mpv/demux/demux_lavf.c -+++ b/src/mpv/demux/demux_lavf.c -@@ -318,7 +318,7 @@ static int lavf_check_file(demuxer_t *demuxer, enum demux_check check) - // Disable file-extension matching with normal checks - .filename = check <= DEMUX_CHECK_REQUEST ? priv->filename : "", - .buf_size = 0, -- .buf = av_mallocz(PROBE_BUF_SIZE + FF_INPUT_BUFFER_PADDING_SIZE), -+ .buf = av_mallocz(PROBE_BUF_SIZE + AV_INPUT_BUFFER_PADDING_SIZE), - }; - if (!avpd.buf) - return -1; -diff --git a/src/mpv/demux/packet.c b/src/mpv/demux/packet.c -index 22b111b0ce..62cd90ef7e 100644 ---- a/src/mpv/demux/packet.c -+++ b/src/mpv/demux/packet.c -@@ -92,7 +92,7 @@ void demux_packet_shorten(struct demux_packet *dp, size_t len) - { - assert(len <= dp->len); - dp->len = len; -- memset(dp->buffer + dp->len, 0, FF_INPUT_BUFFER_PADDING_SIZE); -+ memset(dp->buffer + dp->len, 0, AV_INPUT_BUFFER_PADDING_SIZE); - } - - void free_demux_packet(struct demux_packet *dp) -diff --git a/src/mpv/video/decode/vd_lavc.c b/src/mpv/video/decode/vd_lavc.c -index ffd56350b6..2589faf4ec 100644 ---- a/src/mpv/video/decode/vd_lavc.c -+++ b/src/mpv/video/decode/vd_lavc.c -@@ -377,15 +377,15 @@ static void init_avctx(struct dec_video *vd, const char *decoder, - mp_set_avcodec_threads(vd->log, avctx, lavc_param->threads); - } - -- avctx->flags |= lavc_param->bitexact ? CODEC_FLAG_BITEXACT : 0; -- avctx->flags2 |= lavc_param->fast ? CODEC_FLAG2_FAST : 0; -+ avctx->flags |= lavc_param->bitexact ? AV_CODEC_FLAG_BITEXACT : 0; -+ avctx->flags2 |= lavc_param->fast ? AV_CODEC_FLAG2_FAST : 0; - - if (lavc_param->show_all) { --#ifdef CODEC_FLAG2_SHOW_ALL -- avctx->flags2 |= CODEC_FLAG2_SHOW_ALL; // ffmpeg only? -+#ifdef AV_CODEC_FLAG2_SHOW_ALL -+ avctx->flags2 |= AV_CODEC_FLAG2_SHOW_ALL; // ffmpeg only? - #endif --#ifdef CODEC_FLAG_OUTPUT_CORRUPT -- avctx->flags |= CODEC_FLAG_OUTPUT_CORRUPT; // added with Libav 10 -+#ifdef AV_CODEC_FLAG_OUTPUT_CORRUPT -+ avctx->flags |= AV_CODEC_FLAG_OUTPUT_CORRUPT; // added with Libav 10 - #endif - } - -diff --git a/src/mpv/video/out/vo_lavc.c b/src/mpv/video/out/vo_lavc.c -index 3a6903b7fd..895e0952a5 100644 ---- a/src/mpv/video/out/vo_lavc.c -+++ b/src/mpv/video/out/vo_lavc.c -@@ -166,8 +166,8 @@ static int reconfig(struct vo *vo, struct mp_image_params *params, int flags) - goto error; - - vc->buffer_size = 6 * width * height + 200; -- if (vc->buffer_size < FF_MIN_BUFFER_SIZE) -- vc->buffer_size = FF_MIN_BUFFER_SIZE; -+ if (vc->buffer_size < AV_INPUT_BUFFER_MIN_SIZE) -+ vc->buffer_size = AV_INPUT_BUFFER_MIN_SIZE; - if (vc->buffer_size < sizeof(AVPicture)) - vc->buffer_size = sizeof(AVPicture); - -@@ -253,30 +253,19 @@ static void write_packet(struct vo *vo, int size, AVPacket *packet) - static int encode_video(struct vo *vo, AVFrame *frame, AVPacket *packet) - { - struct priv *vc = vo->priv; -- if (encode_lavc_oformat_flags(vo->encode_lavc_ctx) & AVFMT_RAWPICTURE) { -- if (!frame) -- return 0; -- memcpy(vc->buffer, frame, sizeof(AVPicture)); -- MP_DBG(vo, "got pts %f\n", -- frame->pts * (double) vc->stream->codec->time_base.num / -- (double) vc->stream->codec->time_base.den); -- packet->size = sizeof(AVPicture); -- return packet->size; -- } else { -- int got_packet = 0; -- int status = avcodec_encode_video2(vc->stream->codec, packet, -- frame, &got_packet); -- int size = (status < 0) ? status : got_packet ? packet->size : 0; -- -- if (frame) -- MP_DBG(vo, "got pts %f; out size: %d\n", -- frame->pts * (double) vc->stream->codec->time_base.num / -- (double) vc->stream->codec->time_base.den, size); -- -- if (got_packet) -- encode_lavc_write_stats(vo->encode_lavc_ctx, vc->stream); -- return size; -- } -+ int got_packet = 0; -+ int status = avcodec_encode_video2(vc->stream->codec, packet, -+ frame, &got_packet); -+ int size = (status < 0) ? status : got_packet ? packet->size : 0; -+ -+ if (frame) -+ MP_DBG(vo, "got pts %f; out size: %d\n", -+ frame->pts * (double) vc->stream->codec->time_base.num / -+ (double) vc->stream->codec->time_base.den, size); -+ -+ if (got_packet) -+ encode_lavc_write_stats(vo->encode_lavc_ctx, vc->stream); -+ return size; - } - - static void draw_image_unlocked(struct vo *vo, mp_image_t *mpi) - diff --git a/srcpkgs/bomi/patches/fix-cxx14.patch b/srcpkgs/bomi/patches/fix-cxx14.patch deleted file mode 100644 index b953146e2571..000000000000 --- a/srcpkgs/bomi/patches/fix-cxx14.patch +++ /dev/null @@ -1,67 +0,0 @@ ---- a/src/bomi/bomi.pro 2015-05-20 11:31:58.000000000 +0200 -+++ b/src/bomi/bomi.pro 2016-09-22 20:03:57.452315214 +0200 -@@ -19,6 +19,7 @@ - } - - QMAKE_CXXFLAGS_CXX11 = -std=c++1y -+CONFIG += c++14 - - contains(QMAKE_CXX, clang++) { - QMAKE_CXXFLAGS += -Wno-missing-braces ---- a/src/bomi/misc/filenamegenerator.cpp 2015-05-20 11:31:58.000000000 +0200 -+++ b/src/bomi/misc/filenamegenerator.cpp 2016-09-22 20:06:10.523355518 +0200 -@@ -51,8 +51,8 @@ - }; - get[u"%MEDIA_DISPLAY_NAME%"_q] = [] (const FileNameGenerator *g) { return g->mediaName; }; - -- get[u"%UNIX%"_q] = [] (const FileNameGenerator *g) { return _N(g->unix / 1000llu); }; -- get[u"%UNIX_MS%"_q] = [] (const FileNameGenerator *g) { return _N(g->unix); }; -+ get[u"%UNIX%"_q] = [] (const FileNameGenerator *g) { return _N(g->_unix / 1000llu); }; -+ get[u"%UNIX_MS%"_q] = [] (const FileNameGenerator *g) { return _N(g->_unix); }; - return get; - }(); - auto ret = func.value(ph); ---- a/src/bomi/misc/filenamegenerator.hpp 2015-05-20 11:31:58.000000000 +0200 -+++ b/src/bomi/misc/filenamegenerator.hpp 2016-09-22 20:07:13.762375106 +0200 -@@ -11,7 +11,7 @@ - QTime start, end; - QString mediaName; - Mrl mrl; -- quint64 unix = 0; -+ quint64 _unix = 0; - }; - - #endif // FILENAMEGENERATOR_HPP ---- a/src/bomi/player/mainwindow_p.cpp 2015-05-20 11:31:58.000000000 +0200 -+++ b/src/bomi/player/mainwindow_p.cpp 2016-09-22 20:08:20.590396090 +0200 -@@ -910,7 +910,7 @@ - g.dateTime = QDateTime::currentDateTime(); - g.start = QTime::fromMSecsSinceStartOfDay(e.time()); - g.end = end.isNull() ? g.start : end; -- g.unix = QDateTime::currentMSecsSinceEpoch(); -+ g._unix = QDateTime::currentMSecsSinceEpoch(); - g.mrl = e.mrl(); - g.mediaName = e.media()->name(); - return g; ---- a/src/bomi/player/mainwindow_p.hpp 2015-05-20 11:31:58.000000000 +0200 -+++ b/src/bomi/player/mainwindow_p.hpp 2016-09-22 20:09:18.003414361 +0200 -@@ -101,7 +101,7 @@ - - struct { - QDate date; QTime time, position; -- quint64 unix = 0; -+ quint64 _unix = 0; - QMap<QString, std::function<QString(void)>> get; - } ph; - QTimer waiter, hider, dialogWorkaround; ---- a/src/bomi/dialog/encoderdialog.cpp 2015-05-20 11:31:58.000000000 +0200 -+++ b/src/bomi/dialog/encoderdialog.cpp 2016-09-22 20:05:18.684339670 +0200 -@@ -255,7 +255,7 @@ - { - if (d->size.isEmpty()) - return tr("No video stream exists."); -- d->g.unix = QDateTime::currentMSecsSinceEpoch(); -+ d->g._unix = QDateTime::currentMSecsSinceEpoch(); - d->g.dateTime = QDateTime::currentDateTime(); - d->g.start = d->ui.a->time(); - d->g.end = d->ui.b->time(); diff --git a/srcpkgs/bomi/patches/fix-sysctl_h.patch b/srcpkgs/bomi/patches/fix-sysctl_h.patch deleted file mode 100644 index 1de63a16b819..000000000000 --- a/srcpkgs/bomi/patches/fix-sysctl_h.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/src/bomi/os/mac.mm 2015-05-20 11:31:58.000000000 +0200 -+++ b/src/bomi/os/mac.mm 2021-01-16 10:51:12.701668482 +0100 -@@ -274,7 +274,7 @@ - - - #ifdef Q_OS_MAC --#include <sys/sysctl.h> -+#include <linux/sysctl.h> - #include <mach/mach_host.h> - #include <mach/task.h> - #include <libproc.h> ---- a/src/bomi/os/x11.cpp 2015-05-20 11:31:58.000000000 +0200 -+++ b/src/bomi/os/x11.cpp 2021-01-16 10:51:04.559292267 +0100 -@@ -15,7 +15,7 @@ - #include <fcntl.h> - #include <time.h> - #include <sys/time.h> --#include <sys/sysctl.h> -+#include <linux/sysctl.h> - #include <sys/types.h> - #include <xcb/xcb.h> - #include <xcb/randr.h> diff --git a/srcpkgs/bomi/template b/srcpkgs/bomi/template deleted file mode 100644 index 4cab853148a5..000000000000 --- a/srcpkgs/bomi/template +++ /dev/null @@ -1,35 +0,0 @@ -# Template file for 'bomi' -pkgname=bomi -version=0.9.11 -revision=17 -build_style=configure -configure_args="--disable-systemd --release --prefix=/usr" -# does not build using py3.8 because of waf issues -hostmakedepends="python pkg-config curl perl which" -makedepends="qt5-devel MesaLib-devel ffmpeg-devel mpg123-devel libass-devel - libdvdread-devel libdvdnav-devel libbluray-devel icu-devel libxcb-devel - xcb-util-wm-devel libva-devel libva-glx-devel alsa-lib-devel libvdpau-devel - qt5-tools-devel qt5-declarative-devel qt5-svg-devel qt5-x11extras-devel - fribidi-devel libcdio-devel libcdio-paranoia-devel pulseaudio-devel - samba-devel libchardet-devel" -depends="qt5-quickcontrols" -short_desc="Powerful and easy-to-use Qt5 multimedia player" -maintainer="Jakub Skrzypnik <jot.skrzyp@gmail.com>" -license="GPL-2.0-or-later" -homepage="https://bomi-player.github.io/" -changelog="https://raw.githubusercontent.com/xylosper/bomi/master/CHANGES.txt" -distfiles="https://github.com/xylosper/bomi/archive/v${version}.tar.gz" -checksum=c76ac45733cdafa7003bbc178e5a90a683df9aec30cd85f188bb17c7af9e282e -nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/1382/steps/shell_3/logs/stdio - -pre_configure() { - case "$XBPS_TARGET_MACHINE" in - *-musl) # There is no <sys/sysctl.h> in musl libc - sed -e "s;<sys/sysctl\.h>;<linux/sysctl.h>;" \ - -i ${wrksrc}/src/bomi/os/x11.cpp - ;; - esac -} -do_install() { - make DEST_DIR=${DESTDIR} install -} From f27d3ce8d44ff05827fc59e16387aefeb7643917 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com> Date: Fri, 6 Aug 2021 16:25:50 -0300 Subject: [PATCH 2/2] removed-packages: add bomi and revbump. --- srcpkgs/removed-packages/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index a4a0c532cad2..78ba7731cc3e 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -1,7 +1,7 @@ # Template file for 'removed-packages' pkgname=removed-packages version=0.1 -revision=46 +revision=47 build_style=meta short_desc="Uninstalls packages removed from repository" maintainer="Piotr Wójcik <chocimier@tlen.pl>" @@ -21,6 +21,7 @@ replaces=" avogadro<=1.2.0_8 avogadro-devel<=1.2.0_8 bokken<=1.8_3 + bomi<=0.9.11_17 burp-server<=1.4.40_13 burp-client<=1.4.40_13 bzr<=2.7.0_1
[-- Attachment #1: Type: text/plain, Size: 1591 bytes --] There's a merged pull request on the void-packages repository bomi: remove package https://github.com/void-linux/void-packages/pull/32368 Description: Unmaintaned and broken. <!-- Mark items with [x] where applicable --> #### General - [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements) #### Have the results of the proposed changes been tested? - [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me - [x] I generally don't use the affected packages but briefly tested this PR <!-- If GitHub CI cannot be used to validate the build result (for example, if the build is likely to take several hours), make sure to [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration). When skipping CI, uncomment and fill out the following section. Note: for builds that are likely to complete in less than 2 hours, it is not acceptable to skip CI. --> <!-- #### Does it build and run successfully? (Please choose at least one native build and, if supported, at least one cross build. More are better.) - [ ] I built this PR locally for my native architecture, (ARCH-LIBC) - [ ] I built this PR locally for these architectures (if supported. mark crossbuilds): - [ ] aarch64-musl - [ ] armv7l - [ ] armv6l-musl --> The UI doesn't load for me (saw a similar issue on bomi github page), last release was 6 years ago and it's not maintained anymore.