[packages/transcode] - fix various code issues - rel 19
baggins
baggins at pld-linux.org
Sun Feb 14 19:06:54 CET 2021
commit bd925329f6a2cf6def2a7b75ac4811ad0dc3c8cc
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sun Feb 14 19:06:31 2021 +0100
- fix various code issues
- rel 19
duplicate.patch | 11 +++++++++++
local-static.patch | 37 ++++++++++++++++++++++++++++++++++
strerror.patch | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
transcode.spec | 8 +++++++-
4 files changed, 113 insertions(+), 1 deletion(-)
---
diff --git a/transcode.spec b/transcode.spec
index bbc8d1b..c993087 100644
--- a/transcode.spec
+++ b/transcode.spec
@@ -26,7 +26,7 @@ Summary: Video stream converter
Summary(pl.UTF-8): Konwerter strumieni video
Name: transcode
Version: 1.1.7
-Release: 18
+Release: 19
License: GPL v2+
Group: Applications/Multimedia
Source0: https://bitbucket.org/france/transcode-tcforge/downloads/%{name}-%{version}.tar.bz2
@@ -44,6 +44,9 @@ Patch9: ffmpeg3.patch
Patch10: imagemagick7.patch
Patch11: ffmpeg4.patch
Patch12: libav-10.patch
+Patch13: strerror.patch
+Patch14: local-static.patch
+Patch15: duplicate.patch
URL: https://bitbucket.org/france/transcode-tcforge/overview
%{?with_magick:BuildRequires: ImageMagick-devel >= 6.4.1-2}
%{?with_sdl:BuildRequires: SDL-devel >= 1.2.5}
@@ -161,6 +164,9 @@ Filtry transcode.
%patch10 -p1
%patch11 -p0
%patch12 -p0
+%patch13 -p1
+%patch14 -p1
+%patch15 -p1
%build
%{__libtoolize}
diff --git a/duplicate.patch b/duplicate.patch
new file mode 100644
index 0000000..081bbaf
--- /dev/null
+++ b/duplicate.patch
@@ -0,0 +1,11 @@
+--- transcode-1.1.7/import/demux_pass.c~ 2011-11-19 17:50:27.000000000 +0100
++++ transcode-1.1.7/import/demux_pass.c 2021-02-14 19:01:49.899642865 +0100
+@@ -32,8 +32,6 @@
+ #include "packets.h"
+
+
+-int gop, gop_pts, gop_cnt;
+-
+ /* 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
diff --git a/local-static.patch b/local-static.patch
new file mode 100644
index 0000000..4f4471e
--- /dev/null
+++ b/local-static.patch
@@ -0,0 +1,37 @@
+--- transcode-1.1.7/import/extract_ac3.c~ 2011-11-19 17:50:27.000000000 +0100
++++ transcode-1.1.7/import/extract_ac3.c 2021-02-14 18:57:28.911216181 +0100
+@@ -331,10 +331,10 @@
+
+
+
+-FILE *fd;
++static FILE *fd;
+
+ #define MAX_BUF 4096
+-char audio[MAX_BUF];
++static char audio[MAX_BUF];
+
+
+ /* from ac3scan.c */
+--- transcode-1.1.7/import/extract_mp3.c~ 2011-11-19 17:50:27.000000000 +0100
++++ transcode-1.1.7/import/extract_mp3.c 2021-02-14 18:57:58.834747274 +0100
+@@ -243,7 +243,7 @@
+ }
+
+ #define MAX_BUF 4096
+-char audio[MAX_BUF];
++static char audio[MAX_BUF];
+
+ /* ------------------------------------------------------------
+ *
+--- transcode-1.1.7/import/extract_pcm.c~ 2011-11-19 17:50:27.000000000 +0100
++++ transcode-1.1.7/import/extract_pcm.c 2021-02-14 18:58:28.858280225 +0100
+@@ -33,7 +33,7 @@
+ #include "tc.h"
+
+ #define MAX_BUF 4096
+-char audio[MAX_BUF];
++static char audio[MAX_BUF];
+
+ #define BUFFER_SIZE 262144
+ static uint8_t buffer[BUFFER_SIZE];
diff --git a/strerror.patch b/strerror.patch
new file mode 100644
index 0000000..9ce0656
--- /dev/null
+++ b/strerror.patch
@@ -0,0 +1,58 @@
+--- transcode-1.1.7/import/v4l/import_v4l2.c~ 2011-11-19 17:50:27.000000000 +0100
++++ transcode-1.1.7/import/v4l/import_v4l2.c 2021-02-14 18:53:04.069530261 +0100
+@@ -455,7 +455,7 @@
+ tc_log_warn(MOD_NAME,
+ "driver does not support cropping"
+ "(ioctl(VIDIOC_CROPCAP) returns \"%s\"), disabled",
+- errno <= sys_nerr ? sys_errlist[errno] : "unknown");
++ strerror(errno));
+ return TC_ERROR;
+ }
+ if (verbose_flag > TC_INFO) {
+@@ -485,7 +485,7 @@
+ 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");
++ strerror(errno));
+ return -1;
+ }
+
+@@ -513,7 +513,7 @@
+ 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");
++ strerror(errno));
+ return -1;
+ }
+ if (verbose_flag > TC_INFO) {
+@@ -613,7 +613,7 @@
+ 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");
++ strerror(errno));
+ }
+ }
+ return TC_OK;
+@@ -628,7 +628,7 @@
+ 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");
++ strerror(errno));
+ memset(&stdid, 0, sizeof(v4l2_std_id));
+ }
+
+--- transcode-1.1.7/import/v4l/import_v4lcam.c~ 2011-11-19 17:50:27.000000000 +0100
++++ transcode-1.1.7/import/v4l/import_v4lcam.c 2021-02-14 18:52:17.339247777 +0100
+@@ -368,7 +368,7 @@
+ 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");
++ strerror(errno));
+ }
+ return TC_OK;
+ }
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/transcode.git/commitdiff/bd925329f6a2cf6def2a7b75ac4811ad0dc3c8cc
More information about the pld-cvs-commit
mailing list