[packages/tvheadend] - fix int size issues

[baggins]

commit 432988cc8f05a82e6432914bdcd3ac4eadb157ea
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sat Apr 16 20:05:35 2016 +0200

    - fix int size issues

 64bit.patch    | 16 ++++++++++++++++
 ffmpeg3.patch  | 13 -------------
 tvheadend.spec |  4 ++++
 3 files changed, 20 insertions(+), 13 deletions(-)
---
diff --git a/tvheadend.spec b/tvheadend.spec
index 8243501..bec16f8 100644
--- a/tvheadend.spec
+++ b/tvheadend.spec
@@ -13,6 +13,7 @@ Source3:	%{name}.sysconfig
 Source4:	%{name}.init
 Patch0:		x32.patch
 Patch1:		ffmpeg3.patch
+Patch2:		64bit.patch
 URL:		https://tvheadend.org/projects/tvheadend
 BuildRequires:	avahi-devel
 BuildRequires:	curl-devel
@@ -41,6 +42,9 @@ DVB-C, DVB-T, ATSC, IPTV, and Analog video (V4L) as input sources.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%ifarch %{x8664}
+%patch2 -p1
+%endif
 
 %build
 export CFLAGS="%{rpmcflags}"
diff --git a/64bit.patch b/64bit.patch
new file mode 100644
index 0000000..f77face
--- /dev/null
+++ b/64bit.patch
@@ -0,0 +1,16 @@
+diff -ur tvheadend-4.0.8.orig/src/plumbing/transcoding.c tvheadend-4.0.8/src/plumbing/transcoding.c
+--- tvheadend-4.0.8.orig/src/plumbing/transcoding.c	2015-12-16 18:33:33.000000000 +0100
++++ tvheadend-4.0.8/src/plumbing/transcoding.c	2016-04-16 19:53:13.907273675 +0200
+@@ -592,10 +597,10 @@
+       // Convert audio
+       tvhtrace("transcode", "%04X: converting audio", shortid(t));
+ 
+-      tvhtrace("transcode", "%04X: IN : channels=%d, layout=%" PRIi64 ", rate=%d, fmt=%d, bitrate=%d",
++      tvhtrace("transcode", "%04X: IN : channels=%d, layout=%" PRIi64 ", rate=%d, fmt=%d, bitrate=%ld",
+                shortid(t), ictx->channels, ictx->channel_layout, ictx->sample_rate,
+                ictx->sample_fmt, ictx->bit_rate);
+-      tvhtrace("transcode", "%04X: OUT: channels=%d, layout=%" PRIi64 ", rate=%d, fmt=%d, bitrate=%d",
++      tvhtrace("transcode", "%04X: OUT: channels=%d, layout=%" PRIi64 ", rate=%d, fmt=%d, bitrate=%ld",
+                shortid(t), octx->channels, octx->channel_layout, octx->sample_rate,
+                octx->sample_fmt, octx->bit_rate);
+ 
diff --git a/ffmpeg3.patch b/ffmpeg3.patch
index 910a102..7df91d5 100644
--- a/ffmpeg3.patch
+++ b/ffmpeg3.patch
@@ -97,19 +97,6 @@ diff -ur tvheadend-4.0.8.orig/src/plumbing/transcoding.c tvheadend-4.0.8/src/plu
    int16_t                    vid_width;
    int16_t                    vid_height;
  
-@@ -592,10 +597,10 @@
-       // Convert audio
-       tvhtrace("transcode", "%04X: converting audio", shortid(t));
- 
--      tvhtrace("transcode", "%04X: IN : channels=%d, layout=%" PRIi64 ", rate=%d, fmt=%d, bitrate=%d",
-+      tvhtrace("transcode", "%04X: IN : channels=%d, layout=%" PRIi64 ", rate=%d, fmt=%d, bitrate=%ld",
-                shortid(t), ictx->channels, ictx->channel_layout, ictx->sample_rate,
-                ictx->sample_fmt, ictx->bit_rate);
--      tvhtrace("transcode", "%04X: OUT: channels=%d, layout=%" PRIi64 ", rate=%d, fmt=%d, bitrate=%d",
-+      tvhtrace("transcode", "%04X: OUT: channels=%d, layout=%" PRIi64 ", rate=%d, fmt=%d, bitrate=%ld",
-                shortid(t), octx->channels, octx->channel_layout, octx->sample_rate,
-                octx->sample_fmt, octx->bit_rate);
- 
 @@ -952,6 +957,114 @@
  
  }
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/tvheadend.git/commitdiff/432988cc8f05a82e6432914bdcd3ac4eadb157ea