commit:     331564bcc3900216bb12d442816a53379a958d4e
Author:     Martin Dummer <martin.dummer <AT> gmx <DOT> net>
AuthorDate: Sat Feb  7 19:45:25 2026 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sat Feb  7 23:51:17 2026 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=331564bc

media-plugins/vdr-dvd: drop 0.3.7_pre20090106-r4

Signed-off-by: Martin Dummer <martin.dummer <AT> gmx.net>
Part-of: https://github.com/gentoo/gentoo/pull/45676
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 media-plugins/vdr-dvd/Manifest                     |  1 -
 ...vdr-dvd-0.3.7_pre20090106-compile_warnings.diff | 47 ----------------------
 ...pre20090106-fix-dvdnav-using-c++-keywords.patch | 18 ---------
 .../files/vdr-dvd-0.3.7_pre20090106_clang.patch    | 26 ------------
 media-plugins/vdr-dvd/metadata.xml                 |  1 -
 .../vdr-dvd/vdr-dvd-0.3.7_pre20090106-r4.ebuild    | 43 --------------------
 6 files changed, 136 deletions(-)

diff --git a/media-plugins/vdr-dvd/Manifest b/media-plugins/vdr-dvd/Manifest
index a7adabf41090..d642829f8893 100644
--- a/media-plugins/vdr-dvd/Manifest
+++ b/media-plugins/vdr-dvd/Manifest
@@ -1,2 +1 @@
 DIST vdr-dvd-0.3.7.tar.gz 77824 BLAKE2B 
7e2c9c5465b58290aef880ab405cba9e998a5ce3ad5fe06336c2f1b362d461d74d3f0c13c82e4ff602469cd5c02112ac00b6ebdefe68acc9a20b5631791278cc
 SHA512 
5d9b413d7bce5bd22d5252fa878f61649dba966e1d936844f0a5c7d7893f7ac3078ef3ef2bd8c69119409a23f6ce9d1ec5b0e1fa8fb2011c08f3b2c9efdae782
-DIST vdr-dvd-cvs-20090106.tar.bz2 65387 BLAKE2B 
3642fb4d7d38916b6dfdcba6ea891a84fafee63e3991b18574bf2d33b42f4f59a936a91d364fd523f26f2a0f96bd0c5879955491fd5ec353f201dcff040598be
 SHA512 
7e0f24cfbd7567d46eed73ca52826970a21d2cd49089cc019f24eced88dde83db2b14222a9a01ed37d376b323f82b53947d9f9c675c32ce775a487baaddb4b26

diff --git 
a/media-plugins/vdr-dvd/files/vdr-dvd-0.3.7_pre20090106-compile_warnings.diff 
b/media-plugins/vdr-dvd/files/vdr-dvd-0.3.7_pre20090106-compile_warnings.diff
deleted file mode 100644
index 70f5bfdf9c30..000000000000
--- 
a/media-plugins/vdr-dvd/files/vdr-dvd-0.3.7_pre20090106-compile_warnings.diff
+++ /dev/null
@@ -1,47 +0,0 @@
-fixe a lot of compile warnings,...
-
-Signed of by: Joerg Bornkessel <[email protected]> (26 Jan 2011)
-
-diff -Naur dvd-cvs-20090106.orig/player-dvd.c dvd-cvs-20090106/player-dvd.c
---- dvd-cvs-20090106.orig/player-dvd.c 2011-01-26 15:49:38.000000000 +0100
-+++ dvd-cvs-20090106/player-dvd.c      2011-01-26 15:54:07.000000000 +0100
-@@ -2670,18 +2670,18 @@
- 
-     //Menu's has no titleNumbers and chapterNumbers (see dvdnav.h)
-     if (titleNumber == 0)
--        asprintf(&titleinfo_str, "%d/%d %d", titleNumber, titleNumbers,  
chapterNumber);
-+        (0 < asprintf(&titleinfo_str, "%d/%d %d", titleNumber, titleNumbers,  
chapterNumber));
-     else if (angleNumbers > 1)
--        asprintf(&titleinfo_str, "%d/%d %d/%d %d/%d", titleNumber, 
titleNumbers, chapterNumber, chapterNumbers, angleNumber, angleNumbers);
-+        (0 < asprintf(&titleinfo_str, "%d/%d %d/%d %d/%d", titleNumber, 
titleNumbers, chapterNumber, chapterNumbers, angleNumber, angleNumbers));
-     else
--        asprintf(&titleinfo_str, "%d/%d %d/%d", titleNumber, titleNumbers,  
chapterNumber, chapterNumbers);
-+        (0 < asprintf(&titleinfo_str, "%d/%d %d/%d", titleNumber, 
titleNumbers,  chapterNumber, chapterNumbers));
-     return;
- }
- 
- void cDvdPlayer::GetAudioLanguageStr(const char **AudioLanguageStr) const
- {
-       static char buffer[100];
--      char *audioTypeDescr = NULL;
-+      const char *audioTypeDescr = NULL;
- 
-     if (!DVDActiveAndRunning()) {
-         *AudioLanguageStr = "n.a.";
-@@ -2753,13 +2753,13 @@
- 
-     switch (dvdnav_get_video_aspect(nav)) {
-         case 0:
--            asprintf(&aspect_str, " 4:3");
-+            (0 < asprintf(&aspect_str, " 4:3"));
-             break;
-         case 2:
--            asprintf(&aspect_str, "16:9_");
-+            (0 < asprintf(&aspect_str, "16:9_"));
-             break;
-         case 3:
--            asprintf(&aspect_str, "16:9");
-+            (0 < asprintf(&aspect_str, "16:9"));
-             break;
-         default:
-             aspect_str = strdup(dummy_n_a);

diff --git 
a/media-plugins/vdr-dvd/files/vdr-dvd-0.3.7_pre20090106-fix-dvdnav-using-c++-keywords.patch
 
b/media-plugins/vdr-dvd/files/vdr-dvd-0.3.7_pre20090106-fix-dvdnav-using-c++-keywords.patch
deleted file mode 100644
index 237ad1876458..000000000000
--- 
a/media-plugins/vdr-dvd/files/vdr-dvd-0.3.7_pre20090106-fix-dvdnav-using-c++-keywords.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: When including dvdnvav.h define/undefine the "this" keyword,
- used in dvdnav.h
-Author: Tobias Grimm <[email protected]>
-Bug-Debian: http://bugs.debian.org/642673
-
---- vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013.orig/player-dvd.h
-+++ vdr-plugin-dvd-0.3.6~b03+cvs20090426.0013/player-dvd.h
-@@ -11,8 +11,10 @@
- #ifndef __PLAYER_DVD_H
- #define __PLAYER_DVD_H
- 
-+#define this _this
- #include <dvdnav/dvdnav.h>
- #include <dvdnav/dvdnav_events.h>
-+#undef this
- 
- #include <vdr/device.h>
- #include <vdr/player.h>

diff --git a/media-plugins/vdr-dvd/files/vdr-dvd-0.3.7_pre20090106_clang.patch 
b/media-plugins/vdr-dvd/files/vdr-dvd-0.3.7_pre20090106_clang.patch
deleted file mode 100644
index 7816e84b2a6b..000000000000
--- a/media-plugins/vdr-dvd/files/vdr-dvd-0.3.7_pre20090106_clang.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-clang compilefix
-
-wrt bug 740276
-
-Signed-off-by: Joerg Bornkessel <[email protected]> (13 May 2021)
-diff -Naur dvd-cvs-20090106.orig/player-dvd.c dvd-cvs-20090106/player-dvd.c
---- dvd-cvs-20090106.orig/player-dvd.c 2021-05-13 18:51:00.823067369 +0200
-+++ dvd-cvs-20090106/player-dvd.c      2021-05-13 18:53:17.136067369 +0200
-@@ -2707,7 +2707,7 @@
-     }
- 
-     uint16_t audioStreamLanguageCode = 
GetAudioTrackLanguageCode(currentNavAudioTrack);
--    char audioLanguageStr[3] = {audioStreamLanguageCode, 
audioStreamLanguageCode >> 8, 0};
-+    char audioLanguageStr[3] = {static_cast<char>(audioStreamLanguageCode), 
static_cast<char>(audioStreamLanguageCode >> 8), 0};
-     if (GetAudioStreamNumbers() > 1)
-         sprintf(buffer,"%s %d/%d %s", audioStreamLanguageCode != 0xFFFF ? 
audioLanguageStr : "", GetCurrentNavAudioTrackIdx() + 1, 
GetAudioStreamNumbers() - 1, audioTypeDescr);
-     else
-@@ -2725,7 +2725,7 @@
-     }
- 
-     int subtitleStreamLanguageCode = 
GetSubtitleLanguageCode(currentNavSubpStream);
--    char subtitleLanguageStr[3] = {subtitleStreamLanguageCode, 
subtitleStreamLanguageCode >> 8, 0};
-+    char subtitleLanguageStr[3] = 
{static_cast<char>(subtitleStreamLanguageCode), 
static_cast<char>(subtitleStreamLanguageCode >> 8), 0};
- 
-     if(GetSubtitleStreamNumbers() > 2)
-         sprintf(buffer,"%s %d/%d", subtitleStreamLanguageCode !=0xFFFF ? 
subtitleLanguageStr : "", GetCurrentNavSubpStreamIdx(), 
GetSubtitleStreamNumbers() - 1);

diff --git a/media-plugins/vdr-dvd/metadata.xml 
b/media-plugins/vdr-dvd/metadata.xml
index d2b86a191aa8..9691e11d10f5 100644
--- a/media-plugins/vdr-dvd/metadata.xml
+++ b/media-plugins/vdr-dvd/metadata.xml
@@ -14,7 +14,6 @@
         <name>Gentoo VDR Project</name>
     </maintainer>
     <upstream>
-        <remote-id type="sourceforge">dvdplugin</remote-id>
         <remote-id type="github">vdr-projects/vdr-plugin-dvd</remote-id>
     </upstream>
 </pkgmetadata>

diff --git a/media-plugins/vdr-dvd/vdr-dvd-0.3.7_pre20090106-r4.ebuild 
b/media-plugins/vdr-dvd/vdr-dvd-0.3.7_pre20090106-r4.ebuild
deleted file mode 100644
index 2716555b611e..000000000000
--- a/media-plugins/vdr-dvd/vdr-dvd-0.3.7_pre20090106-r4.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit vdr-plugin-2
-
-MY_P=${PN}-cvs-${PV#*_pre}
-S=${WORKDIR}/${MY_P#vdr-}
-
-DESCRIPTION="VDR Plugin: DVD-Player"
-HOMEPAGE="https://sourceforge.net/projects/dvdplugin";
-SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=media-video/vdr-1.6.0
-       >=media-libs/libdvdnav-4.2.0
-       >=media-libs/a52dec-0.7.4"
-DEPEND="${RDEPEND}"
-
-# vdr-plugin-2.eclass fix
-KEEP_I18NOBJECT="yes"
-
-PATCHES=(
-       "${FILESDIR}/${P}-compile_warnings.diff"
-       "${FILESDIR}/${P}-fix-dvdnav-using-c++-keywords.patch"
-       "${FILESDIR}/${P}_clang.patch"
-       )
-
-src_prepare() {
-       vdr-plugin-2_src_prepare
-
-       if has_version ">=media-video/vdr-2.1.3"; then
-               sed -i player-dvd.c -e 
"s:DeviceTrickSpeed(sp):DeviceTrickSpeed(sp,true):"
-       fi
-
-       #bug 787485
-       sed -e "s:MAKEDEP = g++:MAKEDEP = \$(CXX):" -i Makefile
-}

Reply via email to