[SCM] handbrake/master: Do not require neither wget nor curl to build

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Wed Nov 27 02:39:19 UTC 2013


The following commit has been merged in the master branch:
commit a212fbd7c8b73201f9588d8ffa0f4fbcece21416
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Nov 26 21:27:46 2013 -0500

    Do not require neither wget nor curl to build
    
    The tools are not actually required at build time

diff --git a/debian/patches/0019-Do-not-require-wget-or-curl.patch b/debian/patches/0019-Do-not-require-wget-or-curl.patch
new file mode 100644
index 0000000..362ff71
--- /dev/null
+++ b/debian/patches/0019-Do-not-require-wget-or-curl.patch
@@ -0,0 +1,22 @@
+Author: Reinhard Tartler <siretart at debian.org>
+Description: Do not require neither wget nor curl to build
+
+--- a/make/configure.py
++++ b/make/configure.py
+@@ -949,6 +949,7 @@ class SelectTool( Action ):
+         self.name     = name
+         self.pool     = pool
+         self.kwargs   = kwargs
++        self.selected = None
+ 
+     def _action( self ):
+         self.session = []
+@@ -1382,7 +1383,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:
diff --git a/debian/patches/series b/debian/patches/series
index 1e92adf..536937c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@
 0016-use-older-libmkv.patch
 0017-fixup-libmkv.patch
 0018-Fix-compilation-with-gstreamer-1.patch
+0019-Do-not-require-wget-or-curl.patch

-- 
handbrake packaging



More information about the pkg-multimedia-commits mailing list