Packman Build Service PMBS

transcode.spec Changed

@@ -58,33 +58,27 @@
 Summary(de):    Das Schweizer Taschenmesser der Videobearbeitung
 License:        GPL-2.0+
 Group:          Productivity/Multimedia/Other
-Url:            https://bitbucket.org/france/transcode-tcforge/overview
+Url:            https://lmgtfy.com/?q=transcode
 Source:         %{name}-%{version}.tar.bz2
 Source2:        export_dvraw.c
-# Fix 64 bit portability issue in export_ffmpeg.c
-Patch1:         transcode-fix-64bit-portability.patch
-Patch2:         transcode.ImageMagick-API.patch
-Patch3:         transcode.a52.patch
-# http://article.gmane.org/gmane.comp.video.transcode.user/18434
-# http://article.gmane.org/gmane.comp.video.transcode.user/18381
-# http://article.gmane.org/gmane.comp.video.transcode.user/18446
-# Gentoo
 Patch0:         transcode-export_ffmpeg.patch
-Patch10:        transcode-1.1.7-ffmpeg.patch
-Patch11:        transcode-1.1.7-ffmpeg-0.10.patch
-Patch12:        transcode-1.1.7-ffmpeg-0.11.patch
-Patch13:        transcode-1.1.7-preset-free.patch
-Patch14:        transcode-1.1.7-libav-9.patch
-Patch15:        transcode-1.1.7-preset-force.patch
-Patch16:        transcode-1.1.7-ffmpeg2.patch
-Patch17:        transcode-1.1.7-freetype251.patch
-# ALTLinux patches
-Patch18:        transcode-1.1.7-libav-10.patch
-Patch98:        transcode-1.1.5-textrel.patch
-# From Gentoo for ffmpeg-4
-Patch20:        transcode-1.1.7-ffmpeg29.patch
-Patch19:        ffmpeg4.patch
-Patch30:        transcode-gcc10.patch
+Patch1:         transcode-1.1.7-ffmpeg.patch
+Patch2:         transcode-1.1.7-ffmpeg-0.10.patch
+Patch3:         transcode-1.1.7-ffmpeg-0.11.patch
+Patch4:         transcode-1.1.7-preset-free.patch
+Patch5:         transcode-1.1.7-libav-9.patch
+Patch6:         transcode-1.1.7-preset-force.patch
+Patch7:         transcode-1.1.7-ffmpeg2.patch
+Patch8:         transcode-1.1.7-freetype251.patch
+Patch9:         transcode-1.1.7-libav-10.patch
+Patch10:        transcode-1.1.5-textrel.patch
+Patch11:        transcode-fix-64bit-portability.patch
+Patch12:        transcode.ImageMagick-API.patch
+Patch13:        transcode.a52.patch
+Patch14:        transcode-1.1.7-ffmpeg29.patch
+Patch15:        ffmpeg4.patch
+Patch16:        transcode-gcc10.patch
+Patch17:        transcode.patch
 BuildRequires:  libtool
 BuildRequires:  faac-devel
 BuildRequires:  glibc-devel
@@ -168,36 +162,16 @@
 encodieren von dvd's genutzt werden.
 
 %prep
-%setup -q -n %{name}-%{version}%{subver}
-#
-install -m644 %{SOURCE2} filter/
-%patch0
-%patch10
-%patch11
-%patch12
-%patch13
-%patch14
-%patch15
-%patch16 -p1
-%patch17 -p1
-#
-%patch18 -p1
-%patch98 -p2
-#
-%patch1
-%patch2 -p1
-%patch3 -p1
-%patch20 -p0
-%patch19 -p0
-
-%patch30 -p1
+%autosetup -p1 -n %{name}-%{version}%{subver}
 
 %build
+install -m644 %{SOURCE2} filter/
+#
 test -x "$(type -p gcc)"   && export CC="$_"
 test -x "$(type -p gcc-7)" && export CC="$_"
 test -x "$(type -p gcc-8)" && export CC="$_"
 autoreconf -fi
-CFLAGS="%{optflags} -Wno-implicit-function-declaration -Werror=int-conversion"
+CFLAGS="%{optflags} -Werror=implicit-function-declaration -Werror=int-conversion"
 %configure --enable-experimental \
      --enable-deprecated \
      --disable-x86-textrels \
@@ -249,10 +223,10 @@
      --enable-faac
 #
 
-make %{?_smp_mflags}
+%make_build
 
 %install
-make DESTDIR=%{buildroot} install %{?_smp_mflags}
+%make_install
 
 find %{buildroot} -type f -name "*.la" -delete -print

ffmpeg4.patch Changed

@@ -1,7 +1,5 @@
-Index: encode/encode_lavc.c
-===================================================================
---- encode/encode_lavc.c.orig	2019-02-15 10:14:35.479739977 +0200
-+++ encode/encode_lavc.c	2019-02-15 10:20:22.394123390 +0200
+--- a/encode/encode_lavc.c
++++ b/encode/encode_lavc.c
 @@ -77,6 +77,13 @@ struct tclavcconfigdata_ {
      int luma_elim_threshold;
      int chroma_elim_threshold;
@@ -260,10 +258,8 @@
      
          //  { "turbo", PAUX(turbo_setup), TCCONF_TYPE_FLAG, 0, 0, 1 }, // not yet  supported
          /* End of the config file */
-Index: export/export_ffmpeg.c
-===================================================================
---- export/export_ffmpeg.c.orig	2019-02-15 10:14:35.479739977 +0200
-+++ export/export_ffmpeg.c	2019-02-15 10:20:22.398123553 +0200
+--- a/export/export_ffmpeg.c
++++ b/export/export_ffmpeg.c
 @@ -833,14 +833,11 @@ MOD_init
  
      lavc_venc_context->bit_rate           = vob->divxbitrate * 1000;
@@ -392,10 +388,8 @@
  
  	/* FIXME: transcode itself contains "broken ffmpeg default settings", thus we need to override them! */
  	if (lavc_param_video_preset && strcmp(lavc_param_video_preset, "none")) {
-Index: export/ffmpeg_cfg.c
-===================================================================
---- export/ffmpeg_cfg.c.orig	2019-02-15 10:14:35.479739977 +0200
-+++ export/ffmpeg_cfg.c	2019-02-15 10:20:22.398123553 +0200
+--- a/export/ffmpeg_cfg.c
++++ b/export/ffmpeg_cfg.c
 @@ -93,8 +93,8 @@ int lavc_param_last_pred= 0;
  int lavc_param_pre_me= 1;
  int lavc_param_me_subpel_quality= 8;
@@ -493,10 +487,8 @@
      {"intra_dc_precision", &lavc_param_intra_dc_precision, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 16},
      {"skip_top", &lavc_param_skip_top, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000},
      {"skip_bottom", &lavc_param_skip_bottom, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000},
-Index: import/import_ffmpeg.c
-===================================================================
---- import/import_ffmpeg.c.orig	2019-02-15 10:14:35.479739977 +0200
-+++ import/import_ffmpeg.c	2019-02-15 10:20:22.398123553 +0200
+--- a/import/import_ffmpeg.c
++++ b/import/import_ffmpeg.c
 @@ -310,7 +310,7 @@ do_avi:
      lavc_dec_context->width  = x_dim;
      lavc_dec_context->height = y_dim;

transcode-1.1.5-textrel.patch Changed

transcode-1.1.7-ffmpeg-0.10.patch Changed

transcode-1.1.7-ffmpeg-0.11.patch Changed

@@ -1,7 +1,5 @@
-Index: encode/encode_lavc.c
-===================================================================
---- encode/encode_lavc.c.orig
-+++ encode/encode_lavc.c
+--- a/encode/encode_lavc.c
++++ b/encode/encode_lavc.c
 @@ -114,6 +114,7 @@ struct tclavcprivatedata_ {
  
      AVFrame ff_venc_frame;
@@ -90,10 +88,8 @@
          goto failed;
      }
      /* finally, pass up the extradata, if any */
-Index: export/export_ffmpeg.c
-===================================================================
---- export/export_ffmpeg.c.orig
-+++ export/export_ffmpeg.c
+--- a/export/export_ffmpeg.c
++++ b/export/export_ffmpeg.c
 @@ -122,6 +122,7 @@ static uint8_t             *img_buffer =
  static AVFrame             *lavc_convert_frame = NULL;
  
@@ -213,10 +209,8 @@
        return TC_EXPORT_ERROR;
      }
  
-Index: export/ffmpeg_cfg.c
-===================================================================
---- export/ffmpeg_cfg.c.orig
-+++ export/ffmpeg_cfg.c
+--- a/export/ffmpeg_cfg.c
++++ b/export/ffmpeg_cfg.c
 @@ -156,9 +156,9 @@ TCConfigEntry lavcopts_conf[]={
      {"vcelim", &lavc_param_chroma_elim_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99},
      {"vpsize", &lavc_param_packet_size, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 100000000},
@@ -251,10 +245,8 @@
      {"ilme", &lavc_param_ilme, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME},
      {"inter_threshold", &lavc_param_inter_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000},
      {"sc_threshold", &lavc_param_sc_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000},
-Index: import/decode_lavc.c
-===================================================================
---- import/decode_lavc.c.orig
-+++ import/decode_lavc.c
+--- a/import/decode_lavc.c
++++ b/import/decode_lavc.c
 @@ -181,7 +181,7 @@ void decode_lavc(decode_t *decode)
  #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
    lavc_dec_context->error_resilience  = 2;
@@ -264,10 +256,8 @@
  #endif
    lavc_dec_context->error_concealment = 3;
    lavc_dec_context->workaround_bugs = FF_BUG_AUTODETECT;
-Index: import/import_ffmpeg.c
-===================================================================
---- import/import_ffmpeg.c.orig
-+++ import/import_ffmpeg.c
+--- a/import/import_ffmpeg.c
++++ b/import/import_ffmpeg.c
 @@ -314,7 +314,7 @@ do_avi:
  #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
      lavc_dec_context->error_resilience  = 2;
@@ -277,10 +267,8 @@
  #endif
      lavc_dec_context->error_concealment = 3;
      lavc_dec_context->workaround_bugs = FF_BUG_AUTODETECT;
-Index: import/probe_ffmpeg.c
-===================================================================
---- import/probe_ffmpeg.c.orig
-+++ import/probe_ffmpeg.c
+--- a/import/probe_ffmpeg.c
++++ b/import/probe_ffmpeg.c
 @@ -99,8 +99,8 @@ void probe_ffmpeg(info_t *ipipe)
  
      TC_INIT_LIBAVCODEC;
@@ -292,10 +280,8 @@
      if (ret != 0) {
          tc_log_error(__FILE__, "unable to open '%s'"
                                 " (libavformat failure)",
-Index: libtc/tcavcodec.h
-===================================================================
---- libtc/tcavcodec.h.orig
-+++ libtc/tcavcodec.h
+--- a/libtc/tcavcodec.h
++++ b/libtc/tcavcodec.h
 @@ -53,7 +53,6 @@ extern pthread_mutex_t tc_libavcodec_mut
  
  #define TC_INIT_LIBAVCODEC do { \

transcode-1.1.7-ffmpeg.patch Changed

@@ -1,6 +1,6 @@
---- encode/encode_lavc.c
-+++ encode/encode_lavc.c
-@@ -955,8 +955,6 @@
+--- a/encode/encode_lavc.c
++++ b/encode/encode_lavc.c
+@@ -955,8 +955,6 @@ static void tc_lavc_config_defaults(TCLa
      /* 
       * context *transcode* (not libavcodec) defaults
       */
@@ -9,7 +9,7 @@
      pd->ff_vcontext.max_qdiff               = 3;
      pd->ff_vcontext.max_b_frames            = 0;
      pd->ff_vcontext.me_range                = 0;
-@@ -1116,8 +1114,6 @@
+@@ -1116,8 +1114,6 @@ static int tc_lavc_read_config(TCLavcPri
          //  handled by transcode core
          //  { "vqmax", PCTX(qmax), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 60 },
          //  handled by transcode core
@@ -18,9 +18,9 @@
          { "lmin", PAUX(lmin), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0 },
          { "lmax", PAUX(lmax), TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0 },
          { "vqdiff", PCTX(max_qdiff), TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31 },
---- export/ffmpeg_cfg.c
-+++ export/ffmpeg_cfg.c
-@@ -34,8 +34,6 @@
+--- a/export/ffmpeg_cfg.c
++++ b/export/ffmpeg_cfg.c
+@@ -34,8 +34,6 @@ int lavc_param_vme = 4;
  //int lavc_param_vqscale = 0;
  //int lavc_param_vqmin = 2;
  //int lavc_param_vqmax = 31;
@@ -29,7 +29,7 @@
  int lavc_param_lmin = 2;
  int lavc_param_lmax = 31;
  int lavc_param_vqdiff = 3;
-@@ -143,8 +141,6 @@
+@@ -143,8 +141,6 @@ TCConfigEntry lavcopts_conf[]={
  //    {"vqscale", &lavc_param_vqscale, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
  //    {"vqmin", &lavc_param_vqmin, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
  //    {"vqmax", &lavc_param_vqmax, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
@@ -38,9 +38,9 @@
      {"lmin", &lavc_param_lmin, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0},
      {"lmax", &lavc_param_lmax, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.01, 255.0},
      {"vqdiff", &lavc_param_vqdiff, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 31},
---- export/ffmpeg_cfg.h
-+++ export/ffmpeg_cfg.h
-@@ -13,8 +13,6 @@
+--- a/export/ffmpeg_cfg.h
++++ b/export/ffmpeg_cfg.h
+@@ -13,8 +13,6 @@ extern int lavc_param_vme;
  //extern int lavc_param_vqscale;
  //extern int lavc_param_vqmin;
  //extern int lavc_param_vqmax;

transcode-1.1.7-ffmpeg2.patch Changed

@@ -2,10 +2,8 @@
 Fix segfaults introduced by wrong usage of the av_dict API.
 Fix forgotten parts in the libav9 patch.
 
-Index: transcode-1.1.7/encode/encode_lavc.c
-===================================================================
---- transcode-1.1.7.orig/encode/encode_lavc.c
-+++ transcode-1.1.7/encode/encode_lavc.c
+--- a/encode/encode_lavc.c
++++ b/encode/encode_lavc.c
 @@ -74,6 +74,9 @@ struct tclavcconfigdata_ {
      int lmin;
      int lmax;
@@ -172,10 +170,28 @@
      TC_UNLOCK_LIBAVCODEC;
  
      if (ret < 0) {
-Index: transcode-1.1.7/export/export_ffmpeg.c
-===================================================================
---- transcode-1.1.7.orig/export/export_ffmpeg.c
-+++ transcode-1.1.7/export/export_ffmpeg.c
+--- a/export/aud_aux.c
++++ b/export/aud_aux.c
+@@ -346,7 +346,7 @@ static int tc_audio_init_ffmpeg(vob_t *v
+ 
+     //-- set parameters (bitrate, channels and sample-rate) --
+     //--------------------------------------------------------
+-    avcodec_get_context_defaults(&mpa_ctx);
++    avcodec_get_context_defaults3(&mpa_ctx, mpa_codec);
+ #if LIBAVCODEC_VERSION_MAJOR < 53
+     mpa_ctx.codec_type  = CODEC_TYPE_AUDIO;
+ #else
+@@ -359,7 +359,7 @@ static int tc_audio_init_ffmpeg(vob_t *v
+     //-- open codec --
+     //----------------
+     TC_LOCK_LIBAVCODEC;
+-    ret = avcodec_open(&mpa_ctx, mpa_codec);
++    ret = avcodec_open2(&mpa_ctx, mpa_codec, NULL);
+     TC_UNLOCK_LIBAVCODEC;
+     if (ret < 0) {
+         tc_warn("tc_audio_init_ffmpeg: could not open %s codec !",
+--- a/export/export_ffmpeg.c
++++ b/export/export_ffmpeg.c
 @@ -122,7 +122,7 @@ static uint8_t             *img_buffer =
  static AVFrame             *lavc_convert_frame = NULL;
  
@@ -269,10 +285,8 @@
      TC_UNLOCK_LIBAVCODEC;
      if (ret < 0) {
        tc_log_warn(MOD_NAME, "could not open FFMPEG codec");
-Index: transcode-1.1.7/export/ffmpeg_cfg.c
-===================================================================
---- transcode-1.1.7.orig/export/ffmpeg_cfg.c
-+++ transcode-1.1.7/export/ffmpeg_cfg.c
+--- a/export/ffmpeg_cfg.c
++++ b/export/ffmpeg_cfg.c
 @@ -214,10 +214,10 @@ TCConfigEntry lavcopts_conf[]={
      {"context", &lavc_param_context, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10},
      {"intra_matrix", &lavc_param_intra_matrix, TCCONF_TYPE_STRING, 0, 0, 0},
@@ -286,32 +300,8 @@
      {"threads", &lavc_param_threads, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 16},
      {"ss", &lavc_param_ss, TCCONF_TYPE_FLAG, 0, 0, 1},
      {"svcd_sof", &lavc_param_scan_offset, TCCONF_TYPE_FLAG, 0, 0, 1},
-Index: transcode-1.1.7/export/aud_aux.c
-===================================================================
---- transcode-1.1.7.orig/export/aud_aux.c
-+++ transcode-1.1.7/export/aud_aux.c
-@@ -346,7 +346,7 @@ static int tc_audio_init_ffmpeg(vob_t *v
- 
-     //-- set parameters (bitrate, channels and sample-rate) --
-     //--------------------------------------------------------
--    avcodec_get_context_defaults(&mpa_ctx);
-+    avcodec_get_context_defaults3(&mpa_ctx, mpa_codec);
- #if LIBAVCODEC_VERSION_MAJOR < 53
-     mpa_ctx.codec_type  = CODEC_TYPE_AUDIO;
- #else
-@@ -359,7 +359,7 @@ static int tc_audio_init_ffmpeg(vob_t *v
-     //-- open codec --
-     //----------------
-     TC_LOCK_LIBAVCODEC;
--    ret = avcodec_open(&mpa_ctx, mpa_codec);
-+    ret = avcodec_open2(&mpa_ctx, mpa_codec, NULL);
-     TC_UNLOCK_LIBAVCODEC;
-     if (ret < 0) {
-         tc_warn("tc_audio_init_ffmpeg: could not open %s codec !",
-Index: transcode-1.1.7/import/import_ffmpeg.c
-===================================================================
---- transcode-1.1.7.orig/import/import_ffmpeg.c
-+++ transcode-1.1.7/import/import_ffmpeg.c
+--- a/import/import_ffmpeg.c
++++ b/import/import_ffmpeg.c
 @@ -302,7 +302,7 @@ do_avi:
  
      // Set these to the expected values so that ffmpeg's decoder can

transcode-1.1.7-ffmpeg29.patch Changed

@@ -1,7 +1,5 @@
-Index: encode/encode_lavc.c
-===================================================================
---- encode/encode_lavc.c.orig	2019-02-15 09:47:35.265087629 +0200
-+++ encode/encode_lavc.c	2019-02-15 09:50:35.239920062 +0200
+--- a/encode/encode_lavc.c
++++ b/encode/encode_lavc.c
 @@ -233,7 +233,7 @@ static void pre_encode_video_yuv420p(TCL
                                       vframe_list_t *vframe)
  {
@@ -126,10 +124,8 @@
  
      if (outframe->video_len < 0) {
          tc_log_warn(MOD_NAME, "encoder error: size (%i)",
-Index: export/export_ffmpeg.c
-===================================================================
---- export/export_ffmpeg.c.orig	2019-02-15 09:47:35.265087629 +0200
-+++ export/export_ffmpeg.c	2019-02-15 09:57:02.282565514 +0200
+--- a/export/export_ffmpeg.c
++++ b/export/export_ffmpeg.c
 @@ -252,9 +252,9 @@ int opt_default(const char *opt, const c
      for(type=0; type<AVMEDIA_TYPE_NB && ret>= 0; type++){
  		/* GLUE: +if */
@@ -258,10 +254,8 @@
      if (out_size < 0) {
        tc_log_warn(MOD_NAME, "encoder error: size (%d)", out_size);
        return TC_EXPORT_ERROR;
-Index: import/decode_lavc.c
-===================================================================
---- import/decode_lavc.c.orig	2019-02-15 09:47:35.265087629 +0200
-+++ import/decode_lavc.c	2019-02-15 09:50:35.239920062 +0200
+--- a/import/decode_lavc.c
++++ b/import/decode_lavc.c
 @@ -290,8 +290,8 @@ void decode_lavc(decode_t *decode)
  
        // Convert avcodec image to the requested YUV or RGB format
@@ -304,10 +298,8 @@
  	    if (picture.linesize[0] != lavc_dec_context->width) {
  		int y;
  		for (y = 0; y < lavc_dec_context->height; y++) {
-Index: import/import_ffmpeg.c
-===================================================================
---- import/import_ffmpeg.c.orig	2019-02-15 09:47:35.265087629 +0200
-+++ import/import_ffmpeg.c	2019-02-15 09:50:35.239920062 +0200
+--- a/import/import_ffmpeg.c
++++ b/import/import_ffmpeg.c
 @@ -580,8 +580,8 @@ retry:
  
      // Convert avcodec image to our internal YUV or RGB format

transcode-1.1.7-freetype251.patch Changed

transcode-1.1.7-libav-10.patch Changed

@@ -1,5 +1,5 @@
---- transcode-1.1.7/export/aud_aux.c.libav	2014-05-12 14:33:00.524424335 +0000
-+++ transcode-1.1.7/export/aud_aux.c	2014-05-12 15:22:01.853557714 +0000
+--- a/export/aud_aux.c
++++ b/export/aud_aux.c
 @@ -326,10 +326,10 @@ static int tc_audio_init_ffmpeg(vob_t *v
  
      switch (o_codec) {
@@ -22,8 +22,8 @@
          return(TC_EXPORT_ERROR);
      }
  
---- transcode-1.1.7/filter/filter_resample.c.libav	2014-05-12 14:32:29.000000000 +0000
-+++ transcode-1.1.7/filter/filter_resample.c	2014-05-12 15:26:57.763368255 +0000
+--- a/filter/filter_resample.c
++++ b/filter/filter_resample.c
 @@ -45,7 +45,7 @@ typedef struct {
  
      int bytes_per_sample;
@@ -33,8 +33,8 @@
  } ResamplePrivateData;
  
  static const char resample_help[] = ""
---- transcode-1.1.7/import/decode_lavc.c.libav	2014-05-12 14:33:00.516424069 +0000
-+++ transcode-1.1.7/import/decode_lavc.c	2014-05-12 15:32:38.750673288 +0000
+--- a/import/decode_lavc.c
++++ b/import/decode_lavc.c
 @@ -58,37 +58,37 @@ struct ffmpeg_codec {
  
  // fourCC to ID mapping taken from MPlayer's codecs.conf
@@ -89,8 +89,8 @@
      {"MPG2", ""}},
    {0, TC_CODEC_UNKNOWN, NULL, {""}}};
  
---- transcode-1.1.7/import/import_ffmpeg.c.libav	2014-05-12 14:33:00.524424335 +0000
-+++ transcode-1.1.7/import/import_ffmpeg.c	2014-05-12 15:31:52.589142857 +0000
+--- a/import/import_ffmpeg.c
++++ b/import/import_ffmpeg.c
 @@ -59,51 +59,51 @@ struct ffmpeg_codec {
  
  // fourCC to ID mapping taken from MPlayer's codecs.conf
@@ -222,8 +222,8 @@
  	bkey = 1;
        }
  
---- transcode-1.1.7/import/probe_ffmpeg.c.libav	2014-05-12 14:33:00.516424069 +0000
-+++ transcode-1.1.7/import/probe_ffmpeg.c	2014-05-12 18:06:57.899206701 +0000
+--- a/import/probe_ffmpeg.c
++++ b/import/probe_ffmpeg.c
 @@ -51,12 +51,7 @@ static void translate_info(const AVForma
              info->bitrate = st->codec->bit_rate / 1000;
              info->width = st->codec->width;
@@ -247,8 +247,8 @@
      return;
  }
  
---- transcode-1.1.7/libtc/tcavcodec.h.libav	2014-05-12 14:33:00.512423937 +0000
-+++ transcode-1.1.7/libtc/tcavcodec.h	2014-05-12 15:29:27.800342555 +0000
+--- a/libtc/tcavcodec.h
++++ b/libtc/tcavcodec.h
 @@ -32,6 +32,8 @@
  #include <libavutil/avutil.h>
  #include <libavcodec/avcodec.h>

transcode-1.1.7-libav-9.patch Changed

@@ -1,16 +1,5 @@
---- ./import/probe_ffmpeg.c.original	2013-04-22 20:04:51.058081388 +0200
-+++ ./import/probe_ffmpeg.c	2013-04-22 20:05:25.744081897 +0200
-@@ -109,7 +109,7 @@ void probe_ffmpeg(info_t *ipipe)
-         return;
-     }
- 
--    ret = av_find_stream_info(lavf_dmx_context);
-+    ret = avformat_find_stream_info(lavf_dmx_context, NULL);
-     if (ret < 0) {
-         tc_log_error(__FILE__, "unable to fetch informations from '%s'"
-                                " (libavformat failure)",
---- ./import/decode_lavc.c.original	2013-04-22 20:06:17.260082652 +0200
-+++ ./import/decode_lavc.c	2013-04-22 20:07:47.564083975 +0200
+--- a/import/decode_lavc.c
++++ b/import/decode_lavc.c
 @@ -170,7 +170,7 @@ void decode_lavc(decode_t *decode)
  
    // Set these to the expected values so that ffmpeg's decoder can
@@ -29,3 +18,14 @@
        tc_log_error(__FILE__, "Could not initialize the '%s' codec.",
  		   codec->name);
        goto decoder_error;
+--- a/import/probe_ffmpeg.c
++++ b/import/probe_ffmpeg.c
+@@ -109,7 +109,7 @@ void probe_ffmpeg(info_t *ipipe)
+         return;
+     }
+ 
+-    ret = av_find_stream_info(lavf_dmx_context);
++    ret = avformat_find_stream_info(lavf_dmx_context, NULL);
+     if (ret < 0) {
+         tc_log_error(__FILE__, "unable to fetch informations from '%s'"
+                                " (libavformat failure)",

transcode-1.1.7-preset-force.patch Changed

transcode-1.1.7-preset-free.patch Changed

transcode-export_ffmpeg.patch Changed

transcode-fix-64bit-portability.patch Changed

transcode-gcc10.patch Changed

@@ -1,5 +1,5 @@
---- transcode-1.1.7/import/demux_pass.c	2014-09-16 05:39:12.000000000 +0200
-+++ transcode-1.1.7/import/demux_pass.c	2020-07-08 22:22:09.411717435 +0200
+--- a/import/demux_pass.c
++++ b/import/demux_pass.c
 @@ -32,8 +32,6 @@
  #include "packets.h"
  
@@ -9,9 +9,9 @@
  /* if you listen carefully, then you can hear the desesperate
   * whisper of this code calling for a rewrite. Or for a redesign.
   * Or both. --  FR
---- transcode-1.1.7/import/extract_mp3.c	2014-09-16 05:39:12.000000000 +0200
-+++ transcode-1.1.7/import/extract_mp3.c	2020-07-08 22:17:10.761711335 +0200
-@@ -243,7 +243,7 @@
+--- a/import/extract_mp3.c
++++ b/import/extract_mp3.c
+@@ -243,7 +243,7 @@ static int mp3scan(int infd, int outfd)
  }
  
  #define MAX_BUF 4096
@@ -20,8 +20,8 @@
  
  /* ------------------------------------------------------------
   *
---- transcode-1.1.7/import/extract_pcm.c	2014-09-16 05:39:12.000000000 +0200
-+++ transcode-1.1.7/import/extract_pcm.c	2020-07-08 22:16:56.129613604 +0200
+--- a/import/extract_pcm.c
++++ b/import/extract_pcm.c
 @@ -33,7 +33,7 @@
  #include "tc.h"

transcode.patch Added

@@ -0,0 +1,119 @@
+--- a/export/aud_aux.c
++++ b/export/aud_aux.c
+@@ -843,7 +843,7 @@ static int tc_audio_encode_mp3(char *aud
+ 
+ static int tc_audio_encode_ffmpeg(char *aud_buffer, int aud_size, avi_t *avifile)
+ {
+-#ifdef HAVE_FFMPEG
++#if 0 //def HAVE_FFMPEG
+     int  in_size, out_size;
+     char *in_buf;
+ 
+--- a/import/mpg123.h
++++ b/import/mpg123.h
+@@ -36,6 +36,41 @@
+ #include <lame.h>
+ #endif
+ 
++#if DEPRECATED_OR_OBSOLETE_CODE_REMOVED
++int CDECL lame_decode_init(void);
++int CDECL lame_decode(
++        unsigned char *  mp3buf,
++        int              len,
++        short            pcm_l[],
++        short            pcm_r[] );
++int CDECL lame_decode_headers(
++        unsigned char*   mp3buf,
++        int              len,
++        short            pcm_l[],
++        short            pcm_r[],
++        mp3data_struct*  mp3data );
++int CDECL lame_decode1(
++        unsigned char*  mp3buf,
++        int             len,
++        short           pcm_l[],
++        short           pcm_r[] );
++int CDECL lame_decode1_headers(
++        unsigned char*   mp3buf,
++        int              len,
++        short            pcm_l[],
++        short            pcm_r[],
++        mp3data_struct*  mp3data );
++int CDECL lame_decode1_headersB(
++        unsigned char*   mp3buf,
++        int              len,
++        short            pcm_l[],
++        short            pcm_r[],
++        mp3data_struct*  mp3data,
++        int              *enc_delay,
++        int              *enc_padding );
++int CDECL lame_decode_exit(void);
++#endif /* obsolete lame_decode API calls */
++
+ int lame_decode_initfile(FILE * fd, mp3data_struct * mp3data, int format);
+ int lame_decode_fromfile(FILE * fd, short pcm_l[], short pcm_r[], mp3data_struct * mp3data);
+ 
+--- a/import/v4l/import_v4l2.c
++++ b/import/v4l/import_v4l2.c
+@@ -454,8 +454,7 @@ static int tc_v4l2_video_setup_cropping(
+     if (ret < 0) {
+         tc_log_warn(MOD_NAME,
+                     "driver does not support cropping"
+-                    "(ioctl(VIDIOC_CROPCAP) returns \"%s\"), disabled",
+-                    errno <= sys_nerr ? sys_errlist[errno] : "unknown");
++                    "(ioctl(VIDIOC_CROPCAP) returns \"%m\"), disabled");
+         return TC_ERROR;
+     }
+     if (verbose_flag > TC_INFO) {
+@@ -484,8 +483,7 @@ static int tc_v4l2_video_setup_cropping(
+     if (ret < 0) {
+         tc_log_warn(MOD_NAME,
+                     "driver does not support inquiring cropping"
+-                    " parameters (ioctl(VIDIOC_G_CROP) returns \"%s\")",
+-                    errno <= sys_nerr ? sys_errlist[errno] : "unknown");
++                    " parameters (ioctl(VIDIOC_G_CROP) returns \"%m\")");
+         return -1;
+     }
+ 
+@@ -512,8 +510,7 @@ static int tc_v4l2_video_setup_cropping(
+         if (ret < 0) {
+             tc_log_warn(MOD_NAME,
+                         "driver does not support inquering cropping"
+-                        " parameters (ioctl(VIDIOC_G_CROP) returns \"%s\")",
+-                        errno <= sys_nerr ? sys_errlist[errno] : "unknown");
++                        " parameters (ioctl(VIDIOC_G_CROP) returns \"%m\")");
+             return -1;
+         }
+         if (verbose_flag > TC_INFO) {
+@@ -612,8 +609,7 @@ static int tc_v4l2_video_setup_stream_pa
+     err = ioctl(vs->video_fd, VIDIOC_S_PARM, &streamparm);
+     if (err < 0) {
+         if (verbose_flag) {
+-            tc_log_warn(MOD_NAME, "driver does not support setting parameters (ioctl(VIDIOC_S_PARM) returns \"%s\")",
+-                        errno <= sys_nerr ? sys_errlist[errno] : "unknown");
++            tc_log_warn(MOD_NAME, "driver does not support setting parameters (ioctl(VIDIOC_S_PARM) returns \"%m\")");
+         }
+     }
+     return TC_OK;
+@@ -627,8 +623,7 @@ static int tc_v4l2_video_get_TV_standard
+ 
+     err = ioctl(vs->video_fd, VIDIOC_G_STD, &stdid);
+     if (err < 0) {
+-        tc_log_warn(MOD_NAME, "driver does not support get std (ioctl(VIDIOC_G_STD) returns \"%s\")",
+-                    errno <= sys_nerr ? sys_errlist[errno] : "unknown");
++        tc_log_warn(MOD_NAME, "driver does not support get std (ioctl(VIDIOC_G_STD) returns \"%m\")");
+         memset(&stdid, 0, sizeof(v4l2_std_id));
+     }
+ 
+--- a/import/v4l/import_v4lcam.c
++++ b/import/v4l/import_v4lcam.c
+@@ -367,8 +367,7 @@ static int tc_v4l2_video_setup_stream_pa
+     err = v4l2_ioctl(vs->video_fd, VIDIOC_S_PARM, &streamparm);
+     if (err < 0) {
+         tc_log_warn(MOD_NAME, "driver does not support setting parameters"
+-                              " (ioctl(VIDIOC_S_PARM) returns \"%s\")",
+-                    errno <= sys_nerr ? sys_errlist[errno] : "unknown");
++                              " (ioctl(VIDIOC_S_PARM) returns \"%m\")");
+     }
+     return TC_OK;
+ }

Changes of Revision 26