[SCM] handbrake/master: Refresh patches

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sat Feb 15 17:21:55 UTC 2014


The following commit has been merged in the master branch:
commit 8a1d7a1533773b342f2b7d652a063a2dfdc6e773
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Feb 15 17:18:10 2014 +0000

    Refresh patches

diff --git a/debian/patches/001-Do-not-require-wget-or-curl.patch b/debian/patches/001-Do-not-require-wget-or-curl.patch
index 78300b6..3118b2e 100644
--- a/debian/patches/001-Do-not-require-wget-or-curl.patch
+++ b/debian/patches/001-Do-not-require-wget-or-curl.patch
@@ -11,7 +11,7 @@ Description: Do not require neither wget nor curl to build
  
      def _action( self ):
          self.session = []
-@@ -1437,7 +1438,7 @@ try:
+@@ -1440,7 +1441,7 @@ try:
          xcodebuild = ToolProbe( 'XCODEBUILD.exe', 'xcodebuild', abort=False )
          lipo       = ToolProbe( 'LIPO.exe',       'lipo', abort=False )
  
diff --git a/debian/patches/002-Remove-embedded-downloaded-copies-of-various-librari.patch b/debian/patches/002-Remove-embedded-downloaded-copies-of-various-librari.patch
index 6ff8d64..7fb9113 100644
--- a/debian/patches/002-Remove-embedded-downloaded-copies-of-various-librari.patch
+++ b/debian/patches/002-Remove-embedded-downloaded-copies-of-various-librari.patch
@@ -34,9 +34,9 @@ Last-Update: 2013-02-15
  
  ifeq (1,$(FEATURE.fdk_aac))
      MODULES += contrib/fdk-aac
-@@ -58,12 +55,8 @@ endif
- ifeq (1,$(FEATURE.libmkv))
-     MODULES += contrib/libmkv
+@@ -62,12 +59,8 @@ endif
+ ifeq (1,$(FEATURE.x265))
+     MODULES += contrib/x265
  endif
 +endif
  
@@ -48,7 +48,7 @@ Last-Update: 2013-02-15
  
  ifneq (,$(filter $(BUILD.system),mingw))
  ifneq ($(HAS.pthread),1)
-@@ -75,8 +68,6 @@ ifeq (1,$(FEATURE.qsv))
+@@ -79,8 +72,6 @@ ifeq (1,$(FEATURE.qsv))
      MODULES += contrib/libmfx
  endif
  
@@ -57,7 +57,7 @@ Last-Update: 2013-02-15
  ifneq (,$(filter $(BUILD.system),cygwin mingw))
  ifneq ($(HAS.iconv),1)
      MODULES += contrib/libiconv
-@@ -117,6 +108,11 @@ ifeq (1-gnu,$(FEATURE.gtk)-$(BUILD.syste
+@@ -121,6 +112,11 @@ ifeq (1-gnu,$(FEATURE.gtk)-$(BUILD.syste
      MODULES += gtk
  endif
  
diff --git a/debian/patches/004-link-fix-add-ldl.patch b/debian/patches/004-link-fix-add-ldl.patch
index 265b8c3..cc9f940 100644
--- a/debian/patches/004-link-fix-add-ldl.patch
+++ b/debian/patches/004-link-fix-add-ldl.patch
@@ -1,11 +1,9 @@
 From: Reinhard Tartler
 Subject: Fix FTBFS at link time due to missing -ldl
 
-diff --git a/gtk/configure.ac b/gtk/configure.ac
-index c4362c2..2ae001b 100644
 --- a/gtk/configure.ac
 +++ b/gtk/configure.ac
-@@ -179,7 +179,7 @@ case $host in
+@@ -183,7 +183,7 @@ case $host in
      ;;
  esac
  

-- 
handbrake packaging



More information about the pkg-multimedia-commits mailing list