Switch to system bluray

ROSA-force-system-libs.patch

@@ -1,20 +1,7 @@
-From 3bc273ebe0520c988c4c41886c8f4cab6e2dc958 Mon Sep 17 00:00:00 2001
-From: Mikhail Novosyolov <m.novosyolov@rosalinux.ru>
-Date: Sun, 6 Jan 2019 11:43:25 +0300
-Subject: [PATCH] Force using system libraries
- Based on Debian's patch
- https://salsa.debian.org/multimedia-team/handbrake/blob/master/debian/patches/0001-Remove-embedded-downloaded-copies-of-various-librari.patch
-
----
- make/include/main.defs | 16 +---------------
- test/module.defs       |  2 +-
- 2 files changed, 2 insertions(+), 16 deletions(-)
-
-diff --git a/make/include/main.defs b/make/include/main.defs
-index d56b752d4..a445f1e4d 100644
---- a/make/include/main.defs
-+++ b/make/include/main.defs
-@@ -37,21 +37,7 @@ ifeq (1,$(FEATURE.flatpak))
+diff -urN HandBrake-1.2.0/make/include/main.defs HandBrake-1.2.0-patched/make/include/main.defs
+--- HandBrake-1.2.0/make/include/main.defs	2018-12-17 03:16:51.000000000 +1000
++++ HandBrake-1.2.0-patched/make/include/main.defs	2019-04-11 16:58:52.041911650 +1000
+@@ -37,23 +37,6 @@
      MODULES += contrib/x264
  endif
  
@@ -33,15 +20,15 @@ index d56b752d4..a445f1e4d 100644
 -MODULES += contrib/libvpx
 -MODULES += contrib/libdvdread
 -MODULES += contrib/libdvdnav
-+# remove this when libbluray is >= 1.0
- MODULES += contrib/libbluray
- 
+-MODULES += contrib/libbluray
+-
  ifneq (,$(filter $(BUILD.system),mingw))
-diff --git a/test/module.defs b/test/module.defs
-index 92ae40c45..c77b6f2f7 100644
---- a/test/module.defs
-+++ b/test/module.defs
-@@ -39,7 +39,7 @@ ifeq (1,$(FEATURE.nvenc))
+ ifneq ($(HAS.pthread),1)
+ ifneq ($(HAS.pthreadGC2),1)
+diff -urN HandBrake-1.2.0/test/module.defs HandBrake-1.2.0-patched/test/module.defs
+--- HandBrake-1.2.0/test/module.defs	2018-12-17 03:16:51.000000000 +1000
++++ HandBrake-1.2.0-patched/test/module.defs	2019-04-11 16:58:33.390910035 +1000
+@@ -39,7 +39,7 @@
  endif
  
  ifeq (1,$(FEATURE.x265))
@@ -50,6 +37,3 @@ index 92ae40c45..c77b6f2f7 100644
  endif
  
  ifeq (1,$(FEATURE.flatpak))
--- 
-2.17.1
-

handbrake.spec

@@ -88,16 +88,7 @@ devices.
 
 %prep
 %setup -qn %{oname}-%{version}
-
-# we should switch to system libbluray in rosa2019.1
-%if %{mdvver} >= 201800
-if grep -q '^-MODULES += contrib/libbluray' %{PATCH0} ; then
 %patch0 -p1
-else echo "Switch to system libbluray!" ; exit 1
-fi
-%else
-%patch0 -p1
-%endif
 
 tar -xvzf %{SOURCE2}