From 9f2117d50292ad212946e7c0275dadd0ec3cb3c9 Mon Sep 17 00:00:00 2001 From: groni Date: Wed, 6 Jan 2016 17:05:42 +0100 Subject: [PATCH] handbrake add 2 patches --- .../files/Do-not-require-wget-or-curl.patch | 23 +++++++++++++++++++ .../handbrake/files/use-libtoolize.patch | 19 +++++++++++++++ multimedia/editor/handbrake/pspec.xml | 7 +++--- 3 files changed, 46 insertions(+), 3 deletions(-) create mode 100644 multimedia/editor/handbrake/files/Do-not-require-wget-or-curl.patch create mode 100644 multimedia/editor/handbrake/files/use-libtoolize.patch diff --git a/multimedia/editor/handbrake/files/Do-not-require-wget-or-curl.patch b/multimedia/editor/handbrake/files/Do-not-require-wget-or-curl.patch new file mode 100644 index 0000000000..04fc2bb6f8 --- /dev/null +++ b/multimedia/editor/handbrake/files/Do-not-require-wget-or-curl.patch @@ -0,0 +1,23 @@ +Description: Do not require neither wget no curl to build +Author: Reinhard Tartler +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: diff --git a/multimedia/editor/handbrake/files/use-libtoolize.patch b/multimedia/editor/handbrake/files/use-libtoolize.patch new file mode 100644 index 0000000000..08a5f5b735 --- /dev/null +++ b/multimedia/editor/handbrake/files/use-libtoolize.patch @@ -0,0 +1,19 @@ +Description: Test for libtoolize + libtool is not used anywhere. +Bug-Debian: https://bugs.debian.org/761757 +Author: Sebastian Ramacher +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 ) diff --git a/multimedia/editor/handbrake/pspec.xml b/multimedia/editor/handbrake/pspec.xml index c94f9c9d66..a4f2cd436e 100644 --- a/multimedia/editor/handbrake/pspec.xml +++ b/multimedia/editor/handbrake/pspec.xml @@ -36,9 +36,10 @@ libsamplerate-devel gst-plugins-base-next-devel - + + Do-not-require-wget-or-curl.patch + use-libtoolize.patch +