commit: 6eac0ed3624dd49faee32b79019d63f49c5e342b
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Thu May 15 11:14:24 2025 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu May 15 11:14:24 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6eac0ed3
media-libs/wxsvg: drop 1.5.11-r1, 1.5.23, 1.5.24
Signed-off-by: David Seifert <soap <AT> gentoo.org>
media-libs/wxsvg/Manifest | 2 --
media-libs/wxsvg/files/ffmpeg5.patch | 64 ---------------------------------
media-libs/wxsvg/wxsvg-1.5.11-r1.ebuild | 43 ----------------------
media-libs/wxsvg/wxsvg-1.5.23.ebuild | 44 -----------------------
media-libs/wxsvg/wxsvg-1.5.24.ebuild | 48 -------------------------
5 files changed, 201 deletions(-)
diff --git a/media-libs/wxsvg/Manifest b/media-libs/wxsvg/Manifest
index 1d569153b0aa..812aef0d2040 100644
--- a/media-libs/wxsvg/Manifest
+++ b/media-libs/wxsvg/Manifest
@@ -1,3 +1 @@
-DIST wxsvg-1.5.11.tar.bz2 514919 BLAKE2B
d15d3478b69c4db4bd1cfc5032ff4909d35aca45f69694dbb74db72bc9d651fae3b8948382f60abd3f93a36dd4756f8f8f2c37acf7ac0b8859a9b03cb8cfda55
SHA512
d3538969bc0dda6bab740efef6952c2ca92e0ca74780c6370e3c6daf21d641e894b570d13b6ca408839b1b37df2aca9a3cf32d6423ddbf5f9f84274cfb1b8582
-DIST wxsvg-1.5.23.tar.bz2 500351 BLAKE2B
369bd7cee8581df72712183ecb997f0cebae6e7fe942d4cad123d77472b5e3f479f604854bc267990e7ec29c9420625433a4b8a3fe799fcae0e4d6173d411c50
SHA512
c15f58fecbee595f0f981c9347f1e1b929656b7d9c9dfb699252111df927d554cb88b6d7801b323451b0f906ec8c7d6935c9e15372e213f1921f0fdd90733422
DIST wxsvg-1.5.24.tar.bz2 500480 BLAKE2B
2ecf863f8cb8980a14bcddfe014e595564033af17f710ebdb4352de8a2a3cea93ed471b1870dd111ab24100bbc307fb841bed579edbd00c0e0454c4ac5c77934
SHA512
cceba943102eece67d40f480b5b6fa3d6294e6d6733732f35112406453e2d86f516c07817983a074136dc929b911620ca87018cbe79ce4ba3a9e3562fb53cf58
diff --git a/media-libs/wxsvg/files/ffmpeg5.patch
b/media-libs/wxsvg/files/ffmpeg5.patch
deleted file mode 100644
index 3b726ec79b5f..000000000000
--- a/media-libs/wxsvg/files/ffmpeg5.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-Index: wxsvg-1.5.23/include/wxSVG/mediadec_ffmpeg.h
-===================================================================
---- wxsvg-1.5.23.orig/include/wxSVG/mediadec_ffmpeg.h
-+++ wxsvg-1.5.23/include/wxSVG/mediadec_ffmpeg.h
-@@ -81,6 +81,7 @@ private:
- bool OpenVideoDecoder();
- void CloseVideoDecoder();
- AVStream* GetVideoStream();
-+ int64_t m_cur_dts;
- };
-
- #endif //FFMPEG_MEDIA_DECODER_H
-Index: wxsvg-1.5.23/src/mediadec_ffmpeg.cpp
-===================================================================
---- wxsvg-1.5.23.orig/src/mediadec_ffmpeg.cpp
-+++ wxsvg-1.5.23/src/mediadec_ffmpeg.cpp
-@@ -20,6 +20,7 @@
- #define UINT64_C(val) val##ULL
- #endif
- extern "C" {
-+#include <libavcodec/avcodec.h>
- #include <libavformat/avformat.h>
- #include <libswscale/swscale.h>
- #include <libavutil/avutil.h>
-@@ -153,6 +154,9 @@ StreamType wxFfmpegMediaDecoder::GetStre
- }
-
- wxString wxFfmpegMediaDecoder::GetCodecName(unsigned int streamIndex) {
-+#if LIBAVCODEC_VERSION_MAJOR >= 59
-+ const
-+#endif
- AVCodec *codec =
avcodec_find_decoder(m_formatCtx->streams[streamIndex]->codecpar->codec_id);
- if (codec) {
- return wxString(codec->name, wxConvLocal);
-@@ -193,6 +197,9 @@ bool wxFfmpegMediaDecoder::OpenVideoDeco
-
- // find and open the decoder for the video stream
- AVStream* stream = m_formatCtx->streams[m_videoStream];
-+#if LIBAVCODEC_VERSION_MAJOR >= 59
-+ const
-+#endif
- AVCodec* codec = avcodec_find_decoder(stream->codecpar->codec_id);
- if (!codec)
- return false;
-@@ -255,7 +262,11 @@ double wxFfmpegMediaDecoder::GetPosition
- AVStream *st = GetVideoStream();
- if (st == NULL)
- return -1;
-+#if LIBAVCODEC_VERSION_MAJOR >= 59
-+ int64_t timestamp = m_cur_dts;
-+#else
- int64_t timestamp = st->cur_dts;
-+#endif
- if (timestamp == (int64_t)AV_NOPTS_VALUE)
- return -1;
- timestamp = av_rescale(timestamp, AV_TIME_BASE *
(int64_t)st->time_base.num, st->time_base.den);
-@@ -308,6 +319,7 @@ wxImage wxFfmpegMediaDecoder::GetNextFra
- uint8_t *rgbSrc[3] = { img.GetData(), NULL,
NULL };
- int rgbStride[3] = { 3 * m_width, 0, 0 };
- sws_scale(imgConvertCtx, m_frame->data,
m_frame->linesize, 0, m_codecCtx->height, rgbSrc, rgbStride);
-+ m_cur_dts = packet.dts;
- av_packet_unref(&packet);
- sws_freeContext(imgConvertCtx);
- return img;
diff --git a/media-libs/wxsvg/wxsvg-1.5.11-r1.ebuild
b/media-libs/wxsvg/wxsvg-1.5.11-r1.ebuild
deleted file mode 100644
index ad1f5c2eb769..000000000000
--- a/media-libs/wxsvg/wxsvg-1.5.11-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WX_GTK_VER=3.0
-inherit wxwidgets
-
-DESCRIPTION="C++ library to create, manipulate and render SVG files"
-HOMEPAGE="http://wxsvg.sourceforge.net/";
-SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.bz2";
-
-LICENSE="wxWinLL-3"
-SLOT="0/3" # based on SONAME of libwxsvg.so
-KEYWORDS="amd64 x86"
-
-RDEPEND=">=dev-libs/expat-2:=
- media-libs/libexif:=
- >=dev-libs/glib-2.28:2=
- dev-libs/libxml2:=
- media-libs/fontconfig:=
- media-libs/freetype:2=
- media-libs/harfbuzz:=
- x11-libs/cairo:=
- x11-libs/pango:=
- x11-libs/wxGTK:${WX_GTK_VER}=[X]
- >=media-video/ffmpeg-2.6:0="
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_configure() {
- setup-wxwidgets base-unicode
- econf \
- --disable-static \
- --with-wx-config=${WX_CONFIG}
-}
-
-src_install() {
- default
-
- # no static archives
- find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/wxsvg/wxsvg-1.5.23.ebuild
b/media-libs/wxsvg/wxsvg-1.5.23.ebuild
deleted file mode 100644
index e46240e4f291..000000000000
--- a/media-libs/wxsvg/wxsvg-1.5.23.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WX_GTK_VER=3.0-gtk3
-inherit wxwidgets
-
-DESCRIPTION="C++ library to create, manipulate and render SVG files"
-HOMEPAGE="http://wxsvg.sourceforge.net/";
-SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.bz2";
-
-LICENSE="wxWinLL-3"
-SLOT="0/3" # based on SONAME of libwxsvg.so
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=dev-libs/expat-2:=
- media-libs/libexif:=
- >=dev-libs/glib-2.28:2=
- dev-libs/libxml2:=
- media-libs/fontconfig:=
- media-libs/freetype:2=
- media-libs/harfbuzz:=
- x11-libs/cairo:=
- x11-libs/pango:=
- x11-libs/wxGTK:${WX_GTK_VER}=[X]
- >=media-video/ffmpeg-2.6:0="
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-PATCHES=( "${FILESDIR}/ffmpeg5.patch" )
-
-src_configure() {
- setup-wxwidgets base-unicode
- econf \
- --disable-static \
- --with-wx-config=${WX_CONFIG}
-}
-
-src_install() {
- default
-
- # no static archives
- find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/wxsvg/wxsvg-1.5.24.ebuild
b/media-libs/wxsvg/wxsvg-1.5.24.ebuild
deleted file mode 100644
index b709ec413884..000000000000
--- a/media-libs/wxsvg/wxsvg-1.5.24.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-WX_GTK_VER=3.2-gtk3
-inherit wxwidgets
-
-DESCRIPTION="C++ library to create, manipulate and render SVG files"
-HOMEPAGE="http://wxsvg.sourceforge.net/";
-SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.bz2";
-
-LICENSE="wxWinLL-3"
-SLOT="0/3" # based on SONAME of libwxsvg.so
-KEYWORDS="amd64 x86"
-
-RDEPEND="
- >=dev-libs/expat-2:=
- media-libs/libexif:=
- >=dev-libs/glib-2.28:2=
- dev-libs/libxml2:=
- media-libs/fontconfig:=
- media-libs/freetype:2=
- media-libs/harfbuzz:=
- x11-libs/cairo:=
- x11-libs/pango:=
- x11-libs/wxGTK:${WX_GTK_VER}=[X]
- >=media-video/ffmpeg-2.6:0="
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}/gcc13.patch"
-)
-
-src_configure() {
- setup-wxwidgets base-unicode
- econf \
- --disable-static \
- --with-wx-config=${WX_CONFIG}
-}
-
-src_install() {
- default
-
- # no static archives
- find "${ED}" -name '*.la' -delete || die
-}
