[MPlayer-cvslog] r19826 - in trunk/libmpdvdkit2: FILES css.c device.c dvd_input.c dvdcss dvdcss.h dvdcss/dvdcss.h error.c libdvdcss.c libdvdcss_changes.diff libdvdread_changes.diff

[diego]

Author: diego
Date: Wed Sep 13 15:36:49 2006
New Revision: 19826

Added:
   trunk/libmpdvdkit2/dvdcss/
   trunk/libmpdvdkit2/dvdcss/dvdcss.h
      - copied unchanged from r19805, /trunk/libmpdvdkit2/dvdcss.h
Removed:
   trunk/libmpdvdkit2/dvdcss.h
Modified:
   trunk/libmpdvdkit2/FILES
   trunk/libmpdvdkit2/css.c
   trunk/libmpdvdkit2/device.c
   trunk/libmpdvdkit2/dvd_input.c
   trunk/libmpdvdkit2/error.c
   trunk/libmpdvdkit2/libdvdcss.c
   trunk/libmpdvdkit2/libdvdcss_changes.diff
   trunk/libmpdvdkit2/libdvdread_changes.diff

Log:
Move dvdcss.h to a dvdcss subdirectory, just like upstream libdvdcss does.
This considerably reduces our local patch size.


Modified: trunk/libmpdvdkit2/FILES
==============================================================================
--- trunk/libmpdvdkit2/FILES	(original)
+++ trunk/libmpdvdkit2/FILES	Wed Sep 13 15:36:49 2006
@@ -34,7 +34,7 @@
 csstables.h
 device.c
 device.h
-dvdcss.h
+dvdcss/dvdcss.h
 error.c
 ioctl.c
 ioctl.h

Modified: trunk/libmpdvdkit2/css.c
==============================================================================
--- trunk/libmpdvdkit2/css.c	(original)
+++ trunk/libmpdvdkit2/css.c	Wed Sep 13 15:36:49 2006
@@ -56,7 +56,7 @@
 #   include <limits.h>
 #endif
 
-#include "dvdcss.h"
+#include "dvdcss/dvdcss.h"
 
 #include "common.h"
 #include "css.h"

Modified: trunk/libmpdvdkit2/device.c
==============================================================================
--- trunk/libmpdvdkit2/device.c	(original)
+++ trunk/libmpdvdkit2/device.c	Wed Sep 13 15:36:49 2006
@@ -58,7 +58,7 @@
 #   include <sys/uio.h>                                      /* struct iovec */
 #endif
 
-#include "dvdcss.h"
+#include "dvdcss/dvdcss.h"
 
 #include "common.h"
 #include "css.h"

Modified: trunk/libmpdvdkit2/dvd_input.c
==============================================================================
--- trunk/libmpdvdkit2/dvd_input.c	(original)
+++ trunk/libmpdvdkit2/dvd_input.c	Wed Sep 13 15:36:49 2006
@@ -41,7 +41,7 @@
 
 #ifdef HAVE_DVDCSS_DVDCSS_H
 /* linking to libdvdcss */
-#include "dvdcss.h"
+#include "dvdcss/dvdcss.h"
 #define DVDcss_open(a) dvdcss_open((char*)(a))
 #define DVDcss_close   dvdcss_close
 #define DVDcss_seek    dvdcss_seek

Modified: trunk/libmpdvdkit2/error.c
==============================================================================
--- trunk/libmpdvdkit2/error.c	(original)
+++ trunk/libmpdvdkit2/error.c	Wed Sep 13 15:36:49 2006
@@ -37,7 +37,7 @@
 #   include <limits.h>
 #endif
 
-#include "dvdcss.h"
+#include "dvdcss/dvdcss.h"
 
 #include "common.h"
 #include "css.h"

Modified: trunk/libmpdvdkit2/libdvdcss.c
==============================================================================
--- trunk/libmpdvdkit2/libdvdcss.c	(original)
+++ trunk/libmpdvdkit2/libdvdcss.c	Wed Sep 13 15:36:49 2006
@@ -127,7 +127,7 @@
 #   include <direct.h>
 #endif
 
-#include "dvdcss.h"
+#include "dvdcss/dvdcss.h"
 
 #include "common.h"
 #include "css.h"

Modified: trunk/libmpdvdkit2/libdvdcss_changes.diff
==============================================================================
--- trunk/libmpdvdkit2/libdvdcss_changes.diff	(original)
+++ trunk/libmpdvdkit2/libdvdcss_changes.diff	Wed Sep 13 15:36:49 2006
@@ -12,28 +12,8 @@
  #       if !defined( _OFF_T_ )
  typedef long long _off_t;
  typedef _off_t off_t;
---- css.c	2005-07-11 14:24:09.000000000 +0200
-+++ css.c	2005-10-01 20:14:37.000000000 +0200
-@@ -53,7 +56,7 @@
- #   include <limits.h>
- #endif
- 
--#include "dvdcss/dvdcss.h"
-+#include "dvdcss.h"
- 
- #include "common.h"
- #include "css.h"
 --- device.c	2005-07-11 13:33:34.000000000 +0200
 +++ device.c	2005-10-01 19:08:07.000000000 +0200
-@@ -55,7 +44,7 @@
- #   include <sys/uio.h>                                      /* struct iovec */
- #endif
- 
--#include "dvdcss/dvdcss.h"
-+#include "dvdcss.h"
- 
- #include "common.h"
- #include "css.h"
 @@ -143,8 +132,11 @@
      print_debug( dvdcss, "opening target `%s'", psz_device );
  
@@ -48,28 +28,8 @@
  
      /* Initialize readv temporary buffer */
      dvdcss->p_readv_buffer   = NULL;
---- error.c	2004-02-24 16:46:49.000000000 +0100
-+++ error.c	2005-10-01 20:15:46.000000000 +0200
-@@ -34,7 +37,7 @@
- #   include <limits.h>
- #endif
- 
--#include "dvdcss/dvdcss.h"
-+#include "dvdcss.h"
- 
- #include "common.h"
- #include "css.h"
 --- libdvdcss.c	2004-08-13 15:40:18.000000000 +0200
 +++ libdvdcss.c	2005-10-01 19:11:27.000000000 +0200
-@@ -124,7 +127,7 @@
- #   include <direct.h>
- #endif
- 
--#include "dvdcss/dvdcss.h"
-+#include "dvdcss.h"
- 
- #include "common.h"
- #include "css.h"
 @@ -301,6 +301,10 @@
          {
              psz_home = getenv( "HOME" );

Modified: trunk/libmpdvdkit2/libdvdread_changes.diff
==============================================================================
--- trunk/libmpdvdkit2/libdvdread_changes.diff	(original)
+++ trunk/libmpdvdkit2/libdvdread_changes.diff	Wed Sep 13 15:36:49 2006
@@ -78,7 +78,7 @@
  #ifdef HAVE_DVDCSS_DVDCSS_H
  /* linking to libdvdcss */
 -#include <dvdcss/dvdcss.h>
-+#include "dvdcss.h"
++#include "dvdcss/dvdcss.h"
  #define DVDcss_open(a) dvdcss_open((char*)(a))
  #define DVDcss_close   dvdcss_close
  #define DVDcss_seek    dvdcss_seek