mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-02 03:43:06 +00:00
571c71e6f7
We are migrating packages that meet below requirements:
1. using `callPackage`
2. called path is a directory
3. overriding set is empty (`{ }`)
4. not containing path expressions other than relative path (to
makenixpkgs-vet happy)
5. not referenced by nix files outside of the directory, other
than`pkgs/top-level/all-packages.nix`
6. not referencing nix files outside of the directory
7. not referencing `default.nix` (since it's changed to `package.nix`)
8. `outPath` doesn't change after migration
The tool is here: https://github.com/Aleksanaa/by-name-migrate.
54 lines
1.7 KiB
Diff
54 lines
1.7 KiB
Diff
Removes the deprecated and removed `dvdcss_interface_2` libdvdcss function.
|
|
|
|
This does not change any functionality; it only modifies the printing of software version information.
|
|
--- a/cssdec.c
|
|
+++ b/cssdec.c
|
|
@@ -102,8 +102,8 @@ int main( int argc, char *argv[] )
|
|
b_keyonly = 1;
|
|
break;
|
|
case 'V':
|
|
- printf( "%s version %s (libdvdcss version %s)\n",
|
|
- progname, progversion, dvdcss_interface_2 );
|
|
+ printf( "%s version %s\n",
|
|
+ progname, progversion );
|
|
exit( EX_SUCCESS );
|
|
break;
|
|
case '?':
|
|
@@ -126,8 +126,8 @@ int main( int argc, char *argv[] )
|
|
if( argc >= 3 ) end = (int)strtol( argv[2], (char **)NULL, 0 );
|
|
|
|
/* Initialize libdvdcss */
|
|
- printe( 2, "%s version %s (libdvdcss version %s)",
|
|
- progname, progversion, dvdcss_interface_2 );
|
|
+ printe( 2, "%s version %s",
|
|
+ progname, progversion );
|
|
dvdcss = dvdcss_open( (char *)dvdfile );
|
|
if( dvdcss == NULL )
|
|
{
|
|
diff --git a/dvdimgdecss.c b/dvdimgdecss.c
|
|
index 0b7006d..b7d251a 100644
|
|
--- a/dvdimgdecss.c
|
|
+++ b/dvdimgdecss.c
|
|
@@ -157,8 +157,8 @@ int main( int argc, char *argv[] )
|
|
dvdread_decrypt = 1;
|
|
break;
|
|
case 'V':
|
|
- printf( "%s version %s (libdvdcss version %s)\n",
|
|
- progname, progversion, dvdcss_interface_2 );
|
|
+ printf( "%s version %s\n",
|
|
+ progname, progversion );
|
|
exit( EX_SUCCESS );
|
|
break;
|
|
case '?':
|
|
@@ -180,8 +180,8 @@ int main( int argc, char *argv[] )
|
|
if( !imgfile ) verbosity++;
|
|
|
|
/* Open the DVD */
|
|
- printe( 2, "%s: version %s (libdvdcss version %s)\n",
|
|
- progname, progversion, dvdcss_interface_2 );
|
|
+ printe( 2, "%s: version %s\n",
|
|
+ progname, progversion );
|
|
dvdcss = dvdcss_open( dvdfile );
|
|
if( dvdcss == NULL ) {
|
|
printe( 1, "opening of the DVD (%s) with libdvdcss failed\n", dvdfile );
|