1 |
commit: 1025e894d5ba0b088a768bd9cb135e19e8c492e9 |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jan 30 11:04:45 2022 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jan 30 11:04:45 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1025e894 |
7 |
|
8 |
media-sound/vbrfixc: update EAPI 6 -> 8 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/699916 |
11 |
Closes: https://bugs.gentoo.org/713090 |
12 |
Closes: https://bugs.gentoo.org/829346 |
13 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
14 |
|
15 |
media-sound/vbrfixc/files/vbrfixc-0.24-gcc43.patch | 28 ++++++++++++++++++---- |
16 |
...{vbrfixc-0.24.ebuild => vbrfixc-0.24-r1.ebuild} | 14 ++++------- |
17 |
2 files changed, 29 insertions(+), 13 deletions(-) |
18 |
|
19 |
diff --git a/media-sound/vbrfixc/files/vbrfixc-0.24-gcc43.patch b/media-sound/vbrfixc/files/vbrfixc-0.24-gcc43.patch |
20 |
index 89e20e3aade0..d2473e81d8f5 100644 |
21 |
--- a/media-sound/vbrfixc/files/vbrfixc-0.24-gcc43.patch |
22 |
+++ b/media-sound/vbrfixc/files/vbrfixc-0.24-gcc43.patch |
23 |
@@ -1,11 +1,31 @@ |
24 |
-diff -ur vbrfixc-0.24/vbrfixc/vbrfix.cpp vbrfixc-0.24.dmd/vbrfixc/vbrfix.cpp |
25 |
---- vbrfixc-0.24/vbrfixc/vbrfix.cpp 2003-07-17 13:58:21.000000000 -0400 |
26 |
-+++ vbrfixc-0.24.dmd/vbrfixc/vbrfix.cpp 2008-06-11 11:26:42.000000000 -0400 |
27 |
-@@ -16,6 +16,7 @@ |
28 |
+--- a/vbrfixc/vbrfix.cpp |
29 |
++++ b/vbrfixc/vbrfix.cpp |
30 |
+@@ -16,6 +16,8 @@ |
31 |
***************************************************************************/ |
32 |
#include "vbrfix.h" |
33 |
//#include "stdafx.h"//include in mfc version |
34 |
+#include <cstring> |
35 |
++#include <stdint.h> |
36 |
int getXHpos(int ver,int chan); |
37 |
VbrFix::VbrFix(){ |
38 |
frameptrs=NULL;flags=0; |
39 |
+@@ -295,7 +297,7 @@ |
40 |
+ } |
41 |
+ lyrics3Pos=mp3.getpos()-8-4; |
42 |
+ //find its length |
43 |
+- bool e=false;unsigned char c;uint correctv1=0,correctv2=0,p=0;char ev1[]="LYRICSEND";char ev2[]="LYRICS200"; |
44 |
++ bool e=false;unsigned char c;uint32_t correctv1=0,correctv2=0,p=0;char ev1[]="LYRICSEND";char ev2[]="LYRICS200"; |
45 |
+ while(!e && mp3.getpos()< mp3length){ |
46 |
+ mp3.fRead(&c,1); |
47 |
+ if(c==255){logi("Error byte value of 255 in the lyrics3 tag!, asuming tag has ended");e=true;} |
48 |
+--- a/vbrfixc/wputil.h |
49 |
++++ b/vbrfixc/wputil.h |
50 |
+@@ -199,7 +199,7 @@ |
51 |
+ ofstream out(output, ios::out|ios::binary|ios::trunc); |
52 |
+ if(out.fail())return false; |
53 |
+ // fast portable file copy |
54 |
+- return out << in.rdbuf(); |
55 |
++ return bool(out << in.rdbuf()); |
56 |
+ } |
57 |
+ static wps loadSetting(const char *file,wps setting,wps defaultValue){ |
58 |
+ ifstream in(file, ios::in); |
59 |
|
60 |
diff --git a/media-sound/vbrfixc/vbrfixc-0.24.ebuild b/media-sound/vbrfixc/vbrfixc-0.24-r1.ebuild |
61 |
similarity index 59% |
62 |
rename from media-sound/vbrfixc/vbrfixc-0.24.ebuild |
63 |
rename to media-sound/vbrfixc/vbrfixc-0.24-r1.ebuild |
64 |
index 696cce119952..6aea3451bdef 100644 |
65 |
--- a/media-sound/vbrfixc/vbrfixc-0.24.ebuild |
66 |
+++ b/media-sound/vbrfixc/vbrfixc-0.24-r1.ebuild |
67 |
@@ -1,22 +1,18 @@ |
68 |
-# Copyright 1999-2018 Gentoo Foundation |
69 |
+# Copyright 1999-2022 Gentoo Authors |
70 |
# Distributed under the terms of the GNU General Public License v2 |
71 |
|
72 |
-EAPI=6 |
73 |
+EAPI=8 |
74 |
|
75 |
DESCRIPTION="Vbrfix fixes MP3s and re-constructs VBR headers" |
76 |
-HOMEPAGE="http://home.gna.org/vbrfix/" |
77 |
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" |
78 |
SRC_URI="ftp://mirror.bytemark.co.uk/gentoo/distfiles/${P}.tar.gz" |
79 |
|
80 |
LICENSE="GPL-2" |
81 |
SLOT="0" |
82 |
-# bin endian ones need vbrfixc-0.24-bigendian.diff from gentoo-x86 cvs Attic |
83 |
+# big-endian ones need vbrfixc-0.24-bigendian.diff from gentoo-x86 cvs Attic |
84 |
KEYWORDS="amd64 x86" |
85 |
-IUSE="" |
86 |
|
87 |
-DEPEND="" |
88 |
-RDEPEND="" |
89 |
- |
90 |
-PATCHES=( "${FILESDIR}/${P}-gcc43.patch" ) |
91 |
+PATCHES=( "${FILESDIR}"/${P}-gcc43.patch ) |
92 |
|
93 |
src_install() { |
94 |
HTML_DOCS=( vbrfixc/docs/en/*.html ) |