Request 2399 (accepted)

handbrake.changes Changed

handbrake.spec Changed

@@ -1,5 +1,6 @@
-# vim: set sw=4 ts=4 et:
-
+#
+# spec file for package handbrake
+#
 # Copyright (c) 2012 Pascal Bleser <pascal.bleser@opensuse.org>
 # Copyright (c) 2014 B1 Systems GmbH, Vobhurg, Germany
 #
@@ -12,58 +13,72 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via https://bugs.links2linux.org/
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
 
 Name:           handbrake
-Version:        0.10.2
-Release:        0
-License:        GPL-2.0+
 Summary:        Multithreaded Video Transcoder
+Version:        0.10.2
+Release:        1
 Url:            http://handbrake.fr/
-Group:          Productivity/Multimedia/Video/Editors and Convertors
-# 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/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-9329-0d30d2641875-1.5.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
-
+Source0:        HandBrake-%{version}.tar.bz2
 Patch0:         HandBrake-0.10.0-no-builddate.patch
-Patch1:         handbrake-enable_local_fribidi.patch
+Patch1:         HandBrake-build-shared.patch
+License:        GPL-2.0+
+Group:          Productivity/Multimedia/Video/Editors and Convertors
+BuildRequires:  autoconf
+BuildRequires:  automake
+BuildRequires:  cmake
+BuildRequires:  curl
+BuildRequires:  gcc
+BuildRequires:  gcc-c++
+BuildRequires:  intltool
+BuildRequires:  libtool
+BuildRequires:  make
+BuildRequires:  nasm
 BuildRequires:  python
-# no longer: curl wget subversion
-BuildRequires:  libbz2-devel zlib-devel libgudev-1_0-devel
-%if 0%{?suse_version} > 1230
-BuildRequires:  gtk3-devel >= 3.10
-BuildRequires:  gtkhtml-devel
-%endif
-BuildRequires:  fribidi-devel
-BuildRequires:  dbus-1-glib-devel
-BuildRequires:  libicu-devel libnotify-devel
+BuildRequires:  subversion
+BuildRequires:  update-desktop-files
+BuildRequires:  wget
+BuildRequires:  yasm
+BuildRequires:  glibc-devel
+BuildRequires:  libmp3lame-devel
+BuildRequires:  pkgconfig(bzip2)
+BuildRequires:  pkgconfig(dbus-glib-1)
+BuildRequires:  pkgconfig(dvdnav)
+BuildRequires:  pkgconfig(dvdread)
 %if 0%{?suse_version} <= 1140
-BuildRequires:  hal-devel
-BuildRequires:  libwebkit-devel
-BuildRequires:  gstreamer-0_10-devel gstreamer-0_10-plugins-base-devel
+BuildRequires:  pkgconfig(gstreamer-0.10)
+BuildRequires:  pkgconfig(gstreamer-plugins-base-0.10)
+BuildRequires:  pkgconfig(liblzma)
 %else
-BuildRequires:  libwebkitgtk3-devel
-BuildRequires:  gstreamer-devel gstreamer-plugins-base-devel
+BuildRequires:  pkgconfig(gstreamer-1.0)
+BuildRequires:  pkgconfig(gstreamer-plugins-base-1.0)
 %endif
-BuildRequires:  sqlite3-devel libcurl-devel libxslt-devel
-BuildRequires:  gcc gcc-c++ make glibc-devel yasm nasm
-BuildRequires:  autoconf automake libtool intltool
-BuildRequires:  update-desktop-files
-BuildRequires:  libvorbis-devel libass-devel x264-devel libmp3lame-devel libtheora-devel
-BuildRequires:  libsamplerate-devel
+%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)
+BuildRequires:  pkgconfig(libavformat)
+BuildRequires:  pkgconfig(libavresample)
+BuildRequires:  pkgconfig(libavutil)
+BuildRequires:  pkgconfig(libswscale)
+BuildRequires:  pkgconfig(libbluray)
+BuildRequires:  pkgconfig(libnotify)
+BuildRequires:  pkgconfig(samplerate)
+BuildRequires:  pkgconfig(theora)
+BuildRequires:  pkgconfig(vorbis)
+BuildRequires:  pkgconfig(vpx)
+BuildRequires:  pkgconfig(x264)
+BuildRequires:  pkgconfig(x265)
+%ifarch armv6l || armv6hl
+BuildRequires:  Mesa-libEGL1
+BuildRequires:  Mesa-libEGL-devel
+%endif
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 HandBrake is an open-source, GPL-licensed, multiplatform, multithreaded video
@@ -72,7 +87,6 @@
 %package cli
 Summary:        Multithreaded Video Transcoder
 Group:          Productivity/Multimedia/Video/Editors and Convertors
-Obsoletes:      handbrake-unstable-cli < %{version}
 
 %description cli
 HandBrake is an open-source, GPL-licensed, multiplatform, multithreaded video
@@ -80,138 +94,73 @@
 
 This package contains a command-line interface for Handbrake.
 
-%if 0%{?suse_version} > 1230
+%if 0%{?suse_version} >= 1310
 %package gtk
 Summary:        Multithreaded Video Transcoder
 Group:          Productivity/Multimedia/Video/Editors and Convertors
-Obsoletes:      handbrake-unstable-gtk < %{version}
+Recommends:     handbrake-gtk-lang = %{version}-%{release}
 
 %description gtk
 HandBrake is an open-source, GPL-licensed, multiplatform, multithreaded video
 transcoder.
 
 This package contains a GTK+ graphical user interface for Handbrake.
+
+%lang_package -n handbrake-gtk
 %endif
 
 %prep
-%if 0%{?rev:1}
-%setup -q -n "HandBrake-svn%{rev}"
-%else
-%setup -q -n "HandBrake-%{version}"
-%endif
+%setup -q -n HandBrake-%{version}
 %patch0 -p1
-
-%if 0%{?suse_version} < 1200
-%patch1 -p1
-%endif
-
-# Copy 3rd party dependencies into expected locations:
-%__mkdir download
-for f in \
-%{S:101} %{S:102} %{S:103} \
-%{S:104} %{S:105} %{S:106} \
-%{S:107} %{S:108} %{S:109} \
-; do
-    %__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 \
-| %__awk -F' =' '{print $2}' \
-| while read url; do
-    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
-fi
-
+%patch1 -p0
 
 %build
-export CFLAGS="%{optflags} -fno-strict-aliasing -Wno-unused"
+export CFLAGS="%{optflags} -fno-strict-aliasing -Wno-unused -I%{_includedir}/ffmpeg"
 export CXXFLAGS="$CFLAGS -Wno-reorder"
 export PATH="%{_builddir}/HandBrake-%{version}/build/contrib/bin:$PATH"
 
-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
-# we do not depend on curl or wget -- because everything is already here.
-sed -i -e '/FETCH\.select/d' make/configure.py
 
 %__mkdir build
 ./configure \
     --force \
     --build="$PWD/build" \
-    --prefix="%{_prefix}" \
+    --prefix=%{_prefix} \
     --strip="/bin/true" \
     --optimize=speed \
-%if 0%{?suse_version} <= 1230
+%if 0%{?suse_version} < 1310
     --disable-gtk \
 %endif
-    --debug=std ### debug=max removes -DNDEBUG from ffmpeg, leading to asserts aborting build...
+    --disable-fdk-aac \
+    --debug=max
 
 pushd build
-#### 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
-
+%__make %{?_smp_mflags}
+popd
 
 %install
-pushd build
-%__make install DESTDIR=%{buildroot}
-popd #build
+%makeinstall -C build
 
-if [ -e %{buildroot}%{_bindir}/ghb ]; then
-    %__ln_s ghb "%{buildroot}%{_bindir}/HandBrakeGUI"
-fi
+%if 0%{?suse_version} >= 1310
+%__ln_s ghb %{buildroot}%{_bindir}/HandBrakeGUI
 
 %suse_update_desktop_file -r ghb AudioVideo AudioVideoEditing
 
 # -f because it might not be there if built without gtk...
 %__rm -f "%{buildroot}%{_datadir}/icons"/*/*.cache
 
-## non-standard locales -- just remove to make rpmlint happy
-rm -fr %{buildroot}/usr/share/locale/{ja_JP,no,ro_RO}
-
-%clean
-%{?buildroot:%__rm -rf "%{buildroot}"}
+%find_lang ghb
+%endif
 
 %files cli
 %defattr(-,root,root)
 %doc AUTHORS COPYING CREDITS NEWS THANKS
 %{_bindir}/HandBrakeCLI
 
-%if 0%{?suse_version} > 1230
+%if 0%{?suse_version} >= 1310
 %files gtk
 %defattr(-,root,root)
 %doc AUTHORS COPYING CREDITS NEWS THANKS
@@ -219,7 +168,8 @@
 %{_bindir}/ghb
 %{_datadir}/applications/ghb.desktop
 %{_datadir}/icons/*/*/apps/hb-icon.*
-/usr/share/locale/*/LC_MESSAGES/ghb.mo
+
+%files -n handbrake-gtk-lang -f ghb.lang
 %endif
 
 %changelog

HandBrake-build-shared.patch Added

@@ -0,0 +1,53 @@
+--- gtk/configure.ac.orig	2016-01-09 12:16:52.898315042 +0100
++++ gtk/configure.ac	2016-01-09 12:16:52.918314661 +0100
+@@ -158,7 +158,7 @@
+ GHB_TOOLS_CFLAGS=`$BUILD_PKG_CONFIG --cflags glib-2.0 gdk-pixbuf-2.0`
+ GHB_TOOLS_LIBS=`$BUILD_PKG_CONFIG --libs glib-2.0 gdk-pixbuf-2.0`
+ 
+-HB_LIBS="-lhandbrake -lavresample -lavformat -lavcodec -lavutil -ldvdnav -ldvdread -lmp3lame -lvorbis -lvorbisenc -logg -lsamplerate -lx264 -lswscale -ltheoraenc -ltheoradec -lvpx -lz -lbz2 -lbluray -lass -lfontconfig -lfreetype -lxml2"
++HB_LIBS="-lhandbrake -lavresample -lavformat -lavcodec -lavutil -ldvdnav -ldvdread -lmp3lame -lvorbis -lvorbisenc -logg -lsamplerate -lx264 -lx265 -lswscale -ltheoraenc -ltheoradec -lvpx -lz -lbz2 -lbluray -lass -lfontconfig -lfreetype -lxml2"
+ 
+ case $host in
+   *-*-mingw*)
+--- make/include/main.defs.orig	2016-01-09 12:16:56.814240398 +0100
++++ make/include/main.defs	2016-01-09 14:51:54.590379620 +0100
+@@ -51,22 +51,18 @@
+     MODULES += contrib/libsamplerate
+     MODULES += contrib/lame
+     MODULES += contrib/x264
++    MODULES += contrib/x265
++    MODULES += contrib/ffmpeg
++    MODULES += contrib/libvpx
++    MODULES += contrib/libdvdread
++    MODULES += contrib/libdvdnav
++    MODULES += contrib/libbluray
+ endif
+ 
+ ifeq (1,$(FEATURE.fdk_aac))
+     MODULES += contrib/fdk-aac
+ endif
+ 
+-ifeq (1,$(FEATURE.x265))
+-    MODULES += contrib/x265
+-endif
+-
+-MODULES += contrib/ffmpeg
+-MODULES += contrib/libvpx
+-MODULES += contrib/libdvdread
+-MODULES += contrib/libdvdnav
+-MODULES += contrib/libbluray
+-
+ ifneq (,$(filter $(BUILD.system),mingw))
+ ifneq ($(HAS.pthread),1)
+     MODULES += contrib/pthreadw32
+--- test/module.defs.orig	2016-01-09 12:17:01.246155850 +0100
++++ test/module.defs	2016-01-09 12:17:01.258155621 +0100
+@@ -16,7 +16,7 @@
+ TEST.GCC.l = \
+         ass avcodec avformat avutil avresample dvdnav dvdread \
+         fontconfig fribidi mp3lame ogg \
+-        samplerate swscale vpx theoraenc theoradec vorbis vorbisenc x264 \
++        samplerate swscale vpx theoraenc theoradec vorbis vorbisenc x264 x265 \
+         bluray freetype xml2 bz2 z
+ 
+ ifeq (1,$(FEATURE.qsv))

handbrake-enable_local_fribidi.patch Deleted

libdvdnav-5.0.1-noreturninnonvoidfunction.patch Deleted

checkout.sh Deleted

cmake-3.0.1.tar.gz Deleted

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

handbrake-rpmlintrc Deleted

handbrake.ebuild Deleted

@@ -1,54 +0,0 @@
-# $Id: PKGBUILD 74053 2012-07-18 17:33:26Z foutrelis $
-# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Sebastien Piccand <sebcactus gmail com>
-
-pkgname=('handbrake' 'handbrake-cli')
-pkgver=0.9.8
-pkgrel=28
-arch=('i686' 'x86_64')
-url="http://handbrake.fr/"
-license=('GPL')
-makedepends=('intltool' 'python2' 'yasm' 'wget' 'bzip2' 'gcc-libs' 'libnotify'
-             'gstreamer0.10-base' 'gtk2' 'dbus-glib' 'fribidi')
-source=(http://downloads.sourceforge.net/project/handbrake/$pkgver/HandBrake-$pkgver.tar.bz2)
-
-build() {
-  cd "$srcdir/HandBrake-$pkgver"
-  mv "libhb/hb.h" "libhb/hb2.h"
-  
-  # Fix #include libhb
-  for file in $(grep -R '#include "hb.h"' * 2>/dev/null | awk -F':' '{print $1}'); do sed -i 's/#include\ \"hb\.h\"/#include\ \"hb2\.h\"/g' ${file}; done
-  # Use Python 2
-  sed -i 's/python /python2 /' gtk/src/Makefile.am
-
-  #disable harfbuzz
-  sed -i 's/--disable-png\ --disable-enca\ \\/--disable-png\ --disable-enca\ --disable-harfbuzz\ \\/g' "$srcdir/HandBrake-$pkgver/contrib/libass/module.defs"
-
-  ./configure --prefix=/usr --force --disable-gtk-update-checks
-  cd build
-  make
-}
-
-package_handbrake() {
-  pkgdesc="Multithreaded video transcoder"
-  depends=('bzip2' 'gcc-libs' 'gstreamer0.10-base' 'libnotify' 'dbus-glib'
-           'fribidi' 'gtk2' 'desktop-file-utils' 'hicolor-icon-theme')
-  install=$pkgname.install
-
-  cd "$srcdir/HandBrake-$pkgver/build"
-
-  make DESTDIR="$pkgdir" install
-  rm "$pkgdir/usr/bin/HandBrakeCLI"
-}
-
-package_handbrake-cli() {
-  pkgdesc="Multithreaded video transcoder (CLI)"
-  depends=('bzip2' 'gcc-libs' 'zlib' 'fribidi')
-
-  cd "$srcdir/HandBrake-$pkgver/build"
-  install -D HandBrakeCLI "$pkgdir/usr/bin/HandBrakeCLI"
-}
-
-# vim:set ts=2 sw=2 et:
-sha256sums=('dba75a9ff772e419c01d75532c1bf0d7253e73d7ead184eee755cd4c133dc798')

libav-v10.1.tar.bz2 Deleted

libbluray-0.5.0.tar.bz2 Deleted

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

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

libmfx-v2014.tar.bz2 Deleted

libvpx-v1.3.0.tar.bz2 Deleted

x265-9329-0d30d2641875-1.5.tar.bz2 Deleted

Overview

Request 2399 (accepted)

Request History