[SCM] handbrake/master: debian/patches: Update to use Debian's libdvd{nav, read}.

rbrito-guest at users.alioth.debian.org rbrito-guest at users.alioth.debian.org
Fri Jun 8 17:21:38 UTC 2012 

The following commit has been merged in the master branch:
commit afa1f1ba1af4f69b7caeed9349082053d66a3ebe
Author: Rogério Brito <rbrito at ime.usp.br>
Date:   Fri Jun 8 12:54:00 2012 -0300

    debian/patches: Update to use Debian's libdvd{nav,read}.
    
    Thanks: Daniel Baumann for uploading new versions of these libraries.
    
    Signed-off-by: Rogério Brito <rbrito at ime.usp.br>

diff --git a/debian/patches/0001-Remove-encoding-indication-from-desktop-file.patch b/debian/patches/0001-Remove-encoding-indication-from-desktop-file.patch
index ba8a200..bdf63e7 100644
--- a/debian/patches/0001-Remove-encoding-indication-from-desktop-file.patch
+++ b/debian/patches/0001-Remove-encoding-indication-from-desktop-file.patch
@@ -13,11 +13,9 @@ Signed-off-by: Rogério Theodoro de Brito <rbrito at ime.usp.br>
  gtk/src/ghb.desktop |    1 -
  1 file changed, 1 deletion(-)
 
-diff --git a/gtk/src/ghb.desktop b/gtk/src/ghb.desktop
-index 1547d29..3583fdd 100644
 --- a/gtk/src/ghb.desktop
 +++ b/gtk/src/ghb.desktop
-@@ -5,7 +5,6 @@ Comment=Transcodes DVD, Bluray, and other media
+@@ -5,7 +5,6 @@
  Exec=ghb
  Icon=hb-icon
  Terminal=false
diff --git a/debian/patches/0002-Fix-include-with-the-system-s-libav.patch b/debian/patches/0002-Fix-include-with-the-system-s-libav.patch
index 4c2e471..79a483d 100644
--- a/debian/patches/0002-Fix-include-with-the-system-s-libav.patch
+++ b/debian/patches/0002-Fix-include-with-the-system-s-libav.patch
@@ -17,8 +17,6 @@ Signed-off-by: Rogério Theodoro de Brito <rbrito at ime.usp.br>
  libhb/encavcodecaudio.c |    4 +++-
  2 files changed, 6 insertions(+), 2 deletions(-)
 
-diff --git a/libhb/decavcodec.c b/libhb/decavcodec.c
-index fd58c5c..6192d1e 100644
 --- a/libhb/decavcodec.c
 +++ b/libhb/decavcodec.c
 @@ -38,7 +38,9 @@
@@ -32,8 +30,6 @@ index fd58c5c..6192d1e 100644
  
  static void compute_frame_duration( hb_work_private_t *pv );
  static void flushDelayQueue( hb_work_private_t *pv );
-diff --git a/libhb/encavcodecaudio.c b/libhb/encavcodecaudio.c
-index 3a23256..dad8fa1 100644
 --- a/libhb/encavcodecaudio.c
 +++ b/libhb/encavcodecaudio.c
 @@ -7,7 +7,9 @@
diff --git a/debian/patches/0003-Remove-embedded-downloaded-copies-of-various-librari.patch b/debian/patches/0003-Remove-embedded-downloaded-copies-of-various-librari.patch
index 3e71365..1882dc3 100644
--- a/debian/patches/0003-Remove-embedded-downloaded-copies-of-various-librari.patch
+++ b/debian/patches/0003-Remove-embedded-downloaded-copies-of-various-librari.patch
@@ -19,11 +19,9 @@ Signed-off-by: Rogério Theodoro de Brito <rbrito at ime.usp.br>
  test/module.defs       |   10 +++-------
  3 files changed, 10 insertions(+), 30 deletions(-)
 
-diff --git a/gtk/src/Makefile.am b/gtk/src/Makefile.am
-index 9c1dbd2..8a0be50 100644
 --- a/gtk/src/Makefile.am
 +++ b/gtk/src/Makefile.am
-@@ -10,7 +10,7 @@ else
+@@ -10,7 +10,7 @@
  HB_LIBS= \
  	-lhb -la52 -lmkv -lavformat -lavcodec -lavutil -ldca -ldvdnav -ldvdread \
  	-lfaac -lmp3lame -lmpeg2 -lvorbis -lvorbisenc -logg -lsamplerate \
@@ -32,7 +30,7 @@ index 9c1dbd2..8a0be50 100644
  	-lbz2 -lpthread -lbluray -lass -lfontconfig -lfreetype
  endif
  
-@@ -108,7 +108,7 @@ ghb_LDFLAGS = \
+@@ -108,7 +108,7 @@
  	-mwindows -Wl,--export-dynamic -Wl,--exclude-libs,ALL
  else
  ghb_LDFLAGS = \
@@ -41,11 +39,9 @@ index 9c1dbd2..8a0be50 100644
  endif
  
  ghb_LDADD = $(HB_LIBS) $(GHB_LIBS)
-diff --git a/make/include/main.defs b/make/include/main.defs
-index e68f679..9770de1 100644
 --- a/make/include/main.defs
 +++ b/make/include/main.defs
-@@ -8,8 +8,6 @@ include $(SRC/)make/include/tool.defs
+@@ -8,8 +8,6 @@
  
  ###############################################################################
  
@@ -54,7 +50,7 @@ index e68f679..9770de1 100644
  ifneq (,$(filter $(BUILD.system),cygwin mingw))
  ifneq ($(HAS.bz2),1)
      MODULES += contrib/bzip2
-@@ -20,25 +18,8 @@ ifneq (,$(filter $(BUILD.system),darwin cygwin mingw))
+@@ -20,34 +18,12 @@
      MODULES += contrib/fribidi
  endif
  
@@ -66,8 +62,8 @@ index e68f679..9770de1 100644
 -MODULES += contrib/lame
 -MODULES += contrib/libass
 -MODULES += contrib/libdca
- MODULES += contrib/libdvdread
- MODULES += contrib/libdvdnav
+-MODULES += contrib/libdvdread
+-MODULES += contrib/libdvdnav
 -MODULES += contrib/libbluray
 -MODULES += contrib/libmkv
 -MODULES += contrib/libogg
@@ -77,10 +73,10 @@ index e68f679..9770de1 100644
 -MODULES += contrib/libxml2
 -MODULES += contrib/mp4v2
 -MODULES += contrib/mpeg2dec
- 
+-
  ifneq (,$(filter $(BUILD.system),mingw))
  ifneq ($(HAS.pthread),1)
-@@ -46,8 +27,6 @@ ifneq ($(HAS.pthread),1)
+     MODULES += contrib/pthreadw32
  endif
  endif
  
@@ -89,37 +85,34 @@ index e68f679..9770de1 100644
  ifneq (,$(filter $(BUILD.system),cygwin mingw))
  ifneq ($(HAS.iconv),1)
      MODULES += contrib/libiconv
-@@ -83,6 +62,11 @@ ifeq (1-linux,$(FEATURE.gtk)-$(BUILD.system))
+@@ -82,6 +58,11 @@
+     ## build gtk when gtk+linux
      MODULES += gtk
  endif
- 
++
 +ifeq (1-kfreebsd,$(FEATURE.gtk)-$(BUILD.system))
 +    ## build gtk when gtk+linux
 +    MODULES += gtk
 +endif
-+
+ 
  ifeq (1,$(FEATURE.local_yasm))
      MODULES += contrib/yasm
- endif
-diff --git a/test/module.defs b/test/module.defs
-index 5030e6f..69f9166 100644
 --- a/test/module.defs
 +++ b/test/module.defs
-@@ -10,10 +10,11 @@ TEST.c.o = $(patsubst $(SRC/)%.c,$(BUILD/)%.o,$(TEST.c))
+@@ -10,10 +10,10 @@
  TEST.exe = $(BUILD/)$(call TARGET.exe,$(HB.name)CLI)
  
  TEST.libs = $(LIBHB.a) $(foreach n, \
 -        a52 ass avcodec avformat avutil dca dvdnav dvdread faac fontconfig freetype mkv mpeg2 mp3lame mp4v2 \
 -        ogg samplerate swscale theora vorbis vorbisenc x264 xml2 bluray, \
-+        dvdnav dvdread, \
          $(CONTRIB.build/)lib/lib$(n).a )
  
-+TEST.libs += -lass -lfaac -lmp3lame -lsamplerate -lvorbisenc -ltheoraenc -ltheoradec -lvorbis -lx264 -lmkv -lz -lbz2 -lpthread -ldl -lmp4v2 -lxml2 -ldca -la52 -lbluray -lavcodec -lavformat -lavutil -lswscale -lmpeg2
++TEST.libs += -lass -lfaac -lmp3lame -lsamplerate -lvorbisenc -ltheoraenc -ltheoradec -lvorbis -lx264 -lmkv -lz -lbz2 -lpthread -ldl -lmp4v2 -lxml2 -ldca -la52 -lbluray -lavcodec -lavformat -lavutil -lswscale -lmpeg2 -ldvdnav -ldvdread
 +
  TEST.install.exe = $(DESTDIR)$(PREFIX/)bin/$(notdir $(TEST.exe))
  
  ifeq (1,$(PTHREADW32.enabled))
-@@ -32,11 +33,6 @@ ifeq (1,$(ZLIB.enabled))
+@@ -32,11 +32,6 @@
  else
  	TEST.GCC.l += z
  endif
diff --git a/debian/patches/0004-Enable-compilation-on-Debian-arches-other-than-Linux.patch b/debian/patches/0004-Enable-compilation-on-Debian-arches-other-than-Linux.patch
index 1af6fac..823889e 100644
--- a/debian/patches/0004-Enable-compilation-on-Debian-arches-other-than-Linux.patch
+++ b/debian/patches/0004-Enable-compilation-on-Debian-arches-other-than-Linux.patch
@@ -24,11 +24,9 @@ Signed-off-by: Rogério Theodoro de Brito <rbrito at ime.usp.br>
  make/include/main.defs |    5 +++++
  4 files changed, 21 insertions(+), 6 deletions(-)
 
-diff --git a/gtk/configure.ac b/gtk/configure.ac
-index d2db300..60c5660 100644
 --- a/gtk/configure.ac
 +++ b/gtk/configure.ac
-@@ -94,10 +94,15 @@ case $host in
+@@ -94,10 +94,15 @@
  	mingw_flag=yes
      ;;
    *)
@@ -46,8 +44,6 @@ index d2db300..60c5660 100644
      fi
  	mingw_flag=no
      ;;
-diff --git a/gtk/src/callbacks.c b/gtk/src/callbacks.c
-index 94a932d..866c6e9 100644
 --- a/gtk/src/callbacks.c
 +++ b/gtk/src/callbacks.c
 @@ -28,7 +28,9 @@
@@ -70,7 +66,7 @@ index 94a932d..866c6e9 100644
  #else
  #define WINVER 0x0500
  #include <winsock2.h>
-@@ -3943,14 +3948,14 @@ dvd_device_list()
+@@ -3943,14 +3948,14 @@
  	return dvd_devices;
  }
  
@@ -87,7 +83,7 @@ index 94a932d..866c6e9 100644
  	gchar *device;
  	GUdevDevice *udd;
  
-@@ -3984,7 +3989,7 @@ ghb_is_cd(GDrive *gd)
+@@ -3984,7 +3989,7 @@
  void
  ghb_udev_init()
  {
@@ -96,11 +92,9 @@ index 94a932d..866c6e9 100644
  	udev_ctx = g_udev_client_new(NULL);
  #endif
  }
-diff --git a/libhb/ports.h b/libhb/ports.h
-index 7b743c4..5e17799 100644
 --- a/libhb/ports.h
 +++ b/libhb/ports.h
-@@ -51,7 +51,7 @@ typedef struct hb_thread_s hb_thread_t;
+@@ -51,7 +51,7 @@
  #elif defined( SYS_DARWIN )
  #  define HB_LOW_PRIORITY    0
  #  define HB_NORMAL_PRIORITY 31
@@ -109,11 +103,9 @@ index 7b743c4..5e17799 100644
  #  define HB_LOW_PRIORITY    0
  #  define HB_NORMAL_PRIORITY 0
  #elif defined( SYS_CYGWIN )
-diff --git a/make/include/main.defs b/make/include/main.defs
-index 9770de1..c34c379 100644
 --- a/make/include/main.defs
 +++ b/make/include/main.defs
-@@ -67,6 +67,11 @@ ifeq (1-kfreebsd,$(FEATURE.gtk)-$(BUILD.system))
+@@ -64,6 +64,11 @@
      MODULES += gtk
  endif
  
diff --git a/debian/patches/0005-libhb-Fix-compilation-with-mp4v2-v1.9.1.patch b/debian/patches/0005-libhb-Fix-compilation-with-mp4v2-v1.9.1.patch
index fff26ca..0ee167f 100644
--- a/debian/patches/0005-libhb-Fix-compilation-with-mp4v2-v1.9.1.patch
+++ b/debian/patches/0005-libhb-Fix-compilation-with-mp4v2-v1.9.1.patch
@@ -14,11 +14,9 @@ Signed-off-by: Rogério Theodoro de Brito <rbrito at ime.usp.br>
  libhb/muxmp4.c      |    8 ++++----
  2 files changed, 6 insertions(+), 6 deletions(-)
 
-diff --git a/libhb/decmetadata.c b/libhb/decmetadata.c
-index bd848a9..030188a 100644
 --- a/libhb/decmetadata.c
 +++ b/libhb/decmetadata.c
-@@ -13,7 +13,7 @@ static void decmp4metadata( hb_title_t *title )
+@@ -13,7 +13,7 @@
      MP4FileHandle input_file;
      hb_deep_log( 2, "Got an MP4 input, read the metadata");
  
@@ -27,7 +25,7 @@ index bd848a9..030188a 100644
  
      if( input_file != MP4_INVALID_FILE_HANDLE )
      { 
-@@ -92,7 +92,7 @@ static void decmp4metadata( hb_title_t *title )
+@@ -92,7 +92,7 @@
              }
          }
  
@@ -36,11 +34,9 @@ index bd848a9..030188a 100644
      }
  }
  
-diff --git a/libhb/muxmp4.c b/libhb/muxmp4.c
-index d03326b..887c821 100644
 --- a/libhb/muxmp4.c
 +++ b/libhb/muxmp4.c
-@@ -93,13 +93,13 @@ static int MP4Init( hb_mux_object_t * m )
+@@ -93,13 +93,13 @@
      if (job->largeFileSize)
      /* Use 64-bit MP4 file */
      {
@@ -56,7 +52,7 @@ index d03326b..887c821 100644
      }
  
      if (m->file == MP4_INVALID_FILE_HANDLE)
-@@ -1331,14 +1331,14 @@ static int MP4End( hb_mux_object_t * m )
+@@ -1331,14 +1331,14 @@
          MP4TagsFree( tags );
      }
  
diff --git a/debian/patches/0006-LinGUI-Allow-user-to-pass-libavcodec-settings-also-w.patch b/debian/patches/0006-LinGUI-Allow-user-to-pass-libavcodec-settings-also-w.patch
index a0cd9c2..645b11b 100644
--- a/debian/patches/0006-LinGUI-Allow-user-to-pass-libavcodec-settings-also-w.patch
+++ b/debian/patches/0006-LinGUI-Allow-user-to-pass-libavcodec-settings-also-w.patch
@@ -20,11 +20,9 @@ Signed-off-by: Rogério Theodoro de Brito <rbrito at ime.usp.br>
  gtk/src/makedeps.py |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/gtk/src/makedeps.py b/gtk/src/makedeps.py
-index d7c2fa7..674c56d 100644
 --- a/gtk/src/makedeps.py
 +++ b/gtk/src/makedeps.py
-@@ -47,7 +47,7 @@ dep_map = (
+@@ -47,7 +47,7 @@
  	DepEntry("PictureAutoCrop", "PictureLeftCrop", "FALSE", False, False),
  	DepEntry("PictureAutoCrop", "PictureRightCrop", "FALSE", False, False),
  	DepEntry("VideoEncoder", "x264_tab", "x264", False, True),
diff --git a/debian/patches/0007-Fix-for-compilation-with-Debian-s-libbluray.patch b/debian/patches/0007-Fix-for-compilation-with-Debian-s-libbluray.patch
index 9323440..7c2a3a6 100644
--- a/debian/patches/0007-Fix-for-compilation-with-Debian-s-libbluray.patch
+++ b/debian/patches/0007-Fix-for-compilation-with-Debian-s-libbluray.patch
@@ -23,7 +23,7 @@ Signed-off-by: Rogério Brito <rbrito at ime.usp.br>
 
 --- a/libhb/bd.c
 +++ b/libhb/bd.c
-@@ -51,7 +51,7 @@ hb_bd_t * hb_bd_init( char * path )
+@@ -51,7 +51,7 @@
          goto fail;
      }
  
@@ -32,7 +32,7 @@ Signed-off-by: Rogério Brito <rbrito at ime.usp.br>
      if ( d->title_count == 0 )
      {
          hb_log( "bd: not a bd - trying as a stream/file instead" );
-@@ -60,7 +60,7 @@ hb_bd_t * hb_bd_init( char * path )
+@@ -60,7 +60,7 @@
      d->title_info = calloc( sizeof( BLURAY_TITLE_INFO* ) , d->title_count );
      for ( ii = 0; ii < d->title_count; ii++ )
      {
diff --git a/debian/patches/0008-Fix-for-compilation-with-Debian-s-libdca.patch b/debian/patches/0008-Fix-for-compilation-with-Debian-s-libdca.patch
index 3094efb..f17bab3 100644
--- a/debian/patches/0008-Fix-for-compilation-with-Debian-s-libdca.patch
+++ b/debian/patches/0008-Fix-for-compilation-with-Debian-s-libdca.patch
@@ -28,7 +28,7 @@ Signed-off-by: Rogério Brito <rbrito at ime.usp.br>
  struct hb_work_private_s
  {
      hb_job_t    * job;
-@@ -258,7 +263,7 @@ static hb_buffer_t * Decode( hb_work_obj
+@@ -258,7 +263,7 @@
  
      for( i = 0; i < num_blocks; i++ )
      {
diff --git a/debian/patches/0010-Remove-FAAC-dependency.patch b/debian/patches/0010-Remove-FAAC-dependency.patch
index cb6716d..ea8fdc7 100644
--- a/debian/patches/0010-Remove-FAAC-dependency.patch
+++ b/debian/patches/0010-Remove-FAAC-dependency.patch
@@ -583,12 +583,16 @@ to enter Debian.
  endif
 --- a/test/module.defs
 +++ b/test/module.defs
-@@ -13,7 +13,7 @@
-         dvdnav dvdread, \
-         $(CONTRIB.build/)lib/lib$(n).a )
+@@ -9,10 +9,9 @@
+ 
+ TEST.exe = $(BUILD/)$(call TARGET.exe,$(HB.name)CLI)
+ 
+-TEST.libs = $(LIBHB.a) $(foreach n, \
+-        $(CONTRIB.build/)lib/lib$(n).a )
++TEST.libs = $(LIBHB.a)
  
--TEST.libs += -lass -lfaac -lmp3lame -lsamplerate -lvorbisenc -ltheoraenc -ltheoradec -lvorbis -lx264 -lmkv -lz -lbz2 -lpthread -ldl -lmp4v2 -lxml2 -ldca -la52 -lbluray -lavcodec -lavformat -lavutil -lswscale -lmpeg2
-+TEST.libs += -lass -lmp3lame -lsamplerate -lvorbisenc -ltheoraenc -ltheoradec -lvorbis -lx264 -lmkv -lz -lbz2 -lpthread -ldl -lmp4v2 -lxml2 -ldca -la52 -lbluray -lavcodec -lavformat -lavutil -lswscale -lmpeg2
+-TEST.libs += -lass -lfaac -lmp3lame -lsamplerate -lvorbisenc -ltheoraenc -ltheoradec -lvorbis -lx264 -lmkv -lz -lbz2 -lpthread -ldl -lmp4v2 -lxml2 -ldca -la52 -lbluray -lavcodec -lavformat -lavutil -lswscale -lmpeg2 -ldvdnav -ldvdread
++TEST.libs += -lass -lmp3lame -lsamplerate -lvorbisenc -ltheoraenc -ltheoradec -lvorbis -lx264 -lmkv -lz -lbz2 -lpthread -ldl -lmp4v2 -lxml2 -ldca -la52 -lbluray -lavcodec -lavformat -lavutil -lswscale -lmpeg2 -ldvdnav -ldvdread
  
  TEST.install.exe = $(DESTDIR)$(PREFIX/)bin/$(notdir $(TEST.exe))
  
diff --git a/debian/patches/0011-First-try-at-removing-some-of-mp4v2.patch b/debian/patches/0011-First-try-at-removing-some-of-mp4v2.patch
index 584692f..2624ce7 100644
--- a/debian/patches/0011-First-try-at-removing-some-of-mp4v2.patch
+++ b/debian/patches/0011-First-try-at-removing-some-of-mp4v2.patch
@@ -7,8 +7,6 @@ Signed-off-by: Rogério Brito <rbrito at ime.usp.br>
  libhb/stream.c |    1 -
  1 file changed, 1 deletion(-)
 
-diff --git a/libhb/stream.c b/libhb/stream.c
-index 93167ba..362f862 100644
 --- a/libhb/stream.c
 +++ b/libhb/stream.c
 @@ -12,7 +12,6 @@
@@ -19,6 +17,3 @@ index 93167ba..362f862 100644
  #include "libbluray/bluray.h"
  
  #define min(a, b) a < b ? a : b
--- 
-1.7.10
-

-- 
handbrake packaging

More information about the pkg-multimedia-commits mailing list