Request 2353 (accepted)

transcode.changes Changed

transcode.spec Changed

@@ -16,6 +16,7 @@
 #
 
 
+%bcond_without graphicsmagic
 %define sversion %(echo %{version}|cut -b 1-3)
 Name:           transcode
 Version:        1.2.0
@@ -26,65 +27,55 @@
 Group:          Productivity/Multimedia/Other
 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
+Patch0:         transcode-cflags.patch
 BuildRequires:  aalib-devel
 BuildRequires:  autoconf
 BuildRequires:  automake
-BuildRequires:  ffmpeg-devel
 BuildRequires:  gcc-c++
-BuildRequires:  liba52-devel
+BuildRequires:  libtool
+BuildRequires:  pkg-config
+#
 BuildRequires:  libfaac-devel
-BuildRequires:  libfame-devel
 BuildRequires:  libjpeg-devel
 BuildRequires:  libmp3lame-devel
-BuildRequires:  libmpeg2-devel
-BuildRequires:  libtool
-BuildRequires:  libvorbis
-#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:  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:  xorg-x11-devel
+BuildRequires:  zlib-devel
+%if %{with graphicsmagic}
+%if %{suse_version} < 1315
+# devel pkg lacks dependency on main pkg
+BuildRequires:  libGraphicsMagickWand2
+%endif
 BuildRequires:  pkgconfig(GraphicsMagickWand)
-#BuildRequires:  pkgconfig(MagickWand-6.Q16)
-#BuildRequires:  pkgconfig(Wand)
-#BuildRequires:  pkgconfig(Wand-6.Q16)
+%endif
+BuildRequires:  pkgconfig(liba52)
+BuildRequires:  pkgconfig(alsa)
 BuildRequires:  pkgconfig(dvdread)
 BuildRequires:  pkgconfig(freetype2)
+BuildRequires:  pkgconfig(libavcodec)
+BuildRequires:  pkgconfig(libavformat)
+BuildRequires:  pkgconfig(libavutil)
 BuildRequires:  pkgconfig(libdv)
-BuildRequires:  pkgconfig(libquicktime) >= 0.9.3
+BuildRequires:  pkgconfig(libmpeg2)
+BuildRequires:  pkgconfig(libmpeg2convert)
+BuildRequires:  pkgconfig(libpostproc)
+BuildRequires:  pkgconfig(libquicktime)
+BuildRequires:  pkgconfig(libv4l2)
+BuildRequires:  pkgconfig(libv4lconvert)
 BuildRequires:  pkgconfig(libxml-2.0)
 BuildRequires:  pkgconfig(mjpegtools)
 BuildRequires:  pkgconfig(ogg)
-BuildRequires:  pkgconfig(sndfile)
+BuildRequires:  pkgconfig(sdl)
+BuildRequires:  pkgconfig(shout)
 BuildRequires:  pkgconfig(theora)
-BuildRequires:  pkgconfig(theoradec)
-BuildRequires:  pkgconfig(theoraenc)
-BuildRequires:  pkgconfig(vdpau)
 BuildRequires:  pkgconfig(vorbis)
 BuildRequires:  pkgconfig(vorbisenc)
-BuildRequires:  pkgconfig(vorbisfile)
+BuildRequires:  pkgconfig(x264)
+#
 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
@@ -103,26 +94,17 @@
 
 %prep
 %setup -q
-#%%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
+%patch0 -p1
 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
-# NOTE: The build fails with graphicsmagick in obs but passes on my Leap42.1 machine.
-#    --enable-graphicsmagick \
 %configure --docdir=%{_docdir} \
+%if %{with graphicsmagic}
+    --enable-graphicsmagick \
+%endif
+    --enable-shout \
     --enable-libavcodec --enable-libavformat \
     --enable-libv4l2 --enable-libv4lconvert --enable-oss --enable-alsa \
     --enable-libpostproc --enable-v4l \

transcode-cflags.patch Added

@@ -0,0 +1,83 @@
+---
+ configure.in         |    4 ++++
+ import/Makefile.am   |   16 ++++++++--------
+ libtcext/Makefile.am |    1 +
+ 3 files changed, 13 insertions(+), 8 deletions(-)
+
+Index: transcode-1.2.0/configure.in
+===================================================================
+--- transcode-1.2.0.orig/configure.in
++++ transcode-1.2.0/configure.in
+@@ -687,6 +687,10 @@ else
+   AC_SUBST(LIBAVFORMAT_LIBS)
+ 
+   AC_DEFINE([HAVE_FFMPEG], 1, [Have FFmpeg libraries support])
++  TC_PKG_CHECK(libavutil, optional, LIBAVUTIL, no, none,
++   none, '', libavutil, [http://www.ffmpeg.org/])
++  AC_SUBST(LIBAVUTIL_CFLAGS)
++  AC_SUBST(LIBAVUTIL_LIBS)
+ 
+ fi
+ AM_CONDITIONAL(HAVE_FFMPEG, test x"$enable_ffmpeg" = x"yes")
+Index: transcode-1.2.0/import/Makefile.am
+===================================================================
+--- transcode-1.2.0.orig/import/Makefile.am
++++ transcode-1.2.0/import/Makefile.am
+@@ -338,6 +338,10 @@ tcdecode@TC_VERSUFFIX@_SOURCES = \
+ 	decode_yuv.c
+ 
+ tcdecode@TC_VERSUFFIX@_LDADD = \
++	$(LIBTCVIDEO_LIBS) \
++	$(LIBTCEXT_LIBS) \
++	$(LIBTCUTIL_LIBS) \
++	$(LIBTC_LIBS) \
+ 	$(GRAPHICSMAGICK_LIBS) \
+ 	$(LIBAVCODEC_LIBS) \
+ 	$(LIBDV_LIBS) \
+@@ -352,11 +356,7 @@ tcdecode@TC_VERSUFFIX@_LDADD = \
+ 	$(VORBISFILE) \
+ 	$(XIO_LIBS) \
+ 	$(DLDARWIN_LIBS) \
+-	$(LIBTCVIDEO_LIBS) \
+ 	$(ACLIB_LIBS) \
+-	$(LIBTC_LIBS) \
+-	$(LIBTCEXT_LIBS) \
+-	$(LIBTCUTIL_LIBS) \
+ 	$(PTHREAD_LIBS)
+ 
+ tcdecode@TC_VERSUFFIX@_CFLAGS = $(AM_CFLAGS) \
+@@ -490,6 +490,10 @@ tcprobe@TC_VERSUFFIX@_SOURCES = \
+ 	probe_pvn.c
+ 
+ tcprobe@TC_VERSUFFIX@_LDADD = \
++	$(LIBTCVIDEO_LIBS) \
++	$(LIBTC_LIBS) \
++	$(LIBTCEXT_LIBS) \
++	$(LIBTCUTIL_LIBS) \
+ 	$(LIBAVFORMAT_LIBS) \
+ 	$(LIBAVCODEC_LIBS) \
+ 	$(AVILIB_LIBS) \
+@@ -508,11 +512,7 @@ tcprobe@TC_VERSUFFIX@_LDADD = \
+ 	$(BSDAV_LIBS) \
+ 	$(X11SOURCE_LIBS) \
+ 	$(DLDARWIN_LIBS) \
+-	$(LIBTCVIDEO_LIBS) \
+ 	$(ACLIB_LIBS) \
+-	$(LIBTC_LIBS) \
+-	$(LIBTCEXT_LIBS) \
+-	$(LIBTCUTIL_LIBS) \
+ 	$(PTHREAD_LIBS) \
+ 	-lm
+ 
+Index: transcode-1.2.0/libtcext/Makefile.am
+===================================================================
+--- transcode-1.2.0.orig/libtcext/Makefile.am
++++ transcode-1.2.0/libtcext/Makefile.am
+@@ -2,6 +2,7 @@
+ 
+ AM_CPPFLAGS = \
+ 	$(PTHREAD_CFLAGS) \
++	$(LIBAVUTIL_CFLAGS) \
+ 	$(GRAPHICSMAGICK_CFLAGS) \
+ 	-I$(top_srcdir) \
+ 	-I$(top_srcdir)/src \

transcode-configdir.patch Deleted

transcode-ffmpeg.diff Deleted

@@ -1,64 +0,0 @@
-diff -ur transcode-1.1.5.orig/export/aud_aux.c transcode-1.1.5/export/aud_aux.c
---- transcode-1.1.5.orig/export/aud_aux.c	2009-07-18 13:56:04.000000000 +0200
-+++ transcode-1.1.5/export/aud_aux.c	2013-08-01 20:10:36.917726994 +0200
-@@ -46,6 +46,8 @@
- 
- #ifdef HAVE_FFMPEG
- #include "libtc/tcavcodec.h"
-+#include "libavcodec/avcodec.h"
-+#include "libavutil/mathematics.h"
- 
- 
- static AVCodec        *mpa_codec = NULL;
-@@ -346,7 +348,8 @@
- 
-     //-- set parameters (bitrate, channels and sample-rate) --
-     //--------------------------------------------------------
--    memset(&mpa_ctx, 0, sizeof(mpa_ctx));          // default all
-+    //memset(&mpa_ctx, 0, sizeof(mpa_ctx));          // default all
-+    avcodec_get_context_defaults(&mpa_ctx); // default all
-     mpa_ctx.bit_rate    = vob->mp3bitrate * 1000;  // bitrate dest.
-     mpa_ctx.channels    = vob->dm_chan;            // channels
-     mpa_ctx.sample_rate = vob->a_rate;
-diff -ur transcode-1.1.5.orig/export/export_ffmpeg.c transcode-1.1.5/export/export_ffmpeg.c
---- transcode-1.1.5.orig/export/export_ffmpeg.c	2009-02-21 22:01:57.000000000 +0100
-+++ transcode-1.1.5/export/export_ffmpeg.c	2013-08-01 20:11:47.596879027 +0200
-@@ -668,7 +668,7 @@
-     lavc_venc_context->rc_qsquish         = lavc_param_rc_qsquish;
-     lavc_venc_context->rc_qmod_amp        = lavc_param_rc_qmod_amp;
-     lavc_venc_context->rc_qmod_freq       = lavc_param_rc_qmod_freq;
--    lavc_venc_context->rc_eq              = lavc_param_rc_eq;
-+    lavc_venc_context->rc_eq              = av_strdup(lavc_param_rc_eq);
-     lavc_venc_context->rc_max_rate        = lavc_param_rc_max_rate * 1000;
-     lavc_venc_context->rc_min_rate        = lavc_param_rc_min_rate * 1000;
-     lavc_venc_context->rc_buffer_size     = lavc_param_rc_buffer_size * 1024;
-diff -ur transcode-1.1.5.orig/import/Makefile.am transcode-1.1.5/import/Makefile.am
---- transcode-1.1.5.orig/import/Makefile.am	2009-10-31 18:02:08.000000000 +0100
-+++ transcode-1.1.5/import/Makefile.am	2013-08-01 20:10:36.917726994 +0200
-@@ -143,9 +143,9 @@
- import_dvd_la_LIBADD = $(LIBDVDREAD_LIBS)
- 
- import_ffmpeg_la_SOURCES = import_ffmpeg.c
--import_ffmpeg_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBAVFORMAT_CFLAGS)
-+import_ffmpeg_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBAVFORMAT_CFLAGS) $(LIBAVCODEC_CFLAGS)
- import_ffmpeg_la_LDFLAGS = -module -avoid-version
--import_ffmpeg_la_LIBADD = $(LIBAVFORMAT_LIBS)
-+import_ffmpeg_la_LIBADD = $(LIBAVFORMAT_LIBS) $(LIBAVCODEC_LIBS)
- 
- import_im_la_SOURCES = import_im.c
- import_im_la_CPPFLAGS = $(AM_CPPFLAGS) $(IMAGEMAGICK_CFLAGS)
-diff -ur transcode-1.1.5.orig/import/Makefile.in transcode-1.1.5/import/Makefile.in
---- transcode-1.1.5.orig/import/Makefile.in	2009-10-31 18:41:01.000000000 +0100
-+++ transcode-1.1.5/import/Makefile.in	2013-08-01 20:10:36.920726914 +0200
-@@ -753,9 +753,9 @@
- import_dvd_la_LDFLAGS = -module -avoid-version
- import_dvd_la_LIBADD = $(LIBDVDREAD_LIBS)
- import_ffmpeg_la_SOURCES = import_ffmpeg.c
--import_ffmpeg_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBAVFORMAT_CFLAGS)
-+import_ffmpeg_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBAVFORMAT_CFLAGS) $(LIBAVCODEC_CFLAGS)
- import_ffmpeg_la_LDFLAGS = -module -avoid-version
--import_ffmpeg_la_LIBADD = $(LIBAVFORMAT_LIBS)
-+import_ffmpeg_la_LIBADD = $(LIBAVFORMAT_LIBS) $(LIBAVCODEC_LIBS)
- import_im_la_SOURCES = import_im.c
- import_im_la_CPPFLAGS = $(AM_CPPFLAGS) $(IMAGEMAGICK_CFLAGS)
- import_im_la_LDFLAGS = -module -avoid-version

transcode-fix-rpmlint.patch Deleted

Overview

Request 2353 (accepted)

Request History