* [gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-dvd/files/, media-plugins/vdr-dvd/
@ 2024-07-12 12:25 Joonas Niilola
0 siblings, 0 replies; 2+ messages in thread
From: Joonas Niilola @ 2024-07-12 12:25 UTC (permalink / raw
To: gentoo-commits
commit: 5a04feb14b9bbe39f7b60108b32f33b9251aed49
Author: Martin Dummer <martin.dummer <AT> gmx <DOT> net>
AuthorDate: Sat May 4 12:15:28 2024 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Jul 12 12:25:02 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a04feb1
media-plugins/vdr-dvd: add 0.3.7
Signed-off-by: Martin Dummer <martin.dummer <AT> gmx.net>
Closes: https://github.com/gentoo/gentoo/pull/36573
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
media-plugins/vdr-dvd/Manifest | 1 +
media-plugins/vdr-dvd/files/vdr-dvd-0.3.7.patch | 40 +++++++++++++++++++++++++
media-plugins/vdr-dvd/metadata.xml | 1 +
media-plugins/vdr-dvd/vdr-dvd-0.3.7.ebuild | 27 +++++++++++++++++
4 files changed, 69 insertions(+)
diff --git a/media-plugins/vdr-dvd/Manifest b/media-plugins/vdr-dvd/Manifest
index 87e846901989..a7adabf41090 100644
--- a/media-plugins/vdr-dvd/Manifest
+++ b/media-plugins/vdr-dvd/Manifest
@@ -1 +1,2 @@
+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.patch b/media-plugins/vdr-dvd/files/vdr-dvd-0.3.7.patch
new file mode 100644
index 000000000000..a2bbd60d6b74
--- /dev/null
+++ b/media-plugins/vdr-dvd/files/vdr-dvd-0.3.7.patch
@@ -0,0 +1,40 @@
+--- a/Makefile
++++ b/Makefile
+@@ -82,7 +82,7 @@
+
+ # Dependencies:
+
+-MAKEDEP = g++ -MM -MG
++MAKEDEP = $(CXX) -MM -MG
+ DEPFILE = .dependencies
+ $(DEPFILE): Makefile
+ @$(MAKEDEP) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
+--- a/player-dvd.c
++++ b/player-dvd.c
+@@ -598,7 +598,7 @@
+ sp=2;
+ }
+ #if VDRVERSNUM < 20103
+- DeviceTrickSpeed(sp);
++ DeviceTrickSpeed(sp,true);
+ #else
+ DeviceTrickSpeed(sp,playDir == pdForward);
+ #endif
+@@ -3092,7 +3092,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
+@@ -3110,7 +3110,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 89b6db31754d..d2b86a191aa8 100644
--- a/media-plugins/vdr-dvd/metadata.xml
+++ b/media-plugins/vdr-dvd/metadata.xml
@@ -15,5 +15,6 @@
</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.ebuild b/media-plugins/vdr-dvd/vdr-dvd-0.3.7.ebuild
new file mode 100644
index 000000000000..1cb28217d72a
--- /dev/null
+++ b/media-plugins/vdr-dvd/vdr-dvd-0.3.7.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit vdr-plugin-2
+
+DESCRIPTION="VDR Plugin: DVD-Player"
+HOMEPAGE="https://github.com/vdr-projects/vdr-plugin-dvd"
+SRC_URI="https://github.com/vdr-projects/vdr-plugin-dvd/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/vdr-plugin-dvd-${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="media-video/vdr
+ media-libs/libdvdnav
+ media-libs/a52dec"
+RDEPEND="${DEPEND}"
+
+# vdr-plugin-2.eclass fix
+KEEP_I18NOBJECT="yes"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-0.3.7.patch"
+ )
^ permalink raw reply related [flat|nested] 2+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-dvd/files/, media-plugins/vdr-dvd/
@ 2021-05-13 19:07 Jörg Bornkessel
0 siblings, 0 replies; 2+ messages in thread
From: Jörg Bornkessel @ 2021-05-13 19:07 UTC (permalink / raw
To: gentoo-commits
commit: 63fb00b3235ba162859a170aed29626ecfe7ba4e
Author: Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
AuthorDate: Thu May 13 19:06:50 2021 +0000
Commit: Jörg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
CommitDate: Thu May 13 19:07:17 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63fb00b3
media-plugins/vdr-dvd: clang compile fixed
also reverted bug fix from wrt bug 787488
as it is fixed in main vdr sources
Closes: https://bugs.gentoo.org/740276
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Joerg Bornkessel <hd_brummy <AT> gentoo.org>
.../files/vdr-dvd-0.3.7_pre20090106_clang.patch | 26 ++++++++++++++++++++++
....ebuild => vdr-dvd-0.3.7_pre20090106-r4.ebuild} | 7 +++---
2 files changed, 29 insertions(+), 4 deletions(-)
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
new file mode 100644
index 00000000000..7816e84b2a6
--- /dev/null
+++ b/media-plugins/vdr-dvd/files/vdr-dvd-0.3.7_pre20090106_clang.patch
@@ -0,0 +1,26 @@
+clang compilefix
+
+wrt bug 740276
+
+Signed-off-by: Joerg Bornkessel <hd_brummy@gentoo.org> (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/vdr-dvd-0.3.7_pre20090106-r3.ebuild b/media-plugins/vdr-dvd/vdr-dvd-0.3.7_pre20090106-r4.ebuild
similarity index 83%
rename from media-plugins/vdr-dvd/vdr-dvd-0.3.7_pre20090106-r3.ebuild
rename to media-plugins/vdr-dvd/vdr-dvd-0.3.7_pre20090106-r4.ebuild
index 972e5b50500..2412c3d519a 100644
--- a/media-plugins/vdr-dvd/vdr-dvd-0.3.7_pre20090106-r3.ebuild
+++ b/media-plugins/vdr-dvd/vdr-dvd-0.3.7_pre20090106-r4.ebuild
@@ -26,8 +26,9 @@ DEPEND="${RDEPEND}"
KEEP_I18NOBJECT="yes"
PATCHES=(
- "${FILESDIR}"/${P}-compile_warnings.diff
- "${FILESDIR}"/${P}-fix-dvdnav-using-c++-keywords.patch
+ "${FILESDIR}/${P}-compile_warnings.diff"
+ "${FILESDIR}/${P}-fix-dvdnav-using-c++-keywords.patch"
+ "${FILESDIR}/${P}_clang.patch"
)
src_prepare() {
@@ -39,6 +40,4 @@ src_prepare() {
#bug 787485
sed -e "s:MAKEDEP = g++:MAKEDEP = \$(CXX):" -i Makefile
- #bug 787488
- sed -e "s|min(|std::min(|" -i control-dvd.c
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-07-12 12:25 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-07-12 12:25 [gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-dvd/files/, media-plugins/vdr-dvd/ Joonas Niilola
-- strict thread matches above, loose matches on Subject: below --
2021-05-13 19:07 Jörg Bornkessel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox