Request 116 (accepted)

Overview

Request 116 (accepted)

adjust that >= 12.1 works again, build succeeded for 11.3-Factory, last change was only %{?_smp_mflags}, so I didn't rebuild everything again

Created by dnh over 11 years ago
In state accepted
Package maintainers: dnh, frispete, and pbleser

Submit handbrake

Submit package home:dnh:branches:Multimedia / handbrake to package Multimedia / handbrake

handbrake.spec Changed

@@ -32,15 +32,20 @@
 Source121:      http://download.m0k.org/handbrake/contrib/libxml2-2.7.7.tar.gz
 Source151:      handbrake-ffmpeg_fix_missing_return_in_nonvoid_function.patch
 Source99:       handbrake-rpmlintrc
+Patch1:         handbrake-notify.patch
 URL:            http://handbrake.fr/
 Group:          Productivity/Multimedia/Video/Editors and Convertors
 License:        GNU General Public License version 2 (GPL v2)
 BuildRoot:      %{_tmppath}/build-%{name}-%{version}
 BuildRequires:  python curl wget subversion
 BuildRequires:  gtk2-devel gtkhtml2-devel libbz2-devel zlib-devel
-BuildRequires:  libicu-devel libnotify-devel hal-devel libgudev-1_0-devel
+BuildRequires:  libicu-devel libnotify-devel libgudev-1_0-devel alsa-devel
 BuildRequires:  sqlite3-devel libcurl-devel libxslt-devel
 BuildRequires:  gstreamer-0_10-devel gstreamer-0_10-plugins-base-devel
+%if 0%{?suse_version} <= 1140
+BuildRequires:  hal-devel
+%endif
+BuildRequires:  dbus-1-glib-devel
 %if %suse_version >= 1110
 BuildRequires:  libwebkit-devel
 %else
@@ -99,6 +104,10 @@
 %setup -q -n "HandBrake-%{version}"
 %endif
 
+%if 0%{suse_version} > 1140
+%patch1 -p0
+%endif
+
 # Copy 3rd party dependencies into expected locations:
 %__mkdir download
 for f in \
@@ -133,6 +142,8 @@
 # will be removed when the makefiles are fixed, currently
 # fails on openSUSE factory because of --as-needed
 export SUSE_ASNEEDED=0
+export CFLAGS="%{optflags}"
+export CXXFLAGS="%{optflags}"
 
 %__cp "%{S:151}" contrib/ffmpeg/A99-fix-missing-return-in-nonvoid-function.patch
 
@@ -145,11 +156,16 @@
      --optimize=speed \
      --debug=max
 
+GHB_PKGS="dbus-glib-1 glib-2.0 gdk-pixbuf-2.0 gudev-1.0 webkit-1.0 libnotify"
+GHB_PKGS="$GHB_PKGS gstreamer-interfaces-0.10 gstreamer-0.10 gstreamer-pbutils-0.10 gstreamer-video-0.10"
 pushd build
 %__make libhb/project.h
-%__make %{?jobs:-j%{jobs}}
+%__make %{?_smp_mflags} \
+    GHB_CFLAGS="$(pkg-config --cflags $GHB_PKGS) -I../../libhb" \
+    GHB_LIBS="$(pkg-config --libs $GHB_PKGS)"
 popd #build
 
+
 %install
 pushd build
 %__make install

handbrake-notify.patch Added

Build Results
RPM Lint

Refresh

Comments for request 116 0

Request History

dnh created request over 11 years ago

adjust that >= 12.1 works again, build succeeded for 11.3-Factory, last change was only %{?_smp_mflags}, so I didn't rebuild everything again

pbleser accepted request almost 13 years ago