Request 1450 (accepted)

handbrake.changes Changed

@@ -1,4 +1,30 @@
 -------------------------------------------------------------------
+Tue Dec  2 12:55:15 UTC 2014 - seife+obs@b1-systems.com
+
+- fix "no return in nonvoid function" compiler error from embedded
+  libdvdnav libdvdnav-5.0.1-noreturninnonvoidfunction.patch
+
+-------------------------------------------------------------------
+Tue Dec  2 10:48:00 UTC 2014 - seife+obs@b1-systems.com
+
+- adjust debug config from max to std to avoid ffmpeg assert aborts
+
+-------------------------------------------------------------------
+Tue Nov 25 19:19:39 UTC 2014 - seife+obs@b1-systems.com
+
+- update to 0.10.0:
+- remove obsolete patches, update support tarballs, only add
+  the really needed stuff
+- more build date removal
+- important change: due to GTK3 version dependencies, the GUI
+  is only built for distributions newer than openSUSE 12.3
+
+-------------------------------------------------------------------
+Fri Apr 18 18:52:38 UTC 2014 - seife+obs@b1-systems.com
+
+- remove build date from binaries to avoid republishing
+
+-------------------------------------------------------------------
 Sun Dec  1 08:28:12 UTC 2013 - obs@botter.cc
 
 - add patch to fix compiling libx264: HandBrake-0.9.9_libx264-gcc-488-fix.patch

handbrake.spec Changed

@@ -1,6 +1,7 @@
 # vim: set sw=4 ts=4 et:
 
 # Copyright (c) 2012 Pascal Bleser <pascal.bleser@opensuse.org>
+# Copyright (c) 2014 B1 Systems GmbH, Vobhurg, Germany
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -11,11 +12,11 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.links2linux.org/
 
 Name:           handbrake
-Version:        0.9.9
-Release:        1.pm.1
+Version:        0.10.0
+Release:        0
 License:        GPL-2.0+
 Summary:        Multithreaded Video Transcoder
 Url:            http://handbrake.fr/
@@ -23,78 +24,44 @@
 # svn://svn.handbrake.fr/HandBrake/trunk#%{rev}
 #Source:        HandBrake-svn%{rev}.tar.bz2
 Source:         http://prdownloads.sourceforge.net/handbrake/HandBrake-%{version}.tar.bz2
-Source101:      http://download.handbrake.fr/handbrake/contrib/a52dec-0.7.4.tar.gz
-Source102:      http://download.handbrake.fr/handbrake/contrib/faac-1.28.tar.gz
-#Source103:      http://download.handbrake.fr/handbrake/contrib/faad2-2.7.tar.gz
-Source104:      http://download.handbrake.fr/handbrake/contrib/libav-v9.6.tar.bz2
-Source105:      http://download.handbrake.fr/handbrake/contrib/yasm-1.2.0.tar.gz
-Source106:      http://download.handbrake.fr/handbrake/contrib/lame-3.98.tar.gz
-Source107:      http://download.handbrake.fr/handbrake/contrib/libdvdread-svn1168.tar.gz
-Source108:      http://download.handbrake.fr/handbrake/contrib/libdvdnav-svn1168.tar.gz
-Source109:      http://download.handbrake.fr/handbrake/contrib/libmkv-0.6.5-0-g82075ae.tar.gz
-Source110:      http://download.handbrake.fr/handbrake/contrib/mp4v2-trunk-r355.tar.bz2
-Source111:      http://download.handbrake.fr/handbrake/contrib/mpeg2dec-0.5.1.tar.gz
-Source112:      http://download.handbrake.fr/handbrake/contrib/x264-r2273-b3065e6.tar.gz
-Source113:      http://download.handbrake.fr/handbrake/contrib/libbluray-0.2.3.tar.bz2
-#Source120:      http://download.handbrake.fr/handbrake/contrib/libdca-r81-strapped.tar.gz
-Source151:      handbrake-ffmpeg_fix_missing_return_in_nonvoid_function.patch
-Source152:      handbrake-libmkv_no_return_in_nonvoid_function.patch
-%if 0%{?suse_version} <= 1140
-Source153:      handbrake-libbluray-glibc_older_2_12.patch
-%endif
+Source101:      http://download.handbrake.fr/handbrake/contrib/fdk-aac-v0.1.1-6-gbae4553.tar.bz2
+Source102:      http://download.handbrake.fr/handbrake/contrib/cmake-3.0.1.tar.gz
+Source103:      http://download.handbrake.fr/handbrake/contrib/libav-v10.1.tar.bz2
+Source104:      http://download.handbrake.fr/handbrake/contrib/libdvdnav-5.0.1-0-gaa3659d.tar.gz
+Source105:      http://download.handbrake.fr/handbrake/contrib/libdvdread-5.0.0-6-gcb1ae87.tar.gz
+Source106:      http://download.handbrake.fr/contrib/libmfx-v2014.tar.bz2
+Source107:      http://download.handbrake.fr/contrib/libvpx-v1.3.0.tar.bz2
+Source108:      http://download.handbrake.fr/contrib/x265-8768-5e604833c5aa-1.4.tar.bz2
+Source109:      http://download.handbrake.fr/handbrake/contrib/libbluray-0.5.0.tar.bz2
+##
+## libdvnav has "assert(0)" as default in some error paths, which is a nop with -DNDEBUG...
+Source200:      libdvdnav-5.0.1-noreturninnonvoidfunction.patch
 Source99:       handbrake-rpmlintrc
-%if 0%{?suse_version} >= 1310
-# PATCH-FIX-PACKMAN fix libx264 with newer version of gcc
-Patch0:         HandBrake-0.9.9_libx264-gcc-488-fix.patch
-%endif
-BuildRequires:  alsa-devel
-BuildRequires:  curl
-BuildRequires:  fribidi-devel
-BuildRequires:  gstreamer-0_10-plugins-base-devel
-BuildRequires:  gtkhtml2-devel
-BuildRequires:  libbz2-devel
-BuildRequires:  libcurl-devel
-BuildRequires:  libicu-devel
-BuildRequires:  libxslt-devel
-BuildRequires:  python
-BuildRequires:  sqlite3-devel
-BuildRequires:  subversion
-BuildRequires:  wget
-BuildRequires:  zlib-devel
-%if 0%{?suse_version} == 1210
-BuildRequires:  gstreamer-utils
-%endif
-BuildRequires:  pkgconfig(gstreamer-0.10)
-BuildRequires:  pkgconfig(gtk+-2.0) >= 2.24
-# systemd-mini/udev-mini currently missing in Factory-repo
+
+Patch0:         HandBrake-0.10.0-no-builddate.patch
+Patch1:         handbrake-enable_local_fribidi.patch
+BuildRequires:  python curl wget subversion
+BuildRequires:  libbz2-devel zlib-devel libgudev-1_0-devel
 %if 0%{?suse_version} > 1230
-BuildRequires:  libudev1 libudev-devel
-BuildRequires:  libgudev-1_0-0 libgudev-1_0-devel
-%else
-BuildRequires:  pkgconfig(gudev-1.0)
+BuildRequires:  gtk3-devel >= 3.10
+BuildRequires:  gtkhtml-devel
 %endif
-BuildRequires:  pkgconfig(libnotify)
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRequires:  fribidi-devel
+BuildRequires:  dbus-1-glib-devel
+BuildRequires:  libicu-devel libnotify-devel
 %if 0%{?suse_version} <= 1140
-BuildRequires:  pkgconfig(hal)
-%endif
-BuildRequires:  pkgconfig(dbus-glib-1)
-%if 0%{?suse_version} >= 1110
+BuildRequires:  hal-devel
 BuildRequires:  libwebkit-devel
 %else
-BuildRequires:  WebKitGtk-devel
+BuildRequires:  libwebkitgtk3-devel
 %endif
-BuildRequires:  autoconf
-BuildRequires:  automake
-BuildRequires:  gcc
-BuildRequires:  gcc-c++
-BuildRequires:  glibc-devel
-BuildRequires:  intltool
-BuildRequires:  libtool
-BuildRequires:  make
+BuildRequires:  sqlite3-devel libcurl-devel libxslt-devel
+BuildRequires:  gstreamer-0_10-devel gstreamer-0_10-plugins-base-devel
+BuildRequires:  gcc gcc-c++ make glibc-devel yasm nasm
+BuildRequires:  autoconf automake libtool intltool
 BuildRequires:  update-desktop-files
-BuildRequires:  fontconfig-devel freetype2-devel libxml2-devel libass-devel
-BuildRequires:  libogg-devel libvorbis-devel libtheora-devel libsamplerate-devel
+BuildRequires:  libvorbis-devel libass-devel x264-devel libmp3lame-devel libtheora-devel
+BuildRequires:  libsamplerate-devel
 
 %description
 HandBrake is an open-source, GPL-licensed, multiplatform, multithreaded video
@@ -111,6 +78,7 @@
 
 This package contains a command-line interface for Handbrake.
 
+%if 0%{?suse_version} > 1230
 %package gtk
 Summary:        Multithreaded Video Transcoder
 Group:          Productivity/Multimedia/Video/Editors and Convertors
@@ -121,57 +89,55 @@
 transcoder.
 
 This package contains a GTK+ graphical user interface for Handbrake.
+%endif
 
 %prep
 %if 0%{?rev:1}
 %setup -q -n "HandBrake-svn%{rev}"
 %else
 %setup -q -n "HandBrake-%{version}"
-%if 0%{?suse_version} >= 1310
-%patch0 -p1
-%endif
 %endif
+%patch0 -p1
 
-# unstable, so patch from 0.9.8 did not apply, use the script
-# used to generate the patch instead
-mv -i libhb/hb.h libhb/handbrake.h
-mv -i gtk/src/hb-backend.h gtk/src/handbrake-backend.h
-find $ -name '*.h' -o -name '*.c' $ -exec \
-    grep -l 'include.*"hb.h\|hb-backend.h"' {} + | \
-    xargs perl -pi -e 's/include\s*"hb.h"/include "handbrake.h"/;
-      s/include\s*"hb-backend.h"/include "handbrake-backend.h"/'
+%if 0%{?suse_version} < 1200
+%patch1 -p1
+%endif
 
 # Copy 3rd party dependencies into expected locations:
-mkdir download
-# 
+%__mkdir download
 for f in \
-%{S:101} %{S:102} %{S:104} %{S:105} %{S:106} \
-%{S:107} %{S:108} %{S:109} %{S:110} %{S:111} %{S:112} \
-%{S:113} \
+%{S:101} %{S:102} %{S:103} \
+%{S:104} %{S:105} %{S:106} \
+%{S:107} %{S:108} %{S:109} \
 ; do
-     ln -s "$f" download/
+    %__ln_s "$f" download/
 done
 
 # check beforehand that the versions match what the
 # build system expects:
 missing=$PWD/.missing
-grep -hE '\.FETCH\.url *=' contrib/*/module.defs \
-| gawk -F' =' '{print $2}' \
+%__grep -hE '\.FETCH\.url *=' contrib/*/module.defs \
+| %__awk -F' =' '{print $2}' \
 | while read url; do
-     f=$(echo "$url" | sed 's|^.*/||')
-     case $f in
-    	  bzip2*|libiconv*|pthreads*|zlib*|autoconf*|automake*|\
-          fdk-aac*|fontconfig*|freetype*|libass*|libogg*|libsamplerate*|\
-          libtheora*|libtool*|libvorbis*|libxml2*|m4*)
-            continue ;;
-     esac
-     [ -e "$RPM_SOURCE_DIR/$f" ] || echo "$url">>"$missing"
+    f=$(echo "$url" | sed 's|^.*/||')
+    case $f in
+        bzip2*|libiconv*|pthreads*|zlib*) continue ;;
+        autoconf*|automake*|libtool*|m4*) continue ;;
+        pkg-config*)                      continue ;;
+        fontconfig*|freetype*|fribidi*|libass*) continue ;;
+        libogg*|libtheora*|libvorbis*|libsamplerate*) continue ;;
+        libxml2*)                         continue ;;
+        x264*|lame*)                      continue ;;
+        yasm*)                            continue ;;
+        mingw-libgnurx*)                  continue ;;
+    esac
+    [ -e "download/$f" ] || echo "$url">>"$missing"
 done
 
 if test -e "$missing"; then
-     echo "ERROR: missing contrib source archives:" >&2
-     cat "$missing" >&2
-     exit 1
+    echo "ERROR: missing contrib source archives:" >&2
+    cat "$missing" >&2
+    exit 1
 fi
 
 
@@ -180,59 +146,73 @@
 export CXXFLAGS="$CFLAGS -Wno-reorder"
 export PATH="%{_builddir}/HandBrake-%{version}/build/contrib/bin:$PATH"
 
-cp %{S:152} contrib/libmkv/A99-fix-missing-return-in-nonvoid-function.patch
-%if 0%{?suse_version} <= 1140
-cp %{S:153} contrib/libbluray/A99-glibc_older_2_12.patch
-%endif
+cp %{S:200} contrib/libdvdnav/A99-fix-missing-return-in-nonvoid-function.patch
+
+# try to remove build date from binaries... -- seife+obs@b1-systems.com
+PKGDATE=$(date -r %{_sourcedir}/handbrake.changes +%Y%m%d)
+sed -i -e "s/@BUILD@/$PKGDATE/" make/configure.py
 
-mkdir -p build
+%__mkdir build
 ./configure \
-     --force \
-     --build="$PWD/build" \
-     --prefix="%{buildroot}%{_prefix}" \
-     --strip="/bin/true" \
-     --optimize=speed \
-     --enable-ff-mpeg2 \
-     --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"
-%if 0%{?suse_version} >= 1230
-GHB_PKGS="$GHB_PKGS harfbuzz"
+    --force \
+    --build="$PWD/build" \
+    --prefix="%{buildroot}%{_prefix}" \
+    --strip="/bin/true" \
+    --optimize=speed \
+%if 0%{?suse_version} <= 1230
+    --disable-gtk \
 %endif
+    --debug=std ### debug=max removes -DNDEBUG from ffmpeg, leading to asserts aborting build...
+
 pushd build
-make libhb/project.h
-make %{?_smp_mflags} V=1 \
-    GHB_CFLAGS="$(pkg-config --cflags $GHB_PKGS) -I../../libhb -I../../contrib/include" \
-    GHB_LIBS="$(pkg-config --libs $GHB_PKGS)"
+#### get rid of __DATE__ and __TIME__ in fdk-aac
+%__mkdir contrib
+%__mkdir contrib/fdkaac
+tar -xf %{S:101} -C contrib/fdkaac
+find contrib/fdkaac/ -type f | xargs sed -i -e "s/__DATE__/\"$PKGDATE\"/"
+find contrib/fdkaac/ -type f | xargs sed -i -e 's/__TIME__/"00:00:00"/'
+touch contrib/fdkaac/.stamp.extract
+pushd contrib/fdkaac/fdk-aac-v0.1.1-6-gbae4553
+autoreconf -fi
+popd
+
+%__make libhb/project.h
+%__make %{?_smp_mflags} V=1
+
 popd #build
 
 
 %install
 pushd build
-make install
+%__make install
 popd #build
 
-ln -s ghb "%{buildroot}%{_bindir}/HandBrakeGUI"
+if [ -e %{buildroot}%{_bindir}/ghb ]; then
+    %__ln_s ghb "%{buildroot}%{_bindir}/HandBrakeGUI"
+fi
 
 %suse_update_desktop_file -r ghb AudioVideo AudioVideoEditing
 
-rm "%{buildroot}%{_datadir}/icons"/*/*.cache
+# -f because it might not be there if built without gtk...
+%__rm -f "%{buildroot}%{_datadir}/icons"/*/*.cache
 
 %clean
-%{?buildroot:rm -rf %{buildroot}}
+%{?buildroot:%__rm -rf "%{buildroot}"}
 
 %files cli
 %defattr(-,root,root)
 %doc AUTHORS COPYING CREDITS NEWS THANKS
 %{_bindir}/HandBrakeCLI
 
+%if 0%{?suse_version} > 1230
 %files gtk
 %defattr(-,root,root)
 %doc AUTHORS COPYING CREDITS NEWS THANKS
 %{_bindir}/HandBrakeGUI
 %{_bindir}/ghb
 %{_datadir}/applications/ghb.desktop
-%{_datadir}/icons/*/*/apps/hb-icon.png
+%{_datadir}/icons/*/*/apps/hb-icon.*
+/usr/share/locale/*/LC_MESSAGES/ghb.mo
+%endif
 
 %changelog

HandBrake-0.10.0-no-builddate.patch Added

@@ -0,0 +1,45 @@
+Index: b/make/configure.py
+===================================================================
+--- a/make/configure.py
++++ b/make/configure.py
+@@ -807,19 +807,19 @@ class Project( Action ):
+             self.version = '%d.%d.%d' % (self.vmajor,self.vminor,self.vpoint)
+             url_ctype = ''
+             url_ntype = 'stable'
+-            self.build = time.strftime('%Y%m%d') + '00'
++            self.build = '@BUILD@' + '00'
+             self.title = '%s %s (%s)' % (self.name,self.version,self.build)
+         elif repo.type == 'developer':
+             self.version = '%dsvn' % (repo.rev)
+             url_ctype = '_unstable'
+             url_ntype = 'unstable'
+-            self.build = time.strftime('%Y%m%d') + '01'
++            self.build = '@BUILD@' + '01'
+             self.title = '%s svn%d (%s)' % (self.name,repo.rev,self.build)
+         else:
+             self.version = 'rev%d' % (repo.rev)
+             url_ctype = '_unofficial'
+             url_ntype = 'unofficial'
+-            self.build = time.strftime('%Y%m%d') + '99'
++            self.build = '@BUILD@' + '99'
+             self.title = '%s rev%d (%s)' % (self.name,repo.rev,self.build)
+ 
+         self.url_appcast = 'https://handbrake.fr/appcast%s%s.xml' % (url_ctype,url_arch)
+@@ -1621,7 +1621,7 @@ int main()
+ 
+     ## create document object
+     doc = ConfigDocument()
+-    doc.addComment( 'generated by configure on %s', time.strftime( '%c' ))
++    # doc.addComment( 'generated by configure on %s', time.strftime( '%c' ))
+ 
+     ## add configure line for reconfigure purposes
+     doc.addBlank()
+@@ -1690,7 +1690,7 @@ int main()
+     else:
+         doc.add( 'BUILD.cross.prefix', '' )
+ 
+-    doc.add( 'BUILD.date',   time.strftime('%c') )
++    # doc.add( 'BUILD.date',   time.strftime('%c') )
+     doc.add( 'BUILD.arch',   arch.mode.mode )
+ 
+     doc.addBlank()

HandBrake-0.9.9_libx264-gcc-488-fix.patch Deleted

handbrake-enable_local_fribidi.patch Added

handbrake-ffmpeg_fix_missing_return_in_nonvoid_function.patch Deleted

handbrake-libmkv_no_return_in_nonvoid_function.patch Deleted

libdvdnav-5.0.1-noreturninnonvoidfunction.patch Added

HandBrake-0.9.9.tar.bz2 -> HandBrake-0.10.0.tar.bz2 Changed

a52dec-0.7.4.tar.gz Deleted

cmake-3.0.1.tar.gz Added

faac-1.28.tar.gz Deleted

faad2-2.7.tar.gz Deleted

fdk-aac-v0.1.1-6-gbae4553.tar.bz2 Added

ffmpeg-v0.7-1696-gcae4f4b.tar.bz2 Deleted

fribidi-0.19.2.tar.gz Deleted

lame-3.98.tar.gz Deleted

libav-v9.6.tar.bz2 -> libav-v10.1.tar.bz2 Changed

libbluray-0.2.3.tar.bz2 -> libbluray-0.5.0.tar.bz2 Changed

libdca-r81-strapped.tar.gz Deleted

libdvdnav-5.0.1-0-gaa3659d.tar.gz Added

libdvdnav-svn1168.tar.gz Deleted

libdvdread-5.0.0-6-gcb1ae87.tar.gz Added

libdvdread-svn1168.tar.gz Deleted

libmfx-v2014.tar.bz2 Added

libmkv-0.6.5-0-g82075ae.tar.gz Deleted

libvpx-v1.3.0.tar.bz2 Added

mp4v2-trunk-r355.tar.bz2 Deleted

mpeg2dec-0.5.1.tar.gz Deleted

x264-r2273-b3065e6.tar.gz Deleted

x265-8768-5e604833c5aa-1.4.tar.bz2 Added

yasm-1.2.0.tar.gz Deleted

Overview

Request 1450 (accepted)

Request History