r825 - in /unstable/libquicktime/debian: changelog patches/00list patches/07-rtjpeg-64bit-fix.dpatch
fabian-guest at users.alioth.debian.org
fabian-guest at users.alioth.debian.org
Tue Jul 17 13:34:58 UTC 2007
Author: fabian-guest
Date: Tue Jul 17 13:34:58 2007
New Revision: 825
URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=825
Log:
Apply 07-rtjpeg-64bit-fix.dpatch from the unstable branch
Added:
unstable/libquicktime/debian/patches/07-rtjpeg-64bit-fix.dpatch
Modified:
unstable/libquicktime/debian/changelog
unstable/libquicktime/debian/patches/00list
Modified: unstable/libquicktime/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/libquicktime/debian/changelog?rev=825&op=diff
==============================================================================
--- unstable/libquicktime/debian/changelog (original)
+++ unstable/libquicktime/debian/changelog Tue Jul 17 13:34:58 2007
@@ -1,17 +1,22 @@
libquicktime (2:1.0.0+debian-4) unstable; urgency=low
* Upload to unstable (Closes: #421496).
-
- * debian/patches/06-lqt-config-cflags.dpatch:
- + New patch: Fix "lqt-config --cflags" to get the include path
- (Closes: #391847).
* debian/patches/02-install-in-libquicktime1.dpatch:
+ Removed.
* debian/control:
+ Replace (and conflict with) libquicktime0.
- -- Fabian Greffrath <fabian at debian-unofficial.org> Mon, 25 Jun 2007 08:50:01 +0200
+ * debian/patches/06-lqt-config-cflags.dpatch:
+ + New patch: Fix "lqt-config --cflags" to get the include path
+ (Closes: #391847).
+
+ * debian/patches/07-rtjpeg-64bit-fix.dpatch:
+ + From the unstable branch; updated by Loic Minier to replace some
+ unsigned long long casts with uint64_t casts instead; should fix
+ build failure on amd64 (Closes: #417055).
+
+ -- Fabian Greffrath <fabian at debian-unofficial.org> Mon, 17 Jul 2007 15:12:00 +0200
libquicktime (2:1.0.0+debian-3) experimental; urgency=low
Modified: unstable/libquicktime/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/libquicktime/debian/patches/00list?rev=825&op=diff
==============================================================================
--- unstable/libquicktime/debian/patches/00list (original)
+++ unstable/libquicktime/debian/patches/00list Tue Jul 17 13:34:58 2007
@@ -3,3 +3,4 @@
04-use-soname
05-dont-depend-on-gthread
06-lqt-config-cflags
+07-rtjpeg-64bit-fix
Added: unstable/libquicktime/debian/patches/07-rtjpeg-64bit-fix.dpatch
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/libquicktime/debian/patches/07-rtjpeg-64bit-fix.dpatch?rev=825&op=file
==============================================================================
--- unstable/libquicktime/debian/patches/07-rtjpeg-64bit-fix.dpatch (added)
+++ unstable/libquicktime/debian/patches/07-rtjpeg-64bit-fix.dpatch Tue Jul 17 13:34:58 2007
@@ -1,0 +1,104 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+##
+## DP: Use proper integer types where fixed sizes are required and
+## DP: replace some unsigned long long casts with uint64_t casts instead.
+
+ at DPATCH@
+
+diff -Naru libquicktime-1.0.0.orig/plugins/rtjpeg/mmx.h libquicktime-1.0.0/plugins/rtjpeg/mmx.h
+--- libquicktime-1.0.0.orig/plugins/rtjpeg/mmx.h 2007-02-14 12:40:55.000000000 +0100
++++ libquicktime-1.0.0/plugins/rtjpeg/mmx.h 2007-07-17 15:02:58.000000000 +0200
+@@ -38,15 +38,17 @@
+ * values by ULL, lest they be truncated by the compiler)
+ */
+
++#include <stdint.h>
++
+ typedef union {
+- long long q; /* Quadword (64-bit) value */
+- unsigned long long uq; /* Unsigned Quadword */
+- int d[2]; /* 2 Doubleword (32-bit) values */
+- unsigned int ud[2]; /* 2 Unsigned Doubleword */
+- short w[4]; /* 4 Word (16-bit) values */
+- unsigned short uw[4]; /* 4 Unsigned Word */
+- char b[8]; /* 8 Byte (8-bit) values */
+- unsigned char ub[8]; /* 8 Unsigned Byte */
++ int64_t q; /* Quadword (64-bit) value */
++ uint64_t uq; /* Unsigned Quadword */
++ int32_t d[2]; /* 2 Doubleword (32-bit) values */
++ uint32_t ud[2]; /* 2 Unsigned Doubleword */
++ int16_t w[4]; /* 4 Word (16-bit) values */
++ uint16_t uw[4]; /* 4 Unsigned Word */
++ int8_t b[8]; /* 8 Byte (8-bit) values */
++ uint8_t ub[8]; /* 8 Unsigned Byte */
+ float s[2]; /* Single-precision (32-bit) value */
+ } mmx_t; /* On an 8-byte (64-bit) boundary */
+
+diff -Naru libquicktime-1.0.0.orig/plugins/rtjpeg/RTjpeg.c libquicktime-1.0.0/plugins/rtjpeg/RTjpeg.c
+--- libquicktime-1.0.0.orig/plugins/rtjpeg/RTjpeg.c 2007-02-14 12:40:55.000000000 +0100
++++ libquicktime-1.0.0/plugins/rtjpeg/RTjpeg.c 2007-07-17 14:56:07.000000000 +0200
+@@ -175,8 +175,8 @@
+ for(i=0; i<64; i++)qtbl[i]=(int16_t)rtj->cqt[i];
+ }
+
+-static mmx_t RTjpeg_ones=(mmx_t)0x0001000100010001LL;
+-static mmx_t RTjpeg_half=(mmx_t)0x7fff7fff7fff7fffLL;
++static mmx_t RTjpeg_ones=(mmx_t)(uint64_t)0x0001000100010001LL;
++static mmx_t RTjpeg_half=(mmx_t)(uint64_t)0x7fff7fff7fff7fffLL;
+
+ void RTjpeg_quant(int16_t *block, int32_t *qtbl)
+ {
+@@ -233,11 +233,11 @@
+ * Perform the forward DCT on one block of samples.
+ */
+ #ifdef MMX
+-static mmx_t RTjpeg_C4 =(mmx_t)0x2D412D412D412D41LL;
+-static mmx_t RTjpeg_C6 =(mmx_t)0x187E187E187E187ELL;
+-static mmx_t RTjpeg_C2mC6=(mmx_t)0x22A322A322A322A3LL;
+-static mmx_t RTjpeg_C2pC6=(mmx_t)0x539F539F539F539FLL;
+-static mmx_t RTjpeg_zero =(mmx_t)0x0000000000000000LL;
++static mmx_t RTjpeg_C4 =(mmx_t)(uint64_t)0x2D412D412D412D41LL;
++static mmx_t RTjpeg_C6 =(mmx_t)(uint64_t)0x187E187E187E187ELL;
++static mmx_t RTjpeg_C2mC6=(mmx_t)(uint64_t)0x22A322A322A322A3LL;
++static mmx_t RTjpeg_C2pC6=(mmx_t)(uint64_t)0x539F539F539F539FLL;
++static mmx_t RTjpeg_zero =(mmx_t)(uint64_t)0x0000000000000000LL;
+
+ #else
+
+@@ -1197,11 +1197,11 @@
+ {
+ #ifdef MMX
+
+-static mmx_t fix_141 = (mmx_t)0x5a825a825a825a82LL;
+-static mmx_t fix_184n261 = (mmx_t)0xcf04cf04cf04cf04LL;
+-static mmx_t fix_184 = (mmx_t)0x7641764176417641LL;
+-static mmx_t fix_n184 = (mmx_t)0x896f896f896f896fLL;
+-static mmx_t fix_108n184 = (mmx_t)0xcf04cf04cf04cf04LL;
++static mmx_t fix_141 = (mmx_t)(uint64_t)0x5a825a825a825a82LL;
++static mmx_t fix_184n261 = (mmx_t)(uint64_t)0xcf04cf04cf04cf04LL;
++static mmx_t fix_184 = (mmx_t)(uint64_t)0x7641764176417641LL;
++static mmx_t fix_n184 = (mmx_t)(uint64_t)0x896f896f896f896fLL;
++static mmx_t fix_108n184 = (mmx_t)(uint64_t)0xcf04cf04cf04cf04LL;
+
+ mmx_t *wsptr = (mmx_t *)rtj->ws;
+ register mmx_t *dataptr = (mmx_t *)odata;
+@@ -2443,8 +2443,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;
+@@ -2765,7 +2765,7 @@
+ mmx_t *mold=(mmx_t *)old;
+ mmx_t *mblock=(mmx_t *)rblock;
+ volatile mmx_t result;
+- static mmx_t neg=(mmx_t)0xffffffffffffffffULL;
++ static mmx_t neg=(mmx_t)(uint64_t)0xffffffffffffffffULL;
+
+ movq_m2r(*mask, mm7);
+ movq_m2r(neg, mm6);
More information about the pkg-multimedia-commits
mailing list