#2 Use %__ macro and fix invalid C++11
Opened 3 years ago by tbaeder. Modified 3 years ago
rpms/ tbaeder/dvd+rw-tools master  into  rawhide

@@ -0,0 +1,38 @@ 

+ diff -ruN dvd+rw-tools-7.1.orig/dvd+rw-mediainfo.cpp dvd+rw-tools-7.1/dvd+rw-mediainfo.cpp

+ --- dvd+rw-tools-7.1.orig/dvd+rw-mediainfo.cpp	2006-09-23 19:46:57.000000000 +0200

+ +++ dvd+rw-tools-7.1/dvd+rw-mediainfo.cpp	2020-12-04 15:13:03.770510856 +0100

+ @@ -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);

file modified
+3 -1
@@ -19,6 +19,7 @@ 

  Patch10:	dvd+rw-tools-7.1-bluray_srm+pow.patch

  Patch11:	dvd+rw-tools-7.1-bluray_pow_freespace.patch

  Patch12:	dvd+rw-tools-7.1-sysmacro-inc.patch

+ Patch13:	dvd+rw-tools-7.1-fix-invalid-c++11.patch

  

  Requires:	genisoimage

  BuildRequires:	gcc gcc-c++
@@ -42,6 +43,7 @@ 

  %patch10 -p1 -b .pow

  %patch11 -p1 -b .freespace

  %patch12 -p1 -b .sysmacro

+ %patch13 -p1 -b .c++11

  

  install -m 644 %{SOURCE1} index.html

  
@@ -49,7 +51,7 @@ 

  export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"

  export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"

  export LDFLAGS="$RPM_LD_FLAGS"

- make WARN="-DDEFAULT_BUF_SIZE_MB=16 -DRLIMIT_MEMLOCK" %{?_smp_mflags}

+ %{__make} WARN="-DDEFAULT_BUF_SIZE_MB=16 -DRLIMIT_MEMLOCK" %{?_smp_mflags}

  

  %install

  # make install DESTDIR= does not work here