Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
1Removes the deprecated and removed `dvdcss_interface_2` libdvdcss function. 2 3This does not change any functionality; it only modifies the printing of software version information. 4--- a/cssdec.c 5+++ b/cssdec.c 6@@ -102,8 +102,8 @@ int main( int argc, char *argv[] ) 7 b_keyonly = 1; 8 break; 9 case 'V': 10- printf( "%s version %s (libdvdcss version %s)\n", 11- progname, progversion, dvdcss_interface_2 ); 12+ printf( "%s version %s\n", 13+ progname, progversion ); 14 exit( EX_SUCCESS ); 15 break; 16 case '?': 17@@ -126,8 +126,8 @@ int main( int argc, char *argv[] ) 18 if( argc >= 3 ) end = (int)strtol( argv[2], (char **)NULL, 0 ); 19 20 /* Initialize libdvdcss */ 21- printe( 2, "%s version %s (libdvdcss version %s)", 22- progname, progversion, dvdcss_interface_2 ); 23+ printe( 2, "%s version %s", 24+ progname, progversion ); 25 dvdcss = dvdcss_open( (char *)dvdfile ); 26 if( dvdcss == NULL ) 27 { 28diff --git a/dvdimgdecss.c b/dvdimgdecss.c 29index 0b7006d..b7d251a 100644 30--- a/dvdimgdecss.c 31+++ b/dvdimgdecss.c 32@@ -157,8 +157,8 @@ int main( int argc, char *argv[] ) 33 dvdread_decrypt = 1; 34 break; 35 case 'V': 36- printf( "%s version %s (libdvdcss version %s)\n", 37- progname, progversion, dvdcss_interface_2 ); 38+ printf( "%s version %s\n", 39+ progname, progversion ); 40 exit( EX_SUCCESS ); 41 break; 42 case '?': 43@@ -180,8 +180,8 @@ int main( int argc, char *argv[] ) 44 if( !imgfile ) verbosity++; 45 46 /* Open the DVD */ 47- printe( 2, "%s: version %s (libdvdcss version %s)\n", 48- progname, progversion, dvdcss_interface_2 ); 49+ printe( 2, "%s: version %s\n", 50+ progname, progversion ); 51 dvdcss = dvdcss_open( dvdfile ); 52 if( dvdcss == NULL ) { 53 printe( 1, "opening of the DVD (%s) with libdvdcss failed\n", dvdfile );