[SCM] handbrake/master: Refreshed

sramacher at users.alioth.debian.org sramacher at users.alioth.debian.org
Sat Apr 15 18:53:07 UTC 2017


The following commit has been merged in the master branch:
commit a65c69533af66e61b46b5016daf3019c13120f66
Author: Sebastian Ramacher <sebastian at ramacher.at>
Date:   Sat Apr 15 20:40:39 2017 +0200

    Refreshed

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 87847ba..ff7220f 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
@@ -8,7 +8,7 @@ Last-Update: 2014-09-27
 
 --- a/make/include/main.defs
 +++ b/make/include/main.defs
-@@ -73,16 +73,6 @@
+@@ -72,16 +72,6 @@
      MODULES += contrib/fdk-aac
  endif
  
@@ -27,7 +27,7 @@ Last-Update: 2014-09-27
  ifneq ($(HAS.pthreadGC2),1)
 --- a/test/module.defs
 +++ b/test/module.defs
-@@ -28,6 +28,7 @@
+@@ -32,6 +32,7 @@
  
  ifeq (1,$(FEATURE.x265))
      TEST.GCC.D += USE_X265
diff --git a/debian/patches/005-use-libtoolize.patch b/debian/patches/005-use-libtoolize.patch
index 1a72912..41ce6f1 100644
--- a/debian/patches/005-use-libtoolize.patch
+++ b/debian/patches/005-use-libtoolize.patch
@@ -6,7 +6,7 @@ Last-Update: 2014-09-28
 
 --- a/make/configure.py
 +++ b/make/configure.py
-@@ -1535,7 +1535,7 @@ try:
+@@ -1535,7 +1535,7 @@
          autoconf = ToolProbe( 'AUTOCONF.exe', 'autoconf', abort=False )
          automake = ToolProbe( 'AUTOMAKE.exe', 'automake', abort=False )
          cmake    = ToolProbe( 'CMAKE.exe',    'cmake', abort=False )

-- 
handbrake packaging



More information about the pkg-multimedia-commits mailing list