public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: app-cdr/dvd+rw-tools/, app-cdr/dvd+rw-tools/files/
@ 2016-07-31 15:20 Michael Orlitzky
  0 siblings, 0 replies; 3+ messages in thread
From: Michael Orlitzky @ 2016-07-31 15:20 UTC (permalink / raw
  To: gentoo-commits

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=UTF-8, Size: 4179 bytes --]

commit:     33e1efb78282e59c62628e27429c0aa6b9976dc9
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 31 15:17:58 2016 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Sun Jul 31 15:17:58 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33e1efb7

app-cdr/dvd+rw-tools: new revision with EAPI=6 to fix a bug.

A new revision was in order to fix bug 440426 and only show a ulimit
warning for new installs. It made sense to update to EAPI=6 for the
new revision, and that simplified the ebuild a bit. To use the EAPI=6
PATCHES support, two patches had to be revisioned to be -p1
compatible.  Theoretically they could have been modified in-place
(since epatch autodetects the -pN level), but since that would affect
a stable ebuild, I avoided it.

Gentoo-Bug: 440426

Package-Manager: portage-2.2.28

 app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r2.ebuild    | 51 ++++++++++++++++++++++
 .../files/dvd+rw-tools-7.0-dvddl-r1.patch          | 13 ++++++
 .../files/dvd+rw-tools-7.0-wctomb-r1.patch         | 11 +++++
 3 files changed, 75 insertions(+)

diff --git a/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r2.ebuild b/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r2.ebuild
new file mode 100644
index 0000000..f2abcae
--- /dev/null
+++ b/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="A set of tools for DVD+RW/-RW drives"
+HOMEPAGE="http://fy.chalmers.se/~appro/linux/DVD+RW/"
+SRC_URI="http://fy.chalmers.se/~appro/linux/DVD+RW/tools/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="virtual/cdrtools"
+DEPEND="${RDEPEND}
+	sys-devel/m4"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-7.0-sysmacros.patch
+	"${FILESDIR}"/${PN}-7.0-wctomb-r1.patch
+	"${FILESDIR}"/${PN}-7.0-glibc2.6.90.patch
+	"${FILESDIR}"/${PN}-7.0-dvddl-r1.patch
+	"${FILESDIR}"/${PN}-7.0-wexit.patch
+)
+
+src_prepare() {
+	# Linux compiler flags only include -O2 and are incremental.
+	sed -i '/FLAGS/s:-O2::' Makefile.m4 || die "failed to sed out FLAGS"
+	default
+}
+
+src_compile() {
+	emake SHELL="${EPREFIX}"/bin/bash CC="$(tc-getCC)" CXX="$(tc-getCXX)"
+}
+
+src_install() {
+	emake SHELL="${EPREFIX}"/bin/bash prefix="${ED}/usr" install
+	dodoc index.html
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+		elog 'If you receive an error, "unable to anonymously mmap...'
+		elog 'Resource temporarily unavailable" when running growisofs,'
+		elog 'then you may need to run "ulimit -l unlimited".'
+	fi
+}

diff --git a/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.0-dvddl-r1.patch b/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.0-dvddl-r1.patch
new file mode 100644
index 0000000..8975b04
--- /dev/null
+++ b/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.0-dvddl-r1.patch
@@ -0,0 +1,13 @@
+--- a/growisofs_mmc.cpp	2006-04-27 20:45:00.788446635 +0200
++++ b/growisofs_mmc.cpp	2006-04-27 20:46:01.666824300 +0200
+@@ -1412,9 +1412,7 @@
+     blocks += 15, blocks &= ~15;
+ 
+     if (blocks <= split)
+-	fprintf (stderr,":-( more than 50%% of space will be *wasted*!\n"
+-			"    use single layer media for this recording\n"),
+-	exit (FATAL_START(EMEDIUMTYPE));
++	fprintf (stderr,":-? more than 50%% of space will be *wasted*!\n");
+ 
+     blocks /= 16;
+     blocks += 1;

diff --git a/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.0-wctomb-r1.patch b/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.0-wctomb-r1.patch
new file mode 100644
index 0000000..9a98897
--- /dev/null
+++ b/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.0-wctomb-r1.patch
@@ -0,0 +1,11 @@
+--- a/transport.hxx	2008-03-25 21:24:47.000000000 -0400
++++ b/transport.hxx	2008-03-25 21:25:36.000000000 -0400
+@@ -116,7 +116,7 @@
+ extern "C" char *plusminus_locale()
+ { static class __plusminus {
+     private:
+-	char str[4];
++	char str[MB_LEN_MAX];
+     public:
+ 	__plusminus()	{   setlocale(LC_CTYPE,ENV_LOCALE);
+ 			    int l = wctomb(str,(wchar_t)(unsigned char)'±');


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-cdr/dvd+rw-tools/, app-cdr/dvd+rw-tools/files/
@ 2016-08-18 17:33 Pacho Ramos
  0 siblings, 0 replies; 3+ messages in thread
From: Pacho Ramos @ 2016-08-18 17:33 UTC (permalink / raw
  To: gentoo-commits

commit:     8f2938a48efdf12e2c766c2f7ea64b4de765466f
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 18 17:33:26 2016 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Thu Aug 18 17:33:26 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f2938a4

app-cdr/dvd+rw-tools: Apply more Fedora patches fixing more bugs (#230648 also)

Package-Manager: portage-2.3.0

 app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r3.ebuild    | 55 ++++++++++++++++++++++
 .../files/dvd+rw-tools-7.0-reload.patch            | 12 +++++
 .../dvd+rw-tools-7.1-bluray_pow_freespace.patch    | 14 ++++++
 .../files/dvd+rw-tools-7.1-bluray_srm+pow.patch    | 12 +++++
 .../files/dvd+rw-tools-7.1-lastshort.patch         | 12 +++++
 .../files/dvd+rw-tools-7.1-noevent.patch           | 19 ++++++++
 6 files changed, 124 insertions(+)

diff --git a/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r3.ebuild b/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r3.ebuild
new file mode 100644
index 0000000..4db8572
--- /dev/null
+++ b/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit toolchain-funcs
+
+DESCRIPTION="A set of tools for DVD+RW/-RW drives"
+HOMEPAGE="http://fy.chalmers.se/~appro/linux/DVD+RW/"
+SRC_URI="http://fy.chalmers.se/~appro/linux/DVD+RW/tools/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="virtual/cdrtools"
+DEPEND="${RDEPEND}
+	sys-devel/m4"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-7.0-sysmacros.patch
+	"${FILESDIR}"/${PN}-7.0-wctomb-r1.patch
+	"${FILESDIR}"/${PN}-7.0-glibc2.6.90.patch
+	"${FILESDIR}"/${PN}-7.0-dvddl-r1.patch
+	"${FILESDIR}"/${PN}-7.0-wexit.patch
+	"${FILESDIR}"/${PN}-7.0-reload.patch
+	"${FILESDIR}"/${PN}-7.1-noevent.patch
+	"${FILESDIR}"/${PN}-7.1-lastshort.patch
+	"${FILESDIR}"/${PN}-7.1-bluray_srm+pow.patch
+	"${FILESDIR}"/${PN}-7.1-bluray_pow_freespace.patch
+)
+
+src_prepare() {
+	# Linux compiler flags only include -O2 and are incremental.
+	sed -i '/FLAGS/s:-O2::' Makefile.m4 || die "failed to sed out FLAGS"
+	default
+}
+
+src_compile() {
+	emake SHELL="${EPREFIX}"/bin/bash CC="$(tc-getCC)" CXX="$(tc-getCXX)"
+}
+
+src_install() {
+	emake SHELL="${EPREFIX}"/bin/bash prefix="${ED}/usr" install
+	dodoc index.html
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+		elog 'If you receive an error, "unable to anonymously mmap...'
+		elog 'Resource temporarily unavailable" when running growisofs,'
+		elog 'then you may need to run "ulimit -l unlimited".'
+	fi
+}

diff --git a/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.0-reload.patch b/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.0-reload.patch
new file mode 100644
index 0000000..49352e5
--- /dev/null
+++ b/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.0-reload.patch
@@ -0,0 +1,12 @@
+diff -Nrup dvd+rw-tools-7.0/growisofs_mmc.cpp dvd+rw-tools-7.0_mod/growisofs_mmc.cpp
+--- dvd+rw-tools-7.0/growisofs_mmc.cpp	2006-09-23 20:45:49.000000000 +0800
++++ dvd+rw-tools-7.0_mod/growisofs_mmc.cpp	2007-11-19 18:20:46.000000000 +0800
+@@ -138,7 +138,7 @@ int media_reload (char *name=NULL,struct
+ 		cmd[0] = 0x1B;		// START/STOP UNIT
+ 		cmd[4] = 0x2;		// "Eject"
+ 		cmd[5] = 0;
+-		if (cmd.transport()) return 1;
++		cmd.transport();
+ 	    }
+ #if defined(__sun) || defined(sun)
+ 	    else if (volmgt_running())

diff --git a/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.1-bluray_pow_freespace.patch b/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.1-bluray_pow_freespace.patch
new file mode 100644
index 0000000..3b56282
--- /dev/null
+++ b/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.1-bluray_pow_freespace.patch
@@ -0,0 +1,14 @@
+diff -up wrk/growisofs_mmc.cpp.wrk wrk/growisofs_mmc.cpp
+--- wrk/growisofs_mmc.cpp.wrk	2014-11-14 13:22:49.579552118 +0100
++++ wrk/growisofs_mmc.cpp	2014-11-14 13:35:36.779730963 +0100
+@@ -410,7 +410,9 @@ static unsigned int get_2k_capacity (Scs
+ 	    }
+ 
+ 	    nwa = 0;
+-	    if (buf[7]&1 && !bdr_plus_pow)	// NWA_V
++	    //if (buf[7]&1 && !bdr_plus_pow)	// NWA_V
++	    //!bdr_plus_pow patched out for Fedora
++	    if (buf[7]&1)	// NWA_V
+ 	    {	nwa  = buf[12]<<24;
+ 		nwa |= buf[13]<<16;
+ 		nwa |= buf[14]<<8;

diff --git a/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.1-bluray_srm+pow.patch b/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.1-bluray_srm+pow.patch
new file mode 100644
index 0000000..8fc1a6d
--- /dev/null
+++ b/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.1-bluray_srm+pow.patch
@@ -0,0 +1,12 @@
+diff -up dvd+rw-tools-7.1/growisofs_mmc.cpp.wrk dvd+rw-tools-7.1/growisofs_mmc.cpp
+--- dvd+rw-tools-7.1/growisofs_mmc.cpp.wrk	2013-06-24 14:18:38.898344970 +0200
++++ dvd+rw-tools-7.1/growisofs_mmc.cpp	2013-06-24 14:20:00.428025541 +0200
+@@ -756,6 +756,8 @@ static void bd_r_format (Scsi_Command &c
+ 
+     wait_for_unit (cmd);
+ 
++    bdr_plus_pow = 1;
++
+     cmd[0] = 0x35;	// FLUSH CACHE
+     cmd[9] = 0;
+     cmd.transport();

diff --git a/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.1-lastshort.patch b/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.1-lastshort.patch
new file mode 100644
index 0000000..da225d4
--- /dev/null
+++ b/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.1-lastshort.patch
@@ -0,0 +1,12 @@
+diff -up dvd+rw-tools-7.1/growisofs_mmc.cpp.lastshort dvd+rw-tools-7.1/growisofs_mmc.cpp
+--- dvd+rw-tools-7.1/growisofs_mmc.cpp.lastshort	2012-04-13 18:09:31.047641524 +0200
++++ dvd+rw-tools-7.1/growisofs_mmc.cpp	2012-04-13 18:09:34.451763587 +0200
+@@ -540,7 +540,7 @@ ssize_t poor_mans_pwrite64 (int fd,const
+ 	// own higher HZ value and disrespects the user-land one.
+ 	// Sending them down as milliseconds is just safer...
+ 	//
+-	if (!(errcode=cmd.transport (WRITE,(void *)buff,size)))
++	if (!(errcode=cmd.transport (WRITE,(void *)buff,nbl*2048)))
+ 	    break;
+ 
+ 	//--- WRITE failed ---//

diff --git a/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.1-noevent.patch b/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.1-noevent.patch
new file mode 100644
index 0000000..19c8c66
--- /dev/null
+++ b/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.1-noevent.patch
@@ -0,0 +1,19 @@
+diff -up dvd+rw-tools-7.1/transport.hxx.debug dvd+rw-tools-7.1/transport.hxx
+--- dvd+rw-tools-7.1/transport.hxx.debug	2012-03-07 10:55:07.167322839 +0100
++++ dvd+rw-tools-7.1/transport.hxx	2012-03-07 15:44:34.384202747 +0100
+@@ -1795,9 +1795,12 @@ static int handle_events (Scsi_Command &
+ 		break;
+ 	    case 5: ret |= 1<<5; break;		// Multiple Initiators
+ 	    case 6:				// Device Busy
+-		if ((event[4]&0xF)==1 &&	// Timeout occured
+-		    (event[5]&0x3)!=0)
+-		{   poll(NULL,0,(descr&0xFFFF)*100+100);
++		if ((event[4]&0xF)==1)		// Timeout occured
++		{
++		    if ((event[5]&0x3)==0)	// No Event
++			return 0;		// Ready to accept any command
++
++		    poll(NULL,0,(descr&0xFFFF)*100+100);
+ 		    cmd[0] = 0;		// TEST UNIT READY
+ 		    cmd[5] = 0;
+ 		    if ((err=cmd.transport()))


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-cdr/dvd+rw-tools/, app-cdr/dvd+rw-tools/files/
@ 2021-03-16  6:54 Joonas Niilola
  0 siblings, 0 replies; 3+ messages in thread
From: Joonas Niilola @ 2021-03-16  6:54 UTC (permalink / raw
  To: gentoo-commits

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=UTF-8, Size: 6206 bytes --]

commit:     116f8966c17e6ed5d5fe426a6ace8fb0ac416632
Author:     Viorel Munteanu <ceamac.paragon <AT> gmail <DOT> com>
AuthorDate: Mon Mar 15 17:16:26 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Mar 16 06:50:28 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=116f8966

app-cdr/dvd+rw-tools: fix compilation with clang

Closes: https://bugs.gentoo.org/729128
Closes: https://bugs.gentoo.org/729418
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Viorel Munteanu <ceamac.paragon <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/19935
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r4.ebuild    | 58 ++++++++++++++++++
 .../files/dvd+rw-tools-7.1-clang.patch             | 71 ++++++++++++++++++++++
 app-cdr/dvd+rw-tools/metadata.xml                  |  9 ++-
 3 files changed, 137 insertions(+), 1 deletion(-)

diff --git a/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r4.ebuild b/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r4.ebuild
new file mode 100644
index 00000000000..6e8c6a487ec
--- /dev/null
+++ b/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r4.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="A set of tools for DVD+RW/-RW drives"
+HOMEPAGE="http://fy.chalmers.se/~appro/linux/DVD+RW/"
+SRC_URI="http://fy.chalmers.se/~appro/linux/DVD+RW/tools/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="app-cdr/cdrtools"
+DEPEND="${RDEPEND}
+	sys-devel/m4"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-7.0-sysmacros.patch
+	"${FILESDIR}"/${PN}-7.0-wctomb-r1.patch
+	"${FILESDIR}"/${PN}-7.0-glibc2.6.90.patch
+	"${FILESDIR}"/${PN}-7.0-dvddl-r1.patch
+	"${FILESDIR}"/${PN}-7.0-wexit.patch
+	"${FILESDIR}"/${PN}-7.0-reload.patch
+	"${FILESDIR}"/${PN}-7.1-noevent.patch
+	"${FILESDIR}"/${PN}-7.1-lastshort.patch
+	"${FILESDIR}"/${PN}-7.1-bluray_srm+pow.patch
+	"${FILESDIR}"/${PN}-7.1-bluray_pow_freespace.patch
+	"${FILESDIR}"/${PN}-7.1-clang.patch
+)
+
+# this is a text file, not html
+DOCS=( index.html )
+
+src_prepare() {
+	# Linux compiler flags only include -O2 and are incremental.
+	sed -i '/FLAGS/s:-O2::' Makefile.m4 || die "failed to sed out FLAGS"
+	default
+}
+
+src_compile() {
+	emake SHELL="${EPREFIX}"/bin/bash CC="$(tc-getCC)" CXX="$(tc-getCXX)"
+}
+
+src_install() {
+	emake SHELL="${EPREFIX}"/bin/bash prefix="${ED}/usr" install
+	einstalldocs
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+		elog 'If you receive an error, "unable to anonymously mmap...'
+		elog 'Resource temporarily unavailable" when running growisofs,'
+		elog 'then you may need to run "ulimit -l unlimited".'
+	fi
+}

diff --git a/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.1-clang.patch b/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.1-clang.patch
new file mode 100644
index 00000000000..430d535ed62
--- /dev/null
+++ b/app-cdr/dvd+rw-tools/files/dvd+rw-tools-7.1-clang.patch
@@ -0,0 +1,71 @@
+--- a/dvd+rw-booktype.cpp	2006-06-24 12:21:48.000000000 +0300
++++ b/dvd+rw-booktype.cpp	2021-03-14 10:16:02.533741829 +0200
+@@ -398,7 +398,7 @@
+ 		break;
+ 	case OPT_MEDIA:
+ 		if (profile!=0x1A && profile!=0x14 && profile!=13)
+-		{   fprintf (stderr,":-( action is applicable to DVD±RW only\n");
++		{   fprintf (stderr,":-( action is applicable to DVD\xb1RW only\n");
+ 		    break;
+ 		}
+ 
+@@ -759,7 +759,7 @@
+ 	    }
+ 	}
+ 
+-	delete list;
++	delete[] list;
+     }
+ 
+     profile=buf[6]<<8|buf[7];
+--- a/dvd+rw-mediainfo.cpp	2006-09-23 20:46:57.000000000 +0300
++++ b/dvd+rw-mediainfo.cpp	2021-03-14 10:16:02.533741829 +0200
+@@ -621,7 +621,7 @@
+ 	if (phys_end>0)	phys_end -= phys_start;
+ 	if (phys_end>0) phys_end += 1;
+ 
+-	printf (" %s    %u*2KB=%"LLU"\n",
++	printf (" %s    %u*2KB=%" LLU "\n",
+ 		dvd_dash>=0?"Legacy lead-out at:":"Last border-out at:",
+ 		phys_end,phys_end*2048LL);
+ 
+@@ -941,14 +941,14 @@
+ 	    printf(" %s:\t\t%u*%u=",type[formats[8]&3],
+ 	        capacity=formats[4]<<24|formats[5]<<16|formats[6]<<8|formats[7],
+ 		blocksize);
+-	    printf("%"LLU"\n",(unsigned long long)capacity*blocksize);
++	    printf("%" LLU "\n",(unsigned long long)capacity*blocksize);
+ 
+ 	    for(i=12;i<len;i+=8)
+ 	    {	printf(" %02Xh(%x):\t\t%u*%u=",formats[i+4]>>2,
+ 			formats[i+5]<<16|formats[i+6]<<8|formats[i+7],
+ 	    		capacity=formats[i]<<24|formats[i+1]<<16|formats[i+2]<<8|formats[i+3],
+ 			blocksize);
+-		printf("%"LLU"\n",(unsigned long long)capacity*blocksize);
++		printf("%" LLU "\n",(unsigned long long)capacity*blocksize);
+ 	    }
+ 	    break;
+ 	}
+@@ -1121,7 +1121,7 @@
+ 	if (ccity) ccity++;
+ 	bsize = header[4]<<24|header[5]<<16|header[6]<<8|header[7];
+ 
+-	printf ("READ CAPACITY:          %u*%u=%"LLU"\n",
++	printf ("READ CAPACITY:          %u*%u=%" LLU "\n",
+ 					ccity,bsize,
+ 					(unsigned long long)ccity*bsize);
+     } while (0);
+--- a/transport.hxx	2021-03-14 10:17:54.353626017 +0200
++++ b/transport.hxx	2021-03-14 10:16:44.180365362 +0200
+@@ -127,9 +127,9 @@
+ 	char str[MB_LEN_MAX];
+     public:
+ 	__plusminus()	{   setlocale(LC_CTYPE,ENV_LOCALE);
+-			    int l = wctomb(str,(wchar_t)(unsigned char)'±');
++			    int l = wctomb(str,(wchar_t)'\xb1');
+ 			    if (l>0)	str[l]='\0';
+-			    else	str[0]='±',str[1]='\0';
++			    else	str[0]='\xb1',str[1]='\0';
+ 			}
+ 	~__plusminus()	{ }
+ 	operator char*(){ return str; }

diff --git a/app-cdr/dvd+rw-tools/metadata.xml b/app-cdr/dvd+rw-tools/metadata.xml
index 6f49eba8f49..24939706c0c 100644
--- a/app-cdr/dvd+rw-tools/metadata.xml
+++ b/app-cdr/dvd+rw-tools/metadata.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>ceamac.paragon@gmail.com</email>
+		<name>Viorel Munteanu</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2021-03-16  6:54 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-03-16  6:54 [gentoo-commits] repo/gentoo:master commit in: app-cdr/dvd+rw-tools/, app-cdr/dvd+rw-tools/files/ Joonas Niilola
  -- strict thread matches above, loose matches on Subject: below --
2016-08-18 17:33 Pacho Ramos
2016-07-31 15:20 Michael Orlitzky

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox