Request 3731 (accepted)

Overview

Request 3731 (accepted)

Only build static libbluray for SLE version <= 120200

Created by enzokiel over 8 years ago
In state accepted
4 package maintainers

Submit handbrake

Submit package home:enzokiel:...hes:Multimedia / handbrake to package Multimedia / handbrake

handbrake.changes Changed

handbrake.spec Changed

@@ -16,6 +16,11 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
+%if 0%{?sle_version} > 120200 || 0%{?suse_version} > 1320
+%bcond_without bluray
+%endif
+
 Name:           handbrake
 Summary:        Multithreaded Video Transcoder
 Version:        1.0.3
@@ -24,6 +29,7 @@
 Source0:        https://handbrake.fr/mirror/HandBrake-%{version}.tar.bz2
 Patch0:         HandBrake-no-builddate.patch
 Patch1:         HandBrake-build-shared.patch
+Patch2:         HandBrake-build-shared-withbluray.patch
 Patch3:         HandBrake-ffmpeg3.patch
 Source101:      http://download.videolan.org/pub/videolan/libbluray/0.9.3/libbluray-0.9.3.tar.bz2
 License:        GPL-2.0+
@@ -50,18 +56,10 @@
 BuildRequires:  pkgconfig(dbus-glib-1)
 BuildRequires:  pkgconfig(dvdnav)
 BuildRequires:  pkgconfig(dvdread)
-%if 0%{?suse_version} <= 1140
-BuildRequires:  pkgconfig(gstreamer-0.10)
-BuildRequires:  pkgconfig(gstreamer-plugins-base-0.10)
-BuildRequires:  pkgconfig(liblzma)
-%else
 BuildRequires:  pkgconfig(gstreamer-1.0)
 BuildRequires:  pkgconfig(gstreamer-plugins-base-1.0)
-%endif
-%if 0%{?suse_version} >= 1310
 BuildRequires:  pkgconfig(gtk+-3.0) >= 3.10
 BuildRequires:  pkgconfig(webkitgtk-3.0)
-%endif
 BuildRequires:  pkgconfig(gudev-1.0)
 BuildRequires:  pkgconfig(libass)
 BuildRequires:  pkgconfig(libavcodec)
@@ -69,6 +67,9 @@
 BuildRequires:  pkgconfig(libavformat)
 BuildRequires:  pkgconfig(libavresample)
 BuildRequires:  pkgconfig(libavutil)
+%if %{with bluray}
+BuildRequires:  pkgconfig(libbluray)
+%endif
 BuildRequires:  pkgconfig(libswscale)
 BuildRequires:  pkgconfig(libnotify)
 BuildRequires:  pkgconfig(samplerate)
@@ -98,7 +99,6 @@
 
 This package contains a command-line interface for Handbrake.
 
-%if 0%{?suse_version} >= 1310
 %package gtk
 Summary:        Multithreaded Video Transcoder
 Group:          Productivity/Multimedia/Video/Editors and Convertors
@@ -111,16 +111,20 @@
 This package contains a GTK+ graphical user interface for Handbrake.
 
 %lang_package -n handbrake-gtk
-%endif
 
 %prep
 %setup -q -n HandBrake-%{version}
 %patch0 -p0
 %patch1 -p0
+%if %{with bluray}
+%patch2 -p0
+%endif
 %patch3 -p1
 
+%if %{without bluray}
 install -d ./download
 %__ln_s "%{SOURCE101}" ./download/
+%endif
 
 %build
 export CFLAGS="%{optflags} -fno-strict-aliasing -Wno-unused -I%{_includedir}/ffmpeg"
@@ -138,9 +142,6 @@
     --prefix=%{_prefix} \
     --strip="/bin/true" \
     --optimize=speed \
-%if 0%{?suse_version} < 1310
-    --disable-gtk \
-%endif
     --disable-fdk-aac \
     --debug=max
 
@@ -152,7 +153,6 @@
 %install
 %makeinstall -C build
 
-%if 0%{?suse_version} >= 1310
 %__ln_s ghb %{buildroot}%{_bindir}/HandBrakeGUI
 
 %suse_update_desktop_file -r ghb AudioVideo AudioVideoEditing
@@ -161,14 +161,12 @@
 %__rm -f "%{buildroot}%{_datadir}/icons"/*/*.cache
 
 %find_lang ghb
-%endif
 
 %files cli
 %defattr(-,root,root)
 %doc COPYING NEWS.markdown THANKS.markdown
 %{_bindir}/HandBrakeCLI
 
-%if 0%{?suse_version} >= 1310
 %files gtk
 %defattr(-,root,root)
 %doc COPYING NEWS.markdown THANKS.markdown
@@ -178,6 +176,5 @@
 %{_datadir}/icons/*/*/apps/hb-icon.*
 
 %files -n handbrake-gtk-lang -f ghb.lang
-%endif
 
 %changelog

HandBrake-build-shared-withbluray.patch Added

HandBrake-build-shared.patch Changed

@@ -1,19 +1,17 @@
---- make/include/main.defs.orig	2017-02-12 15:14:51.377211250 +0100
-+++ make/include/main.defs	2017-02-12 15:16:41.749092708 +0100
-@@ -55,6 +55,12 @@
-     MODULES += contrib/libsamplerate
-     MODULES += contrib/lame
-     MODULES += contrib/x264
+--- make/include/main.defs.orig	2017-02-25 21:56:19.000000000 +0100
++++ make/include/main.defs	2017-03-19 18:35:38.487344358 +0100
+@@ -67,20 +67,17 @@
+     MODULES += contrib/freetype
+     MODULES += contrib/libass
+     MODULES += contrib/yasm
 +    MODULES += contrib/x265
 +    MODULES += contrib/ffmpeg
 +    MODULES += contrib/libvpx
 +    MODULES += contrib/libdvdread
 +    MODULES += contrib/libdvdnav
-+    MODULES += contrib/libbluray
-     MODULES += contrib/jansson
  endif
  
-@@ -73,14 +79,6 @@
+ ifeq (1,$(FEATURE.fdk_aac))
      MODULES += contrib/fdk-aac
  endif
  
@@ -28,8 +26,8 @@
  MODULES += contrib/libbluray
  
  ifneq (,$(filter $(BUILD.system),mingw))
---- gtk/configure.ac.orig	2017-01-22 17:49:13.000000000 +0100
-+++ gtk/configure.ac	2017-02-12 15:15:32.625186518 +0100
+--- gtk/configure.ac.orig	2017-02-25 21:56:19.000000000 +0100
++++ gtk/configure.ac	2017-03-19 18:25:10.719325903 +0100
 @@ -168,7 +168,7 @@
  
  GHB_CFLAGS="$HBINC $GHB_CFLAGS"
@@ -39,8 +37,8 @@
  
  case $host in
    *-*-mingw*)
---- test/module.defs.orig	2017-01-22 17:49:13.000000000 +0100
-+++ test/module.defs	2017-02-12 15:15:32.625186518 +0100
+--- test/module.defs.orig	2017-02-25 21:56:19.000000000 +0100
++++ test/module.defs	2017-03-19 18:26:00.350380006 +0100
 @@ -16,7 +16,7 @@
  TEST.GCC.l = \
          ass avresample avformat avcodec avfilter avutil mp3lame dvdnav \

Build Results
RPM Lint

Refresh

Comments for request 3731 0

Request History

enzokiel created request over 8 years ago

Only build static libbluray for SLE version <= 120200

enzokiel accepted request over 8 years ago

Please add a comment