r746 - in /unstable/libquicktime/debian: changelog patches/202_rtjpeg_64bit_fix.diff

[lool at users.alioth.debian.org]

Author: lool
Date: Sun Apr  1 13:24:25 2007
New Revision: 746

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=746
Log:
* Update patch 202_rtjpeg_64bit_fix to replace some unsigned long long casts
  with uint64_t casts instead; should fix build failure on amd64;
  closes: #417055.

Modified:
    unstable/libquicktime/debian/changelog
    unstable/libquicktime/debian/patches/202_rtjpeg_64bit_fix.diff

Modified: unstable/libquicktime/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/libquicktime/debian/changelog?rev=746&op=diff
==============================================================================
--- unstable/libquicktime/debian/changelog (original)
+++ unstable/libquicktime/debian/changelog Sun Apr  1 13:24:25 2007
@@ -1,3 +1,11 @@
+libquicktime (2:0.9.7-5) unstable; urgency=low
+
+  * Update patch 202_rtjpeg_64bit_fix to replace some unsigned long long casts
+    with uint64_t casts instead; should fix build failure on amd64;
+    closes: #417055.
+
+ -- Loic Minier <lool at dooz.org>  Sun, 01 Apr 2007 15:23:16 +0200
+
 libquicktime (2:0.9.7-4) unstable; urgency=low
 
   * debian/patches/202_rtjpeg_64bit_fix.diff:

Modified: unstable/libquicktime/debian/patches/202_rtjpeg_64bit_fix.diff
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/libquicktime/debian/patches/202_rtjpeg_64bit_fix.diff?rev=746&op=diff
==============================================================================
--- unstable/libquicktime/debian/patches/202_rtjpeg_64bit_fix.diff (original)
+++ unstable/libquicktime/debian/patches/202_rtjpeg_64bit_fix.diff Sun Apr  1 13:24:25 2007
@@ -1,7 +1,7 @@
 Index: libquicktime-0.9.7/plugins/rtjpeg/mmx.h
 ===================================================================
---- libquicktime-0.9.7.orig/plugins/rtjpeg/mmx.h	2007-04-01 13:54:01.000000000 +0200
-+++ libquicktime-0.9.7/plugins/rtjpeg/mmx.h	2007-04-01 13:54:05.000000000 +0200
+--- libquicktime-0.9.7.orig/plugins/rtjpeg/mmx.h	2005-05-22 15:05:19.000000000 +0200
++++ libquicktime-0.9.7/plugins/rtjpeg/mmx.h	2007-04-01 15:21:08.000000000 +0200
 @@ -30,16 +30,17 @@
  #ifndef _MMX_H
  #define _MMX_H
@@ -30,8 +30,8 @@
  
 Index: libquicktime-0.9.7/plugins/rtjpeg/RTjpeg.c
 ===================================================================
---- libquicktime-0.9.7.orig/plugins/rtjpeg/RTjpeg.c	2007-04-01 13:54:01.000000000 +0200
-+++ libquicktime-0.9.7/plugins/rtjpeg/RTjpeg.c	2007-04-01 13:54:05.000000000 +0200
+--- libquicktime-0.9.7.orig/plugins/rtjpeg/RTjpeg.c	2005-05-23 01:58:56.000000000 +0200
++++ libquicktime-0.9.7/plugins/rtjpeg/RTjpeg.c	2007-04-01 15:22:08.000000000 +0200
 @@ -175,8 +175,8 @@
   for(i=0; i<64; i++)qtbl[i]=(int16_t)rtj->cqt[i];
  }
@@ -77,6 +77,17 @@
  
    mmx_t *wsptr = (mmx_t *)rtj->ws;
    register mmx_t *dataptr = (mmx_t *)odata;
+@@ -2445,8 +2445,8 @@
+  if (*cm < 0) *cm = 0;
+  if (*cm > 16) *cm = 16;
+ #ifdef MMX
+- rtj->lmask=(mmx_t)(((unsigned long long)(*lm)<<48)|((unsigned long long)(*lm)<<32)|((unsigned long long)(*lm)<<16)|(unsigned long long)(*lm));
+- rtj->cmask=(mmx_t)(((unsigned long long)(*cm)<<48)|((unsigned long long)(*cm)<<32)|((unsigned long long)(*cm)<<16)|(unsigned long long)(*cm));
++ rtj->lmask=(mmx_t)(((uint64_t)(*lm)<<48)|((uint64_t)(*lm)<<32)|((uint64_t)(*lm)<<16)|(uint64_t)(*lm));
++ rtj->cmask=(mmx_t)(((uint64_t)(*cm)<<48)|((uint64_t)(*cm)<<32)|((uint64_t)(*cm)<<16)|(uint64_t)(*cm));
+ #else
+  rtj->lmask=*lm;
+  rtj->cmask=*cm;
 @@ -2767,7 +2767,7 @@
   mmx_t *mold=(mmx_t *)old;
   mmx_t *mblock=(mmx_t *)rblock;