- more bitness fixes

diff --git a/32bit.patch b/32bit.patch
new file mode 100644 (file)
index 0000000..d8c0dda
--- /dev/null
+++ b/32bit.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=%lld",
+                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=%lld",
+                shortid(t), octx->channels, octx->channel_layout, octx->sample_rate,
+                octx->sample_fmt, octx->bit_rate);
+ 

diff --git a/tvheadend.spec b/tvheadend.spec
index bec16f86254f49a14bd882c5142f2b96f737671b..d598753b16dc0f58a71539a510702770f8f617cc 100644 (file)
--- a/tvheadend.spec
+++ b/tvheadend.spec
@@ -14,6 +14,7 @@ Source4:      %{name}.init
 Patch0:                x32.patch
 Patch1:                ffmpeg3.patch
 Patch2:                64bit.patch
+Patch3:                32bit.patch
 URL:           https://tvheadend.org/projects/tvheadend
 BuildRequires: avahi-devel
 BuildRequires: curl-devel
@@ -45,6 +46,9 @@ DVB-C, DVB-T, ATSC, IPTV, and Analog video (V4L) as input sources.
 %ifarch %{x8664}
 %patch2 -p1
 %endif
+%ifarch %{ix86} x32
+%patch3 -p1
+%endif
 
 %build
 export CFLAGS="%{rpmcflags}"