Request 2348 (accepted)

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Overview

Request 2348 (accepted)

Update to 1.2.0 now builds with regular ffmpeg. I've preserved your patches but none apply. See spec file comments for graphics magick problem.

Created by davepl over 9 years ago
In state accepted
Package maintainer: mantre

Submit transcode

Submit package home:davepl / transcode to package Multimedia / transcode

transcode.changes Changed

@@ -1,4 +1,42 @@
 -------------------------------------------------------------------
+Sat Dec 19 20:58:44 UTC 2015 - davejplater@gmail.com
+
+- Update to transcode-1.2.0
+- Upstream changes :
+  [+] Brand new export layer with new-style, separate encoders and
+      muxers.
+  [+] New encoders: theora, vorbis, faac, x264.
+  [+] New multiplexors: ogg, libavformat, yuv4mpeg2.
+  [+] New filter: barrel.
+  [+] ShoutCast support using ogg multiplexor.
+  [!] Fix crash when using transformations (-Z, -j).
+  [!] Fix compilation error with x264 version 78.
+  [*] Improved internal buffering system.
+  [*] Added basic A/V synchronization module.
+  [!] Fix misuse of configuration files which leads to crash.
+  [*] Allow to handle fallback directories for configuration files
+  [*] Improved debug messages handling and internal debug API.
+  [-] The import_imlist is deprecated. Use --multi_input -x im
+      instead.
+  [*] Big YAIT update by Allan Snider.
+  [!] Make the -W option work again like 1.0.x branch.
+  [*] Switch from ImageMagick to GraphicsMagick.
+  [*] Allow to build without FFmpeg.
+  [!] Remove outdated libav* information from the FAQ.
+  [+] Added support for CubicKeys4 and Sinc8 zoom algorithms.
+  [+] Added module registry to automatically select a module from
+      format
+  [+] Added `tccfgshow' to inspect the transcode internal
+      capabilities.
+  [-] Removed the unmantained PVM code.
+  [+] Added a special-crafted import module targeting webcams
+      using libv4l.
+  [*] Update the video stabilization plugins to version 0.61.
+  [*] Added the -X option to tcdecode (let the user specify the
+      acceleration)
+  [+] Enable versioned, parallel installation.
+
+-------------------------------------------------------------------
 Mon Aug 19 13:55:18 UTC 2013 - guillaume@opensuse.org
 
 - Fix ARM build

transcode.spec Changed

@@ -1,60 +1,90 @@
-# vim: set sw=4 ts=4 et:
-
+#
+# spec file for package transcode
+#
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# 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/
+#
+
+
+%define sversion %(echo %{version}|cut -b 1-3)
 Name:           transcode
-Version:        1.1.5
-Release:        100.pm.2
-
-Source:         http://download.berlios.de/tcforge/transcode-%{version}.tar.bz2
-Patch0:         transcode-fix-rpmlint.patch
-Patch1:         transcode-ffmpeg.diff
-Patch2:         transcode-configdir.patch
-BuildRoot:      %{_tmppath}/buildroot-%{name}-%{version}
-
+Version:        1.2.0
+Release:        0
 Summary:        A linux video stream processing utility
 Summary(de):    Das Schweizer Taschenmesser der Videobearbeitung
-License:        GPL
+License:        GPL-2.0+
 Group:          Productivity/Multimedia/Other
-
-URL:            http://tcforge.berlios.de
-BuildRoot:      %{_tmppath}/buildroot-%{name}-%{version}
-
-%if %suse_version < 1130
-BuildRequires:  gtk-devel
-BuildRequires:  glib-devel
-%endif
-BuildRequires:  libfaac-devel
-BuildRequires:  lzo-devel >= 2.01
-BuildRequires:  nasm >= 0.98.35
-BuildRequires:  libdvdread-devel
-BuildRequires:  libogg-devel
-BuildRequires:  libxml2-devel
-BuildRequires:  libquicktime-devel >= 0.9.3
-BuildRequires:  libfame-0_9-1
-BuildRequires:  libfame-devel
+Url:            https://bitbucket.org/achurch_/transcode/wiki/Home
+Source:         transcode-%{version}.tar.bz2
+# Doesn't apply.
+Patch0:         transcode-fix-rpmlint.patch
+Patch1:         transcode-ffmpeg.diff
+Patch2:         transcode-configdir.patch
+BuildRequires:  SDL-devel
 BuildRequires:  aalib-devel
-BuildRequires:  ImageMagick-devel
+BuildRequires:  autoconf
+BuildRequires:  automake
+BuildRequires:  ffmpeg-devel
+BuildRequires:  gcc-c++
 BuildRequires:  liba52-devel
-BuildRequires:  freetype2-devel
-BuildRequires:  pvm-devel
-BuildRequires:  mjpegtools
-BuildRequires:  SDL-devel
-BuildRequires:  libtheora-devel
-BuildRequires:  libsndfile-devel
-BuildRequires:  libffmpeg_oldabi-devel
-BuildRequires:  lzo
+BuildRequires:  libfaac-devel
+BuildRequires:  libfame-devel
+BuildRequires:  libjpeg-devel
+BuildRequires:  libmp3lame-devel
 BuildRequires:  libmpeg2-devel
+BuildRequires:  libtool
 BuildRequires:  libvorbis
-BuildRequires:  libvorbis-devel
-#BuildRequires: libmpeg3-devel
-BuildRequires:  pkgconfig(mjpegtools)
-BuildRequires:  gcc-c++
+#BuildRequires:  GraphicsMagick-devel
+BuildRequires:  libx264-devel
+BuildRequires:  libv4l-devel
+BuildRequires:  libxvidcore-devel
+BuildRequires:  xorg-x11-devel
+BuildRequires:  lzo
+BuildRequires:  lzo-devel >= 2.01
+BuildRequires:  mjpegtools
+BuildRequires:  nasm >= 0.98.35
 BuildRequires:  pkgconfig
-BuildRequires:  libvdpau-devel
-BuildRequires:  libdv-devel
-BuildRequires:  libjpeg-devel
-BuildRequires:  autoconf
-BuildRequires:  automake
-BuildRequires:  libtool
+BuildRequires:  pvm-devel
+BuildRequires:  pkgconfig(alsa)
+BuildRequires:  pkgconfig(GraphicsMagick)
+#BuildRequires:  pkgconfig(ImageMagick)
+#BuildRequires:  pkgconfig(ImageMagick-6.Q16)
+#BuildRequires:  pkgconfig(MagickCore)
+#BuildRequires:  pkgconfig(MagickCore-6.Q16)
+BuildRequires:  pkgconfig(GraphicsMagickWand)
+#BuildRequires:  pkgconfig(MagickWand-6.Q16)
+#BuildRequires:  pkgconfig(Wand)
+#BuildRequires:  pkgconfig(Wand-6.Q16)
+BuildRequires:  pkgconfig(dvdread)
+BuildRequires:  pkgconfig(freetype2)
+BuildRequires:  pkgconfig(libdv)
+BuildRequires:  pkgconfig(libquicktime) >= 0.9.3
+BuildRequires:  pkgconfig(libxml-2.0)
+BuildRequires:  pkgconfig(mjpegtools)
+BuildRequires:  pkgconfig(ogg)
+BuildRequires:  pkgconfig(sndfile)
+BuildRequires:  pkgconfig(theora)
+BuildRequires:  pkgconfig(theoradec)
+BuildRequires:  pkgconfig(theoraenc)
+BuildRequires:  pkgconfig(vdpau)
+BuildRequires:  pkgconfig(vorbis)
+BuildRequires:  pkgconfig(vorbisenc)
+BuildRequires:  pkgconfig(vorbisfile)
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+%if 0%{?suse_version} < 1130
+BuildRequires:  glib-devel
+BuildRequires:  gtk-devel
+%endif
 
 %description
 transcode is a text-console video stream processing tool. Decoding and encoding
@@ -67,84 +97,69 @@
 and decode the sources into raw video/audio streams for import and to enable
 post-processing of AVI files.
 
-
-
-
-Authors:
---------
-    Thomas Östreich (ostreich@theorie.physik.uni-goettingen.de)
-
 %description -l de
 Videokonverter mit sehr vielen input/output und filter plugins, kann auch zum
 encodieren von dvd's genutzt werden.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2
-%__perl -ne 'print $1,"\n" if /^\+{3}\s+(.+?)\s+/' <"%{PATCH2}" | while read f; do
-    %__sed -i 's|@@CONFIGDIR@@|%{_libdir}/transcode|g' "$f"
+#%%patch0 -p1
+#%%patch1 -p1
+#%%patch2
+# NOTE: Left this intact but the config file method has changed, not quite sure what this fixes.
+# had to append || true because it passes on local build but fails in obs.
+perl -ne 'print $1,"\n" if /^\+{3}\s+(.+?)\s+/' <"%{PATCH2}" | while read f; do
+    sed -i 's|@@CONFIGDIR@@|%{_libdir}/transcode|g' "$f" || true
 done
+echo %{sversion}
 
 %build
+export CFLAGS="%{optflags} -isystem %{_includedir}/ffmpeg/"
+export CPPFLAGS="%{optflags} -isystem %{_includedir}/ffmpeg/"
+export LDFLAGS=" -L%{_libdir} `glib-config --libs`"
 autoreconf -ifv
 
 # --enable-ibp --enable-pv3  --enable-bsdav
-CFLAGS="$RPM_OPT_FLAGS" CPPFLAGS="$RPM_OPT_FLAGS"  LDFLAGS=" -L%{_libdir} `glib-config --libs`" ./configure \
-        --prefix=%{_prefix} --mandir=%{_mandir} --libdir=%{_libdir} \
-    --with-mod-path=%{_libdir}/transcode \
+# NOTE: The build fails with graphicsmagick in obs but passes on my Leap42.1 machine.
+#    --enable-graphicsmagick \
+%configure --docdir=%{_docdir} \
     --enable-libavcodec --enable-libavformat \
-    --enable-v4l --enable-oss --enable-alsa \
-    --disable-libpostproc \
+    --enable-libv4l2 --enable-libv4lconvert --enable-oss --enable-alsa \
+    --enable-libpostproc --enable-v4l \
     --enable-freetype2 --enable-lame --enable-xvid --enable-x264 \
-    --enable-ogg --enable-vorbis --enable-theora \
-%ifarch x86_64 amd64 ia32e
-    --enable-pvm3  --with-pvm3-libs=/usr/lib/pvm3/lib/LINUX64 \
-%else
-%ifarch ppc
-    --enable-pvm3  --with-pvm3-libs=/usr/lib/pvm3/lib/LINUXPPC \
-%else
-%ifarch %arm
-    --enable-pvm3  --with-pvm3-libs=/usr/lib/pvm3/lib/LINUXARM \
-%else
-    --enable-pvm3  --with-pvm3-libs=%{_libdir}/pvm3/lib/LINUX \
-%endif
-%endif
-%endif
+    --enable-ogg --enable-vorbis --enable-vorbisenc --enable-theora \
     --enable-libdvdread --enable-libdv --enable-libquicktime \
-    --enable-lzo --with-lzo-includes=%_includedir/lzo \
+    --enable-lzo --with-lzo-includes=%{_includedir}/lzo \
     --enable-a52 --enable-faac --enable-libxml2 \
-    --enable-mjpegtools --enable-sdl --enable-imagemagick \
-%ifarch %{ix86} x86_64
+    --enable-mjpegtools --enable-sdl \
+%ifarch %ix86 x86_64
     --enable-nuv \
 %endif
     --enable-libmpeg2 --enable-libmpeg2convert \
     --enable-libjpeg --enable-iconv --enable-deprecated
 
-%__make %{?jobs:-j%{jobs}}
+make %{?_smp_mflags}
 
 %install
-%makeinstall
-
-%__rm "%{buildroot}%{_libdir}/transcode"/*.la
+make DESTDIR=%{buildroot} install %{?_smp_mflags}
 
-%{__rm} -rf %{buildroot}%{_datadir}/doc/transcode
-%{__rm} -rf %{buildroot}%{_datadir}/doc/packages/%{name}/man docs/man
-%{__rm} -f %{buildroot}%{_bindir}/pvmgs
-find docs/ -name 'Makefile*' -exec %__rm {} \;
-%{__rm} -f docs/tcmkmodhelp.py
-%{__rm} -f docs/make-filter-man.sh
-%{__rm} -f docs/make-import-man.sh
+find %{buildroot} -type f -name "*.la" -delete -print
 
-%clean
-%{?buildroot:%__rm -rf "%{buildroot}"}
+rm -rf %{buildroot}%{_datadir}/doc/%{name}-%{sversion}
+rm -rf %{buildroot}%{_docdir}/%{name}/man docs/man
+rm -f %{buildroot}%{_bindir}/pvmgs
+find docs/ -name 'Makefile*' -print -delete
+rm -f docs/tcmkmodhelp.py
+rm -f docs/make-filter-man.sh
+rm -f docs/make-import-man.sh
+find docs/ -name tcindent.sh -print -exec chmod 0644 {} \;
 
 %files
 %defattr(-,root,root)
 %{_bindir}/*
-%{_libdir}/%{name}
+%{_libdir}/%{name}-%{sversion}/
 %{_mandir}/man*/*
+%{_datadir}/%{name}-%{sversion}/
 %doc AUTHORS COPYING ChangeLog README TODO docs/*
 
 %changelog

transcode-1.1.5.tar.bz2 -> transcode-1.2.0.tar.bz2 Changed

Build Results
RPM Lint

Refresh

Comments for request 2348 0

Request History

davepl created request over 9 years ago

Update to 1.2.0 now builds with regular ffmpeg. I've preserved your patches but none apply. See spec file comments for graphics magick problem.

olh declined request over 9 years ago

Please use pkgconfig(libav*|libsw*|libpostproc) as needed.

davepl reopened request over 9 years ago

olh accepted request over 9 years ago