control: tags -1 patch
control: tags -1 pending

Hi dear maintainer, the following patch taken from avutil (where the code has 
been copied),
has been uploaded on deferred/5

thanks

G.
diff -Nru goldendict-1.5.0~git20160508.g92b5485/debian/changelog 
goldendict-1.5.0~git20160508.g92b5485/debian/changelog
--- goldendict-1.5.0~git20160508.g92b5485/debian/changelog      2016-05-08 
09:02:18.000000000 +0200
+++ goldendict-1.5.0~git20160508.g92b5485/debian/changelog      2016-06-03 
16:04:45.000000000 +0200
@@ -1,3 +1,12 @@
+goldendict (1.5.0~git20160508.g92b5485-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * debian/patches/fix-big-endian-64-swap.patch:
+    - fix 64 bit Big Endian build failures (Closes: #824929).
+      thanks Adam Conrad for the great help there
+
+ -- Gianfranco Costamagna <[email protected]>  Fri, 03 Jun 2016 
15:53:49 +0200
+
 goldendict (1.5.0~git20160508.g92b5485-1) unstable; urgency=medium
 
   * New snapshot.
diff -Nru 
goldendict-1.5.0~git20160508.g92b5485/debian/patches/fix-big-endian-64-swap.patch
 
goldendict-1.5.0~git20160508.g92b5485/debian/patches/fix-big-endian-64-swap.patch
--- 
goldendict-1.5.0~git20160508.g92b5485/debian/patches/fix-big-endian-64-swap.patch
   1970-01-01 01:00:00.000000000 +0100
+++ 
goldendict-1.5.0~git20160508.g92b5485/debian/patches/fix-big-endian-64-swap.patch
   2016-06-03 16:02:47.000000000 +0200
@@ -0,0 +1,28 @@
+Description: This should fix the s390x and sparc64 build failures
+ Code inspired from av_bswap64 libavutil function
+ Thanks Adam Conrad for the help!
+Author: Gianfranco Costamagna <[email protected]>
+
+Bug-Debian: https://bugs.debian.org/824929
+Forwarded: https://github.com/goldendict/goldendict/issues/714
+
+--- goldendict-1.5.0~git20160508.g92b5485.orig/ripemd.cc
++++ goldendict-1.5.0~git20160508.g92b5485/ripemd.cc
+@@ -171,9 +171,16 @@ void RIPEMD128::update( const uint8_t *
+   memcpy( &buffer[j], &data[i], len - i );
+ }
+ 
++#ifndef av_bswap64
++static inline uint64_t av_bswap64(uint64_t x)
++{
++  return (uint64_t)qFromLittleEndian<uint32_t>(x) << 32 | 
qFromLittleEndian<uint32_t>(x >> 32);
++}
++#endif
++
+ void RIPEMD128::digest( uint8_t * digest )
+ {
+-  uint64_t finalcount = qFromLittleEndian( count << 3 );
++  uint64_t finalcount = av_bswap64( count << 3 );
+   update( (const uint8_t *) "\200", 1 );
+   while ( ( count & 63 ) != 56 )
+     update( ( const uint8_t * ) "", 1 );
diff -Nru goldendict-1.5.0~git20160508.g92b5485/debian/patches/series 
goldendict-1.5.0~git20160508.g92b5485/debian/patches/series
--- goldendict-1.5.0~git20160508.g92b5485/debian/patches/series 2015-09-23 
10:22:52.000000000 +0200
+++ goldendict-1.5.0~git20160508.g92b5485/debian/patches/series 2016-06-03 
15:53:49.000000000 +0200
@@ -1,2 +1,3 @@
 disable-autostart-control
 wordnet-dict-paths
+fix-big-endian-64-swap.patch

Attachment: signature.asc
Description: OpenPGP digital signature

Reply via email to