From 07caddbaa9a3f5af6cff129b9b97d01b911a8bc7 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Sun, 26 Feb 2023 18:21:54 +0000
Subject: dev-libs/liborcus && media-video/qmplay2 : drop (fixed upstream)
---
dev-libs/liborcus/Manifest | 1 -
.../liborcus/files/liborcus-0.17.0-test-fix.patch | 51 --------
.../liborcus/files/liborcus-0.17.2-clang.patch | 26 ----
.../liborcus/files/liborcus-0.17.2-gcc-13.patch | 29 -----
.../files/liborcus-0.17.2-python-optional.patch | 26 ----
dev-libs/liborcus/liborcus-0.17.2-r1.ebuild | 70 -----------
media-video/qmplay2/Manifest | 1 -
media-video/qmplay2/qmplay2-23.02.05-r1.ebuild | 137 ---------------------
8 files changed, 341 deletions(-)
delete mode 100644 dev-libs/liborcus/Manifest
delete mode 100644 dev-libs/liborcus/files/liborcus-0.17.0-test-fix.patch
delete mode 100644 dev-libs/liborcus/files/liborcus-0.17.2-clang.patch
delete mode 100644 dev-libs/liborcus/files/liborcus-0.17.2-gcc-13.patch
delete mode 100644 dev-libs/liborcus/files/liborcus-0.17.2-python-optional.patch
delete mode 100644 dev-libs/liborcus/liborcus-0.17.2-r1.ebuild
delete mode 100644 media-video/qmplay2/Manifest
delete mode 100644 media-video/qmplay2/qmplay2-23.02.05-r1.ebuild
diff --git a/dev-libs/liborcus/Manifest b/dev-libs/liborcus/Manifest
deleted file mode 100644
index a10f5c5f..00000000
--- a/dev-libs/liborcus/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST liborcus-0.17.2.tar.xz 1839188 BLAKE2B d274e3af71df16866e305403d63d3978613915753412ac9de19d7de7802930c3886d8653d6d48a8d9a971dc0ee284f8f83af8dc07850b5f28fcdab2815b6d9b2 SHA512 8ad8db46c23673260057aff555286d95ebfeff0a027bdeae24f11f8aa12456284f7f4446edddb91936b3011eb1227cfe1618ab3c4d909f8356c8c151f5739d79
diff --git a/dev-libs/liborcus/files/liborcus-0.17.0-test-fix.patch b/dev-libs/liborcus/files/liborcus-0.17.0-test-fix.patch
deleted file mode 100644
index 1de33a7e..00000000
--- a/dev-libs/liborcus/files/liborcus-0.17.0-test-fix.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-# https://bugs.gentoo.org/713586
-
-[PATCH] Build orcus-env-dump unconditionally
-
-The rule for `orcus-env-dump.o` is guarded by `if WITH_TOOLS` however,
-the rule for the executable `orcus-env-dump` is not. This leads to
-linking errors when running the test suite without tools.
-
-Move the rule for `orcus-env-dump.o` out of the if WITH_TOOLS block to
-always build it.
----
- src/Makefile.am | 20 ++++++++++----------
- 1 file changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -25,6 +25,16 @@ orcus_test_xml_LDADD = \
-
- orcus_test_xml_CPPFLAGS = -I$(top_builddir)/lib/liborcus/liborcus.la $(AM_CPPFLAGS) -DSRCDIR=\""$(top_srcdir)"\"
-
-+#----------------------------------------------------------------------------
-+
-+# orcus-env-dump
-+
-+orcus_env_dump_SOURCES = orcus_env_dump.cpp
-+orcus_env_dump_LDADD = \
-+ parser/liborcus-parser-@ORCUS_API_VERSION@.la \
-+ liborcus/liborcus-@ORCUS_API_VERSION@.la
-+orcus_env_dump_CPPFLAGS = -I$(top_builddir)/lib/liborcus/liborcus.la $(AM_CPPFLAGS)
-+
-
- TESTS = \
- orcus-test-xml \
-@@ -136,16 +146,6 @@ orcus_detect_CPPFLAGS = -I$(top_builddir)/lib/liborcus/liborcus.la $(AM_CPPFLAGS
-
- #----------------------------------------------------------------------------
-
--# orcus-env-dump
--
--orcus_env_dump_SOURCES = orcus_env_dump.cpp
--orcus_env_dump_LDADD = \
-- parser/liborcus-parser-@ORCUS_API_VERSION@.la \
-- liborcus/liborcus-@ORCUS_API_VERSION@.la
--orcus_env_dump_CPPFLAGS = -I$(top_builddir)/lib/liborcus/liborcus.la $(AM_CPPFLAGS)
--
--#----------------------------------------------------------------------------
--
- if BUILD_SPREADSHEET_MODEL
-
- orcus_json_LDADD += \
diff --git a/dev-libs/liborcus/files/liborcus-0.17.2-clang.patch b/dev-libs/liborcus/files/liborcus-0.17.2-clang.patch
deleted file mode 100644
index 62950cfc..00000000
--- a/dev-libs/liborcus/files/liborcus-0.17.2-clang.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-https://gitlab.com/orcus/orcus/-/commit/469aca3c76965b9031947506a15d940cbcd11cdb
-
-From: Tom Stellard <tstellar@redhat.com>
-Date: Mon, 16 May 2022 22:12:30 +0000
-Subject: [PATCH] Fix error when compiling with clang
-
-csv.cpp:83:29: error: non-constant-expression cannot be narrowed from type 'Py_ssize_t' (aka 'long') to 'std::basic_string_view::size_type' (aka 'unsigned long') in initializer list [-Wc++11-narrowing]
- app.read_stream({p, n});
- ^
-csv.cpp:83:29: note: insert an explicit cast to silence this issue
- app.read_stream({p, n});
- ^
- static_cast<size_type>( )
-1 error generated.
---- a/src/python/csv.cpp
-+++ b/src/python/csv.cpp
-@@ -80,7 +80,7 @@ PyObject* csv_read(PyObject* /*module*/, PyObject* args, PyObject* kwargs)
-
- Py_ssize_t n = 0;
- const char* p = PyUnicode_AsUTF8AndSize(str.get(), &n);
-- app.read_stream({p, n});
-+ app.read_stream({p, static_cast<std::string_view::size_type>(n)});
-
- return create_document(std::move(doc));
- }
-GitLab
diff --git a/dev-libs/liborcus/files/liborcus-0.17.2-gcc-13.patch b/dev-libs/liborcus/files/liborcus-0.17.2-gcc-13.patch
deleted file mode 100644
index fa489205..00000000
--- a/dev-libs/liborcus/files/liborcus-0.17.2-gcc-13.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-https://gitlab.com/orcus/orcus/-/commit/fa68d6a76778df26e41108e3400f4a907e351203
-https://gitlab.com/orcus/orcus/-/merge_requests/136
-
-From fa68d6a76778df26e41108e3400f4a907e351203 Mon Sep 17 00:00:00 2001
-From: Kohei Yoshida <kohei.yoshida@gmail.com>
-Date: Tue, 19 Jul 2022 21:11:16 -0400
-Subject: [PATCH] Explicitly include <cstdint> header with GCC 13 (#162)
-
-c.f. https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes
---- a/include/orcus/base64.hpp
-+++ b/include/orcus/base64.hpp
-@@ -9,6 +9,7 @@
- #define __ORCUS_BASE64_HPP__
-
- #include "env.hpp"
-+#include <cstdint>
- #include <vector>
- #include <string>
-
---- a/include/orcus/types.hpp
-+++ b/include/orcus/types.hpp
-@@ -8,6 +8,7 @@
- #ifndef INCLUDED_ORCUS_TYPES_HPP
- #define INCLUDED_ORCUS_TYPES_HPP
-
-+#include <cstdint>
- #include <cstdlib>
- #include <vector>
- #include <string>
diff --git a/dev-libs/liborcus/files/liborcus-0.17.2-python-optional.patch b/dev-libs/liborcus/files/liborcus-0.17.2-python-optional.patch
deleted file mode 100644
index 9473958c..00000000
--- a/dev-libs/liborcus/files/liborcus-0.17.2-python-optional.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 14d15bf331b5cc3ca2c1cdb8097dfe918173cba1 Mon Sep 17 00:00:00 2001
-From: matoro <11910244-matoro3@users.noreply.gitlab.com>
-Date: Wed, 24 Aug 2022 13:42:27 -0400
-Subject: [PATCH] Only recurse into src/python when BUILD_PYTHON is set
-
----
- src/Makefile.am | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index d586299c..7e44aed8 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -1,4 +1,8 @@
--SUBDIRS = include test parser mso liborcus spreadsheet python
-+SUBDIRS = include test parser mso liborcus spreadsheet
-+
-+if BUILD_PYTHON
-+SUBDIRS += python
-+endif
-
- AM_CPPFLAGS = \
- -I$(top_srcdir)/include \
---
-GitLab
-
diff --git a/dev-libs/liborcus/liborcus-0.17.2-r1.ebuild b/dev-libs/liborcus/liborcus-0.17.2-r1.ebuild
deleted file mode 100644
index 000ffa82..00000000
--- a/dev-libs/liborcus/liborcus-0.17.2-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit autotools python-single-r1
-
-DESCRIPTION="Standalone file import filter library for spreadsheet documents"
-HOMEPAGE="https://gitlab.com/orcus/orcus/blob/master/README.md"
-
-if [[ ${PV} == *9999* ]]; then
- MDDS_SLOT="1/2.0"
- EGIT_REPO_URI="https://gitlab.com/orcus/orcus.git"
- inherit git-r3
-else
- MDDS_SLOT="1/2.0"
- SRC_URI="https://kohei.us/files/orcus/src/${P}.tar.xz"
- KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0/0.17" # based on SONAME of liborcus.so
-IUSE="python +spreadsheet-model test tools"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- dev-libs/boost:=[zlib(+)]
- sys-libs/zlib
- python? ( ${PYTHON_DEPS} )
- spreadsheet-model? ( dev-libs/libixion:${SLOT} )
-"
-DEPEND="${RDEPEND}
- dev-util/mdds:${MDDS_SLOT}
-"
-
-PATCHES=(
- "${FILESDIR}"/${P}-clang.patch
- "${FILESDIR}"/${P}-gcc-13.patch
- "${FILESDIR}"/${P}-python-optional.patch
-)
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- # bug 713586
- use test && eapply "${FILESDIR}/${PN}-0.17.0-test-fix.patch"
-
- default
- eautoreconf
-}
-
-src_configure() {
- local myeconfargs=(
- --disable-werror
- $(use_enable python)
- $(use_enable spreadsheet-model)
- $(use_with tools)
- )
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
- find "${D}" -name '*.la' -type f -delete || die
-}
diff --git a/media-video/qmplay2/Manifest b/media-video/qmplay2/Manifest
deleted file mode 100644
index 4ccb1be4..00000000
--- a/media-video/qmplay2/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST QMPlay2-src-23.02.05.tar.xz 1428992 BLAKE2B 7296ed089306e50e1051c33c23dae30f14cbb166b9d9ea8c184e8aa027a261a658e1d7770c7d574784a5cde4890c66e2104927f4473f484562378c956bea4b3f SHA512 d2e998a2df08c98b7e0232de693ee17b5c703793e2b1edadde300ca39998f40f7ad58b5850ee1f8cddf1dd9489c7f96e664db7e9deba01a612d97707aad849c0
diff --git a/media-video/qmplay2/qmplay2-23.02.05-r1.ebuild b/media-video/qmplay2/qmplay2-23.02.05-r1.ebuild
deleted file mode 100644
index 83acd1b1..00000000
--- a/media-video/qmplay2/qmplay2-23.02.05-r1.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake xdg
-
-DESCRIPTION="A Qt-based video player, which can play most formats and codecs"
-HOMEPAGE="https://github.com/zaps166/QMPlay2"
-
-if [[ ${PV} == *9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/zaps166/QMPlay2"
-else
- SRC_URI="https://github.com/zaps166/QMPlay2/releases/download/${PV}/QMPlay2-src-${PV}.tar.xz"
- S="${WORKDIR}/QMPlay2-src-${PV}"
- KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="LGPL-3"
-SLOT="0"
-
-IUSE="avdevice +audiofilters +alsa cdio cuvid extensions gme inputs libass
- modplug notifications opengl pipewire portaudio pulseaudio sid shaders
- +taglib vaapi vdpau videofilters visualizations vulkan xv"
-
-REQUIRED_USE="
- audiofilters? ( || ( alsa pipewire portaudio pulseaudio ) )
- shaders? ( vulkan )"
-
-RDEPEND="
- dev-qt/qtcore:5
- dev-qt/qtdbus:5
- dev-qt/qtsvg:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- media-video/ffmpeg
- || (
- dev-qt/qtgui:5[X(-)]
- dev-qt/qtgui:5[xcb(-)]
- )
- alsa? ( media-libs/alsa-lib )
- cdio? ( dev-libs/libcdio[cddb] )
- extensions? ( dev-qt/qtdeclarative:5 )
- gme? ( media-libs/game-music-emu )
- libass? ( media-libs/libass )
- opengl? ( virtual/opengl )
- pipewire? ( media-video/pipewire )
- portaudio? ( media-libs/portaudio )
- pulseaudio? ( media-sound/pulseaudio )
- sid? ( media-libs/libsidplayfp )
- shaders? ( >=media-libs/shaderc-2020.1 )
- taglib? ( media-libs/taglib )
- vaapi? (
- >=media-video/ffmpeg-4.1.3[vaapi]
- media-libs/libva[X]
- )
- vdpau? ( media-video/ffmpeg[vdpau] )
- videofilters? ( dev-qt/qtconcurrent:5 )
- vulkan? (
- >=dev-qt/qtgui-5.14.1:5[vulkan]
- >=media-libs/vulkan-loader-1.2.133
- )
- xv? ( x11-libs/libXv )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-qt/linguist-tools:5"
-
-src_prepare() {
- # disable compress man pages
- sed -r \
- -e 's/if\(GZIP\)/if\(TRUE\)/' \
- -e 's/(install.+QMPlay2\.1)\.gz/\1/' \
- -i src/gui/CMakeLists.txt || die
-
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- # core
- -DUSE_LINK_TIME_OPTIMIZATION=false
- -DUSE_UPDATES=OFF
- -DUSE_ALSA=$(usex alsa)
- -DUSE_AUDIOCD=$(usex cdio)
- -DUSE_DBUS_SUSPEND=ON
- -DUSE_FREEDESKTOP_NOTIFICATIONS=ON
- -DUSE_LIBASS=$(usex libass)
- -DUSE_NOTIFY=$(usex notifications)
- -DUSE_OPENGL=$(usex opengl)
- -DUSE_VULKAN=$(usex vulkan)
- -DUSE_GLSLC=$(usex shaders)
- -DUSE_XVIDEO=$(usex xv)
-
- # ffmpeg
- -DUSE_FFMPEG_AVDEVICE=$(usex avdevice)
- -DUSE_FFMPEG_VAAPI=$(usex vaapi)
- -DUSE_FFMPEG_VDPAU=$(usex vdpau)
-
- # chiptune
- -DUSE_CHIPTUNE_GME=$(usex gme)
- -DUSE_CHIPTUNE_SID=$(usex sid)
-
- # modules
- -DUSE_AUDIOFILTERS=$(usex audiofilters)
- -DUSE_CUVID=$(usex cuvid)
- -DUSE_INPUTS=$(usex inputs)
- -DUSE_MODPLUG=$(usex modplug)
- -DUSE_PIPEWIRE=$(usex pipewire)
- -DUSE_PORTAUDIO=$(usex portaudio)
- -DUSE_PULSEAUDIO=$(usex pulseaudio)
- -DUSE_TAGLIB=$(usex taglib)
- -DUSE_VIDEOFILTERS=$(usex videofilters)
- -DUSE_VISUALIZATIONS=$(usex visualizations)
-
- # extensions
- -DUSE_EXTENSIONS=$(usex extensions)
- )
-
- if use extensions; then
- # Move inside an if, to remove unused option warning
- mycmakeargs+=(
- -DUSE_LASTFM=ON
- -DUSE_LYRICS=ON
- -DUSE_MEDIABROWSER=ON
- -DUSE_MPRIS2=ON
- )
- fi
-
- if [[ ${PV} == *9999 ]]; then
- mycmakeargs+=( -DUSE_GIT_VERSION=true )
- else
- mycmakeargs+=( -DUSE_GIT_VERSION=false )
- fi
-
- cmake_src_configure
-}
--
cgit v1.2.3