handbrake add 2 patches

2016-01-06 17:05:42 +01:00
parent a44b160d3b
commit 9f2117d502
3 changed files with 46 additions and 3 deletions
@@ -0,0 +1,23 @@
+Description: Do not require neither wget no curl to build
+Author: Reinhard Tartler <siretart@debian.org>
+Last-Update: 2014-09-27
+
+--- handbrake.orig/make/configure.py
+++ handbrake/make/configure.py
+@@ -977,6 +977,7 @@ class SelectTool( Action ):
+         self.name     = name
+         self.pool     = pool
+         self.kwargs   = kwargs
+        self.selected = None
+ 
+     def _action( self ):
+         self.session = []
+@@ -1428,7 +1429,7 @@ try:
+         xcodebuild = ToolProbe( 'XCODEBUILD.exe', 'xcodebuild', abort=False )
+         lipo       = ToolProbe( 'LIPO.exe',       'lipo', abort=False )
+ 
+-        fetch = SelectTool( 'FETCH.select', 'fetch', ['wget',wget], ['curl',curl] )
+        fetch = SelectTool( 'FETCH.select', 'fetch', ['wget',wget], ['curl',curl], abort=False ) 
+ 
+     ## run tool probes
+     for tool in ToolProbe.tools:
@@ -0,0 +1,19 @@
+Description: Test for libtoolize
+ libtool is not used anywhere.
+Bug-Debian: https://bugs.debian.org/761757
+Author: Sebastian Ramacher <sramacher@debian.org>
+Last-Update: 2014-09-28
+
+Index: handbrake/make/configure.py
+===================================================================
+--- handbrake.orig/make/configure.py
+++ handbrake/make/configure.py
+@@ -1423,7 +1423,7 @@ try:
+         autoconf = ToolProbe( 'AUTOCONF.exe', 'autoconf', abort=False )
+         automake = ToolProbe( 'AUTOMAKE.exe', 'automake', abort=False )
+         cmake    = ToolProbe( 'CMAKE.exe',    'cmake', abort=False )
+-        libtool  = ToolProbe( 'LIBTOOL.exe',  'libtool', abort=False )
+        libtool  = ToolProbe( 'LIBTOOLIZE.exe',  'libtoolize', abort=False )
+         pkgconfig = ToolProbe( 'PKGCONFIG.exe', 'pkg-config', abort=False )
+ 
+         xcodebuild = ToolProbe( 'XCODEBUILD.exe', 'xcodebuild', abort=False )
@@ -36,9 +36,10 @@
            <Dependency>libsamplerate-devel</Dependency>
            <Dependency>gst-plugins-base-next-devel</Dependency>
        </BuildDependencies>
-	<!--<Patches>
-	  <Patch level="2">standard-presets-fix-type.patch</Patch>
-        </Patches>-->
+	<Patches>
+	  <Patch level="1">Do-not-require-wget-or-curl.patch</Patch>
+          <Patch level="1">use-libtoolize.patch</Patch>
+        </Patches>
    </Source>

    <Package>