[SCM] handbrake/master: Link against system x265

sramacher at users.alioth.debian.org sramacher at users.alioth.debian.org
Sun Mar 5 09:57:16 UTC 2017


The following commit has been merged in the master branch:
commit 4fd6adc890481d01108b7826f918548c0a303ce4
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Sun Mar 5 10:56:22 2017 +0100

    Link against system x265

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 020f46c..87847ba 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 @@ ifeq (1,$(FEATURE.fdk_aac))
+@@ -73,16 +73,6 @@
      MODULES += contrib/fdk-aac
  endif
  
@@ -25,3 +25,13 @@ Last-Update: 2014-09-27
  ifneq (,$(filter $(BUILD.system),mingw))
  ifneq ($(HAS.pthread),1)
  ifneq ($(HAS.pthreadGC2),1)
+--- a/test/module.defs
++++ b/test/module.defs
+@@ -28,6 +28,7 @@
+ 
+ ifeq (1,$(FEATURE.x265))
+     TEST.GCC.D += USE_X265
++    TEST.GCC.l += x265
+ endif
+ 
+ ifeq (1,$(FEATURE.flatpak))

-- 
handbrake packaging



More information about the pkg-multimedia-commits mailing list