[SCM] kodi/master: Apply patches to additional tarballs using quilt series file

rbalint at users.alioth.debian.org rbalint at users.alioth.debian.org
Wed Feb 8 15:47:42 UTC 2017


The following commit has been merged in the master branch:
commit 15f03caa1fb644a5883d5e188a66681a8d168e13
Author: Balint Reczey <balint at balintreczey.hu>
Date:   Wed Feb 8 13:44:54 2017 +0100

    Apply patches to additional tarballs using quilt series file
    
    Closes: #854463

diff --git a/debian/patches/libdvdnav-0001-xbmc-dvdnav-allow-get-set-vm-state.patch b/debian/patches/libdvdnav-0001-xbmc-dvdnav-allow-get-set-vm-state.patch
index 7b9351c..2bd9a8e 100644
--- a/debian/patches/libdvdnav-0001-xbmc-dvdnav-allow-get-set-vm-state.patch
+++ b/debian/patches/libdvdnav-0001-xbmc-dvdnav-allow-get-set-vm-state.patch
@@ -12,8 +12,8 @@ Subject: [PATCH 01/10] [xbmc][dvdnav] allow get/set vm state
 
 diff --git a/src/dvdnav_internal.h b/src/dvdnav_internal.h
 index 534ccb8..6d936e9 100644
---- a/src/dvdnav_internal.h
-+++ b/src/dvdnav_internal.h
+--- a/libdvdnav-5-0-3/src/dvdnav_internal.h
++++ b/libdvdnav-5-0-3/src/dvdnav_internal.h
 @@ -222,6 +222,18 @@ struct dvdnav_s {
  /* converts a dvd_time_t to PTS ticks */
  int64_t dvdnav_convert_time(dvd_time_t *time);
@@ -35,8 +35,8 @@ index 534ccb8..6d936e9 100644
  #ifdef __GNUC__
 diff --git a/src/searching.c b/src/searching.c
 index f638b61..fd28fb3 100644
---- a/src/searching.c
-+++ b/src/searching.c
+--- a/libdvdnav-5-0-3/src/searching.c
++++ b/libdvdnav-5-0-3/src/searching.c
 @@ -731,6 +731,64 @@ fail:
    return retval;
  }
@@ -104,8 +104,8 @@ index f638b61..fd28fb3 100644
              int32_t *admap_len) {
 diff --git a/src/vm/vm.c b/src/vm/vm.c
 index 869dd05..35d08d5 100644
---- a/src/vm/vm.c
-+++ b/src/vm/vm.c
+--- a/libdvdnav-5-0-3/src/vm/vm.c
++++ b/libdvdnav-5-0-3/src/vm/vm.c
 @@ -1104,3 +1104,44 @@ void vm_ifo_close(ifo_handle_t *ifo)
  {
    ifoClose(ifo);
@@ -153,8 +153,8 @@ index 869dd05..35d08d5 100644
 +}
 diff --git a/src/vm/vm.h b/src/vm/vm.h
 index e4b01c2..a6fdbf9 100644
---- a/src/vm/vm.h
-+++ b/src/vm/vm.h
+--- a/libdvdnav-5-0-3/src/vm/vm.h
++++ b/libdvdnav-5-0-3/src/vm/vm.h
 @@ -161,6 +161,9 @@ subp_attr_t  vm_get_subp_attr(vm_t *vm, int streamN);
  ifo_handle_t *vm_get_title_ifo(vm_t *vm, uint32_t title);
  void vm_ifo_close(ifo_handle_t *ifo);
diff --git a/debian/patches/libdvdnav-0002-xbmc-dvdnav-expose-dvdnav_get_vm-dvdnav_get_button_i.patch b/debian/patches/libdvdnav-0002-xbmc-dvdnav-expose-dvdnav_get_vm-dvdnav_get_button_i.patch
index 804dc3d..821d126 100644
--- a/debian/patches/libdvdnav-0002-xbmc-dvdnav-expose-dvdnav_get_vm-dvdnav_get_button_i.patch
+++ b/debian/patches/libdvdnav-0002-xbmc-dvdnav-expose-dvdnav_get_vm-dvdnav_get_button_i.patch
@@ -11,8 +11,8 @@ Subject: [PATCH 02/10] [xbmc][dvdnav] expose dvdnav_get_vm,
 
 diff --git a/src/dvdnav.c b/src/dvdnav.c
 index ae267d5..39c11dd 100644
---- a/src/dvdnav.c
-+++ b/src/dvdnav.c
+--- a/libdvdnav-5-0-3/src/dvdnav.c
++++ b/libdvdnav-5-0-3/src/dvdnav.c
 @@ -1273,3 +1273,55 @@ user_ops_t dvdnav_get_restrictions(dvdnav_t* this) {
  
    return ops.ops_struct;
@@ -72,8 +72,8 @@ index ae267d5..39c11dd 100644
 \ No newline at end of file
 diff --git a/src/dvdnav/dvdnav.h b/src/dvdnav/dvdnav.h
 index 8d68102..9f82b0f 100644
---- a/src/dvdnav/dvdnav.h
-+++ b/src/dvdnav/dvdnav.h
+--- a/libdvdnav-5-0-3/src/dvdnav/dvdnav.h
++++ b/libdvdnav-5-0-3/src/dvdnav/dvdnav.h
 @@ -699,6 +699,7 @@ int8_t dvdnav_is_domain_vtsm(dvdnav_t *self);
   */
  int8_t dvdnav_is_domain_vts(dvdnav_t *self);
diff --git a/debian/patches/libdvdnav-0003-xbmc-dvdnav-detection-of-dvd-name.patch b/debian/patches/libdvdnav-0003-xbmc-dvdnav-detection-of-dvd-name.patch
index b6fb500..c96343d 100644
--- a/debian/patches/libdvdnav-0003-xbmc-dvdnav-detection-of-dvd-name.patch
+++ b/debian/patches/libdvdnav-0003-xbmc-dvdnav-detection-of-dvd-name.patch
@@ -9,8 +9,8 @@ Subject: [PATCH 03/10] [xbmc][dvdnav] detection of dvd name
 
 diff --git a/src/vm/vm.c b/src/vm/vm.c
 index 35d08d5..7ff285d 100644
---- a/src/vm/vm.c
-+++ b/src/vm/vm.c
+--- a/libdvdnav-5-0-3/src/vm/vm.c
++++ b/libdvdnav-5-0-3/src/vm/vm.c
 @@ -409,6 +409,13 @@ int vm_reset(vm_t *vm, const char *dvdroot,
      if(dvd_read_name(vm->dvd_name, vm->dvd_serial, dvdroot) != 1) {
        fprintf(MSG_OUT, "libdvdnav: vm: dvd_read_name failed\n");
diff --git a/debian/patches/libdvdnav-0004-xbmc-dvdnav-skip-cell-when-unrecoverable.patch b/debian/patches/libdvdnav-0004-xbmc-dvdnav-skip-cell-when-unrecoverable.patch
index f25e271..9c272cd 100644
--- a/debian/patches/libdvdnav-0004-xbmc-dvdnav-skip-cell-when-unrecoverable.patch
+++ b/debian/patches/libdvdnav-0004-xbmc-dvdnav-skip-cell-when-unrecoverable.patch
@@ -9,8 +9,8 @@ Subject: [PATCH 04/10] [xbmc][dvdnav] skip cell when unrecoverable
 
 diff --git a/src/dvdnav.c b/src/dvdnav.c
 index 39c11dd..3b61059 100644
---- a/src/dvdnav.c
-+++ b/src/dvdnav.c
+--- a/libdvdnav-5-0-3/src/dvdnav.c
++++ b/libdvdnav-5-0-3/src/dvdnav.c
 @@ -564,6 +564,10 @@ dvdnav_status_t dvdnav_get_next_cache_block(dvdnav_t *this, uint8_t **buf,
          /* Decode nav into pci and dsi. Then get next VOBU info. */
          if(!dvdnav_decode_packet(*buf, &this->dsi, &this->pci)) {
diff --git a/debian/patches/libdvdnav-0005-xbmc-dvdnav-added-reading-of-VTS_TMAPT-and-TITLE_C_A.patch b/debian/patches/libdvdnav-0005-xbmc-dvdnav-added-reading-of-VTS_TMAPT-and-TITLE_C_A.patch
index 6fd6dd5..db3a662 100644
--- a/debian/patches/libdvdnav-0005-xbmc-dvdnav-added-reading-of-VTS_TMAPT-and-TITLE_C_A.patch
+++ b/debian/patches/libdvdnav-0005-xbmc-dvdnav-added-reading-of-VTS_TMAPT-and-TITLE_C_A.patch
@@ -10,8 +10,8 @@ Subject: [PATCH 05/10] [xbmc][dvdnav] added reading of VTS_TMAPT and
 
 diff --git a/src/vm/vm.c b/src/vm/vm.c
 index 7ff285d..1794ce7 100644
---- a/src/vm/vm.c
-+++ b/src/vm/vm.c
+--- a/libdvdnav-5-0-3/src/vm/vm.c
++++ b/libdvdnav-5-0-3/src/vm/vm.c
 @@ -252,6 +252,15 @@ int ifoOpenNewVTSI(vm_t *vm, dvd_reader_t *dvd, int vtsN) {
      fprintf(MSG_OUT, "libdvdnav: ifoRead_TITLE_VOBU_ADMAP vtsi failed\n");
      return 0;
diff --git a/debian/patches/libdvdnav-0006-xbmc-dvdnav-various-safeguards.patch b/debian/patches/libdvdnav-0006-xbmc-dvdnav-various-safeguards.patch
index be54c37..229eec5 100644
--- a/debian/patches/libdvdnav-0006-xbmc-dvdnav-various-safeguards.patch
+++ b/debian/patches/libdvdnav-0006-xbmc-dvdnav-various-safeguards.patch
@@ -10,8 +10,8 @@ Subject: [PATCH 06/10] [xbmc][dvdnav] various safeguards
 
 diff --git a/src/dvdnav.c b/src/dvdnav.c
 index 3b61059..c188420 100644
---- a/src/dvdnav.c
-+++ b/src/dvdnav.c
+--- a/libdvdnav-5-0-3/src/dvdnav.c
++++ b/libdvdnav-5-0-3/src/dvdnav.c
 @@ -1265,6 +1265,11 @@ user_ops_t dvdnav_get_restrictions(dvdnav_t* this) {
  
    ops.ops_int = 0;
@@ -26,8 +26,8 @@ index 3b61059..c188420 100644
      return ops.ops_struct;
 diff --git a/src/read_cache.c b/src/read_cache.c
 index 1b2862d..1e1c37d 100644
---- a/src/read_cache.c
-+++ b/src/read_cache.c
+--- a/libdvdnav-5-0-3/src/read_cache.c
++++ b/libdvdnav-5-0-3/src/read_cache.c
 @@ -335,7 +335,7 @@ dvdnav_status_t dvdnav_free_cache_block(dvdnav_t *self, unsigned char *buf) {
    pthread_mutex_lock(&cache->lock);
    for (i = 0; i < READ_CACHE_CHUNKS; i++) {
diff --git a/debian/patches/libdvdnav-0007-xbmc-dvdnav-disallow-time-search-when-navigation-pro.patch b/debian/patches/libdvdnav-0007-xbmc-dvdnav-disallow-time-search-when-navigation-pro.patch
index 1ab5e5e..e520168 100644
--- a/debian/patches/libdvdnav-0007-xbmc-dvdnav-disallow-time-search-when-navigation-pro.patch
+++ b/debian/patches/libdvdnav-0007-xbmc-dvdnav-disallow-time-search-when-navigation-pro.patch
@@ -10,8 +10,8 @@ Subject: [PATCH 07/10] [xbmc][dvdnav] disallow time search when navigation
 
 diff --git a/src/searching.c b/src/searching.c
 index fd28fb3..1c9ed6f 100644
---- a/src/searching.c
-+++ b/src/searching.c
+--- a/libdvdnav-5-0-3/src/searching.c
++++ b/libdvdnav-5-0-3/src/searching.c
 @@ -121,6 +121,12 @@ dvdnav_status_t dvdnav_time_search(dvdnav_t *this,
      return DVDNAV_STATUS_ERR;
    }
diff --git a/debian/patches/libdvdnav-0008-xbmc-dvdnav-additional-debug-log.patch b/debian/patches/libdvdnav-0008-xbmc-dvdnav-additional-debug-log.patch
index fb6ddd8..17ff085 100644
--- a/debian/patches/libdvdnav-0008-xbmc-dvdnav-additional-debug-log.patch
+++ b/debian/patches/libdvdnav-0008-xbmc-dvdnav-additional-debug-log.patch
@@ -9,8 +9,8 @@ Subject: [PATCH 08/10] [xbmc][dvdnav] additional debug log
 
 diff --git a/src/searching.c b/src/searching.c
 index 1c9ed6f..1271f87 100644
---- a/src/searching.c
-+++ b/src/searching.c
+--- a/libdvdnav-5-0-3/src/searching.c
++++ b/libdvdnav-5-0-3/src/searching.c
 @@ -208,6 +208,7 @@ dvdnav_status_t dvdnav_sector_search(dvdnav_t *this,
  
    result = dvdnav_get_position(this, &target, &length);
diff --git a/debian/patches/libdvdnav-0009-xbmc-dvdnav-add-timemap-to-time-search.patch b/debian/patches/libdvdnav-0009-xbmc-dvdnav-add-timemap-to-time-search.patch
index 215a6ab..fd3bf38 100644
--- a/debian/patches/libdvdnav-0009-xbmc-dvdnav-add-timemap-to-time-search.patch
+++ b/debian/patches/libdvdnav-0009-xbmc-dvdnav-add-timemap-to-time-search.patch
@@ -9,8 +9,8 @@ Subject: [PATCH 09/10] [xbmc][dvdnav] add timemap to time search
 
 diff --git a/src/searching.c b/src/searching.c
 index 1271f87..ba7481b 100644
---- a/src/searching.c
-+++ b/src/searching.c
+--- a/libdvdnav-5-0-3/src/searching.c
++++ b/libdvdnav-5-0-3/src/searching.c
 @@ -142,24 +142,105 @@ dvdnav_status_t dvdnav_time_search(dvdnav_t *this,
        last_cell_nr = state->pgc->nr_of_cells;
    }
diff --git a/debian/patches/libdvdnav-0010-xbmc-dvdnav-expose-dvdnav_jump_to_sector_by_time.patch b/debian/patches/libdvdnav-0010-xbmc-dvdnav-expose-dvdnav_jump_to_sector_by_time.patch
index 6cf074a..6029e9c 100644
--- a/debian/patches/libdvdnav-0010-xbmc-dvdnav-expose-dvdnav_jump_to_sector_by_time.patch
+++ b/debian/patches/libdvdnav-0010-xbmc-dvdnav-expose-dvdnav_jump_to_sector_by_time.patch
@@ -9,8 +9,8 @@ Subject: [PATCH 10/10] [xbmc][dvdnav] expose dvdnav_jump_to_sector_by_time
 
 diff --git a/src/dvdnav/dvdnav.h b/src/dvdnav/dvdnav.h
 index 9f82b0f..731c0ee 100644
---- a/src/dvdnav/dvdnav.h
-+++ b/src/dvdnav/dvdnav.h
+--- a/libdvdnav-5-0-3/src/dvdnav/dvdnav.h
++++ b/libdvdnav-5-0-3/src/dvdnav/dvdnav.h
 @@ -382,6 +382,14 @@ dvdnav_status_t dvdnav_sector_search(dvdnav_t *self,
  int64_t dvdnav_get_current_time(dvdnav_t *self);
  
diff --git a/debian/patches/libdvdread-0001-xbmc-libdvdread-added-defines-includes.patch b/debian/patches/libdvdread-0001-xbmc-libdvdread-added-defines-includes.patch
index f5e1dd6..5f0893d 100644
--- a/debian/patches/libdvdread-0001-xbmc-libdvdread-added-defines-includes.patch
+++ b/debian/patches/libdvdread-0001-xbmc-libdvdread-added-defines-includes.patch
@@ -10,8 +10,8 @@ Subject: [PATCH 1/3] [xbmc][libdvdread] added defines/includes
 
 diff --git a/src/dvd_input.h b/src/dvd_input.h
 index f981d45..3d33eb1 100644
---- a/src/dvd_input.h
-+++ b/src/dvd_input.h
+--- a/libdvdread-5-0-3/src/dvd_input.h
++++ b/libdvdread-5-0-3/src/dvd_input.h
 @@ -34,6 +34,13 @@ typedef struct dvd_input_s *dvd_input_t;
  #if defined( __MINGW32__ )
  #   undef  lseek
@@ -28,8 +28,8 @@ index f981d45..3d33eb1 100644
  #   undef  stat
 diff --git a/src/dvd_reader.c b/src/dvd_reader.c
 index 4e112d3..5cc06d6 100644
---- a/src/dvd_reader.c
-+++ b/src/dvd_reader.c
+--- a/libdvdread-5-0-3/src/dvd_reader.c
++++ b/libdvdread-5-0-3/src/dvd_reader.c
 @@ -33,6 +33,9 @@
  #include <limits.h>         /* PATH_MAX */
  #include <dirent.h>         /* opendir, readdir */
diff --git a/debian/patches/libdvdread-0002-xbmc-libdvdread-don-t-do-symlink-resolution-on-kodi.patch b/debian/patches/libdvdread-0002-xbmc-libdvdread-don-t-do-symlink-resolution-on-kodi.patch
index a1555f7..536ff2d 100644
--- a/debian/patches/libdvdread-0002-xbmc-libdvdread-don-t-do-symlink-resolution-on-kodi.patch
+++ b/debian/patches/libdvdread-0002-xbmc-libdvdread-don-t-do-symlink-resolution-on-kodi.patch
@@ -9,8 +9,8 @@ Subject: [PATCH 2/3] [xbmc][libdvdread] don't do symlink resolution on kodi
 
 diff --git a/src/dvd_reader.c b/src/dvd_reader.c
 index 5cc06d6..3c31a1c 100644
---- a/src/dvd_reader.c
-+++ b/src/dvd_reader.c
+--- a/libdvdread-5-0-3/src/dvd_reader.c
++++ b/libdvdread-5-0-3/src/dvd_reader.c
 @@ -432,8 +432,9 @@ static dvd_reader_t *DVDOpenCommon( const char *ppath,
      if( !(path_copy = strdup( path ) ) )
        goto DVDOpen_error;
diff --git a/debian/patches/libdvdread-0003-xbmc-libdvdread-kodi-VFS-doesn-t-support-opendir-use.patch b/debian/patches/libdvdread-0003-xbmc-libdvdread-kodi-VFS-doesn-t-support-opendir-use.patch
index c12a60f..e73ac72 100644
--- a/debian/patches/libdvdread-0003-xbmc-libdvdread-kodi-VFS-doesn-t-support-opendir-use.patch
+++ b/debian/patches/libdvdread-0003-xbmc-libdvdread-kodi-VFS-doesn-t-support-opendir-use.patch
@@ -10,8 +10,8 @@ Subject: [PATCH 3/3] [xbmc][libdvdread] kodi VFS doesn't support opendir, use
 
 diff --git a/src/dvd_reader.c b/src/dvd_reader.c
 index 3c31a1c..3c5ec90 100644
---- a/src/dvd_reader.c
-+++ b/src/dvd_reader.c
+--- a/libdvdread-5-0-3/src/dvd_reader.c
++++ b/libdvdread-5-0-3/src/dvd_reader.c
 @@ -692,6 +692,16 @@ static dvd_file_t *DVDOpenFileUDF( dvd_reader_t *dvd, const char *filename,
   */
  static int findDirFile( const char *path, const char *file, char *filename )
diff --git a/debian/patches/libdvdread-debian-0001-libdvdcss.patch b/debian/patches/libdvdread-debian-0001-libdvdcss.patch
index 78ad091..d0bc2e3 100644
--- a/debian/patches/libdvdread-debian-0001-libdvdcss.patch
+++ b/debian/patches/libdvdread-debian-0001-libdvdcss.patch
@@ -7,8 +7,8 @@ Print information about the CSS README.
  src/dvd_input.c | 9 ++++++++-
  1 file changed, 8 insertions(+), 1 deletion(-)
 
---- a/src/dvd_input.c
-+++ b/src/dvd_input.c
+--- a/libdvdread-5-0-3/src/dvd_input.c
++++ b/libdvdread-5-0-3/src/dvd_input.c
 @@ -366,7 +366,14 @@
      return 1;
  
diff --git a/debian/patches/libdvdread-debian-0006-descriptor.patch b/debian/patches/libdvdread-debian-0006-descriptor.patch
index f0dbb10..287448b 100644
--- a/debian/patches/libdvdread-debian-0006-descriptor.patch
+++ b/debian/patches/libdvdread-debian-0006-descriptor.patch
@@ -25,8 +25,8 @@ Closes: #663512
  src/dvd_udf.c | 37 ++++++++++++++++++++++++++++++++++---
  1 file changed, 34 insertions(+), 3 deletions(-)
 
---- a/src/dvd_udf.c
-+++ b/src/dvd_udf.c
+--- a/libdvdread-5-0-3/src/dvd_udf.c
++++ b/libdvdread-5-0-3/src/dvd_udf.c
 @@ -82,6 +82,8 @@
    uint32_t AccessType;
    uint32_t Start;
diff --git a/debian/patches/libdvdread-extra-0001-Use-real-dlopen-for-libdvdcss.patch b/debian/patches/libdvdread-extra-0001-Use-real-dlopen-for-libdvdcss.patch
index acb4e61..ac7b8b0 100644
--- a/debian/patches/libdvdread-extra-0001-Use-real-dlopen-for-libdvdcss.patch
+++ b/debian/patches/libdvdread-extra-0001-Use-real-dlopen-for-libdvdcss.patch
@@ -9,8 +9,8 @@ Subject: [PATCH] Use real dlopen() for libdvdcss
 
 diff --git a/src/dvd_input.c b/src/dvd_input.c
 index d28efe7..ec3ce67 100644
---- a/src/dvd_input.c
-+++ b/src/dvd_input.c
+--- a/libdvdread-5-0-3/src/dvd_input.c
++++ b/libdvdread-5-0-3/src/dvd_input.c
 @@ -19,6 +19,8 @@
   * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
   */
diff --git a/debian/patches/series b/debian/patches/series
index 105ae7a..2c93c98 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,3 +14,19 @@
 13-fix-tests.patch
 14-ignore-test-results.patch
 15-dont-use-openssl.patch
+libdvdnav-0001-xbmc-dvdnav-allow-get-set-vm-state.patch
+libdvdnav-0002-xbmc-dvdnav-expose-dvdnav_get_vm-dvdnav_get_button_i.patch
+libdvdnav-0003-xbmc-dvdnav-detection-of-dvd-name.patch
+libdvdnav-0004-xbmc-dvdnav-skip-cell-when-unrecoverable.patch
+libdvdnav-0005-xbmc-dvdnav-added-reading-of-VTS_TMAPT-and-TITLE_C_A.patch
+libdvdnav-0006-xbmc-dvdnav-various-safeguards.patch
+libdvdnav-0007-xbmc-dvdnav-disallow-time-search-when-navigation-pro.patch
+libdvdnav-0008-xbmc-dvdnav-additional-debug-log.patch
+libdvdnav-0009-xbmc-dvdnav-add-timemap-to-time-search.patch
+libdvdnav-0010-xbmc-dvdnav-expose-dvdnav_jump_to_sector_by_time.patch
+libdvdread-0001-xbmc-libdvdread-added-defines-includes.patch
+libdvdread-0002-xbmc-libdvdread-don-t-do-symlink-resolution-on-kodi.patch
+libdvdread-0003-xbmc-libdvdread-kodi-VFS-doesn-t-support-opendir-use.patch
+libdvdread-debian-0001-libdvdcss.patch
+libdvdread-debian-0006-descriptor.patch
+libdvdread-extra-0001-Use-real-dlopen-for-libdvdcss.patch
diff --git a/debian/rules b/debian/rules
index c4cc1a9..64aff94 100755
--- a/debian/rules
+++ b/debian/rules
@@ -83,10 +83,6 @@ override_dh_clean:
 	find . -name config.status -o -name config.cache -o -name config.log \
 		-exec rm -f "{}" \;
 	rm -rf tools/depends/target; \
-	ls $(CURDIR)/debian/patches/libdvdnav-* | tac | xargs cat | patch -R --no-backup-if-mismatch -r - -s -p1 \
-		-d $(DVDNAV_COMPONENT) || true
-	ls $(CURDIR)/debian/patches/libdvdread-* | tac | xargs cat | patch -R --no-backup-if-mismatch -r - -s -p1 \
-		-d $(DVDREAD_COMPONENT) || true
 	rm -rf $(CURDIR)/addons/webinterface.default
 	rm -f debian/dh-addon/*.1
 
@@ -103,8 +99,6 @@ DEJAVUSANS=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf
 endif
 
 override_dh_auto_configure: configure
-	cat $(CURDIR)/debian/patches/libdvdnav-* | patch -p1 -d $(DVDNAV_COMPONENT)
-	cat $(CURDIR)/debian/patches/libdvdread-* | patch -p1 -d $(DVDREAD_COMPONENT)
 	cp -r $(CURDIR)/webinterface-default $(CURDIR)/addons/webinterface.default
 	sed -i 's/DEB_VERSION/"'$(VERSION)'"/' xbmc/Application.cpp xbmc/utils/SystemInfo.cpp
 	fontforge -script $(CURDIR)/debian/mergefonts.ff \
@@ -199,7 +193,7 @@ override_dh_gencontrol-arch:
 override_dh_gencontrol-indep:
 	dh_gencontrol -i
 
-# extract and patch customized libdvdread and libdvdnav and webinterface from 17.0 beta5
+# extract customized additional tarballs
 extract-components:
 	tar -xf $(CURDIR)/../kodi_"$(UPSTREAM_VERSION)".orig-$(DVDNAV_COMPONENT).tar.bz2 && \
 		mv libdvdnav-* $(CURDIR)/$(DVDNAV_COMPONENT)

-- 
kodi packaging



More information about the pkg-multimedia-commits mailing list